changeset 22360:cbcbe5e0ff1d

Greek translation updated (Bouklis Panos) Closes #4915
author Stu Tomlinson <stu@nosnilmot.com>
date Thu, 28 Feb 2008 16:24:37 +0000 (2008-02-28)
parents 21c75cb7784d
children d0ca25f28561
files po/ChangeLog po/el.po
diffstat 2 files changed, 5778 insertions(+), 5560 deletions(-) [+]
line wrap: on
line diff
--- a/po/ChangeLog	Thu Feb 28 16:23:19 2008 +0000
+++ b/po/ChangeLog	Thu Feb 28 16:24:37 2008 +0000
@@ -4,6 +4,7 @@
 	* Arabic translation updated (Khaled Hosny)
 	* Belarusian Latin translation updated (Ihar Hrachyshka)
 	* Dutch translation updated (Dani谷l Heres)
+	* Greek translation updated (Bouklis Panos)
 	* Hebrew translation updated (Shalom Craimer)
 	* Norwegian Bokm奪l translation updated (Hallvard Glad, Espen Stefansen)
 	* Norwegian Nynorsk translation updated (Yngve Spjeld Landro)
--- a/po/el.po	Thu Feb 28 16:23:19 2008 +0000
+++ b/po/el.po	Thu Feb 28 16:24:37 2008 +0000
@@ -2,26 +2,28 @@
 #
 # This file is distributed under the same license as the Pidgin package.
 #
-# Copyright (C) Bouklis Panos <panos@echidna-band.com>, 2005, 2006, 2007.
+# Copyright (C) Bouklis Panos <panos@echidna-band.com>, 2005-2008.
 # Copyright (C) Panayotis Katsaloulis <panayotis@panayotis.com>, 2005.
 # Copyright (C) Ubuntu Greek Translators <ubuntu-gr@lists.ubuntu.com.>, 2005.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Pidgin 2.0.1\n"
+"Project-Id-Version: el\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-28 15:32-0500\n"
-"PO-Revision-Date: 2007-05-23 15:07+0300\n"
+"POT-Creation-Date: 2008-02-25 03:22-0500\n"
+"PO-Revision-Date: 2008-02-25 19:57+0200\n"
 "Last-Translator: Bouklis Panos <panos@echidna-band.com>\n"
 "Language-Team: Greek <i18ngr@lists.hellug.gr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: Plural-Forms:  nplurals=2; plural=(n != 1)\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../finch/finch.c:64 ../finch/finch.c:301 ../finch/finch.c:330
-#: ../finch/finch.c:418
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+#: ../finch/finch.c:64 ../finch/finch.c:300 ../finch/finch.c:329
+#: ../finch/finch.c:417
 msgid "Finch"
 msgstr "Finch"
 
@@ -51,7 +53,7 @@
 "  -n, --nologin       ���溜� 留���亮留�侶 竜溜�凌隆凌\n"
 "  -v, --version       竜亮�略僚旅�侶 ��劉�凌��留� 劉虜隆凌�侶� 虜留旅 劉両凌隆凌�\n"
 
-#: ../finch/finch.c:328 ../pidgin/gtkmain.c:711
+#: ../finch/finch.c:327 ../pidgin/gtkmain.c:743
 #, c-format
 msgid ""
 "%s encountered errors migrating your settings from %s to %s. Please "
@@ -62,18 +64,18 @@
 "�留�留虜留了凌�亮竜 竜了劉粒両�竜 �凌 虜留旅 凌了凌虜了侶����竜 �侶 亮竜�留�凌�略 亮竜 �凌 �劉�旅. �留�留虜留了凌�亮竜 "
 "留僚留�劉�竜�竜 留��� �凌 ��略了亮留 ��凌 http://developer.pidgin.im"
 
-#: ../finch/gntaccount.c:124 ../finch/gntaccount.c:484 ../finch/gntblist.c:300
-#: ../finch/gntblist.c:433 ../finch/gntblist.c:446 ../finch/gntplugin.c:186
-#: ../finch/gntplugin.c:234 ../finch/gntstatus.c:301 ../finch/gntstatus.c:310
+#: ../finch/gntaccount.c:124 ../finch/gntaccount.c:484 ../finch/gntblist.c:574
+#: ../finch/gntblist.c:710 ../finch/gntblist.c:723 ../finch/gntplugin.c:196
+#: ../finch/gntplugin.c:244 ../finch/gntstatus.c:301 ../finch/gntstatus.c:310
 #: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
 #: ../finch/plugins/gntclipboard.c:128
-#: ../libpurple/protocols/jabber/buddy.c:2029
+#: ../libpurple/protocols/jabber/buddy.c:2036
 #: ../libpurple/protocols/jabber/chat.c:677
 #: ../libpurple/protocols/jabber/chat.c:688
-#: ../libpurple/protocols/jabber/jabber.c:1515
+#: ../libpurple/protocols/jabber/jabber.c:1584
 #: ../libpurple/protocols/qq/group_join.c:328
 #: ../libpurple/protocols/qq/im.c:576 ../libpurple/protocols/silc/ops.c:57
-#: ../libpurple/protocols/silc/ops.c:1456
+#: ../libpurple/protocols/silc/ops.c:1460
 #: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error"
 msgstr "裡�略了亮留"
@@ -96,14 +98,14 @@
 
 #: ../finch/gntaccount.c:485
 msgid "There's no protocol plugins installed."
-msgstr ""
+msgstr "�竜僚 ��略��凌�僚 竜粒虜留�竜��侶亮劉僚留 ����慮竜�留 ����凌虜�了了凌�."
 
 #: ../finch/gntaccount.c:486
 msgid "(You probably forgot to 'make install'.)"
-msgstr ""
-
-#: ../finch/gntaccount.c:496 ../finch/gntconn.c:136
-#: ../pidgin/gtkaccount.c:1473 ../pidgin/gtkblist.c:4040
+msgstr "(�旅慮留僚�� 僚留 両竜�略�留�竜 僚留 虜略僚竜�竜 'make install'.)"
+
+#: ../finch/gntaccount.c:496 ../finch/gntconn.c:138
+#: ../pidgin/gtkaccount.c:1447 ../pidgin/gtkblist.c:4542
 msgid "Modify Account"
 msgstr "里�凌�凌�凌溜侶�侶 了凌粒留�旅留�亮凌�"
 
@@ -130,99 +132,106 @@
 
 #. Cancel button
 #. Cancel
-#: ../finch/gntaccount.c:575 ../finch/gntaccount.c:638
-#: ../finch/gntaccount.c:889 ../finch/gntblist.c:344 ../finch/gntblist.c:421
-#: ../finch/gntblist.c:456 ../finch/gntblist.c:803 ../finch/gntblist.c:1005
-#: ../finch/gntblist.c:1101 ../finch/gntblist.c:2222 ../finch/gntcertmgr.c:91
-#: ../finch/gntplugin.c:379 ../finch/gntpounce.c:459 ../finch/gntpounce.c:667
-#: ../finch/gntprefs.c:265 ../finch/gntsound.c:1058 ../finch/gntstatus.c:145
-#: ../finch/gntstatus.c:485 ../finch/gntstatus.c:610
-#: ../libpurple/account.c:1013 ../libpurple/account.c:1263
-#: ../libpurple/account.c:1298 ../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:2413
-#: ../libpurple/protocols/jabber/buddy.c:2449
+#: ../finch/gntaccount.c:575 ../finch/gntaccount.c:639
+#: ../finch/gntaccount.c:890 ../finch/gntblist.c:620 ../finch/gntblist.c:698
+#: ../finch/gntblist.c:733 ../finch/gntblist.c:1077 ../finch/gntblist.c:1303
+#: ../finch/gntblist.c:1437 ../finch/gntblist.c:2602 ../finch/gntblist.c:2651
+#: ../finch/gntblist.c:2715 ../finch/gntcertmgr.c:90 ../finch/gntplugin.c:532
+#: ../finch/gntpounce.c:471 ../finch/gntpounce.c:679 ../finch/gntprefs.c:265
+#: ../finch/gntsound.c:1059 ../finch/gntstatus.c:145 ../finch/gntstatus.c:485
+#: ../finch/gntstatus.c:610 ../finch/plugins/gnthistory.c:178
+#: ../libpurple/account.c:1116 ../libpurple/account.c:1419
+#: ../libpurple/account.c:1454 ../libpurple/conversation.c:1222
+#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:508
+#: ../libpurple/protocols/gg/gg.c:667 ../libpurple/protocols/gg/gg.c:804
+#: ../libpurple/protocols/gg/gg.c:886
+#: ../libpurple/protocols/jabber/buddy.c:730
+#: ../libpurple/protocols/jabber/buddy.c:2430
+#: ../libpurple/protocols/jabber/buddy.c:2466
 #: ../libpurple/protocols/jabber/chat.c:786
-#: ../libpurple/protocols/jabber/jabber.c:1008
-#: ../libpurple/protocols/jabber/jabber.c:1017
-#: ../libpurple/protocols/jabber/jabber.c:1737
-#: ../libpurple/protocols/jabber/si.c:874
-#: ../libpurple/protocols/jabber/usermood.c:184
+#: ../libpurple/protocols/jabber/jabber.c:1053
+#: ../libpurple/protocols/jabber/jabber.c:1062
+#: ../libpurple/protocols/jabber/jabber.c:1777
+#: ../libpurple/protocols/jabber/si.c:1109
+#: ../libpurple/protocols/jabber/usermood.c:202
 #: ../libpurple/protocols/jabber/usernick.c:78
 #: ../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:6094
-#: ../libpurple/protocols/oscar/peer.c:1046
-#: ../libpurple/protocols/qq/buddy_info.c:484
+#: ../libpurple/protocols/msn/msn.c:359 ../libpurple/protocols/msnp9/msn.c:284
+#: ../libpurple/protocols/msnp9/msn.c:301
+#: ../libpurple/protocols/msnp9/msn.c:318
+#: ../libpurple/protocols/msnp9/msn.c:335
+#: ../libpurple/protocols/msnp9/msn.c:356
+#: ../libpurple/protocols/myspace/user.c:582
+#: ../libpurple/protocols/myspace/user.c:676
+#: ../libpurple/protocols/oscar/oscar.c:6197
+#: ../libpurple/protocols/oscar/peer.c:1048
+#: ../libpurple/protocols/qq/buddy_info.c:525
 #: ../libpurple/protocols/qq/buddy_opt.c:214
 #: ../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: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
-#: ../libpurple/protocols/sametime/sametime.c:5397
-#: ../libpurple/protocols/sametime/sametime.c:5487
-#: ../libpurple/protocols/sametime/sametime.c:5612
+#: ../libpurple/protocols/qq/group_opt.c:120
+#: ../libpurple/protocols/qq/group_opt.c:375
+#: ../libpurple/protocols/qq/sys_msg.c:115
+#: ../libpurple/protocols/qq/sys_msg.c:175
+#: ../libpurple/protocols/qq/sys_msg.c:269
+#: ../libpurple/protocols/sametime/sametime.c:3438
+#: ../libpurple/protocols/sametime/sametime.c:3524
+#: ../libpurple/protocols/sametime/sametime.c:3698
+#: ../libpurple/protocols/sametime/sametime.c:5451
+#: ../libpurple/protocols/sametime/sametime.c:5541
+#: ../libpurple/protocols/sametime/sametime.c:5666
 #: ../libpurple/protocols/silc/buddy.c:455
-#: ../libpurple/protocols/silc/buddy.c:1076
-#: ../libpurple/protocols/silc/buddy.c:1191
-#: ../libpurple/protocols/silc/chat.c:616
-#: ../libpurple/protocols/silc/chat.c:746
-#: ../libpurple/protocols/silc/ops.c:1816
-#: ../libpurple/protocols/silc/silc.c:823
-#: ../libpurple/protocols/silc/silc.c:1031
+#: ../libpurple/protocols/silc/buddy.c:1079
+#: ../libpurple/protocols/silc/buddy.c:1194
+#: ../libpurple/protocols/silc/chat.c:620
+#: ../libpurple/protocols/silc/chat.c:750
+#: ../libpurple/protocols/silc/ops.c:1820
+#: ../libpurple/protocols/silc/silc.c:966
+#: ../libpurple/protocols/silc/silc.c:1174
 #: ../libpurple/protocols/silc10/buddy.c:468
-#: ../libpurple/protocols/silc10/buddy.c:1084
-#: ../libpurple/protocols/silc10/buddy.c:1189
+#: ../libpurple/protocols/silc10/buddy.c:1087
+#: ../libpurple/protocols/silc10/buddy.c:1192
 #: ../libpurple/protocols/silc10/chat.c:600
 #: ../libpurple/protocols/silc10/chat.c:730
-#: ../libpurple/protocols/silc10/ops.c:1904
-#: ../libpurple/protocols/silc10/silc.c:736
-#: ../libpurple/protocols/silc10/silc.c:942
-#: ../libpurple/protocols/yahoo/yahoo.c:1032
-#: ../libpurple/protocols/yahoo/yahoo.c:3498
-#: ../libpurple/protocols/yahoo/yahoo.c:3509 ../pidgin/gtkaccount.c:1908
-#: ../pidgin/gtkaccount.c:2495 ../pidgin/gtkblist.c:5967
-#: ../pidgin/gtkcertmgr.c:197 ../pidgin/gtkdialogs.c:773
-#: ../pidgin/gtkdialogs.c:912 ../pidgin/gtkdialogs.c:1004
-#: ../pidgin/gtkdialogs.c:1024 ../pidgin/gtkdialogs.c:1048
-#: ../pidgin/gtkdialogs.c:1070 ../pidgin/gtkdialogs.c:1118
-#: ../pidgin/gtkdialogs.c:1159 ../pidgin/gtkdialogs.c:1215
-#: ../pidgin/gtkdialogs.c:1254 ../pidgin/gtkdialogs.c:1281
-#: ../pidgin/gtkimhtmltoolbar.c:435 ../pidgin/gtklog.c:328
-#: ../pidgin/gtkplugin.c:289 ../pidgin/gtkpounce.c:1101
-#: ../pidgin/gtkprivacy.c:563 ../pidgin/gtkprivacy.c:579
-#: ../pidgin/gtkprivacy.c:604 ../pidgin/gtkprivacy.c:618
-#: ../pidgin/gtkrequest.c:271 ../pidgin/gtksavedstatuses.c:345
-#: ../pidgin/gtkstatusbox.c:1574
+#: ../libpurple/protocols/silc10/ops.c:1910
+#: ../libpurple/protocols/silc10/silc.c:742
+#: ../libpurple/protocols/silc10/silc.c:948
+#: ../libpurple/protocols/yahoo/yahoo.c:993
+#: ../libpurple/protocols/yahoo/yahoo.c:3540
+#: ../libpurple/protocols/yahoo/yahoo.c:3551 ../pidgin/gtkaccount.c:1841
+#: ../pidgin/gtkaccount.c:2402 ../pidgin/gtkblist.c:6768
+#: ../pidgin/gtkcertmgr.c:197 ../pidgin/gtkdialogs.c:765
+#: ../pidgin/gtkdialogs.c:904 ../pidgin/gtkdialogs.c:996
+#: ../pidgin/gtkdialogs.c:1016 ../pidgin/gtkdialogs.c:1040
+#: ../pidgin/gtkdialogs.c:1062 ../pidgin/gtkdialogs.c:1110
+#: ../pidgin/gtkdialogs.c:1151 ../pidgin/gtkdialogs.c:1207
+#: ../pidgin/gtkdialogs.c:1246 ../pidgin/gtkdialogs.c:1273
+#: ../pidgin/gtkimhtmltoolbar.c:438 ../pidgin/gtklog.c:327
+#: ../pidgin/gtkplugin.c:290 ../pidgin/gtkpounce.c:1113
+#: ../pidgin/gtkprivacy.c:509 ../pidgin/gtkprivacy.c:525
+#: ../pidgin/gtkprivacy.c:550 ../pidgin/gtkprivacy.c:564
+#: ../pidgin/gtkrequest.c:273 ../pidgin/gtksavedstatuses.c:345
+#: ../pidgin/gtkstatusbox.c:1610
 msgid "Cancel"
 msgstr "�虜��凌"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:579 ../finch/gntcertmgr.c:311
-#: ../finch/gntplugin.c:379 ../finch/gntpounce.c:465 ../finch/gntprefs.c:265
-#: ../finch/gntsound.c:1055 ../finch/gntstatus.c:488 ../finch/gntstatus.c:598
-#: ../libpurple/account.c:1297 ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:727 ../pidgin/gtkdebug.c:749
-#: ../pidgin/gtkrequest.c:277
+#: ../finch/gntaccount.c:579 ../finch/gntcertmgr.c:310 ../finch/gntdebug.c:297
+#: ../finch/gntplugin.c:532 ../finch/gntpounce.c:477 ../finch/gntprefs.c:265
+#: ../finch/gntsound.c:1056 ../finch/gntstatus.c:488 ../finch/gntstatus.c:598
+#: ../libpurple/account.c:1453 ../libpurple/plugins/buddynote.c:50
+#: ../libpurple/protocols/jabber/buddy.c:729 ../pidgin/gtkdebug.c:746
+#: ../pidgin/gtkrequest.c:279
 msgid "Save"
 msgstr "��凌慮流虜竜��侶"
 
-#: ../finch/gntaccount.c:632 ../pidgin/gtkaccount.c:1900
-#: ../pidgin/gtksavedstatuses.c:333 ../pidgin/gtkstatusbox.c:1568
+#: ../finch/gntaccount.c:632 ../pidgin/gtkaccount.c:1832
+#: ../pidgin/gtksavedstatuses.c:333 ../pidgin/gtkstatusbox.c:1604
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "�溜��竜 �溜粒凌��凌旅 ��旅 慮劉了竜�竜 �侶 隆旅留粒�留�流 �凌� %s;"
@@ -232,345 +241,76 @@
 msgstr "�旅留粒�留�流 了凌粒留�旅留�亮凌�"
 
 #. Delete button
-#: ../finch/gntaccount.c:637 ../finch/gntaccount.c:707
-#: ../finch/gntcertmgr.c:319 ../finch/gntpounce.c:666 ../finch/gntpounce.c:729
+#: ../finch/gntaccount.c:638 ../finch/gntaccount.c:708
+#: ../finch/gntcertmgr.c:318 ../finch/gntpounce.c:678 ../finch/gntpounce.c:741
 #: ../finch/gntstatus.c:144 ../finch/gntstatus.c:210
-#: ../pidgin/gtkaccount.c:1907 ../pidgin/gtklog.c:327
-#: ../pidgin/gtkpounce.c:1100 ../pidgin/gtkrequest.c:274
-#: ../pidgin/gtksavedstatuses.c:344 ../pidgin/gtkstatusbox.c:1573
+#: ../pidgin/gtkaccount.c:1840 ../pidgin/gtklog.c:326
+#: ../pidgin/gtkpounce.c:1112 ../pidgin/gtkrequest.c:276
+#: ../pidgin/gtksavedstatuses.c:344 ../pidgin/gtkstatusbox.c:1609
 msgid "Delete"
 msgstr "�旅留粒�留�流"
 
-#: ../finch/gntaccount.c:669 ../finch/gntblist.c:2119 ../finch/gntui.c:82
-#: ../pidgin/gtkaccount.c:2325 ../pidgin/gtkdocklet.c:522
+#: ../finch/gntaccount.c:670 ../finch/gntblist.c:2469 ../finch/gntui.c:94
+#: ../pidgin/gtkaccount.c:2261 ../pidgin/gtkdocklet.c:716
 msgid "Accounts"
 msgstr "�凌粒留�旅留�亮凌溜"
 
-#: ../finch/gntaccount.c:675
+#: ../finch/gntaccount.c:676
 msgid "You can enable/disable accounts from the following list."
 msgstr "��凌�竜溜�竜 僚留 (留�)竜僚竜�粒凌�凌旅流�竜�竜 了凌粒留�旅留�亮凌�� 留�� �侶僚 留虜�了凌�慮侶 了溜��留."
 
 #. Add button
-#: ../finch/gntaccount.c:698 ../finch/gntaccount.c:888 ../finch/gntblist.c:343
-#: ../finch/gntblist.c:421 ../finch/gntblist.c:456 ../finch/gntcertmgr.c:306
-#: ../finch/gntnotify.c:380 ../finch/gntpounce.c:713 ../finch/gntstatus.c:199
-#: ../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:2494
-#: ../pidgin/gtkblist.c:5966 ../pidgin/gtkconv.c:1659
-#: ../pidgin/gtkrequest.c:275
+#: ../finch/gntaccount.c:699 ../finch/gntaccount.c:889 ../finch/gntblist.c:619
+#: ../finch/gntblist.c:698 ../finch/gntblist.c:733 ../finch/gntblist.c:2819
+#: ../finch/gntcertmgr.c:305 ../finch/gntnotify.c:385 ../finch/gntpounce.c:725
+#: ../finch/gntroomlist.c:274 ../finch/gntstatus.c:199
+#: ../libpurple/protocols/gg/gg.c:885 ../libpurple/protocols/qq/sys_msg.c:116
+#: ../libpurple/protocols/qq/sys_msg.c:176
+#: ../libpurple/protocols/qq/sys_msg.c:270
+#: ../libpurple/protocols/sametime/sametime.c:5540
+#: ../libpurple/protocols/silc/chat.c:619
+#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2401
+#: ../pidgin/gtkblist.c:6767 ../pidgin/gtkconv.c:1702
+#: ../pidgin/gtkrequest.c:277
 msgid "Add"
 msgstr "��凌�慮流虜侶"
 
 #. Modify button
-#: ../finch/gntaccount.c:703 ../finch/gntpounce.c:721
+#: ../finch/gntaccount.c:704 ../finch/gntpounce.c:733
 msgid "Modify"
 msgstr "里�凌�凌�凌溜侶�侶"
 
-#: ../finch/gntaccount.c:811 ../pidgin/gtkaccount.c:2441
+#: ../finch/gntaccount.c:812 ../pidgin/gtkaccount.c:2348
 #, 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:884 ../pidgin/gtkaccount.c:2493
+#: ../finch/gntaccount.c:885 ../pidgin/gtkaccount.c:2400
 msgid "Add buddy to your list?"
 msgstr "��凌�慮流虜侶 �溜了凌� ��侶 了溜��留 �留�;"
 
-#: ../finch/gntaccount.c:944 ../pidgin/gtkaccount.c:2551
+#: ../finch/gntaccount.c:945 ../pidgin/gtkaccount.c:2458
 #, 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:969 ../finch/gntaccount.c:972
-#: ../finch/gntaccount.c:999 ../pidgin/gtkaccount.c:2574
-#: ../pidgin/gtkaccount.c:2580
+#: ../finch/gntaccount.c:970 ../finch/gntaccount.c:973
+#: ../finch/gntaccount.c:1000 ../pidgin/gtkaccount.c:2481
+#: ../pidgin/gtkaccount.c:2488
 msgid "Authorize buddy?"
 msgstr "�粒虜�旅�侶 �溜了凌�;"
 
-#: ../finch/gntaccount.c:976 ../finch/gntaccount.c:1003
-#: ../pidgin/gtkaccount.c:2575 ../pidgin/gtkaccount.c:2581
+#: ../finch/gntaccount.c:977 ../finch/gntaccount.c:1004
+#: ../pidgin/gtkaccount.c:2482 ../pidgin/gtkaccount.c:2489
 msgid "Authorize"
 msgstr "�粒虜�旅�侶"
 
-#: ../finch/gntaccount.c:977 ../finch/gntaccount.c:1004
-#: ../pidgin/gtkaccount.c:2576 ../pidgin/gtkaccount.c:2582
+#: ../finch/gntaccount.c:978 ../finch/gntaccount.c:1005
+#: ../pidgin/gtkaccount.c:2483 ../pidgin/gtkaccount.c:2490
 msgid "Deny"
 msgstr "��僚侶�侶"
 
-#: ../finch/gntblist.c:289
-msgid "You must provide a screename for the buddy."
-msgstr "��劉�竜旅 僚留 竜旅�略粒竜�竜 劉僚留 竜亮�留僚旅龍�亮竜僚凌 �僚凌亮留 粒旅留 �凌 �溜了凌."
-
-#: ../finch/gntblist.c:291
-msgid "You must provide a group."
-msgstr "��劉�竜旅 僚留 隆��竜�竜 亮溜留 凌亮略隆留."
-
-#: ../finch/gntblist.c:293
-msgid "You must select an account."
-msgstr "��劉�竜旅 僚留 竜�旅了劉両竜�竜 劉僚留 了凌粒留�旅留�亮�."
-
-#: ../finch/gntblist.c:295
-msgid "The selected account is not online."
-msgstr "� 竜�旅了竜粒亮劉僚凌� 了凌粒留�旅留�亮�� 隆竜僚 竜溜僚留旅 ��僚隆竜隆竜亮劉僚凌�."
-
-#: ../finch/gntblist.c:300
-msgid "Error adding buddy"
-msgstr "裡�略了亮留 虜留�略 �侶僚 ��凌�慮流虜侶 �溜了凌�"
-
-#: ../finch/gntblist.c:325 ../libpurple/protocols/oscar/oscar.c:2888
-#: ../pidgin/gtkaccount.c:1981 ../pidgin/gtksavedstatuses.c:980
-msgid "Screen Name"
-msgstr "�亮�留僚旅龍�亮竜僚凌 �僚凌亮留"
-
-#: ../finch/gntblist.c:328 ../finch/gntblist.c:410 ../finch/gntblist.c:1250
-#: ../libpurple/protocols/msn/msn.c:1395
-#: ../libpurple/protocols/silc/chat.c:606
-#: ../libpurple/protocols/silc10/chat.c:590
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:704
-#: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:1023
-#: ../pidgin/gtkdialogs.c:1047 ../pidgin/gtkdialogs.c:1069
-#: ../pidgin/gtkrequest.c:278
-msgid "Alias"
-msgstr "�僚����� ��"
-
-#: ../finch/gntblist.c:331 ../finch/gntblist.c:413
-msgid "Group"
-msgstr "�亮略隆留"
-
-#: ../finch/gntblist.c:335 ../finch/gntblist.c:401 ../finch/gntblist.c:1305
-#: ../finch/gntnotify.c:174 ../finch/gntstatus.c:576
-#: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:3008 ../pidgin/gtknotify.c:506
-#: ../pidgin/gtkpounce.c:1268 ../pidgin/plugins/gevolution/gevolution.c:445
-msgid "Account"
-msgstr "�凌粒留�旅留�亮��"
-
-#: ../finch/gntblist.c:341 ../finch/gntblist.c:852
-#: ../libpurple/protocols/silc/buddy.c:725
-#: ../libpurple/protocols/silc/buddy.c:1027
-#: ../libpurple/protocols/silc/buddy.c:1072
-#: ../libpurple/protocols/silc/buddy.c:1182
-#: ../libpurple/protocols/silc10/buddy.c:737
-#: ../libpurple/protocols/silc10/buddy.c:1033
-#: ../libpurple/protocols/silc10/buddy.c:1080
-#: ../libpurple/protocols/silc10/buddy.c:1180
-#: ../libpurple/protocols/yahoo/yahoo.c:3343 ../pidgin/gtkblist.c:5483
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
-msgid "Add Buddy"
-msgstr "��凌�慮流虜侶 �溜了凌�"
-
-#: ../finch/gntblist.c:341
-msgid "Please enter buddy information."
-msgstr "�留�留虜留了凌�亮竜 竜旅�略粒竜�竜 �旅� �了侶�凌�凌�溜竜� �凌� �溜了凌�."
-
-#: ../finch/gntblist.c:370 ../libpurple/blist.c:1209
-msgid "Chats"
-msgstr "裡�龍侶�流�竜旅�"
-
-#. Extract their Name and put it in
-#: ../finch/gntblist.c:407 ../libpurple/protocols/jabber/jabber.c:924
-#: ../libpurple/protocols/jabber/jabber.c:927
-#: ../libpurple/protocols/msn/msn.c:1584 ../libpurple/protocols/msn/msn.c:1649
-#: ../libpurple/protocols/msn/msn.c:1676
-#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:582
-#: ../pidgin/gtkroomlist.c:618
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:123
-msgid "Name"
-msgstr "�僚凌亮留"
-
-#: ../finch/gntblist.c:416 ../finch/gntblist.c:819
-msgid "Auto-join"
-msgstr "����亮留�侶 ��亮亮竜�凌�流"
-
-#: ../finch/gntblist.c:419 ../finch/gntblist.c:854 ../pidgin/gtkblist.c:5859
-msgid "Add Chat"
-msgstr "��凌�慮流虜侶 ��龍流�侶�侶�"
-
-#: ../finch/gntblist.c:420
-msgid "You can edit more information from the context menu later."
-msgstr ""
-
-#: ../finch/gntblist.c:433 ../finch/gntblist.c:446
-msgid "Error adding group"
-msgstr "裡�略了亮留 虜留�略 �侶僚 ��凌�慮流虜侶 凌亮略隆留�"
-
-#: ../finch/gntblist.c:434
-msgid "You must give a name for the group to add."
-msgstr "��劉�竜旅 僚留 隆��竜�竜 劉僚留 �僚凌亮留 粒旅留 �侶僚 凌亮略隆留 �凌� 慮留 ��凌��竜慮竜溜."
-
-#: ../finch/gntblist.c:447
-msgid "A group with the name already exists."
-msgstr "離�略��竜旅 流隆侶 亮溜留 凌亮略隆留 亮竜 留��� �凌 �僚凌亮留."
-
-#: ../finch/gntblist.c:454 ../finch/gntblist.c:856
-#: ../libpurple/protocols/sametime/sametime.c:5396
-#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5963
-msgid "Add Group"
-msgstr "��凌�慮流虜侶 凌亮略隆留�"
-
-#: ../finch/gntblist.c:454
-msgid "Enter the name of the group"
-msgstr "�旅�略粒竜�竜 �凌 �僚凌亮留 �侶� 凌亮略隆留�"
-
-#: ../finch/gntblist.c:802
-msgid "Edit Chat"
-msgstr "��竜両竜�粒留�溜留 ��龍流�侶�侶�"
-
-#: ../finch/gntblist.c:802
-msgid "Please Update the necessary fields."
-msgstr "�留�留虜留了凌�亮竜 留僚留僚竜���竜 �留 留�留�留溜�侶�留 �竜隆溜留."
-
-#: ../finch/gntblist.c:803 ../finch/gntstatus.c:205
-msgid "Edit"
-msgstr "��竜両竜�粒留�溜留"
-
-#: ../finch/gntblist.c:828
-msgid "Edit Settings"
-msgstr "��竜両竜�粒留�溜留 ��慮亮溜�竜�僚"
-
-#: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:931
-msgid "Information"
-msgstr "�了侶�凌�凌�溜竜�"
-
-#: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:931
-msgid "Retrieving..."
-msgstr "�流�侶..."
-
-#: ../finch/gntblist.c:904 ../finch/gntconv.c:507
-#: ../libpurple/protocols/silc/chat.c:899
-#: ../libpurple/protocols/silc10/chat.c:883
-msgid "Get Info"
-msgstr "�了侶�凌�凌�溜竜�"
-
-#: ../finch/gntblist.c:908
-msgid "Add Buddy Pounce"
-msgstr "��凌�慮流虜侶 竜���亮侶�侶� �溜了凌�"
-
-#. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:915 ../finch/gntconv.c:519
-#: ../libpurple/protocols/jabber/si.c:874
-#: ../libpurple/protocols/oscar/oscar.c:654 ../libpurple/protocols/qq/qq.c:587
-#: ../pidgin/gtkconv.c:1607
-msgid "Send File"
-msgstr "��凌��凌了流 留��竜溜凌�"
-
-#: ../finch/gntblist.c:919
-msgid "View Log"
-msgstr "�亮�略僚旅�侶 虜留�留粒�留�流�"
-
-#: ../finch/gntblist.c:1000
-#, c-format
-msgid "Please enter the new name for %s"
-msgstr "�留�留虜留了凌�亮竜 竜旅�略粒竜�竜 僚劉凌 �僚凌亮留 粒旅留 %s"
-
-#: ../finch/gntblist.c:1002 ../finch/gntblist.c:1250
-msgid "Rename"
-msgstr "�竜�凌僚凌亮留�溜留"
-
-#: ../finch/gntblist.c:1002
-msgid "Set Alias"
-msgstr "�僚����� ��"
-
-#: ../finch/gntblist.c:1003
-msgid "Enter empty string to reset the name."
-msgstr "�旅�略粒竜�竜 虜竜僚� 粒旅留 僚留 粒溜僚竜旅 竜�留僚留�凌�略 �凌� 凌僚�亮留�凌�."
-
-#: ../finch/gntblist.c:1079
-msgid "Removing this contact will also remove all the buddies in the contact"
-msgstr ""
-"� 留�留溜�竜�侶 留��流� �侶� 竜�留�流� 慮留 留�留旅�劉�竜旅 竜�溜�侶� 虜留旅 �了凌�� �凌�� �溜了凌�� 亮劉�留 "
-"��侶僚 竜�留�流"
-
-#: ../finch/gntblist.c:1087
-msgid "Removing this group will also remove all the buddies in the group"
-msgstr ""
-"� 留�留溜�竜�侶 留��流� �侶� 凌亮略隆留� 慮留 留�留旅�劉�竜旅 竜�溜�侶� 虜留旅 �了凌�� �凌�� �溜了凌�� 亮劉�留 "
-"��侶僚 凌亮略隆留"
-
-#: ../finch/gntblist.c:1092
-#, 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:1095
-msgid "Confirm Remove"
-msgstr "��旅硫竜硫留溜��侶 留�留溜�竜�侶�"
-
-#: ../finch/gntblist.c:1100 ../finch/gntblist.c:1252 ../finch/gntft.c:227
-#: ../pidgin/gtkconv.c:1656 ../pidgin/gtkrequest.c:276
-#: ../pidgin/gtkstatusbox.c:264
-msgid "Remove"
-msgstr "��留溜�竜�侶"
-
-#. Buddy List
-#: ../finch/gntblist.c:1226 ../finch/gntblist.c:2307 ../finch/gntprefs.c:258
-#: ../finch/gntui.c:83 ../pidgin/gtkblist.c:2688 ../pidgin/gtkblist.c:4284
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:326
-msgid "Buddy List"
-msgstr "�溜��留 �溜了�僚"
-
-#: ../finch/gntblist.c:1257
-msgid "Place tagged"
-msgstr ""
-
-#: ../finch/gntblist.c:1262
-msgid "Toggle Tag"
-msgstr ""
-
-#. General
-#: ../finch/gntblist.c:1298 ../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:2214
-#: ../libpurple/protocols/jabber/buddy.c:2396
-#: ../libpurple/protocols/jabber/jabber.c:937
-#: ../libpurple/protocols/jabber/jabber.c:1544
-#: ../libpurple/protocols/jabber/jabber.c:1567
-#: ../libpurple/protocols/jabber/jabber.c:1590
-#: ../libpurple/protocols/jabber/jabber.c:1613
-#: ../libpurple/protocols/jabber/jabber.c:1636
-#: ../libpurple/protocols/msn/msn.c:1403 ../libpurple/protocols/msn/msn.c:1587
-#: ../libpurple/protocols/qq/buddy_info.c:43
-#: ../libpurple/protocols/silc/buddy.c:1535
-#: ../libpurple/protocols/silc/ops.c:1002
-#: ../libpurple/protocols/silc/ops.c:1186
-#: ../libpurple/protocols/silc/ops.c:1322
-#: ../libpurple/protocols/silc10/buddy.c:1535
-#: ../libpurple/protocols/silc10/ops.c:1036
-#: ../libpurple/protocols/silc10/ops.c:1179
-#: ../libpurple/protocols/silc10/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3032
-msgid "Nickname"
-msgstr "率竜�隆�僚�亮凌"
-
-#. Idle stuff
-#: ../finch/gntblist.c:1320 ../finch/gntprefs.c:261
-#: ../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:2912
-#: ../libpurple/protocols/yahoo/yahoo.c:3097
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3060
-#: ../pidgin/gtkblist.c:3460 ../pidgin/gtkprefs.c:1925
-msgid "Idle"
-msgstr "�僚竜僚竜�粒��"
-
-#: ../finch/gntblist.c:1334
-#, fuzzy
-msgid "On Mobile"
-msgstr "�竜 �凌�侶�流 ���虜竜�流"
-
-#: ../finch/gntblist.c:1415
+#: ../finch/gntblist.c:265
 #, c-format
 msgid ""
 "Online: %d\n"
@@ -579,12 +319,12 @@
 "裡�僚隆竜隆竜亮劉僚凌�: %d\n"
 "裡�僚凌了旅虜略: %d"
 
-#: ../finch/gntblist.c:1424
+#: ../finch/gntblist.c:274
 #, c-format
 msgid "Account: %s (%s)"
 msgstr "�凌粒留�旅留�亮��: %s (%s)"
 
-#: ../finch/gntblist.c:1436
+#: ../finch/gntblist.c:286
 #, c-format
 msgid ""
 "\n"
@@ -593,168 +333,527 @@
 "\n"
 "里竜了竜��留溜留 慮劉留�侶: ��旅僚 %s"
 
-#: ../finch/gntblist.c:1702 ../pidgin/gtkdocklet.c:470
-#: ../pidgin/gtkstatusbox.c:1072
+#: ../finch/gntblist.c:306 ../pidgin/gtkprefs.c:327
+#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:1
+msgid "Default"
+msgstr "��凌竜�旅了凌粒流"
+
+#: ../finch/gntblist.c:563
+msgid "You must provide a screename for the buddy."
+msgstr "��劉�竜旅 僚留 竜旅�略粒竜�竜 劉僚留 竜亮�留僚旅龍�亮竜僚凌 �僚凌亮留 粒旅留 �凌 �溜了凌."
+
+#: ../finch/gntblist.c:565
+msgid "You must provide a group."
+msgstr "��劉�竜旅 僚留 隆��竜�竜 亮溜留 凌亮略隆留."
+
+#: ../finch/gntblist.c:567
+msgid "You must select an account."
+msgstr "��劉�竜旅 僚留 竜�旅了劉両竜�竜 劉僚留 了凌粒留�旅留�亮�."
+
+#: ../finch/gntblist.c:569
+msgid "The selected account is not online."
+msgstr "� 竜�旅了竜粒亮劉僚凌� 了凌粒留�旅留�亮�� 隆竜僚 竜溜僚留旅 ��僚隆竜隆竜亮劉僚凌�."
+
+#: ../finch/gntblist.c:574
+msgid "Error adding buddy"
+msgstr "裡�略了亮留 虜留�略 �侶僚 ��凌�慮流虜侶 �溜了凌�"
+
+#: ../finch/gntblist.c:601 ../libpurple/protocols/oscar/oscar.c:2949
+#: ../pidgin/gtkaccount.c:1914 ../pidgin/gtksavedstatuses.c:971
+msgid "Screen Name"
+msgstr "�亮�留僚旅龍�亮竜僚凌 �僚凌亮留"
+
+#: ../finch/gntblist.c:604
+msgid "Alias (optional)"
+msgstr "�僚����� �� (��凌留旅�竜�旅虜�)"
+
+#: ../finch/gntblist.c:607
+msgid "Add in group"
+msgstr "��凌�慮流虜侶 �竜 凌亮略隆留"
+
+#: ../finch/gntblist.c:611 ../finch/gntblist.c:678 ../finch/gntblist.c:1648
+#: ../finch/gntblist.c:2583 ../finch/gntblist.c:2637 ../finch/gntblist.c:2702
+#: ../finch/gntnotify.c:174 ../finch/gntstatus.c:576
+#: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
+#: ../pidgin/gtkblist.c:3201 ../pidgin/gtknotify.c:517
+#: ../pidgin/gtkpounce.c:1281 ../pidgin/plugins/gevolution/gevolution.c:445
+msgid "Account"
+msgstr "�凌粒留�旅留�亮��"
+
+#: ../finch/gntblist.c:617 ../finch/gntblist.c:1126
+#: ../libpurple/protocols/silc/buddy.c:725
+#: ../libpurple/protocols/silc/buddy.c:1030
+#: ../libpurple/protocols/silc/buddy.c:1075
+#: ../libpurple/protocols/silc/buddy.c:1185
+#: ../libpurple/protocols/silc10/buddy.c:737
+#: ../libpurple/protocols/silc10/buddy.c:1036
+#: ../libpurple/protocols/silc10/buddy.c:1083
+#: ../libpurple/protocols/silc10/buddy.c:1183
+#: ../libpurple/protocols/yahoo/yahoo.c:3380 ../pidgin/gtkblist.c:6298
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
+msgid "Add Buddy"
+msgstr "��凌�慮流虜侶 �溜了凌�"
+
+#: ../finch/gntblist.c:617
+msgid "Please enter buddy information."
+msgstr "�留�留虜留了凌�亮竜 竜旅�略粒竜�竜 �旅� �了侶�凌�凌�溜竜� �凌� �溜了凌�."
+
+#: ../finch/gntblist.c:647 ../libpurple/blist.c:1237
+msgid "Chats"
+msgstr "裡�龍侶�流�竜旅�"
+
+#. Extract their Name and put it in
+#: ../finch/gntblist.c:684 ../finch/gntblist.c:2578 ../finch/gntblist.c:2632
+#: ../finch/gntroomlist.c:298 ../libpurple/protocols/jabber/jabber.c:981
+#: ../libpurple/protocols/jabber/jabber.c:984
+#: ../libpurple/protocols/msn/msn.c:1740 ../libpurple/protocols/msn/msn.c:1805
+#: ../libpurple/protocols/msn/msn.c:1832
+#: ../libpurple/protocols/msnp9/msn.c:1596
+#: ../libpurple/protocols/msnp9/msn.c:1661
+#: ../libpurple/protocols/msnp9/msn.c:1688
+#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:652
+#: ../pidgin/gtkroomlist.c:749
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:123
+msgid "Name"
+msgstr "�僚凌亮留"
+
+#: ../finch/gntblist.c:687 ../finch/gntblist.c:1589
+#: ../libpurple/protocols/msn/msn.c:1559
+#: ../libpurple/protocols/msnp9/msn.c:1413
+#: ../libpurple/protocols/silc/chat.c:610
+#: ../libpurple/protocols/silc10/chat.c:590
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:704
+#: ../libpurple/protocols/zephyr/zephyr.c:792
+#: ../libpurple/protocols/zephyr/zephyr.c:1167 ../pidgin/gtkdialogs.c:1015
+#: ../pidgin/gtkdialogs.c:1039 ../pidgin/gtkdialogs.c:1061
+#: ../pidgin/gtkrequest.c:280
+msgid "Alias"
+msgstr "�僚����� ��"
+
+#: ../finch/gntblist.c:690 ../finch/gntblist.c:2835
+msgid "Group"
+msgstr "�亮略隆留"
+
+#: ../finch/gntblist.c:693 ../finch/gntblist.c:1093
+msgid "Auto-join"
+msgstr "����亮留�侶 ��亮亮竜�凌�流"
+
+#: ../finch/gntblist.c:696 ../finch/gntblist.c:1128 ../pidgin/gtkblist.c:6681
+msgid "Add Chat"
+msgstr "��凌�慮流虜侶 ��龍流�侶�侶�"
+
+#: ../finch/gntblist.c:697
+msgid "You can edit more information from the context menu later."
+msgstr ""
+
+#: ../finch/gntblist.c:710 ../finch/gntblist.c:723
+msgid "Error adding group"
+msgstr "裡�略了亮留 虜留�略 �侶僚 ��凌�慮流虜侶 凌亮略隆留�"
+
+#: ../finch/gntblist.c:711
+msgid "You must give a name for the group to add."
+msgstr "��劉�竜旅 僚留 隆��竜�竜 劉僚留 �僚凌亮留 粒旅留 �侶僚 凌亮略隆留 �凌� 慮留 ��凌��竜慮竜溜."
+
+#: ../finch/gntblist.c:724
+msgid "A group with the name already exists."
+msgstr "離�略��竜旅 流隆侶 亮溜留 凌亮略隆留 亮竜 留��� �凌 �僚凌亮留."
+
+#: ../finch/gntblist.c:731 ../finch/gntblist.c:1130
+#: ../libpurple/protocols/sametime/sametime.c:5450
+#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtkblist.c:6764
+msgid "Add Group"
+msgstr "��凌�慮流虜侶 凌亮略隆留�"
+
+#: ../finch/gntblist.c:731
+msgid "Enter the name of the group"
+msgstr "�旅�略粒竜�竜 �凌 �僚凌亮留 �侶� 凌亮略隆留�"
+
+#: ../finch/gntblist.c:1076
+msgid "Edit Chat"
+msgstr "��竜両竜�粒留�溜留 ��龍流�侶�侶�"
+
+#: ../finch/gntblist.c:1076
+msgid "Please Update the necessary fields."
+msgstr "�留�留虜留了凌�亮竜 留僚留僚竜���竜 �留 留�留�留溜�侶�留 �竜隆溜留."
+
+#: ../finch/gntblist.c:1077 ../finch/gntstatus.c:205
+msgid "Edit"
+msgstr "��竜両竜�粒留�溜留"
+
+#: ../finch/gntblist.c:1102
+msgid "Edit Settings"
+msgstr "��竜両竜�粒留�溜留 ��慮亮溜�竜�僚"
+
+#: ../finch/gntblist.c:1138 ../pidgin/gtkutils.c:980
+msgid "Information"
+msgstr "�了侶�凌�凌�溜竜�"
+
+#: ../finch/gntblist.c:1138 ../pidgin/gtkutils.c:980
+msgid "Retrieving..."
+msgstr "�流�侶..."
+
+#: ../finch/gntblist.c:1192 ../finch/gntconv.c:591
+#: ../libpurple/protocols/silc/chat.c:903
+#: ../libpurple/protocols/silc10/chat.c:883
+msgid "Get Info"
+msgstr "�了侶�凌�凌�溜竜�"
+
+#: ../finch/gntblist.c:1196
+msgid "Add Buddy Pounce"
+msgstr "��凌�慮流虜侶 竜���亮侶�侶� �溜了凌�"
+
+#. if (q_bud && is_online(q_bud->status)) {
+#: ../finch/gntblist.c:1203 ../finch/gntconv.c:603
+#: ../libpurple/protocols/jabber/si.c:1109
+#: ../libpurple/protocols/oscar/oscar.c:653 ../libpurple/protocols/qq/qq.c:588
+#: ../pidgin/gtkconv.c:1650
+msgid "Send File"
+msgstr "��凌��凌了流 留��竜溜凌�"
+
+#: ../finch/gntblist.c:1210 ../libpurple/protocols/gg/gg.c:1629
+#: ../libpurple/protocols/msn/msn.c:660 ../libpurple/protocols/msnp9/msn.c:562
+msgid "Blocked"
+msgstr "��凌虜了竜旅�亮劉僚凌�"
+
+#: ../finch/gntblist.c:1216 ../finch/gntblist.c:1605
+msgid "View Log"
+msgstr "�亮�略僚旅�侶 虜留�留粒�留�流�"
+
+#: ../finch/gntblist.c:1298
+#, c-format
+msgid "Please enter the new name for %s"
+msgstr "�留�留虜留了凌�亮竜 竜旅�略粒竜�竜 僚劉凌 �僚凌亮留 粒旅留 %s"
+
+#: ../finch/gntblist.c:1300 ../finch/gntblist.c:1589
+msgid "Rename"
+msgstr "�竜�凌僚凌亮留�溜留"
+
+#: ../finch/gntblist.c:1300
+msgid "Set Alias"
+msgstr "�僚����� ��"
+
+#: ../finch/gntblist.c:1301
+msgid "Enter empty string to reset the name."
+msgstr "�旅�略粒竜�竜 虜竜僚� 粒旅留 僚留 粒溜僚竜旅 竜�留僚留�凌�略 �凌� 凌僚�亮留�凌�."
+
+#: ../finch/gntblist.c:1415
+msgid "Removing this contact will also remove all the buddies in the contact"
+msgstr ""
+"� 留�留溜�竜�侶 留��流� �侶� 竜�留�流� 慮留 留�留旅�劉�竜旅 竜�溜�侶� 虜留旅 �了凌�� �凌�� �溜了凌�� 亮劉�留 "
+"��侶僚 竜�留�流"
+
+#: ../finch/gntblist.c:1423
+msgid "Removing this group will also remove all the buddies in the group"
+msgstr ""
+"� 留�留溜�竜�侶 留��流� �侶� 凌亮略隆留� 慮留 留�留旅�劉�竜旅 竜�溜�侶� 虜留旅 �了凌�� �凌�� �溜了凌�� 亮劉�留 "
+"��侶僚 凌亮略隆留"
+
+#: ../finch/gntblist.c:1428
+#, 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:1431
+msgid "Confirm Remove"
+msgstr "��旅硫竜硫留溜��侶 留�留溜�竜�侶�"
+
+#: ../finch/gntblist.c:1436 ../finch/gntblist.c:1591 ../finch/gntft.c:243
+#: ../pidgin/gtkconv.c:1699 ../pidgin/gtkrequest.c:278
+#: ../pidgin/gtkstatusbox.c:267
+msgid "Remove"
+msgstr "��留溜�竜�侶"
+
+#. Buddy List
+#: ../finch/gntblist.c:1565 ../finch/gntblist.c:2876 ../finch/gntprefs.c:258
+#: ../finch/gntui.c:95 ../pidgin/gtkblist.c:5037
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:326
+msgid "Buddy List"
+msgstr "�溜��留 �溜了�僚"
+
+#: ../finch/gntblist.c:1596
+msgid "Place tagged"
+msgstr ""
+
+#: ../finch/gntblist.c:1601
+msgid "Toggle Tag"
+msgstr ""
+
+#. General
+#: ../finch/gntblist.c:1641 ../libpurple/protocols/gg/gg.c:638
+#: ../libpurple/protocols/gg/gg.c:1052 ../libpurple/protocols/gg/gg.c:1125
+#: ../libpurple/protocols/gg/gg.c:2228
+#: ../libpurple/protocols/jabber/buddy.c:286
+#: ../libpurple/protocols/jabber/buddy.c:1251
+#: ../libpurple/protocols/jabber/buddy.c:2221
+#: ../libpurple/protocols/jabber/buddy.c:2413
+#: ../libpurple/protocols/jabber/jabber.c:992
+#: ../libpurple/protocols/jabber/jabber.c:1604
+#: ../libpurple/protocols/jabber/jabber.c:1618
+#: ../libpurple/protocols/jabber/jabber.c:1632
+#: ../libpurple/protocols/jabber/jabber.c:1646
+#: ../libpurple/protocols/jabber/jabber.c:1660
+#: ../libpurple/protocols/msn/msn.c:1567 ../libpurple/protocols/msn/msn.c:1743
+#: ../libpurple/protocols/msnp9/msn.c:1421
+#: ../libpurple/protocols/msnp9/msn.c:1599
+#: ../libpurple/protocols/qq/buddy_info.c:43
+#: ../libpurple/protocols/silc/buddy.c:1538
+#: ../libpurple/protocols/silc/ops.c:1002
+#: ../libpurple/protocols/silc/ops.c:1186
+#: ../libpurple/protocols/silc/ops.c:1324
+#: ../libpurple/protocols/silc10/buddy.c:1538
+#: ../libpurple/protocols/silc10/ops.c:1036
+#: ../libpurple/protocols/silc10/ops.c:1179
+#: ../libpurple/protocols/silc10/ops.c:1328
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1072 ../pidgin/gtkblist.c:3225
+msgid "Nickname"
+msgstr "率竜�隆�僚�亮凌"
+
+#. Idle stuff
+#: ../finch/gntblist.c:1663 ../finch/gntprefs.c:261
+#: ../libpurple/protocols/bonjour/bonjour.c:376
+#: ../libpurple/protocols/jabber/buddy.c:789
+#: ../libpurple/protocols/jabber/buddy.c:953
+#: ../libpurple/protocols/msn/msn.c:607 ../libpurple/protocols/msn/msn.c:625
+#: ../libpurple/protocols/msn/msn.c:633 ../libpurple/protocols/msn/state.c:32
+#: ../libpurple/protocols/msnp9/msn.c:541
+#: ../libpurple/protocols/msnp9/state.c:32
+#: ../libpurple/protocols/novell/novell.c:2843
+#: ../libpurple/protocols/oscar/oscar.c:2973
+#: ../libpurple/protocols/yahoo/yahoo.c:3134
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3253
+#: ../pidgin/gtkblist.c:3703 ../pidgin/gtkprefs.c:1946
+msgid "Idle"
+msgstr "�僚竜僚竜�粒��"
+
+#: ../finch/gntblist.c:1677
+msgid "On Mobile"
+msgstr "�竜 �凌�侶�流 ���虜竜�流"
+
+#: ../finch/gntblist.c:1976 ../pidgin/gtkdocklet.c:582
 msgid "New..."
 msgstr "�劉凌..."
 
-#: ../finch/gntblist.c:1709 ../pidgin/gtkdocklet.c:471
-#: ../pidgin/gtkstatusbox.c:1073
+#: ../finch/gntblist.c:1983 ../pidgin/gtkdocklet.c:583
 msgid "Saved..."
 msgstr "��凌慮侶虜竜��侶虜竜..."
 
-#: ../finch/gntblist.c:2087 ../finch/gntplugin.c:255 ../finch/gntui.c:88
-#: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:531
+#: ../finch/gntblist.c:2437 ../finch/gntplugin.c:352 ../finch/gntui.c:100
+#: ../pidgin/gtkdocklet.c:717 ../pidgin/gtkplugin.c:601
 msgid "Plugins"
 msgstr "����慮竜�留"
 
-#: ../finch/gntblist.c:2203 ../pidgin/gtkdialogs.c:754
-#: ../pidgin/gtkdialogs.c:893 ../pidgin/gtkdialogs.c:974
-msgid "_Name"
-msgstr "_�僚凌亮留"
-
-#: ../finch/gntblist.c:2208 ../pidgin/gtkdialogs.c:759
-#: ../pidgin/gtkdialogs.c:898 ../pidgin/gtkdialogs.c:979
-msgid "_Account"
-msgstr "_�凌粒留�旅留�亮��"
-
-#: ../finch/gntblist.c:2216 ../pidgin/gtkdialogs.c:767
-msgid "New Instant Message"
-msgstr "�劉凌 略亮竜�凌 亮流僚�亮留"
-
-#: ../finch/gntblist.c:2218 ../pidgin/gtkdialogs.c:769
-msgid ""
-"Please enter the screen name or alias of the person you would like to IM."
-msgstr ""
-"�留�留虜留了凌�亮竜 竜旅�略粒竜�竜 �凌 竜亮�留僚旅龍�亮竜僚凌 �僚凌亮留 流 �竜�隆�僚�亮凌 �凌� 留��亮凌� ��凌 凌�凌溜凌 "
-"慮劉了竜�竜 僚留 ��竜溜了竜�竜 略亮竜�凌 亮流僚�亮留."
+#: ../finch/gntblist.c:2591 ../finch/gntblist.c:2596
+msgid "Block/Unblock"
+msgstr "��凌虜了竜旅�亮�� / �虜����侶 留�凌虜了竜旅�亮凌�"
+
+#: ../finch/gntblist.c:2592 ../libpurple/protocols/gg/gg.c:1665
+msgid "Block"
+msgstr "��凌虜了竜旅�亮��"
+
+#: ../finch/gntblist.c:2593 ../libpurple/protocols/gg/gg.c:1661
+msgid "Unblock"
+msgstr "�虜����侶 留�凌虜了竜旅�亮凌�"
+
+#: ../finch/gntblist.c:2598
+msgid ""
+"Please enter the screen name or alias of the person you would like to Block/"
+"Unblock."
+msgstr ""
+"�留�留虜留了凌�亮竜 竜旅�略粒竜�竜 �凌 竜亮�留僚旅龍�亮竜僚凌 �僚凌亮留 流 �竜�隆�僚�亮凌 �凌� 留��亮凌� �凌 凌�凌溜凌 "
+"慮劉了竜�竜 僚留 留�凌虜了竜溜�竜�竜 / 留虜����竜�竜 �凌僚 留�凌虜了竜旅�亮� �凌�."
 
 #. Not multiline
 #. Not masked?
 #. No hints?
-#: ../finch/gntblist.c:2221 ../finch/gntcertmgr.c:90 ../finch/gntconn.c:135
-#: ../finch/gntnotify.c:80 ../libpurple/account.c:1012
-#: ../libpurple/account.c:1262 ../libpurple/protocols/gg/gg.c:506
-#: ../libpurple/protocols/gg/gg.c:665 ../libpurple/protocols/gg/gg.c:802
-#: ../libpurple/protocols/jabber/jabber.c:1736
+#: ../finch/gntblist.c:2601 ../finch/gntblist.c:2650 ../finch/gntcertmgr.c:89
+#: ../finch/gntconn.c:137 ../finch/gntnotify.c:80
+#: ../finch/plugins/gnthistory.c:177 ../libpurple/account.c:1115
+#: ../libpurple/account.c:1418 ../libpurple/protocols/gg/gg.c:507
+#: ../libpurple/protocols/gg/gg.c:666 ../libpurple/protocols/gg/gg.c:803
+#: ../libpurple/protocols/jabber/jabber.c:1776
 #: ../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:6093
+#: ../libpurple/protocols/msnp9/msn.c:283
+#: ../libpurple/protocols/msnp9/msn.c:300
+#: ../libpurple/protocols/msnp9/msn.c:317
+#: ../libpurple/protocols/msnp9/msn.c:334
+#: ../libpurple/protocols/myspace/user.c:581
+#: ../libpurple/protocols/myspace/user.c:675
+#: ../libpurple/protocols/oscar/oscar.c:6196
 #: ../libpurple/protocols/silc/buddy.c:454
-#: ../libpurple/protocols/silc/buddy.c:1190
-#: ../libpurple/protocols/silc/chat.c:447
-#: ../libpurple/protocols/silc/chat.c:482
-#: ../libpurple/protocols/silc/chat.c:745
-#: ../libpurple/protocols/silc/ops.c:1291
-#: ../libpurple/protocols/silc/ops.c:1815
-#: ../libpurple/protocols/silc/silc.c:822
+#: ../libpurple/protocols/silc/buddy.c:1193
+#: ../libpurple/protocols/silc/chat.c:449
+#: ../libpurple/protocols/silc/chat.c:486
+#: ../libpurple/protocols/silc/chat.c:749
+#: ../libpurple/protocols/silc/ops.c:1293
+#: ../libpurple/protocols/silc/ops.c:1819
+#: ../libpurple/protocols/silc/silc.c:965
 #: ../libpurple/protocols/silc10/buddy.c:467
-#: ../libpurple/protocols/silc10/buddy.c:1188
+#: ../libpurple/protocols/silc10/buddy.c:1191
 #: ../libpurple/protocols/silc10/chat.c:425
 #: ../libpurple/protocols/silc10/chat.c:464
 #: ../libpurple/protocols/silc10/chat.c:729
 #: ../libpurple/protocols/silc10/ops.c:1297
-#: ../libpurple/protocols/silc10/ops.c:1903
-#: ../libpurple/protocols/silc10/silc.c:735
-#: ../libpurple/protocols/yahoo/yahoo.c:1031
-#: ../libpurple/protocols/yahoo/yahoo.c:3497
-#: ../libpurple/protocols/yahoo/yahoo.c:3508 ../pidgin/gtkblist.c:4039
-#: ../pidgin/gtkcertmgr.c:195 ../pidgin/gtkdialogs.c:772
-#: ../pidgin/gtkdialogs.c:911 ../pidgin/gtkdialogs.c:1003
-#: ../pidgin/gtkrequest.c:270
+#: ../libpurple/protocols/silc10/ops.c:1909
+#: ../libpurple/protocols/silc10/silc.c:741
+#: ../libpurple/protocols/yahoo/yahoo.c:992
+#: ../libpurple/protocols/yahoo/yahoo.c:3539
+#: ../libpurple/protocols/yahoo/yahoo.c:3550 ../pidgin/gtkcertmgr.c:195
+#: ../pidgin/gtkdialogs.c:764 ../pidgin/gtkdialogs.c:903
+#: ../pidgin/gtkdialogs.c:995 ../pidgin/gtkrequest.c:272
 msgid "OK"
 msgstr "�僚�略両竜旅"
 
+#: ../finch/gntblist.c:2645 ../pidgin/gtkdialogs.c:759
+msgid "New Instant Message"
+msgstr "�劉凌 略亮竜�凌 亮流僚�亮留"
+
+#: ../finch/gntblist.c:2647 ../pidgin/gtkdialogs.c:761
+msgid "Please enter the screen name or alias of the person you would like to IM."
+msgstr ""
+"�留�留虜留了凌�亮竜 竜旅�略粒竜�竜 �凌 竜亮�留僚旅龍�亮竜僚凌 �僚凌亮留 流 �竜�隆�僚�亮凌 �凌� 留��亮凌� ��凌 凌�凌溜凌 "
+"慮劉了竜�竜 僚留 ��竜溜了竜�竜 略亮竜�凌 亮流僚�亮留."
+
+#: ../finch/gntblist.c:2698
+msgid "Channel"
+msgstr "�留僚略了旅"
+
+#: ../finch/gntblist.c:2710 ../pidgin/gtkblist.c:951
+msgid "Join a Chat"
+msgstr "裡�亮亮竜�凌�流 �竜 ��龍流�侶�侶"
+
+#: ../finch/gntblist.c:2712
+msgid "Please enter the name of the chat you want to join."
+msgstr "�留�留虜留了凌�亮竜 竜旅�略粒竜�竜 �凌 �僚凌亮留 �侶� ��龍流�侶�侶� �凌� 慮劉了竜�竜 僚留 ��亮亮竜�略��竜�竜."
+
+#: ../finch/gntblist.c:2714 ../finch/gntnotify.c:394
+msgid "Join"
+msgstr "裡�亮亮竜�凌�流"
+
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2241 ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:790
+#: ../finch/gntblist.c:2759 ../finch/gntpounce.c:459 ../pidgin/gtkpounce.c:802
 msgid "Options"
 msgstr "��旅了凌粒劉�"
 
-#: ../finch/gntblist.c:2247
+#: ../finch/gntblist.c:2765
 msgid "Send IM..."
 msgstr "��凌��凌了流 略亮竜�凌� 亮侶僚�亮留�凌�..."
 
-#: ../finch/gntblist.c:2251
-#, fuzzy
-msgid "Show empty groups"
-msgstr "�僚略 凌亮略隆留"
-
-#: ../finch/gntblist.c:2257
-#, fuzzy
-msgid "Show offline buddies"
-msgstr "�亮�略僚旅�侶 亮侶 ��僚隆竜隆竜亮劉僚�僚 �溜了�僚"
-
-#: ../finch/gntblist.c:2263
-msgid "Sort by status"
-msgstr "里留両旅僚�亮侶�侶 留僚略 虜留�略��留�侶"
-
-#: ../finch/gntblist.c:2267
-msgid "Sort alphabetically"
-msgstr "里留両旅僚�亮侶�侶 留了�留硫侶�旅虜略"
-
-#: ../finch/gntblist.c:2271
-msgid "Sort by log size"
-msgstr "里留両旅僚�亮侶�侶 留僚略 亮劉粒竜慮凌� 虜留�留粒�留�流�"
-
-#: ../finch/gntcertmgr.c:86 ../pidgin/gtkcertmgr.c:188
-#, fuzzy
+#: ../finch/gntblist.c:2770
+msgid "Block/Unblock..."
+msgstr "��凌虜了竜旅�亮�� / �虜����侶 留�凌虜了竜旅�亮凌�"
+
+#: ../finch/gntblist.c:2775
+msgid "Join Chat..."
+msgstr "裡�亮亮竜�凌�流 �竜 ��龍流�侶�侶..."
+
+#: ../finch/gntblist.c:2780
+msgid "Show"
+msgstr "�亮�略僚旅�侶"
+
+#: ../finch/gntblist.c:2785
+msgid "Empty groups"
+msgstr "�竜僚劉� 凌亮略隆竜�"
+
+#: ../finch/gntblist.c:2792
+msgid "Offline buddies"
+msgstr "�侶 ��僚隆竜隆竜亮劉僚凌旅 �溜了凌旅"
+
+#: ../finch/gntblist.c:2799
+msgid "Sort"
+msgstr "里留両旅僚�亮侶�侶"
+
+#: ../finch/gntblist.c:2804
+msgid "By Status"
+msgstr "�僚略 虜留�略��留�侶"
+
+#: ../finch/gntblist.c:2809 ../pidgin/gtkblist.c:4194
+msgid "Alphabetically"
+msgstr "�了�留硫侶�旅虜略"
+
+#: ../finch/gntblist.c:2814
+msgid "By Log Size"
+msgstr "�僚略 亮劉粒竜慮凌� 虜留�留粒�留�流�"
+
+#: ../finch/gntblist.c:2825
+msgid "Buddy"
+msgstr "陸溜了凌�"
+
+#: ../finch/gntblist.c:2830 ../libpurple/protocols/oscar/oscar.c:647
+#: ../libpurple/protocols/silc/silc.c:911
+#: ../libpurple/protocols/silc/util.c:559
+#: ../libpurple/protocols/silc10/silc.c:685
+#: ../libpurple/protocols/silc10/util.c:549
+msgid "Chat"
+msgstr "裡�龍流�侶�侶"
+
+#: ../finch/gntblist.c:2840 ../finch/plugins/grouping.c:255
+msgid "Grouping"
+msgstr "�亮留隆凌�凌溜侶�侶"
+
+#: ../finch/gntcertmgr.c:85 ../pidgin/gtkcertmgr.c:188
 msgid "Certificate Import"
-msgstr "���留 ��僚隆竜�侶�"
-
-#: ../finch/gntcertmgr.c:87 ../pidgin/gtkcertmgr.c:189
+msgstr "�旅�留粒�粒流 �旅��凌�凌旅侶�旅虜凌�"
+
+#: ../finch/gntcertmgr.c:86 ../pidgin/gtkcertmgr.c:189
 msgid "Specify a hostname"
-msgstr ""
-
-#: ../finch/gntcertmgr.c:88 ../pidgin/gtkcertmgr.c:190
+msgstr "��旅�亮�� 凌僚�亮留�凌� ��凌了凌粒旅��流"
+
+#: ../finch/gntcertmgr.c:87 ../pidgin/gtkcertmgr.c:190
 msgid "Type the host name this certificate is for."
-msgstr ""
-
-#: ../finch/gntcertmgr.c:97 ../pidgin/gtkcertmgr.c:210
+msgstr "�旅�略粒竜�竜 �凌 �僚凌亮留 �凌� ��凌了凌粒旅��流 粒旅留 �凌僚 凌�凌溜凌 竜溜僚留旅 留��� �凌 �旅��凌�凌旅侶�旅虜�."
+
+#: ../finch/gntcertmgr.c:96 ../pidgin/gtkcertmgr.c:210
 #, c-format
 msgid ""
 "File %s could not be imported.\n"
 "Make sure that the file is readable and in PEM format.\n"
 msgstr ""
-
-#: ../finch/gntcertmgr.c:99 ../pidgin/gtkcertmgr.c:212
+"里凌 留��竜溜凌 %s 隆竜僚 流�留僚 隆�僚留�� 僚留 竜旅�留�慮竜溜.\n"
+"裡旅粒凌��竜��竜溜�竜 ��旅 �凌 留��竜溜凌 竜溜僚留旅 留僚留粒僚��旅亮凌 虜留旅 �竜 亮凌��流 PEM.\n"
+
+#: ../finch/gntcertmgr.c:98 ../pidgin/gtkcertmgr.c:212
 msgid "Certificate Import Error"
-msgstr ""
-
-#: ../finch/gntcertmgr.c:100 ../pidgin/gtkcertmgr.c:213
+msgstr "裡�略了亮留 竜旅�留粒�粒流� �旅��凌�凌旅侶�旅虜凌�"
+
+#: ../finch/gntcertmgr.c:99 ../pidgin/gtkcertmgr.c:213
 msgid "X.509 certificate import failed"
-msgstr ""
-
-#: ../finch/gntcertmgr.c:110 ../pidgin/gtkcertmgr.c:224
-#, fuzzy
+msgstr "� 竜旅�留粒�粒流 �凌� �旅��凌�凌旅侶�旅虜凌� X.509 留�劉���竜"
+
+#: ../finch/gntcertmgr.c:109 ../pidgin/gtkcertmgr.c:224
 msgid "Select a PEM certificate"
-msgstr "��旅了凌粒流 留��竜溜凌�"
-
-#: ../finch/gntcertmgr.c:127 ../pidgin/gtkcertmgr.c:245
+msgstr "��旅了劉両�竜 劉僚留 �旅��凌�凌旅侶�旅虜� PEM"
+
+#: ../finch/gntcertmgr.c:126 ../pidgin/gtkcertmgr.c:245
 #, c-format
 msgid ""
 "Export to file %s failed.\n"
 "Check that you have write permission to the target path\n"
 msgstr ""
-
-#: ../finch/gntcertmgr.c:129 ../pidgin/gtkcertmgr.c:247
+"� 竜両留粒�粒流 �竜 留��竜溜凌 %s 留�劉���竜.\n"
+"�了劉粒両�竜 留僚 劉�竜�竜 隆旅虜留溜�亮留 竜粒粒�留�流� ��侶僚 �凌�凌慮竜�溜留 ��凌凌�旅�亮凌�\n"
+
+#: ../finch/gntcertmgr.c:128 ../pidgin/gtkcertmgr.c:247
 msgid "Certificate Export Error"
-msgstr ""
-
-#: ../finch/gntcertmgr.c:130 ../pidgin/gtkcertmgr.c:248
+msgstr "裡�略了亮留 竜両留粒�粒流� �旅��凌�凌旅侶�旅虜凌�"
+
+#: ../finch/gntcertmgr.c:129 ../pidgin/gtkcertmgr.c:248
 msgid "X.509 certificate export failed"
-msgstr ""
-
-#: ../finch/gntcertmgr.c:159 ../pidgin/gtkcertmgr.c:299
+msgstr "� 竜両留粒�粒流 �旅��凌�凌旅侶�旅虜凌� X.509 留�劉���竜"
+
+#: ../finch/gntcertmgr.c:158 ../pidgin/gtkcertmgr.c:298
 msgid "PEM X.509 Certificate Export"
-msgstr ""
-
-#: ../finch/gntcertmgr.c:188
-#, fuzzy, c-format
+msgstr "�両留粒�粒流 �旅��凌�凌旅侶�旅虜凌� PEM X.509"
+
+#: ../finch/gntcertmgr.c:187
+#, c-format
 msgid "Certificate for %s"
-msgstr "�留�略��留�侶 %s"
-
-#: ../finch/gntcertmgr.c:195
+msgstr "�旅��凌�凌旅侶�旅虜� 粒旅留 %s"
+
+#: ../finch/gntcertmgr.c:194
 #, c-format
 msgid ""
 "Common name: %s\n"
@@ -763,57 +862,58 @@
 "%s"
 msgstr ""
 
-#: ../finch/gntcertmgr.c:198
+#: ../finch/gntcertmgr.c:197
 msgid "SSL Host Certificate"
-msgstr ""
-
-#: ../finch/gntcertmgr.c:233 ../pidgin/gtkcertmgr.c:372
+msgstr "�旅��凌�凌旅侶�旅虜� ��凌了凌粒旅��流 SSL"
+
+#: ../finch/gntcertmgr.c:232 ../pidgin/gtkcertmgr.c:371
 #, c-format
 msgid "Really delete certificate for %s?"
-msgstr ""
-
-#: ../finch/gntcertmgr.c:236 ../pidgin/gtkcertmgr.c:374
+msgstr "裡溜粒凌��留 隆旅留粒�留�流 �凌� �旅��凌�凌旅侶�旅虜凌� 粒旅留 %s;"
+
+#: ../finch/gntcertmgr.c:235 ../pidgin/gtkcertmgr.c:373
 msgid "Confirm certificate delete"
-msgstr ""
-
-#: ../finch/gntcertmgr.c:293 ../pidgin/gtkcertmgr.c:602
+msgstr "��旅硫竜硫留溜��侶 隆旅留粒�留�流� �旅��凌�凌旅侶�旅虜凌�"
+
+#: ../finch/gntcertmgr.c:292 ../pidgin/gtkcertmgr.c:613
 msgid "Certificate Manager"
-msgstr ""
+msgstr "��粒略僚��侶 �旅��凌�凌旅侶�旅虜�僚"
 
 #. Creating the user splits
-#: ../finch/gntcertmgr.c:298 ../libpurple/protocols/bonjour/bonjour.c:652
-#: ../libpurple/protocols/silc/silc.c:1007
-#: ../libpurple/protocols/silc10/silc.c:918
+#: ../finch/gntcertmgr.c:297 ../libpurple/protocols/bonjour/bonjour.c:694
+#: ../libpurple/protocols/silc/silc.c:1150
+#: ../libpurple/protocols/silc10/silc.c:924 ../pidgin/gtkcertmgr.c:446
 msgid "Hostname"
 msgstr "�僚凌亮留 ��凌了凌粒旅��流"
 
-#: ../finch/gntcertmgr.c:315 ../finch/gntnotify.c:383 ../pidgin/gtkconv.c:1635
-#: ../pidgin/gtkdebug.c:835
+#: ../finch/gntcertmgr.c:314 ../finch/gntnotify.c:388 ../pidgin/gtkconv.c:1678
+#: ../pidgin/gtkdebug.c:832
 msgid "Info"
 msgstr "�了侶�凌�凌�溜竜�"
 
 #. Close button
-#: ../finch/gntcertmgr.c:324 ../finch/gntft.c:237 ../finch/gntnotify.c:182
-#: ../finch/gntplugin.c:210 ../finch/gntplugin.c:310 ../finch/gntpounce.c:738
-#: ../finch/gntstatus.c:216 ../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:273
+#: ../finch/gntcertmgr.c:323 ../finch/gntft.c:253 ../finch/gntnotify.c:182
+#: ../finch/gntplugin.c:220 ../finch/gntplugin.c:413 ../finch/gntpounce.c:750
+#: ../finch/gntroomlist.c:275 ../finch/gntstatus.c:216
+#: ../libpurple/protocols/msn/msn.c:403 ../libpurple/protocols/msnp9/msn.c:400
+#: ../libpurple/protocols/silc/util.c:388
+#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2375
+#: ../pidgin/gtkrequest.c:275
 msgid "Close"
 msgstr "�了竜溜�旅亮凌"
 
-#: ../finch/gntconn.c:124
+#: ../finch/gntconn.c:126
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../finch/gntconn.c:127
+#: ../finch/gntconn.c:129
 #, c-format
 msgid "%s disconnected."
 msgstr "%s 留�凌��僚隆劉慮侶虜竜."
 
-#: ../finch/gntconn.c:128
-#, fuzzy, c-format
+#: ../finch/gntconn.c:130
+#, c-format
 msgid ""
 "%s\n"
 "\n"
@@ -822,54 +922,60 @@
 msgstr ""
 "%s\n"
 "\n"
-"里凌 %s 隆竜 慮留 竜�旅�竜旅�流�竜旅 僚留 竜�留僚留��僚隆竜慮竜溜 亮竜 留��� �凌 了凌粒留�旅留�亮� 亮劉��旅 僚留 "
+"里凌 Finch 隆竜 慮留 竜�旅�竜旅�流�竜旅 僚留 竜�留僚留��僚隆竜慮竜溜 亮竜 留��� �凌 了凌粒留�旅留�亮� 亮劉��旅 僚留 "
 "隆旅凌�慮��竜�竜 �凌 ��略了亮留 虜留旅 僚留 竜僚竜�粒凌�凌旅流�竜�竜 両留僚略 �凌 了凌粒留�旅留�亮�."
 
-#: ../finch/gntconn.c:137 ../pidgin/gtkblist.c:4041
+#: ../finch/gntconn.c:139
 msgid "Re-enable Account"
 msgstr "��留僚竜僚竜�粒凌�凌溜侶�侶 了凌粒留�旅留�亮凌�"
 
-#: ../finch/gntconv.c:139
+#: ../finch/gntconn.c:156
+msgid ""
+"The account has disconnected and you are no longer in this chat. You will be "
+"automatically rejoined in the chat when the account reconnects."
+msgstr ""
+"����� 凌 了凌粒留�旅留�亮�� 留�凌��僚隆劉慮侶虜竜 虜留旅 隆竜 ��亮亮竜�劉�竜�竜 �了劉凌僚 �竜 留��流 �侶 "
+"��龍流�侶�侶. �留 ��亮亮竜�略��竜�竜 両留僚略 留���亮留�留 ��留僚 竜�留僚留��僚隆竜慮竜溜 凌 了凌粒留�旅留�亮��."
+
+#: ../finch/gntconv.c:159
 msgid "No such command."
 msgstr "�竜僚 ��略��竜旅 �劉�凌旅留 竜僚�凌了流."
 
-#: ../finch/gntconv.c:143 ../pidgin/gtkconv.c:489
+#: ../finch/gntconv.c:163 ../pidgin/gtkconv.c:492
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
-msgstr ""
-"裡�略了亮留 ��僚�留両侶�:  �了侶虜��凌了凌粒流�留�竜 了略慮凌� 留�旅慮亮� 凌�旅�亮略��僚 粒旅留 留��流 �侶僚 竜僚�凌了流."
-
-#: ../finch/gntconv.c:148 ../pidgin/gtkconv.c:495
+msgstr "裡�略了亮留 ��僚�留両侶�:  �了侶虜��凌了凌粒流�留�竜 了略慮凌� 留�旅慮亮� 凌�旅�亮略��僚 粒旅留 留��流 �侶僚 竜僚�凌了流."
+
+#: ../finch/gntconv.c:168 ../pidgin/gtkconv.c:498
 msgid "Your command failed for an unknown reason."
 msgstr "� 竜僚�凌了流 留�劉���竜 粒旅留 略粒僚���凌 了�粒凌."
 
-#: ../finch/gntconv.c:153 ../pidgin/gtkconv.c:502
+#: ../finch/gntconv.c:173 ../pidgin/gtkconv.c:505
 msgid "That command only works in chats, not IMs."
 msgstr "���流 侶 竜僚�凌了流 了竜旅�凌��粒竜溜 亮�僚凌 �竜 ��龍侶�流�竜旅�, ��旅 �竜 略亮竜�留 亮侶僚�亮留�留."
 
-#: ../finch/gntconv.c:156 ../pidgin/gtkconv.c:505
+#: ../finch/gntconv.c:176 ../pidgin/gtkconv.c:508
 msgid "That command only works in IMs, not chats."
 msgstr "���流 侶 竜僚�凌了流 了竜旅�凌��粒竜溜 亮�僚凌 �竜 略亮竜�留 亮侶僚�亮留�留, ��旅 �竜 ��龍侶�流�竜旅�."
 
-#: ../finch/gntconv.c:160 ../pidgin/gtkconv.c:510
+#: ../finch/gntconv.c:180 ../pidgin/gtkconv.c:513
 msgid "That command doesn't work on this protocol."
 msgstr "���流 侶 竜僚�凌了流 隆竜 了竜旅�凌��粒竜溜 �竜 留��� �凌 �����虜凌了了凌."
 
-#: ../finch/gntconv.c:168
-#, fuzzy
+#: ../finch/gntconv.c:188
 msgid "Message was not sent, because you are not signed on."
-msgstr "里凌 亮流僚�亮留 隆竜僚 流�留僚 隆�僚留�� 僚留 ��留了竜溜 竜�竜旅隆流 ��劉了僚凌�亮竜 �凌了� 粒�流粒凌�留:"
-
-#: ../finch/gntconv.c:251
+msgstr "里凌 亮流僚�亮留 隆竜 ��略了慮侶虜竜 竜�竜旅隆流 隆竜僚 竜溜��竜 ��僚隆竜隆竜亮劉僚凌旅."
+
+#: ../finch/gntconv.c:268
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../finch/gntconv.c:274
+#: ../finch/gntconv.c:291
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:279 ../finch/gntconv.c:773
+#: ../finch/gntconv.c:296 ../finch/gntconv.c:880 ../pidgin/gtkconv.c:3479
 #, c-format
 msgid ""
 "\n"
@@ -878,71 +984,72 @@
 "\n"
 "%s �了侶虜��凌了凌粒竜溜..."
 
-#: ../finch/gntconv.c:298
+#: ../finch/gntconv.c:315
 msgid "You have left this chat."
 msgstr "陸�粒留�竜 留�� 留��流 �侶 ��龍流�侶�侶."
 
-#: ../finch/gntconv.c:387 ../pidgin/gtkconv.c:1362
+#: ../finch/gntconv.c:433 ../pidgin/gtkconv.c:1384
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr ""
 "� 虜留�留粒�留�流 両竜虜溜僚侶�竜. 里留 亮竜了了凌僚�旅虜略 亮侶僚�亮留�留 �竜 留��流 �侶 ��僚凌亮旅了溜留 慮留 "
 "虜留�留粒�略�凌僚�留旅."
 
-#: ../finch/gntconv.c:393 ../pidgin/gtkconv.c:1370
-msgid ""
-"Logging stopped. Future messages in this conversation will not be logged."
+#: ../finch/gntconv.c:437 ../pidgin/gtkconv.c:1392
+msgid "Logging stopped. Future messages in this conversation will not be logged."
 msgstr ""
 "� 虜留�留粒�留�流 ��留亮略�侶�竜. 里留 亮竜了了凌僚�旅虜略 亮侶僚�亮留�留 �竜 留��流 �侶 ��僚凌亮旅了溜留 隆竜 慮留 "
 "虜留�留粒�略�凌僚�留旅."
 
-#: ../finch/gntconv.c:442
+#: ../finch/gntconv.c:523
 msgid "Send To"
 msgstr "��凌��凌了流 �竜"
 
-#: ../finch/gntconv.c:486
+#: ../finch/gntconv.c:568
 msgid "Conversation"
 msgstr "裡�僚凌亮旅了溜留"
 
-#: ../finch/gntconv.c:492
+#: ../finch/gntconv.c:574
 msgid "Clear Scrollback"
 msgstr "�留慮留�旅�亮�� 留僚留隆溜�侶�侶�"
 
-#: ../finch/gntconv.c:496 ../finch/gntprefs.c:191
+#: ../finch/gntconv.c:578 ../finch/gntprefs.c:191
 msgid "Show Timestamps"
 msgstr "�亮�略僚旅�侶 ��凌僚凌�流亮�僚"
 
-#: ../finch/gntconv.c:512
+#: ../finch/gntconv.c:596
 msgid "Add Buddy Pounce..."
 msgstr "��凌�慮流虜侶 竜���亮侶�侶� �溜了凌�..."
 
-#: ../finch/gntconv.c:527
-#, fuzzy
+#: ../finch/gntconv.c:611
+msgid "View Log..."
+msgstr "�亮�略僚旅�侶 虜留�留粒�留�流�..."
+
+#: ../finch/gntconv.c:615
 msgid "Enable Logging"
-msgstr "/��旅了凌粒劉�/�僚竜�粒凌�凌溜侶�侶 虜留�留粒�留�流�"
-
-#: ../finch/gntconv.c:533
-#, fuzzy
+msgstr "�僚竜�粒凌�凌溜侶�侶 虜留�留粒�留�流�"
+
+#: ../finch/gntconv.c:621
 msgid "Enable Sounds"
-msgstr "�僚竜�粒凌�凌溜侶�侶 了凌粒留�旅留�亮凌�:"
-
-#: ../finch/gntconv.c:739
+msgstr "�僚竜�粒凌�凌溜侶�侶 流��僚"
+
+#: ../finch/gntconv.c:833
 msgid "<AUTO-REPLY> "
 msgstr "<�離里���里�-����里�裡�> "
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:861
+#: ../finch/gntconv.c:968
 msgid "List of users:\n"
 msgstr "�溜��留 ��侶���僚:\n"
 
-#: ../finch/gntconv.c:1023 ../pidgin/gtkconv.c:331
+#: ../finch/gntconv.c:1130 ../pidgin/gtkconv.c:337
 msgid "Supported debug options are:  version"
 msgstr "�旅 ��凌��侶�旅龍�亮竜僚竜� 竜�旅了凌粒劉� 留�凌��留了亮略���侶� 竜溜僚留旅:  劉虜隆凌�侶"
 
-#: ../finch/gntconv.c:1059 ../pidgin/gtkconv.c:381
+#: ../finch/gntconv.c:1166 ../pidgin/gtkconv.c:389
 msgid "No such command (in this context)."
 msgstr "�竜僚 ��略��竜旅 �劉�凌旅留 竜僚�凌了流 (�竜 留��� �凌 �了留溜�旅凌)."
 
-#: ../finch/gntconv.c:1062 ../pidgin/gtkconv.c:384
+#: ../finch/gntconv.c:1169 ../pidgin/gtkconv.c:392
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -951,7 +1058,7 @@
 "竜僚�凌了流.\n"
 "�旅 留虜�了凌�慮竜� 竜僚�凌了劉� 竜溜僚留旅 隆旅留慮劉�旅亮竜� �竜 留��� �凌 �了留溜�旅凌:\n"
 
-#: ../finch/gntconv.c:1120 ../pidgin/gtkconv.c:7560
+#: ../finch/gntconv.c:1242 ../pidgin/gtkconv.c:7778
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -959,13 +1066,13 @@
 "say &lt;亮流僚�亮留&gt;:  ��凌��凌了流 亮侶僚�亮留�凌� �留� �留僚 僚留 亮侶 ��侶�旅亮凌�凌旅凌��留�竜 虜留亮溜留 "
 "竜僚�凌了流."
 
-#: ../finch/gntconv.c:1123 ../pidgin/gtkconv.c:7563
+#: ../finch/gntconv.c:1245 ../pidgin/gtkconv.c:7781
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
 "me &lt;竜僚劉�粒竜旅留&gt;:  ��凌��凌了流 亮旅留� 竜僚劉�粒竜旅留� ��凌 ���了 �凌� IRC �竜 劉僚留 �溜了凌 流 "
 "亮旅留 ��龍流�侶�侶."
 
-#: ../finch/gntconv.c:1126 ../pidgin/gtkconv.c:7566
+#: ../finch/gntconv.c:1248 ../pidgin/gtkconv.c:7784
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -973,43 +1080,48 @@
 "debug &lt;竜�旅了凌粒流&gt;:  ��凌��凌了流 隆旅留����僚 亮侶僚�亮略��僚 留�凌��留了亮略���侶� ��侶僚 "
 "��劉�凌��留 ��僚凌亮旅了溜留."
 
-#: ../finch/gntconv.c:1129 ../pidgin/gtkconv.c:7569
+#: ../finch/gntconv.c:1251 ../pidgin/gtkconv.c:7787
 msgid "clear: Clears the conversation scrollback."
 msgstr ""
 
-#: ../finch/gntconv.c:1132 ../pidgin/gtkconv.c:7575
+#: ../finch/gntconv.c:1254 ../pidgin/gtkconv.c:7793
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;竜僚�凌了流&gt;:  �凌流慮竜旅留 �竜 亮旅留 ��粒虜竜虜�旅亮劉僚侶 竜僚�凌了流."
 
-#: ../finch/gntconv.c:1135
+#: ../finch/gntconv.c:1257
 msgid "users:  Show the list of users in the chat."
 msgstr "uses: �亮�略僚旅�侶 �侶� 了溜��留� �溜了�僚 �凌� 竜溜僚留旅 ��侶 ��龍流�侶�侶."
 
-#: ../finch/gntconv.c:1140
+#: ../finch/gntconv.c:1262
 msgid "plugins: Show the plugins window."
 msgstr "plugins: �亮�略僚旅�侶 �留�留慮��凌� ��凌�慮劉��僚."
 
-#: ../finch/gntconv.c:1143
+#: ../finch/gntconv.c:1265
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist: �亮�略僚旅�侶 了溜��留� �溜了�僚."
 
-#: ../finch/gntconv.c:1146
+#: ../finch/gntconv.c:1268
 msgid "accounts: Show the accounts window."
 msgstr "accounts: �亮�略僚旅�侶 �留�留慮��凌� 了凌粒留�旅留�亮�僚."
 
-#: ../finch/gntconv.c:1149
+#: ../finch/gntconv.c:1271
 msgid "debugwin: Show the debug window."
 msgstr "debugwin: �亮�略僚旅�侶 �留�留慮��凌� 留�凌��留了亮略���侶�."
 
-#: ../finch/gntconv.c:1152
+#: ../finch/gntconv.c:1274
 msgid "prefs: Show the preference window."
 msgstr "prefs: �亮�略僚旅�侶 �留�留慮��凌� ��凌�旅亮流�竜�僚."
 
-#: ../finch/gntconv.c:1155
+#: ../finch/gntconv.c:1277
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: �亮�略僚旅�侶 �留�留慮��凌� 留�凌慮侶虜竜�亮劉僚�僚 虜留�留��略�竜�僚."
 
-#: ../finch/gntdebug.c:235 ../finch/gntui.c:86 ../pidgin/gtkdebug.c:695
+#: ../finch/gntdebug.c:231 ../pidgin/gtkconv.c:948 ../pidgin/gtkconv.c:2656
+#: ../pidgin/gtkdebug.c:219 ../pidgin/gtkft.c:543
+msgid "Unable to open file."
+msgstr "�隆�僚留�凌 �凌 略僚凌旅粒亮留 �凌� 留��竜溜凌�."
+
+#: ../finch/gntdebug.c:271 ../finch/gntui.c:98 ../pidgin/gtkdebug.c:689
 msgid "Debug Window"
 msgstr "�留�略慮��凌 留�凌��留了亮略���侶�"
 
@@ -1017,186 +1129,249 @@
 #. * it's necessary to make the width of the debug window resizable ... like I said,
 #. * it doesn't make sense. The bug is likely in the packing in gntbox.c.
 #.
-#: ../finch/gntdebug.c:256 ../pidgin/gtkdebug.c:754
+#: ../finch/gntdebug.c:292 ../pidgin/gtkdebug.c:751
 msgid "Clear"
 msgstr "�留慮留�旅�亮��"
 
-#: ../finch/gntdebug.c:262
-msgid "Filter: "
-msgstr "陸溜了��凌: "
-
-#: ../finch/gntdebug.c:266 ../pidgin/gtkdebug.c:763
+#: ../finch/gntdebug.c:303
+msgid "Filter:"
+msgstr "陸溜了��凌:"
+
+#: ../finch/gntdebug.c:309 ../pidgin/gtkdebug.c:760
 msgid "Pause"
 msgstr "�留��侶"
 
-#: ../finch/gntft.c:118 ../pidgin/gtkft.c:229
+#: ../finch/gntft.c:120 ../pidgin/gtkft.c:229
 #, c-format
 msgid "File Transfers - %d%% of %d files"
 msgstr "�竜�留�凌�劉� 留��竜溜�僚 - %d%% 留�� %d 留��竜溜留"
 
 #. Create the window.
-#: ../finch/gntft.c:123 ../finch/gntft.c:196 ../finch/gntui.c:87
-#: ../pidgin/gtkft.c:234 ../pidgin/gtkft.c:762
+#: ../finch/gntft.c:125 ../finch/gntft.c:212 ../finch/gntui.c:99
+#: ../pidgin/gtkft.c:234 ../pidgin/gtkft.c:761
 msgid "File Transfers"
 msgstr "�竜�留�凌�劉� 留��竜溜�僚"
 
-#: ../finch/gntft.c:201 ../pidgin/gtkft.c:645
+#: ../finch/gntft.c:217 ../pidgin/gtkft.c:645
 msgid "Progress"
 msgstr "���凌隆凌�"
 
-#: ../finch/gntft.c:201 ../pidgin/gtkft.c:652
+#: ../finch/gntft.c:217 ../pidgin/gtkft.c:652
 msgid "Filename"
 msgstr "�僚凌亮留 留��竜溜凌�"
 
-#: ../finch/gntft.c:201 ../pidgin/gtkft.c:659
+#: ../finch/gntft.c:217 ../pidgin/gtkft.c:659
 msgid "Size"
 msgstr "�劉粒竜慮凌�"
 
-#: ../finch/gntft.c:201
+#: ../finch/gntft.c:217
 msgid "Speed"
 msgstr "里留���侶�留"
 
-#: ../finch/gntft.c:201 ../pidgin/gtkft.c:666
+#: ../finch/gntft.c:217 ../pidgin/gtkft.c:666
 msgid "Remaining"
 msgstr "��凌亮劉僚凌�僚"
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
-#: ../finch/gntft.c:201 ../finch/gntstatus.c:547 ../finch/gntstatus.c:576
-#: ../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:1500
-#: ../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:2700
-#: ../libpurple/protocols/oscar/oscar.c:3780
-#: ../libpurple/protocols/sametime/sametime.c:3263
-#: ../libpurple/protocols/sametime/sametime.c:4150
-#: ../libpurple/protocols/yahoo/yahoo.c:3248 ../pidgin/gtkblist.c:3104
-#: ../pidgin/gtkblist.c:3118 ../pidgin/gtkblist.c:3120
-#: ../pidgin/gtksavedstatuses.c:999 ../pidgin/gtksavedstatuses.c:1144
+#: ../finch/gntft.c:217 ../finch/gntstatus.c:547 ../finch/gntstatus.c:576
+#: ../libpurple/protocols/bonjour/bonjour.c:380
+#: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1584
+#: ../libpurple/protocols/gg/gg.c:1592
+#: ../libpurple/protocols/jabber/buddy.c:780
+#: ../libpurple/protocols/jabber/buddy.c:784
+#: ../libpurple/protocols/jabber/buddy.c:943
+#: ../libpurple/protocols/jabber/jabber.c:1569
+#: ../libpurple/protocols/msn/msn.c:617 ../libpurple/protocols/msn/msn.c:627
+#: ../libpurple/protocols/msn/msn.c:632 ../libpurple/protocols/msn/msn.c:635
+#: ../libpurple/protocols/msnp9/msn.c:540
+#: ../libpurple/protocols/novell/novell.c:2853
+#: ../libpurple/protocols/oscar/oscar.c:820
+#: ../libpurple/protocols/oscar/oscar.c:825
+#: ../libpurple/protocols/oscar/oscar.c:827
+#: ../libpurple/protocols/oscar/oscar.c:2761
+#: ../libpurple/protocols/oscar/oscar.c:3813
+#: ../libpurple/protocols/sametime/sametime.c:3313
+#: ../libpurple/protocols/sametime/sametime.c:4204
+#: ../libpurple/protocols/yahoo/yahoo.c:3285 ../pidgin/gtkblist.c:3297
+#: ../pidgin/gtkblist.c:3311 ../pidgin/gtkblist.c:3313
+#: ../pidgin/gtksavedstatuses.c:990 ../pidgin/gtksavedstatuses.c:1134
 msgid "Status"
 msgstr "�留�略��留�侶"
 
-#: ../finch/gntft.c:211
+#: ../finch/gntft.c:227
 msgid "Close this window when all transfers finish"
 msgstr "�了竜溜�旅亮凌 留��凌� �凌� �留�留慮��凌� ��留僚 凌了凌虜了侶��慮凌�僚 �了竜� 凌旅 亮竜�留�凌�劉�"
 
-#: ../finch/gntft.c:218
+#: ../finch/gntft.c:234
 msgid "Clear finished transfers"
 msgstr "�留慮留�旅�亮�� 凌了凌虜了侶��亮劉僚�僚 亮竜�留�凌��僚"
 
-#: ../finch/gntft.c:232
+#: ../finch/gntft.c:248 ../finch/gntroomlist.c:272
 msgid "Stop"
 msgstr "裡�留亮略�侶亮留"
 
-#: ../finch/gntft.c:305 ../pidgin/gtkft.c:169 ../pidgin/gtkft.c:973
+#: ../finch/gntft.c:321 ../pidgin/gtkft.c:169 ../pidgin/gtkft.c:934
 msgid "Waiting for transfer to begin"
 msgstr "�僚留亮凌僚流 劉僚留�両侶� 亮竜�留�凌�略�"
 
-#: ../finch/gntft.c:372 ../pidgin/gtkft.c:166 ../pidgin/gtkft.c:1054
+#: ../finch/gntft.c:388 ../pidgin/gtkft.c:163 ../pidgin/gtkft.c:1015
 msgid "Canceled"
 msgstr "�虜���慮侶虜竜"
 
-#: ../finch/gntft.c:374 ../pidgin/gtkft.c:1056
+#: ../finch/gntft.c:390 ../pidgin/gtkft.c:1017
 msgid "Failed"
 msgstr "��劉���竜"
 
-#: ../finch/gntft.c:420 ../pidgin/gtkft.c:134
-#, fuzzy, c-format
+#: ../finch/gntft.c:434 ../pidgin/gtkft.c:134
+#, c-format
 msgid "%.2f KiB/s"
-msgstr "%.2f KB/隆竜��竜��了竜��凌"
-
-#: ../finch/gntft.c:431
+msgstr "%.2f KiB/隆竜��竜��了竜��凌"
+
+#: ../finch/gntft.c:445
 #, c-format
 msgid "The file was saved as %s."
-msgstr ""
-
-#: ../finch/gntft.c:432 ../finch/gntft.c:433 ../pidgin/gtkft.c:163
-#: ../pidgin/gtkft.c:1116
+msgstr "里凌 留��竜溜凌 留�凌慮侶虜竜��侶虜竜 �� %s."
+
+#: ../finch/gntft.c:446 ../finch/gntft.c:447 ../pidgin/gtkft.c:160
+#: ../pidgin/gtkft.c:1077
 msgid "Finished"
 msgstr "�了凌虜了侶��慮侶虜竜"
 
-#: ../finch/gntft.c:437 ../libpurple/protocols/msn/session.c:347
+#: ../finch/gntft.c:452 ../libpurple/protocols/msn/session.c:404
+#: ../libpurple/protocols/msnp9/session.c:356
 msgid "Transferring"
 msgstr "�溜僚竜�留旅 亮竜�留�凌�略"
 
+#: ../finch/gntlog.c:183
+#, c-format
+msgid "Conversation in %s on %s"
+msgstr "裡�僚凌亮旅了溜留 ��凌 %s ��旅� %s"
+
+#: ../finch/gntlog.c:186
+#, c-format
+msgid "Conversation with %s on %s"
+msgstr "裡�僚凌亮旅了溜竜� 亮竜 %s ��旅� %s"
+
+#: ../finch/gntlog.c:231 ../pidgin/gtklog.c:503
+msgid "%B %Y"
+msgstr "%B %Y"
+
+#: ../finch/gntlog.c:271 ../pidgin/gtklog.c:550
+msgid ""
+"System events will only be logged if the \"Log all status changes to system "
+"log\" preference is enabled."
+msgstr ""
+"里留 粒竜粒凌僚��留 ����流亮留�凌� 慮留 虜留�留粒�略�凌僚�留旅 亮�僚凌 留僚 竜溜僚留旅 竜僚竜�粒凌�凌旅侶亮劉僚侶 侶 "
+"\"�留�留粒�留�流 �了�僚 ��僚 留了了留粒�僚 ��侶僚 虜留�留粒�留�流 ����流亮留�凌�\"."
+
+#: ../finch/gntlog.c:275 ../pidgin/gtklog.c:554
+msgid ""
+"Instant messages will only be logged if the \"Log all instant messages\" "
+"preference is enabled."
+msgstr ""
+"里留 略亮竜�留 亮侶僚�亮留�留 慮留 虜留�留粒�略�凌僚�留旅 亮�僚凌 留僚 竜溜僚留旅 竜僚竜�粒凌�凌旅侶亮劉僚侶 侶 "
+"\"�留�留粒�留�流 �了�僚 ��僚 略亮竜��僚 亮侶僚�亮略��僚\"."
+
+#: ../finch/gntlog.c:278 ../pidgin/gtklog.c:557
+msgid "Chats will only be logged if the \"Log all chats\" preference is enabled."
+msgstr ""
+"�旅 ��龍侶�流�竜旅� 慮留 虜留�留粒�略�凌僚�留旅 亮�僚凌 留僚 竜溜僚留旅 竜僚竜�粒凌�凌旅侶亮劉僚侶 侶 \"虜留�留粒�留�流 "
+"�了�僚 ��僚 ��龍侶�流�竜�僚\"."
+
+#: ../finch/gntlog.c:284 ../pidgin/gtklog.c:566
+msgid "No logs were found"
+msgstr "�竜 硫�劉慮侶虜留僚 虜留�留粒�留�劉�"
+
+#: ../finch/gntlog.c:330 ../pidgin/gtklog.c:646
+msgid "Total log size:"
+msgstr "裡�僚凌了旅虜� 亮劉粒竜慮凌� 虜留�留粒�留�流�:"
+
+#. Search box *********
+#: ../finch/gntlog.c:338
+msgid "Scroll/Search: "
+msgstr ""
+
+#: ../finch/gntlog.c:382 ../pidgin/gtklog.c:716
+#, c-format
+msgid "Conversations in %s"
+msgstr "裡�僚凌亮旅了溜竜� ��凌 %s"
+
+#: ../finch/gntlog.c:390 ../finch/gntlog.c:447 ../pidgin/gtklog.c:724
+#: ../pidgin/gtklog.c:799
+#, c-format
+msgid "Conversations with %s"
+msgstr "裡�僚凌亮旅了溜竜� 亮竜 %s"
+
+#: ../finch/gntlog.c:472 ../pidgin/gtklog.c:824
+msgid "System Log"
+msgstr "�留�留粒�留�流 ����流亮留�凌�"
+
 #: ../finch/gntnotify.c:165
 msgid "Emails"
 msgstr "Emails"
 
-#: ../finch/gntnotify.c:171 ../finch/gntnotify.c:225
+#: ../finch/gntnotify.c:171 ../finch/gntnotify.c:226
 msgid "You have mail!"
 msgstr "��竜�竜 僚劉留 留了了侶了凌粒�留�溜留!"
 
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:513
+#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:524
 msgid "Sender"
 msgstr "��凌��凌了劉留�"
 
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:520
+#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:531
 msgid "Subject"
 msgstr "�劉亮留"
 
-#: ../finch/gntnotify.c:201
+#: ../finch/gntnotify.c:202
 #, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
 msgstr[0] "%s (%s) 劉�竜旅 %d 僚劉凌 亮流僚�亮留."
 msgstr[1] "%s (%s) 劉�竜旅 %d 僚劉留 亮侶僚�亮留�留."
 
-#: ../finch/gntnotify.c:225 ../pidgin/gtknotify.c:341
+#: ../finch/gntnotify.c:226 ../pidgin/gtknotify.c:346
 msgid "New Mail"
 msgstr "�劉留 留了了侶了凌粒�留�溜留"
 
-#: ../finch/gntnotify.c:290 ../pidgin/gtknotify.c:940
+#: ../finch/gntnotify.c:291 ../pidgin/gtknotify.c:959
 #, c-format
 msgid "Info for %s"
 msgstr "�了侶�凌�凌�溜竜� 粒旅留 %s"
 
-#: ../finch/gntnotify.c:291 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:941
+#: ../finch/gntnotify.c:292 ../libpurple/protocols/toc/toc.c:476
+#: ../pidgin/gtknotify.c:960
 msgid "Buddy Information"
 msgstr "�了侶�凌�凌�溜竜� �溜了凌�"
 
-#: ../finch/gntnotify.c:377 ../libpurple/protocols/qq/group_join.c:367
+#: ../finch/gntnotify.c:382 ../libpurple/protocols/qq/group_join.c:367
 msgid "Continue"
 msgstr "裡�僚劉�竜旅留"
 
-#: ../finch/gntnotify.c:386 ../pidgin/gtkconv.c:1596
+#: ../finch/gntnotify.c:391 ../pidgin/gtkconv.c:1639
 msgid "IM"
 msgstr "�流僚�亮留"
 
-#: ../finch/gntnotify.c:389
-msgid "Join"
-msgstr "裡�亮亮竜�凌�流"
-
-#: ../finch/gntnotify.c:392 ../libpurple/protocols/sametime/sametime.c:3473
+#: ../finch/gntnotify.c:397 ../libpurple/protocols/sametime/sametime.c:3523
 msgid "Invite"
 msgstr "����虜了侶�侶"
 
-#: ../finch/gntnotify.c:395
+#: ../finch/gntnotify.c:400
 msgid "(none)"
 msgstr "(虜留僚劉僚留)"
 
-#: ../finch/gntplugin.c:75 ../finch/gntplugin.c:84
+#: ../finch/gntplugin.c:84 ../finch/gntplugin.c:93
 msgid "ERROR"
 msgstr "裡陸����"
 
-#: ../finch/gntplugin.c:75
+#: ../finch/gntplugin.c:84
 msgid "loading plugin failed"
 msgstr "留�凌���溜留 �凌���亮留�凌� �凌� ��凌�慮劉�凌�"
 
-#: ../finch/gntplugin.c:84
+#: ../finch/gntplugin.c:93
 msgid "unloading plugin failed"
-msgstr ""
-
-#: ../finch/gntplugin.c:129
+msgstr "�凌 留�凌�����亮留 �凌� ��凌�慮劉�凌� 留�劉���竜"
+
+#: ../finch/gntplugin.c:139
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -1213,19 +1388,41 @@
 "���凌�竜了溜隆留: %s\n"
 "�僚凌亮留 留��竜溜凌�: %s\n"
 
-#: ../finch/gntplugin.c:187
+#: ../finch/gntplugin.c:197
 msgid "Plugin need to be loaded before you can configure it."
 msgstr "里凌 ����慮竜�凌 ��劉�竜旅 僚留 劉�竜旅 �凌���慮竜溜 粒旅留 僚留 亮�凌�竜溜�竜 僚留 �凌 ��慮亮溜�竜�竜."
 
-#: ../finch/gntplugin.c:235
+#: ../finch/gntplugin.c:245
 msgid "No configuration options for this plugin."
 msgstr "�竜僚 ��略��凌�僚 竜�旅了凌粒劉� ��慮亮溜�竜�僚 粒旅留 留��� �凌 ����慮竜�凌."
 
-#: ../finch/gntplugin.c:260
+#: ../finch/gntplugin.c:266
+msgid "Error loading plugin"
+msgstr "裡�略了亮留 虜留�略 �凌 �����亮留 ��凌�慮劉�凌�"
+
+#: ../finch/gntplugin.c:267
+msgid "The selected file is not a valid plugin."
+msgstr "里凌 竜�旅了竜粒亮劉僚凌 留��竜溜凌 隆竜僚 竜溜僚留旅 劉粒虜��凌 ����慮竜�凌."
+
+#: ../finch/gntplugin.c:268
+msgid "Please open the debug window and try again to see the exact error message."
+msgstr ""
+"�留�留虜留了凌�亮竜 留僚凌溜両�竜 �凌 �留�略慮��凌 留�凌��留了亮略���侶� 虜留旅 ��凌��留慮流��竜 両留僚略 粒旅留 僚留 "
+"隆竜溜�竜 �凌 留虜�旅硫劉� 亮流僚�亮留 ��略了亮留�凌�."
+
+#: ../finch/gntplugin.c:331
+msgid "Select plugin to install"
+msgstr "��旅了劉両�竜 劉僚留 ����慮竜�凌 粒旅留 竜粒虜留�略��留�侶"
+
+#: ../finch/gntplugin.c:357
 msgid "You can (un)load plugins from the following list."
 msgstr "��凌�竜溜�竜 僚留 (留�凌)�凌����竜�竜 �留 ����慮竜�留 留�� �侶僚 留虜�了凌�慮侶 了溜��留."
 
-#: ../finch/gntplugin.c:315
+#: ../finch/gntplugin.c:408
+msgid "Install Plugin..."
+msgstr "�粒虜留�略��留�侶 ��凌�慮劉�凌�..."
+
+#: ../finch/gntplugin.c:418
 msgid "Configure Plugin"
 msgstr "痢�慮亮旅�侶 ��凌�慮劉�凌�"
 
@@ -1234,189 +1431,188 @@
 #. (that should have been "effect," right?)
 #. Back to instant-apply! I win!  BU-HAHAHA!
 #. Create the window
-#: ../finch/gntplugin.c:371 ../finch/gntplugin.c:378 ../finch/gntprefs.c:264
-#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2067
+#: ../finch/gntplugin.c:524 ../finch/gntplugin.c:531 ../finch/gntprefs.c:264
+#: ../finch/gntui.c:103 ../pidgin/gtkdocklet.c:718 ../pidgin/gtkprefs.c:2070
 msgid "Preferences"
 msgstr "��凌�旅亮流�竜旅�"
 
-#: ../finch/gntpounce.c:183 ../pidgin/gtkpounce.c:256
+#: ../finch/gntpounce.c:193 ../pidgin/gtkpounce.c:256
 msgid "Please enter a buddy to pounce."
 msgstr "�留�留虜留了凌�亮竜 竜旅�略粒竜�竜 劉僚留 �溜了凌 粒旅留 僚留 竜�凌�亮流�竜�竜."
 
-#: ../finch/gntpounce.c:328 ../pidgin/gtkpounce.c:517
+#: ../finch/gntpounce.c:338 ../pidgin/gtkpounce.c:524
 msgid "New Buddy Pounce"
 msgstr "�劉留 竜���亮侶�侶 �溜了凌�"
 
-#: ../finch/gntpounce.c:328 ../pidgin/gtkpounce.c:517
+#: ../finch/gntpounce.c:338 ../pidgin/gtkpounce.c:524
 msgid "Edit Buddy Pounce"
 msgstr "��竜両竜�粒留�溜留 竜���亮侶�侶� �溜了凌�"
 
-#: ../finch/gntpounce.c:333
+#: ../finch/gntpounce.c:343
 msgid "Pounce Who"
 msgstr "����亮侶�侶 �竜"
 
 #. Account:
-#: ../finch/gntpounce.c:336 ../finch/gntstatus.c:456
+#: ../finch/gntpounce.c:346 ../finch/gntstatus.c:456
 msgid "Account:"
 msgstr "�凌粒留�旅留�亮��:"
 
-#: ../finch/gntpounce.c:358
+#: ../finch/gntpounce.c:368
 msgid "Buddy name:"
 msgstr "�僚凌亮留 �溜了凌�:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:374 ../pidgin/gtkpounce.c:585
+#: ../finch/gntpounce.c:386 ../pidgin/gtkpounce.c:592
 msgid "Pounce When Buddy..."
 msgstr "����亮侶�侶 ��留僚 凌 �溜了凌�..."
 
-#: ../finch/gntpounce.c:376
+#: ../finch/gntpounce.c:388
 msgid "Signs on"
 msgstr "裡�僚隆劉竜�留旅"
 
-#: ../finch/gntpounce.c:377
+#: ../finch/gntpounce.c:389
 msgid "Signs off"
 msgstr "��凌��僚隆劉竜�留旅"
 
-#: ../finch/gntpounce.c:378
+#: ../finch/gntpounce.c:390
 msgid "Goes away"
 msgstr "�溜僚竜�留旅 留��僚"
 
-#: ../finch/gntpounce.c:379
+#: ../finch/gntpounce.c:391
 msgid "Returns from away"
 msgstr "��旅���劉�竜旅 留�� 留��僚"
 
-#: ../finch/gntpounce.c:380
+#: ../finch/gntpounce.c:392
 msgid "Becomes idle"
 msgstr "�溜僚竜�留旅 留僚竜僚竜�粒��"
 
-#: ../finch/gntpounce.c:381
+#: ../finch/gntpounce.c:393
 msgid "Is no longer idle"
 msgstr "�竜僚 竜溜僚留旅 �旅留 留僚竜僚竜�粒��"
 
-#: ../finch/gntpounce.c:382
+#: ../finch/gntpounce.c:394
 msgid "Starts typing"
 msgstr "�竜虜旅僚略竜旅 僚留 �了侶虜��凌了凌粒竜溜"
 
-#: ../finch/gntpounce.c:383
+#: ../finch/gntpounce.c:395
 msgid "Pauses while typing"
 msgstr "�略僚竜旅 �留��侶 虜留�略 �侶僚 �了侶虜��凌了�粒侶�侶"
 
-#: ../finch/gntpounce.c:384
+#: ../finch/gntpounce.c:396
 msgid "Stops typing"
 msgstr "裡�留亮留�略竜旅 僚留 �了侶虜��凌了凌粒竜溜"
 
-#: ../finch/gntpounce.c:385
+#: ../finch/gntpounce.c:397
 msgid "Sends a message"
 msgstr "裡�劉了僚竜旅 劉僚留 亮流僚�亮留"
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:414 ../pidgin/gtkpounce.c:646
+#: ../finch/gntpounce.c:426 ../pidgin/gtkpounce.c:653
 msgid "Action"
 msgstr "�僚劉�粒竜旅留"
 
-#: ../finch/gntpounce.c:416
+#: ../finch/gntpounce.c:428
 msgid "Open an IM window"
 msgstr "�僚凌旅粒亮留 �留�留慮��凌� 略亮竜�凌� 亮侶僚�亮留�凌�"
 
-#: ../finch/gntpounce.c:417
+#: ../finch/gntpounce.c:429
 msgid "Pop up a notification"
 msgstr "�僚留隆��亮竜僚侶 竜旅隆凌�凌溜侶�侶"
 
-#: ../finch/gntpounce.c:418
+#: ../finch/gntpounce.c:430
 msgid "Send a message"
 msgstr "��凌��凌了流 亮侶僚�亮留�凌�"
 
-#: ../finch/gntpounce.c:419
+#: ../finch/gntpounce.c:431
 msgid "Execute a command"
 msgstr "�虜�劉了竜�侶 竜僚�凌了流�"
 
-#: ../finch/gntpounce.c:420
+#: ../finch/gntpounce.c:432
 msgid "Play a sound"
 msgstr "�僚留�留�留粒�粒流 流�凌�"
 
-#: ../finch/gntpounce.c:448
-msgid "Pounce only when my status is not available"
+#: ../finch/gntpounce.c:460
+msgid "Pounce only when my status is not Available"
 msgstr "����亮侶�侶 亮�僚凌 ��留僚 侶 虜留�略��留�流 亮凌� 竜溜僚留旅 亮侶 隆旅留慮劉�旅亮凌�"
 
-#: ../finch/gntpounce.c:450 ../pidgin/gtkpounce.c:1281
+#: ../finch/gntpounce.c:462 ../pidgin/gtkpounce.c:1294
 msgid "Recurring"
 msgstr "�留�' 竜�留僚略了侶�侶"
 
-#: ../finch/gntpounce.c:618
-#, fuzzy
+#: ../finch/gntpounce.c:630
 msgid "Cannot create pounce"
-msgstr "�竜僚 竜溜僚留旅 隆�僚留�流 侶 留了了留粒流 �凌� �竜�隆�僚�亮凌�"
-
-#: ../finch/gntpounce.c:619
-#, fuzzy
+msgstr "�竜僚 竜溜僚留旅 隆�僚留�流 侶 隆侶亮旅凌��粒溜留 竜���亮侶�侶�"
+
+#: ../finch/gntpounce.c:631
 msgid "You do not have any accounts."
-msgstr "��劉�竜旅 僚留 竜�旅了劉両竜�竜 劉僚留 了凌粒留�旅留�亮�."
-
-#: ../finch/gntpounce.c:620
+msgstr "�竜僚 劉�竜�竜 虜留僚劉僚留 了凌粒留�旅留�亮�."
+
+#: ../finch/gntpounce.c:632
 msgid "You must create an account first before you can create a pounce."
 msgstr ""
-
-#: ../finch/gntpounce.c:662 ../pidgin/gtkpounce.c:1096
+"��劉�竜旅 僚留 隆侶亮旅凌��粒流�竜�竜 劉僚留 了凌粒留�旅留�亮� ���竜 僚留 亮�凌�竜溜�竜 僚留 隆侶亮旅凌��粒流�竜�竜 亮旅留 "
+"竜���亮侶�侶."
+
+#: ../finch/gntpounce.c:674 ../pidgin/gtkpounce.c:1108
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "�溜��竜 �溜粒凌��凌旅 ��旅 慮劉了竜�竜 僚留 隆旅留粒�略�竜�竜 �侶僚 竜���亮侶�侶 %s �凌� %s;"
 
-#: ../finch/gntpounce.c:696 ../finch/gntui.c:84 ../pidgin/gtkpounce.c:1325
+#: ../finch/gntpounce.c:708 ../finch/gntui.c:96 ../pidgin/gtkpounce.c:1337
 msgid "Buddy Pounces"
 msgstr "��凌�亮流�竜旅� �溜了�僚"
 
-#: ../finch/gntpounce.c:810 ../pidgin/gtkpounce.c:1452
+#: ../finch/gntpounce.c:817 ../pidgin/gtkpounce.c:1436
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s 両竜虜溜僚侶�竜 僚留 �了侶虜��凌了凌粒竜溜 �竜 竜�略� (%s)"
 
-#: ../finch/gntpounce.c:812 ../pidgin/gtkpounce.c:1454
+#: ../finch/gntpounce.c:818 ../pidgin/gtkpounce.c:1438
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s 劉虜留僚竜 �留��侶 虜留�略 �侶僚 �了侶虜��凌了�粒侶�流 �凌� �竜 竜�略� (%s)"
 
-#: ../finch/gntpounce.c:814 ../pidgin/gtkpounce.c:1456
+#: ../finch/gntpounce.c:819 ../pidgin/gtkpounce.c:1440
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s ��僚隆劉慮侶虜竜 (%s)"
 
-#: ../finch/gntpounce.c:816 ../pidgin/gtkpounce.c:1458
+#: ../finch/gntpounce.c:820 ../pidgin/gtkpounce.c:1442
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s 隆竜僚 竜溜僚留旅 �旅留 留僚竜僚竜�粒�� (%s)"
 
-#: ../finch/gntpounce.c:818 ../pidgin/gtkpounce.c:1460
+#: ../finch/gntpounce.c:821 ../pidgin/gtkpounce.c:1444
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s 隆竜僚 竜溜僚留旅 �旅留 留��僚 (%s)"
 
-#: ../finch/gntpounce.c:820 ../pidgin/gtkpounce.c:1462
+#: ../finch/gntpounce.c:822 ../pidgin/gtkpounce.c:1446
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s ��留亮略�侶�竜 僚留 �了侶虜��凌了凌粒竜溜 �竜 竜�略� (%s)"
 
-#: ../finch/gntpounce.c:822 ../pidgin/gtkpounce.c:1464
+#: ../finch/gntpounce.c:823 ../pidgin/gtkpounce.c:1448
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s 留�凌��僚隆劉慮侶虜竜 (%s)"
 
-#: ../finch/gntpounce.c:824 ../pidgin/gtkpounce.c:1466
+#: ../finch/gntpounce.c:824 ../pidgin/gtkpounce.c:1450
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s 劉粒旅僚竜 留僚竜僚竜�粒�� (%s)"
 
-#: ../finch/gntpounce.c:826 ../pidgin/gtkpounce.c:1468
+#: ../finch/gntpounce.c:825 ../pidgin/gtkpounce.c:1452
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s 留�凌��旅略龍竜旅. (%s)"
 
-#: ../finch/gntpounce.c:828 ../pidgin/gtkpounce.c:1470
+#: ../finch/gntpounce.c:826 ../pidgin/gtkpounce.c:1454
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s �留� 劉��竜旅了竜 劉僚留 亮流僚�亮留. (%s)"
 
-#: ../finch/gntpounce.c:829 ../pidgin/gtkpounce.c:1471
-#, c-format
+#: ../finch/gntpounce.c:845 ../pidgin/gtkpounce.c:1455
 msgid "Unknown pounce event. Please report this!"
 msgstr "�粒僚���凌 粒竜粒凌僚�� 竜���亮侶�侶�. �留�留虜留了凌�亮竜 留僚留�劉�竜�劉 �凌!"
 
@@ -1424,12 +1620,12 @@
 msgid "Based on keyboard use"
 msgstr "�略�竜旅 �侶� ��流�侶� �凌� �了侶虜��凌了凌粒溜凌�"
 
-#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:1930
+#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:1951
 msgid "From last sent message"
 msgstr "��� �凌 �竜了竜��留溜凌 亮流僚�亮留 �凌� ��略了慮侶虜竜"
 
-#: ../finch/gntprefs.c:96 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:907
-#: ../pidgin/gtkprefs.c:1929 ../pidgin/gtkprefs.c:1943
+#: ../finch/gntprefs.c:96 ../pidgin/gtkprefs.c:848 ../pidgin/gtkprefs.c:856
+#: ../pidgin/gtkprefs.c:1950 ../pidgin/gtkprefs.c:1964
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:333
 msgid "Never"
 msgstr "�凌�劉"
@@ -1446,15 +1642,15 @@
 msgid "Notify buddies when you are typing"
 msgstr "�旅隆凌�凌溜侶�侶 �溜了�僚 ��留僚 �了侶虜��凌了凌粒竜溜�竜"
 
-#: ../finch/gntprefs.c:198
+#: ../finch/gntprefs.c:198 ../finch/plugins/gnthistory.c:153
 msgid "Log format"
 msgstr "�凌��流 虜留�留粒�留�流�"
 
-#: ../finch/gntprefs.c:199
+#: ../finch/gntprefs.c:199 ../finch/plugins/gnthistory.c:143
 msgid "Log IMs"
 msgstr "�留�留粒�留�流 略亮竜��僚 亮侶僚�亮略��僚"
 
-#: ../finch/gntprefs.c:200
+#: ../finch/gntprefs.c:200 ../finch/plugins/gnthistory.c:144
 msgid "Log chats"
 msgstr "�留�留粒�留�流 ��龍侶�流�竜�僚"
 
@@ -1463,206 +1659,211 @@
 msgstr "�留�留粒�留�流 留了了留粒�僚 虜留�略��留�侶�"
 
 #: ../finch/gntprefs.c:207
-#, fuzzy
 msgid "Report Idle time"
-msgstr "�僚留�凌�略 _���僚凌� �凌� 竜溜僚留旅 留僚竜僚竜�粒��:"
+msgstr "�僚留�凌�略 ���僚凌� �凌� 竜溜僚留旅 留僚竜僚竜�粒��"
 
 #: ../finch/gntprefs.c:208
-#, fuzzy
 msgid "Change status when idle"
-msgstr "�了了留粒流 虜留�略��留�侶� ��留僚 竜溜亮留旅 _留僚竜僚竜�粒��"
+msgstr "�了了留粒流 虜留�略��留�侶� ��留僚 竜溜亮留旅 留僚竜僚竜�粒��"
 
 #: ../finch/gntprefs.c:209
-#, fuzzy
 msgid "Minutes before changing status"
-msgstr "_�竜��略 ��旅僚 �侶僚 留了了留粒流 �侶� 虜留�略��留�侶�:"
+msgstr "�竜��略 ��旅僚 �侶僚 留了了留粒流 �侶� 虜留�略��留�侶�"
 
 #: ../finch/gntprefs.c:210
-#, fuzzy
 msgid "Change status to"
-msgstr "�了了留粒流 _虜留�略��留�侶� �竜:"
+msgstr "�了了留粒流 虜留�略��留�侶� �竜"
 
 #. Conversations
-#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:993 ../pidgin/gtkprefs.c:2033
+#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:942 ../pidgin/gtkprefs.c:2037
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:340
 msgid "Conversations"
 msgstr "裡�僚凌亮旅了溜竜�"
 
-#: ../finch/gntprefs.c:260 ../pidgin/gtkprefs.c:1467 ../pidgin/gtkprefs.c:2044
+#: ../finch/gntprefs.c:260 ../finch/plugins/gnthistory.c:151
+#: ../pidgin/gtkprefs.c:1507 ../pidgin/gtkprefs.c:2048
 msgid "Logging"
 msgstr "�留�留粒�留�流"
 
-#: ../finch/gntrequest.c:583
+#: ../finch/gntrequest.c:621
 msgid "Not implemented yet."
 msgstr "�竜僚 劉�竜旅 �了凌�凌旅侶慮竜溜 留虜�亮侶."
 
-#: ../finch/gntrequest.c:659 ../pidgin/gtkrequest.c:1555
-#: ../pidgin/gtkrequest.c:1601
+#: ../finch/gntrequest.c:726 ../pidgin/gtkrequest.c:1552
+#: ../pidgin/gtkrequest.c:1598
 msgid "Save File..."
 msgstr "��凌慮流虜竜��侶 留��竜溜凌�..."
 
-#: ../finch/gntrequest.c:659 ../pidgin/gtkrequest.c:1556
-#: ../pidgin/gtkrequest.c:1602
+#: ../finch/gntrequest.c:726 ../pidgin/gtkrequest.c:1553
+#: ../pidgin/gtkrequest.c:1599
 msgid "Open File..."
 msgstr "�僚凌旅粒亮留 留��竜溜凌�..."
 
-#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:64
+#: ../finch/gntrequest.c:743
+msgid "Choose Location..."
+msgstr "��旅了劉両�竜 �凌�凌慮竜�溜留..."
+
+#: ../finch/gntroomlist.c:208
+msgid "Hit 'Enter' to find more rooms of this category."
+msgstr "�留�流��竜 �凌 'Enter' 粒旅留 僚留 硫�竜溜�竜 �竜�旅����竜�留 隆�亮略�旅留 �竜 留��流 �侶僚 虜留�侶粒凌�溜留."
+
+#: ../finch/gntroomlist.c:273
+msgid "Get"
+msgstr "�流�侶"
+
+#. Create the window.
+#: ../finch/gntroomlist.c:285 ../finch/gntui.c:101 ../pidgin/gtkroomlist.c:530
+msgid "Room List"
+msgstr "�溜��留 隆�亮留�溜�僚"
+
+#: ../finch/gntsound.c:96 ../pidgin/gtksound.c:62
 msgid "Buddy logs in"
 msgstr "� �溜了凌� ��僚隆劉竜�留旅"
 
-#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:65
+#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:63
 msgid "Buddy logs out"
 msgstr "� �溜了凌� 留�凌��僚隆劉竜�留旅"
 
-#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:66
+#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:64
 msgid "Message received"
 msgstr "�流�慮侶虜竜 亮流僚�亮留"
 
-#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:67
+#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:65
 msgid "Message received begins conversation"
 msgstr "�流�慮侶虜竜 亮流僚�亮留 �凌� 両竜虜旅僚略竜旅 ��龍流�侶�侶"
 
-#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:68
+#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:66
 msgid "Message sent"
 msgstr "裡�略了慮侶虜竜 亮流僚�亮留"
 
-#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:69
+#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:67
 msgid "Person enters chat"
 msgstr "里凌 略�凌亮凌 竜旅�劉��竜�留旅 ��侶 ��龍流�侶�侶"
 
-#: ../finch/gntsound.c:103 ../pidgin/gtksound.c:70
+#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:68
 msgid "Person leaves chat"
 msgstr "里凌 略�凌亮凌 留�凌���竜溜 留�� �侶 ��龍流�侶�侶"
 
-#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:71
+#: ../finch/gntsound.c:103 ../pidgin/gtksound.c:69
 msgid "You talk in chat"
 msgstr "�旅了略�竜 �竜 ��龍流�侶�侶"
 
-#: ../finch/gntsound.c:105 ../pidgin/gtksound.c:72
+#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:70
 msgid "Others talk in chat"
 msgstr "�了了凌旅 亮旅了凌�僚 �竜 ��龍流�侶�侶"
 
-#: ../finch/gntsound.c:107 ../pidgin/gtksound.c:75
+#: ../finch/gntsound.c:106 ../pidgin/gtksound.c:73
 msgid "Someone says your screen name in chat"
 msgstr "�略�凌旅凌� 留僚劉�竜�竜 �凌 �僚凌亮略 �留� �竜 ��龍流�侶�侶"
 
-#: ../finch/gntsound.c:361 ../pidgin/gtksound.c:311
+#: ../finch/gntsound.c:362 ../pidgin/gtksound.c:306
 msgid "GStreamer Failure"
 msgstr "��凌���溜留 GStreamer"
 
-#: ../finch/gntsound.c:362 ../pidgin/gtksound.c:312
+#: ../finch/gntsound.c:363 ../pidgin/gtksound.c:307
 msgid "GStreamer failed to initialize."
 msgstr "里凌 GStreamer 留�劉���竜 僚留 留��旅虜凌�凌旅侶慮竜溜."
 
-#: ../finch/gntsound.c:716 ../finch/gntsound.c:802 ../pidgin/gtkprefs.c:1587
-#: ../pidgin/gtkprefs.c:1676 ../pidgin/gtkprefs.c:1872
+#: ../finch/gntsound.c:717 ../finch/gntsound.c:803 ../pidgin/gtkprefs.c:1631
+#: ../pidgin/gtkprefs.c:1720 ../pidgin/gtkprefs.c:1893
 msgid "(default)"
 msgstr "(��凌竜�旅了凌粒流)"
 
-#: ../finch/gntsound.c:729
-#, fuzzy
+#: ../finch/gntsound.c:730
 msgid "Select Sound File ..."
-msgstr "��旅了凌粒流 �留虜劉了凌�..."
-
-#: ../finch/gntsound.c:904
-#, fuzzy
+msgstr "��旅了凌粒流 留��竜溜凌� 流�凌�..."
+
+#: ../finch/gntsound.c:905
 msgid "Sound Preferences"
-msgstr "��凌�旅亮流�竜旅�"
-
-#: ../finch/gntsound.c:915
-#, fuzzy
+msgstr "��凌�旅亮流�竜旅� 流�凌�"
+
+#: ../finch/gntsound.c:916
 msgid "Profiles"
 msgstr "��凌�溜了"
 
-#: ../finch/gntsound.c:954 ../pidgin/gtkprefs.c:1717
+#: ../finch/gntsound.c:955 ../pidgin/gtkprefs.c:1758
 msgid "Automatic"
 msgstr "����亮留�凌"
 
-#: ../finch/gntsound.c:957
-#, fuzzy
+#: ../finch/gntsound.c:958
 msgid "Console Beep"
 msgstr "��旅� 虜凌僚��了留�"
 
-#: ../finch/gntsound.c:958 ../pidgin/gtkprefs.c:1721
+#: ../finch/gntsound.c:959 ../pidgin/gtkprefs.c:1762
 msgid "Command"
 msgstr "�僚�凌了流"
 
-#: ../finch/gntsound.c:959
-#, fuzzy
+#: ../finch/gntsound.c:960
 msgid "No Sound"
-msgstr "律��溜� 流�凌��"
-
-#: ../finch/gntsound.c:961 ../pidgin/gtkprefs.c:1712
+msgstr "律��溜� 流�凌"
+
+#: ../finch/gntsound.c:962 ../pidgin/gtkprefs.c:1753
 msgid "Sound Method"
 msgstr "�劉慮凌隆凌� 流�凌�"
 
-#: ../finch/gntsound.c:966
-#, fuzzy
+#: ../finch/gntsound.c:967
 msgid "Method: "
-msgstr "_�劉慮凌隆凌�:"
-
-#: ../finch/gntsound.c:973
-#, fuzzy, c-format
+msgstr "�劉慮凌隆凌�: "
+
+#: ../finch/gntsound.c:974
+#, c-format
 msgid ""
 "Sound Command\n"
 "(%s for filename)"
 msgstr ""
-"_�僚�凌了流 流�凌�:\n"
+"�僚�凌了流 流�凌�:\n"
 "(%s 粒旅留 �僚凌亮留 留��竜溜凌�)"
 
 #. Sound options
-#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:1756
+#: ../finch/gntsound.c:982 ../pidgin/gtkprefs.c:1784
 msgid "Sound Options"
 msgstr "��旅了凌粒劉� 流�凌�"
 
-#: ../finch/gntsound.c:982
-#, fuzzy
+#: ../finch/gntsound.c:983
 msgid "Sounds when conversation has focus"
-msgstr "��凌� ��留僚 侶 ��僚凌亮旅了溜留 竜溜僚留旅 _竜��旅留�亮劉僚侶"
-
-#: ../finch/gntsound.c:990 ../pidgin/gtkprefs.c:897 ../pidgin/gtkprefs.c:909
-#: ../pidgin/gtkprefs.c:1763 ../pidgin/plugins/timestamp_format.c:42
+msgstr "��凌� ��留僚 侶 ��僚凌亮旅了溜留 竜溜僚留旅 竜��旅留�亮劉僚侶"
+
+#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:846 ../pidgin/gtkprefs.c:858
+#: ../pidgin/gtkprefs.c:1791 ../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:991 ../pidgin/gtkprefs.c:1761
+#: ../finch/gntsound.c:992 ../pidgin/gtkprefs.c:1789
 msgid "Only when available"
 msgstr "��僚凌 ��留僚 竜溜亮留旅 隆旅留慮劉�旅亮凌�"
 
-#: ../finch/gntsound.c:992 ../pidgin/gtkprefs.c:1762
+#: ../finch/gntsound.c:993 ../pidgin/gtkprefs.c:1790
 msgid "Only when not available"
 msgstr "��僚凌 ��留僚 隆竜僚 竜溜亮留旅 隆旅留慮劉�旅亮凌�"
 
-#: ../finch/gntsound.c:999
-#, fuzzy
+#: ../finch/gntsound.c:1000
 msgid "Volume(0-100):"
-msgstr "�僚�留�侶:"
+msgstr "�僚�留�侶(0-100):"
 
 #. Sound events
-#: ../finch/gntsound.c:1018 ../pidgin/gtkprefs.c:1798
+#: ../finch/gntsound.c:1019 ../pidgin/gtkprefs.c:1819
 msgid "Sound Events"
 msgstr "��侶�旅虜略 粒竜粒凌僚��留"
 
-#: ../finch/gntsound.c:1020 ../pidgin/gtkprefs.c:1857
+#: ../finch/gntsound.c:1021 ../pidgin/gtkprefs.c:1878
 msgid "Event"
 msgstr "�竜粒凌僚��"
 
-#: ../finch/gntsound.c:1020
-#, fuzzy
+#: ../finch/gntsound.c:1021
 msgid "File"
-msgstr "��劉���竜"
-
-#: ../finch/gntsound.c:1039 ../pidgin/gtkprefs.c:1876
+msgstr "���竜溜凌"
+
+#: ../finch/gntsound.c:1040 ../pidgin/gtkprefs.c:1897
 msgid "Test"
 msgstr "�凌虜旅亮流"
 
-#: ../finch/gntsound.c:1042 ../pidgin/gtkprefs.c:1880
+#: ../finch/gntsound.c:1043 ../pidgin/gtkprefs.c:1901
 msgid "Reset"
 msgstr "��留僚留�凌�略"
 
-#: ../finch/gntsound.c:1045 ../pidgin/gtkprefs.c:1884
+#: ../finch/gntsound.c:1046 ../pidgin/gtkprefs.c:1905
 msgid "Choose..."
 msgstr "��旅了凌粒流..."
 
@@ -1681,8 +1882,10 @@
 
 #: ../finch/gntstatus.c:183 ../finch/gntstatus.c:539
 #: ../libpurple/protocols/jabber/buddy.c:298
-#: ../libpurple/protocols/jabber/buddy.c:1359
-#: ../libpurple/protocols/novell/novell.c:1484
+#: ../libpurple/protocols/jabber/buddy.c:1363
+#: ../libpurple/protocols/msn/msn.c:733
+#: ../libpurple/protocols/myspace/myspace.c:171
+#: ../libpurple/protocols/novell/novell.c:1493
 #: ../pidgin/gtksavedstatuses.c:500
 msgid "Title"
 msgstr "里溜�了凌�"
@@ -1700,41 +1903,44 @@
 #. not independent
 #. Attributes - each status can have a message.
 #: ../finch/gntstatus.c:183 ../finch/gntstatus.c:564 ../finch/gntstatus.c:576
-#: ../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:1532
-#: ../libpurple/protocols/jabber/jabber.c:1555
-#: ../libpurple/protocols/jabber/jabber.c:1578
+#: ../libpurple/protocols/bonjour/bonjour.c:292
+#: ../libpurple/protocols/bonjour/bonjour.c:299
+#: ../libpurple/protocols/bonjour/bonjour.c:382
+#: ../libpurple/protocols/gg/gg.c:1079 ../libpurple/protocols/gg/gg.c:1587
+#: ../libpurple/protocols/gg/gg.c:1605 ../libpurple/protocols/gg/gg.c:1615
+#: ../libpurple/protocols/gg/gg.c:1621 ../libpurple/protocols/gg/gg.c:1630
+#: ../libpurple/protocols/gg/gg.c:1635 ../libpurple/protocols/irc/irc.c:245
 #: ../libpurple/protocols/jabber/jabber.c:1601
-#: ../libpurple/protocols/jabber/jabber.c:1624
-#: ../libpurple/protocols/jabber/jabber.c:1649
+#: ../libpurple/protocols/jabber/jabber.c:1615
+#: ../libpurple/protocols/jabber/jabber.c:1629
+#: ../libpurple/protocols/jabber/jabber.c:1643
+#: ../libpurple/protocols/jabber/jabber.c:1657
+#: ../libpurple/protocols/jabber/jabber.c:1673
+#: ../libpurple/protocols/msn/msn.c:685 ../libpurple/protocols/msn/msn.c:691
+#: ../libpurple/protocols/msn/msn.c:697 ../libpurple/protocols/msn/msn.c:703
+#: ../libpurple/protocols/msn/msn.c:708 ../libpurple/protocols/msn/msn.c:713
 #: ../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:5554
-#: ../libpurple/protocols/oscar/oscar.c:5772
-#: ../libpurple/protocols/oscar/oscar.c:5786
-#: ../libpurple/protocols/oscar/oscar.c:5802
-#: ../libpurple/protocols/oscar/oscar.c:5809
-#: ../libpurple/protocols/oscar/oscar.c:5816
-#: ../libpurple/protocols/sametime/sametime.c:3286
-#: ../libpurple/protocols/sametime/sametime.c:3292
-#: ../libpurple/protocols/sametime/sametime.c:3298
-#: ../libpurple/protocols/sametime/sametime.c:3377
-#: ../libpurple/protocols/silc/buddy.c:1551
-#: ../libpurple/protocols/silc10/buddy.c:1551
-#: ../libpurple/protocols/simple/simple.c:246
-#: ../libpurple/protocols/yahoo/yahoo.c:3751
-#: ../libpurple/protocols/yahoo/yahoo.c:3757
-#: ../libpurple/protocols/zephyr/zephyr.c:2337
-#: ../pidgin/gtksavedstatuses.c:526 ../pidgin/gtksavedstatuses.c:1010
+#: ../libpurple/protocols/novell/novell.c:2856
+#: ../libpurple/protocols/novell/novell.c:2959
+#: ../libpurple/protocols/novell/novell.c:2965
+#: ../libpurple/protocols/novell/novell.c:2971
+#: ../libpurple/protocols/oscar/oscar.c:5657
+#: ../libpurple/protocols/oscar/oscar.c:5875
+#: ../libpurple/protocols/oscar/oscar.c:5889
+#: ../libpurple/protocols/oscar/oscar.c:5905
+#: ../libpurple/protocols/oscar/oscar.c:5912
+#: ../libpurple/protocols/oscar/oscar.c:5919
+#: ../libpurple/protocols/sametime/sametime.c:3336
+#: ../libpurple/protocols/sametime/sametime.c:3342
+#: ../libpurple/protocols/sametime/sametime.c:3348
+#: ../libpurple/protocols/sametime/sametime.c:3427
+#: ../libpurple/protocols/silc/buddy.c:1554
+#: ../libpurple/protocols/silc10/buddy.c:1554
+#: ../libpurple/protocols/simple/simple.c:247
+#: ../libpurple/protocols/yahoo/yahoo.c:3793
+#: ../libpurple/protocols/yahoo/yahoo.c:3799
+#: ../libpurple/protocols/zephyr/zephyr.c:2349
+#: ../pidgin/gtksavedstatuses.c:526 ../pidgin/gtksavedstatuses.c:1001
 msgid "Message"
 msgstr "�流僚�亮留"
 
@@ -1784,41 +1990,40 @@
 msgid "Save & Use"
 msgstr "��凌慮流虜竜��侶 & 律�流�侶"
 
-#: ../finch/gntui.c:85
+#: ../finch/gntui.c:97
 msgid "Certificates"
-msgstr ""
-
-#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2035
+msgstr "�旅��凌�凌旅侶�旅虜略"
+
+#: ../finch/gntui.c:102 ../pidgin/gtkprefs.c:2039
 msgid "Sounds"
 msgstr "��凌旅"
 
-#: ../finch/gntui.c:91
+#: ../finch/gntui.c:104
 msgid "Statuses"
 msgstr "�留�留��略�竜旅�"
 
 #: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
 #: ../finch/plugins/gntclipboard.c:128
-#, fuzzy
 msgid "Error loading the plugin."
-msgstr "離�流�両留僚 ��略了亮留�留 虜留�略 �凌 留�凌�����亮留 �凌� ��凌�慮劉�凌�."
+msgstr "離�流�両留僚 ��略了亮留�留 虜留�略 �凌 �����亮留 �凌� ��凌�慮劉�凌�."
 
 #: ../finch/plugins/gntclipboard.c:116
-#, fuzzy
 msgid "Couldn't find X display"
-msgstr "�竜僚 流�留僚 隆�僚留�� �凌 略僚凌旅粒亮留 �凌� 留��竜溜凌�"
+msgstr "�竜僚 流�留僚 隆�僚留�流 侶 竜��竜�侶 �侶� 凌慮�僚侶� X"
 
 #: ../finch/plugins/gntclipboard.c:122
-#, fuzzy
 msgid "Couldn't find window"
-msgstr "�竜僚 流�留僚 隆�僚留�� �凌 略僚凌旅粒亮留 �凌� 留��竜溜凌�"
+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 ""
+msgstr "����竜旅�凌 Gnt"
 
 #: ../finch/plugins/gntclipboard.c:160
 msgid "Clipboard plugin"
@@ -1829,6 +2034,8 @@
 "When the gnt clipboard contents change, the contents are made available to "
 "X, if possible."
 msgstr ""
+"��留僚 留了了略龍凌�僚 �留 �竜�旅竜��亮竜僚留 �凌� ��凌�竜溜�凌� gnt, ���竜 留��略 粒溜僚凌僚�留旅 隆旅留慮劉�旅亮留 ��凌 "
+"X, 留僚 留��� 竜溜僚留旅 隆�僚留��."
 
 #: ../finch/plugins/gntgf.c:231
 #, c-format
@@ -1891,16 +2098,16 @@
 msgid "Toaster plugin"
 msgstr ""
 
-#: ../finch/plugins/gnthistory.c:116 ../pidgin/plugins/history.c:120
+#: ../finch/plugins/gnthistory.c:114 ../pidgin/plugins/history.c:125
 #, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
 msgstr "<b>裡�僚凌亮旅了溜留 亮竜 %s ��旅� %s:</b><br>"
 
-#: ../finch/plugins/gnthistory.c:138 ../pidgin/plugins/history.c:147
+#: ../finch/plugins/gnthistory.c:172 ../pidgin/plugins/history.c:153
 msgid "History Plugin Requires Logging"
 msgstr "里凌 ����慮竜�凌 旅��凌�旅虜凌� 留�留旅�竜溜 �侶僚 竜僚竜�粒凌�凌溜侶�侶 虜留�留粒�留�流�"
 
-#: ../finch/plugins/gnthistory.c:139 ../pidgin/plugins/history.c:148
+#: ../finch/plugins/gnthistory.c:173 ../pidgin/plugins/history.c:154
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
 "\n"
@@ -1913,17 +2120,17 @@
 "� 竜僚竜�粒凌�凌溜侶�侶 ��僚 虜留�留粒�留��僚 粒旅留 �留 略亮竜�留 亮侶僚�亮留�留 虜留旅/流 �旅� ��龍侶�流�竜旅� 慮留 "
 "竜僚竜�粒凌�凌旅流�竜旅 �凌 旅��凌�旅虜� 粒旅留 �凌�� 溜隆旅凌�� ���凌�� ��僚凌亮旅了旅�僚."
 
-#: ../finch/plugins/gnthistory.c:179
+#: ../finch/plugins/gnthistory.c:217
 msgid "GntHistory"
 msgstr ""
 
-#: ../finch/plugins/gnthistory.c:181 ../pidgin/plugins/history.c:190
+#: ../finch/plugins/gnthistory.c:219 ../pidgin/plugins/history.c:197
 msgid "Shows recently logged conversations in new conversations."
 msgstr ""
 "�亮�留僚溜龍竜旅 �旅� �����留�留 虜留�留粒竜粒�留亮亮劉僚竜� ��僚凌亮旅了溜竜� 亮劉�留 ��旅� 虜留旅僚凌��旅竜� "
 "��僚凌亮旅了溜竜�."
 
-#: ../finch/plugins/gnthistory.c:182 ../pidgin/plugins/history.c:191
+#: ../finch/plugins/gnthistory.c:220 ../pidgin/plugins/history.c:198
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
@@ -1931,9 +2138,51 @@
 "��留僚 留僚凌溜粒竜旅 亮溜留 僚劉留 ��僚凌亮旅了溜留 留��� �凌 ����慮竜�凌 慮留 竜旅�略粒竜旅 �侶僚 �竜了竜��留溜留 "
 "��僚凌亮旅了溜留 亮劉�留 ��侶僚 ��劉�凌��留."
 
+#: ../finch/plugins/grouping.c:42 ../libpurple/protocols/oscar/oscar.c:738
+msgid "Online"
+msgstr "裡�僚隆竜隆竜亮劉僚凌�"
+
+#: ../finch/plugins/grouping.c:44 ../finch/plugins/grouping.c:145
+#: ../libpurple/protocols/gg/gg.c:1010
+#: ../libpurple/protocols/jabber/buddy.c:2038
+#: ../libpurple/protocols/novell/novell.c:2846
+#: ../libpurple/protocols/oscar/oscar.c:827
+#: ../libpurple/protocols/oscar/oscar.c:5707
+#: ../libpurple/protocols/qq/qq.c:171 ../libpurple/protocols/qq/qq.c:178
+#: ../libpurple/protocols/qq/qq.c:293
+#: ../libpurple/protocols/yahoo/yahoo.c:3136 ../libpurple/status.c:154
+#: ../pidgin/gtkblist.c:3297 ../pidgin/gtkblist.c:3679
+#: ../pidgin/gtkdocklet.c:561 ../pidgin/gtkstatusbox.c:1085
+msgid "Offline"
+msgstr "律��溜� ��僚隆竜�侶"
+
+#: ../finch/plugins/grouping.c:117 ../pidgin/gtkblist.c:3336
+msgid "Online Buddies"
+msgstr "裡�僚隆竜隆竜亮劉僚凌旅 �溜了凌旅"
+
+#: ../finch/plugins/grouping.c:117
+msgid "Offline Buddies"
+msgstr "�侶 ��僚隆竜隆竜亮劉僚凌旅 �溜了凌旅"
+
+#: ../finch/plugins/grouping.c:127
+msgid "Online/Offline"
+msgstr "(���)��僚隆竜隆竜亮劉僚凌旅"
+
+#: ../finch/plugins/grouping.c:168
+msgid "Meebo"
+msgstr ""
+
+#: ../finch/plugins/grouping.c:217
+msgid "No Grouping"
+msgstr "律��溜� 凌亮留隆凌�凌溜侶�侶"
+
+#: ../finch/plugins/grouping.c:257 ../finch/plugins/grouping.c:258
+msgid "Provides alternate buddylist grouping options."
+msgstr "�留�劉�竜旅 竜僚留了了留虜�旅虜劉� 竜�旅了凌粒劉� 凌亮留隆凌�凌溜侶�侶� �侶� 了溜��留� �溜了�僚."
+
 #: ../finch/plugins/lastlog.c:69
 msgid "Lastlog"
-msgstr ""
+msgstr "Lastlog"
 
 #. Translator Note: The "backlog" is the conversation buffer/history.
 #: ../finch/plugins/lastlog.c:100
@@ -1946,91 +2195,90 @@
 
 #: ../finch/plugins/lastlog.c:124 ../finch/plugins/lastlog.c:125
 msgid "Lastlog plugin."
-msgstr ""
-
-#: ../libpurple/account.c:791
+msgstr "����慮竜�凌 lastlog."
+
+#: ../libpurple/account.c:886
 msgid "accounts"
 msgstr "了凌粒留�旅留�亮凌溜"
 
-#: ../libpurple/account.c:958 ../libpurple/protocols/jabber/auth.c:195
+#: ../libpurple/account.c:1061 ../libpurple/protocols/jabber/auth.c:199
 msgid "Password is required to sign on."
 msgstr "��留旅�竜溜�留旅 虜�隆旅虜�� 粒旅留 僚留 粒溜僚竜旅 ��僚隆竜�侶."
 
-#: ../libpurple/account.c:992
+#: ../libpurple/account.c:1095
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "�旅�略粒竜�竜 �凌僚 虜�隆旅虜� 粒旅留 %s (%s)"
 
-#: ../libpurple/account.c:999
+#: ../libpurple/account.c:1102
 msgid "Enter Password"
 msgstr "�旅�留粒�粒流 虜�隆旅虜凌�"
 
-#: ../libpurple/account.c:1004
+#: ../libpurple/account.c:1107
 msgid "Save password"
 msgstr "��凌慮流虜竜��侶 虜�隆旅虜凌�"
 
-#: ../libpurple/account.c:1039 ../libpurple/connection.c:105
-#: ../libpurple/connection.c:178
+#: ../libpurple/account.c:1142 ../libpurple/connection.c:118
+#: ../libpurple/connection.c:191
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "�竜溜�竜旅 �凌 ����慮竜�凌 ����凌虜�了了凌� 粒旅留 %s"
 
-#: ../libpurple/account.c:1041 ../libpurple/connection.c:108
-#: ../pidgin/gtkblist.c:4036
+#: ../libpurple/account.c:1144 ../libpurple/connection.c:121
 msgid "Connection Error"
 msgstr "裡�略了亮留 ��僚隆竜�侶�"
 
-#: ../libpurple/account.c:1199 ../libpurple/protocols/gg/gg.c:707
-#: ../libpurple/protocols/jabber/jabber.c:1687
+#: ../libpurple/account.c:1355 ../libpurple/protocols/gg/gg.c:708
+#: ../libpurple/protocols/jabber/jabber.c:1729
 msgid "New passwords do not match."
 msgstr "�旅 僚劉凌旅 虜�隆旅虜凌溜 隆竜僚 �留旅�旅略龍凌�僚."
 
-#: ../libpurple/account.c:1208
+#: ../libpurple/account.c:1364
 msgid "Fill out all fields completely."
 msgstr "裡�亮�了侶����竜 �了留 �留 �竜隆溜留."
 
-#: ../libpurple/account.c:1231
+#: ../libpurple/account.c:1387
 msgid "Original password"
 msgstr "�留了旅�� 虜�隆旅虜��"
 
-#: ../libpurple/account.c:1238
+#: ../libpurple/account.c:1394
 msgid "New password"
 msgstr "�劉凌� 虜�隆旅虜��"
 
-#: ../libpurple/account.c:1245
+#: ../libpurple/account.c:1401
 msgid "New password (again)"
 msgstr "�劉凌� 虜�隆旅虜�� (両留僚略)"
 
-#: ../libpurple/account.c:1251
+#: ../libpurple/account.c:1407
 #, c-format
 msgid "Change password for %s"
 msgstr "�了了留粒流 虜�隆旅虜凌� 粒旅留 %s"
 
-#: ../libpurple/account.c:1259
+#: ../libpurple/account.c:1415
 msgid "Please enter your current password and your new password."
 msgstr "�留�留虜留了凌�亮竜 竜旅�略粒竜�竜 �凌僚 �留了旅� 虜留旅 �凌僚 虜留旅僚凌��旅凌 虜�隆旅虜� �留�."
 
-#: ../libpurple/account.c:1290
+#: ../libpurple/account.c:1446
 #, c-format
 msgid "Change user information for %s"
 msgstr "�了了留粒流 �了侶�凌�凌�旅�僚 ��流��侶 粒旅留 %s"
 
-#: ../libpurple/account.c:1293 ../libpurple/protocols/toc/toc.c:1670
+#: ../libpurple/account.c:1449 ../libpurple/protocols/toc/toc.c:1670
 msgid "Set User Info"
 msgstr "��旅�亮�� �了侶�凌�凌�旅�僚 ��流��侶"
 
-#: ../libpurple/account.c:1764 ../libpurple/protocols/gg/gg.c:1017
-#: ../libpurple/protocols/jabber/buddy.c:782
-#: ../libpurple/protocols/jabber/buddy.c:2027
-#: ../libpurple/protocols/jabber/buddy.c:2044
-#: ../libpurple/protocols/novell/novell.c:2831
-#: ../libpurple/protocols/qq/qq.c:232 ../pidgin/gtkft.c:160
+#: ../libpurple/account.c:1920 ../libpurple/protocols/gg/gg.c:1019
+#: ../libpurple/protocols/jabber/buddy.c:784
+#: ../libpurple/protocols/jabber/buddy.c:2034
+#: ../libpurple/protocols/jabber/buddy.c:2051
+#: ../libpurple/protocols/novell/novell.c:2849
+#: ../libpurple/protocols/qq/qq.c:233 ../pidgin/gtkft.c:166
 msgid "Unknown"
 msgstr "�粒僚���凌"
 
-#: ../libpurple/blist.c:521 ../libpurple/blist.c:1320
-#: ../libpurple/blist.c:1552 ../libpurple/protocols/jabber/roster.c:69
-#: ../libpurple/protocols/myspace/myspace.c:3244 ../pidgin/gtkblist.c:5373
+#: ../libpurple/blist.c:521 ../libpurple/blist.c:1348
+#: ../libpurple/blist.c:1558 ../libpurple/protocols/jabber/roster.c:69
+#: ../libpurple/protocols/myspace/myspace.c:3433 ../pidgin/gtkblist.c:6188
 #: ../pidgin/plugins/gevolution/gevo-util.c:67
 #: ../pidgin/plugins/gevolution/gevolution.c:96
 msgid "Buddies"
@@ -2040,17 +2288,17 @@
 msgid "buddy list"
 msgstr "了溜��留 �溜了�僚"
 
-#: ../libpurple/certificate.c:545
+#: ../libpurple/certificate.c:558
 msgid "(DOES NOT MATCH)"
-msgstr ""
+msgstr "(��� 里��痢�����)"
 
 #. Make messages
-#: ../libpurple/certificate.c:549
+#: ../libpurple/certificate.c:562
 #, c-format
 msgid "%s has presented the following certificate for just-this-once use:"
-msgstr ""
-
-#: ../libpurple/certificate.c:550
+msgstr "%s �留�凌��溜留�竜 �凌 留虜�了凌�慮凌 �旅��凌�凌旅侶�旅虜� 亮�僚凌 粒旅留 ���留:"
+
+#: ../libpurple/certificate.c:563
 #, c-format
 msgid ""
 "Common name: %s %s\n"
@@ -2058,93 +2306,81 @@
 msgstr ""
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:555
+#: ../libpurple/certificate.c:568
 msgid "Single-use Certificate Verification"
-msgstr ""
+msgstr "��旅硫竜硫留溜��侶 �旅��凌�凌旅侶�旅虜凌� 亮�僚凌 粒旅留 亮旅留 �凌�略"
 
 #. Scheme name
 #. Pool name
-#: ../libpurple/certificate.c:872
+#: ../libpurple/certificate.c:894
 msgid "Certificate Authorities"
 msgstr ""
 
 #. Scheme name
 #. Pool name
-#: ../libpurple/certificate.c:1040
+#: ../libpurple/certificate.c:1062
 msgid "SSL Peers Cache"
 msgstr ""
 
 #. Make messages
-#: ../libpurple/certificate.c:1171
-#, fuzzy, c-format
+#: ../libpurple/certificate.c:1193
+#, c-format
 msgid "Accept certificate for %s?"
-msgstr "��凌隆凌�流 ����虜了侶�侶� ��龍流�侶�侶�;"
+msgstr "��凌隆凌�流 �旅��凌�凌旅侶�旅虜凌� 粒旅留 %s;"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1177
+#: ../libpurple/certificate.c:1199
 msgid "SSL Certificate Verification"
-msgstr ""
+msgstr "��旅硫竜硫留溜��侶 �旅��凌�凌旅侶�旅虜凌� SSL"
 
 #. Number of actions
-#: ../libpurple/certificate.c:1186
-#, fuzzy
+#: ../libpurple/certificate.c:1208
 msgid "Accept"
-msgstr "_��凌隆凌�流"
-
-#: ../libpurple/certificate.c:1187 ../libpurple/protocols/qq/buddy_opt.c:214
+msgstr "��凌隆凌�流"
+
+#: ../libpurple/certificate.c:1209 ../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
+#: ../libpurple/protocols/qq/group_opt.c:103
+#: ../libpurple/protocols/qq/sys_msg.c:91
+#: ../libpurple/protocols/qq/sys_msg.c:249
 msgid "Reject"
 msgstr "�����旅�侶"
 
-#: ../libpurple/certificate.c:1188
+#: ../libpurple/certificate.c:1210
 msgid "_View Certificate..."
-msgstr ""
-
-#. 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 ""
+msgstr "_��凌硫凌了流 �旅��凌�凌旅侶�旅虜凌�..."
 
 #. Prompt the user to authenticate the certificate
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1313
+#: ../libpurple/certificate.c:1311
 #, c-format
 msgid ""
 "The certificate presented by \"%s\" is self-signed. It cannot be "
 "automatically checked."
 msgstr ""
-
-#: ../libpurple/certificate.c:1331
+"里凌 �旅��凌�凌旅侶�旅虜� �凌� �留� �留�凌��旅略��侶虜竜 留�� \"%s\" 劉�竜旅 ��凌���旅虜流 ��凌粒�留�流. "
+"�竜僚 亮�凌�竜溜 僚留 竜了竜粒�慮竜溜 留���亮留�留."
+
+#: ../libpurple/certificate.c:1329
 #, c-format
 msgid "The certificate chain presented for %s is not valid."
-msgstr ""
+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
-#, fuzzy
+#: ../libpurple/certificate.c:1337 ../libpurple/certificate.c:1407
 msgid "SSL Certificate Error"
-msgstr "裡�略了亮留 竜粒粒�留�流�"
-
-#: ../libpurple/certificate.c:1340
-#, fuzzy
+msgstr "裡�略了亮留 �旅��凌�凌旅侶�旅虜凌� SSL"
+
+#: ../libpurple/certificate.c:1338
 msgid "Invalid certificate chain"
-msgstr "�侶 劉粒虜��凌� �溜�了凌�"
+msgstr "�侶 劉粒虜��侶 留了��溜隆留 �旅��凌�凌旅侶�旅虜凌�"
 
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1360
+#: ../libpurple/certificate.c:1359
 msgid ""
 "You have no database of root certificates, so this certificate cannot be "
 "validated."
@@ -2152,11 +2388,10 @@
 
 #. 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
+msgid "The root certificate this one claims to be issued by is unknown to Pidgin."
+msgstr ""
+
+#: ../libpurple/certificate.c:1399
 #, c-format
 msgid ""
 "The certificate chain presented by %s does not have a valid digital "
@@ -2164,12 +2399,26 @@
 "signature."
 msgstr ""
 
-#: ../libpurple/certificate.c:1417
+#: ../libpurple/certificate.c:1408
 msgid "Invalid certificate authority signature"
 msgstr ""
 
+#. 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:1434
+#, 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\".  ���� 亮�凌�竜溜 僚留 �侶亮留溜僚竜旅 ��旅 隆竜僚 竜溜��竜 ��僚隆竜隆竜亮劉僚凌旅 亮竜 �侶僚 ��侶�竜�溜留 "
+"�凌� 僚凌亮溜龍竜�竜 ��旅 竜溜��竜."
+
 #. Make messages
-#: ../libpurple/certificate.c:1881
+#: ../libpurple/certificate.c:1896
 #, c-format
 msgid ""
 "Common name: %s\n"
@@ -2181,34 +2430,35 @@
 msgstr ""
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1890
-#, fuzzy
+#: ../libpurple/certificate.c:1905
 msgid "Certificate Information"
-msgstr "�了侶�凌�凌�溜竜� 竜両��侶�竜�侶�流"
-
-#: ../libpurple/connection.c:107
+msgstr "�了侶�凌�凌�溜竜� �旅��凌�凌旅侶�旅虜凌�"
+
+#: ../libpurple/connection.c:120
 msgid "Registration Error"
 msgstr "裡�略了亮留 虜留�留���侶�侶�"
 
-#: ../libpurple/connection.c:180
-#, fuzzy
+#: ../libpurple/connection.c:193
 msgid "Unregistration Error"
-msgstr "裡�略了亮留 虜留�留���侶�侶�"
-
-#: ../libpurple/connection.c:350
+msgstr "裡�略了亮留 隆旅留粒�留�流�"
+
+#: ../libpurple/connection.c:347
 #, c-format
 msgid "+++ %s signed on"
 msgstr "+++ %s ��僚隆劉慮侶虜竜"
 
-#: ../libpurple/connection.c:380
+#: ../libpurple/connection.c:377
 #, c-format
 msgid "+++ %s signed off"
 msgstr "+++ %s 留�凌��僚隆劉慮侶虜竜"
 
-#: ../libpurple/connection.c:497 ../libpurple/plugin.c:282
-#: ../libpurple/protocols/jabber/buddy.c:2337
+#: ../libpurple/connection.c:530 ../libpurple/plugin.c:277
+#: ../libpurple/protocols/jabber/buddy.c:2354
 #: ../libpurple/protocols/msn/servconn.c:141
-#: ../libpurple/protocols/msn/session.c:322
+#: ../libpurple/protocols/msn/session.c:377
+#: ../libpurple/protocols/msnp9/servconn.c:139
+#: ../libpurple/protocols/msnp9/session.c:329
+#: ../libpurple/protocols/oscar/family_chatnav.c:63
 msgid "Unknown error"
 msgstr "�粒僚���凌 ��略了亮留"
 
@@ -2225,45 +2475,45 @@
 msgid "The message is too large."
 msgstr "里凌 亮流僚�亮留 竜溜僚留旅 �凌了� 亮竜粒略了凌."
 
-#: ../libpurple/conversation.c:183 ../libpurple/protocols/bonjour/jabber.c:255
-#: ../libpurple/protocols/bonjour/jabber.c:298
+#: ../libpurple/conversation.c:183 ../libpurple/protocols/bonjour/jabber.c:272
+#: ../libpurple/protocols/bonjour/jabber.c:315
 msgid "Unable to send message."
 msgstr "�隆�僚留�凌 僚留 ��留了竜溜 �凌 亮流僚�亮留."
 
-#: ../libpurple/conversation.c:1211
+#: ../libpurple/conversation.c:1218
 msgid "Send Message"
 msgstr "��凌��凌了流 亮侶僚�亮留�凌�"
 
-#: ../libpurple/conversation.c:1214
+#: ../libpurple/conversation.c:1221
 msgid "_Send Message"
 msgstr "_��凌��凌了流 亮侶僚�亮留�凌�"
 
-#: ../libpurple/conversation.c:1620
+#: ../libpurple/conversation.c:1627
 #, c-format
 msgid "%s entered the room."
 msgstr "%s 亮�流虜竜 ��凌 隆�亮略�旅凌."
 
-#: ../libpurple/conversation.c:1623
+#: ../libpurple/conversation.c:1630
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] 亮�流虜竜 ��凌 隆�亮略�旅凌."
 
-#: ../libpurple/conversation.c:1733
+#: ../libpurple/conversation.c:1740
 #, c-format
 msgid "You are now known as %s"
 msgstr "里��留 竜溜��竜 粒僚���凌溜 �� %s"
 
-#: ../libpurple/conversation.c:1753
+#: ../libpurple/conversation.c:1760
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s ���留 竜溜僚留旅 粒僚����� �� %s"
 
-#: ../libpurple/conversation.c:1828
+#: ../libpurple/conversation.c:1835
 #, c-format
 msgid "%s left the room."
 msgstr "%s 劉��粒竜 留�� �凌 隆�亮略�旅凌."
 
-#: ../libpurple/conversation.c:1831
+#: ../libpurple/conversation.c:1838
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s 劉��粒竜 留�� �凌 隆�亮略�旅凌 (%s)."
@@ -2283,7 +2533,7 @@
 msgid "Failed to get serv name: %s"
 msgstr "��凌���溜留 了流�侶� 凌僚凌亮留�溜留� 竜両��侶�竜�侶�流: %s"
 
-#: ../libpurple/dbus-server.h:85
+#: ../libpurple/dbus-server.h:84
 msgid "Purple's D-BUS server is not running for the reason listed below"
 msgstr ""
 
@@ -2291,15 +2541,15 @@
 msgid "No name"
 msgstr "律��溜� �僚凌亮留"
 
-#: ../libpurple/dnsquery.c:511
+#: ../libpurple/dnsquery.c:532
 msgid "Unable to create new resolver process\n"
 msgstr ""
 
-#: ../libpurple/dnsquery.c:516
+#: ../libpurple/dnsquery.c:537
 msgid "Unable to send request to resolver process\n"
 msgstr ""
 
-#: ../libpurple/dnsquery.c:549 ../libpurple/dnsquery.c:697
+#: ../libpurple/dnsquery.c:570 ../libpurple/dnsquery.c:719
 #, c-format
 msgid ""
 "Error resolving %s:\n"
@@ -2308,34 +2558,33 @@
 "裡�略了亮留 虜留�略 �侶僚 竜��竜�侶 �凌� %s: \n"
 "%s"
 
-#: ../libpurple/dnsquery.c:552 ../libpurple/dnsquery.c:711
-#: ../libpurple/dnsquery.c:831
+#: ../libpurple/dnsquery.c:573 ../libpurple/dnsquery.c:733
+#: ../libpurple/dnsquery.c:851
 #, c-format
 msgid "Error resolving %s: %d"
 msgstr "裡�略了亮留 虜留�略 �侶僚 竜��竜�侶 �凌� %s: %d"
 
-#: ../libpurple/dnsquery.c:574
+#: ../libpurple/dnsquery.c:595
 #, c-format
 msgid ""
 "Error reading from resolver process:\n"
 "%s"
 msgstr ""
 
-#: ../libpurple/dnsquery.c:578
-#, c-format
+#: ../libpurple/dnsquery.c:599
 msgid "EOF while reading from resolver process"
 msgstr ""
 
-#: ../libpurple/dnsquery.c:761
+#: ../libpurple/dnsquery.c:783
 #, c-format
 msgid "Thread creation failure: %s"
 msgstr ""
 
-#: ../libpurple/dnsquery.c:762
+#: ../libpurple/dnsquery.c:784
 msgid "Unknown reason"
 msgstr "�粒僚���侶 留旅�溜留"
 
-#: ../libpurple/ft.c:209
+#: ../libpurple/ft.c:210
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -2344,7 +2593,7 @@
 "裡�略了亮留 虜留�略 �侶僚 留僚略粒僚��侶 �凌� %s: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:213
+#: ../libpurple/ft.c:214
 #, c-format
 msgid ""
 "Error writing %s: \n"
@@ -2353,7 +2602,7 @@
 "裡�略了亮留 虜留�略 �侶僚 竜粒粒�留�流 �凌� %s: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:217
+#: ../libpurple/ft.c:218
 #, c-format
 msgid ""
 "Error accessing %s: \n"
@@ -2362,41 +2611,41 @@
 "裡�略了亮留 虜留�略 �侶僚 ��凌��劉了留�侶 �凌� %s: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:253
+#: ../libpurple/ft.c:254
 msgid "Directory is not writable."
 msgstr "� 虜留�略了凌粒凌� 隆竜僚 竜溜僚留旅 竜粒粒�略�旅亮凌�."
 
-#: ../libpurple/ft.c:268
+#: ../libpurple/ft.c:269
 msgid "Cannot send a file of 0 bytes."
 msgstr "�竜僚 竜溜僚留旅 隆�僚留�� 僚留 ��留了竜溜 留��竜溜凌 亮竜粒劉慮凌�� 0 bytes."
 
-#: ../libpurple/ft.c:278
+#: ../libpurple/ft.c:279
 msgid "Cannot send a directory."
 msgstr "�隆�僚留�凌 僚留 ��留了竜溜 虜留�略了凌粒凌�."
 
-#: ../libpurple/ft.c:287
+#: ../libpurple/ft.c:288
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr ""
 "里凌 %s 隆竜僚 竜溜僚留旅 劉僚留 ��僚侶慮旅�亮劉僚凌 留��竜溜凌. �竜僚 竜溜僚留旅 虜留了流 旅隆劉留 侶 留僚�旅虜留�略��留�流 "
 "�凌�.\n"
 
-#: ../libpurple/ft.c:347
+#: ../libpurple/ft.c:348
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s 慮劉了竜旅 僚留 �留� ��竜溜了竜旅 �凌 %s (%s)"
 
-#: ../libpurple/ft.c:354
+#: ../libpurple/ft.c:355
 #, c-format
 msgid "%s wants to send you a file"
 msgstr "%s 慮劉了竜旅 僚留 �留� ��竜溜了竜旅 劉僚留 留��竜溜凌"
 
-#: ../libpurple/ft.c:397
+#: ../libpurple/ft.c:398
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "��凌隆凌�流 留旅�流亮留�凌� 亮竜�留�凌�略� 留��竜溜凌� 留�� %s;"
 
-#: ../libpurple/ft.c:401
+#: ../libpurple/ft.c:402
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -2407,62 +2656,60 @@
 "��凌亮留虜���亮劉僚凌� ��凌了凌粒旅��流�: %s\n"
 "��凌亮留虜���亮劉僚侶 慮��留: %d"
 
-#: ../libpurple/ft.c:436
+#: ../libpurple/ft.c:437
 #, c-format
 msgid "%s is offering to send file %s"
 msgstr "%s ��凌��劉�竜�留旅 僚留 ��竜溜了竜旅 �凌 留��竜溜凌 %s"
 
-#: ../libpurple/ft.c:488
+#: ../libpurple/ft.c:490
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "里凌 %s 隆竜僚 竜溜僚留旅 劉粒虜��凌 �僚凌亮留 留��竜溜凌�.\n"
 
-#: ../libpurple/ft.c:509
+#: ../libpurple/ft.c:511
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "��凌��凌�略 留�凌��凌了流� �凌� %s �竜 %s"
 
-#: ../libpurple/ft.c:521
+#: ../libpurple/ft.c:523
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr "�虜虜溜僚侶�侶 亮竜�留�凌�略� �凌� %s 留�� %s"
 
-#: ../libpurple/ft.c:682
+#: ../libpurple/ft.c:700
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "� 亮竜�留�凌�略 �凌� 留��竜溜凌� %s 凌了凌虜了侶��慮侶虜竜"
 
-#: ../libpurple/ft.c:685
-#, c-format
+#: ../libpurple/ft.c:703
 msgid "File transfer complete"
 msgstr "�竜�留�凌�略 留��竜溜凌� 凌了凌虜了侶��慮侶虜竜"
 
-#: ../libpurple/ft.c:1103
+#: ../libpurple/ft.c:1138
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "�虜����留�竜 �侶 亮竜�留�凌�略 �凌� %s"
 
-#: ../libpurple/ft.c:1108
-#, c-format
+#: ../libpurple/ft.c:1143
 msgid "File transfer cancelled"
 msgstr "�竜�留�凌�略 留��竜溜凌� 留虜���慮侶虜竜"
 
-#: ../libpurple/ft.c:1166
+#: ../libpurple/ft.c:1201
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s 留虜����竜 �侶 亮竜�留�凌�略 �凌� 留��竜溜凌� %s"
 
-#: ../libpurple/ft.c:1171
+#: ../libpurple/ft.c:1206
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s 留虜����竜 �侶 亮竜�留�凌�略 �凌� 留��竜溜凌�"
 
-#: ../libpurple/ft.c:1228
+#: ../libpurple/ft.c:1263
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "� 亮竜�留�凌�略 留��竜溜凌� �竜 %s 留�劉���竜."
 
-#: ../libpurple/ft.c:1230
+#: ../libpurple/ft.c:1265
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "� 亮竜�留�凌�略 留��竜溜凌� 留�� %s 留�劉���竜."
@@ -2641,30 +2888,29 @@
 
 #: ../libpurple/log.c:183
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
-msgstr ""
-"<b><font color=\"red\">� 虜留�留粒�留�劉留� 隆竜僚 劉�竜旅 了竜旅�凌��粒溜留 留僚略粒僚��侶�</font></b>"
-
-#: ../libpurple/log.c:598
+msgstr "<b><font color=\"red\">� 虜留�留粒�留�劉留� 隆竜僚 劉�竜旅 了竜旅�凌��粒溜留 留僚略粒僚��侶�</font></b>"
+
+#: ../libpurple/log.c:597
 msgid "HTML"
 msgstr "HTML"
 
-#: ../libpurple/log.c:612
+#: ../libpurple/log.c:611
 msgid "Plain text"
 msgstr "裡虜劉�凌 虜竜溜亮竜僚凌"
 
-#: ../libpurple/log.c:626
+#: ../libpurple/log.c:625
 msgid "Old flat format"
 msgstr ""
 
-#: ../libpurple/log.c:839
+#: ../libpurple/log.c:838
 msgid "Logging of this conversation failed."
 msgstr "��凌���溜留 虜留�留粒�留�流� 留��流� �侶� ��僚凌亮旅了溜留�."
 
-#: ../libpurple/log.c:1282
+#: ../libpurple/log.c:1281
 msgid "XML"
 msgstr "XML"
 
-#: ../libpurple/log.c:1366
+#: ../libpurple/log.c:1365
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -2673,7 +2919,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;�離里���里� "
 "����里�裡�&gt;:</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1368
+#: ../libpurple/log.c:1367
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -2682,47 +2928,44 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;�離里���里� "
 "����里�裡�&gt;:</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1426 ../libpurple/log.c:1559
+#: ../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:1438 ../libpurple/log.c:1568
+msgstr "<font color=\"red\"><b>�隆�僚留�侶 侶 竜��竜�侶 �侶� 隆旅留隆�凌亮流� 虜留�留粒�留�流�!</b></font>"
+
+#: ../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:1500
+msgstr "<font color=\"red\"><b>�竜僚 流�留僚 隆�僚留�� 僚留 隆旅留硫留��竜溜 �凌 留��竜溜凌: %s</b></font>"
+
+#: ../libpurple/log.c:1499
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <�離里���里�-����里�裡�>: %s\n"
 
-#: ../libpurple/plugin.c:365
+#: ../libpurple/plugin.c:360
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "律�侶�旅亮凌�凌旅竜溜�竜 �凌 %s, 留了了略 留��� �凌 ����慮竜�凌 留�留旅�竜溜 �凌 %s."
 
-#: ../libpurple/plugin.c:380
-#, c-format
+#: ../libpurple/plugin.c:375
 msgid "This plugin has not defined an ID."
 msgstr "���� �凌 ����慮竜�凌 隆竜僚 劉�竜旅 留僚留粒僚��旅��旅虜� ID."
 
-#: ../libpurple/plugin.c:448
+#: ../libpurple/plugin.c:443
 #, c-format
 msgid "Plugin magic mismatch %d (need %d)"
 msgstr ""
 
-#: ../libpurple/plugin.c:465
+#: ../libpurple/plugin.c:460
 #, c-format
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
 msgstr "�竜僚 �留旅�旅略龍凌�僚 凌旅 竜虜隆��竜旅� ABI %d.%d.x (��竜旅略龍竜�留旅 %d.%d.x)"
 
-#: ../libpurple/plugin.c:482
+#: ../libpurple/plugin.c:477
 msgid "Plugin does not implement all required functions"
 msgstr "里凌 ����慮竜�凌 隆竜僚 留僚�留�凌虜�溜僚竜�留旅 �竜 �了竜� �旅� 留�留旅�凌�亮竜僚竜� 了竜旅�凌��粒溜竜�"
 
-#: ../libpurple/plugin.c:547
+#: ../libpurple/plugin.c:542
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
@@ -2731,27 +2974,23 @@
 "里凌 留�留�留溜�侶�凌 ����慮竜�凌 %s 隆竜 硫�劉慮侶虜竜. �留�留虜留了凌�亮竜 竜粒虜留�留��流��竜 �凌 ����慮竜�凌 "
 "虜留旅 ��凌��留慮流��竜 両留僚略."
 
-#: ../libpurple/plugin.c:552
+#: ../libpurple/plugin.c:547
 msgid "Unable to load the plugin"
 msgstr "�隆�僚留亮溜留 �凌���亮留�凌� �凌� ��凌�慮劉�凌�"
 
-#: ../libpurple/plugin.c:574
+#: ../libpurple/plugin.c:569
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "里凌 留�留�留溜�侶�凌 ����慮竜�凌 %s 隆竜僚 流�留僚 隆�僚留�� 僚留 �凌���慮竜溜."
 
-#: ../libpurple/plugin.c:578
+#: ../libpurple/plugin.c:573
 msgid "Unable to load your plugin."
 msgstr "�隆�僚留亮溜留 �凌���亮留�凌� �凌� ��凌�慮劉�凌� �留�."
 
-#: ../libpurple/plugin.c:677
-#, c-format
-msgid "The dependent plugin %s failed to unload."
-msgstr "里凌 竜両留���亮竜僚凌 ����慮竜�凌 %s 留�劉���竜 僚留 �凌���慮竜溜."
-
-#: ../libpurple/plugin.c:681
-msgid "There were errors unloading the plugin."
-msgstr "離�流�両留僚 ��略了亮留�留 虜留�略 �凌 留�凌�����亮留 �凌� ��凌�慮劉�凌�."
+#: ../libpurple/plugin.c:663
+#, c-format
+msgid "%s requires %s, but it failed to unload."
+msgstr "%s 留�留旅�竜溜 %s, 留了了略 留�劉���竜 僚留 留�凌�凌���慮竜溜."
 
 #: ../libpurple/plugins/autoaccept.c:23
 msgid "Autoaccept"
@@ -2759,8 +2998,7 @@
 
 #: ../libpurple/plugins/autoaccept.c:25 ../libpurple/plugins/autoaccept.c:26
 msgid "Auto-accept file transfer requests from selected users."
-msgstr ""
-"����亮留�侶 留�凌隆凌�流 留旅�流亮留�凌� 亮竜�留�凌�略� 留��竜溜凌� 留�� �凌�� 竜�旅了竜粒亮劉僚凌�� ��流��竜�."
+msgstr "����亮留�侶 留�凌隆凌�流 留旅�流亮留�凌� 亮竜�留�凌�略� 留��竜溜凌� 留�� �凌�� 竜�旅了竜粒亮劉僚凌�� ��流��竜�."
 
 #: ../libpurple/plugins/autoaccept.c:80
 #, c-format
@@ -2771,50 +3009,50 @@
 msgid "Autoaccept complete"
 msgstr "� 留���亮留�侶 留�凌隆凌�流 凌了凌虜了侶��慮侶虜竜"
 
-#: ../libpurple/plugins/autoaccept.c:160
+#: ../libpurple/plugins/autoaccept.c:171
 #, c-format
 msgid "When a file-transfer request arrives from %s"
 msgstr "��留僚 �凌 留溜�侶亮留 亮竜�留�凌�略� 留��竜溜凌� ��凌劉��竜�留旅 留�� %s"
 
-#: ../libpurple/plugins/autoaccept.c:162
+#: ../libpurple/plugins/autoaccept.c:173
 msgid "Set Autoaccept Setting"
 msgstr "痢�慮亮溜�竜旅� 留���亮留�侶� 留�凌隆凌�流�"
 
-#: ../libpurple/plugins/autoaccept.c:164
+#: ../libpurple/plugins/autoaccept.c:175
 msgid "_Save"
 msgstr "_��凌慮流虜竜��侶"
 
-#: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/idle.c:170
+#: ../libpurple/plugins/autoaccept.c:176 ../libpurple/plugins/idle.c:170
 #: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
-#: ../libpurple/protocols/oscar/oscar.c:1453
-#: ../libpurple/protocols/oscar/oscar.c:2233
-#: ../libpurple/protocols/oscar/oscar.c:2282
-#: ../libpurple/protocols/oscar/oscar.c:5886
-#: ../libpurple/protocols/oscar/oscar.c:5941
-#: ../libpurple/protocols/oscar/oscar.c:6167
-#: ../libpurple/protocols/oscar/oscar.c:6237 ../libpurple/request.h:1388
-#: ../libpurple/request.h:1398
+#: ../libpurple/protocols/oscar/oscar.c:1492
+#: ../libpurple/protocols/oscar/oscar.c:2294
+#: ../libpurple/protocols/oscar/oscar.c:2343
+#: ../libpurple/protocols/oscar/oscar.c:5989
+#: ../libpurple/protocols/oscar/oscar.c:6044
+#: ../libpurple/protocols/oscar/oscar.c:6270
+#: ../libpurple/protocols/oscar/oscar.c:6340 ../libpurple/request.h:1458
+#: ../libpurple/request.h:1468 ../pidgin/gtkblist.c:552
 msgid "_Cancel"
 msgstr "_�虜��凌"
 
-#: ../libpurple/plugins/autoaccept.c:168
+#: ../libpurple/plugins/autoaccept.c:179
 msgid "Ask"
 msgstr "����侶�侶"
 
-#: ../libpurple/plugins/autoaccept.c:169
+#: ../libpurple/plugins/autoaccept.c:180
 msgid "Auto Accept"
 msgstr "����亮留�侶 留�凌隆凌�流"
 
-#: ../libpurple/plugins/autoaccept.c:170
+#: ../libpurple/plugins/autoaccept.c:181
 msgid "Auto Reject"
 msgstr "����亮留�侶 留����旅�侶"
 
-#: ../libpurple/plugins/autoaccept.c:185
+#: ../libpurple/plugins/autoaccept.c:196
 msgid "Autoaccept File Transfers..."
 msgstr "����亮留�侶 留�凌隆凌�流 亮竜�留�凌�略� 留��竜溜�僚..."
 
 #. XXX: Is there a better way than this? There really should be.
-#: ../libpurple/plugins/autoaccept.c:215
+#: ../libpurple/plugins/autoaccept.c:226
 msgid ""
 "Path to save the files in\n"
 "(Please provide the full path)"
@@ -2822,11 +3060,11 @@
 "�旅留隆�凌亮流 留�凌慮流虜竜��侶� 留��竜溜�僚\n"
 "(�留�留虜留了凌�亮竜 �留�劉�竜�竜 凌了�虜了侶�侶 �侶 隆旅留隆�凌亮流)"
 
-#: ../libpurple/plugins/autoaccept.c:220
+#: ../libpurple/plugins/autoaccept.c:231
 msgid "Automatically reject from users not in buddy list"
 msgstr "����亮留�侶 留����旅�侶 ��僚 ��侶���僚 �凌� 隆竜僚 竜溜僚留旅 ��侶 了溜��留 �溜了�僚"
 
-#: ../libpurple/plugins/autoaccept.c:224
+#: ../libpurple/plugins/autoaccept.c:235
 msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
 "(only when there's no conversation with the sender)"
@@ -2835,8 +3073,10 @@
 "留��竜溜凌�\n"
 "(亮�僚凌 ��留僚 隆竜僚 ��略��竜旅 ��僚凌亮旅了溜留 亮竜 �凌僚 留�凌��凌了劉留)"
 
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1660
-#: ../libpurple/protocols/msn/msn.c:1690
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1816
+#: ../libpurple/protocols/msn/msn.c:1846
+#: ../libpurple/protocols/msnp9/msn.c:1672
+#: ../libpurple/protocols/msnp9/msn.c:1702
 msgid "Notes"
 msgstr "裡侶亮竜旅��竜旅�"
 
@@ -3027,7 +3267,7 @@
 
 #: ../libpurple/plugins/joinpart.c:229
 msgid "Join/Part Hiding Configuration"
-msgstr ""
+msgstr "痢�慮亮溜�竜旅� 留��虜���侶� ��亮亮竜�凌�流�/留�凌���侶�侶�"
 
 #: ../libpurple/plugins/joinpart.c:233
 msgid "Minimum Room Size"
@@ -3035,7 +3275,7 @@
 
 #: ../libpurple/plugins/joinpart.c:239
 msgid "User Inactivity Timeout (in minutes)"
-msgstr ""
+msgstr "里劉了凌� ��凌僚旅虜凌� 凌�溜凌� 竜僚竜�粒凌� ��流��侶 (�竜 了竜��略)"
 
 #. *< type
 #. *< ui_requirement
@@ -3045,14 +3285,14 @@
 #. *< id
 #: ../libpurple/plugins/joinpart.c:270
 msgid "Join/Part Hiding"
-msgstr ""
+msgstr "���虜���侶 ��亮亮竜�凌�流�/留�凌���侶�侶�"
 
 #. *< name
 #. *< version
 #. *  summary
 #: ../libpurple/plugins/joinpart.c:273
 msgid "Hides extraneous join/part messages."
-msgstr ""
+msgstr "���硫竜旅 �留 留僚留了��旅虜略 亮侶僚�亮留�留 ��亮亮竜�凌�流�/留�凌���侶�侶�."
 
 #. *  description
 #: ../libpurple/plugins/joinpart.c:275
@@ -3060,116 +3300,125 @@
 "This plugin hides join/part messages in large rooms, except for those users "
 "actively taking part in a conversation."
 msgstr ""
+"���� �凌 ����慮竜�凌 虜��硫竜旅 �留 亮侶僚�亮留�留 ��亮亮竜�凌�流�/留�凌���侶�侶� �竜 亮竜粒略了留 隆�亮略�旅留, 竜虜��� "
+"留�� 留��略 ��僚 ��侶���僚 �凌� ��亮亮竜�劉�凌�僚 竜僚竜�粒略 �竜 亮旅留 ��龍流�侶�侶."
 
 #. This is used in the place of a timezone abbreviation if the
 #. * 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:493
+#: ../libpurple/plugins/log_reader.c:499
 msgid "(UTC)"
 msgstr "(UTC)"
 
-#: ../libpurple/plugins/log_reader.c:1577
+#: ../libpurple/plugins/log_reader.c:1554
 msgid "User is offline."
 msgstr "� ��流��侶� 隆竜僚 竜溜僚留旅 ��僚隆竜隆竜亮劉僚凌�."
 
-#: ../libpurple/plugins/log_reader.c:1583
+#: ../libpurple/plugins/log_reader.c:1560
 msgid "Auto-response sent:"
 msgstr "裡�略了慮侶虜竜 留���亮留�侶 留�略僚�侶�侶:"
 
-#: ../libpurple/plugins/log_reader.c:1593
-#: ../libpurple/plugins/log_reader.c:1596
+#: ../libpurple/plugins/log_reader.c:1570
+#: ../libpurple/plugins/log_reader.c:1573
 #: ../libpurple/plugins/statenotify.c:80
 #, c-format
 msgid "%s has signed off."
 msgstr "%s 留�凌��僚隆劉慮侶虜竜."
 
-#: ../libpurple/plugins/log_reader.c:1610
+#: ../libpurple/plugins/log_reader.c:1587
 msgid "One or more messages may have been undeliverable."
 msgstr "���� 隆竜僚 �留�留隆�慮侶虜留僚 劉僚留 流 �竜�旅����竜�留 亮侶僚�亮留�留."
 
-#: ../libpurple/plugins/log_reader.c:1620
+#: ../libpurple/plugins/log_reader.c:1597
 msgid "You were disconnected from the server."
 msgstr "��凌��僚隆竜慮流虜留�竜 留�� �凌僚 竜両��侶�竜�侶�流."
 
-#: ../libpurple/plugins/log_reader.c:1628
+#: ../libpurple/plugins/log_reader.c:1605
 msgid ""
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
-msgstr ""
-"�竜僚 竜溜��竜 ��僚隆竜隆竜亮劉僚凌旅. 里留 亮侶僚�亮留�留 隆竜僚 慮留 �留�留隆溜隆凌僚�留旅 竜虜��� 留僚 ��僚隆竜慮竜溜�竜."
-
-#: ../libpurple/plugins/log_reader.c:1643
+msgstr "�竜僚 竜溜��竜 ��僚隆竜隆竜亮劉僚凌旅. 里留 亮侶僚�亮留�留 隆竜僚 慮留 �留�留隆溜隆凌僚�留旅 竜虜��� 留僚 ��僚隆竜慮竜溜�竜."
+
+#: ../libpurple/plugins/log_reader.c:1620
 msgid "Message could not be sent because the maximum length was exceeded."
 msgstr "里凌 亮流僚�亮留 隆竜僚 流�留僚 隆�僚留�� 僚留 ��留了竜溜 竜�竜旅隆流 劉�竜旅 �凌了� 亮竜粒略了凌 亮劉粒竜慮凌�."
 
-#: ../libpurple/plugins/log_reader.c:1648
+#: ../libpurple/plugins/log_reader.c:1625
 msgid "Message could not be sent."
 msgstr "里凌 亮流僚�亮留 隆竜僚 流�留僚 隆�僚留�� 僚留 ��留了竜溜."
 
 #. 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:2349
-#: ../libpurple/plugins/log_reader.c:2472
+#: ../libpurple/plugins/log_reader.c:2699
+#: ../libpurple/plugins/log_reader.c:2835
 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:2362
-#: ../libpurple/plugins/log_reader.c:2477
+#: ../libpurple/plugins/log_reader.c:2712
+#: ../libpurple/plugins/log_reader.c:2840
 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:2374
-#: ../libpurple/plugins/log_reader.c:2481
+#: ../libpurple/plugins/log_reader.c:2724
+#: ../libpurple/plugins/log_reader.c:2844
 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:2388
-#: ../libpurple/plugins/log_reader.c:2486
+#: ../libpurple/plugins/log_reader.c:2738
+#: ../libpurple/plugins/log_reader.c:2849
 msgid "QIP"
-msgstr ""
+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:2400
-#: ../libpurple/plugins/log_reader.c:2490
+#: ../libpurple/plugins/log_reader.c:2750
+#: ../libpurple/plugins/log_reader.c:2853
 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:2412
-#: ../libpurple/plugins/log_reader.c:2494
+#: ../libpurple/plugins/log_reader.c:2762
+#: ../libpurple/plugins/log_reader.c:2857
 msgid "Trillian"
 msgstr "Trillian"
 
+#. 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:2774
+#: ../libpurple/plugins/log_reader.c:2861
+msgid "aMSN"
+msgstr "aMSN"
+
 #. Add general preferences.
-#: ../libpurple/plugins/log_reader.c:2454
+#: ../libpurple/plugins/log_reader.c:2817
 msgid "General Log Reading Configuration"
 msgstr "�竜僚旅虜劉� ��慮亮溜�竜旅� 留僚略粒僚��侶� 虜留�留粒�留��僚"
 
-#: ../libpurple/plugins/log_reader.c:2458
+#: ../libpurple/plugins/log_reader.c:2821
 msgid "Fast size calculations"
 msgstr "��流粒凌�凌旅 ��凌了凌粒旅�亮凌溜 亮竜粒劉慮凌��"
 
-#: ../libpurple/plugins/log_reader.c:2462
+#: ../libpurple/plugins/log_reader.c:2825
 msgid "Use name heuristics"
 msgstr ""
 
 #. Add Log Directory preferences.
-#: ../libpurple/plugins/log_reader.c:2468
+#: ../libpurple/plugins/log_reader.c:2831
 msgid "Log Directory"
 msgstr "�留�略了凌粒凌� 虜留�留粒�留��僚"
 
@@ -3179,21 +3428,21 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/log_reader.c:2523
+#: ../libpurple/plugins/log_reader.c:2890
 msgid "Log Reader"
 msgstr "�僚留粒僚���侶� 虜留�留粒�留��僚"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libpurple/plugins/log_reader.c:2527
+#: ../libpurple/plugins/log_reader.c:2894
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr ""
 "�竜�旅了留亮硫略僚竜旅 �旅� 虜留�留粒�留�劉� 略了了�僚 �竜了留��僚 略亮竜��僚 亮侶僚�亮略��僚 ��凌僚 ��凌硫凌了劉留 "
 "虜留�留粒�留��僚."
 
 #. * description
-#: ../libpurple/plugins/log_reader.c:2531
+#: ../libpurple/plugins/log_reader.c:2898
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, and Trillian.\n"
@@ -3216,6 +3465,14 @@
 msgid "Loads .NET plugins with Mono."
 msgstr "陸凌���僚竜旅 ����慮竜�留 .NET 亮竜 Mono."
 
+#: ../libpurple/plugins/newline.c:57
+msgid "Add new line in IMs"
+msgstr "��凌�慮流虜侶 僚劉留� 粒�留亮亮流� ��留 略亮竜�留 亮侶僚�亮留�留"
+
+#: ../libpurple/plugins/newline.c:61
+msgid "Add new line in Chats"
+msgstr "��凌�慮流虜侶 僚劉留� 粒�留亮亮流� ��旅� ��龍侶�流�竜旅�"
+
 #. *< magic
 #. *< major version
 #. *< minor version
@@ -3225,18 +3482,18 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/newline.c:68
+#: ../libpurple/plugins/newline.c:104
 msgid "New Line"
 msgstr "�劉留 粒�留亮亮流"
 
 #. *< name
 #. *< version
-#: ../libpurple/plugins/newline.c:70
+#: ../libpurple/plugins/newline.c:106
 msgid "Prepends a newline to displayed message."
 msgstr "�旅�略粒竜旅 亮溜留 僚劉留 粒�留亮亮流 ��旅僚 留�� �凌 竜亮�留僚旅龍�亮竜僚凌 亮流僚�亮留."
 
 #. *< summary
-#: ../libpurple/plugins/newline.c:71
+#: ../libpurple/plugins/newline.c:107
 msgid ""
 "Prepends a newline to messages so that the rest of the message appears below "
 "the screen name in the conversation window."
@@ -3274,7 +3531,7 @@
 
 #: ../libpurple/plugins/offlinemsg.c:160
 msgid "Offline Message"
-msgstr ""
+msgstr "�流僚�亮留 ���溜� ��僚隆竜�侶"
 
 #: ../libpurple/plugins/offlinemsg.c:161
 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
@@ -3283,32 +3540,38 @@
 "'��凌�亮流�竜旅� �溜了�僚'"
 
 #: ../libpurple/plugins/offlinemsg.c:165
-#: ../libpurple/protocols/msn/dialog.c:133
-#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560
-#: ../libpurple/protocols/novell/novell.c:1917
+#: ../libpurple/protocols/msn/dialog.c:141
+#: ../libpurple/protocols/msn/msn.c:661
+#: ../libpurple/protocols/msnp9/dialog.c:133
+#: ../libpurple/protocols/msnp9/msn.c:547
+#: ../libpurple/protocols/msnp9/msn.c:563
+#: ../libpurple/protocols/novell/novell.c:1929
 #: ../libpurple/protocols/silc/buddy.c:317
-#: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:304
+#: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:308
 #: ../libpurple/protocols/silc10/buddy.c:314
 #: ../libpurple/protocols/silc10/pk.c:119
-#: ../libpurple/protocols/silc10/wb.c:304 ../pidgin/gtkrequest.c:268
+#: ../libpurple/protocols/silc10/wb.c:307 ../pidgin/gtkrequest.c:270
 msgid "Yes"
 msgstr "�留旅"
 
 #: ../libpurple/plugins/offlinemsg.c:166
-#: ../libpurple/protocols/msn/dialog.c:134
-#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560
-#: ../libpurple/protocols/novell/novell.c:1918
+#: ../libpurple/protocols/msn/dialog.c:142
+#: ../libpurple/protocols/msn/msn.c:661
+#: ../libpurple/protocols/msnp9/dialog.c:134
+#: ../libpurple/protocols/msnp9/msn.c:547
+#: ../libpurple/protocols/msnp9/msn.c:563
+#: ../libpurple/protocols/novell/novell.c:1930
 #: ../libpurple/protocols/silc/buddy.c:318
-#: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:305
+#: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:309
 #: ../libpurple/protocols/silc10/buddy.c:315
 #: ../libpurple/protocols/silc10/pk.c:120
-#: ../libpurple/protocols/silc10/wb.c:305 ../pidgin/gtkrequest.c:269
+#: ../libpurple/protocols/silc10/wb.c:308 ../pidgin/gtkrequest.c:271
 msgid "No"
 msgstr "��旅"
 
 #: ../libpurple/plugins/offlinemsg.c:193
 msgid "Save offline messages in pounce"
-msgstr ""
+msgstr "��凌慮流虜竜��侶 ��僚 亮侶僚�亮略��僚 ���溜� ��僚隆竜�侶 �� 竜���亮侶�侶"
 
 #: ../libpurple/plugins/offlinemsg.c:197
 msgid "Do not ask. Always save in pounce."
@@ -3349,7 +3612,7 @@
 
 #: ../libpurple/plugins/psychic.c:72
 msgid "You feel a disturbance in the force..."
-msgstr ""
+msgstr "�旅�慮竜旅� 亮旅留 竜僚��了侶�侶 ��凌僚 留劉�留..."
 
 #: ../libpurple/plugins/psychic.c:91
 msgid "Only enable for users on the buddy list"
@@ -3373,7 +3636,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/signals-test.c:711
+#: ../libpurple/plugins/signals-test.c:753
 msgid "Signals Test"
 msgstr "�凌虜旅亮流 �侶亮略��僚"
 
@@ -3381,8 +3644,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/signals-test.c:714
-#: ../libpurple/plugins/signals-test.c:716
+#: ../libpurple/plugins/signals-test.c:756
+#: ../libpurple/plugins/signals-test.c:758
 msgid "Test to see that all signals are working properly."
 msgstr "�凌虜旅亮略龍竜旅 留僚 �了留 �留 �流亮留�留 了竜旅�凌��粒凌�僚 ����略."
 
@@ -3405,10 +3668,10 @@
 msgstr "�凌虜旅亮略龍竜旅 留僚 �留 �竜�旅����竜�留 ��略粒亮留�留 隆凌�了竜�凌�僚 ����略."
 
 #. Scheme name
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:902
-#: ../libpurple/plugins/ssl/ssl-nss.c:725
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:910
+#: ../libpurple/plugins/ssl/ssl-nss.c:731
 msgid "X.509 Certificates"
-msgstr ""
+msgstr "�旅��凌�凌旅侶�旅虜略 X.509"
 
 #. *< type
 #. *< ui_requirement
@@ -3416,7 +3679,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:986
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:994
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -3424,8 +3687,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:989
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:991
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:997
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:999
 msgid "Provides SSL support through GNUTLS."
 msgstr "�留�劉�竜旅 ��凌��流�旅両侶 SSL 亮劉�� ��僚 GNUTLS."
 
@@ -3435,7 +3698,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:810
+#: ../libpurple/plugins/ssl/ssl-nss.c:816
 msgid "NSS"
 msgstr "NSS"
 
@@ -3443,8 +3706,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-nss.c:813
-#: ../libpurple/plugins/ssl/ssl-nss.c:815
+#: ../libpurple/plugins/ssl/ssl-nss.c:819
+#: ../libpurple/plugins/ssl/ssl-nss.c:821
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "�留�劉�竜旅 ��凌��流�旅両侶 SSL 亮劉�� �凌� Mozilla NSS."
 
@@ -3530,15 +3793,15 @@
 "裡留� 竜旅隆凌�凌旅竜溜 �竜 劉僚留 �留�略慮��凌 ��龍流�侶�侶� ��留僚 凌 �溜了凌� 粒溜僚竜�留旅 流 竜�旅���劉�竜旅 "
 "留�� 留��僚 流 留僚竜僚竜�粒��."
 
-#: ../libpurple/plugins/tcl/tcl.c:421
+#: ../libpurple/plugins/tcl/tcl.c:423
 msgid "Tcl Plugin Loader"
 msgstr "陸凌����流� ��凌�慮劉��僚 Tcl"
 
-#: ../libpurple/plugins/tcl/tcl.c:423 ../libpurple/plugins/tcl/tcl.c:424
+#: ../libpurple/plugins/tcl/tcl.c:425 ../libpurple/plugins/tcl/tcl.c:426
 msgid "Provides support for loading Tcl plugins"
 msgstr "�留�劉�竜旅 ��凌��流�旅両侶 粒旅留 �凌 �����亮留 ��凌�慮劉��僚 Tcl"
 
-#: ../libpurple/plugins/tcl/tcl.c:507
+#: ../libpurple/plugins/tcl/tcl.c:509
 msgid ""
 "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
 "install ActiveTCL from http://www.activestate.com\n"
@@ -3547,53 +3810,62 @@
 "��侶�旅亮凌�凌旅流�竜�竜 ����慮竜�留 TCL 竜粒虜留�留��流��竜 �凌 ActiveTCL 留�� �凌 http://www."
 "activestate.com\n"
 
-#. Send a message about the connection error
-#: ../libpurple/protocols/bonjour/bonjour.c:112
+#: ../libpurple/protocols/bonjour/bonjour.c:101
+msgid ""
+"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://"
+"developer.pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-"
+"LocalMessaging for more information."
+msgstr ""
+"�竜 硫�劉慮侶虜竜 �凌 �竜� 竜�粒留了竜溜�僚 Apple Bonjour 粒旅留 Windows, 隆竜溜�竜 �旅� 裡��僚劉� "
+"����流�竜旅� ��凌: http://developer.pidgin.im/wiki/Using%"
+"20Pidgin#CanIusePidginforBonjourLink-LocalMessaging 粒旅留 �竜�旅����竜�竜� "
+"�了侶�凌�凌�溜竜�."
+
+#: ../libpurple/protocols/bonjour/bonjour.c:120
 msgid "Unable to listen for incoming IM connections\n"
 msgstr "�隆�僚留亮溜留 留虜��留�侶� 竜旅�竜���亮竜僚�僚 ��僚隆劉�竜�僚 略亮竜��僚 亮侶僚�亮略��僚\n"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:137
-msgid ""
-"Unable to establish connection with the local mDNS server.  Is it running?"
+#: ../libpurple/protocols/bonjour/bonjour.c:147
+msgid "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr ""
 "�隆�僚留亮溜留 隆侶亮旅凌��粒溜留 ��僚隆竜�侶� 亮竜 �凌僚 �凌�旅虜� 竜両��侶�竜�侶�流 mDNS.  �溜僚留旅 �竜 "
 "了竜旅�凌��粒溜留;"
 
 #. 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:942
+#: ../libpurple/protocols/bonjour/bonjour.c:392
+#: ../libpurple/protocols/bonjour/bonjour.c:698
+#: ../libpurple/protocols/gg/gg.c:633
+#: ../libpurple/protocols/jabber/jabber.c:996
 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:947
+#: ../libpurple/protocols/bonjour/bonjour.c:394
+#: ../libpurple/protocols/bonjour/bonjour.c:701
+#: ../libpurple/protocols/gg/gg.c:628
+#: ../libpurple/protocols/jabber/jabber.c:1000
 msgid "Last name"
 msgstr "���僚�亮凌"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:357
+#: ../libpurple/protocols/bonjour/bonjour.c:398
 #: ../libpurple/protocols/jabber/buddy.c:295
-#: ../libpurple/protocols/jabber/buddy.c:1325
-#: ../libpurple/protocols/jabber/buddy.c:1335
-#: ../libpurple/protocols/jabber/buddy.c:2216
+#: ../libpurple/protocols/jabber/buddy.c:1329
+#: ../libpurple/protocols/jabber/buddy.c:1339
+#: ../libpurple/protocols/jabber/buddy.c:2223
 #: ../libpurple/protocols/silc/ops.c:1041
-#: ../libpurple/protocols/silc/util.c:555
+#: ../libpurple/protocols/silc/util.c:561
 #: ../libpurple/protocols/silc10/ops.c:1075
 #: ../libpurple/protocols/silc10/util.c:551
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1067
 msgid "E-Mail"
 msgstr "E-Mail"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:360
-#: ../libpurple/protocols/bonjour/bonjour.c:665
+#: ../libpurple/protocols/bonjour/bonjour.c:401
+#: ../libpurple/protocols/bonjour/bonjour.c:707
 msgid "AIM Account"
 msgstr "�凌粒留�旅留�亮�� AIM"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:363
-#: ../libpurple/protocols/bonjour/bonjour.c:668
+#: ../libpurple/protocols/bonjour/bonjour.c:404
+#: ../libpurple/protocols/bonjour/bonjour.c:710
 msgid "XMPP Account"
 msgstr "�凌粒留�旅留�亮�� XMPP"
 
@@ -3607,22 +3879,22 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:467
-#: ../libpurple/protocols/bonjour/bonjour.c:469
+#: ../libpurple/protocols/bonjour/bonjour.c:508
+#: ../libpurple/protocols/bonjour/bonjour.c:510
 msgid "Bonjour Protocol Plugin"
 msgstr "����慮竜�凌 ����凌虜�了了凌� Bonjour"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:610
+#: ../libpurple/protocols/bonjour/bonjour.c:651
 msgid "Purple Person"
 msgstr ""
 
-#: ../libpurple/protocols/bonjour/bonjour.c:662
-#: ../libpurple/protocols/gg/gg.c:477
-#: ../libpurple/protocols/jabber/jabber.c:932
-#: ../libpurple/protocols/silc/silc.c:770
-#: ../libpurple/protocols/silc/silc.c:1011
-#: ../libpurple/protocols/silc10/silc.c:681
-#: ../libpurple/protocols/silc10/silc.c:922
+#: ../libpurple/protocols/bonjour/bonjour.c:704
+#: ../libpurple/protocols/gg/gg.c:478
+#: ../libpurple/protocols/jabber/jabber.c:988
+#: ../libpurple/protocols/silc/silc.c:913
+#: ../libpurple/protocols/silc/silc.c:1154
+#: ../libpurple/protocols/silc10/silc.c:687
+#: ../libpurple/protocols/silc10/silc.c:928
 msgid "E-mail"
 msgstr "E-mail"
 
@@ -3630,38 +3902,44 @@
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../libpurple/protocols/bonjour/jabber.c:380
+#: ../libpurple/protocols/bonjour/jabber.c:407
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s 劉虜了竜旅�竜 �侶 ��僚凌亮旅了溜留."
 
-#: ../libpurple/protocols/bonjour/jabber.c:437
-#: ../libpurple/protocols/bonjour/jabber.c:660
-#: ../libpurple/protocols/bonjour/jabber.c:678
+#: ../libpurple/protocols/bonjour/jabber.c:457
+#: ../libpurple/protocols/bonjour/jabber.c:522
+#: ../libpurple/protocols/bonjour/jabber.c:567
+#: ../libpurple/protocols/bonjour/jabber.c:744
+#: ../libpurple/protocols/bonjour/jabber.c:762
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "�隆�僚留�凌 僚留 ��留了竜溜 �凌 亮流僚�亮留, 侶 ��僚凌亮旅了溜留 隆竜僚 両竜虜溜僚侶�竜."
 
-#: ../libpurple/protocols/bonjour/jabber.c:583
+#: ../libpurple/protocols/bonjour/jabber.c:661
 msgid "Cannot open socket"
 msgstr "�竜僚 竜溜僚留旅 隆�僚留�� �凌 略僚凌旅粒亮留 �凌� ��凌隆凌�劉留"
 
-#: ../libpurple/protocols/bonjour/jabber.c:591
+#: ../libpurple/protocols/bonjour/jabber.c:671
 msgid "Error setting socket options"
 msgstr "裡�略了亮留 ��慮亮旅�侶� 竜�旅了凌粒�僚 ��凌隆凌�劉留"
 
-#: ../libpurple/protocols/bonjour/jabber.c:615
+#: ../libpurple/protocols/bonjour/jabber.c:697
 msgid "Could not bind socket to port"
 msgstr ""
 
-#: ../libpurple/protocols/bonjour/jabber.c:623
+#: ../libpurple/protocols/bonjour/jabber.c:707
 msgid "Could not listen on socket"
 msgstr "�竜僚 流�留僚 隆�僚留�流 侶 留虜��留�侶 �凌� ��凌隆凌�劉留"
 
-#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1829
+#: ../libpurple/protocols/bonjour/mdns_win32.c:110
+msgid "Error communicating with local mDNSResponder."
+msgstr ""
+
+#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1851
 msgid "Invalid proxy settings"
 msgstr "�留僚慮留�亮劉僚竜� ��慮亮溜�竜旅� 隆旅留亮竜�凌了留硫侶�流"
 
-#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1829
+#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1851
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -3679,39 +3957,41 @@
 msgid "Unable to fetch the token.\n"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:269 ../libpurple/protocols/gg/gg.c:288
+#: ../libpurple/protocols/gg/gg.c:267 ../libpurple/protocols/gg/gg.c:274
+#: ../libpurple/protocols/gg/gg.c:280
 msgid "Save Buddylist..."
 msgstr "��凌慮流虜竜��侶 了溜��留� �溜了�僚..."
 
-#: ../libpurple/protocols/gg/gg.c:270
+#: ../libpurple/protocols/gg/gg.c:268
 msgid "Your buddylist is empty, nothing was written to the file."
 msgstr "� 了溜��留 �溜了�僚 �留� 竜溜僚留旅 虜竜僚流, 隆竜僚 竜粒粒�略�侶虜竜 �溜�凌�留 ��凌 留��竜溜凌."
 
-#: ../libpurple/protocols/gg/gg.c:276 ../libpurple/protocols/gg/gg.c:278
-msgid "Couldn't open file"
-msgstr "�竜僚 流�留僚 隆�僚留�� �凌 略僚凌旅粒亮留 �凌� 留��竜溜凌�"
-
-#: ../libpurple/protocols/gg/gg.c:289
+#: ../libpurple/protocols/gg/gg.c:275
 msgid "Buddylist saved successfully!"
 msgstr "� 了溜��留 �溜了�僚 留�凌慮侶虜竜��侶虜竜 竜�旅�����!"
 
-#: ../libpurple/protocols/gg/gg.c:307 ../libpurple/protocols/gg/gg.c:308
+#: ../libpurple/protocols/gg/gg.c:278
+#, c-format
+msgid "Couldn't write buddy list for %s to %s"
+msgstr "�竜僚 流�留僚 隆�僚留�流 侶 竜粒粒�留�流 �侶� 了溜��留� �溜了�僚 粒旅留 %s �竜 %s"
+
+#: ../libpurple/protocols/gg/gg.c:303 ../libpurple/protocols/gg/gg.c:304
 msgid "Couldn't load buddylist"
 msgstr "�竜僚 流�留僚 隆�僚留�� �凌 �����亮留 �侶� 了溜��留� �溜了�僚"
 
-#: ../libpurple/protocols/gg/gg.c:324
+#: ../libpurple/protocols/gg/gg.c:320
 msgid "Load Buddylist..."
 msgstr "陸����亮留 了溜��留� �溜了�僚..."
 
-#: ../libpurple/protocols/gg/gg.c:325
+#: ../libpurple/protocols/gg/gg.c:321
 msgid "Buddylist loaded successfully!"
 msgstr "� 了溜��留 �溜了�僚 �凌���慮侶虜竜 竜�旅�����!"
 
-#: ../libpurple/protocols/gg/gg.c:336
+#: ../libpurple/protocols/gg/gg.c:332
 msgid "Save buddylist..."
 msgstr "��凌慮流虜竜��侶 了溜��留� �溜了�僚..."
 
-#: ../libpurple/protocols/gg/gg.c:384
+#: ../libpurple/protocols/gg/gg.c:382
 msgid "Fill in the registration fields."
 msgstr "裡�亮�了侶����竜 �留 �竜隆溜留 虜留�留���侶�侶�."
 
@@ -3719,306 +3999,283 @@
 msgid "Passwords do not match."
 msgstr "�旅 虜�隆旅虜凌溜 隆竜僚 �留旅�旅略龍凌�僚."
 
-#: ../libpurple/protocols/gg/gg.c:398
+#: ../libpurple/protocols/gg/gg.c:399
 msgid "Unable to register new account. Error occurred.\n"
 msgstr "�隆�僚留亮溜留 虜留�留���侶�侶� 僚劉凌� 了凌粒留�旅留�亮凌�. 裡�僚劉硫侶 ��略了亮留.\n"
 
-#: ../libpurple/protocols/gg/gg.c:411
-msgid "New Gadu-Gadu Account Registered"
-msgstr "�留�留���流慮侶虜竜 僚劉凌� 了凌粒留�旅留�亮�� Gadu-Gadu"
-
 #: ../libpurple/protocols/gg/gg.c:412
+msgid "New Gadu-Gadu Account Registered"
+msgstr "�留�留���流慮侶虜竜 僚劉凌� 了凌粒留�旅留�亮�� Gadu-Gadu"
+
+#: ../libpurple/protocols/gg/gg.c:413
 msgid "Registration completed successfully!"
 msgstr "� 虜留�留���侶�侶 凌了凌虜了侶��慮侶虜竜 竜�旅�����!"
 
-#: ../libpurple/protocols/gg/gg.c:482 ../libpurple/protocols/gg/gg.c:775
-#: ../libpurple/protocols/jabber/jabber.c:913
-#: ../libpurple/protocols/jabber/jabber.c:916
-#: ../libpurple/protocols/jabber/jabber.c:1722
+#: ../libpurple/protocols/gg/gg.c:483 ../libpurple/protocols/gg/gg.c:776
+#: ../libpurple/protocols/jabber/jabber.c:971
+#: ../libpurple/protocols/jabber/jabber.c:974
+#: ../libpurple/protocols/jabber/jabber.c:1762
 msgid "Password"
 msgstr "��隆旅虜��"
 
-#: ../libpurple/protocols/gg/gg.c:487 ../libpurple/protocols/gg/gg.c:780
+#: ../libpurple/protocols/gg/gg.c:488 ../libpurple/protocols/gg/gg.c:781
 msgid "Password (retype)"
 msgstr "��隆旅虜�� (両留僚略)"
 
-#: ../libpurple/protocols/gg/gg.c:492 ../libpurple/protocols/gg/gg.c:785
+#: ../libpurple/protocols/gg/gg.c:493 ../libpurple/protocols/gg/gg.c:786
 msgid "Enter current token"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:498 ../libpurple/protocols/gg/gg.c:791
+#: ../libpurple/protocols/gg/gg.c:499 ../libpurple/protocols/gg/gg.c:792
 msgid "Current token"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:502 ../libpurple/protocols/gg/gg.c:503
+#: ../libpurple/protocols/gg/gg.c:503 ../libpurple/protocols/gg/gg.c:504
 msgid "Register New Gadu-Gadu Account"
 msgstr "�留�留���侶�侶 僚劉凌� 了凌粒留�旅留�亮凌� Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:504
+#: ../libpurple/protocols/gg/gg.c:505
 msgid "Please, fill in the following fields"
 msgstr "�留�留虜留了凌�亮竜, ��亮�了侶����竜 �留 �留�留虜略�� �竜隆溜留"
 
-#: ../libpurple/protocols/gg/gg.c:642 ../libpurple/protocols/gg/gg.c:1054
-#: ../libpurple/protocols/gg/gg.c:1126
-#: ../libpurple/protocols/jabber/jabber.c:957
-#: ../libpurple/protocols/oscar/oscar.c:3789
-#: ../libpurple/protocols/oscar/oscar.c:3802
+#: ../libpurple/protocols/gg/gg.c:643 ../libpurple/protocols/gg/gg.c:1056
+#: ../libpurple/protocols/gg/gg.c:1128
+#: ../libpurple/protocols/jabber/jabber.c:1008
+#: ../libpurple/protocols/oscar/oscar.c:3822
+#: ../libpurple/protocols/oscar/oscar.c:3835
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "��了侶"
 
-#: ../libpurple/protocols/gg/gg.c:647
+#: ../libpurple/protocols/gg/gg.c:648
 msgid "Year of birth"
 msgstr "�亮竜�凌亮侶僚溜留 粒劉僚僚侶�侶�"
 
-#: ../libpurple/protocols/gg/gg.c:650 ../libpurple/protocols/msn/msn.c:1589
-#: ../libpurple/protocols/myspace/user.c:115
-#: ../libpurple/protocols/oscar/oscar.c:3732
+#: ../libpurple/protocols/gg/gg.c:651 ../libpurple/protocols/msn/msn.c:1745
+#: ../libpurple/protocols/msnp9/msn.c:1601
+#: ../libpurple/protocols/myspace/user.c:129
+#: ../libpurple/protocols/oscar/oscar.c:3765
 #: ../libpurple/protocols/qq/buddy_info.c:46
-#: ../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
+#: ../libpurple/protocols/qq/qq.c:227 ../libpurple/protocols/qq/qq.c:230
+#: ../libpurple/protocols/qq/qq.c:233 ../libpurple/protocols/qq/qq.c:237
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1097
 msgid "Gender"
 msgstr "陸�了凌"
 
-#: ../libpurple/protocols/gg/gg.c:651
-msgid "Male or female"
-msgstr "�僚��留� 流 粒�僚留溜虜留"
-
 #: ../libpurple/protocols/gg/gg.c:652
-#: ../libpurple/protocols/oscar/oscar.c:3732
-#: ../libpurple/protocols/qq/buddy_info.c:83
-#: ../libpurple/protocols/qq/qq.c:226
-msgid "Male"
-msgstr "�僚��留�"
+msgid "Male or female"
+msgstr "�僚��留� 流 粒�僚留溜虜留"
 
 #: ../libpurple/protocols/gg/gg.c:653
-#: ../libpurple/protocols/oscar/oscar.c:3732
+#: ../libpurple/protocols/oscar/oscar.c:3765
+#: ../libpurple/protocols/qq/buddy_info.c:83
+#: ../libpurple/protocols/qq/qq.c:227
+msgid "Male"
+msgstr "�僚��留�"
+
+#: ../libpurple/protocols/gg/gg.c:654
+#: ../libpurple/protocols/oscar/oscar.c:3765
 #: ../libpurple/protocols/qq/buddy_info.c:84
-#: ../libpurple/protocols/qq/qq.c:229
+#: ../libpurple/protocols/qq/qq.c:230
 msgid "Female"
 msgstr "��僚留溜虜留"
 
-#: ../libpurple/protocols/gg/gg.c:657
+#: ../libpurple/protocols/gg/gg.c:658
 msgid "Only online"
 msgstr "��僚凌 虜留�略 �侶 ��僚隆竜�侶"
 
-#: ../libpurple/protocols/gg/gg.c:661 ../libpurple/protocols/gg/gg.c:662
+#: ../libpurple/protocols/gg/gg.c:662 ../libpurple/protocols/gg/gg.c:663
 msgid "Find buddies"
 msgstr "���竜�侶 �溜了�僚"
 
-#: ../libpurple/protocols/gg/gg.c:663
+#: ../libpurple/protocols/gg/gg.c:664
 msgid "Please, enter your search criteria below"
 msgstr "�留�留虜留了凌�亮竜, 竜旅�略粒竜�竜 �留 虜�旅�流�旅留 �侶� 留僚留龍流�侶�侶�"
 
-#: ../libpurple/protocols/gg/gg.c:701
+#: ../libpurple/protocols/gg/gg.c:702
 msgid "Fill in the fields."
 msgstr "裡�亮�了侶����竜 �留 �竜隆溜留."
 
-#: ../libpurple/protocols/gg/gg.c:713
+#: ../libpurple/protocols/gg/gg.c:714
 msgid "Your current password is different from the one that you specified."
 msgstr "� ��劉��僚 虜�隆旅虜�� �留� 竜溜僚留旅 隆旅留�凌�竜�旅虜�� 留�� 留���僚 �凌� 凌�溜�留�竜."
 
-#: ../libpurple/protocols/gg/gg.c:727
+#: ../libpurple/protocols/gg/gg.c:728
 msgid "Unable to change password. Error occurred.\n"
 msgstr "�隆�僚留亮溜留 留了了留粒流� 虜�隆旅虜凌�. 裡�僚劉硫侶 ��略了亮留.\n"
 
-#: ../libpurple/protocols/gg/gg.c:736
+#: ../libpurple/protocols/gg/gg.c:737
 msgid "Change password for the Gadu-Gadu account"
 msgstr "�了了留粒流 虜�隆旅虜凌� �凌� 了凌粒留�旅留�亮凌� Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:737
+#: ../libpurple/protocols/gg/gg.c:738
 msgid "Password was changed successfully!"
 msgstr "� 虜�隆旅虜�� 略了了留両竜 竜�旅�����!"
 
-#: ../libpurple/protocols/gg/gg.c:770
+#: ../libpurple/protocols/gg/gg.c:771
 msgid "Current password"
 msgstr "里�劉��僚 虜�隆旅虜��"
 
-#: ../libpurple/protocols/gg/gg.c:795
+#: ../libpurple/protocols/gg/gg.c:796
 msgid "Please, enter your current password and your new password for UIN: "
-msgstr ""
-"�留�留虜留了凌�亮竜 竜旅�略粒竜�竜 �凌僚 �留了旅� 虜留旅 �凌僚 虜留旅僚凌��旅凌 虜�隆旅虜� �留� 粒旅留 �凌 UIN. "
-
-#: ../libpurple/protocols/gg/gg.c:799 ../libpurple/protocols/gg/gg.c:800
+msgstr "�留�留虜留了凌�亮竜 竜旅�略粒竜�竜 �凌僚 �留了旅� 虜留旅 �凌僚 虜留旅僚凌��旅凌 虜�隆旅虜� �留� 粒旅留 �凌 UIN. "
+
+#: ../libpurple/protocols/gg/gg.c:800 ../libpurple/protocols/gg/gg.c:801
 msgid "Change Gadu-Gadu Password"
 msgstr "�了了留粒流 虜�隆旅虜凌� Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:876
+#: ../libpurple/protocols/gg/gg.c:878
 #, c-format
 msgid "Select a chat for buddy: %s"
 msgstr "��旅了凌粒流 ��龍流�侶�侶� �溜了凌�: %s"
 
-#: ../libpurple/protocols/gg/gg.c:879 ../libpurple/protocols/gg/gg.c:880
+#: ../libpurple/protocols/gg/gg.c:881 ../libpurple/protocols/gg/gg.c:882
 msgid "Add to chat..."
 msgstr "��凌�慮流虜侶 ��侶 ��龍流�侶�侶..."
 
-#: ../libpurple/protocols/gg/gg.c:1008
-#: ../libpurple/protocols/jabber/buddy.c:2031
-#: ../libpurple/protocols/novell/novell.c:2828
-#: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:5604
-#: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
-#: ../libpurple/protocols/qq/qq.c:292
-#: ../libpurple/protocols/yahoo/yahoo.c:3099 ../libpurple/status.c:154
-#: ../pidgin/gtkblist.c:3104 ../pidgin/gtkblist.c:3436
-#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1061
-msgid "Offline"
-msgstr "律��溜� ��僚隆竜�侶"
-
-#: ../libpurple/protocols/gg/gg.c:1011
-#: ../libpurple/protocols/jabber/buddy.c:2033
+#: ../libpurple/protocols/gg/gg.c:1013
+#: ../libpurple/protocols/jabber/buddy.c:2040
 #: ../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/qq/qq.c:280
-#: ../libpurple/protocols/yahoo/yahoo.c:3101 ../libpurple/status.c:155
-#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1057
+#: ../libpurple/protocols/msnp9/state.c:29
+#: ../libpurple/protocols/msnp9/state.c:30
+#: ../libpurple/protocols/msnp9/state.c:37
+#: ../libpurple/protocols/msnp9/state.c:38
+#: ../libpurple/protocols/novell/novell.c:2834
+#: ../libpurple/protocols/qq/qq.c:281
+#: ../libpurple/protocols/yahoo/yahoo.c:3138 ../libpurple/status.c:155
+#: ../pidgin/gtkdocklet.c:545 ../pidgin/gtkstatusbox.c:1081
 msgid "Available"
 msgstr "�旅留慮劉�旅亮凌�"
 
 #. 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:2037
-#: ../libpurple/protocols/novell/novell.c:2819
-#: ../libpurple/protocols/oscar/oscar.c:733
-#: ../libpurple/protocols/oscar/oscar.c:4547
-#: ../libpurple/protocols/oscar/oscar.c:5632
-#: ../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:3653
-#: ../libpurple/protocols/yahoo/yahoo.c:3727 ../libpurple/status.c:158
-#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1939
-#: ../pidgin/gtkstatusbox.c:1058
-#, c-format
+#: ../libpurple/protocols/gg/gg.c:1016 ../libpurple/protocols/irc/irc.c:544
+#: ../libpurple/protocols/irc/msgs.c:312
+#: ../libpurple/protocols/jabber/buddy.c:2044
+#: ../libpurple/protocols/novell/novell.c:2837
+#: ../libpurple/protocols/oscar/oscar.c:732
+#: ../libpurple/protocols/oscar/oscar.c:5735
+#: ../libpurple/protocols/qq/qq.c:181 ../libpurple/protocols/qq/qq.c:285
+#: ../libpurple/protocols/silc/buddy.c:1479
+#: ../libpurple/protocols/silc10/buddy.c:1479
+#: ../libpurple/protocols/yahoo/yahoo.c:3695
+#: ../libpurple/protocols/yahoo/yahoo.c:3769 ../libpurple/status.c:158
+#: ../pidgin/gtkdocklet.c:549 ../pidgin/gtkprefs.c:1960
+#: ../pidgin/gtkstatusbox.c:1082
 msgid "Away"
 msgstr "���僚"
 
-#: ../libpurple/protocols/gg/gg.c:1043 ../libpurple/protocols/gg/gg.c:1117
-#: ../libpurple/protocols/oscar/oscar.c:2699
-#: ../libpurple/protocols/oscar/oscar.c:3699
+#: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1119
+#: ../libpurple/protocols/oscar/oscar.c:2760
+#: ../libpurple/protocols/oscar/oscar.c:3732
 msgid "UIN"
 msgstr "UIN"
 
-#: ../libpurple/protocols/gg/gg.c:1046 ../libpurple/protocols/gg/gg.c:1120
-#: ../libpurple/protocols/jabber/buddy.c:2210
-#: ../libpurple/protocols/jabber/buddy.c:2386
-#: ../libpurple/protocols/oscar/oscar.c:3710
+#: ../libpurple/protocols/gg/gg.c:1048 ../libpurple/protocols/gg/gg.c:1122
+#: ../libpurple/protocols/jabber/buddy.c:2217
+#: ../libpurple/protocols/jabber/buddy.c:2403
+#: ../libpurple/protocols/oscar/oscar.c:3743
 #: ../libpurple/protocols/silc/ops.c:990
 #: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
 msgstr "�僚凌亮留"
 
-#: ../libpurple/protocols/gg/gg.c:1059 ../libpurple/protocols/gg/gg.c:1129
+#: ../libpurple/protocols/gg/gg.c:1061 ../libpurple/protocols/gg/gg.c:1131
 msgid "Birth Year"
 msgstr "律�凌僚旅略 粒劉僚僚侶�侶�"
 
-#: ../libpurple/protocols/gg/gg.c:1111 ../libpurple/protocols/gg/gg.c:1180
-#: ../libpurple/protocols/oscar/oscar.c:3911
+#: ../libpurple/protocols/gg/gg.c:1113 ../libpurple/protocols/gg/gg.c:1182
+#: ../libpurple/protocols/oscar/oscar.c:3944
 msgid "Unable to display the search results."
 msgstr "�隆�僚留亮溜留 竜亮�略僚旅�侶� ��僚 留�凌�竜了竜�亮略��僚 �侶� 留僚留龍流�侶�侶�."
 
-#: ../libpurple/protocols/gg/gg.c:1171
+#: ../libpurple/protocols/gg/gg.c:1173
 msgid "Gadu-Gadu Public Directory"
 msgstr "�侶亮��旅凌� 虜留�略了凌粒凌� Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:1172
+#: ../libpurple/protocols/gg/gg.c:1174
 msgid "Search results"
 msgstr "��凌�竜了劉�亮留�留 留僚留龍流�侶�侶�"
 
-#: ../libpurple/protocols/gg/gg.c:1215
+#: ../libpurple/protocols/gg/gg.c:1217
 msgid "No matching users found"
 msgstr "�竜 硫�劉慮侶虜留僚 ��流��竜� �凌� 僚留 �留旅�旅略龍凌�僚"
 
-#: ../libpurple/protocols/gg/gg.c:1216
+#: ../libpurple/protocols/gg/gg.c:1218
 msgid "There are no users matching your search criteria."
 msgstr "�竜 硫�劉慮侶虜留僚 ��流��竜� �凌� 僚留 �留旅�旅略龍凌�僚 亮竜 �留 虜�旅�流�旅留 留僚留龍流�侶�侶�."
 
-#: ../libpurple/protocols/gg/gg.c:1310 ../libpurple/protocols/gg/gg.c:1463
+#: ../libpurple/protocols/gg/gg.c:1314 ../libpurple/protocols/gg/gg.c:1469
 msgid "Unable to read socket"
 msgstr "�隆�僚留亮溜留 留僚略粒僚��侶� ��凌隆凌�劉留"
 
-#: ../libpurple/protocols/gg/gg.c:1395
+#: ../libpurple/protocols/gg/gg.c:1399
 msgid "Buddy list downloaded"
 msgstr "� 了溜��留 �溜了�僚 了流�慮侶虜竜"
 
-#: ../libpurple/protocols/gg/gg.c:1396
+#: ../libpurple/protocols/gg/gg.c:1400
 msgid "Your buddy list was downloaded from the server."
 msgstr "� 了溜��留 �溜了�僚 �留� 了流�慮侶虜竜 留�� �凌僚 竜両��侶�竜�侶�流."
 
-#: ../libpurple/protocols/gg/gg.c:1403
+#: ../libpurple/protocols/gg/gg.c:1407
 msgid "Buddy list uploaded"
 msgstr "� 了溜��留 �溜了�僚 ��略了慮侶虜竜"
 
-#: ../libpurple/protocols/gg/gg.c:1404
+#: ../libpurple/protocols/gg/gg.c:1408
 msgid "Your buddy list was stored on the server."
 msgstr "� 了溜��留 �溜了�僚 �留� 留�凌慮侶虜竜��侶虜竜 ��凌僚 竜両��侶�竜�侶�流."
 
-#: ../libpurple/protocols/gg/gg.c:1509 ../libpurple/protocols/gg/gg.c:1715
+#: ../libpurple/protocols/gg/gg.c:1517 ../libpurple/protocols/gg/gg.c:1725
 msgid "Connection failed."
 msgstr "��凌���溜留 ��僚隆竜�侶�."
 
-#: ../libpurple/protocols/gg/gg.c:1621 ../libpurple/protocols/msn/msn.c:559
-msgid "Blocked"
-msgstr "��凌虜了竜旅�亮劉僚凌�"
-
-#: ../libpurple/protocols/gg/gg.c:1644
+#: ../libpurple/protocols/gg/gg.c:1652
 msgid "Add to chat"
 msgstr "��凌�慮流虜侶 ��侶 ��龍流�侶�侶"
 
-#: ../libpurple/protocols/gg/gg.c:1653
-msgid "Unblock"
-msgstr "�虜����侶 留�凌虜了竜旅�亮凌�"
-
-#: ../libpurple/protocols/gg/gg.c:1657
-msgid "Block"
-msgstr "��凌虜了竜旅�亮��"
-
-#: ../libpurple/protocols/gg/gg.c:1674
+#: ../libpurple/protocols/gg/gg.c:1682
 msgid "Chat _name:"
 msgstr "�僚凌亮留 _��龍流�侶�侶�:"
 
-#: ../libpurple/protocols/gg/gg.c:1914
+#: ../libpurple/protocols/gg/gg.c:1933
 msgid "Chat error"
 msgstr "裡�略了亮留 ��龍流�侶�侶�"
 
-#: ../libpurple/protocols/gg/gg.c:1915
+#: ../libpurple/protocols/gg/gg.c:1934
 msgid "This chat name is already in use"
 msgstr "���� �凌 �僚凌亮留 ��龍流�侶�侶� ��侶�旅亮凌�凌旅竜溜�留旅 流隆侶"
 
-#: ../libpurple/protocols/gg/gg.c:1998
+#: ../libpurple/protocols/gg/gg.c:2019
 msgid "Not connected to the server."
 msgstr "�竜僚 竜溜��竜 ��僚隆竜隆竜亮劉僚凌旅 亮竜 �凌僚 竜両��侶�竜�侶�流."
 
-#: ../libpurple/protocols/gg/gg.c:2021
+#: ../libpurple/protocols/gg/gg.c:2042
 msgid "Find buddies..."
 msgstr "���竜�侶 �溜了�僚..."
 
-#: ../libpurple/protocols/gg/gg.c:2027
+#: ../libpurple/protocols/gg/gg.c:2048
 msgid "Change password..."
 msgstr "�了了留粒流 虜�隆旅虜凌�..."
 
-#: ../libpurple/protocols/gg/gg.c:2033
+#: ../libpurple/protocols/gg/gg.c:2054
 msgid "Upload buddylist to Server"
 msgstr "��凌��凌了流 了溜��留� �溜了�僚 ��凌僚 竜両��侶�竜�侶�流"
 
-#: ../libpurple/protocols/gg/gg.c:2037
+#: ../libpurple/protocols/gg/gg.c:2058
 msgid "Download buddylist from Server"
 msgstr "�流�侶 了溜��留� �溜了�僚 留�� �凌僚 竜両��侶�竜�侶�流"
 
-#: ../libpurple/protocols/gg/gg.c:2041
+#: ../libpurple/protocols/gg/gg.c:2062
 msgid "Delete buddylist from Server"
 msgstr "�旅留粒�留�流 了溜��留� �溜了�僚 留�� �凌僚 竜両��侶�竜�侶�流"
 
-#: ../libpurple/protocols/gg/gg.c:2045
+#: ../libpurple/protocols/gg/gg.c:2066
 msgid "Save buddylist to file..."
 msgstr "��凌慮流虜竜��侶 了溜��留� �溜了�僚 �竜 留��竜溜凌..."
 
-#: ../libpurple/protocols/gg/gg.c:2049
+#: ../libpurple/protocols/gg/gg.c:2070
 msgid "Load buddylist from file..."
 msgstr "陸����亮留 了溜��留� �溜了�僚 留�� 留��竜溜凌..."
 
@@ -4033,51 +4290,54 @@
 #. id
 #. name
 #. version
-#: ../libpurple/protocols/gg/gg.c:2153
+#: ../libpurple/protocols/gg/gg.c:2174
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "����慮竜�凌 ����凌虜�了了凌� Gadu-Gadu"
 
 #. summary
-#: ../libpurple/protocols/gg/gg.c:2154
+#: ../libpurple/protocols/gg/gg.c:2175
 msgid "Polish popular IM"
 msgstr "�侶亮凌�旅了流� ��侶�竜�溜留 略亮竜��僚 亮侶僚�亮略��僚 ��侶僚 �凌了�僚溜留"
 
-#: ../libpurple/protocols/gg/gg.c:2208
+#: ../libpurple/protocols/gg/gg.c:2229
 msgid "Gadu-Gadu User"
 msgstr "律�流��侶� Gadu-Gadu"
 
 #: ../libpurple/protocols/irc/cmds.c:43
-#: ../libpurple/protocols/silc/silc.c:1637
-#: ../libpurple/protocols/silc10/silc.c:1566
+#: ../libpurple/protocols/silc/silc.c:1780
+#: ../libpurple/protocols/silc10/silc.c:1572
 #, c-format
 msgid "Unknown command: %s"
 msgstr "�粒僚���侶 竜僚�凌了流: %s"
 
-#: ../libpurple/protocols/irc/cmds.c:503
+#: ../libpurple/protocols/irc/cmds.c:511
 #: ../libpurple/protocols/jabber/chat.c:591
-#: ../libpurple/protocols/silc/silc.c:1345
-#: ../libpurple/protocols/silc10/silc.c:1274
+#: ../libpurple/protocols/silc/silc.c:1488
+#: ../libpurple/protocols/silc10/silc.c:1280
 #, c-format
 msgid "current topic is: %s"
 msgstr "�凌 ��劉�凌僚 慮劉亮留 ��龍流�侶�侶� 竜溜僚留旅: %s"
 
-#: ../libpurple/protocols/irc/cmds.c:507
+#: ../libpurple/protocols/irc/cmds.c:515
 #: ../libpurple/protocols/jabber/chat.c:595
-#: ../libpurple/protocols/silc/silc.c:1349
-#: ../libpurple/protocols/silc10/silc.c:1278
+#: ../libpurple/protocols/silc/silc.c:1492
+#: ../libpurple/protocols/silc10/silc.c:1284
 msgid "No topic is set"
 msgstr "�竜僚 凌�溜��侶虜竜 慮劉亮留 ��龍流�侶�侶�"
 
-#: ../libpurple/protocols/irc/dcc_send.c:296
-#: ../libpurple/protocols/irc/dcc_send.c:337
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:269
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:278
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:287
+#: ../libpurple/protocols/irc/dcc_send.c:298
+#: ../libpurple/protocols/irc/dcc_send.c:339
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:318
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:327
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:336
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1109
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1513
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1564
 msgid "File Transfer Failed"
 msgstr "��凌���溜留 亮竜�留�凌�略� 留��竜溜凌�"
 
-#: ../libpurple/protocols/irc/dcc_send.c:297
-#: ../libpurple/protocols/irc/dcc_send.c:338
+#: ../libpurple/protocols/irc/dcc_send.c:299
+#: ../libpurple/protocols/irc/dcc_send.c:340
 msgid "Could not open a listening port."
 msgstr "�隆�僚留亮溜留 留僚凌溜粒亮留�凌� 亮旅留� 慮��留� 留虜��留�侶�."
 
@@ -4098,86 +4358,84 @@
 msgid "MOTD for %s"
 msgstr "�流僚�亮留 �侶� 侶亮劉�留� 粒旅留 %s"
 
-#: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165
-#: ../libpurple/protocols/irc/irc.c:612 ../libpurple/protocols/irc/irc.c:637
-#: ../libpurple/protocols/myspace/myspace.c:2356
+#: ../libpurple/protocols/irc/irc.c:129 ../libpurple/protocols/irc/irc.c:169
+#: ../libpurple/protocols/irc/irc.c:633 ../libpurple/protocols/irc/irc.c:662
+#: ../libpurple/protocols/myspace/myspace.c:2530
 msgid "Server has disconnected"
 msgstr "� 竜両��侶�竜�侶�流� 留�凌��僚隆劉慮侶虜竜"
 
-#: ../libpurple/protocols/irc/irc.c:249
+#: ../libpurple/protocols/irc/irc.c:260
 msgid "View MOTD"
 msgstr "�亮�略僚旅�侶 亮侶僚�亮留�凌� �侶� 侶亮劉�留�"
 
-#: ../libpurple/protocols/irc/irc.c:261 ../libpurple/protocols/silc/chat.c:33
+#: ../libpurple/protocols/irc/irc.c:272 ../libpurple/protocols/silc/chat.c:33
 #: ../libpurple/protocols/silc10/chat.c:33
 msgid "_Channel:"
 msgstr "_�留僚略了旅:"
 
-#: ../libpurple/protocols/irc/irc.c:267
-#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:524
+#: ../libpurple/protocols/irc/irc.c:278
+#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:496
 msgid "_Password:"
 msgstr "_��隆旅虜��:"
 
-#: ../libpurple/protocols/irc/irc.c:298
+#: ../libpurple/protocols/irc/irc.c:311
 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:1280
-#: ../libpurple/protocols/msn/session.c:345
-#: ../libpurple/protocols/myspace/myspace.c:301
-#: ../libpurple/protocols/novell/novell.c:2182
-#: ../libpurple/protocols/oscar/oscar.c:1287
+#: ../libpurple/protocols/irc/irc.c:332
+#: ../libpurple/protocols/jabber/jabber.c:1336
+#: ../libpurple/protocols/msn/session.c:402
+#: ../libpurple/protocols/msnp9/session.c:354
+#: ../libpurple/protocols/myspace/myspace.c:295
+#: ../libpurple/protocols/novell/novell.c:2199
+#: ../libpurple/protocols/oscar/oscar.c:1331
 #: ../libpurple/protocols/qq/qq.c:136
-#: ../libpurple/protocols/sametime/sametime.c:3723
-#: ../libpurple/protocols/simple/simple.c:1716
-#: ../libpurple/protocols/yahoo/yahoo.c:2939
-#: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:662
+#: ../libpurple/protocols/sametime/sametime.c:3776
+#: ../libpurple/protocols/simple/simple.c:1915
+#: ../libpurple/protocols/yahoo/yahoo.c:2966
+#: ../libpurple/protocols/zephyr/zephyr.c:1585 ../pidgin/gtkstatusbox.c:681
 msgid "Connecting"
 msgstr "�溜僚竜�留旅 ��僚隆竜�侶"
 
-#: ../libpurple/protocols/irc/irc.c:327
-#: ../libpurple/protocols/jabber/jabber.c:610
-#: ../libpurple/protocols/jabber/jabber.c:1095
+#: ../libpurple/protocols/irc/irc.c:342
+#: ../libpurple/protocols/jabber/jabber.c:664
+#: ../libpurple/protocols/jabber/jabber.c:1145
 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:1631
+#: ../libpurple/protocols/irc/irc.c:355
+#: ../libpurple/protocols/myspace/myspace.c:313
+#: ../libpurple/protocols/simple/simple.c:469
+#: ../libpurple/protocols/simple/simple.c:1825
 msgid "Couldn't create socket"
 msgstr "�竜僚 流�留僚 隆�僚留�流 侶 隆侶亮旅凌��粒溜留 ��凌隆凌�劉留"
 
-#: ../libpurple/protocols/irc/irc.c:421
-#: ../libpurple/protocols/myspace/myspace.c:2469
-#: ../libpurple/protocols/oscar/oscar.c:1283
+#: ../libpurple/protocols/irc/irc.c:437
+#: ../libpurple/protocols/oscar/oscar.c:1327
 msgid "Couldn't connect to host"
 msgstr "�竜僚 流�留僚 隆�僚留�流 侶 ��僚隆竜�侶 亮竜 �凌僚 虜竜僚��旅虜� ��凌了凌粒旅��流"
 
-#: ../libpurple/protocols/irc/irc.c:609 ../libpurple/protocols/irc/irc.c:634
-#: ../libpurple/protocols/myspace/myspace.c:2352
+#: ../libpurple/protocols/irc/irc.c:628 ../libpurple/protocols/irc/irc.c:657
+#: ../libpurple/protocols/myspace/myspace.c:2524
 msgid "Read error"
 msgstr "裡�略了亮留 留僚略粒僚��侶�"
 
-#: ../libpurple/protocols/irc/irc.c:773
-#: ../libpurple/protocols/silc/chat.c:1412
+#: ../libpurple/protocols/irc/irc.c:798
+#: ../libpurple/protocols/silc/chat.c:1398
 #: ../libpurple/protocols/silc10/chat.c:1426
-#: ../libpurple/protocols/yahoo/yahoochat.c:1497
+#: ../libpurple/protocols/yahoo/yahoochat.c:1508
 msgid "Users"
 msgstr "律�流��竜�"
 
-#: ../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/irc/irc.c:801
+#: ../libpurple/protocols/sametime/sametime.c:3424
+#: ../libpurple/protocols/silc/chat.c:1401
+#: ../libpurple/protocols/silc/ops.c:1393
 #: ../libpurple/protocols/silc10/chat.c:1429
 #: ../libpurple/protocols/silc10/ops.c:1382
-#: ../libpurple/protocols/yahoo/yahoochat.c:1506
+#: ../libpurple/protocols/yahoo/yahoochat.c:1517
 msgid "Topic"
 msgstr "�劉亮留 ��龍流�侶�侶�"
 
@@ -4189,66 +4447,68 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:914
+#: ../libpurple/protocols/irc/irc.c:939
 msgid "IRC Protocol Plugin"
 msgstr "����慮竜�凌 ����凌虜�了了凌� IRC"
 
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:915
+#: ../libpurple/protocols/irc/irc.c:940
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "里凌 了旅粒��竜�凌 �略了旅留 ����慮竜�凌 粒旅留 �凌 �����虜凌了了凌 IRC"
 
 #. host to connect to
-#: ../libpurple/protocols/irc/irc.c:940 ../libpurple/protocols/irc/msgs.c:323
-#: ../libpurple/protocols/msn/msn.c:2185
-#: ../libpurple/protocols/oscar/oscar.c:6671
-#: ../libpurple/protocols/qq/qq.c:755
-#: ../libpurple/protocols/sametime/sametime.c:5727
+#: ../libpurple/protocols/irc/irc.c:965 ../libpurple/protocols/irc/msgs.c:325
+#: ../libpurple/protocols/msn/msn.c:2343
+#: ../libpurple/protocols/msnp9/msn.c:2197
+#: ../libpurple/protocols/oscar/oscar.c:6747
+#: ../libpurple/protocols/qq/qq.c:756
+#: ../libpurple/protocols/sametime/sametime.c:5781
 #: ../libpurple/protocols/silc/ops.c:1249
-#: ../libpurple/protocols/silc/ops.c:1341
+#: ../libpurple/protocols/silc/ops.c:1343
 #: ../libpurple/protocols/silc10/ops.c:1244
 #: ../libpurple/protocols/silc10/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:1896
+#: ../libpurple/protocols/simple/simple.c:2099
 #: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "�両��侶�竜�侶�流�"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:943 ../libpurple/protocols/msn/msn.c:2190
-#: ../libpurple/protocols/oscar/oscar.c:6674
-#: ../libpurple/protocols/qq/qq.c:758
-#: ../libpurple/protocols/sametime/sametime.c:5732
-#: ../libpurple/protocols/silc/silc.c:1918
-#: ../libpurple/protocols/silc10/silc.c:1861
+#: ../libpurple/protocols/irc/irc.c:968 ../libpurple/protocols/msn/msn.c:2348
+#: ../libpurple/protocols/msnp9/msn.c:2202
+#: ../libpurple/protocols/oscar/oscar.c:6750
+#: ../libpurple/protocols/qq/qq.c:759
+#: ../libpurple/protocols/sametime/sametime.c:5786
+#: ../libpurple/protocols/silc/silc.c:2061
+#: ../libpurple/protocols/silc10/silc.c:1867
 #: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "���留"
 
-#: ../libpurple/protocols/irc/irc.c:946
+#: ../libpurple/protocols/irc/irc.c:971
 msgid "Encodings"
 msgstr "��隆旅虜凌�凌旅流�竜旅�"
 
-#: ../libpurple/protocols/irc/irc.c:949 ../libpurple/protocols/irc/msgs.c:316
-#: ../libpurple/protocols/jabber/jabber.c:904
-#: ../libpurple/protocols/jabber/jabber.c:907
-#: ../libpurple/protocols/silc/buddy.c:1539
+#: ../libpurple/protocols/irc/irc.c:974 ../libpurple/protocols/irc/msgs.c:318
+#: ../libpurple/protocols/jabber/jabber.c:964
+#: ../libpurple/protocols/jabber/jabber.c:966
+#: ../libpurple/protocols/silc/buddy.c:1542
 #: ../libpurple/protocols/silc/ops.c:1197
 #: ../libpurple/protocols/silc/ops.c:1200
-#: ../libpurple/protocols/silc/ops.c:1334
-#: ../libpurple/protocols/silc/ops.c:1337
-#: ../libpurple/protocols/silc/silc.c:1005
-#: ../libpurple/protocols/silc10/buddy.c:1539
+#: ../libpurple/protocols/silc/ops.c:1336
+#: ../libpurple/protocols/silc/ops.c:1339
+#: ../libpurple/protocols/silc/silc.c:1148
+#: ../libpurple/protocols/silc10/buddy.c:1542
 #: ../libpurple/protocols/silc10/ops.c:1191
 #: ../libpurple/protocols/silc10/ops.c:1194
 #: ../libpurple/protocols/silc10/ops.c:1340
 #: ../libpurple/protocols/silc10/ops.c:1343
-#: ../libpurple/protocols/silc10/silc.c:916
+#: ../libpurple/protocols/silc10/silc.c:922
 msgid "Username"
 msgstr "�僚凌亮留 ��流��侶"
 
-#: ../libpurple/protocols/irc/irc.c:952 ../libpurple/protocols/irc/msgs.c:317
-#: ../libpurple/protocols/silc/silc.c:1009
-#: ../libpurple/protocols/silc10/silc.c:920
+#: ../libpurple/protocols/irc/irc.c:977 ../libpurple/protocols/irc/msgs.c:319
+#: ../libpurple/protocols/silc/silc.c:1152
+#: ../libpurple/protocols/silc10/silc.c:926
 msgid "Real name"
 msgstr "��留粒亮留�旅虜� �僚凌亮留"
 
@@ -4256,158 +4516,158 @@
 #. 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:960
+#: ../libpurple/protocols/irc/irc.c:985
 msgid "Use SSL"
 msgstr "律�流�侶 SSL"
 
-#: ../libpurple/protocols/irc/msgs.c:187
+#: ../libpurple/protocols/irc/msgs.c:189
 msgid "Bad mode"
 msgstr "�留虜流 虜留�略��留�侶"
 
-#: ../libpurple/protocols/irc/msgs.c:198
+#: ../libpurple/protocols/irc/msgs.c:200
 #, c-format
 msgid "You are banned from %s."
 msgstr "裡留� 留�留粒��竜��留僚 �侶僚 竜溜�凌隆凌 ��凌 %s."
 
-#: ../libpurple/protocols/irc/msgs.c:199
+#: ../libpurple/protocols/irc/msgs.c:201
 msgid "Banned"
 msgstr "��留粒凌�竜�亮劉僚侶 竜溜�凌隆凌�"
 
-#: ../libpurple/protocols/irc/msgs.c:216
+#: ../libpurple/protocols/irc/msgs.c:218
 #, c-format
 msgid "Cannot ban %s: banlist is full"
 msgstr "�隆�僚留亮溜留 留�留粒��竜��侶� 竜旅��隆凌� �竜 %s: 侶 了溜��留 留�留粒��竜��侶� 竜旅��隆凌� 粒劉亮旅�竜"
 
-#: ../libpurple/protocols/irc/msgs.c:301
+#: ../libpurple/protocols/irc/msgs.c:303
 msgid " <i>(ircop)</i>"
 msgstr " <i>(ircop)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:302
+#: ../libpurple/protocols/irc/msgs.c:304
 msgid " <i>(identified)</i>"
 msgstr " <i>(留僚留粒僚��旅�亮劉僚凌�)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:303
-#: ../libpurple/protocols/oscar/oscar.c:3700
-#: ../libpurple/protocols/silc/ops.c:1418
+#: ../libpurple/protocols/irc/msgs.c:305
+#: ../libpurple/protocols/oscar/oscar.c:3733
+#: ../libpurple/protocols/silc/ops.c:1422
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
 msgstr "率竜�隆�僚�亮凌"
 
-#: ../libpurple/protocols/irc/msgs.c:329
+#: ../libpurple/protocols/irc/msgs.c:331
 #: ../libpurple/protocols/silc/ops.c:1268
 #: ../libpurple/protocols/silc10/ops.c:1272
 msgid "Currently on"
 msgstr "�留��僚 ��留"
 
-#: ../libpurple/protocols/irc/msgs.c:334
+#: ../libpurple/protocols/irc/msgs.c:336
 msgid "Idle for"
 msgstr "�僚竜僚竜�粒�� 粒旅留"
 
-#: ../libpurple/protocols/irc/msgs.c:337
+#: ../libpurple/protocols/irc/msgs.c:339
 msgid "Online since"
 msgstr "裡�僚隆竜隆竜亮劉僚凌� 留��"
 
-#: ../libpurple/protocols/irc/msgs.c:341
+#: ../libpurple/protocols/irc/msgs.c:343
 msgid "<b>Defining adjective:</b>"
 msgstr "<b>律留�留虜�侶�旅��旅虜� 竜�溜慮竜�凌:</b>"
 
-#: ../libpurple/protocols/irc/msgs.c:341
+#: ../libpurple/protocols/irc/msgs.c:343
 msgid "Glorious"
 msgstr "律留�凌�亮竜僚凌�"
 
-#: ../libpurple/protocols/irc/msgs.c:420
+#: ../libpurple/protocols/irc/msgs.c:422
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s 略了了留両竜 �凌 慮劉亮留 ��龍流�侶�侶� �竜: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:422
+#: ../libpurple/protocols/irc/msgs.c:424
 #, c-format
 msgid "%s has cleared the topic."
 msgstr "%s 虜留慮略�旅�竜 �凌 慮劉亮留 ��龍流�侶�侶�."
 
-#: ../libpurple/protocols/irc/msgs.c:430
+#: ../libpurple/protocols/irc/msgs.c:432
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "里凌 慮劉亮留 ��龍流�侶�侶� �凌� %s 竜溜僚留旅: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:448
+#: ../libpurple/protocols/irc/msgs.c:450
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "�粒僚���凌 亮流僚�亮留 '%s'"
 
-#: ../libpurple/protocols/irc/msgs.c:449
+#: ../libpurple/protocols/irc/msgs.c:451
 msgid "Unknown message"
 msgstr "�粒僚���凌 亮流僚�亮留"
 
-#: ../libpurple/protocols/irc/msgs.c:449
+#: ../libpurple/protocols/irc/msgs.c:451
 msgid "The IRC server received a message it did not understand."
 msgstr "� 竜両��侶�竜�侶�流� IRC 劉了留硫竜 劉僚留 亮流僚�亮留 �凌 凌�凌溜凌 隆竜僚 虜留�留僚�侶�竜."
 
-#: ../libpurple/protocols/irc/msgs.c:470
+#: ../libpurple/protocols/irc/msgs.c:472
 #, c-format
 msgid "Users on %s: %s"
 msgstr "律�流��竜� ��凌 %s: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:575
+#: ../libpurple/protocols/irc/msgs.c:577
 msgid "Time Response"
 msgstr "律�凌僚旅虜流 留僚�留��虜�旅�侶"
 
-#: ../libpurple/protocols/irc/msgs.c:576
+#: ../libpurple/protocols/irc/msgs.c:578
 msgid "The IRC server's local time is:"
 msgstr "� �凌�旅虜流 ��留 �凌� 竜両��侶�竜�侶�流 IRC 竜溜僚留旅:"
 
-#: ../libpurple/protocols/irc/msgs.c:587
+#: ../libpurple/protocols/irc/msgs.c:589
 msgid "No such channel"
 msgstr "�竜僚 ��略��竜旅 �劉�凌旅凌 虜留僚略了旅"
 
 #. does this happen?
-#: ../libpurple/protocols/irc/msgs.c:598
+#: ../libpurple/protocols/irc/msgs.c:600
 msgid "no such channel"
 msgstr "隆竜僚 ��略��竜旅 �劉�凌旅凌 虜留僚略了旅"
 
-#: ../libpurple/protocols/irc/msgs.c:601
+#: ../libpurple/protocols/irc/msgs.c:603
 msgid "User is not logged in"
 msgstr "� ��流��侶� 隆竜僚 竜溜僚留旅 ��僚隆竜隆竜亮劉僚凌�"
 
-#: ../libpurple/protocols/irc/msgs.c:606
+#: ../libpurple/protocols/irc/msgs.c:608
 msgid "No such nick or channel"
 msgstr "�竜僚 ��略��竜旅 �劉�凌旅凌 �竜�隆�僚�亮凌 流 虜留僚略了旅"
 
-#: ../libpurple/protocols/irc/msgs.c:626
+#: ../libpurple/protocols/irc/msgs.c:628
 msgid "Could not send"
 msgstr "�竜僚 流�留僚 隆�僚留�流 侶 留�凌��凌了流"
 
-#: ../libpurple/protocols/irc/msgs.c:682
+#: ../libpurple/protocols/irc/msgs.c:684
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "� ��亮亮竜�凌�流 ��凌 %s 留�留旅�竜溜 ����虜了侶�侶."
 
-#: ../libpurple/protocols/irc/msgs.c:683
+#: ../libpurple/protocols/irc/msgs.c:685
 msgid "Invitation only"
 msgstr "��僚凌 亮竜 ��凌�虜了流�竜旅�"
 
-#: ../libpurple/protocols/irc/msgs.c:795
+#: ../libpurple/protocols/irc/msgs.c:801
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "��竜�竜 竜虜隆旅��慮竜溜 留�� �凌僚 %s: (%s)"
 
 #. Remove user from channel
-#: ../libpurple/protocols/irc/msgs.c:800 ../libpurple/protocols/silc/ops.c:699
+#: ../libpurple/protocols/irc/msgs.c:806 ../libpurple/protocols/silc/ops.c:699
 #: ../libpurple/protocols/silc10/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "�虜隆旅�粒亮劉僚凌� 留�� �凌僚 %s (%s)"
 
-#: ../libpurple/protocols/irc/msgs.c:823
+#: ../libpurple/protocols/irc/msgs.c:829
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "虜留�略��留�侶 (%s %s) 留�� %s"
 
-#: ../libpurple/protocols/irc/msgs.c:908 ../libpurple/protocols/irc/msgs.c:909
+#: ../libpurple/protocols/irc/msgs.c:914 ../libpurple/protocols/irc/msgs.c:915
 msgid "Invalid nickname"
 msgstr "�侶 劉粒虜��凌 �竜�隆�僚�亮凌"
 
-#: ../libpurple/protocols/irc/msgs.c:910
+#: ../libpurple/protocols/irc/msgs.c:916
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
@@ -4415,7 +4675,7 @@
 "里凌 �竜�隆�僚�亮凌 �凌� 竜�旅了劉両留�竜 留�凌��溜�慮侶虜竜 留�� �凌僚 竜両��侶�竜�侶�流.  �旅慮留僚�� 僚留 "
 "�竜�旅劉�竜旅 亮侶 劉粒虜��凌�� �留�留虜�流�竜�."
 
-#: ../libpurple/protocols/irc/msgs.c:915
+#: ../libpurple/protocols/irc/msgs.c:921
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
@@ -4423,44 +4683,44 @@
 "里凌 �僚凌亮留 了凌粒留�旅留�亮凌� �凌� 竜�旅了劉両留�竜 留�凌��溜�慮侶虜竜 留�� �凌僚 竜両��侶�竜�侶�流.  �旅慮留僚�� "
 "僚留 �竜�旅劉�竜旅 亮侶 劉粒虜��凌�� �留�留虜�流�竜�."
 
-#: ../libpurple/protocols/irc/msgs.c:954
+#: ../libpurple/protocols/irc/msgs.c:960
 msgid "Cannot change nick"
 msgstr "�竜僚 竜溜僚留旅 隆�僚留�流 侶 留了了留粒流 �凌� �竜�隆�僚�亮凌�"
 
-#: ../libpurple/protocols/irc/msgs.c:954
+#: ../libpurple/protocols/irc/msgs.c:960
 msgid "Could not change nick"
 msgstr "�竜僚 流�留僚 隆�僚留�流 侶 留了了留粒流 �凌� �竜�隆�僚�亮凌�"
 
-#: ../libpurple/protocols/irc/msgs.c:975
+#: ../libpurple/protocols/irc/msgs.c:981
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "��凌���溜�留�竜 留�� �凌 虜留僚略了旅%s%s"
 
-#: ../libpurple/protocols/irc/msgs.c:1017
+#: ../libpurple/protocols/irc/msgs.c:1023
 msgid "Error: invalid PONG from server"
 msgstr "裡�略了亮留: 了留僚慮留�亮劉僚凌 PONG 留�� �凌僚 竜両��侶�竜�侶�流"
 
-#: ../libpurple/protocols/irc/msgs.c:1019
+#: ../libpurple/protocols/irc/msgs.c:1025
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "��略僚�侶�侶 Ping -- �留慮���劉�侶�侶:  %lu 隆竜��竜��了竜��留"
 
-#: ../libpurple/protocols/irc/msgs.c:1110
+#: ../libpurple/protocols/irc/msgs.c:1116
 #, c-format
 msgid "Cannot join %s: Registration is required."
 msgstr "�竜僚 竜溜僚留旅 隆�僚留�流 侶 ��亮亮竜�凌�流 ��凌 %s: ��留旅�竜溜�留旅 虜留�留���侶�侶."
 
-#: ../libpurple/protocols/irc/msgs.c:1111
+#: ../libpurple/protocols/irc/msgs.c:1117
 #: ../libpurple/protocols/silc/ops.c:1093
 #: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Cannot join channel"
 msgstr "�竜僚 竜溜僚留旅 隆�僚留�流 侶 ��亮亮竜�凌�流 ��凌 虜留僚略了旅"
 
-#: ../libpurple/protocols/irc/msgs.c:1145
+#: ../libpurple/protocols/irc/msgs.c:1151
 msgid "Nick or channel is temporarily unavailable."
 msgstr "里凌 �竜�隆�僚�亮凌 流 �凌 虜留僚略了旅 竜溜僚留旅 ��凌���旅僚略 亮侶 隆旅留慮劉�旅亮凌."
 
-#: ../libpurple/protocols/irc/msgs.c:1157
+#: ../libpurple/protocols/irc/msgs.c:1163
 #, c-format
 msgid "Wallops from %s"
 msgstr "Wallops 留�� %s"
@@ -4570,7 +4830,7 @@
 msgstr "names [虜留僚略了旅]:  �溜��留 ��僚 ��侶���僚 �凌� 竜溜僚留旅 �留��僚�竜� �竜 劉僚留 虜留僚略了旅."
 
 #: ../libpurple/protocols/irc/parse.c:137
-#: ../libpurple/protocols/jabber/jabber.c:2261
+#: ../libpurple/protocols/jabber/jabber.c:2348
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;僚劉凌 �竜�隆�僚�亮凌&gt;:  �了了留粒流 �凌� �竜�隆�僚�亮凌� �留�."
 
@@ -4579,6 +4839,10 @@
 msgstr "nickserv: ��凌��凌了流 竜僚�凌了流� ��凌僚 nickserv"
 
 #: ../libpurple/protocols/irc/parse.c:139
+msgid "notice &lt;target&lt;:  Send a notice to a user or channel."
+msgstr "notice &lt;����凌�&lt;:  ��凌��凌了流 留僚留虜凌溜僚��侶� �竜 劉僚留 ��流��侶 流 虜留僚略了旅."
+
+#: ../libpurple/protocols/irc/parse.c:140
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
@@ -4586,7 +4850,7 @@
 "op &lt;�僚凌亮留1&gt; [�僚凌亮留2] ...:  里溜亮侶�竜 虜略�凌旅凌僚 虜略僚凌僚�略� �凌僚 隆旅留�竜旅�旅��流 �凌� "
 "虜留僚留了旅凌�. ��劉�竜旅 流隆侶 僚留 竜溜��竜 隆旅留�竜旅�旅��流� 虜留僚留了旅凌� 粒旅留 僚留 �凌 竜虜�竜了劉�竜�竜."
 
-#: ../libpurple/protocols/irc/parse.c:140
+#: ../libpurple/protocols/irc/parse.c:141
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
@@ -4594,11 +4858,11 @@
 "operwall &lt;亮流僚�亮留&gt;:  �僚 隆竜僚 両劉�竜�竜 �旅 竜溜僚留旅, 亮略了了凌僚 隆竜僚 亮�凌�竜溜�竜 僚留 �凌 "
 "��侶�旅亮凌�凌旅流�竜�竜 虜旅�了留�."
 
-#: ../libpurple/protocols/irc/parse.c:141
+#: ../libpurple/protocols/irc/parse.c:142
 msgid "operserv: Send a command to operserv"
 msgstr "operserv: ��凌��凌了流 竜僚�凌了流� ��凌僚 operserv"
 
-#: ../libpurple/protocols/irc/parse.c:142
+#: ../libpurple/protocols/irc/parse.c:143
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
@@ -4606,7 +4870,7 @@
 "part [隆�亮略�旅凌] [亮流僚�亮留]:  ��凌���侶�侶 留�� �凌 ��劉�凌僚 虜留僚略了旅, 流 劉僚留 凌�旅�亮劉僚凌 "
 "虜留僚略了旅, 亮竜 劉僚留 ��凌留旅�竜�旅虜� 亮流僚�亮留."
 
-#: ../libpurple/protocols/irc/parse.c:143
+#: ../libpurple/protocols/irc/parse.c:144
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
@@ -4614,7 +4878,7 @@
 "ping [�僚凌亮留]:  痢��流��竜 �凌 ���僚凌 虜留慮���劉�侶�侶� �竜 ��劉�侶 亮竜 劉僚留僚 ��流��侶 (流 �凌僚 "
 "竜両��侶�竜�侶�流 留僚 隆竜 隆凌慮竜溜 ��流��侶�)."
 
-#: ../libpurple/protocols/irc/parse.c:144
+#: ../libpurple/protocols/irc/parse.c:145
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -4622,16 +4886,15 @@
 "query &lt;�竜�隆�僚�亮凌&gt; &lt;亮流僚�亮留&gt;:  ��凌��凌了流 ��凌���旅虜凌� 亮侶僚�亮留�凌� ��凌 "
 "��流��侶 (�竜 留僚�溜慮竜�侶 亮竜 �凌 虜留僚略了旅)."
 
-#: ../libpurple/protocols/irc/parse.c:145
+#: ../libpurple/protocols/irc/parse.c:146
 msgid "quit [message]:  Disconnect from the server, with an optional message."
-msgstr ""
-"quit [亮流僚�亮留]:  ��凌��僚隆竜�侶 留�� �凌僚 竜両��侶�竜�侶�流, 亮竜 劉僚留 ��凌留旅�竜�旅虜� 亮流僚�亮留."
-
-#: ../libpurple/protocols/irc/parse.c:146
+msgstr "quit [亮流僚�亮留]:  ��凌��僚隆竜�侶 留�� �凌僚 竜両��侶�竜�侶�流, 亮竜 劉僚留 ��凌留旅�竜�旅虜� 亮流僚�亮留."
+
+#: ../libpurple/protocols/irc/parse.c:147
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...]:  裡�竜溜了�竜 亮旅留 亮侶 隆旅留亮凌��凌�凌旅侶亮劉僚侶 竜僚�凌了流 ��凌僚 竜両��侶�竜�侶�流."
 
-#: ../libpurple/protocols/irc/parse.c:147
+#: ../libpurple/protocols/irc/parse.c:148
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
@@ -4639,25 +4902,25 @@
 "remove &lt;�僚凌亮留&gt; [亮流僚�亮留]:  ��凌亮留虜��僚竜�竜 虜略�凌旅凌僚 留�� �凌 虜留僚略了旅. ��劉�竜旅 "
 "流隆侶 僚留 竜溜��竜 隆旅留�竜旅�旅��流� 虜留僚留了旅凌� 粒旅留 僚留 �凌 竜虜�竜了劉�竜�竜."
 
-#: ../libpurple/protocols/irc/parse.c:148
+#: ../libpurple/protocols/irc/parse.c:149
 msgid "time: Displays the current local time at the IRC server."
 msgstr "time: �亮�留僚溜龍竜旅 �侶僚 ��劉�凌��留 �凌�旅虜流 ��留 �凌� 竜両��侶�竜�侶�流 IRC."
 
-#: ../libpurple/protocols/irc/parse.c:149
+#: ../libpurple/protocols/irc/parse.c:150
 msgid "topic [new topic]:  View or change the channel topic."
 msgstr "topic [僚劉凌 慮劉亮留 ��龍流�侶�侶�]:  �亮�略僚旅�侶 流 留了了留粒流 �凌� 慮劉亮留�凌� ��龍流�侶�侶�."
 
-#: ../libpurple/protocols/irc/parse.c:150
+#: ../libpurple/protocols/irc/parse.c:151
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
 msgstr ""
 "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  ��旅�亮�� 流 留僚留溜�竜�侶 凌�旅�亮凌� �侶� 虜留�略��留�侶� "
 "�凌� ��流��侶."
 
-#: ../libpurple/protocols/irc/parse.c:151
+#: ../libpurple/protocols/irc/parse.c:152
 msgid "version [nick]: send CTCP VERSION request to a user"
 msgstr "version [�竜�隆�僚�亮凌]: 留�凌��凌了流 竜���流亮留�凌� CTCP VERSION �竜 劉僚留 ��流��侶"
 
-#: ../libpurple/protocols/irc/parse.c:152
+#: ../libpurple/protocols/irc/parse.c:153
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
@@ -4665,7 +4928,7 @@
 "voice &lt;�僚凌亮留1&gt; [�僚凌亮留2] ...:  里旅亮流��竜 虜略�凌旅凌僚 亮竜 �侶 隆�僚留���侶�留 凌亮旅了溜留� "
 "��凌 虜留僚略了旅. ��劉�竜旅 流隆侶 僚留 竜溜��竜 隆旅留�竜旅�旅��流� 虜留僚留了旅凌� 粒旅留 僚留 �凌 竜虜�竜了劉�竜�竜."
 
-#: ../libpurple/protocols/irc/parse.c:153
+#: ../libpurple/protocols/irc/parse.c:154
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
@@ -4673,67 +4936,64 @@
 "wallops &lt;亮流僚�亮留&gt;:  �僚 隆竜僚 両劉�竜�竜 �旅 竜溜僚留旅, 亮略了了凌僚 隆竜僚 亮�凌�竜溜�竜 僚留 �凌 "
 "��侶�旅亮凌�凌旅流�竜�竜 虜旅�了留�."
 
-#: ../libpurple/protocols/irc/parse.c:154
+#: ../libpurple/protocols/irc/parse.c:155
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr "whois [竜両��侶�竜�侶�流�] &lt;�竜�隆�僚�亮凌&gt;:  �流�侶 �了侶�凌�凌�旅�僚 ��流��侶."
 
-#: ../libpurple/protocols/irc/parse.c:155
+#: ../libpurple/protocols/irc/parse.c:156
 msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
-msgstr ""
-"whowas &lt;�竜�隆�僚�亮凌&gt;:  �流�侶 �了侶�凌�凌�旅�僚 竜僚�� ��流��侶 �凌� 留�凌��僚隆劉慮侶虜竜."
-
-#: ../libpurple/protocols/irc/parse.c:465
+msgstr "whowas &lt;�竜�隆�僚�亮凌&gt;:  �流�侶 �了侶�凌�凌�旅�僚 竜僚�� ��流��侶 �凌� 留�凌��僚隆劉慮侶虜竜."
+
+#: ../libpurple/protocols/irc/parse.c:521
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "律��僚凌� 留�略僚�侶�侶� 留�� %s: %lu 隆竜��竜��了竜��留"
 
-#: ../libpurple/protocols/irc/parse.c:466
+#: ../libpurple/protocols/irc/parse.c:522
 msgid "PONG"
 msgstr "PONG"
 
-#: ../libpurple/protocols/irc/parse.c:466
+#: ../libpurple/protocols/irc/parse.c:522
 msgid "CTCP PING reply"
 msgstr "�僚�留��虜�旅�侶 CTCP PING"
 
-#: ../libpurple/protocols/irc/parse.c:577
-#: ../libpurple/protocols/irc/parse.c:581 ../libpurple/protocols/toc/toc.c:191
+#: ../libpurple/protocols/irc/parse.c:634
+#: ../libpurple/protocols/irc/parse.c:641 ../libpurple/protocols/toc/toc.c:191
 #: ../libpurple/protocols/toc/toc.c:694 ../libpurple/protocols/toc/toc.c:710
 #: ../libpurple/protocols/toc/toc.c:786
 msgid "Disconnected."
 msgstr "��凌��僚隆劉慮侶虜竜."
 
-#: ../libpurple/protocols/jabber/adhoccommands.c:137
-#: ../libpurple/protocols/jabber/jabber.c:671
-#: ../libpurple/protocols/jabber/jabber.c:701
-#: ../libpurple/protocols/jabber/jabber.c:1887
+#: ../libpurple/protocols/jabber/adhoccommands.c:143
+#: ../libpurple/protocols/jabber/jabber.c:725
+#: ../libpurple/protocols/jabber/jabber.c:755
+#: ../libpurple/protocols/jabber/jabber.c:1932
 msgid "Unknown Error"
 msgstr "�粒僚���凌 ��略了亮留"
 
-#: ../libpurple/protocols/jabber/adhoccommands.c:139
-#: ../libpurple/protocols/jabber/adhoccommands.c:140
-#, fuzzy
+#: ../libpurple/protocols/jabber/adhoccommands.c:145
+#: ../libpurple/protocols/jabber/adhoccommands.c:146
 msgid "Ad-Hoc Command Failed"
-msgstr "�僚�凌了流 留�竜僚竜�粒凌�凌旅侶亮劉僚侶"
-
-#: ../libpurple/protocols/jabber/adhoccommands.c:173
-#, fuzzy
+msgstr ""
+
+#: ../libpurple/protocols/jabber/adhoccommands.c:182
 msgid "execute"
-msgstr "�僚留�略僚�竜�凌"
-
-#: ../libpurple/protocols/jabber/auth.c:53
+msgstr "竜虜�劉了竜�侶"
+
+#: ../libpurple/protocols/jabber/auth.c:55
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
 msgstr ""
 "� 竜両��侶�竜�侶�流� 留�留旅�竜溜 TLS/SSL 粒旅留 僚留 粒溜僚竜旅 ��僚隆竜�侶.  �竜 硫�劉慮侶虜竜 ��凌��流�旅両侶 "
 "TLS/SSL."
 
-#: ../libpurple/protocols/jabber/auth.c:116
+#: ../libpurple/protocols/jabber/auth.c:120
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
 "� 竜両��侶�竜�侶�流� 留�留旅�竜溜 劉粒虜�旅�侶 亮竜 �虜劉�凌 虜竜溜亮竜僚凌 亮劉�� 亮旅留� 亮侶 虜�隆旅虜凌�凌旅侶亮劉僚侶� "
 "�凌流�"
 
-#: ../libpurple/protocols/jabber/auth.c:319
-#: ../libpurple/protocols/jabber/auth.c:508
+#: ../libpurple/protocols/jabber/auth.c:323
+#: ../libpurple/protocols/jabber/auth.c:526
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
@@ -4742,33 +5002,31 @@
 "里凌 %s 留�留旅�竜溜 劉粒虜�旅�侶 亮竜 �虜劉�凌 虜竜溜亮竜僚凌 亮劉�� 亮旅留� 亮侶 虜����凌粒�留�侶亮劉僚侶� "
 "��僚隆竜�侶�.  �留 竜�旅��留�竜溜 虜留旅 僚留 ��僚竜�旅��竜溜 侶 竜�旅虜����侶;"
 
-#: ../libpurple/protocols/jabber/auth.c:321
-#: ../libpurple/protocols/jabber/auth.c:322
-#: ../libpurple/protocols/jabber/auth.c:510
-#: ../libpurple/protocols/jabber/auth.c:511
-#: ../libpurple/protocols/jabber/auth.c:598
-#: ../libpurple/protocols/jabber/auth.c:599
+#: ../libpurple/protocols/jabber/auth.c:325
+#: ../libpurple/protocols/jabber/auth.c:326
+#: ../libpurple/protocols/jabber/auth.c:528
+#: ../libpurple/protocols/jabber/auth.c:529
+#: ../libpurple/protocols/jabber/auth.c:720
+#: ../libpurple/protocols/jabber/auth.c:721
 msgid "Plaintext Authentication"
 msgstr "�粒虜�旅�侶 亮竜 �虜劉�凌 虜竜溜亮竜僚凌"
 
-#: ../libpurple/protocols/jabber/auth.c:334
-#: ../libpurple/protocols/jabber/auth.c:523
-#: ../libpurple/protocols/jabber/auth.c:610
+#: ../libpurple/protocols/jabber/auth.c:480
+#: ../libpurple/protocols/jabber/auth.c:653
+#: ../libpurple/protocols/jabber/auth.c:901
+#: ../libpurple/protocols/jabber/auth.c:1050
+#: ../libpurple/protocols/jabber/auth.c:1077
+#: ../libpurple/protocols/jabber/auth.c:1101
+#: ../libpurple/protocols/jabber/jabber.c:127
+msgid "Invalid response from server."
+msgstr "�留僚慮留�亮劉僚侶 留僚�留��虜�旅�侶 �凌� 竜両��侶�竜�侶�流."
+
+#: ../libpurple/protocols/jabber/auth.c:542
+#: ../libpurple/protocols/jabber/auth.c:733
 msgid "Server does not use any supported authentication method"
 msgstr "� 竜両��侶�竜�侶�流� 隆竜 ��侶�旅亮凌�凌旅竜溜 虜留亮溜留 ��凌��侶�旅龍�亮竜僚侶 亮劉慮凌隆凌 劉粒虜�旅�侶�"
 
-#. This should never happen!
-#: ../libpurple/protocols/jabber/auth.c:462
-#: ../libpurple/protocols/jabber/auth.c:561
-#: ../libpurple/protocols/jabber/auth.c:776
-#: ../libpurple/protocols/jabber/auth.c:917
-#: ../libpurple/protocols/jabber/auth.c:942
-#: ../libpurple/protocols/jabber/auth.c:961
-#: ../libpurple/protocols/jabber/jabber.c:123
-msgid "Invalid response from server."
-msgstr "�留僚慮留�亮劉僚侶 留僚�留��虜�旅�侶 �凌� 竜両��侶�竜�侶�流."
-
-#: ../libpurple/protocols/jabber/auth.c:600
+#: ../libpurple/protocols/jabber/auth.c:722
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
@@ -4776,114 +5034,115 @@
 "����� 凌 竜両��侶�竜�侶�流� 留�留旅�竜溜 劉粒虜�旅�侶 亮竜 �虜劉�凌 虜竜溜亮竜僚凌 亮劉�� 亮旅留� 亮侶 "
 "虜����凌粒�留�侶亮劉僚侶� ��僚隆竜�侶�.  �留 竜�旅��留�竜溜 虜留旅 僚留 ��僚竜�旅��竜溜 侶 竜�旅虜����侶;"
 
-#: ../libpurple/protocols/jabber/auth.c:797
-#: ../libpurple/protocols/jabber/auth.c:820
+#: ../libpurple/protocols/jabber/auth.c:924
+#: ../libpurple/protocols/jabber/auth.c:949
 msgid "Invalid challenge from server"
 msgstr "�侶 劉粒虜��侶 ���虜了侶�侶 留�� �凌僚 竜両��侶�竜�侶�流"
 
-#: ../libpurple/protocols/jabber/auth.c:892
+#: ../libpurple/protocols/jabber/auth.c:1023
 msgid "SASL error"
 msgstr "裡�略了亮留 SASL"
 
 #: ../libpurple/protocols/jabber/buddy.c:283
-#: ../libpurple/protocols/jabber/buddy.c:1219
-#: ../libpurple/protocols/sametime/sametime.c:4128
+#: ../libpurple/protocols/jabber/buddy.c:1223
+#: ../libpurple/protocols/sametime/sametime.c:4182
 #: ../libpurple/protocols/silc/ops.c:986
 #: ../libpurple/protocols/silc10/ops.c:1020
 msgid "Full Name"
 msgstr "�僚凌亮留�竜��僚�亮凌"
 
 #: ../libpurple/protocols/jabber/buddy.c:284
-#: ../libpurple/protocols/jabber/buddy.c:1231
+#: ../libpurple/protocols/jabber/buddy.c:1235
 #: ../libpurple/protocols/silc/ops.c:998
 #: ../libpurple/protocols/silc10/ops.c:1032
 msgid "Family Name"
 msgstr "���僚�亮凌"
 
 #: ../libpurple/protocols/jabber/buddy.c:285
-#: ../libpurple/protocols/jabber/buddy.c:1234
+#: ../libpurple/protocols/jabber/buddy.c:1238
 msgid "Given Name"
 msgstr "�僚凌亮留"
 
 #: ../libpurple/protocols/jabber/buddy.c:287
-#: ../libpurple/protocols/jabber/jabber.c:977
+#: ../libpurple/protocols/jabber/jabber.c:1024
 msgid "URL"
 msgstr "URL"
 
 #: ../libpurple/protocols/jabber/buddy.c:288
-#: ../libpurple/protocols/jabber/buddy.c:1282
+#: ../libpurple/protocols/jabber/buddy.c:1286
 msgid "Street Address"
 msgstr "�旅竜�慮�僚�侶"
 
 #: ../libpurple/protocols/jabber/buddy.c:289
-#: ../libpurple/protocols/jabber/buddy.c:1279
+#: ../libpurple/protocols/jabber/buddy.c:1283
 msgid "Extended Address"
 msgstr "�虜�竜�留亮劉僚侶 隆旅竜�慮�僚�侶"
 
 #: ../libpurple/protocols/jabber/buddy.c:290
-#: ../libpurple/protocols/jabber/buddy.c:1285
+#: ../libpurple/protocols/jabber/buddy.c:1289
 msgid "Locality"
 msgstr "裡�僚凌旅虜溜留"
 
 #: ../libpurple/protocols/jabber/buddy.c:291
-#: ../libpurple/protocols/jabber/buddy.c:1288
+#: ../libpurple/protocols/jabber/buddy.c:1292
 msgid "Region"
 msgstr "�竜�旅凌�流"
 
 #: ../libpurple/protocols/jabber/buddy.c:292
-#: ../libpurple/protocols/jabber/buddy.c:1291
+#: ../libpurple/protocols/jabber/buddy.c:1295
 msgid "Postal Code"
 msgstr "里留�. ��隆旅虜留�"
 
 #: ../libpurple/protocols/jabber/buddy.c:293
-#: ../libpurple/protocols/jabber/buddy.c:1295
-#: ../libpurple/protocols/silc/silc.c:1015
-#: ../libpurple/protocols/silc10/silc.c:926
+#: ../libpurple/protocols/jabber/buddy.c:1299
+#: ../libpurple/protocols/silc/silc.c:1158
+#: ../libpurple/protocols/silc10/silc.c:932
 msgid "Country"
 msgstr "律��留"
 
 #: ../libpurple/protocols/jabber/buddy.c:294
-#: ../libpurple/protocols/jabber/buddy.c:1306
-#: ../libpurple/protocols/jabber/buddy.c:1313
+#: ../libpurple/protocols/jabber/buddy.c:1310
+#: ../libpurple/protocols/jabber/buddy.c:1317
 msgid "Telephone"
 msgstr "里侶了劉��僚凌"
 
 #: ../libpurple/protocols/jabber/buddy.c:296
-#: ../libpurple/protocols/jabber/buddy.c:1350
+#: ../libpurple/protocols/jabber/buddy.c:1354
 msgid "Organization Name"
 msgstr "�僚凌亮留 凌�粒留僚旅�亮凌�"
 
 #: ../libpurple/protocols/jabber/buddy.c:297
-#: ../libpurple/protocols/jabber/buddy.c:1353
+#: ../libpurple/protocols/jabber/buddy.c:1357
 msgid "Organization Unit"
 msgstr "里亮流亮留"
 
 #: ../libpurple/protocols/jabber/buddy.c:299
-#: ../libpurple/protocols/jabber/buddy.c:1362
+#: ../libpurple/protocols/jabber/buddy.c:1366
 msgid "Role"
 msgstr "痢�了凌�"
 
 #: ../libpurple/protocols/jabber/buddy.c:300
-#: ../libpurple/protocols/jabber/buddy.c:1250
-#: ../libpurple/protocols/msn/msn.c:1658
-#: ../libpurple/protocols/oscar/oscar.c:3749
+#: ../libpurple/protocols/jabber/buddy.c:1254
+#: ../libpurple/protocols/msn/msn.c:1814
+#: ../libpurple/protocols/msnp9/msn.c:1670
+#: ../libpurple/protocols/oscar/oscar.c:3782
 msgid "Birthday"
 msgstr "�亮竜�凌亮侶僚溜留 粒劉僚僚侶�侶�"
 
 #: ../libpurple/protocols/jabber/buddy.c:301
-#: ../libpurple/protocols/jabber/buddy.c:1365
+#: ../libpurple/protocols/jabber/buddy.c:1369
 #: ../libpurple/protocols/jabber/chat.c:775
-#: ../libpurple/protocols/jabber/usermood.c:175 ../pidgin/gtkblist.c:3116
-#: ../pidgin/gtkprefs.c:739
+#: ../libpurple/protocols/jabber/usermood.c:193 ../pidgin/gtkblist.c:3309
+#: ../pidgin/gtkprefs.c:688
 msgid "Description"
 msgstr "�竜�旅粒�留�流"
 
-#: ../libpurple/protocols/jabber/buddy.c:722
-#: ../libpurple/protocols/jabber/buddy.c:723
+#: ../libpurple/protocols/jabber/buddy.c:724
+#: ../libpurple/protocols/jabber/buddy.c:725
 msgid "Edit XMPP vCard"
 msgstr "��竜両竜�粒留�溜留 XMPP vCard"
 
-#: ../libpurple/protocols/jabber/buddy.c:724
+#: ../libpurple/protocols/jabber/buddy.c:726
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
@@ -4891,487 +5150,455 @@
 "�了留 �留 �留�留虜略�� 留僚�旅虜竜溜亮竜僚留 竜溜僚留旅 ��凌留旅�竜�旅虜略. �旅�略粒竜�竜 亮�僚凌 �旅� �了侶�凌�凌�溜竜� "
 "�旅� 凌�凌溜竜� 慮劉了竜�竜."
 
-#: ../libpurple/protocols/jabber/buddy.c:795
-#: ../libpurple/protocols/jabber/buddy.c:960
+#: ../libpurple/protocols/jabber/buddy.c:797
+#: ../libpurple/protocols/jabber/buddy.c:962
 msgid "Client"
 msgstr "�竜了略�侶�"
 
-#: ../libpurple/protocols/jabber/buddy.c:799
-#: ../libpurple/protocols/jabber/buddy.c:964
+#: ../libpurple/protocols/jabber/buddy.c:801
+#: ../libpurple/protocols/jabber/buddy.c:966
 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
-#, fuzzy
-msgid "Service Discovery Info"
-msgstr "��旅�亮�� �了侶�凌�凌�旅�僚 虜留�留了�粒凌�"
+msgid "Last Activity"
+msgstr "里竜了竜��留溜留 竜僚劉�粒竜旅留"
 
 #: ../libpurple/protocols/jabber/buddy.c:819
 #: ../libpurple/protocols/jabber/buddy.c:979
-msgid "Service Discovery Items"
+msgid "Service Discovery Info"
 msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:821
 #: ../libpurple/protocols/jabber/buddy.c:981
-#, fuzzy
-msgid "Extended Stanza Addressing"
-msgstr "�虜�竜�留亮劉僚侶 隆旅竜�慮�僚�侶"
+msgid "Service Discovery Items"
+msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:823
 #: ../libpurple/protocols/jabber/buddy.c:983
-#, fuzzy
-msgid "Multi-User Chat"
-msgstr "裡�龍流�侶�侶 粒僚���流 ��"
+msgid "Extended Stanza Addressing"
+msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:825
 #: ../libpurple/protocols/jabber/buddy.c:985
-#, fuzzy
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "� ��流��侶� 隆竜僚 劉�竜旅 �了侶�凌�凌�溜竜� 虜留�留了�粒凌�."
+msgid "Multi-User Chat"
+msgstr "裡�龍流�侶�侶 �凌了了�僚 留��亮�僚"
 
 #: ../libpurple/protocols/jabber/buddy.c:827
 #: ../libpurple/protocols/jabber/buddy.c:987
-msgid "In-Band Bytestreams"
+msgid "Multi-User Chat Extended Presence Information"
 msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:829
 #: ../libpurple/protocols/jabber/buddy.c:989
-#, fuzzy
-msgid "Ad-Hoc Commands"
-msgstr "�僚�凌了流"
+msgid "In-Band Bytestreams"
+msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:831
 #: ../libpurple/protocols/jabber/buddy.c:991
-msgid "PubSub Service"
+msgid "Ad-Hoc Commands"
 msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:833
 #: ../libpurple/protocols/jabber/buddy.c:993
-msgid "SOCKS5 Bytestreams"
+msgid "PubSub Service"
 msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:835
 #: ../libpurple/protocols/jabber/buddy.c:995
-msgid "Out of Band Data"
+msgid "SOCKS5 Bytestreams"
 msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:837
 #: ../libpurple/protocols/jabber/buddy.c:997
-#, fuzzy
-msgid "XHTML-IM"
-msgstr "HTML"
+msgid "Out of Band Data"
+msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:839
 #: ../libpurple/protocols/jabber/buddy.c:999
-#, fuzzy
-msgid "In-Band Registration"
-msgstr "裡�略了亮留 虜留�留���侶�侶�"
+msgid "XHTML-IM"
+msgstr "XHTML-IM"
 
 #: ../libpurple/protocols/jabber/buddy.c:841
 #: ../libpurple/protocols/jabber/buddy.c:1001
-#, fuzzy
-msgid "User Location"
-msgstr "里凌�凌慮竜�溜留"
+msgid "In-Band Registration"
+msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:843
 #: ../libpurple/protocols/jabber/buddy.c:1003
-#, fuzzy
-msgid "User Avatar"
-msgstr "�僚留龍流�侶�侶 ��流��侶"
+msgid "User Location"
+msgstr "里凌�凌慮竜�溜留 ��流��侶"
 
 #: ../libpurple/protocols/jabber/buddy.c:845
 #: ../libpurple/protocols/jabber/buddy.c:1005
-#, fuzzy
-msgid "Chat State Notifications"
-msgstr "�旅隆凌�凌溜侶�侶 虜留�略��留�侶� �溜了凌�"
+msgid "User Avatar"
+msgstr "�旅虜�僚留 ��流��侶"
 
 #: ../libpurple/protocols/jabber/buddy.c:847
 #: ../libpurple/protocols/jabber/buddy.c:1007
-#, fuzzy
-msgid "Software Version"
-msgstr "�侶 ��凌��侶�旅龍�亮竜僚侶 劉虜隆凌�侶"
+msgid "Chat State Notifications"
+msgstr "�旅隆凌�凌旅流�竜旅� 虜留�略��留�侶� ��龍流�侶�侶�"
 
 #: ../libpurple/protocols/jabber/buddy.c:849
 #: ../libpurple/protocols/jabber/buddy.c:1009
-#, fuzzy
-msgid "Stream Initiation"
-msgstr "��凌�留僚留�凌了旅�亮��"
+msgid "Software Version"
+msgstr "�虜隆凌�侶 了凌粒旅�亮旅虜凌�"
 
 #: ../libpurple/protocols/jabber/buddy.c:851
 #: ../libpurple/protocols/jabber/buddy.c:1011
-#: ../libpurple/protocols/sametime/sametime.c:3235
-msgid "File Transfer"
-msgstr "�竜�留�凌�劉� 留��竜溜�僚"
+msgid "Stream Initiation"
+msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:853
 #: ../libpurple/protocols/jabber/buddy.c:1013
-#, fuzzy
-msgid "User Mood"
-msgstr "�留�留��略�竜旅� ��侶���僚"
+#: ../libpurple/protocols/sametime/sametime.c:3285
+msgid "File Transfer"
+msgstr "�竜�留�凌�劉� 留��竜溜�僚"
 
 #: ../libpurple/protocols/jabber/buddy.c:855
 #: ../libpurple/protocols/jabber/buddy.c:1015
-#, fuzzy
-msgid "User Activity"
-msgstr "��旅凌 ��侶���僚"
+msgid "User Mood"
+msgstr "�旅略慮竜�侶 ��流��侶"
 
 #: ../libpurple/protocols/jabber/buddy.c:857
 #: ../libpurple/protocols/jabber/buddy.c:1017
-#, fuzzy
-msgid "Entity Capabilities"
-msgstr "��僚留���侶�竜�"
+msgid "User Activity"
+msgstr "��留��侶�旅��侶�留 ��流��侶"
 
 #: ../libpurple/protocols/jabber/buddy.c:859
 #: ../libpurple/protocols/jabber/buddy.c:1019
-msgid "Encrypted Session Negotiations"
+msgid "Entity Capabilities"
 msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:861
 #: ../libpurple/protocols/jabber/buddy.c:1021
-#, fuzzy
-msgid "User Tune"
-msgstr "�僚凌亮留 ��流��侶"
+msgid "Encrypted Session Negotiations"
+msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:863
 #: ../libpurple/protocols/jabber/buddy.c:1023
-#, fuzzy
-msgid "Roster Item Exchange"
-msgstr "�亮竜�凌 亮流僚�亮留 亮竜 留僚�留了了留粒流 虜了竜旅隆旅凌�"
+msgid "User Tune"
+msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:865
 #: ../libpurple/protocols/jabber/buddy.c:1025
-#, fuzzy
-msgid "Reachability Address"
-msgstr "�旅竜�慮�僚�侶 e-mail"
+msgid "Roster Item Exchange"
+msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:867
 #: ../libpurple/protocols/jabber/buddy.c:1027
-#, fuzzy
-msgid "User Profile"
-msgstr "��凌�溜了"
+msgid "Reachability Address"
+msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:869
 #: ../libpurple/protocols/jabber/buddy.c:1029
-#, fuzzy
-msgid "Jingle"
-msgstr "裡�亮亮竜�凌�流"
+msgid "User Profile"
+msgstr "��凌�溜了 ��流��侶"
 
 #: ../libpurple/protocols/jabber/buddy.c:871
 #: ../libpurple/protocols/jabber/buddy.c:1031
-msgid "Jingle Audio"
+msgid "Jingle"
 msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:873
 #: ../libpurple/protocols/jabber/buddy.c:1033
-#, fuzzy
-msgid "User Nickname"
-msgstr "�僚凌亮留 ��流��侶"
+msgid "Jingle Audio"
+msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:875
 #: ../libpurple/protocols/jabber/buddy.c:1035
-msgid "Jingle ICE UDP"
-msgstr ""
+msgid "User Nickname"
+msgstr "�僚凌亮留 ��流��侶"
 
 #: ../libpurple/protocols/jabber/buddy.c:877
 #: ../libpurple/protocols/jabber/buddy.c:1037
-msgid "Jingle ICE TCP"
+msgid "Jingle ICE UDP"
 msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:879
 #: ../libpurple/protocols/jabber/buddy.c:1039
-msgid "Jingle Raw UDP"
+msgid "Jingle ICE TCP"
 msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:881
 #: ../libpurple/protocols/jabber/buddy.c:1041
-#, fuzzy
-msgid "Jingle Video"
-msgstr "��僚�留僚� 硫溜僚�竜凌"
+msgid "Jingle Raw UDP"
+msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:883
 #: ../libpurple/protocols/jabber/buddy.c:1043
-msgid "Jingle DTMF"
+msgid "Jingle Video"
 msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:885
 #: ../libpurple/protocols/jabber/buddy.c:1045
-#, fuzzy
-msgid "Message Receipts"
-msgstr "�流�慮侶虜竜 亮流僚�亮留"
+msgid "Jingle DTMF"
+msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:887
 #: ../libpurple/protocols/jabber/buddy.c:1047
-#, fuzzy
-msgid "Public Key Publishing"
-msgstr "���竜溜凌 隆侶亮��旅凌� 虜了竜旅隆旅凌�"
+msgid "Message Receipts"
+msgstr "�流�竜旅� 亮侶僚�亮略��僚"
 
 #: ../libpurple/protocols/jabber/buddy.c:889
 #: ../libpurple/protocols/jabber/buddy.c:1049
-#, fuzzy
-msgid "User Chatting"
-msgstr "��旅了凌粒劉� ��流��侶"
+msgid "Public Key Publishing"
+msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:891
 #: ../libpurple/protocols/jabber/buddy.c:1051
-#, fuzzy
-msgid "User Browsing"
-msgstr "�留�留��略�竜旅� ��侶���僚"
+msgid "User Chatting"
+msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:893
 #: ../libpurple/protocols/jabber/buddy.c:1053
-#, fuzzy
-msgid "User Gaming"
-msgstr "�僚凌亮留 ��流��侶"
+msgid "User Browsing"
+msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:895
 #: ../libpurple/protocols/jabber/buddy.c:1055
-#, fuzzy
-msgid "User Viewing"
-msgstr "��旅凌 ��侶���僚"
+msgid "User Gaming"
+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
+msgid "User Viewing"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:899
+#: ../libpurple/protocols/jabber/buddy.c:1059
+#: ../libpurple/protocols/silc/ops.c:1600
+#: ../libpurple/protocols/silc/ops.c:1605
 #: ../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"
+msgid "Stanza Encryption"
 msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:903
 #: ../libpurple/protocols/jabber/buddy.c:1063
-msgid "Delayed Delivery"
+msgid "Entity Time"
 msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:905
 #: ../libpurple/protocols/jabber/buddy.c:1065
-msgid "Collaborative Data Objects"
-msgstr ""
+msgid "Delayed Delivery"
+msgstr "�留慮���竜�侶亮劉僚侶 �留�略隆凌�侶"
 
 #: ../libpurple/protocols/jabber/buddy.c:907
 #: ../libpurple/protocols/jabber/buddy.c:1067
-msgid "File Repository and Sharing"
+msgid "Collaborative Data Objects"
 msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:909
 #: ../libpurple/protocols/jabber/buddy.c:1069
-msgid "STUN Service Discovery for Jingle"
+msgid "File Repository and Sharing"
 msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:911
 #: ../libpurple/protocols/jabber/buddy.c:1071
-msgid "Simplified Encrypted Session Negotiation"
+msgid "STUN Service Discovery for Jingle"
 msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:913
 #: ../libpurple/protocols/jabber/buddy.c:1073
+msgid "Simplified Encrypted Session Negotiation"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:915
+#: ../libpurple/protocols/jabber/buddy.c:1075
 msgid "Hop Check"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:921
-#: ../libpurple/protocols/jabber/buddy.c:1081
-#: ../libpurple/protocols/oscar/oscar.c:2906
+#: ../libpurple/protocols/jabber/buddy.c:923
+#: ../libpurple/protocols/jabber/buddy.c:1083
+#: ../libpurple/protocols/oscar/oscar.c:2967
 msgid "Capabilities"
 msgstr "��僚留���侶�竜�"
 
-#: ../libpurple/protocols/jabber/buddy.c:933
-#: ../libpurple/protocols/jabber/libxmpp.c:206
-#: ../libpurple/protocols/jabber/si.c:859
+#: ../libpurple/protocols/jabber/buddy.c:935
+#: ../libpurple/protocols/jabber/libxmpp.c:209
+#: ../libpurple/protocols/jabber/si.c:1094
 msgid "Resource"
 msgstr "�侶粒流"
 
-#: ../libpurple/protocols/jabber/buddy.c:935
-#: ../libpurple/protocols/jabber/jabber.c:1531
-#: ../libpurple/protocols/jabber/jabber.c:1554
-#: ../libpurple/protocols/jabber/jabber.c:1577
+#: ../libpurple/protocols/jabber/buddy.c:937
 #: ../libpurple/protocols/jabber/jabber.c:1600
-#: ../libpurple/protocols/jabber/jabber.c:1623
+#: ../libpurple/protocols/jabber/jabber.c:1614
+#: ../libpurple/protocols/jabber/jabber.c:1628
+#: ../libpurple/protocols/jabber/jabber.c:1642
+#: ../libpurple/protocols/jabber/jabber.c:1656
 msgid "Priority"
 msgstr "��凌�竜�留旅��侶�留"
 
-#: ../libpurple/protocols/jabber/buddy.c:1237
+#: ../libpurple/protocols/jabber/buddy.c:1241
 #: ../libpurple/protocols/silc/ops.c:994
 #: ../libpurple/protocols/silc10/ops.c:1028
 msgid "Middle Name"
 msgstr "�留���僚�亮凌"
 
-#: ../libpurple/protocols/jabber/buddy.c:1270
-#: ../libpurple/protocols/jabber/jabber.c:952
-#: ../libpurple/protocols/oscar/oscar.c:3788
-#: ../libpurple/protocols/oscar/oscar.c:3801
+#: ../libpurple/protocols/jabber/buddy.c:1274
+#: ../libpurple/protocols/jabber/jabber.c:1004
+#: ../libpurple/protocols/oscar/oscar.c:3821
+#: ../libpurple/protocols/oscar/oscar.c:3834
 #: ../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:1276
+#: ../libpurple/protocols/jabber/buddy.c:1280
 msgid "P.O. Box"
 msgstr "里留�. ���溜隆留"
 
-#: ../libpurple/protocols/jabber/buddy.c:1386
+#: ../libpurple/protocols/jabber/buddy.c:1390
 msgid "Photo"
 msgstr "陸��凌粒�留�溜留"
 
-#: ../libpurple/protocols/jabber/buddy.c:1386
+#: ../libpurple/protocols/jabber/buddy.c:1390
 msgid "Logo"
 msgstr "�凌粒����凌"
 
-#: ../libpurple/protocols/jabber/buddy.c:1942
+#: ../libpurple/protocols/jabber/buddy.c:1949
 msgid "Un-hide From"
 msgstr "��旅 �旅留 留��虜���侶 留��"
 
-#: ../libpurple/protocols/jabber/buddy.c:1946
+#: ../libpurple/protocols/jabber/buddy.c:1953
 msgid "Temporarily Hide From"
 msgstr "��凌���旅僚流 留��虜���侶 留��"
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1954
+#: ../libpurple/protocols/jabber/buddy.c:1961
 msgid "Cancel Presence Notification"
 msgstr "�虜����侶 竜旅隆凌�凌溜侶�侶� �留�凌��溜留�"
 
-#: ../libpurple/protocols/jabber/buddy.c:1961
+#: ../libpurple/protocols/jabber/buddy.c:1968
 msgid "(Re-)Request authorization"
 msgstr "�溜�侶�侶 劉粒虜�旅�侶� (両留僚略)"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:1970
+#: ../libpurple/protocols/jabber/buddy.c:1977
 msgid "Unsubscribe"
 msgstr "�旅留粒�留�流 留�� �侶 ��僚隆�凌亮流"
 
-#: ../libpurple/protocols/jabber/buddy.c:1985
-#, fuzzy
+#: ../libpurple/protocols/jabber/buddy.c:1992
 msgid "Log In"
-msgstr "裡�僚隆竜隆竜亮劉僚凌�"
-
-#: ../libpurple/protocols/jabber/buddy.c:1989
-#, fuzzy
+msgstr "裡�僚隆竜�侶"
+
+#: ../libpurple/protocols/jabber/buddy.c:1996
 msgid "Log Out"
-msgstr "�留�留粒�留�流 ��龍侶�流�竜�僚"
-
-#: ../libpurple/protocols/jabber/buddy.c:2035
-#: ../libpurple/protocols/jabber/jabber.c:1553
+msgstr "��凌��僚隆竜�侶"
+
+#: ../libpurple/protocols/jabber/buddy.c:2042
+#: ../libpurple/protocols/jabber/jabber.c:1613
 msgid "Chatty"
 msgstr "�亮旅了侶�旅虜��"
 
-#: ../libpurple/protocols/jabber/buddy.c:2039
+#: ../libpurple/protocols/jabber/buddy.c:2046
 msgid "Extended Away"
 msgstr "�凌了� 留��僚"
 
-#: ../libpurple/protocols/jabber/buddy.c:2041
-#: ../libpurple/protocols/jabber/jabber.c:1622
-#: ../libpurple/protocols/oscar/oscar.c:727
-#: ../libpurple/protocols/oscar/oscar.c:5808
-#: ../libpurple/protocols/sametime/sametime.c:3297
-#, c-format
+#: ../libpurple/protocols/jabber/buddy.c:2048
+#: ../libpurple/protocols/jabber/jabber.c:1655
+#: ../libpurple/protocols/oscar/oscar.c:726
+#: ../libpurple/protocols/oscar/oscar.c:5911
+#: ../libpurple/protocols/sametime/sametime.c:3347
 msgid "Do Not Disturb"
 msgstr "�侶僚 竜僚凌�了竜溜�竜"
 
-#: ../libpurple/protocols/jabber/buddy.c:2208
+#: ../libpurple/protocols/jabber/buddy.c:2215
 msgid "JID"
 msgstr "JID"
 
-#: ../libpurple/protocols/jabber/buddy.c:2212
-#: ../libpurple/protocols/jabber/buddy.c:2391
-#: ../libpurple/protocols/oscar/oscar.c:3711
+#: ../libpurple/protocols/jabber/buddy.c:2219
+#: ../libpurple/protocols/jabber/buddy.c:2408
+#: ../libpurple/protocols/oscar/oscar.c:3744
 msgid "Last Name"
 msgstr "���僚�亮凌"
 
-#: ../libpurple/protocols/jabber/buddy.c:2244
+#: ../libpurple/protocols/jabber/buddy.c:2251
 msgid "The following are the results of your search"
 msgstr "里留 留虜�了凌�慮留 竜溜僚留旅 �留 留�凌�竜了劉�亮留�留 �侶� 留僚留龍流�侶�流� �留�"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:2319
+#: ../libpurple/protocols/jabber/buddy.c:2336
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:2339
+#: ../libpurple/protocols/jabber/buddy.c:2356
 msgid "Directory Query Failed"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:2340
+#: ../libpurple/protocols/jabber/buddy.c:2357
 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:2374
+#: ../libpurple/protocols/jabber/buddy.c:2391
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "�隆侶粒溜竜� 竜両��侶�竜�侶�流: %s"
 
-#: ../libpurple/protocols/jabber/buddy.c:2381
+#: ../libpurple/protocols/jabber/buddy.c:2398
 msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr ""
 "裡�亮�了侶����竜 劉僚留 流 �竜�旅����竜�留 �竜隆溜留 粒旅留 �侶僚 留僚留龍流�侶�侶 ��侶���僚 XMPP �凌� "
 "�留旅�旅略龍凌�僚."
 
-#: ../libpurple/protocols/jabber/buddy.c:2401
-#: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3714
-#: ../libpurple/protocols/oscar/oscar.c:3723
+#: ../libpurple/protocols/jabber/buddy.c:2418
+#: ../libpurple/protocols/novell/novell.c:1497
+#: ../libpurple/protocols/oscar/oscar.c:3747
+#: ../libpurple/protocols/oscar/oscar.c:3756
 msgid "E-Mail Address"
 msgstr "�旅竜�慮�僚�侶 e-mail"
 
-#: ../libpurple/protocols/jabber/buddy.c:2410
-#: ../libpurple/protocols/jabber/buddy.c:2411
+#: ../libpurple/protocols/jabber/buddy.c:2427
+#: ../libpurple/protocols/jabber/buddy.c:2428
 msgid "Search for XMPP users"
 msgstr "�僚留龍流�侶�侶 ��侶���僚 XMPP"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:2412
+#: ../libpurple/protocols/jabber/buddy.c:2429
 #: ../libpurple/protocols/qq/group.c:123
 #: ../libpurple/protocols/qq/group_im.c:147
-#: ../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
+#: ../libpurple/protocols/qq/sys_msg.c:177
+#: ../libpurple/protocols/qq/sys_msg.c:253
+#: ../libpurple/protocols/qq/sys_msg.c:271
+#: ../libpurple/protocols/sametime/sametime.c:5665
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:470
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:356
 msgid "Search"
 msgstr "�僚留龍流�侶�侶"
 
-#: ../libpurple/protocols/jabber/buddy.c:2427
+#: ../libpurple/protocols/jabber/buddy.c:2444
 msgid "Invalid Directory"
 msgstr "�留僚慮留�亮劉僚凌� 虜留�略了凌粒凌�"
 
-#: ../libpurple/protocols/jabber/buddy.c:2444
+#: ../libpurple/protocols/jabber/buddy.c:2461
 msgid "Enter a User Directory"
 msgstr "�旅�留粒�粒流 虜留�留了�粒凌� ��侶���僚"
 
-#: ../libpurple/protocols/jabber/buddy.c:2445
+#: ../libpurple/protocols/jabber/buddy.c:2462
 msgid "Select a user directory to search"
 msgstr "��旅了劉両�竜 虜留�略了凌粒凌 ��侶���僚 粒旅留 留僚留龍流�侶�侶"
 
-#: ../libpurple/protocols/jabber/buddy.c:2448
+#: ../libpurple/protocols/jabber/buddy.c:2465
 msgid "Search Directory"
 msgstr "�留�略了凌粒凌� 留僚留龍流�侶�侶�"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5294
-#: ../libpurple/protocols/yahoo/yahoochat.c:1048
+#: ../libpurple/protocols/oscar/oscar.c:5391
+#: ../libpurple/protocols/yahoo/yahoochat.c:1057
 msgid "_Room:"
 msgstr "_��亮略�旅凌:"
 
@@ -5440,7 +5667,7 @@
 
 #: ../libpurple/protocols/jabber/chat.c:678
 #: ../libpurple/protocols/jabber/chat.c:689
-#: ../libpurple/protocols/silc/ops.c:1456
+#: ../libpurple/protocols/silc/ops.c:1460
 #: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error retrieving room list"
 msgstr "裡�略了亮留 虜留�略 �侶 了流�侶 �侶� 了溜��留� 隆�亮留�溜�僚"
@@ -5461,29 +5688,29 @@
 msgid "Find Rooms"
 msgstr "���竜�侶 隆�亮留�溜�僚"
 
-#: ../libpurple/protocols/jabber/jabber.c:92
-msgid "Error initializing session"
-msgstr "裡�略了亮留 竜虜虜溜僚侶�侶� ��僚竜隆�溜留�"
-
-#: ../libpurple/protocols/jabber/jabber.c:145
+#: ../libpurple/protocols/jabber/jabber.c:151
 msgid "You require encryption, but it is not available on this server."
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:259
-#: ../libpurple/protocols/jabber/jabber.c:312
-#: ../libpurple/protocols/jabber/jabber.c:340
+msgstr "��留旅�竜溜�竜 虜����凌粒�略�侶�侶, 留了了略 隆竜僚 竜溜僚留旅 隆旅留慮劉�旅亮侶 �竜 留���僚 �凌僚 竜両��侶�竜�侶�流."
+
+#: ../libpurple/protocols/jabber/jabber.c:269
+#: ../libpurple/protocols/jabber/jabber.c:324
+#: ../libpurple/protocols/jabber/jabber.c:354
 msgid "Write error"
 msgstr "裡�略了亮留 竜粒粒�留�流�"
 
-#: ../libpurple/protocols/jabber/jabber.c:408
-#: ../libpurple/protocols/jabber/jabber.c:445
+#: ../libpurple/protocols/jabber/jabber.c:401
+msgid "Ping timeout"
+msgstr "里劉了凌� ��凌僚旅虜凌� 凌�溜凌� 粒旅留 ping"
+
+#: ../libpurple/protocols/jabber/jabber.c:448
+#: ../libpurple/protocols/jabber/jabber.c:488
 msgid "Read Error"
 msgstr "裡�略了亮留 留僚略粒僚��侶�"
 
-#: ../libpurple/protocols/jabber/jabber.c:482
-#: ../libpurple/protocols/oscar/flap_connection.c:394
-#: ../libpurple/protocols/yahoo/yahoo.c:2558
-#: ../libpurple/protocols/yahoo/yahoo.c:2590
+#: ../libpurple/protocols/jabber/jabber.c:525
+#: ../libpurple/protocols/oscar/flap_connection.c:398
+#: ../libpurple/protocols/yahoo/yahoo.c:2576
+#: ../libpurple/protocols/yahoo/yahoo.c:2608
 #, c-format
 msgid ""
 "Could not establish a connection with the server:\n"
@@ -5492,635 +5719,609 @@
 "�隆�僚留亮溜留 隆侶亮旅凌��粒溜留� ��僚隆竜�侶� 亮竜 �凌僚 竜両��侶�竜�侶�流:\n"
 "%s"
 
-#: ../libpurple/protocols/jabber/jabber.c:529
+#: ../libpurple/protocols/jabber/jabber.c:575
 msgid "Unable to create socket"
 msgstr "�隆�僚留亮溜留 隆侶亮旅凌��粒溜留� ��凌隆凌�劉留"
 
-#: ../libpurple/protocols/jabber/jabber.c:575
-#: ../libpurple/protocols/jabber/jabber.c:1063
+#: ../libpurple/protocols/jabber/jabber.c:625
+#: ../libpurple/protocols/jabber/jabber.c:1110
 msgid "Invalid XMPP ID"
 msgstr "�侶 劉粒虜��凌 XMPP ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:580
+#: ../libpurple/protocols/jabber/jabber.c:632
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:656
+#: ../libpurple/protocols/jabber/jabber.c:710
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "� 虜留�留���侶�侶 �凌� %s@%s 流�留僚 竜�旅���流�"
 
-#: ../libpurple/protocols/jabber/jabber.c:662
-#, fuzzy, c-format
+#: ../libpurple/protocols/jabber/jabber.c:716
+#, c-format
 msgid "Registration to %s successful"
-msgstr "� 虜留�留���侶�侶 �凌� %s@%s 流�留僚 竜�旅���流�"
-
-#: ../libpurple/protocols/jabber/jabber.c:664
-#: ../libpurple/protocols/jabber/jabber.c:665
+msgstr "� 虜留�留���侶�侶 �竜 %s 流�留僚 竜�旅���流�"
+
+#: ../libpurple/protocols/jabber/jabber.c:718
+#: ../libpurple/protocols/jabber/jabber.c:719
 msgid "Registration Successful"
 msgstr "��旅���流� 虜留�留���侶�侶"
 
-#: ../libpurple/protocols/jabber/jabber.c:673
-#: ../libpurple/protocols/jabber/jabber.c:674
+#: ../libpurple/protocols/jabber/jabber.c:727
+#: ../libpurple/protocols/jabber/jabber.c:728
 msgid "Registration Failed"
 msgstr "��凌���溜留 虜留�留���侶�侶�"
 
-#: ../libpurple/protocols/jabber/jabber.c:692
-#, fuzzy, c-format
+#: ../libpurple/protocols/jabber/jabber.c:746
+#, c-format
 msgid "Registration from %s successfully removed"
-msgstr "� 虜留�留���侶�侶 �凌� %s@%s 流�留僚 竜�旅���流�"
-
-#: ../libpurple/protocols/jabber/jabber.c:694
-#: ../libpurple/protocols/jabber/jabber.c:695
-#, fuzzy
+msgstr "� 虜留�留���侶�侶 留�� %s 留�留旅�劉慮侶虜竜 竜�旅�����"
+
+#: ../libpurple/protocols/jabber/jabber.c:748
+#: ../libpurple/protocols/jabber/jabber.c:749
 msgid "Unregistration Successful"
-msgstr "��旅���流� 虜留�留���侶�侶"
-
-#: ../libpurple/protocols/jabber/jabber.c:703
-#: ../libpurple/protocols/jabber/jabber.c:704
-#, fuzzy
+msgstr "��旅���流� 隆旅留粒�留�流"
+
+#: ../libpurple/protocols/jabber/jabber.c:757
+#: ../libpurple/protocols/jabber/jabber.c:758
 msgid "Unregistration Failed"
-msgstr "��凌���溜留 虜留�留���侶�侶�"
-
-#: ../libpurple/protocols/jabber/jabber.c:864
-#: ../libpurple/protocols/jabber/jabber.c:865
+msgstr "��凌���溜留 隆旅留粒�留�流�"
+
+#: ../libpurple/protocols/jabber/jabber.c:924
+#: ../libpurple/protocols/jabber/jabber.c:925
 msgid "Already Registered"
 msgstr "�隆侶 虜留�留���侶亮劉僚凌�"
 
-#: ../libpurple/protocols/jabber/jabber.c:962
-#: ../libpurple/protocols/oscar/oscar.c:3790
-#: ../libpurple/protocols/oscar/oscar.c:3803
+#: ../libpurple/protocols/jabber/jabber.c:1012
+#: ../libpurple/protocols/oscar/oscar.c:3823
+#: ../libpurple/protocols/oscar/oscar.c:3836
 msgid "State"
 msgstr "�凌了旅�竜溜留"
 
-#: ../libpurple/protocols/jabber/jabber.c:967
+#: ../libpurple/protocols/jabber/jabber.c:1016
 msgid "Postal code"
 msgstr "里留�. ��隆旅虜留�"
 
-#: ../libpurple/protocols/jabber/jabber.c:972
+#: ../libpurple/protocols/jabber/jabber.c:1020
 #: ../libpurple/protocols/silc/ops.c:1035
-#: ../libpurple/protocols/silc/silc.c:772
-#: ../libpurple/protocols/silc/util.c:557
+#: ../libpurple/protocols/silc/silc.c:915
+#: ../libpurple/protocols/silc/util.c:563
 #: ../libpurple/protocols/silc10/ops.c:1069
-#: ../libpurple/protocols/silc10/silc.c:683
+#: ../libpurple/protocols/silc10/silc.c:689
 #: ../libpurple/protocols/silc10/util.c:553
 msgid "Phone"
 msgstr "里侶了劉��僚凌"
 
-#: ../libpurple/protocols/jabber/jabber.c:982
+#: ../libpurple/protocols/jabber/jabber.c:1028
 msgid "Date"
 msgstr "�亮竜�凌亮侶僚溜留"
 
-#: ../libpurple/protocols/jabber/jabber.c:987
-#, fuzzy
+#: ../libpurple/protocols/jabber/jabber.c:1032
 msgid "Unregister"
-msgstr "�留�留���侶�侶"
-
-#: ../libpurple/protocols/jabber/jabber.c:994
-#, fuzzy
-msgid ""
-"Please fill out the information below to change your account registration."
-msgstr ""
-"�留�留虜留了凌�亮竜 竜旅�略粒竜�竜 �旅� �留�留虜略�� �了侶�凌�凌�溜竜� 粒旅留 僚留 虜留�留���流�竜�竜 �凌 僚劉凌 �留� "
-"了凌粒留�旅留�亮�."
-
-#: ../libpurple/protocols/jabber/jabber.c:997
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1039
+msgid "Please fill out the information below to change your account registration."
+msgstr ""
+"�留�留虜留了凌�亮竜 竜旅�略粒竜�竜 �旅� �留�留虜略�� �了侶�凌�凌�溜竜� 粒旅留 僚留 留了了略両竜�竜 �侶僚 虜留�留���侶�侶 "
+"�凌� 了凌粒留�旅留�亮凌� �留�."
+
+#: ../libpurple/protocols/jabber/jabber.c:1042
 msgid "Please fill out the information below to register your new account."
 msgstr ""
 "�留�留虜留了凌�亮竜 竜旅�略粒竜�竜 �旅� �留�留虜略�� �了侶�凌�凌�溜竜� 粒旅留 僚留 虜留�留���流�竜�竜 �凌 僚劉凌 �留� "
 "了凌粒留�旅留�亮�."
 
-#: ../libpurple/protocols/jabber/jabber.c:1005
-#: ../libpurple/protocols/jabber/jabber.c:1006
+#: ../libpurple/protocols/jabber/jabber.c:1050
+#: ../libpurple/protocols/jabber/jabber.c:1051
 msgid "Register New XMPP Account"
 msgstr "�留�留���侶�侶 僚劉凌� 了凌粒留�旅留�亮凌� XMPP"
 
-#: ../libpurple/protocols/jabber/jabber.c:1007
-#: ../libpurple/protocols/jabber/jabber.c:1016
+#: ../libpurple/protocols/jabber/jabber.c:1052
+#: ../libpurple/protocols/jabber/jabber.c:1061
 msgid "Register"
 msgstr "�留�留���侶�侶"
 
-#: ../libpurple/protocols/jabber/jabber.c:1012
-#, fuzzy, c-format
+#: ../libpurple/protocols/jabber/jabber.c:1057
+#, c-format
 msgid "Change Account Registration at %s"
-msgstr "�了了留粒流 �了侶�凌�凌�旅�僚 ��流��侶 粒旅留 %s"
-
-#: ../libpurple/protocols/jabber/jabber.c:1013
-#, fuzzy, c-format
+msgstr "�了了留粒流 虜留�留���侶�侶� 了凌粒留�旅留�亮凌� �竜 %s"
+
+#: ../libpurple/protocols/jabber/jabber.c:1058
+#, c-format
 msgid "Register New Account at %s"
-msgstr "�留�留���侶�侶 僚劉凌� 了凌粒留�旅留�亮凌� XMPP"
-
-#: ../libpurple/protocols/jabber/jabber.c:1016
-#, fuzzy
+msgstr "�留�留���侶�侶 僚劉凌� 了凌粒留�旅留�亮凌� �竜 %s"
+
+#: ../libpurple/protocols/jabber/jabber.c:1061
 msgid "Change Registration"
-msgstr "裡�略了亮留 虜留�留���侶�侶�"
-
-#: ../libpurple/protocols/jabber/jabber.c:1120
-#: ../libpurple/protocols/jabber/jabber.c:1121
-#, fuzzy
+msgstr "�了了留粒流 虜留�留���侶�侶�"
+
+#: ../libpurple/protocols/jabber/jabber.c:1170
+#: ../libpurple/protocols/jabber/jabber.c:1171
 msgid "Error unregistering account"
-msgstr "裡�略了亮留 虜留�略 �侶僚 留了了留粒流 ��僚 �了侶�凌�凌�旅�僚 了凌粒留�旅留�亮凌�"
-
-#: ../libpurple/protocols/jabber/jabber.c:1126
-#: ../libpurple/protocols/jabber/jabber.c:1127
-#, fuzzy
+msgstr "裡�略了亮留 虜留�略 �侶僚 隆旅留粒�留�流 �侶� 虜留�留���侶�侶� �凌� 了凌粒留�旅留�亮凌�"
+
+#: ../libpurple/protocols/jabber/jabber.c:1176
+#: ../libpurple/protocols/jabber/jabber.c:1177
 msgid "Account successfully unregistered"
-msgstr "�侶亮旅凌��粒流�留�竜 竜�旅����� 劉僚留 Qun"
-
-#: ../libpurple/protocols/jabber/jabber.c:1284
+msgstr "� 虜留�留���侶�侶 �凌� 了凌粒留�旅留�亮凌� 隆旅留粒�略�侶虜竜 竜�旅�����"
+
+#: ../libpurple/protocols/jabber/jabber.c:1340
 msgid "Initializing Stream"
 msgstr "�虜虜溜僚侶�侶 �凌流�"
 
-#: ../libpurple/protocols/jabber/jabber.c:1289
-#, fuzzy
+#: ../libpurple/protocols/jabber/jabber.c:1345
 msgid "Initializing SSL/TLS"
-msgstr "�虜虜溜僚侶�侶 �凌流�"
-
-#: ../libpurple/protocols/jabber/jabber.c:1293
-#: ../libpurple/protocols/msn/session.c:351
+msgstr "�虜虜溜僚侶�侶 SSL/TLS"
+
+#: ../libpurple/protocols/jabber/jabber.c:1349
+#: ../libpurple/protocols/msn/session.c:408
+#: ../libpurple/protocols/msnp9/session.c:360
 msgid "Authenticating"
 msgstr "�溜僚竜�留旅 劉粒虜�旅�侶"
 
-#: ../libpurple/protocols/jabber/jabber.c:1302
+#: ../libpurple/protocols/jabber/jabber.c:1358
 msgid "Re-initializing Stream"
 msgstr "��留僚竜虜虜溜僚侶�侶 �凌流�"
 
-#: ../libpurple/protocols/jabber/jabber.c:1396
-#: ../libpurple/protocols/jabber/jabber.c:1865
-#: ../libpurple/protocols/jabber/jabber.c:1909
-#: ../libpurple/protocols/jabber/jabber.c:1945
-#: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:5602
+#: ../libpurple/protocols/jabber/jabber.c:1452
+#: ../libpurple/protocols/jabber/jabber.c:1910
+#: ../libpurple/protocols/jabber/jabber.c:1953
+#: ../libpurple/protocols/jabber/jabber.c:1991
+#: ../libpurple/protocols/oscar/oscar.c:825
+#: ../libpurple/protocols/oscar/oscar.c:5705
 msgid "Not Authorized"
 msgstr "�竜僚 竜粒虜�溜慮侶虜竜"
 
-#: ../libpurple/protocols/jabber/jabber.c:1442
+#: ../libpurple/protocols/jabber/jabber.c:1500
 msgid "Both"
 msgstr "�留旅 �留 隆�凌"
 
-#: ../libpurple/protocols/jabber/jabber.c:1444
+#: ../libpurple/protocols/jabber/jabber.c:1502
 msgid "From (To pending)"
 msgstr "��� (��凌� 竜虜虜�竜亮竜溜)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1446
+#: ../libpurple/protocols/jabber/jabber.c:1504
 msgid "From"
 msgstr "���"
 
-#: ../libpurple/protocols/jabber/jabber.c:1449
+#: ../libpurple/protocols/jabber/jabber.c:1507
 msgid "To"
 msgstr "裡竜"
 
-#: ../libpurple/protocols/jabber/jabber.c:1451
+#: ../libpurple/protocols/jabber/jabber.c:1509
 msgid "None (To pending)"
 msgstr "�留僚劉僚留 (��凌� 竜虜虜�竜亮竜溜)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1453
+#: ../libpurple/protocols/jabber/jabber.c:1511
 #: ../pidgin/plugins/gevolution/eds-utils.c:73
 #: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr "�留亮溜留"
 
-#: ../libpurple/protocols/jabber/jabber.c:1456
+#: ../libpurple/protocols/jabber/jabber.c:1514
 msgid "Subscription"
 msgstr "�粒粒�留�流"
 
-#: ../libpurple/protocols/jabber/jabber.c:1466
-#: ../libpurple/protocols/jabber/jabber.c:1469
-#: ../libpurple/protocols/jabber/jabber.c:1533
-#: ../libpurple/protocols/jabber/jabber.c:1556
-#: ../libpurple/protocols/jabber/jabber.c:1579
+#: ../libpurple/protocols/jabber/jabber.c:1524
+#: ../libpurple/protocols/jabber/jabber.c:1527
 #: ../libpurple/protocols/jabber/jabber.c:1602
-#: ../libpurple/protocols/jabber/jabber.c:1625
-#: ../libpurple/protocols/jabber/usermood.c:166
-#: ../libpurple/protocols/silc/buddy.c:1557
+#: ../libpurple/protocols/jabber/jabber.c:1616
+#: ../libpurple/protocols/jabber/jabber.c:1630
+#: ../libpurple/protocols/jabber/jabber.c:1644
+#: ../libpurple/protocols/jabber/jabber.c:1658
+#: ../libpurple/protocols/jabber/usermood.c:184
+#: ../libpurple/protocols/silc/buddy.c:1560
 #: ../libpurple/protocols/silc/ops.c:1212
-#: ../libpurple/protocols/silc10/buddy.c:1557
+#: ../libpurple/protocols/silc10/buddy.c:1560
 #: ../libpurple/protocols/silc10/ops.c:1207
 msgid "Mood"
 msgstr "�旅略慮竜�侶"
 
-#: ../libpurple/protocols/jabber/jabber.c:1534
-#: ../libpurple/protocols/jabber/jabber.c:1557
-#: ../libpurple/protocols/jabber/jabber.c:1580
+#: ../libpurple/protocols/jabber/jabber.c:1536
+#: ../libpurple/protocols/msn/msn.c:642
+msgid "Now Listening"
+msgstr "里��留 留虜凌�竜旅"
+
 #: ../libpurple/protocols/jabber/jabber.c:1603
-#: ../libpurple/protocols/jabber/jabber.c:1626
-#, fuzzy
+#: ../libpurple/protocols/jabber/jabber.c:1617
+#: ../libpurple/protocols/jabber/jabber.c:1631
+#: ../libpurple/protocols/jabber/jabber.c:1645
+#: ../libpurple/protocols/jabber/jabber.c:1659
 msgid "Mood Text"
-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
+msgstr "�竜溜亮竜僚凌 隆旅略慮竜�侶�"
+
+#: ../libpurple/protocols/jabber/jabber.c:1605
+#: ../libpurple/protocols/jabber/jabber.c:1619
+#: ../libpurple/protocols/jabber/jabber.c:1633
+#: ../libpurple/protocols/jabber/jabber.c:1647
+#: ../libpurple/protocols/jabber/jabber.c:1661
+msgid "Allow Buzz"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1679
 msgid "Tune Artist"
-msgstr "�留了了旅�劉�僚竜�"
-
-#: ../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
-#, fuzzy
+msgstr "�留了了旅�劉�僚侶�"
+
+#: ../libpurple/protocols/jabber/jabber.c:1680
 msgid "Tune Title"
 msgstr "里溜�了凌�"
 
-#: ../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
+#: ../libpurple/protocols/jabber/jabber.c:1681
 msgid "Tune Album"
-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
+msgstr "�溜�虜凌�"
+
+#: ../libpurple/protocols/jabber/jabber.c:1682
 msgid "Tune Genre"
-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
-#, fuzzy
+msgstr "�溜隆凌�"
+
+#: ../libpurple/protocols/jabber/jabber.c:1683
 msgid "Tune Comment"
-msgstr "裡��了旅凌 �溜了凌�"
-
-#: ../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
+msgstr "裡��了旅留"
+
+#: ../libpurple/protocols/jabber/jabber.c:1684
 msgid "Tune Track"
-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
+msgstr "�凌亮亮略�旅"
+
+#: ../libpurple/protocols/jabber/jabber.c:1685
 msgid "Tune Time"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1542
-#: ../libpurple/protocols/jabber/jabber.c:1565
-#: ../libpurple/protocols/jabber/jabber.c:1588
-#: ../libpurple/protocols/jabber/jabber.c:1611
-#: ../libpurple/protocols/jabber/jabber.c:1634
+msgstr "律��僚凌�"
+
+#: ../libpurple/protocols/jabber/jabber.c:1686
 msgid "Tune Year"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1543
-#: ../libpurple/protocols/jabber/jabber.c:1566
-#: ../libpurple/protocols/jabber/jabber.c:1589
-#: ../libpurple/protocols/jabber/jabber.c:1612
-#: ../libpurple/protocols/jabber/jabber.c:1635
+msgstr "��凌�"
+
+#: ../libpurple/protocols/jabber/jabber.c:1687
 msgid "Tune URL"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1545
-#: ../libpurple/protocols/jabber/jabber.c:1568
-#: ../libpurple/protocols/jabber/jabber.c:1591
-#: ../libpurple/protocols/jabber/jabber.c:1614
-#: ../libpurple/protocols/jabber/jabber.c:1637
-#, fuzzy
-msgid "Allow Buzz"
-msgstr "��旅��劉�竜�留旅"
-
-#: ../libpurple/protocols/jabber/jabber.c:1665
+msgstr "URL"
+
+#: ../libpurple/protocols/jabber/jabber.c:1703
 msgid "Password Changed"
 msgstr "� 虜�隆旅虜�� 略了了留両竜"
 
-#: ../libpurple/protocols/jabber/jabber.c:1666
+#: ../libpurple/protocols/jabber/jabber.c:1704
 msgid "Your password has been changed."
 msgstr "� 虜�隆旅虜�� �留� 劉�竜旅 留了了略両竜旅."
 
-#: ../libpurple/protocols/jabber/jabber.c:1670
-#: ../libpurple/protocols/jabber/jabber.c:1671
+#: ../libpurple/protocols/jabber/jabber.c:1710
+#: ../libpurple/protocols/jabber/jabber.c:1711
 msgid "Error changing password"
 msgstr "裡�略了亮留 留了了留粒流� 虜�隆旅虜凌�"
 
-#: ../libpurple/protocols/jabber/jabber.c:1728
+#: ../libpurple/protocols/jabber/jabber.c:1768
 msgid "Password (again)"
 msgstr "��隆旅虜�� (両留僚略)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1734
-#: ../libpurple/protocols/jabber/jabber.c:1735
+#: ../libpurple/protocols/jabber/jabber.c:1774
+#: ../libpurple/protocols/jabber/jabber.c:1775
 msgid "Change XMPP Password"
 msgstr "�了了留粒流 虜�隆旅虜凌� XMPP"
 
-#: ../libpurple/protocols/jabber/jabber.c:1735
+#: ../libpurple/protocols/jabber/jabber.c:1775
 msgid "Please enter your new password"
 msgstr "�留�留虜留了凌�亮竜 竜旅�略粒竜�竜 �凌 僚劉凌 �留� 虜�隆旅虜�"
 
-#: ../libpurple/protocols/jabber/jabber.c:1749
-#: ../libpurple/protocols/oscar/oscar.c:6388
-#: ../libpurple/protocols/silc/silc.c:1093
-#: ../libpurple/protocols/silc10/silc.c:1004
+#: ../libpurple/protocols/jabber/jabber.c:1789
+#: ../libpurple/protocols/oscar/oscar.c:6491
+#: ../libpurple/protocols/silc/silc.c:1236
+#: ../libpurple/protocols/silc10/silc.c:1010
 msgid "Set User Info..."
 msgstr "��旅�亮�� �了侶�凌�凌�旅�僚 ��流��侶..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1754
-#: ../libpurple/protocols/oscar/oscar.c:6399
-#: ../libpurple/protocols/silc/silc.c:1089
-#: ../libpurple/protocols/silc10/silc.c:1000
+#: ../libpurple/protocols/jabber/jabber.c:1794
+#: ../libpurple/protocols/oscar/oscar.c:6502
+#: ../libpurple/protocols/silc/silc.c:1232
+#: ../libpurple/protocols/silc10/silc.c:1006
 msgid "Change Password..."
 msgstr "�了了留粒流 虜�隆旅虜凌�..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1759
+#: ../libpurple/protocols/jabber/jabber.c:1799
 msgid "Search for Users..."
 msgstr "�僚留龍流�侶�侶 ��侶���僚..."
 
-#: ../libpurple/protocols/jabber/jabber.c:1845
+#: ../libpurple/protocols/jabber/jabber.c:1890
 msgid "Bad Request"
 msgstr "�留虜� 留溜�侶亮留"
 
-#: ../libpurple/protocols/jabber/jabber.c:1847
+#: ../libpurple/protocols/jabber/jabber.c:1892
 msgid "Conflict"
 msgstr "裡�粒虜�凌��侶"
 
-#: ../libpurple/protocols/jabber/jabber.c:1849
+#: ../libpurple/protocols/jabber/jabber.c:1894
 msgid "Feature Not Implemented"
 msgstr "里凌 �留�留虜�侶�旅��旅虜� 隆竜僚 劉�竜旅 �了凌�凌旅侶慮竜溜"
 
-#: ../libpurple/protocols/jabber/jabber.c:1851
+#: ../libpurple/protocols/jabber/jabber.c:1896
 msgid "Forbidden"
 msgstr "��留粒凌�竜�亮劉僚凌"
 
-#: ../libpurple/protocols/jabber/jabber.c:1853
+#: ../libpurple/protocols/jabber/jabber.c:1898
 msgid "Gone"
 msgstr "���粒竜"
 
-#: ../libpurple/protocols/jabber/jabber.c:1855
-#: ../libpurple/protocols/jabber/jabber.c:1935
+#: ../libpurple/protocols/jabber/jabber.c:1900
+#: ../libpurple/protocols/jabber/jabber.c:1981
 msgid "Internal Server Error"
 msgstr "����竜�旅虜� ��略了亮留 竜両��侶�竜�侶�流"
 
-#: ../libpurple/protocols/jabber/jabber.c:1857
+#: ../libpurple/protocols/jabber/jabber.c:1902
 msgid "Item Not Found"
 msgstr "里凌 留僚�旅虜竜溜亮竜僚凌 隆竜 硫�劉慮侶虜竜"
 
-#: ../libpurple/protocols/jabber/jabber.c:1859
+#: ../libpurple/protocols/jabber/jabber.c:1904
 msgid "Malformed XMPP ID"
 msgstr "�留�留亮凌���亮劉僚凌 XMPP ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:1861
+#: ../libpurple/protocols/jabber/jabber.c:1906
 msgid "Not Acceptable"
 msgstr "�侶 留�凌隆竜虜��"
 
-#: ../libpurple/protocols/jabber/jabber.c:1863
+#: ../libpurple/protocols/jabber/jabber.c:1908
 msgid "Not Allowed"
 msgstr "�竜僚 竜�旅��劉�竜�留旅"
 
-#: ../libpurple/protocols/jabber/jabber.c:1867
+#: ../libpurple/protocols/jabber/jabber.c:1912
 msgid "Payment Required"
 msgstr "��留旅�竜溜�留旅 �了侶��亮流"
 
-#: ../libpurple/protocols/jabber/jabber.c:1869
+#: ../libpurple/protocols/jabber/jabber.c:1914
 msgid "Recipient Unavailable"
 msgstr "� �留�留了流��侶� 隆竜僚 竜溜僚留旅 隆旅留慮劉�旅亮凌�"
 
-#: ../libpurple/protocols/jabber/jabber.c:1873
+#: ../libpurple/protocols/jabber/jabber.c:1918
 msgid "Registration Required"
 msgstr "��留旅�竜溜�留旅 虜留�留���侶�侶"
 
-#: ../libpurple/protocols/jabber/jabber.c:1875
+#: ../libpurple/protocols/jabber/jabber.c:1920
 msgid "Remote Server Not Found"
 msgstr "� 留�凌亮留虜���亮劉僚凌� 竜両��侶�竜�侶�流� 隆竜 硫�劉慮侶虜竜"
 
-#: ../libpurple/protocols/jabber/jabber.c:1877
+#: ../libpurple/protocols/jabber/jabber.c:1922
 msgid "Remote Server Timeout"
 msgstr "里劉了凌� ��凌僚旅虜凌� 凌�溜凌� �凌� 留�凌亮留虜���亮劉僚凌� 竜両��侶�竜�侶�流"
 
-#: ../libpurple/protocols/jabber/jabber.c:1879
+#: ../libpurple/protocols/jabber/jabber.c:1924
 msgid "Server Overloaded"
 msgstr "離�竜�������侶 竜両��侶�竜�侶�流"
 
-#: ../libpurple/protocols/jabber/jabber.c:1881
+#: ../libpurple/protocols/jabber/jabber.c:1926
 msgid "Service Unavailable"
 msgstr "離�侶�竜�溜留 亮侶 隆旅留慮劉�旅亮侶"
 
-#: ../libpurple/protocols/jabber/jabber.c:1883
+#: ../libpurple/protocols/jabber/jabber.c:1928
 msgid "Subscription Required"
 msgstr "��留旅�竜溜�留旅 竜粒粒�留�流"
 
-#: ../libpurple/protocols/jabber/jabber.c:1885
+#: ../libpurple/protocols/jabber/jabber.c:1930
 msgid "Unexpected Request"
 msgstr "�僚留�略僚�竜�凌 留溜�侶亮留"
 
-#: ../libpurple/protocols/jabber/jabber.c:1892
+#: ../libpurple/protocols/jabber/jabber.c:1938
 msgid "Authorization Aborted"
 msgstr "� 劉粒虜�旅�侶 留虜���慮侶虜竜"
 
-#: ../libpurple/protocols/jabber/jabber.c:1894
+#: ../libpurple/protocols/jabber/jabber.c:1940
 msgid "Incorrect encoding in authorization"
 msgstr "�留僚慮留�亮劉僚侶 虜�隆旅虜凌�凌溜侶�侶 ��侶僚 劉粒虜�旅�侶"
 
-#: ../libpurple/protocols/jabber/jabber.c:1897
+#: ../libpurple/protocols/jabber/jabber.c:1942
 msgid "Invalid authzid"
 msgstr "�侶 劉粒虜��凌 隆旅留虜�旅�旅虜� 劉粒虜�旅�侶�"
 
-#: ../libpurple/protocols/jabber/jabber.c:1900
+#: ../libpurple/protocols/jabber/jabber.c:1944
 msgid "Invalid Authorization Mechanism"
 msgstr "�侶 劉粒虜��凌� 亮侶�留僚旅�亮�� 劉粒虜�旅�侶�"
 
-#: ../libpurple/protocols/jabber/jabber.c:1903
+#: ../libpurple/protocols/jabber/jabber.c:1947
 msgid "Authorization mechanism too weak"
 msgstr "�隆�僚留亮凌� 亮侶�留僚旅�亮�� 劉粒虜�旅�侶�"
 
-#: ../libpurple/protocols/jabber/jabber.c:1911
+#: ../libpurple/protocols/jabber/jabber.c:1955
 msgid "Temporary Authentication Failure"
 msgstr "��凌���旅僚流 留�凌���溜留 劉粒虜�旅�侶�"
 
-#: ../libpurple/protocols/jabber/jabber.c:1914
+#: ../libpurple/protocols/jabber/jabber.c:1958
 msgid "Authentication Failure"
 msgstr "��凌���溜留 劉粒虜�旅�侶�"
 
-#: ../libpurple/protocols/jabber/jabber.c:1920
+#: ../libpurple/protocols/jabber/jabber.c:1966
 msgid "Bad Format"
 msgstr "�留虜流 亮凌��流"
 
-#: ../libpurple/protocols/jabber/jabber.c:1922
+#: ../libpurple/protocols/jabber/jabber.c:1968
 msgid "Bad Namespace Prefix"
 msgstr "�留虜� ���慮竜亮留 凌僚凌亮留�凌���凌�"
 
-#: ../libpurple/protocols/jabber/jabber.c:1925
+#: ../libpurple/protocols/jabber/jabber.c:1971
 msgid "Resource Conflict"
 msgstr "裡�粒虜�凌��侶 �侶粒�僚"
 
-#: ../libpurple/protocols/jabber/jabber.c:1927
-#: ../libpurple/protocols/silc/silc.c:244
-#: ../libpurple/protocols/silc10/ops.c:1720
+#: ../libpurple/protocols/jabber/jabber.c:1973
+#: ../libpurple/protocols/silc/silc.c:350
+#: ../libpurple/protocols/silc10/ops.c:1725
 msgid "Connection Timeout"
 msgstr "里劉了凌� ��凌僚旅虜凌� 凌�溜凌� ��僚隆竜�侶�"
 
-#: ../libpurple/protocols/jabber/jabber.c:1929
+#: ../libpurple/protocols/jabber/jabber.c:1975
 msgid "Host Gone"
 msgstr "� 虜竜僚��旅虜�� ��凌了凌粒旅��流� �略慮侶虜竜"
 
-#: ../libpurple/protocols/jabber/jabber.c:1931
+#: ../libpurple/protocols/jabber/jabber.c:1977
 msgid "Host Unknown"
 msgstr "�粒僚���凌� 虜竜僚��旅虜�� ��凌了凌粒旅��流�"
 
-#: ../libpurple/protocols/jabber/jabber.c:1933
+#: ../libpurple/protocols/jabber/jabber.c:1979
 msgid "Improper Addressing"
 msgstr "�僚略�亮凌��侶 隆旅竜�慮�僚�旅凌隆��侶�侶"
 
-#: ../libpurple/protocols/jabber/jabber.c:1937
+#: ../libpurple/protocols/jabber/jabber.c:1983
 msgid "Invalid ID"
 msgstr "�侶 劉粒虜��凌 ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:1939
+#: ../libpurple/protocols/jabber/jabber.c:1985
 msgid "Invalid Namespace"
 msgstr "�侶 劉粒虜��凌� 凌僚凌亮留�凌���凌�"
 
-#: ../libpurple/protocols/jabber/jabber.c:1941
+#: ../libpurple/protocols/jabber/jabber.c:1987
 msgid "Invalid XML"
 msgstr "�侶 劉粒虜��凌 XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1943
+#: ../libpurple/protocols/jabber/jabber.c:1989
 msgid "Non-matching Hosts"
 msgstr "�旅 虜竜僚��旅虜凌溜 ��凌了凌粒旅��劉� 隆竜僚 �留旅�旅略龍凌�僚"
 
-#: ../libpurple/protocols/jabber/jabber.c:1947
+#: ../libpurple/protocols/jabber/jabber.c:1993
 msgid "Policy Violation"
 msgstr "�留�略硫留�侶 �凌了旅�旅虜流�"
 
-#: ../libpurple/protocols/jabber/jabber.c:1949
+#: ../libpurple/protocols/jabber/jabber.c:1995
 msgid "Remote Connection Failed"
 msgstr "��凌���溜留 留�凌亮留虜���亮劉僚侶� ��僚隆竜�侶�"
 
-#: ../libpurple/protocols/jabber/jabber.c:1951
+#: ../libpurple/protocols/jabber/jabber.c:1997
 msgid "Resource Constraint"
 msgstr "�竜�旅凌�旅�亮�� ����僚"
 
-#: ../libpurple/protocols/jabber/jabber.c:1953
+#: ../libpurple/protocols/jabber/jabber.c:1999
 msgid "Restricted XML"
 msgstr "�竜�旅凌�旅�亮劉僚凌 XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1955
+#: ../libpurple/protocols/jabber/jabber.c:2001
 msgid "See Other Host"
 msgstr "�亮�略僚旅�侶 �凌� 略了了凌� ��凌了凌粒旅��流"
 
-#: ../libpurple/protocols/jabber/jabber.c:1957
+#: ../libpurple/protocols/jabber/jabber.c:2003
 msgid "System Shutdown"
 msgstr "里竜�亮留�旅�亮�� ����流亮留�凌�"
 
-#: ../libpurple/protocols/jabber/jabber.c:1959
+#: ../libpurple/protocols/jabber/jabber.c:2005
 msgid "Undefined Condition"
 msgstr "���凌�隆旅��旅��侶 虜留�略��留�侶"
 
-#: ../libpurple/protocols/jabber/jabber.c:1961
+#: ../libpurple/protocols/jabber/jabber.c:2007
 msgid "Unsupported Encoding"
 msgstr "�侶 ��凌��侶�旅龍�亮竜僚侶 虜�隆旅虜凌�凌溜侶�侶"
 
-#: ../libpurple/protocols/jabber/jabber.c:1963
+#: ../libpurple/protocols/jabber/jabber.c:2009
 msgid "Unsupported Stanza Type"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1965
+#: ../libpurple/protocols/jabber/jabber.c:2011
 msgid "Unsupported Version"
 msgstr "�侶 ��凌��侶�旅龍�亮竜僚侶 劉虜隆凌�侶"
 
-#: ../libpurple/protocols/jabber/jabber.c:1967
+#: ../libpurple/protocols/jabber/jabber.c:2013
 msgid "XML Not Well Formed"
 msgstr "�留虜流 亮凌��流 �凌� XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1969
+#: ../libpurple/protocols/jabber/jabber.c:2015
 msgid "Stream Error"
 msgstr "裡�略了亮留 �凌流�"
 
-#: ../libpurple/protocols/jabber/jabber.c:2052
+#: ../libpurple/protocols/jabber/jabber.c:2100
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "�隆�僚留亮溜留 留�留粒��竜��侶� 竜旅��隆凌� �竜 %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2072
+#: ../libpurple/protocols/jabber/jabber.c:2120
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2077
+#: ../libpurple/protocols/jabber/jabber.c:2125
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2096
+#: ../libpurple/protocols/jabber/jabber.c:2144
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "�粒僚���凌� ��了凌�: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:2101
+#: ../libpurple/protocols/jabber/jabber.c:2149
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "�竜僚 流�留僚 隆�僚留�� 僚留 凌�旅��竜溜 凌 ��了凌� \"%s\" 粒旅留 �凌 ��流��侶: %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2154
+#: ../libpurple/protocols/jabber/jabber.c:2202
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "�隆�僚留亮溜留 竜虜隆旅�粒亮凌� �凌� ��流��侶 %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2185
-#, fuzzy, c-format
+#: ../libpurple/protocols/jabber/jabber.c:2233
+#, c-format
 msgid "Unable to ping user %s"
-msgstr "�隆�僚留亮溜留 留�留粒��竜��侶� 竜旅��隆凌� �竜 %s"
-
-#: ../libpurple/protocols/jabber/jabber.c:2207
-#: ../libpurple/protocols/jabber/jabber.c:2217
+msgstr "�竜僚 流�留僚 隆�僚留�� 僚留 粒溜僚竜旅 ping ��凌 ��流��侶 %s"
+
+#: ../libpurple/protocols/jabber/jabber.c:2251
+#: ../libpurple/protocols/jabber/jabber.c:2262
 #, c-format
 msgid "Unable to buzz, because there is nothing known about user %s."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2213
+#: ../libpurple/protocols/jabber/jabber.c:2257
 #, c-format
 msgid "Unable to buzz, because user %s might be offline."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2239
-#, fuzzy, c-format
+#: ../libpurple/protocols/jabber/jabber.c:2288
+#, c-format
 msgid "Unable to buzz, because the user %s does not support it."
 msgstr ""
-"�隆�僚留亮溜留 留�凌��凌了流� 留��竜溜凌� �竜 %s, 凌 ��流��侶� 隆竜僚 ��凌��侶�溜龍竜旅 亮竜�留�凌�劉� 留��竜溜�僚"
-
-#: ../libpurple/protocols/jabber/jabber.c:2253
+
+#. Yahoo only supports one attention command: the 'buzz'.
+#. This is index number YAHOO_BUZZ.
+#: ../libpurple/protocols/jabber/jabber.c:2308
+#: ../libpurple/protocols/yahoo/yahoo.c:4143
+msgid "Buzz"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2309
+#: ../libpurple/protocols/jabber/message.c:308
+#: ../libpurple/protocols/yahoo/yahoo.c:4144
+#, c-format
+msgid "%s has buzzed you!"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2309
+#: ../libpurple/protocols/yahoo/yahoo.c:4144
+#, c-format
+msgid "Buzzing %s..."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2340
 msgid "config:  Configure a chat room."
 msgstr "config:  痢�慮亮旅�侶 �凌� 隆�亮留�溜凌� ��龍流�侶�侶�."
 
-#: ../libpurple/protocols/jabber/jabber.c:2257
+#: ../libpurple/protocols/jabber/jabber.c:2344
 msgid "configure:  Configure a chat room."
 msgstr "configure:  痢�慮亮旅�侶 �凌� 隆�亮留�溜凌� ��龍流�侶�侶�."
 
-#: ../libpurple/protocols/jabber/jabber.c:2266
+#: ../libpurple/protocols/jabber/jabber.c:2353
 msgid "part [room]:  Leave the room."
 msgstr "part [隆�亮略�旅凌]:  ��凌���侶�侶 留�� �凌 隆�亮略�旅凌."
 
-#: ../libpurple/protocols/jabber/jabber.c:2271
+#: ../libpurple/protocols/jabber/jabber.c:2358
 msgid "register:  Register with a chat room."
 msgstr "register:  �留�留���侶�侶 竜僚�� 隆�亮留�溜凌� ��龍侶�流�竜�僚."
 
-#: ../libpurple/protocols/jabber/jabber.c:2277
+#: ../libpurple/protocols/jabber/jabber.c:2364
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [僚劉凌 慮劉亮留 ��龍流�侶�侶�]:  �亮�略僚旅�侶 流 留了了留粒流 �凌� 慮劉亮留�凌� ��龍流�侶�侶�."
 
-#: ../libpurple/protocols/jabber/jabber.c:2283
+#: ../libpurple/protocols/jabber/jabber.c:2370
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
-msgstr ""
-"ban &lt;��流��侶�&gt; [隆�亮略�旅凌]:  ��留粒��竜��侶 竜旅��隆凌� 竜僚�� ��流��侶 ��凌 隆�亮略�旅凌."
-
-#: ../libpurple/protocols/jabber/jabber.c:2289
+msgstr "ban &lt;��流��侶�&gt; [隆�亮略�旅凌]:  ��留粒��竜��侶 竜旅��隆凌� 竜僚�� ��流��侶 ��凌 隆�亮略�旅凌."
+
+#: ../libpurple/protocols/jabber/jabber.c:2376
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2295
+#: ../libpurple/protocols/jabber/jabber.c:2382
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -6128,33 +6329,32 @@
 "role &lt;��流��侶�&gt; &lt;moderator|participant|visitor|none&gt;: ��溜龍竜旅 �凌 "
 "��了凌 竜僚�� ��流��侶 ��凌 隆�亮略�旅凌."
 
-#: ../libpurple/protocols/jabber/jabber.c:2301
+#: ../libpurple/protocols/jabber/jabber.c:2388
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;��流��侶�&gt; [亮流僚�亮留]:  ����虜了侶�侶 竜僚�� ��流��侶 ��凌 隆�亮略�旅凌."
 
-#: ../libpurple/protocols/jabber/jabber.c:2307
+#: ../libpurple/protocols/jabber/jabber.c:2394
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr ""
 "join: &lt;隆�亮略�旅凌&gt; [竜両��侶�竜�侶�流�]:  裡�亮亮竜�凌�流 �竜 ��龍流�侶�侶 �竜 留���僚 �凌僚 "
 "竜両��侶�竜�侶�流."
 
-#: ../libpurple/protocols/jabber/jabber.c:2313
+#: ../libpurple/protocols/jabber/jabber.c:2400
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;��流��侶�&gt; [隆�亮略�旅凌]:  �虜隆旅�粒亮�� 竜僚�� ��流��侶 留�� �凌 隆�亮略�旅凌."
 
-#: ../libpurple/protocols/jabber/jabber.c:2318
-msgid ""
-"msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
+#: ../libpurple/protocols/jabber/jabber.c:2405
+msgid "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
 "msg &lt;��流��侶�&gt; &lt;亮流僚�亮留&gt;:  ��凌��凌了流 ��凌���旅虜凌� 亮侶僚�亮留�凌� �竜 劉僚留僚 "
 "略了了凌 ��流��侶."
 
-#: ../libpurple/protocols/jabber/jabber.c:2324
+#: ../libpurple/protocols/jabber/jabber.c:2411
 msgid "ping &lt;jid&gt;:\tPing a user/component/server."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2329
-#: ../libpurple/protocols/yahoo/yahoo.c:4145
+#: ../libpurple/protocols/jabber/jabber.c:2416
+#: ../libpurple/protocols/yahoo/yahoo.c:4167
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: 里�留硫流両�竜 �侶僚 ��凌�凌�流 竜僚�� ��流��侶"
 
@@ -6174,92 +6374,90 @@
 msgstr "����慮竜�凌 ����凌虜�了了凌� XMPP"
 
 #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
-#: ../libpurple/protocols/jabber/libxmpp.c:202 ../pidgin/gtkaccount.c:506
+#: ../libpurple/protocols/jabber/libxmpp.c:205 ../pidgin/gtkaccount.c:478
 msgid "Domain"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/libxmpp.c:210
+#: ../libpurple/protocols/jabber/libxmpp.c:213
 msgid "Require SSL/TLS"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/libxmpp.c:214
+msgstr "��留旅�竜溜�留旅 SSL/TLS"
+
+#: ../libpurple/protocols/jabber/libxmpp.c:217
 msgid "Force old (port 5223) SSL"
 msgstr "�両留僚留粒虜留�亮�� �留了旅凌� (慮��留 5223) SSL"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:219
+#: ../libpurple/protocols/jabber/libxmpp.c:222
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "��旅��劉�竜�留旅 侶 劉粒虜�旅�侶 �虜劉�凌� 虜竜旅亮劉僚凌� 亮劉�� 亮侶 虜����凌粒�留�侶亮劉僚�僚 �凌�僚"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:224
-#: ../libpurple/protocols/myspace/myspace.c:3277
-#: ../libpurple/protocols/simple/simple.c:1902
+#: ../libpurple/protocols/jabber/libxmpp.c:227
+#: ../libpurple/protocols/myspace/myspace.c:3466
+#: ../libpurple/protocols/simple/simple.c:2105
 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:228
-#: ../libpurple/protocols/myspace/myspace.c:3274
-#: ../libpurple/protocols/silc/silc.c:1914
-#: ../libpurple/protocols/silc10/silc.c:1857 ../pidgin/gtkaccount.c:837
+#: ../libpurple/protocols/jabber/libxmpp.c:231
+#: ../libpurple/protocols/myspace/myspace.c:3463
+#: ../libpurple/protocols/silc/silc.c:2057
+#: ../libpurple/protocols/silc10/silc.c:1863 ../pidgin/gtkaccount.c:809
 msgid "Connect server"
 msgstr "裡�僚隆竜�侶 亮竜 竜両��侶�竜�侶�流"
 
+#: ../libpurple/protocols/jabber/libxmpp.c:236
+msgid "File transfer proxies"
+msgstr "�旅留亮竜�凌了留硫侶�劉� 亮竜�留�凌�略� 留��竜溜�僚"
+
 #: ../libpurple/protocols/jabber/message.c:106
 #, c-format
 msgid "%s has left the conversation."
 msgstr "%s 留�凌���侶�竜 留�� �侶 ��僚凌亮旅了溜留."
 
-#: ../libpurple/protocols/jabber/message.c:161
+#: ../libpurple/protocols/jabber/message.c:162
 #, c-format
 msgid "Message from %s"
 msgstr "�流僚�亮留 留�� %s"
 
-#: ../libpurple/protocols/jabber/message.c:225
+#: ../libpurple/protocols/jabber/message.c:226
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s ��旅�竜 �凌 慮劉亮留 ��龍流�侶�侶� �竜: %s"
 
-#: ../libpurple/protocols/jabber/message.c:227
+#: ../libpurple/protocols/jabber/message.c:228
 #, c-format
 msgid "The topic is: %s"
 msgstr "里凌 慮劉亮留 ��龍流�侶�侶� 竜溜僚留旅: %s"
 
-#: ../libpurple/protocols/jabber/message.c:275
+#: ../libpurple/protocols/jabber/message.c:276
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "�竜�留�凌�略 亮侶僚�亮留�凌� �竜 %s 留�劉���竜: %s"
 
-#: ../libpurple/protocols/jabber/message.c:278
+#: ../libpurple/protocols/jabber/message.c:279
 msgid "XMPP Message Error"
 msgstr "裡�略了亮留 亮侶僚�亮留�凌� XMPP"
 
-#: ../libpurple/protocols/jabber/message.c:307
-#: ../libpurple/protocols/yahoo/yahoo.c:4120
-#, fuzzy, c-format
-msgid "%s has buzzed you!"
-msgstr "%s �留� ��凌�劉慮竜�竜 [%s]"
-
-#: ../libpurple/protocols/jabber/message.c:407
+#: ../libpurple/protocols/jabber/message.c:408
 #, c-format
 msgid " (Code %s)"
 msgstr " (��隆旅虜留� %s)"
 
-#: ../libpurple/protocols/jabber/parser.c:196
+#: ../libpurple/protocols/jabber/parser.c:198
 msgid "XML Parse error"
 msgstr "裡�略了亮留 留僚略了��侶� XML"
 
-#: ../libpurple/protocols/jabber/presence.c:427
+#: ../libpurple/protocols/jabber/presence.c:441
 msgid "Unknown Error in presence"
 msgstr "離�略��竜旅 略粒僚���凌 ��略了亮留"
 
-#: ../libpurple/protocols/jabber/presence.c:508
-#: ../libpurple/protocols/jabber/presence.c:509
+#: ../libpurple/protocols/jabber/presence.c:522
+#: ../libpurple/protocols/jabber/presence.c:523
 msgid "Create New Room"
 msgstr "�侶亮旅凌��粒溜留 僚劉凌� 隆�亮留�溜凌�"
 
-#: ../libpurple/protocols/jabber/presence.c:510
+#: ../libpurple/protocols/jabber/presence.c:524
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -6267,121 +6465,117 @@
 "�侶亮旅凌��粒竜溜�竜 劉僚留 僚劉凌 隆�亮略�旅凌.  �劉了竜�竜 僚留 �凌 ��慮亮溜�竜�竜, 流 慮留 留�凌隆竜�慮竜溜�竜 �旅� "
 "��凌竜�旅了竜粒亮劉僚竜� ��慮亮溜�竜旅�;"
 
-#: ../libpurple/protocols/jabber/presence.c:516
+#: ../libpurple/protocols/jabber/presence.c:530
 msgid "_Configure Room"
 msgstr "_痢�慮亮旅�侶 隆�亮留�溜凌�"
 
-#: ../libpurple/protocols/jabber/presence.c:517
+#: ../libpurple/protocols/jabber/presence.c:531
 msgid "_Accept Defaults"
 msgstr "_��凌隆凌�流 ��凌竜�旅了竜粒亮劉僚�僚"
 
-#: ../libpurple/protocols/jabber/presence.c:559
+#: ../libpurple/protocols/jabber/presence.c:573
 #, c-format
 msgid "Error in chat %s"
 msgstr "裡�略了亮留 ��侶 ��龍流�侶�侶 %s"
 
-#: ../libpurple/protocols/jabber/presence.c:563
+#: ../libpurple/protocols/jabber/presence.c:577
 #, c-format
 msgid "Error joining chat %s"
 msgstr "裡�略了亮留 虜留�略 �侶 ��亮亮竜�凌�流 ��侶 ��龍流�侶�侶 %s"
 
-#: ../libpurple/protocols/jabber/si.c:775
+#: ../libpurple/protocols/jabber/si.c:1009
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
-msgstr ""
-"�隆�僚留亮溜留 留�凌��凌了流� 留��竜溜凌� �竜 %s, 凌 ��流��侶� 隆竜僚 ��凌��侶�溜龍竜旅 亮竜�留�凌�劉� 留��竜溜�僚"
-
-#: ../libpurple/protocols/jabber/si.c:776
-#: ../libpurple/protocols/jabber/si.c:777
-#: ../libpurple/protocols/jabber/si.c:845
+msgstr "�隆�僚留亮溜留 留�凌��凌了流� 留��竜溜凌� �竜 %s, 凌 ��流��侶� 隆竜僚 ��凌��侶�溜龍竜旅 亮竜�留�凌�劉� 留��竜溜�僚"
+
+#: ../libpurple/protocols/jabber/si.c:1010
+#: ../libpurple/protocols/jabber/si.c:1011
+#: ../libpurple/protocols/jabber/si.c:1080
 msgid "File Send Failed"
 msgstr "��凌���溜留 留�凌��凌了流� 留��竜溜凌�"
 
-#: ../libpurple/protocols/jabber/si.c:838
-#, fuzzy, c-format
+#: ../libpurple/protocols/jabber/si.c:1073
+#, c-format
 msgid "Unable to send file to %s, invalid JID"
-msgstr "�隆�僚留�凌 僚留 ��留了竜溜 �凌 亮流僚�亮留 �竜 %s."
-
-#: ../libpurple/protocols/jabber/si.c:840
-#, fuzzy, c-format
+msgstr "�隆�僚留亮溜留 留�凌��凌了流� 留��竜溜凌� �竜 %s, 亮侶 劉粒虜��凌 JID"
+
+#: ../libpurple/protocols/jabber/si.c:1075
+#, c-format
 msgid "Unable to send file to %s, user is not online"
-msgstr ""
-"�隆�僚留亮溜留 留�凌��凌了流� 留��竜溜凌� �竜 %s, 凌 ��流��侶� 隆竜僚 ��凌��侶�溜龍竜旅 亮竜�留�凌�劉� 留��竜溜�僚"
-
-#: ../libpurple/protocols/jabber/si.c:842
-#, fuzzy, c-format
+msgstr "�隆�僚留亮溜留 留�凌��凌了流� 留��竜溜凌� �竜 %s, 凌 ��流��侶� 隆竜僚 竜溜僚留旅 ��僚隆竜隆竜亮劉僚凌�"
+
+#: ../libpurple/protocols/jabber/si.c:1077
+#, c-format
 msgid "Unable to send file to %s, not subscribed to user presence"
 msgstr ""
-"�隆�僚留亮溜留 留�凌��凌了流� 留��竜溜凌� �竜 %s, 凌 ��流��侶� 隆竜僚 ��凌��侶�溜龍竜旅 亮竜�留�凌�劉� 留��竜溜�僚"
-
-#: ../libpurple/protocols/jabber/si.c:857
-#, c-format
-msgid "Please select which resource of %s you would like to send a file to"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/si.c:873
-#, fuzzy
+
+#: ../libpurple/protocols/jabber/si.c:1092
+#, c-format
+msgid "Please select the resource of %s to which you would like to send a file"
+msgstr "�留�留虜留了凌�亮竜 竜�旅了劉両�竜 �侶僚 �侶粒流 �凌� %s ��凌 凌�凌溜凌 慮劉了竜�竜 僚留 ��竜溜了竜�竜 劉僚留 留��竜溜凌"
+
+#: ../libpurple/protocols/jabber/si.c:1108
 msgid "Select a Resource"
-msgstr "��旅了凌粒流 留��竜溜凌�"
-
-#: ../libpurple/protocols/jabber/usermood.c:179
-#: ../libpurple/protocols/jabber/usermood.c:180
-#, fuzzy
+msgstr "��旅了凌粒流 �侶粒流�"
+
+#: ../libpurple/protocols/jabber/usermood.c:197
+#: ../libpurple/protocols/jabber/usermood.c:198
 msgid "Edit User Mood"
-msgstr "�留�留��略�竜旅� ��侶���僚"
-
-#: ../libpurple/protocols/jabber/usermood.c:181
+msgstr "��竜両竜�粒留�溜留 隆旅略慮竜�侶� ��流��侶"
+
+#: ../libpurple/protocols/jabber/usermood.c:199
 msgid "Please select your mood from the list."
-msgstr ""
-
-#: ../libpurple/protocols/jabber/usermood.c:183
+msgstr "�留�留虜留了凌�亮竜 竜�旅了劉両�竜 �侶 隆旅略慮竜�流 �留� 留�� �侶 了溜��留."
+
+#: ../libpurple/protocols/jabber/usermood.c:201
 #: ../libpurple/protocols/jabber/usernick.c:78
-#, fuzzy
 msgid "Set"
-msgstr "_��旅�亮��"
-
-#: ../libpurple/protocols/jabber/usermood.c:191
-#, fuzzy
+msgstr "��旅�亮��"
+
+#: ../libpurple/protocols/jabber/usermood.c:209
 msgid "Set Mood..."
-msgstr "��凌��凌了流 略亮竜�凌� 亮侶僚�亮留�凌�..."
+msgstr "��旅�亮�� 隆旅略慮竜�侶�..."
 
 #: ../libpurple/protocols/jabber/usernick.c:76
-#, fuzzy
 msgid "Set User Nickname"
-msgstr "��旅�亮�� 凌�溜凌� ��侶���僚"
+msgstr "��旅�亮�� �竜�隆�僚�亮凌�"
 
 #: ../libpurple/protocols/jabber/usernick.c:76
-#, fuzzy
 msgid "Please specify a new nickname for you."
-msgstr "�留�留虜留了凌�亮竜 竜旅�略粒竜�竜 僚劉凌 �僚凌亮留 粒旅留 %s"
+msgstr "�留�留虜留了凌�亮竜 凌�溜��竜 劉僚留 �竜�隆�僚�亮凌 粒旅留 竜�略�."
 
 #: ../libpurple/protocols/jabber/usernick.c:77
 msgid ""
 "This information is visible to all contacts on your contact list, so choose "
 "something appropriate."
 msgstr ""
-
-#: ../libpurple/protocols/jabber/usernick.c:99
-#, fuzzy
+"���劉� 凌旅 �了侶�凌�凌�溜竜� 慮留 竜溜僚留旅 凌�留�劉� �竜 �了竜� �旅� 竜�留�劉� ��侶 了溜��留 竜�留��僚 "
+"�留�, 粒旅 留��� 竜�旅了劉両�竜 虜略�旅 虜留�略了了侶了凌."
+
+#: ../libpurple/protocols/jabber/usernick.c:100
 msgid "Set Nickname..."
-msgstr "率竜�隆�僚�亮凌"
+msgstr "��旅�亮�� �竜�隆�僚�亮凌�..."
 
 #: ../libpurple/protocols/jabber/xdata.c:378
-#, fuzzy
 msgid "Actions"
-msgstr "�僚劉�粒竜旅留"
+msgstr "�僚劉�粒竜旅竜�"
 
 #: ../libpurple/protocols/jabber/xdata.c:380
-#, fuzzy
 msgid "Select an action"
-msgstr "��旅了凌粒流 留��竜溜凌�"
-
-#: ../libpurple/protocols/msn/dialog.c:110
+msgstr "��旅了劉両�竜 亮溜留 竜僚劉�粒竜旅留"
+
+#: ../libpurple/protocols/msn/contact.c:712
+msgid "Unable to retrieve MSN Address Book"
+msgstr "�隆�僚留�侶 侶 了流�侶 竜僚�� 硫旅硫了溜凌� 隆旅竜�慮�僚�竜�僚 �凌� MSN"
+
+#: ../libpurple/protocols/msn/dialog.c:118
+#: ../libpurple/protocols/msnp9/dialog.c:110
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
 msgstr "��凌硫了流亮留�留 ��粒��凌僚旅�亮凌� �侶� 了溜��留� �溜了�僚 ��凌 %s (%s)"
 
-#: ../libpurple/protocols/msn/dialog.c:116
+#: ../libpurple/protocols/msn/dialog.c:124
+#: ../libpurple/protocols/msnp9/dialog.c:116
 #, c-format
 msgid ""
 "%s on the local list is inside the group \"%s\" but not on the server list. "
@@ -6390,7 +6584,8 @@
 "%s 竜溜僚留旅 ��侶僚 �凌�旅虜流 了溜��留 ��侶僚 凌亮略隆留 \"%s\" 留了了略 ��旅 ��侶 了溜��留 �凌� "
 "竜両��侶�竜�侶�流. ��旅慮�亮竜溜�竜 �侶僚 ��凌�慮流虜侶 留��凌� �凌� �溜了凌�;"
 
-#: ../libpurple/protocols/msn/dialog.c:124
+#: ../libpurple/protocols/msn/dialog.c:132
+#: ../libpurple/protocols/msnp9/dialog.c:124
 #, c-format
 msgid ""
 "%s is on the local list but not on the server list. Do you want this buddy "
@@ -6400,331 +6595,335 @@
 "�侶僚 ��凌�慮流虜侶 留��凌� �凌� �溜了凌�;"
 
 #: ../libpurple/protocols/msn/error.c:36
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:36
 msgid "Unable to parse message"
 msgstr "�隆�僚留亮溜留 留僚略了��侶� 亮侶僚�亮留�凌�"
 
 #: ../libpurple/protocols/msn/error.c:41
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:41
 msgid "Syntax Error (probably a client bug)"
 msgstr "裡�略了亮留 ��僚�留両侶� (�旅慮留僚�� ��略了亮留 虜�隆旅虜留 �凌� ��凌粒�略亮亮留�凌�)"
 
 #: ../libpurple/protocols/msn/error.c:46
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:46
 msgid "Invalid e-mail address"
 msgstr "�侶 劉粒虜��侶 隆旅竜�慮�僚�侶 e-mail"
 
 #: ../libpurple/protocols/msn/error.c:49
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:49
 msgid "User does not exist"
 msgstr "� ��流��侶� 隆竜僚 ��略��竜旅"
 
 #: ../libpurple/protocols/msn/error.c:53
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:53
 msgid "Fully qualified domain name missing"
 msgstr "�竜溜�竜旅 劉僚留 �了流��� 虜留�略了了侶了凌 隆旅虜��留虜� �僚凌亮留"
 
 #: ../libpurple/protocols/msn/error.c:56
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:56
 msgid "Already logged in"
 msgstr "�隆侶 ��僚隆竜隆竜亮劉僚凌�"
 
 #: ../libpurple/protocols/msn/error.c:59
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:59
 msgid "Invalid screen name"
 msgstr "�侶 劉粒虜��凌 竜亮�留僚旅龍�亮竜僚凌 �僚凌亮留"
 
 #: ../libpurple/protocols/msn/error.c:62
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:62
 msgid "Invalid friendly name"
 msgstr "�侶 劉粒虜��凌 �旅了旅虜� �僚凌亮留"
 
 #: ../libpurple/protocols/msn/error.c:65
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:65
 msgid "List full"
 msgstr "�溜��留 �了流�侶�"
 
 #: ../libpurple/protocols/msn/error.c:68
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:68
 msgid "Already there"
 msgstr "�溜��竜 流隆侶 竜虜竜溜"
 
 #: ../libpurple/protocols/msn/error.c:72
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:72
 msgid "Not on list"
 msgstr "�竜僚 竜溜僚留旅 ��侶 了溜��留"
 
 #: ../libpurple/protocols/msn/error.c:75
-#: ../libpurple/protocols/zephyr/zephyr.c:756
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:75
+#: ../libpurple/protocols/zephyr/zephyr.c:760
 msgid "User is offline"
 msgstr "� ��流��侶� 隆竜僚 竜溜僚留旅 ��僚隆竜隆竜亮劉僚凌�"
 
 #: ../libpurple/protocols/msn/error.c:78
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:78
 msgid "Already in the mode"
 msgstr "�溜��竜 流隆侶 �竜 留��流 �侶僚 虜留�略��留�侶"
 
 #: ../libpurple/protocols/msn/error.c:82
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:82
 msgid "Already in opposite list"
 msgstr "�溜��竜 流隆侶 ��侶僚 略了了侶 了溜��留"
 
 #: ../libpurple/protocols/msn/error.c:86
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:86
 msgid "Too many groups"
 msgstr "�略�留 �凌了了劉� 凌亮略隆竜�"
 
 #: ../libpurple/protocols/msn/error.c:89
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:89
 msgid "Invalid group"
 msgstr "�侶 劉粒虜��侶 凌亮略隆留"
 
 #: ../libpurple/protocols/msn/error.c:92
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:92
 msgid "User not in group"
 msgstr "� ��流��侶� 隆竜僚 ��略��竜旅 ��侶僚 凌亮略隆留"
 
 #: ../libpurple/protocols/msn/error.c:95
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:95
 msgid "Group name too long"
 msgstr "�僚凌亮留�溜留 凌亮略隆留� �凌了� 亮竜粒略了侶"
 
 #: ../libpurple/protocols/msn/error.c:98
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:98
 msgid "Cannot remove group zero"
 msgstr "�竜僚 竜溜僚留旅 隆�僚留�流 侶 留�留溜�竜�侶 �侶� 凌亮略隆留� 亮侶隆劉僚"
 
 #: ../libpurple/protocols/msn/error.c:103
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:103
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "��凌��留慮流�留�竜 僚留 ��凌�慮劉�竜�竜 亮溜留 竜�留�流 �竜 亮溜留 凌亮略隆留 �凌� 隆竜僚 ��略��竜旅"
 
 #: ../libpurple/protocols/msn/error.c:107
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:107
 msgid "Switchboard failed"
 msgstr "���凌�溜留 虜劉僚��凌� 亮侶僚�亮略��僚"
 
 #: ../libpurple/protocols/msn/error.c:111
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:111
 msgid "Notify transfer failed"
 msgstr "��凌���溜留 竜旅隆凌�凌溜侶�侶� 亮竜�留�凌�略�"
 
 #: ../libpurple/protocols/msn/error.c:116
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:116
 msgid "Required fields missing"
 msgstr "�竜溜�凌�僚 留�留旅�凌�亮竜僚留 �竜隆溜留"
 
 #: ../libpurple/protocols/msn/error.c:120
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:120
 msgid "Too many hits to a FND"
 msgstr "�略�留 �凌了了略 ����流亮留�留 �竜 劉僚留 FND"
 
 #: ../libpurple/protocols/msn/error.c:124
-#: ../libpurple/protocols/oscar/oscar.c:120
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:124
+#: ../libpurple/protocols/oscar/oscar.c:121
 msgid "Not logged in"
 msgstr "��凌��僚隆竜隆竜亮劉僚凌�"
 
 #: ../libpurple/protocols/msn/error.c:128
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:128
 msgid "Service temporarily unavailable"
 msgstr "離�侶�竜�溜留 ��凌���旅僚略 亮侶 隆旅留慮劉�旅亮侶"
 
 #: ../libpurple/protocols/msn/error.c:131
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:131
 msgid "Database server error"
 msgstr "裡�略了亮留 硫略�侶� 隆竜隆凌亮劉僚�僚 竜両��侶�竜�侶�流"
 
 #: ../libpurple/protocols/msn/error.c:135
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:135
 msgid "Command disabled"
 msgstr "�僚�凌了流 留�竜僚竜�粒凌�凌旅侶亮劉僚侶"
 
 #: ../libpurple/protocols/msn/error.c:139
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:139
 msgid "File operation error"
 msgstr "裡�略了亮留 虜留�留僚凌亮流� 留��竜溜凌�"
 
 #: ../libpurple/protocols/msn/error.c:143
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:143
 msgid "Memory allocation error"
 msgstr "裡�略了亮留 虜留�留僚凌亮流� 亮僚流亮侶�"
 
 #: ../libpurple/protocols/msn/error.c:147
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:147
 msgid "Wrong CHL value sent to server"
 msgstr "裡�略了慮侶虜竜 了留僚慮留�亮劉僚侶 �旅亮流 CHL ��凌僚 竜両��侶�竜�侶�流"
 
 #: ../libpurple/protocols/msn/error.c:152
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:152
 msgid "Server busy"
 msgstr "� 竜両��侶�竜�侶�流� 竜溜僚留旅 留�留��凌了侶亮劉僚凌�"
 
 #: ../libpurple/protocols/msn/error.c:155
 #: ../libpurple/protocols/msn/error.c:170
 #: ../libpurple/protocols/msn/error.c:230
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:155
+#: ../libpurple/protocols/msnp9/error.c:170
+#: ../libpurple/protocols/msnp9/error.c:230
 msgid "Server unavailable"
 msgstr "� 竜両��侶�竜�侶�流� 隆竜僚 竜溜僚留旅 隆旅留慮劉�旅亮凌�"
 
 #: ../libpurple/protocols/msn/error.c:158
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:158
 msgid "Peer notification server down"
 msgstr ""
 
 #: ../libpurple/protocols/msn/error.c:162
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:162
 msgid "Database connect error"
 msgstr "裡�略了亮留 ��僚隆竜�侶� 亮竜 �侶 硫略�侶 隆竜隆凌亮劉僚�僚"
 
 #: ../libpurple/protocols/msn/error.c:167
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:167
 msgid "Server is going down (abandon ship)"
 msgstr "� 竜両��侶�竜�侶�流� 慮留 虜了竜溜�竜旅 (竜粒虜留�留了竜溜��竜 �凌僚)"
 
 #: ../libpurple/protocols/msn/error.c:174
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:174
 msgid "Error creating connection"
 msgstr "裡�略了亮留 隆侶亮旅凌��粒溜留� ��僚隆竜�侶�"
 
 #: ../libpurple/protocols/msn/error.c:179
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:179
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "�旅 �留�略亮竜��凌旅 CVR 竜溜僚留旅 竜溜�竜 略粒僚���竜� 竜溜�竜 亮竜 竜�旅��竜��亮竜僚竜�"
 
 #: ../libpurple/protocols/msn/error.c:183
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:183
 msgid "Unable to write"
 msgstr "�隆�僚留亮溜留 竜粒粒�留�流�"
 
 #: ../libpurple/protocols/msn/error.c:186
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:186
 msgid "Session overload"
 msgstr "離�竜�������侶 ��僚竜隆�溜留�"
 
 #: ../libpurple/protocols/msn/error.c:190
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:190
 msgid "User is too active"
 msgstr "� ��流��侶� 竜溜僚留旅 ��竜�隆�留��流�旅凌�"
 
 #: ../libpurple/protocols/msn/error.c:193
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:193
 msgid "Too many sessions"
 msgstr "�略�留 �凌了了劉� ��僚竜隆�溜竜�"
 
 #: ../libpurple/protocols/msn/error.c:196
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:196
 msgid "Passport not verified"
 msgstr "� 虜�隆旅虜�� 隆竜僚 竜�旅硫竜硫留旅�慮侶虜竜"
 
 #: ../libpurple/protocols/msn/error.c:199
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:199
 msgid "Bad friend file"
 msgstr "�留僚慮留�亮劉僚凌 留��竜溜凌 �溜了�僚"
 
 #: ../libpurple/protocols/msn/error.c:203
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:203
 msgid "Not expected"
 msgstr "�僚留�略僚�竜�凌"
 
 #: ../libpurple/protocols/msn/error.c:209
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:209
 msgid "Friendly name changes too rapidly"
 msgstr "里凌 �旅了旅虜� �僚凌亮留 留了了略龍竜旅 �凌了� 粒�流粒凌�留"
 
 #: ../libpurple/protocols/msn/error.c:218
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:218
 msgid "Server too busy"
 msgstr "� 竜両��侶�竜�侶�流� 竜溜僚留旅 �凌了� 留�留��凌了侶亮劉僚凌�"
 
 #: ../libpurple/protocols/msn/error.c:222
-#: ../libpurple/protocols/oscar/oscar.c:1380
-#: ../libpurple/protocols/silc/silc.c:233
-#: ../libpurple/protocols/silc10/ops.c:1709
-#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1380
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:222
+#: ../libpurple/protocols/oscar/oscar.c:1418
+#: ../libpurple/protocols/silc/silc.c:338
+#: ../libpurple/protocols/silc10/ops.c:1713
+#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1399
 msgid "Authentication failed"
 msgstr "��凌���溜留 劉粒虜�旅�侶�"
 
 #: ../libpurple/protocols/msn/error.c:225
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:225
 msgid "Not allowed when offline"
 msgstr "�竜僚 竜�旅��劉�竜�留旅 ���溜� ��僚隆竜�侶"
 
 #: ../libpurple/protocols/msn/error.c:233
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:233
 msgid "Not accepting new users"
 msgstr "�竜僚 竜�旅��劉�凌僚�留旅 凌旅 僚劉凌旅 ��流��竜�"
 
 #: ../libpurple/protocols/msn/error.c:237
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:237
 msgid "Kids Passport without parental consent"
 msgstr "�旅留硫留�流�旅凌 �留旅隆旅�僚 ���溜� 粒凌僚旅虜流 ��僚留溜僚竜�侶"
 
 #: ../libpurple/protocols/msn/error.c:241
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:241
 msgid "Passport account not yet verified"
 msgstr "� 了凌粒留�旅留�亮�� 隆旅留硫留�侶�溜凌� 隆竜僚 �旅��凌�凌旅流慮侶虜竜"
 
 #: ../libpurple/protocols/msn/error.c:244
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:244
 msgid "Bad ticket"
 msgstr "�留虜� 竜旅�旅�流�旅凌"
 
 #: ../libpurple/protocols/msn/error.c:249
+#: ../libpurple/protocols/msnp9/error.c:249
 #, c-format
 msgid "Unknown Error Code %d"
 msgstr "�粒僚���凌� 虜�隆旅虜留� ��略了亮留�凌� %d"
 
 #: ../libpurple/protocols/msn/error.c:263
+#: ../libpurple/protocols/msnp9/error.c:263
 #, c-format
 msgid "MSN Error: %s\n"
 msgstr "裡�略了亮留 MSN: %s\n"
 
-#: ../libpurple/protocols/msn/msn.c:130
+#: ../libpurple/protocols/msn/msn.c:128 ../libpurple/protocols/msnp9/msn.c:129
 msgid "Nudge"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:131
-#, fuzzy, c-format
+#: ../libpurple/protocols/msn/msn.c:129 ../libpurple/protocols/msnp9/msn.c:130
+#, c-format
 msgid "%s has nudged you!"
-msgstr "%s �留� ��凌�劉慮竜�竜 [%s]"
-
-#: ../libpurple/protocols/msn/msn.c:132
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:129 ../libpurple/protocols/msnp9/msn.c:130
 #, c-format
 msgid "Nudging %s..."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:174
+#: ../libpurple/protocols/msn/msn.c:170 ../libpurple/protocols/msnp9/msn.c:171
 msgid "Your new MSN friendly name is too long."
 msgstr "里凌 僚劉凌 �留� �旅了旅虜� �僚凌亮留 MSN 竜溜僚留旅 �凌了� 亮竜粒略了凌."
 
-#: ../libpurple/protocols/msn/msn.c:282
+#: ../libpurple/protocols/msn/msn.c:282 ../libpurple/protocols/msnp9/msn.c:279
 msgid "Set your friendly name."
 msgstr "��旅�亮�� 僚劉凌� �旅了旅虜凌� 凌僚�亮留�凌�."
 
-#: ../libpurple/protocols/msn/msn.c:283
+#: ../libpurple/protocols/msn/msn.c:283 ../libpurple/protocols/msnp9/msn.c:280
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "���� 竜溜僚留旅 �凌 �僚凌亮留 亮竜 �凌 凌�凌溜凌 慮留 �留� 硫了劉�凌�僚 凌旅 �溜了凌旅 �留� ��凌 MSN."
 
-#: ../libpurple/protocols/msn/msn.c:301
+#: ../libpurple/protocols/msn/msn.c:301 ../libpurple/protocols/msnp9/msn.c:298
 msgid "Set your home phone number."
 msgstr "��旅�亮�� �侶了竜��僚凌� 凌旅虜溜留�."
 
-#: ../libpurple/protocols/msn/msn.c:318
+#: ../libpurple/protocols/msn/msn.c:318 ../libpurple/protocols/msnp9/msn.c:315
 msgid "Set your work phone number."
 msgstr "��旅�亮�� �侶了竜��僚凌� 竜�粒留�溜留�."
 
-#: ../libpurple/protocols/msn/msn.c:335
+#: ../libpurple/protocols/msn/msn.c:335 ../libpurple/protocols/msnp9/msn.c:332
 msgid "Set your mobile phone number."
 msgstr "��旅�亮�� 虜旅僚侶�凌� �侶了竜��僚凌�."
 
-#: ../libpurple/protocols/msn/msn.c:350
+#: ../libpurple/protocols/msn/msn.c:350 ../libpurple/protocols/msnp9/msn.c:347
 msgid "Allow MSN Mobile pages?"
 msgstr "��旅��劉�凌僚�留旅 凌旅 �竜了溜隆竜� MSN Mobile;"
 
-#: ../libpurple/protocols/msn/msn.c:351
+#: ../libpurple/protocols/msn/msn.c:351 ../libpurple/protocols/msnp9/msn.c:348
 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?"
@@ -6732,323 +6931,411 @@
 "�劉了竜�竜 僚留 竜�旅��劉�竜�留旅 流 ��旅 ��留 略�凌亮留 �凌� 竜溜僚留旅 ��侶 了溜��留 �溜了�僚 �留� 僚留 "
 "��劉了僚凌�僚 �竜了溜隆竜� MSN Mobile ��凌 虜旅僚侶�� �留� �侶了劉��僚凌 流 �竜 略了了侶 �凌�侶�流 ���虜竜�流;"
 
-#: ../libpurple/protocols/msn/msn.c:357
+#: ../libpurple/protocols/msn/msn.c:357 ../libpurple/protocols/msnp9/msn.c:354
 msgid "Allow"
 msgstr "��旅��劉�竜�留旅"
 
-#: ../libpurple/protocols/msn/msn.c:358
+#: ../libpurple/protocols/msn/msn.c:358 ../libpurple/protocols/msnp9/msn.c:355
 msgid "Disallow"
 msgstr "��留粒凌�竜�竜�留旅"
 
-#: ../libpurple/protocols/msn/msn.c:374
+#: ../libpurple/protocols/msn/msn.c:374 ../libpurple/protocols/msnp9/msn.c:371
 msgid "This Hotmail account may not be active."
 msgstr "����� 凌 了凌粒留�旅留�亮�� Hotmail 溜��� 隆竜僚 竜溜僚留旅 竜僚竜�粒��."
 
-#: ../libpurple/protocols/msn/msn.c:400
+#: ../libpurple/protocols/msn/msn.c:400 ../libpurple/protocols/msnp9/msn.c:397
 msgid "Send a mobile message."
 msgstr "��凌��凌了流 亮侶僚�亮留�凌� �竜 虜旅僚侶��."
 
-#: ../libpurple/protocols/msn/msn.c:402
+#: ../libpurple/protocols/msn/msn.c:402 ../libpurple/protocols/msnp9/msn.c:399
 msgid "Page"
 msgstr "裡竜了溜隆留"
 
-#: ../libpurple/protocols/msn/msn.c:549
-msgid "Has you"
-msgstr "裡留� 劉�竜旅"
-
-#: ../libpurple/protocols/msn/msn.c:579 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:3077
-#: ../libpurple/protocols/yahoo/yahoo.c:3761
+#: ../libpurple/protocols/msn/msn.c:665 ../libpurple/protocols/msnp9/msn.c:567
+msgid "Home Phone Number"
+msgstr "里侶了劉��僚凌 凌旅虜溜留�"
+
+#: ../libpurple/protocols/msn/msn.c:669 ../libpurple/protocols/msnp9/msn.c:571
+msgid "Work Phone Number"
+msgstr "里侶了劉��僚凌 竜�粒留�溜留�"
+
+#: ../libpurple/protocols/msn/msn.c:673 ../libpurple/protocols/msnp9/msn.c:575
+msgid "Mobile Phone Number"
+msgstr "�旅僚侶�� �侶了劉��僚凌"
+
+#: ../libpurple/protocols/msn/msn.c:696 ../libpurple/protocols/msn/state.c:33
+#: ../libpurple/protocols/msnp9/msn.c:594
+#: ../libpurple/protocols/msnp9/state.c:33
+#: ../libpurple/protocols/yahoo/yahoo.c:3114
+#: ../libpurple/protocols/yahoo/yahoo.c:3803
 msgid "Be Right Back"
 msgstr "��旅���劉�� 留亮劉���"
 
-#: ../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/msn/msn.c:702 ../libpurple/protocols/msn/state.c:31
+#: ../libpurple/protocols/msnp9/msn.c:598
+#: ../libpurple/protocols/msnp9/state.c:31
+#: ../libpurple/protocols/novell/novell.c:2840
+#: ../libpurple/protocols/novell/novell.c:2970
+#: ../libpurple/protocols/silc/buddy.c:1483
 #: ../libpurple/protocols/silc/silc.c:56
-#: ../libpurple/protocols/silc10/buddy.c:1480
+#: ../libpurple/protocols/silc10/buddy.c:1483
 #: ../libpurple/protocols/silc10/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:3079
-#: ../libpurple/protocols/yahoo/yahoo.c:3764
+#: ../libpurple/protocols/yahoo/yahoo.c:3116
+#: ../libpurple/protocols/yahoo/yahoo.c:3806
 msgid "Busy"
 msgstr "��留��凌了侶亮劉僚凌�"
 
-#: ../libpurple/protocols/msn/msn.c:587
-#: ../libpurple/protocols/yahoo/yahoo.c:3087
-#: ../libpurple/protocols/yahoo/yahoo.c:3776
+#: ../libpurple/protocols/msn/msn.c:707 ../libpurple/protocols/msnp9/msn.c:602
+#: ../libpurple/protocols/yahoo/yahoo.c:3124
+#: ../libpurple/protocols/yahoo/yahoo.c:3818
 msgid "On the Phone"
 msgstr "裡�凌 �侶了劉��僚凌"
 
-#: ../libpurple/protocols/msn/msn.c:591
-#: ../libpurple/protocols/yahoo/yahoo.c:3091
-#: ../libpurple/protocols/yahoo/yahoo.c:3782
+#: ../libpurple/protocols/msn/msn.c:712 ../libpurple/protocols/msnp9/msn.c:606
+#: ../libpurple/protocols/yahoo/yahoo.c:3128
+#: ../libpurple/protocols/yahoo/yahoo.c:3824
 msgid "Out to Lunch"
 msgstr "�溜亮留旅 粒旅留 �留粒侶��"
 
-#: ../libpurple/protocols/msn/msn.c:619
+#. primitive
+#. ID
+#. name - use default
+#. savable
+#. should be user_settable some day
+#. independent
+#: ../libpurple/protocols/msn/msn.c:731
+#: ../libpurple/protocols/myspace/myspace.c:170
+msgid "Artist"
+msgstr "�留了了旅�劉�僚侶�"
+
+#: ../libpurple/protocols/msn/msn.c:732
+msgid "Album"
+msgstr "�溜�虜凌�"
+
+#: ../libpurple/protocols/msn/msn.c:750 ../libpurple/protocols/msnp9/msn.c:634
 msgid "Set Friendly Name..."
 msgstr "��旅�亮�� �旅了旅虜凌� 凌僚�亮留�凌�..."
 
-#: ../libpurple/protocols/msn/msn.c:624
+#: ../libpurple/protocols/msn/msn.c:755 ../libpurple/protocols/msnp9/msn.c:639
 msgid "Set Home Phone Number..."
 msgstr "��旅�亮�� �侶了竜��僚凌� 凌旅虜溜留�..."
 
-#: ../libpurple/protocols/msn/msn.c:628
+#: ../libpurple/protocols/msn/msn.c:759 ../libpurple/protocols/msnp9/msn.c:643
 msgid "Set Work Phone Number..."
 msgstr "��旅�亮�� �侶了竜��僚凌� 竜�粒留�溜留�..."
 
-#: ../libpurple/protocols/msn/msn.c:632
+#: ../libpurple/protocols/msn/msn.c:763 ../libpurple/protocols/msnp9/msn.c:647
 msgid "Set Mobile Phone Number..."
 msgstr "��旅�亮�� 虜旅僚侶�凌� �侶了竜��僚凌�..."
 
-#: ../libpurple/protocols/msn/msn.c:638
+#: ../libpurple/protocols/msn/msn.c:769 ../libpurple/protocols/msnp9/msn.c:653
 msgid "Enable/Disable Mobile Devices..."
 msgstr "�僚竜�粒凌�凌溜侶�侶/��竜僚竜�粒凌�凌溜侶�侶 �凌�侶��僚 ���虜竜��僚..."
 
-#: ../libpurple/protocols/msn/msn.c:643
+#: ../libpurple/protocols/msn/msn.c:774 ../libpurple/protocols/msnp9/msn.c:658
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "��旅��劉��竜/留�留粒凌�竜��竜�竜 �旅� �竜了溜隆竜� 粒旅留 �凌�侶�劉� ���虜竜�劉�..."
 
-#: ../libpurple/protocols/msn/msn.c:654
+#: ../libpurple/protocols/msn/msn.c:785 ../libpurple/protocols/msnp9/msn.c:669
 msgid "Open Hotmail Inbox"
 msgstr "�僚凌旅粒亮留 竜旅�竜��凌亮劉僚�僚 Hotmail"
 
-#: ../libpurple/protocols/msn/msn.c:678
+#: ../libpurple/protocols/msn/msn.c:809 ../libpurple/protocols/msnp9/msn.c:693
 msgid "Send to Mobile"
 msgstr "��凌��凌了流 �竜 虜旅僚侶��"
 
-#: ../libpurple/protocols/msn/msn.c:688
-#: ../libpurple/protocols/novell/novell.c:3408
+#: ../libpurple/protocols/msn/msn.c:819 ../libpurple/protocols/msnp9/msn.c:703
+#: ../libpurple/protocols/novell/novell.c:3426
 msgid "Initiate _Chat"
 msgstr "�僚留�両侶 _��龍流�侶�侶�"
 
-#: ../libpurple/protocols/msn/msn.c:726
+#: ../libpurple/protocols/msn/msn.c:857 ../libpurple/protocols/msnp9/msn.c:742
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 "律�竜旅略龍竜�留旅 ��凌��流�旅両侶 SSL 粒旅留 �凌 MSN. �留�留虜留了凌�亮竜 竜粒虜留�留��流��竜 亮溜留 "
 "��凌��侶�旅龍�亮竜僚侶 硫旅硫了旅凌慮流虜侶 SSL."
 
-#: ../libpurple/protocols/msn/msn.c:754
+#: ../libpurple/protocols/msn/msn.c:887 ../libpurple/protocols/msnp9/msn.c:772
 msgid "Failed to connect to server."
 msgstr "��凌���溜留 ��僚隆竜�侶� 亮竜 �凌僚 竜両��侶�竜�侶�流."
 
-#: ../libpurple/protocols/msn/msn.c:1510 ../libpurple/protocols/msn/msn.c:1858
+#: ../libpurple/protocols/msn/msn.c:1671 ../libpurple/protocols/msn/msn.c:2014
+#: ../libpurple/protocols/msnp9/msn.c:1527
+#: ../libpurple/protocols/msnp9/msn.c:1870
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:808
 msgid "Error retrieving profile"
 msgstr "裡�略了亮留 虜留�略 �侶 了流�侶 �凌� ��凌�溜了"
 
-#: ../libpurple/protocols/msn/msn.c:1581 ../pidgin/plugins/convcolors.c:309
-#: ../pidgin/plugins/pidginrc.c:366
+#: ../libpurple/protocols/msn/msn.c:1737
+#: ../libpurple/protocols/msnp9/msn.c:1593 ../pidgin/plugins/convcolors.c:371
+#: ../pidgin/plugins/pidginrc.c:372
 msgid "General"
 msgstr "�竜僚旅虜略"
 
-#: ../libpurple/protocols/msn/msn.c:1588
-#: ../libpurple/protocols/myspace/user.c:110
-#: ../libpurple/protocols/oscar/oscar.c:3755
+#: ../libpurple/protocols/msn/msn.c:1744
+#: ../libpurple/protocols/msnp9/msn.c:1600
+#: ../libpurple/protocols/myspace/user.c:125
+#: ../libpurple/protocols/oscar/oscar.c:3788
 #: ../libpurple/protocols/qq/buddy_info.c:45
-#: ../libpurple/protocols/qq/qq.c:221
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1081
+#: ../libpurple/protocols/qq/qq.c:222
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1087
 msgid "Age"
 msgstr "�了旅虜溜留"
 
-#: ../libpurple/protocols/msn/msn.c:1590
+#: ../libpurple/protocols/msn/msn.c:1746
+#: ../libpurple/protocols/msnp9/msn.c:1602
 #: ../libpurple/protocols/qq/buddy_info.c:51
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1096
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1102
 msgid "Occupation"
 msgstr "��留���了侶�侶"
 
-#: ../libpurple/protocols/msn/msn.c:1591
-#: ../libpurple/protocols/myspace/user.c:119
-#: ../libpurple/protocols/novell/novell.c:1478
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1076
-#: ../libpurple/protocols/zephyr/zephyr.c:798
-#: ../libpurple/protocols/zephyr/zephyr.c:1215
+#: ../libpurple/protocols/msn/msn.c:1747
+#: ../libpurple/protocols/msnp9/msn.c:1603
+#: ../libpurple/protocols/myspace/user.c:133
+#: ../libpurple/protocols/novell/novell.c:1487
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1082
+#: ../libpurple/protocols/zephyr/zephyr.c:802
+#: ../libpurple/protocols/zephyr/zephyr.c:1175
 msgid "Location"
 msgstr "里凌�凌慮竜�溜留"
 
-#: ../libpurple/protocols/msn/msn.c:1596 ../libpurple/protocols/msn/msn.c:1788
-#: ../libpurple/protocols/msn/msn.c:1794 ../libpurple/protocols/msn/msn.c:1801
+#: ../libpurple/protocols/msn/msn.c:1752 ../libpurple/protocols/msn/msn.c:1944
+#: ../libpurple/protocols/msn/msn.c:1950 ../libpurple/protocols/msn/msn.c:1957
+#: ../libpurple/protocols/msnp9/msn.c:1608
+#: ../libpurple/protocols/msnp9/msn.c:1800
+#: ../libpurple/protocols/msnp9/msn.c:1806
+#: ../libpurple/protocols/msnp9/msn.c:1813
 msgid "Hobbies and Interests"
 msgstr "�了竜�慮竜�凌� ���僚凌� 虜留旅 竜僚隆旅留�劉�凌僚�留"
 
-#: ../libpurple/protocols/msn/msn.c:1602 ../libpurple/protocols/msn/msn.c:1722
-#: ../libpurple/protocols/msn/msn.c:1728 ../libpurple/protocols/msn/msn.c:1735
-#: ../libpurple/protocols/msn/msn.c:1743 ../libpurple/protocols/msn/msn.c:1750
+#: ../libpurple/protocols/msn/msn.c:1758 ../libpurple/protocols/msn/msn.c:1878
+#: ../libpurple/protocols/msn/msn.c:1884 ../libpurple/protocols/msn/msn.c:1891
+#: ../libpurple/protocols/msn/msn.c:1899 ../libpurple/protocols/msn/msn.c:1906
+#: ../libpurple/protocols/msnp9/msn.c:1614
+#: ../libpurple/protocols/msnp9/msn.c:1734
+#: ../libpurple/protocols/msnp9/msn.c:1740
+#: ../libpurple/protocols/msnp9/msn.c:1747
+#: ../libpurple/protocols/msnp9/msn.c:1755
+#: ../libpurple/protocols/msnp9/msn.c:1762
 msgid "A Little About Me"
 msgstr "�溜粒留 了�粒旅留 粒旅留 亮劉僚留"
 
-#: ../libpurple/protocols/msn/msn.c:1619
+#: ../libpurple/protocols/msn/msn.c:1775
+#: ../libpurple/protocols/msnp9/msn.c:1631
 msgid "Social"
 msgstr "�凌旅僚�僚旅虜略"
 
-#: ../libpurple/protocols/msn/msn.c:1621
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1086
+#: ../libpurple/protocols/msn/msn.c:1777
+#: ../libpurple/protocols/msnp9/msn.c:1633
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1092
 msgid "Marital Status"
 msgstr "�旅虜凌粒竜僚竜旅留虜流 虜留�略��留�侶"
 
-#: ../libpurple/protocols/msn/msn.c:1622
+#: ../libpurple/protocols/msn/msn.c:1778
+#: ../libpurple/protocols/msnp9/msn.c:1634
 msgid "Interests"
 msgstr "�僚隆旅留�劉�凌僚�留"
 
-#: ../libpurple/protocols/msn/msn.c:1623
+#: ../libpurple/protocols/msn/msn.c:1779
+#: ../libpurple/protocols/msnp9/msn.c:1635
 msgid "Pets"
 msgstr "�留�凌旅虜溜隆旅留"
 
-#: ../libpurple/protocols/msn/msn.c:1624
+#: ../libpurple/protocols/msn/msn.c:1780
+#: ../libpurple/protocols/msnp9/msn.c:1636
 msgid "Hometown"
 msgstr "�留�留粒�粒流"
 
-#: ../libpurple/protocols/msn/msn.c:1625
+#: ../libpurple/protocols/msn/msn.c:1781
+#: ../libpurple/protocols/msnp9/msn.c:1637
 msgid "Places Lived"
 msgstr "�劉�侶 ��凌� 劉�� 龍流�竜旅"
 
-#: ../libpurple/protocols/msn/msn.c:1626
+#: ../libpurple/protocols/msn/msn.c:1782
+#: ../libpurple/protocols/msnp9/msn.c:1638
 msgid "Fashion"
 msgstr "��隆留"
 
-#: ../libpurple/protocols/msn/msn.c:1627
+#: ../libpurple/protocols/msn/msn.c:1783
+#: ../libpurple/protocols/msnp9/msn.c:1639
 msgid "Humor"
 msgstr "律旅凌�亮凌�"
 
-#: ../libpurple/protocols/msn/msn.c:1628
+#: ../libpurple/protocols/msn/msn.c:1784
+#: ../libpurple/protocols/msnp9/msn.c:1640
 msgid "Music"
 msgstr "�凌��旅虜流"
 
-#: ../libpurple/protocols/msn/msn.c:1629 ../libpurple/protocols/msn/msn.c:1810
-#: ../libpurple/protocols/msn/msn.c:1816
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1138
+#: ../libpurple/protocols/msn/msn.c:1785 ../libpurple/protocols/msn/msn.c:1966
+#: ../libpurple/protocols/msn/msn.c:1972
+#: ../libpurple/protocols/msnp9/msn.c:1641
+#: ../libpurple/protocols/msnp9/msn.c:1822
+#: ../libpurple/protocols/msnp9/msn.c:1828
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1144
 msgid "Favorite Quote"
 msgstr "�粒留�侶亮劉僚凌 �侶��"
 
-#: ../libpurple/protocols/msn/msn.c:1646
+#: ../libpurple/protocols/msn/msn.c:1802
+#: ../libpurple/protocols/msnp9/msn.c:1658
 msgid "Contact Info"
 msgstr "�了侶�凌�凌�溜竜� 竜�旅虜凌旅僚�僚溜留�"
 
-#: ../libpurple/protocols/msn/msn.c:1647
+#: ../libpurple/protocols/msn/msn.c:1803
+#: ../libpurple/protocols/msnp9/msn.c:1659
 msgid "Personal"
 msgstr "��凌���旅虜略"
 
-#: ../libpurple/protocols/msn/msn.c:1650
+#: ../libpurple/protocols/msn/msn.c:1806
+#: ../libpurple/protocols/msnp9/msn.c:1662
 msgid "Significant Other"
 msgstr "�了了留 �侶亮留僚�旅虜略"
 
-#: ../libpurple/protocols/msn/msn.c:1651
+#: ../libpurple/protocols/msn/msn.c:1807
+#: ../libpurple/protocols/msnp9/msn.c:1663
 msgid "Home Phone"
 msgstr "里侶了劉��僚凌 凌旅虜溜留�"
 
-#: ../libpurple/protocols/msn/msn.c:1652
+#: ../libpurple/protocols/msn/msn.c:1808
+#: ../libpurple/protocols/msnp9/msn.c:1664
 msgid "Home Phone 2"
 msgstr "里侶了劉��僚凌 凌旅虜溜留� 2"
 
-#: ../libpurple/protocols/msn/msn.c:1653
-#: ../libpurple/protocols/oscar/oscar.c:3793
+#: ../libpurple/protocols/msn/msn.c:1809
+#: ../libpurple/protocols/msnp9/msn.c:1665
+#: ../libpurple/protocols/oscar/oscar.c:3826
 msgid "Home Address"
 msgstr "�旅竜�慮�僚�侶 凌旅虜溜留�"
 
-#: ../libpurple/protocols/msn/msn.c:1654
+#: ../libpurple/protocols/msn/msn.c:1810
+#: ../libpurple/protocols/msnp9/msn.c:1666
 msgid "Personal Mobile"
 msgstr "��凌���旅虜� 虜旅僚侶��"
 
-#: ../libpurple/protocols/msn/msn.c:1655
+#: ../libpurple/protocols/msn/msn.c:1811
+#: ../libpurple/protocols/msnp9/msn.c:1667
 msgid "Home Fax"
 msgstr "Fax 凌旅虜溜留�"
 
-#: ../libpurple/protocols/msn/msn.c:1656
+#: ../libpurple/protocols/msn/msn.c:1812
+#: ../libpurple/protocols/msnp9/msn.c:1668
 msgid "Personal E-Mail"
 msgstr "��凌���旅虜� E-Mail"
 
-#: ../libpurple/protocols/msn/msn.c:1657
+#: ../libpurple/protocols/msn/msn.c:1813
+#: ../libpurple/protocols/msnp9/msn.c:1669
 msgid "Personal IM"
 msgstr "��凌���旅虜� IM"
 
-#: ../libpurple/protocols/msn/msn.c:1659
+#: ../libpurple/protocols/msn/msn.c:1815
+#: ../libpurple/protocols/msnp9/msn.c:1671
 msgid "Anniversary"
 msgstr "�竜僚劉慮了旅留"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1675
+#: ../libpurple/protocols/msn/msn.c:1831
+#: ../libpurple/protocols/msnp9/msn.c:1687
 msgid "Work"
 msgstr "��粒留�溜留"
 
-#: ../libpurple/protocols/msn/msn.c:1677
+#: ../libpurple/protocols/msn/msn.c:1833
+#: ../libpurple/protocols/msnp9/msn.c:1689
 #: ../libpurple/protocols/silc/ops.c:1010
 #: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "里溜�了凌� 竜�粒留�溜留�"
 
-#: ../libpurple/protocols/msn/msn.c:1678
-#: ../libpurple/protocols/oscar/oscar.c:3814
+#: ../libpurple/protocols/msn/msn.c:1834
+#: ../libpurple/protocols/msnp9/msn.c:1690
+#: ../libpurple/protocols/oscar/oscar.c:3847
 msgid "Company"
 msgstr "��留旅�溜留"
 
-#: ../libpurple/protocols/msn/msn.c:1679
-#: ../libpurple/protocols/novell/novell.c:1480
+#: ../libpurple/protocols/msn/msn.c:1835
+#: ../libpurple/protocols/msnp9/msn.c:1691
+#: ../libpurple/protocols/novell/novell.c:1489
 msgid "Department"
 msgstr "里亮流亮留"
 
-#: ../libpurple/protocols/msn/msn.c:1680
+#: ../libpurple/protocols/msn/msn.c:1836
+#: ../libpurple/protocols/msnp9/msn.c:1692
 msgid "Profession"
 msgstr "��略粒粒竜了亮留"
 
-#: ../libpurple/protocols/msn/msn.c:1681
+#: ../libpurple/protocols/msn/msn.c:1837
+#: ../libpurple/protocols/msnp9/msn.c:1693
 msgid "Work Phone"
 msgstr "里侶了劉��僚凌 竜�粒留�溜留�"
 
-#: ../libpurple/protocols/msn/msn.c:1682
+#: ../libpurple/protocols/msn/msn.c:1838
+#: ../libpurple/protocols/msnp9/msn.c:1694
 msgid "Work Phone 2"
 msgstr "里侶了劉��僚凌 竜�粒留�溜留� 2"
 
-#: ../libpurple/protocols/msn/msn.c:1683
-#: ../libpurple/protocols/oscar/oscar.c:3806
+#: ../libpurple/protocols/msn/msn.c:1839
+#: ../libpurple/protocols/msnp9/msn.c:1695
+#: ../libpurple/protocols/oscar/oscar.c:3839
 msgid "Work Address"
 msgstr "�旅竜�慮�僚�侶 竜�粒留�溜留�"
 
-#: ../libpurple/protocols/msn/msn.c:1684
+#: ../libpurple/protocols/msn/msn.c:1840
+#: ../libpurple/protocols/msnp9/msn.c:1696
 msgid "Work Mobile"
 msgstr "�旅僚侶�� 竜�粒留�溜留�"
 
-#: ../libpurple/protocols/msn/msn.c:1685
+#: ../libpurple/protocols/msn/msn.c:1841
+#: ../libpurple/protocols/msnp9/msn.c:1697
 msgid "Work Pager"
 msgstr "�凌亮硫侶�流� 竜�粒留�溜留�"
 
-#: ../libpurple/protocols/msn/msn.c:1686
+#: ../libpurple/protocols/msn/msn.c:1842
+#: ../libpurple/protocols/msnp9/msn.c:1698
 msgid "Work Fax"
 msgstr "Fax 竜�粒留�溜留�"
 
-#: ../libpurple/protocols/msn/msn.c:1687
+#: ../libpurple/protocols/msn/msn.c:1843
+#: ../libpurple/protocols/msnp9/msn.c:1699
 msgid "Work E-Mail"
 msgstr "E-mail 竜�粒留�溜留�"
 
-#: ../libpurple/protocols/msn/msn.c:1688
+#: ../libpurple/protocols/msn/msn.c:1844
+#: ../libpurple/protocols/msnp9/msn.c:1700
 msgid "Work IM"
 msgstr "IM 竜�粒留�溜留�"
 
-#: ../libpurple/protocols/msn/msn.c:1689
+#: ../libpurple/protocols/msn/msn.c:1845
+#: ../libpurple/protocols/msnp9/msn.c:1701
 msgid "Start Date"
 msgstr "�亮竜�凌亮侶僚溜留 劉僚留�両侶�"
 
-#: ../libpurple/protocols/msn/msn.c:1759 ../libpurple/protocols/msn/msn.c:1765
-#: ../libpurple/protocols/msn/msn.c:1772 ../libpurple/protocols/msn/msn.c:1779
+#: ../libpurple/protocols/msn/msn.c:1915 ../libpurple/protocols/msn/msn.c:1921
+#: ../libpurple/protocols/msn/msn.c:1928 ../libpurple/protocols/msn/msn.c:1935
+#: ../libpurple/protocols/msnp9/msn.c:1771
+#: ../libpurple/protocols/msnp9/msn.c:1777
+#: ../libpurple/protocols/msnp9/msn.c:1784
+#: ../libpurple/protocols/msnp9/msn.c:1791
 msgid "Favorite Things"
 msgstr "�粒留�侶亮劉僚留 ��略粒亮留�留"
 
-#: ../libpurple/protocols/msn/msn.c:1824
+#: ../libpurple/protocols/msn/msn.c:1980
+#: ../libpurple/protocols/msnp9/msn.c:1836
 msgid "Last Updated"
 msgstr "里竜了竜��留溜留 竜僚侶亮劉���侶"
 
-#: ../libpurple/protocols/msn/msn.c:1835
+#: ../libpurple/protocols/msn/msn.c:1991
+#: ../libpurple/protocols/msnp9/msn.c:1847
 #: ../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:1859
+#: ../libpurple/protocols/msn/msn.c:2015
+#: ../libpurple/protocols/msnp9/msn.c:1871
 msgid "The user has not created a public profile."
 msgstr "� ��流��侶� 隆竜僚 劉�竜旅 隆侶亮旅凌��粒流�竜旅 隆侶亮��旅凌 ��凌�溜了."
 
-#: ../libpurple/protocols/msn/msn.c:1860
+#: ../libpurple/protocols/msn/msn.c:2016
+#: ../libpurple/protocols/msnp9/msn.c:1872
 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 "
@@ -7058,7 +7345,8 @@
 "�侶亮留溜僚竜旅 ��旅 竜溜�竜 凌 ��流��侶� 隆竜僚 ��略��竜旅, 流 ��旅 ��略��竜旅 留了了略 隆竜僚 劉�竜旅 "
 "隆侶亮旅凌��粒流�竜旅 劉僚留 隆侶亮��旅凌 ��凌�溜了."
 
-#: ../libpurple/protocols/msn/msn.c:1864
+#: ../libpurple/protocols/msn/msn.c:2020
+#: ../libpurple/protocols/msnp9/msn.c:1876
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
@@ -7066,8 +7354,9 @@
 "�隆�僚留亮溜留 竜��竜�侶� �了侶�凌�凌�旅�僚 ��凌 ��凌�溜了 �凌� ��流��侶. � ��流��侶� 亮略了了凌僚 隆竜僚 "
 "��略��竜旅."
 
-#: ../libpurple/protocols/msn/msn.c:1872
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1240
+#: ../libpurple/protocols/msn/msn.c:2028
+#: ../libpurple/protocols/msnp9/msn.c:1884
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1246
 msgid "Profile URL"
 msgstr "URL ��凌�溜了"
 
@@ -7081,101 +7370,128 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2158 ../libpurple/protocols/msn/msn.c:2160
-msgid "MSN Protocol Plugin"
-msgstr "����慮竜�凌 ����凌虜�了了凌� MSN"
-
-#: ../libpurple/protocols/msn/msn.c:2194
+#: ../libpurple/protocols/msn/msn.c:2315 ../libpurple/protocols/msn/msn.c:2317
+msgid "Windows Live Messenger Protocol Plugin"
+msgstr "����慮竜�凌 ����凌虜�了了凌� Windows Live Messenger"
+
+#: ../libpurple/protocols/msn/msn.c:2352
+#: ../libpurple/protocols/msnp9/msn.c:2206
 msgid "Use HTTP Method"
 msgstr "律�流�侶 亮竜慮�隆凌� HTTP"
 
-#: ../libpurple/protocols/msn/msn.c:2199
-#, fuzzy
+#: ../libpurple/protocols/msn/msn.c:2357
+#: ../libpurple/protocols/msnp9/msn.c:2211
 msgid "HTTP Method Server"
-msgstr "�凌虜旅亮流 竜両��侶�竜�侶�流 IPC"
-
-#: ../libpurple/protocols/msn/msn.c:2204
+msgstr "�劉慮凌隆凌� 竜両��侶�竜�侶�流 HTTP"
+
+#: ../libpurple/protocols/msn/msn.c:2362
+#: ../libpurple/protocols/msnp9/msn.c:2216
 msgid "Show custom smileys"
 msgstr "�亮�略僚旅�侶 ��凌�留�亮凌�亮劉僚�僚 smileys"
 
-#: ../libpurple/protocols/msn/msn.c:2212
+#: ../libpurple/protocols/msn/msn.c:2370
+#: ../libpurple/protocols/msnp9/msn.c:2224
 msgid "nudge: nudge a user to get their attention"
 msgstr ""
 
-#: ../libpurple/protocols/msn/nexus.c:146
-#: ../libpurple/protocols/msn/servconn.c:135
-#: ../libpurple/protocols/qq/qq_proxy.c:242
-#: ../libpurple/protocols/qq/qq_proxy.c:321
-#: ../libpurple/protocols/qq/qq_proxy.c:366
-#: ../libpurple/protocols/qq/qq_proxy.c:399
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:63
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:163
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:187
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:200
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:229
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:243
-#: ../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:1416
-#: ../libpurple/protocols/yahoo/yahoochat.c:1442
-msgid "Unable to connect"
-msgstr "�隆�僚留亮溜留 ��僚隆竜�侶�"
-
-#: ../libpurple/protocols/msn/notification.c:178
+#: ../libpurple/protocols/msn/nexus.c:70
+msgid "Windows Live ID authentication:Unable to connect"
+msgstr "�粒虜�旅�侶 Windows Live ID:�隆�僚留亮溜留 ��僚隆竜�侶�"
+
+#. we must have failed!
+#: ../libpurple/protocols/msn/nexus.c:126
+msgid ""
+"Windows Live ID authentication: cannot find authenticate token in server "
+"response"
+msgstr ""
+
+#: ../libpurple/protocols/msn/nexus.c:172
+msgid "Windows Live ID authentication Failed"
+msgstr "� 劉粒虜�旅�侶 �凌� Windows Live ID 留�劉���竜"
+
+#: ../libpurple/protocols/msn/notification.c:185
+#: ../libpurple/protocols/msnp9/notification.c:178
 #, c-format
 msgid "%s is not a valid group."
 msgstr "%s 隆竜僚 竜溜僚留旅 劉粒虜��侶 凌亮略隆留."
 
-#: ../libpurple/protocols/msn/notification.c:184
-#: ../libpurple/protocols/msn/notification.c:532
-#: ../libpurple/protocols/msn/session.c:330
+#: ../libpurple/protocols/msn/notification.c:191
+#: ../libpurple/protocols/msn/notification.c:931
+#: ../libpurple/protocols/msn/session.c:387
+#: ../libpurple/protocols/msnp9/notification.c:184
+#: ../libpurple/protocols/msnp9/notification.c:534
+#: ../libpurple/protocols/msnp9/session.c:339
 msgid "Unknown error."
 msgstr "�粒僚���凌 ��略了亮留."
 
-#: ../libpurple/protocols/msn/notification.c:187
+#: ../libpurple/protocols/msn/notification.c:194
+#: ../libpurple/protocols/msnp9/notification.c:187
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%s �竜 %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:498
+#: ../libpurple/protocols/msn/notification.c:509
+#, c-format
+msgid "%s just sent you a Nudge!"
+msgstr ""
+
+#: ../libpurple/protocols/msn/notification.c:836
+#, c-format
+msgid "Unknown error (%d)"
+msgstr "�粒僚���凌 ��略了亮留 (%d)"
+
+#: ../libpurple/protocols/msn/notification.c:837
+#: ../libpurple/protocols/sametime/sametime.c:4479
+msgid "Unable to add user"
+msgstr "�隆�僚留亮溜留 ��凌�慮流虜侶� ��流��侶"
+
+#: ../libpurple/protocols/msn/notification.c:897
+#: ../libpurple/protocols/msnp9/notification.c:500
 #, c-format
 msgid "Unable to add user on %s (%s)"
 msgstr "�隆�僚留亮溜留 ��凌�慮流虜侶� ��流��侶 �竜 %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:502
+#: ../libpurple/protocols/msn/notification.c:901
+#: ../libpurple/protocols/msnp9/notification.c:504
 #, c-format
 msgid "Unable to block user on %s (%s)"
 msgstr "�隆�僚留亮溜留 留�凌虜了竜旅�亮凌� ��流��侶 �竜 %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:506
+#: ../libpurple/protocols/msn/notification.c:905
+#: ../libpurple/protocols/msnp9/notification.c:508
 #, c-format
 msgid "Unable to permit user on %s (%s)"
 msgstr "�隆�僚留�凌 僚留 竜�旅��留�竜溜 凌 ��流��侶� �竜 %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:514
+#: ../libpurple/protocols/msn/notification.c:913
+#: ../libpurple/protocols/msnp9/notification.c:516
 #, c-format
 msgid "%s could not be added because your buddy list is full."
 msgstr "%s 隆竜僚 流�留僚 隆�僚留�� 僚留 ��凌��竜慮竜溜 竜�竜旅隆流 侶 了溜��留 �溜了�僚 竜溜僚留旅 �了流�侶�."
 
-#: ../libpurple/protocols/msn/notification.c:523
+#: ../libpurple/protocols/msn/notification.c:922
+#: ../libpurple/protocols/msnp9/notification.c:525
 #, c-format
 msgid "%s is not a valid passport account."
 msgstr "%s 隆竜僚 竜溜僚留旅 劉僚留� 劉粒虜��凌� 了凌粒留�旅留�亮�� 隆旅留硫留�侶�溜凌�."
 
-#: ../libpurple/protocols/msn/notification.c:528
+#: ../libpurple/protocols/msn/notification.c:927
+#: ../libpurple/protocols/msnp9/notification.c:530
 msgid "Service Temporarily Unavailable."
 msgstr "離�侶�竜�溜留 ��凌���旅僚略 亮侶 隆旅留慮劉�旅亮侶."
 
-#: ../libpurple/protocols/msn/notification.c:851
+#: ../libpurple/protocols/msn/notification.c:1276
+#: ../libpurple/protocols/msnp9/notification.c:898
 msgid "Unable to rename group"
 msgstr "�隆�僚留亮溜留 亮竜�凌僚凌亮留�溜留� 凌亮略隆留�"
 
-#: ../libpurple/protocols/msn/notification.c:906
+#: ../libpurple/protocols/msn/notification.c:1331
+#: ../libpurple/protocols/msnp9/notification.c:953
 msgid "Unable to delete group"
 msgstr "�隆�僚留亮溜留 隆旅留粒�留�流� 凌亮略隆留�"
 
-#: ../libpurple/protocols/msn/notification.c:1325
+#: ../libpurple/protocols/msn/notification.c:1945
+#: ../libpurple/protocols/msnp9/notification.c:1372
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -7204,15 +7520,40 @@
 "\n"
 "�竜�略 �侶僚 凌了凌虜了流���侶 �侶� ��僚�流�侶�侶� 慮留 亮�凌�竜溜�竜 僚留 ��僚隆竜慮竜溜�竜 竜�旅�����."
 
+#: ../libpurple/protocols/msn/servconn.c:135
+#: ../libpurple/protocols/msnp9/nexus.c:146
+#: ../libpurple/protocols/msnp9/servconn.c:133
+#: ../libpurple/protocols/qq/qq_proxy.c:242
+#: ../libpurple/protocols/qq/qq_proxy.c:324
+#: ../libpurple/protocols/qq/qq_proxy.c:369
+#: ../libpurple/protocols/qq/qq_proxy.c:402
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:64
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:167
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:191
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:204
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:233
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:247
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:272
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:307
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:338
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1564
+#: ../libpurple/protocols/yahoo/yahoochat.c:1425
+#: ../libpurple/protocols/yahoo/yahoochat.c:1451
+msgid "Unable to connect"
+msgstr "�隆�僚留亮溜留 ��僚隆竜�侶�"
+
 #: ../libpurple/protocols/msn/servconn.c:137
+#: ../libpurple/protocols/msnp9/servconn.c:135
 msgid "Writing error"
 msgstr "裡�略了亮留 竜粒粒�留�流�"
 
 #: ../libpurple/protocols/msn/servconn.c:139
+#: ../libpurple/protocols/msnp9/servconn.c:137
 msgid "Reading error"
 msgstr "裡�略了亮留 留僚略粒僚��侶�"
 
 #: ../libpurple/protocols/msn/servconn.c:146
+#: ../libpurple/protocols/msnp9/servconn.c:144
 #, c-format
 msgid ""
 "Connection error from %s server:\n"
@@ -7221,137 +7562,185 @@
 "裡�略了亮留 ��僚隆竜�侶� 留�� %s 隆旅留虜凌亮旅��流:\n"
 "%s"
 
-#: ../libpurple/protocols/msn/session.c:299
+#: ../libpurple/protocols/msn/session.c:349
+#: ../libpurple/protocols/msnp9/session.c:301
 msgid "Our protocol is not supported by the server."
 msgstr "里凌 �����虜凌了了� 亮留� 隆竜僚 ��凌��侶�溜龍竜�留旅 留�� �凌僚 竜両��侶�竜�侶�流."
 
-#: ../libpurple/protocols/msn/session.c:303
+#: ../libpurple/protocols/msn/session.c:354
+#: ../libpurple/protocols/msnp9/session.c:306
 msgid "Error parsing HTTP."
 msgstr "裡�略了亮留 留僚略了��侶� HTTP."
 
-#: ../libpurple/protocols/msn/session.c:307
-#: ../libpurple/protocols/oscar/flap_connection.c:384
-#: ../libpurple/protocols/yahoo/yahoo.c:205
+#: ../libpurple/protocols/msn/session.c:358
+#: ../libpurple/protocols/msnp9/session.c:310
+#: ../libpurple/protocols/oscar/flap_connection.c:387
+#: ../libpurple/protocols/yahoo/yahoo.c:155
 msgid "You have signed on from another location."
 msgstr "��竜�竜 ��僚隆竜慮竜溜 留�� 略了了侶 �凌�凌慮竜�溜留."
 
-#: ../libpurple/protocols/msn/session.c:310
+#: ../libpurple/protocols/msn/session.c:364
+#: ../libpurple/protocols/msnp9/session.c:316
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "�旅 竜両��侶�竜�侶�劉� �凌� MSN 竜溜僚留旅 ��凌���旅僚略 亮侶 隆旅留慮劉�旅亮凌旅. �留�留虜留了凌�亮竜 "
 "�竜�旅亮劉僚竜�竜 虜留旅 両留僚留隆凌虜旅亮略��竜."
 
-#: ../libpurple/protocols/msn/session.c:315
+#: ../libpurple/protocols/msn/session.c:370
+#: ../libpurple/protocols/msnp9/session.c:322
 msgid "The MSN servers are going down temporarily."
 msgstr "�旅 竜両��侶�竜�侶�劉� �凌� MSN 虜了竜溜僚凌�僚 ��凌���旅僚略."
 
-#: ../libpurple/protocols/msn/session.c:320
+#: ../libpurple/protocols/msn/session.c:375
+#: ../libpurple/protocols/msnp9/session.c:327
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "�隆�僚留亮溜留 劉粒虜�旅�侶�: %s"
 
-#: ../libpurple/protocols/msn/session.c:325
-msgid ""
-"Your MSN buddy list is temporarily unavailable. Please wait and try again."
+#: ../libpurple/protocols/msn/session.c:381
+#: ../libpurple/protocols/msnp9/session.c:333
+msgid "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 "� 了溜��留 �溜了�僚 �留� �凌� MSN 竜溜僚留旅 ��凌���旅僚略 亮侶 隆旅留慮劉�旅亮侶. �留�留虜留了凌�亮竜 "
 "�竜�旅亮劉僚竜�竜 虜留旅 両留僚留��凌��留慮流��竜."
 
-#: ../libpurple/protocols/msn/session.c:346
-#: ../libpurple/protocols/msn/session.c:348
+#: ../libpurple/protocols/msn/session.c:403
+#: ../libpurple/protocols/msn/session.c:405
+#: ../libpurple/protocols/msnp9/session.c:355
+#: ../libpurple/protocols/msnp9/session.c:357
 msgid "Handshaking"
 msgstr "�溜僚竜�留旅 �竜旅�留�溜留"
 
-#: ../libpurple/protocols/msn/session.c:349
+#: ../libpurple/protocols/msn/session.c:406
+#: ../libpurple/protocols/msnp9/session.c:358
 msgid "Starting authentication"
 msgstr "�僚留�両侶 劉粒虜�旅�侶�"
 
-#: ../libpurple/protocols/msn/session.c:350
+#: ../libpurple/protocols/msn/session.c:407
+#: ../libpurple/protocols/msnp9/session.c:359
 msgid "Getting cookie"
 msgstr "�流�侶 cookie"
 
-#: ../libpurple/protocols/msn/session.c:352
+#: ../libpurple/protocols/msn/session.c:409
+#: ../libpurple/protocols/msnp9/session.c:361
 msgid "Sending cookie"
 msgstr "��凌��凌了流 cookie"
 
-#: ../libpurple/protocols/msn/session.c:353
+#: ../libpurple/protocols/msn/session.c:410
+#: ../libpurple/protocols/msnp9/session.c:362
 msgid "Retrieving buddy list"
 msgstr "�流�侶 了溜��留� �溜了�僚"
 
 #: ../libpurple/protocols/msn/state.c:34
+#: ../libpurple/protocols/msnp9/state.c:34
 msgid "Away From Computer"
 msgstr "�留虜�旅略 留�� �凌僚 ��凌了凌粒旅��流"
 
 #: ../libpurple/protocols/msn/state.c:35
+#: ../libpurple/protocols/msnp9/state.c:35
 msgid "On The Phone"
 msgstr "裡�凌 �侶了劉��僚凌"
 
 #: ../libpurple/protocols/msn/state.c:36
+#: ../libpurple/protocols/msnp9/state.c:36
 msgid "Out To Lunch"
 msgstr "�溜亮留旅 粒旅留 �留粒侶��"
 
-#: ../libpurple/protocols/msn/switchboard.c:400
+#: ../libpurple/protocols/msn/switchboard.c:406
+#: ../libpurple/protocols/msnp9/switchboard.c:408
 msgid "Message may have not been sent because a timeout occurred:"
 msgstr "里凌 亮流僚�亮留 �旅慮留僚� 僚留 亮侶 ��略了慮侶虜竜 了�粒� �凌� �劉了凌�� �凌� ��凌僚旅虜凌� 凌�溜凌�:"
 
-#: ../libpurple/protocols/msn/switchboard.c:408
+#: ../libpurple/protocols/msn/switchboard.c:414
+#: ../libpurple/protocols/msnp9/switchboard.c:416
 msgid "Message could not be sent, not allowed while invisible:"
-msgstr ""
-"里凌 亮流僚�亮留 隆竜僚 流�留僚 隆�僚留�� 僚留 ��留了竜溜, 隆竜僚 竜�旅��劉�竜�留旅 ��留僚 竜溜��竜 留��留�凌�:"
-
-#: ../libpurple/protocols/msn/switchboard.c:412
+msgstr "里凌 亮流僚�亮留 隆竜僚 流�留僚 隆�僚留�� 僚留 ��留了竜溜, 隆竜僚 竜�旅��劉�竜�留旅 ��留僚 竜溜��竜 留��留�凌�:"
+
+#: ../libpurple/protocols/msn/switchboard.c:418
+#: ../libpurple/protocols/msnp9/switchboard.c:420
 msgid "Message could not be sent because the user is offline:"
-msgstr ""
-"里凌 亮流僚�亮留 隆竜僚 流�留僚 隆�僚留�� 僚留 ��留了竜溜 竜�竜旅隆流 凌 ��流��侶� 隆竜僚 竜溜僚留旅 ��僚隆竜隆竜亮劉僚凌�:"
-
-#: ../libpurple/protocols/msn/switchboard.c:416
+msgstr "里凌 亮流僚�亮留 隆竜僚 流�留僚 隆�僚留�� 僚留 ��留了竜溜 竜�竜旅隆流 凌 ��流��侶� 隆竜僚 竜溜僚留旅 ��僚隆竜隆竜亮劉僚凌�:"
+
+#: ../libpurple/protocols/msn/switchboard.c:422
+#: ../libpurple/protocols/msnp9/switchboard.c:424
 msgid "Message could not be sent because a connection error occurred:"
 msgstr "里凌 亮流僚�亮留 隆竜僚 流�留僚 隆�僚留�� 僚留 ��留了竜溜 竜�竜旅隆流 ��僚劉硫侶 劉僚留 ��略了亮留 ��僚隆竜�侶�:"
 
-#: ../libpurple/protocols/msn/switchboard.c:420
+#: ../libpurple/protocols/msn/switchboard.c:426
+#: ../libpurple/protocols/msnp9/switchboard.c:428
 msgid "Message could not be sent because we are sending too quickly:"
 msgstr "里凌 亮流僚�亮留 隆竜僚 流�留僚 隆�僚留�� 僚留 ��留了竜溜 竜�竜旅隆流 ��劉了僚凌�亮竜 �凌了� 粒�流粒凌�留:"
 
-#: ../libpurple/protocols/msn/switchboard.c:424
+#: ../libpurple/protocols/msn/switchboard.c:430
+#: ../libpurple/protocols/msnp9/switchboard.c:432
 msgid ""
 "Message could not be sent because we were unable to establish a session with "
 "the server. This is likely a server problem, try again in a few minutes:"
 msgstr ""
-
-#: ../libpurple/protocols/msn/switchboard.c:431
-msgid ""
-"Message could not be sent because an error with the switchboard occurred:"
+"里凌 亮流僚�亮留 隆竜僚 亮�凌�凌��竜 僚留 ��留了竜溜 竜�竜旅隆流 隆竜僚 流�留僚 隆�僚留�流 侶 隆侶亮旅凌��粒溜留 "
+"��僚竜隆�溜留� 亮竜 �凌僚 竜両��侶�竜�侶�流. ���� 竜溜僚留旅 亮略了了凌僚 ���硫了侶亮留 �凌� 竜両��侶�竜�侶�流, "
+"��凌��留慮流��竜 両留僚略 �竜 了溜粒留 了竜��略:"
+
+#: ../libpurple/protocols/msn/switchboard.c:437
+#: ../libpurple/protocols/msnp9/switchboard.c:439
+msgid "Message could not be sent because an error with the switchboard occurred:"
 msgstr ""
 "里凌 亮流僚�亮留 隆竜僚 亮�凌�凌��竜 僚留 留�凌��留了竜溜 竜�竜旅隆流 ��僚劉硫侶 劉僚留 ��略了亮留 亮竜 �凌 虜劉僚��凌 "
 "亮侶僚�亮略��僚:"
 
-#: ../libpurple/protocols/msn/switchboard.c:439
+#: ../libpurple/protocols/msn/switchboard.c:445
+#: ../libpurple/protocols/msnp9/switchboard.c:447
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "里凌 亮流僚�亮留 �旅慮留僚� 僚留 亮侶 ��略了慮侶虜竜 竜�竜旅隆流 ��僚劉硫侶 劉僚留 略粒僚���凌 ��略了亮留:"
 
-#: ../libpurple/protocols/msn/userlist.c:252
+#: ../libpurple/protocols/msn/userlist.c:243
+#: ../libpurple/protocols/msnp9/userlist.c:262
 #, c-format
 msgid "%s has added you to his or her buddy list."
 msgstr "%s �留� ��凌�劉慮竜�竜 ��侶 了溜��留 �溜了�僚 �凌�."
 
-#: ../libpurple/protocols/msn/userlist.c:321
+#: ../libpurple/protocols/msn/userlist.c:312
+#: ../libpurple/protocols/msnp9/userlist.c:331
 #, c-format
 msgid "%s has removed you from his or her buddy list."
 msgstr "%s �留� 留�留溜�竜�竜 留�� �侶 了溜��留 �溜了�僚 �凌�."
 
-#: ../libpurple/protocols/msn/userlist.c:643
+#. only notify the user about problems adding to the friends list
+#. * maybe we should do something else for other lists, but it probably
+#. * won't cause too many problems if we just ignore it
+#: ../libpurple/protocols/msn/userlist.c:693
+#: ../libpurple/protocols/msnp9/userlist.c:653
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "�隆�僚留亮溜留 ��凌�慮流虜侶� �凌� \"%s\"."
 
-#: ../libpurple/protocols/msn/userlist.c:645
+#: ../libpurple/protocols/msn/userlist.c:696
+#: ../libpurple/protocols/msnp9/userlist.c:655
 msgid "The screen name specified is invalid."
 msgstr "里凌 竜亮�留僚旅龍�亮竜僚凌 �僚凌亮留 �凌� 隆�慮侶虜竜 隆竜僚 竜溜僚留旅 劉粒虜��凌."
 
+#: ../libpurple/protocols/msnp9/msn.c:546
+msgid "Has you"
+msgstr "裡留� 劉�竜旅"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libpurple/protocols/msnp9/msn.c:2170
+#: ../libpurple/protocols/msnp9/msn.c:2172
+msgid "MSN Protocol Plugin"
+msgstr "����慮竜�凌 ����凌虜�了了凌� MSN"
+
 #: ../libpurple/protocols/myspace/myspace.c:111
-#, fuzzy
 msgid "Missing Cipher"
-msgstr "�����凌粒�略�侶�侶"
+msgstr ""
 
 #: ../libpurple/protocols/myspace/myspace.c:112
 msgid "The RC4 cipher could not be found"
@@ -7362,402 +7751,441 @@
 "Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
 "not be loaded."
 msgstr ""
-
-#: ../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 ""
-
-#. Notify an error message also, because this is important!
-#: ../libpurple/protocols/myspace/myspace.c:292
-#: ../libpurple/protocols/myspace/myspace.c:1801
-msgid "MySpaceIM Error"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:349
-#, fuzzy
+"�僚留硫略慮亮旅�侶 �竜 libpurple 亮竜 ��凌��流�旅両侶 RC4 (>= 2.0.1). 里凌 ����慮竜�凌 MySpaceIM "
+"隆竜 慮留 �凌���慮竜溜."
+
+#: ../libpurple/protocols/myspace/myspace.c:345
 msgid "Reading challenge"
-msgstr "裡�略了亮留 留僚略粒僚��侶�"
-
-#: ../libpurple/protocols/myspace/myspace.c:355
-#, fuzzy
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:353
 msgid "Unexpected challenge length from server"
-msgstr "�侶 劉粒虜��侶 ���虜了侶�侶 留�� �凌僚 竜両��侶�竜�侶�流"
-
-#: ../libpurple/protocols/myspace/myspace.c:359
-#, fuzzy
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:357
 msgid "Logging in"
-msgstr "�留�留粒�留�流"
-
-#: ../libpurple/protocols/myspace/myspace.c:1286
+msgstr "�溜僚竜�留旅 竜溜�凌隆凌�"
+
+#: ../libpurple/protocols/myspace/myspace.c:1322
 #, 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:1328
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:1365
 msgid "New mail messages"
-msgstr "��凌��凌了流 亮侶僚�亮留�凌�"
-
-#: ../libpurple/protocols/myspace/myspace.c:1329
+msgstr "�劉留 留了了侶了凌粒�留�溜留"
+
+#: ../libpurple/protocols/myspace/myspace.c:1366
 msgid "New blog comments"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:1330
+msgstr "�劉留 ���了旅留 blog"
+
+#: ../libpurple/protocols/myspace/myspace.c:1367
 msgid "New profile comments"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:1331
+msgstr "�劉留 ���了旅留 ��凌�溜了"
+
+#: ../libpurple/protocols/myspace/myspace.c:1368
 msgid "New friend requests!"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:1332
+msgstr "�劉竜� 留旅�流�竜旅� �溜了�僚!"
+
+#: ../libpurple/protocols/myspace/myspace.c:1369
 msgid "New picture comments"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:1360
+msgstr "�劉留 ���了旅留 竜旅虜�僚�僚"
+
+#: ../libpurple/protocols/myspace/myspace.c:1399
 msgid "MySpace"
-msgstr ""
+msgstr "MySpace"
+
+#: ../libpurple/protocols/myspace/myspace.c:1585
+msgid "MySpaceIM - No Username Set"
+msgstr "MySpaceIM - �竜僚 凌�溜��侶虜竜 �僚凌亮留 ��流��侶"
+
+#: ../libpurple/protocols/myspace/myspace.c:1586
+msgid "You appear to have no MySpace username."
+msgstr "陸留溜僚竜�留旅 ��旅 隆竜僚 劉�竜�竜 �僚凌亮留 ��流��侶 ��凌 MySpace."
+
+#: ../libpurple/protocols/myspace/myspace.c:1587
+msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
+msgstr "�劉了竜�竜 僚留 ��慮亮溜�竜�竜 虜略�凌旅凌 ���留; (裡侶亮竜溜��侶: ��� ���痢�� �� �������!)"
 
 #. 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:1543
-#: ../libpurple/protocols/sametime/sametime.c:1544
+#: ../libpurple/protocols/myspace/myspace.c:1611
+#: ../libpurple/protocols/sametime/sametime.c:1546
 msgid "Connected"
 msgstr "裡�僚隆劉慮侶虜竜"
 
-#: ../libpurple/protocols/myspace/myspace.c:1554
-#: ../libpurple/protocols/myspace/myspace.c:1556
-#, fuzzy
-msgid "No username set"
-msgstr "律��溜� �僚凌亮留"
-
-#: ../libpurple/protocols/myspace/myspace.c:1555
-msgid ""
-"Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
-"username and choose a username and try to login again."
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:1782
-#, fuzzy, c-format
+#: ../libpurple/protocols/myspace/myspace.c:1846
+#, c-format
 msgid "Protocol error, code %d: %s"
-msgstr "� 隆旅竜�粒留�溜留 竜�劉���竜�竜 �凌僚 虜�隆旅虜留 ��略了亮留�凌� %d"
-
-#: ../libpurple/protocols/myspace/myspace.c:1972
-#: ../libpurple/protocols/myspace/myspace.c:2006
-#, fuzzy
+msgstr "裡�略了亮留 ����凌虜�了了凌�, 虜�隆旅虜留� %d: %s"
+
+#: ../libpurple/protocols/myspace/myspace.c:1868
+#, c-format
+msgid ""
+"%s Your password is %d characters, greater than the expected maximum length "
+"of %d for MySpaceIM. Please shorten your password at http://profileedit."
+"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
+"again."
+msgstr ""
+"%s � 虜�隆旅虜� �留� 竜溜僚留旅 %d �留�留虜�流�竜�, 亮竜粒留了��竜�凌� 留�� �凌 亮劉粒旅��凌 竜�旅��竜��亮竜僚凌 亮流虜凌� "
+"��僚 %d 粒旅留 �凌 MySpaceIM. �留�留虜留了凌�亮竜 亮旅虜��僚竜�竜 �凌僚 虜�隆旅虜� �留� ��凌 http://profileedit."
+"myspace.com/index.cfm?fuseaction=accountSettings.changePassword 虜留旅 隆凌虜旅亮略��竜 "
+"両留僚略."
+
+#: ../libpurple/protocols/myspace/myspace.c:1891
+msgid "MySpaceIM Error"
+msgstr "裡�略了亮留 MySpaceIM"
+
+#: ../libpurple/protocols/myspace/myspace.c:2069
+#: ../libpurple/protocols/myspace/myspace.c:2103
 msgid "Failed to add buddy"
-msgstr "�隆�僚留�侶 侶 ��亮亮竜�凌�流 �凌� �溜了凌� ��侶 ��龍流�侶�侶"
-
-#: ../libpurple/protocols/myspace/myspace.c:1972
-#, fuzzy
+msgstr "�隆�僚留亮溜留 ��凌�慮流虜侶� �溜了凌�"
+
+#: ../libpurple/protocols/myspace/myspace.c:2069
 msgid "'addbuddy' command failed."
-msgstr "陸����亮留 了溜��留� �溜了�僚 留�� 留��竜溜凌..."
-
-#: ../libpurple/protocols/myspace/myspace.c:2006
-#: ../libpurple/protocols/myspace/myspace.c:2247
-#, fuzzy
+msgstr "��凌���溜留 竜僚�凌了流� 'addbuddy'."
+
+#: ../libpurple/protocols/myspace/myspace.c:2103
+#: ../libpurple/protocols/myspace/myspace.c:2348
 msgid "persist command failed"
-msgstr "���凌�溜留 虜劉僚��凌� 亮侶僚�亮略��僚"
-
-#: ../libpurple/protocols/myspace/myspace.c:2115
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:2208
 #, c-format
 msgid "No such user: %s"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:2116
-#, fuzzy
+msgstr "�竜僚 ��略��竜旅 �劉�凌旅凌� ��流��侶�: %s"
+
+#: ../libpurple/protocols/myspace/myspace.c:2210
 msgid "User lookup"
-msgstr "��亮略�旅留 ��侶���僚"
-
-#: ../libpurple/protocols/myspace/myspace.c:2228
-#: ../libpurple/protocols/myspace/myspace.c:2247
-#: ../libpurple/protocols/myspace/myspace.c:2269
-#, fuzzy
+msgstr "���竜�侶 ��流��侶"
+
+#: ../libpurple/protocols/myspace/myspace.c:2329
+#: ../libpurple/protocols/myspace/myspace.c:2348
+#: ../libpurple/protocols/myspace/myspace.c:2370
 msgid "Failed to remove buddy"
-msgstr "�隆�僚留�侶 侶 ��亮亮竜�凌�流 �凌� �溜了凌� ��侶 ��龍流�侶�侶"
-
-#: ../libpurple/protocols/myspace/myspace.c:2228
+msgstr "�隆�僚留亮溜留 留�留溜�竜�侶� �溜了凌�"
+
+#: ../libpurple/protocols/myspace/myspace.c:2329
 msgid "'delbuddy' command failed"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:2269
-#, fuzzy
+msgstr "��凌���溜留 竜僚�凌了流� 'delbuddy'"
+
+#: ../libpurple/protocols/myspace/myspace.c:2370
 msgid "blocklist command failed"
-msgstr "���凌�溜留 虜劉僚��凌� 亮侶僚�亮略��僚"
-
-#: ../libpurple/protocols/myspace/myspace.c:2315
-#, fuzzy
+msgstr "留�凌���溜留 竜僚�凌了流� 了溜��留� 留�凌虜了竜旅�亮凌�"
+
+#: ../libpurple/protocols/myspace/myspace.c:2484
 msgid "Invalid input condition"
-msgstr "�了凌虜了流���侶 ��僚隆竜�侶�"
-
-#. TODO: g_realloc like msn, yahoo, irc, jabber?
-#: ../libpurple/protocols/myspace/myspace.c:2333
-#: ../libpurple/protocols/myspace/myspace.c:2364
-#, fuzzy
-msgid "Read buffer full"
-msgstr "���略 �了流�侶�"
-
-#: ../libpurple/protocols/myspace/myspace.c:2402
-#, fuzzy
+msgstr "了留僚慮留�亮劉僚侶 ��僚慮流虜侶 竜旅��隆凌�"
+
+#: ../libpurple/protocols/myspace/myspace.c:2539
+msgid "Read buffer full (2)"
+msgstr "� 竜僚隆旅略亮竜�侶 亮僚流亮侶 留僚略粒僚��侶� 竜溜僚留旅 粒竜亮略�侶 (2)"
+
+#: ../libpurple/protocols/myspace/myspace.c:2582
 msgid "Unparseable message"
-msgstr "�隆�僚留亮溜留 留僚略了��侶� 亮侶僚�亮留�凌�"
-
-#: ../libpurple/protocols/myspace/myspace.c:2471
-#, fuzzy, c-format
+msgstr "�侶 留僚留了��亮竜僚凌 亮流僚�亮留"
+
+#: ../libpurple/protocols/myspace/myspace.c:2653
+#, c-format
 msgid "Couldn't connect to host: %s (%d)"
-msgstr "�竜僚 流�留僚 隆�僚留�流 侶 ��僚隆竜�侶 亮竜 �凌僚 虜竜僚��旅虜� ��凌了凌粒旅��流"
-
-#: ../libpurple/protocols/myspace/myspace.c:2642
-#, fuzzy
+msgstr "�隆�僚留亮溜留 ��僚隆竜�侶� ��凌僚 ��凌了凌粒旅��流: %s (%d)"
+
+#: ../libpurple/protocols/myspace/myspace.c:2831
 msgid "IM Friends"
-msgstr "_�留�略慮��留 略亮竜��僚 亮侶僚�亮略��僚"
-
-#: ../libpurple/protocols/myspace/myspace.c:2741
+msgstr "陸溜了凌旅 IM"
+
+#: ../libpurple/protocols/myspace/myspace.c:2931
 #, c-format
 msgid ""
 "%d buddies were added or updated from the server (including buddies already "
 "on the server-side list)"
 msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:2742
-#, fuzzy
+"%d �溜了凌旅 ��凌��劉慮侶虜留僚 流 留僚留僚竜�慮侶虜留僚 留�� �凌僚 竜両��侶�竜�侶�流 (�竜�旅了留亮硫略僚凌僚�留旅 凌旅 "
+"�溜了凌旅 �凌� 竜溜僚留旅 流隆侶 ��侶 了溜��留 �凌� 竜両��侶�竜�侶�流)"
+
+#: ../libpurple/protocols/myspace/myspace.c:2932
 msgid "Add contacts from server"
-msgstr "�留僚慮留�亮劉僚侶 留僚�留��虜�旅�侶 �凌� 竜両��侶�竜�侶�流."
-
-#: ../libpurple/protocols/myspace/myspace.c:2794
-#: ../libpurple/protocols/myspace/myspace.c:2859
+msgstr "��凌�慮流虜侶 竜�留��僚 留�� �凌僚 竜両��侶�竜�侶�流"
+
+#: ../libpurple/protocols/myspace/myspace.c:2984
+#: ../libpurple/protocols/myspace/myspace.c:3048
 msgid "Add friends from MySpace.com"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:2795
-#, fuzzy
+msgstr "��凌�慮流虜侶 �溜了�僚 留�� �凌 MySpace.com"
+
+#: ../libpurple/protocols/myspace/myspace.c:2985
 msgid "Importing friends failed"
-msgstr "留�凌���溜留 �凌���亮留�凌� �凌� ��凌�慮劉�凌�"
+msgstr "��凌���溜留 竜旅�留粒�粒流 �溜了�僚"
 
 #. TODO: find out how
-#: ../libpurple/protocols/myspace/myspace.c:2851
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:3041
 msgid "Find people..."
-msgstr "���竜�侶 �溜了�僚..."
-
-#: ../libpurple/protocols/myspace/myspace.c:2854
-#, fuzzy
+msgstr "���竜�侶 留��亮�僚..."
+
+#: ../libpurple/protocols/myspace/myspace.c:3044
 msgid "Change IM name..."
-msgstr "�了了留粒流 虜�隆旅虜凌�..."
-
-#: ../libpurple/protocols/myspace/myspace.c:3156
+msgstr "�了了留粒流 凌僚�亮留�凌� IM..."
+
+#: ../libpurple/protocols/myspace/myspace.c:3345
 msgid "myim URL handler"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:3157
+#: ../libpurple/protocols/myspace/myspace.c:3346
 msgid "No suitable MySpaceIM account could be found to open this myim URL."
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:3158
+msgstr "�竜 硫�劉慮侶虜竜 虜留�略了了侶了凌� 了凌粒留�旅留�亮�� MySpaceIM 粒旅留 僚留 留僚凌溜両竜旅 留��� �凌 myim URL."
+
+#: ../libpurple/protocols/myspace/myspace.c:3347
 msgid "Enable the proper MySpaceIM account and try again."
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:3281
+msgstr "�僚竜�粒凌�凌旅流��竜 �凌僚 虜留�略了了侶了凌 了凌粒留�旅留�亮� MySpaceIM 虜留旅 ��凌��留慮流��竜 両留僚略."
+
+#: ../libpurple/protocols/myspace/myspace.c:3470
 msgid "Show display name in status text"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:3284
+msgstr "�亮�略僚旅�侶 竜亮�留僚旅龍�亮竜僚凌� 凌僚�亮留�凌� ��凌 虜竜溜亮竜僚凌 虜留�略��留�侶�"
+
+#: ../libpurple/protocols/myspace/myspace.c:3473
 msgid "Show headline in status text"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:3289
-#, fuzzy
+msgstr "�亮�略僚旅�侶 虜竜�留了溜隆留� ��凌 虜竜溜亮竜僚凌 虜留�略��留�侶�"
+
+#: ../libpurple/protocols/myspace/myspace.c:3478
 msgid "Send emoticons"
-msgstr "��旅了凌粒劉� 流�凌�"
-
-#: ../libpurple/protocols/myspace/myspace.c:3294
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:3483
 msgid "Screen resolution (dots per inch)"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:3297
-#, fuzzy
+msgstr "�僚略了��侶 凌慮�僚侶� (虜凌�虜虜溜隆竜� 留僚略 溜僚��留)"
+
+#: ../libpurple/protocols/myspace/myspace.c:3486
 msgid "Base font size (points)"
-msgstr "�竜粒留了��竜�凌 亮劉粒竜慮凌� 粒�留亮亮留�凌�竜旅�略�"
-
-#: ../libpurple/protocols/myspace/user.c:95
-#: ../libpurple/protocols/zephyr/zephyr.c:786
-#: ../libpurple/protocols/zephyr/zephyr.c:1204
+msgstr "�留�旅虜� 亮劉粒竜慮凌� 粒�留亮亮留�凌�竜旅�略� (��僚�凌旅)"
+
+#: ../libpurple/protocols/myspace/user.c:105
+#: ../libpurple/protocols/zephyr/zephyr.c:790
+#: ../libpurple/protocols/zephyr/zephyr.c:1164
 msgid "User"
 msgstr "律�流��侶�"
 
-#. TODO: link to username, if available
-#: ../libpurple/protocols/myspace/user.c:102
-#: ../libpurple/protocols/oscar/oscar.c:2964
+#: ../libpurple/protocols/myspace/user.c:115
+#: ../libpurple/protocols/oscar/oscar.c:3025
 msgid "Profile"
 msgstr "��凌�溜了"
 
-#: ../libpurple/protocols/myspace/user.c:124
-#, fuzzy
+#: ../libpurple/protocols/myspace/user.c:138
 msgid "Headline"
-msgstr "_��僚侶�侶"
-
-#: ../libpurple/protocols/myspace/user.c:129
-#, fuzzy
+msgstr "�竜�留了溜隆留"
+
+#: ../libpurple/protocols/myspace/user.c:153
 msgid "Song"
-msgstr "��凌旅"
-
-#: ../libpurple/protocols/myspace/user.c:134
+msgstr "里�留粒凌�隆旅"
+
+#: ../libpurple/protocols/myspace/user.c:162
 msgid "Total Friends"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/user.c:145
-#: ../libpurple/protocols/myspace/user.c:148
-#: ../libpurple/protocols/myspace/user.c:151
-#, fuzzy
+msgstr "裡�僚凌了凌 �溜了�僚"
+
+#: ../libpurple/protocols/myspace/user.c:180
 msgid "Client Version"
-msgstr "�了竜溜�旅亮凌 ��僚凌亮旅了溜留�"
+msgstr "�虜隆凌�侶 �竜了略�侶"
+
+#. Protocol won't log in now without a username set.. Disconnect
+#: ../libpurple/protocols/myspace/user.c:570
+msgid "No username set"
+msgstr "�竜僚 凌�溜��侶虜竜 �僚凌亮留 ��流��侶"
+
+#: ../libpurple/protocols/myspace/user.c:577
+#: ../libpurple/protocols/myspace/user.c:671
+msgid "MySpaceIM - Please Set a Username"
+msgstr "MySpaceIM - �留�留虜留了凌�亮竜 凌�溜��竜 劉僚留 �僚凌亮留 ��流��侶"
+
+#: ../libpurple/protocols/myspace/user.c:578
+msgid "Please enter a username to check its availability:"
+msgstr "�留�留虜留了凌�亮竜 竜旅�略粒竜�竜 劉僚留 �僚凌亮留 ��流��侶 粒旅留 僚留 竜了竜粒�慮竜溜 侶 隆旅留慮竜�旅亮��侶�略 �凌�:"
+
+#: ../libpurple/protocols/myspace/user.c:658
+msgid "MySpaceIM - Username Available"
+msgstr "MySpaceIM - 里凌 �僚凌亮留 ��流��侶 竜溜僚留旅 隆旅留慮劉�旅亮凌"
+
+#: ../libpurple/protocols/myspace/user.c:659
+msgid "This username is available. Would you like to set it?"
+msgstr "���� �凌 �僚凌亮留 ��流��侶 竜溜僚留旅 隆旅留慮劉�旅亮凌. �劉了竜�竜 僚留 �凌 凌�溜�竜�竜;"
+
+#: ../libpurple/protocols/myspace/user.c:660
+msgid "ONCE SET, THIS CANNOT BE CHANGED!"
+msgstr "�陸�離 �痢�裡里��, ��� ���痢�� �� �������!"
+
+#: ../libpurple/protocols/myspace/user.c:672
+msgid "This username is unavailable."
+msgstr "���� �凌 �僚凌亮留 ��流��侶 隆竜僚 竜溜僚留旅 隆旅留慮劉�旅亮凌."
+
+#: ../libpurple/protocols/myspace/user.c:673
+msgid "Please try another username:"
+msgstr "�留�留虜留了凌�亮竜 隆凌虜旅亮略��竜 劉僚留 略了了凌 �僚凌亮留 ��流��侶:"
 
 #. TODO: icons for each zap
-#: ../libpurple/protocols/myspace/zap.c:44
-#: ../libpurple/protocols/myspace/zap.c:177
+#. Lots of comments for translators:
+#. Zap means "to strike suddenly and forcefully as if with a
+#. * projectile or weapon."  This term often has an electrical
+#. * connotation, for example, "he was zapped by electricity when
+#. * he put a fork in the toaster."
+#: ../libpurple/protocols/myspace/zap.c:48
+#: ../libpurple/protocols/myspace/zap.c:221
 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
-#, c-format
-msgid "Zapping %s..."
-msgstr ""
-
-#: ../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 ""
-
-#: ../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 ""
-
-#: ../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 ""
-
 #: ../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..."
+#, c-format
+msgid "%s has zapped you!"
 msgstr ""
 
 #: ../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
-#, fuzzy
-msgid "Goose"
-msgstr "���粒竜"
-
-#: ../libpurple/protocols/myspace/zap.c:50
-#, fuzzy, c-format
-msgid "%s has goosed you!"
-msgstr "%s 留�凌��旅略龍竜旅."
-
-#: ../libpurple/protocols/myspace/zap.c:50
-#, fuzzy, c-format
-msgid "Goosing %s..."
-msgstr "���竜�侶 �凌� %s"
-
-#: ../libpurple/protocols/myspace/zap.c:51
-msgid "High-five"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:51
-#, fuzzy, c-format
-msgid "%s has high-fived you!"
-msgstr "%s ��僚隆劉慮侶虜竜."
-
-#: ../libpurple/protocols/myspace/zap.c:51
-#, c-format
-msgid "High-fiving %s..."
-msgstr ""
-
+#, c-format
+msgid "Zapping %s..."
+msgstr ""
+
+#. Whack means "to hit or strike someone with a sharp blow"
 #: ../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..."
+msgid "Whack"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:53
+#, c-format
+msgid "%s has whacked you!"
 msgstr ""
 
 #: ../libpurple/protocols/myspace/zap.c:53
+#, c-format
+msgid "Whacking %s..."
+msgstr ""
+
+#. Torch means "to set on fire."  Don't worry, this doesn't
+#. * make a whole lot of sense in English, either.  Feel free
+#. * to translate it literally.
+#: ../libpurple/protocols/myspace/zap.c:58
+msgid "Torch"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:59
+#, c-format
+msgid "%s has torched you!"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:59
+#, c-format
+msgid "Torching %s..."
+msgstr ""
+
+#. Smooch means "to kiss someone, often enthusiastically"
+#: ../libpurple/protocols/myspace/zap.c:62
+msgid "Smooch"
+msgstr "�略虜旅留"
+
+#: ../libpurple/protocols/myspace/zap.c:63
+#, c-format
+msgid "%s has smooched you!"
+msgstr "%s �留� 劉虜留僚竜 亮略虜旅留!"
+
+#: ../libpurple/protocols/myspace/zap.c:63
+#, c-format
+msgid "Smooching %s..."
+msgstr "�略虜旅留 �竜 %s..."
+
+#. A hug is a display of affection; wrapping your arms around someone
+#: ../libpurple/protocols/myspace/zap.c:66
+msgid "Hug"
+msgstr "�粒虜留了旅略"
+
+#: ../libpurple/protocols/myspace/zap.c:66
+#, c-format
+msgid "%s has hugged you!"
+msgstr "%s �留� 留粒虜略了旅留�竜!"
+
+#: ../libpurple/protocols/myspace/zap.c:67
+#, c-format
+msgid "Hugging %s..."
+msgstr ""
+
+#. Slap means "to hit someone with an open/flat hand"
+#: ../libpurple/protocols/myspace/zap.c:70
+msgid "Slap"
+msgstr "陸略�留"
+
+#: ../libpurple/protocols/myspace/zap.c:71
+#, c-format
+msgid "%s has slapped you!"
+msgstr "%s �留� 劉隆��竜 �略�留!"
+
+#: ../libpurple/protocols/myspace/zap.c:71
+#, c-format
+msgid "Slapping %s..."
+msgstr "陸略�留 �竜 %s..."
+
+#. Goose means "to pinch someone on their butt"
+#: ../libpurple/protocols/myspace/zap.c:74
+msgid "Goose"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:75
+#, c-format
+msgid "%s has goosed you!"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:75
+#, c-format
+msgid "Goosing %s..."
+msgstr ""
+
+#. A high-five is when two people's hands slap each other
+#. * in the air above their heads.  It is done to celebrate
+#. * something, often a victory, or to congratulate someone.
+#: ../libpurple/protocols/myspace/zap.c:80
+msgid "High-five"
+msgstr "���竜 �劉僚�竜"
+
+#: ../libpurple/protocols/myspace/zap.c:81
+#, c-format
+msgid "%s has high-fived you!"
+msgstr "%s �留� 劉隆��竜 �劉僚�竜!"
+
+#: ../libpurple/protocols/myspace/zap.c:81
+#, c-format
+msgid "High-fiving %s..."
+msgstr "���竜 �劉僚�竜 �竜 %s..."
+
+#. We're not entirely sure what the MySpace people mean by
+#. * this... but we think it's the equivalent of "prank."  Or, for
+#. * someone to perform a mischievous trick or practical joke.
+#: ../libpurple/protocols/myspace/zap.c:86
+msgid "Punk"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:87
+#, c-format
+msgid "%s has punk'd you!"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:87
+#, c-format
+msgid "Punking %s..."
+msgstr ""
+
+#. Raspberry is a slang term for the vibrating sound made
+#. * when you stick your tongue out of your mouth with your
+#. * lips closed and blow.  It is typically done when
+#. * gloating or bragging.  Nowadays it's a pretty silly
+#. * gesture, so it does not carry a harsh negative
+#. * connotation.  It is generally used in a playful tone
+#. * with friends.
+#: ../libpurple/protocols/myspace/zap.c:96
 msgid "Raspberry"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:53
-#, fuzzy, c-format
+#: ../libpurple/protocols/myspace/zap.c:97
+#, c-format
 msgid "%s has raspberried you!"
-msgstr "%s ��僚隆劉慮侶虜竜."
-
-#: ../libpurple/protocols/myspace/zap.c:53
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:97
 #, c-format
 msgid "Raspberrying %s..."
 msgstr ""
@@ -7898,45 +8326,45 @@
 msgid "Login failed (%s)."
 msgstr "� ��僚隆竜�侶 留�劉���竜 (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:247
+#: ../libpurple/protocols/novell/novell.c:255
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr ""
 "�隆�僚留亮溜留 留�凌��凌了流� 亮侶僚�亮留�凌�. �竜僚 流�留僚 隆�僚留�流 侶 了流�侶 ��僚 了竜��凌亮竜�竜旅�僚 �凌� "
 "��流��侶 (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:396
+#: ../libpurple/protocols/novell/novell.c:404
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
 msgstr "�隆�僚留亮溜留 ��凌�慮流虜侶� �凌� %s ��侶 了溜��留 �溜了�僚 �留� (%s)."
 
 #. TODO: Improve this! message to who or for what conference?
-#: ../libpurple/protocols/novell/novell.c:422
+#: ../libpurple/protocols/novell/novell.c:430
 #, c-format
 msgid "Unable to send message (%s)."
 msgstr "�隆�僚留亮溜留 留�凌��凌了流� 亮侶僚�亮留�凌� (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:493
-#: ../libpurple/protocols/novell/novell.c:985
+#: ../libpurple/protocols/novell/novell.c:501
+#: ../libpurple/protocols/novell/novell.c:993
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "�隆�僚留亮溜留 ����虜了侶�侶� �凌� ��流��侶 (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:532
+#: ../libpurple/protocols/novell/novell.c:540
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr ""
 "�隆�僚留亮溜留 留�凌��凌了流� 亮侶僚�亮留�凌� �竜 %s. �竜僚 流�留僚 隆�僚留�流 侶 隆侶亮旅凌��粒溜留 ��龍流�侶�侶� (%"
 "s)."
 
-#: ../libpurple/protocols/novell/novell.c:537
+#: ../libpurple/protocols/novell/novell.c:545
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
 msgstr ""
 "�隆�僚留亮溜留 留�凌��凌了流� 亮侶僚�亮留�凌�. �竜僚 流�留僚 隆�僚留�流 侶 隆侶亮旅凌��粒溜留 �侶� ��龍流�侶�侶� (%"
 "s)."
 
-#: ../libpurple/protocols/novell/novell.c:584
+#: ../libpurple/protocols/novell/novell.c:592
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
@@ -7945,7 +8373,7 @@
 "�隆�僚留亮溜留 亮竜�留虜溜僚侶�侶� �凌� ��流��侶 %s ��凌 �略虜竜了凌 %s ��侶 了溜��留 �凌� 竜両��侶�竜�侶�流.  "
 "裡�略了亮留 虜留�略 �侶 隆侶亮旅凌��粒溜留 �凌� �留虜劉了凌� (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:632
+#: ../libpurple/protocols/novell/novell.c:640
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
@@ -7954,64 +8382,62 @@
 "�隆�僚留亮溜留 ��凌�慮流虜侶� �凌� %s ��侶 了溜��留 �溜了�僚 �留�. 裡�略了亮留 虜留�略 �侶 隆侶亮旅凌��粒溜留  "
 "�凌� �留虜劉了凌� ��侶 了溜��留 �凌� 竜両��侶�竜�侶�流(%s)."
 
-#: ../libpurple/protocols/novell/novell.c:705
+#: ../libpurple/protocols/novell/novell.c:713
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr "�隆�僚留亮溜留 了流�侶� �了侶�凌�凌�旅�僚 �凌� ��流��侶 %s (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:751
-#: ../libpurple/protocols/novell/novell.c:897
+#: ../libpurple/protocols/novell/novell.c:759
+#: ../libpurple/protocols/novell/novell.c:905
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
 msgstr "�隆�僚留亮溜留 ��凌�慮流虜侶� �溜了凌� ��侶僚 了溜��留 竜亮�旅��竜��旅虜��侶�留� (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:798
+#: ../libpurple/protocols/novell/novell.c:806
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
 msgstr "�隆�僚留亮溜留 ��凌�慮流虜侶� �凌� %s ��侶 了溜��留 略�僚侶�侶� (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:851
+#: ../libpurple/protocols/novell/novell.c:859
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
 msgstr "�竜僚 流�留僚 隆�僚留�流 侶 ��凌�慮流虜侶 �凌� %s ��侶 了溜��留 竜�旅��竜��亮竜僚�僚 (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:919
+#: ../libpurple/protocols/novell/novell.c:927
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
-msgstr ""
-"�竜僚 流�留僚 隆�僚留�流 侶 留�留溜�竜�侶 �凌� %s 留�� �侶僚 了溜��留 竜亮�旅��竜��旅虜��侶�留� (%s)."
-
-#: ../libpurple/protocols/novell/novell.c:942
-#: ../libpurple/protocols/novell/novell.c:1647
+msgstr "�竜僚 流�留僚 隆�僚留�流 侶 留�留溜�竜�侶 �凌� %s 留�� �侶僚 了溜��留 竜亮�旅��竜��旅虜��侶�留� (%s)."
+
+#: ../libpurple/protocols/novell/novell.c:950
+#: ../libpurple/protocols/novell/novell.c:1656
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
-msgstr ""
-"�隆�僚留亮溜留 留了了留粒流� ��僚 ��慮亮溜�竜�僚 竜亮�旅��竜��旅虜��侶�留� ��凌僚 竜両��侶�竜�侶�流 (%s)."
-
-#: ../libpurple/protocols/novell/novell.c:1012
+msgstr "�隆�僚留亮溜留 留了了留粒流� ��僚 ��慮亮溜�竜�僚 竜亮�旅��竜��旅虜��侶�留� ��凌僚 竜両��侶�竜�侶�流 (%s)."
+
+#: ../libpurple/protocols/novell/novell.c:1020
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "�隆�僚留亮溜留 隆侶亮旅凌��粒溜留� ��龍流�侶�侶� (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:1121
-#: ../libpurple/protocols/novell/novell.c:1692
+#: ../libpurple/protocols/novell/novell.c:1131
+#: ../libpurple/protocols/novell/novell.c:1702
 msgid "Error communicating with server. Closing connection."
 msgstr "裡�略了亮留 ��僚隆竜�侶� 亮竜 �凌僚 竜両��侶�竜�侶�流. �了竜溜�旅亮凌 ��僚隆竜�侶�."
 
-#: ../libpurple/protocols/novell/novell.c:1476
+#: ../libpurple/protocols/novell/novell.c:1485
 msgid "Telephone Number"
 msgstr "��旅慮亮�� �侶了竜��僚凌�"
 
-#: ../libpurple/protocols/novell/novell.c:1482
+#: ../libpurple/protocols/novell/novell.c:1491
 msgid "Personal Title"
 msgstr "��凌���旅虜�� �溜�了凌�"
 
-#: ../libpurple/protocols/novell/novell.c:1486
+#: ../libpurple/protocols/novell/novell.c:1495
 msgid "Mailstop"
 msgstr ""
 
-#: ../libpurple/protocols/novell/novell.c:1502
-#: ../libpurple/protocols/sametime/sametime.c:4122
+#: ../libpurple/protocols/novell/novell.c:1511
+#: ../libpurple/protocols/sametime/sametime.c:4176
 msgid "User ID"
 msgstr "ID ��流��侶"
 
@@ -8021,41 +8447,37 @@
 #. purple_notify_user_info_add_pair(user_info, tag, value);
 #. }
 #.
-#: ../libpurple/protocols/novell/novell.c:1515
+#: ../libpurple/protocols/novell/novell.c:1524
 msgid "Full name"
 msgstr "�僚凌亮留�竜��僚�亮凌"
 
-#: ../libpurple/protocols/novell/novell.c:1637
+#: ../libpurple/protocols/novell/novell.c:1646
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "裡�龍流�侶�侶 GroupWise %d"
 
-#: ../libpurple/protocols/novell/novell.c:1668
-msgid "Unable to make SSL connection to server."
-msgstr "�隆�僚留亮溜留 ��僚隆竜�侶� SSL 亮竜 �凌僚 竜両��侶�竜�侶�流."
-
-#: ../libpurple/protocols/novell/novell.c:1720
+#: ../libpurple/protocols/novell/novell.c:1729
 msgid "Authenticating..."
 msgstr "�溜僚竜�留旅 劉粒虜�旅�侶..."
 
-#: ../libpurple/protocols/novell/novell.c:1732
+#: ../libpurple/protocols/novell/novell.c:1743
 msgid "Unable to connect to server."
 msgstr "�隆�僚留�侶 侶 ��僚隆竜�侶 亮竜 �凌僚 竜両��侶�竜�侶�流."
 
-#: ../libpurple/protocols/novell/novell.c:1735
+#: ../libpurple/protocols/novell/novell.c:1746
 msgid "Waiting for response..."
 msgstr "�僚留亮凌僚流 留僚�留��虜�旅�侶�..."
 
-#: ../libpurple/protocols/novell/novell.c:1870
+#: ../libpurple/protocols/novell/novell.c:1881
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "%s ��凌�虜了流慮侶虜竜 ��侶 ��僚凌亮旅了溜留."
 
-#: ../libpurple/protocols/novell/novell.c:1898
+#: ../libpurple/protocols/novell/novell.c:1909
 msgid "Invitation to Conversation"
 msgstr "����虜了侶�侶 �竜 ��僚凌亮旅了溜留"
 
-#: ../libpurple/protocols/novell/novell.c:1899
+#: ../libpurple/protocols/novell/novell.c:1910
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -8066,28 +8488,22 @@
 "\n"
 "��略了慮侶虜竜: %s"
 
-#: ../libpurple/protocols/novell/novell.c:1901
+#: ../libpurple/protocols/novell/novell.c:1912
 msgid "Would you like to join the conversation?"
 msgstr "�劉了竜�竜 僚留 ��亮亮竜�略��竜�竜 ��侶 ��龍流�侶�侶;"
 
-#. we don't want to reconnect in this case
-#: ../libpurple/protocols/novell/novell.c:2012
+#: ../libpurple/protocols/novell/novell.c:2028
 msgid "You have been logged out because you logged in at another workstation."
 msgstr "��凌��僚隆竜慮流虜留�竜 竜�竜旅隆流 竜溜��竜 ��僚隆竜隆竜亮劉僚凌旅 留�� 略了了凌 ��留慮亮� 竜�粒留�溜留�."
 
-#: ../libpurple/protocols/novell/novell.c:2069
-#, c-format
-msgid ""
-"%s appears to be offline and did not receive the message that you just sent."
+#: ../libpurple/protocols/novell/novell.c:2085
+#, c-format
+msgid "%s appears to be offline and did not receive the message that you just sent."
 msgstr ""
 "%s �留溜僚竜�留旅 ��旅 隆竜僚 竜溜僚留旅 ��僚隆竜隆竜亮劉僚凌� 虜留旅 隆竜僚 劉了留硫竜 �凌 亮流僚�亮留 �凌� 亮�了旅� "
 "��竜溜了留�竜."
 
-#. TODO: Would be nice to prompt if not set!
-#. *  purple_request_fields(gc, _("Server Address"),...);
-#.
-#. ...but for now just error out with a nice message.
-#: ../libpurple/protocols/novell/novell.c:2167
+#: ../libpurple/protocols/novell/novell.c:2185
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
@@ -8095,12 +8511,11 @@
 "�隆�僚留�侶 侶 ��僚隆竜�侶 亮竜 �凌僚 竜両��侶�竜�侶�流. �留�留虜留了凌�亮竜 竜旅�略粒竜�竜 �侶 隆旅竜�慮�僚�侶 �凌� "
 "竜両��侶�竜�侶�流 亮竜 �凌僚 凌�凌溜凌 竜�旅慮�亮竜溜�竜 僚留 ��僚隆竜慮竜溜�竜."
 
-#: ../libpurple/protocols/novell/novell.c:2195
+#: ../libpurple/protocols/novell/novell.c:2214
 msgid "Error. SSL support is not installed."
 msgstr "裡�略了亮留. �竜僚 竜溜僚留旅 竜粒虜留�竜��侶亮劉僚侶 侶 ��凌��流�旅両侶 SSL."
 
-#: ../libpurple/protocols/novell/novell.c:2504
-#, c-format
+#: ../libpurple/protocols/novell/novell.c:2522
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "���流 侶 ��龍流�侶�侶 劉虜了竜旅�竜. �竜僚 竜溜僚留旅 隆�僚留�流 侶 留�凌��凌了流 略了了�僚 亮侶僚�亮略��僚."
 
@@ -8114,33 +8529,41 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/novell/novell.c:3518
-#: ../libpurple/protocols/novell/novell.c:3520
+#: ../libpurple/protocols/novell/novell.c:3536
+#: ../libpurple/protocols/novell/novell.c:3538
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "����慮竜�凌 ����凌虜�了了凌� Novell GroupWise Messenger"
 
-#: ../libpurple/protocols/novell/novell.c:3545
+#: ../libpurple/protocols/novell/novell.c:3563
 msgid "Server address"
 msgstr "�旅竜�慮�僚�侶 竜両��侶�竜�侶�流"
 
-#: ../libpurple/protocols/novell/novell.c:3549
+#: ../libpurple/protocols/novell/novell.c:3567
 msgid "Server port"
 msgstr "���留 竜両��侶�竜�侶�流"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:387
-#: ../libpurple/protocols/yahoo/yahoo.c:2469
-#: ../libpurple/protocols/yahoo/yahoo.c:2636
-#: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:581
-#: ../libpurple/proxy.c:1116 ../libpurple/proxy.c:1225
-#: ../libpurple/proxy.c:1325 ../libpurple/proxy.c:1453
+#: ../libpurple/protocols/oscar/family_chatnav.c:62
+msgid "Could not join chat room"
+msgstr "�竜僚 流�留僚 隆�僚留�流 侶 竜溜�凌隆凌� ��凌 隆�亮略�旅凌 ��龍流�侶�侶�"
+
+#: ../libpurple/protocols/oscar/family_chatnav.c:63
+msgid "Invalid chat room name"
+msgstr "�侶 劉粒虜��凌 �僚凌亮留 隆�亮留�溜凌�"
+
+#: ../libpurple/protocols/oscar/flap_connection.c:391
+#: ../libpurple/protocols/yahoo/yahoo.c:2487
+#: ../libpurple/protocols/yahoo/yahoo.c:2655
+#: ../libpurple/protocols/yahoo/ycht.c:482 ../libpurple/proxy.c:584
+#: ../libpurple/proxy.c:1135 ../libpurple/proxy.c:1244
+#: ../libpurple/proxy.c:1344 ../libpurple/proxy.c:1472
 msgid "Server closed the connection."
 msgstr "� 竜両��侶�竜�侶�流� 劉虜了竜旅�竜 �侶 ��僚隆竜�侶"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:389
-#: ../libpurple/protocols/yahoo/yahoo.c:2463
-#: ../libpurple/protocols/yahoo/yahoo.c:2630 ../libpurple/proxy.c:593
-#: ../libpurple/proxy.c:1128 ../libpurple/proxy.c:1237
-#: ../libpurple/proxy.c:1337 ../libpurple/proxy.c:1465
+#: ../libpurple/protocols/oscar/flap_connection.c:393
+#: ../libpurple/protocols/yahoo/yahoo.c:2480
+#: ../libpurple/protocols/yahoo/yahoo.c:2648 ../libpurple/proxy.c:596
+#: ../libpurple/proxy.c:1147 ../libpurple/proxy.c:1256
+#: ../libpurple/proxy.c:1356 ../libpurple/proxy.c:1484
 #, c-format
 msgid ""
 "Lost connection with server:\n"
@@ -8149,10 +8572,10 @@
 "� ��僚隆竜�侶 亮竜 �凌僚 竜両��侶�竜�侶�流 �略慮侶虜竜:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:392
-#: ../libpurple/proxy.c:1145 ../libpurple/proxy.c:1250
-#: ../libpurple/proxy.c:1349 ../libpurple/proxy.c:1421
-#: ../libpurple/proxy.c:1478
+#: ../libpurple/protocols/oscar/flap_connection.c:396
+#: ../libpurple/proxy.c:1164 ../libpurple/proxy.c:1269
+#: ../libpurple/proxy.c:1368 ../libpurple/proxy.c:1440
+#: ../libpurple/proxy.c:1497
 msgid "Received invalid data on connection with server."
 msgstr "�流�慮侶虜留僚 亮侶 劉粒虜��留 隆竜隆凌亮劉僚留 虜留�略 �侶 ��僚隆竜�侶 亮竜 �凌僚 竜両��侶�竜�侶�流."
 
@@ -8187,140 +8610,148 @@
 msgstr "����慮竜�凌 ����凌虜�了了凌� IRC"
 
 #: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4410
-#: ../libpurple/protocols/zephyr/zephyr.c:2997
+#: ../libpurple/protocols/yahoo/yahoo.c:4432
+#: ../libpurple/protocols/zephyr/zephyr.c:2979
 msgid "Encoding"
 msgstr "��隆旅虜凌�凌溜侶�侶"
 
-#: ../libpurple/protocols/oscar/odc.c:40
+#: ../libpurple/protocols/oscar/odc.c:42
 msgid "The remote user has closed the connection."
 msgstr "� 留�凌亮留虜���亮劉僚凌� ��流��侶� 劉虜了竜旅�竜 �侶 ��僚隆竜�侶."
 
-#: ../libpurple/protocols/oscar/odc.c:42
+#: ../libpurple/protocols/oscar/odc.c:44
 msgid "The remote user has declined your request."
 msgstr "� 留�凌亮留虜���亮劉僚凌� ��流��侶� 留�僚流慮侶虜竜 �凌 留溜�侶亮略 �留�."
 
-#: ../libpurple/protocols/oscar/odc.c:44
+#: ../libpurple/protocols/oscar/odc.c:46
 #, c-format
 msgid "Lost connection with the remote user:<br>%s"
 msgstr "律略慮侶虜竜 侶 ��僚隆竜�侶 亮竜 �凌僚 留�凌亮留虜���亮劉僚凌 ��流��侶:<br>%s"
 
-#: ../libpurple/protocols/oscar/odc.c:47
+#: ../libpurple/protocols/oscar/odc.c:49
 msgid "Received invalid data on connection with remote user."
-msgstr ""
-"�流�慮侶虜留僚 亮侶 劉粒虜��留 隆竜隆凌亮劉僚留 虜留�略 �侶 ��僚隆竜�侶 亮竜 �凌僚 留�凌亮留虜���亮劉僚凌 ��流��侶."
-
-#: ../libpurple/protocols/oscar/odc.c:49
+msgstr "�流�慮侶虜留僚 亮侶 劉粒虜��留 隆竜隆凌亮劉僚留 虜留�略 �侶 ��僚隆竜�侶 亮竜 �凌僚 留�凌亮留虜���亮劉僚凌 ��流��侶."
+
+#: ../libpurple/protocols/oscar/odc.c:51
 msgid "Could not establish a connection with the remote user."
 msgstr "�竜僚 流�留僚 隆�僚留�流 侶 隆侶亮旅凌��粒溜留 ��僚隆竜�侶� 亮竜 �凌僚 留�凌亮留虜���亮劉僚凌 ��流��侶."
 
-#: ../libpurple/protocols/oscar/odc.c:560
+#: ../libpurple/protocols/oscar/odc.c:562
 msgid "Direct IM established"
 msgstr "�侶亮旅凌��粒流慮侶虜竜 留�竜�慮竜溜留� ��僚隆竜�侶 略亮竜��僚 亮侶僚�亮略��僚"
 
+#: ../libpurple/protocols/oscar/odc.c:600
+#, c-format
+msgid ""
+"%s tried to send you a %s file, but we only allow files up to %s over Direct "
+"IM.  Try using file transfer instead.\n"
+msgstr ""
+"%s ��凌��略慮侶�竜 僚留 �留� ��竜溜了竜旅 劉僚留 留��竜溜凌 %s, 留了了略 竜�旅��劉�凌�亮竜 亮�僚凌 留��竜溜留 "
+"亮劉��旅 %s 亮劉�� 留�竜�慮竜溜留� 略亮竜��僚 亮侶僚�亮略��僚.  �凌虜旅亮略��竜 僚留 ��侶�旅亮凌�凌旅流�竜�竜 �侶 "
+"亮竜�留�凌�略 留��竜溜�僚.\n"
+
 #: ../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."
-
-#: ../libpurple/protocols/oscar/oscar.c:116
+msgstr "里凌 留��竜溜凌 %s 竜溜僚留旅 %s, �凌� 竜溜僚留旅 亮竜粒留了��竜�凌 留�� �凌 亮劉粒旅��凌 亮劉粒竜慮凌� ��僚 %s."
+
+#: ../libpurple/protocols/oscar/oscar.c:117
 msgid "Invalid error"
 msgstr "�侶 劉粒虜��凌 ��略了亮留"
 
-#: ../libpurple/protocols/oscar/oscar.c:117
+#: ../libpurple/protocols/oscar/oscar.c:118
 msgid "Invalid SNAC"
 msgstr "�侶 劉粒虜��凌 SNAC"
 
-#: ../libpurple/protocols/oscar/oscar.c:118
+#: ../libpurple/protocols/oscar/oscar.c:119
 msgid "Rate to host"
 msgstr "�留慮亮凌了�粒侶�侶 ����流亮留�凌�"
 
-#: ../libpurple/protocols/oscar/oscar.c:119
+#: ../libpurple/protocols/oscar/oscar.c:120
 msgid "Rate to client"
 msgstr "�留慮亮凌了�粒侶�侶 ��流��侶"
 
-#: ../libpurple/protocols/oscar/oscar.c:121
-msgid "Service unavailable"
-msgstr "離�侶�竜�溜留 亮侶 隆旅留慮劉�旅亮侶"
-
 #: ../libpurple/protocols/oscar/oscar.c:122
-msgid "Service not defined"
-msgstr "�竜僚 ��凌�隆旅凌�溜��侶虜竜 侶 ��侶�竜�溜留"
+msgid "Service unavailable"
+msgstr "離�侶�竜�溜留 亮侶 隆旅留慮劉�旅亮侶"
 
 #: ../libpurple/protocols/oscar/oscar.c:123
+msgid "Service not defined"
+msgstr "�竜僚 ��凌�隆旅凌�溜��侶虜竜 侶 ��侶�竜�溜留"
+
+#: ../libpurple/protocols/oscar/oscar.c:124
 msgid "Obsolete SNAC"
 msgstr "��留��留旅�亮劉僚凌 SNAC"
 
-#: ../libpurple/protocols/oscar/oscar.c:124
-msgid "Not supported by host"
-msgstr "�竜僚 ��凌��侶�溜龍竜�留旅 留�� �凌僚 虜竜僚��旅虜� ��凌了凌粒旅��流"
-
 #: ../libpurple/protocols/oscar/oscar.c:125
+msgid "Not supported by host"
+msgstr "�竜僚 ��凌��侶�溜龍竜�留旅 留�� �凌僚 虜竜僚��旅虜� ��凌了凌粒旅��流"
+
+#: ../libpurple/protocols/oscar/oscar.c:126
 msgid "Not supported by client"
 msgstr "�竜僚 ��凌��侶�溜龍竜�留旅 留�� �凌僚 �竜了略�侶"
 
-#: ../libpurple/protocols/oscar/oscar.c:126
+#: ../libpurple/protocols/oscar/oscar.c:127
 msgid "Refused by client"
 msgstr "��僚流慮侶虜竜 留�� �凌僚 �竜了略�侶"
 
-#: ../libpurple/protocols/oscar/oscar.c:127
+#: ../libpurple/protocols/oscar/oscar.c:128
 msgid "Reply too big"
 msgstr "�凌了� 亮竜粒略了侶 留�略僚�侶�侶"
 
-#: ../libpurple/protocols/oscar/oscar.c:128
+#: ../libpurple/protocols/oscar/oscar.c:129
 msgid "Responses lost"
 msgstr "�旅 留僚�留�凌虜�溜�竜旅� �略慮侶虜留僚"
 
-#: ../libpurple/protocols/oscar/oscar.c:129
+#: ../libpurple/protocols/oscar/oscar.c:130
 msgid "Request denied"
 msgstr "里凌 留溜�侶亮留 留�凌��溜�慮侶虜竜"
 
-#: ../libpurple/protocols/oscar/oscar.c:130
+#: ../libpurple/protocols/oscar/oscar.c:131
 msgid "Busted SNAC payload"
 msgstr "律�竜凌虜凌�侶亮劉僚凌 �凌��溜凌 SNAC"
 
-#: ../libpurple/protocols/oscar/oscar.c:131
+#: ../libpurple/protocols/oscar/oscar.c:132
 msgid "Insufficient rights"
 msgstr "�了了旅�流 隆旅虜留旅�亮留�留"
 
-#: ../libpurple/protocols/oscar/oscar.c:132
+#: ../libpurple/protocols/oscar/oscar.c:133
 msgid "In local permit/deny"
 msgstr "里凌�旅虜流 略隆竜旅留/略�僚侶�侶"
 
-#: ../libpurple/protocols/oscar/oscar.c:133
+#: ../libpurple/protocols/oscar/oscar.c:134
 msgid "Too evil (sender)"
 msgstr "�凌了� 虜留虜�� (留�凌��凌了劉留�)"
 
-#: ../libpurple/protocols/oscar/oscar.c:134
-msgid "Too evil (receiver)"
-msgstr "�凌了� 虜留虜�� (�留�留了流��侶�)"
-
 #: ../libpurple/protocols/oscar/oscar.c:135
-msgid "User temporarily unavailable"
-msgstr "律�流��侶� ��凌���旅僚略 亮侶 隆旅留慮劉�旅亮凌�"
+msgid "Too evil (receiver)"
+msgstr "�凌了� 虜留虜�� (�留�留了流��侶�)"
 
 #: ../libpurple/protocols/oscar/oscar.c:136
+msgid "User temporarily unavailable"
+msgstr "律�流��侶� ��凌���旅僚略 亮侶 隆旅留慮劉�旅亮凌�"
+
+#: ../libpurple/protocols/oscar/oscar.c:137
 msgid "No match"
 msgstr "�留亮溜留 留僚�旅��凌旅�溜留"
 
-#: ../libpurple/protocols/oscar/oscar.c:137
-msgid "List overflow"
-msgstr "離�竜��竜溜了旅�侶 了溜��留�"
-
 #: ../libpurple/protocols/oscar/oscar.c:138
+msgid "List overflow"
+msgstr "離�竜��竜溜了旅�侶 了溜��留�"
+
+#: ../libpurple/protocols/oscar/oscar.c:139
 msgid "Request ambiguous"
 msgstr "�旅�凌�凌�亮竜僚凌 留溜�侶亮留"
 
-#: ../libpurple/protocols/oscar/oscar.c:139
+#: ../libpurple/protocols/oscar/oscar.c:140
 msgid "Queue full"
 msgstr "���略 �了流�侶�"
 
-#: ../libpurple/protocols/oscar/oscar.c:140
+#: ../libpurple/protocols/oscar/oscar.c:141
 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 "
@@ -8332,7 +8763,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 "
@@ -8343,153 +8774,135 @@
 "亮竜了略�侶.)"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:639 ../pidgin/gtkutils.c:2387
-#: ../pidgin/gtkutils.c:2417
+#: ../libpurple/protocols/oscar/oscar.c:638 ../pidgin/gtkutils.c:2444
+#: ../pidgin/gtkutils.c:2474
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:332
 msgid "Buddy Icon"
 msgstr "�旅虜凌僚溜隆旅凌 �溜了凌�"
 
-#: ../libpurple/protocols/oscar/oscar.c:642
+#: ../libpurple/protocols/oscar/oscar.c:641
 msgid "Voice"
 msgstr "陸�僚流"
 
-#: ../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/silc/silc.c:768
-#: ../libpurple/protocols/silc/util.c:553
-#: ../libpurple/protocols/silc10/silc.c:679
-#: ../libpurple/protocols/silc10/util.c:549
-msgid "Chat"
-msgstr "裡�龍流�侶�侶"
-
-#: ../libpurple/protocols/oscar/oscar.c:651
-#: ../libpurple/protocols/oscar/oscar.c:6010
+#: ../libpurple/protocols/oscar/oscar.c:650
+#: ../libpurple/protocols/oscar/oscar.c:6113
 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"
 
-#: ../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"
 
-#: ../libpurple/protocols/oscar/oscar.c:676
+#: ../libpurple/protocols/oscar/oscar.c:675
 msgid "Nihilist"
 msgstr "�旅�旅了旅��流�"
 
-#: ../libpurple/protocols/oscar/oscar.c:679
+#: ../libpurple/protocols/oscar/oscar.c:678
 msgid "ICQ Server Relay"
 msgstr ""
 
-#: ../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"
 
-#: ../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 "���略了竜旅留 竜僚竜�粒凌�凌旅流慮侶虜竜"
 
-#: ../libpurple/protocols/oscar/oscar.c:697
+#: ../libpurple/protocols/oscar/oscar.c:696
 msgid "Video Chat"
 msgstr "�旅僚�竜凌��僚凌亮旅了溜留"
 
-#: ../libpurple/protocols/oscar/oscar.c:701
+#: ../libpurple/protocols/oscar/oscar.c:700
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: ../libpurple/protocols/oscar/oscar.c:704
+#: ../libpurple/protocols/oscar/oscar.c:703
 msgid "Live Video"
 msgstr "��僚�留僚� 硫溜僚�竜凌"
 
-#: ../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:5780
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:724
+#: ../libpurple/protocols/oscar/oscar.c:5883
 msgid "Free For Chat"
 msgstr "�了竜�慮竜�凌� 粒旅留 ��龍流�侶�侶"
 
-#: ../libpurple/protocols/oscar/oscar.c:729
-#: ../libpurple/protocols/oscar/oscar.c:5815
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:728
+#: ../libpurple/protocols/oscar/oscar.c:5918
 msgid "Not Available"
 msgstr "�侶 隆旅留慮劉�旅亮凌�"
 
-#: ../libpurple/protocols/oscar/oscar.c:731
-#: ../libpurple/protocols/oscar/oscar.c:5801
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:730
+#: ../libpurple/protocols/oscar/oscar.c:5904
 msgid "Occupied"
 msgstr "��留��凌了侶亮劉僚凌�"
 
-#: ../libpurple/protocols/oscar/oscar.c:735
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:734
 msgid "Web Aware"
 msgstr "�亮�留僚流� ��凌僚 旅���"
 
-#: ../libpurple/protocols/oscar/oscar.c:737 ../libpurple/protocols/qq/qq.c:183
-#: ../libpurple/protocols/qq/qq.c:288
-#: ../libpurple/protocols/yahoo/yahoo.c:3095 ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1060
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:736 ../libpurple/protocols/qq/qq.c:184
+#: ../libpurple/protocols/qq/qq.c:289
+#: ../libpurple/protocols/yahoo/yahoo.c:3132 ../libpurple/status.c:157
+#: ../pidgin/gtkdocklet.c:557 ../pidgin/gtkstatusbox.c:1084
 msgid "Invisible"
 msgstr "���留�凌�"
 
-#: ../libpurple/protocols/oscar/oscar.c:739
-#, c-format
-msgid "Online"
-msgstr "裡�僚隆竜隆竜亮劉僚凌�"
-
-#: ../libpurple/protocols/oscar/oscar.c:838
-#: ../libpurple/protocols/oscar/oscar.c:3707
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1126
+#: ../libpurple/protocols/oscar/oscar.c:837
+#: ../libpurple/protocols/oscar/oscar.c:3740
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1100
 msgid "IP Address"
 msgstr "�旅竜�慮�僚�侶 IP"
 
-#: ../libpurple/protocols/oscar/oscar.c:845
-#: ../libpurple/protocols/oscar/oscar.c:2891
+#: ../libpurple/protocols/oscar/oscar.c:844
+#: ../libpurple/protocols/oscar/oscar.c:2952
 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"
@@ -8498,7 +8911,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"
@@ -8507,54 +8920,58 @@
 "�竜僚 流�留僚 隆�僚留�流 侶 ��僚隆竜�侶 亮竜 �凌僚 竜両��侶�竜�侶�流 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:1260
-#, fuzzy, c-format
+#: ../libpurple/protocols/oscar/oscar.c:1302
+#, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
 "invalid.  Screen names must be a valid email address, or start with a letter "
 "and contain only letters, numbers and spaces, or contain only numbers."
 msgstr ""
 "�隆�僚留亮溜留 竜旅��隆凌�: �竜僚 流�留僚 隆�僚留�� 僚留 ��僚隆竜慮竜溜�竜 �� %s 竜�竜旅隆流 �凌 竜亮�留僚旅龍�亮竜僚凌 "
-"�僚凌亮留 隆竜僚 竜溜僚留旅 劉粒虜��凌.  里留 凌僚�亮留�留 了凌粒留�旅留�亮�僚 ��劉�竜旅 竜溜�竜 僚留 両竜虜旅僚凌�僚 亮竜 "
-"劉僚留 粒�略亮亮留 虜留旅 僚留 �竜�旅劉�凌�僚 亮�僚凌 粒�略亮亮留�留, 留�旅慮亮凌�� 虜留旅 虜竜僚略, 流 僚留 �竜�旅劉�凌�僚 "
-"亮�僚凌 留�旅慮亮凌��."
-
-#: ../libpurple/protocols/oscar/oscar.c:1345
-#: ../libpurple/protocols/yahoo/yahoo.c:2105
+"�僚凌亮留 隆竜僚 竜溜僚留旅 劉粒虜��凌.  里留 凌僚�亮留�留 了凌粒留�旅留�亮�僚 ��劉�竜旅 流 僚留 竜溜僚留旅 亮溜留 劉粒虜��侶 "
+"隆旅竜�慮�僚�侶 侶了竜虜��凌僚旅虜凌� �留��隆�凌亮竜溜凌�, 流 僚留 両竜虜旅僚凌�僚 亮竜 劉僚留 粒�略亮亮留 虜留旅 僚留 "
+"�竜�旅劉�凌�僚 亮�僚凌 粒�略亮亮留�留, 留�旅慮亮凌�� 虜留旅 虜竜僚略, 流 僚留 �竜�旅劉�凌�僚 亮�僚凌 留�旅慮亮凌��."
+
+#. Unregistered screen name
+#: ../libpurple/protocols/oscar/oscar.c:1388
+#: ../libpurple/protocols/yahoo/yahoo.c:2109
 msgid "Invalid screen name."
 msgstr "�侶 劉粒虜��凌 竜亮�留僚旅龍�亮竜僚凌 �僚凌亮留."
 
-#: ../libpurple/protocols/oscar/oscar.c:1352
-#: ../libpurple/protocols/qq/login_logout.c:483
-#: ../libpurple/protocols/simple/simple.c:1045
-#: ../libpurple/protocols/yahoo/yahoo.c:2126
+#: ../libpurple/protocols/oscar/oscar.c:1394
+#: ../libpurple/protocols/qq/login_logout.c:485
+#: ../libpurple/protocols/simple/simple.c:1112
+#: ../libpurple/protocols/yahoo/yahoo.c:2131
 msgid "Incorrect password."
 msgstr "�留僚慮留�亮劉僚凌� 虜�隆旅虜��."
 
-#: ../libpurple/protocols/oscar/oscar.c:1357
+#. Suspended account
+#: ../libpurple/protocols/oscar/oscar.c:1398
 msgid "Your account is currently suspended."
 msgstr "� 了凌粒留�旅留�亮�� �留� 竜溜僚留旅 ��凌� �凌 �留��僚 �竜 留僚留��凌了流."
 
 #. service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1361
+#: ../libpurple/protocols/oscar/oscar.c:1402
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "� ��侶�竜�溜留 AOL Instant Messenger 竜溜僚留旅 ��凌���旅僚略 亮侶 隆旅留慮劉�旅亮侶."
 
-#: ../libpurple/protocols/oscar/oscar.c:1366
-#: ../libpurple/protocols/oscar/oscar.c:1377
+#. screen name connecting too frequently
+#. IP address connecting too frequently
+#: ../libpurple/protocols/oscar/oscar.c:1406
+#: ../libpurple/protocols/oscar/oscar.c:1415
 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."
@@ -8563,46 +8980,46 @@
 "両留僚留��凌��留慮流��竜. �僚 ��僚竜�溜�竜�竜 僚留 ��凌��留慮竜溜�竜, 慮留 ��劉�竜旅 僚留 �竜�旅亮劉僚竜�竜 留虜�亮留 "
 "�竜�旅����竜�凌."
 
-#: ../libpurple/protocols/oscar/oscar.c:1371
+#. client too old
+#: ../libpurple/protocols/oscar/oscar.c:1410
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 "� 劉虜隆凌�侶 �竜了略�侶 �凌� ��侶�旅亮凌�凌旅竜溜�竜 竜溜僚留旅 �凌了� �留了旅略. �留�留虜留了凌�亮竜 留僚留硫留慮亮溜��竜 "
 "�竜 %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1410
+#: ../libpurple/protocols/oscar/oscar.c:1448
 msgid "Could Not Connect"
 msgstr "�竜僚 流�留僚 隆�僚留�流 侶 ��僚隆竜�侶"
 
-#: ../libpurple/protocols/oscar/oscar.c:1414
+#: ../libpurple/protocols/oscar/oscar.c:1452
 msgid "Received authorization"
 msgstr "�流�慮侶虜竜 劉粒虜�旅�侶"
 
-#: ../libpurple/protocols/oscar/oscar.c:1436
+#: ../libpurple/protocols/oscar/oscar.c:1475
 msgid "The SecurID key entered is invalid."
 msgstr "里凌 SecurID �凌� �了侶虜��凌了凌粒流慮侶虜竜 竜溜僚留旅 了留僚慮留�亮劉僚凌."
 
-#: ../libpurple/protocols/oscar/oscar.c:1449
+#: ../libpurple/protocols/oscar/oscar.c:1488
 msgid "Enter SecurID"
 msgstr "�旅�留粒�粒流 SecurID"
 
-#: ../libpurple/protocols/oscar/oscar.c:1450
+#: ../libpurple/protocols/oscar/oscar.c:1489
 msgid "Enter the 6 digit number from the digital display."
 msgstr "����竜 �留 6 �侶�溜留 留�� �侶 �侶�旅留虜流 凌慮�僚侶."
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
-#: ../libpurple/protocols/oscar/oscar.c:1452
-#: ../libpurple/protocols/oscar/oscar.c:2232
-#: ../libpurple/protocols/oscar/oscar.c:2281
-#: ../libpurple/protocols/oscar/oscar.c:5885
-#: ../libpurple/protocols/oscar/oscar.c:6166 ../libpurple/request.h:1388
+#: ../libpurple/protocols/oscar/oscar.c:1491
+#: ../libpurple/protocols/oscar/oscar.c:2293
+#: ../libpurple/protocols/oscar/oscar.c:2342
+#: ../libpurple/protocols/oscar/oscar.c:5988
+#: ../libpurple/protocols/oscar/oscar.c:6269 ../libpurple/request.h:1458
 msgid "_OK"
 msgstr "_�僚�略両竜旅"
 
-#: ../libpurple/protocols/oscar/oscar.c:1491
-#: ../libpurple/protocols/oscar/oscar.c:1534
+#: ../libpurple/protocols/oscar/oscar.c:1530
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -8611,54 +9028,54 @@
 "��凌��僚隆竜慮流虜留�竜 �凌了� 粒�流粒凌�留.  ���� 僚留 慮劉了竜�竜 僚留 ��侶�旅亮凌�凌旅流�竜�竜 �凌 TOC 亮劉��旅 "
 "僚留 隆旅凌�慮�慮竜溜 留���.  �了劉粒両�竜 �凌 %s 粒旅留 留僚留硫留慮亮溜�竜旅�."
 
-#: ../libpurple/protocols/oscar/oscar.c:1494
-#: ../libpurple/protocols/oscar/oscar.c:1537
+#: ../libpurple/protocols/oscar/oscar.c:1533
+#: ../libpurple/protocols/oscar/oscar.c:1577
 msgid "Unable to get a valid AIM login hash."
 msgstr "�隆�僚留亮溜留 了流�侶� 竜僚�� 劉粒虜��凌� hash 竜旅��隆凌� ��凌 AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:1622
+#: ../libpurple/protocols/oscar/oscar.c:1574
+#: ../libpurple/protocols/oscar/oscar.c:1673
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr "��凌��僚隆竜慮流虜留�竜 �凌了� 粒�流粒凌�留.  �了劉粒両�竜 �凌 %s 粒旅留 留僚留硫留慮亮溜�竜旅�."
 
-#: ../libpurple/protocols/oscar/oscar.c:1625
+#: ../libpurple/protocols/oscar/oscar.c:1676
 msgid "Unable to get a valid login hash."
 msgstr "�隆�僚留亮溜留 了流�侶� 竜僚�� 劉粒虜��凌� hash 竜旅��隆凌�."
 
-#: ../libpurple/protocols/oscar/oscar.c:1655
+#: ../libpurple/protocols/oscar/oscar.c:1706
 msgid "Password sent"
 msgstr "��隆旅虜�� ��略了慮侶虜竜"
 
-#: ../libpurple/protocols/oscar/oscar.c:1711
+#: ../libpurple/protocols/oscar/oscar.c:1762
 msgid "Unable to initialize connection"
 msgstr "�隆�僚留亮溜留 隆侶亮旅凌��粒溜留� ��僚隆竜�侶�"
 
-#: ../libpurple/protocols/oscar/oscar.c:2202
+#: ../libpurple/protocols/oscar/oscar.c:2251
 msgid "Please authorize me so I can add you to my buddy list."
-msgstr ""
-"�留�留虜留了� 隆���竜 亮凌� 劉粒虜�旅�侶 ���竜 僚留 亮�凌�� 僚留 �留� ��凌�慮劉�� ��侶 了溜��留 �溜了�僚 亮凌�."
-
-#: ../libpurple/protocols/oscar/oscar.c:2230
+msgstr "�留�留虜留了� 隆���竜 亮凌� 劉粒虜�旅�侶 ���竜 僚留 亮�凌�� 僚留 �留� ��凌�慮劉�� ��侶 了溜��留 �溜了�僚 亮凌�."
+
+#: ../libpurple/protocols/oscar/oscar.c:2291
 msgid "Authorization Request Message:"
 msgstr "�流僚�亮留 留溜�侶�侶� 劉粒虜�旅�侶�:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2231
+#: ../libpurple/protocols/oscar/oscar.c:2292
 msgid "Please authorize me!"
 msgstr "�留�留虜留了� 隆���竜 亮凌� 劉粒虜�旅�侶!"
 
-#: ../libpurple/protocols/oscar/oscar.c:2272
-#: ../libpurple/protocols/oscar/oscar.c:2280
-#: ../libpurple/protocols/oscar/oscar.c:2407
-#: ../libpurple/protocols/oscar/oscar.c:5263
-#: ../libpurple/protocols/yahoo/yahoo.c:1030
+#: ../libpurple/protocols/oscar/oscar.c:2333
+#: ../libpurple/protocols/oscar/oscar.c:2341
+#: ../libpurple/protocols/oscar/oscar.c:2468
+#: ../libpurple/protocols/oscar/oscar.c:5360
+#: ../libpurple/protocols/yahoo/yahoo.c:991
 msgid "No reason given."
 msgstr "�竜僚 隆�慮侶虜竜 留旅�溜留."
 
-#: ../libpurple/protocols/oscar/oscar.c:2279
+#: ../libpurple/protocols/oscar/oscar.c:2340
 msgid "Authorization Denied Message:"
 msgstr "�流僚�亮留 略�僚侶�侶� 劉粒虜�旅�侶�:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2407
+#: ../libpurple/protocols/oscar/oscar.c:2468
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -8669,18 +9086,17 @@
 "粒旅留 �凌僚 留虜�了凌�慮凌 了�粒凌:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2408
+#: ../libpurple/protocols/oscar/oscar.c:2469
 msgid "ICQ authorization denied."
 msgstr "��僚侶�侶 劉粒虜�旅�侶� ICQ."
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2415
+#: ../libpurple/protocols/oscar/oscar.c:2476
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
-msgstr ""
-"� ��流��侶� %u 竜僚劉虜�旅僚竜 �凌 留溜�侶亮略 �留� 僚留 �凌僚 ��凌�慮劉�竜�竜 ��侶 了溜��留 �溜了�僚 �留�."
-
-#: ../libpurple/protocols/oscar/oscar.c:2423
+msgstr "� ��流��侶� %u 竜僚劉虜�旅僚竜 �凌 留溜�侶亮略 �留� 僚留 �凌僚 ��凌�慮劉�竜�竜 ��侶 了溜��留 �溜了�僚 �留�."
+
+#: ../libpurple/protocols/oscar/oscar.c:2484
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -8693,7 +9109,7 @@
 "���: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2431
+#: ../libpurple/protocols/oscar/oscar.c:2492
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -8706,7 +9122,7 @@
 "���: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2439
+#: ../libpurple/protocols/oscar/oscar.c:2500
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -8719,61 +9135,59 @@
 "里凌 亮流僚�亮留 竜溜僚留旅:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2460
+#: ../libpurple/protocols/oscar/oscar.c:2521
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "� ��流��侶� ICQ %u �留� 劉��竜旅了竜 劉僚留 �溜了凌: %s (%s)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2466
+#: ../libpurple/protocols/oscar/oscar.c:2527
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "�劉了竜�竜 僚留 ��凌�慮劉�竜�竜 留���僚 �凌 �溜了凌 ��侶 了溜��留 �溜了�僚 �留�;"
 
-#: ../libpurple/protocols/oscar/oscar.c:2471 ../pidgin/gtkroomlist.c:309
+#: ../libpurple/protocols/oscar/oscar.c:2532 ../pidgin/gtkroomlist.c:320
 msgid "_Add"
 msgstr "_��凌�慮流虜侶"
 
-#: ../libpurple/protocols/oscar/oscar.c:2472
+#: ../libpurple/protocols/oscar/oscar.c:2533
 msgid "_Decline"
 msgstr "_��僚侶�侶"
 
-#: ../libpurple/protocols/oscar/oscar.c:2596
+#: ../libpurple/protocols/oscar/oscar.c:2657
 #, 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:2605
+#: ../libpurple/protocols/oscar/oscar.c:2666
 #, 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:2614
-#, c-format
-msgid ""
-"You missed %hu message from %s because the rate limit has been exceeded."
-msgid_plural ""
-"You missed %hu messages from %s because the rate limit has been exceeded."
+#: ../libpurple/protocols/oscar/oscar.c:2675
+#, c-format
+msgid "You missed %hu message from %s because the rate limit has been exceeded."
+msgid_plural "You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr[0] "律略�留�竜 %hu 亮流僚�亮留 留�� %s 了�粒� ��劉�硫留�侶� �凌� 凌�溜凌� 竜��凌��."
 msgstr[1] "律略�留�竜 %hu 亮侶僚�亮留�留 留�� %s 了�粒� ��劉�硫留�侶� �凌� 凌�溜凌� 竜��凌��."
 
-#: ../libpurple/protocols/oscar/oscar.c:2623
+#: ../libpurple/protocols/oscar/oscar.c:2684
 #, 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:2632
+#: ../libpurple/protocols/oscar/oscar.c:2693
 #, 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:2641
+#: ../libpurple/protocols/oscar/oscar.c:2702
 #, 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."
@@ -8781,47 +9195,47 @@
 msgstr[1] "律略�留�竜 %hu 亮侶僚�亮留�留 留�� %s 粒旅留 略粒僚���凌 了�粒凌."
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2796
+#: ../libpurple/protocols/oscar/oscar.c:2857
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "�隆�僚留亮溜留 留�凌��凌了流� 亮侶僚�亮留�凌�: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2796
-#: ../libpurple/protocols/oscar/oscar.c:2801
-#: ../libpurple/protocols/oscar/oscar.c:2865
+#: ../libpurple/protocols/oscar/oscar.c:2857
+#: ../libpurple/protocols/oscar/oscar.c:2862
+#: ../libpurple/protocols/oscar/oscar.c:2926
 msgid "Unknown reason."
 msgstr "�粒僚���侶 留旅�溜留."
 
-#: ../libpurple/protocols/oscar/oscar.c:2799
-#: ../libpurple/protocols/sametime/sametime.c:2409
+#: ../libpurple/protocols/oscar/oscar.c:2860
+#: ../libpurple/protocols/sametime/sametime.c:2459
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "�隆�僚留�凌 僚留 ��留了竜溜 ��凌 亮流僚�亮留 �竜 %s:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2865
+#: ../libpurple/protocols/oscar/oscar.c:2926
 #, c-format
 msgid "User information not available: %s"
 msgstr "�了侶�凌�凌�溜竜� ��流��侶 亮侶 隆旅留慮劉�旅亮竜�: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2896
+#: ../libpurple/protocols/oscar/oscar.c:2957
 msgid "Online Since"
 msgstr "裡�僚隆竜隆竜亮劉僚凌� 留��"
 
-#: ../libpurple/protocols/oscar/oscar.c:2901
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1185
+#: ../libpurple/protocols/oscar/oscar.c:2962
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1191
 msgid "Member Since"
 msgstr "�劉了凌� 留��"
 
-#: ../libpurple/protocols/oscar/oscar.c:2936
+#: ../libpurple/protocols/oscar/oscar.c:2997
 msgid "Available Message"
 msgstr "�旅留慮劉�旅亮凌 亮流僚�亮留"
 
-#: ../libpurple/protocols/oscar/oscar.c:3044
+#: ../libpurple/protocols/oscar/oscar.c:3101
 msgid "Your AIM connection may be lost."
 msgstr "� ��僚隆竜�流 �留� AIM 亮�凌�竜溜 僚留 �留慮竜溜."
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3232
+#: ../libpurple/protocols/oscar/oscar.c:3289
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -8829,7 +9243,7 @@
 "[�隆�僚留�侶 侶 竜亮�略僚旅�侶 竜僚�� 亮侶僚�亮留�凌� 留�� 留���僚 �凌 ��流��侶 竜�竜旅隆流 �竜�旅竜溜�竜 "
 "了留僚慮留�亮劉僚凌�� �留�留虜�流�竜�.]"
 
-#: ../libpurple/protocols/oscar/oscar.c:3396
+#: ../libpurple/protocols/oscar/oscar.c:3453
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -8837,83 +9251,82 @@
 "� �竜了竜��留溜留 ��凌��略慮竜旅留 竜僚劉�粒竜旅留� 隆竜僚 亮�凌�凌��竜 僚留 竜�留�亮凌��竜溜 了�粒� ��劉�硫留�侶� "
 "�凌� 凌�溜凌� 竜��凌��. �留�留虜留了凌�亮竜 �竜�旅亮劉僚竜�竜 10 隆竜��竜��了竜��留 虜留旅 両留僚留��凌��留慮流��竜."
 
-#: ../libpurple/protocols/oscar/oscar.c:3479
+#: ../libpurple/protocols/oscar/oscar.c:3538
 #: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "��凌��僚隆竜慮流虜留�竜 留�� �凌 隆�亮略�旅凌 ��龍流�侶�侶� %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:3729
-#: ../libpurple/protocols/silc/util.c:585
+#: ../libpurple/protocols/oscar/oscar.c:3762
+#: ../libpurple/protocols/silc/util.c:591
 #: ../libpurple/protocols/silc10/util.c:581
 msgid "Mobile Phone"
 msgstr "�旅僚侶�� �侶了劉��僚凌"
 
-#: ../libpurple/protocols/oscar/oscar.c:3759
+#: ../libpurple/protocols/oscar/oscar.c:3792
 msgid "Personal Web Page"
 msgstr "��凌���旅虜流 旅��凌�竜了溜隆留"
 
-#: ../libpurple/protocols/oscar/oscar.c:3783
+#: ../libpurple/protocols/oscar/oscar.c:3816
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "����慮竜�竜� �了侶�凌�凌�溜竜�"
 
-#: ../libpurple/protocols/oscar/oscar.c:3791
-#: ../libpurple/protocols/oscar/oscar.c:3804
+#: ../libpurple/protocols/oscar/oscar.c:3824
+#: ../libpurple/protocols/oscar/oscar.c:3837
 msgid "Zip Code"
 msgstr "里留�. ��隆旅虜留�"
 
-#: ../libpurple/protocols/oscar/oscar.c:3815
+#: ../libpurple/protocols/oscar/oscar.c:3848
 msgid "Division"
 msgstr "里亮流亮留"
 
-#: ../libpurple/protocols/oscar/oscar.c:3816
+#: ../libpurple/protocols/oscar/oscar.c:3849
 msgid "Position"
 msgstr "�劉�侶"
 
-#: ../libpurple/protocols/oscar/oscar.c:3818
+#: ../libpurple/protocols/oscar/oscar.c:3851
 msgid "Web Page"
 msgstr "���凌�竜了溜隆留"
 
-#: ../libpurple/protocols/oscar/oscar.c:3821
+#: ../libpurple/protocols/oscar/oscar.c:3854
 msgid "Work Information"
 msgstr "�了侶�凌�凌�溜竜� 竜�粒留�溜留�"
 
-#: ../libpurple/protocols/oscar/oscar.c:3877
+#: ../libpurple/protocols/oscar/oscar.c:3910
 msgid "Pop-Up Message"
 msgstr "�僚留隆��亮竜僚凌 亮流僚�亮留"
 
-#: ../libpurple/protocols/oscar/oscar.c:3917
+#: ../libpurple/protocols/oscar/oscar.c:3950
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] "里o 留虜�了凌�慮凌 竜亮�留僚旅龍�亮竜僚凌 �僚凌亮留 劉�竜旅 ��劉�侶 亮竜 %s"
 msgstr[1] "里留 留虜�了凌�慮留 竜亮�留僚旅龍�亮竜僚留 凌僚�亮留�留 劉�凌�僚 ��劉�侶 亮竜 %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3922
+#: ../libpurple/protocols/oscar/oscar.c:3955
 msgid "Screen name"
 msgstr "�亮�留僚旅龍�亮竜僚凌 �僚凌亮留"
 
-#: ../libpurple/protocols/oscar/oscar.c:3948
+#: ../libpurple/protocols/oscar/oscar.c:3981
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "�竜 硫�劉慮侶虜留僚 留�凌�竜了劉�亮留�留 粒旅留 �侶 隆旅竜�慮�僚�侶 e-mail %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3969
+#: ../libpurple/protocols/oscar/oscar.c:4002
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "��劉�竜旅 僚留 了略硫竜�竜 劉僚留 e-mail 竜�旅硫竜硫留溜��侶� �凌� %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:3971
+#: ../libpurple/protocols/oscar/oscar.c:4004
 msgid "Account Confirmation Requested"
 msgstr "�旅�流慮侶虜竜 竜�旅硫竜硫留溜��侶 了凌粒留�旅留�亮凌�"
 
-#: ../libpurple/protocols/oscar/oscar.c:4002
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:4035
 msgid "Error Changing Account Info"
 msgstr "裡�略了亮留 虜留�略 �侶僚 留了了留粒流 ��僚 �了侶�凌�凌�旅�僚 了凌粒留�旅留�亮凌�"
 
-#: ../libpurple/protocols/oscar/oscar.c:4005
+#: ../libpurple/protocols/oscar/oscar.c:4038
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8922,14 +9335,14 @@
 "裡�略了亮留 0x%04x: �隆�僚留亮溜留 隆旅留亮�����侶� �凌� 竜亮�留僚旅龍�亮竜僚凌� 凌僚�亮留�凌� 竜�竜旅隆流 �凌 "
 "龍侶�凌�亮竜僚凌 竜亮�留僚旅龍�亮竜僚凌 �僚凌亮留 隆旅留�劉�竜旅 留�� �凌 留��旅虜�."
 
-#: ../libpurple/protocols/oscar/oscar.c:4008
+#: ../libpurple/protocols/oscar/oscar.c:4041
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr ""
 "裡�略了亮留 0x%04x: �隆�僚留亮溜留 隆旅留亮�����侶� �凌� 竜亮�留僚旅龍�亮竜僚凌� 凌僚�亮留�凌� 竜�竜旅隆流 隆竜僚 "
 "竜溜僚留旅 劉粒虜��凌."
 
-#: ../libpurple/protocols/oscar/oscar.c:4011
+#: ../libpurple/protocols/oscar/oscar.c:4044
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8938,7 +9351,7 @@
 "裡�略了亮留 0x%04x: �隆�僚留亮溜留 隆旅留亮�����侶� �凌� 竜亮�留僚旅龍�亮竜僚凌� 凌僚�亮留�凌� 竜�竜旅隆流 �凌 "
 "龍侶�凌�亮竜僚凌 竜亮�留僚旅龍�亮竜僚凌 �僚凌亮留 竜溜僚留旅 �凌了� 亮竜粒略了凌."
 
-#: ../libpurple/protocols/oscar/oscar.c:4014
+#: ../libpurple/protocols/oscar/oscar.c:4047
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
@@ -8947,7 +9360,7 @@
 "裡�略了亮留 0x%04x: �隆�僚留亮溜留 留了了留粒流� �侶� 侶了. 隆旅竜�慮�僚�侶� 竜�竜旅隆流 ��略��竜旅 亮溜留 留溜�侶�侶 "
 "�凌� 竜虜虜�竜亮竜溜 粒旅留 留��� �凌 竜亮�留僚旅龍�亮竜僚凌 �僚凌亮留."
 
-#: ../libpurple/protocols/oscar/oscar.c:4017
+#: ../libpurple/protocols/oscar/oscar.c:4050
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -8956,7 +9369,7 @@
 "裡�略了亮留 0x%04x: �隆�僚留亮溜留 留了了留粒流� �侶� 侶了. 隆旅竜�慮�僚�侶� 竜�竜旅隆流 侶 隆旅竜�慮�僚�侶 �凌� "
 "隆�慮侶虜竜 ��竜�溜龍竜�留旅 亮竜 �凌了了略 竜亮�留僚旅龍�亮竜僚留 凌僚�亮留�留."
 
-#: ../libpurple/protocols/oscar/oscar.c:4020
+#: ../libpurple/protocols/oscar/oscar.c:4053
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
@@ -8965,32 +9378,31 @@
 "Error 0x%04x: �隆�僚留亮溜留 留了了留粒流� �侶� 侶了. 隆旅竜�慮�僚�侶� 竜�竜旅隆流 侶 隆旅竜�慮�僚�侶 �凌� "
 "隆�慮侶虜竜 隆竜僚 竜溜僚留旅 劉粒虜��侶."
 
-#: ../libpurple/protocols/oscar/oscar.c:4023
+#: ../libpurple/protocols/oscar/oscar.c:4056
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Error 0x%04x: �粒僚���凌 ��略了亮留."
 
-#: ../libpurple/protocols/oscar/oscar.c:4033
+#: ../libpurple/protocols/oscar/oscar.c:4066
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "� 隆旅竜�慮�僚�侶 e-mail �凌� %s 竜溜僚留旅 %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4035
+#: ../libpurple/protocols/oscar/oscar.c:4068
 msgid "Account Info"
 msgstr "�了侶�凌�凌�溜竜� 了凌粒留�旅留�亮凌�"
 
-#: ../libpurple/protocols/oscar/oscar.c:4218
-msgid ""
-"Your IM Image was not sent. You must be Direct Connected to send IM Images."
+#: ../libpurple/protocols/oscar/oscar.c:4251
+msgid "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 "里凌 略亮竜�凌 亮流僚�亮留 竜旅虜�僚留 �留� 隆竜 ��略了慮侶虜竜. ��劉�竜旅 僚留 竜溜��竜 留�竜�慮竜溜留� "
 "��僚隆竜隆竜亮劉僚凌旅 粒旅留 僚留 ��竜溜了竜�竜 略亮竜�留 亮侶僚�亮留�留 竜旅虜�僚�僚."
 
-#: ../libpurple/protocols/oscar/oscar.c:4489
+#: ../libpurple/protocols/oscar/oscar.c:4520
 msgid "Unable to set AIM profile."
 msgstr "�隆�僚留亮溜留 凌�旅�亮凌� ��凌�溜了 AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:4490
+#: ../libpurple/protocols/oscar/oscar.c:4521
 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 "
@@ -9000,7 +9412,7 @@
 "��凌�溜了 �留� �留�留亮劉僚竜旅 亮侶 凌�旅�亮劉僚凌, ��凌��留慮流��竜 僚留 �凌 両留僚留凌�溜�竜�竜 ��留僚 "
 "��僚隆竜慮竜溜�竜 �了流���."
 
-#: ../libpurple/protocols/oscar/oscar.c:4504
+#: ../libpurple/protocols/oscar/oscar.c:4535
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
@@ -9015,11 +9427,11 @@
 "離�竜�硫流虜留�竜 �凌 亮劉粒旅��凌 亮劉粒竜慮凌� ��凌�溜了 ��僚 %d bytes.  里凌 ��凌�溜了 �竜�旅凌�溜��侶虜竜 "
 "粒旅留 竜�略�."
 
-#: ../libpurple/protocols/oscar/oscar.c:4509
+#: ../libpurple/protocols/oscar/oscar.c:4540
 msgid "Profile too long."
 msgstr "�凌了� 亮竜粒略了凌 ��凌�溜了."
 
-#: ../libpurple/protocols/oscar/oscar.c:4554
+#: ../libpurple/protocols/oscar/oscar.c:4584
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -9034,48 +9446,49 @@
 "離�竜�硫流虜留�竜 �凌 亮劉粒旅��凌 亮劉粒竜慮凌� 亮侶僚�亮留�凌� 留�凌��溜留� ��僚 %d bytes.  里凌 亮流僚�亮留 "
 "�竜�旅虜��侶虜竜 粒旅留 竜�略�."
 
-#: ../libpurple/protocols/oscar/oscar.c:4559
+#: ../libpurple/protocols/oscar/oscar.c:4589
 msgid "Away message too long."
 msgstr "�凌了� 亮竜粒略了凌 亮流僚�亮留 留�凌��溜留�."
 
-#: ../libpurple/protocols/oscar/oscar.c:4628
-#, fuzzy, c-format
+#: ../libpurple/protocols/oscar/oscar.c:4662
+#, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
 "must be a valid email address, or start with a letter and contain only "
 "letters, numbers and spaces, or contain only numbers."
 msgstr ""
 "�竜僚 流�留僚 隆�僚留�流 侶 ��凌�慮流虜侶 �凌� �溜了凌� %s 竜�竜旅隆流 �凌 竜亮�留僚旅龍�亮竜僚凌 �僚凌亮留 隆竜僚 "
-"竜溜僚留旅 劉粒虜��凌.  里留 竜亮�留僚旅龍�亮竜僚留 凌僚�亮留�留 両竜虜旅僚凌�僚 亮竜 劉僚留 粒�略亮亮留 虜留旅 僚留 "
-"�竜�旅劉�凌�僚 亮�僚凌 粒�略亮亮留�留, 留�旅慮亮凌�� 虜留旅 虜竜僚略, 流 僚留 �竜�旅劉�凌�僚 亮�僚凌 留�旅慮亮凌��."
-
-#: ../libpurple/protocols/oscar/oscar.c:4630
-#: ../libpurple/protocols/oscar/oscar.c:5060
-#: ../libpurple/protocols/oscar/oscar.c:5075
+"竜溜僚留旅 劉粒虜��凌.  里留 竜亮�留僚旅龍�亮竜僚留 凌僚�亮留�留 ��劉�竜旅 僚留 竜溜僚留旅 亮溜留 劉粒虜��侶 隆旅竜�慮�僚�侶 "
+"侶了竜虜��凌僚旅虜凌� �留��隆�凌亮竜溜凌�, 流 両竜虜旅僚凌�僚 亮竜 劉僚留 粒�略亮亮留 虜留旅 僚留  �竜�旅劉�凌�僚 亮�僚凌 "
+"粒�略亮亮留�留, 留�旅慮亮凌�� 虜留旅 虜竜僚略, 流 僚留 �竜�旅劉�凌�僚 亮�僚凌 留�旅慮亮凌��."
+
+#: ../libpurple/protocols/oscar/oscar.c:4664
+#: ../libpurple/protocols/oscar/oscar.c:5129
+#: ../libpurple/protocols/oscar/oscar.c:5144
 msgid "Unable To Add"
 msgstr "�隆�僚留�侶 侶 ��凌�慮流虜侶"
 
-#: ../libpurple/protocols/oscar/oscar.c:4739
+#: ../libpurple/protocols/oscar/oscar.c:4783
 msgid "Unable To Retrieve Buddy List"
 msgstr "�隆�僚留�侶 侶 了流�侶 �侶� 了溜��留� �溜了�僚"
 
-#: ../libpurple/protocols/oscar/oscar.c:4740
+#: ../libpurple/protocols/oscar/oscar.c:4784
 msgid ""
 "The AIM servers were temporarily unable to send your buddy list.  Your buddy "
-"list is not lost, and will probably become available in a few hours."
+"list is not lost, and will probably become available in a few minutes."
 msgstr ""
 "�旅 竜両��侶�竜�侶�劉� AIM 隆竜僚 亮�凌�凌��留僚 僚留 �留� ��竜溜了凌�僚 �侶 了溜��留 �溜了�僚 ��凌���旅僚略.  "
-"� 了溜��留 �溜了�僚 �留� 隆竜 �略慮侶虜竜, 虜留旅 亮略了了凌僚 慮留 竜溜僚留旅 隆旅留慮劉�旅亮侶 �竜 了溜粒竜� ��竜�."
-
-#: ../libpurple/protocols/oscar/oscar.c:4922
-#: ../libpurple/protocols/oscar/oscar.c:4924
-#: ../libpurple/protocols/oscar/oscar.c:5140
-#: ../libpurple/protocols/oscar/oscar.c:5141
-#: ../libpurple/protocols/oscar/oscar.c:5146
+"� 了溜��留 �溜了�僚 �留� 隆竜 �略慮侶虜竜, 虜留旅 亮略了了凌僚 慮留 竜溜僚留旅 隆旅留慮劉�旅亮侶 �竜 了溜粒留 了竜��略."
+
+#: ../libpurple/protocols/oscar/oscar.c:4979
+#: ../libpurple/protocols/oscar/oscar.c:4981
+#: ../libpurple/protocols/oscar/oscar.c:5211
+#: ../libpurple/protocols/oscar/oscar.c:5212
+#: ../libpurple/protocols/oscar/oscar.c:5217
 msgid "Orphans"
 msgstr "���留僚略"
 
-#: ../libpurple/protocols/oscar/oscar.c:5058
+#: ../libpurple/protocols/oscar/oscar.c:5127
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -9084,17 +9497,17 @@
 "�隆�僚留�侶 侶 ��凌�慮流虜侶 �凌� %s 竜�竜旅隆流 劉�竜�竜 �略�留 �凌了了凌�� �溜了凌�� ��侶 了溜��留 �溜了�僚 "
 "�留�.  �留�留虜留了凌�亮竜 留�留旅�劉��竜 劉僚留僚 虜留旅 両留僚留��凌��留慮流��竜."
 
-#: ../libpurple/protocols/oscar/oscar.c:5058
-#: ../libpurple/protocols/oscar/oscar.c:5073
+#: ../libpurple/protocols/oscar/oscar.c:5127
+#: ../libpurple/protocols/oscar/oscar.c:5142
 msgid "(no name)"
 msgstr "(���溜� �僚凌亮留)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5072
-#, fuzzy, c-format
+#: ../libpurple/protocols/oscar/oscar.c:5141
+#, c-format
 msgid "Could not add the buddy %s for an unknown reason."
-msgstr "� 竜僚�凌了流 留�劉���竜 粒旅留 略粒僚���凌 了�粒凌."
-
-#: ../libpurple/protocols/oscar/oscar.c:5178
+msgstr "�竜僚 流�留僚 隆�僚留�流 侶 ��凌�慮流虜侶 �凌� �溜了凌� %s 粒旅留 略粒僚���凌 了�粒凌."
+
+#: ../libpurple/protocols/oscar/oscar.c:5275
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -9103,23 +9516,22 @@
 "� ��流��侶� %s �留� 劉隆��竜 �侶僚 略隆竜旅留 僚留 �留� ��凌�慮劉�竜旅 ��侶 了溜��留 �溜了�僚 �凌�.  "
 "��竜溜� 慮劉了竜�竜 僚留 �凌僚 ��凌�慮劉�竜�竜 ��侶 隆旅虜流 �留� 了溜��留 �溜了�僚;"
 
-#: ../libpurple/protocols/oscar/oscar.c:5186
+#: ../libpurple/protocols/oscar/oscar.c:5283
 msgid "Authorization Given"
 msgstr "��慮侶虜竜 劉粒虜�旅�侶"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5259
+#: ../libpurple/protocols/oscar/oscar.c:5356
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
-msgstr ""
-"� ��流��侶� %s 竜僚劉虜�旅僚竜 �凌 留溜�侶亮略 �留� 僚留 �凌僚 ��凌�慮劉�竜�竜 ��侶 了溜��留 �溜了�僚 �留�."
-
-#: ../libpurple/protocols/oscar/oscar.c:5260
+msgstr "� ��流��侶� %s 竜僚劉虜�旅僚竜 �凌 留溜�侶亮略 �留� 僚留 �凌僚 ��凌�慮劉�竜�竜 ��侶 了溜��留 �溜了�僚 �留�."
+
+#: ../libpurple/protocols/oscar/oscar.c:5357
 msgid "Authorization Granted"
 msgstr "�粒虜�溜慮侶虜竜"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5263
+#: ../libpurple/protocols/oscar/oscar.c:5360
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -9130,53 +9542,49 @@
 "粒旅留 �凌僚 留虜�了凌�慮凌 了�粒凌:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5264
+#: ../libpurple/protocols/oscar/oscar.c:5361
 msgid "Authorization Denied"
 msgstr "��僚侶�侶 劉粒虜�旅�侶�"
 
-#: ../libpurple/protocols/oscar/oscar.c:5300
+#: ../libpurple/protocols/oscar/oscar.c:5397
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "_�僚�留了了留粒流:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5340
-msgid "Invalid chat name specified."
-msgstr "��溜��侶虜竜 亮侶 劉粒虜��凌 �僚凌亮留 ��龍流�侶�侶�."
-
-#: ../libpurple/protocols/oscar/oscar.c:5409
+#: ../libpurple/protocols/oscar/oscar.c:5510
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 "里凌 略亮竜�凌 亮流僚�亮留 竜旅虜�僚留 �留� 隆竜 ��略了慮侶虜竜. �竜僚 亮�凌�竜溜�竜 僚留 ��竜溜了竜�竜 略亮竜�留 "
 "亮侶僚�亮留�留 竜旅虜�僚留� �竜 ��龍侶�流�竜旅� AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:5569
-#: ../libpurple/protocols/oscar/oscar.c:5574
+#: ../libpurple/protocols/oscar/oscar.c:5672
+#: ../libpurple/protocols/oscar/oscar.c:5677
 msgid "Away Message"
 msgstr "�流僚�亮留 留�凌��溜留�"
 
-#: ../libpurple/protocols/oscar/oscar.c:5574
+#: ../libpurple/protocols/oscar/oscar.c:5677
 msgid "<i>(retrieving)</i>"
 msgstr " <i>(了流�侶)</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:5774
+#: ../libpurple/protocols/oscar/oscar.c:5877
 msgid "iTunes Music Store Link"
 msgstr "�了竜虜��凌僚旅虜� 虜留�略��侶亮留 亮凌��旅虜流� iTunes"
 
-#: ../libpurple/protocols/oscar/oscar.c:5882
+#: ../libpurple/protocols/oscar/oscar.c:5985
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "裡��了旅凌 �凌� �溜了凌� 粒旅留 %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5883
+#: ../libpurple/protocols/oscar/oscar.c:5986
 msgid "Buddy Comment:"
 msgstr "裡��了旅凌 �溜了凌�:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5930
+#: ../libpurple/protocols/oscar/oscar.c:6033
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "��旅了劉両留�竜 僚留 留僚凌溜両竜�竜 亮溜留 留�竜�慮竜溜留� ��僚隆竜�侶 略亮竜��僚 亮侶僚�亮略��僚 亮竜 %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:5934
+#: ../libpurple/protocols/oscar/oscar.c:6037
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
@@ -9184,68 +9592,68 @@
 "��竜旅隆流 留��� 留�凌虜留了���竜旅 �侶僚 隆旅竜�慮�僚�侶 IP �留�, ��凌�竜溜 僚留 慮竜��侶慮竜溜 �� 虜溜僚隆�僚凌� "
 "留��留了竜溜留�.  �劉了竜�竜 僚留 ��僚竜�溜�竜�竜;"
 
-#: ../libpurple/protocols/oscar/oscar.c:5940
-#: ../libpurple/protocols/oscar/peer.c:1045
+#: ../libpurple/protocols/oscar/oscar.c:6043
+#: ../libpurple/protocols/oscar/peer.c:1047
 msgid "C_onnect"
 msgstr "_裡�僚隆竜�侶"
 
-#: ../libpurple/protocols/oscar/oscar.c:5975
+#: ../libpurple/protocols/oscar/oscar.c:6078
 msgid "Get AIM Info"
 msgstr "�流�侶 �了侶�凌�凌�旅�僚 AIM"
 
-#: ../libpurple/protocols/oscar/oscar.c:5981
+#: ../libpurple/protocols/oscar/oscar.c:6084
 msgid "Edit Buddy Comment"
 msgstr "��竜両竜�粒留�溜留 ��凌了溜凌� �溜了凌�"
 
-#: ../libpurple/protocols/oscar/oscar.c:5989
+#: ../libpurple/protocols/oscar/oscar.c:6092
 msgid "Get Status Msg"
 msgstr "�流�侶 亮侶僚�亮留�凌� 虜留�略��留�侶�"
 
-#: ../libpurple/protocols/oscar/oscar.c:6002
+#: ../libpurple/protocols/oscar/oscar.c:6105
 msgid "Direct IM"
 msgstr "��竜�慮竜溜留� 略亮竜�凌 亮流僚�亮留"
 
-#: ../libpurple/protocols/oscar/oscar.c:6024
+#: ../libpurple/protocols/oscar/oscar.c:6127
 msgid "Re-request Authorization"
 msgstr "�溜�侶�侶 劉粒虜�旅�侶� (両留僚略)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6083
+#: ../libpurple/protocols/oscar/oscar.c:6186
 msgid "Require authorization"
 msgstr "�溜�侶�侶 劉粒虜�旅�侶�"
 
-#: ../libpurple/protocols/oscar/oscar.c:6086
+#: ../libpurple/protocols/oscar/oscar.c:6189
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr ""
 "�亮�留僚流� ��凌僚 旅��� (竜僚竜�粒凌�凌旅�僚�留� �凌, �溜粒凌��留 慮留 留��溜�竜�竜 僚留 了留亮硫略僚竜�竜 "
 "竜僚凌�了侶�旅虜略 亮侶僚�亮留�留!)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6091
+#: ../libpurple/protocols/oscar/oscar.c:6194
 msgid "ICQ Privacy Options"
 msgstr "��旅了凌粒劉� 竜亮�旅��竜��旅虜��侶�留� ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:6110
+#: ../libpurple/protocols/oscar/oscar.c:6213
 msgid "The new formatting is invalid."
 msgstr "� 僚劉留 亮凌��流 竜溜僚留旅 亮侶 劉粒虜��侶."
 
-#: ../libpurple/protocols/oscar/oscar.c:6111
+#: ../libpurple/protocols/oscar/oscar.c:6214
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 "� 亮凌��凌�凌溜侶�侶 �凌� 竜亮�留僚旅龍�亮竜僚凌� 凌僚�亮留�凌� 亮�凌�竜溜 僚留 留了了略両竜旅 亮�僚凌 �侶僚 "
 "虜竜�留了留旅凌�凌溜侶�侶 ��僚 粒�留亮亮略��僚 虜留旅 �留 虜竜僚略."
 
-#: ../libpurple/protocols/oscar/oscar.c:6164
+#: ../libpurple/protocols/oscar/oscar.c:6267
 msgid "Change Address To:"
 msgstr "�了了留粒流 隆旅竜�慮�僚�侶� �竜:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6210
+#: ../libpurple/protocols/oscar/oscar.c:6313
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>隆竜僚 留僚留亮劉僚竜�竜 劉粒虜�旅�侶</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6213
+#: ../libpurple/protocols/oscar/oscar.c:6316
 msgid "You are awaiting authorization from the following buddies"
 msgstr "�僚留亮劉僚竜�竜 劉粒虜�旅�侶 留�� �凌�� 留虜�了凌�慮凌�� �溜了凌��"
 
-#: ../libpurple/protocols/oscar/oscar.c:6214
+#: ../libpurple/protocols/oscar/oscar.c:6317
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -9253,100 +9661,94 @@
 "��凌�竜溜�竜 僚留 両留僚留龍侶�流�竜�竜 劉粒虜�旅�侶 留�� 留��凌�� �凌� �溜了凌�� 虜略僚凌僚�留� 隆竜両溜 虜了旅虜 "
 "竜�略僚� �凌�� 虜留旅 竜�旅了劉粒凌僚�留� \"�溜�侶�侶 劉粒虜�旅�侶� (両留僚略).\""
 
-#: ../libpurple/protocols/oscar/oscar.c:6231
+#: ../libpurple/protocols/oscar/oscar.c:6334
 msgid "Find Buddy by E-Mail"
 msgstr "���竜�侶 �溜了凌� 亮竜 e-mail"
 
-#: ../libpurple/protocols/oscar/oscar.c:6232
+#: ../libpurple/protocols/oscar/oscar.c:6335
 msgid "Search for a buddy by e-mail address"
 msgstr "�僚留龍流�侶�侶 竜僚�� �溜了凌� 亮竜 e-mail"
 
-#: ../libpurple/protocols/oscar/oscar.c:6233
+#: ../libpurple/protocols/oscar/oscar.c:6336
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "�了侶虜��凌了凌粒竜溜��竜 �凌 e-mail �凌� �溜了凌� �凌� �略�僚竜�竜."
 
-#: ../libpurple/protocols/oscar/oscar.c:6236
+#: ../libpurple/protocols/oscar/oscar.c:6339
 msgid "_Search"
 msgstr "_�僚留龍流�侶�侶"
 
-#: ../libpurple/protocols/oscar/oscar.c:6394
+#: ../libpurple/protocols/oscar/oscar.c:6497
 msgid "Set User Info (URL)..."
 msgstr "��旅�亮�� �了侶�凌�凌�旅�僚 ��流��侶 (URL)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6405
+#: ../libpurple/protocols/oscar/oscar.c:6508
 msgid "Change Password (URL)"
 msgstr "�了了留粒流 虜�隆旅虜凌� (URL)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6409
+#: ../libpurple/protocols/oscar/oscar.c:6512
 msgid "Configure IM Forwarding (URL)"
 msgstr "痢�慮亮旅�侶 ��凌�慮侶�侶� 略亮竜��僚 亮侶僚�亮略��僚 (URL)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6419
+#: ../libpurple/protocols/oscar/oscar.c:6522
 msgid "Set Privacy Options..."
 msgstr "��旅了凌粒劉� 竜亮�旅��竜��旅虜��侶�留�..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6426
+#: ../libpurple/protocols/oscar/oscar.c:6529
 msgid "Confirm Account"
 msgstr "��旅硫竜硫留溜��侶 了凌粒留�旅留�亮凌�"
 
-#: ../libpurple/protocols/oscar/oscar.c:6430
+#: ../libpurple/protocols/oscar/oscar.c:6533
 msgid "Display Currently Registered E-Mail Address"
 msgstr "�亮�略僚旅�侶 虜留�留���侶亮劉僚侶� 隆旅竜�慮�僚�侶� e-mail"
 
-#: ../libpurple/protocols/oscar/oscar.c:6434
+#: ../libpurple/protocols/oscar/oscar.c:6537
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "�了了留粒流 虜留�留���侶亮劉僚侶� 隆旅竜�慮�僚�侶� e-mail..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6441
+#: ../libpurple/protocols/oscar/oscar.c:6544
 msgid "Show Buddies Awaiting Authorization"
 msgstr "�亮�略僚旅�侶 �溜了�僚 �凌� �竜�旅亮劉僚凌�僚 劉粒虜�旅�侶"
 
-#: ../libpurple/protocols/oscar/oscar.c:6447
+#: ../libpurple/protocols/oscar/oscar.c:6550
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "�僚留龍流�侶�侶 �溜了凌� 亮竜 e-mail..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6452
+#: ../libpurple/protocols/oscar/oscar.c:6555
 msgid "Search for Buddy by Information"
 msgstr "�僚留龍流�侶�侶 �溜了凌� 亮竜 �了侶�凌�凌�溜竜�"
 
-#: ../libpurple/protocols/oscar/oscar.c:6520
-msgid "Use recent buddies group"
-msgstr "律�流�侶 ��凌��略��僚 凌亮略隆�僚 �溜了�僚"
-
-#: ../libpurple/protocols/oscar/oscar.c:6523
-msgid "Show how long you have been idle"
-msgstr "�亮�略僚旅�侶 ���侶� ��留� 流�留��留僚 留僚竜僚竜�粒凌溜"
-
-#: ../libpurple/protocols/oscar/oscar.c:6678
-msgid ""
-"Always use ICQ proxy server for file transfers\n"
-"(slower, but does not reveal your IP address)"
-msgstr "�略僚�留 ��流�侶 隆旅留亮竜�凌了留硫侶�流 ICQ (留�粒�, 留了了略 ��僚流慮�� 隆凌�了竜�竜旅)"
-
-#: ../libpurple/protocols/oscar/peer.c:697
+#: ../libpurple/protocols/oscar/oscar.c:6754
+msgid ""
+"Always use AIM/ICQ proxy server for\n"
+"file transfers and direct IM (slower,\n"
+"but does not reveal your IP address)"
+msgstr ""
+"�略僚�留 ��流�侶 �凌� 隆旅留亮竜�凌了留硫侶�流 AIM/ICQ 粒旅留 \n"
+"�旅� 亮竜�留�凌�劉� 留��竜溜�僚 虜留旅 �留 略亮竜�留 亮侶僚�亮留�留 \n"
+"(�旅凌 留�粒� 留了了略 隆竜僚 留�凌虜留了���竜旅 �侶 隆旅竜�慮�僚�侶 IP �留�)"
+
+#: ../libpurple/protocols/oscar/peer.c:699
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
-msgstr ""
-"�溜�侶�侶 �竜 %s 僚留 ��僚隆竜慮竜溜 亮留龍溜 亮留� ��旅� %s:%hu 粒旅留 留�竜�慮竜溜留� 略亮竜�留 亮侶僚�亮留�留."
-
-#: ../libpurple/protocols/oscar/peer.c:782
+msgstr "�溜�侶�侶 �竜 %s 僚留 ��僚隆竜慮竜溜 亮留龍溜 亮留� ��旅� %s:%hu 粒旅留 留�竜�慮竜溜留� 略亮竜�留 亮侶僚�亮留�留."
+
+#: ../libpurple/protocols/oscar/peer.c:784
 #, c-format
 msgid "Attempting to connect to %s:%hu."
 msgstr "��凌��略慮竜旅留 ��僚隆竜�侶� 亮竜 %s:%hu."
 
-#: ../libpurple/protocols/oscar/peer.c:856
-#, c-format
+#: ../libpurple/protocols/oscar/peer.c:858
 msgid "Attempting to connect via proxy server."
 msgstr "��凌��略慮竜旅留 ��僚隆竜�侶� 亮竜 隆旅留亮竜�凌了留硫侶�流."
 
-#: ../libpurple/protocols/oscar/peer.c:1033
+#: ../libpurple/protocols/oscar/peer.c:1035
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s 亮�了旅� 龍流�侶�竜 留�竜�慮竜溜留� ��僚隆竜�侶 亮竜 %s"
 
-#: ../libpurple/protocols/oscar/peer.c:1037
+#: ../libpurple/protocols/oscar/peer.c:1039
 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 "
@@ -9508,20 +9910,20 @@
 msgid "Other"
 msgstr "�了了凌"
 
-#: ../libpurple/protocols/qq/buddy_info.c:481
-#: ../libpurple/protocols/qq/buddy_info.c:482
+#: ../libpurple/protocols/qq/buddy_info.c:522
+#: ../libpurple/protocols/qq/buddy_info.c:523
 msgid "Modify my information"
 msgstr "里�凌�凌�凌溜侶�侶 ��僚 �了侶�凌�凌�旅�僚 亮凌�"
 
-#: ../libpurple/protocols/qq/buddy_info.c:483
+#: ../libpurple/protocols/qq/buddy_info.c:524
 msgid "Update my information"
 msgstr "�僚留僚劉��侶 ��僚 �了侶�凌�凌�旅�僚 亮凌�"
 
-#: ../libpurple/protocols/qq/buddy_info.c:507
+#: ../libpurple/protocols/qq/buddy_info.c:548
 msgid "Your information has been updated"
 msgstr "�旅 �了侶�凌�凌�溜竜� �留� 劉�凌�僚 留僚留僚竜�慮竜溜"
 
-#: ../libpurple/protocols/qq/buddy_info.c:560
+#: ../libpurple/protocols/qq/buddy_info.c:601
 #, c-format
 msgid ""
 "Setting custom faces is not currently supported. Please choose an image from "
@@ -9530,13 +9932,13 @@
 "� 凌�旅�亮�� ��凌�留�亮凌�亮劉僚�僚 ��凌����僚 隆竜僚 ��凌��侶�溜龍竜�留旅 留��流 �侶 ��旅粒亮流. "
 "�留�留虜留了凌�亮竜 竜�旅了劉両�竜 亮旅留 竜旅虜�僚留 留�� %s."
 
-#: ../libpurple/protocols/qq/buddy_info.c:577
-#: ../libpurple/protocols/qq/buddy_info.c:590
+#: ../libpurple/protocols/qq/buddy_info.c:618
+#: ../libpurple/protocols/qq/buddy_info.c:631
 msgid "Invalid QQ Face"
 msgstr "�侶 劉粒虜��凌 ������凌 QQ"
 
 #: ../libpurple/protocols/qq/buddy_opt.c:208
-#: ../libpurple/protocols/qq/group_opt.c:136
+#: ../libpurple/protocols/qq/group_opt.c:112
 #, c-format
 msgid "You rejected %d's request"
 msgstr "��凌��溜�留�竜 �凌 留溜�侶亮留 �凌� %d"
@@ -9551,14 +9953,13 @@
 
 #. title
 #: ../libpurple/protocols/qq/buddy_opt.c:213
-#: ../libpurple/protocols/qq/group_opt.c:141
+#: ../libpurple/protocols/qq/group_opt.c:117
 msgid "Sorry, you are not my type..."
 msgstr "裡�粒粒僚�亮侶, 隆竜僚 竜溜�留旅 凌 ���凌� 亮凌�..."
 
 #: ../libpurple/protocols/qq/buddy_opt.c:277
-#, fuzzy
 msgid "Add buddy with auth request failed"
-msgstr "� ��凌�慮流虜侶 �溜了凌� 留�凌��溜�慮侶虜竜"
+msgstr "� ��凌�慮流虜侶 �溜了凌� 亮竜 留溜�侶亮留 劉粒虜�旅�侶� 留�劉���竜"
 
 #. TODO: We don't really need to notify the user about this, do we?
 #: ../libpurple/protocols/qq/buddy_opt.c:309
@@ -9567,9 +9968,8 @@
 
 #. TODO: Does the user really need to be notified about this?
 #: ../libpurple/protocols/qq/buddy_opt.c:338
-#, fuzzy
 msgid "You have successfully removed yourself from your friend's buddy list"
-msgstr "��留旅�劉�留�竜 竜�旅����� �凌僚 竜留��� �留� 留�� 劉僚留 �溜了凌"
+msgstr "��留旅�劉�留�竜 竜�旅����� �凌僚 竜留��� �留� 留�� �侶 了溜��留 �溜了�僚 �凌� �溜了凌� �留�"
 
 #: ../libpurple/protocols/qq/buddy_opt.c:404
 #, c-format
@@ -9592,14 +9992,14 @@
 #. hint
 #: ../libpurple/protocols/qq/buddy_opt.c:408
 #: ../libpurple/protocols/qq/group_join.c:138
-#: ../libpurple/protocols/qq/group_opt.c:143
+#: ../libpurple/protocols/qq/group_opt.c:119
 msgid "Send"
 msgstr "��凌��凌了流"
 
 #: ../libpurple/protocols/qq/buddy_opt.c:418
-#, fuzzy, c-format
+#, c-format
 msgid "You have added %d to buddy list"
-msgstr "��旅���流� ��凌�慮流虜侶 �凌� %d ��侶 了溜��留 �溜了�僚"
+msgstr "��凌�慮劉�留�竜 �凌僚 %d ��侶 了溜��留 �溜了�僚"
 
 #: ../libpurple/protocols/qq/buddy_opt.c:515
 msgid "QQid Error"
@@ -9634,7 +10034,6 @@
 msgstr "QQ Qun"
 
 #: ../libpurple/protocols/qq/group.c:120
-#, fuzzy
 msgid "Please enter external group ID"
 msgstr "�留�留虜留了凌�亮竜 竜旅�略粒竜�竜 劉僚留 ID 竜両��竜�旅虜流� 凌亮略隆留�"
 
@@ -9643,13 +10042,13 @@
 msgstr "��凌�竜溜�竜 僚留 留僚留龍侶�流�竜�竜 亮�僚凌 亮�僚旅亮竜� 凌亮略隆竜� QQ\n"
 
 #: ../libpurple/protocols/qq/group_im.c:126
-#, fuzzy, c-format
+#, c-format
 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:193
+#: ../libpurple/protocols/qq/sys_msg.c:196
 #, c-format
 msgid "Reason: %s"
 msgstr "�旅�溜留: %s"
@@ -9661,47 +10060,44 @@
 #: ../libpurple/protocols/qq/group_im.c:292
 #: ../libpurple/protocols/qq/group_join.c:233
 #: ../libpurple/protocols/qq/group_join.c:359
-#: ../libpurple/protocols/qq/group_opt.c:235
-#: ../libpurple/protocols/qq/group_opt.c:305
-#: ../libpurple/protocols/qq/group_opt.c:391
+#: ../libpurple/protocols/qq/group_opt.c:211
+#: ../libpurple/protocols/qq/group_opt.c:281
+#: ../libpurple/protocols/qq/group_opt.c:367
 msgid "QQ Qun Operation"
 msgstr "�旅留隆旅虜留�溜留 QQ Qun"
 
 #: ../libpurple/protocols/qq/group_im.c:141
-#: ../libpurple/protocols/qq/group_opt.c:128
-#: ../libpurple/protocols/qq/sys_msg.c:91
-#: ../libpurple/protocols/qq/sys_msg.c:248
+#: ../libpurple/protocols/qq/group_opt.c:104
+#: ../libpurple/protocols/qq/sys_msg.c:92
+#: ../libpurple/protocols/qq/sys_msg.c:251
 msgid "Approve"
 msgstr "�粒虜�旅�侶"
 
 #: ../libpurple/protocols/qq/group_im.c:180
-#, fuzzy, c-format
+#, c-format
 msgid "Your request to join group %d has been rejected by admin %d"
-msgstr ""
-"里凌 留溜�侶亮略 �留� 僚留 ��亮亮竜�略��竜�竜 ��侶僚 凌亮略隆留 %d 留�凌��溜�慮侶虜竜 留�� �凌 隆旅留�竜旅�旅��流 %d"
+msgstr "里凌 留溜�侶亮略 �留� 僚留 ��亮亮竜�略��竜�竜 ��侶僚 凌亮略隆留 %d 留�凌��溜�慮侶虜竜 留�� �凌 隆旅留�竜旅�旅��流 %d"
 
 #: ../libpurple/protocols/qq/group_im.c:221
-#, fuzzy, c-format
+#, c-format
 msgid "Your request to join group %d has been approved by admin %d"
-msgstr ""
-"里凌 留溜�侶亮略 �留� 僚留 ��亮亮竜�略��竜�竜 ��侶僚 凌亮略隆留 %d 竜粒虜�溜慮侶虜竜 留�� �凌 隆旅留�竜旅�旅��流 %d"
+msgstr "里凌 留溜�侶亮略 �留� 僚留 ��亮亮竜�略��竜�竜 ��侶僚 凌亮略隆留 %d 竜粒虜�溜慮侶虜竜 留�� �凌 隆旅留�竜旅�旅��流 %d"
 
 #: ../libpurple/protocols/qq/group_im.c:257
 #, c-format
 msgid "You [%d] have left group \"%d\""
-msgstr ""
+msgstr "[%d] ��粒留�竜 留�� �侶僚 凌亮略隆留 \"%d\""
 
 #: ../libpurple/protocols/qq/group_im.c:291
-#, fuzzy, c-format
+#, c-format
 msgid "You [%d] have been added to group \"%d\""
-msgstr "��凌��竜慮流虜留�竜 留�� %s"
+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
-#, fuzzy
 msgid "I am not a member"
 msgstr "�竜僚 竜溜亮留旅 亮劉了凌�"
 
@@ -9726,7 +10122,6 @@
 msgstr "���流 侶 凌亮略隆留 隆竜僚 竜�旅��劉�竜旅 �竜 略了了凌�� 僚留 ��亮亮竜�劉�凌�僚"
 
 #: ../libpurple/protocols/qq/group_join.c:233
-#, fuzzy
 msgid "You have successfully left the group"
 msgstr "��凌亮留虜��僚慮流虜留�竜 竜�旅����� 留�� �侶僚 凌亮略隆留"
 
@@ -9735,19 +10130,16 @@
 msgstr ""
 
 #: ../libpurple/protocols/qq/group_join.c:258
-#, fuzzy
 msgid "Your authorization request has been accepted by the QQ server"
-msgstr "� 隆旅留隆旅虜留�溜留 劉粒虜�旅�流� �留� 劉粒旅僚竜 留�凌隆竜虜�流 留�� �凌僚 竜両��侶�竜�侶�流 QQ"
+msgstr "里凌 留溜�侶亮留 劉粒虜�旅�流� �留� 劉粒旅僚竜 留�凌隆竜虜�� 留�� �凌僚 竜両��侶�竜�侶�流 QQ"
 
 #: ../libpurple/protocols/qq/group_join.c:329
-#, fuzzy
 msgid "You entered a group ID outside the acceptable range"
-msgstr "�旅�略粒留�竜 劉僚留 id 凌亮略隆留� 劉両� 留�� �留 竜�旅��竜��亮竜僚留 ��旅留"
+msgstr "�旅�略粒留�竜 劉僚留 ID 凌亮略隆留� 劉両� 留�� �留 竜�旅��竜��亮竜僚留 ��旅留"
 
 #: ../libpurple/protocols/qq/group_join.c:360
-#, fuzzy
 msgid "Are you sure you want to leave this Qun?"
-msgstr "�溜��竜 �溜粒凌��凌旅 ��旅 慮劉了竜�竜 �侶 隆旅留粒�留�流 �凌� %s;"
+msgstr "�劉了竜�竜 �溜粒凌��留 僚留 ��粒竜�竜 留�� 留��� �凌 Qun;"
 
 #: ../libpurple/protocols/qq/group_join.c:362
 msgid ""
@@ -9767,36 +10159,32 @@
 msgstr "裡�略了亮留 了竜旅�凌��粒溜留� 凌亮略隆留�"
 
 #. we want to see window
-#: ../libpurple/protocols/qq/group_opt.c:124
+#: ../libpurple/protocols/qq/group_opt.c:99
 #: ../libpurple/protocols/qq/sys_msg.c:87
-#, fuzzy
 msgid "Do you want to approve the request?"
 msgstr "�劉了竜�竜 僚留 竜粒虜�溜僚竜�竜 �凌 留溜�侶亮留;"
 
-#: ../libpurple/protocols/qq/group_opt.c:137
-#, fuzzy
+#: ../libpurple/protocols/qq/group_opt.c:113
 msgid "Enter your reason:"
 msgstr "�旅�略粒竜�竜 �凌 了�粒凌:"
 
-#: ../libpurple/protocols/qq/group_opt.c:235
-#, fuzzy
+#: ../libpurple/protocols/qq/group_opt.c:211
 msgid "You have successfully modified Qun member"
 msgstr "里�凌�凌�凌旅流�留�竜 竜�旅����� �凌 亮劉了凌� Qun"
 
-#: ../libpurple/protocols/qq/group_opt.c:305
-#, fuzzy
+#: ../libpurple/protocols/qq/group_opt.c:281
 msgid "You have successfully modified Qun information"
 msgstr "里�凌�凌�凌旅流��竜 竜�旅����� �旅� �了侶�凌�凌�溜竜� Qun"
 
-#: ../libpurple/protocols/qq/group_opt.c:392
+#: ../libpurple/protocols/qq/group_opt.c:368
 msgid "You have successfully created a Qun"
 msgstr "�侶亮旅凌��粒流�留�竜 竜�旅����� 劉僚留 Qun"
 
-#: ../libpurple/protocols/qq/group_opt.c:394
+#: ../libpurple/protocols/qq/group_opt.c:370
 msgid "Would you like to set up the Qun details now?"
 msgstr "�劉了竜�竜 僚留 ��慮亮溜�竜�竜 �旅� 了竜��凌亮劉�竜旅竜� Qun ���留;"
 
-#: ../libpurple/protocols/qq/group_opt.c:398
+#: ../libpurple/protocols/qq/group_opt.c:374
 msgid "Setup"
 msgstr "痢�慮亮旅�侶"
 
@@ -9805,118 +10193,116 @@
 msgstr "�流僚�亮留 ����流亮留�凌�"
 
 #: ../libpurple/protocols/qq/im.c:576
-#, fuzzy
 msgid "Failed to send IM."
-msgstr "��凌���溜留 了流�侶� 凌僚�亮留�凌�: %s"
-
-#: ../libpurple/protocols/qq/keep_alive.c:87
-#, fuzzy
+msgstr "��凌���溜留 留�凌��凌了流� 亮侶僚�亮留�凌�"
+
+#: ../libpurple/protocols/qq/keep_alive.c:88
 msgid "Keep alive error"
-msgstr "裡�略了亮留 留僚略粒僚��侶�"
+msgstr ""
 
 #: ../libpurple/protocols/qq/login_logout.c:408
-#, fuzzy
 msgid "Error requesting login token"
-msgstr "裡�略了亮留 隆侶亮旅凌��粒溜留� ��僚隆竜�侶�"
-
-#: ../libpurple/protocols/qq/login_logout.c:486
-msgid "Unable to login, check debug log"
-msgstr "�隆�僚留�侶 侶 竜溜�凌隆凌�, 竜了劉粒両�竜 �侶僚 虜留�留粒�留�流 留�凌��留了亮略���侶�"
+msgstr ""
+
+#: ../libpurple/protocols/qq/login_logout.c:490
+msgid "Unable to login. Check debug log."
+msgstr "�隆�僚留亮溜留 竜旅��隆凌�. �了劉粒両�竜 �侶僚 虜留�留粒�留�流 留�凌��留了亮略���侶�."
+
+#: ../libpurple/protocols/qq/login_logout.c:493
+msgid "Unable to login"
+msgstr "�隆�僚留亮溜留 竜旅��隆凌�"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: ../libpurple/protocols/qq/qq.c:139 ../libpurple/protocols/toc/toc.c:173
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:109
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:189
-#: ../libpurple/protocols/yahoo/ycht.c:549
+#: ../libpurple/protocols/qq/qq.c:140 ../libpurple/protocols/toc/toc.c:173
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:158
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:238
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1194
+#: ../libpurple/protocols/yahoo/ycht.c:550
 msgid "Unable to connect."
 msgstr "�隆�僚留亮溜留 ��僚隆竜�侶�."
 
-#: ../libpurple/protocols/qq/qq.c:186
+#: ../libpurple/protocols/qq/qq.c:187
 #, c-format
 msgid "Unknown-%d"
 msgstr "�粒僚���凌-%d"
 
-#: ../libpurple/protocols/qq/qq.c:211
-#, fuzzy
+#: ../libpurple/protocols/qq/qq.c:212
 msgid "TCP Address"
-msgstr "�旅竜�慮�僚�侶 IP"
-
-#: ../libpurple/protocols/qq/qq.c:213
-#, fuzzy
+msgstr "�旅竜�慮�僚�侶 TCP"
+
+#: ../libpurple/protocols/qq/qq.c:214
 msgid "UDP Address"
-msgstr "�旅竜�慮�僚�侶 IP"
-
-#: ../libpurple/protocols/qq/qq.c:242
+msgstr "�旅竜�慮�僚�侶 UDP"
+
+#: ../libpurple/protocols/qq/qq.c:243
 msgid "Level"
 msgstr "��溜�竜隆凌"
 
-#: ../libpurple/protocols/qq/qq.c:373
+#: ../libpurple/protocols/qq/qq.c:374
 msgid "Invalid name"
 msgstr "�侶 劉粒虜��凌 �僚凌亮留"
 
-#: ../libpurple/protocols/qq/qq.c:439
+#: ../libpurple/protocols/qq/qq.c:440
 #, c-format
 msgid "<b>Current Online</b>: %d<br>\n"
 msgstr "<b>裡竜 ��僚隆竜�侶</b>: %d<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:440
+#: ../libpurple/protocols/qq/qq.c:441
 #, c-format
 msgid "<b>Last Refresh</b>: %s<br>\n"
 msgstr "<b>里竜了竜��留溜留 留僚留僚劉��侶</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:444
+#: ../libpurple/protocols/qq/qq.c:445
 #, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
 msgstr "<b>�竜旅�凌��粒溜留 ��僚隆竜�侶�</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:445
+#: ../libpurple/protocols/qq/qq.c:446
 #, c-format
 msgid "<b>Server IP</b>: %s: %d<br>\n"
 msgstr "<b>IP 竜両��侶�竜�侶�流</b>: %s: %d<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:446
+#: ../libpurple/protocols/qq/qq.c:447
 #, c-format
 msgid "<b>My Public IP</b>: %s<br>\n"
 msgstr "<b>� 隆侶亮��旅留 IP 亮凌�</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:451
+#: ../libpurple/protocols/qq/qq.c:452
 #, c-format
 msgid "<b>Login Time</b>: %s<br>\n"
 msgstr "<b>律��僚凌� ��僚隆竜�侶�</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:452
+#: ../libpurple/protocols/qq/qq.c:453
 #, c-format
 msgid "<b>Last Login IP</b>: %s<br>\n"
 msgstr "<b>里竜了竜��留溜留 IP ��僚隆竜�侶�</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:453
+#: ../libpurple/protocols/qq/qq.c:454
 #, c-format
 msgid "<b>Last Login Time</b>: %s\n"
 msgstr "<b>里竜了竜��留溜凌� ���僚凌� ��僚隆竜�侶�</b>: %s\n"
 
-#: ../libpurple/protocols/qq/qq.c:457
+#: ../libpurple/protocols/qq/qq.c:458
 msgid "Login Information"
 msgstr "�了侶�凌�凌�溜竜� ��僚隆竜�侶�"
 
-#: ../libpurple/protocols/qq/qq.c:533
-#, fuzzy
+#: ../libpurple/protocols/qq/qq.c:534
 msgid "Set My Information"
-msgstr "�了侶�凌�凌�溜竜� 竜両��侶�竜�侶�流"
-
-#: ../libpurple/protocols/qq/qq.c:536 ../libpurple/protocols/toc/toc.c:1680
+msgstr "��旅�亮�� ��僚 �了侶�凌�凌�旅�僚 亮凌�"
+
+#: ../libpurple/protocols/qq/qq.c:537 ../libpurple/protocols/toc/toc.c:1680
 msgid "Change Password"
 msgstr "�了了留粒流 虜�隆旅虜凌�"
 
-#: ../libpurple/protocols/qq/qq.c:539
+#: ../libpurple/protocols/qq/qq.c:540
 msgid "Show Login Information"
 msgstr "�亮�略僚旅�侶 �了侶�凌�凌�旅�僚 ��僚隆竜�侶�"
 
-#: ../libpurple/protocols/qq/qq.c:560
-#, fuzzy
+#: ../libpurple/protocols/qq/qq.c:561
 msgid "Leave this QQ Qun"
 msgstr "�両凌隆凌� 留�� 留��� �凌 QQ Qun"
 
-#: ../libpurple/protocols/qq/qq.c:584
+#: ../libpurple/protocols/qq/qq.c:585
 msgid "Block this buddy"
 msgstr "��凌虜了竜旅�亮�� 留��凌� �凌� �溜了凌�"
 
@@ -9930,20 +10316,19 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/qq/qq.c:725 ../libpurple/protocols/qq/qq.c:727
+#: ../libpurple/protocols/qq/qq.c:726 ../libpurple/protocols/qq/qq.c:728
 msgid "QQ Protocol\tPlugin"
 msgstr "����慮竜�凌 ����凌虜�了了凌� QQ"
 
-#: ../libpurple/protocols/qq/qq.c:752
-#, fuzzy
+#: ../libpurple/protocols/qq/qq.c:753
 msgid "Connect using TCP"
-msgstr "�溜僚竜�留旅 ��僚隆竜�侶"
-
-#: ../libpurple/protocols/qq/recv_core.c:309
+msgstr "裡�僚隆竜�侶 亮竜 ��流�侶 TCP"
+
+#: ../libpurple/protocols/qq/recv_core.c:310
 msgid "Socket error"
 msgstr "裡�略了亮留 ��凌隆凌�劉留"
 
-#: ../libpurple/protocols/qq/recv_core.c:319
+#: ../libpurple/protocols/qq/recv_core.c:321
 msgid "Unable to read from socket"
 msgstr "�隆�僚留亮溜留 留僚略粒僚��侶� 留�� �凌僚 ��凌隆凌�劉留"
 
@@ -9962,196 +10347,193 @@
 msgid "%d canceled the transfer of %s"
 msgstr "%d 留虜����竜 �侶 亮竜�留�凌�略 �凌� %s"
 
-#: ../libpurple/protocols/qq/sendqueue.c:123
+#: ../libpurple/protocols/qq/sendqueue.c:124
 msgid "Connection lost"
 msgstr "� ��僚隆竜�侶 �略慮侶虜竜"
 
-#. cancel login progress
-#: ../libpurple/protocols/qq/sendqueue.c:131
+#: ../libpurple/protocols/qq/sendqueue.c:133
 msgid "Login failed, no reply"
 msgstr "� ��僚隆竜�侶 留�劉���竜, 隆竜僚 ��略��竜旅 留�略僚�侶�侶"
 
-#: ../libpurple/protocols/qq/sys_msg.c:110
-#, fuzzy
+#: ../libpurple/protocols/qq/sys_msg.c:111
 msgid "Do you want to add this buddy?"
 msgstr "�劉了竜�竜 僚留 ��凌�慮劉�竜�竜 留���僚 �凌 �溜了凌;"
 
 #. only need to get value
-#: ../libpurple/protocols/qq/sys_msg.c:166
+#: ../libpurple/protocols/qq/sys_msg.c:168
 #, c-format
 msgid "You have been added by %s"
 msgstr "��凌��竜慮流虜留�竜 留�� %s"
 
-#: ../libpurple/protocols/qq/sys_msg.c:169
-#: ../libpurple/protocols/qq/sys_msg.c:263
+#: ../libpurple/protocols/qq/sys_msg.c:171
+#: ../libpurple/protocols/qq/sys_msg.c:266
 msgid "Would you like to add him?"
 msgstr "�劉了竜�竜 僚留 �凌僚 ��凌�慮劉�竜�竜;"
 
-#: ../libpurple/protocols/qq/sys_msg.c:176
-#, fuzzy, c-format
+#: ../libpurple/protocols/qq/sys_msg.c:179
+#, c-format
 msgid "%s has added you [%s] to his or her buddy list"
-msgstr "%s �留� ��凌�劉慮竜�竜 ��侶 了溜��留 �溜了�僚 �凌�."
-
-#: ../libpurple/protocols/qq/sys_msg.c:192
+msgstr "%s �留� ��凌�劉慮竜�竜 ��侶 了溜��留 �溜了�僚 �凌�. [%s]"
+
+#: ../libpurple/protocols/qq/sys_msg.c:195
 #, c-format
 msgid "User %s rejected your request"
 msgstr "� ��流��侶� %s 留�劉��旅�竜 �凌 留溜�侶亮略 �留�"
 
-#: ../libpurple/protocols/qq/sys_msg.c:212
-#, fuzzy, c-format
+#: ../libpurple/protocols/qq/sys_msg.c:215
+#, 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:238
-#, fuzzy, c-format
+#: ../libpurple/protocols/qq/sys_msg.c:241
+#, c-format
 msgid "%s wants to add you [%s] as a friend"
 msgstr "%s 慮劉了竜旅 僚留 �留� ��凌�慮劉�竜旅 [%s] �� �溜了凌旅"
 
-#: ../libpurple/protocols/qq/sys_msg.c:239
+#: ../libpurple/protocols/qq/sys_msg.c:242
 #, c-format
 msgid "Message: %s"
 msgstr "�流僚�亮留: %s"
 
-#: ../libpurple/protocols/qq/sys_msg.c:261
+#: ../libpurple/protocols/qq/sys_msg.c:264
 #, c-format
 msgid "%s is not in your buddy list"
 msgstr "%s 隆竜僚 竜溜僚留旅 ��侶 了溜��留 �溜了�僚 �留�"
 
-#: ../libpurple/protocols/sametime/sametime.c:417
+#: ../libpurple/protocols/sametime/sametime.c:419
 msgid "Connection closed (writing)"
 msgstr "� ��僚隆竜�侶 劉虜了竜旅�竜 (粒溜僚竜�留旅 竜粒粒�留�流)"
 
-#: ../libpurple/protocols/sametime/sametime.c:1290
+#: ../libpurple/protocols/sametime/sametime.c:1292
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>里溜�了凌� �亮略隆留�:</b> %s<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:1291
+#: ../libpurple/protocols/sametime/sametime.c:1293
 #, c-format
 msgid "<b>Notes Group ID:</b> %s<br>"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:1293
+#: ../libpurple/protocols/sametime/sametime.c:1295
 #, c-format
 msgid "Info for Group %s"
 msgstr "�了侶�凌�凌�溜竜� �侶� 凌亮略隆留� %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:1295
+#: ../libpurple/protocols/sametime/sametime.c:1297
 msgid "Notes Address Book Information"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:1327
+#: ../libpurple/protocols/sametime/sametime.c:1329
 msgid "Invite Group to Conference..."
 msgstr "����虜了侶�侶 �亮略隆留� ��侶 裡�龍流�侶�侶..."
 
-#: ../libpurple/protocols/sametime/sametime.c:1337
+#: ../libpurple/protocols/sametime/sametime.c:1339
 msgid "Get Notes Address Book Info"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:1504
+#: ../libpurple/protocols/sametime/sametime.c:1506
 msgid "Sending Handshake"
 msgstr "��凌��凌了流 �竜旅�留�溜留�"
 
-#: ../libpurple/protocols/sametime/sametime.c:1509
+#: ../libpurple/protocols/sametime/sametime.c:1511
 msgid "Waiting for Handshake Acknowledgement"
 msgstr "�僚留亮凌僚流 留僚留粒僚��旅�侶� �竜旅�留�溜留�"
 
-#: ../libpurple/protocols/sametime/sametime.c:1514
+#: ../libpurple/protocols/sametime/sametime.c:1516
 msgid "Handshake Acknowledged, Sending Login"
 msgstr "� �竜旅�留�溜留 留僚留粒僚��溜��侶虜竜, 留�凌��凌了流 竜旅��隆凌�"
 
-#: ../libpurple/protocols/sametime/sametime.c:1519
+#: ../libpurple/protocols/sametime/sametime.c:1521
 msgid "Waiting for Login Acknowledgement"
 msgstr "�僚留亮凌僚流 留僚留粒僚��旅�侶� 竜旅��隆凌�"
 
-#: ../libpurple/protocols/sametime/sametime.c:1524
+#: ../libpurple/protocols/sametime/sametime.c:1526
 msgid "Login Redirected"
 msgstr "�僚留隆�凌亮凌了�粒侶�侶 竜旅��隆凌�"
 
-#: ../libpurple/protocols/sametime/sametime.c:1530
+#: ../libpurple/protocols/sametime/sametime.c:1532
 msgid "Forcing Login"
 msgstr "�両留僚留粒虜留�亮�� 竜旅��隆凌�"
 
-#: ../libpurple/protocols/sametime/sametime.c:1534
+#: ../libpurple/protocols/sametime/sametime.c:1536
 msgid "Login Acknowledged"
 msgstr "� 竜溜�凌隆凌� 留僚留粒僚��溜��侶虜竜"
 
-#: ../libpurple/protocols/sametime/sametime.c:1539
+#: ../libpurple/protocols/sametime/sametime.c:1541
 msgid "Starting Services"
 msgstr "�虜虜溜僚侶�侶 ��侶�竜�旅�僚"
 
-#: ../libpurple/protocols/sametime/sametime.c:1645
-#, c-format
-msgid ""
-"A Sametime administrator has issued the following announcement on server %s"
+#: ../libpurple/protocols/sametime/sametime.c:1678
+#, c-format
+msgid "A Sametime administrator has issued the following announcement on server %s"
 msgstr ""
 "�僚留� 隆旅留�竜旅�旅��流� Sametime ��劉硫留了了竜 �侶僚 留虜�了凌�慮侶 留僚留虜凌溜僚��侶 ��凌僚 竜両��侶�竜�侶�流 "
 "%s"
 
-#: ../libpurple/protocols/sametime/sametime.c:1650
+#: ../libpurple/protocols/sametime/sametime.c:1683
 msgid "Sametime Administrator Announcement"
 msgstr "�僚留虜凌溜僚��侶 隆旅留�竜旅�旅��流 Sametime"
 
-#: ../libpurple/protocols/sametime/sametime.c:1702
+#: ../libpurple/protocols/sametime/sametime.c:1736
 msgid "Connection reset"
 msgstr "��留僚留�凌�略 ��僚隆竜�侶�"
 
-#: ../libpurple/protocols/sametime/sametime.c:1709
+#: ../libpurple/protocols/sametime/sametime.c:1748
 #, c-format
 msgid "Error reading from socket: %s"
 msgstr "裡�略了亮留 留僚略粒僚��侶� 留�� �凌僚 ��凌隆凌�劉留: %s"
 
 #. this is a regular connect, error out
-#: ../libpurple/protocols/sametime/sametime.c:1732
-#: ../libpurple/protocols/sametime/sametime.c:3726
+#: ../libpurple/protocols/sametime/sametime.c:1773
+#: ../libpurple/protocols/sametime/sametime.c:3780
 msgid "Unable to connect to host"
 msgstr "�隆�僚留�侶 侶 ��僚隆竜�侶 亮竜 �凌僚 虜竜僚��旅虜� ��凌了凌粒旅��流"
 
-#: ../libpurple/protocols/sametime/sametime.c:1770
+#: ../libpurple/protocols/sametime/sametime.c:1814
 #, c-format
 msgid "Announcement from %s"
 msgstr "�僚留虜凌溜僚��侶 留�� %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:1944
+#: ../libpurple/protocols/sametime/sametime.c:1988
 msgid "Conference Closed"
 msgstr "� ��龍流�侶�侶 劉虜了竜旅�竜"
 
-#: ../libpurple/protocols/sametime/sametime.c:2403
+#: ../libpurple/protocols/sametime/sametime.c:2453
 msgid "Unable to send message: "
 msgstr "�隆�僚留亮溜留 留�凌��凌了流� 亮侶僚�亮留�凌�. "
 
-#: ../libpurple/protocols/sametime/sametime.c:2959
+#: ../libpurple/protocols/sametime/sametime.c:3009
 msgid "Place Closed"
 msgstr "� �竜�旅凌�流 劉虜了竜旅�竜"
 
-#: ../libpurple/protocols/sametime/sametime.c:3229
+#: ../libpurple/protocols/sametime/sametime.c:3279
 msgid "Microphone"
 msgstr "�旅虜����僚凌"
 
-#: ../libpurple/protocols/sametime/sametime.c:3230
+#: ../libpurple/protocols/sametime/sametime.c:3280
 msgid "Speakers"
 msgstr "��竜溜留"
 
-#: ../libpurple/protocols/sametime/sametime.c:3231
+#: ../libpurple/protocols/sametime/sametime.c:3281
 msgid "Video Camera"
 msgstr "�旅僚�竜凌虜略亮竜�留"
 
-#: ../libpurple/protocols/sametime/sametime.c:3269
-#: ../libpurple/protocols/sametime/sametime.c:4145
+#: ../libpurple/protocols/sametime/sametime.c:3319
+#: ../libpurple/protocols/sametime/sametime.c:4199
 msgid "Supports"
 msgstr "離�凌��侶�溜龍竜旅"
 
-#: ../libpurple/protocols/sametime/sametime.c:3274
-#: ../libpurple/protocols/sametime/sametime.c:4119
+#: ../libpurple/protocols/sametime/sametime.c:3324
+#: ../libpurple/protocols/sametime/sametime.c:4173
 msgid "External User"
 msgstr "�両��竜�旅虜�� ��流��侶�"
 
-#: ../libpurple/protocols/sametime/sametime.c:3380
+#: ../libpurple/protocols/sametime/sametime.c:3430
 msgid "Create conference with user"
 msgstr "�侶亮旅凌��粒溜留 ��龍流�侶�侶� 亮竜 �凌 ��流��侶"
 
-#: ../libpurple/protocols/sametime/sametime.c:3381
+#: ../libpurple/protocols/sametime/sametime.c:3431
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
@@ -10160,27 +10542,27 @@
 "�留�留虜留了凌�亮竜 竜旅�略粒竜�竜 劉僚留 慮劉亮留 粒旅留 �侶 僚劉留 ��龍流�侶�侶, 虜留旅 劉僚留 亮流僚�亮留 ����虜了侶�侶� "
 "粒旅留 僚留 留�凌��留了竜溜 �竜 %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:3385
+#: ../libpurple/protocols/sametime/sametime.c:3435
 msgid "New Conference"
 msgstr "�劉留 ��龍流�侶�侶"
 
-#: ../libpurple/protocols/sametime/sametime.c:3387
+#: ../libpurple/protocols/sametime/sametime.c:3437
 msgid "Create"
 msgstr "�侶亮旅凌��粒溜留"
 
-#: ../libpurple/protocols/sametime/sametime.c:3452
+#: ../libpurple/protocols/sametime/sametime.c:3502
 msgid "Available Conferences"
 msgstr "�旅留慮劉�旅亮竜� ��龍侶�流�竜旅�"
 
-#: ../libpurple/protocols/sametime/sametime.c:3458
+#: ../libpurple/protocols/sametime/sametime.c:3508
 msgid "Create New Conference..."
 msgstr "�侶亮旅凌��粒溜留 僚劉留� ��龍流�侶�侶�..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3465
+#: ../libpurple/protocols/sametime/sametime.c:3515
 msgid "Invite user to a conference"
 msgstr "����虜了侶�侶 ��流��侶 �竜 亮旅留 ��龍流�侶�侶"
 
-#: ../libpurple/protocols/sametime/sametime.c:3466
+#: ../libpurple/protocols/sametime/sametime.c:3516
 #, c-format
 msgid ""
 "Select a conference from the list below to send an invite to user %s. Select "
@@ -10191,27 +10573,27 @@
 "��凌 ��流��侶 %s. ��旅了劉両�竜 \"�侶亮旅凌��粒溜留 僚劉留� ��龍流�侶�侶�\" 留僚 慮劉了竜�竜 僚留 "
 "隆侶亮旅凌��粒流�竜�竜 亮旅留 僚劉留 ��龍流�侶�侶 ��侶僚 凌�凌溜留 慮留 ��凌�虜留了劉�竜�竜 留���僚 �凌 ��流��侶."
 
-#: ../libpurple/protocols/sametime/sametime.c:3471
+#: ../libpurple/protocols/sametime/sametime.c:3521
 msgid "Invite to Conference"
 msgstr "����虜了侶�侶 �竜 ��龍流�侶�侶"
 
-#: ../libpurple/protocols/sametime/sametime.c:3562
+#: ../libpurple/protocols/sametime/sametime.c:3612
 msgid "Invite to Conference..."
 msgstr "����虜了侶�侶 �竜 ��龍流�侶�侶..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3567
+#: ../libpurple/protocols/sametime/sametime.c:3617
 msgid "Send TEST Announcement"
 msgstr "��凌��凌了流 留僚留虜凌溜僚��侶� ������裡"
 
-#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4354
+#: ../libpurple/protocols/sametime/sametime.c:3636 ../pidgin/gtkconv.c:4431
 msgid "Topic:"
 msgstr "�劉亮留 ��龍流�侶�侶�:"
 
-#: ../libpurple/protocols/sametime/sametime.c:3614
+#: ../libpurple/protocols/sametime/sametime.c:3664
 msgid "No Sametime Community Server specified"
 msgstr "�竜僚 凌�溜��侶虜竜 竜両��侶�竜�侶�流� 虜凌旅僚��侶�留� Sametime"
 
-#: ../libpurple/protocols/sametime/sametime.c:3636
+#: ../libpurple/protocols/sametime/sametime.c:3689
 #, c-format
 msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
@@ -10220,42 +10602,42 @@
 "�竜僚 凌�溜��侶虜竜 虜竜僚��旅虜�� ��凌了凌粒旅��流� 流 隆旅竜�慮�僚�侶 IP 粒旅留 �凌僚 了凌粒留�旅留�亮� "
 "Meanwhile  %s. �留�留虜留了凌�亮竜 竜旅�略粒竜�竜 虜略�旅 留�� 留��略 �留�留虜略�� 粒旅留 僚留 ��僚隆竜慮竜溜�竜."
 
-#: ../libpurple/protocols/sametime/sametime.c:3641
+#: ../libpurple/protocols/sametime/sametime.c:3694
 msgid "Meanwhile Connection Setup"
 msgstr "痢�慮亮溜�竜旅� ��僚隆竜�侶� Meanwhile"
 
-#: ../libpurple/protocols/sametime/sametime.c:3642
+#: ../libpurple/protocols/sametime/sametime.c:3695
 msgid "No Sametime Community Server Specified"
 msgstr "�竜僚 凌�溜��侶虜竜 竜両��侶�竜�侶�流� 虜凌旅僚��侶�留� Sametime"
 
-#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4041
+#: ../libpurple/protocols/sametime/sametime.c:3697
 msgid "Connect"
 msgstr "裡�僚隆竜�侶"
 
-#: ../libpurple/protocols/sametime/sametime.c:4135
+#: ../libpurple/protocols/sametime/sametime.c:4189
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "�粒僚���凌 (0x%04x)<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:4137
+#: ../libpurple/protocols/sametime/sametime.c:4191
 msgid "Last Known Client"
 msgstr "里竜了竜��留溜凌� 粒僚����� �竜了略�侶�:"
 
-#: ../libpurple/protocols/sametime/sametime.c:4301
-#: ../libpurple/protocols/sametime/sametime.c:5506
+#: ../libpurple/protocols/sametime/sametime.c:4355
+#: ../libpurple/protocols/sametime/sametime.c:5560
 msgid "User Name"
 msgstr "�僚凌亮留 ��流��侶"
 
-#: ../libpurple/protocols/sametime/sametime.c:4304
-#: ../libpurple/protocols/sametime/sametime.c:5509
+#: ../libpurple/protocols/sametime/sametime.c:4358
+#: ../libpurple/protocols/sametime/sametime.c:5563
 msgid "Sametime ID"
 msgstr "Sametime ID"
 
-#: ../libpurple/protocols/sametime/sametime.c:4328
+#: ../libpurple/protocols/sametime/sametime.c:4382
 msgid "An ambiguous user ID was entered"
 msgstr "��竜旅 竜旅�留�慮竜溜 劉僚留 留�留�劉� ID ��流��侶"
 
-#: ../libpurple/protocols/sametime/sametime.c:4329
+#: ../libpurple/protocols/sametime/sametime.c:4383
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
@@ -10265,15 +10647,15 @@
 "��流��竜�. �留�留虜留了凌�亮竜 竜�旅了劉両�竜 �凌 ����� ��流��侶 留�� �侶僚 �留�留虜略��僚 了溜��留 粒旅留 僚留 "
 "�凌僚 ��凌�慮劉�竜�竜 ��侶 了溜��留 �溜了�僚 �留�.."
 
-#: ../libpurple/protocols/sametime/sametime.c:4334
+#: ../libpurple/protocols/sametime/sametime.c:4388
 msgid "Select User"
 msgstr "��旅了凌粒流 ��流��侶"
 
-#: ../libpurple/protocols/sametime/sametime.c:4418
+#: ../libpurple/protocols/sametime/sametime.c:4472
 msgid "Unable to add user: user not found"
 msgstr "�隆�僚留亮溜留 ��凌�慮流虜侶� ��流��侶: 凌 ��流��侶� 隆竜 硫�劉慮侶虜竜"
 
-#: ../libpurple/protocols/sametime/sametime.c:4420
+#: ../libpurple/protocols/sametime/sametime.c:4474
 #, c-format
 msgid ""
 "The identifier '%s' did not match any users in your Sametime community. This "
@@ -10282,11 +10664,7 @@
 "里凌 留僚留粒僚��旅��旅虜� '%s' 隆竜僚 �留旅�旅略龍竜旅 亮竜 虜留僚劉僚留 ��流��侶 ��侶 虜凌旅僚��侶�留 Sametime "
 "�留�. ���流 侶 虜留�留���侶�侶 留�留旅�劉慮侶虜竜 留�� �侶 了溜��留 �溜了�僚 �留�."
 
-#: ../libpurple/protocols/sametime/sametime.c:4425
-msgid "Unable to add user"
-msgstr "�隆�僚留亮溜留 ��凌�慮流虜侶� ��流��侶"
-
-#: ../libpurple/protocols/sametime/sametime.c:5011
+#: ../libpurple/protocols/sametime/sametime.c:5065
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -10295,63 +10673,63 @@
 "裡�略了亮留 虜留�略 �侶僚 留僚略粒僚��侶 �凌� 留��竜溜凌� %s: \n"
 "%s\n"
 
-#: ../libpurple/protocols/sametime/sametime.c:5146
+#: ../libpurple/protocols/sametime/sametime.c:5200
 msgid "Remotely Stored Buddy List"
 msgstr "�粒旅僚竜 留�凌亮留虜���亮劉僚侶 留�凌慮流虜竜��侶 �侶� 了溜��留� �溜了�僚"
 
-#: ../libpurple/protocols/sametime/sametime.c:5151
+#: ../libpurple/protocols/sametime/sametime.c:5205
 msgid "Buddy List Storage Mode"
 msgstr "�竜旅�凌��粒溜留 留�凌慮流虜竜��侶� 了溜��留� �溜了�僚"
 
-#: ../libpurple/protocols/sametime/sametime.c:5154
+#: ../libpurple/protocols/sametime/sametime.c:5208
 msgid "Local Buddy List Only"
 msgstr "��僚凌 �侶� �凌�旅虜流� 了溜��留� �溜了�僚"
 
-#: ../libpurple/protocols/sametime/sametime.c:5156
+#: ../libpurple/protocols/sametime/sametime.c:5210
 msgid "Merge List from Server"
 msgstr "裡�粒��僚竜��侶 了溜��留� 留�� �凌僚 竜両��侶�竜�侶�流"
 
-#: ../libpurple/protocols/sametime/sametime.c:5158
+#: ../libpurple/protocols/sametime/sametime.c:5212
 msgid "Merge and Save List to Server"
 msgstr "裡�粒��僚竜��侶 虜留旅 留�凌慮流虜竜��侶 了溜��留� ��凌僚 竜両��侶�竜�侶�流"
 
-#: ../libpurple/protocols/sametime/sametime.c:5160
+#: ../libpurple/protocols/sametime/sametime.c:5214
 msgid "Synchronize List with Server"
 msgstr "裡�粒��凌僚旅�亮�� 了溜��留� 亮竜 �凌僚 竜両��侶�竜�侶�流"
 
-#: ../libpurple/protocols/sametime/sametime.c:5215
+#: ../libpurple/protocols/sametime/sametime.c:5269
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "�旅�留粒�粒流 了溜��留� Sametime 粒旅留 �凌 了凌粒留�旅留�亮� %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5255
+#: ../libpurple/protocols/sametime/sametime.c:5309
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "�両留粒�粒流 了溜��留� Sametime 粒旅留 �凌 了凌粒留�旅留�亮� %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5309
+#: ../libpurple/protocols/sametime/sametime.c:5363
 msgid "Unable to add group: group exists"
 msgstr "�隆�僚留亮溜留 ��凌�慮流虜侶� �侶� 凌亮略隆留�: 侶 凌亮略隆留 ��略��竜旅"
 
-#: ../libpurple/protocols/sametime/sametime.c:5310
+#: ../libpurple/protocols/sametime/sametime.c:5364
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "�溜留 凌亮略隆留 亮竜 �凌 �僚凌亮留 '%s' ��略��竜旅 流隆侶 ��侶 了溜��留 �溜了�僚 �留�."
 
-#: ../libpurple/protocols/sametime/sametime.c:5313
-#: ../libpurple/protocols/sametime/sametime.c:5443
+#: ../libpurple/protocols/sametime/sametime.c:5367
+#: ../libpurple/protocols/sametime/sametime.c:5497
 msgid "Unable to add group"
 msgstr "�隆�僚留亮溜留 ��凌�慮流虜侶� 凌亮略隆留�"
 
-#: ../libpurple/protocols/sametime/sametime.c:5372
+#: ../libpurple/protocols/sametime/sametime.c:5426
 msgid "Possible Matches"
 msgstr "�旅慮留僚劉� 留僚�旅��凌旅�溜竜�"
 
-#: ../libpurple/protocols/sametime/sametime.c:5388
+#: ../libpurple/protocols/sametime/sametime.c:5442
 msgid "Notes Address Book group results"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5389
+#: ../libpurple/protocols/sametime/sametime.c:5443
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -10359,37 +10737,37 @@
 "to your buddy list."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5394
+#: ../libpurple/protocols/sametime/sametime.c:5448
 msgid "Select Notes Address Book"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5437
+#: ../libpurple/protocols/sametime/sametime.c:5491
 msgid "Unable to add group: group not found"
 msgstr "�隆�僚留亮溜留 ��凌�慮流虜侶� 凌亮略隆留�: 侶 凌亮略隆留 隆竜 硫�劉慮侶虜竜"
 
-#: ../libpurple/protocols/sametime/sametime.c:5439
+#: ../libpurple/protocols/sametime/sametime.c:5493
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
 "Sametime community."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5480
+#: ../libpurple/protocols/sametime/sametime.c:5534
 msgid "Notes Address Book Group"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5481
+#: ../libpurple/protocols/sametime/sametime.c:5535
 msgid ""
 "Enter the name of a Notes Address Book group in the field below to add the "
 "group and its members to your buddy list."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5530
+#: ../libpurple/protocols/sametime/sametime.c:5584
 #, c-format
 msgid "Search results for '%s'"
 msgstr "��凌�竜了劉�亮留�留 留僚留龍流�侶�侶� 粒旅留 '%s'"
 
-#: ../libpurple/protocols/sametime/sametime.c:5531
+#: ../libpurple/protocols/sametime/sametime.c:5585
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -10397,28 +10775,28 @@
 "buttons below."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:756
+#: ../libpurple/protocols/sametime/sametime.c:5592 ../pidgin/gtknotify.c:770
 msgid "Search Results"
 msgstr "��凌�竜了劉�亮留�留 留僚留龍流�侶�侶�"
 
-#: ../libpurple/protocols/sametime/sametime.c:5563
+#: ../libpurple/protocols/sametime/sametime.c:5617
 msgid "No matches"
 msgstr "�留亮溜留 留僚�旅��凌旅�溜留"
 
-#: ../libpurple/protocols/sametime/sametime.c:5564
+#: ../libpurple/protocols/sametime/sametime.c:5618
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5568
+#: ../libpurple/protocols/sametime/sametime.c:5622
 msgid "No Matches"
 msgstr "�留亮溜留 留僚�旅��凌旅�溜留"
 
-#: ../libpurple/protocols/sametime/sametime.c:5605
+#: ../libpurple/protocols/sametime/sametime.c:5659
 msgid "Search for a user"
 msgstr "�僚留龍流�侶�侶 ��流��侶"
 
-#: ../libpurple/protocols/sametime/sametime.c:5606
+#: ../libpurple/protocols/sametime/sametime.c:5660
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
@@ -10426,32 +10804,32 @@
 "�旅�略粒竜�竜 劉僚留 �僚凌亮留 流 亮竜�旅虜� ID ��凌 �留�留虜略�� �竜隆溜凌 粒旅留 僚留 留僚留龍侶�流�竜�竜 �凌�� "
 "��流��竜� �凌� �凌� 留僚�旅��凌旅�凌�僚 ��侶僚 虜凌旅僚��侶�留 Sametime."
 
-#: ../libpurple/protocols/sametime/sametime.c:5609
+#: ../libpurple/protocols/sametime/sametime.c:5663
 msgid "User Search"
 msgstr "�僚留龍流�侶�侶 ��流��侶"
 
-#: ../libpurple/protocols/sametime/sametime.c:5622
+#: ../libpurple/protocols/sametime/sametime.c:5676
 msgid "Import Sametime List..."
 msgstr "�旅�留粒�粒流 了溜��留� Sametime..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5626
+#: ../libpurple/protocols/sametime/sametime.c:5680
 msgid "Export Sametime List..."
 msgstr "�両留粒�粒流 了溜��留� Sametime..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5630
+#: ../libpurple/protocols/sametime/sametime.c:5684
 msgid "Add Notes Address Book Group..."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5634
+#: ../libpurple/protocols/sametime/sametime.c:5688
 msgid "User Search..."
 msgstr "�僚留龍流�侶�侶 ��流��侶..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5740
+#: ../libpurple/protocols/sametime/sametime.c:5794
 msgid "Force login (ignore server redirects)"
 msgstr "�両留僚留粒虜留�亮�� 竜旅��隆凌� (�留�略硫了竜�侶 留僚留隆�凌亮凌了凌粒流�竜�僚 �凌� 竜両��侶�竜�侶�流)"
 
 #. pretend to be Sametime Connect
-#: ../libpurple/protocols/sametime/sametime.c:5750
+#: ../libpurple/protocols/sametime/sametime.c:5804
 msgid "Hide client identity"
 msgstr "���虜���侶 �留����侶�留� �竜了略�侶"
 
@@ -10582,8 +10960,8 @@
 #: ../libpurple/protocols/silc/buddy.c:496
 #: ../libpurple/protocols/silc/buddy.c:507
 #: ../libpurple/protocols/silc/buddy.c:540
-#: ../libpurple/protocols/silc/ops.c:1499
-#: ../libpurple/protocols/silc/ops.c:1510
+#: ../libpurple/protocols/silc/ops.c:1503
+#: ../libpurple/protocols/silc/ops.c:1514
 #: ../libpurple/protocols/silc10/buddy.c:513
 #: ../libpurple/protocols/silc10/buddy.c:548
 #: ../libpurple/protocols/silc10/ops.c:1494
@@ -10592,8 +10970,8 @@
 msgstr "�流�侶 隆侶亮凌�溜凌� 虜了竜旅隆旅凌�"
 
 #: ../libpurple/protocols/silc/buddy.c:541
-#: ../libpurple/protocols/silc/ops.c:1500
-#: ../libpurple/protocols/silc/ops.c:1511
+#: ../libpurple/protocols/silc/ops.c:1504
+#: ../libpurple/protocols/silc/ops.c:1515
 #: ../libpurple/protocols/silc10/buddy.c:549
 #: ../libpurple/protocols/silc10/ops.c:1495
 #: ../libpurple/protocols/silc10/ops.c:1506
@@ -10601,17 +10979,17 @@
 msgstr "�竜僚 竜溜僚留旅 隆�僚留�流 侶 了流�侶 �凌� 隆侶亮凌�溜凌� 虜了竜旅隆旅凌�"
 
 #: ../libpurple/protocols/silc/buddy.c:622
-#: ../libpurple/protocols/silc/buddy.c:1655
+#: ../libpurple/protocols/silc/buddy.c:1658
 #: ../libpurple/protocols/silc10/buddy.c:635
-#: ../libpurple/protocols/silc10/buddy.c:1654
+#: ../libpurple/protocols/silc10/buddy.c:1657
 msgid "Show Public Key"
 msgstr "�亮�略僚旅�侶 隆侶亮凌�溜凌� 虜了竜旅隆旅凌�"
 
 #: ../libpurple/protocols/silc/buddy.c:623
-#: ../libpurple/protocols/silc/buddy.c:1027
-#: ../libpurple/protocols/silc/chat.c:237
+#: ../libpurple/protocols/silc/buddy.c:1030
+#: ../libpurple/protocols/silc/chat.c:239
 #: ../libpurple/protocols/silc10/buddy.c:636
-#: ../libpurple/protocols/silc10/buddy.c:1033
+#: ../libpurple/protocols/silc10/buddy.c:1036
 #: ../libpurple/protocols/silc10/chat.c:237
 msgid "Could not load public key"
 msgstr "�竜僚 竜溜僚留旅 隆�僚留�� �凌 �����亮留 �凌� 隆侶亮凌�溜凌� 虜了竜旅隆旅凌�"
@@ -10619,9 +10997,9 @@
 #: ../libpurple/protocols/silc/buddy.c:701
 #: ../libpurple/protocols/silc/ops.c:1053
 #: ../libpurple/protocols/silc/ops.c:1168
-#: ../libpurple/protocols/silc/ops.c:1288
-#: ../libpurple/protocols/silc/ops.c:1289
-#: ../libpurple/protocols/silc/ops.c:1307
+#: ../libpurple/protocols/silc/ops.c:1290
+#: ../libpurple/protocols/silc/ops.c:1291
+#: ../libpurple/protocols/silc/ops.c:1309
 #: ../libpurple/protocols/silc10/buddy.c:713
 #: ../libpurple/protocols/silc10/ops.c:1087
 #: ../libpurple/protocols/silc10/ops.c:1159
@@ -10633,7 +11011,7 @@
 
 #: ../libpurple/protocols/silc/buddy.c:702
 #: ../libpurple/protocols/silc/ops.c:1169
-#: ../libpurple/protocols/silc/ops.c:1308
+#: ../libpurple/protocols/silc/ops.c:1310
 #: ../libpurple/protocols/silc10/buddy.c:714
 #: ../libpurple/protocols/silc10/ops.c:1160
 #: ../libpurple/protocols/silc10/ops.c:1314
@@ -10657,19 +11035,19 @@
 "粒旅留 僚留 了略硫竜�竜 �凌 隆侶亮��旅凌 虜了竜旅隆溜."
 
 #. Open file selector to select the public key.
-#: ../libpurple/protocols/silc/buddy.c:1059
-#: ../libpurple/protocols/silc10/buddy.c:1067
+#: ../libpurple/protocols/silc/buddy.c:1062
+#: ../libpurple/protocols/silc10/buddy.c:1070
 msgid "Open..."
 msgstr "�僚凌旅粒亮留..."
 
-#: ../libpurple/protocols/silc/buddy.c:1070
-#: ../libpurple/protocols/silc10/buddy.c:1078
+#: ../libpurple/protocols/silc/buddy.c:1073
+#: ../libpurple/protocols/silc10/buddy.c:1081
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr "� �溜了凌� %s 隆竜僚 竜溜僚留旅 �留��僚 ��凌 隆溜虜��凌"
 
-#: ../libpurple/protocols/silc/buddy.c:1073
-#: ../libpurple/protocols/silc10/buddy.c:1081
+#: ../libpurple/protocols/silc/buddy.c:1076
+#: ../libpurple/protocols/silc10/buddy.c:1084
 msgid ""
 "To add the buddy you must import his/her public key. Press Import to import "
 "a public key."
@@ -10677,18 +11055,18 @@
 "�旅留 僚留 ��凌�慮劉�竜�竜 劉僚留 �溜了凌 ��劉�竜旅 僚留 竜旅�略粒竜�竜 �凌 隆侶亮��旅凌 虜了竜旅隆溜 �凌�. �留�流��竜 "
 "�旅�留粒�粒流 粒旅留 僚留 竜旅�略粒竜�竜 �凌 隆侶亮��旅凌 虜了竜旅隆溜 �凌�."
 
-#: ../libpurple/protocols/silc/buddy.c:1077
-#: ../libpurple/protocols/silc10/buddy.c:1085
+#: ../libpurple/protocols/silc/buddy.c:1080
+#: ../libpurple/protocols/silc10/buddy.c:1088
 msgid "_Import..."
 msgstr "_�旅�留粒�粒流..."
 
-#: ../libpurple/protocols/silc/buddy.c:1183
-#: ../libpurple/protocols/silc10/buddy.c:1181
+#: ../libpurple/protocols/silc/buddy.c:1186
+#: ../libpurple/protocols/silc10/buddy.c:1184
 msgid "Select correct user"
 msgstr "��旅了凌粒流 ����凌� ��流��侶"
 
-#: ../libpurple/protocols/silc/buddy.c:1185
-#: ../libpurple/protocols/silc10/buddy.c:1183
+#: ../libpurple/protocols/silc/buddy.c:1188
+#: ../libpurple/protocols/silc10/buddy.c:1186
 msgid ""
 "More than one user was found with the same public key. Select the correct "
 "user from the list to add to the buddy list."
@@ -10696,8 +11074,8 @@
 "��劉慮侶虜留僚 �竜�旅����竜�凌旅 留�� 劉僚留 ��流��竜� 亮竜 �凌 溜隆旅凌 隆侶亮��旅凌 虜了竜旅隆溜. ��旅了劉両�竜 �凌 "
 "����� ��流��侶 留�� �侶僚 �溜��留 粒旅留 僚留 �凌僚 ��凌�慮劉�竜�竜 ��侶 了溜��留 �溜了�僚."
 
-#: ../libpurple/protocols/silc/buddy.c:1187
-#: ../libpurple/protocols/silc10/buddy.c:1185
+#: ../libpurple/protocols/silc/buddy.c:1190
+#: ../libpurple/protocols/silc10/buddy.c:1188
 msgid ""
 "More than one user was found with the same name. Select the correct user "
 "from the list to add to the buddy list."
@@ -10705,208 +11083,208 @@
 "��劉慮侶虜留僚 �竜�旅����竜�凌旅 留�� 劉僚留 ��流��竜� 亮竜 �凌 溜隆旅凌 �僚凌亮留. ��旅了劉両�竜 �凌 ����� "
 "��流��侶 留�� �侶僚 �溜��留 粒旅留 僚留 �凌僚 ��凌�慮劉�竜�竜 ��侶 了溜��留 �溜了�僚."
 
-#: ../libpurple/protocols/silc/buddy.c:1474
-#: ../libpurple/protocols/silc10/buddy.c:1474
+#: ../libpurple/protocols/silc/buddy.c:1477
+#: ../libpurple/protocols/silc10/buddy.c:1477
 msgid "Detached"
 msgstr "��凌隆竜�亮竜��侶虜竜"
 
-#: ../libpurple/protocols/silc/buddy.c:1478
+#: ../libpurple/protocols/silc/buddy.c:1481
 #: ../libpurple/protocols/silc/silc.c:58
-#: ../libpurple/protocols/silc10/buddy.c:1478
+#: ../libpurple/protocols/silc10/buddy.c:1481
 #: ../libpurple/protocols/silc10/silc.c:49
 msgid "Indisposed"
 msgstr "里凌�凌慮竜�流慮侶虜竜 �留�略�留旅�留"
 
-#: ../libpurple/protocols/silc/buddy.c:1482
+#: ../libpurple/protocols/silc/buddy.c:1485
 #: ../libpurple/protocols/silc/silc.c:60
-#: ../libpurple/protocols/silc10/buddy.c:1482
+#: ../libpurple/protocols/silc10/buddy.c:1485
 #: ../libpurple/protocols/silc10/silc.c:51
 msgid "Wake Me Up"
 msgstr "���僚流��竜 亮竜"
 
-#: ../libpurple/protocols/silc/buddy.c:1484
+#: ../libpurple/protocols/silc/buddy.c:1487
 #: ../libpurple/protocols/silc/silc.c:52
-#: ../libpurple/protocols/silc10/buddy.c:1484
+#: ../libpurple/protocols/silc10/buddy.c:1487
 #: ../libpurple/protocols/silc10/silc.c:43
 msgid "Hyper Active"
 msgstr "離�竜�隆�留��流�旅凌�"
 
-#: ../libpurple/protocols/silc/buddy.c:1486
-#: ../libpurple/protocols/silc10/buddy.c:1486
+#: ../libpurple/protocols/silc/buddy.c:1489
+#: ../libpurple/protocols/silc10/buddy.c:1489
 msgid "Robot"
 msgstr "痢凌亮���"
 
-#: ../libpurple/protocols/silc/buddy.c:1493
-#: ../libpurple/protocols/silc/silc.c:743
-#: ../libpurple/protocols/silc/util.c:516
-#: ../libpurple/protocols/silc10/buddy.c:1493
-#: ../libpurple/protocols/silc10/silc.c:654
+#: ../libpurple/protocols/silc/buddy.c:1496
+#: ../libpurple/protocols/silc/silc.c:886
+#: ../libpurple/protocols/silc/util.c:522
+#: ../libpurple/protocols/silc10/buddy.c:1496
+#: ../libpurple/protocols/silc10/silc.c:660
 #: ../libpurple/protocols/silc10/util.c:512
 msgid "Happy"
 msgstr "律留�凌�亮竜僚凌�"
 
-#: ../libpurple/protocols/silc/buddy.c:1495
-#: ../libpurple/protocols/silc/silc.c:745
-#: ../libpurple/protocols/silc/util.c:518
-#: ../libpurple/protocols/silc10/buddy.c:1495
-#: ../libpurple/protocols/silc10/silc.c:656
+#: ../libpurple/protocols/silc/buddy.c:1498
+#: ../libpurple/protocols/silc/silc.c:888
+#: ../libpurple/protocols/silc/util.c:524
+#: ../libpurple/protocols/silc10/buddy.c:1498
+#: ../libpurple/protocols/silc10/silc.c:662
 #: ../libpurple/protocols/silc10/util.c:514
 msgid "Sad"
 msgstr "���侶亮劉僚凌�"
 
-#: ../libpurple/protocols/silc/buddy.c:1497
-#: ../libpurple/protocols/silc/silc.c:747
-#: ../libpurple/protocols/silc/util.c:520
-#: ../libpurple/protocols/silc10/buddy.c:1497
-#: ../libpurple/protocols/silc10/silc.c:658
+#: ../libpurple/protocols/silc/buddy.c:1500
+#: ../libpurple/protocols/silc/silc.c:890
+#: ../libpurple/protocols/silc/util.c:526
+#: ../libpurple/protocols/silc10/buddy.c:1500
+#: ../libpurple/protocols/silc10/silc.c:664
 #: ../libpurple/protocols/silc10/util.c:516
 msgid "Angry"
 msgstr "��亮�亮劉僚凌�"
 
-#: ../libpurple/protocols/silc/buddy.c:1499
-#: ../libpurple/protocols/silc/silc.c:749
-#: ../libpurple/protocols/silc/util.c:522
-#: ../libpurple/protocols/silc10/buddy.c:1499
-#: ../libpurple/protocols/silc10/silc.c:660
+#: ../libpurple/protocols/silc/buddy.c:1502
+#: ../libpurple/protocols/silc/silc.c:892
+#: ../libpurple/protocols/silc/util.c:528
+#: ../libpurple/protocols/silc10/buddy.c:1502
+#: ../libpurple/protocols/silc10/silc.c:666
 #: ../libpurple/protocols/silc10/util.c:518
 msgid "Jealous"
 msgstr "�侶了旅略�侶�"
 
-#: ../libpurple/protocols/silc/buddy.c:1501
-#: ../libpurple/protocols/silc/silc.c:751
-#: ../libpurple/protocols/silc/util.c:524
-#: ../libpurple/protocols/silc10/buddy.c:1501
-#: ../libpurple/protocols/silc10/silc.c:662
+#: ../libpurple/protocols/silc/buddy.c:1504
+#: ../libpurple/protocols/silc/silc.c:894
+#: ../libpurple/protocols/silc/util.c:530
+#: ../libpurple/protocols/silc10/buddy.c:1504
+#: ../libpurple/protocols/silc10/silc.c:668
 #: ../libpurple/protocols/silc10/util.c:520
 msgid "Ashamed"
 msgstr "���凌�留了��"
 
-#: ../libpurple/protocols/silc/buddy.c:1503
-#: ../libpurple/protocols/silc/silc.c:753
-#: ../libpurple/protocols/silc/util.c:526
-#: ../libpurple/protocols/silc10/buddy.c:1503
-#: ../libpurple/protocols/silc10/silc.c:664
+#: ../libpurple/protocols/silc/buddy.c:1506
+#: ../libpurple/protocols/silc/silc.c:896
+#: ../libpurple/protocols/silc/util.c:532
+#: ../libpurple/protocols/silc10/buddy.c:1506
+#: ../libpurple/protocols/silc10/silc.c:670
 #: ../libpurple/protocols/silc10/util.c:522
 msgid "Invincible"
 msgstr "�����凌�"
 
-#: ../libpurple/protocols/silc/buddy.c:1505
-#: ../libpurple/protocols/silc/util.c:528
-#: ../libpurple/protocols/silc10/buddy.c:1505
+#: ../libpurple/protocols/silc/buddy.c:1508
+#: ../libpurple/protocols/silc/util.c:534
+#: ../libpurple/protocols/silc10/buddy.c:1508
 #: ../libpurple/protocols/silc10/util.c:524
 msgid "In Love"
 msgstr "����竜�亮劉僚凌�"
 
-#: ../libpurple/protocols/silc/buddy.c:1507
-#: ../libpurple/protocols/silc/silc.c:757
-#: ../libpurple/protocols/silc/util.c:530
-#: ../libpurple/protocols/silc10/buddy.c:1507
-#: ../libpurple/protocols/silc10/silc.c:668
+#: ../libpurple/protocols/silc/buddy.c:1510
+#: ../libpurple/protocols/silc/silc.c:900
+#: ../libpurple/protocols/silc/util.c:536
+#: ../libpurple/protocols/silc10/buddy.c:1510
+#: ../libpurple/protocols/silc10/silc.c:674
 #: ../libpurple/protocols/silc10/util.c:526
 msgid "Sleepy"
 msgstr "�凌旅亮旅�亮劉僚凌�"
 
-#: ../libpurple/protocols/silc/buddy.c:1509
-#: ../libpurple/protocols/silc/silc.c:759
-#: ../libpurple/protocols/silc/util.c:532
-#: ../libpurple/protocols/silc10/buddy.c:1509
-#: ../libpurple/protocols/silc10/silc.c:670
+#: ../libpurple/protocols/silc/buddy.c:1512
+#: ../libpurple/protocols/silc/silc.c:902
+#: ../libpurple/protocols/silc/util.c:538
+#: ../libpurple/protocols/silc10/buddy.c:1512
+#: ../libpurple/protocols/silc10/silc.c:676
 #: ../libpurple/protocols/silc10/util.c:528
 msgid "Bored"
 msgstr "�留�旅竜��侶亮劉僚凌�"
 
-#: ../libpurple/protocols/silc/buddy.c:1511
-#: ../libpurple/protocols/silc/silc.c:761
-#: ../libpurple/protocols/silc/util.c:534
-#: ../libpurple/protocols/silc10/buddy.c:1511
-#: ../libpurple/protocols/silc10/silc.c:672
+#: ../libpurple/protocols/silc/buddy.c:1514
+#: ../libpurple/protocols/silc/silc.c:904
+#: ../libpurple/protocols/silc/util.c:540
+#: ../libpurple/protocols/silc10/buddy.c:1514
+#: ../libpurple/protocols/silc10/silc.c:678
 #: ../libpurple/protocols/silc10/util.c:530
 msgid "Excited"
 msgstr "�僚�����旅留�亮劉僚凌�"
 
-#: ../libpurple/protocols/silc/buddy.c:1513
-#: ../libpurple/protocols/silc/silc.c:763
-#: ../libpurple/protocols/silc/util.c:536
-#: ../libpurple/protocols/silc10/buddy.c:1513
-#: ../libpurple/protocols/silc10/silc.c:674
+#: ../libpurple/protocols/silc/buddy.c:1516
+#: ../libpurple/protocols/silc/silc.c:906
+#: ../libpurple/protocols/silc/util.c:542
+#: ../libpurple/protocols/silc10/buddy.c:1516
+#: ../libpurple/protocols/silc10/silc.c:680
 #: ../libpurple/protocols/silc10/util.c:532
 msgid "Anxious"
 msgstr "�亮流�留僚凌�"
 
-#: ../libpurple/protocols/silc/buddy.c:1545
+#: ../libpurple/protocols/silc/buddy.c:1548
 #: ../libpurple/protocols/silc/ops.c:1207
-#: ../libpurple/protocols/silc10/buddy.c:1545
+#: ../libpurple/protocols/silc10/buddy.c:1548
 #: ../libpurple/protocols/silc10/ops.c:1202
 msgid "User Modes"
 msgstr "�留�留��略�竜旅� ��侶���僚"
 
-#: ../libpurple/protocols/silc/buddy.c:1562
+#: ../libpurple/protocols/silc/buddy.c:1565
 #: ../libpurple/protocols/silc/ops.c:1224
-#: ../libpurple/protocols/silc10/buddy.c:1562
+#: ../libpurple/protocols/silc10/buddy.c:1565
 #: ../libpurple/protocols/silc10/ops.c:1219
 msgid "Preferred Contact"
 msgstr "��凌�旅亮�亮竜僚侶 竜�留�流"
 
-#: ../libpurple/protocols/silc/buddy.c:1567
+#: ../libpurple/protocols/silc/buddy.c:1570
 #: ../libpurple/protocols/silc/ops.c:1229
-#: ../libpurple/protocols/silc10/buddy.c:1567
+#: ../libpurple/protocols/silc10/buddy.c:1570
 #: ../libpurple/protocols/silc10/ops.c:1224
 msgid "Preferred Language"
 msgstr "��凌�旅亮�亮竜僚侶 粒了���留"
 
-#: ../libpurple/protocols/silc/buddy.c:1572
+#: ../libpurple/protocols/silc/buddy.c:1575
 #: ../libpurple/protocols/silc/ops.c:1234
-#: ../libpurple/protocols/silc10/buddy.c:1572
+#: ../libpurple/protocols/silc10/buddy.c:1575
 #: ../libpurple/protocols/silc10/ops.c:1229
 msgid "Device"
 msgstr "裡��虜竜�流"
 
-#: ../libpurple/protocols/silc/buddy.c:1577
+#: ../libpurple/protocols/silc/buddy.c:1580
 #: ../libpurple/protocols/silc/ops.c:1239
-#: ../libpurple/protocols/silc10/buddy.c:1577
+#: ../libpurple/protocols/silc10/buddy.c:1580
 #: ../libpurple/protocols/silc10/ops.c:1234
-#: ../libpurple/protocols/silc10/silc.c:722
-#: ../libpurple/protocols/silc10/silc.c:724
+#: ../libpurple/protocols/silc10/silc.c:728
+#: ../libpurple/protocols/silc10/silc.c:730
 msgid "Timezone"
 msgstr "��僚侶 ��留�"
 
-#: ../libpurple/protocols/silc/buddy.c:1582
+#: ../libpurple/protocols/silc/buddy.c:1585
 #: ../libpurple/protocols/silc/ops.c:1244
-#: ../libpurple/protocols/silc10/buddy.c:1582
+#: ../libpurple/protocols/silc10/buddy.c:1585
 #: ../libpurple/protocols/silc10/ops.c:1239
 msgid "Geolocation"
 msgstr "�竜�粒�留�旅虜流 �凌�凌慮竜�溜留"
 
-#: ../libpurple/protocols/silc/buddy.c:1638
-#: ../libpurple/protocols/silc10/buddy.c:1636
+#: ../libpurple/protocols/silc/buddy.c:1641
+#: ../libpurple/protocols/silc10/buddy.c:1639
 msgid "Reset IM Key"
 msgstr "��留僚留�凌�略 虜了竜旅隆旅凌� 略亮竜�凌� 亮侶僚�亮留�凌�"
 
-#: ../libpurple/protocols/silc/buddy.c:1643
-#: ../libpurple/protocols/silc10/buddy.c:1642
+#: ../libpurple/protocols/silc/buddy.c:1646
+#: ../libpurple/protocols/silc10/buddy.c:1645
 msgid "IM with Key Exchange"
 msgstr "�亮竜�凌 亮流僚�亮留 亮竜 留僚�留了了留粒流 虜了竜旅隆旅凌�"
 
-#: ../libpurple/protocols/silc/buddy.c:1648
-#: ../libpurple/protocols/silc10/buddy.c:1647
+#: ../libpurple/protocols/silc/buddy.c:1651
+#: ../libpurple/protocols/silc10/buddy.c:1650
 msgid "IM with Password"
 msgstr "�亮竜�凌 亮流僚�亮留 亮竜 虜�隆旅虜�"
 
-#: ../libpurple/protocols/silc/buddy.c:1661
-#: ../libpurple/protocols/silc10/buddy.c:1660
+#: ../libpurple/protocols/silc/buddy.c:1664
+#: ../libpurple/protocols/silc10/buddy.c:1663
 msgid "Get Public Key..."
 msgstr "�流�侶 隆侶亮凌�溜凌� 虜了竜旅隆旅凌�..."
 
-#: ../libpurple/protocols/silc/buddy.c:1668
-#: ../libpurple/protocols/silc/ops.c:1608
-#: ../libpurple/protocols/silc10/buddy.c:1667
+#: ../libpurple/protocols/silc/buddy.c:1671
+#: ../libpurple/protocols/silc/ops.c:1612
+#: ../libpurple/protocols/silc10/buddy.c:1670
 #: ../libpurple/protocols/silc10/ops.c:1624
 msgid "Kill User"
 msgstr "裡虜���亮留 ��流��侶"
 
-#: ../libpurple/protocols/silc/buddy.c:1678
-#: ../libpurple/protocols/silc/chat.c:993
-#: ../libpurple/protocols/silc10/buddy.c:1677
+#: ../libpurple/protocols/silc/buddy.c:1681
+#: ../libpurple/protocols/silc/chat.c:997
+#: ../libpurple/protocols/silc10/buddy.c:1680
 #: ../libpurple/protocols/silc10/chat.c:977
 msgid "Draw On Whiteboard"
 msgstr ""
@@ -10923,7 +11301,7 @@
 msgstr "里凌 虜留僚略了旅 %s 隆竜僚 ��略��竜旅 ��凌 隆溜虜��凌"
 
 #: ../libpurple/protocols/silc/chat.c:81
-#: ../libpurple/protocols/silc/chat.c:175
+#: ../libpurple/protocols/silc/chat.c:177
 #: ../libpurple/protocols/silc10/chat.c:81
 #: ../libpurple/protocols/silc10/chat.c:174
 msgid "Channel Information"
@@ -10973,46 +11351,44 @@
 
 #: ../libpurple/protocols/silc/chat.c:153
 #: ../libpurple/protocols/silc10/chat.c:152
-#, c-format
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>�留�留��略�竜旅� 虜留僚留了旅凌�:</b> "
 
-#: ../libpurple/protocols/silc/chat.c:166
+#: ../libpurple/protocols/silc/chat.c:167
 #: ../libpurple/protocols/silc10/chat.c:165
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr "<br><b>��凌����亮留 虜了竜旅隆旅凌� 旅隆���流:</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:167
+#: ../libpurple/protocols/silc/chat.c:168
 #: ../libpurple/protocols/silc10/chat.c:166
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr ""
 
-#: ../libpurple/protocols/silc/chat.c:236
+#: ../libpurple/protocols/silc/chat.c:238
 #: ../libpurple/protocols/silc10/chat.c:236
 msgid "Add Channel Public Key"
 msgstr "��凌�慮流虜侶 隆侶亮凌�溜凌� 虜了竜旅隆旅凌� 虜留僚留了旅凌�"
 
 #. Add new public key
-#: ../libpurple/protocols/silc/chat.c:304
+#: ../libpurple/protocols/silc/chat.c:306
 #: ../libpurple/protocols/silc10/chat.c:291
 msgid "Open Public Key..."
 msgstr "�僚凌旅粒亮留 隆侶亮凌�溜凌� 虜了竜旅隆旅凌�..."
 
-#: ../libpurple/protocols/silc/chat.c:423
+#: ../libpurple/protocols/silc/chat.c:425
 #: ../libpurple/protocols/silc10/chat.c:401
 msgid "Channel Passphrase"
 msgstr "裡�僚慮侶亮留 虜留僚留了旅凌�"
 
-#: ../libpurple/protocols/silc/chat.c:430
+#: ../libpurple/protocols/silc/chat.c:432
 #: ../libpurple/protocols/silc10/chat.c:408
 msgid "Channel Public Keys List"
 msgstr "�溜��留 隆侶亮凌�溜�僚 虜了竜旅隆旅�僚 虜留僚留了旅凌�"
 
-#: ../libpurple/protocols/silc/chat.c:435
+#: ../libpurple/protocols/silc/chat.c:437
 #: ../libpurple/protocols/silc10/chat.c:413
-#, c-format
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -11026,11 +11402,11 @@
 "隆侶亮��旅留 虜了竜旅隆旅略 ���竜 亮�僚凌 凌旅 ��流��竜� ��僚 凌�凌溜�僚 �留 隆侶亮��旅留 虜了竜旅隆旅略 竜溜僚留旅 ��侶 "
 "了溜��留 亮�凌�凌�僚 僚留 ��亮亮竜�略��凌�僚."
 
-#: ../libpurple/protocols/silc/chat.c:444
-#: ../libpurple/protocols/silc/chat.c:445
-#: ../libpurple/protocols/silc/chat.c:479
-#: ../libpurple/protocols/silc/chat.c:480
-#: ../libpurple/protocols/silc/chat.c:927
+#: ../libpurple/protocols/silc/chat.c:446
+#: ../libpurple/protocols/silc/chat.c:447
+#: ../libpurple/protocols/silc/chat.c:483
+#: ../libpurple/protocols/silc/chat.c:484
+#: ../libpurple/protocols/silc/chat.c:931
 #: ../libpurple/protocols/silc10/chat.c:422
 #: ../libpurple/protocols/silc10/chat.c:423
 #: ../libpurple/protocols/silc10/chat.c:461
@@ -11039,145 +11415,144 @@
 msgid "Channel Authentication"
 msgstr "�粒虜�旅�侶 虜留僚留了旅凌�"
 
-#: ../libpurple/protocols/silc/chat.c:446
-#: ../libpurple/protocols/silc/chat.c:481
+#: ../libpurple/protocols/silc/chat.c:448
+#: ../libpurple/protocols/silc/chat.c:485
 #: ../libpurple/protocols/silc10/chat.c:424
 #: ../libpurple/protocols/silc10/chat.c:463
 msgid "Add / Remove"
 msgstr "��凌�慮流虜侶 / ��留溜�竜�侶"
 
-#: ../libpurple/protocols/silc/chat.c:597
+#: ../libpurple/protocols/silc/chat.c:601
 #: ../libpurple/protocols/silc10/chat.c:581
 msgid "Group Name"
 msgstr "�僚凌亮留 凌亮略隆留�"
 
-#: ../libpurple/protocols/silc/chat.c:601
-#: ../libpurple/protocols/silc/ops.c:1813
-#: ../libpurple/protocols/silc/silc.c:1020
+#: ../libpurple/protocols/silc/chat.c:605
+#: ../libpurple/protocols/silc/ops.c:1817
+#: ../libpurple/protocols/silc/silc.c:1163
 #: ../libpurple/protocols/silc10/chat.c:585
-#: ../libpurple/protocols/silc10/ops.c:1901
-#: ../libpurple/protocols/silc10/silc.c:931
+#: ../libpurple/protocols/silc10/ops.c:1907
+#: ../libpurple/protocols/silc10/silc.c:937
 msgid "Passphrase"
 msgstr "裡�僚慮侶亮留"
 
-#: ../libpurple/protocols/silc/chat.c:612
+#: ../libpurple/protocols/silc/chat.c:616
 #: ../libpurple/protocols/silc10/chat.c:596
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
-msgstr ""
-
-#: ../libpurple/protocols/silc/chat.c:614
+msgstr "�留�留虜留了凌�亮竜 竜旅�略粒竜�竜 �凌 �僚凌亮留 �侶� 虜了竜旅��流� 凌亮略隆留� �凌� 虜留僚留了旅凌� %s 虜留旅 �凌 ��僚慮侶亮留."
+
+#: ../libpurple/protocols/silc/chat.c:618
 #: ../libpurple/protocols/silc10/chat.c:598
 msgid "Add Channel Private Group"
-msgstr ""
-
-#: ../libpurple/protocols/silc/chat.c:742
+msgstr "��凌�慮流虜侶 虜了竜旅��流� 凌亮略隆留� 虜留僚留了旅凌�"
+
+#: ../libpurple/protocols/silc/chat.c:746
 #: ../libpurple/protocols/silc10/chat.c:726
 msgid "User Limit"
 msgstr "��旅凌 ��侶���僚"
 
-#: ../libpurple/protocols/silc/chat.c:743
+#: ../libpurple/protocols/silc/chat.c:747
 #: ../libpurple/protocols/silc10/chat.c:727
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr ""
 "��旅�亮�� 凌�溜凌� ��侶���僚 ��凌 虜留僚略了旅. ��溜��竜 亮侶隆劉僚 粒旅留 竜�留僚留�凌�略 �凌� 凌�溜凌� "
 "��侶���僚."
 
-#: ../libpurple/protocols/silc/chat.c:907
+#: ../libpurple/protocols/silc/chat.c:911
 #: ../libpurple/protocols/silc10/chat.c:891
 msgid "Invite List"
 msgstr "�溜��留 ��凌�虜了流�竜�僚"
 
-#: ../libpurple/protocols/silc/chat.c:912
+#: ../libpurple/protocols/silc/chat.c:916
 #: ../libpurple/protocols/silc10/chat.c:896
 msgid "Ban List"
 msgstr "�溜��留 留�留粒��竜��侶� 竜旅��隆凌�"
 
-#: ../libpurple/protocols/silc/chat.c:920
+#: ../libpurple/protocols/silc/chat.c:924
 #: ../libpurple/protocols/silc10/chat.c:904
 msgid "Add Private Group"
-msgstr ""
-
-#: ../libpurple/protocols/silc/chat.c:933
+msgstr "��凌�慮流虜侶 虜了竜旅��流� 凌亮略隆留�"
+
+#: ../libpurple/protocols/silc/chat.c:937
 #: ../libpurple/protocols/silc10/chat.c:917
 msgid "Reset Permanent"
 msgstr "��留僚留�凌�略 亮凌僚溜亮�僚"
 
-#: ../libpurple/protocols/silc/chat.c:938
+#: ../libpurple/protocols/silc/chat.c:942
 #: ../libpurple/protocols/silc10/chat.c:922
 msgid "Set Permanent"
 msgstr "��旅�亮�� 亮凌僚溜亮�僚"
 
-#: ../libpurple/protocols/silc/chat.c:946
+#: ../libpurple/protocols/silc/chat.c:950
 #: ../libpurple/protocols/silc10/chat.c:930
 msgid "Set User Limit"
 msgstr "��旅�亮�� 凌�溜凌� ��侶���僚"
 
-#: ../libpurple/protocols/silc/chat.c:952
+#: ../libpurple/protocols/silc/chat.c:956
 #: ../libpurple/protocols/silc10/chat.c:936
 msgid "Reset Topic Restriction"
 msgstr "��留僚留�凌�略 �竜�旅凌�旅�亮凌� 慮劉亮留�凌� ��龍流�侶�侶�"
 
-#: ../libpurple/protocols/silc/chat.c:957
+#: ../libpurple/protocols/silc/chat.c:961
 #: ../libpurple/protocols/silc10/chat.c:941
 msgid "Set Topic Restriction"
 msgstr "��旅�亮�� �竜�旅凌�旅�亮凌� 慮劉亮留�凌� ��龍流�侶�侶�"
 
-#: ../libpurple/protocols/silc/chat.c:964
+#: ../libpurple/protocols/silc/chat.c:968
 #: ../libpurple/protocols/silc10/chat.c:948
 msgid "Reset Private Channel"
-msgstr ""
-
-#: ../libpurple/protocols/silc/chat.c:969
+msgstr "��留僚留�凌�略 虜了竜旅��凌� 虜留僚留了旅凌�"
+
+#: ../libpurple/protocols/silc/chat.c:973
 #: ../libpurple/protocols/silc10/chat.c:953
 msgid "Set Private Channel"
-msgstr ""
-
-#: ../libpurple/protocols/silc/chat.c:976
+msgstr "��旅�亮�� 虜了竜旅��凌� 虜留僚留了旅凌�"
+
+#: ../libpurple/protocols/silc/chat.c:980
 #: ../libpurple/protocols/silc10/chat.c:960
 msgid "Reset Secret Channel"
 msgstr "��留僚留�凌�略 虜���凌� 虜留僚留了旅凌�"
 
-#: ../libpurple/protocols/silc/chat.c:981
+#: ../libpurple/protocols/silc/chat.c:985
 #: ../libpurple/protocols/silc10/chat.c:965
 msgid "Set Secret Channel"
 msgstr "��旅�亮�� 虜���凌� 虜留僚留了旅凌�"
 
-#: ../libpurple/protocols/silc/chat.c:1045
+#: ../libpurple/protocols/silc/chat.c:1046
 #: ../libpurple/protocols/silc10/chat.c:1102
 #, c-format
-msgid ""
-"You have to join the %s channel before you are able to join the private group"
-msgstr ""
-
-#: ../libpurple/protocols/silc/chat.c:1047
+msgid "You have to join the %s channel before you are able to join the private group"
+msgstr "��劉�竜旅 僚留 亮�竜溜�竜 ��凌 虜留僚略了旅 %s ��旅僚 僚留 劉�竜�竜 �侶 隆�僚留���侶�留 僚留 ��亮亮竜�略��竜�竜 ��侶僚 虜了竜旅��流 凌亮略隆留"
+
+#: ../libpurple/protocols/silc/chat.c:1048
 #: ../libpurple/protocols/silc10/chat.c:1104
 msgid "Join Private Group"
-msgstr ""
-
-#: ../libpurple/protocols/silc/chat.c:1048
+msgstr "裡�亮亮竜�凌�流 �竜 虜了竜旅��流 凌亮略隆留"
+
+#: ../libpurple/protocols/silc/chat.c:1049
 #: ../libpurple/protocols/silc10/chat.c:1105
 msgid "Cannot join private group"
-msgstr ""
-
-#: ../libpurple/protocols/silc/chat.c:1260
-#: ../libpurple/protocols/silc/silc.c:1217
+msgstr "�隆�僚留亮溜留 ��亮亮竜�凌�流� ��侶僚 虜了竜旅��流 凌亮略隆留"
+
+#: ../libpurple/protocols/silc/chat.c:1245
+#: ../libpurple/protocols/silc/silc.c:1360
 #: ../libpurple/protocols/silc10/chat.c:1299
-#: ../libpurple/protocols/silc10/silc.c:1137
+#: ../libpurple/protocols/silc10/silc.c:1143
 msgid "Call Command"
 msgstr "�了流�侶 竜僚�凌了流�"
 
-#: ../libpurple/protocols/silc/chat.c:1260
-#: ../libpurple/protocols/silc/silc.c:1218
+#: ../libpurple/protocols/silc/chat.c:1245
+#: ../libpurple/protocols/silc/silc.c:1361
 #: ../libpurple/protocols/silc10/chat.c:1299
-#: ../libpurple/protocols/silc10/silc.c:1137
+#: ../libpurple/protocols/silc10/silc.c:1143
 msgid "Cannot call command"
 msgstr "�竜僚 竜溜僚留旅 隆�僚留�流 侶 虜了流�侶 �侶� 竜僚�凌了流�"
 
-#: ../libpurple/protocols/silc/chat.c:1261
-#: ../libpurple/protocols/silc/silc.c:1219
+#: ../libpurple/protocols/silc/chat.c:1246
+#: ../libpurple/protocols/silc/silc.c:1362
 #: ../libpurple/protocols/silc10/chat.c:1300
-#: ../libpurple/protocols/silc10/silc.c:1138
+#: ../libpurple/protocols/silc10/silc.c:1144
 msgid "Unknown command"
 msgstr "�粒僚���侶 竜僚�凌了流"
 
@@ -11210,9 +11585,8 @@
 msgstr "裡�略了亮留 虜留�略 �侶 亮竜�留�凌�略 �凌� 留��竜溜凌�"
 
 #: ../libpurple/protocols/silc/ft.c:87
-#, fuzzy
 msgid "Remote disconnected"
-msgstr "%s 留�凌��僚隆劉慮侶虜竜"
+msgstr "� 留�凌亮留虜���亮劉僚凌� 留�凌��僚隆劉慮侶虜竜"
 
 #: ../libpurple/protocols/silc/ft.c:106 ../libpurple/protocols/silc10/ft.c:94
 msgid "Permission denied"
@@ -11223,14 +11597,12 @@
 msgstr "��凌���溜留 ��亮��僚溜留� 虜了竜旅隆旅凌�"
 
 #: ../libpurple/protocols/silc/ft.c:114
-#, fuzzy
 msgid "Connection timed out"
 msgstr "里劉了凌� ��凌僚旅虜凌� 凌�溜凌� ��僚隆竜�侶�"
 
 #: ../libpurple/protocols/silc/ft.c:118
-#, fuzzy
 msgid "Creating connection failed"
-msgstr "��凌���溜留 ��僚隆竜�侶�"
+msgstr "��凌���溜留 隆侶亮旅凌��粒溜留� ��僚隆竜�侶�"
 
 #: ../libpurple/protocols/silc/ft.c:122 ../libpurple/protocols/silc10/ft.c:102
 msgid "File transfer session does not exist"
@@ -11257,9 +11629,8 @@
 msgstr "�隆�僚留�侶 侶 留�凌��凌了流 �凌� 留��竜溜凌�"
 
 #: ../libpurple/protocols/silc/ops.c:57
-#, fuzzy
 msgid "Error occurred"
-msgstr "裡�略了亮留 "
+msgstr "裡�僚劉硫侶 ��略了亮留"
 
 #: ../libpurple/protocols/silc/ops.c:533 ../libpurple/protocols/silc/ops.c:542
 #: ../libpurple/protocols/silc/ops.c:551
@@ -11339,9 +11710,9 @@
 msgstr "痢�了凌� 竜�粒留�溜留�"
 
 #: ../libpurple/protocols/silc/ops.c:1018
-#: ../libpurple/protocols/silc/silc.c:1013
+#: ../libpurple/protocols/silc/silc.c:1156
 #: ../libpurple/protocols/silc10/ops.c:1052
-#: ../libpurple/protocols/silc10/silc.c:924
+#: ../libpurple/protocols/silc10/silc.c:930
 msgid "Organization"
 msgstr "��粒留僚旅�亮��"
 
@@ -11373,10 +11744,10 @@
 msgstr "� 旅隆���流� �凌� 虜留僚留了旅凌� <I>%s</I> 竜溜僚留旅 凌 <I>%s</I>"
 
 #: ../libpurple/protocols/silc/ops.c:1190
-#: ../libpurple/protocols/silc/ops.c:1326
+#: ../libpurple/protocols/silc/ops.c:1328
 #: ../libpurple/protocols/silc10/ops.c:1183
 #: ../libpurple/protocols/silc10/ops.c:1332
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1071
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1077
 msgid "Real Name"
 msgstr "��留粒亮留�旅虜� �僚凌亮留"
 
@@ -11385,91 +11756,90 @@
 msgid "Status Text"
 msgstr "�竜溜亮竜僚凌 虜留�略��留�侶�"
 
-#: ../libpurple/protocols/silc/ops.c:1279
-#: ../libpurple/protocols/silc/ops.c:1351
+#: ../libpurple/protocols/silc/ops.c:1280
+#: ../libpurple/protocols/silc/ops.c:1354
 #: ../libpurple/protocols/silc10/ops.c:1285
 #: ../libpurple/protocols/silc10/ops.c:1357
 msgid "Public Key Fingerprint"
 msgstr "��凌����亮留 隆侶亮凌�溜凌� 虜了竜旅隆旅凌�"
 
-#: ../libpurple/protocols/silc/ops.c:1280
-#: ../libpurple/protocols/silc/ops.c:1352
+#: ../libpurple/protocols/silc/ops.c:1281
+#: ../libpurple/protocols/silc/ops.c:1355
 #: ../libpurple/protocols/silc10/ops.c:1286
 #: ../libpurple/protocols/silc10/ops.c:1358
 msgid "Public Key Babbleprint"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1292
+#: ../libpurple/protocols/silc/ops.c:1294
 #: ../libpurple/protocols/silc10/ops.c:1298
 msgid "_More..."
 msgstr "_�竜�旅����竜�留..."
 
-#: ../libpurple/protocols/silc/ops.c:1369
-#: ../libpurple/protocols/silc/silc.c:1077
+#: ../libpurple/protocols/silc/ops.c:1373
+#: ../libpurple/protocols/silc/silc.c:1220
 #: ../libpurple/protocols/silc10/ops.c:1371
-#: ../libpurple/protocols/silc10/silc.c:988
+#: ../libpurple/protocols/silc10/silc.c:994
 msgid "Detach From Server"
 msgstr "��凌隆劉�亮竜��侶 留�� �凌僚 竜両��侶�竜�侶�流"
 
-#: ../libpurple/protocols/silc/ops.c:1369
+#: ../libpurple/protocols/silc/ops.c:1373
 #: ../libpurple/protocols/silc10/ops.c:1371
 msgid "Cannot detach"
 msgstr "�竜僚 竜溜僚留旅 隆�僚留�流 侶 留�凌隆劉�亮竜��侶"
 
-#: ../libpurple/protocols/silc/ops.c:1389
+#: ../libpurple/protocols/silc/ops.c:1393
 #: ../libpurple/protocols/silc10/ops.c:1382
 msgid "Cannot set topic"
 msgstr "�竜僚 竜溜僚留旅 隆�僚留��� 凌 凌�旅�亮�� �凌� 慮劉亮留�凌� ��龍流�侶�侶�"
 
-#: ../libpurple/protocols/silc/ops.c:1418
+#: ../libpurple/protocols/silc/ops.c:1422
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Failed to change nickname"
 msgstr "��凌���溜留 留了了留粒流� �竜�隆�僚�亮凌�"
 
-#: ../libpurple/protocols/silc/ops.c:1467
+#: ../libpurple/protocols/silc/ops.c:1471
 #: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Roomlist"
 msgstr "�溜��留 隆�亮留�溜�僚"
 
-#: ../libpurple/protocols/silc/ops.c:1467
+#: ../libpurple/protocols/silc/ops.c:1471
 #: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Cannot get room list"
 msgstr "�竜僚 竜溜僚留旅 隆�僚留�流 侶 了流�侶 了溜��留� 隆�亮留�溜�僚"
 
-#: ../libpurple/protocols/silc/ops.c:1468
-#, fuzzy
+#: ../libpurple/protocols/silc/ops.c:1472
 msgid "Network is empty"
-msgstr "裡�留�旅��旅虜略 隆旅虜��凌�"
-
-#: ../libpurple/protocols/silc/ops.c:1512
+msgstr "里凌 隆溜虜��凌 竜溜僚留旅 略隆竜旅凌"
+
+#: ../libpurple/protocols/silc/ops.c:1516
 #: ../libpurple/protocols/silc10/ops.c:1507
 msgid "No public key was received"
 msgstr "�竜僚 了流�慮侶虜竜 虜留僚劉僚留 隆侶亮��旅凌 虜了竜旅隆溜"
 
-#: ../libpurple/protocols/silc/ops.c:1524
-#: ../libpurple/protocols/silc/ops.c:1537
+#: ../libpurple/protocols/silc/ops.c:1528
+#: ../libpurple/protocols/silc/ops.c:1541
 #: ../libpurple/protocols/silc10/ops.c:1519
 #: ../libpurple/protocols/silc10/ops.c:1532
 msgid "Server Information"
 msgstr "�了侶�凌�凌�溜竜� 竜両��侶�竜�侶�流"
 
-#: ../libpurple/protocols/silc/ops.c:1525
+#: ../libpurple/protocols/silc/ops.c:1529
 #: ../libpurple/protocols/silc10/ops.c:1520
 msgid "Cannot get server information"
 msgstr "�竜僚 流�留僚 隆�僚留�流 侶 了流�侶 �了侶�凌�凌�旅�僚 �凌� 竜両��侶�竜�侶�流"
 
-#: ../libpurple/protocols/silc/ops.c:1548
+#: ../libpurple/protocols/silc/ops.c:1552
 #: ../libpurple/protocols/silc10/ops.c:1549
 #: ../libpurple/protocols/silc10/ops.c:1558
 msgid "Server Statistics"
 msgstr "裡�留�旅��旅虜略 竜両��侶�竜�侶�流"
 
-#: ../libpurple/protocols/silc/ops.c:1549
+#: ../libpurple/protocols/silc/ops.c:1553
 #: ../libpurple/protocols/silc10/ops.c:1550
 msgid "Cannot get server statistics"
 msgstr "�竜僚 流�留僚 隆�僚留�流 侶 了流�侶 ��僚 ��留�旅��旅虜�僚 �凌� 竜両��侶�竜�侶�流"
 
-#: ../libpurple/protocols/silc/ops.c:1556
+#: ../libpurple/protocols/silc/ops.c:1560
 #: ../libpurple/protocols/silc10/ops.c:1581
 #, c-format
 msgid ""
@@ -11505,56 +11875,55 @@
 "裡�僚凌了旅虜凌溜 隆旅留�竜旅�旅��劉� �凌� 竜両��侶�竜�侶�流: %d\n"
 "裡�僚凌了旅虜凌溜 隆旅留�竜旅�旅��劉� �凌� 隆�凌亮凌了凌粒侶�流: %d\n"
 
-#: ../libpurple/protocols/silc/ops.c:1588
+#: ../libpurple/protocols/silc/ops.c:1592
 #: ../libpurple/protocols/silc10/ops.c:1604
 msgid "Network Statistics"
 msgstr "裡�留�旅��旅虜略 隆旅虜��凌�"
 
-#: ../libpurple/protocols/silc/ops.c:1596
+#: ../libpurple/protocols/silc/ops.c:1600
 #: ../libpurple/protocols/silc10/ops.c:1612
 msgid "Ping failed"
 msgstr "��凌���溜留 Ping"
 
-#: ../libpurple/protocols/silc/ops.c:1601
+#: ../libpurple/protocols/silc/ops.c:1605
 #: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping reply received from server"
 msgstr "�略硫留�竜 留僚�留��虜�旅�侶 Ping 留�� �凌僚 竜両��侶�竜�侶�流"
 
-#: ../libpurple/protocols/silc/ops.c:1609
+#: ../libpurple/protocols/silc/ops.c:1613
 #: ../libpurple/protocols/silc10/ops.c:1625
 msgid "Could not kill user"
 msgstr "�隆�僚留�凌 �凌 �虜���亮留 �凌� ��流��侶"
 
-#: ../libpurple/protocols/silc/ops.c:1648
+#: ../libpurple/protocols/silc/ops.c:1652
 msgid "WATCH"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1648
-#, fuzzy
+#: ../libpurple/protocols/silc/ops.c:1652
 msgid "Cannot watch user"
-msgstr "�竜僚 亮�凌�竜溜�竜 僚留 ��凌�慮劉�竜�竜 �凌僚 竜留��� �留�"
-
-#: ../libpurple/protocols/silc/ops.c:1724
-#: ../libpurple/protocols/silc/ops.c:1775
-#: ../libpurple/protocols/silc/silc.c:277
-#: ../libpurple/protocols/silc10/ops.c:1811
-#: ../libpurple/protocols/silc10/ops.c:1858
-#: ../libpurple/protocols/silc10/silc.c:190
+msgstr ""
+
+#: ../libpurple/protocols/silc/ops.c:1728
+#: ../libpurple/protocols/silc/ops.c:1779
+#: ../libpurple/protocols/silc/silc.c:385
+#: ../libpurple/protocols/silc10/ops.c:1817
+#: ../libpurple/protocols/silc10/ops.c:1864
+#: ../libpurple/protocols/silc10/silc.c:193
 msgid "Resuming session"
 msgstr "裡�僚劉�竜旅留 ��僚竜隆�溜留�"
 
-#: ../libpurple/protocols/silc/ops.c:1726
-#: ../libpurple/protocols/silc10/ops.c:1813
+#: ../libpurple/protocols/silc/ops.c:1730
+#: ../libpurple/protocols/silc10/ops.c:1819
 msgid "Authenticating connection"
 msgstr "�粒虜�旅�侶 ��僚隆竜�侶�"
 
-#: ../libpurple/protocols/silc/ops.c:1777
-#: ../libpurple/protocols/silc10/ops.c:1860
+#: ../libpurple/protocols/silc/ops.c:1781
+#: ../libpurple/protocols/silc10/ops.c:1866
 msgid "Verifying server public key"
 msgstr "��旅硫竜硫留溜��侶 隆侶亮凌�溜凌� 虜了竜旅隆旅凌� 竜両��侶�竜�侶�流"
 
-#: ../libpurple/protocols/silc/ops.c:1814
-#: ../libpurple/protocols/silc10/ops.c:1902
+#: ../libpurple/protocols/silc/ops.c:1818
+#: ../libpurple/protocols/silc10/ops.c:1908
 msgid "Passphrase required"
 msgstr "��留旅�竜溜�留旅 ��僚慮侶亮留"
 
@@ -11597,89 +11966,87 @@
 msgid "Unsupported public key type"
 msgstr "�侶 ��凌��侶�旅龍�亮竜僚凌� ���凌� 隆侶亮凌�溜凌� 虜了竜旅隆旅凌�"
 
-#: ../libpurple/protocols/silc/silc.c:217
-#: ../libpurple/protocols/silc10/ops.c:1749
+#: ../libpurple/protocols/silc/silc.c:319
+#: ../libpurple/protocols/silc10/ops.c:1755
 msgid "Disconnected by server"
 msgstr "�粒旅僚竜 留�凌��僚隆竜�侶 留�� �凌僚 竜両��侶�竜�侶�流"
 
-#: ../libpurple/protocols/silc/silc.c:224
-#: ../libpurple/protocols/silc10/ops.c:1700
+#: ../libpurple/protocols/silc/silc.c:327
+#: ../libpurple/protocols/silc10/ops.c:1701
 msgid "Error during connecting to SILC Server"
 msgstr "裡�略了亮留 虜留�略 �侶 ��僚隆竜�侶 亮竜 �凌僚 竜両��侶�竜�侶�流 SILC"
 
-#: ../libpurple/protocols/silc/silc.c:229
-#: ../libpurple/protocols/silc10/ops.c:1705
+#: ../libpurple/protocols/silc/silc.c:333
+#: ../libpurple/protocols/silc10/ops.c:1707
 msgid "Key Exchange failed"
 msgstr "��凌���溜留 留僚�留了了留粒流� 虜了竜旅隆旅凌�"
 
-#: ../libpurple/protocols/silc/silc.c:238
-#: ../libpurple/protocols/silc10/ops.c:1714
-msgid ""
-"Resuming detached session failed. Press Reconnect to create new connection."
+#: ../libpurple/protocols/silc/silc.c:343
+#: ../libpurple/protocols/silc10/ops.c:1718
+msgid "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 "��凌���溜留 ��僚劉�竜旅留� 留�凌隆竜�亮竜�亮劉僚侶� ��僚竜隆�溜留�. �留�流��竜 ��留僚留��僚隆竜�侶 粒旅留 僚留 "
 "隆侶亮旅凌��粒流�竜�竜 僚劉留 ��僚隆竜�侶"
 
-#: ../libpurple/protocols/silc/silc.c:265
-#: ../libpurple/protocols/silc/silc.c:311
-#: ../libpurple/protocols/silc10/silc.c:161
+#: ../libpurple/protocols/silc/silc.c:373
+#: ../libpurple/protocols/silc/silc.c:420
+#: ../libpurple/protocols/silc10/silc.c:163
 msgid "Connection failed"
 msgstr "��凌���溜留 ��僚隆竜�侶�"
 
-#: ../libpurple/protocols/silc/silc.c:280
-#: ../libpurple/protocols/silc10/silc.c:193
+#: ../libpurple/protocols/silc/silc.c:388
+#: ../libpurple/protocols/silc10/silc.c:196
 msgid "Performing key exchange"
 msgstr "�溜僚竜�留旅 留僚�留了了留粒流 虜了竜旅隆旅凌�"
 
 #. Progress
-#: ../libpurple/protocols/silc/silc.c:343
-#: ../libpurple/protocols/silc10/silc.c:325
+#: ../libpurple/protocols/silc/silc.c:445
+#: ../libpurple/protocols/silc10/silc.c:329
 msgid "Connecting to SILC Server"
 msgstr "�溜僚竜�留旅 ��僚隆竜�侶 亮竜 �凌僚 竜両��侶�竜�侶�流 SILC"
 
-#: ../libpurple/protocols/silc/silc.c:352
-#, fuzzy, c-format
+#: ../libpurple/protocols/silc/silc.c:455
+#: ../libpurple/protocols/silc10/silc.c:340
 msgid "Could not load SILC key pair"
-msgstr "�竜僚 流�留僚 隆�僚留�� �凌 �����亮留 �凌� 龍竜�粒凌�� 虜了竜旅隆旅�僚 SILC: %s"
-
-#: ../libpurple/protocols/silc/silc.c:366
-#: ../libpurple/protocols/silc10/silc.c:355
+msgstr "�隆�僚留亮溜留 �凌���亮留�凌� �凌� 虜了竜旅隆旅凌� SILC"
+
+#: ../libpurple/protocols/silc/silc.c:469
+#: ../libpurple/protocols/silc10/silc.c:361
 msgid "Unable to create connection"
 msgstr "�隆�僚留亮溜留 隆侶亮旅凌��粒溜留� ��僚隆竜�侶�"
 
-#: ../libpurple/protocols/silc/silc.c:395
-#: ../libpurple/protocols/silc10/silc.c:267
+#: ../libpurple/protocols/silc/silc.c:499
+#: ../libpurple/protocols/silc10/silc.c:271
 msgid "Out of memory"
 msgstr "里劉了凌� 亮僚流亮侶�"
 
-#: ../libpurple/protocols/silc/silc.c:438
-#: ../libpurple/protocols/silc10/silc.c:313
+#: ../libpurple/protocols/silc/silc.c:550
+#: ../libpurple/protocols/silc10/silc.c:317
 msgid "Cannot initialize SILC protocol"
 msgstr "�隆�僚留亮溜留 竜虜虜溜僚侶�侶� ����凌虜�了了凌� SILC"
 
-#: ../libpurple/protocols/silc/silc.c:445
-#, fuzzy
+#: ../libpurple/protocols/silc/silc.c:559
+#: ../libpurple/protocols/silc10/silc.c:324
 msgid "Error loading SILC key pair"
-msgstr "�侶亮旅凌��粒溜留 龍竜�粒凌�� 虜了竜旅隆旅�僚 SILC..."
-
-#: ../libpurple/protocols/silc/silc.c:739
-#: ../libpurple/protocols/silc10/silc.c:650
+msgstr "裡�略了亮留 虜留�略 �凌 �����亮留 �凌� 虜了竜旅隆旅凌� SILC"
+
+#: ../libpurple/protocols/silc/silc.c:882
+#: ../libpurple/protocols/silc10/silc.c:656
 msgid "Your Current Mood"
 msgstr "� ��劉�凌��留 隆旅略慮竜�流 �留�"
 
-#: ../libpurple/protocols/silc/silc.c:741
-#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1641
-#, c-format
+#: ../libpurple/protocols/silc/silc.c:884
+#: ../libpurple/protocols/silc10/silc.c:658 ../pidgin/gtkprefs.c:1685
 msgid "Normal"
 msgstr "陸��旅凌了凌粒旅虜��"
 
-#: ../libpurple/protocols/silc/silc.c:755
-#: ../libpurple/protocols/silc10/silc.c:666
+#: ../libpurple/protocols/silc/silc.c:898
+#: ../libpurple/protocols/silc10/silc.c:672
 msgid "In love"
 msgstr "����竜�亮劉僚凌�"
 
-#: ../libpurple/protocols/silc/silc.c:766
-#: ../libpurple/protocols/silc10/silc.c:677
+#: ../libpurple/protocols/silc/silc.c:909
+#: ../libpurple/protocols/silc10/silc.c:683
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -11687,64 +12054,63 @@
 "\n"
 "�旅 ��凌�旅亮�亮竜僚竜� 亮劉慮凌隆凌旅 竜�留�流�"
 
-#: ../libpurple/protocols/silc/silc.c:774
-#: ../libpurple/protocols/silc/util.c:561
-#: ../libpurple/protocols/silc10/silc.c:685
+#: ../libpurple/protocols/silc/silc.c:917
+#: ../libpurple/protocols/silc/util.c:567
+#: ../libpurple/protocols/silc10/silc.c:691
 #: ../libpurple/protocols/silc10/util.c:557
 msgid "SMS"
 msgstr "SMS"
 
-#: ../libpurple/protocols/silc/silc.c:776
-#: ../libpurple/protocols/silc/util.c:563
-#: ../libpurple/protocols/silc10/silc.c:687
+#: ../libpurple/protocols/silc/silc.c:919
+#: ../libpurple/protocols/silc/util.c:569
+#: ../libpurple/protocols/silc10/silc.c:693
 #: ../libpurple/protocols/silc10/util.c:559
 msgid "MMS"
 msgstr "MMS"
 
-#: ../libpurple/protocols/silc/silc.c:778
-#: ../libpurple/protocols/silc10/silc.c:689
+#: ../libpurple/protocols/silc/silc.c:921
+#: ../libpurple/protocols/silc10/silc.c:695
 msgid "Video conferencing"
 msgstr "�旅僚�竜凌��僚隆旅略�虜竜�侶"
 
-#: ../libpurple/protocols/silc/silc.c:783
-#: ../libpurple/protocols/silc10/silc.c:694
+#: ../libpurple/protocols/silc/silc.c:926
+#: ../libpurple/protocols/silc10/silc.c:700
 msgid "Your Current Status"
 msgstr "� ��劉�凌��留 虜留�略��留�流 �留�"
 
-#: ../libpurple/protocols/silc/silc.c:790
-#: ../libpurple/protocols/silc10/silc.c:701
+#: ../libpurple/protocols/silc/silc.c:933
+#: ../libpurple/protocols/silc10/silc.c:707
 msgid "Online Services"
 msgstr "離�侶�竜�溜竜� 亮竜 ��僚隆竜�侶"
 
-#: ../libpurple/protocols/silc/silc.c:793
-#: ../libpurple/protocols/silc10/silc.c:704
+#: ../libpurple/protocols/silc/silc.c:936
+#: ../libpurple/protocols/silc10/silc.c:710
 msgid "Let others see what services you are using"
 msgstr "��旅��劉�竜�留旅 凌旅 略了了凌旅 ��流��竜� 僚留 硫了劉�凌�僚 �旅 ��侶�竜�溜竜� ��侶�旅亮凌�凌旅竜溜�竜"
 
-#: ../libpurple/protocols/silc/silc.c:799
-#: ../libpurple/protocols/silc10/silc.c:710
+#: ../libpurple/protocols/silc/silc.c:942
+#: ../libpurple/protocols/silc10/silc.c:716
 msgid "Let others see what computer you are using"
 msgstr "��旅��劉�竜�留旅 凌旅 略了了凌旅 ��流��竜� 僚留 硫了劉�凌�僚 �旅 ��凌了凌粒旅��流 ��侶�旅亮凌�凌旅竜溜�竜"
 
-#: ../libpurple/protocols/silc/silc.c:806
-#: ../libpurple/protocols/silc10/silc.c:717
+#: ../libpurple/protocols/silc/silc.c:949
+#: ../libpurple/protocols/silc10/silc.c:723
 msgid "Your VCard File"
 msgstr "里凌 留��竜溜凌 VCard �留�"
 
-#: ../libpurple/protocols/silc/silc.c:812
-#, fuzzy
+#: ../libpurple/protocols/silc/silc.c:955
 msgid "Timezone (UTC)"
-msgstr "��僚侶 ��留�"
-
-#: ../libpurple/protocols/silc/silc.c:816
-#: ../libpurple/protocols/silc/silc.c:817
-#: ../libpurple/protocols/silc10/silc.c:729
-#: ../libpurple/protocols/silc10/silc.c:730
+msgstr "��僚侶 ��留� (UTC)"
+
+#: ../libpurple/protocols/silc/silc.c:959
+#: ../libpurple/protocols/silc/silc.c:960
+#: ../libpurple/protocols/silc10/silc.c:735
+#: ../libpurple/protocols/silc10/silc.c:736
 msgid "User Online Status Attributes"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:818
-#: ../libpurple/protocols/silc10/silc.c:731
+#: ../libpurple/protocols/silc/silc.c:961
+#: ../libpurple/protocols/silc10/silc.c:737
 msgid ""
 "You can let other users see your online status information and your personal "
 "information. Please fill the information you would like other users to see "
@@ -11754,222 +12120,220 @@
 "�留� 虜留旅 �旅� ��凌���旅虜劉� �留� �了侶�凌�凌�溜竜�. �留�留虜留了凌�亮竜 竜旅�略粒竜�竜 �旅� �了侶�凌�凌�溜竜� "
 "�凌� 慮留 慮劉了留�竜 凌旅 略了了凌旅 ��流��竜� 僚留 硫了劉�凌�僚."
 
-#: ../libpurple/protocols/silc/silc.c:859
-#: ../libpurple/protocols/silc/silc.c:865
-#: ../libpurple/protocols/silc/silc.c:1486
-#: ../libpurple/protocols/silc10/silc.c:772
+#: ../libpurple/protocols/silc/silc.c:1002
+#: ../libpurple/protocols/silc/silc.c:1008
+#: ../libpurple/protocols/silc/silc.c:1629
 #: ../libpurple/protocols/silc10/silc.c:778
-#: ../libpurple/protocols/silc10/silc.c:1415
+#: ../libpurple/protocols/silc10/silc.c:784
+#: ../libpurple/protocols/silc10/silc.c:1421
 msgid "Message of the Day"
 msgstr "�流僚�亮留 �侶� 侶亮劉�留�"
 
-#: ../libpurple/protocols/silc/silc.c:859
-#: ../libpurple/protocols/silc10/silc.c:772
+#: ../libpurple/protocols/silc/silc.c:1002
+#: ../libpurple/protocols/silc10/silc.c:778
 msgid "No Message of the Day available"
 msgstr "�竜僚 ��略��竜旅 隆旅留慮劉�旅亮凌 亮流僚�亮留 �侶� 侶亮劉�留�"
 
-#: ../libpurple/protocols/silc/silc.c:860
-#: ../libpurple/protocols/silc/silc.c:1481
-#: ../libpurple/protocols/silc10/silc.c:773
-#: ../libpurple/protocols/silc10/silc.c:1410
+#: ../libpurple/protocols/silc/silc.c:1003
+#: ../libpurple/protocols/silc/silc.c:1624
+#: ../libpurple/protocols/silc10/silc.c:779
+#: ../libpurple/protocols/silc10/silc.c:1416
 msgid "There is no Message of the Day associated with this connection"
 msgstr "�竜僚 ��略��竜旅 亮流僚�亮留 �侶� 侶亮劉�留� ��竜�旅虜� 亮竜 留��流 �侶 ��僚隆竜�侶"
 
-#: ../libpurple/protocols/silc/silc.c:911
-#: ../libpurple/protocols/silc/silc.c:957
-#: ../libpurple/protocols/silc/silc.c:1028
-#: ../libpurple/protocols/silc/silc.c:1029
-#: ../libpurple/protocols/silc10/silc.c:824
-#: ../libpurple/protocols/silc10/silc.c:868
-#: ../libpurple/protocols/silc10/silc.c:939
-#: ../libpurple/protocols/silc10/silc.c:940
+#: ../libpurple/protocols/silc/silc.c:1054
+#: ../libpurple/protocols/silc/silc.c:1100
+#: ../libpurple/protocols/silc/silc.c:1171
+#: ../libpurple/protocols/silc/silc.c:1172
+#: ../libpurple/protocols/silc10/silc.c:830
+#: ../libpurple/protocols/silc10/silc.c:874
+#: ../libpurple/protocols/silc10/silc.c:945
+#: ../libpurple/protocols/silc10/silc.c:946
 msgid "Create New SILC Key Pair"
 msgstr "�侶亮旅凌��粒溜留 僚劉凌� 龍竜�粒凌�� 虜了竜旅隆旅�僚 SILC"
 
-#: ../libpurple/protocols/silc/silc.c:911
-#: ../libpurple/protocols/silc10/silc.c:824
+#: ../libpurple/protocols/silc/silc.c:1054
+#: ../libpurple/protocols/silc10/silc.c:830
 msgid "Passphrases do not match"
 msgstr "里留 ��僚慮流亮留�留 隆竜僚 �留旅�旅略龍凌�僚"
 
-#: ../libpurple/protocols/silc/silc.c:957
-#: ../libpurple/protocols/silc10/silc.c:868
+#: ../libpurple/protocols/silc/silc.c:1100
+#: ../libpurple/protocols/silc10/silc.c:874
 msgid "Key Pair Generation failed"
 msgstr "��凌���溜留 隆侶亮旅凌��粒溜留� 龍竜�粒凌�� 虜了竜旅隆旅�僚"
 
-#: ../libpurple/protocols/silc/silc.c:996
-#: ../libpurple/protocols/silc10/silc.c:907
+#: ../libpurple/protocols/silc/silc.c:1139
+#: ../libpurple/protocols/silc10/silc.c:913
 msgid "Key length"
 msgstr "�流虜凌� 虜了竜旅隆旅凌�"
 
-#: ../libpurple/protocols/silc/silc.c:998
-#: ../libpurple/protocols/silc10/silc.c:909
+#: ../libpurple/protocols/silc/silc.c:1141
+#: ../libpurple/protocols/silc10/silc.c:915
 msgid "Public key file"
 msgstr "���竜溜凌 隆侶亮��旅凌� 虜了竜旅隆旅凌�"
 
-#: ../libpurple/protocols/silc/silc.c:1000
-#: ../libpurple/protocols/silc10/silc.c:911
+#: ../libpurple/protocols/silc/silc.c:1143
+#: ../libpurple/protocols/silc10/silc.c:917
 msgid "Private key file"
 msgstr "���竜溜凌 旅隆旅��旅虜凌� 虜了竜旅隆旅凌�"
 
-#: ../libpurple/protocols/silc/silc.c:1023
-#: ../libpurple/protocols/silc10/silc.c:934
+#: ../libpurple/protocols/silc/silc.c:1166
+#: ../libpurple/protocols/silc10/silc.c:940
 msgid "Passphrase (retype)"
 msgstr "裡�僚慮侶亮留 (両留僚略)"
 
-#: ../libpurple/protocols/silc/silc.c:1030
-#: ../libpurple/protocols/silc10/silc.c:941
+#: ../libpurple/protocols/silc/silc.c:1173
+#: ../libpurple/protocols/silc10/silc.c:947
 msgid "Generate Key Pair"
 msgstr "�侶亮旅凌��粒溜留 龍竜�粒凌�� 虜了竜旅隆旅�僚"
 
-#: ../libpurple/protocols/silc/silc.c:1073
-#: ../libpurple/protocols/silc10/silc.c:984
+#: ../libpurple/protocols/silc/silc.c:1216
+#: ../libpurple/protocols/silc10/silc.c:990
 msgid "Online Status"
 msgstr "�留�略��留�侶 ��僚隆竜�侶�"
 
-#: ../libpurple/protocols/silc/silc.c:1081
-#: ../libpurple/protocols/silc10/silc.c:992
+#: ../libpurple/protocols/silc/silc.c:1224
+#: ../libpurple/protocols/silc10/silc.c:998
 msgid "View Message of the Day"
 msgstr "�亮�略僚旅�侶 亮侶僚�亮留�凌� �侶� 侶亮劉�留�"
 
-#: ../libpurple/protocols/silc/silc.c:1085
-#: ../libpurple/protocols/silc10/silc.c:996
+#: ../libpurple/protocols/silc/silc.c:1228
+#: ../libpurple/protocols/silc10/silc.c:1002
 msgid "Create SILC Key Pair..."
 msgstr "�侶亮旅凌��粒溜留 龍竜�粒凌�� 虜了竜旅隆旅�僚 SILC..."
 
-#: ../libpurple/protocols/silc/silc.c:1177
-#: ../libpurple/protocols/silc10/silc.c:1095
+#: ../libpurple/protocols/silc/silc.c:1320
+#: ../libpurple/protocols/silc10/silc.c:1101
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "� ��流��侶� <I>%s</I> 隆竜僚 竜溜僚留旅 �留��僚 ��凌 隆溜虜��凌"
 
-#: ../libpurple/protocols/silc/silc.c:1357
-#: ../libpurple/protocols/silc10/silc.c:1286
+#: ../libpurple/protocols/silc/silc.c:1500
+#: ../libpurple/protocols/silc10/silc.c:1292
 msgid "Topic too long"
 msgstr "里凌 慮劉亮留 ��龍流�侶�侶� 竜溜僚留旅 �凌了� 亮竜粒略了凌"
 
-#: ../libpurple/protocols/silc/silc.c:1438
-#: ../libpurple/protocols/silc10/silc.c:1367
+#: ../libpurple/protocols/silc/silc.c:1581
+#: ../libpurple/protocols/silc10/silc.c:1373
 msgid "You must specify a nick"
 msgstr "��劉�竜旅 僚留 凌�溜�竜�竜 劉僚留 �竜�隆�僚�亮凌"
 
-#: ../libpurple/protocols/silc/silc.c:1540
-#: ../libpurple/protocols/silc10/silc.c:1469
+#: ../libpurple/protocols/silc/silc.c:1683
+#: ../libpurple/protocols/silc10/silc.c:1475
 #, c-format
 msgid "channel %s not found"
 msgstr "里凌 虜留僚略了旅 %s 隆竜 硫�劉慮侶虜竜"
 
-#: ../libpurple/protocols/silc/silc.c:1545
-#: ../libpurple/protocols/silc10/silc.c:1474
+#: ../libpurple/protocols/silc/silc.c:1688
+#: ../libpurple/protocols/silc10/silc.c:1480
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "虜留�留��略�竜旅� 虜留僚留了旅凌� 粒旅留 %s: %s"
 
-#: ../libpurple/protocols/silc/silc.c:1547
-#: ../libpurple/protocols/silc10/silc.c:1476
+#: ../libpurple/protocols/silc/silc.c:1690
+#: ../libpurple/protocols/silc10/silc.c:1482
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "隆竜僚 劉�凌�僚 凌�旅��竜溜 虜留�留��略�竜旅� 虜留僚留了旅凌� �竜 %s"
 
-#: ../libpurple/protocols/silc/silc.c:1560
-#: ../libpurple/protocols/silc10/silc.c:1489
+#: ../libpurple/protocols/silc/silc.c:1703
+#: ../libpurple/protocols/silc10/silc.c:1495
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "��凌���溜留 凌�旅�亮凌� 虜留�留��略�竜�僚 虜留僚留了旅凌� 粒旅留 %s"
 
-#: ../libpurple/protocols/silc/silc.c:1590
-#: ../libpurple/protocols/silc10/silc.c:1519
+#: ../libpurple/protocols/silc/silc.c:1733
+#: ../libpurple/protocols/silc10/silc.c:1525
 #, c-format
 msgid "Unknown command: %s, (may be a client bug)"
 msgstr "�粒僚���侶 竜僚�凌了流: %s, (亮�凌�竜溜 僚留 竜溜僚留旅 ��略了亮留 虜�隆旅虜留 �凌� ��凌粒�略亮亮留�凌�)"
 
-#: ../libpurple/protocols/silc/silc.c:1653
-#: ../libpurple/protocols/silc10/silc.c:1582
+#: ../libpurple/protocols/silc/silc.c:1796
+#: ../libpurple/protocols/silc10/silc.c:1588
 msgid "part [channel]:  Leave the chat"
 msgstr "part [虜留僚略了旅]:  ��凌���侶�侶 留�� �侶 ��龍流�侶�侶"
 
-#: ../libpurple/protocols/silc/silc.c:1657
-#: ../libpurple/protocols/silc10/silc.c:1586
+#: ../libpurple/protocols/silc/silc.c:1800
+#: ../libpurple/protocols/silc10/silc.c:1592
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [虜留僚略了旅]:  ��凌���侶�侶 留�� �侶 ��龍流�侶�侶"
 
-#: ../libpurple/protocols/silc/silc.c:1661
-#: ../libpurple/protocols/silc10/silc.c:1590
+#: ../libpurple/protocols/silc/silc.c:1804
+#: ../libpurple/protocols/silc10/silc.c:1596
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
-msgstr ""
-"topic [&lt;僚劉凌 慮劉亮留 ��龍流�侶�侶�&gt;]:  �亮�略僚旅�侶 流 留了了留粒流 �凌� 慮劉亮留�凌� ��龍流�侶�侶�"
-
-#: ../libpurple/protocols/silc/silc.c:1666
-#: ../libpurple/protocols/silc10/silc.c:1595
+msgstr "topic [&lt;僚劉凌 慮劉亮留 ��龍流�侶�侶�&gt;]:  �亮�略僚旅�侶 流 留了了留粒流 �凌� 慮劉亮留�凌� ��龍流�侶�侶�"
+
+#: ../libpurple/protocols/silc/silc.c:1809
+#: ../libpurple/protocols/silc10/silc.c:1601
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr ""
 "join &lt;虜留僚略了旅留&gt; [&lt;虜�隆旅虜��&gt;]:  裡�亮亮竜�凌�流 �竜 ��龍流�侶�侶 �竜 留��� �凌 "
 "隆溜虜��凌"
 
-#: ../libpurple/protocols/silc/silc.c:1670
-#: ../libpurple/protocols/silc10/silc.c:1599
+#: ../libpurple/protocols/silc/silc.c:1813
+#: ../libpurple/protocols/silc10/silc.c:1605
 msgid "list:  List channels on this network"
 msgstr "list:  �溜��留 ��僚 虜留僚留了旅�僚 �竜 留��� �凌 隆溜虜��凌"
 
-#: ../libpurple/protocols/silc/silc.c:1674
-#: ../libpurple/protocols/silc10/silc.c:1603
+#: ../libpurple/protocols/silc/silc.c:1817
+#: ../libpurple/protocols/silc10/silc.c:1609
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;�竜�隆�僚�亮凌&gt;:  �亮�略僚旅�侶 �了侶�凌�凌�旅�僚 �凌� �竜�隆�僚�亮凌�"
 
-#: ../libpurple/protocols/silc/silc.c:1678
-#: ../libpurple/protocols/silc10/silc.c:1607
-#: ../libpurple/protocols/zephyr/zephyr.c:2685
+#: ../libpurple/protocols/silc/silc.c:1821
+#: ../libpurple/protocols/silc10/silc.c:1613
+#: ../libpurple/protocols/zephyr/zephyr.c:2697
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr ""
 "msg &lt;�竜�隆�僚�亮凌&gt; &lt;亮流僚�亮留&gt;:  ��凌��凌了流 ��凌���旅虜凌� 亮侶僚�亮留�凌� �竜 劉僚留 "
 "��流��侶"
 
-#: ../libpurple/protocols/silc/silc.c:1682
-#: ../libpurple/protocols/silc10/silc.c:1611
+#: ../libpurple/protocols/silc/silc.c:1825
+#: ../libpurple/protocols/silc10/silc.c:1617
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr ""
 "query &lt;�竜�隆�僚�亮凌&gt; [&lt;亮流僚�亮留&gt;]:  ��凌��凌了流 ��凌���旅虜凌� 亮侶僚�亮留�凌� �竜 "
 "劉僚留 ��流��侶"
 
-#: ../libpurple/protocols/silc/silc.c:1686
-#: ../libpurple/protocols/silc10/silc.c:1615
+#: ../libpurple/protocols/silc/silc.c:1829
+#: ../libpurple/protocols/silc10/silc.c:1621
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd:  �亮�略僚旅�侶 �凌� 亮侶僚�亮留�凌� �侶� 侶亮劉�留� �凌� 竜両��侶�竜�侶�流"
 
-#: ../libpurple/protocols/silc/silc.c:1690
-#: ../libpurple/protocols/silc10/silc.c:1619
+#: ../libpurple/protocols/silc/silc.c:1833
+#: ../libpurple/protocols/silc10/silc.c:1625
 msgid "detach:  Detach this session"
 msgstr "detach:  ��凌隆劉�亮竜��侶 留��流� �侶� ��僚竜隆�溜留�"
 
-#: ../libpurple/protocols/silc/silc.c:1694
-#: ../libpurple/protocols/silc10/silc.c:1623
+#: ../libpurple/protocols/silc/silc.c:1837
+#: ../libpurple/protocols/silc10/silc.c:1629
 msgid "quit [message]:  Disconnect from the server, with an optional message"
-msgstr ""
-"quit [亮流僚�亮留]:  ��凌��僚隆竜�侶 留�� �凌僚 竜両��侶�竜�侶�流 亮竜 劉僚留 ��凌留旅�竜�旅虜� 亮流僚�亮留"
-
-#: ../libpurple/protocols/silc/silc.c:1698
-#: ../libpurple/protocols/silc10/silc.c:1627
+msgstr "quit [亮流僚�亮留]:  ��凌��僚隆竜�侶 留�� �凌僚 竜両��侶�竜�侶�流 亮竜 劉僚留 ��凌留旅�竜�旅虜� 亮流僚�亮留"
+
+#: ../libpurple/protocols/silc/silc.c:1841
+#: ../libpurple/protocols/silc10/silc.c:1633
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;竜僚�凌了流&gt;:  �了流�侶 凌�凌旅留�隆流�凌�竜 竜僚�凌了流� �凌� �竜了略�侶 silc"
 
-#: ../libpurple/protocols/silc/silc.c:1704
-#: ../libpurple/protocols/silc10/silc.c:1633
+#: ../libpurple/protocols/silc/silc.c:1847
+#: ../libpurple/protocols/silc10/silc.c:1639
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr ""
 "kill &lt;�竜�隆�僚�亮凌&gt; [-隆侶亮��旅凌 虜了竜旅隆溜|&lt;了�粒凌�&gt;]:  裡虜凌����竜 �凌 "
 "�竜�隆�僚�亮凌"
 
-#: ../libpurple/protocols/silc/silc.c:1708
-#: ../libpurple/protocols/silc10/silc.c:1637
+#: ../libpurple/protocols/silc/silc.c:1851
+#: ../libpurple/protocols/silc10/silc.c:1643
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;僚劉凌 �竜�隆�僚�亮凌&gt;:  �了了留粒流 �凌� �竜�隆�僚�亮凌� �留�"
 
-#: ../libpurple/protocols/silc/silc.c:1712
-#: ../libpurple/protocols/silc10/silc.c:1641
+#: ../libpurple/protocols/silc/silc.c:1855
+#: ../libpurple/protocols/silc10/silc.c:1647
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;�竜�隆�僚�亮凌&gt;:  �亮�略僚旅�侶 �了侶�凌�凌�旅�僚 �凌� �竜�隆�僚�亮凌�"
 
-#: ../libpurple/protocols/silc/silc.c:1716
-#: ../libpurple/protocols/silc10/silc.c:1645
+#: ../libpurple/protocols/silc/silc.c:1859
+#: ../libpurple/protocols/silc10/silc.c:1651
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
@@ -11977,8 +12341,8 @@
 "cmode &lt;虜留僚略了旅&gt; [+|-&lt;虜留�留��略�竜旅�&gt;] [凌�溜�亮留�留]:  �了了留粒流 流 竜亮�略僚旅�侶 "
 "��僚 虜留�留��略�竜�僚 �凌� 虜留僚留了旅凌�"
 
-#: ../libpurple/protocols/silc/silc.c:1720
-#: ../libpurple/protocols/silc10/silc.c:1649
+#: ../libpurple/protocols/silc/silc.c:1863
+#: ../libpurple/protocols/silc10/silc.c:1655
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
@@ -11986,20 +12350,18 @@
 "cumode &lt;虜留僚略了旅&gt; +|-&lt;虜留�留��略�竜旅�&gt; &lt;�竜�隆�僚�亮凌&gt;:  �了了留粒流 ��僚 "
 "虜留�留��略�竜�僚 �凌� �竜�隆�僚�亮凌� ��凌 虜留僚略了旅"
 
-#: ../libpurple/protocols/silc/silc.c:1724
-#: ../libpurple/protocols/silc10/silc.c:1653
+#: ../libpurple/protocols/silc/silc.c:1867
+#: ../libpurple/protocols/silc10/silc.c:1659
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
-msgstr ""
-"umode &lt;虜留�留��略�竜旅� ��流��侶&gt;:  ��溜��竜 �旅� 虜留�留��略�竜旅� �留� ��凌 隆溜虜��凌"
-
-#: ../libpurple/protocols/silc/silc.c:1728
-#: ../libpurple/protocols/silc10/silc.c:1657
+msgstr "umode &lt;虜留�留��略�竜旅� ��流��侶&gt;:  ��溜��竜 �旅� 虜留�留��略�竜旅� �留� ��凌 隆溜虜��凌"
+
+#: ../libpurple/protocols/silc/silc.c:1871
+#: ../libpurple/protocols/silc10/silc.c:1663
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
-msgstr ""
-"oper &lt;�僚凌亮留&gt; [-虜了竜旅隆溜]:  �流�侶 隆旅虜留旅�亮略��僚 隆旅留�竜旅�旅��流 �凌� 竜両��侶�竜�侶�流"
-
-#: ../libpurple/protocols/silc/silc.c:1732
-#: ../libpurple/protocols/silc10/silc.c:1661
+msgstr "oper &lt;�僚凌亮留&gt; [-虜了竜旅隆溜]:  �流�侶 隆旅虜留旅�亮略��僚 隆旅留�竜旅�旅��流 �凌� 竜両��侶�竜�侶�流"
+
+#: ../libpurple/protocols/silc/silc.c:1875
+#: ../libpurple/protocols/silc10/silc.c:1667
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
@@ -12007,49 +12369,47 @@
 "invite &lt;虜留僚略了旅&gt; [-|+]&lt;�竜�隆�僚�亮凌&gt;:  ����虜了侶�侶 ��流��侶 流 ��凌�慮流虜侶/"
 "留�留溜�竜�侶 留�� �侶 了溜��留 ��凌�虜了流�竜�僚 �凌� 虜留僚留了旅凌�"
 
-#: ../libpurple/protocols/silc/silc.c:1736
-#: ../libpurple/protocols/silc10/silc.c:1665
+#: ../libpurple/protocols/silc/silc.c:1879
+#: ../libpurple/protocols/silc10/silc.c:1671
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
-msgstr ""
-"kick &lt;虜留僚略了旅&gt; &lt;�僚凌亮留&gt; [���了旅凌]:  �虜隆溜�両侶 留��亮凌� 留�� �凌 虜留僚略了旅"
-
-#: ../libpurple/protocols/silc/silc.c:1740
-#: ../libpurple/protocols/silc10/silc.c:1669
+msgstr "kick &lt;虜留僚略了旅&gt; &lt;�僚凌亮留&gt; [���了旅凌]:  �虜隆溜�両侶 留��亮凌� 留�� �凌 虜留僚略了旅"
+
+#: ../libpurple/protocols/silc/silc.c:1883
+#: ../libpurple/protocols/silc10/silc.c:1675
 msgid "info [server]:  View server administrative details"
-msgstr ""
-"info [竜両��侶�竜�侶�流�]:  �亮�略僚旅�侶 了竜��凌亮竜�竜旅�僚 隆旅留�竜溜�旅�侶� �凌� 竜両��侶�竜�侶�流"
-
-#: ../libpurple/protocols/silc/silc.c:1744
-#: ../libpurple/protocols/silc10/silc.c:1673
+msgstr "info [竜両��侶�竜�侶�流�]:  �亮�略僚旅�侶 了竜��凌亮竜�竜旅�僚 隆旅留�竜溜�旅�侶� �凌� 竜両��侶�竜�侶�流"
+
+#: ../libpurple/protocols/silc/silc.c:1887
+#: ../libpurple/protocols/silc10/silc.c:1679
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr ""
 "ban [&lt;虜留僚略了旅&gt; +|-&lt;�竜�隆�僚�亮凌&gt;]:  ��留粒��竜��侶 竜旅��隆凌� 留��亮凌� ��凌 "
 "虜留僚略了旅"
 
-#: ../libpurple/protocols/silc/silc.c:1748
-#: ../libpurple/protocols/silc10/silc.c:1677
+#: ../libpurple/protocols/silc/silc.c:1891
+#: ../libpurple/protocols/silc10/silc.c:1683
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr ""
 "getkey &lt;�竜�隆�僚�亮凌|竜両��侶�竜�侶�流�&gt;:  �流�侶 �凌� 隆侶亮凌�溜凌� 虜了竜旅隆旅凌� �凌� "
 "�竜了略�侶 流 �凌� 竜両��侶�竜�侶�流"
 
-#: ../libpurple/protocols/silc/silc.c:1752
-#: ../libpurple/protocols/silc10/silc.c:1681
+#: ../libpurple/protocols/silc/silc.c:1895
+#: ../libpurple/protocols/silc10/silc.c:1687
 msgid "stats:  View server and network statistics"
 msgstr "stats:  �亮�略僚旅�侶 ��留�旅��旅虜�僚 竜両��侶�竜�侶�流 虜留旅 隆旅虜��凌�"
 
-#: ../libpurple/protocols/silc/silc.c:1756
-#: ../libpurple/protocols/silc10/silc.c:1685
+#: ../libpurple/protocols/silc/silc.c:1899
+#: ../libpurple/protocols/silc10/silc.c:1691
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:  ��凌��凌了流 PING ��凌 ��僚隆竜隆竜亮劉僚凌 竜両��侶�竜�侶�流"
 
-#: ../libpurple/protocols/silc/silc.c:1761
-#: ../libpurple/protocols/silc10/silc.c:1690
+#: ../libpurple/protocols/silc/silc.c:1904
+#: ../libpurple/protocols/silc10/silc.c:1696
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;虜留僚略了旅&gt;:  �溜��留 ��侶���僚 �竜 劉僚留 虜留僚略了旅"
 
-#: ../libpurple/protocols/silc/silc.c:1765
-#: ../libpurple/protocols/silc10/silc.c:1694
+#: ../libpurple/protocols/silc/silc.c:1908
+#: ../libpurple/protocols/silc10/silc.c:1700
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -12066,141 +12426,140 @@
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/protocols/silc/silc.c:1876
-#: ../libpurple/protocols/silc10/silc.c:1819
+#: ../libpurple/protocols/silc/silc.c:2019
+#: ../libpurple/protocols/silc10/silc.c:1825
 msgid "SILC Protocol Plugin"
 msgstr "����慮竜�凌 ����凌虜�了了凌� SILC"
 
 #. *  description
-#: ../libpurple/protocols/silc/silc.c:1878
-#: ../libpurple/protocols/silc10/silc.c:1821
+#: ../libpurple/protocols/silc/silc.c:2021
+#: ../libpurple/protocols/silc10/silc.c:1827
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "�����虜凌了了凌 Secure Internet Live Conferencing (SILC)"
 
-#: ../libpurple/protocols/silc/silc.c:1910
-#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2036
+#: ../libpurple/protocols/silc/silc.c:2053
+#: ../libpurple/protocols/silc10/silc.c:1859 ../pidgin/gtkprefs.c:2040
 msgid "Network"
 msgstr "�溜虜��凌"
 
-#: ../libpurple/protocols/silc/silc.c:1921
-#: ../libpurple/protocols/silc10/silc.c:1864
+#: ../libpurple/protocols/silc/silc.c:2064
+#: ../libpurple/protocols/silc10/silc.c:1870
 msgid "Public Key file"
 msgstr "���竜溜凌 隆侶亮��旅凌� 虜了竜旅隆旅凌�"
 
-#: ../libpurple/protocols/silc/silc.c:1925
-#: ../libpurple/protocols/silc10/silc.c:1868
+#: ../libpurple/protocols/silc/silc.c:2068
+#: ../libpurple/protocols/silc10/silc.c:1874
 msgid "Private Key file"
 msgstr "���竜溜凌 旅隆旅��旅虜凌� 虜了竜旅隆旅凌�"
 
-#: ../libpurple/protocols/silc/silc.c:1935
-#: ../libpurple/protocols/silc10/silc.c:1878
+#: ../libpurple/protocols/silc/silc.c:2078
+#: ../libpurple/protocols/silc10/silc.c:1884
 msgid "Cipher"
 msgstr "�����凌粒�略�侶�侶"
 
-#: ../libpurple/protocols/silc/silc.c:1945
-#: ../libpurple/protocols/silc10/silc.c:1888
+#: ../libpurple/protocols/silc/silc.c:2088
+#: ../libpurple/protocols/silc10/silc.c:1894
 msgid "HMAC"
 msgstr "HMAC"
 
-#: ../libpurple/protocols/silc/silc.c:1948
+#: ../libpurple/protocols/silc/silc.c:2091
 msgid "Use Perfect Forward Secrecy"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1952
-#: ../libpurple/protocols/silc10/silc.c:1891
+#: ../libpurple/protocols/silc/silc.c:2095
+#: ../libpurple/protocols/silc10/silc.c:1897
 msgid "Public key authentication"
 msgstr "�粒虜�旅�侶 隆侶亮��旅凌� 虜了竜旅隆旅凌�"
 
-#: ../libpurple/protocols/silc/silc.c:1955
-#: ../libpurple/protocols/silc10/silc.c:1894
+#: ../libpurple/protocols/silc/silc.c:2098
+#: ../libpurple/protocols/silc10/silc.c:1900
 msgid "Block IMs without Key Exchange"
 msgstr "��凌虜了竜旅�亮�� 略亮竜��僚 亮侶僚�亮略��僚 ���溜� 留僚�留了了留粒流 虜了竜旅隆旅凌�"
 
-#: ../libpurple/protocols/silc/silc.c:1958
-#: ../libpurple/protocols/silc10/silc.c:1897
+#: ../libpurple/protocols/silc/silc.c:2101
+#: ../libpurple/protocols/silc10/silc.c:1903
 msgid "Block messages to whiteboard"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1961
-#: ../libpurple/protocols/silc10/silc.c:1900
+#: ../libpurple/protocols/silc/silc.c:2104
+#: ../libpurple/protocols/silc10/silc.c:1906
 msgid "Automatically open whiteboard"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1964
-#: ../libpurple/protocols/silc10/silc.c:1903
+#: ../libpurple/protocols/silc/silc.c:2107
+#: ../libpurple/protocols/silc10/silc.c:1909
 msgid "Digitally sign and verify all messages"
 msgstr "率侶�旅留虜流 ��凌粒�留�流 虜留旅 劉了竜粒�凌� �了�僚 ��僚 亮侶僚�亮略��僚"
 
 #: ../libpurple/protocols/silc/util.c:207
-#: ../libpurple/protocols/silc/util.c:249
+#: ../libpurple/protocols/silc/util.c:250
 #: ../libpurple/protocols/silc10/util.c:207
 #: ../libpurple/protocols/silc10/util.c:247
 msgid "Creating SILC key pair..."
-msgstr "�侶亮旅凌��粒溜留 龍竜�粒凌�� 虜了竜旅隆旅�僚 SILC..."
-
-#: ../libpurple/protocols/silc/util.c:215
-#: ../libpurple/protocols/silc/util.c:257
-#, fuzzy
+msgstr "�侶亮旅凌��粒溜留 虜了竜旅隆旅凌� SILC..."
+
+#: ../libpurple/protocols/silc/util.c:216
+#: ../libpurple/protocols/silc/util.c:259
 msgid "Cannot create SILC key pair\n"
-msgstr "�侶亮旅凌��粒溜留 龍竜�粒凌�� 虜了竜旅隆旅�僚 SILC..."
+msgstr "�隆�僚留�侶 侶 隆侶亮旅凌��粒溜留 虜了竜旅隆旅凌� SILC\n"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
 #. sum: 3 tabs or 24 characters)
-#: ../libpurple/protocols/silc/util.c:358
+#: ../libpurple/protocols/silc/util.c:364
 #: ../libpurple/protocols/silc10/util.c:355
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "��留粒亮留�旅虜� �僚凌亮留: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:360
+#: ../libpurple/protocols/silc/util.c:366
 #: ../libpurple/protocols/silc10/util.c:357
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "�僚凌亮留 ��流��侶: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:362
+#: ../libpurple/protocols/silc/util.c:368
 #: ../libpurple/protocols/silc10/util.c:359
 #, c-format
 msgid "E-Mail: \t\t%s\n"
 msgstr "E-Mail: \t\t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:364
+#: ../libpurple/protocols/silc/util.c:370
 #: ../libpurple/protocols/silc10/util.c:361
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "�僚凌亮留�溜留 虜竜僚��旅虜凌� ��凌了凌粒旅��流: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:366
+#: ../libpurple/protocols/silc/util.c:372
 #: ../libpurple/protocols/silc10/util.c:363
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "��粒留僚旅�亮��: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:368
+#: ../libpurple/protocols/silc/util.c:374
 #: ../libpurple/protocols/silc10/util.c:365
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "律��留: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:369
+#: ../libpurple/protocols/silc/util.c:375
 #: ../libpurple/protocols/silc10/util.c:366
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr "�了粒��旅慮亮凌�: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:370
+#: ../libpurple/protocols/silc/util.c:376
 #: ../libpurple/protocols/silc10/util.c:367
 #, c-format
 msgid "Key Length: \t%d bits\n"
 msgstr "�流虜凌� 虜了竜旅隆旅凌�: \t%d bits\n"
 
-#: ../libpurple/protocols/silc/util.c:372
-#, fuzzy, c-format
+#: ../libpurple/protocols/silc/util.c:378
+#, c-format
 msgid "Version: \t%s\n"
-msgstr "�旅�溜留: %s"
-
-#: ../libpurple/protocols/silc/util.c:374
+msgstr "�虜隆凌�侶: \t%s\n"
+
+#: ../libpurple/protocols/silc/util.c:380
 #: ../libpurple/protocols/silc10/util.c:369
 #, c-format
 msgid ""
@@ -12212,7 +12571,7 @@
 "%s\n"
 "\n"
 
-#: ../libpurple/protocols/silc/util.c:375
+#: ../libpurple/protocols/silc/util.c:381
 #: ../libpurple/protocols/silc10/util.c:370
 #, c-format
 msgid ""
@@ -12220,51 +12579,51 @@
 "%s"
 msgstr ""
 
-#: ../libpurple/protocols/silc/util.c:379
-#: ../libpurple/protocols/silc/util.c:380
+#: ../libpurple/protocols/silc/util.c:385
+#: ../libpurple/protocols/silc/util.c:386
 #: ../libpurple/protocols/silc10/util.c:374
 #: ../libpurple/protocols/silc10/util.c:375
 msgid "Public Key Information"
 msgstr "�了侶�凌�凌�溜竜� 隆侶亮��旅凌� 虜了竜旅隆旅凌�"
 
-#: ../libpurple/protocols/silc/util.c:559
+#: ../libpurple/protocols/silc/util.c:565
 #: ../libpurple/protocols/silc10/util.c:555
 msgid "Paging"
 msgstr ""
 
-#: ../libpurple/protocols/silc/util.c:565
+#: ../libpurple/protocols/silc/util.c:571
 #: ../libpurple/protocols/silc10/util.c:561
 msgid "Video Conferencing"
 msgstr "�旅僚�竜凌��僚隆旅略�虜竜�侶"
 
-#: ../libpurple/protocols/silc/util.c:583
+#: ../libpurple/protocols/silc/util.c:589
 #: ../libpurple/protocols/silc10/util.c:579
 msgid "Computer"
 msgstr "離�凌了凌粒旅��流�"
 
-#: ../libpurple/protocols/silc/util.c:587
+#: ../libpurple/protocols/silc/util.c:593
 #: ../libpurple/protocols/silc10/util.c:583
 msgid "PDA"
 msgstr "PDA"
 
-#: ../libpurple/protocols/silc/util.c:589
+#: ../libpurple/protocols/silc/util.c:595
 #: ../libpurple/protocols/silc10/util.c:585
 msgid "Terminal"
 msgstr "里竜�亮留�旅虜�"
 
-#: ../libpurple/protocols/silc/wb.c:284 ../libpurple/protocols/silc10/wb.c:284
+#: ../libpurple/protocols/silc/wb.c:288 ../libpurple/protocols/silc10/wb.c:287
 #, c-format
 msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
 msgstr ""
 
-#: ../libpurple/protocols/silc/wb.c:288 ../libpurple/protocols/silc10/wb.c:288
+#: ../libpurple/protocols/silc/wb.c:292 ../libpurple/protocols/silc10/wb.c:291
 #, c-format
 msgid ""
 "%s sent message to whiteboard on %s channel. Would you like to open the "
 "whiteboard?"
 msgstr ""
 
-#: ../libpurple/protocols/silc/wb.c:302 ../libpurple/protocols/silc10/wb.c:302
+#: ../libpurple/protocols/silc/wb.c:306 ../libpurple/protocols/silc10/wb.c:305
 msgid "Whiteboard"
 msgstr ""
 
@@ -12272,112 +12631,94 @@
 msgid "No server statistics available"
 msgstr "�竜僚 ��略��凌�僚 隆旅留慮劉�旅亮留 ��留�旅��旅虜略 竜両��侶�竜�侶�流"
 
-#: ../libpurple/protocols/silc10/ops.c:1931
-#, c-format
+#: ../libpurple/protocols/silc10/ops.c:1937
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "��凌���溜留: �竜僚 �留旅�旅略龍凌�僚 凌旅 竜虜隆��竜旅�, 留僚留硫留慮亮溜��竜 �凌僚 �竜了略�侶 �留�"
 
-#: ../libpurple/protocols/silc10/ops.c:1934
-#, c-format
+#: ../libpurple/protocols/silc10/ops.c:1940
 msgid "Failure: Remote does not trust/support your public key"
-msgstr ""
-"��凌���溜留: � 留�凌亮留虜���亮劉僚凌� 隆竜僚 竜亮�旅��竜�竜�留旅/��凌��侶�溜龍竜旅 �凌 隆侶亮��旅凌 虜了竜旅隆溜 �留�"
-
-#: ../libpurple/protocols/silc10/ops.c:1937
-#, c-format
+msgstr "��凌���溜留: � 留�凌亮留虜���亮劉僚凌� 隆竜僚 竜亮�旅��竜�竜�留旅/��凌��侶�溜龍竜旅 �凌 隆侶亮��旅凌 虜了竜旅隆溜 �留�"
+
+#: ../libpurple/protocols/silc10/ops.c:1943
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "��凌���溜留: � 留�凌亮留虜���亮劉僚凌� 隆竜僚 ��凌��侶�溜龍竜旅 �侶僚 ��凌�竜旅僚�亮竜僚侶 凌亮略隆留 KE"
 
-#: ../libpurple/protocols/silc10/ops.c:1940
-#, c-format
+#: ../libpurple/protocols/silc10/ops.c:1946
 msgid "Failure: Remote does not support proposed cipher"
 msgstr ""
 "��凌���溜留: � 留�凌亮留虜���亮劉僚凌� ��流��侶� 隆竜僚 ��凌��侶�溜龍竜旅 �侶僚 ��凌�竜旅僚�亮竜僚侶 "
 "虜����凌粒�略�侶�侶"
 
-#: ../libpurple/protocols/silc10/ops.c:1943
-#, c-format
+#: ../libpurple/protocols/silc10/ops.c:1949
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "��凌���溜留: � 留�凌亮留虜���亮劉僚凌� 隆竜僚 ��凌��侶�溜龍竜旅 �凌 ��凌�竜旅僚�亮竜僚凌 PKCS"
 
-#: ../libpurple/protocols/silc10/ops.c:1946
-#, c-format
+#: ../libpurple/protocols/silc10/ops.c:1952
 msgid "Failure: Remote does not support proposed hash function"
 msgstr ""
 "��凌���溜留: 里凌 留�凌亮留虜���亮劉僚凌 ����侶亮留 隆竜僚 ��凌��侶�溜龍竜旅 �侶僚 ��凌�竜旅僚�亮竜僚侶 "
 "��僚略��侶�侶 hash"
 
-#: ../libpurple/protocols/silc10/ops.c:1949
-#, c-format
+#: ../libpurple/protocols/silc10/ops.c:1955
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "��凌���溜留: � 留�凌亮留虜���亮劉僚凌� 隆竜僚 ��凌��侶�溜龍竜旅 �凌 ��凌�竜旅僚�亮竜僚凌 HMAC"
 
-#: ../libpurple/protocols/silc10/ops.c:1951
-#, c-format
+#: ../libpurple/protocols/silc10/ops.c:1957
 msgid "Failure: Incorrect signature"
 msgstr "��凌���溜留: �侶 劉粒虜��侶 ��凌粒�留�流"
 
-#: ../libpurple/protocols/silc10/ops.c:1953
-#, c-format
+#: ../libpurple/protocols/silc10/ops.c:1959
 msgid "Failure: Invalid cookie"
 msgstr "��凌���溜留: �侶 劉粒虜��凌 cookie"
 
-#: ../libpurple/protocols/silc10/ops.c:1964
-#, c-format
+#: ../libpurple/protocols/silc10/ops.c:1970
 msgid "Failure: Authentication failed"
 msgstr "��凌���溜留: � 劉粒虜�旅�流 留�劉���竜"
 
-#: ../libpurple/protocols/silc10/silc.c:182
+#: ../libpurple/protocols/silc10/silc.c:185
 msgid "Cannot initialize SILC Client connection"
 msgstr "�隆�僚留亮溜留 劉僚留�両侶� ��僚隆竜�侶� �凌� �竜了略�侶 SILC"
 
-#: ../libpurple/protocols/silc10/silc.c:290
+#: ../libpurple/protocols/silc10/silc.c:294
 msgid "John Noname"
 msgstr "�旅略僚僚侶� 律��溜�-�僚凌亮留"
 
-#: ../libpurple/protocols/silc10/silc.c:320
-msgid "Cannot find/access ~/.silc directory"
-msgstr "�竜僚 竜溜僚留旅 隆�僚留�流 侶 留僚略粒僚��侶/����硫留�侶 �凌� �留虜劉了凌� ~/.silc"
-
-#: ../libpurple/protocols/silc10/silc.c:334
+#: ../libpurple/protocols/silc10/silc.c:338
 #, c-format
 msgid "Could not load SILC key pair: %s"
 msgstr "�竜僚 流�留僚 隆�僚留�� �凌 �����亮留 �凌� 龍竜�粒凌�� 虜了竜旅隆旅�僚 SILC: %s"
 
-#. TODO: do we really want to disconnect on a failure to write?
-#: ../libpurple/protocols/simple/simple.c:416
+#: ../libpurple/protocols/simple/simple.c:419
 msgid "Could not write"
 msgstr "�竜僚 流�留僚 隆�僚留�流 侶 竜粒粒�留�流"
 
-#: ../libpurple/protocols/simple/simple.c:438
-#: ../libpurple/protocols/simple/simple.c:1529
+#: ../libpurple/protocols/simple/simple.c:443
+#: ../libpurple/protocols/simple/simple.c:1713
 msgid "Could not connect"
 msgstr "�竜僚 流�留僚 隆�僚留�流 侶 ��僚隆竜�侶"
 
-#: ../libpurple/protocols/simple/simple.c:1059
-#, fuzzy
+#: ../libpurple/protocols/simple/simple.c:1127
 msgid "Unknown server response."
-msgstr "�粒僚���侶 留旅�溜留."
-
-#: ../libpurple/protocols/simple/simple.c:1563
-#: ../libpurple/protocols/simple/simple.c:1605
-#: ../libpurple/protocols/simple/simple.c:1618
-#: ../libpurple/protocols/simple/simple.c:1669
+msgstr "�粒僚���侶 留�略僚�侶�侶 竜両��侶�竜�侶�流."
+
+#: ../libpurple/protocols/simple/simple.c:1749
+#: ../libpurple/protocols/simple/simple.c:1795
+#: ../libpurple/protocols/simple/simple.c:1810
+#: ../libpurple/protocols/simple/simple.c:1865
 msgid "Could not create listen socket"
 msgstr "�竜僚 流�留僚 隆�僚留�流 侶 隆侶亮旅凌��粒溜留 ��凌隆凌�劉留 留虜��留�侶�"
 
-#: ../libpurple/protocols/simple/simple.c:1586
+#: ../libpurple/protocols/simple/simple.c:1774
 msgid "Couldn't resolve host"
 msgstr "�竜僚 流�留僚 隆�僚留�流 侶 竜��竜�侶 �凌� 虜竜僚��旅虜凌� ��凌了凌粒旅��流"
 
-#: ../libpurple/protocols/simple/simple.c:1677
+#: ../libpurple/protocols/simple/simple.c:1875
 msgid "Could not resolve hostname"
 msgstr "�竜僚 流�留僚 隆�僚留�流 侶 竜��竜�侶 �凌� 凌僚�亮留�凌� �凌� 虜竜僚��旅虜凌� ��凌了凌粒旅��流"
 
-#: ../libpurple/protocols/simple/simple.c:1694
+#: ../libpurple/protocols/simple/simple.c:1893
 msgid "SIP screen names may not contain whitespaces or @ symbols"
-msgstr ""
-"里留 竜亮�留僚旅龍�亮竜僚留 凌僚�亮留�留 ��侶���僚 SIP 隆竜僚 ��劉�竜旅 僚留 �竜�旅劉�凌�僚 虜竜僚略 流 ��亮硫凌了留 @"
+msgstr "里留 竜亮�留僚旅龍�亮竜僚留 凌僚�亮留�留 ��侶���僚 SIP 隆竜僚 ��劉�竜旅 僚留 �竜�旅劉�凌�僚 虜竜僚略 流 ��亮硫凌了留 @"
 
 #. *< type
 #. *< ui_requirement
@@ -12387,36 +12728,36 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:1870
+#: ../libpurple/protocols/simple/simple.c:2073
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "����慮竜�凌 ����凌虜�了了凌� SIP/SIMPLE"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:1871
+#: ../libpurple/protocols/simple/simple.c:2074
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "里凌 ����慮竜�凌 �凌� ����凌虜�了了凌� SIP/SIMPLE"
 
-#: ../libpurple/protocols/simple/simple.c:1899
+#: ../libpurple/protocols/simple/simple.c:2102
 msgid "Publish status (note: everyone may watch you)"
 msgstr "�留�略��留�侶 隆侶亮凌�溜竜��侶� (�侶亮竜溜��侶: �了凌旅 亮�凌�凌�僚 僚留 �留� �留�留虜凌了凌�慮流�凌�僚)"
 
-#: ../libpurple/protocols/simple/simple.c:1905
+#: ../libpurple/protocols/simple/simple.c:2108
 msgid "Use UDP"
 msgstr "律�流�侶 UDP"
 
-#: ../libpurple/protocols/simple/simple.c:1907
+#: ../libpurple/protocols/simple/simple.c:2110
 msgid "Use proxy"
 msgstr "律�流�侶 隆旅留亮竜�凌了留硫侶�流"
 
-#: ../libpurple/protocols/simple/simple.c:1909
+#: ../libpurple/protocols/simple/simple.c:2112
 msgid "Proxy"
 msgstr "�旅留亮竜�凌了留硫侶�流�"
 
-#: ../libpurple/protocols/simple/simple.c:1911
+#: ../libpurple/protocols/simple/simple.c:2114
 msgid "Auth User"
 msgstr ""
 
-#: ../libpurple/protocols/simple/simple.c:1913
+#: ../libpurple/protocols/simple/simple.c:2116
 msgid "Auth Domain"
 msgstr ""
 
@@ -12461,7 +12802,6 @@
 msgstr "� ��凌竜旅隆凌�凌溜侶�侶 �凌� %s 隆竜僚 竜�旅��劉�竜�留旅."
 
 #: ../libpurple/protocols/toc/toc.c:503
-#, c-format
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "里凌 亮流僚�亮留 留�凌��溜�慮侶虜竜, 両竜�竜�略�留�竜 �凌 ��旅凌 �留���侶�留� �凌� 竜両��侶�竜�侶�流."
 
@@ -12486,47 +12826,38 @@
 msgstr "律略�留�竜 劉僚留 略亮竜�凌 亮流僚�亮留 留�� %s 竜�竜旅隆流 ��略了慮侶虜竜 �凌了� 粒�流粒凌�留."
 
 #: ../libpurple/protocols/toc/toc.c:518
-#, c-format
 msgid "Failure."
 msgstr "��凌���溜留."
 
 #: ../libpurple/protocols/toc/toc.c:521
-#, c-format
 msgid "Too many matches."
 msgstr "�略�留 �凌了了劉� 留僚�旅��凌旅�溜竜�."
 
 #: ../libpurple/protocols/toc/toc.c:524
-#, c-format
 msgid "Need more qualifiers."
 msgstr ""
 
 #: ../libpurple/protocols/toc/toc.c:527
-#, c-format
 msgid "Dir service temporarily unavailable."
 msgstr "� ��侶�竜�溜留 虜留�留了�粒凌� 竜溜僚留旅 ��凌���旅僚略 亮侶 隆旅留慮劉�旅亮侶."
 
 #: ../libpurple/protocols/toc/toc.c:530
-#, c-format
 msgid "E-mail lookup restricted."
 msgstr "��留粒凌�竜�竜�留旅 侶 竜��竜�侶 e-mail."
 
 #: ../libpurple/protocols/toc/toc.c:533
-#, c-format
 msgid "Keyword ignored."
 msgstr "� 了劉両侶-虜了竜旅隆溜 留粒僚凌流慮侶虜竜."
 
 #: ../libpurple/protocols/toc/toc.c:536
-#, c-format
 msgid "No keywords."
 msgstr "�竜僚 ��略��凌�僚 了劉両竜旅� 虜了竜旅隆旅略."
 
 #: ../libpurple/protocols/toc/toc.c:539
-#, c-format
 msgid "User has no directory information."
 msgstr "� ��流��侶� 隆竜僚 劉�竜旅 �了侶�凌�凌�溜竜� 虜留�留了�粒凌�."
 
 #: ../libpurple/protocols/toc/toc.c:543
-#, c-format
 msgid "Country not supported."
 msgstr "� ���留 隆竜僚 ��凌��侶�溜龍竜�留旅."
 
@@ -12536,22 +12867,18 @@
 msgstr "�粒僚���侶 留�凌���溜留: %s."
 
 #: ../libpurple/protocols/toc/toc.c:549
-#, c-format
 msgid "Incorrect screen name or password."
 msgstr "�留僚慮留�亮劉僚凌 竜亮�留僚旅龍�亮竜僚凌 �僚凌亮留 流 虜�隆旅虜��."
 
 #: ../libpurple/protocols/toc/toc.c:552
-#, c-format
 msgid "The service is temporarily unavailable."
 msgstr "� ��侶�竜�溜留 竜溜僚留旅 ��凌���旅僚略 亮侶 隆旅留慮劉�旅亮侶."
 
 #: ../libpurple/protocols/toc/toc.c:555
-#, c-format
 msgid "Your warning level is currently too high to log in."
 msgstr "��竜�竜 �凌了� ��侶了� 竜�溜�竜隆凌 ��凌竜旅隆凌�凌溜侶�侶� 粒旅留 僚留 ��僚隆竜慮竜溜�竜."
 
 #: ../libpurple/protocols/toc/toc.c:558
-#, c-format
 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."
@@ -12584,15 +12911,14 @@
 
 #: ../libpurple/protocols/toc/toc.c:792
 msgid "TOC has come back from its pause. You may now send messages again."
-msgstr ""
-"里凌 TOC 竜�劉���竜�竜 留�� �侶僚 �留��侶 �凌�. 里��留 亮�凌�竜溜�竜 僚留 ��竜溜了竜�竜 亮侶僚�亮留�留 両留僚略."
+msgstr "里凌 TOC 竜�劉���竜�竜 留�� �侶僚 �留��侶 �凌�. 里��留 亮�凌�竜溜�竜 僚留 ��竜溜了竜�竜 亮侶僚�亮留�留 両留僚略."
 
 #: ../libpurple/protocols/toc/toc.c:995
 msgid "Password Change Successful"
 msgstr "��旅���流� 留了了留粒流 虜�隆旅虜凌�"
 
-#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5582
-#: ../pidgin/gtkblist.c:5932
+#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:6399
+#: ../pidgin/gtkblist.c:6736
 msgid "_Group:"
 msgstr "_�亮略隆留:"
 
@@ -12654,25 +12980,25 @@
 msgid "TOC Protocol Plugin"
 msgstr "����慮竜�凌 ����凌虜�了了凌� TOC"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:782
+#: ../libpurple/protocols/yahoo/yahoo.c:745
 #, c-format
 msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:838
+msgstr "%s �留� 劉��竜旅了竜 ����虜了侶�侶 亮竜 虜略亮竜�留, 虜略�旅 �凌 凌�凌溜凌 隆竜僚 ��凌��侶�溜龍竜�留旅 留虜�亮留."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:803
 msgid "Your Yahoo! message did not get sent."
 msgstr "里凌 亮流僚�亮留 �留� Yahoo! 隆竜 ��略了慮侶虜竜."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:960
+#: ../libpurple/protocols/yahoo/yahoo.c:916
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "�流僚�亮留 ����流亮留�凌� Yahoo! ��凌� %s:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1029
+#: ../libpurple/protocols/yahoo/yahoo.c:990
 msgid "Authorization denied message:"
 msgstr "�流僚�亮留 略�僚侶�侶� 劉粒虜�旅�侶�:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1047
+#: ../libpurple/protocols/yahoo/yahoo.c:1008
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -12681,17 +13007,16 @@
 "%s 留�僚流慮侶虜竜 (留僚留隆�凌亮旅虜略) �凌 留溜�侶亮略 �留� 僚留 �凌僚 ��凌�慮劉�竜�竜 ��侶 了溜��留 �留� 粒旅留 "
 "�凌僚 留虜�了凌�慮凌 了�粒凌: %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1050
+#: ../libpurple/protocols/yahoo/yahoo.c:1011
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
-msgstr ""
-"%s 留�僚流慮侶虜竜 (留僚留隆�凌亮旅虜略) �凌 留溜�侶亮略 �留� 僚留 �凌僚 ��凌�慮劉�竜�竜 ��侶 了溜��留 �留�."
-
-#: ../libpurple/protocols/yahoo/yahoo.c:1052
+msgstr "%s 留�僚流慮侶虜竜 (留僚留隆�凌亮旅虜略) �凌 留溜�侶亮略 �留� 僚留 �凌僚 ��凌�慮劉�竜�竜 ��侶 了溜��留 �留�."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:1013
 msgid "Add buddy rejected"
 msgstr "� ��凌�慮流虜侶 �溜了凌� 留�凌��溜�慮侶虜竜"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1994
+#: ../libpurple/protocols/yahoo/yahoo.c:1997
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -12702,11 +13027,11 @@
 "劉粒虜�旅�侶�.   �旅慮留僚�僚 僚留 亮侶僚 亮�凌�竜溜�竜 僚留 ��僚隆竜慮竜溜�竜 竜�旅����� ��凌 Yahoo.  "
 "�了劉粒両�竜 �凌 %s 粒旅留 留僚留硫留慮亮溜�竜旅�."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1997
+#: ../libpurple/protocols/yahoo/yahoo.c:2000
 msgid "Failed Yahoo! Authentication"
 msgstr "��凌���溜留 劉粒虜�旅�侶� Yahoo!"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2063
+#: ../libpurple/protocols/yahoo/yahoo.c:2066
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -12715,180 +13040,168 @@
 "��凌��留慮流�留�竜 僚留 �留�留硫了劉�竜�竜 �凌僚 %s, 留了了略 凌 ��流��侶� 竜溜僚留旅 ��侶 了溜��留 �溜了�僚 "
 "�留�.   �略僚凌僚�留� 虜了旅虜 ��凌 \"�留旅\" 慮留 �凌僚 留�留旅�劉�竜�竜 虜留旅 慮留 �凌僚 留粒僚凌流�竜�竜."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2066
+#: ../libpurple/protocols/yahoo/yahoo.c:2069
 msgid "Ignore buddy?"
 msgstr "�粒僚�侶�侶 �凌� �溜了凌�;"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2129
+#: ../libpurple/protocols/yahoo/yahoo.c:2134
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr ""
 "� 了凌粒留�旅留�亮�� �留� 竜溜僚留旅 虜了竜旅隆�亮劉僚凌�, �留�留虜留了凌�亮竜 ��僚隆竜慮竜溜�竜 ��侶僚 旅��凌�竜了溜隆留 "
 "�凌� Yahoo!."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2132
+#: ../libpurple/protocols/yahoo/yahoo.c:2137
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 "�粒僚���凌 ��略了亮留 亮竜 留�旅慮亮� %d. �僚 ��僚隆竜慮竜溜�竜 ��侶僚 旅��凌�竜了溜隆留 �凌� Yahoo! 溜��� "
 "隆旅凌�慮�慮竜溜."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2186
+#: ../libpurple/protocols/yahoo/yahoo.c:2190
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "�竜僚 流�留僚 隆�僚留�流 侶 ��凌�慮流虜侶 �凌� �溜了凌� %s ��侶僚 凌亮略隆留 %s �侶� 了溜��留� 竜両��侶�竜�侶�流 "
 "��凌 了凌粒留�旅留�亮� %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2189
+#: ../libpurple/protocols/yahoo/yahoo.c:2193
 msgid "Could not add buddy to server list"
 msgstr "�竜僚 流�留僚 隆�僚留�流 侶 ��凌�慮流虜侶 �凌� �溜了凌� ��侶 了溜��留 竜両��侶�竜�侶�流"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2308
+#: ../libpurple/protocols/yahoo/yahoo.c:2315
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ %s/%s/%s.swf 亮竜 流�凌 ] %s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2651
+#: ../libpurple/protocols/yahoo/yahoo.c:2671
 msgid "Received unexpected HTTP response from server."
 msgstr "�流�慮侶虜竜 留僚留�略僚�竜�侶 留僚�留��虜�旅�侶 HTTP 留�� �凌僚 竜両��侶�竜�侶�流."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2675
-#: ../libpurple/protocols/yahoo/yahoo.c:2861
-#: ../libpurple/protocols/yahoo/yahoo.c:2964
-#: ../libpurple/protocols/yahoo/yahoo.c:2974
-#: ../libpurple/protocols/yahoo/yahoochat.c:1514
-#: ../libpurple/protocols/yahoo/yahoochat.c:1584
-#: ../libpurple/protocols/yahoo/ycht.c:585
+#: ../libpurple/protocols/yahoo/yahoo.c:2700
+#: ../libpurple/protocols/yahoo/yahoo.c:2888
+#: ../libpurple/protocols/yahoo/yahoo.c:2993
+#: ../libpurple/protocols/yahoo/yahoo.c:3004
+#: ../libpurple/protocols/yahoo/yahoochat.c:1525
+#: ../libpurple/protocols/yahoo/yahoochat.c:1595
+#: ../libpurple/protocols/yahoo/ycht.c:586
 msgid "Connection problem"
 msgstr "���硫了侶亮留 ��僚隆竜�侶�"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2701
-#, fuzzy, c-format
+#: ../libpurple/protocols/yahoo/yahoo.c:2726
+#, c-format
 msgid ""
 "Lost connection with %s:\n"
 "%s"
 msgstr ""
-"� ��僚隆竜�侶 亮竜 �凌僚 竜両��侶�竜�侶�流 �略慮侶虜竜:\n"
+"律略慮侶虜竜 侶 ��僚隆竜�侶 亮竜 %s:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2726
-#, fuzzy, c-format
+#: ../libpurple/protocols/yahoo/yahoo.c:2751
+#, c-format
 msgid ""
 "Could not establish a connection with %s:\n"
 "%s"
 msgstr ""
-"�隆�僚留亮溜留 隆侶亮旅凌��粒溜留� ��僚隆竜�侶� 亮竜 �凌僚 竜両��侶�竜�侶�流:\n"
+"�隆�僚留亮溜留 隆侶亮旅凌��粒溜留� ��僚隆竜�侶� 亮竜 %s:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3081
-#: ../libpurple/protocols/yahoo/yahoo.c:3767
+#: ../libpurple/protocols/yahoo/yahoo.c:3118
+#: ../libpurple/protocols/yahoo/yahoo.c:3809
 msgid "Not at Home"
 msgstr "�虜��� ��旅�旅凌�"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3083
-#: ../libpurple/protocols/yahoo/yahoo.c:3770
+#: ../libpurple/protocols/yahoo/yahoo.c:3120
+#: ../libpurple/protocols/yahoo/yahoo.c:3812
 msgid "Not at Desk"
 msgstr "�虜��� 慮�留僚溜凌�"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3085
-#: ../libpurple/protocols/yahoo/yahoo.c:3773
+#: ../libpurple/protocols/yahoo/yahoo.c:3122
+#: ../libpurple/protocols/yahoo/yahoo.c:3815
 msgid "Not in Office"
 msgstr "�虜��� 粒�留�竜溜凌�"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3089
-#: ../libpurple/protocols/yahoo/yahoo.c:3779
+#: ../libpurple/protocols/yahoo/yahoo.c:3126
+#: ../libpurple/protocols/yahoo/yahoo.c:3821
 msgid "On Vacation"
 msgstr "裡竜 隆旅留虜凌�劉�"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3093
-#: ../libpurple/protocols/yahoo/yahoo.c:3785
+#: ../libpurple/protocols/yahoo/yahoo.c:3130
+#: ../libpurple/protocols/yahoo/yahoo.c:3827
 msgid "Stepped Out"
 msgstr "��� 硫粒竜旅 劉両�"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3186
-#: ../libpurple/protocols/yahoo/yahoo.c:3216
+#: ../libpurple/protocols/yahoo/yahoo.c:3223
+#: ../libpurple/protocols/yahoo/yahoo.c:3253
 msgid "Not on server list"
 msgstr "��旅 ��侶 了溜��留 �凌� 竜両��侶�竜�侶�流"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3233
-#: ../libpurple/protocols/yahoo/yahoo.c:3291
+#: ../libpurple/protocols/yahoo/yahoo.c:3270
+#: ../libpurple/protocols/yahoo/yahoo.c:3328
 msgid "Appear Online"
 msgstr "�亮�略僚旅�侶 �� ��僚隆竜隆竜亮劉僚凌�"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3236
-#: ../libpurple/protocols/yahoo/yahoo.c:3312
+#: ../libpurple/protocols/yahoo/yahoo.c:3273
+#: ../libpurple/protocols/yahoo/yahoo.c:3349
 msgid "Appear Permanently Offline"
 msgstr "�亮�略僚旅�侶 �� 亮�僚旅亮留 留�凌��僚隆竜隆竜亮劉僚凌�"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3254
+#: ../libpurple/protocols/yahoo/yahoo.c:3291
 msgid "Presence"
 msgstr "�留�凌��溜留"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3297
+#: ../libpurple/protocols/yahoo/yahoo.c:3334
 msgid "Appear Offline"
 msgstr "�亮�略僚旅�侶 �� 留�凌��僚隆竜隆竜亮劉僚凌�"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3306
+#: ../libpurple/protocols/yahoo/yahoo.c:3343
 msgid "Don't Appear Permanently Offline"
 msgstr "�亮�略僚旅�侶 �� ��旅 亮�僚旅亮留 留�凌��僚隆竜隆竜亮劉僚凌�"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3354
+#: ../libpurple/protocols/yahoo/yahoo.c:3391
 msgid "Join in Chat"
 msgstr "裡�亮亮竜�凌�流 �竜 ��龍流�侶�侶"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3360
+#: ../libpurple/protocols/yahoo/yahoo.c:3397
 msgid "Initiate Conference"
 msgstr "�僚留�両侶 ��龍流�侶�侶�"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3388
+#: ../libpurple/protocols/yahoo/yahoo.c:3425
 msgid "Presence Settings"
 msgstr "痢�慮亮溜�竜旅� �留�凌��溜留�"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3394
+#: ../libpurple/protocols/yahoo/yahoo.c:3431
 msgid "Start Doodling"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3495
-#, fuzzy
+#: ../libpurple/protocols/yahoo/yahoo.c:3537
 msgid "Activate which ID?"
 msgstr "�僚竜�粒凌�凌溜侶�侶 �凌旅留僚凌� ID;"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3506
+#: ../libpurple/protocols/yahoo/yahoo.c:3548
 msgid "Join whom in chat?"
-msgstr "�凌旅留僚凌� ��亮亮竜�凌�流 ��侶 ��龍流�侶�侶;"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3518
+msgstr "裡�亮亮竜�凌�流 ��侶 ��龍流�侶�侶 亮竜 �凌旅凌僚;"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:3560
 msgid "Activate ID..."
 msgstr "�僚竜�粒凌�凌溜侶�侶 ID..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3522
+#: ../libpurple/protocols/yahoo/yahoo.c:3564
 msgid "Join User in Chat..."
 msgstr "裡�亮亮竜�凌�流 ��流��侶 �竜 ��龍流�侶�侶..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3527
-#, fuzzy
+#: ../libpurple/protocols/yahoo/yahoo.c:3569
 msgid "Open Inbox"
-msgstr "�僚凌旅粒亮留 竜旅�竜��凌亮劉僚�僚 Hotmail"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4119
-msgid "Buzz"
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4121
-#, c-format
-msgid "Buzzing %s..."
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4136
+msgstr "�僚凌旅粒亮留 竜旅�竜��凌亮劉僚�僚"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4158
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr ""
-"join &lt;隆�亮略�旅凌&gt;:  ��亮亮竜�凌�流 �竜 劉僚留 隆�亮略�旅凌 ��龍流�侶�侶� ��凌 隆溜虜��凌 Yahoo"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4141
+msgstr "join &lt;隆�亮略�旅凌&gt;:  ��亮亮竜�凌�流 �竜 劉僚留 隆�亮略�旅凌 ��龍流�侶�侶� ��凌 隆溜虜��凌 Yahoo"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4163
 msgid "list: List rooms on the Yahoo network"
 msgstr "list:  �溜��留 ��僚 虜留僚留了旅�僚 ��凌 隆溜虜��凌 Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4149
+#: ../libpurple/protocols/yahoo/yahoo.c:4171
 msgid "doodle: Request user to start a Doodle session"
 msgstr ""
 
@@ -12902,56 +13215,56 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4358
-#: ../libpurple/protocols/yahoo/yahoo.c:4360
+#: ../libpurple/protocols/yahoo/yahoo.c:4380
+#: ../libpurple/protocols/yahoo/yahoo.c:4382
 msgid "Yahoo Protocol Plugin"
 msgstr "����慮竜�凌 ����凌虜�了了凌� Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4383
+#: ../libpurple/protocols/yahoo/yahoo.c:4405
 msgid "Yahoo Japan"
 msgstr "Yahoo �留��僚溜留�"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4386
+#: ../libpurple/protocols/yahoo/yahoo.c:4408
 msgid "Pager server"
 msgstr "�両��侶�竜�侶�流� �侶了竜竜旅隆凌�凌溜侶�侶�"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4389
+#: ../libpurple/protocols/yahoo/yahoo.c:4411
 msgid "Japan Pager server"
 msgstr "�両��侶�竜�侶�流� �侶了竜竜旅隆凌�凌溜侶�侶� �留��僚溜留�"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4392
+#: ../libpurple/protocols/yahoo/yahoo.c:4414
 msgid "Pager port"
 msgstr "���留 �侶了竜竜旅隆凌�凌旅侶�流"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4395
+#: ../libpurple/protocols/yahoo/yahoo.c:4417
 msgid "File transfer server"
 msgstr "�両��侶�竜�侶�流� 亮竜�留�凌�略� 留��竜溜�僚"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4398
+#: ../libpurple/protocols/yahoo/yahoo.c:4420
 msgid "Japan file transfer server"
 msgstr "�両��侶�竜�侶�流� 亮竜�留�凌�略� 留��竜溜�僚 �留��僚溜留�"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4401
+#: ../libpurple/protocols/yahoo/yahoo.c:4423
 msgid "File transfer port"
 msgstr "���留 亮竜�留�凌�略� 留��竜溜�僚"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4404
+#: ../libpurple/protocols/yahoo/yahoo.c:4426
 msgid "Chat room locale"
 msgstr "�僚�凌�旅��侶�留 隆�亮留�溜凌� ��龍流�侶�侶�"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4407
+#: ../libpurple/protocols/yahoo/yahoo.c:4429
 msgid "Ignore conference and chatroom invitations"
 msgstr "�留�略硫了竜�侶 ��凌�虜了流�竜�僚 ��龍侶�流�竜�僚 虜留旅 隆�亮留�溜�僚 ��龍侶�流�竜�僚"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4415
+#: ../libpurple/protocols/yahoo/yahoo.c:4437
 msgid "Chat room list URL"
 msgstr "URL 了溜��留� 隆�亮留�溜�僚 ��龍流�侶�侶�"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4418
+#: ../libpurple/protocols/yahoo/yahoo.c:4440
 msgid "Yahoo Chat server"
 msgstr "�両��侶�竜�侶�流� ��龍侶�流�竜�僚 Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4421
+#: ../libpurple/protocols/yahoo/yahoo.c:4443
 msgid "Yahoo Chat port"
 msgstr "���留 ��龍侶�流�竜�僚 Yahoo"
 
@@ -12962,13 +13275,19 @@
 msgid "Sent Doodle request."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:270
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:279
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:288
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:319
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:328
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:337
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1110
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1514
 msgid "Unable to establish file descriptor."
 msgstr "�隆�僚留亮溜留 ��僚隆竜�侶� 亮竜 �凌僚 �竜�旅粒�留�劉留 留��竜溜�僚."
 
-#. TODO: what to do here - do we really have to disconnect?
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1409
+#, c-format
+msgid "%s is trying to send you a group of %d files.\n"
+msgstr "%s ��凌��留慮竜溜 僚留 �留� ��竜溜了竜旅 劉僚留 ��僚凌了凌 %d 留��竜溜�僚.\n"
+
 #: ../libpurple/protocols/yahoo/yahoo_packet.c:307
 msgid "Write Error"
 msgstr "裡�略了亮留 竜粒粒�留�流�"
@@ -12997,47 +13316,47 @@
 "�僚 竜�旅慮�亮竜溜�竜 僚留 隆竜溜�竜 留��� �凌 ��凌�溜了, 慮留 ��竜旅留��竜溜 僚留 竜�旅�虜竜��竜溜�竜 留���僚 �凌 "
 "��僚隆竜�亮凌 ��凌 �竜�旅侶粒侶�流 隆旅留隆旅虜��凌� �留�:"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1034
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1040
 msgid "Yahoo! ID"
 msgstr "Yahoo! ID"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1109
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1113
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1117
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1115
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1119
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1123
 msgid "Hobbies"
 msgstr "�了竜�慮竜�凌� ���僚凌�"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1127
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1131
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1133
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1137
 msgid "Latest News"
 msgstr "里竜了竜��留溜留 僚劉留"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1152
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1158
 msgid "Home Page"
 msgstr "���旅虜流 �竜了溜隆留"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1167
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1173
 msgid "Cool Link 1"
 msgstr "��凌�竜旅僚�亮竜僚凌� ��僚隆竜�亮凌� 1"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1172
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1178
 msgid "Cool Link 2"
 msgstr "��凌�竜旅僚�亮竜僚凌� ��僚隆竜�亮凌� 2"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1176
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1182
 msgid "Cool Link 3"
 msgstr "��凌�竜旅僚�亮竜僚凌� ��僚隆竜�亮凌� 3"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1190
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1196
 msgid "Last Update"
 msgstr "里竜了竜��留溜留 竜僚侶亮劉���侶"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1199
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1205
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "�了侶�凌�凌�溜竜� �凌� ��流��侶 %s 亮侶 隆旅留慮劉�旅亮竜�"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1205
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1211
 msgid ""
 "Sorry, this profile seems to be in a language or format that is not "
 "supported at this time."
@@ -13045,7 +13364,7 @@
 "裡�粒僚�亮侶, 留��� �凌 ��凌�溜了 �留溜僚竜�留旅 ��旅 竜溜僚留旅 �竜 亮旅留 粒了���留 侶 凌�凌溜留 隆竜僚 "
 "��凌��侶�溜龍竜�留旅 留��流 �侶 ��旅粒亮流."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1221
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1227
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
 "server-side problem. Please try again later."
@@ -13053,7 +13372,7 @@
 "�竜僚 流�留僚 隆�僚留�流 侶 了流�侶 �凌� ��凌�溜了 �凌� ��流��侶. ���� 亮略了了凌僚 竜溜僚留旅 劉僚留 "
 "��凌���旅僚� ���硫了侶亮留 ��凌僚 竜両��侶�竜�侶�流. �留�留虜留了凌�亮竜 隆凌虜旅亮略��竜 留�粒��竜�留."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1224
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1230
 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 "
@@ -13064,39 +13383,39 @@
 "�凌� ��流��侶. �僚 粒僚��溜龍竜�竜 ��旅 凌 ��流��侶� ��略��竜旅, �留�留虜留了凌�亮竜 隆凌虜旅亮略��竜 "
 "留�粒��竜�留."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1231
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1237
 msgid "The user's profile is empty."
 msgstr "里凌 ��凌�溜了 �凌� ��流��侶 竜溜僚留旅 略隆竜旅凌."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:217
+#: ../libpurple/protocols/yahoo/yahoochat.c:222
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr "%s 留�僚流慮侶虜竜 �侶僚 ����虜了侶�侶 ��龍流�侶�侶� ��凌 隆�亮略�旅凌 \"%s\" 竜�竜旅隆流 \"%s\"."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:219
+#: ../libpurple/protocols/yahoo/yahoochat.c:224
 msgid "Invitation Rejected"
 msgstr "� ����虜了侶�侶 留�凌��溜�慮侶虜竜"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:438
+#: ../libpurple/protocols/yahoo/yahoochat.c:443
 msgid "Failed to join chat"
 msgstr "��凌���溜留 ��亮亮竜�凌�流� ��侶 ��龍流�侶�侶"
 
 #. -6
-#: ../libpurple/protocols/yahoo/yahoochat.c:441
+#: ../libpurple/protocols/yahoo/yahoochat.c:446
 msgid "Unknown room"
 msgstr "�粒僚���凌 隆�亮略�旅凌"
 
 #. -15
-#: ../libpurple/protocols/yahoo/yahoochat.c:444
+#: ../libpurple/protocols/yahoo/yahoochat.c:449
 msgid "Maybe the room is full"
 msgstr "���� �凌 隆�亮略�旅凌 僚留 竜溜僚留旅 粒竜亮略�凌"
 
 #. -35
-#: ../libpurple/protocols/yahoo/yahoochat.c:447
+#: ../libpurple/protocols/yahoo/yahoochat.c:452
 msgid "Not available"
 msgstr "�侶 隆旅留慮劉�旅亮凌"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:451
+#: ../libpurple/protocols/yahoo/yahoochat.c:456
 msgid ""
 "Unknown error. You may need to logout and wait five minutes before being "
 "able to rejoin a chatroom"
@@ -13104,46 +13423,46 @@
 "�粒僚���凌 ��略了亮留. ���� ��竜旅略龍竜�留旅 僚留 留�凌��僚隆竜慮竜溜�竜 虜留旅 僚留 �竜�旅亮劉僚竜�竜 �劉僚�竜 "
 "了竜��略 粒旅留 僚留 劉�竜�竜 �侶 隆�僚留���侶�留 僚留 亮�竜溜�竜 �略了旅 ��凌 隆�亮略�旅凌 ��龍流�侶�侶�"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:534
+#: ../libpurple/protocols/yahoo/yahoochat.c:539
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "裡�龍侶�略�竜 ��凌 %s."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:719
+#: ../libpurple/protocols/yahoo/yahoochat.c:728
 msgid "Failed to join buddy in chat"
 msgstr "�隆�僚留�侶 侶 ��亮亮竜�凌�流 �凌� �溜了凌� ��侶 ��龍流�侶�侶"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:720
+#: ../libpurple/protocols/yahoo/yahoochat.c:729
 msgid "Maybe they're not in a chat?"
 msgstr "�流��� 隆竜僚 竜溜僚留旅 ��侶 ��龍流�侶�侶;"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1416
-#: ../libpurple/protocols/yahoo/yahoochat.c:1442
+#: ../libpurple/protocols/yahoo/yahoochat.c:1425
+#: ../libpurple/protocols/yahoo/yahoochat.c:1451
 msgid "Fetching the room list failed."
 msgstr "��凌���溜留 了流�侶� 了溜��留� 隆�亮留�溜�僚."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1500
+#: ../libpurple/protocols/yahoo/yahoochat.c:1511
 msgid "Voices"
 msgstr "陸�僚劉�"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1503
+#: ../libpurple/protocols/yahoo/yahoochat.c:1514
 msgid "Webcams"
 msgstr "���凌虜略亮竜�竜�"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1514
-#: ../libpurple/protocols/yahoo/yahoochat.c:1584
+#: ../libpurple/protocols/yahoo/yahoochat.c:1525
+#: ../libpurple/protocols/yahoo/yahoochat.c:1595
 msgid "Unable to fetch room list."
 msgstr "�隆�僚留�侶 侶 了流�侶 �侶� 了溜��留� 隆�亮留�溜�僚."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1577
+#: ../libpurple/protocols/yahoo/yahoochat.c:1588
 msgid "User Rooms"
 msgstr "��亮略�旅留 ��侶���僚"
 
-#: ../libpurple/protocols/yahoo/ycht.c:456
+#: ../libpurple/protocols/yahoo/ycht.c:457
 msgid "Connection problem with the YCHT server."
 msgstr "���硫了侶亮留 ��僚隆竜�侶� 亮竜 �凌僚 竜両��侶�竜�侶�流 YCHT."
 
-#: ../libpurple/protocols/yahoo/ycht.c:475
+#: ../libpurple/protocols/yahoo/ycht.c:476
 #, c-format
 msgid ""
 "Lost connection with server\n"
@@ -13152,7 +13471,7 @@
 "� ��僚隆竜�侶 亮竜 �凌僚 竜両��侶�竜�侶�流 �略慮侶虜竜\n"
 "%s"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:354
+#: ../libpurple/protocols/zephyr/zephyr.c:358
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -13160,100 +13479,99 @@
 "(裡�僚劉硫侶 劉僚留 ��略了亮留 虜留�略 �侶 亮竜�留��凌�流 留��凌� �凌� 亮侶僚�亮留�凌�.\t �了劉粒両�竜 �侶僚 "
 "竜�旅了凌粒流 '��隆旅虜凌�凌溜侶�侶' ��凌僚 竜�竜両竜�粒留��流 了凌粒留�旅留�亮�僚)"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:752
+#: ../libpurple/protocols/zephyr/zephyr.c:756
 #, c-format
 msgid "Unable to send to chat %s,%s,%s"
 msgstr "�隆�僚留亮溜留� 留�凌��凌了流� ��侶 ��龍流�侶�侶 %s,%s,%s"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:791
-#: ../libpurple/protocols/zephyr/zephyr.c:1210
+#: ../libpurple/protocols/zephyr/zephyr.c:795
+#: ../libpurple/protocols/zephyr/zephyr.c:1170
 msgid "Hidden or not logged-in"
 msgstr "������ 流 留�凌��僚隆竜隆竜亮劉僚凌�"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:797
-#: ../libpurple/protocols/zephyr/zephyr.c:1212
+#: ../libpurple/protocols/zephyr/zephyr.c:801
+#: ../libpurple/protocols/zephyr/zephyr.c:1172
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>裡�凌 %s 留�� %s"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:1546
-#: ../libpurple/protocols/zephyr/zephyr.c:1547
+#: ../libpurple/protocols/zephyr/zephyr.c:1510
+#: ../libpurple/protocols/zephyr/zephyr.c:1511
 msgid "Anyone"
 msgstr "��凌旅凌�隆流�凌�竜"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2354
+#: ../libpurple/protocols/zephyr/zephyr.c:2366
 msgid "_Class:"
 msgstr "_里略両侶:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2360
+#: ../libpurple/protocols/zephyr/zephyr.c:2372
 msgid "_Instance:"
 msgstr "_裡�旅粒亮旅����凌:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2366
+#: ../libpurple/protocols/zephyr/zephyr.c:2378
 msgid "_Recipient:"
 msgstr "_�留�留了流��侶�:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2377
+#: ../libpurple/protocols/zephyr/zephyr.c:2389
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "��凌���溜留 ��凌��略慮竜旅留� 竜粒粒�留�流� ��凌 %s,%s,%s"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2690
+#: ../libpurple/protocols/zephyr/zephyr.c:2702
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;�竜�隆�僚�亮凌&gt;: �僚�凌�旅�亮�� ��流��侶"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2695
+#: ../libpurple/protocols/zephyr/zephyr.c:2707
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;�竜�隆�僚�亮凌&gt;: �僚�凌�旅�亮�� ��流��侶"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2700
+#: ../libpurple/protocols/zephyr/zephyr.c:2712
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2705
+#: ../libpurple/protocols/zephyr/zephyr.c:2717
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2710
+#: ../libpurple/protocols/zephyr/zephyr.c:2722
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2716
+#: ../libpurple/protocols/zephyr/zephyr.c:2728
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2721
-msgid ""
-"zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
-msgstr ""
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2727
+#: ../libpurple/protocols/zephyr/zephyr.c:2733
+msgid "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
+msgstr ""
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2739
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2733
+#: ../libpurple/protocols/zephyr/zephyr.c:2745
 msgid ""
 "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
 "<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2739
+#: ../libpurple/protocols/zephyr/zephyr.c:2751
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2744
+#: ../libpurple/protocols/zephyr/zephyr.c:2756
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2850
+#: ../libpurple/protocols/zephyr/zephyr.c:2832
 msgid "Resubscribe"
 msgstr "��留僚竜粒粒�留�流"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2853
+#: ../libpurple/protocols/zephyr/zephyr.c:2835
 msgid "Retrieve subscriptions from server"
 msgstr "�流�侶 竜粒粒�留��僚 留�� �凌僚 竜両��侶�竜�侶�流"
 
@@ -13267,45 +13585,45 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/zephyr/zephyr.c:2946
-#: ../libpurple/protocols/zephyr/zephyr.c:2948
+#: ../libpurple/protocols/zephyr/zephyr.c:2928
+#: ../libpurple/protocols/zephyr/zephyr.c:2930
 msgid "Zephyr Protocol Plugin"
 msgstr "����慮竜�凌 ����凌虜�了了凌� Zephyr"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2973
+#: ../libpurple/protocols/zephyr/zephyr.c:2955
 msgid "Use tzc"
 msgstr "律�流�侶 tzc"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2976
+#: ../libpurple/protocols/zephyr/zephyr.c:2958
 msgid "tzc command"
 msgstr "竜僚�凌了流 tzc"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2979
+#: ../libpurple/protocols/zephyr/zephyr.c:2961
 msgid "Export to .anyone"
 msgstr "�両留粒�粒流 �竜 .anyone"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2982
+#: ../libpurple/protocols/zephyr/zephyr.c:2964
 msgid "Export to .zephyr.subs"
 msgstr "�両留粒�粒流 �竜 .zephyr.subs"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2985
+#: ../libpurple/protocols/zephyr/zephyr.c:2967
 msgid "Import from .anyone"
 msgstr "�旅�留粒�粒流 留�� .anyone"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2988
+#: ../libpurple/protocols/zephyr/zephyr.c:2970
 msgid "Import from .zephyr.subs"
 msgstr "�旅�留粒�粒流 留�� .zephyr.subs"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2991
+#: ../libpurple/protocols/zephyr/zephyr.c:2973
 msgid "Realm"
 msgstr "裡�留溜�留"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2994
+#: ../libpurple/protocols/zephyr/zephyr.c:2976
 msgid "Exposure"
 msgstr "�虜慮竜�侶"
 
-#: ../libpurple/proxy.c:459 ../libpurple/proxy.c:894 ../libpurple/proxy.c:1049
-#: ../libpurple/proxy.c:1617
+#: ../libpurple/proxy.c:461 ../libpurple/proxy.c:908 ../libpurple/proxy.c:1067
+#: ../libpurple/proxy.c:1638
 #, c-format
 msgid ""
 "Unable to create socket:\n"
@@ -13314,48 +13632,48 @@
 "�隆�僚留亮溜留 隆侶亮旅凌��粒溜留� ��凌隆凌�劉留\n"
 "%s"
 
-#: ../libpurple/proxy.c:659
+#: ../libpurple/proxy.c:662
 #, c-format
 msgid "Unable to parse response from HTTP proxy: %s\n"
 msgstr "�隆�僚留亮溜留 留僚略了��侶� �侶� 留僚�留��虜�旅�侶� �凌� 隆旅留虜凌亮旅��流 HTTP: %s\n"
 
-#: ../libpurple/proxy.c:698 ../libpurple/proxy.c:744 ../libpurple/proxy.c:780
-#: ../libpurple/proxy.c:792
+#: ../libpurple/proxy.c:702 ../libpurple/proxy.c:751 ../libpurple/proxy.c:789
+#: ../libpurple/proxy.c:801
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "裡�略了亮留 ��僚隆竜�侶� 隆旅留亮竜�凌了留硫侶�流 HTTP %d"
 
-#: ../libpurple/proxy.c:788
+#: ../libpurple/proxy.c:797
 #, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling."
 msgstr ""
 "��僚侶�侶 ����硫留�侶�: 凌 隆旅留亮竜�凌了留硫侶�流� HTTP 留�留粒凌�竜�竜旅 �侶僚 �侶�略粒粒��侶 �侶� 慮��留� %"
 "d."
 
-#: ../libpurple/proxy.c:1012
+#: ../libpurple/proxy.c:1028
 #, c-format
 msgid "Error resolving %s"
 msgstr "裡�略了亮留 竜��竜�侶� �凌� %s"
 
-#: ../libpurple/proxy.c:1714
+#: ../libpurple/proxy.c:1736
 msgid "Could not resolve host name"
 msgstr "�竜僚 流�留僚 隆�僚留�流 侶 竜��竜�侶 �凌� 凌僚�亮留�凌� �凌� 虜竜僚��旅虜凌� ��凌了凌粒旅��流"
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
 #.
-#: ../libpurple/request.h:1378
+#: ../libpurple/request.h:1448
 msgid "_Yes"
 msgstr "_�留旅"
 
-#: ../libpurple/request.h:1378
+#: ../libpurple/request.h:1448
 msgid "_No"
 msgstr "_��旅"
 
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
-#: ../libpurple/request.h:1398
+#: ../libpurple/request.h:1468
 msgid "_Accept"
 msgstr "_��凌隆凌�流"
 
@@ -13366,26 +13684,26 @@
 msgid "I'm not here right now"
 msgstr "�竜僚 竜溜亮留旅 竜隆� 留��流 �侶 ��旅粒亮流"
 
-#: ../libpurple/savedstatuses.c:535
+#: ../libpurple/savedstatuses.c:537
 msgid "saved statuses"
 msgstr "留�凌慮侶虜竜�亮劉僚竜� 虜留�留��略�竜旅�"
 
-#: ../libpurple/server.c:234
+#: ../libpurple/server.c:265
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s ���留 竜溜僚留旅 粒僚����� �� %s.\n"
 
-#: ../libpurple/server.c:302
+#: ../libpurple/server.c:333
 #, c-format
 msgid "Requesting %s's attention..."
-msgstr ""
-
-#: ../libpurple/server.c:347
+msgstr "�侶�竜溜�留旅 侶 ��凌�凌�流 �凌� %s..."
+
+#: ../libpurple/server.c:378
 #, c-format
 msgid "%s has requested your attention!"
-msgstr ""
-
-#: ../libpurple/server.c:796
+msgstr "%s 龍流�侶�竜 �侶僚 ��凌�凌�流 �留�!"
+
+#: ../libpurple/server.c:875
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -13394,19 +13712,18 @@
 "%s ��凌�虜略了竜�竜 �凌僚 %s ��凌 隆�亮略�旅凌 ��龍流�侶�侶� %s\n"
 "%s"
 
-#: ../libpurple/server.c:801
+#: ../libpurple/server.c:880
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s ��凌�虜略了竜�竜 �凌僚 %s ��凌 隆�亮略�旅凌 ��龍流�侶�侶� %s\n"
 
-#: ../libpurple/server.c:805
+#: ../libpurple/server.c:884
 msgid "Accept chat invitation?"
 msgstr "��凌隆凌�流 ����虜了侶�侶� ��龍流�侶�侶�;"
 
 #: ../libpurple/sslconn.c:164
-#, fuzzy
 msgid "SSL Connection Failed"
-msgstr "��凌���溜留 ��僚隆竜�侶�"
+msgstr "��凌���溜留 ��僚隆竜�侶� SSL"
 
 #: ../libpurple/sslconn.c:166
 msgid "SSL Handshake Failed"
@@ -13414,24 +13731,22 @@
 
 #: ../libpurple/sslconn.c:168
 msgid "SSL peer presented an invalid certificate"
-msgstr ""
+msgstr "� 虜�亮硫凌� SSL �留�凌��溜留�竜 劉僚留 亮侶 劉粒虜��凌 �旅��凌�凌旅侶�旅虜�"
 
 #: ../libpurple/sslconn.c:171
-#, fuzzy
 msgid "Unknown SSL error"
-msgstr "�粒僚���凌 ��略了亮留"
+msgstr "�粒僚���凌 ��略了亮留 SSL"
 
 #: ../libpurple/status.c:153
 msgid "Unset"
 msgstr "��竜僚竜�粒凌�凌溜侶�侶"
 
-#: ../libpurple/status.c:156 ../pidgin/gtkstatusbox.c:1059
-#, fuzzy
+#: ../libpurple/status.c:156 ../pidgin/gtkdocklet.c:553
+#: ../pidgin/gtkstatusbox.c:1083
 msgid "Do not disturb"
 msgstr "�侶僚 竜僚凌�了竜溜�竜"
 
 #: ../libpurple/status.c:159
-#, fuzzy
 msgid "Extended away"
 msgstr "�凌了� 留��僚"
 
@@ -13439,52 +13754,56 @@
 msgid "Mobile"
 msgstr "�竜 �凌�侶�流 ���虜竜�流"
 
-#: ../libpurple/status.c:609
-#, c-format
-msgid "%s changed status from %s to %s"
-msgstr "%s 略了了留両竜 虜留�略��留�侶 留�� %s �竜 %s"
-
-#: ../libpurple/status.c:619
-#, c-format
-msgid "%s is now %s"
-msgstr "%s ���留 竜溜僚留旅 %s"
-
-#: ../libpurple/status.c:624
-#, c-format
-msgid "%s is no longer %s"
-msgstr "%s 隆竜僚 竜溜僚留旅 �了劉凌僚 %s"
-
-#: ../libpurple/status.c:1234
+#: ../libpurple/status.c:161
+msgid "Listening to music"
+msgstr "�虜凌�竜旅 亮凌��旅虜流"
+
+#: ../libpurple/status.c:610
+#, c-format
+msgid "%s (%s) changed status from %s to %s"
+msgstr "%s (%s) 略了了留両竜 虜留�略��留�侶 留�� %s �竜 %s"
+
+#: ../libpurple/status.c:621
+#, c-format
+msgid "%s (%s) is now %s"
+msgstr "%s (%s) ���留 竜溜僚留旅 %s"
+
+#: ../libpurple/status.c:627
+#, c-format
+msgid "%s (%s) is no longer %s"
+msgstr "%s (%s) 隆竜僚 竜溜僚留旅 �了劉凌僚 %s"
+
+#: ../libpurple/status.c:1242
 #, c-format
 msgid "%s became idle"
 msgstr "%s 竜溜僚留旅 留僚竜僚竜�粒��"
 
-#: ../libpurple/status.c:1251
+#: ../libpurple/status.c:1262
 #, c-format
 msgid "%s became unidle"
 msgstr "%s 隆竜僚 竜溜僚留旅 �旅留 留僚竜僚竜�粒��"
 
-#: ../libpurple/status.c:1314
+#: ../libpurple/status.c:1328
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s 劉粒旅僚竜 留僚竜僚竜�粒��"
 
-#: ../libpurple/status.c:1316
+#: ../libpurple/status.c:1330
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s 隆竜僚 竜溜僚留旅 �旅留 留僚竜僚竜�粒��"
 
-#: ../libpurple/util.c:718
+#: ../libpurple/util.c:721
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2722
+#: ../libpurple/util.c:2804
 #, c-format
 msgid "Error Reading %s"
 msgstr "裡�略了亮留 留僚略粒僚��侶� �凌� %s"
 
-#: ../libpurple/util.c:2723
+#: ../libpurple/util.c:2805
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -13493,67 +13812,67 @@
 "�僚留 ��略了亮留 ��僚劉硫侶 虜留�略 �侶僚 留僚略粒僚��侶 �凌� %s �留�.  �竜僚 �凌���慮侶虜竜, 虜留旅 �凌 �留了旅� "
 "留��竜溜凌 亮竜�凌僚凌亮略��侶虜竜 �竜 %s~."
 
-#: ../libpurple/util.c:3223
+#: ../libpurple/util.c:3304
 msgid "Calculating..."
 msgstr "離�凌了凌粒旅�亮��..."
 
-#: ../libpurple/util.c:3226
+#: ../libpurple/util.c:3307
 msgid "Unknown."
 msgstr "�粒僚���凌."
 
-#: ../libpurple/util.c:3252
+#: ../libpurple/util.c:3333
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d 隆竜��竜��了竜��凌"
 msgstr[1] "%d 隆竜��竜��了竜��留"
 
-#: ../libpurple/util.c:3264
+#: ../libpurple/util.c:3345
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d 侶亮劉�留"
 msgstr[1] "%d 侶亮劉�竜�"
 
-#: ../libpurple/util.c:3272
+#: ../libpurple/util.c:3353
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d ��留"
 msgstr[1] "%s, %d ��竜�"
 
-#: ../libpurple/util.c:3278
+#: ../libpurple/util.c:3359
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d ��留"
 msgstr[1] "%d ��竜�"
 
-#: ../libpurple/util.c:3286
+#: ../libpurple/util.c:3367
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d 了竜���"
 msgstr[1] "%s, %d 了竜��略"
 
-#: ../libpurple/util.c:3292
+#: ../libpurple/util.c:3373
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d 了竜���"
 msgstr[1] "%d 了竜��略"
 
-#: ../libpurple/util.c:3552
+#: ../libpurple/util.c:3633
 #, c-format
 msgid "Could not open %s: Redirected too many times"
 msgstr ""
 
-#: ../libpurple/util.c:3589 ../libpurple/util.c:3885
+#: ../libpurple/util.c:3670 ../libpurple/util.c:3966
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "�隆�僚留亮溜留 ��僚隆竜�侶� 亮竜 %s"
 
-#: ../libpurple/util.c:3712
+#: ../libpurple/util.c:3793
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
@@ -13562,21 +13881,55 @@
 "�隆�僚留�侶 侶 虜留�留僚凌亮流 留�虜竜�流� 亮僚流亮侶� ���竜 僚留 隆旅留�侶�侶慮凌�僚 �留 �竜�旅竜��亮竜僚留 留�� �凌 %"
 "s.  � 竜両��侶�竜�侶�流� 溜��� ��凌��留慮竜溜 僚留 虜略僚竜旅 虜略�旅 竜�旅硫了留硫劉�."
 
-#: ../libpurple/util.c:3747
+#: ../libpurple/util.c:3828
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "裡�略了亮留 留僚略粒僚��侶� 留�� %s: %s"
 
-#: ../libpurple/util.c:3778
+#: ../libpurple/util.c:3859
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "裡�略了亮留 竜粒粒�留�流� �凌� %s: %s"
 
-#: ../libpurple/util.c:3803
+#: ../libpurple/util.c:3884
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "�隆�僚留亮溜留 ��僚隆竜�侶� 亮竜 %s: %s"
 
+#: ../libpurple/util.c:4686
+#, c-format
+msgid " - %s"
+msgstr " - %s"
+
+#: ../libpurple/util.c:4692
+#, c-format
+msgid " (%s)"
+msgstr " (%s)"
+
+#. 10053
+#: ../libpurple/win32/libc_interface.c:322
+#, c-format
+msgid "Connection interrupted by other software on your computer."
+msgstr "� ��僚隆竜�侶 隆旅留虜��侶虜竜 留�� 虜略�凌旅凌 略了了凌 了凌粒旅�亮旅虜� �凌� ��凌了凌粒旅��流 �留�."
+
+#. 10054
+#: ../libpurple/win32/libc_interface.c:324
+#, c-format
+msgid "Remote host closed connection."
+msgstr "� 留�凌亮留虜���亮劉僚凌� ��凌了凌粒旅��流� 劉虜了竜旅�竜 �侶 ��僚隆竜�侶."
+
+#. 10060
+#: ../libpurple/win32/libc_interface.c:326
+#, c-format
+msgid "Connection timed out."
+msgstr "里劉了凌� ��凌僚旅虜凌� 凌�溜凌� ��僚隆竜�侶�."
+
+#. 10061
+#: ../libpurple/win32/libc_interface.c:328
+#, c-format
+msgid "Connection refused."
+msgstr "��僚侶�侶 ��僚隆竜�侶�."
+
 #: ../pidgin.desktop.in.h:1
 msgid "Internet Messenger"
 msgstr "��凌��凌了劉留� 亮侶僚�亮略��僚 隆旅留隆旅虜��凌�"
@@ -13589,86 +13942,80 @@
 msgid "Send instant messages over multiple protocols"
 msgstr "��凌��凌了流 略亮竜��僚 亮侶僚�亮略��僚 亮竜 �侶 ��流�侶 �凌了了留�了�僚 ����凌虜�了了�僚"
 
-#: ../pidgin/eggtrayicon.c:129
+#: ../pidgin/eggtrayicon.c:128
 msgid "Orientation"
 msgstr "��凌�留僚留�凌了旅�亮��"
 
-#: ../pidgin/eggtrayicon.c:130
+#: ../pidgin/eggtrayicon.c:129
 msgid "The orientation of the tray."
 msgstr "� ��凌�留僚留�凌了旅�亮�� �侶� 竜�粒留了竜旅凌慮流虜侶�."
 
 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:407
+#: ../pidgin/gtkaccount.c:379
 msgid "Login Options"
 msgstr "��旅了凌粒劉� 竜旅��隆凌�"
 
-#: ../pidgin/gtkaccount.c:428
-#, fuzzy
+#: ../pidgin/gtkaccount.c:400
 msgid "Pro_tocol:"
-msgstr "�����虜凌了了凌:"
-
-#: ../pidgin/gtkaccount.c:439
-#, fuzzy
+msgstr "���_��虜凌了了凌:"
+
+#: ../pidgin/gtkaccount.c:411
 msgid "Screen _name:"
-msgstr "�亮�留僚旅龍�亮竜僚凌 �僚凌亮留:"
-
-#: ../pidgin/gtkaccount.c:529
-#, fuzzy
+msgstr "�亮_�留僚旅龍�亮竜僚凌 �僚凌亮留:"
+
+#: ../pidgin/gtkaccount.c:501
 msgid "_Local alias:"
-msgstr "里凌�旅虜略 粒僚����� ��:"
-
-#: ../pidgin/gtkaccount.c:533
-#, fuzzy
+msgstr "里_凌�旅虜略 粒僚����� ��:"
+
+#: ../pidgin/gtkaccount.c:505
 msgid "Remember pass_word"
-msgstr "��凌亮僚侶亮�僚竜��侶 虜�隆旅虜凌�"
+msgstr "��凌亮僚侶亮�僚竜��侶 _虜�隆旅虜凌�"
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:591
+#: ../pidgin/gtkaccount.c:563
 msgid "User Options"
 msgstr "��旅了凌粒劉� ��流��侶"
 
-#: ../pidgin/gtkaccount.c:604
-#, fuzzy
+#: ../pidgin/gtkaccount.c:576
 msgid "New _mail notifications"
-msgstr "�旅隆凌�凌旅流�竜旅� 僚劉留� 留了了侶了凌粒�留�溜留�"
+msgstr "�旅隆凌�凌旅流�竜旅� 僚劉留� 留_了了侶了凌粒�留�溜留�"
 
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:609
-#, fuzzy
+#: ../pidgin/gtkaccount.c:581
 msgid "Use this buddy _icon for this account:"
-msgstr "律�流�侶 留��凌� �凌� 竜旅虜凌僚旅隆溜凌� �溜了凌� 粒旅留 留���僚 �凌 了凌粒留�旅留�亮�."
+msgstr "律�流�侶 留��凌� �凌� _竜旅虜凌僚旅隆溜凌� �溜了凌� 粒旅留 留���僚 �凌 了凌粒留�旅留�亮�."
 
 #. Build the protocol options frame.
-#: ../pidgin/gtkaccount.c:731
+#: ../pidgin/gtkaccount.c:703
 #, c-format
 msgid "%s Options"
 msgstr "��旅了凌粒劉� %s"
 
-#: ../pidgin/gtkaccount.c:936
+#: ../pidgin/gtkaccount.c:908
 msgid "Use GNOME Proxy Settings"
 msgstr "律�流�侶 ��慮亮溜�竜�僚 隆旅留亮竜�凌了留硫侶�流 GNOME"
 
-#: ../pidgin/gtkaccount.c:937
+#: ../pidgin/gtkaccount.c:909
 msgid "Use Global Proxy Settings"
 msgstr "律�流�侶 粒竜僚旅虜�僚 ��慮亮溜�竜�僚 隆旅留亮竜�凌了留硫侶�流"
 
-#: ../pidgin/gtkaccount.c:943
+#: ../pidgin/gtkaccount.c:915
 msgid "No Proxy"
 msgstr "律��溜� 隆旅留亮竜�凌了留硫侶�流"
 
-#: ../pidgin/gtkaccount.c:949
+#: ../pidgin/gtkaccount.c:921
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../pidgin/gtkaccount.c:955
+#: ../pidgin/gtkaccount.c:927
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../pidgin/gtkaccount.c:961
+#: ../pidgin/gtkaccount.c:933
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1211
+#: ../pidgin/gtkaccount.c:939 ../pidgin/gtkprefs.c:1230
 msgid "Use Environmental Settings"
 msgstr "律�流�侶 ��慮亮溜�竜�僚 �竜�旅硫略了了凌僚�凌�"
 
@@ -13677,73 +14024,73 @@
 #. A) your network is really slow and you have nothing better to do than
 #. look at butterflies.
 #. B)You are looking really closely at something that shouldn't matter.
-#: ../pidgin/gtkaccount.c:1006
+#: ../pidgin/gtkaccount.c:978
 msgid "If you look real closely"
 msgstr "�僚 虜凌旅�略両竜旅� 留�� ��留粒亮留�旅虜略 �凌了� 虜凌僚�略"
 
 #. This is an easter egg. See the comment on the previous line in the source.
-#: ../pidgin/gtkaccount.c:1009
+#: ../pidgin/gtkaccount.c:981
 msgid "you can see the butterflies mating"
 msgstr "慮留 亮�凌�劉�竜旅� 僚留 隆竜旅� �旅� �竜�留了凌�隆竜� 僚留 龍竜�粒留��僚凌�僚"
 
-#: ../pidgin/gtkaccount.c:1030
+#: ../pidgin/gtkaccount.c:1002
 msgid "Proxy Options"
 msgstr "��旅了凌粒劉� 隆旅留亮竜�凌了留硫侶�流"
 
-#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1205
+#: ../pidgin/gtkaccount.c:1016 ../pidgin/gtkprefs.c:1224
 msgid "Proxy _type:"
 msgstr "_里��凌� 隆旅留亮竜�凌了留硫侶�流:"
 
-#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1226
+#: ../pidgin/gtkaccount.c:1025 ../pidgin/gtkprefs.c:1245
 msgid "_Host:"
 msgstr "_�竜僚��旅虜�� 離�凌了凌粒旅��流�:"
 
-#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1244
+#: ../pidgin/gtkaccount.c:1029 ../pidgin/gtkprefs.c:1263
 msgid "_Port:"
 msgstr "_���留:"
 
-#: ../pidgin/gtkaccount.c:1065
+#: ../pidgin/gtkaccount.c:1037
 msgid "_Username:"
 msgstr "_�僚凌亮留 ��流��侶:"
 
-#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1281
+#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1300
 msgid "Pa_ssword:"
 msgstr "_��隆旅虜��:"
 
-#: ../pidgin/gtkaccount.c:1195
-#, fuzzy
+#: ../pidgin/gtkaccount.c:1169
 msgid "Unable to save new account"
-msgstr "�隆�僚留亮溜留 隆侶亮旅凌��粒溜留� ��僚隆竜�侶�"
-
-#: ../pidgin/gtkaccount.c:1196
+msgstr "�隆�僚留亮溜留 留�凌慮流虜竜��侶� �凌� 僚劉凌� 了凌粒留�旅留�亮凌�"
+
+#: ../pidgin/gtkaccount.c:1170
 msgid "An account already exists with the specified criteria."
-msgstr ""
-
-#: ../pidgin/gtkaccount.c:1473
+msgstr "離�略��竜旅 流隆侶 劉僚留� 了凌粒留�旅留�亮�� 亮竜 �留 虜�旅�流�旅留 �凌� 劉�凌�僚 凌�旅��竜溜."
+
+#: ../pidgin/gtkaccount.c:1447
 msgid "Add Account"
 msgstr "��凌�慮流虜侶 了凌粒留�旅留�亮凌�"
 
-#: ../pidgin/gtkaccount.c:1492
+#: ../pidgin/gtkaccount.c:1464
 msgid "_Basic"
 msgstr "_�留�旅虜略"
 
-#: ../pidgin/gtkaccount.c:1499
+#: ../pidgin/gtkaccount.c:1471
 msgid "Create this new account on the server"
-msgstr ""
-
-#: ../pidgin/gtkaccount.c:1515
+msgstr "�侶亮旅凌��粒溜留 留��凌� �凌� 僚劉凌� 了凌粒留�旅留�亮凌� ��凌僚 竜両��侶�竜�侶�流"
+
+#: ../pidgin/gtkaccount.c:1485
 msgid "_Advanced"
 msgstr "_�旅留 ��凌���侶亮劉僚凌��"
 
-#: ../pidgin/gtkaccount.c:1973 ../pidgin/gtkplugin.c:569
+#: ../pidgin/gtkaccount.c:1906 ../pidgin/gtkplugin.c:639
+#: ../pidgin/plugins/convcolors.c:327
 msgid "Enabled"
 msgstr "�僚竜�粒凌�凌旅流慮侶虜竜"
 
-#: ../pidgin/gtkaccount.c:2001
+#: ../pidgin/gtkaccount.c:1934
 msgid "Protocol"
 msgstr "�����虜凌了了凌"
 
-#: ../pidgin/gtkaccount.c:2201
+#: ../pidgin/gtkaccount.c:2137
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -13768,11 +14115,29 @@
 "竜�竜両竜�粒留��竜溜�竜 流 僚留 留�留旅�劉�竜�竜 了凌粒留�旅留�亮凌�� 亮劉�� �凌� <b>�凌粒留�旅留�亮凌溜-"
 ">��凌�慮流虜侶/��竜両竜�粒留�溜留</b> ��凌 �留�略慮��凌 �侶� 了溜��留� �溜了�僚"
 
-#: ../pidgin/gtkblist.c:767
-msgid "Join a Chat"
-msgstr "裡�亮亮竜�凌�流 �竜 ��龍流�侶�侶"
-
-#: ../pidgin/gtkblist.c:788
+#: ../pidgin/gtkblist.c:549
+#, c-format
+msgid "You have %d contact named %s. Would you like to merge them?"
+msgid_plural "You currently have %d contacts named %s. Would you like to merge them?"
+msgstr[0] "��竜�竜 %d 竜�留�流 �凌� 凌僚凌亮略龍竜�留旅 %s. �劉了竜�竜 僚留 �旅� ��粒��僚竜��竜�竜;"
+msgstr[1] "��竜�竜 %d 竜�留�劉� �凌� 凌僚凌亮略龍凌僚�留旅 %s. �劉了竜�竜 僚留 �旅� ��粒��僚竜��竜�竜;"
+
+#: ../pidgin/gtkblist.c:550
+msgid ""
+"Merging these contacts will cause them to share a single entry on the buddy "
+"list and use a single conversation window. You can separate them again by "
+"choosing 'Expand' from the contact's context menu"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:552
+msgid "_Merge"
+msgstr "_裡�粒��僚竜��侶"
+
+#: ../pidgin/gtkblist.c:953 ../pidgin/gtkblist.c:6683
+msgid "Room _List"
+msgstr "_�溜��留 隆�亮留�溜�僚"
+
+#: ../pidgin/gtkblist.c:973
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
@@ -13780,416 +14145,452 @@
 "�留�留虜留了凌�亮竜 竜旅�略粒竜�竜 �旅� 虜留�略了了侶了竜� �了侶�凌�凌�溜竜� ��竜�旅虜略 亮竜 �侶 ��龍流�侶�侶 �凌� "
 "慮劉了竜�竜 僚留 ��亮亮竜�略��竜�竜.\n"
 
-#. Set up stuff for the account box
-#: ../pidgin/gtkblist.c:799 ../pidgin/gtkblist.c:5530
-#: ../pidgin/gtkblist.c:5893 ../pidgin/gtkpounce.c:539
-#: ../pidgin/gtkroomlist.c:396
+#: ../pidgin/gtkblist.c:985 ../pidgin/gtkblist.c:6718
+#: ../pidgin/gtkpounce.c:546 ../pidgin/gtkroomlist.c:547
 msgid "_Account:"
 msgstr "_�凌粒留�旅留�亮��:"
 
-#: ../pidgin/gtkblist.c:1088 ../pidgin/gtkprivacy.c:603
-#: ../pidgin/gtkprivacy.c:617
+#: ../pidgin/gtkblist.c:1263 ../pidgin/gtkprivacy.c:549
+#: ../pidgin/gtkprivacy.c:563
 msgid "_Block"
 msgstr "_��凌虜了竜旅�亮��"
 
-#: ../pidgin/gtkblist.c:1088
+#: ../pidgin/gtkblist.c:1263
 msgid "Un_block"
 msgstr "�虜�_���侶 留�凌虜了竜旅�亮凌�"
 
-#: ../pidgin/gtkblist.c:1139
+#: ../pidgin/gtkblist.c:1306
+msgid "Move to"
+msgstr "�竜�留虜溜僚侶�侶 �竜"
+
+#: ../pidgin/gtkblist.c:1346
 msgid "Get _Info"
 msgstr "�流�侶 _�了侶�凌�凌�旅�僚"
 
-#: ../pidgin/gtkblist.c:1142 ../pidgin/pidginstock.c:90
+#: ../pidgin/gtkblist.c:1349 ../pidgin/pidginstock.c:90
 msgid "I_M"
 msgstr "_�流僚�亮留"
 
-#: ../pidgin/gtkblist.c:1148
-#, fuzzy
-msgid "_Send File"
-msgstr "��凌��凌了流 留��竜溜凌�"
-
-#: ../pidgin/gtkblist.c:1155
-msgid "Add Buddy _Pounce"
-msgstr "��凌�慮流虜侶 _竜���亮侶�侶� �溜了凌�"
-
-#: ../pidgin/gtkblist.c:1160 ../pidgin/gtkblist.c:1164
-#: ../pidgin/gtkblist.c:1269 ../pidgin/gtkblist.c:1292
+#: ../pidgin/gtkblist.c:1355
+msgid "_Send File..."
+msgstr "_��凌��凌了流 留��竜溜凌�..."
+
+#: ../pidgin/gtkblist.c:1362
+msgid "Add Buddy _Pounce..."
+msgstr "��凌�慮流虜侶 竜_���亮侶�侶� �溜了凌�..."
+
+#: ../pidgin/gtkblist.c:1367 ../pidgin/gtkblist.c:1371
+#: ../pidgin/gtkblist.c:1486 ../pidgin/gtkblist.c:1509
 msgid "View _Log"
 msgstr "�亮�略僚旅�侶 _虜留�留粒�留�流�"
 
-#: ../pidgin/gtkblist.c:1177 ../pidgin/gtkblist.c:1186
-#: ../pidgin/gtkblist.c:1277 ../pidgin/gtkblist.c:1298
+#: ../pidgin/gtkblist.c:1377
+msgid "Hide when offline"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:1377
+msgid "Show when offline"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:1391 ../pidgin/gtkblist.c:1400
+#: ../pidgin/gtkblist.c:1494 ../pidgin/gtkblist.c:1515
 msgid "_Alias..."
 msgstr "_�僚����� ��..."
 
-#: ../pidgin/gtkblist.c:1180 ../pidgin/gtkblist.c:1188
-#: ../pidgin/gtkblist.c:1279 ../pidgin/gtkblist.c:1300
+#: ../pidgin/gtkblist.c:1394 ../pidgin/gtkblist.c:1402
+#: ../pidgin/gtkblist.c:1496 ../pidgin/gtkblist.c:1517
 msgid "_Remove"
 msgstr "_��留溜�竜�侶"
 
-#: ../pidgin/gtkblist.c:1238
-msgid "Add a _Buddy"
-msgstr "��凌�慮流虜侶 _�溜了凌�"
-
-#: ../pidgin/gtkblist.c:1241
-msgid "Add a C_hat"
-msgstr "��凌�慮流虜侶 _��龍流�侶�侶�"
-
-#: ../pidgin/gtkblist.c:1244
+#: ../pidgin/gtkblist.c:1452
+msgid "Add _Buddy..."
+msgstr "_��凌�慮流虜侶 �溜了凌�..."
+
+#: ../pidgin/gtkblist.c:1455
+msgid "Add C_hat..."
+msgstr "��凌�慮流虜侶 ��_龍流�侶�侶�..."
+
+#: ../pidgin/gtkblist.c:1458
 msgid "_Delete Group"
 msgstr "_�旅留粒�留�流 凌亮略隆留�"
 
-#: ../pidgin/gtkblist.c:1246
+#: ../pidgin/gtkblist.c:1460
 msgid "_Rename"
 msgstr "_�竜�凌僚凌亮留�溜留"
 
 #. join button
-#: ../pidgin/gtkblist.c:1265 ../pidgin/gtkroomlist.c:307
-#: ../pidgin/gtkroomlist.c:460 ../pidgin/pidginstock.c:88
+#: ../pidgin/gtkblist.c:1480 ../pidgin/gtkroomlist.c:318
+#: ../pidgin/gtkroomlist.c:594 ../pidgin/pidginstock.c:88
 msgid "_Join"
 msgstr "_裡�亮亮竜�凌�流"
 
-#: ../pidgin/gtkblist.c:1267
+#: ../pidgin/gtkblist.c:1482
 msgid "Auto-Join"
 msgstr "����亮留�侶 ��亮亮竜�凌�流"
 
-#: ../pidgin/gtkblist.c:1305 ../pidgin/gtkblist.c:1329
+#: ../pidgin/gtkblist.c:1484
+msgid "Persistent"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:1522 ../pidgin/gtkblist.c:1545
 msgid "_Collapse"
 msgstr "_裡�亮���両侶"
 
-#: ../pidgin/gtkblist.c:1334
+#: ../pidgin/gtkblist.c:1550
 msgid "_Expand"
 msgstr "_�僚略���両侶"
 
-#: ../pidgin/gtkblist.c:1585 ../pidgin/gtkblist.c:1597
-#: ../pidgin/gtkblist.c:4603 ../pidgin/gtkblist.c:4616
+#: ../pidgin/gtkblist.c:1801 ../pidgin/gtkblist.c:1813
+#: ../pidgin/gtkblist.c:5364 ../pidgin/gtkblist.c:5377
 msgid "/Tools/Mute Sounds"
 msgstr "/��粒留了竜溜留/��凌�旅��侶�侶 流��僚"
 
-#: ../pidgin/gtkblist.c:2057 ../pidgin/gtkconv.c:4840
-#: ../pidgin/gtkpounce.c:430
-msgid ""
-"You are not currently signed on with an account that can add that buddy."
+#: ../pidgin/gtkblist.c:2273 ../pidgin/gtkconv.c:4818
+#: ../pidgin/gtkpounce.c:437
+msgid "You are not currently signed on with an account that can add that buddy."
 msgstr ""
 "��凌� �凌 �留��僚 隆竜僚 竜溜��竜 ��僚隆竜隆竜亮劉僚凌旅 亮竜 劉僚留 了凌粒留�旅留�亮� �凌� 僚留 亮�凌�竜溜�竜 僚留 "
 "��凌�慮劉�竜�竜 留���僚 �凌 �溜了凌."
 
+#. I don't believe this can happen currently, I think
+#. * everything that calls this function checks for one of the
+#. * above node types first.
+#: ../pidgin/gtkblist.c:2618
+msgid "Unknown node type"
+msgstr "�粒僚���凌� ���凌� 虜�亮硫凌�"
+
 #. Buddies menu
-#: ../pidgin/gtkblist.c:2869
+#: ../pidgin/gtkblist.c:3054
 msgid "/_Buddies"
 msgstr "/_陸溜了凌旅"
 
-#: ../pidgin/gtkblist.c:2870
+#: ../pidgin/gtkblist.c:3055
 msgid "/Buddies/New Instant _Message..."
 msgstr "/陸溜了凌旅/�劉凌 略亮竜�凌 亮流僚�亮留..."
 
-#: ../pidgin/gtkblist.c:2871
+#: ../pidgin/gtkblist.c:3056
 msgid "/Buddies/Join a _Chat..."
 msgstr "/陸溜了凌旅/裡�亮亮竜�凌�流 �竜 _��龍流�侶�侶..."
 
-#: ../pidgin/gtkblist.c:2872
+#: ../pidgin/gtkblist.c:3057
 msgid "/Buddies/Get User _Info..."
 msgstr "/陸溜了凌旅/�流�侶 _�了侶�凌�凌�旅�僚 ��流��侶..."
 
-#: ../pidgin/gtkblist.c:2873
+#: ../pidgin/gtkblist.c:3058
 msgid "/Buddies/View User _Log..."
 msgstr "/陸溜了凌旅/�亮�略僚旅�侶 _虜留�留粒�留�流� ��流��侶..."
 
-#: ../pidgin/gtkblist.c:2875
-#, fuzzy
-msgid "/Buddies/Show"
-msgstr "/_陸溜了凌旅"
-
-#: ../pidgin/gtkblist.c:2876
-#, fuzzy
+#: ../pidgin/gtkblist.c:3060
+msgid "/Buddies/Sh_ow"
+msgstr "/陸溜了凌旅/_�亮�略僚旅�侶"
+
+#: ../pidgin/gtkblist.c:3061
 msgid "/Buddies/Show/_Offline Buddies"
-msgstr "/陸溜了凌旅/�亮�略僚旅�侶 _亮侶 ��僚隆竜隆竜亮劉僚�僚 �溜了�僚"
-
-#: ../pidgin/gtkblist.c:2877
-#, fuzzy
+msgstr "/陸溜了凌旅/�亮�略僚旅�侶/_�侶 ��僚隆竜隆竜亮劉僚凌旅 �溜了凌旅"
+
+#: ../pidgin/gtkblist.c:3062
 msgid "/Buddies/Show/_Empty Groups"
-msgstr "/陸溜了凌旅/�亮�略僚旅�侶 _虜竜僚�僚 凌亮略隆�僚"
-
-#: ../pidgin/gtkblist.c:2878
-#, fuzzy
+msgstr "/陸溜了凌旅/�亮�略僚旅�侶/_�竜僚劉� 凌亮略隆竜�"
+
+#: ../pidgin/gtkblist.c:3063
 msgid "/Buddies/Show/Buddy _Details"
-msgstr "/陸溜了凌旅/�亮�略僚旅�侶 _了竜��凌亮竜�竜旅�僚 �溜了凌�"
-
-#: ../pidgin/gtkblist.c:2879
-#, fuzzy
+msgstr "/陸溜了凌旅/�亮�略僚旅�侶/_�竜��凌亮劉�竜旅竜� �溜了�僚"
+
+#: ../pidgin/gtkblist.c:3064
 msgid "/Buddies/Show/Idle _Times"
-msgstr "/陸溜了凌旅/�亮�略僚旅�侶 _���僚凌� �凌� 竜溜僚留旅 留僚竜僚竜�粒凌溜"
-
-#: ../pidgin/gtkblist.c:2880
-#, fuzzy
+msgstr "/陸溜了凌旅/�亮�略僚旅�侶/_律��僚凌� �凌� 竜溜僚留旅 留僚竜僚竜�粒凌溜"
+
+#: ../pidgin/gtkblist.c:3065
 msgid "/Buddies/Show/_Protocol Icons"
-msgstr "/陸溜了凌旅/�亮�略僚旅�侶 _虜竜僚�僚 凌亮略隆�僚"
-
-#: ../pidgin/gtkblist.c:2881
+msgstr "/陸溜了凌旅/�亮�略僚旅�侶/_�旅虜凌僚溜隆旅留 ����凌虜�了了凌�"
+
+#: ../pidgin/gtkblist.c:3066
 msgid "/Buddies/_Sort Buddies"
 msgstr "/陸溜了凌旅/_里留両旅僚�亮侶�侶 �溜了�僚"
 
-#: ../pidgin/gtkblist.c:2883
+#: ../pidgin/gtkblist.c:3068
 msgid "/Buddies/_Add Buddy..."
 msgstr "/陸溜了凌旅/_��凌�慮流虜侶 �溜了凌�..."
 
-#: ../pidgin/gtkblist.c:2884
+#: ../pidgin/gtkblist.c:3069
 msgid "/Buddies/Add C_hat..."
 msgstr "/陸溜了凌旅/��凌�慮流虜侶 _��龍流�侶�侶�..."
 
-#: ../pidgin/gtkblist.c:2885
+#: ../pidgin/gtkblist.c:3070
 msgid "/Buddies/Add _Group..."
 msgstr "/陸溜了凌旅/��凌�慮流虜侶 _凌亮略隆留�..."
 
-#: ../pidgin/gtkblist.c:2887
+#: ../pidgin/gtkblist.c:3072
 msgid "/Buddies/_Quit"
 msgstr "/陸溜了凌旅/_�両凌隆凌�"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:2890
+#: ../pidgin/gtkblist.c:3075
 msgid "/_Accounts"
 msgstr "/_�凌粒留�旅留�亮凌溜"
 
-#: ../pidgin/gtkblist.c:2891 ../pidgin/gtkblist.c:6589
-msgid "/Accounts/Add\\/Edit"
-msgstr "/�凌粒留�旅留�亮凌溜/��凌�慮流虜侶\\/��竜両竜�粒留�溜留"
+#: ../pidgin/gtkblist.c:3076 ../pidgin/gtkblist.c:7403
+msgid "/Accounts/Manage"
+msgstr "/�凌粒留�旅留�亮凌溜/��粒略僚��侶"
 
 #. Tools
-#: ../pidgin/gtkblist.c:2894
+#: ../pidgin/gtkblist.c:3079
 msgid "/_Tools"
 msgstr "/_��粒留了竜溜留"
 
-#: ../pidgin/gtkblist.c:2895
+#: ../pidgin/gtkblist.c:3080
 msgid "/Tools/Buddy _Pounces"
 msgstr "/��粒留了竜溜留/_����亮侶�侶 �溜了�僚"
 
-#: ../pidgin/gtkblist.c:2896
-#, fuzzy
+#: ../pidgin/gtkblist.c:3081
 msgid "/Tools/_Certificates"
-msgstr "/��粒留了竜溜留/�_�凌�旅亮流�竜旅�"
-
-#: ../pidgin/gtkblist.c:2897
+msgstr "/��粒留了竜溜留/_�旅��凌�凌旅侶�旅虜略"
+
+#: ../pidgin/gtkblist.c:3082
 msgid "/Tools/Plu_gins"
 msgstr "/��粒留了竜溜留/_����慮竜�留"
 
-#: ../pidgin/gtkblist.c:2898
+#: ../pidgin/gtkblist.c:3083
 msgid "/Tools/Pr_eferences"
 msgstr "/��粒留了竜溜留/�_�凌�旅亮流�竜旅�"
 
-#: ../pidgin/gtkblist.c:2899
+#: ../pidgin/gtkblist.c:3084
 msgid "/Tools/Pr_ivacy"
 msgstr "/��粒留了竜溜留/��凌���旅虜� _留����侶�凌"
 
-#: ../pidgin/gtkblist.c:2901
+#: ../pidgin/gtkblist.c:3086
 msgid "/Tools/_File Transfers"
 msgstr "/��粒留了竜溜留/_�竜�留�凌�劉� 留��竜溜�僚"
 
-#: ../pidgin/gtkblist.c:2902
+#: ../pidgin/gtkblist.c:3087
 msgid "/Tools/R_oom List"
 msgstr "/��粒留了竜溜留/�溜��留 _隆�亮留�溜�僚"
 
-#: ../pidgin/gtkblist.c:2903
+#: ../pidgin/gtkblist.c:3088
 msgid "/Tools/System _Log"
 msgstr "/��粒留了竜溜留/_�留�留粒�留�流 ����流亮留�凌�"
 
-#: ../pidgin/gtkblist.c:2905
+#: ../pidgin/gtkblist.c:3090
 msgid "/Tools/Mute _Sounds"
 msgstr "/��粒留了竜溜留/�_�凌�旅��侶�侶 流��僚"
 
 #. Help
-#: ../pidgin/gtkblist.c:2907
+#: ../pidgin/gtkblist.c:3092
 msgid "/_Help"
 msgstr "/_�凌流慮竜旅留"
 
-#: ../pidgin/gtkblist.c:2908
+#: ../pidgin/gtkblist.c:3093
 msgid "/Help/Online _Help"
 msgstr "/�凌流慮竜旅留/_�凌流慮竜旅留 亮劉�� 隆旅留隆旅虜��凌�"
 
-#: ../pidgin/gtkblist.c:2909
+#: ../pidgin/gtkblist.c:3094
 msgid "/Help/_Debug Window"
 msgstr "/�凌流慮竜旅留/�留�略慮��凌 _留�凌��留了亮略���侶�"
 
-#: ../pidgin/gtkblist.c:2911 ../pidgin/gtkblist.c:2913
+#: ../pidgin/gtkblist.c:3096 ../pidgin/gtkblist.c:3098
 msgid "/Help/_About"
 msgstr "/�凌流慮竜旅留/_裡�竜�旅虜略"
 
-#: ../pidgin/gtkblist.c:2942
-#, c-format
-msgid ""
-"\n"
-"<b>Account:</b> %s"
-msgstr ""
-"\n"
-"<b>�凌粒留�旅留�亮��:</b> %s"
-
-#: ../pidgin/gtkblist.c:3020
+#: ../pidgin/gtkblist.c:3128
+#, c-format
+msgid "<b>Account:</b> %s"
+msgstr "<b>�凌粒留�旅留�亮��:</b> %s"
+
+#: ../pidgin/gtkblist.c:3136
+#, c-format
+msgid ""
+"\n"
+"<b>Topic:</b> %s"
+msgstr ""
+"\n"
+"<b>�劉亮留 ��龍流�侶�侶�:</b> %s"
+
+#: ../pidgin/gtkblist.c:3136
+msgid "(no topic set)"
+msgstr "(�竜僚 凌�溜��侶虜竜 慮劉亮留 ��龍流�侶�侶�)"
+
+#: ../pidgin/gtkblist.c:3213
 msgid "Buddy Alias"
 msgstr "陸溜了凌� 粒僚����� ��"
 
-#: ../pidgin/gtkblist.c:3049
+#: ../pidgin/gtkblist.c:3242
 msgid "Logged In"
 msgstr "裡�僚隆竜隆竜亮劉僚凌�"
 
-#: ../pidgin/gtkblist.c:3095
+#: ../pidgin/gtkblist.c:3288
 msgid "Last Seen"
 msgstr "里竜了竜��留溜留 慮劉留�侶"
 
-#: ../pidgin/gtkblist.c:3116
+#: ../pidgin/gtkblist.c:3309
 msgid "Spooky"
-msgstr ""
-
-#: ../pidgin/gtkblist.c:3118
+msgstr "�僚留��旅�溜了留�"
+
+#: ../pidgin/gtkblist.c:3311
 msgid "Awesome"
-msgstr ""
-
-#: ../pidgin/gtkblist.c:3120
+msgstr "里劉了竜旅留"
+
+#: ../pidgin/gtkblist.c:3313
 msgid "Rockin'"
-msgstr ""
-
-#: ../pidgin/gtkblist.c:3453
-#, fuzzy, c-format
+msgstr "里留 ��略竜旅"
+
+#: ../pidgin/gtkblist.c:3329
+msgid "Total Buddies"
+msgstr "裡�僚凌了凌 �溜了�僚"
+
+#: ../pidgin/gtkblist.c:3696
+#, c-format
 msgid "Idle %dd %dh %02dm"
-msgstr "�僚竜僚竜�粒�� %dh %02dm"
-
-#: ../pidgin/gtkblist.c:3455
+msgstr "�僚竜僚竜�粒�� %dd %dh %02dm"
+
+#: ../pidgin/gtkblist.c:3698
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "�僚竜僚竜�粒�� %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3457
+#: ../pidgin/gtkblist.c:3700
 #, c-format
 msgid "Idle %dm"
 msgstr "�僚竜僚竜�粒�� %dm"
 
-#: ../pidgin/gtkblist.c:3602
+#: ../pidgin/gtkblist.c:3854
 msgid "/Buddies/New Instant Message..."
 msgstr "/陸溜了凌旅/�劉凌 略亮竜�凌 亮流僚�亮留..."
 
-#: ../pidgin/gtkblist.c:3603 ../pidgin/gtkblist.c:3636
+#: ../pidgin/gtkblist.c:3855 ../pidgin/gtkblist.c:3888
 msgid "/Buddies/Join a Chat..."
 msgstr "/陸溜了凌旅/裡�亮亮竜�凌�流 �竜 ��龍流�侶�侶..."
 
-#: ../pidgin/gtkblist.c:3604
+#: ../pidgin/gtkblist.c:3856
 msgid "/Buddies/Get User Info..."
 msgstr "/陸溜了凌旅/�流�侶 �了侶�凌�凌�旅�僚 ��流��侶..."
 
-#: ../pidgin/gtkblist.c:3605
+#: ../pidgin/gtkblist.c:3857
 msgid "/Buddies/Add Buddy..."
 msgstr "/陸溜了凌旅/��凌�慮流虜侶 �溜了凌�..."
 
-#: ../pidgin/gtkblist.c:3606 ../pidgin/gtkblist.c:3639
+#: ../pidgin/gtkblist.c:3858 ../pidgin/gtkblist.c:3891
 msgid "/Buddies/Add Chat..."
 msgstr "/陸溜了凌旅/��凌�慮流虜侶 ��龍流�侶�侶�..."
 
-#: ../pidgin/gtkblist.c:3607
+#: ../pidgin/gtkblist.c:3859
 msgid "/Buddies/Add Group..."
 msgstr "/陸溜了凌旅/��凌�慮流虜侶 凌亮略隆留�..."
 
-#: ../pidgin/gtkblist.c:3642
+#: ../pidgin/gtkblist.c:3894
 msgid "/Tools/Privacy"
 msgstr "/��粒留了竜溜留/�亮�旅��竜��旅虜��侶�留"
 
-#: ../pidgin/gtkblist.c:3645
+#: ../pidgin/gtkblist.c:3897
 msgid "/Tools/Room List"
 msgstr "/��粒留了竜溜留/�溜��留 隆�亮留�溜�僚"
 
-#: ../pidgin/gtkblist.c:3742 ../pidgin/gtkdocklet.c:153
+#: ../pidgin/gtkblist.c:4029 ../pidgin/gtkdocklet.c:155
+#: ../pidgin/gtkdocklet.c:160
 #, 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:3822
+#: ../pidgin/gtkblist.c:4192
 msgid "Manually"
 msgstr "�竜 �凌 �劉�旅"
 
-#: ../pidgin/gtkblist.c:3824
-msgid "Alphabetically"
-msgstr "�了�留硫侶�旅虜略"
-
-#: ../pidgin/gtkblist.c:3825
+#: ../pidgin/gtkblist.c:4195
 msgid "By status"
 msgstr "�僚略 虜留�略��留�侶"
 
-#: ../pidgin/gtkblist.c:3826
+#: ../pidgin/gtkblist.c:4196
 msgid "By log size"
 msgstr "�僚略 亮劉粒竜慮凌� 虜留�留粒�留�流�"
 
-#: ../pidgin/gtkblist.c:4031 ../pidgin/gtkconn.c:179
+#: ../pidgin/gtkblist.c:4533
 #, c-format
 msgid "%s disconnected"
 msgstr "%s 留�凌��僚隆劉慮侶虜竜"
 
-#: ../pidgin/gtkblist.c:4067
-#, c-format
-msgid "<span color=\"red\">%s disconnected: %s</span>"
-msgstr "<span color=\"red\">%s 留�凌��僚隆劉慮侶虜竜: %s</span>"
-
-#: ../pidgin/gtkblist.c:4219
+#: ../pidgin/gtkblist.c:4535
+#, c-format
+msgid "%s disabled"
+msgstr "%s 留�竜僚竜�粒凌�凌旅流慮侶虜竜"
+
+#: ../pidgin/gtkblist.c:4539
+msgid "Reconnect"
+msgstr "��留僚留��僚隆竜�侶"
+
+#: ../pidgin/gtkblist.c:4539 ../pidgin/gtkblist.c:4658
+msgid "Re-enable"
+msgstr "��留僚竜僚竜�粒凌�凌溜侶�侶"
+
+#: ../pidgin/gtkblist.c:4656
+msgid "Welcome back!"
+msgstr "�留了�� 流�慮留�竜 �溜��!"
+
+#: ../pidgin/gtkblist.c:4692
+#, c-format
+msgid "%d account was disabled because you signed on from another location:"
+msgid_plural "%d accounts were disabled because you signed on from another location:"
+msgstr[0] "%d 了凌粒留�旅留�亮�� 留�竜僚竜�粒凌�凌旅流慮侶虜竜 竜�竜旅隆流 ��僚隆竜慮流虜留�竜 留�� 略了了侶 �竜�旅凌�流:"
+msgstr[1] "%d 了凌粒留�旅留�亮凌溜 留�竜僚竜�粒凌�凌旅流慮侶虜留僚 竜�竜旅隆流 ��僚隆竜慮流虜留�竜 留�� 略了了侶 �竜�旅凌�流:"
+
+#: ../pidgin/gtkblist.c:4971
 msgid "<b>Username:</b>"
 msgstr "<b>�僚凌亮留 ��流��侶:</b>"
 
-#: ../pidgin/gtkblist.c:4226
+#: ../pidgin/gtkblist.c:4978
 msgid "<b>Password:</b>"
 msgstr "<b>��隆旅虜��:</b>"
 
-#: ../pidgin/gtkblist.c:4237
+#: ../pidgin/gtkblist.c:4989
 msgid "_Login"
 msgstr "_�留�留粒�留�流"
 
-#: ../pidgin/gtkblist.c:4320
+#: ../pidgin/gtkblist.c:5073
 msgid "/Accounts"
 msgstr "/�凌粒留�旅留�亮凌溜"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4334
-#, fuzzy, c-format
+#: ../pidgin/gtkblist.c:5087
+#, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
 "\n"
 "You have no accounts enabled. Enable your IM accounts from the <b>Accounts</"
-"b> window at <b>Accounts->Add/Edit</b>. Once you enable accounts, you'll be "
+"b> window at <b>Accounts->Manage</b>. Once you enable accounts, you'll be "
 "able to sign on, set your status, and talk to your friends."
 msgstr ""
 "<span weight='bold' size='larger'>�留了�� ��慮留�竜 ��凌 %s!</span>\n"
 "\n"
 "�竜僚 劉�竜�竜 竜僚竜�粒凌�� 了凌粒留�旅留�亮凌��. �僚竜�粒凌�凌旅流��竜 �凌�� 了凌粒留�旅留�亮凌�� 略亮竜��僚 "
 "亮侶僚�亮略��僚 留�� �凌 �留�略慮��凌 <b>�凌粒留�旅留�亮�僚</b> 亮劉�� �凌� <b>�凌粒留�旅留�亮凌溜-"
-">��凌�慮流虜侶/��竜両竜�粒留�溜留</b>. ��了旅� 竜僚竜�粒凌�凌旅流�竜�竜 �凌�� 了凌粒留�旅留�亮凌�� 慮留 "
-"亮�凌�竜溜�竜 僚留 ��僚隆竜慮竜溜�竜, 僚留 ��慮亮溜�竜�竜 �侶僚 虜留�略��留�流 �留� 虜留旅 僚留 亮旅了流�竜�竜 亮竜 "
-"�凌�� �溜了凌�� �留�."
+">��凌�慮流虜侶->��粒略僚��侶</b>. ��了旅� 竜僚竜�粒凌�凌旅流�竜�竜 �凌�� 了凌粒留�旅留�亮凌�� 慮留 亮�凌�竜溜�竜 "
+"僚留 ��僚隆竜慮竜溜�竜, 僚留 ��慮亮溜�竜�竜 �侶僚 虜留�略��留�流 �留� 虜留旅 僚留 亮旅了流�竜�竜 亮竜 �凌�� �溜了凌�� "
+"�留�."
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4597
-#, fuzzy
+#: ../pidgin/gtkblist.c:5358
 msgid "/Buddies/Show/Offline Buddies"
-msgstr "/陸溜了凌旅/�亮�略僚旅�侶 亮侶 ��僚隆竜隆竜亮劉僚�僚 �溜了�僚"
-
-#: ../pidgin/gtkblist.c:4600
-#, fuzzy
+msgstr "/陸溜了凌旅/�亮�略僚旅�侶/�侶 ��僚隆竜隆竜亮劉僚凌旅 �溜了凌旅束"
+
+#: ../pidgin/gtkblist.c:5361
 msgid "/Buddies/Show/Empty Groups"
-msgstr "/陸溜了凌旅/�亮�略僚旅�侶 虜竜僚�僚 凌亮略隆�僚"
-
-#: ../pidgin/gtkblist.c:4606
-#, fuzzy
+msgstr "/陸溜了凌旅/�亮�略僚旅�侶/�竜僚劉� 凌亮略隆竜�"
+
+#: ../pidgin/gtkblist.c:5367
 msgid "/Buddies/Show/Buddy Details"
-msgstr "/陸溜了凌旅/�亮�略僚旅�侶 了竜��凌亮竜�竜旅�僚 �溜了�僚"
-
-#: ../pidgin/gtkblist.c:4609
-#, fuzzy
+msgstr "/陸溜了凌旅/�亮�略僚旅�侶/�竜��凌亮劉�竜旅竜� �溜了�僚"
+
+#: ../pidgin/gtkblist.c:5370
 msgid "/Buddies/Show/Idle Times"
-msgstr "/陸溜了凌旅/�亮�略僚旅�侶 ���僚凌� �凌� 竜溜僚留旅 留僚竜僚竜�粒凌溜"
-
-#: ../pidgin/gtkblist.c:4612
-#, fuzzy
+msgstr "/陸溜了凌旅/�亮�略僚旅�侶/律��僚凌� �凌� 竜溜僚留旅 留僚竜僚竜�粒凌溜"
+
+#: ../pidgin/gtkblist.c:5373
 msgid "/Buddies/Show/Protocol Icons"
-msgstr "/陸溜了凌旅/�亮�略僚旅�侶 虜竜僚�僚 凌亮略隆�僚"
-
-#: ../pidgin/gtkblist.c:5507
+msgstr "/陸溜了凌旅/�亮�略僚旅�侶/�旅虜凌僚溜隆旅留 ����凌虜�了了凌�"
+
+#: ../pidgin/gtkblist.c:6324
 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. "
@@ -14200,22 +14601,25 @@
 "竜溜僚留旅 粒僚����� 流 劉僚留 �竜�隆�僚�亮凌. 里凌 ��� 慮留 竜溜僚留旅 粒僚����� 慮留 竜亮�留僚溜龍竜�留旅 ��侶 "
 "慮劉�侶 �凌� 凌僚�亮留�凌� 了凌粒留�旅留�亮凌� ��凌�竜 留��� 竜溜僚留旅 隆�僚留��.\n"
 
+#. Set up stuff for the account box
+#: ../pidgin/gtkblist.c:6347
+msgid "A_ccount:"
+msgstr "_�凌粒留�旅留�亮��:"
+
 #. End of account box
-#: ../pidgin/gtkblist.c:5542
-#, fuzzy
+#: ../pidgin/gtkblist.c:6359
 msgid "_Screen name:"
-msgstr "�亮�留僚旅龍�亮竜僚凌 �僚凌亮留:"
-
-#: ../pidgin/gtkblist.c:5564 ../pidgin/gtkblist.c:5914
-#, fuzzy
+msgstr "�亮_�留僚旅龍�亮竜僚凌 �僚凌亮留:"
+
+#: ../pidgin/gtkblist.c:6381 ../pidgin/gtkblist.c:6731
 msgid "A_lias:"
-msgstr "�僚����� ��:"
-
-#: ../pidgin/gtkblist.c:5826
+msgstr "_�僚����� ��:"
+
+#: ../pidgin/gtkblist.c:6648
 msgid "This protocol does not support chat rooms."
 msgstr "���� �凌 �����虜凌了了凌 隆竜僚 ��凌��侶�溜龍竜旅 隆�亮略�旅留 ��龍侶�流�竜�僚."
 
-#: ../pidgin/gtkblist.c:5842
+#: ../pidgin/gtkblist.c:6664
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -14223,7 +14627,7 @@
 "��凌� �凌 �留��僚 隆竜僚 竜溜��竜 ��僚隆竜隆竜亮劉僚凌旅 亮竜 虜略�凌旅凌 �����虜凌了了凌 �凌� 僚留 劉�竜旅 �侶僚 "
 "隆�僚留���侶�留 ��龍侶�流�竜�僚."
 
-#: ../pidgin/gtkblist.c:5883
+#: ../pidgin/gtkblist.c:6708
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -14231,83 +14635,75 @@
 "�留�留虜留了凌�亮竜 竜旅�略粒竜�竜 �旅� 虜留�略了了侶了竜� �了侶�凌�凌�溜竜� 虜留旅 �凌 ��� 慮留 竜溜僚留旅 粒僚���流 侶 "
 "��龍流�侶�侶 �侶僚 凌�凌溜留 慮劉了竜�竜 僚留 ��凌�慮劉�竜�竜 ��侶 了溜��留 �溜了�僚. \n"
 
-#: ../pidgin/gtkblist.c:5964
+#: ../pidgin/gtkblist.c:6738
+msgid "Auto_join when account becomes online."
+msgstr "����亮留�侶 竜_�留僚留��僚隆竜�侶 ��留僚 凌 了凌粒留�旅留�亮�� ��僚隆劉竜�留旅."
+
+#: ../pidgin/gtkblist.c:6739
+msgid "_Hide chat when the window is closed."
+msgstr "���虜��_�侶 ��龍流�侶�侶� ��留僚 虜了竜溜僚竜旅 �凌 �留�略慮��凌."
+
+#: ../pidgin/gtkblist.c:6765
 msgid "Please enter the name of the group to be added."
 msgstr "�留�留虜留了凌�亮竜 竜旅�略粒竜�竜 �凌 �僚凌亮留 �侶� 凌亮略隆留� �凌� 慮留 ��凌��竜慮竜溜."
 
-#: ../pidgin/gtkblist.c:6609
+#: ../pidgin/gtkblist.c:7423
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/�凌粒留�旅留�亮凌溜/"
 
-#: ../pidgin/gtkblist.c:6633
+#: ../pidgin/gtkblist.c:7447
 msgid "_Edit Account"
 msgstr "_��竜両竜�粒留�溜留 了凌粒留�旅留�亮凌�"
 
-#: ../pidgin/gtkblist.c:6646 ../pidgin/gtkconv.c:3073
+#: ../pidgin/gtkblist.c:7460 ../pidgin/gtkconv.c:3137
 msgid "No actions available"
 msgstr "�竜僚 ��略��凌�僚 隆旅留慮劉�旅亮竜� 竜僚劉�粒竜旅竜�"
 
-#: ../pidgin/gtkblist.c:6654
+#: ../pidgin/gtkblist.c:7468
 msgid "_Disable"
 msgstr "_��竜僚竜�粒凌�凌溜侶�侶"
 
-#: ../pidgin/gtkblist.c:6666
+#: ../pidgin/gtkblist.c:7480
 msgid "Enable Account"
 msgstr "�僚竜�粒凌�凌溜侶�侶 了凌粒留�旅留�亮凌�"
 
-#: ../pidgin/gtkblist.c:6672
+#: ../pidgin/gtkblist.c:7486
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/�凌粒留�旅留�亮凌溜/�僚竜�粒凌�凌溜侶�侶 了凌粒留�旅留�亮凌�"
 
-#: ../pidgin/gtkblist.c:6721
+#: ../pidgin/gtkblist.c:7535
 msgid "/Tools"
 msgstr "/��粒留了竜溜留"
 
-#: ../pidgin/gtkblist.c:6791
+#: ../pidgin/gtkblist.c:7605
 msgid "/Buddies/Sort Buddies"
 msgstr "/陸溜了凌旅/里留両旅僚�亮侶�侶 �溜了�僚"
 
 #. Widget creation function
-#: ../pidgin/gtkcertmgr.c:530
-#, fuzzy
+#: ../pidgin/gtkcertmgr.c:541
 msgid "SSL Servers"
-msgstr "�両��侶�竜�侶�流�"
-
-#: ../pidgin/gtkconn.c:180
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"%s will not attempt to reconnect the account until you correct the error and "
-"re-enable the account."
-msgstr ""
-"%s\n"
-"\n"
-"里凌 %s 隆竜 慮留 竜�旅�竜旅�流�竜旅 僚留 竜�留僚留��僚隆竜慮竜溜 亮竜 留��� �凌 了凌粒留�旅留�亮� 亮劉��旅 僚留 "
-"隆旅凌�慮��竜�竜 �凌 ��略了亮留 虜留旅 僚留 竜僚竜�粒凌�凌旅流�竜�竜 両留僚略 �凌 了凌粒留�旅留�亮�."
-
-#: ../pidgin/gtkconv.c:482
-#, fuzzy
+msgstr "�両��侶�竜�侶�劉� SSL"
+
+#: ../pidgin/gtkconv.c:485
 msgid "Unknown command."
-msgstr "�粒僚���侶 竜僚�凌了流"
-
-#: ../pidgin/gtkconv.c:754 ../pidgin/gtkconv.c:780
+msgstr "�粒僚���侶 竜僚�凌了流."
+
+#: ../pidgin/gtkconv.c:755 ../pidgin/gtkconv.c:781
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "����� 凌 �溜了凌� 隆竜 ��侶�旅亮凌�凌旅竜溜 �凌 溜隆旅凌 �����虜凌了了凌 亮竜 留��流 �侶 ��龍流�侶�侶."
 
-#: ../pidgin/gtkconv.c:774
-msgid ""
-"You are not currently signed on with an account that can invite that buddy."
+#: ../pidgin/gtkconv.c:775
+msgid "You are not currently signed on with an account that can invite that buddy."
 msgstr ""
 "��凌� �凌 �留��僚 隆竜僚 竜溜��竜 ��僚隆竜隆竜亮劉僚凌旅 亮竜 劉僚留 了凌粒留�旅留�亮� �凌� 僚留 亮�凌�竜溜�竜 僚留 "
 "��凌�虜留了劉�竜�竜 留���僚 �凌 �溜了凌."
 
-#: ../pidgin/gtkconv.c:827
+#: ../pidgin/gtkconv.c:828
 msgid "Invite Buddy Into Chat Room"
 msgstr "����虜了侶�侶 �溜了凌� ��凌 隆�亮略�旅凌 ��龍流�侶�侶�"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:857
+#: ../pidgin/gtkconv.c:858
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -14315,369 +14711,364 @@
 "�留�留虜留了凌�亮竜 竜旅�略粒竜�竜 �凌 �僚凌亮留 �凌� ��流��侶 �凌� 竜�旅慮�亮竜溜�竜 僚留 ��凌�虜留了劉�竜�竜, "
 "亮留龍溜 亮竜 劉僚留 ��凌留旅�竜�旅虜� 亮流僚�亮留 ����虜了侶�侶�."
 
-#: ../pidgin/gtkconv.c:878
+#: ../pidgin/gtkconv.c:879
 msgid "_Buddy:"
 msgstr "_陸溜了凌�:"
 
-#: ../pidgin/gtkconv.c:889 ../pidgin/gtksavedstatuses.c:1194
-#: ../pidgin/gtksavedstatuses.c:1528
+#: ../pidgin/gtkconv.c:890 ../pidgin/gtksavedstatuses.c:1166
+#: ../pidgin/gtksavedstatuses.c:1484
 msgid "_Message:"
 msgstr "_�流僚�亮留:"
 
-#: ../pidgin/gtkconv.c:947 ../pidgin/gtkconv.c:2598 ../pidgin/gtkdebug.c:219
-#: ../pidgin/gtkft.c:543
-msgid "Unable to open file."
-msgstr "�隆�僚留�凌 �凌 略僚凌旅粒亮留 �凌� 留��竜溜凌�."
-
-#: ../pidgin/gtkconv.c:953
+#: ../pidgin/gtkconv.c:954
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>裡�僚凌亮旅了溜留 亮竜 %s</h1>\n"
 
-#: ../pidgin/gtkconv.c:991
+#: ../pidgin/gtkconv.c:992
 msgid "Save Conversation"
 msgstr "��凌慮流虜竜��侶 ��僚凌亮旅了溜留�"
 
-#: ../pidgin/gtkconv.c:1140 ../pidgin/gtkdebug.c:167 ../pidgin/gtkdebug.c:743
+#: ../pidgin/gtkconv.c:1138 ../pidgin/gtkdebug.c:167 ../pidgin/gtkdebug.c:740
 msgid "Find"
 msgstr "���竜�侶"
 
-#: ../pidgin/gtkconv.c:1166 ../pidgin/gtkdebug.c:195
+#: ../pidgin/gtkconv.c:1164 ../pidgin/gtkdebug.c:195
 msgid "_Search for:"
 msgstr "_�僚留龍流�侶�侶 粒旅留:"
 
-#: ../pidgin/gtkconv.c:1622
+#: ../pidgin/gtkconv.c:1665
 msgid "Un-Ignore"
 msgstr "��旅 �旅留 �留�略硫了竜�侶"
 
-#: ../pidgin/gtkconv.c:1625
+#: ../pidgin/gtkconv.c:1668
 msgid "Ignore"
 msgstr "�留�略硫了竜�侶"
 
-#: ../pidgin/gtkconv.c:1645
+#: ../pidgin/gtkconv.c:1688
 msgid "Get Away Message"
 msgstr "�流�侶 亮侶僚�亮留�凌� 留�凌��溜留�"
 
-#: ../pidgin/gtkconv.c:1668
+#: ../pidgin/gtkconv.c:1711
 msgid "Last said"
 msgstr "里竜了竜��留溜留 ��略�侶"
 
-#: ../pidgin/gtkconv.c:2606
+#: ../pidgin/gtkconv.c:2664
 msgid "Unable to save icon file to disk."
 msgstr "�隆�僚留�凌 僚留 留�凌慮侶虜竜��竜溜 �凌 留��竜溜凌 竜旅虜凌僚旅隆溜凌� ��凌 隆溜�虜凌."
 
-#: ../pidgin/gtkconv.c:2657
+#: ../pidgin/gtkconv.c:2715
 msgid "Save Icon"
 msgstr "��凌慮流虜竜��侶 竜旅虜凌僚旅隆溜凌�"
 
-#: ../pidgin/gtkconv.c:2709
+#: ../pidgin/gtkconv.c:2767
 msgid "Animate"
 msgstr "�溜僚侶�侶"
 
-#: ../pidgin/gtkconv.c:2714
+#: ../pidgin/gtkconv.c:2772
 msgid "Hide Icon"
 msgstr "���虜���侶 竜旅虜凌僚旅隆溜凌�"
 
-#: ../pidgin/gtkconv.c:2717
+#: ../pidgin/gtkconv.c:2775
 msgid "Save Icon As..."
 msgstr "��凌慮流虜竜��侶 竜旅虜凌僚旅隆溜凌� ��..."
 
-#: ../pidgin/gtkconv.c:2721
+#: ../pidgin/gtkconv.c:2779
 msgid "Set Custom Icon..."
 msgstr "��旅�亮�� ��凌�留�亮凌�亮劉僚凌� 竜旅虜凌僚旅隆溜凌�..."
 
-#: ../pidgin/gtkconv.c:2734
+#: ../pidgin/gtkconv.c:2792
 msgid "Remove Custom Icon"
 msgstr "��留溜�竜�侶 ��凌�留�亮凌�亮劉僚凌� 竜旅虜凌僚旅隆溜凌�"
 
-#: ../pidgin/gtkconv.c:2861
+#: ../pidgin/gtkconv.c:2922
 msgid "Show All"
-msgstr ""
+msgstr "�亮�略僚旅�侶 �了�僚"
 
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2880
+#: ../pidgin/gtkconv.c:2941
 msgid "/_Conversation"
 msgstr "/_裡�僚凌亮旅了溜留"
 
-#: ../pidgin/gtkconv.c:2882
+#: ../pidgin/gtkconv.c:2943
 msgid "/Conversation/New Instant _Message..."
 msgstr "/裡�僚凌亮旅了溜留/�劉凌 略亮竜�凌 _亮流僚�亮留..."
 
-#: ../pidgin/gtkconv.c:2887
+#: ../pidgin/gtkconv.c:2948
 msgid "/Conversation/_Find..."
 msgstr "/裡�僚凌亮旅了溜留/_���竜�侶..."
 
-#: ../pidgin/gtkconv.c:2889
+#: ../pidgin/gtkconv.c:2950
 msgid "/Conversation/View _Log"
 msgstr "/裡�僚凌亮旅了溜留/�亮�略僚旅�侶 _虜留�留粒�留�流�"
 
-#: ../pidgin/gtkconv.c:2890
+#: ../pidgin/gtkconv.c:2951
 msgid "/Conversation/_Save As..."
 msgstr "/裡�僚凌亮旅了溜留/_��凌慮流虜竜��侶 ��..."
 
-#: ../pidgin/gtkconv.c:2892
+#: ../pidgin/gtkconv.c:2953
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/裡�僚凌亮旅了溜留/_�留慮留�旅�亮�� 留僚留隆溜�侶�侶�"
 
-#: ../pidgin/gtkconv.c:2896
+#: ../pidgin/gtkconv.c:2957
 msgid "/Conversation/Se_nd File..."
 msgstr "/裡�僚凌亮旅了溜留/_��凌��凌了流 留��竜溜凌�..."
 
-#: ../pidgin/gtkconv.c:2897
+#: ../pidgin/gtkconv.c:2958
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/裡�僚凌亮旅了溜留/��凌�慮流虜侶 _竜���亮侶�侶� �溜了凌�..."
 
-#: ../pidgin/gtkconv.c:2899
+#: ../pidgin/gtkconv.c:2960
 msgid "/Conversation/_Get Info"
 msgstr "/裡�僚凌亮旅了溜留/_�流�侶 �了侶�凌�凌�旅�僚"
 
-#: ../pidgin/gtkconv.c:2901
+#: ../pidgin/gtkconv.c:2962
 msgid "/Conversation/In_vite..."
 msgstr "/裡�僚凌亮旅了溜留/_����虜了侶�侶..."
 
-#: ../pidgin/gtkconv.c:2903
+#: ../pidgin/gtkconv.c:2964
 msgid "/Conversation/M_ore"
 msgstr "/裡�僚凌亮旅了溜留/�_竜�旅����竜�留"
 
-#: ../pidgin/gtkconv.c:2907
+#: ../pidgin/gtkconv.c:2968
 msgid "/Conversation/Al_ias..."
 msgstr "/裡�僚凌亮旅了溜留/_�僚����� ��..."
 
-#: ../pidgin/gtkconv.c:2909
+#: ../pidgin/gtkconv.c:2970
 msgid "/Conversation/_Block..."
 msgstr "/裡�僚凌亮旅了溜留/_��凌虜了竜旅�亮��..."
 
-#: ../pidgin/gtkconv.c:2911
+#: ../pidgin/gtkconv.c:2972
 msgid "/Conversation/_Unblock..."
 msgstr "/裡�僚凌亮旅了溜留/_�虜����侶 留�凌虜了竜旅�亮凌�..."
 
-#: ../pidgin/gtkconv.c:2913
+#: ../pidgin/gtkconv.c:2974
 msgid "/Conversation/_Add..."
 msgstr "/裡�僚凌亮旅了溜留/_��凌�慮流虜侶..."
 
-#: ../pidgin/gtkconv.c:2915
+#: ../pidgin/gtkconv.c:2976
 msgid "/Conversation/_Remove..."
 msgstr "/裡�僚凌亮旅了溜留/_��留溜�竜�侶..."
 
-#: ../pidgin/gtkconv.c:2920
-#, fuzzy
+#: ../pidgin/gtkconv.c:2981
 msgid "/Conversation/Insert Lin_k..."
-msgstr "/裡�僚凌亮旅了溜留/����虜了侶�侶..."
-
-#: ../pidgin/gtkconv.c:2922
-#, fuzzy
+msgstr "/裡�僚凌亮旅了溜留/��凌�慮流虜侶 _��僚隆劉�亮凌�..."
+
+#: ../pidgin/gtkconv.c:2983
 msgid "/Conversation/Insert Imag_e..."
-msgstr "/裡�僚凌亮旅了溜留/����虜了侶�侶..."
-
-#: ../pidgin/gtkconv.c:2928
+msgstr "/裡�僚凌亮旅了溜留/��凌�慮流虜侶 _竜旅虜�僚留�..."
+
+#: ../pidgin/gtkconv.c:2989
 msgid "/Conversation/_Close"
 msgstr "/裡�僚凌亮旅了溜留/_�了竜溜�旅亮凌"
 
 #. Options
-#: ../pidgin/gtkconv.c:2932
+#: ../pidgin/gtkconv.c:2993
 msgid "/_Options"
 msgstr "/_��旅了凌粒劉�"
 
-#: ../pidgin/gtkconv.c:2933
+#: ../pidgin/gtkconv.c:2994
 msgid "/Options/Enable _Logging"
 msgstr "/��旅了凌粒劉�/�僚竜�粒凌�凌溜侶�侶 _虜留�留粒�留�流�"
 
-#: ../pidgin/gtkconv.c:2934
+#: ../pidgin/gtkconv.c:2995
 msgid "/Options/Enable _Sounds"
 msgstr "/��旅了凌粒劉�/�僚竜�粒凌�凌溜侶�侶 _流��僚"
 
-#: ../pidgin/gtkconv.c:2936
+#: ../pidgin/gtkconv.c:2997
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/��旅了凌粒劉�/�亮�略僚旅�侶 _粒�留亮亮�僚 竜�粒留了竜溜�僚 亮凌��凌�凌溜侶�侶�"
 
-#: ../pidgin/gtkconv.c:2937
+#: ../pidgin/gtkconv.c:2998
 msgid "/Options/Show Ti_mestamps"
 msgstr "/��旅了凌粒劉�/�亮�略僚旅�侶 _��凌僚凌�流亮�僚"
 
-#: ../pidgin/gtkconv.c:3061
+#: ../pidgin/gtkconv.c:3125
 msgid "/Conversation/More"
 msgstr "/裡�僚凌亮旅了溜留/�竜�旅����竜�留"
 
-#: ../pidgin/gtkconv.c:3117
-#, fuzzy
+#: ../pidgin/gtkconv.c:3181
 msgid "/Options"
-msgstr "/_��旅了凌粒劉�"
+msgstr "/��旅了凌粒劉�"
 
 #. The menubar has been deactivated. Make sure the 'More' submenu is regenerated next time
 #. * the 'Conversation' menu pops up.
 #. 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:3152 ../pidgin/gtkconv.c:3184
+#: ../pidgin/gtkconv.c:3216 ../pidgin/gtkconv.c:3248
 msgid "/Conversation"
 msgstr "/裡�僚凌亮旅了溜留"
 
-#: ../pidgin/gtkconv.c:3192
+#: ../pidgin/gtkconv.c:3256
 msgid "/Conversation/View Log"
 msgstr "/裡�僚凌亮旅了溜留/�亮�略僚旅�侶 虜留�留粒�留�流�"
 
-#: ../pidgin/gtkconv.c:3198
+#: ../pidgin/gtkconv.c:3262
 msgid "/Conversation/Send File..."
 msgstr "/裡�僚凌亮旅了溜留/��凌��凌了流 留��竜溜凌�..."
 
-#: ../pidgin/gtkconv.c:3202
+#: ../pidgin/gtkconv.c:3266
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/裡�僚凌亮旅了溜留/��凌�慮流虜侶 竜���亮侶�侶� �溜了凌�..."
 
-#: ../pidgin/gtkconv.c:3208
+#: ../pidgin/gtkconv.c:3272
 msgid "/Conversation/Get Info"
 msgstr "/裡�僚凌亮旅了溜留/�流�侶 �了侶�凌�凌�旅�僚"
 
-#: ../pidgin/gtkconv.c:3212
+#: ../pidgin/gtkconv.c:3276
 msgid "/Conversation/Invite..."
 msgstr "/裡�僚凌亮旅了溜留/����虜了侶�侶..."
 
-#: ../pidgin/gtkconv.c:3218
+#: ../pidgin/gtkconv.c:3282
 msgid "/Conversation/Alias..."
 msgstr "/裡�僚凌亮旅了溜留/�僚����� ��..."
 
-#: ../pidgin/gtkconv.c:3222
+#: ../pidgin/gtkconv.c:3286
 msgid "/Conversation/Block..."
 msgstr "/裡�僚凌亮旅了溜留/��凌虜了竜旅�亮��..."
 
-#: ../pidgin/gtkconv.c:3226
+#: ../pidgin/gtkconv.c:3290
 msgid "/Conversation/Unblock..."
 msgstr "/裡�僚凌亮旅了溜留/�虜����侶 留�凌虜了竜旅�亮凌�..."
 
-#: ../pidgin/gtkconv.c:3230
+#: ../pidgin/gtkconv.c:3294
 msgid "/Conversation/Add..."
 msgstr "/裡�僚凌亮旅了溜留/��凌�慮流虜侶..."
 
-#: ../pidgin/gtkconv.c:3234
+#: ../pidgin/gtkconv.c:3298
 msgid "/Conversation/Remove..."
 msgstr "/裡�僚凌亮旅了溜留/��留溜�竜�侶..."
 
-#: ../pidgin/gtkconv.c:3240
-#, fuzzy
+#: ../pidgin/gtkconv.c:3304
 msgid "/Conversation/Insert Link..."
-msgstr "/裡�僚凌亮旅了溜留/����虜了侶�侶..."
-
-#: ../pidgin/gtkconv.c:3244
-#, fuzzy
+msgstr "/裡�僚凌亮旅了溜留/��凌�慮流虜侶 ��僚隆劉�亮凌�..."
+
+#: ../pidgin/gtkconv.c:3308
 msgid "/Conversation/Insert Image..."
-msgstr "/裡�僚凌亮旅了溜留/����虜了侶�侶..."
-
-#: ../pidgin/gtkconv.c:3250
+msgstr "/裡�僚凌亮旅了溜留/��凌�慮流虜侶 竜旅虜�僚留�..."
+
+#: ../pidgin/gtkconv.c:3314
 msgid "/Options/Enable Logging"
 msgstr "/��旅了凌粒劉�/�僚竜�粒凌�凌溜侶�侶 虜留�留粒�留�流�"
 
-#: ../pidgin/gtkconv.c:3253
+#: ../pidgin/gtkconv.c:3317
 msgid "/Options/Enable Sounds"
 msgstr "/��旅了凌粒劉�/�僚竜�粒凌�凌溜侶�侶 流��僚"
 
-#: ../pidgin/gtkconv.c:3266
+#: ../pidgin/gtkconv.c:3330
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/��旅了凌粒劉�/�亮�略僚旅�侶 粒�留亮亮�僚 竜�粒留了竜溜�僚 亮凌��凌�凌溜侶�侶�"
 
-#: ../pidgin/gtkconv.c:3269
+#: ../pidgin/gtkconv.c:3333
 msgid "/Options/Show Timestamps"
 msgstr "/��旅了凌粒劉�/�亮�略僚旅�侶 ��凌僚凌�流亮�僚"
 
-#: ../pidgin/gtkconv.c:3346 ../pidgin/gtkconv.c:3388
+#: ../pidgin/gtkconv.c:3411
 msgid "User is typing..."
 msgstr "� ��流��侶� �了侶虜��凌了凌粒竜溜..."
 
-#: ../pidgin/gtkconv.c:3391
-msgid "User has typed something and stopped"
-msgstr "� ��流��侶� �了侶虜��凌了�粒侶�竜 虜略�旅 虜留旅 ��留亮略�侶�竜"
+#: ../pidgin/gtkconv.c:3481
+#, c-format
+msgid ""
+"\n"
+"%s has stopped typing"
+msgstr ""
+"\n"
+"%s ��留亮略�侶�竜 僚留 �了侶虜��凌了凌粒竜溜"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3574 ../pidgin/gtkconv.c:8022
-msgid "_Send To"
-msgstr "_��凌��凌了流 �竜"
-
-#: ../pidgin/gtkconv.c:4286
+#: ../pidgin/gtkconv.c:3647 ../pidgin/gtkconv.c:8318
+msgid "S_end To"
+msgstr "��凌_��凌了流 �竜"
+
+#: ../pidgin/gtkconv.c:4359
 msgid "_Send"
 msgstr "_��凌��凌了流"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4390
+#: ../pidgin/gtkconv.c:4497
 msgid "0 people in room"
 msgstr "�留僚劉僚留 略�凌亮凌 ��凌 隆�亮略�旅凌"
 
-#: ../pidgin/gtkconv.c:5759 ../pidgin/gtkconv.c:5880
+#: ../pidgin/gtkconv.c:5796 ../pidgin/gtkconv.c:5917
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d 略�凌亮凌 ��凌 隆�亮略�旅凌"
 msgstr[1] "%d 略�凌亮留 ��凌 隆�亮略�旅凌"
 
-#: ../pidgin/gtkconv.c:6486 ../pidgin/gtkstatusbox.c:660
+#: ../pidgin/gtkconv.c:6544 ../pidgin/gtkstatusbox.c:679
 msgid "Typing"
 msgstr "�了侶虜��凌了凌粒竜溜"
 
-#: ../pidgin/gtkconv.c:6490
+#: ../pidgin/gtkconv.c:6548
 msgid "Stopped Typing"
 msgstr "裡�留亮略�侶�竜 �侶僚 �了侶虜��凌了�粒侶�侶"
 
-#: ../pidgin/gtkconv.c:6493
+#: ../pidgin/gtkconv.c:6551
 msgid "Nick Said"
 msgstr ""
 
-#: ../pidgin/gtkconv.c:6496 ../pidgin/gtkdocklet.c:492
+#: ../pidgin/gtkconv.c:6554 ../pidgin/gtkdocklet.c:686
 msgid "Unread Messages"
 msgstr "�侶 留僚留粒僚��亮劉僚留 亮侶僚�亮留�留"
 
-#: ../pidgin/gtkconv.c:6499
+#: ../pidgin/gtkconv.c:6560
 msgid "New Event"
 msgstr "�劉凌 粒竜粒凌僚��"
 
-#: ../pidgin/gtkconv.c:7572
+#: ../pidgin/gtkconv.c:7790
 msgid "clear: Clears all conversation scrollbacks."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:7736
+#: ../pidgin/gtkconv.c:7994
 msgid "Confirm close"
 msgstr "��旅硫竜硫留溜��侶 虜了竜旅�溜亮留�凌�"
 
-#: ../pidgin/gtkconv.c:7768
+#: ../pidgin/gtkconv.c:8026
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr ""
 "��竜�竜 亮侶 留僚留粒僚��亮劉僚留 亮侶僚�亮留�留. �溜��竜 �溜粒凌��凌旅 ��旅 慮劉了竜�竜 僚留 虜了竜溜�竜�竜 �凌 "
 "�留�略慮��凌;"
 
-#: ../pidgin/gtkconv.c:8355
+#: ../pidgin/gtkconv.c:8659
 msgid "Close other tabs"
 msgstr "�了竜溜�旅亮凌 ��僚 略了了�僚 虜留��竜了�僚"
 
-#: ../pidgin/gtkconv.c:8361
+#: ../pidgin/gtkconv.c:8665
 msgid "Close all tabs"
 msgstr "�了竜溜�旅亮凌 �了�僚 ��僚 虜留��竜了�僚"
 
-#: ../pidgin/gtkconv.c:8369
+#: ../pidgin/gtkconv.c:8673
 msgid "Detach this tab"
 msgstr "��凌隆劉�亮竜��侶 留��流� �侶� 虜留��劉了留�"
 
-#: ../pidgin/gtkconv.c:8375
+#: ../pidgin/gtkconv.c:8679
 msgid "Close this tab"
 msgstr "�了竜溜�旅亮凌 留��流� �侶� 虜留��劉了留�"
 
-#: ../pidgin/gtkconv.c:8875
+#: ../pidgin/gtkconv.c:9193
 msgid "Close conversation"
 msgstr "�了竜溜�旅亮凌 ��僚凌亮旅了溜留�"
 
-#: ../pidgin/gtkconv.c:9477
+#: ../pidgin/gtkconv.c:9797
 msgid "Last created window"
 msgstr "�留�略慮��凌 �凌� 隆侶亮旅凌��粒流慮侶虜竜 �竜了竜��留溜凌"
 
-#: ../pidgin/gtkconv.c:9479
+#: ../pidgin/gtkconv.c:9799
 msgid "Separate IM and Chat windows"
 msgstr "�旅留���旅�亮�� �留�留慮���僚 略亮竜��僚 亮侶僚�亮略��僚 虜留旅 ��龍侶�流�竜�僚"
 
-#: ../pidgin/gtkconv.c:9481 ../pidgin/gtkprefs.c:1415
+#: ../pidgin/gtkconv.c:9801 ../pidgin/gtkprefs.c:1466
 msgid "New window"
 msgstr "�劉凌 �留�略慮��凌"
 
-#: ../pidgin/gtkconv.c:9483
+#: ../pidgin/gtkconv.c:9803
 msgid "By group"
 msgstr "�僚略 凌亮略隆留"
 
-#: ../pidgin/gtkconv.c:9485
+#: ../pidgin/gtkconv.c:9805
 msgid "By account"
 msgstr "�僚略 了凌粒留�旅留�亮�"
 
@@ -14705,43 +15096,43 @@
 msgid "_Both Icon & Text"
 msgstr "_�竜溜亮竜僚凌 虜留旅 竜旅虜凌僚溜隆旅留"
 
-#: ../pidgin/gtkdebug.c:775
+#: ../pidgin/gtkdebug.c:772
 msgid "Filter"
 msgstr "陸溜了��凌"
 
-#: ../pidgin/gtkdebug.c:794
+#: ../pidgin/gtkdebug.c:791
 msgid "Right click for more options."
 msgstr "�略僚�竜 隆竜両溜 虜了旅虜 粒旅留 �竜�旅����竜�竜� 竜�旅了凌粒劉�."
 
-#: ../pidgin/gtkdebug.c:824
+#: ../pidgin/gtkdebug.c:821
 msgid "Level "
 msgstr "��溜�竜隆凌 "
 
-#: ../pidgin/gtkdebug.c:825 ../pidgin/gtkdebug.c:831
+#: ../pidgin/gtkdebug.c:822 ../pidgin/gtkdebug.c:828
 msgid "Select the debug filter level."
 msgstr "��旅了劉両�竜 �凌 竜�溜�竜隆凌 �凌� �溜了��凌� 留�凌��留了亮略���侶�."
 
-#: ../pidgin/gtkdebug.c:833
+#: ../pidgin/gtkdebug.c:830
 msgid "All"
 msgstr "�了留"
 
-#: ../pidgin/gtkdebug.c:834
+#: ../pidgin/gtkdebug.c:831
 msgid "Misc"
 msgstr "�旅略�凌�留"
 
-#: ../pidgin/gtkdebug.c:836
+#: ../pidgin/gtkdebug.c:833
 msgid "Warning"
 msgstr "��凌竜旅隆凌�凌溜侶�侶"
 
-#: ../pidgin/gtkdebug.c:837
+#: ../pidgin/gtkdebug.c:834
 msgid "Error "
 msgstr "裡�略了亮留 "
 
-#: ../pidgin/gtkdebug.c:838
+#: ../pidgin/gtkdebug.c:835
 msgid "Fatal Error"
 msgstr "���凌�隆�虜侶�凌 ��略了亮留"
 
-#: ../pidgin/gtkdialogs.c:72 ../pidgin/gtkdialogs.c:117
+#: ../pidgin/gtkdialogs.c:72 ../pidgin/gtkdialogs.c:118
 msgid "lead developer"
 msgstr "虜��旅凌� ��竜�慮�僚凌� 留僚略���両侶�"
 
@@ -14752,352 +15143,358 @@
 #: ../pidgin/gtkdialogs.c:81 ../pidgin/gtkdialogs.c:82
 #: ../pidgin/gtkdialogs.c:83 ../pidgin/gtkdialogs.c:84
 #: ../pidgin/gtkdialogs.c:85 ../pidgin/gtkdialogs.c:86
-#: ../pidgin/gtkdialogs.c:89 ../pidgin/gtkdialogs.c:91
-#: ../pidgin/gtkdialogs.c:92
+#: ../pidgin/gtkdialogs.c:87 ../pidgin/gtkdialogs.c:90
+#: ../pidgin/gtkdialogs.c:92 ../pidgin/gtkdialogs.c:93
+#: ../pidgin/gtkdialogs.c:94
 msgid "developer"
 msgstr "��竜�慮�僚凌� 留僚略���両侶�"
 
-#: ../pidgin/gtkdialogs.c:87
+#: ../pidgin/gtkdialogs.c:88
 msgid "support"
 msgstr "��凌��流�旅両侶"
 
-#: ../pidgin/gtkdialogs.c:88
+#: ../pidgin/gtkdialogs.c:89
 msgid "support/QA"
 msgstr "��凌��流�旅両侶/QA"
 
-#: ../pidgin/gtkdialogs.c:90 ../pidgin/gtkdialogs.c:112
+#: ../pidgin/gtkdialogs.c:91 ../pidgin/gtkdialogs.c:113
 msgid "developer & webmaster"
 msgstr "��竜�慮�僚凌� 留僚略���両侶� & 隆旅留�竜溜�旅�侶� 旅��凌�竜了溜隆�僚"
 
-#: ../pidgin/gtkdialogs.c:99
+#: ../pidgin/gtkdialogs.c:100
 msgid "Senior Contributor/QA"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:108
+#: ../pidgin/gtkdialogs.c:109
 msgid "win32 port"
 msgstr "�虜隆凌�侶 win32"
 
-#: ../pidgin/gtkdialogs.c:109 ../pidgin/gtkdialogs.c:110
+#: ../pidgin/gtkdialogs.c:110 ../pidgin/gtkdialogs.c:111
 msgid "maintainer"
 msgstr "��僚�侶�侶�流�"
 
-#: ../pidgin/gtkdialogs.c:111
+#: ../pidgin/gtkdialogs.c:112
 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:115
 msgid "hacker and designated driver [lazy bum]"
 msgstr "�略虜竜� 虜留旅 凌隆侶粒略�留 [�竜亮�劉了留�凌�]"
 
-#: ../pidgin/gtkdialogs.c:115
+#: ../pidgin/gtkdialogs.c:116
 msgid "XMPP developer"
 msgstr "��竜�慮�僚凌� 留僚略���両侶� XMPP"
 
-#: ../pidgin/gtkdialogs.c:116
+#: ../pidgin/gtkdialogs.c:117
 msgid "original author"
 msgstr "留��旅虜�� ��粒粒�留�劉留�"
 
-#: ../pidgin/gtkdialogs.c:133
+#: ../pidgin/gtkdialogs.c:134
 msgid "Afrikaans"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:134 ../pidgin/gtkdialogs.c:226
+#: ../pidgin/gtkdialogs.c:135 ../pidgin/gtkdialogs.c:229
 msgid "Arabic"
 msgstr "��留硫旅虜略"
 
-#: ../pidgin/gtkdialogs.c:135
+#: ../pidgin/gtkdialogs.c:136
 msgid "Belarusian Latin"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
-#: ../pidgin/gtkdialogs.c:227
+#: ../pidgin/gtkdialogs.c:137 ../pidgin/gtkdialogs.c:138
+#: ../pidgin/gtkdialogs.c:230
 msgid "Bulgarian"
 msgstr "�凌�了粒略�旅虜留"
 
-#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
-#: ../pidgin/gtkdialogs.c:140 ../pidgin/gtkdialogs.c:141
+#: ../pidgin/gtkdialogs.c:139 ../pidgin/gtkdialogs.c:140
+#: ../pidgin/gtkdialogs.c:141 ../pidgin/gtkdialogs.c:142
 msgid "Bengali"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:142
+#: ../pidgin/gtkdialogs.c:143
 msgid "Bosnian"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:228
-#: ../pidgin/gtkdialogs.c:229
+#: ../pidgin/gtkdialogs.c:144 ../pidgin/gtkdialogs.c:231
+#: ../pidgin/gtkdialogs.c:232
 msgid "Catalan"
 msgstr "�留�留了留僚旅虜略"
 
-#: ../pidgin/gtkdialogs.c:144 ../pidgin/gtkdialogs.c:145
+#: ../pidgin/gtkdialogs.c:145 ../pidgin/gtkdialogs.c:146
 msgid "Valencian-Catalan"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:146 ../pidgin/gtkdialogs.c:230
+#: ../pidgin/gtkdialogs.c:147 ../pidgin/gtkdialogs.c:233
 msgid "Czech"
 msgstr "里�劉�旅虜留"
 
-#: ../pidgin/gtkdialogs.c:147 ../pidgin/gtkdialogs.c:148
+#: ../pidgin/gtkdialogs.c:148 ../pidgin/gtkdialogs.c:149
 msgid "Danish"
 msgstr "�留僚劉龍旅虜留"
 
-#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:150
-#: ../pidgin/gtkdialogs.c:231
+#: ../pidgin/gtkdialogs.c:150 ../pidgin/gtkdialogs.c:151
+#: ../pidgin/gtkdialogs.c:234
 msgid "German"
 msgstr "�竜�亮留僚旅虜略"
 
-#: ../pidgin/gtkdialogs.c:151 ../pidgin/gtkdialogs.c:152
-#: ../pidgin/gtkdialogs.c:153
+#: ../pidgin/gtkdialogs.c:152 ../pidgin/gtkdialogs.c:153
+#: ../pidgin/gtkdialogs.c:154
 msgid "Dzongkha"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:154 ../pidgin/gtkdialogs.c:155
+#: ../pidgin/gtkdialogs.c:155 ../pidgin/gtkdialogs.c:156
 msgid "Greek"
 msgstr "�了了侶僚旅虜略"
 
-#: ../pidgin/gtkdialogs.c:156
+#: ../pidgin/gtkdialogs.c:157
 msgid "Australian English"
 msgstr "�粒粒了旅虜略 �����留了溜留�"
 
-#: ../pidgin/gtkdialogs.c:157
+#: ../pidgin/gtkdialogs.c:158
 msgid "Canadian English"
 msgstr "�粒粒了旅虜略 �留僚留隆略"
 
-#: ../pidgin/gtkdialogs.c:158
+#: ../pidgin/gtkdialogs.c:159
 msgid "British English"
 msgstr "�粒粒了旅虜略 ��竜�留僚溜留�"
 
-#: ../pidgin/gtkdialogs.c:159
+#: ../pidgin/gtkdialogs.c:160
 msgid "Esperanto"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:232
-#: ../pidgin/gtkdialogs.c:233 ../pidgin/gtkdialogs.c:234
-#: ../pidgin/gtkdialogs.c:235
+#: ../pidgin/gtkdialogs.c:161 ../pidgin/gtkdialogs.c:235
+#: ../pidgin/gtkdialogs.c:236 ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:238
 msgid "Spanish"
 msgstr "���留僚旅虜略"
 
-#: ../pidgin/gtkdialogs.c:161
-#, fuzzy
+#: ../pidgin/gtkdialogs.c:162
 msgid "Estonian"
-msgstr "痢凌�亮略僚旅虜留"
-
-#: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:163
+msgstr "��慮凌僚旅虜略"
+
+#: ../pidgin/gtkdialogs.c:163 ../pidgin/gtkdialogs.c:164
 msgid "Euskera(Basque)"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:165
-#: ../pidgin/gtkdialogs.c:166
+msgstr "Euskera(�略�虜旅虜留)"
+
+#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:166
+#: ../pidgin/gtkdialogs.c:167
 msgid "Persian"
 msgstr "�竜��旅虜略"
 
-#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:236
-#: ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:239
+#: ../pidgin/gtkdialogs.c:240
 msgid "Finnish"
 msgstr "陸旅僚了留僚隆旅虜略"
 
-#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:238
-#: ../pidgin/gtkdialogs.c:239 ../pidgin/gtkdialogs.c:240
-#: ../pidgin/gtkdialogs.c:241
+#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:241
+#: ../pidgin/gtkdialogs.c:242 ../pidgin/gtkdialogs.c:243
+#: ../pidgin/gtkdialogs.c:244
 msgid "French"
 msgstr "�留了了旅虜略"
 
-#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:170
-#: ../pidgin/gtkdialogs.c:242
+#: ../pidgin/gtkdialogs.c:170 ../pidgin/gtkdialogs.c:171
+#: ../pidgin/gtkdialogs.c:245
 msgid "Galician"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:171 ../pidgin/gtkdialogs.c:172
+#: ../pidgin/gtkdialogs.c:172 ../pidgin/gtkdialogs.c:173
 msgid "Gujarati"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:172
+#: ../pidgin/gtkdialogs.c:173
 msgid "Gujarati Language Team"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:243
+#: ../pidgin/gtkdialogs.c:174 ../pidgin/gtkdialogs.c:246
 msgid "Hebrew"
 msgstr "�硫�留�虜略"
 
-#: ../pidgin/gtkdialogs.c:174
+#: ../pidgin/gtkdialogs.c:175
 msgid "Hindi"
 msgstr "�僚隆旅虜略"
 
-#: ../pidgin/gtkdialogs.c:175 ../pidgin/gtkdialogs.c:244
+#: ../pidgin/gtkdialogs.c:176 ../pidgin/gtkdialogs.c:247
 msgid "Hungarian"
 msgstr "��粒粒�旅虜略"
 
-#: ../pidgin/gtkdialogs.c:176
+#: ../pidgin/gtkdialogs.c:177
 msgid "Indonesian"
 msgstr "�僚隆凌僚侶�旅留虜略"
 
-#: ../pidgin/gtkdialogs.c:177 ../pidgin/gtkdialogs.c:245
+#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:248
 msgid "Italian"
 msgstr "��留了旅虜略"
 
-#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:246
-#: ../pidgin/gtkdialogs.c:247 ../pidgin/gtkdialogs.c:248
+#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:249
+#: ../pidgin/gtkdialogs.c:250 ../pidgin/gtkdialogs.c:251
 msgid "Japanese"
 msgstr "�留��僚旅虜略"
 
-#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:249
+#: ../pidgin/gtkdialogs.c:180 ../pidgin/gtkdialogs.c:252
 msgid "Georgian"
 msgstr "�竜��粒旅留僚略"
 
-#: ../pidgin/gtkdialogs.c:179
-msgid "Ubuntu Georgian Translators"
-msgstr "�竜��粒旅留僚凌溜 亮竜�留��留��劉� Ubuntu"
-
-#: ../pidgin/gtkdialogs.c:180
-msgid "Kannada"
-msgstr ""
-
 #: ../pidgin/gtkdialogs.c:180
+msgid "Ubuntu Georgian Translators"
+msgstr "�竜��粒旅留僚凌溜 亮竜�留��留��劉� Ubuntu"
+
+#: ../pidgin/gtkdialogs.c:181
+msgid "Kannada"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:181
 msgid "Kannada Translation team"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:250
-#: ../pidgin/gtkdialogs.c:251
+#: ../pidgin/gtkdialogs.c:182 ../pidgin/gtkdialogs.c:253
+#: ../pidgin/gtkdialogs.c:254
 msgid "Korean"
 msgstr "�凌�竜略�旅虜留"
 
-#: ../pidgin/gtkdialogs.c:182 ../pidgin/gtkdialogs.c:183
-#: ../pidgin/gtkdialogs.c:184
+#: ../pidgin/gtkdialogs.c:183 ../pidgin/gtkdialogs.c:184
+#: ../pidgin/gtkdialogs.c:185
 msgid "Kurdish"
 msgstr "�凌��隆旅虜略"
 
-#: ../pidgin/gtkdialogs.c:185
-#, fuzzy
+#: ../pidgin/gtkdialogs.c:186
 msgid "Lao"
-msgstr "�劉�僚"
-
-#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:252
-#: ../pidgin/gtkdialogs.c:253
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:187 ../pidgin/gtkdialogs.c:255
+#: ../pidgin/gtkdialogs.c:256
 msgid "Lithuanian"
 msgstr "�旅慮凌�留僚旅虜略"
 
-#: ../pidgin/gtkdialogs.c:187 ../pidgin/gtkdialogs.c:188
-#: ../pidgin/gtkdialogs.c:189 ../pidgin/gtkdialogs.c:254
+#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:189
+#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:257
 msgid "Macedonian"
 msgstr "�留虜竜隆凌僚旅虜略 (裡了留硫旅虜略)"
 
-#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:255
-#: ../pidgin/gtkdialogs.c:256
+#: ../pidgin/gtkdialogs.c:191 ../pidgin/gtkdialogs.c:258
+#: ../pidgin/gtkdialogs.c:259
 msgid "Bokm奪l Norwegian"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:191
-msgid "Nepali"
-msgstr "�竜�留了旅虜略"
-
 #: ../pidgin/gtkdialogs.c:192
-msgid "Dutch, Flemish"
-msgstr ""
+msgid "Nepali"
+msgstr "�竜�留了旅虜略"
 
 #: ../pidgin/gtkdialogs.c:193
-#, fuzzy
+msgid "Dutch, Flemish"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:194
 msgid "Norwegian Nynorsk"
-msgstr "�凌�硫侶粒旅虜略"
-
-#: ../pidgin/gtkdialogs.c:194 ../pidgin/gtkdialogs.c:195
-#: ../pidgin/gtkdialogs.c:196 ../pidgin/gtkdialogs.c:257
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:195
+msgid "Punjabi"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:196 ../pidgin/gtkdialogs.c:197
+#: ../pidgin/gtkdialogs.c:198 ../pidgin/gtkdialogs.c:260
 msgid "Polish"
 msgstr "�凌了�僚旅虜略"
 
-#: ../pidgin/gtkdialogs.c:197
-msgid "Portuguese"
-msgstr "�凌��凌粒留了旅虜略"
-
-#: ../pidgin/gtkdialogs.c:198
-msgid "Portuguese-Brazil"
-msgstr "�凌��凌粒留了旅虜略 ��留龍旅了溜留�"
-
 #: ../pidgin/gtkdialogs.c:199
-msgid "Pashto"
-msgstr ""
+msgid "Portuguese"
+msgstr "�凌��凌粒留了旅虜略"
 
 #: ../pidgin/gtkdialogs.c:200
+msgid "Portuguese-Brazil"
+msgstr "�凌��凌粒留了旅虜略 ��留龍旅了溜留�"
+
+#: ../pidgin/gtkdialogs.c:201
+msgid "Pashto"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:202
 msgid "Romanian"
 msgstr "痢凌�亮略僚旅虜留"
 
-#: ../pidgin/gtkdialogs.c:201 ../pidgin/gtkdialogs.c:258
-#: ../pidgin/gtkdialogs.c:259
+#: ../pidgin/gtkdialogs.c:203 ../pidgin/gtkdialogs.c:261
+#: ../pidgin/gtkdialogs.c:262
 msgid "Russian"
 msgstr "痢��旅虜略"
 
-#: ../pidgin/gtkdialogs.c:202 ../pidgin/gtkdialogs.c:203
-#: ../pidgin/gtkdialogs.c:260 ../pidgin/gtkdialogs.c:261
-#: ../pidgin/gtkdialogs.c:262
+#: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:205
+#: ../pidgin/gtkdialogs.c:263 ../pidgin/gtkdialogs.c:264
+#: ../pidgin/gtkdialogs.c:265
 msgid "Slovak"
 msgstr "裡了凌硫留虜旅虜略"
 
-#: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:263
+#: ../pidgin/gtkdialogs.c:206 ../pidgin/gtkdialogs.c:266
 msgid "Slovenian"
 msgstr "裡了凌硫劉僚旅虜留"
 
-#: ../pidgin/gtkdialogs.c:205
+#: ../pidgin/gtkdialogs.c:207
 msgid "Albanian"
 msgstr "�了硫留僚旅虜略"
 
-#: ../pidgin/gtkdialogs.c:206 ../pidgin/gtkdialogs.c:207
-#: ../pidgin/gtkdialogs.c:264 ../pidgin/gtkdialogs.c:265
+#: ../pidgin/gtkdialogs.c:208 ../pidgin/gtkdialogs.c:209
+#: ../pidgin/gtkdialogs.c:267 ../pidgin/gtkdialogs.c:268
 msgid "Serbian"
 msgstr "裡竜�硫旅虜略"
 
-#: ../pidgin/gtkdialogs.c:208 ../pidgin/gtkdialogs.c:266
-#: ../pidgin/gtkdialogs.c:267
+#: ../pidgin/gtkdialogs.c:210 ../pidgin/gtkdialogs.c:269
+#: ../pidgin/gtkdialogs.c:270
 msgid "Swedish"
 msgstr "裡凌�侶隆旅虜略"
 
-#: ../pidgin/gtkdialogs.c:209
+#: ../pidgin/gtkdialogs.c:211
 msgid "Tamil"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:210
+#: ../pidgin/gtkdialogs.c:212
 msgid "Telugu"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:211
-msgid "Thai"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:212 ../pidgin/gtkdialogs.c:268
-msgid "Turkish"
-msgstr "里凌��虜旅虜略"
-
-#: ../pidgin/gtkdialogs.c:213
-msgid "Vietnamese"
-msgstr "�旅竜�僚留亮劉龍旅虜留"
-
 #: ../pidgin/gtkdialogs.c:213
+msgid "Thai"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:214 ../pidgin/gtkdialogs.c:271
+msgid "Turkish"
+msgstr "里凌��虜旅虜略"
+
+#: ../pidgin/gtkdialogs.c:215
+msgid "Urdu"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:216
+msgid "Vietnamese"
+msgstr "�旅竜�僚留亮劉龍旅虜留"
+
+#: ../pidgin/gtkdialogs.c:216
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh 虜留旅 凌亮略隆留 Gnome-Vi"
 
-#: ../pidgin/gtkdialogs.c:214 ../pidgin/gtkdialogs.c:269
+#: ../pidgin/gtkdialogs.c:217 ../pidgin/gtkdialogs.c:272
 msgid "Simplified Chinese"
 msgstr "��了凌�凌旅侶亮劉僚留 �旅僚劉龍旅虜留"
 
-#: ../pidgin/gtkdialogs.c:215 ../pidgin/gtkdialogs.c:216
-#: ../pidgin/gtkdialogs.c:217
+#: ../pidgin/gtkdialogs.c:218 ../pidgin/gtkdialogs.c:219
+#: ../pidgin/gtkdialogs.c:220
 msgid "Hong Kong Chinese"
 msgstr "�旅僚劉龍旅虜留 律凌僚粒虜 �凌僚粒虜"
 
-#: ../pidgin/gtkdialogs.c:218 ../pidgin/gtkdialogs.c:219
-#: ../pidgin/gtkdialogs.c:270
+#: ../pidgin/gtkdialogs.c:221 ../pidgin/gtkdialogs.c:222
+#: ../pidgin/gtkdialogs.c:273
 msgid "Traditional Chinese"
 msgstr "�留�留隆凌�旅留虜略 �旅僚劉龍旅虜留"
 
-#: ../pidgin/gtkdialogs.c:225
+#: ../pidgin/gtkdialogs.c:228
 msgid "Amharic"
 msgstr "�亮留�旅虜略"
 
-#: ../pidgin/gtkdialogs.c:357
+#: ../pidgin/gtkdialogs.c:358
 #, c-format
 msgid "About %s"
 msgstr "裡�竜�旅虜略 亮竜 �凌 %s"
 
-#: ../pidgin/gtkdialogs.c:400
-#, fuzzy, c-format
+#: ../pidgin/gtkdialogs.c:394
+#, 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, "
@@ -15111,58 +15508,66 @@
 msgstr ""
 "里凌 %s 竜溜僚留旅 劉僚留� 竜�亮竜�略硫了侶�凌� �竜了略�侶� 留僚�留了了留粒流� 亮侶僚�亮略��僚 硫留�旅�亮劉僚凌� ��侶 "
 "libpurple �凌� 亮�凌�竜溜 僚留 ��侶�旅亮凌�凌旅竜溜 �留 AIM, MSN, Yahoo!, XMPP, ICQ, IRC, "
-"SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-"
-"Gadu 虜留旅 QQ, �了留 �留�����凌僚留.  �溜僚留旅 粒�留亮亮劉僚凌 亮竜 �侶 ��流�侶 GTK+."
-"<BR><BR>��凌�竜溜�竜 僚留 ��凌�凌�凌旅流�竜�竜 虜留旅 僚留 留僚留隆旅留僚竜溜亮竜�竜 �凌 ���粒�留亮亮留 ��� �凌�� "
-"��凌�� �侶� 略隆竜旅留� ��流�侶� GPL (劉虜隆凌�侶 2 流 僚竜��竜�侶).  �僚留 留僚�溜粒�留�凌 �侶� 略隆竜旅留� "
-"��流�侶� GPL �竜�旅劉�竜�留旅 ��凌 留��竜溜凌 COPYING �凌� 隆旅留僚劉亮竜�留旅 亮留龍溜 亮竜 �凌 %s.  里凌 %"
-"s 竜溜僚留旅 �僚竜�亮留�旅虜流 旅隆旅凌虜�侶�溜留 ��僚 ��亮硫留了了凌亮劉僚�僚.  �竜溜�竜 �凌 留��竜溜凌 COPYRIGHT "
-"粒旅留 �侶僚 �了流�侶 了溜��留 �了�僚 ��僚 ��亮硫留了了凌亮劉僚�僚.  �竜僚 �留�劉�凌�亮竜 虜留亮溜留 竜粒粒�侶�侶 粒旅留 "
-"留��� �凌 ���粒�留亮亮留.<BR><BR>"
-
-#: ../pidgin/gtkdialogs.c:418
-#, c-format
+"SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, "
+"MySpaceIM, Gadu-Gadu 虜留旅 QQ, �了留 �留�����凌僚留.  �溜僚留旅 粒�留亮亮劉僚凌 亮竜 �侶 ��流�侶 GTK"
+"+.<BR><BR>��凌�竜溜�竜 僚留 ��凌�凌�凌旅流�竜�竜 虜留旅 僚留 留僚留隆旅留僚竜溜亮竜�竜 �凌 ���粒�留亮亮留 ��� "
+"�凌�� ��凌�� �侶� 略隆竜旅留� ��流�侶� GPL (劉虜隆凌�侶 2 流 僚竜��竜�侶).  �僚留 留僚�溜粒�留�凌 �侶� "
+"略隆竜旅留� ��流�侶� GPL �竜�旅劉�竜�留旅 ��凌 留��竜溜凌 COPYING �凌� 隆旅留僚劉亮竜�留旅 亮留龍溜 亮竜 �凌 %"
+"s.  里凌 %s 竜溜僚留旅 �僚竜�亮留�旅虜流 旅隆旅凌虜�侶�溜留 ��僚 ��亮硫留了了凌亮劉僚�僚.  �竜溜�竜 �凌 留��竜溜凌 "
+"COPYRIGHT 粒旅留 �侶僚 �了流�侶 了溜��留 �了�僚 ��僚 ��亮硫留了了凌亮劉僚�僚.  �竜僚 �留�劉�凌�亮竜 虜留亮溜留 "
+"竜粒粒�侶�侶 粒旅留 留��� �凌 ���粒�留亮亮留.<BR><BR>"
+
+#: ../pidgin/gtkdialogs.c:412
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin ��凌 irc.freenode.net<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:423
+#: ../pidgin/gtkdialogs.c:417
 msgid "Current Developers"
 msgstr "離�竜�慮�僚凌旅 留僚略���両侶�"
 
-#: ../pidgin/gtkdialogs.c:438
+#: ../pidgin/gtkdialogs.c:432
 msgid "Crazy Patch Writers"
 msgstr "里�竜了凌溜 ��粒粒�留�竜溜� 亮�留了�亮略��僚"
 
-#: ../pidgin/gtkdialogs.c:453
+#: ../pidgin/gtkdialogs.c:447
 msgid "Retired Developers"
 msgstr "離�竜�慮�僚凌旅 留僚略���両侶� �凌� 劉�凌�僚 �了劉凌僚 留�凌���慮竜溜"
 
-#: ../pidgin/gtkdialogs.c:468
-#, fuzzy
+#: ../pidgin/gtkdialogs.c:462
 msgid "Retired Crazy Patch Writers"
-msgstr "里�竜了凌溜 ��粒粒�留�竜溜� 亮�留了�亮略��僚"
-
-#: ../pidgin/gtkdialogs.c:483
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:477
 msgid "Artists"
 msgstr "�留了了旅�劉�僚竜�"
 
-#: ../pidgin/gtkdialogs.c:498
+#: ../pidgin/gtkdialogs.c:492
 msgid "Current Translators"
 msgstr "里��旅僚凌溜 亮竜�留��留��劉�"
 
-#: ../pidgin/gtkdialogs.c:518
+#: ../pidgin/gtkdialogs.c:512
 msgid "Past Translators"
 msgstr "�留�竜了慮�僚�竜� 亮竜�留��留��劉�"
 
-#: ../pidgin/gtkdialogs.c:536
+#: ../pidgin/gtkdialogs.c:530
 msgid "Debugging Information"
 msgstr "�了侶�凌�凌�溜竜� 留�凌��留了亮略���侶�"
 
-#: ../pidgin/gtkdialogs.c:906
+#: ../pidgin/gtkdialogs.c:746 ../pidgin/gtkdialogs.c:885
+#: ../pidgin/gtkdialogs.c:966
+msgid "_Name"
+msgstr "_�僚凌亮留"
+
+#: ../pidgin/gtkdialogs.c:751 ../pidgin/gtkdialogs.c:890
+#: ../pidgin/gtkdialogs.c:971
+msgid "_Account"
+msgstr "_�凌粒留�旅留�亮��"
+
+#: ../pidgin/gtkdialogs.c:898
 msgid "Get User Info"
 msgstr "�了侶�凌�凌�溜竜� ��流��侶"
 
-#: ../pidgin/gtkdialogs.c:908
+#: ../pidgin/gtkdialogs.c:900
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
@@ -15170,11 +15575,11 @@
 "�留�留虜留了凌�亮竜 竜旅�略粒竜�竜 �凌 竜亮�留僚旅龍�亮竜僚凌 �僚凌亮留 流 �竜�隆�僚�亮凌 �凌� 留��亮凌� �凌� 慮留 "
 "慮劉了留�竜 僚留 ��凌硫略了了竜�竜."
 
-#: ../pidgin/gtkdialogs.c:998
+#: ../pidgin/gtkdialogs.c:990
 msgid "View User Log"
 msgstr "�亮�略僚旅�侶 虜留�留粒�留�流� ��流��侶"
 
-#: ../pidgin/gtkdialogs.c:1000
+#: ../pidgin/gtkdialogs.c:992
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
@@ -15182,32 +15587,32 @@
 "�留�留虜留了凌�亮竜 竜旅�略粒竜�竜 �凌 竜亮�留僚旅龍�亮竜僚凌 �僚凌亮留 流 �竜�隆�僚�亮凌 �凌� 留��亮凌� �凌� 慮留 "
 "慮劉了留�竜 僚留 ��凌硫略了了竜�竜 �侶僚 虜留�留粒�留�流 �凌�."
 
-#: ../pidgin/gtkdialogs.c:1020
+#: ../pidgin/gtkdialogs.c:1012
 msgid "Alias Contact"
 msgstr "��留�流 粒僚���流 ��"
 
-#: ../pidgin/gtkdialogs.c:1021
+#: ../pidgin/gtkdialogs.c:1013
 msgid "Enter an alias for this contact."
 msgstr "�旅�略粒竜�竜 ��� 慮留 竜溜僚留旅 粒僚���流 留��流 侶 竜�留�流."
 
-#: ../pidgin/gtkdialogs.c:1043
+#: ../pidgin/gtkdialogs.c:1035
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "�旅�略粒竜�竜 ��� 慮留 竜溜僚留旅 粒僚����� 凌 %s."
 
-#: ../pidgin/gtkdialogs.c:1045
+#: ../pidgin/gtkdialogs.c:1037
 msgid "Alias Buddy"
 msgstr "陸溜了凌� 粒僚����� ��"
 
-#: ../pidgin/gtkdialogs.c:1066
+#: ../pidgin/gtkdialogs.c:1058
 msgid "Alias Chat"
 msgstr "裡�龍流�侶�侶 粒僚���流 ��"
 
-#: ../pidgin/gtkdialogs.c:1067
+#: ../pidgin/gtkdialogs.c:1059
 msgid "Enter an alias for this chat."
 msgstr "�旅�略粒竜�竜 ��� 慮留 竜溜僚留旅 粒僚���流 留��流 侶 ��龍流�侶�侶."
 
-#: ../pidgin/gtkdialogs.c:1106
+#: ../pidgin/gtkdialogs.c:1098
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -15222,31 +15627,30 @@
 "���虜竜旅�留旅 僚留 虜留�留�粒流�竜�竜 �侶僚 竜�留�流 �凌� �竜�旅劉�竜旅 �凌僚 %s 虜留旅 略了了凌�� %d �溜了凌�� "
 "留�� �侶 了溜��留 �溜了�僚 �留�.  �劉了竜�竜 僚留 ��僚竜�溜�竜�竜;"
 
-#: ../pidgin/gtkdialogs.c:1114
+#: ../pidgin/gtkdialogs.c:1106
 msgid "Remove Contact"
 msgstr "��留溜�竜�侶 竜�留�流�"
 
-#: ../pidgin/gtkdialogs.c:1117
+#: ../pidgin/gtkdialogs.c:1109
 msgid "_Remove Contact"
 msgstr "_��留溜�竜�侶 ��留�流�"
 
-#: ../pidgin/gtkdialogs.c:1148
+#: ../pidgin/gtkdialogs.c:1140
 #, 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:1155
+msgstr "���虜竜旅�留旅 僚留 ��粒��僚竜��竜�竜 �侶僚 凌亮略隆留 %s 亮竜 �侶僚 凌亮略隆留 %s. �劉了竜�竜 僚留 ��僚竜�溜�竜�竜;"
+
+#: ../pidgin/gtkdialogs.c:1147
 msgid "Merge Groups"
 msgstr "裡�粒��僚竜��侶 凌亮略隆�僚"
 
-#: ../pidgin/gtkdialogs.c:1158
+#: ../pidgin/gtkdialogs.c:1150
 msgid "_Merge Groups"
 msgstr "_裡�粒��僚竜��侶 凌亮略隆�僚"
 
-#: ../pidgin/gtkdialogs.c:1208
+#: ../pidgin/gtkdialogs.c:1200
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -15255,30 +15659,28 @@
 "���虜竜旅�留旅 僚留 留�留旅�劉�竜�竜 �侶僚 凌亮略隆留 %s 虜留旅 �了留 �侶� �留 亮劉了侶 留�� �侶 了溜��留 �溜了�僚 "
 "�留�.  �劉了竜�竜 僚留 ��僚竜�溜�竜�竜;"
 
-#: ../pidgin/gtkdialogs.c:1211
+#: ../pidgin/gtkdialogs.c:1203
 msgid "Remove Group"
 msgstr "��留溜�竜�侶 凌亮略隆留�"
 
-#: ../pidgin/gtkdialogs.c:1214
+#: ../pidgin/gtkdialogs.c:1206
 msgid "_Remove Group"
 msgstr "_��留溜�竜�侶 凌亮略隆留�"
 
-#: ../pidgin/gtkdialogs.c:1247
-#, c-format
-msgid ""
-"You are about to remove %s from your buddy list.  Do you want to continue?"
-msgstr ""
-"���虜竜旅�留旅 僚留 留�留旅�劉�竜�竜 �凌僚 %s 留�� �侶 了溜��留 �溜了�僚 �留�.  �劉了竜�竜 僚留 ��僚竜�溜�竜�竜;"
-
-#: ../pidgin/gtkdialogs.c:1250
+#: ../pidgin/gtkdialogs.c:1239
+#, c-format
+msgid "You are about to remove %s from your buddy list.  Do you want to continue?"
+msgstr "���虜竜旅�留旅 僚留 留�留旅�劉�竜�竜 �凌僚 %s 留�� �侶 了溜��留 �溜了�僚 �留�.  �劉了竜�竜 僚留 ��僚竜�溜�竜�竜;"
+
+#: ../pidgin/gtkdialogs.c:1242
 msgid "Remove Buddy"
 msgstr "��留溜�竜�侶 �溜了凌�"
 
-#: ../pidgin/gtkdialogs.c:1253
+#: ../pidgin/gtkdialogs.c:1245
 msgid "_Remove Buddy"
 msgstr "_��留溜�竜�侶 �溜了凌�"
 
-#: ../pidgin/gtkdialogs.c:1274
+#: ../pidgin/gtkdialogs.c:1266
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -15287,40 +15689,39 @@
 "���虜竜旅�留旅 僚留 留�留旅�劉�竜�竜 �侶 ��龍流�侶�侶 %s 留�� �侶 了溜��留 �溜了�僚 �留�. �劉了竜�竜 僚留 "
 "��僚竜�溜�竜�竜;"
 
-#: ../pidgin/gtkdialogs.c:1277
+#: ../pidgin/gtkdialogs.c:1269
 msgid "Remove Chat"
 msgstr "��留溜�竜�侶 ��龍流�侶�侶�"
 
-#: ../pidgin/gtkdialogs.c:1280
+#: ../pidgin/gtkdialogs.c:1272
 msgid "_Remove Chat"
 msgstr "_��留溜�竜�侶 裡�龍流�侶�侶�"
 
-#: ../pidgin/gtkdocklet.c:150
+#: ../pidgin/gtkdocklet.c:152
 msgid "Right-click for more unread messages...\n"
 msgstr "�略僚�竜 隆竜両溜 虜了旅虜 粒旅留 �竜�旅����竜�留 亮侶 留僚留粒僚��亮劉僚留 亮侶僚�亮留�留...\n"
 
-#: ../pidgin/gtkdocklet.c:435
+#: ../pidgin/gtkdocklet.c:533
 msgid "Change Status"
 msgstr "�了了留粒流 虜留�略��留�侶�"
 
-#: ../pidgin/gtkdocklet.c:487
+#: ../pidgin/gtkdocklet.c:681
 msgid "Show Buddy List"
 msgstr "�亮�略僚旅�侶 了溜��留� �溜了�僚"
 
-#: ../pidgin/gtkdocklet.c:513
+#: ../pidgin/gtkdocklet.c:707
 msgid "New Message..."
 msgstr "�劉凌 亮流僚�亮留..."
 
-#: ../pidgin/gtkdocklet.c:528
+#: ../pidgin/gtkdocklet.c:722
 msgid "Mute Sounds"
 msgstr "��凌�旅��侶�侶 流��僚"
 
-#: ../pidgin/gtkdocklet.c:535
-#, fuzzy
-msgid "Blink on new message"
+#: ../pidgin/gtkdocklet.c:729
+msgid "Blink on New Message"
 msgstr "�留 留僚留硫凌�硫流僚竜旅 ��留僚 ��略��竜旅 僚劉凌 亮流僚�亮留"
 
-#: ../pidgin/gtkdocklet.c:542
+#: ../pidgin/gtkdocklet.c:739
 msgid "Quit"
 msgstr "�両凌隆凌�"
 
@@ -15387,26 +15788,26 @@
 msgid "Time Remaining:"
 msgstr "律��僚凌� �凌� 留�凌亮劉僚竜旅:"
 
-#: ../pidgin/gtkft.c:784
+#: ../pidgin/gtkft.c:781
 msgid "Close this window when all transfers _finish"
 msgstr "�了竜溜�旅亮凌 留��凌� �凌� �留�留慮��凌� ��留僚 _凌了凌虜了侶��慮凌�僚 �了竜� 凌旅 亮竜�留�凌�劉�"
 
-#: ../pidgin/gtkft.c:794
+#: ../pidgin/gtkft.c:791
 msgid "C_lear finished transfers"
 msgstr "_�留慮留�旅�亮�� 凌了凌虜了侶��亮劉僚�僚 亮竜�留�凌��僚"
 
 #. "Download Details" arrow
-#: ../pidgin/gtkft.c:803
+#: ../pidgin/gtkft.c:800
 msgid "File transfer _details"
 msgstr "_�竜��凌亮劉�竜旅竜� 亮竜�留�凌�略� 留��竜溜凌�"
 
 #. Pause button
-#: ../pidgin/gtkft.c:833 ../pidgin/pidginstock.c:95
+#: ../pidgin/gtkft.c:818 ../pidgin/pidginstock.c:95
 msgid "_Pause"
 msgstr "_�留��侶"
 
 #. Resume button
-#: ../pidgin/gtkft.c:843
+#: ../pidgin/gtkft.c:823
 msgid "_Resume"
 msgstr "_裡�僚劉�竜旅留"
 
@@ -15414,40 +15815,71 @@
 msgid "Paste as Plain _Text"
 msgstr "_��旅虜�了了侶�侶 �� �虜劉�凌 虜竜溜亮竜僚凌"
 
-#: ../pidgin/gtkimhtml.c:833 ../pidgin/gtkimhtmltoolbar.c:1194
+#: ../pidgin/gtkimhtml.c:833 ../pidgin/gtkimhtmltoolbar.c:1197
 msgid "_Reset formatting"
 msgstr "_�留慮留�旅�亮�� 亮凌��凌�凌溜侶�侶�"
 
-#: ../pidgin/gtkimhtml.c:1373
+#: ../pidgin/gtkimhtml.c:1391
 msgid "Hyperlink color"
 msgstr "律��亮留 ��竜���僚隆劉�亮凌�"
 
-#: ../pidgin/gtkimhtml.c:1374
+#: ../pidgin/gtkimhtml.c:1392
 msgid "Color to draw hyperlinks."
 msgstr "律��亮留 粒旅留 僚留 龍�粒�留�旅��凌�僚 凌旅 ��竜���僚隆竜�亮凌旅."
 
-#: ../pidgin/gtkimhtml.c:1377
+#: ../pidgin/gtkimhtml.c:1395
 msgid "Hyperlink prelight color"
 msgstr ""
 
-#: ../pidgin/gtkimhtml.c:1378
+#: ../pidgin/gtkimhtml.c:1396
 msgid "Color to draw hyperlinks when mouse is over them."
-msgstr ""
-"律��亮留 粒旅留 僚留 龍�粒�留�旅��凌�僚 凌旅 ��竜���僚隆竜�亮凌旅 ��留僚 �竜�僚略竜旅 凌 隆竜溜虜�侶� 留�� �略僚�."
-
-#: ../pidgin/gtkimhtml.c:1598
+msgstr "律��亮留 粒旅留 僚留 龍�粒�留�旅��凌�僚 凌旅 ��竜���僚隆竜�亮凌旅 ��留僚 �竜�僚略竜旅 凌 隆竜溜虜�侶� 留�� �略僚�."
+
+#: ../pidgin/gtkimhtml.c:1399 ../pidgin/plugins/pidginrc.c:52
+msgid "Sent Message Name Color"
+msgstr "律��亮留 凌僚�亮留�凌� 竜両竜���亮竜僚�僚 亮侶僚�亮略��僚"
+
+#: ../pidgin/gtkimhtml.c:1400
+msgid "Color to draw the name of a message you sent."
+msgstr "律��亮留 �凌� 慮留 龍�粒�留�溜龍竜�留旅 �凌 �僚凌亮留 �竜 劉僚留 亮流僚�亮留 �凌� ��劉了僚竜�竜."
+
+#: ../pidgin/gtkimhtml.c:1403 ../pidgin/plugins/pidginrc.c:53
+msgid "Received Message Name Color"
+msgstr "律��亮留 凌僚�亮留�凌� 竜旅�竜���亮竜僚�僚 亮侶僚�亮略��僚"
+
+#: ../pidgin/gtkimhtml.c:1404
+msgid "Color to draw the name of a message you received."
+msgstr "律��亮留 �凌� 慮留 龍�粒�留�溜龍竜�留旅 �凌 �僚凌亮留 �竜 劉僚留 亮流僚�亮留 �凌� 了留亮硫略僚竜�竜."
+
+#: ../pidgin/gtkimhtml.c:1407
+msgid "\"Attention\" Name Color"
+msgstr "律��亮留 凌僚�亮留�凌�粒旅留 \"��凌�凌�流\""
+
+#: ../pidgin/gtkimhtml.c:1408
+msgid "Color to draw the name of a message you received containing your name."
+msgstr "律��亮留 �凌� 慮留 龍�粒�留�溜龍竜�留旅 �凌 �僚凌亮留 �竜 劉僚留 亮流僚�亮留 �凌� 了留亮硫略僚竜�竜 虜留旅 �竜�旅劉�竜旅 �凌 �僚凌亮略 �留�."
+
+#: ../pidgin/gtkimhtml.c:1411 ../pidgin/plugins/pidginrc.c:55
+msgid "Action Message Name Color"
+msgstr "律��亮留 凌僚�亮留�凌� 亮侶僚�亮留�凌� 竜僚劉�粒竜旅留�"
+
+#: ../pidgin/gtkimhtml.c:1412
+msgid "Color to draw the name of an action message."
+msgstr "律��亮留 �凌� 慮留 龍�粒�留�溜龍竜�留旅 �凌 �僚凌亮留 竜僚�� 亮侶僚�亮留�凌� 竜僚劉�粒竜旅留�."
+
+#: ../pidgin/gtkimhtml.c:1632
 msgid "_Copy E-Mail Address"
 msgstr "_�僚�旅粒�留�流 隆旅竜�慮�僚�侶� e-mail"
 
-#: ../pidgin/gtkimhtml.c:1610
+#: ../pidgin/gtkimhtml.c:1644
 msgid "_Open Link in Browser"
 msgstr "_�僚凌旅粒亮留 ��凌僚 �竜�旅侶粒侶�流"
 
-#: ../pidgin/gtkimhtml.c:1620
+#: ../pidgin/gtkimhtml.c:1654
 msgid "_Copy Link Location"
 msgstr "_�僚�旅粒�留�流 �凌�凌慮竜�溜留� ��僚隆劉�亮凌�"
 
-#: ../pidgin/gtkimhtml.c:3369
+#: ../pidgin/gtkimhtml.c:3421
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -15457,7 +15889,7 @@
 "\n"
 "�両 凌�旅�亮凌� 竜�旅了凌粒流 PNG."
 
-#: ../pidgin/gtkimhtml.c:3372
+#: ../pidgin/gtkimhtml.c:3424
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -15467,7 +15899,7 @@
 "\n"
 "�溜僚竜�留旅 ��凌竜�旅了凌粒流 �竜 PNG."
 
-#: ../pidgin/gtkimhtml.c:3401
+#: ../pidgin/gtkimhtml.c:3453
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -15479,7 +15911,7 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3404
+#: ../pidgin/gtkimhtml.c:3456
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -15490,36 +15922,35 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3482 ../pidgin/gtkimhtml.c:3494
+#: ../pidgin/gtkimhtml.c:3537 ../pidgin/gtkimhtml.c:3549
 msgid "Save Image"
 msgstr "��凌慮流虜竜��侶 竜旅虜�僚留�"
 
-#: ../pidgin/gtkimhtml.c:3522
-#, c-format
+#: ../pidgin/gtkimhtml.c:3577
 msgid "_Save Image..."
 msgstr "_��凌慮流虜竜��侶 竜旅虜�僚留�..."
 
-#: ../pidgin/gtkimhtmltoolbar.c:163
+#: ../pidgin/gtkimhtmltoolbar.c:164
 msgid "Select Font"
 msgstr "��旅了凌粒流 粒�留亮亮留�凌�竜旅�略�"
 
-#: ../pidgin/gtkimhtmltoolbar.c:242
+#: ../pidgin/gtkimhtmltoolbar.c:244
 msgid "Select Text Color"
 msgstr "��旅了凌粒流 ���亮留�凌� 虜竜旅亮劉僚凌�"
 
-#: ../pidgin/gtkimhtmltoolbar.c:321
+#: ../pidgin/gtkimhtmltoolbar.c:324
 msgid "Select Background Color"
 msgstr "��旅了凌粒流 ���亮留�凌� �留�留�虜侶僚溜凌�"
 
-#: ../pidgin/gtkimhtmltoolbar.c:410
+#: ../pidgin/gtkimhtmltoolbar.c:413
 msgid "_URL"
 msgstr "_URL"
 
-#: ../pidgin/gtkimhtmltoolbar.c:418
+#: ../pidgin/gtkimhtmltoolbar.c:421
 msgid "_Description"
 msgstr "_�竜�旅粒�留�流"
 
-#: ../pidgin/gtkimhtmltoolbar.c:421
+#: ../pidgin/gtkimhtmltoolbar.c:424
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
@@ -15527,179 +15958,163 @@
 "�留�留虜留了凌�亮竜 竜旅�略粒竜�竜 �凌 URL 虜留旅 �侶 �竜�旅粒�留�流 �凌� ��僚隆劉�亮凌� �凌� 慮劉了竜�竜 僚留  "
 "竜旅�略粒竜�竜.  � �竜�旅粒�留�流 竜溜僚留旅 ��凌留旅�竜�旅虜流."
 
-#: ../pidgin/gtkimhtmltoolbar.c:425
+#: ../pidgin/gtkimhtmltoolbar.c:428
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "�留�留虜留了凌�亮竜 竜旅�略粒竜�竜 �凌 URL �凌� ��僚隆劉�亮凌� �凌� 慮劉了竜�竜 僚留 竜旅�略粒竜�竜."
 
-#: ../pidgin/gtkimhtmltoolbar.c:430 ../pidgin/gtkimhtmltoolbar.c:1102
+#: ../pidgin/gtkimhtmltoolbar.c:433 ../pidgin/gtkimhtmltoolbar.c:1104
 msgid "Insert Link"
 msgstr "�旅�留粒�粒流 ��僚隆劉�亮凌�"
 
-#: ../pidgin/gtkimhtmltoolbar.c:434 ../pidgin/gtkimhtmltoolbar.c:1262
+#: ../pidgin/gtkimhtmltoolbar.c:437 ../pidgin/gtkimhtmltoolbar.c:1265
 msgid "_Insert"
 msgstr "_�旅�留粒�粒流"
 
-#: ../pidgin/gtkimhtmltoolbar.c:514
+#: ../pidgin/gtkimhtmltoolbar.c:518
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "��凌���溜留 留�凌慮流虜竜��侶� �侶� 竜旅虜�僚留�: %s\n"
 
-#: ../pidgin/gtkimhtmltoolbar.c:540 ../pidgin/gtkimhtmltoolbar.c:550
+#: ../pidgin/gtkimhtmltoolbar.c:544 ../pidgin/gtkimhtmltoolbar.c:554
 msgid "Insert Image"
 msgstr "�旅�留粒�粒流 竜旅虜�僚留�"
 
-#: ../pidgin/gtkimhtmltoolbar.c:761
-msgid "This theme has no available smileys."
-msgstr "���� �凌 慮劉亮留 隆竜僚 劉�竜旅 隆旅留慮劉�旅亮留 smileys."
-
-#. show everything
-#: ../pidgin/gtkimhtmltoolbar.c:778
+#: ../pidgin/gtkimhtmltoolbar.c:712
 msgid "Smile!"
 msgstr "律留亮凌粒劉了留!"
 
-#: ../pidgin/gtkimhtmltoolbar.c:846 ../pidgin/gtkimhtmltoolbar.c:1219
-#, fuzzy
+#: ../pidgin/gtkimhtmltoolbar.c:764
+msgid "This theme has no available smileys."
+msgstr "���� �凌 慮劉亮留 隆竜僚 劉�竜旅 隆旅留慮劉�旅亮留 smileys."
+
+#: ../pidgin/gtkimhtmltoolbar.c:848 ../pidgin/gtkimhtmltoolbar.c:1222
 msgid "_Font"
-msgstr "��留亮亮留�凌�竜旅�劉�"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1054
-#, fuzzy
+msgstr "_��留亮亮留�凌�竜旅�略"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1056
 msgid "Group Items"
-msgstr "ID 凌亮略隆留�"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1054
+msgstr "�亮留隆凌�凌溜侶�侶 留僚�旅虜竜旅亮劉僚�僚"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1056
 msgid "Ungroup Items"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:1088 ../pidgin/plugins/convcolors.c:287
+#: ../pidgin/gtkimhtmltoolbar.c:1090 ../pidgin/plugins/convcolors.c:342
 msgid "Bold"
 msgstr "�僚�凌僚留"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1089 ../pidgin/plugins/convcolors.c:294
+#: ../pidgin/gtkimhtmltoolbar.c:1091 ../pidgin/plugins/convcolors.c:351
 msgid "Italic"
 msgstr "�了略粒旅留"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1090 ../pidgin/plugins/convcolors.c:301
+#: ../pidgin/gtkimhtmltoolbar.c:1092 ../pidgin/plugins/convcolors.c:360
 msgid "Underline"
 msgstr "離�凌粒�留亮亮旅�亮劉僚留"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1091
+#: ../pidgin/gtkimhtmltoolbar.c:1093
 msgid "Strikethrough"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:1093
+#: ../pidgin/gtkimhtmltoolbar.c:1095
 msgid "Increase Font Size"
-msgstr ""
-
-#: ../pidgin/gtkimhtmltoolbar.c:1094
-msgid "Decrease Font Size"
-msgstr ""
+msgstr "��両侶�侶 亮竜粒劉慮凌�� 粒�留亮亮留�凌�竜旅�略�"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1096
-#, fuzzy
-msgid "Font Face"
-msgstr "��留亮亮留�凌�竜旅�略"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1097
-#, fuzzy
-msgid "Background Color"
-msgstr "律��亮留 �留�留�虜侶僚溜凌�"
+msgid "Decrease Font Size"
+msgstr "�竜溜��侶 亮竜粒劉慮凌�� 粒�留亮亮留�凌�竜旅�略�"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1098
-#, fuzzy
-msgid "Foreground Color"
-msgstr "律��亮留 粒�留亮亮留�凌�竜旅�略� ��凌�虜侶僚溜凌�"
+msgid "Font Face"
+msgstr "�溜隆凌� 粒�留亮亮留�凌�竜旅�略�"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1099
+msgid "Background Color"
+msgstr "律��亮留 �留�留�虜侶僚溜凌�"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1100
-#, fuzzy
+msgid "Foreground Color"
+msgstr "律��亮留 ��凌�虜侶僚溜凌�"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1102
 msgid "Reset Formatting"
 msgstr "��留僚留�凌�略 亮凌��凌�凌溜侶�侶�"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1103
-#, fuzzy
+#: ../pidgin/gtkimhtmltoolbar.c:1105
 msgid "Insert IM Image"
 msgstr "�旅�留粒�粒流 竜旅虜�僚留�"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1104
-#, fuzzy
+#: ../pidgin/gtkimhtmltoolbar.c:1106
 msgid "Insert Smiley"
-msgstr "�旅�留粒�粒流 smiley"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1179
-#, fuzzy
-msgid "<b>_Bold</b>"
-msgstr "<b>��隆旅虜��:</b>"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1180
-#, fuzzy
-msgid "<i>_Italic</i>"
-msgstr " <i>(ircop)</i>"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1181
-#, fuzzy
-msgid "<u>_Underline</u>"
-msgstr "離�凌粒�留亮亮旅�亮劉僚留"
+msgstr ""
 
 #: ../pidgin/gtkimhtmltoolbar.c:1182
-msgid "<span strikethrough='true'>Strikethrough</span>"
-msgstr ""
+msgid "<b>_Bold</b>"
+msgstr "<b>_�僚�凌僚留</b>"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1183
-#, fuzzy
-msgid "<span size='larger'>_Larger</span>"
-msgstr ""
-"<span size='larger' weight='bold'>裡�略了亮留 虜留�略 �侶僚 留�凌慮流虜竜��侶 �侶� 竜旅虜�僚留�</"
-"span>\n"
-"\n"
-"%s"
+msgid "<i>_Italic</i>"
+msgstr "<i>_�了略粒旅留</i>"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1184
+msgid "<u>_Underline</u>"
+msgstr "<u>_離�凌粒�留亮亮旅�亮劉僚留</u>"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1185
-#, fuzzy
+msgid "<span strikethrough='true'>Strikethrough</span>"
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:1186
+msgid "<span size='larger'>_Larger</span>"
+msgstr "<span size='larger'>_�竜粒留了��竜�留</span>"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1188
 msgid "_Normal"
-msgstr "陸��旅凌了凌粒旅虜��"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1187
+msgstr "_�留僚凌僚旅虜略"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1190
 msgid "<span size='smaller'>_Smaller</span>"
-msgstr ""
+msgstr "<span size='smaller'>_�旅虜���竜�留</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:1191
-#, fuzzy
+#: ../pidgin/gtkimhtmltoolbar.c:1194
 msgid "_Font face"
-msgstr "��留亮亮留�凌�竜旅�略"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1192
-#, fuzzy
+msgstr "_�溜隆凌� 粒�留亮亮留�凌�竜旅�略�"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1195
 msgid "Foreground _color"
-msgstr "律��亮留 粒�留亮亮留�凌�竜旅�略� ��凌�虜侶僚溜凌�"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1193
-#, fuzzy
+msgstr "律��亮留 _��凌�虜侶僚溜凌�"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1196
 msgid "Bac_kground color"
-msgstr "律��亮留 �留�留�虜侶僚溜凌�"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1270
-#, fuzzy
-msgid "_Smiley"
-msgstr "律留亮凌粒劉了留!"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1276
-#, fuzzy
+msgstr "律��亮留 �留_�留�虜侶僚溜凌�"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1273
 msgid "_Image"
-msgstr "��凌慮流虜竜��侶 竜旅虜�僚留�"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1282
-#, fuzzy
+msgstr "�旅_虜�僚留"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1279
 msgid "_Link"
-msgstr "_�留�留粒�留�流"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1288
+msgstr "_裡�僚隆竜�亮凌�"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1285
 msgid "_Horizontal rule"
-msgstr ""
-
-#: ../pidgin/gtklog.c:293
+msgstr "_��旅龍�僚�旅凌� �略�留虜留�"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1307
+msgid "_Smile!"
+msgstr "_律留亮凌粒劉了留!"
+
+#: ../pidgin/gtklog.c:245
+msgid "Log Deletion Failed"
+msgstr "��凌���溜留 隆旅留粒�留�流� 虜留�留粒�留�流�"
+
+#: ../pidgin/gtklog.c:246
+msgid "Check permissions and try again."
+msgstr "�了劉粒両�竜 �旅� 略隆竜旅竜� 虜留旅 隆凌虜旅亮略��竜 両留僚略."
+
+#: ../pidgin/gtklog.c:292
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation with "
@@ -15708,7 +16123,7 @@
 "�溜��竜 �溜粒凌��凌旅 ��旅 慮劉了竜�竜 僚留 隆旅留粒�略�竜�竜 凌�旅��旅虜略 �侶僚 虜留�留粒�留�流 �侶� "
 "��僚凌亮旅了溜留� 亮竜 %s �凌� 両竜虜溜僚侶�竜 ��旅� %s;"
 
-#: ../pidgin/gtklog.c:304
+#: ../pidgin/gtklog.c:303
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation in %"
@@ -15717,7 +16132,7 @@
 "�溜��竜 �溜粒凌��凌旅 ��旅 慮劉了竜�竜 僚留 隆旅留粒�略�竜�竜 凌�旅��旅虜略 �侶僚 虜留�留粒�留�流 �侶� "
 "��僚凌亮旅了溜留� ��凌 %s �凌� 両竜虜溜僚侶�竜 ��旅� %s;"
 
-#: ../pidgin/gtklog.c:309
+#: ../pidgin/gtklog.c:308
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the system log which started at %"
@@ -15726,6 +16141,14 @@
 "�溜��竜 �溜粒凌��凌旅 ��旅 慮劉了竜�竜 僚留 隆旅留粒�略�竜�竜 凌�旅��旅虜略 �侶僚 虜留�留粒�留�流 ����流亮留�凌� "
 "�凌� 両竜虜溜僚侶�竜 ��旅� %s;"
 
+#: ../pidgin/gtklog.c:323
+msgid "Delete Log?"
+msgstr "�旅留粒�留�流 虜留�留粒�留�流�;"
+
+#: ../pidgin/gtklog.c:334
+msgid "Delete Log..."
+msgstr "�旅留粒�留�流 虜留�留粒�留�流�..."
+
 #: ../pidgin/gtklog.c:453
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
@@ -15736,67 +16159,50 @@
 msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>裡�僚凌亮旅了溜留 亮竜 %s ��旅� %s</span>"
 
-#: ../pidgin/gtklog.c:503
-msgid "%B %Y"
-msgstr "%B %Y"
-
-#: ../pidgin/gtklog.c:550
-msgid ""
-"System events will only be logged if the \"Log all status changes to system "
-"log\" preference is enabled."
-msgstr ""
-"里留 粒竜粒凌僚��留 ����流亮留�凌� 慮留 虜留�留粒�略�凌僚�留旅 亮�僚凌 留僚 竜溜僚留旅 竜僚竜�粒凌�凌旅侶亮劉僚侶 侶 "
-"\"�留�留粒�留�流 �了�僚 ��僚 留了了留粒�僚 ��侶僚 虜留�留粒�留�流 ����流亮留�凌�\"."
-
-#: ../pidgin/gtklog.c:554
-msgid ""
-"Instant messages will only be logged if the \"Log all instant messages\" "
-"preference is enabled."
-msgstr ""
-"里留 略亮竜�留 亮侶僚�亮留�留 慮留 虜留�留粒�略�凌僚�留旅 亮�僚凌 留僚 竜溜僚留旅 竜僚竜�粒凌�凌旅侶亮劉僚侶 侶 "
-"\"�留�留粒�留�流 �了�僚 ��僚 略亮竜��僚 亮侶僚�亮略��僚\"."
-
-#: ../pidgin/gtklog.c:557
-msgid ""
-"Chats will only be logged if the \"Log all chats\" preference is enabled."
-msgstr ""
-"�旅 ��龍侶�流�竜旅� 慮留 虜留�留粒�略�凌僚�留旅 亮�僚凌 留僚 竜溜僚留旅 竜僚竜�粒凌�凌旅侶亮劉僚侶 侶 \"虜留�留粒�留�流 "
-"�了�僚 ��僚 ��龍侶�流�竜�僚\"."
-
-#: ../pidgin/gtklog.c:561
-msgid "No logs were found"
-msgstr "�竜 硫�劉慮侶虜留僚 虜留�留粒�留�劉�"
-
 #. Steal the "HELP" response and use it to trigger browsing to the logs folder
-#: ../pidgin/gtklog.c:576
+#: ../pidgin/gtklog.c:581
 msgid "_Browse logs folder"
 msgstr "_�両竜�竜�僚侶�侶 �留虜劉了凌� 虜留�留粒�留��僚"
 
-#: ../pidgin/gtklog.c:640
-msgid "Total log size:"
-msgstr "裡�僚凌了旅虜� 亮劉粒竜慮凌� 虜留�留粒�留�流�:"
-
-#: ../pidgin/gtklog.c:709
-#, c-format
-msgid "Conversations in %s"
-msgstr "裡�僚凌亮旅了溜竜� ��凌 %s"
-
-#: ../pidgin/gtklog.c:717 ../pidgin/gtklog.c:779
-#, c-format
-msgid "Conversations with %s"
-msgstr "裡�僚凌亮旅了溜竜� 亮竜 %s"
-
-#: ../pidgin/gtklog.c:804
-msgid "System Log"
-msgstr "�留�留粒�留�流 ����流亮留�凌�"
-
-#: ../pidgin/gtkmain.c:386
+#: ../pidgin/gtkmain.c:398
 #, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s. �凌虜旅亮略��竜 `%s -h' 粒旅留 �竜�旅����竜�竜� �了侶�凌�凌�溜竜�.\n"
 
-#: ../pidgin/gtkmain.c:388
-#, fuzzy, c-format
+#: ../pidgin/gtkmain.c:401
+#, c-format
+#, fuzzy
+msgid ""
+"%s %s\n"
+"Usage: %s [OPTION]...\n"
+"\n"
+"  -c, --config=DIR    use DIR for config files\n"
+"  -d, --debug         print debugging messages to stdout\n"
+"  -h, --help          display this help and exit\n"
+"  -m, --multiple      do not ensure single instance\n"
+"  -n, --nologin       don't automatically login\n"
+"  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
+"                      account(s) to use, separated by commas)\n"
+"  --display=DISPLAY   X display to use\n"
+"  -v, --version       display the current version and exit\n"
+msgstr ""
+"%s %s\n"
+"律�流�侶: %s [�������]...\n"
+"\n"
+"  -c, --config=DIR    ��流�侶 �凌� DIR 粒旅留 �留 留��竜溜留 ��慮亮溜�竜�僚\n"
+"  -d, --debug         ����亮留 ��僚 亮侶僚�亮略��僚 留�凌��留了亮略���侶� ��凌 stdout\n"
+"  -h, --help          竜亮�略僚旅�侶 留��流� �侶� 硫凌流慮竜旅留� 虜留旅 劉両凌隆凌�\n"
+"  -m, --multiple      do not ensure single instance\n"
+"  -n, --nologin       ���溜� 留���亮留�侶 竜溜�凌隆凌\n"
+"  -l, --login[=�����裡��] 留���亮留�侶 竜溜�凌隆凌� (�凌 ��旅�亮留 �����裡�� ��凌�隆旅凌�溜龍竜旅\n"
+"                      �凌�� 了凌粒留�旅留�亮凌�� �凌� 慮留 ��侶�旅亮凌�凌旅侶慮凌�僚, ���旅�亮劉僚凌�� "
+"亮竜 虜�亮亮留)\n"
+"  --display=DISPLAY   �慮�僚侶 X �凌� 慮留 ��侶�旅亮凌�凌旅侶慮竜溜\n"
+"  -v, --version       竜亮�略僚旅�侶 ��劉�凌��留� 劉虜隆凌�侶� 虜留旅 劉両凌隆凌�\n"
+
+#: ../pidgin/gtkmain.c:413
+#, c-format
+#, fuzzy
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
@@ -15816,16 +16222,17 @@
 "  -c, --config=DIR    ��流�侶 �凌� DIR 粒旅留 �留 留��竜溜留 ��慮亮溜�竜�僚\n"
 "  -d, --debug         ����亮留 ��僚 亮侶僚�亮略��僚 留�凌��留了亮略���侶� ��凌 stdout\n"
 "  -h, --help          竜亮�略僚旅�侶 留��流� �侶� 硫凌流慮竜旅留� 虜留旅 劉両凌隆凌�\n"
+"  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       ���溜� 留���亮留�侶 竜溜�凌隆凌\n"
 "  -l, --login[=�����裡��] 留���亮留�侶 竜溜�凌隆凌� (�凌 ��旅�亮留 �����裡�� ��凌�隆旅凌�溜龍竜旅\n"
 "                      �凌�� 了凌粒留�旅留�亮凌�� �凌� 慮留 ��侶�旅亮凌�凌旅侶慮凌�僚, ���旅�亮劉僚凌�� "
 "亮竜 虜�亮亮留)\n"
 "  -v, --version       竜亮�略僚旅�侶 ��劉�凌��留� 劉虜隆凌�侶� 虜留旅 劉両凌隆凌�\n"
 
-#: ../pidgin/gtkmain.c:512
-#, c-format
-msgid ""
-"%s has segfaulted and attempted to dump a core file.\n"
+#: ../pidgin/gtkmain.c:540
+#, c-format
+msgid ""
+"%s %s has segfaulted and attempted to dump a core file.\n"
 "This is a bug in the software and has happened through\n"
 "no fault of your own.\n"
 "\n"
@@ -15846,70 +16253,81 @@
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../pidgin/gtkmain.c:699 ../pidgin/pidgin.h:51
+#: ../pidgin/gtkmain.c:731 ../pidgin/pidgin.h:51
 msgid "Pidgin"
 msgstr "Pidgin"
 
-#: ../pidgin/gtknotify.c:349
+#: ../pidgin/gtknotify.c:354
 msgid "Open All Messages"
 msgstr "�僚凌旅粒亮留 �了�僚 ��僚 亮侶僚�亮略��僚"
 
-#: ../pidgin/gtknotify.c:402
+#: ../pidgin/gtknotify.c:408
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr ""
 "<span weight=\"bold\" size=\"larger\">��竜�竜 留了了侶了凌粒�留�溜留!</span>\n"
 "\n"
 "%s"
 
-#: ../pidgin/gtknotify.c:540
+#: ../pidgin/gtknotify.c:551
 #, 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:564
-#, fuzzy, c-format
-msgid "<b>You have %d new e-mail.</b>"
-msgid_plural "<b>You have %d new e-mails.</b>"
+#: ../pidgin/gtknotify.c:575
+#, c-format
+msgid "<b>%d new e-mail.</b>"
+msgid_plural "<b>%d new e-mails.</b>"
 msgstr[0] "<b>��竜�竜 %d 僚劉凌 e-mail.</b>"
 msgstr[1] "<b>��竜�竜 %d 僚劉留 e-mail.</b>"
 
-#: ../pidgin/gtknotify.c:989
+#: ../pidgin/gtknotify.c:1008
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "� 竜僚�凌了流 �竜�旅侶粒侶�流 \"%s\" 竜溜僚留旅 了留僚慮留�亮劉僚侶."
 
-#: ../pidgin/gtknotify.c:991 ../pidgin/gtknotify.c:1003
-#: ../pidgin/gtknotify.c:1016 ../pidgin/gtknotify.c:1144
+#: ../pidgin/gtknotify.c:1010 ../pidgin/gtknotify.c:1022
+#: ../pidgin/gtknotify.c:1035 ../pidgin/gtknotify.c:1172
 msgid "Unable to open URL"
 msgstr "�隆�僚留�凌 僚留 留僚凌旅�慮竜溜 �凌 URL"
 
-#: ../pidgin/gtknotify.c:1001 ../pidgin/gtknotify.c:1014
+#: ../pidgin/gtknotify.c:1020 ../pidgin/gtknotify.c:1033
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "裡�略了亮留 虜留�略 �侶僚 竜虜虜溜僚侶�侶 �凌� \"%s\": %s"
 
-#: ../pidgin/gtknotify.c:1145
-msgid ""
-"The 'Manual' browser command has been chosen, but no command has been set."
+#: ../pidgin/gtknotify.c:1173
+msgid "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
 "��竜旅 竜�旅了竜�慮竜溜 侶 '亮竜 �凌 �劉�旅' 竜僚�凌了流 �凌� �竜�旅侶粒侶�流, 留了了略 隆竜僚 劉�竜旅 凌�旅�慮竜溜 "
 "虜留亮溜留 竜僚�凌了流."
 
-#: ../pidgin/gtkplugin.c:265
+#: ../pidgin/gtkplugin.c:266
 msgid "The following plugins will be unloaded."
 msgstr "里留 留虜�了凌�慮留 ����慮竜�留 慮留 留�凌�凌���慮凌�僚."
 
-#: ../pidgin/gtkplugin.c:284
+#: ../pidgin/gtkplugin.c:285
 msgid "Multiple plugins will be unloaded."
 msgstr "�凌了了留�了略 ����慮竜�留 慮留 留�凌�凌���慮凌�僚."
 
-#: ../pidgin/gtkplugin.c:288
+#: ../pidgin/gtkplugin.c:289
 msgid "Unload Plugins"
 msgstr "��凌�����亮留 ��凌�慮劉��僚"
 
-#: ../pidgin/gtkplugin.c:400
+#: ../pidgin/gtkplugin.c:309
+msgid "Could not unload plugin"
+msgstr "�竜僚 流�留僚 隆�僚留�� �凌 留�凌�����亮留 �凌� ��凌�慮劉�凌�"
+
+#: ../pidgin/gtkplugin.c:310
+msgid ""
+"The plugin could not be unloaded now, but will be disabled at the next "
+"startup."
+msgstr ""
+"里凌 ����慮竜�凌 隆竜僚 亮�凌�竜溜 僚留 留�凌�凌���慮竜溜 ���留, 留了了略 慮留 留�竜僚竜�粒凌�凌旅侶慮竜溜 ��侶僚 "
+"竜��亮竜僚侶 竜虜虜溜僚侶�侶."
+
+#: ../pidgin/gtkplugin.c:418
 #, c-format
 msgid ""
 "%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
@@ -15920,7 +16338,7 @@
 "<span weight=\"bold\">���凌�竜了溜隆留:</span>\t\t%s\n"
 "<span weight=\"bold\">�僚凌亮留 留��竜溜凌�:</span>\t\t%s"
 
-#: ../pidgin/gtkplugin.c:410
+#: ../pidgin/gtkplugin.c:428
 #, c-format
 msgid ""
 "%s\n"
@@ -15931,11 +16349,11 @@
 "<span foreground=\"#ff0000\" weight=\"bold\">裡�略了亮留: %s\n"
 "�了劉粒両�竜 �侶僚 旅��凌�竜了溜隆留 �凌� ��凌�慮劉�凌� 粒旅留 竜僚侶亮竜��亮劉僚侶 劉虜隆凌�侶.</span>"
 
-#: ../pidgin/gtkplugin.c:536
+#: ../pidgin/gtkplugin.c:606
 msgid "Configure Pl_ugin"
 msgstr "痢�慮亮旅�侶 _��凌�慮劉�凌�"
 
-#: ../pidgin/gtkplugin.c:599
+#: ../pidgin/gtkplugin.c:673
 msgid "<b>Plugin Details</b>"
 msgstr "<b>�竜��凌亮劉�竜旅竜� ��凌�慮劉�凌�</b>"
 
@@ -15944,114 +16362,107 @@
 msgstr "��旅了凌粒流 留��竜溜凌�"
 
 #. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:532
+#: ../pidgin/gtkpounce.c:539
 msgid "Pounce on Whom"
 msgstr "����亮侶�侶 �竜"
 
-#: ../pidgin/gtkpounce.c:559
+#: ../pidgin/gtkpounce.c:566
 msgid "_Buddy name:"
 msgstr "_�僚凌亮留 �溜了凌�:"
 
-#: ../pidgin/gtkpounce.c:593
+#: ../pidgin/gtkpounce.c:600
 msgid "Si_gns on"
 msgstr "_裡�僚隆劉竜�留旅"
 
-#: ../pidgin/gtkpounce.c:595
+#: ../pidgin/gtkpounce.c:602
 msgid "Signs o_ff"
 msgstr "_��凌��僚隆劉竜�留旅"
 
-#: ../pidgin/gtkpounce.c:597
+#: ../pidgin/gtkpounce.c:604
 msgid "Goes a_way"
 msgstr "�溜僚竜�留旅 _留��僚"
 
-#: ../pidgin/gtkpounce.c:599
+#: ../pidgin/gtkpounce.c:606
 msgid "Ret_urns from away"
 msgstr "_��旅���劉�竜旅 留�� 留��僚"
 
-#: ../pidgin/gtkpounce.c:601
+#: ../pidgin/gtkpounce.c:608
 msgid "Becomes _idle"
 msgstr "�溜僚竜�留旅 留_僚竜僚竜�粒��"
 
-#: ../pidgin/gtkpounce.c:603
+#: ../pidgin/gtkpounce.c:610
 msgid "Is no longer i_dle"
 msgstr "�竜僚 竜溜僚留旅 �旅留 留_僚竜僚竜�粒��"
 
-#: ../pidgin/gtkpounce.c:605
+#: ../pidgin/gtkpounce.c:612
 msgid "Starts _typing"
 msgstr "�竜虜旅僚略竜旅 僚留 _�了侶虜��凌了凌粒竜溜"
 
-#: ../pidgin/gtkpounce.c:607
+#: ../pidgin/gtkpounce.c:614
 msgid "P_auses while typing"
 msgstr "�略僚竜旅 �_留��侶 虜留�略 �侶僚 �了侶虜��凌了�粒侶�侶"
 
-#: ../pidgin/gtkpounce.c:609
+#: ../pidgin/gtkpounce.c:616
 msgid "Stops t_yping"
 msgstr "裡�留亮留�略竜旅 僚留 �_了侶虜��凌了凌粒竜溜"
 
-#: ../pidgin/gtkpounce.c:611
+#: ../pidgin/gtkpounce.c:618
 msgid "Sends a _message"
 msgstr "裡�劉了僚竜旅 劉僚留 _亮流僚�亮留"
 
-#: ../pidgin/gtkpounce.c:654
+#: ../pidgin/gtkpounce.c:661
 msgid "Ope_n an IM window"
 msgstr "_�僚凌旅粒亮留 �留�留慮��凌� 略亮竜�凌� 亮侶僚�亮留�凌�"
 
-#: ../pidgin/gtkpounce.c:656
+#: ../pidgin/gtkpounce.c:663
 msgid "_Pop up a notification"
 msgstr "�僚留_隆��亮竜僚侶 竜旅隆凌�凌溜侶�侶"
 
-#: ../pidgin/gtkpounce.c:658
+#: ../pidgin/gtkpounce.c:665
 msgid "Send a _message"
 msgstr "��凌��凌了流 _亮侶僚�亮留�凌�"
 
-#: ../pidgin/gtkpounce.c:660
+#: ../pidgin/gtkpounce.c:667
 msgid "E_xecute a command"
 msgstr "_�虜�劉了竜�侶 竜僚�凌了流�"
 
-#: ../pidgin/gtkpounce.c:662
+#: ../pidgin/gtkpounce.c:669
 msgid "P_lay a sound"
 msgstr "_�僚留�留�留粒�粒流 流�凌�"
 
-#: ../pidgin/gtkpounce.c:668
+#: ../pidgin/gtkpounce.c:675
 msgid "Brows_e..."
 msgstr "_�両竜�竜�僚侶�侶..."
 
-#: ../pidgin/gtkpounce.c:670
+#: ../pidgin/gtkpounce.c:677
 msgid "Br_owse..."
 msgstr "�_両竜�竜�僚侶�侶..."
 
-#: ../pidgin/gtkpounce.c:671
+#: ../pidgin/gtkpounce.c:678
 msgid "Pre_view"
 msgstr "_��凌竜�旅�虜��侶�侶"
 
-#: ../pidgin/gtkpounce.c:798
-#, fuzzy
+#: ../pidgin/gtkpounce.c:810
 msgid "P_ounce only when my status is not Available"
 msgstr "�_���亮侶�侶 亮�僚凌 ��留僚 侶 虜留�略��留�流 亮凌� 竜溜僚留旅 亮侶 隆旅留慮劉�旅亮凌�"
 
-#: ../pidgin/gtkpounce.c:803
+#: ../pidgin/gtkpounce.c:815
 msgid "_Recurring"
 msgstr "_�留�' 竜�留僚略了侶�侶"
 
-#: ../pidgin/gtkpounce.c:1246
+#: ../pidgin/gtkpounce.c:1259
 msgid "Pounce Target"
 msgstr "裡���凌� 竜���亮侶�侶�"
 
-#: ../pidgin/gtkprefs.c:386
-#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:1
-#, fuzzy
-msgid "Default"
-msgstr "(��凌竜�旅了凌粒流)"
-
-#: ../pidgin/gtkprefs.c:517
+#: ../pidgin/gtkprefs.c:458
 msgid "Smiley theme failed to unpack."
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:644
+#: ../pidgin/gtkprefs.c:593
 msgid "Install Theme"
-msgstr ""
-
-#: ../pidgin/gtkprefs.c:697
+msgstr "�粒虜留�略��留�侶 慮劉亮留�凌�"
+
+#: ../pidgin/gtkprefs.c:646
 msgid ""
 "Select a smiley theme that you would like to use from the list below. New "
 "themes can be installed by dragging and dropping them onto the theme list."
@@ -16060,257 +16471,300 @@
 "��侶�旅亮凌�凌旅流�竜�竜. �劉留 慮劉亮留�留 亮�凌�凌�僚 僚留 竜粒虜留�留��留慮凌�僚 留僚 �留 ���竜�竜 虜留旅 �留 "
 "留�流�竜�竜 ��侶 了溜��留 慮竜亮略��僚."
 
-#: ../pidgin/gtkprefs.c:732
+#: ../pidgin/gtkprefs.c:681
 msgid "Icon"
 msgstr "�旅虜凌僚溜隆旅凌"
 
-#: ../pidgin/gtkprefs.c:894
+#: ../pidgin/gtkprefs.c:843
 msgid "System Tray Icon"
 msgstr "�旅虜凌僚溜隆旅凌 竜�粒留了竜旅凌慮流虜侶� ����流亮留�凌�"
 
-#: ../pidgin/gtkprefs.c:895
+#: ../pidgin/gtkprefs.c:844
 msgid "_Show system tray icon:"
 msgstr "�亮�略僚旅�侶 竜旅虜凌僚旅隆溜凌� 竜�粒留了竜旅凌慮流虜侶� ����流亮留�凌�"
 
-#: ../pidgin/gtkprefs.c:899
+#: ../pidgin/gtkprefs.c:847
 msgid "On unread messages"
 msgstr "��留僚 ��略��凌�僚 亮侶 留僚留粒僚��亮劉僚留 亮侶僚�亮留�留"
 
-#: ../pidgin/gtkprefs.c:904
+#: ../pidgin/gtkprefs.c:853
 msgid "Conversation Window Hiding"
 msgstr "���虜���侶 �留�留慮���僚 ��僚凌亮旅了旅�僚"
 
-#: ../pidgin/gtkprefs.c:905
+#: ../pidgin/gtkprefs.c:854
 msgid "_Hide new IM conversations:"
 msgstr "_���虜���侶 僚劉�僚 ��僚凌亮旅了旅�僚 略亮竜��僚 亮侶僚�亮略��僚:"
 
-#: ../pidgin/gtkprefs.c:908 ../pidgin/gtkprefs.c:1944
+#: ../pidgin/gtkprefs.c:857 ../pidgin/gtkprefs.c:1965
 msgid "When away"
 msgstr "�留�略 �侶僚 留�凌��溜留"
 
 #. All the tab options!
-#: ../pidgin/gtkprefs.c:916
+#: ../pidgin/gtkprefs.c:865
 msgid "Tabs"
 msgstr "�留��劉了竜�"
 
-#: ../pidgin/gtkprefs.c:918
+#: ../pidgin/gtkprefs.c:867
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "�亮�略僚旅�侶 略亮竜��僚 亮侶僚�亮略��僚 虜留旅 ��龍侶�流�竜�僚 �竜 �留�略慮��留 亮竜 _虜留��劉了竜�"
 
-#: ../pidgin/gtkprefs.c:932
+#: ../pidgin/gtkprefs.c:881
 msgid "Show close b_utton on tabs"
 msgstr "�亮�略僚旅�侶 _虜凌�亮�旅凌� 虜了竜旅�溜亮留�凌� ��旅� 虜留��劉了竜�"
 
-#: ../pidgin/gtkprefs.c:935
+#: ../pidgin/gtkprefs.c:884
 msgid "_Placement:"
 msgstr "_里凌�凌慮劉�侶�侶:"
 
-#: ../pidgin/gtkprefs.c:937
+#: ../pidgin/gtkprefs.c:886
 msgid "Top"
 msgstr "�略僚�"
 
-#: ../pidgin/gtkprefs.c:938
+#: ../pidgin/gtkprefs.c:887
 msgid "Bottom"
 msgstr "�略��"
 
-#: ../pidgin/gtkprefs.c:939
+#: ../pidgin/gtkprefs.c:888
 msgid "Left"
 msgstr "��旅��竜�略"
 
-#: ../pidgin/gtkprefs.c:940
+#: ../pidgin/gtkprefs.c:889
 msgid "Right"
 msgstr "�竜両旅略"
 
-#: ../pidgin/gtkprefs.c:942
+#: ../pidgin/gtkprefs.c:891
 msgid "Left Vertical"
 msgstr "�略慮竜�留 留�旅��竜�略"
 
-#: ../pidgin/gtkprefs.c:943
+#: ../pidgin/gtkprefs.c:892
 msgid "Right Vertical"
 msgstr "�略慮竜�留 隆竜両旅略"
 
-#: ../pidgin/gtkprefs.c:950
+#: ../pidgin/gtkprefs.c:899
 msgid "N_ew conversations:"
 msgstr "_�劉竜� ��僚凌亮旅了溜竜�:"
 
-#: ../pidgin/gtkprefs.c:995
+#: ../pidgin/gtkprefs.c:944
 msgid "Show _formatting on incoming messages"
 msgstr "�亮�略僚旅�侶 _亮凌��凌�凌溜侶�侶� 竜旅�竜���亮竜僚�僚 亮侶僚�亮略��僚"
 
-#: ../pidgin/gtkprefs.c:998
-#, fuzzy
+#: ../pidgin/gtkprefs.c:946
+msgid "Close IMs immediately when the tab is closed"
+msgstr "�了竜溜�旅亮凌 略亮竜��僚 亮侶僚�亮略��僚 留亮劉��� 亮�了旅� 虜了竜溜僚竜旅 侶 虜留��劉了留"
+
+#: ../pidgin/gtkprefs.c:949
 msgid "Show _detailed information"
-msgstr "�亮�略僚旅�侶 �了侶�凌�凌�旅�僚 ��僚隆竜�侶�"
-
-#: ../pidgin/gtkprefs.c:1000
+msgstr "�亮�略僚旅�侶 _了竜��凌亮竜�竜旅�僚"
+
+#: ../pidgin/gtkprefs.c:951
 msgid "Enable buddy ic_on animation"
 msgstr "�僚竜�粒凌�凌溜侶�侶 虜溜僚侶�侶� _竜旅虜凌僚旅隆溜凌� �溜了凌�"
 
-#: ../pidgin/gtkprefs.c:1007
+#: ../pidgin/gtkprefs.c:958
 msgid "_Notify buddies that you are typing to them"
 msgstr "_�旅隆凌�凌溜侶�侶 ��僚 �溜了�僚 ��留僚 �了侶虜��凌了凌粒竜溜�竜 �竜 留��凌��"
 
-#: ../pidgin/gtkprefs.c:1010
+#: ../pidgin/gtkprefs.c:961
 msgid "Highlight _misspelled words"
 msgstr "_里凌僚旅�亮�� 了留僚慮留�亮劉僚�僚 了劉両竜�僚"
 
-#: ../pidgin/gtkprefs.c:1014
+#: ../pidgin/gtkprefs.c:965
 msgid "Use smooth-scrolling"
 msgstr "律�流�侶 凌亮留了流� 虜�了旅�侶�"
 
-#: ../pidgin/gtkprefs.c:1017
+#: ../pidgin/gtkprefs.c:968
 msgid "F_lash window when IMs are received"
 msgstr "�留 留僚留_硫凌�硫流僚竜旅 �凌 �留�略慮��凌 ��留僚 了留亮硫略僚凌僚�留旅 略亮竜�留 亮侶僚�亮留�留"
 
-#: ../pidgin/gtkprefs.c:1019
-#, fuzzy
+#: ../pidgin/gtkprefs.c:970
 msgid "Minimi_ze new conversation windows"
-msgstr "�_僚����侶 �留�留慮��凌� ��僚凌亮旅了溜留�"
-
-#: ../pidgin/gtkprefs.c:1023
-#, fuzzy
+msgstr "�了留�旅��凌�凌溜侶�侶 �留�留慮���僚 _僚劉�僚 ��僚凌亮旅了旅�僚"
+
+#: ../pidgin/gtkprefs.c:974
 msgid "Font"
-msgstr "��留亮亮留�凌�竜旅�劉�"
-
-#: ../pidgin/gtkprefs.c:1025
+msgstr "��留亮亮留�凌�竜旅�略"
+
+#: ../pidgin/gtkprefs.c:976
 msgid "Use document font from _theme"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1027
+#: ../pidgin/gtkprefs.c:978
 msgid "Use font from _theme"
-msgstr ""
-
-#: ../pidgin/gtkprefs.c:1029
-#, fuzzy
+msgstr "律�流�侶 粒�留亮亮留�凌�竜旅�略� _慮劉亮留�凌�"
+
+#: ../pidgin/gtkprefs.c:984
 msgid "Conversation _font:"
-msgstr "�留�留���侶�侶 ��僚凌亮旅了溜留�"
-
-#: ../pidgin/gtkprefs.c:1043
+msgstr "��留亮亮留�凌�竜旅�略 _��僚凌亮旅了溜留�:"
+
+#: ../pidgin/gtkprefs.c:991
 msgid "Default Formatting"
 msgstr "��凌竜�旅了竜粒亮劉僚侶 亮凌��凌�凌溜侶�侶"
 
-#: ../pidgin/gtkprefs.c:1062
-#, fuzzy
+#: ../pidgin/gtkprefs.c:1010
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting."
 msgstr ""
 "���旅 慮留 �留溜僚竜�留旅 �凌 竜両竜���亮竜僚凌 亮流僚�亮略 �留� ��留僚 ��侶�旅亮凌�凌旅竜溜�竜 �����虜凌了了留 �凌� "
-"竜�旅��劉�凌�僚 �侶 亮凌��凌�凌溜侶�侶. :)"
-
-#: ../pidgin/gtkprefs.c:1128
+"竜�旅��劉�凌�僚 �侶 亮凌��凌�凌溜侶�侶."
+
+#: ../pidgin/gtkprefs.c:1070
+msgid "Cannot start proxy configuration program."
+msgstr "�竜僚 竜溜僚留旅 隆�僚留�流 侶 竜虜虜溜僚侶�侶 �凌� ��凌粒�略亮亮留�凌� ��慮亮溜�竜�僚 隆旅留亮竜�凌了留硫侶�流."
+
+#: ../pidgin/gtkprefs.c:1082
+msgid "Cannot start browser configuration program."
+msgstr "�竜僚 竜溜僚留旅 隆�僚留�流 侶 竜虜虜溜僚侶�侶 �凌� ��凌粒�略亮亮留�凌� ��慮亮溜�竜�僚 �竜�旅侶粒侶�流."
+
+#: ../pidgin/gtkprefs.c:1102
 msgid "ST_UN server:"
 msgstr "�両��侶�竜�侶�流� STUN:"
 
-#: ../pidgin/gtkprefs.c:1140
+#: ../pidgin/gtkprefs.c:1114
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">�留�略隆竜旅粒亮留: stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1144
+#: ../pidgin/gtkprefs.c:1118
 msgid "_Autodetect IP address"
 msgstr "_����亮留�凌� 竜僚�凌�旅�亮�� 隆旅竜�慮�僚�侶� IP"
 
-#: ../pidgin/gtkprefs.c:1153
+#: ../pidgin/gtkprefs.c:1127
 msgid "Public _IP:"
 msgstr "�侶亮��旅留 _IP:"
 
-#: ../pidgin/gtkprefs.c:1182
+#: ../pidgin/gtkprefs.c:1158
 msgid "Ports"
 msgstr "���竜�"
 
-#: ../pidgin/gtkprefs.c:1185
+#: ../pidgin/gtkprefs.c:1161
+msgid "_Enable automatic router port forwarding"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1164
 msgid "_Manually specify range of ports to listen on"
 msgstr "_��旅�亮�� �凌� 竜��凌�� ��僚 慮���僚 留虜��留�侶� 亮竜 �凌 �劉�旅"
 
-#: ../pidgin/gtkprefs.c:1188
+#: ../pidgin/gtkprefs.c:1167
 msgid "_Start port:"
 msgstr "_���留 竜虜虜溜僚侶�侶�:"
 
-#: ../pidgin/gtkprefs.c:1195
+#: ../pidgin/gtkprefs.c:1174
 msgid "_End port:"
 msgstr "_���留 �劉了凌��:"
 
+#: ../pidgin/gtkprefs.c:1182
+msgid "Proxy Server &amp; Browser"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1190
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr "<b>�竜 硫�劉慮侶虜竜 ���粒�留亮亮留 ��慮亮溜�竜�僚 隆旅留亮竜�凌了留硫侶�流.</b>"
+
+#: ../pidgin/gtkprefs.c:1198
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr "<b>�竜 硫�劉慮侶虜竜 ���粒�留亮亮留 ��慮亮溜�竜�僚 �旅竜�旅侶粒流�流.</b>"
+
 #: ../pidgin/gtkprefs.c:1203
+msgid ""
+"Proxy & Browser preferences are configured\n"
+"in GNOME Preferences"
+msgstr ""
+"�旅 ��凌�旅亮流�竜旅� �旅留亮竜�凌了留硫侶�流 & �竜�旅侶粒侶�流 ��慮亮溜龍凌僚�留旅\n"
+"��旅� ��凌�旅亮流�竜旅� �凌� GNOME"
+
+#: ../pidgin/gtkprefs.c:1210
+msgid "Configure _Proxy"
+msgstr "痢�慮亮旅�侶 _隆旅留亮竜�凌了留硫侶�流"
+
+#: ../pidgin/gtkprefs.c:1215
+msgid "Configure _Browser"
+msgstr "痢�慮亮旅�侶 _�竜�旅侶粒侶�流"
+
+#: ../pidgin/gtkprefs.c:1221
 msgid "Proxy Server"
 msgstr "�旅留亮竜�凌了留硫侶�流�"
 
-#: ../pidgin/gtkprefs.c:1207
+#: ../pidgin/gtkprefs.c:1226
 msgid "No proxy"
 msgstr "律��溜� 隆旅留亮竜�凌了留硫侶�流"
 
-#: ../pidgin/gtkprefs.c:1263
+#: ../pidgin/gtkprefs.c:1282
 msgid "_User:"
 msgstr "_律�流��侶�:"
 
-#: ../pidgin/gtkprefs.c:1328
+#: ../pidgin/gtkprefs.c:1370
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
-#: ../pidgin/gtkprefs.c:1329
+#: ../pidgin/gtkprefs.c:1371
 msgid "Opera"
 msgstr "Opera"
 
-#: ../pidgin/gtkprefs.c:1330
+#: ../pidgin/gtkprefs.c:1372
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../pidgin/gtkprefs.c:1331
+#: ../pidgin/gtkprefs.c:1373
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../pidgin/gtkprefs.c:1332
+#: ../pidgin/gtkprefs.c:1374
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../pidgin/gtkprefs.c:1333
+#: ../pidgin/gtkprefs.c:1375
+msgid "Desktop Default"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1376
 msgid "GNOME Default"
 msgstr "��凌竜�旅了凌粒流 GNOME"
 
-#: ../pidgin/gtkprefs.c:1334
+#: ../pidgin/gtkprefs.c:1377
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../pidgin/gtkprefs.c:1335
+#: ../pidgin/gtkprefs.c:1378
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../pidgin/gtkprefs.c:1336
+#: ../pidgin/gtkprefs.c:1379
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../pidgin/gtkprefs.c:1337
+#: ../pidgin/gtkprefs.c:1380
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1346
+#: ../pidgin/gtkprefs.c:1389
 msgid "Manual"
 msgstr "�竜 �凌 �劉�旅"
 
-#: ../pidgin/gtkprefs.c:1399
+#: ../pidgin/gtkprefs.c:1450
 msgid "Browser Selection"
 msgstr "��旅了凌粒流 �竜�旅侶粒侶�流"
 
-#: ../pidgin/gtkprefs.c:1403
+#: ../pidgin/gtkprefs.c:1454
 msgid "_Browser:"
 msgstr "_�竜�旅侶粒侶�流�:"
 
-#: ../pidgin/gtkprefs.c:1411
+#: ../pidgin/gtkprefs.c:1462
 msgid "_Open link in:"
 msgstr "_�僚凌旅粒亮留 ��僚隆劉�亮凌� �竜:"
 
-#: ../pidgin/gtkprefs.c:1413
+#: ../pidgin/gtkprefs.c:1464
 msgid "Browser default"
 msgstr "��凌竜�旅了竜粒亮劉僚凌� �竜�旅侶粒侶�流�"
 
-#: ../pidgin/gtkprefs.c:1414
+#: ../pidgin/gtkprefs.c:1465
 msgid "Existing window"
 msgstr "離�略��凌僚 �留�略慮��凌"
 
-#: ../pidgin/gtkprefs.c:1416
+#: ../pidgin/gtkprefs.c:1467
 msgid "New tab"
 msgstr "�劉留 虜留��劉了留"
 
-#: ../pidgin/gtkprefs.c:1430
+#: ../pidgin/gtkprefs.c:1484
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -16319,69 +16773,63 @@
 "_�竜 �凌 �劉�旅:\n"
 "(%s �� URL)"
 
-#: ../pidgin/gtkprefs.c:1470
+#: ../pidgin/gtkprefs.c:1510
 msgid "Log _format:"
 msgstr "_�凌��流 虜留�留粒�留�流�:"
 
-#: ../pidgin/gtkprefs.c:1475
+#: ../pidgin/gtkprefs.c:1515
 msgid "Log all _instant messages"
 msgstr "_�留�留粒�留�流 �了�僚 ��僚 略亮竜��僚 亮侶僚�亮略��僚"
 
-#: ../pidgin/gtkprefs.c:1477
+#: ../pidgin/gtkprefs.c:1517
 msgid "Log all c_hats"
 msgstr "�留�留粒�留�流 �了�僚 ��僚 _��龍侶�流�竜�僚"
 
-#: ../pidgin/gtkprefs.c:1479
+#: ../pidgin/gtkprefs.c:1519
 msgid "Log all _status changes to system log"
 msgstr "�留�留粒�留�流 �了�僚 ��僚 留_了了留粒�僚 虜留�略��留�侶� ��侶僚 虜留�留粒�留�流 ����流亮留�凌�"
 
-#: ../pidgin/gtkprefs.c:1625
+#: ../pidgin/gtkprefs.c:1669
 msgid "Sound Selection"
 msgstr "��旅了凌粒流 流�凌�"
 
-#: ../pidgin/gtkprefs.c:1635
-#, c-format
+#: ../pidgin/gtkprefs.c:1679
 msgid "Quietest"
 msgstr "里竜了竜溜�� 流���凌�"
 
-#: ../pidgin/gtkprefs.c:1637
-#, c-format
+#: ../pidgin/gtkprefs.c:1681
 msgid "Quieter"
 msgstr "�竜�旅����竜�凌 流���凌�"
 
-#: ../pidgin/gtkprefs.c:1639
-#, c-format
+#: ../pidgin/gtkprefs.c:1683
 msgid "Quiet"
 msgstr "����凌�"
 
-#: ../pidgin/gtkprefs.c:1643
-#, c-format
+#: ../pidgin/gtkprefs.c:1687
 msgid "Loud"
 msgstr "�凌��硫�隆侶�"
 
-#: ../pidgin/gtkprefs.c:1645
-#, c-format
+#: ../pidgin/gtkprefs.c:1689
 msgid "Louder"
 msgstr "�竜�旅����竜�凌 慮凌��硫�隆侶�"
 
-#: ../pidgin/gtkprefs.c:1647
-#, c-format
+#: ../pidgin/gtkprefs.c:1691
 msgid "Loudest"
 msgstr "里竜了竜溜�� 慮凌��硫�隆侶�"
 
-#: ../pidgin/gtkprefs.c:1713
+#: ../pidgin/gtkprefs.c:1754
 msgid "_Method:"
 msgstr "_�劉慮凌隆凌�:"
 
-#: ../pidgin/gtkprefs.c:1715
+#: ../pidgin/gtkprefs.c:1756
 msgid "Console beep"
 msgstr "��旅� 虜凌僚��了留�"
 
-#: ../pidgin/gtkprefs.c:1722
+#: ../pidgin/gtkprefs.c:1763
 msgid "No sounds"
 msgstr "律��溜� 流�凌��"
 
-#: ../pidgin/gtkprefs.c:1730
+#: ../pidgin/gtkprefs.c:1776
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -16390,208 +16838,204 @@
 "_�僚�凌了流 流�凌�:\n"
 "(%s 粒旅留 �僚凌亮留 留��竜溜凌�)"
 
-#: ../pidgin/gtkprefs.c:1757
+#: ../pidgin/gtkprefs.c:1785
 msgid "Sounds when conversation has _focus"
 msgstr "��凌� ��留僚 侶 ��僚凌亮旅了溜留 竜溜僚留旅 _竜��旅留�亮劉僚侶"
 
-#: ../pidgin/gtkprefs.c:1759
+#: ../pidgin/gtkprefs.c:1787
 msgid "Enable sounds:"
 msgstr "�僚竜�粒凌�凌溜侶�侶 了凌粒留�旅留�亮凌�:"
 
-#: ../pidgin/gtkprefs.c:1770
+#: ../pidgin/gtkprefs.c:1804
 msgid "Volume:"
 msgstr "�僚�留�侶:"
 
-#: ../pidgin/gtkprefs.c:1850
+#: ../pidgin/gtkprefs.c:1871
 msgid "Play"
 msgstr "�僚留�留�留粒�粒流"
 
-#: ../pidgin/gtkprefs.c:1927
+#: ../pidgin/gtkprefs.c:1948
 msgid "_Report idle time:"
 msgstr "�僚留�凌�略 _���僚凌� �凌� 竜溜僚留旅 留僚竜僚竜�粒��:"
 
-#: ../pidgin/gtkprefs.c:1932
+#: ../pidgin/gtkprefs.c:1953
 msgid "Based on keyboard or mouse use"
 msgstr "�略�竜旅 �侶� ��流�侶� �凌� �了侶虜��凌了凌粒溜凌� 流 �凌� �凌僚�旅虜旅凌�"
 
-#: ../pidgin/gtkprefs.c:1941
+#: ../pidgin/gtkprefs.c:1962
 msgid "_Auto-reply:"
 msgstr "_����亮留�侶 留�略僚�侶�侶:"
 
-#: ../pidgin/gtkprefs.c:1945
+#: ../pidgin/gtkprefs.c:1966
 msgid "When both away and idle"
 msgstr "���僚 虜留旅 留僚竜僚竜�粒��"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1951
+#: ../pidgin/gtkprefs.c:1972
 msgid "Auto-away"
 msgstr "����亮留�侶 留�凌��溜留"
 
-#: ../pidgin/gtkprefs.c:1953
+#: ../pidgin/gtkprefs.c:1974
 msgid "Change status when _idle"
 msgstr "�了了留粒流 虜留�略��留�侶� ��留僚 竜溜亮留旅 _留僚竜僚竜�粒��"
 
-#: ../pidgin/gtkprefs.c:1957
-#, fuzzy
+#: ../pidgin/gtkprefs.c:1978
 msgid "_Minutes before becoming idle:"
-msgstr "_�竜��略 ��旅僚 �侶僚 留了了留粒流 �侶� 虜留�略��留�侶�:"
-
-#: ../pidgin/gtkprefs.c:1965
+msgstr "_�竜��略 ��旅僚 粒溜僚� 留僚竜僚竜�粒��:"
+
+#: ../pidgin/gtkprefs.c:1985
 msgid "Change _status to:"
 msgstr "�了了留粒流 _虜留�略��留�侶� �竜:"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1986
+#: ../pidgin/gtkprefs.c:1998
 msgid "Status at Startup"
 msgstr "�留�略��留�侶 虜留�略 �侶僚 竜虜虜溜僚侶�侶"
 
-#: ../pidgin/gtkprefs.c:1988
+#: ../pidgin/gtkprefs.c:2000
 msgid "Use status from last _exit at startup"
 msgstr "律�流�侶 虜留�略��留�侶� 留�� �侶僚 �竜了竜��留溜留 _劉両凌隆凌 虜留�略 �侶僚 竜虜虜溜僚侶�侶"
 
-#: ../pidgin/gtkprefs.c:1994
+#: ../pidgin/gtkprefs.c:2007
 msgid "Status to a_pply at startup:"
 msgstr "�留�略��留�侶 虜留�略 �侶僚 竜虜虜溜僚侶�侶:"
 
-#: ../pidgin/gtkprefs.c:2032
+#: ../pidgin/gtkprefs.c:2036
 msgid "Interface"
 msgstr "�竜�旅硫略了了凌僚"
 
-#: ../pidgin/gtkprefs.c:2034
+#: ../pidgin/gtkprefs.c:2038
 msgid "Smiley Themes"
 msgstr "�劉亮留�留 smiley"
 
-#: ../pidgin/gtkprefs.c:2041
-msgid "Browser"
-msgstr "�竜�旅侶粒侶�流�"
-
 #: ../pidgin/gtkprefs.c:2045
+msgid "Browser"
+msgstr "�竜�旅侶粒侶�流�"
+
+#: ../pidgin/gtkprefs.c:2049
 msgid "Status / Idle"
 msgstr "�留�略��留�侶 / (�僚)竜僚竜�粒��"
 
-#: ../pidgin/gtkprivacy.c:80
+#: ../pidgin/gtkprivacy.c:81
 msgid "Allow all users to contact me"
 msgstr "��旅��劉�竜�留旅 �了凌旅 凌旅 ��流��竜� 僚留 竜�旅虜凌旅僚�僚凌�僚 亮留龍溜 亮凌�"
 
-#: ../pidgin/gtkprivacy.c:81
+#: ../pidgin/gtkprivacy.c:82
 msgid "Allow only the users on my buddy list"
 msgstr ""
 "��旅��劉�竜�留旅 僚留 竜�旅虜凌旅僚�僚凌�僚 亮留龍溜 亮凌� 亮�僚凌 凌旅 ��流��竜� �凌� 竜溜僚留旅 ��侶 了溜��留 "
 "�溜了�僚 亮凌�"
 
-#: ../pidgin/gtkprivacy.c:82
+#: ../pidgin/gtkprivacy.c:83
 msgid "Allow only the users below"
 msgstr "��旅��劉�凌僚�留旅 亮�僚凌 凌旅 �留�留虜略�� ��流��竜�"
 
-#: ../pidgin/gtkprivacy.c:83
+#: ../pidgin/gtkprivacy.c:84
 msgid "Block all users"
 msgstr "��凌虜了竜旅�亮�� �了�僚 ��僚 ��侶���僚"
 
-#: ../pidgin/gtkprivacy.c:84
+#: ../pidgin/gtkprivacy.c:85
 msgid "Block only the users below"
 msgstr "��凌虜了竜旅�亮�� 亮�僚凌 ��僚 �留�留虜略�� ��侶���僚"
 
-#: ../pidgin/gtkprivacy.c:370
+#: ../pidgin/gtkprivacy.c:352
 msgid "Privacy"
 msgstr "�亮�旅��竜��旅虜��侶�留"
 
-#: ../pidgin/gtkprivacy.c:382
+#: ../pidgin/gtkprivacy.c:362
 msgid "Changes to privacy settings take effect immediately."
 msgstr "�旅 留了了留粒劉� ��旅� ��慮亮溜�竜旅� 竜亮�旅��竜��旅虜��侶�留� 竜僚竜�粒凌�凌旅凌�僚�留旅 留亮劉���."
 
-#. "Set privacy for:" label
-#: ../pidgin/gtkprivacy.c:394
+#: ../pidgin/gtkprivacy.c:371
 msgid "Set privacy for:"
 msgstr "痢�慮亮旅�侶 竜亮�旅��竜��旅虜��侶�留� 粒旅留:"
 
-#: ../pidgin/gtkprivacy.c:557 ../pidgin/gtkprivacy.c:574
+#. Remove All button
+#: ../pidgin/gtkprivacy.c:417
+msgid "Remove Al_l"
+msgstr "��留溜�竜�侶 _�了�僚"
+
+#: ../pidgin/gtkprivacy.c:503 ../pidgin/gtkprivacy.c:520
 msgid "Permit User"
 msgstr "��旅��劉�竜�留旅 凌 ��流��侶�"
 
-#: ../pidgin/gtkprivacy.c:558
+#: ../pidgin/gtkprivacy.c:504
 msgid "Type a user you permit to contact you."
 msgstr "�了侶虜��凌了凌粒竜溜��竜 劉僚留 ��流��侶 �凌� 竜�旅��劉�竜�留旅 僚留 竜�旅虜凌旅僚�僚竜溜 亮留龍溜 �留�."
 
-#: ../pidgin/gtkprivacy.c:559
+#: ../pidgin/gtkprivacy.c:505
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr ""
 "�留�留虜留了凌�亮竜 竜旅�略粒竜�竜 �凌 �僚凌亮留 �凌� ��流��侶 �凌� 竜�旅慮�亮竜溜�竜 僚留 亮�凌�竜溜 僚留 "
 "竜�旅虜凌旅僚�僚竜溜 亮留龍溜 �留�."
 
-#: ../pidgin/gtkprivacy.c:562 ../pidgin/gtkprivacy.c:578
+#: ../pidgin/gtkprivacy.c:508 ../pidgin/gtkprivacy.c:524
 msgid "_Permit"
 msgstr "_��旅��劉�竜�留旅"
 
-#: ../pidgin/gtkprivacy.c:568
+#: ../pidgin/gtkprivacy.c:514
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "�留 竜�旅��留�竜溜 ��凌僚 %s 僚留 竜�旅虜凌旅僚�僚竜溜 亮留龍溜 �留�;"
 
-#: ../pidgin/gtkprivacy.c:570
+#: ../pidgin/gtkprivacy.c:516
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
-msgstr ""
-"�溜��竜 �溜粒凌��凌旅 ��旅 竜�旅慮�亮竜溜�竜 僚留 竜�旅��劉�竜�竜 ��凌僚 %s 僚留 竜�旅虜凌旅僚�僚竜溜 亮留龍溜 �留�;"
-
-#: ../pidgin/gtkprivacy.c:599 ../pidgin/gtkprivacy.c:613
+msgstr "�溜��竜 �溜粒凌��凌旅 ��旅 竜�旅慮�亮竜溜�竜 僚留 竜�旅��劉�竜�竜 ��凌僚 %s 僚留 竜�旅虜凌旅僚�僚竜溜 亮留龍溜 �留�;"
+
+#: ../pidgin/gtkprivacy.c:545 ../pidgin/gtkprivacy.c:559
 msgid "Block User"
 msgstr "��凌虜了竜旅�亮�� ��流��侶"
 
-#: ../pidgin/gtkprivacy.c:600
+#: ../pidgin/gtkprivacy.c:546
 msgid "Type a user to block."
 msgstr "�了侶虜��凌了凌粒竜溜��竜 劉僚留僚 ��流��侶 粒旅留 僚留 留�凌虜了竜旅��竜溜."
 
-#: ../pidgin/gtkprivacy.c:601
+#: ../pidgin/gtkprivacy.c:547
 msgid "Please enter the name of the user you wish to block."
-msgstr ""
-"�留�留虜留了凌�亮竜 竜旅�略粒竜�竜 �凌 �僚凌亮留 �凌� ��流��侶 �凌� 竜�旅慮�亮竜溜�竜 僚留 留�凌虜了竜旅��竜溜."
-
-#: ../pidgin/gtkprivacy.c:609
+msgstr "�留�留虜留了凌�亮竜 竜旅�略粒竜�竜 �凌 �僚凌亮留 �凌� ��流��侶 �凌� 竜�旅慮�亮竜溜�竜 僚留 留�凌虜了竜旅��竜溜."
+
+#: ../pidgin/gtkprivacy.c:555
 #, c-format
 msgid "Block %s?"
 msgstr "��凌虜了竜旅�亮�� �凌� %s;"
 
-#: ../pidgin/gtkprivacy.c:611
+#: ../pidgin/gtkprivacy.c:557
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "�溜��竜 �溜粒凌��凌旅 ��旅 慮劉了竜�竜 僚留 留�凌虜了竜旅��竜溜 凌 %s;"
 
-#: ../pidgin/gtkrequest.c:272
+#: ../pidgin/gtkrequest.c:274
 msgid "Apply"
 msgstr "��留�亮凌粒流"
 
-#: ../pidgin/gtkrequest.c:1507
+#: ../pidgin/gtkrequest.c:1503
 msgid "That file already exists"
 msgstr "���� �凌 留��竜溜凌 ��略��竜旅 流隆侶"
 
-#: ../pidgin/gtkrequest.c:1508
+#: ../pidgin/gtkrequest.c:1504
 msgid "Would you like to overwrite it?"
 msgstr "�劉了竜�竜 僚留 �凌 留僚�旅虜留�留��流�竜�竜;"
 
-#: ../pidgin/gtkrequest.c:1511
+#: ../pidgin/gtkrequest.c:1507
 msgid "Overwrite"
 msgstr "�僚�旅虜留�略��留�侶"
 
-#: ../pidgin/gtkrequest.c:1512
+#: ../pidgin/gtkrequest.c:1508
 msgid "Choose New Name"
 msgstr "��旅了凌粒流 僚劉凌� 凌僚�亮留�凌�"
 
-#: ../pidgin/gtkrequest.c:1650 ../pidgin/gtkrequest.c:1664
+#: ../pidgin/gtkrequest.c:1649 ../pidgin/gtkrequest.c:1663
 msgid "Select Folder..."
 msgstr "��旅了凌粒流 �留虜劉了凌�..."
 
-#. Create the window.
-#: ../pidgin/gtkroomlist.c:375
-msgid "Room List"
-msgstr "�溜��留 隆�亮留�溜�僚"
-
 #. list button
-#: ../pidgin/gtkroomlist.c:443
+#: ../pidgin/gtkroomlist.c:577
 msgid "_Get List"
 msgstr "_�流�侶 了溜��留�"
 
 #. add button
-#: ../pidgin/gtkroomlist.c:451
+#: ../pidgin/gtkroomlist.c:585
 msgid "_Add Chat"
 msgstr "_��凌�慮流虜侶 ��龍流�侶�侶�"
 
@@ -16602,64 +17046,72 @@
 "虜留�留��略�竜旅�;"
 
 #. Use button
-#: ../pidgin/gtksavedstatuses.c:620 ../pidgin/gtksavedstatuses.c:1266
+#: ../pidgin/gtksavedstatuses.c:616 ../pidgin/gtksavedstatuses.c:1229
 msgid "_Use"
 msgstr "_律�流�侶"
 
-#: ../pidgin/gtksavedstatuses.c:780
+#: ../pidgin/gtksavedstatuses.c:765
 msgid "Title already in use.  You must choose a unique title."
 msgstr "� �溜�了凌� ��侶�旅亮凌�凌旅竜溜�留旅 流隆侶.  ��劉�竜旅 僚留 竜�旅了劉両竜�竜 劉僚留 亮凌僚留隆旅虜� �溜�了凌."
 
-#: ../pidgin/gtksavedstatuses.c:970
+#: ../pidgin/gtksavedstatuses.c:961
 msgid "Different"
 msgstr "�旅留�凌�竜�旅虜��"
 
-#: ../pidgin/gtksavedstatuses.c:1159
+#: ../pidgin/gtksavedstatuses.c:1153
 msgid "_Title:"
 msgstr "_里溜�了凌�:"
 
-#: ../pidgin/gtksavedstatuses.c:1178 ../pidgin/gtksavedstatuses.c:1497
+#: ../pidgin/gtksavedstatuses.c:1161 ../pidgin/gtksavedstatuses.c:1453
 msgid "_Status:"
 msgstr "_�留�略��留�侶:"
 
 #. Different status message expander
-#: ../pidgin/gtksavedstatuses.c:1210
+#: ../pidgin/gtksavedstatuses.c:1177
 msgid "Use a _different status for some accounts"
 msgstr "律�流�侶 _隆旅留�凌�竜�旅虜�僚 虜留�留��略�竜�僚 粒旅留 亮竜�旅虜凌�� 了凌粒留�旅留�亮凌��"
 
 #. Save & Use button
-#: ../pidgin/gtksavedstatuses.c:1274
+#: ../pidgin/gtksavedstatuses.c:1236
 msgid "Sa_ve & Use"
 msgstr "_��凌慮流虜竜��侶 & 律�流�侶"
 
-#: ../pidgin/gtksavedstatuses.c:1480
+#: ../pidgin/gtksavedstatuses.c:1437
 #, c-format
 msgid "Status for %s"
 msgstr "�留�略��留�侶 %s"
 
-#: ../pidgin/gtkstatusbox.c:664
+#: ../pidgin/gtkstatusbox.c:683
 msgid "Waiting for network connection"
 msgstr "�僚留亮凌僚流 ��僚隆竜�侶� 亮竜 �凌 隆溜虜��凌"
 
-#: ../pidgin/gtkutils.c:632
+#: ../pidgin/gtkstatusbox.c:1096
+msgid "New status..."
+msgstr "�劉留 虜留�略��留�侶..."
+
+#: ../pidgin/gtkstatusbox.c:1097
+msgid "Saved statuses..."
+msgstr "��凌慮侶虜竜�亮劉僚竜� 虜留�留��略�竜旅�..."
+
+#: ../pidgin/gtkutils.c:683
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../pidgin/gtkutils.c:1399 ../pidgin/gtkutils.c:1422
+#: ../pidgin/gtkutils.c:1450 ../pidgin/gtkutils.c:1473
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "里凌 留虜�了凌�慮凌 ��略了亮留 ��僚劉硫侶 虜留�略 �凌 �����亮留 �凌� %s: %s"
 
-#: ../pidgin/gtkutils.c:1402 ../pidgin/gtkutils.c:1424
+#: ../pidgin/gtkutils.c:1453 ../pidgin/gtkutils.c:1475
 msgid "Failed to load image"
 msgstr "��凌���溜留 �凌���亮留�凌� 竜旅虜�僚留�"
 
-#: ../pidgin/gtkutils.c:1498
+#: ../pidgin/gtkutils.c:1549
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "�隆�僚留亮溜留 留�凌��凌了流� �凌� �留虜劉了凌� %s."
 
-#: ../pidgin/gtkutils.c:1499
+#: ../pidgin/gtkutils.c:1550
 #, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
@@ -16668,12 +17120,12 @@
 "里凌 %s 隆竜僚 亮�凌�竜溜 僚留 ��竜溜了竜旅 劉僚留僚 �略虜竜了凌. ��劉�竜旅 僚留 ��竜溜了竜�竜 �留 留��竜溜留 �凌� "
 "�竜�旅劉�凌僚�留旅 両竜���旅��略."
 
-#: ../pidgin/gtkutils.c:1531 ../pidgin/gtkutils.c:1543
-#: ../pidgin/gtkutils.c:1550
+#: ../pidgin/gtkutils.c:1584 ../pidgin/gtkutils.c:1596
+#: ../pidgin/gtkutils.c:1603
 msgid "You have dragged an image"
 msgstr "裡��留�竜 亮溜留 竜旅虜�僚留"
 
-#: ../pidgin/gtkutils.c:1532
+#: ../pidgin/gtkutils.c:1585
 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."
@@ -16681,32 +17133,31 @@
 "��凌�竜溜�竜 僚留 ��竜溜了竜�竜 留��流 �侶僚 竜旅虜�僚留 �� 亮竜�留�凌�略 留��竜溜凌�, 竜僚��亮留��亮劉僚侶 �竜 "
 "留��� �凌 亮流僚�亮留, 流 僚留 �侶 ��侶�旅亮凌�凌旅流�竜�竜 �� 竜旅虜凌僚溜隆旅凌 粒旅留 留���僚 �凌 �溜了凌."
 
-#: ../pidgin/gtkutils.c:1538 ../pidgin/gtkutils.c:1558
+#: ../pidgin/gtkutils.c:1591 ../pidgin/gtkutils.c:1611
 msgid "Set as buddy icon"
 msgstr "��旅�亮�� 竜旅虜凌僚旅隆溜凌� �溜了凌�"
 
-#: ../pidgin/gtkutils.c:1539 ../pidgin/gtkutils.c:1559
+#: ../pidgin/gtkutils.c:1592 ../pidgin/gtkutils.c:1612
 msgid "Send image file"
 msgstr "��凌��凌了流 留��竜溜凌� 竜旅虜�僚留�"
 
-#: ../pidgin/gtkutils.c:1540 ../pidgin/gtkutils.c:1559
+#: ../pidgin/gtkutils.c:1593 ../pidgin/gtkutils.c:1612
 msgid "Insert in message"
 msgstr "�旅�留粒�粒流 ��凌 亮流僚�亮留"
 
-#: ../pidgin/gtkutils.c:1544
+#: ../pidgin/gtkutils.c:1597
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "�劉了竜�竜 僚留 �凌 凌�溜�竜�竜 �� 竜旅虜凌僚溜隆旅凌 �溜了凌� 粒旅留 留���僚 �凌 ��流��侶;"
 
-#: ../pidgin/gtkutils.c:1551
-#, fuzzy
+#: ../pidgin/gtkutils.c:1604
 msgid ""
 "You can send this image as a file transfer, or use it as the buddy icon for "
 "this user."
 msgstr ""
-"��凌�竜溜�竜 僚留 ��竜溜了竜�竜 留��流 �侶僚 竜旅虜�僚留 �� 亮竜�留�凌�略 留��竜溜凌�, 竜僚��亮留��亮劉僚侶 �竜 "
-"留��� �凌 亮流僚�亮留, 流 僚留 �侶 ��侶�旅亮凌�凌旅流�竜�竜 �� 竜旅虜凌僚溜隆旅凌 粒旅留 留���僚 �凌 �溜了凌."
-
-#: ../pidgin/gtkutils.c:1552
+"��凌�竜溜�竜 僚留 ��竜溜了竜�竜 留��流 �侶僚 竜旅虜�僚留 �� 亮竜�留�凌�略 留��竜溜凌�, 流 僚留 �侶 "
+"��侶�旅亮凌�凌旅流�竜�竜 �� 竜旅虜凌僚溜隆旅凌 粒旅留 留���僚 �凌 �溜了凌."
+
+#: ../pidgin/gtkutils.c:1605
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -16719,11 +17170,11 @@
 #. * 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:1610
+#: ../pidgin/gtkutils.c:1664
 msgid "Cannot send launcher"
 msgstr "�竜僚 竜溜僚留旅 隆�僚留�流 侶 留�凌��凌了流 ��僚��亮竜��侶�"
 
-#: ../pidgin/gtkutils.c:1610
+#: ../pidgin/gtkutils.c:1664
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
@@ -16731,7 +17182,7 @@
 "裡��留�竜 亮溜留 ��僚��亮竜��侶 �侶� 竜�旅�略僚竜旅留� 竜�粒留�溜留�. 里凌 �旅慮留僚��竜�凌 竜溜僚留旅 僚留 慮劉了竜�竜 "
 "僚留 ��竜溜了竜�竜 �凌 ����凌 留��流� �侶� ��僚��亮竜��侶� 虜留旅 ��旅 �侶僚 溜隆旅留 �侶 ��僚��亮竜��侶."
 
-#: ../pidgin/gtkutils.c:2345
+#: ../pidgin/gtkutils.c:2402
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -16742,30 +17193,29 @@
 "<b>�劉粒竜慮凌� 留��竜溜凌�:</b> %s\n"
 "<b>�劉粒竜慮凌� 竜旅虜�僚留�:</b> %dx%d"
 
-#: ../pidgin/gtkutils.c:2641
+#: ../pidgin/gtkutils.c:2704
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr ""
 "里凌 留��竜溜凌 '%s' 竜溜僚留旅 �凌了� 亮竜粒略了凌 粒旅留 �凌 %s.  �留�留虜留了凌�亮竜 隆凌虜旅亮略��竜 亮溜留 "
 "亮旅虜���竜�侶 竜旅虜�僚留.\n"
 
-#: ../pidgin/gtkutils.c:2643
+#: ../pidgin/gtkutils.c:2706
 msgid "Icon Error"
 msgstr "裡�略了亮留 竜旅虜凌僚旅隆溜凌�"
 
-#: ../pidgin/gtkutils.c:2644
+#: ../pidgin/gtkutils.c:2707
 msgid "Could not set icon"
 msgstr "�竜僚 流�留僚 隆�僚留��� 凌 凌�旅�亮�� �凌� 竜旅虜凌僚旅隆溜凌�"
 
-#: ../pidgin/gtkutils.c:2744
+#: ../pidgin/gtkutils.c:2807
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "��凌���溜留 虜留�略 �凌 略僚凌旅粒亮留 �凌� 留��竜溜凌� '%s': %s"
 
-#: ../pidgin/gtkutils.c:2793
-#, c-format
-msgid ""
-"Failed to load image '%s': reason not known, probably a corrupt image file"
+#: ../pidgin/gtkutils.c:2856
+#, c-format
+msgid "Failed to load image '%s': reason not known, probably a corrupt image file"
 msgstr ""
 "��凌���溜留 虜留�略 �凌 �����亮留 �侶� 竜旅虜�僚留� '%s': 略粒僚���侶 留旅�溜留, �旅慮留僚�� 劉僚留 "
 "虜留�竜���留亮亮劉僚凌 留��竜溜凌 竜旅虜�僚留�"
@@ -16802,10 +17252,13 @@
 msgid "_Open Mail"
 msgstr "_�僚凌旅粒亮留 留了了侶了凌粒�留�溜留�"
 
+#: ../pidgin/pidgintooltip.c:100
+msgid "Pidgin Tooltip"
+msgstr "裡�亮硫凌�了劉� Pidgin"
+
 #: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:2
-#, fuzzy
 msgid "Pidgin smileys"
-msgstr "Pidgin"
+msgstr ""
 
 #: ../pidgin/pixmaps/emotes/none/none.theme.in.h:1
 msgid "Penguin Pimps"
@@ -16816,39 +17269,34 @@
 msgstr ""
 
 #: ../pidgin/pixmaps/emotes/none/none.theme.in.h:3
-#, fuzzy
 msgid "none"
-msgstr "(虜留僚劉僚留)"
-
-#: ../pidgin/plugins/cap/cap.c:450
-msgid "Display Statistics"
-msgstr "�亮�略僚旅�侶 ��留�旅��旅虜�僚"
-
-#: ../pidgin/plugins/cap/cap.c:462 ../pidgin/plugins/cap/cap.c:465
+msgstr "虜留僚劉僚留"
+
+#: ../pidgin/plugins/cap/cap.c:444 ../pidgin/plugins/cap/cap.c:447
 msgid "Response Probability:"
 msgstr "�旅慮留僚��侶�留 留僚�留��虜�旅�侶�:"
 
-#: ../pidgin/plugins/cap/cap.c:811
+#: ../pidgin/plugins/cap/cap.c:772
 msgid "Statistics Configuration"
 msgstr "痢�慮亮旅�侶 ��留�旅��旅虜�僚"
 
 #. msg_difference spinner
-#: ../pidgin/plugins/cap/cap.c:814
+#: ../pidgin/plugins/cap/cap.c:775
 msgid "Maximum response timeout:"
 msgstr "律�凌僚旅虜� ��旅凌 留僚�留��虜�旅�侶�:"
 
-#: ../pidgin/plugins/cap/cap.c:817 ../pidgin/plugins/cap/cap.c:824
-#: ../pidgin/plugins/cap/cap.c:831 ../pidgin/plugins/timestamp.c:150
+#: ../pidgin/plugins/cap/cap.c:778 ../pidgin/plugins/cap/cap.c:785
+#: ../pidgin/plugins/cap/cap.c:792 ../pidgin/plugins/timestamp.c:148
 msgid "minutes"
 msgstr "了竜��略"
 
 #. last_seen spinner
-#: ../pidgin/plugins/cap/cap.c:821
+#: ../pidgin/plugins/cap/cap.c:782
 msgid "Maximum last-seen difference:"
 msgstr "�劉粒旅��侶 隆旅留�凌�略 �竜了竜��留溜留� 慮劉留�侶�:"
 
 #. threshold spinner
-#: ../pidgin/plugins/cap/cap.c:828
+#: ../pidgin/plugins/cap/cap.c:789
 msgid "Threshold:"
 msgstr ""
 
@@ -16858,18 +17306,18 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/cap/cap.c:936
+#: ../pidgin/plugins/cap/cap.c:897
 msgid "Contact Availability Prediction"
 msgstr "���硫了竜�侶 隆旅留慮竜�旅亮��侶�留� 竜�留�流�"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/cap/cap.c:938
+#: ../pidgin/plugins/cap/cap.c:899
 msgid "Contact Availability Prediction plugin."
 msgstr "����慮竜�凌 ���硫了竜�侶� 隆旅留慮竜�旅亮��侶�留� 竜�留�流�"
 
 #. *  summary
-#: ../pidgin/plugins/cap/cap.c:939
+#: ../pidgin/plugins/cap/cap.c:900
 msgid ""
 "The contact availability plugin (cap) is used to display statistical "
 "information about buddies in a users contact list."
@@ -16924,22 +17372,21 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/contact_priority.c:187
+#: ../pidgin/plugins/contact_priority.c:188
 msgid "Contact Priority"
 msgstr "��凌�竜�留旅��侶�留 竜�留�流�"
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../pidgin/plugins/contact_priority.c:190
-msgid ""
-"Allows for controlling the values associated with different buddy states."
+#: ../pidgin/plugins/contact_priority.c:191
+msgid "Allows for controlling the values associated with different buddy states."
 msgstr ""
 "��旅��劉�竜旅 �凌僚 劉了竜粒�凌 ��僚 �旅亮�僚 �凌� ��竜�溜龍凌僚�留旅 亮竜 �旅� 隆旅留�凌�竜�旅虜劉� "
 "虜留�留��略�竜旅� �溜了�僚."
 
 #. *< description
-#: ../pidgin/plugins/contact_priority.c:192
+#: ../pidgin/plugins/contact_priority.c:193
 msgid ""
 "Allows for changing the point values of idle/away/offline states for buddies "
 "in contact priority computations."
@@ -16955,40 +17402,40 @@
 msgid "Customize colors in the conversation window"
 msgstr "��凌�留�亮凌粒流 ��僚 ���亮略��僚 ��凌 �留�略慮��凌 ��僚凌亮旅了溜留�"
 
-#: ../pidgin/plugins/convcolors.c:82
+#: ../pidgin/plugins/convcolors.c:87
 msgid "Error Messages"
 msgstr "�侶僚�亮留�留 ��留了亮略��僚"
 
-#: ../pidgin/plugins/convcolors.c:83
+#: ../pidgin/plugins/convcolors.c:88
 msgid "Highlighted Messages"
 msgstr "里凌僚旅�亮劉僚留 亮侶僚�亮留�留"
 
-#: ../pidgin/plugins/convcolors.c:84
+#: ../pidgin/plugins/convcolors.c:89
 msgid "System Messages"
 msgstr "�侶僚�亮留�留 ����流亮留�凌�"
 
-#: ../pidgin/plugins/convcolors.c:85
+#: ../pidgin/plugins/convcolors.c:90
 msgid "Sent Messages"
 msgstr "�両竜���亮竜僚留 亮侶僚�亮留�留"
 
-#: ../pidgin/plugins/convcolors.c:86
+#: ../pidgin/plugins/convcolors.c:91
 msgid "Received Messages"
 msgstr "�旅�竜���亮竜僚留 亮侶僚�亮留�留"
 
-#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:251
+#: ../pidgin/plugins/convcolors.c:223 ../pidgin/plugins/pidginrc.c:257
 #, c-format
 msgid "Select Color for %s"
 msgstr "��旅了凌粒流 ���亮留�凌� %s"
 
-#: ../pidgin/plugins/convcolors.c:310
+#: ../pidgin/plugins/convcolors.c:372
 msgid "Ignore incoming format"
 msgstr "�留�略硫了竜�侶 竜旅�竜���亮竜僚侶� 亮凌��凌�凌溜侶�侶�"
 
-#: ../pidgin/plugins/convcolors.c:311
+#: ../pidgin/plugins/convcolors.c:373
 msgid "Apply in Chats"
 msgstr "��留�亮凌粒流 ��旅� ��龍侶�流�竜旅�"
 
-#: ../pidgin/plugins/convcolors.c:312
+#: ../pidgin/plugins/convcolors.c:374
 msgid "Apply in IMs"
 msgstr "��留�亮凌粒流 ��留 略亮竜�留 亮侶僚�亮留�留"
 
@@ -17250,13 +17697,15 @@
 msgstr "�凌虜旅亮略龍竜旅 留僚 �了留 �留 �流亮留�留 ui 了竜旅�凌��粒凌�僚 ����略."
 
 #: ../pidgin/plugins/gtkbuddynote.c:36
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "<b>Buddy Note</b>: %s"
-msgstr "裡侶亮竜旅��竜旅� �溜了�僚"
-
-#: ../pidgin/plugins/history.c:188
+msgstr ""
+"\n"
+"<b>裡侶亮竜溜�亮留 �溜了凌�</b>: %s"
+
+#: ../pidgin/plugins/history.c:195
 msgid "History"
 msgstr "���凌�旅虜�"
 
@@ -17276,8 +17725,7 @@
 #. *  description
 #: ../pidgin/plugins/iconaway.c:85 ../pidgin/plugins/iconaway.c:87
 msgid "Iconifies the buddy list and your conversations when you go away."
-msgstr ""
-"�旅虜凌僚旅隆旅凌�凌旅竜溜 �侶 了溜��留 �溜了�僚 虜留旅 �旅� ��僚凌亮旅了溜竜� �留� ��留僚 竜溜��竜 亮留虜�旅略."
+msgstr "�旅虜凌僚旅隆旅凌�凌旅竜溜 �侶 了溜��留 �溜了�僚 虜留旅 �旅� ��僚凌亮旅了溜竜� �留� ��留僚 竜溜��竜 亮留虜�旅略."
 
 #: ../pidgin/plugins/mailchk.c:160
 msgid "Mail Checker"
@@ -17466,8 +17914,7 @@
 #. *  description
 #: ../pidgin/plugins/notify.c:910 ../pidgin/plugins/notify.c:912
 msgid "Provides a variety of ways of notifying you of unread messages."
-msgstr ""
-"�留�劉�竜旅 亮溜留 �凌旅虜旅了溜留 �����僚 竜旅隆凌�凌溜侶�侶� 粒旅留 �留 亮侶 留僚留粒僚��亮劉僚留 亮侶僚�亮留�留."
+msgstr "�留�劉�竜旅 亮溜留 �凌旅虜旅了溜留 �����僚 竜旅隆凌�凌溜侶�侶� 粒旅留 �留 亮侶 留僚留粒僚��亮劉僚留 亮侶僚�亮留�留."
 
 #. *< type
 #. *< ui_requirement
@@ -17499,61 +17946,56 @@
 "- �僚�旅���劉�竜旅 �凌 竜旅�竜���亮竜僚凌 虜竜溜亮竜僚凌\n"
 "- 裡�劉了僚竜旅 劉僚留 亮流僚�亮留 ��留 略�凌亮留 �侶� 了溜��留� �留� 亮�了旅� ��僚隆竜慮凌�僚"
 
-#: ../pidgin/plugins/pidginrc.c:41
+#: ../pidgin/plugins/pidginrc.c:49
 msgid "Cursor Color"
 msgstr "律��亮留 隆竜溜虜�侶 �凌僚�旅虜旅凌�"
 
-#: ../pidgin/plugins/pidginrc.c:42
+#: ../pidgin/plugins/pidginrc.c:50
 msgid "Secondary Cursor Color"
 msgstr "�竜��竜�竜�凌僚 ���亮留 隆竜溜虜�侶 �凌僚�旅虜旅凌�"
 
-#: ../pidgin/plugins/pidginrc.c:43
+#: ../pidgin/plugins/pidginrc.c:51
 msgid "Hyperlink Color"
 msgstr "律��亮留 ��竜���僚隆劉�亮凌�"
 
 #: ../pidgin/plugins/pidginrc.c:54
+msgid "Highlighted Message Name Color"
+msgstr "律��亮留 凌僚凌亮略��僚 �凌僚旅�亮劉僚�僚 亮侶僚�亮略��僚"
+
+#: ../pidgin/plugins/pidginrc.c:66
 msgid "GtkTreeView Horizontal Separation"
 msgstr ""
 
-#: ../pidgin/plugins/pidginrc.c:73
+#: ../pidgin/plugins/pidginrc.c:81
 msgid "Conversation Entry"
 msgstr "�留�留���侶�侶 ��僚凌亮旅了溜留�"
 
-#: ../pidgin/plugins/pidginrc.c:74
-msgid "Conversation History"
-msgstr "���凌�旅虜� ��僚凌亮旅了溜留�"
-
-#: ../pidgin/plugins/pidginrc.c:75
-msgid "Log Viewer"
-msgstr "�竜�旅侶粒侶�流� 虜留�留粒�留��僚"
-
-#: ../pidgin/plugins/pidginrc.c:76
+#: ../pidgin/plugins/pidginrc.c:82
 msgid "Request Dialog"
 msgstr "�旅略了凌粒凌� 留旅�流亮留�凌�"
 
-#: ../pidgin/plugins/pidginrc.c:77
+#: ../pidgin/plugins/pidginrc.c:83
 msgid "Notify Dialog"
 msgstr "�旅略了凌粒凌� 竜旅隆凌�凌溜侶�侶�"
 
-#: ../pidgin/plugins/pidginrc.c:253
+#: ../pidgin/plugins/pidginrc.c:259
 msgid "Select Color"
 msgstr "��旅了凌粒流 ���亮留�凌�"
 
-#: ../pidgin/plugins/pidginrc.c:300
-#, c-format
+#: ../pidgin/plugins/pidginrc.c:306
 msgid "Select Interface Font"
 msgstr "��旅了凌粒流 粒�留亮亮留�凌�竜旅�略� �竜�旅硫略了了凌僚�凌�"
 
-#: ../pidgin/plugins/pidginrc.c:303
+#: ../pidgin/plugins/pidginrc.c:309
 #, c-format
 msgid "Select Font for %s"
 msgstr "��旅了凌粒流 粒�留亮亮留�凌�竜旅�略� %s"
 
-#: ../pidgin/plugins/pidginrc.c:371
+#: ../pidgin/plugins/pidginrc.c:377
 msgid "GTK+ Interface Font"
 msgstr "��留亮亮留�凌�竜旅�略 �竜�旅硫略了了凌僚�凌� GTK+"
 
-#: ../pidgin/plugins/pidginrc.c:391
+#: ../pidgin/plugins/pidginrc.c:397
 msgid "GTK+ Text Shortcut Theme"
 msgstr "�劉亮留 虜竜旅亮劉僚凌� ��僚��亮竜��侶� GTK+"
 
@@ -17577,36 +18019,36 @@
 #. widget_bool_widgets[i]);
 #. }
 #.
-#: ../pidgin/plugins/pidginrc.c:428
+#: ../pidgin/plugins/pidginrc.c:434
 msgid "Interface colors"
 msgstr "律��亮留�留 �竜�旅硫略了了凌僚�凌�"
 
-#: ../pidgin/plugins/pidginrc.c:452
+#: ../pidgin/plugins/pidginrc.c:458
 msgid "Widget Sizes"
-msgstr ""
-
-#: ../pidgin/plugins/pidginrc.c:473
+msgstr "�竜粒劉慮侶 竜�留�亮凌粒旅隆溜�僚"
+
+#: ../pidgin/plugins/pidginrc.c:479
 msgid "Fonts"
 msgstr "��留亮亮留�凌�竜旅�劉�"
 
-#: ../pidgin/plugins/pidginrc.c:497
+#: ../pidgin/plugins/pidginrc.c:503
 msgid "Gtkrc File Tools"
-msgstr ""
-
-#: ../pidgin/plugins/pidginrc.c:502
+msgstr "��粒留了竜溜留 留��竜溜�僚 Gtkrc"
+
+#: ../pidgin/plugins/pidginrc.c:508
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
 msgstr "�粒粒�留�流 ��慮亮溜�竜�僚 ��凌 %s%sgtkrc-2.0"
 
-#: ../pidgin/plugins/pidginrc.c:511
+#: ../pidgin/plugins/pidginrc.c:517
 msgid "Re-read gtkrc files"
 msgstr "�僚略粒僚��侶 ��僚 留��竜溜�僚 gtkrc 両留僚略"
 
-#: ../pidgin/plugins/pidginrc.c:544
+#: ../pidgin/plugins/pidginrc.c:555
 msgid "Pidgin GTK+ Theme Control"
 msgstr "�了竜粒�凌� 慮竜亮略��僚 Pidgin GTK+"
 
-#: ../pidgin/plugins/pidginrc.c:546 ../pidgin/plugins/pidginrc.c:547
+#: ../pidgin/plugins/pidginrc.c:557 ../pidgin/plugins/pidginrc.c:558
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "�留�劉�竜旅 ����硫留�侶 �竜 ���僚略 ��侶�旅亮凌�凌旅凌�亮竜僚竜� ��慮亮溜�竜旅� gtkrc."
 
@@ -17630,16 +18072,18 @@
 "��竜溜了竜�竜.  �了劉粒両�竜 �凌 �留�略慮��凌 留�凌��留了亮略���侶�."
 
 #: ../pidgin/plugins/relnot.c:71
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "You are using %s version %s.  The current version is %s.  You can get it "
 "from <a href=\"%s\">%s</a><hr>"
-msgstr "律�侶�旅亮凌�凌旅竜溜�竜 �凌 %s ��侶僚 劉虜隆凌�侶 %s.  � ��劉�凌��留 劉虜隆凌�侶 竜溜僚留旅 %s.<hr>"
+msgstr ""
+"律�侶�旅亮凌�凌旅流�竜 %s ��侶僚 劉虜隆凌�侶 %s.  � ��劉�凌��留 劉虜隆凌�侶 竜溜僚留旅 %s.  ��凌�竜溜�竜 僚留 "
+"�侶 了略硫竜�竜 留�� �凌 <a href=\"%s\">%s</a><hr>"
 
 #: ../pidgin/plugins/relnot.c:79
-#, fuzzy, c-format
+#, c-format
 msgid "<b>ChangeLog:</b><br>%s"
-msgstr "<br><b>�劉亮留 ��龍流�侶�侶� 虜留僚留了旅凌�:</b><br>%s"
+msgstr ""
 
 #: ../pidgin/plugins/relnot.c:84 ../pidgin/plugins/relnot.c:85
 msgid "New Version Available"
@@ -17679,62 +18123,62 @@
 msgid "The specified word already exists in the correction list."
 msgstr "� 了劉両侶 �凌� 隆�慮侶虜竜 ��略��竜旅 流隆侶 ��侶 了溜��留 隆旅凌�慮��竜�僚."
 
-#: ../pidgin/plugins/spellchk.c:2177
+#: ../pidgin/plugins/spellchk.c:2176
 msgid "Text Replacements"
 msgstr "�僚�旅虜留�留��略�竜旅� 虜竜旅亮劉僚凌�"
 
-#: ../pidgin/plugins/spellchk.c:2200
+#: ../pidgin/plugins/spellchk.c:2199
 msgid "You type"
 msgstr "�了侶虜��凌了凌粒竜溜�竜"
 
-#: ../pidgin/plugins/spellchk.c:2214
+#: ../pidgin/plugins/spellchk.c:2213
 msgid "You send"
 msgstr "裡�劉了僚竜�竜"
 
-#: ../pidgin/plugins/spellchk.c:2228
+#: ../pidgin/plugins/spellchk.c:2227
 msgid "Whole words only"
 msgstr "��僚凌 凌了�虜了侶�竜� 了劉両竜旅�"
 
-#: ../pidgin/plugins/spellchk.c:2240
+#: ../pidgin/plugins/spellchk.c:2239
 msgid "Case sensitive"
 msgstr "�旅略虜�旅�侶 �竜龍�僚/虜竜�留了留溜�僚"
 
-#: ../pidgin/plugins/spellchk.c:2266
+#: ../pidgin/plugins/spellchk.c:2265
 msgid "Add a new text replacement"
 msgstr "��凌�慮流虜侶 僚劉留� 留僚�旅虜留�略��留�侶� 虜竜旅亮劉僚凌�"
 
-#: ../pidgin/plugins/spellchk.c:2282
+#: ../pidgin/plugins/spellchk.c:2281
 msgid "You _type:"
 msgstr "_�了侶虜��凌了凌粒竜溜�竜:"
 
-#: ../pidgin/plugins/spellchk.c:2299
+#: ../pidgin/plugins/spellchk.c:2285
 msgid "You _send:"
 msgstr "_裡�劉了僚竜�竜:"
 
 #. Created here so it can be passed to whole_words_button_toggled.
-#: ../pidgin/plugins/spellchk.c:2311
+#: ../pidgin/plugins/spellchk.c:2288
 msgid "_Exact case match (uncheck for automatic case handling)"
 msgstr ""
 "_�旅略虜�旅�侶 �竜龍�僚 / 虜竜�留了留溜�僚 (留�流��竜 �凌 留�竜僚竜�粒凌�凌旅侶亮劉僚凌 粒旅留 留���亮留�侶 "
 "隆旅留�竜溜�旅�侶)"
 
-#: ../pidgin/plugins/spellchk.c:2313
+#: ../pidgin/plugins/spellchk.c:2290
 msgid "Only replace _whole words"
 msgstr "�僚�旅虜留�略��留�侶 亮�僚凌 凌_了�虜了侶��僚 了劉両竜�僚"
 
-#: ../pidgin/plugins/spellchk.c:2338
+#: ../pidgin/plugins/spellchk.c:2315
 msgid "General Text Replacement Options"
 msgstr "�竜僚旅虜劉� 竜�旅了凌粒劉� 留僚�旅虜留�略��留�侶� 虜竜旅亮劉僚凌�"
 
-#: ../pidgin/plugins/spellchk.c:2339
+#: ../pidgin/plugins/spellchk.c:2316
 msgid "Enable replacement of last word on send"
 msgstr "�僚竜�粒凌�凌溜侶�侶 留僚�旅虜留�略��留�侶� �侶� �竜了竜��留溜留� 了劉両侶� 虜留�略 �侶僚 留�凌��凌了流"
 
-#: ../pidgin/plugins/spellchk.c:2370
+#: ../pidgin/plugins/spellchk.c:2349
 msgid "Text replacement"
 msgstr "�僚�旅虜留�略��留�侶 虜竜旅亮劉僚凌�"
 
-#: ../pidgin/plugins/spellchk.c:2372 ../pidgin/plugins/spellchk.c:2373
+#: ../pidgin/plugins/spellchk.c:2351 ../pidgin/plugins/spellchk.c:2352
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr ""
 "�僚�旅虜留慮旅��略 �凌 虜竜溜亮竜僚凌 ��留 竜両竜���亮竜僚留 亮侶僚�亮留�留 ��亮��僚留 亮竜 凌�旅�亮劉僚凌�� 留�� �凌僚 "
@@ -17746,7 +18190,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/ticker/ticker.c:74 ../pidgin/plugins/ticker/ticker.c:354
+#: ../pidgin/plugins/ticker/ticker.c:74 ../pidgin/plugins/ticker/ticker.c:356
 msgid "Buddy Ticker"
 msgstr "�了竜粒虜�流� �溜了�僚"
 
@@ -17754,11 +18198,11 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/ticker/ticker.c:357 ../pidgin/plugins/ticker/ticker.c:359
+#: ../pidgin/plugins/ticker/ticker.c:359 ../pidgin/plugins/ticker/ticker.c:361
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "�溜留 凌�旅龍�僚�旅留 劉虜隆凌�侶 �侶� 了溜��留� �溜了�僚."
 
-#: ../pidgin/plugins/timestamp.c:137
+#: ../pidgin/plugins/timestamp.c:135
 msgid "Display Timestamps Every"
 msgstr "�亮�略僚旅�侶 ��凌僚凌�流亮�僚 虜略慮竜"
 
@@ -17768,19 +18212,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/timestamp.c:202
+#: ../pidgin/plugins/timestamp.c:200
 msgid "Timestamp"
 msgstr "律�凌僚��侶亮留"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/timestamp.c:205
+#: ../pidgin/plugins/timestamp.c:203
 msgid "Display iChat-style timestamps"
 msgstr "�亮�略僚旅�侶 ��凌僚凌�流亮�僚 ��凌 ���了 �凌� iChat"
 
 #. *  description
-#: ../pidgin/plugins/timestamp.c:207
+#: ../pidgin/plugins/timestamp.c:205
 msgid "Display iChat-style timestamps every N minutes."
 msgstr "�亮�留僚溜龍竜旅 ��凌僚��侶亮留 ��凌 ���了 �凌� iChat 虜略慮竜 N 了竜��略."
 
@@ -17789,7 +18233,6 @@
 msgstr "��旅了凌粒劉� 亮凌��凌�凌溜侶�侶� ��凌僚凌�流亮�僚"
 
 #: ../pidgin/plugins/timestamp_format.c:26
-#, c-format
 msgid "_Force 24-hour time format"
 msgstr "_�両留僚留粒虜留�亮�� 亮凌��流� ��留� 24 ���僚"
 
@@ -17953,13 +18396,12 @@
 msgstr "��旅了凌粒劉� 竜旅隆旅虜略 粒旅留 �凌 Pidgin 粒旅留 Windows."
 
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:374
-msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+msgid "Provides options specific to Pidgin for Windows , such as buddy list docking."
 msgstr ""
 "�留�劉�竜旅 竜�旅了凌粒劉� 竜旅隆旅虜略 粒旅留 �凌 Windows Pidgin, ���� 竜溜僚留旅 侶 ��凌�略��侶�侶 �侶� "
 "了溜��留� �溜了�僚."
 
-#: ../pidgin/plugins/xmppconsole.c:667
+#: ../pidgin/plugins/xmppconsole.c:670
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr "<font color='#777777'>��凌��僚隆劉慮侶虜竜.</font>"
 
@@ -17969,267 +18411,42 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/xmppconsole.c:746 ../pidgin/plugins/xmppconsole.c:841
-#: ../pidgin/plugins/xmppconsole.c:860
+#: ../pidgin/plugins/xmppconsole.c:749 ../pidgin/plugins/xmppconsole.c:844
+#: ../pidgin/plugins/xmppconsole.c:863
 msgid "XMPP Console"
 msgstr "�凌僚��了留 XMPP"
 
-#: ../pidgin/plugins/xmppconsole.c:753
+#: ../pidgin/plugins/xmppconsole.c:756
 msgid "Account: "
 msgstr "�凌粒留�旅留�亮��: "
 
-#: ../pidgin/plugins/xmppconsole.c:780
+#: ../pidgin/plugins/xmppconsole.c:783
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>�竜僚 竜溜僚留旅 ��僚隆竜隆竜亮劉僚凌 亮竜 �凌 XMPP</font>"
 
-#: ../pidgin/plugins/xmppconsole.c:790
+#: ../pidgin/plugins/xmppconsole.c:793
 msgid "Insert an <iq/> stanza."
 msgstr ""
 
-#: ../pidgin/plugins/xmppconsole.c:799
+#: ../pidgin/plugins/xmppconsole.c:802
 msgid "Insert a <presence/> stanza."
 msgstr ""
 
-#: ../pidgin/plugins/xmppconsole.c:808
+#: ../pidgin/plugins/xmppconsole.c:811
 msgid "Insert a <message/> stanza."
 msgstr ""
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/xmppconsole.c:863
+#: ../pidgin/plugins/xmppconsole.c:866
 msgid "Send and receive raw XMPP stanzas."
 msgstr ""
 
 #. *  description
-#: ../pidgin/plugins/xmppconsole.c:865
+#: ../pidgin/plugins/xmppconsole.c:868
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 "���� �凌 ����慮竜�凌 竜溜僚留旅 ��流�旅亮凌 粒旅留 �侶僚 留�凌��留了亮略���侶 竜両��侶�竜�侶��僚 虜留旅 "
 "�竜了留��僚 XMPP."
 
-#, fuzzy
-#~ msgid "Offline buddies"
-#~ msgstr "�亮�略僚旅�侶 亮侶 ��僚隆竜隆竜亮劉僚�僚 �溜了�僚"
-
-#, fuzzy
-#~ msgid "Sort"
-#~ msgstr "���留"
-
-#, fuzzy
-#~ msgid "By Status"
-#~ msgstr "�僚略 虜留�略��留�侶"
-
-#, fuzzy
-#~ msgid "By Log Size"
-#~ msgstr "�僚略 亮劉粒竜慮凌� 虜留�留粒�留�流�"
-
-#, fuzzy
-#~ msgid "Unable to connect to contact server"
-#~ msgstr "�隆�僚留�侶 侶 ��僚隆竜�侶 亮竜 �凌僚 竜両��侶�竜�侶�流."
-
-#, fuzzy
-#~ msgid "Unable to retrieve MSN Address Book"
-#~ msgstr "�隆�僚留�侶 侶 了流�侶 �侶� 了溜��留� �溜了�僚"
-
-#, fuzzy
-#~ msgid "Current media"
-#~ msgstr "�留��僚 ��留"
-
-#, fuzzy
-#~ msgid "Windows Live Messenger Protocol Plugin"
-#~ msgstr "����慮竜�凌 ����凌虜�了了凌� Novell GroupWise Messenger"
-
-#, fuzzy
-#~ msgid "Windows Live ID authentication Failed"
-#~ msgstr "��凌���溜留: � 劉粒虜�旅�流 留�劉���竜"
-
-#, fuzzy
-#~ msgid "Unknown error (%d)"
-#~ msgstr "�粒僚���凌 ��略了亮留"
-
-#, fuzzy
-#~ msgid "Unable to connect to OIM server"
-#~ msgstr "�隆�僚留�侶 侶 ��僚隆竜�侶 亮竜 �凌僚 竜両��侶�竜�侶�流."
-
-#, fuzzy
-#~ msgid "%s (%s) changed status from %s to %s"
-#~ msgstr "%s 略了了留両竜 虜留�略��留�侶 留�� %s �竜 %s"
-
-#, fuzzy
-#~ msgid "%s (%s) is now %s"
-#~ msgstr "%s ���留 竜溜僚留旅 %s"
-
-#, fuzzy
-#~ msgid "%s (%s) is no longer %s"
-#~ msgstr "%s 隆竜僚 竜溜僚留旅 �了劉凌僚 %s"
-
-#, fuzzy
-#~ msgid "_Merge"
-#~ msgstr "_�流僚�亮留:"
-
-#, fuzzy
-#~ msgid "_Send File..."
-#~ msgstr "_��凌��凌了流 留��竜溜凌�"
-
-#, fuzzy
-#~ msgid "Add Buddy _Pounce..."
-#~ msgstr "��凌�慮流虜侶 竜���亮侶�侶� �溜了凌�..."
-
-#, fuzzy
-#~ msgid "Hide when offline"
-#~ msgstr "�竜僚 竜�旅��劉�竜�留旅 ���溜� ��僚隆竜�侶"
-
-#, fuzzy
-#~ msgid "Show when offline"
-#~ msgstr "�竜僚 竜�旅��劉�竜�留旅 ���溜� ��僚隆竜�侶"
-
-#, fuzzy
-#~ msgid "Add _Buddy..."
-#~ msgstr "��凌�慮流虜侶 �溜了凌�"
-
-#, fuzzy
-#~ msgid "Add C_hat..."
-#~ msgstr "��凌�慮流虜侶 ��龍流�侶�侶�"
-
-#, fuzzy
-#~ msgid "Persistent"
-#~ msgstr "�竜��旅虜略"
-
-#, fuzzy
-#~ msgid "/Accounts/Manage"
-#~ msgstr "/�凌粒留�旅留�亮凌溜"
-
-#, fuzzy
-#~ msgid "A_ccount:"
-#~ msgstr "�凌粒留�旅留�亮��:"
-
-#, fuzzy
-#~ msgid "S_end To"
-#~ msgstr "��凌��凌了流 �竜"
-
-#~ msgid ""
-#~ "%s was disconnected due to the following error:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "%s 留�凌��僚隆劉慮侶虜竜 了�粒� �凌� 留虜�了凌�慮凌� ��略了亮留�凌�:\n"
-#~ "%s"
-
-#~ msgid "Commands are not supported yet. Message was NOT sent."
-#~ msgstr "�竜僚 ��凌��侶�溜龍凌僚�留旅 留虜�亮留 竜僚�凌了劉�. 里凌 亮流僚�亮留 �� ��略了慮侶虜竜."
-
-#~ msgid "User information for %s unavailable:"
-#~ msgstr "�了侶�凌�凌�溜竜� �凌� ��流��侶 %s 亮侶 隆旅留慮劉�旅亮竜�:"
-
-#~ msgid "You have been signed off for an unknown reason."
-#~ msgstr "��凌��僚隆竜慮流虜留�竜 留�� 略粒僚���侶 留旅�溜留."
-
-#~ msgid ""
-#~ "Could not add the buddy %s for an unknown reason.  The most common reason "
-#~ "for this is that you have the maximum number of allowed buddies in your "
-#~ "buddy list."
-#~ msgstr ""
-#~ "�竜僚 流�留僚 隆�僚留�流 侶 ��凌�慮流虜侶 �凌� %s 粒旅留 略粒僚���凌 了�粒凌.  � �旅凌 ��僚流慮侶� 留旅�溜留 "
-#~ "�凌� ��亮硫留溜僚竜旅 留��� 竜溜僚留旅 ��旅 劉�竜�竜 �凌僚 留僚��留�凌 留�旅慮亮� 竜�旅��竜��亮竜僚�僚 �溜了�僚 "
-#~ "��侶 了溜��留 �溜了�僚 �留�."
-
-#~ msgid "_Connect"
-#~ msgstr "_裡�僚隆竜�侶"
-
-#~ msgid "Are you sure to exit this Qun?"
-#~ msgstr "�溜��竜 �溜粒凌��凌旅 ��旅 慮劉了竜�竜 僚留 硫粒竜溜�竜 留�� 留��� �凌 Qun;"
-
-#~ msgid "Go ahead"
-#~ msgstr "裡�僚劉�竜旅留"
-
-#~ msgid "Server ACK"
-#~ msgstr "ACK 竜両��侶�竜�侶�流"
-
-#~ msgid "Send IM fail\n"
-#~ msgstr "��凌���溜留 留�凌��凌了流� 略亮竜�凌� 亮侶僚�亮留�凌�\n"
-
-#~ msgid "Keep alive error, seems connection lost!"
-#~ msgstr "裡�略了亮留 隆旅留�流�侶�侶� �侶� ��僚隆竜�侶�, �留溜僚竜�留旅 ��旅 侶 ��僚隆竜�侶 �略慮侶虜竜!"
-
-#~ 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 "裡�略了亮留 留�凌��凌了流� ��凌隆凌�劉留"
-
-#~ msgid "Connection refused"
-#~ msgstr "��僚侶�侶 ��僚隆竜�侶�"
-
-#~ msgid "Would like to add him?"
-#~ msgstr "�劉了竜�竜 僚留 �凌僚 ��凌�慮劉�竜�竜;"
-
-#~ msgid "Reject watching by other users"
-#~ msgstr "�����旅�侶 �留�留虜凌了凌�慮侶�侶� 留�� 略了了凌�� ��流��竜�"
-
-#~ msgid "Block invites"
-#~ msgstr "��凌虜了竜旅�亮�� ��凌�虜了流�竜�僚"
-
-#~ msgid "Reject online status attribute requests"
-#~ msgstr "�����旅�侶 留旅�流�竜�僚 �了侶�凌�凌�旅�僚 ��僚隆竜�侶�"
-
-#~ msgid "Unavailable"
-#~ msgstr "�侶 隆旅留慮劉�旅亮凌�"
-
-#~ msgid "Alias..."
-#~ msgstr "�僚����� ��..."
-
-#~ msgid "/Options/Show Buddy _Icon"
-#~ msgstr "/��旅了凌粒劉�/�亮�略僚旅�侶 _竜旅虜凌僚旅隆溜�僚 �溜了�僚"
-
-#~ msgid "/Options/Show Buddy Icon"
-#~ msgstr "/��旅了凌粒劉�/�亮�略僚旅�侶 竜旅虜凌僚旅隆溜�僚 �溜了�僚"
-
-#~ msgid "Smaller font size"
-#~ msgstr "�旅虜���竜�凌 亮劉粒竜慮凌� 粒�留亮亮留�凌�竜旅�略�"
-
-#~ msgid "Insert link"
-#~ msgstr "�旅�留粒�粒流 ��僚隆劉�亮凌�"
-
-#~ msgid "Insert image"
-#~ msgstr "�旅�留粒�粒流 竜旅虜�僚留�"
-
-#~ msgid "Show buddy _icons"
-#~ msgstr "�亮�略僚旅�侶 _竜旅虜凌僚旅隆溜�僚 �溜了�僚"
-
-#~ msgid ""
-#~ "You can send this image as a file transfer or embed it into this message, "
-#~ "or use it as the buddy icon for this user."
-#~ msgstr ""
-#~ "��凌�竜溜�竜 僚留 ��竜溜了竜�竜 留��流 �侶僚 竜旅虜�僚留 �� 亮竜�留�凌�略 留��竜溜凌� 流 竜僚��亮留��亮劉僚侶 "
-#~ "�竜 留��� �凌 亮流僚�亮留, 流 僚留 �侶 ��侶�旅亮凌�凌旅流�竜�竜 �� 竜旅虜凌僚溜隆旅凌 粒旅留 留���僚 �凌 �溜了凌."
-
-#~ msgid "Tools"
-#~ msgstr "��粒留了竜溜留"
-
-#~ msgid ""
-#~ "You can get version %s from:<br><a href=\"http://pidgin.im/\">http://"
-#~ "pidgin.im</a>."
-#~ msgstr ""
-#~ "��凌�竜溜�竜 僚留 ��凌亮侶慮竜��竜溜�竜 �侶僚 劉虜隆凌�侶 %s 留�� �凌:<br><a href=\"http://"
-#~ "pidgin.im/\">http://pidgin.im</a>."