changeset 22558:16a4b1fc98ea

Russian translation updated (Dmitry Beloglazov) Closes #5103
author Stu Tomlinson <stu@nosnilmot.com>
date Tue, 25 Mar 2008 14:38:39 +0000 (2008-03-25)
parents d36775c919ab
children 832c1da0287d
files po/ChangeLog po/ru.po
diffstat 2 files changed, 3979 insertions(+), 3613 deletions(-) [+]
line wrap: on
line diff
--- a/po/ChangeLog	Tue Mar 25 14:38:02 2008 +0000
+++ b/po/ChangeLog	Tue Mar 25 14:38:39 2008 +0000
@@ -9,6 +9,7 @@
 	* Finnish translation updated (Timo Jyrinki)
 	* French translation updated (�ric Boumaour)
 	* German translation updated (Jochen Kemnade, Bj旦rn Voigt)
+	* Russian translation updated (Dmitry Beloglazov)
 
 version 2.4.0
 	* Arabic translation updated (Khaled Hosny)
--- a/po/ru.po	Tue Mar 25 14:38:02 2008 +0000
+++ b/po/ru.po	Tue Mar 25 14:38:39 2008 +0000
@@ -2,15 +2,15 @@
 # Copyright (C) 2001, 2003-2007 Free Software Foundation, Inc.
 # Sergey Volozhanin <svo@asplinux.ru>, 2001.
 # Alexandre Prokoudine <avp@altlinux.ru>, 2003, 2004.
-# Dmitry Beloglazov <dmaa@users.sf.net>, 2004-2007.
+# Dmitry Beloglazov <dmaa@users.sf.net>, 2004-2008.
 #
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-11-12 10:14+0300\n"
-"PO-Revision-Date: 2007-11-12 12:00+0300\n"
+"POT-Creation-Date: 2008-03-06 11:20+0300\n"
+"PO-Revision-Date: 2008-03-06 12:00+0300\n"
 "Last-Translator: Dmitry Beloglazov <dmaa@users.sf.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -19,8 +19,10 @@
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\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"
 
@@ -50,7 +52,7 @@
 "  -n, --nologin       仆亠 于�仂亟亳�� 舒于�仂仄舒�亳�亠�从亳\n"
 "  -v, --version       仗仂从舒亰舒�� �亠从���� 于亠��亳� 亳 于�亶�亳\n"
 
-#: ../finch/finch.c:328 ../pidgin/gtkmain.c:718
+#: ../finch/finch.c:327 ../pidgin/gtkmain.c:751
 #, c-format
 msgid ""
 "%s encountered errors migrating your settings from %s to %s. Please "
@@ -58,15 +60,15 @@
 "http://developer.pidgin.im"
 msgstr ""
 
-#: ../finch/gntaccount.c:124 ../finch/gntaccount.c:484 ../finch/gntblist.c:300
-#: ../finch/gntblist.c:433 ../finch/gntblist.c:446 ../finch/gntplugin.c:189
-#: ../finch/gntplugin.c:237 ../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:2032
+#: ../libpurple/protocols/jabber/buddy.c:2064
 #: ../libpurple/protocols/jabber/chat.c:677
 #: ../libpurple/protocols/jabber/chat.c:688
-#: ../libpurple/protocols/jabber/jabber.c:1553
+#: ../libpurple/protocols/jabber/jabber.c:1591
 #: ../libpurple/protocols/qq/group_join.c:328
 #: ../libpurple/protocols/qq/im.c:576 ../libpurple/protocols/silc/ops.c:57
 #: ../libpurple/protocols/silc/ops.c:1460
@@ -98,8 +100,8 @@
 msgid "(You probably forgot to 'make install'.)"
 msgstr ""
 
-#: ../finch/gntaccount.c:496 ../finch/gntconn.c:137
-#: ../pidgin/gtkaccount.c:1478 ../pidgin/gtkblist.c:4492
+#: ../finch/gntaccount.c:496 ../finch/gntconn.c:138
+#: ../pidgin/gtkaccount.c:1447 ../pidgin/gtkblist.c:4542
 msgid "Modify Account"
 msgstr "�亰仄亠仆亳�� ����仆�� 亰舒仗亳��"
 
@@ -126,37 +128,40 @@
 
 #. 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:2224 ../finch/gntblist.c:2287
-#: ../finch/gntcertmgr.c:91 ../finch/gntplugin.c:475 ../finch/gntpounce.c:472
-#: ../finch/gntpounce.c:680 ../finch/gntprefs.c:265 ../finch/gntsound.c:1058
-#: ../finch/gntstatus.c:145 ../finch/gntstatus.c:485 ../finch/gntstatus.c:610
-#: ../libpurple/account.c:1105 ../libpurple/account.c:1394
-#: ../libpurple/account.c:1429 ../libpurple/conversation.c:1215
+#: ../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:728
-#: ../libpurple/protocols/jabber/buddy.c:2426
-#: ../libpurple/protocols/jabber/buddy.c:2462
+#: ../libpurple/protocols/jabber/buddy.c:758
+#: ../libpurple/protocols/jabber/buddy.c:2458
+#: ../libpurple/protocols/jabber/buddy.c:2494
 #: ../libpurple/protocols/jabber/chat.c:786
-#: ../libpurple/protocols/jabber/jabber.c:1035
-#: ../libpurple/protocols/jabber/jabber.c:1044
-#: ../libpurple/protocols/jabber/jabber.c:1746
-#: ../libpurple/protocols/jabber/si.c:874
+#: ../libpurple/protocols/jabber/jabber.c:1060
+#: ../libpurple/protocols/jabber/jabber.c:1069
+#: ../libpurple/protocols/jabber/jabber.c:1784
+#: ../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:291 ../libpurple/protocols/msn/msn.c:308
-#: ../libpurple/protocols/msn/msn.c:325 ../libpurple/protocols/msn/msn.c:342
-#: ../libpurple/protocols/msn/msn.c:363 ../libpurple/protocols/msnp9/msn.c:287
-#: ../libpurple/protocols/msnp9/msn.c:304
-#: ../libpurple/protocols/msnp9/msn.c:321
-#: ../libpurple/protocols/msnp9/msn.c:338
-#: ../libpurple/protocols/msnp9/msn.c:359
-#: ../libpurple/protocols/oscar/oscar.c:6144
+#: ../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/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:6223
 #: ../libpurple/protocols/oscar/peer.c:1048
 #: ../libpurple/protocols/qq/buddy_info.c:525
 #: ../libpurple/protocols/qq/buddy_opt.c:214
@@ -164,17 +169,17 @@
 #: ../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:3430
-#: ../libpurple/protocols/sametime/sametime.c:3516
-#: ../libpurple/protocols/sametime/sametime.c:3690
-#: ../libpurple/protocols/sametime/sametime.c:5443
-#: ../libpurple/protocols/sametime/sametime.c:5533
-#: ../libpurple/protocols/sametime/sametime.c:5658
+#: ../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:1079
 #: ../libpurple/protocols/silc/buddy.c:1194
@@ -188,41 +193,41 @@
 #: ../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:943
-#: ../libpurple/protocols/yahoo/yahoo.c:1034
-#: ../libpurple/protocols/yahoo/yahoo.c:3509
-#: ../libpurple/protocols/yahoo/yahoo.c:3520 ../pidgin/gtkaccount.c:1913
-#: ../pidgin/gtkaccount.c:2501 ../pidgin/gtkblist.c:6639
-#: ../pidgin/gtkcertmgr.c:197 ../pidgin/gtkdialogs.c:787
-#: ../pidgin/gtkdialogs.c:926 ../pidgin/gtkdialogs.c:1018
-#: ../pidgin/gtkdialogs.c:1038 ../pidgin/gtkdialogs.c:1062
-#: ../pidgin/gtkdialogs.c:1084 ../pidgin/gtkdialogs.c:1132
-#: ../pidgin/gtkdialogs.c:1173 ../pidgin/gtkdialogs.c:1229
-#: ../pidgin/gtkdialogs.c:1268 ../pidgin/gtkdialogs.c:1295
-#: ../pidgin/gtkimhtmltoolbar.c:437 ../pidgin/gtklog.c:328
-#: ../pidgin/gtkplugin.c:289 ../pidgin/gtkpounce.c:1121
-#: ../pidgin/gtkprivacy.c:565 ../pidgin/gtkprivacy.c:581
-#: ../pidgin/gtkprivacy.c:606 ../pidgin/gtkprivacy.c:620
-#: ../pidgin/gtkrequest.c:321 ../pidgin/gtksavedstatuses.c:345
-#: ../pidgin/gtkstatusbox.c:1593
+#: ../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:3560
+#: ../libpurple/protocols/yahoo/yahoo.c:3571 ../pidgin/gtkaccount.c:1841
+#: ../pidgin/gtkaccount.c:2402 ../pidgin/gtkblist.c:6768
+#: ../pidgin/gtkcertmgr.c:197 ../pidgin/gtkdialogs.c:766
+#: ../pidgin/gtkdialogs.c:905 ../pidgin/gtkdialogs.c:997
+#: ../pidgin/gtkdialogs.c:1017 ../pidgin/gtkdialogs.c:1041
+#: ../pidgin/gtkdialogs.c:1063 ../pidgin/gtkdialogs.c:1111
+#: ../pidgin/gtkdialogs.c:1152 ../pidgin/gtkdialogs.c:1208
+#: ../pidgin/gtkdialogs.c:1247 ../pidgin/gtkdialogs.c:1274
+#: ../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/gntdebug.c:297
-#: ../finch/gntplugin.c:475 ../finch/gntpounce.c:478 ../finch/gntprefs.c:265
-#: ../finch/gntsound.c:1055 ../finch/gntstatus.c:488 ../finch/gntstatus.c:598
-#: ../libpurple/account.c:1428 ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:727 ../pidgin/gtkdebug.c:754
-#: ../pidgin/gtkrequest.c:327
+#: ../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:757 ../pidgin/gtkdebug.c:746
+#: ../pidgin/gtkrequest.c:279
 msgid "Save"
 msgstr "弌仂��舒仆亳��"
 
-#: ../finch/gntaccount.c:632 ../pidgin/gtkaccount.c:1905
-#: ../pidgin/gtksavedstatuses.c:333 ../pidgin/gtkstatusbox.c:1587
+#: ../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,127 +237,148 @@
 msgstr "丕亟舒仍亳�� ����仆�� 亰舒仗亳��"
 
 #. Delete button
-#: ../finch/gntaccount.c:637 ../finch/gntaccount.c:707
-#: ../finch/gntcertmgr.c:319 ../finch/gntpounce.c:679 ../finch/gntpounce.c:742
+#: ../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:1912 ../pidgin/gtklog.c:327
-#: ../pidgin/gtkpounce.c:1120 ../pidgin/gtkrequest.c:324
-#: ../pidgin/gtksavedstatuses.c:344 ../pidgin/gtkstatusbox.c:1592
+#: ../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:2121 ../finch/gntui.c:82
-#: ../pidgin/gtkaccount.c:2331 ../pidgin/gtkdocklet.c:715
+#: ../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/gntblist.c:2379
-#: ../finch/gntcertmgr.c:306 ../finch/gntnotify.c:385 ../finch/gntpounce.c:726
-#: ../finch/gntstatus.c:199 ../libpurple/protocols/gg/gg.c:885
-#: ../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:5532
+#: ../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:2500
-#: ../pidgin/gtkblist.c:6638 ../pidgin/gtkconv.c:1713
-#: ../pidgin/gtkrequest.c:325
+#: ../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:734
+#: ../finch/gntaccount.c:704 ../finch/gntpounce.c:733
 msgid "Modify"
 msgstr "�亰仄亠仆亳��"
 
-#: ../finch/gntaccount.c:811 ../pidgin/gtkaccount.c:2447
+#: ../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:2499
+#: ../finch/gntaccount.c:885 ../pidgin/gtkaccount.c:2400
 msgid "Add buddy to your list?"
 msgstr "�仂弍舒于亳�� �仂弍亠�亠亟仆亳从舒 于 �仗亳�仂从?"
 
-#: ../finch/gntaccount.c:944 ../pidgin/gtkaccount.c:2557
+#: ../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:2580
-#: ../pidgin/gtkaccount.c:2586
+#: ../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:2581 ../pidgin/gtkaccount.c:2587
-msgid "Authorize"
-msgstr "�于�仂�亳亰仂于舒��"
-
 #: ../finch/gntaccount.c:977 ../finch/gntaccount.c:1004
-#: ../pidgin/gtkaccount.c:2582 ../pidgin/gtkaccount.c:2588
+#: ../pidgin/gtkaccount.c:2482 ../pidgin/gtkaccount.c:2489
+msgid "Authorize"
+msgstr "�于�仂�亳亰仂于舒��"
+
+#: ../finch/gntaccount.c:978 ../finch/gntaccount.c:1005
+#: ../pidgin/gtkaccount.c:2483 ../pidgin/gtkaccount.c:2490
 msgid "Deny"
 msgstr "��从舒亰舒��"
 
-#: ../finch/gntblist.c:289
+#: ../finch/gntblist.c:265
+#, c-format
+msgid ""
+"Online: %d\n"
+"Total: %d"
+msgstr ""
+"� �亠�亳: %d\n"
+"��亠亞仂: %d"
+
+#: ../finch/gntblist.c:274
+#, c-format
+msgid "Account: %s (%s)"
+msgstr "丕���仆舒� 亰舒仗亳��: %s (%s)"
+
+#: ../finch/gntblist.c:286
+#, c-format
+msgid ""
+"\n"
+"Last Seen: %s ago"
+msgstr ""
+"\n"
+"�仂�仍亠亟仆亠亠 仗仂�于仍亠仆亳亠: %s 仆舒亰舒亟"
+
+#: ../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:291
+#: ../finch/gntblist.c:565
 msgid "You must provide a group."
 msgstr "�� 亟仂仍亢仆� 亰舒亟舒�� 亞��仗仗�."
 
-#: ../finch/gntblist.c:293
+#: ../finch/gntblist.c:567
 msgid "You must select an account."
 msgstr "�� 亟仂仍亢仆� 于�弍�舒�� ����仆�� 亰舒仗亳��."
 
-#: ../finch/gntblist.c:295
+#: ../finch/gntblist.c:569
 msgid "The selected account is not online."
 msgstr ""
 
-#: ../finch/gntblist.c:300
+#: ../finch/gntblist.c:574
 msgid "Error adding buddy"
 msgstr "��亳弍从舒 亟仂弍舒于仍亠仆亳� �仂弍亠�亠亟仆亳从舒"
 
-#: ../finch/gntblist.c:325 ../libpurple/protocols/oscar/oscar.c:2898
-#: ../pidgin/gtkaccount.c:1986 ../pidgin/gtksavedstatuses.c:986
+#: ../finch/gntblist.c:601 ../pidgin/gtkaccount.c:1914
+#: ../pidgin/gtksavedstatuses.c:971
 msgid "Screen Name"
 msgstr "�亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍�"
 
-#: ../finch/gntblist.c:328 ../finch/gntblist.c:410 ../finch/gntblist.c:1250
-#: ../libpurple/protocols/msn/msn.c:1551
-#: ../libpurple/protocols/msnp9/msn.c:1402
-#: ../libpurple/protocols/silc/chat.c:610
-#: ../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:1037
-#: ../pidgin/gtkdialogs.c:1061 ../pidgin/gtkdialogs.c:1083
-#: ../pidgin/gtkrequest.c:328
-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/gntblist.c:2210 ../finch/gntblist.c:2274 ../finch/gntnotify.c:174
-#: ../finch/gntstatus.c:576 ../libpurple/plugins/idle.c:153
-#: ../libpurple/plugins/idle.c:190 ../pidgin/gtkblist.c:3242
-#: ../pidgin/gtknotify.c:512 ../pidgin/gtkpounce.c:1288
-#: ../pidgin/plugins/gevolution/gevolution.c:445
+#: ../finch/gntblist.c:604
+#, fuzzy
+msgid "Alias (optional)"
+msgstr "��亠于亟仂仆亳仄 从仂仆�舒从�舒"
+
+#: ../finch/gntblist.c:607
+#, fuzzy
+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:341 ../finch/gntblist.c:852
+#: ../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
@@ -361,190 +387,212 @@
 #: ../libpurple/protocols/silc10/buddy.c:1036
 #: ../libpurple/protocols/silc10/buddy.c:1083
 #: ../libpurple/protocols/silc10/buddy.c:1183
-#: ../libpurple/protocols/yahoo/yahoo.c:3354 ../pidgin/gtkblist.c:6140
+#: ../libpurple/protocols/yahoo/yahoo.c:3400 ../pidgin/gtkblist.c:6298
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
 msgid "Add Buddy"
 msgstr "�仂弍舒于亳�� �仂弍亠�亠亟仆亳从舒"
 
-#: ../finch/gntblist.c:341
+#: ../finch/gntblist.c:617
 msgid "Please enter buddy information."
 msgstr "�于亠亟亳�亠 亳仆�仂�仄舒�亳� 仂 �仂弍亠�亠亟仆亳从亠."
 
-#: ../finch/gntblist.c:370 ../libpurple/blist.c:1210
+#: ../finch/gntblist.c:647 ../libpurple/blist.c:1237
 msgid "Chats"
 msgstr "丼舒��"
 
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:407 ../finch/gntblist.c:2205
-#: ../libpurple/protocols/jabber/jabber.c:951
-#: ../libpurple/protocols/jabber/jabber.c:954
-#: ../libpurple/protocols/msn/msn.c:1732 ../libpurple/protocols/msn/msn.c:1797
-#: ../libpurple/protocols/msn/msn.c:1824
-#: ../libpurple/protocols/msnp9/msn.c:1585
-#: ../libpurple/protocols/msnp9/msn.c:1650
-#: ../libpurple/protocols/msnp9/msn.c:1677
-#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:608
-#: ../pidgin/gtkroomlist.c:931
+#: ../finch/gntblist.c:684 ../finch/gntblist.c:2578 ../finch/gntblist.c:2632
+#: ../finch/gntroomlist.c:298 ../libpurple/protocols/jabber/jabber.c:988
+#: ../libpurple/protocols/jabber/jabber.c:991
+#: ../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:416 ../finch/gntblist.c:819
+#: ../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:1016
+#: ../pidgin/gtkdialogs.c:1040 ../pidgin/gtkdialogs.c:1062
+#: ../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:419 ../finch/gntblist.c:854 ../pidgin/gtkblist.c:6524
+#: ../finch/gntblist.c:696 ../finch/gntblist.c:1128 ../pidgin/gtkblist.c:6681
 msgid "Add Chat"
 msgstr "�仂弍舒于亳�� �舒�"
 
-#: ../finch/gntblist.c:420
+#: ../finch/gntblist.c:697
 msgid "You can edit more information from the context menu later."
 msgstr "�� 仄仂亢亠�亠 亳亰仄亠仆亳�� 弍仂仍��亠 亳仆�仂�仄舒�亳亳 仗仂亰亢亠 亳亰 从仂仆�亠从��仆仂亞仂 仄亠仆�."
 
-#: ../finch/gntblist.c:433 ../finch/gntblist.c:446
+#: ../finch/gntblist.c:710 ../finch/gntblist.c:723
 msgid "Error adding group"
 msgstr "��亳弍从舒 亟仂弍舒于仍亠仆亳� 亞��仗仗�"
 
-#: ../finch/gntblist.c:434
+#: ../finch/gntblist.c:711
 msgid "You must give a name for the group to add."
 msgstr "�� 亟仂仍亢仆� 亟舒�� 亳仄� 亟仂弍舒于仍�亠仄仂亶 亞��仗仗亠."
 
-#: ../finch/gntblist.c:447
+#: ../finch/gntblist.c:724
 msgid "A group with the name already exists."
 msgstr "���仗仗舒 � �舒从亳仄 亳仄亠仆亠仄 �亢亠 ���亠��于�亠�."
 
-#: ../finch/gntblist.c:454 ../finch/gntblist.c:856
-#: ../libpurple/protocols/sametime/sametime.c:5442
-#: ../libpurple/protocols/sametime/sametime.c:5530 ../pidgin/gtkblist.c:6635
+#: ../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:454
+#: ../finch/gntblist.c:731
 msgid "Enter the name of the group"
 msgstr "�于亠亟亳�亠 亳仄� 亞��仗仗�"
 
-#: ../finch/gntblist.c:802
+#: ../finch/gntblist.c:1076
 msgid "Edit Chat"
 msgstr "�亰仄亠仆亳�� �舒�"
 
-#: ../finch/gntblist.c:802
+#: ../finch/gntblist.c:1076
 msgid "Please Update the necessary fields."
 msgstr "�弍仆仂于亳�亠 仆�亢仆�亠 仗仂仍�."
 
-#: ../finch/gntblist.c:803 ../finch/gntstatus.c:205
+#: ../finch/gntblist.c:1077 ../finch/gntstatus.c:205
 msgid "Edit"
 msgstr "�亰仄亠仆亳��"
 
-#: ../finch/gntblist.c:828
+#: ../finch/gntblist.c:1102
 msgid "Edit Settings"
 msgstr "�亰仄亠仆亳�� 仆舒���仂亶从亳"
 
-#: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:931
+#: ../finch/gntblist.c:1138 ../pidgin/gtkutils.c:980
 msgid "Information"
 msgstr "�仆�仂�仄舒�亳�"
 
-#: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:931
+#: ../finch/gntblist.c:1138 ../pidgin/gtkutils.c:980
 msgid "Retrieving..."
 msgstr "�舒亞��亰从舒..."
 
-#: ../finch/gntblist.c:904 ../finch/gntconv.c:528
+#: ../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:908
+#: ../finch/gntblist.c:1196
 msgid "Add Buddy Pounce"
 msgstr "�仂弍舒于亳�� 仗�舒于亳仍仂"
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:915 ../finch/gntconv.c:540
-#: ../libpurple/protocols/jabber/si.c:874
-#: ../libpurple/protocols/oscar/oscar.c:654 ../libpurple/protocols/qq/qq.c:588
-#: ../pidgin/gtkconv.c:1661
+#: ../finch/gntblist.c:1203 ../finch/gntconv.c:603
+#: ../libpurple/protocols/jabber/si.c:1109
+#: ../libpurple/protocols/oscar/oscar.c:655 ../libpurple/protocols/qq/qq.c:588
+#: ../pidgin/gtkconv.c:1650
 msgid "Send File"
 msgstr "��仗�舒于亳�� �舒亶仍"
 
-#: ../finch/gntblist.c:919
+#: ../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:1000
+#: ../finch/gntblist.c:1298
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr "�于亠亟亳�亠 仆仂于仂亠 亳仄� 亟仍� %s"
 
-#: ../finch/gntblist.c:1002 ../finch/gntblist.c:1250
+#: ../finch/gntblist.c:1300 ../finch/gntblist.c:1589
 msgid "Rename"
 msgstr "�亠�亠亳仄亠仆仂于舒��"
 
-#: ../finch/gntblist.c:1002
+#: ../finch/gntblist.c:1300
 msgid "Set Alias"
 msgstr "�舒亟舒�� 仗�亠于亟仂仆亳仄"
 
-#: ../finch/gntblist.c:1003
+#: ../finch/gntblist.c:1301
 msgid "Enter empty string to reset the name."
 msgstr "�于亠亟亳�亠 仗����� ���仂从� 亟仍� �弍�仂�舒 亳仄亠仆亳."
 
-#: ../finch/gntblist.c:1079
+#: ../finch/gntblist.c:1415
 msgid "Removing this contact will also remove all the buddies in the contact"
 msgstr ""
 "丕亟舒仍亠仆亳亠 ��仂亞仂 从仂仆�舒从�舒 仗�亳于亠亟�� 从 �亟舒仍亠仆亳� 于�亠� 于�仂亟��亳� 于 仆亠亞仂 �仂弍亠�亠亟仆亳从仂于"
 
-#: ../finch/gntblist.c:1087
+#: ../finch/gntblist.c:1423
 msgid "Removing this group will also remove all the buddies in the group"
 msgstr ""
 "丕亟舒仍亠仆亳亠 ��仂亶 亞��仗仗� 仗�亳于亠亟�� 从 �亟舒仍亠仆亳� 于�亠� 于�仂亟��亳� 于 仆亠� �仂弍亠�亠亟仆亳从仂于"
 
-#: ../finch/gntblist.c:1092
+#: ../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:1095
+#: ../finch/gntblist.c:1431
 msgid "Confirm Remove"
 msgstr "�仂亟�于亠�亟亳�� �亟舒仍亠仆亳亠"
 
-#: ../finch/gntblist.c:1100 ../finch/gntblist.c:1252 ../finch/gntft.c:227
-#: ../pidgin/gtkconv.c:1710 ../pidgin/gtkrequest.c:326
-#: ../pidgin/gtkstatusbox.c:264
+#: ../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:1226 ../finch/gntblist.c:2432 ../finch/gntprefs.c:258
-#: ../finch/gntui.c:83 ../pidgin/gtkblist.c:2908 ../pidgin/gtkblist.c:4898
+#: ../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:1257
+#: ../finch/gntblist.c:1596
 msgid "Place tagged"
 msgstr "�亠��仂 仗仂仄亠�亠仆仂"
 
-#: ../finch/gntblist.c:1262
+#: ../finch/gntblist.c:1601
 msgid "Toggle Tag"
 msgstr "�弍�舒�亳�� 仗仂仄亠�从�"
 
 #. General
-#: ../finch/gntblist.c:1298 ../libpurple/protocols/gg/gg.c:638
+#: ../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:1247
-#: ../libpurple/protocols/jabber/buddy.c:2217
-#: ../libpurple/protocols/jabber/buddy.c:2409
-#: ../libpurple/protocols/jabber/jabber.c:964
-#: ../libpurple/protocols/jabber/jabber.c:1573
-#: ../libpurple/protocols/jabber/jabber.c:1587
-#: ../libpurple/protocols/jabber/jabber.c:1601
-#: ../libpurple/protocols/jabber/jabber.c:1615
-#: ../libpurple/protocols/jabber/jabber.c:1629
-#: ../libpurple/protocols/msn/msn.c:1559 ../libpurple/protocols/msn/msn.c:1735
-#: ../libpurple/protocols/msnp9/msn.c:1410
-#: ../libpurple/protocols/msnp9/msn.c:1588
+#: ../libpurple/protocols/jabber/buddy.c:314
+#: ../libpurple/protocols/jabber/buddy.c:1279
+#: ../libpurple/protocols/jabber/buddy.c:2249
+#: ../libpurple/protocols/jabber/buddy.c:2441
+#: ../libpurple/protocols/jabber/jabber.c:999
+#: ../libpurple/protocols/jabber/jabber.c:1611
+#: ../libpurple/protocols/jabber/jabber.c:1625
+#: ../libpurple/protocols/jabber/jabber.c:1639
+#: ../libpurple/protocols/jabber/jabber.c:1653
+#: ../libpurple/protocols/jabber/jabber.c:1667
+#: ../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
@@ -554,74 +602,61 @@
 #: ../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:3266
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1072 ../pidgin/gtkblist.c:3225
 msgid "Nickname"
 msgstr "��亠于亟仂仆亳仄"
 
 #. Idle stuff
-#: ../finch/gntblist.c:1320 ../finch/gntprefs.c:261
-#: ../libpurple/protocols/bonjour/bonjour.c:358
-#: ../libpurple/protocols/jabber/buddy.c:787
-#: ../libpurple/protocols/jabber/buddy.c:951
-#: ../libpurple/protocols/msn/msn.c:611 ../libpurple/protocols/msn/msn.c:629
-#: ../libpurple/protocols/msn/msn.c:637 ../libpurple/protocols/msn/state.c:32
-#: ../libpurple/protocols/msnp9/msn.c:544
+#: ../finch/gntblist.c:1663 ../finch/gntprefs.c:261
+#: ../libpurple/protocols/bonjour/bonjour.c:376
+#: ../libpurple/protocols/jabber/buddy.c:817
+#: ../libpurple/protocols/jabber/buddy.c:981
+#: ../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:2842
-#: ../libpurple/protocols/oscar/oscar.c:2922
-#: ../libpurple/protocols/yahoo/yahoo.c:3108
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3294
-#: ../pidgin/gtkblist.c:3700 ../pidgin/gtkprefs.c:2026
+#: ../libpurple/protocols/novell/novell.c:2843
+#: ../libpurple/protocols/oscar/oscar.c:2980
+#: ../libpurple/protocols/yahoo/yahoo.c:3154
+#: ../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:1334
+#: ../finch/gntblist.c:1677
 msgid "On Mobile"
 msgstr ""
 
-#: ../finch/gntblist.c:1415
-#, c-format
-msgid ""
-"Online: %d\n"
-"Total: %d"
-msgstr ""
-"� �亠�亳: %d\n"
-"��亠亞仂: %d"
-
-#: ../finch/gntblist.c:1424
-#, c-format
-msgid "Account: %s (%s)"
-msgstr "丕���仆舒� 亰舒仗亳��: %s (%s)"
-
-#: ../finch/gntblist.c:1436
-#, c-format
-msgid ""
-"\n"
-"Last Seen: %s ago"
-msgstr ""
-"\n"
-"�仂�仍亠亟仆亠亠 仗仂�于仍亠仆亳亠: %s 仆舒亰舒亟"
-
-#: ../finch/gntblist.c:1704 ../pidgin/gtkdocklet.c:582
+#: ../finch/gntblist.c:1976 ../pidgin/gtkdocklet.c:582
 msgid "New..."
 msgstr "�仂于�亶..."
 
-#: ../finch/gntblist.c:1711 ../pidgin/gtkdocklet.c:583
+#: ../finch/gntblist.c:1983 ../pidgin/gtkdocklet.c:583
 msgid "Saved..."
 msgstr "弌仂��舒仆�仆仆�亶..."
 
-#: ../finch/gntblist.c:2089 ../finch/gntplugin.c:345 ../finch/gntui.c:88
-#: ../pidgin/gtkdocklet.c:716 ../pidgin/gtkplugin.c:555
+#: ../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:2218 ../pidgin/gtkdialogs.c:781
-msgid "New Instant Message"
-msgstr "�仂于仂亠 仄亞仆仂于亠仆仆仂亠 �仂仂弍�亠仆亳亠"
-
-#: ../finch/gntblist.c:2220 ../pidgin/gtkdialogs.c:783
-msgid ""
-"Please enter the screen name or alias of the person you would like to IM."
+#: ../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
+#, fuzzy
+msgid ""
+"Please enter the screen name or alias of the person you would like to Block/"
+"Unblock."
 msgstr ""
 "�于亠亟亳�亠 亳亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍� 亳仍亳 仗�亠于亟仂仆亳仄 仗亠��仂仆�, 从仂�仂�仂亶 于� �仂�亠仍亳 "
 "弍� 仂�仗�舒于亳�� �仂仂弍�亠仆亳亠."
@@ -629,19 +664,22 @@
 #. Not multiline
 #. Not masked?
 #. No hints?
-#: ../finch/gntblist.c:2223 ../finch/gntcertmgr.c:90 ../finch/gntconn.c:136
-#: ../finch/gntnotify.c:80 ../libpurple/account.c:1104
-#: ../libpurple/account.c:1393 ../libpurple/protocols/gg/gg.c:507
+#: ../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:1745
+#: ../libpurple/protocols/jabber/jabber.c:1783
 #: ../libpurple/protocols/jabber/xdata.c:399
-#: ../libpurple/protocols/msn/msn.c:290 ../libpurple/protocols/msn/msn.c:307
-#: ../libpurple/protocols/msn/msn.c:324 ../libpurple/protocols/msn/msn.c:341
-#: ../libpurple/protocols/msnp9/msn.c:286
-#: ../libpurple/protocols/msnp9/msn.c:303
-#: ../libpurple/protocols/msnp9/msn.c:320
-#: ../libpurple/protocols/msnp9/msn.c:337
-#: ../libpurple/protocols/oscar/oscar.c:6143
+#: ../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/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:6222
 #: ../libpurple/protocols/silc/buddy.c:454
 #: ../libpurple/protocols/silc/buddy.c:1193
 #: ../libpurple/protocols/silc/chat.c:449
@@ -656,130 +694,162 @@
 #: ../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:1033
-#: ../libpurple/protocols/yahoo/yahoo.c:3508
-#: ../libpurple/protocols/yahoo/yahoo.c:3519 ../pidgin/gtkcertmgr.c:195
-#: ../pidgin/gtkdialogs.c:786 ../pidgin/gtkdialogs.c:925
-#: ../pidgin/gtkdialogs.c:1017 ../pidgin/gtkrequest.c:320
+#: ../libpurple/protocols/silc10/ops.c:1909
+#: ../libpurple/protocols/silc10/silc.c:741
+#: ../libpurple/protocols/yahoo/yahoo.c:992
+#: ../libpurple/protocols/yahoo/yahoo.c:3559
+#: ../libpurple/protocols/yahoo/yahoo.c:3570 ../pidgin/gtkcertmgr.c:195
+#: ../pidgin/gtkdialogs.c:765 ../pidgin/gtkdialogs.c:904
+#: ../pidgin/gtkdialogs.c:996 ../pidgin/gtkrequest.c:272
 msgid "OK"
 msgstr "OK"
 
-#: ../finch/gntblist.c:2270
+#: ../finch/gntblist.c:2645 ../pidgin/gtkdialogs.c:760
+msgid "New Instant Message"
+msgstr "�仂于仂亠 仄亞仆仂于亠仆仆仂亠 �仂仂弍�亠仆亳亠"
+
+#: ../finch/gntblist.c:2647 ../pidgin/gtkdialogs.c:762
+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:2282 ../pidgin/gtkblist.c:940
+#: ../finch/gntblist.c:2710 ../pidgin/gtkblist.c:951
 msgid "Join a Chat"
 msgstr "��亳�仂亠亟亳仆亳���� 从 �舒��"
 
-#: ../finch/gntblist.c:2284
+#: ../finch/gntblist.c:2712
 msgid "Please enter the name of the chat you want to join."
 msgstr "�于亠亟亳�亠 亳仄� �舒�舒, 从 从仂�仂�仂仄� 于� �仂�亳�亠 仗�亳�仂亠亟亳仆亳����."
 
-#: ../finch/gntblist.c:2286 ../finch/gntnotify.c:394
+#: ../finch/gntblist.c:2714 ../finch/gntnotify.c:394
 msgid "Join"
 msgstr "��亳�仂亠亟亳仆亳����"
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2324 ../finch/gntpounce.c:460 ../pidgin/gtkpounce.c:810
+#: ../finch/gntblist.c:2759 ../finch/gntpounce.c:459 ../pidgin/gtkpounce.c:802
 msgid "Options"
 msgstr "�舒�舒仄亠���"
 
-#: ../finch/gntblist.c:2330
+#: ../finch/gntblist.c:2765
 msgid "Send IM..."
 msgstr "��仗�舒于亳�� 仄亞仆仂于亠仆仆仂亠 �仂仂弍�亠仆亳亠..."
 
-#: ../finch/gntblist.c:2335
+#: ../finch/gntblist.c:2770
+msgid "Block/Unblock..."
+msgstr "�仍仂从亳�仂于舒��/�舒亰弍仍仂从亳�仂于舒��..."
+
+#: ../finch/gntblist.c:2775
 msgid "Join Chat..."
 msgstr "��亳�仂亠亟亳仆亳���� 从 �舒��..."
 
-#: ../finch/gntblist.c:2340
+#: ../finch/gntblist.c:2780
 msgid "Show"
 msgstr "�仂从舒亰�于舒��"
 
-#: ../finch/gntblist.c:2345
+#: ../finch/gntblist.c:2785
 msgid "Empty groups"
 msgstr "�����亠 亞��仗仗�"
 
-#: ../finch/gntblist.c:2352
+#: ../finch/gntblist.c:2792
 msgid "Offline buddies"
 msgstr "弌仂弍亠�亠亟仆亳从仂于 仆亠 于 �亠�亳"
 
-#: ../finch/gntblist.c:2359
+#: ../finch/gntblist.c:2799
 msgid "Sort"
 msgstr "弌仂��亳�仂于舒��"
 
-#: ../finch/gntblist.c:2364
+#: ../finch/gntblist.c:2804
 msgid "By Status"
 msgstr "�仂 ��舒����"
 
-#: ../finch/gntblist.c:2369 ../pidgin/gtkblist.c:4191
+#: ../finch/gntblist.c:2809 ../pidgin/gtkblist.c:4194
 msgid "Alphabetically"
 msgstr "�仂 舒仍�舒于亳��"
 
-#: ../finch/gntblist.c:2374
+#: ../finch/gntblist.c:2814
 msgid "By Log Size"
 msgstr "�仂 �舒亰仄亠�� 亢��仆舒仍舒"
 
-#: ../finch/gntcertmgr.c:86 ../pidgin/gtkcertmgr.c:188
+#: ../finch/gntblist.c:2825
+msgid "Buddy"
+msgstr "弌仂弍亠�亠亟仆亳从"
+
+#: ../finch/gntblist.c:2830 ../libpurple/protocols/oscar/oscar.c:649
+#: ../libpurple/protocols/silc/silc.c:911
+#: ../libpurple/protocols/silc/util.c:563
+#: ../libpurple/protocols/silc10/silc.c:685
+#: ../libpurple/protocols/silc10/util.c:553
+msgid "Chat"
+msgstr "丼舒�"
+
+#: ../finch/gntblist.c:2840 ../finch/plugins/grouping.c:255
+#, fuzzy
+msgid "Grouping"
+msgstr "���仗仗舒"
+
+#: ../finch/gntcertmgr.c:85 ../pidgin/gtkcertmgr.c:188
 msgid "Certificate Import"
 msgstr "�仄仗仂�� �亠��亳�亳从舒�舒"
 
-#: ../finch/gntcertmgr.c:87 ../pidgin/gtkcertmgr.c:189
+#: ../finch/gntcertmgr.c:86 ../pidgin/gtkcertmgr.c:189
 msgid "Specify a hostname"
 msgstr ""
 
-#: ../finch/gntcertmgr.c:88 ../pidgin/gtkcertmgr.c:190
+#: ../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
+#: ../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
+#: ../finch/gntcertmgr.c:98 ../pidgin/gtkcertmgr.c:212
 msgid "Certificate Import Error"
 msgstr "��亳弍从舒 亳仄仗仂��舒 �亠��亳�亳从舒�舒"
 
-#: ../finch/gntcertmgr.c:100 ../pidgin/gtkcertmgr.c:213
+#: ../finch/gntcertmgr.c:99 ../pidgin/gtkcertmgr.c:213
 msgid "X.509 certificate import failed"
 msgstr ""
 
-#: ../finch/gntcertmgr.c:110 ../pidgin/gtkcertmgr.c:224
+#: ../finch/gntcertmgr.c:109 ../pidgin/gtkcertmgr.c:224
 #, fuzzy
 msgid "Select a PEM certificate"
 msgstr "��弍�舒�� �舒亶仍"
 
-#: ../finch/gntcertmgr.c:127 ../pidgin/gtkcertmgr.c:245
+#: ../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
+#: ../finch/gntcertmgr.c:128 ../pidgin/gtkcertmgr.c:247
 msgid "Certificate Export Error"
 msgstr "��亳弍从舒 �从�仗仂��舒 �亠��亳�亳从舒�舒"
 
-#: ../finch/gntcertmgr.c:130 ../pidgin/gtkcertmgr.c:248
+#: ../finch/gntcertmgr.c:129 ../pidgin/gtkcertmgr.c:248
 msgid "X.509 certificate export failed"
 msgstr ""
 
-#: ../finch/gntcertmgr.c:159 ../pidgin/gtkcertmgr.c:299
+#: ../finch/gntcertmgr.c:158 ../pidgin/gtkcertmgr.c:298
 msgid "PEM X.509 Certificate Export"
 msgstr ""
 
-#: ../finch/gntcertmgr.c:188
+#: ../finch/gntcertmgr.c:187
 #, c-format
 msgid "Certificate for %s"
 msgstr "弌亠��亳�亳从舒� 亟仍� %s"
 
-#: ../finch/gntcertmgr.c:195
+#: ../finch/gntcertmgr.c:194
 #, c-format
 msgid ""
 "Common name: %s\n"
@@ -792,58 +862,58 @@
 "��仗亠�舒�仂从 SHA1:\n"
 "%s"
 
-#: ../finch/gntcertmgr.c:198
+#: ../finch/gntcertmgr.c:197
 #, fuzzy
 msgid "SSL Host Certificate"
 msgstr "/�仆����仄亠仆��/_�舒���仂亶从亳"
 
-#: ../finch/gntcertmgr.c:233 ../pidgin/gtkcertmgr.c:372
+#: ../finch/gntcertmgr.c:232 ../pidgin/gtkcertmgr.c:371
 #, c-format
 msgid "Really delete certificate for %s?"
 msgstr "�亠亶��于亳�亠仍�仆仂 �亟舒仍亳�� �亠��亳�亳从舒� 亟仍� %s?"
 
-#: ../finch/gntcertmgr.c:236 ../pidgin/gtkcertmgr.c:374
+#: ../finch/gntcertmgr.c:235 ../pidgin/gtkcertmgr.c:373
 msgid "Confirm certificate delete"
 msgstr "�仂亟�于亠�亟亳�� �亟舒仍亠仆亳亠 �亠��亳�亳从舒�舒"
 
-#: ../finch/gntcertmgr.c:293 ../pidgin/gtkcertmgr.c:603
+#: ../finch/gntcertmgr.c:292 ../pidgin/gtkcertmgr.c:613
 msgid "Certificate Manager"
 msgstr "�亠仆亠亟亢亠� �亠��亳�亳从舒�仂于"
 
 #. Creating the user splits
-#: ../finch/gntcertmgr.c:298 ../libpurple/protocols/bonjour/bonjour.c:670
+#: ../finch/gntcertmgr.c:297 ../libpurple/protocols/bonjour/bonjour.c:694
 #: ../libpurple/protocols/silc/silc.c:1150
-#: ../libpurple/protocols/silc10/silc.c:918
+#: ../libpurple/protocols/silc10/silc.c:924 ../pidgin/gtkcertmgr.c:446
 msgid "Hostname"
 msgstr "�仄� �亰仍舒"
 
-#: ../finch/gntcertmgr.c:315 ../finch/gntnotify.c:388 ../pidgin/gtkconv.c:1689
-#: ../pidgin/gtkdebug.c:840
+#: ../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:213 ../finch/gntplugin.c:406 ../finch/gntpounce.c:751
-#: ../finch/gntstatus.c:216 ../libpurple/protocols/msn/msn.c:407
-#: ../libpurple/protocols/msnp9/msn.c:403
+#: ../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:2474
-#: ../pidgin/gtkrequest.c:323
+#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2375
+#: ../pidgin/gtkrequest.c:275
 msgid "Close"
 msgstr "�舒从����"
 
-#: ../finch/gntconn.c:125
+#: ../finch/gntconn.c:126
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../finch/gntconn.c:128
+#: ../finch/gntconn.c:129
 #, c-format
 msgid "%s disconnected."
 msgstr "弌仂亠亟亳仆亠仆亳亠 � %s �舒亰仂�于舒仆仂."
 
-#: ../finch/gntconn.c:129
+#: ../finch/gntconn.c:130
 #, c-format
 msgid ""
 "%s\n"
@@ -852,54 +922,60 @@
 "and re-enable the account."
 msgstr ""
 
-#: ../finch/gntconn.c:138
+#: ../finch/gntconn.c:139
 msgid "Re-enable Account"
 msgstr "�仂于�仂�仆仂 于从仍��亳�� ����仆�� 亰舒仗亳��"
 
-#: ../finch/gntconv.c:137
+#: ../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:141 ../pidgin/gtkconv.c:531
+#: ../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:146 ../pidgin/gtkconv.c:537
+#: ../finch/gntconv.c:168 ../pidgin/gtkconv.c:498
 msgid "Your command failed for an unknown reason."
 msgstr "�舒�舒 从仂仄舒仆亟舒 仆亠 弍�仍舒 于�仗仂仍仆亠仆舒 仗仂 仆亠亳亰于亠��仆仂亶 仗�亳�亳仆亠."
 
-#: ../finch/gntconv.c:151 ../pidgin/gtkconv.c:544
+#: ../finch/gntconv.c:173 ../pidgin/gtkconv.c:505
 msgid "That command only works in chats, not IMs."
 msgstr "亅�舒 从仂仄舒仆亟舒 �舒弍仂�舒亠� �仂仍�从仂 于 �舒�舒�, 仆亠 于 仄亞仆仂于亠仆仆�� �仂仂弍�亠仆亳��."
 
-#: ../finch/gntconv.c:154 ../pidgin/gtkconv.c:547
+#: ../finch/gntconv.c:176 ../pidgin/gtkconv.c:508
 msgid "That command only works in IMs, not chats."
 msgstr "亅�舒 从仂仄舒仆亟舒 �舒弍仂�舒亠� �仂仍�从仂 于 仄亞仆仂于亠仆仆�� �仂仂弍�亠仆亳��, 仆亠 于 �舒�舒�."
 
-#: ../finch/gntconv.c:158 ../pidgin/gtkconv.c:552
+#: ../finch/gntconv.c:180 ../pidgin/gtkconv.c:513
 msgid "That command doesn't work on this protocol."
 msgstr "亅�舒 从仂仄舒仆亟舒 仆亠 �舒弍仂�舒亠� � ��亳仄 仗�仂�仂从仂仍仂仄."
 
-#: ../finch/gntconv.c:166
+#: ../finch/gntconv.c:188
 #, fuzzy
 msgid "Message was not sent, because you are not signed on."
 msgstr ""
 "弌仂仂弍�亠仆亳亠 仆亠 仄仂亢亠� 弍��� 仂�仗�舒于仍亠仆仂, �舒从 从舒从 仂�仗�舒于从舒 仗�仂亳��仂亟亳� �仍亳�从仂仄 "
 "弍����仂:"
 
-#: ../finch/gntconv.c:245
+#: ../finch/gntconv.c:268
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../finch/gntconv.c:268
+#: ../finch/gntconv.c:291
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:273 ../finch/gntconv.c:795
+#: ../finch/gntconv.c:296 ../finch/gntconv.c:880 ../pidgin/gtkconv.c:3474
 #, c-format
 msgid ""
 "\n"
@@ -908,68 +984,72 @@
 "\n"
 "%s 仆舒弍亳�舒亠� �仂仂弍�亠仆亳亠..."
 
-#: ../finch/gntconv.c:292
+#: ../finch/gntconv.c:315
 msgid "You have left this chat."
 msgstr "�� 仗仂从亳仆�仍亳 ��仂� �舒�."
 
-#: ../finch/gntconv.c:408 ../pidgin/gtkconv.c:1416
+#: ../finch/gntconv.c:433 ../pidgin/gtkconv.c:1384
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr ""
 "�亠亟亠仆亳亠 亢��仆舒仍舒 仆舒�舒�仂. �仂�仍亠亟���亳亠 �仂仂弍�亠仆亳� 于 ��仂亶 弍亠�亠亟亠 弍�亟�� 亰舒仗亳�舒仆�."
 
-#: ../finch/gntconv.c:414 ../pidgin/gtkconv.c:1424
+#: ../finch/gntconv.c:437 ../pidgin/gtkconv.c:1392
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr ""
 "�亠亟亠仆亳亠 亢��仆舒仍舒 仂��舒仆仂于仍亠仆仂. �仂�仍亠亟���亳亠 �仂仂弍�亠仆亳� 于 ��仂亶 弍亠�亠亟亠 仆亠 弍�亟�� "
 "亰舒仗亳�舒仆�."
 
-#: ../finch/gntconv.c:463
+#: ../finch/gntconv.c:523
 msgid "Send To"
 msgstr "�亟�亠�舒�"
 
-#: ../finch/gntconv.c:507
+#: ../finch/gntconv.c:568
 msgid "Conversation"
 msgstr "�亠�亠亟舒"
 
-#: ../finch/gntconv.c:513
+#: ../finch/gntconv.c:574
 msgid "Clear Scrollback"
 msgstr "��亳��亳��"
 
-#: ../finch/gntconv.c:517 ../finch/gntprefs.c:191
+#: ../finch/gntconv.c:578 ../finch/gntprefs.c:191
 msgid "Show Timestamps"
 msgstr "�仂从舒亰�于舒�� 于�亠仄� �仂仂弍�亠仆亳亶"
 
-#: ../finch/gntconv.c:533
+#: ../finch/gntconv.c:596
 msgid "Add Buddy Pounce..."
 msgstr "�仂弍舒于亳�� 仗�舒于亳仍仂..."
 
-#: ../finch/gntconv.c:548
+#: ../finch/gntconv.c:611
+msgid "View Log..."
+msgstr "��仂�仄仂��亠�� 亢��仆舒仍..."
+
+#: ../finch/gntconv.c:615
 msgid "Enable Logging"
 msgstr "�亠��亳 亢��仆舒仍"
 
-#: ../finch/gntconv.c:554
+#: ../finch/gntconv.c:621
 msgid "Enable Sounds"
 msgstr "�仂�仗�仂亳亰于仂亟亳�� 亰于�从亳"
 
-#: ../finch/gntconv.c:760
+#: ../finch/gntconv.c:833
 msgid "<AUTO-REPLY> "
 msgstr "<AUTO-REPLY> "
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:883
+#: ../finch/gntconv.c:968
 msgid "List of users:\n"
 msgstr "弌仗亳�仂从 仗仂仍�亰仂于舒�亠仍亠亶:\n"
 
-#: ../finch/gntconv.c:1045 ../pidgin/gtkconv.c:371
+#: ../finch/gntconv.c:1130 ../pidgin/gtkconv.c:337
 msgid "Supported debug options are:  version"
 msgstr "�仂亟亟亠�亢亳于舒亠仄�亠 仗舒�舒仄亠��� 仂�仍舒亟从亳:  version"
 
-#: ../finch/gntconv.c:1081 ../pidgin/gtkconv.c:423
+#: ../finch/gntconv.c:1166 ../pidgin/gtkconv.c:389
 msgid "No such command (in this context)."
 msgstr "�亠� �舒从仂亶 从仂仄舒仆亟� (于 ��仂仄 从仂仆�亠从��亠)."
 
-#: ../finch/gntconv.c:1084 ../pidgin/gtkconv.c:426
+#: ../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"
@@ -977,7 +1057,7 @@
 "��仗仂仍�亰�亶�亠 \"/help &lt;从仂仄舒仆亟舒&gt;\" 亟仍� 仗仂仄仂�亳 仗仂 从仂仆从�亠�仆仂亶 从仂仄舒仆亟亠.\n"
 "弌仍亠亟���亳亠 从仂仄舒仆亟� 亟仂���仗仆� 于 ��仂仄 从仂仆�亠从��亠:\n"
 
-#: ../finch/gntconv.c:1142 ../pidgin/gtkconv.c:7755
+#: ../finch/gntconv.c:1242 ../pidgin/gtkconv.c:7773
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -985,12 +1065,12 @@
 "say &lt;�仂仂弍�亠仆亳亠&gt;:  ��仗�舒于亳�� 仂弍��仆仂亠 �仂仂弍�亠仆亳亠, 从舒从 亠�仍亳 弍� 于� 仆亠 "
 "亳�仗仂仍�亰仂于舒仍亳 从仂仄舒仆亟�."
 
-#: ../finch/gntconv.c:1145 ../pidgin/gtkconv.c:7758
+#: ../finch/gntconv.c:1245 ../pidgin/gtkconv.c:7776
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
 "me &lt;亟亠亶��于亳亠&gt;:  ��仗�舒于亳�� 亟亠亶��于亳亠 于 ��亳仍亠 IRC �仂弍亠�亠亟仆亳从� 亳仍亳 于 �舒�."
 
-#: ../finch/gntconv.c:1148 ../pidgin/gtkconv.c:7761
+#: ../finch/gntconv.c:1248 ../pidgin/gtkconv.c:7779
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -998,48 +1078,48 @@
 "debug &lt;仗舒�舒仄亠��&gt;:  ��仗�舒于亳�� �舒亰仍亳�仆�� 仂�仍舒亟仂�仆�� 亳仆�仂�仄舒�亳� 于 �亠从���� "
 "弍亠�亠亟�."
 
-#: ../finch/gntconv.c:1151 ../pidgin/gtkconv.c:7764
+#: ../finch/gntconv.c:1251 ../pidgin/gtkconv.c:7782
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: ��亳��亳�� 仂从仆仂 弍亠�亠亟�."
 
-#: ../finch/gntconv.c:1154 ../pidgin/gtkconv.c:7770
+#: ../finch/gntconv.c:1254 ../pidgin/gtkconv.c:7788
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;从仂仄舒仆亟舒&gt;:  �仂仍��亳�� 仗仂仄仂�� 仗仂 从仂仆从�亠�仆仂亶 从仂仄舒仆亟亠."
 
-#: ../finch/gntconv.c:1157
+#: ../finch/gntconv.c:1257
 msgid "users:  Show the list of users in the chat."
 msgstr "users:  ��于亠��亳 �仗亳�仂从 仗仂仍�亰仂于舒�亠仍亠亶 于 �舒�亠."
 
-#: ../finch/gntconv.c:1162
+#: ../finch/gntconv.c:1262
 msgid "plugins: Show the plugins window."
 msgstr "plugins: ��于亠��亳 仂从仆仂 仄仂亟�仍亠亶."
 
-#: ../finch/gntconv.c:1165
+#: ../finch/gntconv.c:1265
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist: ��于亠��亳 �仗亳�仂从 �仂弍亠�亠亟仆亳从仂于."
 
-#: ../finch/gntconv.c:1168
+#: ../finch/gntconv.c:1268
 msgid "accounts: Show the accounts window."
 msgstr "accounts: ��于亠��亳 仂从仆仂 ����仆�� 亰舒仗亳�亠亶."
 
-#: ../finch/gntconv.c:1171
+#: ../finch/gntconv.c:1271
 msgid "debugwin: Show the debug window."
 msgstr "debugwin: ��于亠��亳 仂从仆仂 仂�仍舒亟从亳."
 
-#: ../finch/gntconv.c:1174
+#: ../finch/gntconv.c:1274
 msgid "prefs: Show the preference window."
 msgstr "prefs: ��于亠��亳 仂从仆仂 仆舒���仂亠从."
 
-#: ../finch/gntconv.c:1177
+#: ../finch/gntconv.c:1277
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: ��于亠��亳 仂从仆仂 �仂��舒仆�仆仆�� ��舒���仂于."
 
-#: ../finch/gntdebug.c:231 ../pidgin/gtkconv.c:989 ../pidgin/gtkconv.c:2663
-#: ../pidgin/gtkdebug.c:220 ../pidgin/gtkft.c:543
+#: ../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:86 ../pidgin/gtkdebug.c:700
+#: ../finch/gntdebug.c:271 ../finch/gntui.c:98 ../pidgin/gtkdebug.c:689
 msgid "Debug Window"
 msgstr "�从仆仂 仂�仍舒亟从亳"
 
@@ -1047,7 +1127,7 @@
 #. * 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:292 ../pidgin/gtkdebug.c:759
+#: ../finch/gntdebug.c:292 ../pidgin/gtkdebug.c:751
 msgid "Clear"
 msgstr "��亳��亳��"
 
@@ -1055,111 +1135,170 @@
 msgid "Filter:"
 msgstr "个亳仍���:"
 
-#: ../finch/gntdebug.c:309 ../pidgin/gtkdebug.c:768
+#: ../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:362
+#: ../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:778
-#: ../libpurple/protocols/jabber/buddy.c:782
-#: ../libpurple/protocols/jabber/buddy.c:941
-#: ../libpurple/protocols/jabber/jabber.c:1538
-#: ../libpurple/protocols/msn/msn.c:621 ../libpurple/protocols/msn/msn.c:631
-#: ../libpurple/protocols/msn/msn.c:636 ../libpurple/protocols/msn/msn.c:639
-#: ../libpurple/protocols/msnp9/msn.c:543
-#: ../libpurple/protocols/novell/novell.c:2852
-#: ../libpurple/protocols/oscar/oscar.c:821
-#: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:2710
-#: ../libpurple/protocols/oscar/oscar.c:3790
-#: ../libpurple/protocols/sametime/sametime.c:3305
-#: ../libpurple/protocols/sametime/sametime.c:4196
-#: ../libpurple/protocols/yahoo/yahoo.c:3259 ../pidgin/gtkblist.c:3338
-#: ../pidgin/gtkblist.c:3352 ../pidgin/gtkblist.c:3354
-#: ../pidgin/gtksavedstatuses.c:1005 ../pidgin/gtksavedstatuses.c:1150
+#: ../libpurple/protocols/jabber/buddy.c:808
+#: ../libpurple/protocols/jabber/buddy.c:812
+#: ../libpurple/protocols/jabber/buddy.c:971
+#: ../libpurple/protocols/jabber/jabber.c:1576
+#: ../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:822
+#: ../libpurple/protocols/oscar/oscar.c:827
+#: ../libpurple/protocols/oscar/oscar.c:829
+#: ../libpurple/protocols/oscar/oscar.c:2768
+#: ../libpurple/protocols/oscar/oscar.c:3827
+#: ../libpurple/protocols/sametime/sametime.c:3313
+#: ../libpurple/protocols/sametime/sametime.c:4204
+#: ../libpurple/protocols/yahoo/yahoo.c:3305 ../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
+#: ../finch/gntft.c:434 ../pidgin/gtkft.c:134
 #, c-format
 msgid "%.2f KiB/s"
 msgstr "%.2f �亳�/�"
 
-#: ../finch/gntft.c:431
+#: ../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
+#: ../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:404
-#: ../libpurple/protocols/msnp9/session.c:357
+#: ../finch/gntft.c:452 ../libpurple/protocols/msn/session.c:404
+#: ../libpurple/protocols/msnp9/session.c:356
 msgid "Transferring"
 msgstr "�亠�亠亟舒�舒"
 
+#: ../finch/gntlog.c:183
+#, fuzzy, c-format
+msgid "Conversation in %s on %s"
+msgstr "�亠�亠亟� 于 %s"
+
+#: ../finch/gntlog.c:186
+#, fuzzy, c-format
+msgid "Conversation with %s on %s"
+msgstr "�亠�亠亟� � %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:448 ../pidgin/gtklog.c:724
+#: ../pidgin/gtklog.c:799
+#, c-format
+msgid "Conversations with %s"
+msgstr "�亠�亠亟� � %s"
+
+#: ../finch/gntlog.c:473 ../pidgin/gtklog.c:824
+msgid "System Log"
+msgstr "弌亳��亠仄仆�亶 亢��仆舒仍"
+
 #: ../finch/gntnotify.c:165
 msgid "Emails"
 msgstr "�亟�亠�舒 e-mail"
@@ -1168,11 +1307,11 @@
 msgid "You have mail!"
 msgstr "�舒仄 仗�亳�仍舒 仗仂��舒!"
 
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:519
+#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:524
 msgid "Sender"
 msgstr "��仗�舒于亳�亠仍�"
 
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:526
+#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:531
 msgid "Subject"
 msgstr "丐亠仄舒"
 
@@ -1184,17 +1323,17 @@
 msgstr[1] "%s (%s) 亳仄亠亠� %d 仆仂于�� �仂仂弍�亠仆亳�."
 msgstr[2] "%s (%s) 亳仄亠亠� %d 仆仂于�� �仂仂弍�亠仆亳亶."
 
-#: ../finch/gntnotify.c:226 ../pidgin/gtknotify.c:342
+#: ../finch/gntnotify.c:226 ../pidgin/gtknotify.c:346
 msgid "New Mail"
 msgstr "�仂于舒� 仗仂��舒"
 
-#: ../finch/gntnotify.c:291 ../pidgin/gtknotify.c:949
+#: ../finch/gntnotify.c:291 ../pidgin/gtknotify.c:959
 #, c-format
 msgid "Info for %s"
 msgstr "�仆�仂�仄舒�亳� 亟仍� %s"
 
 #: ../finch/gntnotify.c:292 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:950
+#: ../pidgin/gtknotify.c:960
 msgid "Buddy Information"
 msgstr "�仆�仂�仄舒�亳� 仂 �仂弍亠�亠亟仆亳从亠"
 
@@ -1202,11 +1341,11 @@
 msgid "Continue"
 msgstr "��仂亟仂仍亢亳��"
 
-#: ../finch/gntnotify.c:391 ../pidgin/gtkconv.c:1650
+#: ../finch/gntnotify.c:391 ../pidgin/gtkconv.c:1639
 msgid "IM"
 msgstr "�亞仆仂于亠仆仆仂亠 �仂仂弍�亠仆亳亠"
 
-#: ../finch/gntnotify.c:397 ../libpurple/protocols/sametime/sametime.c:3515
+#: ../finch/gntnotify.c:397 ../libpurple/protocols/sametime/sametime.c:3523
 msgid "Invite"
 msgstr "��亳亞仍舒�亳��"
 
@@ -1214,19 +1353,19 @@
 msgid "(none)"
 msgstr "(仆亠�)"
 
-#: ../finch/gntplugin.c:77 ../finch/gntplugin.c:86
+#: ../finch/gntplugin.c:84 ../finch/gntplugin.c:93
 msgid "ERROR"
 msgstr "�丿����"
 
-#: ../finch/gntplugin.c:77
+#: ../finch/gntplugin.c:84
 msgid "loading plugin failed"
 msgstr "仆亠 �亟舒仍仂�� 亰舒亞��亰亳�� 仄仂亟�仍�"
 
-#: ../finch/gntplugin.c:86
+#: ../finch/gntplugin.c:93
 msgid "unloading plugin failed"
 msgstr "仆亠 �亟舒仍仂�� 于�亞��亰亳�� 仄仂亟�仍�"
 
-#: ../finch/gntplugin.c:132
+#: ../finch/gntplugin.c:139
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -1243,42 +1382,42 @@
 "�亠弍-�舒亶�: %s\n"
 "�仄� �舒亶仍舒: %s\n"
 
-#: ../finch/gntplugin.c:190
+#: ../finch/gntplugin.c:197
 msgid "Plugin need to be loaded before you can configure it."
 msgstr "�仂亟�仍� 仆亠仂弍�仂亟亳仄仂 亰舒亞��亰亳�� 仗亠�亠亟 亠亞仂 仆舒���仂亶从仂亶."
 
-#: ../finch/gntplugin.c:238
+#: ../finch/gntplugin.c:245
 msgid "No configuration options for this plugin."
 msgstr "亅�仂� 仄仂亟�仍� 仆亠 亳仄亠亠� 仆舒���舒亳于舒亠仄�� 仗舒�舒仄亠��仂于."
 
-#: ../finch/gntplugin.c:259
+#: ../finch/gntplugin.c:266
 msgid "Error loading plugin"
 msgstr "��亳弍从舒 亰舒亞��亰从亳 仄仂亟�仍�"
 
-#: ../finch/gntplugin.c:260
+#: ../finch/gntplugin.c:267
 msgid "The selected file is not a valid plugin."
 msgstr "��弍�舒仆仆�亶 �舒亶仍 仆亠 �于仍�亠��� 亟仂仗���亳仄�仄 仄仂亟�仍亠仄."
 
-#: ../finch/gntplugin.c:261
+#: ../finch/gntplugin.c:268
 msgid ""
 "Please open the debug window and try again to see the exact error message."
 msgstr ""
 "��从�仂亶�亠 仂从仆仂 仂�仍舒亟从亳 亳 仗仂于�仂�亳�亠 仗仂仗��从�, ��仂弍� �于亳亟亠�� �仂�仆仂亠 �仂仂弍�亠仆亳亠 仂弍 "
 "仂�亳弍从亠."
 
-#: ../finch/gntplugin.c:324
+#: ../finch/gntplugin.c:331
 msgid "Select plugin to install"
 msgstr "��弍亠�亳�亠 仄仂亟�仍� 亟仍� ���舒仆仂于从亳"
 
-#: ../finch/gntplugin.c:350
+#: ../finch/gntplugin.c:357
 msgid "You can (un)load plugins from the following list."
 msgstr "�� 仄仂亢亠�亠 亰舒亞��亢舒��/于�亞��亢舒�� 仄仂亟�仍亳 亳亰 �仍亠亟���亠亞仂 �仗亳�从舒."
 
-#: ../finch/gntplugin.c:401
+#: ../finch/gntplugin.c:408
 msgid "Install Plugin..."
 msgstr "丕��舒仆仂于亳�� 仄仂亟�仍�..."
 
-#: ../finch/gntplugin.c:411
+#: ../finch/gntplugin.c:418
 msgid "Configure Plugin"
 msgstr "�舒���仂亳�� 仄仂亟�仍�"
 
@@ -1287,187 +1426,187 @@
 #. (that should have been "effect," right?)
 #. Back to instant-apply! I win!  BU-HAHAHA!
 #. Create the window
-#: ../finch/gntplugin.c:467 ../finch/gntplugin.c:474 ../finch/gntprefs.c:264
-#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:717 ../pidgin/gtkprefs.c:2169
+#: ../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:194 ../pidgin/gtkpounce.c:256
+#: ../finch/gntpounce.c:193 ../pidgin/gtkpounce.c:256
 msgid "Please enter a buddy to pounce."
 msgstr "�于亠亟亳�亠 �仂弍亠�亠亟仆亳从舒 亟仍� �仍亠亢亠仆亳�."
 
-#: ../finch/gntpounce.c:339 ../pidgin/gtkpounce.c:531
+#: ../finch/gntpounce.c:338 ../pidgin/gtkpounce.c:524
 msgid "New Buddy Pounce"
 msgstr "�仂于仂亠 仗�舒于亳仍仂"
 
-#: ../finch/gntpounce.c:339 ../pidgin/gtkpounce.c:531
+#: ../finch/gntpounce.c:338 ../pidgin/gtkpounce.c:524
 msgid "Edit Buddy Pounce"
 msgstr "�亰仄亠仆亳�� 仗�舒于亳仍仂"
 
-#: ../finch/gntpounce.c:344
+#: ../finch/gntpounce.c:343
 msgid "Pounce Who"
 msgstr "�舒 从亠仄 �仍亠亟亳��"
 
 #. Account:
-#: ../finch/gntpounce.c:347 ../finch/gntstatus.c:456
+#: ../finch/gntpounce.c:346 ../finch/gntstatus.c:456
 msgid "Account:"
 msgstr "丕���仆舒� 亰舒仗亳��:"
 
-#: ../finch/gntpounce.c:369
+#: ../finch/gntpounce.c:368
 msgid "Buddy name:"
 msgstr "�仄� �仂弍亠�亠亟仆亳从舒:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:387 ../pidgin/gtkpounce.c:600
+#: ../finch/gntpounce.c:386 ../pidgin/gtkpounce.c:592
 msgid "Pounce When Buddy..."
 msgstr "��仗仂仍仆���, 从仂亞亟舒 �仂弍亠�亠亟仆亳从..."
 
-#: ../finch/gntpounce.c:389
+#: ../finch/gntpounce.c:388
 msgid "Signs on"
 msgstr "��仂亟亳�"
 
+#: ../finch/gntpounce.c:389
+msgid "Signs off"
+msgstr "���仂亟亳�"
+
 #: ../finch/gntpounce.c:390
-msgid "Signs off"
-msgstr "���仂亟亳�"
+msgid "Goes away"
+msgstr "���仂亟亳�"
 
 #: ../finch/gntpounce.c:391
-msgid "Goes away"
-msgstr "���仂亟亳�"
+msgid "Returns from away"
+msgstr "�仂亰于�舒�舒亠���"
 
 #: ../finch/gntpounce.c:392
-msgid "Returns from away"
-msgstr "�仂亰于�舒�舒亠���"
+msgid "Becomes idle"
+msgstr "�舒�亳仆舒亠� 弍亠亰亟亠亶��于仂于舒��"
 
 #: ../finch/gntpounce.c:393
-msgid "Becomes idle"
-msgstr "�舒�亳仆舒亠� 弍亠亰亟亠亶��于仂于舒��"
+msgid "Is no longer idle"
+msgstr "�亠�亠��舒�� 弍亠亰亟亠亶��于仂于舒��"
 
 #: ../finch/gntpounce.c:394
-msgid "Is no longer idle"
-msgstr "�亠�亠��舒�� 弍亠亰亟亠亶��于仂于舒��"
-
-#: ../finch/gntpounce.c:395
 msgid "Starts typing"
 msgstr "�舒�亳仆舒亠� 仆舒弍仂� �仂仂弍�亠仆亳�"
 
-#: ../finch/gntpounce.c:396
+#: ../finch/gntpounce.c:395
 msgid "Pauses while typing"
 msgstr "��亳仂��舒仆舒于仍亳于舒亠� 仆舒弍仂� �仂仂弍�亠仆亳�"
 
+#: ../finch/gntpounce.c:396
+msgid "Stops typing"
+msgstr "��亠从�舒�舒亠� 仆舒弍仂� �仂仂弍�亠仆亳�"
+
 #: ../finch/gntpounce.c:397
-msgid "Stops typing"
-msgstr "��亠从�舒�舒亠� 仆舒弍仂� �仂仂弍�亠仆亳�"
-
-#: ../finch/gntpounce.c:398
 msgid "Sends a message"
 msgstr "��仗�舒于仍�亠� �仂仂弍�亠仆亳亠"
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:427 ../pidgin/gtkpounce.c:661
+#: ../finch/gntpounce.c:426 ../pidgin/gtkpounce.c:653
 msgid "Action"
 msgstr "�亠亶��于亳亠"
 
-#: ../finch/gntpounce.c:429
+#: ../finch/gntpounce.c:428
 msgid "Open an IM window"
 msgstr "��从���� 仂从仆仂 仄亞仆仂于亠仆仆�� �仂仂弍�亠仆亳亶"
 
+#: ../finch/gntpounce.c:429
+msgid "Pop up a notification"
+msgstr "��于亠��亳 �于亠亟仂仄仍亠仆亳亠"
+
 #: ../finch/gntpounce.c:430
-msgid "Pop up a notification"
-msgstr "��于亠��亳 �于亠亟仂仄仍亠仆亳亠"
+msgid "Send a message"
+msgstr "��仗�舒于亳�� �仂仂弍�亠仆亳亠"
 
 #: ../finch/gntpounce.c:431
-msgid "Send a message"
-msgstr "��仗�舒于亳�� �仂仂弍�亠仆亳亠"
-
-#: ../finch/gntpounce.c:432
 msgid "Execute a command"
 msgstr "��仗仂仍仆亳�� 从仂仄舒仆亟�"
 
-#: ../finch/gntpounce.c:433
+#: ../finch/gntpounce.c:432
 msgid "Play a sound"
 msgstr "�仂�仗�仂亳亰于亠��亳 亰于�从"
 
-#: ../finch/gntpounce.c:461
-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:463 ../pidgin/gtkpounce.c:1301
+#: ../finch/gntpounce.c:462 ../pidgin/gtkpounce.c:1294
 msgid "Recurring"
 msgstr "�仂于�仂�亠仆亳亠"
 
-#: ../finch/gntpounce.c:631
+#: ../finch/gntpounce.c:630
 msgid "Cannot create pounce"
 msgstr "�亠 �亟舒���� �仂亰亟舒�� 仗�舒于亳仍仂"
 
+#: ../finch/gntpounce.c:631
+msgid "You do not have any accounts."
+msgstr "丕 于舒� 仆亠� 仆亳 仂亟仆仂亶 ����仆仂亶 亰舒仗亳�亳."
+
 #: ../finch/gntpounce.c:632
-msgid "You do not have any accounts."
-msgstr "丕 于舒� 仆亠� 仆亳 仂亟仆仂亶 ����仆仂亶 亰舒仗亳�亳."
-
-#: ../finch/gntpounce.c:633
 #, fuzzy
 msgid "You must create an account first before you can create a pounce."
 msgstr "�� 亟仂仍亢仆� �仂亰亟舒�� ����仆�� 亰舒仗亳�� 仗亠�亠亟 �亠仄, 从舒从 �仂亰亟舒于舒�� 仗�舒于亳仍仂."
 
-#: ../finch/gntpounce.c:675 ../pidgin/gtkpounce.c:1116
+#: ../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:709 ../finch/gntui.c:84 ../pidgin/gtkpounce.c:1352
+#: ../finch/gntpounce.c:708 ../finch/gntui.c:96 ../pidgin/gtkpounce.c:1337
 msgid "Buddy Pounces"
 msgstr "��舒于亳仍舒"
 
-#: ../finch/gntpounce.c:823 ../pidgin/gtkpounce.c:1480
+#: ../finch/gntpounce.c:817 ../pidgin/gtkpounce.c:1436
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s 仆舒�舒仍 仆舒弍仂� �仂仂弍�亠仆亳� 亟仍� 于舒� (%s)"
 
-#: ../finch/gntpounce.c:825 ../pidgin/gtkpounce.c:1482
+#: ../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:827 ../pidgin/gtkpounce.c:1484
+#: ../finch/gntpounce.c:819 ../pidgin/gtkpounce.c:1440
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s 于 �亠�亳 (%s)"
 
-#: ../finch/gntpounce.c:829 ../pidgin/gtkpounce.c:1486
+#: ../finch/gntpounce.c:820 ../pidgin/gtkpounce.c:1442
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s 仗亠�亠��舒仍 弍亠亰亟亠亶��于仂于舒�� (%s)"
 
-#: ../finch/gntpounce.c:831 ../pidgin/gtkpounce.c:1488
+#: ../finch/gntpounce.c:821 ../pidgin/gtkpounce.c:1444
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s 于亠�仆�仍�� (%s)"
 
-#: ../finch/gntpounce.c:833 ../pidgin/gtkpounce.c:1490
+#: ../finch/gntpounce.c:822 ../pidgin/gtkpounce.c:1446
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s 仗�亠从�舒�亳仍 仆舒弍仂� �仂仂弍�亠仆亳� 亟仍� 于舒� (%s)"
 
-#: ../finch/gntpounce.c:835 ../pidgin/gtkpounce.c:1492
+#: ../finch/gntpounce.c:823 ../pidgin/gtkpounce.c:1448
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s 仆亠 于 �亠�亳 (%s)"
 
-#: ../finch/gntpounce.c:837 ../pidgin/gtkpounce.c:1494
+#: ../finch/gntpounce.c:824 ../pidgin/gtkpounce.c:1450
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s 仆舒�舒仍 弍亠亰亟亠亶��于仂于舒�� (%s)"
 
-#: ../finch/gntpounce.c:839 ../pidgin/gtkpounce.c:1496
+#: ../finch/gntpounce.c:825 ../pidgin/gtkpounce.c:1452
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s 仂�仂��仍 (%s)"
 
-#: ../finch/gntpounce.c:841 ../pidgin/gtkpounce.c:1498
+#: ../finch/gntpounce.c:826 ../pidgin/gtkpounce.c:1454
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s 仂�仗�舒于亳仍 于舒仄 �仂仂弍�亠仆亳亠 (%s)"
 
-#: ../finch/gntpounce.c:842 ../pidgin/gtkpounce.c:1499
+#: ../finch/gntpounce.c:845 ../pidgin/gtkpounce.c:1455
 #, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "�亠亳亰于亠��仆仂亠 �仂弍��亳亠 �仍亠亢亠仆亳�. 弌仂仂弍�亳�亠 仂弍 ��仂仄!"
@@ -1476,12 +1615,12 @@
 msgid "Based on keyboard use"
 msgstr "��仆仂于�于舒��� 仆舒 亳�仗仂仍�亰仂于舒仆亳亳 从仍舒于亳舒����"
 
-#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:2031
+#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:1951
 msgid "From last sent message"
 msgstr "弌 仄仂仄亠仆�舒 仗仂�仍亠亟仆亠亶 仂�仗�舒于从亳 �仂仂弍�亠仆亳�"
 
-#: ../finch/gntprefs.c:96 ../pidgin/gtkprefs.c:900 ../pidgin/gtkprefs.c:908
-#: ../pidgin/gtkprefs.c:2030 ../pidgin/gtkprefs.c:2044
+#: ../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 "�亳从仂亞亟舒"
@@ -1498,15 +1637,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 "�舒仗亳��于舒�� �舒��"
 
@@ -1531,119 +1670,137 @@
 msgstr "�亠仆��� ��舒��� 仆舒"
 
 #. Conversations
-#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:995 ../pidgin/gtkprefs.c:2135
+#: ../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:1563 ../pidgin/gtkprefs.c:2146
+#: ../finch/gntprefs.c:260 ../finch/plugins/gnthistory.c:151
+#: ../pidgin/gtkprefs.c:1507 ../pidgin/gtkprefs.c:2048
 msgid "Logging"
 msgstr "���仆舒仍�"
 
-#: ../finch/gntrequest.c:585
+#: ../finch/gntrequest.c:621
 msgid "Not implemented yet."
 msgstr "��� 仆亠 �亠舒仍亳亰仂于舒仆仂."
 
-#: ../finch/gntrequest.c:661 ../pidgin/gtkrequest.c:1699
-#: ../pidgin/gtkrequest.c:1745
+#: ../finch/gntrequest.c:726 ../pidgin/gtkrequest.c:1552
+#: ../pidgin/gtkrequest.c:1598
 msgid "Save File..."
 msgstr "弌仂��舒仆亳�� �舒亶仍..."
 
-#: ../finch/gntrequest.c:661 ../pidgin/gtkrequest.c:1700
-#: ../pidgin/gtkrequest.c:1746
+#: ../finch/gntrequest.c:726 ../pidgin/gtkrequest.c:1553
+#: ../pidgin/gtkrequest.c:1599
 msgid "Open File..."
 msgstr "��从���� �舒亶仍..."
 
-#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:62
+#: ../finch/gntrequest.c:743
+msgid "Choose Location..."
+msgstr "��弍�舒�� 仄亠��仂仗仂仍仂亢亠仆亳亠..."
+
+#: ../finch/gntroomlist.c:208
+msgid "Hit 'Enter' to find more rooms of this category."
+msgstr ""
+
+#: ../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:63
+#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:63
 msgid "Buddy logs out"
 msgstr "弌仂弍亠�亠亟仆亳从 于��仂亟亳� 亳亰 �亠�亳"
 
-#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:64
+#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:64
 msgid "Message received"
-msgstr "��亳仆��仂 �仂仂弍�亠仆亳亠"
-
-#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:65
+msgstr "�仂仍��亠仆仂 �仂仂弍�亠仆亳亠"
+
+#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:65
 msgid "Message received begins conversation"
-msgstr "��亳仆��仂 �仂仂弍�亠仆亳亠, 仆舒�亳仆舒��亠亠 弍亠�亠亟�"
-
-#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:66
+msgstr "�仂仍��亠仆仂 �仂仂弍�亠仆亳亠, 仆舒�亳仆舒��亠亠 弍亠�亠亟�"
+
+#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:66
 msgid "Message sent"
 msgstr "弌仂仂弍�亠仆亳亠 仂�仗�舒于仍亠仆仂"
 
-#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:67
+#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:67
 msgid "Person enters chat"
 msgstr "�仂仍�亰仂于舒�亠仍� 于�仂亟亳� 于 �舒�"
 
-#: ../finch/gntsound.c:103 ../pidgin/gtksound.c:68
+#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:68
 msgid "Person leaves chat"
 msgstr "�仂仍�亰仂于舒�亠仍� 于��仂亟亳� 亳亰 �舒�舒"
 
-#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:69
+#: ../finch/gntsound.c:103 ../pidgin/gtksound.c:69
 msgid "You talk in chat"
 msgstr "�� 亞仂于仂�亳�亠 于 �舒�亠"
 
-#: ../finch/gntsound.c:105 ../pidgin/gtksound.c:70
+#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:70
 msgid "Others talk in chat"
 msgstr "���亞亳亠 亞仂于仂��� 于 �舒�亠"
 
-#: ../finch/gntsound.c:107 ../pidgin/gtksound.c:73
+#: ../finch/gntsound.c:106 ../pidgin/gtksound.c:73
 msgid "Someone says your screen name in chat"
 msgstr "��仂-�仂 仗�仂亳亰仆仂�亳� 于舒�亠 亳仄� 于 �舒�亠"
 
-#: ../finch/gntsound.c:361 ../pidgin/gtksound.c:306
+#: ../finch/gntsound.c:362 ../pidgin/gtksound.c:306
 msgid "GStreamer Failure"
 msgstr "��亳弍从舒 GStreamer"
 
-#: ../finch/gntsound.c:362 ../pidgin/gtksound.c:307
+#: ../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:1687
-#: ../pidgin/gtkprefs.c:1776 ../pidgin/gtkprefs.c:1972
+#: ../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
+#: ../finch/gntsound.c:730
 msgid "Select Sound File ..."
 msgstr "��弍�舒�� 亰于�从仂于仂亶 �舒亶仍..."
 
-#: ../finch/gntsound.c:904
+#: ../finch/gntsound.c:905
 msgid "Sound Preferences"
 msgstr "�舒���仂亶从亳 亰于�从舒"
 
-#: ../finch/gntsound.c:915
+#: ../finch/gntsound.c:916
 msgid "Profiles"
 msgstr "��仂�亳仍亳"
 
-#: ../finch/gntsound.c:954 ../pidgin/gtkprefs.c:1817
+#: ../finch/gntsound.c:955 ../pidgin/gtkprefs.c:1758
 msgid "Automatic"
 msgstr "�于�仂仄舒�亳�亠�从亳"
 
-#: ../finch/gntsound.c:957
+#: ../finch/gntsound.c:958
 msgid "Console Beep"
 msgstr "弌亳亞仆舒仍 亟亳仆舒仄亳从仂仄"
 
-#: ../finch/gntsound.c:958 ../pidgin/gtkprefs.c:1821
+#: ../finch/gntsound.c:959 ../pidgin/gtkprefs.c:1762
 msgid "Command"
 msgstr "�仂仄舒仆亟舒"
 
-#: ../finch/gntsound.c:959
+#: ../finch/gntsound.c:960
 msgid "No Sound"
 msgstr "�亠� 亰于�从舒"
 
-#: ../finch/gntsound.c:961 ../pidgin/gtkprefs.c:1812
+#: ../finch/gntsound.c:962 ../pidgin/gtkprefs.c:1753
 msgid "Sound Method"
 msgstr "�亠�仂亟 于仂�仗�仂亳亰于亠亟亠仆亳� 亰于�从舒"
 
-#: ../finch/gntsound.c:966
+#: ../finch/gntsound.c:967
 msgid "Method: "
 msgstr "�亠�仂亟: "
 
-#: ../finch/gntsound.c:973
+#: ../finch/gntsound.c:974
 #, c-format
 msgid ""
 "Sound Command\n"
@@ -1653,55 +1810,55 @@
 "(%s 亟仍� 亳仄亠仆亳 �舒亶仍舒)"
 
 #. Sound options
-#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:1856
+#: ../finch/gntsound.c:982 ../pidgin/gtkprefs.c:1784
 msgid "Sound Options"
 msgstr "�舒�舒仄亠��� 亰于�从舒"
 
-#: ../finch/gntsound.c:982
+#: ../finch/gntsound.c:983
 msgid "Sounds when conversation has focus"
 msgstr "�于�从亳, 从仂亞亟舒 仂从仆仂 弍亠�亠亟� 于 �仂从��亠"
 
-#: ../finch/gntsound.c:990 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:910
-#: ../pidgin/gtkprefs.c:1863 ../pidgin/plugins/timestamp_format.c:42
+#: ../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:1861
+#: ../finch/gntsound.c:992 ../pidgin/gtkprefs.c:1789
 msgid "Only when available"
 msgstr "丐仂仍�从仂 于仂 于�亠仄� 仗�亳�����于亳�"
 
-#: ../finch/gntsound.c:992 ../pidgin/gtkprefs.c:1862
+#: ../finch/gntsound.c:993 ../pidgin/gtkprefs.c:1790
 msgid "Only when not available"
 msgstr "丐仂仍�从仂 于仂 于�亠仄� 仂������于亳�"
 
-#: ../finch/gntsound.c:999
+#: ../finch/gntsound.c:1000
 msgid "Volume(0-100):"
 msgstr "��仂仄从仂���(0-100):"
 
 #. Sound events
-#: ../finch/gntsound.c:1018 ../pidgin/gtkprefs.c:1898
+#: ../finch/gntsound.c:1019 ../pidgin/gtkprefs.c:1819
 msgid "Sound Events"
 msgstr "�于�从仂于�亠 �仂弍��亳�"
 
-#: ../finch/gntsound.c:1020 ../pidgin/gtkprefs.c:1957
+#: ../finch/gntsound.c:1021 ../pidgin/gtkprefs.c:1878
 msgid "Event"
 msgstr "弌仂弍��亳亠"
 
-#: ../finch/gntsound.c:1020
+#: ../finch/gntsound.c:1021
 msgid "File"
 msgstr "个舒亶仍"
 
-#: ../finch/gntsound.c:1039 ../pidgin/gtkprefs.c:1976
+#: ../finch/gntsound.c:1040 ../pidgin/gtkprefs.c:1897
 msgid "Test"
 msgstr "丐亠��"
 
-#: ../finch/gntsound.c:1042 ../pidgin/gtkprefs.c:1980
+#: ../finch/gntsound.c:1043 ../pidgin/gtkprefs.c:1901
 msgid "Reset"
 msgstr "弌弍�仂�"
 
-#: ../finch/gntsound.c:1045 ../pidgin/gtkprefs.c:1984
+#: ../finch/gntsound.c:1046 ../pidgin/gtkprefs.c:1905
 msgid "Choose..."
 msgstr "��弍�舒��..."
 
@@ -1719,9 +1876,10 @@
 msgstr "弌仂��舒仆�仆仆�亠 ��舒����"
 
 #: ../finch/gntstatus.c:183 ../finch/gntstatus.c:539
-#: ../libpurple/protocols/jabber/buddy.c:298
-#: ../libpurple/protocols/jabber/buddy.c:1359
-#: ../libpurple/protocols/msn/msn.c:725
+#: ../libpurple/protocols/jabber/buddy.c:326
+#: ../libpurple/protocols/jabber/buddy.c:1391
+#: ../libpurple/protocols/msn/msn.c:733
+#: ../libpurple/protocols/myspace/myspace.c:171
 #: ../libpurple/protocols/novell/novell.c:1493
 #: ../pidgin/gtksavedstatuses.c:500
 msgid "Title"
@@ -1740,44 +1898,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:274
-#: ../libpurple/protocols/bonjour/bonjour.c:281
-#: ../libpurple/protocols/bonjour/bonjour.c:364
+#: ../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:238
-#: ../libpurple/protocols/jabber/jabber.c:1570
-#: ../libpurple/protocols/jabber/jabber.c:1584
-#: ../libpurple/protocols/jabber/jabber.c:1598
-#: ../libpurple/protocols/jabber/jabber.c:1612
-#: ../libpurple/protocols/jabber/jabber.c:1626
-#: ../libpurple/protocols/jabber/jabber.c:1642
-#: ../libpurple/protocols/msn/msn.c:677 ../libpurple/protocols/msn/msn.c:683
-#: ../libpurple/protocols/msn/msn.c:689 ../libpurple/protocols/msn/msn.c:695
-#: ../libpurple/protocols/msn/msn.c:700 ../libpurple/protocols/msn/msn.c:705
+#: ../libpurple/protocols/gg/gg.c:1635 ../libpurple/protocols/irc/irc.c:245
+#: ../libpurple/protocols/jabber/jabber.c:1608
+#: ../libpurple/protocols/jabber/jabber.c:1622
+#: ../libpurple/protocols/jabber/jabber.c:1636
+#: ../libpurple/protocols/jabber/jabber.c:1650
+#: ../libpurple/protocols/jabber/jabber.c:1664
+#: ../libpurple/protocols/jabber/jabber.c:1680
+#: ../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:2855
-#: ../libpurple/protocols/novell/novell.c:2958
-#: ../libpurple/protocols/novell/novell.c:2964
-#: ../libpurple/protocols/novell/novell.c:2970
-#: ../libpurple/protocols/oscar/oscar.c:5604
-#: ../libpurple/protocols/oscar/oscar.c:5822
-#: ../libpurple/protocols/oscar/oscar.c:5836
-#: ../libpurple/protocols/oscar/oscar.c:5852
-#: ../libpurple/protocols/oscar/oscar.c:5859
-#: ../libpurple/protocols/oscar/oscar.c:5866
-#: ../libpurple/protocols/sametime/sametime.c:3328
-#: ../libpurple/protocols/sametime/sametime.c:3334
-#: ../libpurple/protocols/sametime/sametime.c:3340
-#: ../libpurple/protocols/sametime/sametime.c:3419
+#: ../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:5683
+#: ../libpurple/protocols/oscar/oscar.c:5901
+#: ../libpurple/protocols/oscar/oscar.c:5915
+#: ../libpurple/protocols/oscar/oscar.c:5931
+#: ../libpurple/protocols/oscar/oscar.c:5938
+#: ../libpurple/protocols/oscar/oscar.c:5945
+#: ../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:3762
-#: ../libpurple/protocols/yahoo/yahoo.c:3768
-#: ../libpurple/protocols/zephyr/zephyr.c:2337
-#: ../pidgin/gtksavedstatuses.c:526 ../pidgin/gtksavedstatuses.c:1016
+#: ../libpurple/protocols/yahoo/yahoo.c:3813
+#: ../libpurple/protocols/yahoo/yahoo.c:3819
+#: ../libpurple/protocols/zephyr/zephyr.c:2352
+#: ../pidgin/gtksavedstatuses.c:526 ../pidgin/gtksavedstatuses.c:1001
 msgid "Message"
 msgstr "弌仂仂弍�亠仆亳亠"
 
@@ -1827,15 +1985,15 @@
 msgid "Save & Use"
 msgstr "弌仂��舒仆亳�� 亳 仗�亳仄亠仆亳��"
 
-#: ../finch/gntui.c:85
+#: ../finch/gntui.c:97
 msgid "Certificates"
 msgstr "弌亠��亳�亳从舒��"
 
-#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2137
+#: ../finch/gntui.c:102 ../pidgin/gtkprefs.c:2039
 msgid "Sounds"
 msgstr "�于�从亳"
 
-#: ../finch/gntui.c:91
+#: ../finch/gntui.c:104
 msgid "Statuses"
 msgstr "弌�舒����"
 
@@ -1902,7 +2060,7 @@
 
 #: ../finch/plugins/gntgf.c:306
 msgid "You receive an IM"
-msgstr "�� 仗�亳仆亳仄舒亠�亠 仄亞仆仂于亠仆仆仂亠 �仂仂弍�亠仆亳亠"
+msgstr "�� 仗仂仍��舒亠�亠 仄亞仆仂于亠仆仆仂亠 �仂仂弍�亠仆亳亠"
 
 #: ../finch/plugins/gntgf.c:307
 msgid "Someone speaks in a chat"
@@ -1932,16 +2090,16 @@
 msgid "Toaster plugin"
 msgstr "�仂亟�仍� �于亠亟仂仄仍亠仆亳亶"
 
-#: ../finch/plugins/gnthistory.c:116 ../pidgin/plugins/history.c:125
+#: ../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:153
+#: ../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:154
+#: ../finch/plugins/gnthistory.c:173 ../pidgin/plugins/history.c:154
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
 "\n"
@@ -1953,21 +2111,68 @@
 "�从仍��亠仆亳亠 亢��仆舒仍仂于 亟仍� 仄亞仆仂于亠仆仆�� �仂仂弍�亠仆亳亶 亳/亳仍亳 �舒�仂于 舒从�亳于亳��亠� 亳��仂�亳� "
 "亟仍� �仂仂�于亠���于���亳� �亳仗仂于 弍亠�亠亟."
 
-#: ../finch/plugins/gnthistory.c:179
+#: ../finch/plugins/gnthistory.c:217
 msgid "GntHistory"
 msgstr "Gnt-亳��仂�亳�"
 
-#: ../finch/plugins/gnthistory.c:181 ../pidgin/plugins/history.c:197
+#: ../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:198
+#: ../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."
 msgstr ""
 "��亳 仂�从���亳亳 仆仂于仂亶 弍亠�亠亟� ��仂� 仄仂亟�仍� 于��舒于亳� 仗�仂�仍�� 弍亠�亠亟� 于 �亠从����."
 
+#: ../finch/plugins/grouping.c:42 ../libpurple/protocols/oscar/oscar.c:740
+#, c-format
+msgid "Online"
+msgstr "� �亠�亳"
+
+#: ../finch/plugins/grouping.c:44 ../finch/plugins/grouping.c:145
+#: ../libpurple/protocols/gg/gg.c:1010
+#: ../libpurple/protocols/jabber/buddy.c:2066
+#: ../libpurple/protocols/novell/novell.c:2846
+#: ../libpurple/protocols/oscar/oscar.c:829
+#: ../libpurple/protocols/oscar/oscar.c:5733
+#: ../libpurple/protocols/qq/qq.c:171 ../libpurple/protocols/qq/qq.c:178
+#: ../libpurple/protocols/qq/qq.c:293
+#: ../libpurple/protocols/yahoo/yahoo.c:3156 ../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
+#, fuzzy
+msgid "Online Buddies"
+msgstr "弌仂弍亠�亠亟仆亳从仂于 仆亠 于 �亠�亳"
+
+#: ../finch/plugins/grouping.c:117
+#, fuzzy
+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
+#, fuzzy
+msgid "No Grouping"
+msgstr "�亠� 亰于�从舒"
+
+#: ../finch/plugins/grouping.c:257 ../finch/plugins/grouping.c:258
+#, fuzzy
+msgid "Provides alternate buddylist grouping options."
+msgstr "��亠亟仂��舒于仍�亠� 亳仆�亠亞�舒�亳� � Evolution."
+
 #: ../finch/plugins/lastlog.c:69
 msgid "Lastlog"
 msgstr ""
@@ -1985,88 +2190,88 @@
 msgid "Lastlog plugin."
 msgstr ""
 
-#: ../libpurple/account.c:875
+#: ../libpurple/account.c:886
 msgid "accounts"
 msgstr "����仆�亠 亰舒仗亳�亳"
 
-#: ../libpurple/account.c:1050 ../libpurple/protocols/jabber/auth.c:199
+#: ../libpurple/account.c:1061 ../libpurple/protocols/jabber/auth.c:199
 msgid "Password is required to sign on."
 msgstr "�仍� 仗仂亟从仍��亠仆亳� ��亠弍�亠��� 仗舒�仂仍�."
 
-#: ../libpurple/account.c:1084
+#: ../libpurple/account.c:1095
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "�于亠亟亳�亠 仗舒�仂仍� 亟仍� %s (%s)"
 
-#: ../libpurple/account.c:1091
+#: ../libpurple/account.c:1102
 msgid "Enter Password"
 msgstr "�于亠亟亳�亠 仗舒�仂仍�"
 
-#: ../libpurple/account.c:1096
+#: ../libpurple/account.c:1107
 msgid "Save password"
 msgstr "弌仂��舒仆亳�� 仗舒�仂仍�"
 
-#: ../libpurple/account.c:1131 ../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:1133 ../libpurple/connection.c:108
+#: ../libpurple/account.c:1144 ../libpurple/connection.c:121
 msgid "Connection Error"
 msgstr "��亳弍从舒 �仂亠亟亳仆亠仆亳�"
 
-#: ../libpurple/account.c:1330 ../libpurple/protocols/gg/gg.c:708
-#: ../libpurple/protocols/jabber/jabber.c:1698
+#: ../libpurple/account.c:1355 ../libpurple/protocols/gg/gg.c:708
+#: ../libpurple/protocols/jabber/jabber.c:1736
 msgid "New passwords do not match."
 msgstr "�仂于�亠 仗舒�仂仍亳 仆亠 �仂于仗舒亟舒��."
 
-#: ../libpurple/account.c:1339
+#: ../libpurple/account.c:1364
 msgid "Fill out all fields completely."
 msgstr "�舒仗仂仍仆亳�亠 于�亠 仗仂仍�."
 
-#: ../libpurple/account.c:1362
+#: ../libpurple/account.c:1387
 msgid "Original password"
 msgstr "���仂亟仆�亶 仗舒�仂仍�"
 
-#: ../libpurple/account.c:1369
+#: ../libpurple/account.c:1394
 msgid "New password"
 msgstr "�仂于�亶 仗舒�仂仍�"
 
-#: ../libpurple/account.c:1376
+#: ../libpurple/account.c:1401
 msgid "New password (again)"
 msgstr "�仂于�亶 仗舒�仂仍� (亠�� �舒亰)"
 
-#: ../libpurple/account.c:1382
+#: ../libpurple/account.c:1407
 #, c-format
 msgid "Change password for %s"
 msgstr "�亰仄亠仆亳�� 仗舒�仂仍� 亟仍� %s"
 
-#: ../libpurple/account.c:1390
+#: ../libpurple/account.c:1415
 msgid "Please enter your current password and your new password."
 msgstr "�于亠亟亳�亠 于舒� �亠从��亳亶 亳 于舒� 仆仂于�亶 仗舒�仂仍亳."
 
-#: ../libpurple/account.c:1421
+#: ../libpurple/account.c:1446
 #, c-format
 msgid "Change user information for %s"
 msgstr "�亰仄亠仆亳�� 仗仂仍�亰仂于舒�亠仍��从�� 亳仆�仂�仄舒�亳� 亟仍� %s"
 
-#: ../libpurple/account.c:1424 ../libpurple/protocols/toc/toc.c:1670
+#: ../libpurple/account.c:1449 ../libpurple/protocols/toc/toc.c:1670
 msgid "Set User Info"
 msgstr "丕��舒仆仂于亳�� 仗仂仍�亰仂于舒�亠仍��从�� 亳仆�仂�仄舒�亳�"
 
-#: ../libpurple/account.c:1895 ../libpurple/protocols/gg/gg.c:1019
-#: ../libpurple/protocols/jabber/buddy.c:782
-#: ../libpurple/protocols/jabber/buddy.c:2030
-#: ../libpurple/protocols/jabber/buddy.c:2047
-#: ../libpurple/protocols/novell/novell.c:2848
-#: ../libpurple/protocols/qq/qq.c:233 ../pidgin/gtkft.c:160
+#: ../libpurple/account.c:1920 ../libpurple/protocols/gg/gg.c:1019
+#: ../libpurple/protocols/jabber/buddy.c:812
+#: ../libpurple/protocols/jabber/buddy.c:2062
+#: ../libpurple/protocols/jabber/buddy.c:2079
+#: ../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:1321
-#: ../libpurple/blist.c:1531 ../libpurple/protocols/jabber/roster.c:69
-#: ../libpurple/protocols/myspace/myspace.c:3272 ../pidgin/gtkblist.c:6030
+#: ../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"
@@ -2102,66 +2307,54 @@
 
 #. Scheme name
 #. Pool name
-#: ../libpurple/certificate.c:886
+#: ../libpurple/certificate.c:894
 msgid "Certificate Authorities"
 msgstr "��亞舒仆� �亠��亳�亳从舒�亳亳"
 
 #. Scheme name
 #. Pool name
-#: ../libpurple/certificate.c:1054
+#: ../libpurple/certificate.c:1062
 msgid "SSL Peers Cache"
 msgstr ""
 
 #. Make messages
-#: ../libpurple/certificate.c:1185
+#: ../libpurple/certificate.c:1193
 #, c-format
 msgid "Accept certificate for %s?"
 msgstr "��亳仆��� �亠��亳�亳从舒� 亟仍� %s?"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1191
+#: ../libpurple/certificate.c:1199
 msgid "SSL Certificate Verification"
 msgstr "��仂于亠�从舒 SSL-�亠��亳�亳从舒�舒"
 
 #. Number of actions
-#: ../libpurple/certificate.c:1201
+#: ../libpurple/certificate.c:1208
 msgid "Accept"
 msgstr "��亳仆���"
 
-#: ../libpurple/certificate.c:1202 ../libpurple/protocols/qq/buddy_opt.c:214
+#: ../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:1203
-#, fuzzy
+#: ../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:1303
-#, 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:1328
+#: ../libpurple/certificate.c:1311
 #, c-format
 msgid ""
 "The certificate presented by \"%s\" is self-signed. It cannot be "
 "automatically checked."
 msgstr ""
 
-#: ../libpurple/certificate.c:1346
+#: ../libpurple/certificate.c:1329
 #, c-format
 msgid "The certificate chain presented for %s is not valid."
 msgstr ""
@@ -2171,28 +2364,28 @@
 #. stifle it.
 #. TODO: Probably wrong.
 #. TODO: Probably wrong
-#: ../libpurple/certificate.c:1354 ../libpurple/certificate.c:1423
+#: ../libpurple/certificate.c:1337 ../libpurple/certificate.c:1407
 msgid "SSL Certificate Error"
 msgstr "��亳弍从舒 SSL-�亠��亳�亳从舒�舒"
 
-#: ../libpurple/certificate.c:1355
+#: ../libpurple/certificate.c:1338
 msgid "Invalid certificate chain"
 msgstr "�亠于亠�仆舒� �亠仗仂�从舒 �亠��亳�亳从舒�仂于"
 
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1375
+#: ../libpurple/certificate.c:1359
 msgid ""
 "You have no database of root certificates, so this certificate cannot be "
 "validated."
 msgstr ""
 
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1398
+#: ../libpurple/certificate.c:1382
 msgid ""
 "The root certificate this one claims to be issued by is unknown to Pidgin."
 msgstr ""
 
-#: ../libpurple/certificate.c:1415
+#: ../libpurple/certificate.c:1399
 #, c-format
 msgid ""
 "The certificate chain presented by %s does not have a valid digital "
@@ -2200,12 +2393,23 @@
 "signature."
 msgstr ""
 
-#: ../libpurple/certificate.c:1424
+#: ../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 ""
+
 #. Make messages
-#: ../libpurple/certificate.c:1888
+#: ../libpurple/certificate.c:1896
 #, c-format
 msgid ""
 "Common name: %s\n"
@@ -2223,35 +2427,35 @@
 "�舒�舒 亳��亠�亠仆亳� ��仂从舒 亟亠亶��于亳�: %s\n"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1897
+#: ../libpurple/certificate.c:1905
 msgid "Certificate Information"
 msgstr "�仆�仂�仄舒�亳� 仂 �亠��亳�亳从舒�亠"
 
-#: ../libpurple/connection.c:107
+#: ../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:525 ../libpurple/plugin.c:277
-#: ../libpurple/protocols/jabber/buddy.c:2350
+#: ../libpurple/connection.c:530 ../libpurple/plugin.c:277
+#: ../libpurple/protocols/jabber/buddy.c:2382
 #: ../libpurple/protocols/msn/servconn.c:141
 #: ../libpurple/protocols/msn/session.c:377
 #: ../libpurple/protocols/msnp9/servconn.c:139
-#: ../libpurple/protocols/msnp9/session.c:330
+#: ../libpurple/protocols/msnp9/session.c:329
+#: ../libpurple/protocols/oscar/family_chatnav.c:63
 msgid "Unknown error"
 msgstr "�亠亳亰于亠��仆舒� 仂�亳弍从舒"
 
@@ -2268,45 +2472,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)."
@@ -2334,15 +2538,15 @@
 msgid "No name"
 msgstr "�亠� 亳仄亠仆亳"
 
-#: ../libpurple/dnsquery.c:511
+#: ../libpurple/dnsquery.c:532
 msgid "Unable to create new resolver process\n"
 msgstr "�亠 �亟舒���� �仂亰亟舒�� 仆仂于�亶 仗�仂�亠�� �舒亰�亠�亳�亠仍� 亳仄�仆\n"
 
-#: ../libpurple/dnsquery.c:516
+#: ../libpurple/dnsquery.c:537
 msgid "Unable to send request to resolver process\n"
 msgstr "�亠 �亟舒���� 仂�仗�舒于亳�� 亰舒仗�仂� �舒亰�亠�亳�亠仍� 亳仄�仆\n"
 
-#: ../libpurple/dnsquery.c:549 ../libpurple/dnsquery.c:698
+#: ../libpurple/dnsquery.c:570 ../libpurple/dnsquery.c:719
 #, c-format
 msgid ""
 "Error resolving %s:\n"
@@ -2351,13 +2555,13 @@
 "��亳弍从舒 �舒亰�亠�亠仆亳� 亳仄亠仆亳 %s:\n"
 "%s"
 
-#: ../libpurple/dnsquery.c:552 ../libpurple/dnsquery.c:712
-#: ../libpurple/dnsquery.c:830
+#: ../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"
@@ -2366,21 +2570,21 @@
 "��亳弍从舒 ��亠仆亳� 亳亰 仗�仂�亠��舒 �舒亰�亠�亳�亠仍� 亳仄�仆:\n"
 "%s"
 
-#: ../libpurple/dnsquery.c:578
+#: ../libpurple/dnsquery.c:599
 #, c-format
 msgid "EOF while reading from resolver process"
 msgstr "EOF 仗�亳 ��亠仆亳亳 亳亰 仗�仂�亠��舒 �舒亰�亠�亳�亠仍� 亳仄�仆"
 
-#: ../libpurple/dnsquery.c:762
+#: ../libpurple/dnsquery.c:783
 #, c-format
 msgid "Thread creation failure: %s"
 msgstr "��亳弍从舒 �仂亰亟舒仆亳� 仆亳�亳: %s"
 
-#: ../libpurple/dnsquery.c:763
+#: ../libpurple/dnsquery.c:784
 msgid "Unknown reason"
 msgstr "��亳�亳仆舒 仆亠亳亰于亠��仆舒"
 
-#: ../libpurple/ft.c:209
+#: ../libpurple/ft.c:210
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -2389,7 +2593,7 @@
 "��亳弍从舒 ��亠仆亳� %s: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:213
+#: ../libpurple/ft.c:214
 #, c-format
 msgid ""
 "Error writing %s: \n"
@@ -2398,7 +2602,7 @@
 "��亳弍从舒 亰舒仗亳�亳 %s: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:217
+#: ../libpurple/ft.c:218
 #, c-format
 msgid ""
 "Error accessing %s: \n"
@@ -2407,39 +2611,39 @@
 "��亳弍从舒 亟仂���仗舒 %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 弍舒亶�."
 
-#: ../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"
@@ -2450,62 +2654,62 @@
 "丕亟舒仍�仆仆�亶 �亰亠仍: %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
+#: ../libpurple/ft.c:703
 #, c-format
 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
+#: ../libpurple/ft.c:1143
 #, c-format
 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."
@@ -2670,27 +2874,27 @@
 "<b><font color=\"red\">弌仍�亢弍舒 于亠亟亠仆亳� 亢��仆舒仍舒 仆亠 亳仄亠亠� ��仆从�亳亳 ��亠仆亳�</"
 "font></b>"
 
-#: ../libpurple/log.c:598
+#: ../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-"
@@ -2699,7 +2903,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&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-"
@@ -2708,16 +2912,16 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&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
+#: ../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
+#: ../libpurple/log.c:1499
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
@@ -2792,51 +2996,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:1451
-#: ../libpurple/protocols/oscar/oscar.c:2243
-#: ../libpurple/protocols/oscar/oscar.c:2292
-#: ../libpurple/protocols/oscar/oscar.c:5936
-#: ../libpurple/protocols/oscar/oscar.c:5991
-#: ../libpurple/protocols/oscar/oscar.c:6217
-#: ../libpurple/protocols/oscar/oscar.c:6287 ../libpurple/request.h:1828
-#: ../libpurple/request.h:1841 ../libpurple/request.h:1854
-#: ../libpurple/request.h:1867 ../pidgin/gtkblist.c:546
+#: ../libpurple/protocols/oscar/oscar.c:1496
+#: ../libpurple/protocols/oscar/oscar.c:2301
+#: ../libpurple/protocols/oscar/oscar.c:2350
+#: ../libpurple/protocols/oscar/oscar.c:6015
+#: ../libpurple/protocols/oscar/oscar.c:6070
+#: ../libpurple/protocols/oscar/oscar.c:6296
+#: ../libpurple/protocols/oscar/oscar.c:6366 ../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)"
@@ -2844,11 +3047,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)"
@@ -2857,10 +3060,10 @@
 "�舒亶仍仂于\n"
 "(�仂仍�从仂 仗�亳 仂������于亳亳 弍亠�亠亟� � 仂�仗�舒于亳�亠仍亠仄)"
 
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1808
-#: ../libpurple/protocols/msn/msn.c:1838
-#: ../libpurple/protocols/msnp9/msn.c:1661
-#: ../libpurple/protocols/msnp9/msn.c:1691
+#: ../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 "�舒仄亠�从亳"
 
@@ -3238,6 +3441,14 @@
 msgid "Loads .NET plugins with Mono."
 msgstr ""
 
+#: ../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
@@ -3247,18 +3458,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."
@@ -3297,31 +3508,31 @@
 
 #: ../libpurple/plugins/offlinemsg.c:165
 #: ../libpurple/protocols/msn/dialog.c:141
-#: ../libpurple/protocols/msn/msn.c:665
+#: ../libpurple/protocols/msn/msn.c:661
 #: ../libpurple/protocols/msnp9/dialog.c:133
-#: ../libpurple/protocols/msnp9/msn.c:550
-#: ../libpurple/protocols/msnp9/msn.c:564
-#: ../libpurple/protocols/novell/novell.c:1928
+#: ../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:308
 #: ../libpurple/protocols/silc10/buddy.c:314
 #: ../libpurple/protocols/silc10/pk.c:119
-#: ../libpurple/protocols/silc10/wb.c:307 ../pidgin/gtkrequest.c:318
+#: ../libpurple/protocols/silc10/wb.c:307 ../pidgin/gtkrequest.c:270
 msgid "Yes"
 msgstr "�舒"
 
 #: ../libpurple/plugins/offlinemsg.c:166
 #: ../libpurple/protocols/msn/dialog.c:142
-#: ../libpurple/protocols/msn/msn.c:665
+#: ../libpurple/protocols/msn/msn.c:661
 #: ../libpurple/protocols/msnp9/dialog.c:134
-#: ../libpurple/protocols/msnp9/msn.c:550
-#: ../libpurple/protocols/msnp9/msn.c:564
-#: ../libpurple/protocols/novell/novell.c:1929
+#: ../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:309
 #: ../libpurple/protocols/silc10/buddy.c:315
 #: ../libpurple/protocols/silc10/pk.c:120
-#: ../libpurple/protocols/silc10/wb.c:308 ../pidgin/gtkrequest.c:319
+#: ../libpurple/protocols/silc10/wb.c:308 ../pidgin/gtkrequest.c:271
 msgid "No"
 msgstr "�亠�"
 
@@ -3422,7 +3633,7 @@
 msgstr "��仂于亠��亠�, 于�� 仍亳 �舒弍仂�舒亠�."
 
 #. Scheme name
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:911
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:910
 #: ../libpurple/plugins/ssl/ssl-nss.c:731
 msgid "X.509 Certificates"
 msgstr ""
@@ -3433,7 +3644,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:995
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:994
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -3441,8 +3652,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:998
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:1000
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:997
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:999
 msgid "Provides SSL support through GNUTLS."
 msgstr "��亠亟仂��舒于仍�亠� 仗仂亟亟亠�亢从� SSL 仗仂��亠亟��于仂仄 GNUTLS."
 
@@ -3561,58 +3772,58 @@
 "install ActiveTCL from http://www.activestate.com\n"
 msgstr ""
 
-#: ../libpurple/protocols/bonjour/bonjour.c:107
+#: ../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 ""
 
-#: ../libpurple/protocols/bonjour/bonjour.c:126
+#: ../libpurple/protocols/bonjour/bonjour.c:120
 msgid "Unable to listen for incoming IM connections\n"
 msgstr "�亠 �亟舒���� 仗�仂�仍��亳于舒�� 于�仂亟��亳亠 �仂亠亟亳仆亠仆亳�\n"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:153
+#: ../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:369
-#: ../libpurple/protocols/bonjour/bonjour.c:674
+#: ../libpurple/protocols/bonjour/bonjour.c:392
+#: ../libpurple/protocols/bonjour/bonjour.c:698
 #: ../libpurple/protocols/gg/gg.c:633
-#: ../libpurple/protocols/jabber/jabber.c:969
+#: ../libpurple/protocols/jabber/jabber.c:1003
 msgid "First name"
 msgstr "�仄�"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:371
-#: ../libpurple/protocols/bonjour/bonjour.c:677
+#: ../libpurple/protocols/bonjour/bonjour.c:394
+#: ../libpurple/protocols/bonjour/bonjour.c:701
 #: ../libpurple/protocols/gg/gg.c:628
-#: ../libpurple/protocols/jabber/jabber.c:974
+#: ../libpurple/protocols/jabber/jabber.c:1007
 msgid "Last name"
 msgstr "个舒仄亳仍亳�"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:375
-#: ../libpurple/protocols/jabber/buddy.c:295
-#: ../libpurple/protocols/jabber/buddy.c:1325
-#: ../libpurple/protocols/jabber/buddy.c:1335
-#: ../libpurple/protocols/jabber/buddy.c:2219
+#: ../libpurple/protocols/bonjour/bonjour.c:398
+#: ../libpurple/protocols/jabber/buddy.c:323
+#: ../libpurple/protocols/jabber/buddy.c:1357
+#: ../libpurple/protocols/jabber/buddy.c:1367
+#: ../libpurple/protocols/jabber/buddy.c:2251
 #: ../libpurple/protocols/silc/ops.c:1041
-#: ../libpurple/protocols/silc/util.c:561
+#: ../libpurple/protocols/silc/util.c:565
 #: ../libpurple/protocols/silc10/ops.c:1075
-#: ../libpurple/protocols/silc10/util.c:551
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
+#: ../libpurple/protocols/silc10/util.c:555
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1067
 msgid "E-Mail"
 msgstr "E-mail"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:378
-#: ../libpurple/protocols/bonjour/bonjour.c:683
+#: ../libpurple/protocols/bonjour/bonjour.c:401
+#: ../libpurple/protocols/bonjour/bonjour.c:707
 msgid "AIM Account"
 msgstr "丕���仆舒� 亰舒仗亳�� AIM"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:381
-#: ../libpurple/protocols/bonjour/bonjour.c:686
+#: ../libpurple/protocols/bonjour/bonjour.c:404
+#: ../libpurple/protocols/bonjour/bonjour.c:710
 msgid "XMPP Account"
 msgstr "丕���仆舒� 亰舒仗亳�� XMPP"
 
@@ -3626,22 +3837,22 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:485
-#: ../libpurple/protocols/bonjour/bonjour.c:487
+#: ../libpurple/protocols/bonjour/bonjour.c:508
+#: ../libpurple/protocols/bonjour/bonjour.c:510
 msgid "Bonjour Protocol Plugin"
 msgstr "�仂亟�仍� 仗�仂�仂从仂仍舒 Bonjour"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:628
+#: ../libpurple/protocols/bonjour/bonjour.c:651
 msgid "Purple Person"
 msgstr ""
 
-#: ../libpurple/protocols/bonjour/bonjour.c:680
+#: ../libpurple/protocols/bonjour/bonjour.c:704
 #: ../libpurple/protocols/gg/gg.c:478
-#: ../libpurple/protocols/jabber/jabber.c:959
+#: ../libpurple/protocols/jabber/jabber.c:995
 #: ../libpurple/protocols/silc/silc.c:913
 #: ../libpurple/protocols/silc/silc.c:1154
-#: ../libpurple/protocols/silc10/silc.c:681
-#: ../libpurple/protocols/silc10/silc.c:922
+#: ../libpurple/protocols/silc10/silc.c:687
+#: ../libpurple/protocols/silc10/silc.c:928
 msgid "E-mail"
 msgstr "E-mail"
 
@@ -3649,38 +3860,45 @@
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../libpurple/protocols/bonjour/jabber.c:381
+#: ../libpurple/protocols/bonjour/jabber.c:407
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s 亰舒从��仍 弍亠�亠亟�."
 
-#: ../libpurple/protocols/bonjour/jabber.c:439
-#: ../libpurple/protocols/bonjour/jabber.c:672
-#: ../libpurple/protocols/bonjour/jabber.c:690
+#: ../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:589
+#: ../libpurple/protocols/bonjour/jabber.c:661
 msgid "Cannot open socket"
 msgstr "�亠 �亟舒���� 仂�从���� �仂从亠�"
 
-#: ../libpurple/protocols/bonjour/jabber.c:599
+#: ../libpurple/protocols/bonjour/jabber.c:671
 msgid "Error setting socket options"
 msgstr "��亳弍从舒 ���舒仆仂于从亳 仗舒�舒仄亠��仂于 �仂从亠�舒"
 
-#: ../libpurple/protocols/bonjour/jabber.c:625
+#: ../libpurple/protocols/bonjour/jabber.c:697
 msgid "Could not bind socket to port"
 msgstr "�亠 �亟舒仍仂�� �于�亰舒�� �仂从亠� � 仗仂��仂仄"
 
-#: ../libpurple/protocols/bonjour/jabber.c:635
+#: ../libpurple/protocols/bonjour/jabber.c:707
 msgid "Could not listen on socket"
 msgstr "�亠 �亟舒仍仂�� 仂���亠��于亳�� 仗�仂�仍��亳于舒仆亳亠 �仂从亠�舒"
 
-#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1845
+#: ../libpurple/protocols/bonjour/mdns_win32.c:110
+#, fuzzy
+msgid "Error communicating with local mDNSResponder."
+msgstr "��亳弍从舒 �于�亰亳 � �亠�于亠�仂仄"
+
+#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1876
 msgid "Invalid proxy settings"
 msgstr "�亠于亠�仆�亠 仆舒���仂亶从亳 仗�仂从�亳"
 
-#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1845
+#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1876
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -3751,9 +3969,9 @@
 msgstr "�亠亞亳���舒�亳� 亰舒于亠��亠仆舒 ��仗亠�仆仂!"
 
 #: ../libpurple/protocols/gg/gg.c:483 ../libpurple/protocols/gg/gg.c:776
-#: ../libpurple/protocols/jabber/jabber.c:940
-#: ../libpurple/protocols/jabber/jabber.c:943
-#: ../libpurple/protocols/jabber/jabber.c:1731
+#: ../libpurple/protocols/jabber/jabber.c:978
+#: ../libpurple/protocols/jabber/jabber.c:981
+#: ../libpurple/protocols/jabber/jabber.c:1769
 msgid "Password"
 msgstr "�舒�仂仍�"
 
@@ -3779,9 +3997,9 @@
 
 #: ../libpurple/protocols/gg/gg.c:643 ../libpurple/protocols/gg/gg.c:1056
 #: ../libpurple/protocols/gg/gg.c:1128
-#: ../libpurple/protocols/jabber/jabber.c:984
-#: ../libpurple/protocols/oscar/oscar.c:3799
-#: ../libpurple/protocols/oscar/oscar.c:3812
+#: ../libpurple/protocols/jabber/jabber.c:1015
+#: ../libpurple/protocols/oscar/oscar.c:3836
+#: ../libpurple/protocols/oscar/oscar.c:3849
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "�仂�仂亟"
@@ -3790,14 +4008,14 @@
 msgid "Year of birth"
 msgstr "�仂亟 �仂亢亟亠仆亳�"
 
-#: ../libpurple/protocols/gg/gg.c:651 ../libpurple/protocols/msn/msn.c:1737
-#: ../libpurple/protocols/msnp9/msn.c:1590
-#: ../libpurple/protocols/myspace/user.c:119
-#: ../libpurple/protocols/oscar/oscar.c:3742
+#: ../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:3779
 #: ../libpurple/protocols/qq/buddy_info.c:46
 #: ../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:1091
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1097
 msgid "Gender"
 msgstr "�仂仍"
 
@@ -3806,14 +4024,14 @@
 msgstr "��亢�亳仆舒 亳仍亳 亢亠仆�亳仆舒"
 
 #: ../libpurple/protocols/gg/gg.c:653
-#: ../libpurple/protocols/oscar/oscar.c:3742
+#: ../libpurple/protocols/oscar/oscar.c:3779
 #: ../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:3742
+#: ../libpurple/protocols/oscar/oscar.c:3779
 #: ../libpurple/protocols/qq/buddy_info.c:84
 #: ../libpurple/protocols/qq/qq.c:230
 msgid "Female"
@@ -3872,65 +4090,51 @@
 msgid "Add to chat..."
 msgstr "�仂弍舒于亳�� 从 �舒��..."
 
-#: ../libpurple/protocols/gg/gg.c:1010
-#: ../libpurple/protocols/jabber/buddy.c:2034
-#: ../libpurple/protocols/novell/novell.c:2845
-#: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:5654
-#: ../libpurple/protocols/qq/qq.c:171 ../libpurple/protocols/qq/qq.c:178
-#: ../libpurple/protocols/qq/qq.c:293
-#: ../libpurple/protocols/yahoo/yahoo.c:3110 ../libpurple/status.c:154
-#: ../pidgin/gtkblist.c:3338 ../pidgin/gtkblist.c:3676
-#: ../pidgin/gtkdocklet.c:561 ../pidgin/gtkstatusbox.c:1061
-msgid "Offline"
-msgstr "�亠 于 �亠�亳"
-
 #: ../libpurple/protocols/gg/gg.c:1013
-#: ../libpurple/protocols/jabber/buddy.c:2036
+#: ../libpurple/protocols/jabber/buddy.c:2068
 #: ../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/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:2833
+#: ../libpurple/protocols/novell/novell.c:2834
 #: ../libpurple/protocols/qq/qq.c:281
-#: ../libpurple/protocols/yahoo/yahoo.c:3112 ../libpurple/status.c:155
-#: ../pidgin/gtkdocklet.c:545 ../pidgin/gtkstatusbox.c:1057
+#: ../libpurple/protocols/yahoo/yahoo.c:3158 ../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:1016 ../libpurple/protocols/irc/irc.c:537
-#: ../libpurple/protocols/irc/msgs.c:310
-#: ../libpurple/protocols/jabber/buddy.c:2040
-#: ../libpurple/protocols/novell/novell.c:2836
-#: ../libpurple/protocols/oscar/oscar.c:733
-#: ../libpurple/protocols/oscar/oscar.c:4557
-#: ../libpurple/protocols/oscar/oscar.c:5682
+#: ../libpurple/protocols/gg/gg.c:1016 ../libpurple/protocols/irc/irc.c:544
+#: ../libpurple/protocols/irc/msgs.c:312
+#: ../libpurple/protocols/jabber/buddy.c:2072
+#: ../libpurple/protocols/novell/novell.c:2837
+#: ../libpurple/protocols/oscar/oscar.c:734
+#: ../libpurple/protocols/oscar/oscar.c:5761
 #: ../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:3664
-#: ../libpurple/protocols/yahoo/yahoo.c:3738 ../libpurple/status.c:158
-#: ../pidgin/gtkdocklet.c:549 ../pidgin/gtkprefs.c:2040
-#: ../pidgin/gtkstatusbox.c:1058
+#: ../libpurple/protocols/yahoo/yahoo.c:3715
+#: ../libpurple/protocols/yahoo/yahoo.c:3789 ../libpurple/status.c:158
+#: ../pidgin/gtkdocklet.c:549 ../pidgin/gtkprefs.c:1960
+#: ../pidgin/gtkstatusbox.c:1082
 #, c-format
 msgid "Away"
 msgstr "��仂��仍"
 
 #: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1119
-#: ../libpurple/protocols/oscar/oscar.c:2709
-#: ../libpurple/protocols/oscar/oscar.c:3709
+#: ../libpurple/protocols/oscar/oscar.c:2767
+#: ../libpurple/protocols/oscar/oscar.c:3746
 msgid "UIN"
 msgstr "UIN"
 
 #: ../libpurple/protocols/gg/gg.c:1048 ../libpurple/protocols/gg/gg.c:1122
-#: ../libpurple/protocols/jabber/buddy.c:2213
-#: ../libpurple/protocols/jabber/buddy.c:2399
-#: ../libpurple/protocols/oscar/oscar.c:3720
+#: ../libpurple/protocols/jabber/buddy.c:2245
+#: ../libpurple/protocols/jabber/buddy.c:2431
+#: ../libpurple/protocols/oscar/oscar.c:3757
 #: ../libpurple/protocols/silc/ops.c:990
 #: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
@@ -3941,7 +4145,7 @@
 msgstr "�仂亟 �仂亢亟亠仆亳�"
 
 #: ../libpurple/protocols/gg/gg.c:1113 ../libpurple/protocols/gg/gg.c:1182
-#: ../libpurple/protocols/oscar/oscar.c:3921
+#: ../libpurple/protocols/oscar/oscar.c:3958
 msgid "Unable to display the search results."
 msgstr "�亠 �亟舒���� 仂�仂弍�舒亰亳�� �亠亰�仍��舒�� 仗仂亳�从舒."
 
@@ -3985,23 +4189,10 @@
 msgid "Connection failed."
 msgstr "�亠 �亟舒仍仂�� ���舒仆仂于亳�� �仂亠亟亳仆亠仆亳亠."
 
-#: ../libpurple/protocols/gg/gg.c:1629 ../libpurple/protocols/msn/msn.c:664
-#: ../libpurple/protocols/msnp9/msn.c:563
-msgid "Blocked"
-msgstr "�舒弍仍仂从亳�仂于舒仆"
-
 #: ../libpurple/protocols/gg/gg.c:1652
 msgid "Add to chat"
 msgstr "�仂弍舒于亳�� 从 �舒��"
 
-#: ../libpurple/protocols/gg/gg.c:1661
-msgid "Unblock"
-msgstr "�舒亰弍仍仂从亳�仂于舒��"
-
-#: ../libpurple/protocols/gg/gg.c:1665
-msgid "Block"
-msgstr "�仍仂从亳�仂于舒��"
-
 #: ../libpurple/protocols/gg/gg.c:1682
 msgid "Chat _name:"
 msgstr "_�仄� �舒�舒:"
@@ -4072,36 +4263,39 @@
 
 #: ../libpurple/protocols/irc/cmds.c:43
 #: ../libpurple/protocols/silc/silc.c:1780
-#: ../libpurple/protocols/silc10/silc.c:1569
+#: ../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:509
 #: ../libpurple/protocols/jabber/chat.c:591
 #: ../libpurple/protocols/silc/silc.c:1488
-#: ../libpurple/protocols/silc10/silc.c:1277
+#: ../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:513
 #: ../libpurple/protocols/jabber/chat.c:595
 #: ../libpurple/protocols/silc/silc.c:1492
-#: ../libpurple/protocols/silc10/silc.c:1281
+#: ../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 "�亠 �亟舒仍仂�� 仂�从���� 仗仂�� 亟仍� 仗�仂�仍��亳于舒仆亳�."
 
@@ -4123,83 +4317,83 @@
 msgstr "MOTD 亟仍� %s"
 
 #: ../libpurple/protocols/irc/irc.c:129 ../libpurple/protocols/irc/irc.c:169
-#: ../libpurple/protocols/irc/irc.c:625 ../libpurple/protocols/irc/irc.c:654
-#: ../libpurple/protocols/myspace/myspace.c:2378
+#: ../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:253
+#: ../libpurple/protocols/irc/irc.c:260
 msgid "View MOTD"
 msgstr "��仂�仄仂��亠�� MOTD"
 
-#: ../libpurple/protocols/irc/irc.c:265 ../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:271
-#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:527
+#: ../libpurple/protocols/irc/irc.c:278
+#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:496
 msgid "_Password:"
 msgstr "_�舒�仂仍�:"
 
-#: ../libpurple/protocols/irc/irc.c:304
+#: ../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:325
-#: ../libpurple/protocols/jabber/jabber.c:1311
+#: ../libpurple/protocols/irc/irc.c:332
+#: ../libpurple/protocols/jabber/jabber.c:1343
 #: ../libpurple/protocols/msn/session.c:402
-#: ../libpurple/protocols/msnp9/session.c:355
-#: ../libpurple/protocols/myspace/myspace.c:302
-#: ../libpurple/protocols/novell/novell.c:2198
-#: ../libpurple/protocols/oscar/oscar.c:1290
+#: ../libpurple/protocols/msnp9/session.c:354
+#: ../libpurple/protocols/myspace/myspace.c:295
+#: ../libpurple/protocols/novell/novell.c:2199
+#: ../libpurple/protocols/oscar/oscar.c:1335
 #: ../libpurple/protocols/qq/qq.c:136
-#: ../libpurple/protocols/sametime/sametime.c:3768
-#: ../libpurple/protocols/simple/simple.c:1893
-#: ../libpurple/protocols/yahoo/yahoo.c:2948
-#: ../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:2984
+#: ../libpurple/protocols/zephyr/zephyr.c:1585 ../pidgin/gtkstatusbox.c:681
 msgid "Connecting"
 msgstr "弌仂亠亟亳仆亠仆亳亠"
 
-#: ../libpurple/protocols/irc/irc.c:335
-#: ../libpurple/protocols/jabber/jabber.c:637
-#: ../libpurple/protocols/jabber/jabber.c:1126
+#: ../libpurple/protocols/irc/irc.c:342
+#: ../libpurple/protocols/jabber/jabber.c:671
+#: ../libpurple/protocols/jabber/jabber.c:1152
 msgid "SSL support unavailable"
 msgstr "�仂亟亟亠�亢从舒 SSL 仆亠亟仂���仗仆舒"
 
-#: ../libpurple/protocols/irc/irc.c:348
-#: ../libpurple/protocols/myspace/myspace.c:320
+#: ../libpurple/protocols/irc/irc.c:355
+#: ../libpurple/protocols/myspace/myspace.c:313
 #: ../libpurple/protocols/simple/simple.c:469
-#: ../libpurple/protocols/simple/simple.c:1803
+#: ../libpurple/protocols/simple/simple.c:1825
 msgid "Couldn't create socket"
 msgstr "�亠 �亟舒仍仂�� �仂亰亟舒�� �仂从亠�"
 
-#: ../libpurple/protocols/irc/irc.c:430
-#: ../libpurple/protocols/oscar/oscar.c:1286
+#: ../libpurple/protocols/irc/irc.c:437
+#: ../libpurple/protocols/oscar/oscar.c:1331
 msgid "Couldn't connect to host"
 msgstr "�亠 �亟舒仍仂�� �仂亠亟亳仆亳���� � �亰仍仂仄"
 
-#: ../libpurple/protocols/irc/irc.c:620 ../libpurple/protocols/irc/irc.c:649
-#: ../libpurple/protocols/myspace/myspace.c:2372
+#: ../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:790
+#: ../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:793
-#: ../libpurple/protocols/sametime/sametime.c:3416
+#: ../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 "丐亠仄舒"
 
@@ -4211,50 +4405,52 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:931
+#: ../libpurple/protocols/irc/irc.c:939
 msgid "IRC Protocol Plugin"
 msgstr "�仂亟�仍� 仗�仂�仂从仂仍舒 IRC"
 
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:932
+#: ../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:957 ../libpurple/protocols/irc/msgs.c:323
-#: ../libpurple/protocols/msn/msn.c:2335
-#: ../libpurple/protocols/msnp9/msn.c:2186
-#: ../libpurple/protocols/oscar/oscar.c:6721
+#: ../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:6762
 #: ../libpurple/protocols/qq/qq.c:756
-#: ../libpurple/protocols/sametime/sametime.c:5773
+#: ../libpurple/protocols/sametime/sametime.c:5781
 #: ../libpurple/protocols/silc/ops.c:1249
 #: ../libpurple/protocols/silc/ops.c:1343
 #: ../libpurple/protocols/silc10/ops.c:1244
 #: ../libpurple/protocols/silc10/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:2083
+#: ../libpurple/protocols/simple/simple.c:2099
 #: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "弌亠�于亠�"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:960 ../libpurple/protocols/msn/msn.c:2340
-#: ../libpurple/protocols/msnp9/msn.c:2191
-#: ../libpurple/protocols/oscar/oscar.c:6724
+#: ../libpurple/protocols/irc/irc.c:968 ../libpurple/protocols/msn/msn.c:2348
+#: ../libpurple/protocols/msnp9/msn.c:2202
+#: ../libpurple/protocols/oscar/oscar.c:6765
 #: ../libpurple/protocols/qq/qq.c:759
-#: ../libpurple/protocols/sametime/sametime.c:5778
+#: ../libpurple/protocols/sametime/sametime.c:5786
 #: ../libpurple/protocols/silc/silc.c:2061
-#: ../libpurple/protocols/silc10/silc.c:1864
+#: ../libpurple/protocols/silc10/silc.c:1867
 #: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "�仂��"
 
-#: ../libpurple/protocols/irc/irc.c:963
+#: ../libpurple/protocols/irc/irc.c:971
 msgid "Encodings"
 msgstr "�仂亟亳�仂于从亳"
 
-#: ../libpurple/protocols/irc/irc.c:966 ../libpurple/protocols/irc/msgs.c:316
-#: ../libpurple/protocols/jabber/jabber.c:931
-#: ../libpurple/protocols/jabber/jabber.c:934
+#: ../libpurple/protocols/irc/irc.c:974 ../libpurple/protocols/irc/msgs.c:318
+#: ../libpurple/protocols/jabber/jabber.c:971
+#: ../libpurple/protocols/jabber/jabber.c:973
+#: ../libpurple/protocols/oscar/oscar.c:2956
+#: ../libpurple/protocols/oscar/oscar.c:3969
 #: ../libpurple/protocols/silc/buddy.c:1542
 #: ../libpurple/protocols/silc/ops.c:1197
 #: ../libpurple/protocols/silc/ops.c:1200
@@ -4266,13 +4462,13 @@
 #: ../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:969 ../libpurple/protocols/irc/msgs.c:317
+#: ../libpurple/protocols/irc/irc.c:977 ../libpurple/protocols/irc/msgs.c:319
 #: ../libpurple/protocols/silc/silc.c:1152
-#: ../libpurple/protocols/silc10/silc.c:920
+#: ../libpurple/protocols/silc10/silc.c:926
 msgid "Real name"
 msgstr "�舒��仂��亠亠 亳仄�"
 
@@ -4280,158 +4476,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:977
+#: ../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 ""
 
-#: ../libpurple/protocols/irc/msgs.c:301
+#: ../libpurple/protocols/irc/msgs.c:303
 msgid " <i>(ircop)</i>"
 msgstr " <i>(仂仗亠�舒�仂� IRC)</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:3710
+#: ../libpurple/protocols/irc/msgs.c:305
+#: ../libpurple/protocols/oscar/oscar.c:3747
 #: ../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 ""
 
-#: ../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:579
 msgid "Time Response"
 msgstr "��从仍亳从 于�亠仄亠仆亳"
 
-#: ../libpurple/protocols/irc/msgs.c:576
+#: ../libpurple/protocols/irc/msgs.c:580
 msgid "The IRC server's local time is:"
 msgstr "�仂从舒仍�仆仂亠 于�亠仄� �亠�于亠�舒 IRC:"
 
-#: ../libpurple/protocols/irc/msgs.c:587
+#: ../libpurple/protocols/irc/msgs.c:591
 msgid "No such channel"
 msgstr "�亠� �舒从仂亞仂 从舒仆舒仍舒"
 
 #. does this happen?
-#: ../libpurple/protocols/irc/msgs.c:598
+#: ../libpurple/protocols/irc/msgs.c:602
 msgid "no such channel"
 msgstr "仆亠� �舒从仂亞仂 从舒仆舒仍舒"
 
-#: ../libpurple/protocols/irc/msgs.c:601
+#: ../libpurple/protocols/irc/msgs.c:605
 msgid "User is not logged in"
 msgstr "�仂仍�亰仂于舒�亠仍� 仆亠 于 �亠�亳"
 
-#: ../libpurple/protocols/irc/msgs.c:606
+#: ../libpurple/protocols/irc/msgs.c:610
 msgid "No such nick or channel"
 msgstr "�亠� �舒从仂亞仂 仗�亠于亟仂仆亳仄舒 亳仍亳 从舒仆舒仍舒"
 
-#: ../libpurple/protocols/irc/msgs.c:626
+#: ../libpurple/protocols/irc/msgs.c:630
 msgid "Could not send"
 msgstr "�亠 �亟舒仍仂�� 仂�仗�舒于亳��"
 
-#: ../libpurple/protocols/irc/msgs.c:682
+#: ../libpurple/protocols/irc/msgs.c:686
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "��亳�仂亠亟亳仆亠仆亳亠 从 %s ��亠弍�亠� 仗�亳亞仍舒�亠仆亳�."
 
-#: ../libpurple/protocols/irc/msgs.c:683
+#: ../libpurple/protocols/irc/msgs.c:687
 msgid "Invitation only"
 msgstr "丐仂仍�从仂 仗仂 仗�亳亞仍舒�亠仆亳�"
 
-#: ../libpurple/protocols/irc/msgs.c:798
+#: ../libpurple/protocols/irc/msgs.c:803
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "�� 弍�仍亳 �亟舒仍亠仆� 仂仗亠�舒�仂�仂仄 %s: (%s)"
 
 #. Remove user from channel
-#: ../libpurple/protocols/irc/msgs.c:803 ../libpurple/protocols/silc/ops.c:699
+#: ../libpurple/protocols/irc/msgs.c:808 ../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:826
+#: ../libpurple/protocols/irc/msgs.c:831
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "�亠亢亳仄 (%s %s) ���舒仆仂于仍亠仆 %s"
 
-#: ../libpurple/protocols/irc/msgs.c:911 ../libpurple/protocols/irc/msgs.c:912
+#: ../libpurple/protocols/irc/msgs.c:919 ../libpurple/protocols/irc/msgs.c:920
 msgid "Invalid nickname"
 msgstr "�亠于亠�仆�亶 仗�亠于亟仂仆亳仄"
 
-#: ../libpurple/protocols/irc/msgs.c:913
+#: ../libpurple/protocols/irc/msgs.c:921
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
@@ -4439,7 +4635,7 @@
 "��弍�舒仆仆�亶 于舒仄亳 仗�亠于亟仂仆亳仄 弍�仍 仂�于亠�亞仆�� �亠�于亠�仂仄. �亠�仂��仆仂, 仂仆 �仂亟亠�亢亳� "
 "仆亠亟仂仗���亳仄�亠 �亳仄于仂仍�."
 
-#: ../libpurple/protocols/irc/msgs.c:918
+#: ../libpurple/protocols/irc/msgs.c:926
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
@@ -4447,44 +4643,44 @@
 "��弍�舒仆仆仂亠 于舒仄亳 亳仄� ����仆仂亶 亰舒仗亳�亳 弍�仍仂 仂�于亠�亞仆��仂 �亠�于亠�仂仄. �亠�仂��仆仂, 仂仆仂 "
 "�仂亟亠�亢亳� 仆亠亟仂仗���亳仄�亠 �亳仄于仂仍�."
 
-#: ../libpurple/protocols/irc/msgs.c:957
+#: ../libpurple/protocols/irc/msgs.c:965
 msgid "Cannot change nick"
 msgstr "�亠 �亟舒���� 亳亰仄亠仆亳�� 仗�亠于亟仂仆亳仄"
 
-#: ../libpurple/protocols/irc/msgs.c:957
+#: ../libpurple/protocols/irc/msgs.c:965
 msgid "Could not change nick"
 msgstr "�亠 �亟舒仍仂�� 亳亰仄亠仆亳�� 仗�亠于亟仂仆亳仄"
 
-#: ../libpurple/protocols/irc/msgs.c:978
+#: ../libpurple/protocols/irc/msgs.c:986
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "�� 仗仂从亳仆�仍亳 从舒仆舒仍%s%s"
 
-#: ../libpurple/protocols/irc/msgs.c:1020
+#: ../libpurple/protocols/irc/msgs.c:1028
 msgid "Error: invalid PONG from server"
 msgstr "��亳弍从舒: 仆亠于亠�仆�亶 PONG � �亠�于亠�舒"
 
-#: ../libpurple/protocols/irc/msgs.c:1022
+#: ../libpurple/protocols/irc/msgs.c:1030
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "��于亠� PING -- 亰舒亟亠�亢从舒: %lu �亠从�仆亟"
 
-#: ../libpurple/protocols/irc/msgs.c:1113
+#: ../libpurple/protocols/irc/msgs.c:1121
 #, c-format
 msgid "Cannot join %s: Registration is required."
 msgstr "�亠 �亟舒���� 仗�亳�仂亠亟亳仆亳���� 从 %s: 丐�亠弍�亠��� �亠亞亳���舒�亳�."
 
-#: ../libpurple/protocols/irc/msgs.c:1114
+#: ../libpurple/protocols/irc/msgs.c:1122
 #: ../libpurple/protocols/silc/ops.c:1093
 #: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Cannot join channel"
 msgstr "�亠 �亟舒���� 仗�亳�仂亠亟亳仆亳���� 从 从舒仆舒仍�"
 
-#: ../libpurple/protocols/irc/msgs.c:1148
+#: ../libpurple/protocols/irc/msgs.c:1156
 msgid "Nick or channel is temporarily unavailable."
 msgstr "��亠于亟仂仆亳仄 亳仍亳 从舒仆舒仍 于�亠仄亠仆仆仂 仆亠亟仂���仗亠仆."
 
-#: ../libpurple/protocols/irc/msgs.c:1160
+#: ../libpurple/protocols/irc/msgs.c:1168
 #, c-format
 msgid "Wallops from %s"
 msgstr ""
@@ -4588,7 +4784,7 @@
 "从舒仆舒仍亠."
 
 #: ../libpurple/protocols/irc/parse.c:137
-#: ../libpurple/protocols/jabber/jabber.c:2321
+#: ../libpurple/protocols/jabber/jabber.c:2355
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;仆仂于�亶 仗�亠于亟仂仆亳仄&gt;:  �亰仄亠仆亳�� �于仂亶 仗�亠于亟仂仆亳仄."
 
@@ -4597,6 +4793,12 @@
 msgstr "nickserv: �仂�仍舒�� 从仂仄舒仆亟� 亟仍� nickserv"
 
 #: ../libpurple/protocols/irc/parse.c:139
+#, fuzzy
+msgid "notice &lt;target&lt;:  Send a notice to a user or channel."
+msgstr ""
+"me &lt;亟亠亶��于亳亠&gt;:  ��仗�舒于亳�� 亟亠亶��于亳亠 于 ��亳仍亠 IRC �仂弍亠�亠亟仆亳从� 亳仍亳 于 �舒�."
+
+#: ../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."
@@ -4604,17 +4806,17 @@
 "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."
 msgstr ""
 
-#: ../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."
@@ -4622,7 +4824,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."
@@ -4630,22 +4832,22 @@
 "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)."
 msgstr ""
 
-#: ../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
+#: ../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."
@@ -4653,24 +4855,24 @@
 "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 ""
 
-#: ../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."
@@ -4678,46 +4880,46 @@
 "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."
 msgstr ""
 
-#: ../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:520
+#: ../libpurple/protocols/irc/parse.c:521
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "��亠仄� 仂�于亠�舒 仂� %s: %lu �亠从�仆亟"
 
-#: ../libpurple/protocols/irc/parse.c:521
+#: ../libpurple/protocols/irc/parse.c:522
 msgid "PONG"
 msgstr "PONG"
 
-#: ../libpurple/protocols/irc/parse.c:521
+#: ../libpurple/protocols/irc/parse.c:522
 msgid "CTCP PING reply"
 msgstr "��于亠� CTCP PING"
 
-#: ../libpurple/protocols/irc/parse.c:633
-#: ../libpurple/protocols/irc/parse.c:640 ../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:143
-#: ../libpurple/protocols/jabber/jabber.c:698
-#: ../libpurple/protocols/jabber/jabber.c:728
-#: ../libpurple/protocols/jabber/jabber.c:1901
+#: ../libpurple/protocols/jabber/jabber.c:732
+#: ../libpurple/protocols/jabber/jabber.c:762
+#: ../libpurple/protocols/jabber/jabber.c:1939
 msgid "Unknown Error"
 msgstr "�亠亳亰于亠��仆舒� 仂�亳弍从舒"
 
@@ -4740,7 +4942,7 @@
 "弌亠�于亠� ��亠弍�亠� 舒��亠仆�亳�亳从舒�亳� 仗�仂���仄 �亠从��仂仄 �亠�亠亰 仆亠�亳��仂于舒仆仆�亶 仗仂�仂从"
 
 #: ../libpurple/protocols/jabber/auth.c:323
-#: ../libpurple/protocols/jabber/auth.c:518
+#: ../libpurple/protocols/jabber/auth.c:526
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
@@ -4751,30 +4953,29 @@
 
 #: ../libpurple/protocols/jabber/auth.c:325
 #: ../libpurple/protocols/jabber/auth.c:326
-#: ../libpurple/protocols/jabber/auth.c:520
-#: ../libpurple/protocols/jabber/auth.c:521
-#: ../libpurple/protocols/jabber/auth.c:614
-#: ../libpurple/protocols/jabber/auth.c:615
+#: ../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:340
-#: ../libpurple/protocols/jabber/auth.c:534
-#: ../libpurple/protocols/jabber/auth.c:627
-msgid "Server does not use any supported authentication method"
-msgstr "弌亠�于亠� 仆亠 亳�仗仂仍�亰�亠� 仆亳 仂亟仆仂亞仂 仗仂亟亟亠�亢亳于舒亠仄仂亞仂 仄亠�仂亟舒 舒��亠仆�亳�亳从舒�亳亳"
-
-#: ../libpurple/protocols/jabber/auth.c:472
-#: ../libpurple/protocols/jabber/auth.c:576
-#: ../libpurple/protocols/jabber/auth.c:795
-#: ../libpurple/protocols/jabber/auth.c:944
-#: ../libpurple/protocols/jabber/auth.c:971
-#: ../libpurple/protocols/jabber/auth.c:993
+#: ../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:616
+#: ../libpurple/protocols/jabber/auth.c:542
+#: ../libpurple/protocols/jabber/auth.c:733
+msgid "Server does not use any supported authentication method"
+msgstr "弌亠�于亠� 仆亠 亳�仗仂仍�亰�亠� 仆亳 仂亟仆仂亞仂 仗仂亟亟亠�亢亳于舒亠仄仂亞仂 仄亠�仂亟舒 舒��亠仆�亳�亳从舒�亳亳"
+
+#: ../libpurple/protocols/jabber/auth.c:722
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
@@ -4782,347 +4983,344 @@
 "亅�仂� �亠�于亠� ��亠弍�亠� 舒��亠仆�亳�亳从舒�亳� 仗�仂���仄 �亠从��仂仄 �亠�亠亰 仆亠�亳��仂于舒仆仆仂亠 "
 "�仂亠亟亳仆亠仆亳亠. �仂亰于仂仍亳�� ��仂 亳 仗�仂亟仂仍亢亳�� 舒��亠仆�亳�亳从舒�亳�?"
 
-#: ../libpurple/protocols/jabber/auth.c:818
-#: ../libpurple/protocols/jabber/auth.c:843
+#: ../libpurple/protocols/jabber/auth.c:924
+#: ../libpurple/protocols/jabber/auth.c:949
 msgid "Invalid challenge from server"
 msgstr "�亠于亠�仆�亶 亰舒仗�仂� � �亠�于亠�舒"
 
-#: ../libpurple/protocols/jabber/auth.c:917
+#: ../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:4174
+#: ../libpurple/protocols/jabber/buddy.c:311
+#: ../libpurple/protocols/jabber/buddy.c:1251
+#: ../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:312
+#: ../libpurple/protocols/jabber/buddy.c:1263
 #: ../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:313
+#: ../libpurple/protocols/jabber/buddy.c:1266
 msgid "Given Name"
 msgstr "�仄�"
 
-#: ../libpurple/protocols/jabber/buddy.c:287
-#: ../libpurple/protocols/jabber/jabber.c:1004
+#: ../libpurple/protocols/jabber/buddy.c:315
+#: ../libpurple/protocols/jabber/jabber.c:1031
 msgid "URL"
 msgstr "URL"
 
-#: ../libpurple/protocols/jabber/buddy.c:288
-#: ../libpurple/protocols/jabber/buddy.c:1282
+#: ../libpurple/protocols/jabber/buddy.c:316
+#: ../libpurple/protocols/jabber/buddy.c:1314
 msgid "Street Address"
 msgstr "�亟�亠�"
 
-#: ../libpurple/protocols/jabber/buddy.c:289
-#: ../libpurple/protocols/jabber/buddy.c:1279
+#: ../libpurple/protocols/jabber/buddy.c:317
+#: ../libpurple/protocols/jabber/buddy.c:1311
 msgid "Extended Address"
 msgstr "�仂仗仂仍仆亳�亠仍�仆�亶 舒亟�亠�"
 
-#: ../libpurple/protocols/jabber/buddy.c:290
-#: ../libpurple/protocols/jabber/buddy.c:1285
+#: ../libpurple/protocols/jabber/buddy.c:318
+#: ../libpurple/protocols/jabber/buddy.c:1317
 msgid "Locality"
 msgstr "�舒�亠仍�仆仆�亶 仗�仆从�"
 
-#: ../libpurple/protocols/jabber/buddy.c:291
-#: ../libpurple/protocols/jabber/buddy.c:1288
+#: ../libpurple/protocols/jabber/buddy.c:319
+#: ../libpurple/protocols/jabber/buddy.c:1320
 msgid "Region"
 msgstr "�亠亞亳仂仆"
 
-#: ../libpurple/protocols/jabber/buddy.c:292
-#: ../libpurple/protocols/jabber/buddy.c:1291
+#: ../libpurple/protocols/jabber/buddy.c:320
+#: ../libpurple/protocols/jabber/buddy.c:1323
 msgid "Postal Code"
 msgstr "�仂��仂于�亶 从仂亟"
 
-#: ../libpurple/protocols/jabber/buddy.c:293
-#: ../libpurple/protocols/jabber/buddy.c:1295
+#: ../libpurple/protocols/jabber/buddy.c:321
+#: ../libpurple/protocols/jabber/buddy.c:1327
 #: ../libpurple/protocols/silc/silc.c:1158
-#: ../libpurple/protocols/silc10/silc.c:926
+#: ../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:322
+#: ../libpurple/protocols/jabber/buddy.c:1338
+#: ../libpurple/protocols/jabber/buddy.c:1345
 msgid "Telephone"
 msgstr "丐亠仍亠�仂仆"
 
-#: ../libpurple/protocols/jabber/buddy.c:296
-#: ../libpurple/protocols/jabber/buddy.c:1350
+#: ../libpurple/protocols/jabber/buddy.c:324
+#: ../libpurple/protocols/jabber/buddy.c:1382
 msgid "Organization Name"
 msgstr "�舒亰于舒仆亳亠 仂�亞舒仆亳亰舒�亳亳"
 
-#: ../libpurple/protocols/jabber/buddy.c:297
-#: ../libpurple/protocols/jabber/buddy.c:1353
+#: ../libpurple/protocols/jabber/buddy.c:325
+#: ../libpurple/protocols/jabber/buddy.c:1385
 msgid "Organization Unit"
 msgstr "��亟亠仍"
 
-#: ../libpurple/protocols/jabber/buddy.c:299
-#: ../libpurple/protocols/jabber/buddy.c:1362
+#: ../libpurple/protocols/jabber/buddy.c:327
+#: ../libpurple/protocols/jabber/buddy.c:1394
 msgid "Role"
 msgstr "�仂仍亢仆仂���"
 
-#: ../libpurple/protocols/jabber/buddy.c:300
-#: ../libpurple/protocols/jabber/buddy.c:1250
-#: ../libpurple/protocols/msn/msn.c:1806
-#: ../libpurple/protocols/msnp9/msn.c:1659
-#: ../libpurple/protocols/oscar/oscar.c:3759
+#: ../libpurple/protocols/jabber/buddy.c:328
+#: ../libpurple/protocols/jabber/buddy.c:1282
+#: ../libpurple/protocols/msn/msn.c:1814
+#: ../libpurple/protocols/msnp9/msn.c:1670
+#: ../libpurple/protocols/oscar/oscar.c:3796
 msgid "Birthday"
 msgstr "�舒�舒 �仂亢亟亠仆亳�"
 
-#: ../libpurple/protocols/jabber/buddy.c:301
-#: ../libpurple/protocols/jabber/buddy.c:1365
+#: ../libpurple/protocols/jabber/buddy.c:329
+#: ../libpurple/protocols/jabber/buddy.c:1397
 #: ../libpurple/protocols/jabber/chat.c:775
-#: ../libpurple/protocols/jabber/usermood.c:193 ../pidgin/gtkblist.c:3350
-#: ../pidgin/gtkprefs.c:740
+#: ../libpurple/protocols/jabber/usermood.c:193 ../pidgin/gtkblist.c:3309
+#: ../pidgin/gtkplugin.c:564 ../pidgin/gtkprefs.c:688
 msgid "Description"
 msgstr "�仗亳�舒仆亳亠"
 
-#: ../libpurple/protocols/jabber/buddy.c:722
-#: ../libpurple/protocols/jabber/buddy.c:723
+#: ../libpurple/protocols/jabber/buddy.c:752
+#: ../libpurple/protocols/jabber/buddy.c:753
 msgid "Edit XMPP vCard"
 msgstr "�亰仄亠仆亳�� XMPP vCard"
 
-#: ../libpurple/protocols/jabber/buddy.c:724
+#: ../libpurple/protocols/jabber/buddy.c:754
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
 msgstr ""
 "��亠 仆亳亢亠�仍亠亟���亳亠 仗�仆从�� 仆亠仂弍�亰舒�亠仍�仆�. �舒仗仂仍仆�亶�亠 仗仂 �于仂亠仄� ��仄仂��亠仆亳�."
 
-#: ../libpurple/protocols/jabber/buddy.c:795
-#: ../libpurple/protocols/jabber/buddy.c:960
+#: ../libpurple/protocols/jabber/buddy.c:825
+#: ../libpurple/protocols/jabber/buddy.c:990
 msgid "Client"
 msgstr "�仍亳亠仆�"
 
-#: ../libpurple/protocols/jabber/buddy.c:799
-#: ../libpurple/protocols/jabber/buddy.c:964
+#: ../libpurple/protocols/jabber/buddy.c:829
+#: ../libpurple/protocols/jabber/buddy.c:994
 msgid "Operating System"
 msgstr "�仗亠�舒�亳仂仆仆舒� �亳��亠仄舒"
 
-#: ../libpurple/protocols/jabber/buddy.c:815
-#: ../libpurple/protocols/jabber/buddy.c:975
+#: ../libpurple/protocols/jabber/buddy.c:845
+#: ../libpurple/protocols/jabber/buddy.c:1005
 msgid "Last Activity"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:817
-#: ../libpurple/protocols/jabber/buddy.c:977
+#: ../libpurple/protocols/jabber/buddy.c:847
+#: ../libpurple/protocols/jabber/buddy.c:1007
 msgid "Service Discovery Info"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:819
-#: ../libpurple/protocols/jabber/buddy.c:979
+#: ../libpurple/protocols/jabber/buddy.c:849
+#: ../libpurple/protocols/jabber/buddy.c:1009
 msgid "Service Discovery Items"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:821
-#: ../libpurple/protocols/jabber/buddy.c:981
+#: ../libpurple/protocols/jabber/buddy.c:851
+#: ../libpurple/protocols/jabber/buddy.c:1011
 #, fuzzy
 msgid "Extended Stanza Addressing"
 msgstr "�仂仗仂仍仆亳�亠仍�仆�亶 舒亟�亠�"
 
-#: ../libpurple/protocols/jabber/buddy.c:823
-#: ../libpurple/protocols/jabber/buddy.c:983
+#: ../libpurple/protocols/jabber/buddy.c:853
+#: ../libpurple/protocols/jabber/buddy.c:1013
 msgid "Multi-User Chat"
 msgstr "�仆仂亞仂仗仂仍�亰仂于舒�亠仍��从亳亶 �舒�"
 
-#: ../libpurple/protocols/jabber/buddy.c:825
-#: ../libpurple/protocols/jabber/buddy.c:985
+#: ../libpurple/protocols/jabber/buddy.c:855
+#: ../libpurple/protocols/jabber/buddy.c:1015
 #, fuzzy
 msgid "Multi-User Chat Extended Presence Information"
 msgstr "�仂仍�亰仂于舒�亠仍� 仆亠 亳仄亠亠� 亳仆�仂�仄舒�亳亳 从舒�舒仍仂亞舒."
 
-#: ../libpurple/protocols/jabber/buddy.c:827
-#: ../libpurple/protocols/jabber/buddy.c:987
-msgid "In-Band Bytestreams"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:829
-#: ../libpurple/protocols/jabber/buddy.c:989
-msgid "Ad-Hoc Commands"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:831
-#: ../libpurple/protocols/jabber/buddy.c:991
-msgid "PubSub Service"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:833
-#: ../libpurple/protocols/jabber/buddy.c:993
-msgid "SOCKS5 Bytestreams"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:835
-#: ../libpurple/protocols/jabber/buddy.c:995
-msgid "Out of Band Data"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:837
-#: ../libpurple/protocols/jabber/buddy.c:997
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-#: ../libpurple/protocols/jabber/buddy.c:839
-#: ../libpurple/protocols/jabber/buddy.c:999
-msgid "In-Band Registration"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:841
-#: ../libpurple/protocols/jabber/buddy.c:1001
-msgid "User Location"
-msgstr "�亠��仂仗仂仍仂亢亠仆亳亠 仗仂仍�亰仂于舒�亠仍�"
-
-#: ../libpurple/protocols/jabber/buddy.c:843
-#: ../libpurple/protocols/jabber/buddy.c:1003
-msgid "User Avatar"
-msgstr "�于舒�舒�舒 仗仂仍�亰仂于舒�亠仍�"
-
-#: ../libpurple/protocols/jabber/buddy.c:845
-#: ../libpurple/protocols/jabber/buddy.c:1005
-msgid "Chat State Notifications"
-msgstr "丕于亠亟仂仄仍亠仆亳� 仂 �仂��仂�仆亳亳 �舒�舒"
-
-#: ../libpurple/protocols/jabber/buddy.c:847
-#: ../libpurple/protocols/jabber/buddy.c:1007
-msgid "Software Version"
-msgstr "�亠��亳� 仗�仂亞�舒仄仄仆仂亞仂 仂弍亠�仗亠�亠仆亳�"
-
-#: ../libpurple/protocols/jabber/buddy.c:849
-#: ../libpurple/protocols/jabber/buddy.c:1009
-msgid "Stream Initiation"
-msgstr "弌仂亰亟舒仆亳亠 仗仂�仂从舒"
-
-#: ../libpurple/protocols/jabber/buddy.c:851
-#: ../libpurple/protocols/jabber/buddy.c:1011
-#: ../libpurple/protocols/sametime/sametime.c:3277
-msgid "File Transfer"
-msgstr "�亠�亠亟舒�舒 �舒亶仍仂于"
-
-#: ../libpurple/protocols/jabber/buddy.c:853
-#: ../libpurple/protocols/jabber/buddy.c:1013
-#, fuzzy
-msgid "User Mood"
-msgstr "�亠亢亳仄� 仗仂仍�亰仂于舒�亠仍�"
-
-#: ../libpurple/protocols/jabber/buddy.c:855
-#: ../libpurple/protocols/jabber/buddy.c:1015
-#, fuzzy
-msgid "User Activity"
-msgstr "��亠亟亠仍 从仂仍亳�亠��于舒 仗仂仍�亰仂于舒�亠仍亠亶"
-
 #: ../libpurple/protocols/jabber/buddy.c:857
 #: ../libpurple/protocols/jabber/buddy.c:1017
-#, fuzzy
-msgid "Entity Capabilities"
-msgstr "�仂亰仄仂亢仆仂��亳"
+msgid "In-Band Bytestreams"
+msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:859
 #: ../libpurple/protocols/jabber/buddy.c:1019
-msgid "Encrypted Session Negotiations"
+msgid "Ad-Hoc Commands"
 msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:861
 #: ../libpurple/protocols/jabber/buddy.c:1021
-#, fuzzy
-msgid "User Tune"
-msgstr "�仄� 仗仂仍�亰仂于舒�亠仍�"
+msgid "PubSub Service"
+msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:863
 #: ../libpurple/protocols/jabber/buddy.c:1023
-msgid "Roster Item Exchange"
+msgid "SOCKS5 Bytestreams"
 msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:865
 #: ../libpurple/protocols/jabber/buddy.c:1025
-msgid "Reachability Address"
+msgid "Out of Band Data"
 msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:867
 #: ../libpurple/protocols/jabber/buddy.c:1027
-msgid "User Profile"
-msgstr "��仂�亳仍� 仗仂仍�亰仂于舒�亠仍�"
+msgid "XHTML-IM"
+msgstr "XHTML-IM"
 
 #: ../libpurple/protocols/jabber/buddy.c:869
 #: ../libpurple/protocols/jabber/buddy.c:1029
-msgid "Jingle"
+msgid "In-Band Registration"
 msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:871
 #: ../libpurple/protocols/jabber/buddy.c:1031
-msgid "Jingle Audio"
-msgstr ""
+msgid "User Location"
+msgstr "�亠��仂仗仂仍仂亢亠仆亳亠 仗仂仍�亰仂于舒�亠仍�"
 
 #: ../libpurple/protocols/jabber/buddy.c:873
 #: ../libpurple/protocols/jabber/buddy.c:1033
-msgid "User Nickname"
-msgstr "��亠于亟仂仆亳仄 仗仂仍�亰仂于舒�亠仍�"
+msgid "User Avatar"
+msgstr "�于舒�舒�舒 仗仂仍�亰仂于舒�亠仍�"
 
 #: ../libpurple/protocols/jabber/buddy.c:875
 #: ../libpurple/protocols/jabber/buddy.c:1035
-msgid "Jingle ICE UDP"
-msgstr ""
+msgid "Chat State Notifications"
+msgstr "丕于亠亟仂仄仍亠仆亳� 仂 �仂��仂�仆亳亳 �舒�舒"
 
 #: ../libpurple/protocols/jabber/buddy.c:877
 #: ../libpurple/protocols/jabber/buddy.c:1037
-msgid "Jingle ICE TCP"
-msgstr ""
+msgid "Software Version"
+msgstr "�亠��亳� 仗�仂亞�舒仄仄仆仂亞仂 仂弍亠�仗亠�亠仆亳�"
 
 #: ../libpurple/protocols/jabber/buddy.c:879
 #: ../libpurple/protocols/jabber/buddy.c:1039
-msgid "Jingle Raw UDP"
-msgstr ""
+msgid "Stream Initiation"
+msgstr "弌仂亰亟舒仆亳亠 仗仂�仂从舒"
 
 #: ../libpurple/protocols/jabber/buddy.c:881
 #: ../libpurple/protocols/jabber/buddy.c:1041
-msgid "Jingle Video"
-msgstr ""
+#: ../libpurple/protocols/sametime/sametime.c:3285
+msgid "File Transfer"
+msgstr "�亠�亠亟舒�舒 �舒亶仍仂于"
 
 #: ../libpurple/protocols/jabber/buddy.c:883
 #: ../libpurple/protocols/jabber/buddy.c:1043
-msgid "Jingle DTMF"
-msgstr ""
+#, fuzzy
+msgid "User Mood"
+msgstr "�亠亢亳仄� 仗仂仍�亰仂于舒�亠仍�"
 
 #: ../libpurple/protocols/jabber/buddy.c:885
 #: ../libpurple/protocols/jabber/buddy.c:1045
-#, fuzzy
-msgid "Message Receipts"
-msgstr "��亳仆��仂 �仂仂弍�亠仆亳亠"
+msgid "User Activity"
+msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:887
 #: ../libpurple/protocols/jabber/buddy.c:1047
 #, fuzzy
-msgid "Public Key Publishing"
-msgstr "个舒亶仍 仗�弍仍亳�仆仂亞仂 从仍��舒"
+msgid "Entity Capabilities"
+msgstr "�仂亰仄仂亢仆仂��亳"
 
 #: ../libpurple/protocols/jabber/buddy.c:889
 #: ../libpurple/protocols/jabber/buddy.c:1049
-msgid "User Chatting"
+msgid "Encrypted Session Negotiations"
 msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:891
 #: ../libpurple/protocols/jabber/buddy.c:1051
-msgid "User Browsing"
+msgid "User Tune"
 msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:893
 #: ../libpurple/protocols/jabber/buddy.c:1053
-msgid "User Gaming"
+msgid "Roster Item Exchange"
 msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:895
 #: ../libpurple/protocols/jabber/buddy.c:1055
-msgid "User Viewing"
+msgid "Reachability Address"
 msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:897
 #: ../libpurple/protocols/jabber/buddy.c:1057
+msgid "User Profile"
+msgstr "��仂�亳仍� 仗仂仍�亰仂于舒�亠仍�"
+
+#: ../libpurple/protocols/jabber/buddy.c:899
+#: ../libpurple/protocols/jabber/buddy.c:1059
+msgid "Jingle"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:901
+#: ../libpurple/protocols/jabber/buddy.c:1061
+msgid "Jingle Audio"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:903
+#: ../libpurple/protocols/jabber/buddy.c:1063
+msgid "User Nickname"
+msgstr "��亠于亟仂仆亳仄 仗仂仍�亰仂于舒�亠仍�"
+
+#: ../libpurple/protocols/jabber/buddy.c:905
+#: ../libpurple/protocols/jabber/buddy.c:1065
+msgid "Jingle ICE UDP"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:907
+#: ../libpurple/protocols/jabber/buddy.c:1067
+msgid "Jingle ICE TCP"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:909
+#: ../libpurple/protocols/jabber/buddy.c:1069
+msgid "Jingle Raw UDP"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:911
+#: ../libpurple/protocols/jabber/buddy.c:1071
+msgid "Jingle Video"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:913
+#: ../libpurple/protocols/jabber/buddy.c:1073
+msgid "Jingle DTMF"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:915
+#: ../libpurple/protocols/jabber/buddy.c:1075
+msgid "Message Receipts"
+msgstr "�仂仍��亠仆亳亠 �仂仂弍�亠仆亳亶"
+
+#: ../libpurple/protocols/jabber/buddy.c:917
+#: ../libpurple/protocols/jabber/buddy.c:1077
+#, fuzzy
+msgid "Public Key Publishing"
+msgstr "个舒亶仍 仗�弍仍亳�仆仂亞仂 从仍��舒"
+
+#: ../libpurple/protocols/jabber/buddy.c:919
+#: ../libpurple/protocols/jabber/buddy.c:1079
+msgid "User Chatting"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:921
+#: ../libpurple/protocols/jabber/buddy.c:1081
+msgid "User Browsing"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:923
+#: ../libpurple/protocols/jabber/buddy.c:1083
+msgid "User Gaming"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:925
+#: ../libpurple/protocols/jabber/buddy.c:1085
+msgid "User Viewing"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:927
+#: ../libpurple/protocols/jabber/buddy.c:1087
 #: ../libpurple/protocols/silc/ops.c:1600
 #: ../libpurple/protocols/silc/ops.c:1605
 #: ../libpurple/protocols/silc10/ops.c:1612
@@ -5130,230 +5328,230 @@
 msgid "Ping"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:899
-#: ../libpurple/protocols/jabber/buddy.c:1059
+#: ../libpurple/protocols/jabber/buddy.c:929
+#: ../libpurple/protocols/jabber/buddy.c:1089
 #, fuzzy
 msgid "Stanza Encryption"
 msgstr "丿亳��仂于舒仆亳亠 Trillian"
 
-#: ../libpurple/protocols/jabber/buddy.c:901
-#: ../libpurple/protocols/jabber/buddy.c:1061
+#: ../libpurple/protocols/jabber/buddy.c:931
+#: ../libpurple/protocols/jabber/buddy.c:1091
 msgid "Entity Time"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:903
-#: ../libpurple/protocols/jabber/buddy.c:1063
+#: ../libpurple/protocols/jabber/buddy.c:933
+#: ../libpurple/protocols/jabber/buddy.c:1093
 msgid "Delayed Delivery"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:905
-#: ../libpurple/protocols/jabber/buddy.c:1065
+#: ../libpurple/protocols/jabber/buddy.c:935
+#: ../libpurple/protocols/jabber/buddy.c:1095
 msgid "Collaborative Data Objects"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:907
-#: ../libpurple/protocols/jabber/buddy.c:1067
+#: ../libpurple/protocols/jabber/buddy.c:937
+#: ../libpurple/protocols/jabber/buddy.c:1097
 msgid "File Repository and Sharing"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:909
-#: ../libpurple/protocols/jabber/buddy.c:1069
+#: ../libpurple/protocols/jabber/buddy.c:939
+#: ../libpurple/protocols/jabber/buddy.c:1099
 msgid "STUN Service Discovery for Jingle"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:911
-#: ../libpurple/protocols/jabber/buddy.c:1071
+#: ../libpurple/protocols/jabber/buddy.c:941
+#: ../libpurple/protocols/jabber/buddy.c:1101
 msgid "Simplified Encrypted Session Negotiation"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:913
-#: ../libpurple/protocols/jabber/buddy.c:1073
+#: ../libpurple/protocols/jabber/buddy.c:943
+#: ../libpurple/protocols/jabber/buddy.c:1103
 msgid "Hop Check"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:921
-#: ../libpurple/protocols/jabber/buddy.c:1081
-#: ../libpurple/protocols/oscar/oscar.c:2916
+#: ../libpurple/protocols/jabber/buddy.c:951
+#: ../libpurple/protocols/jabber/buddy.c:1111
+#: ../libpurple/protocols/oscar/oscar.c:2974
 msgid "Capabilities"
 msgstr "�仂亰仄仂亢仆仂��亳"
 
-#: ../libpurple/protocols/jabber/buddy.c:933
+#: ../libpurple/protocols/jabber/buddy.c:963
 #: ../libpurple/protocols/jabber/libxmpp.c:209
-#: ../libpurple/protocols/jabber/si.c:859
+#: ../libpurple/protocols/jabber/si.c:1094
 msgid "Resource"
 msgstr "�亠����"
 
-#: ../libpurple/protocols/jabber/buddy.c:935
-#: ../libpurple/protocols/jabber/jabber.c:1569
-#: ../libpurple/protocols/jabber/jabber.c:1583
-#: ../libpurple/protocols/jabber/jabber.c:1597
-#: ../libpurple/protocols/jabber/jabber.c:1611
-#: ../libpurple/protocols/jabber/jabber.c:1625
+#: ../libpurple/protocols/jabber/buddy.c:965
+#: ../libpurple/protocols/jabber/jabber.c:1607
+#: ../libpurple/protocols/jabber/jabber.c:1621
+#: ../libpurple/protocols/jabber/jabber.c:1635
+#: ../libpurple/protocols/jabber/jabber.c:1649
+#: ../libpurple/protocols/jabber/jabber.c:1663
 msgid "Priority"
 msgstr "��亳仂�亳�亠�"
 
-#: ../libpurple/protocols/jabber/buddy.c:1237
+#: ../libpurple/protocols/jabber/buddy.c:1269
 #: ../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:979
-#: ../libpurple/protocols/oscar/oscar.c:3798
-#: ../libpurple/protocols/oscar/oscar.c:3811
+#: ../libpurple/protocols/jabber/buddy.c:1302
+#: ../libpurple/protocols/jabber/jabber.c:1011
+#: ../libpurple/protocols/oscar/oscar.c:3835
+#: ../libpurple/protocols/oscar/oscar.c:3848
 #: ../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:1308
 msgid "P.O. Box"
 msgstr "�仆亟亠从�"
 
-#: ../libpurple/protocols/jabber/buddy.c:1386
+#: ../libpurple/protocols/jabber/buddy.c:1418
 msgid "Photo"
 msgstr "个仂�仂亞�舒�亳�"
 
-#: ../libpurple/protocols/jabber/buddy.c:1386
+#: ../libpurple/protocols/jabber/buddy.c:1418
 msgid "Logo"
 msgstr "�仂亞仂�亳仗"
 
-#: ../libpurple/protocols/jabber/buddy.c:1945
+#: ../libpurple/protocols/jabber/buddy.c:1977
 msgid "Un-hide From"
 msgstr "�仂从舒亰舒���� 亟仍�"
 
-#: ../libpurple/protocols/jabber/buddy.c:1949
+#: ../libpurple/protocols/jabber/buddy.c:1981
 msgid "Temporarily Hide From"
 msgstr "��亠仄亠仆仆仂 �从������ 仂�"
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1957
+#: ../libpurple/protocols/jabber/buddy.c:1989
 msgid "Cancel Presence Notification"
 msgstr "��仄亠仆亳�� �于亠亟仂仄仍亠仆亳亠 仂 仗�亳�����于亳亳"
 
-#: ../libpurple/protocols/jabber/buddy.c:1964
+#: ../libpurple/protocols/jabber/buddy.c:1996
 msgid "(Re-)Request authorization"
 msgstr "(�仂于�仂�仆仂) �舒仗�仂�亳�� 舒于�仂�亳亰舒�亳�"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:1973
+#: ../libpurple/protocols/jabber/buddy.c:2005
 msgid "Unsubscribe"
 msgstr "��仗亳�舒����"
 
-#: ../libpurple/protocols/jabber/buddy.c:1988
+#: ../libpurple/protocols/jabber/buddy.c:2020
 msgid "Log In"
 msgstr "�仂亶�亳"
 
-#: ../libpurple/protocols/jabber/buddy.c:1992
+#: ../libpurple/protocols/jabber/buddy.c:2024
 msgid "Log Out"
 msgstr "��亶�亳"
 
-#: ../libpurple/protocols/jabber/buddy.c:2038
-#: ../libpurple/protocols/jabber/jabber.c:1582
+#: ../libpurple/protocols/jabber/buddy.c:2070
+#: ../libpurple/protocols/jabber/jabber.c:1620
 msgid "Chatty"
 msgstr "�仂�仂于 仗仂仂弍�舒����"
 
-#: ../libpurple/protocols/jabber/buddy.c:2042
+#: ../libpurple/protocols/jabber/buddy.c:2074
 msgid "Extended Away"
 msgstr "�舒��亳�亠仆仆�亶 \"��仂��仍\""
 
-#: ../libpurple/protocols/jabber/buddy.c:2044
-#: ../libpurple/protocols/jabber/jabber.c:1624
-#: ../libpurple/protocols/oscar/oscar.c:727
-#: ../libpurple/protocols/oscar/oscar.c:5858
-#: ../libpurple/protocols/sametime/sametime.c:3339
+#: ../libpurple/protocols/jabber/buddy.c:2076
+#: ../libpurple/protocols/jabber/jabber.c:1662
+#: ../libpurple/protocols/oscar/oscar.c:728
+#: ../libpurple/protocols/oscar/oscar.c:5937
+#: ../libpurple/protocols/sametime/sametime.c:3347
 #, c-format
 msgid "Do Not Disturb"
 msgstr "�亠 弍亠�仗仂从仂亳��"
 
-#: ../libpurple/protocols/jabber/buddy.c:2211
+#: ../libpurple/protocols/jabber/buddy.c:2243
 msgid "JID"
 msgstr "JID"
 
-#: ../libpurple/protocols/jabber/buddy.c:2215
-#: ../libpurple/protocols/jabber/buddy.c:2404
-#: ../libpurple/protocols/oscar/oscar.c:3721
+#: ../libpurple/protocols/jabber/buddy.c:2247
+#: ../libpurple/protocols/jabber/buddy.c:2436
+#: ../libpurple/protocols/oscar/oscar.c:3758
 msgid "Last Name"
 msgstr "个舒仄亳仍亳�"
 
-#: ../libpurple/protocols/jabber/buddy.c:2247
+#: ../libpurple/protocols/jabber/buddy.c:2279
 msgid "The following are the results of your search"
 msgstr "弌仍亠亟���亠亠 �于仍�亠��� �亠亰�仍��舒�舒仄亳 于舒�亠亞仂 仗仂亳�从舒"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:2332
+#: ../libpurple/protocols/jabber/buddy.c:2364
 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:2352
+#: ../libpurple/protocols/jabber/buddy.c:2384
 msgid "Directory Query Failed"
 msgstr "�亠 �亟舒仍仂�� 仂仗�仂�亳�� 从舒�舒仍仂亞"
 
-#: ../libpurple/protocols/jabber/buddy.c:2353
+#: ../libpurple/protocols/jabber/buddy.c:2385
 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:2387
+#: ../libpurple/protocols/jabber/buddy.c:2419
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "�仆����从�亳亳 �亠�于亠�舒: %s"
 
-#: ../libpurple/protocols/jabber/buddy.c:2394
+#: ../libpurple/protocols/jabber/buddy.c:2426
 msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:2414
+#: ../libpurple/protocols/jabber/buddy.c:2446
 #: ../libpurple/protocols/novell/novell.c:1497
-#: ../libpurple/protocols/oscar/oscar.c:3724
-#: ../libpurple/protocols/oscar/oscar.c:3733
+#: ../libpurple/protocols/oscar/oscar.c:3761
+#: ../libpurple/protocols/oscar/oscar.c:3770
 msgid "E-Mail Address"
 msgstr "�亟�亠� e-mail"
 
-#: ../libpurple/protocols/jabber/buddy.c:2423
-#: ../libpurple/protocols/jabber/buddy.c:2424
+#: ../libpurple/protocols/jabber/buddy.c:2455
+#: ../libpurple/protocols/jabber/buddy.c:2456
 msgid "Search for XMPP users"
 msgstr "��从舒�� 仗仂仍�亰仂于舒�亠仍亠亶 XMPP"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:2425
+#: ../libpurple/protocols/jabber/buddy.c:2457
 #: ../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:5657
+#: ../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:2440
+#: ../libpurple/protocols/jabber/buddy.c:2472
 msgid "Invalid Directory"
 msgstr "�亠于亠�仆�亶 从舒�舒仍仂亞"
 
-#: ../libpurple/protocols/jabber/buddy.c:2457
+#: ../libpurple/protocols/jabber/buddy.c:2489
 msgid "Enter a User Directory"
 msgstr "�于亠亟亳�亠 从舒�舒仍仂亞 仗仂仍�亰仂于舒�亠仍亠亶"
 
-#: ../libpurple/protocols/jabber/buddy.c:2458
+#: ../libpurple/protocols/jabber/buddy.c:2490
 msgid "Select a user directory to search"
 msgstr "��弍亠�亳�亠 从舒�舒仍仂亞 仗仂仍�亰仂于舒�亠仍亠亶 亟仍� 仗仂亳�从舒"
 
-#: ../libpurple/protocols/jabber/buddy.c:2461
+#: ../libpurple/protocols/jabber/buddy.c:2493
 msgid "Search Directory"
 msgstr "�仂亳�从 于 从舒�舒仍仂亞亠"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5342
-#: ../libpurple/protocols/yahoo/yahoochat.c:1048
+#: ../libpurple/protocols/oscar/oscar.c:5417
+#: ../libpurple/protocols/yahoo/yahoochat.c:1057
 msgid "_Room:"
 msgstr "_�仂仄仆舒�舒:"
 
@@ -5453,15 +5651,20 @@
 msgid "Write error"
 msgstr "��亳弍从舒 亰舒仗亳�亳"
 
-#: ../libpurple/protocols/jabber/jabber.c:424
-#: ../libpurple/protocols/jabber/jabber.c:463
+#: ../libpurple/protocols/jabber/jabber.c:401
+#, fuzzy
+msgid "Ping timeout"
+msgstr "��仂��仂亶 �亠从��"
+
+#: ../libpurple/protocols/jabber/jabber.c:448
+#: ../libpurple/protocols/jabber/jabber.c:488
 msgid "Read Error"
 msgstr "��亳弍从舒 ��亠仆亳�"
 
-#: ../libpurple/protocols/jabber/jabber.c:500
+#: ../libpurple/protocols/jabber/jabber.c:525
 #: ../libpurple/protocols/oscar/flap_connection.c:398
-#: ../libpurple/protocols/yahoo/yahoo.c:2562
 #: ../libpurple/protocols/yahoo/yahoo.c:2594
+#: ../libpurple/protocols/yahoo/yahoo.c:2626
 #, c-format
 msgid ""
 "Could not establish a connection with the server:\n"
@@ -5470,198 +5673,195 @@
 "�亠 �亟舒仍仂�� ���舒仆仂于亳�� �仂亠亟亳仆亠仆亳亠 � �亠�于亠�仂仄:\n"
 "%s"
 
-#: ../libpurple/protocols/jabber/jabber.c:550
+#: ../libpurple/protocols/jabber/jabber.c:582
 msgid "Unable to create socket"
 msgstr "�亠 �亟舒���� �仂亰亟舒�� �仂从亠�"
 
-#: ../libpurple/protocols/jabber/jabber.c:598
-#: ../libpurple/protocols/jabber/jabber.c:1092
+#: ../libpurple/protocols/jabber/jabber.c:632
+#: ../libpurple/protocols/jabber/jabber.c:1117
 msgid "Invalid XMPP ID"
 msgstr "�亠于亠�仆�亶 XMPP ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:605
+#: ../libpurple/protocols/jabber/jabber.c:639
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "�亠于亠�仆�亶 XMPP ID. �仂仍亢亠仆 弍��� 亰舒亟舒仆 亟仂仄亠仆."
 
-#: ../libpurple/protocols/jabber/jabber.c:683
+#: ../libpurple/protocols/jabber/jabber.c:717
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "�亠亞亳���舒�亳� %s@%s 亰舒于亠��亠仆舒 ��仗亠�仆仂"
 
-#: ../libpurple/protocols/jabber/jabber.c:689
+#: ../libpurple/protocols/jabber/jabber.c:723
 #, fuzzy, c-format
 msgid "Registration to %s successful"
 msgstr "�亠亞亳���舒�亳� %s@%s 亰舒于亠��亠仆舒 ��仗亠�仆仂"
 
-#: ../libpurple/protocols/jabber/jabber.c:691
-#: ../libpurple/protocols/jabber/jabber.c:692
+#: ../libpurple/protocols/jabber/jabber.c:725
+#: ../libpurple/protocols/jabber/jabber.c:726
 msgid "Registration Successful"
 msgstr "�亠亞亳���舒�亳� 亰舒于亠��亠仆舒 ��仗亠�仆仂"
 
-#: ../libpurple/protocols/jabber/jabber.c:700
-#: ../libpurple/protocols/jabber/jabber.c:701
+#: ../libpurple/protocols/jabber/jabber.c:734
+#: ../libpurple/protocols/jabber/jabber.c:735
 msgid "Registration Failed"
-msgstr "�亠亞亳���舒�亳� 亰舒于亠��亳仍舒�� 仆亠�亟舒�仆仂"
-
-#: ../libpurple/protocols/jabber/jabber.c:719
+msgstr "�亠 �亟舒仍仂�� 于�仗仂仍仆亳�� �亠亞亳���舒�亳�"
+
+#: ../libpurple/protocols/jabber/jabber.c:753
 #, fuzzy, c-format
 msgid "Registration from %s successfully removed"
 msgstr "�亠亞亳���舒�亳� %s@%s 亰舒于亠��亠仆舒 ��仗亠�仆仂"
 
-#: ../libpurple/protocols/jabber/jabber.c:721
-#: ../libpurple/protocols/jabber/jabber.c:722
-#, fuzzy
+#: ../libpurple/protocols/jabber/jabber.c:755
+#: ../libpurple/protocols/jabber/jabber.c:756
 msgid "Unregistration Successful"
-msgstr "�亠亞亳���舒�亳� 亰舒于亠��亠仆舒 ��仗亠�仆仂"
-
-#: ../libpurple/protocols/jabber/jabber.c:730
-#: ../libpurple/protocols/jabber/jabber.c:731
-#, fuzzy
+msgstr "��仄亠仆舒 �亠亞亳���舒�亳亳 亰舒于亠��亠仆舒 ��仗亠�仆仂"
+
+#: ../libpurple/protocols/jabber/jabber.c:764
+#: ../libpurple/protocols/jabber/jabber.c:765
 msgid "Unregistration Failed"
-msgstr "�亠亞亳���舒�亳� 亰舒于亠��亳仍舒�� 仆亠�亟舒�仆仂"
-
-#: ../libpurple/protocols/jabber/jabber.c:891
-#: ../libpurple/protocols/jabber/jabber.c:892
+msgstr "�亠 �亟舒仍仂�� 于�仗仂仍仆亳�� 仂�仄亠仆� �亠亞亳���舒�亳亳"
+
+#: ../libpurple/protocols/jabber/jabber.c:931
+#: ../libpurple/protocols/jabber/jabber.c:932
 msgid "Already Registered"
 msgstr "丕亢亠 亰舒�亠亞亳���亳�仂于舒仆仂"
 
-#: ../libpurple/protocols/jabber/jabber.c:989
-#: ../libpurple/protocols/oscar/oscar.c:3800
-#: ../libpurple/protocols/oscar/oscar.c:3813
+#: ../libpurple/protocols/jabber/jabber.c:1019
+#: ../libpurple/protocols/oscar/oscar.c:3837
+#: ../libpurple/protocols/oscar/oscar.c:3850
 msgid "State"
 msgstr "�弍仍舒���"
 
-#: ../libpurple/protocols/jabber/jabber.c:994
+#: ../libpurple/protocols/jabber/jabber.c:1023
 msgid "Postal code"
 msgstr "�仂��仂于�亶 从仂亟"
 
-#: ../libpurple/protocols/jabber/jabber.c:999
+#: ../libpurple/protocols/jabber/jabber.c:1027
 #: ../libpurple/protocols/silc/ops.c:1035
 #: ../libpurple/protocols/silc/silc.c:915
-#: ../libpurple/protocols/silc/util.c:563
+#: ../libpurple/protocols/silc/util.c:567
 #: ../libpurple/protocols/silc10/ops.c:1069
-#: ../libpurple/protocols/silc10/silc.c:683
-#: ../libpurple/protocols/silc10/util.c:553
+#: ../libpurple/protocols/silc10/silc.c:689
+#: ../libpurple/protocols/silc10/util.c:557
 msgid "Phone"
 msgstr "丐亠仍亠�仂仆"
 
-#: ../libpurple/protocols/jabber/jabber.c:1009
+#: ../libpurple/protocols/jabber/jabber.c:1035
 msgid "Date"
 msgstr "�舒�舒"
 
-#: ../libpurple/protocols/jabber/jabber.c:1014
+#: ../libpurple/protocols/jabber/jabber.c:1039
 msgid "Unregister"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1021
+msgstr "��仄亠仆亳�� �亠亞亳���舒�亳�"
+
+#: ../libpurple/protocols/jabber/jabber.c:1046
 msgid ""
 "Please fill out the information below to change your account registration."
 msgstr ""
 "�舒仗仂仍仆亳�亠 仆亳亢亠�仍亠亟���亳亠 仗仂仍� 亟仍� 亳亰仄亠仆亠仆亳� �亠亞亳���舒�亳亳 于舒�亠亶 ����仆仂亶 亰舒仗亳�亳."
 
-#: ../libpurple/protocols/jabber/jabber.c:1024
+#: ../libpurple/protocols/jabber/jabber.c:1049
 msgid "Please fill out the information below to register your new account."
 msgstr "�舒仗仂仍仆亳�亠 仆亳亢亠�仍亠亟���亳亠 仗仂仍� 亟仍� �亠亞亳���舒�亳亳 仆仂于仂亶 ����仆仂亶 亰舒仗亳�亳."
 
-#: ../libpurple/protocols/jabber/jabber.c:1032
-#: ../libpurple/protocols/jabber/jabber.c:1033
+#: ../libpurple/protocols/jabber/jabber.c:1057
+#: ../libpurple/protocols/jabber/jabber.c:1058
 msgid "Register New XMPP Account"
 msgstr "�舒�亠亞亳���亳�仂于舒�� 仆仂于�� ����仆�� 亰舒仗亳�� XMPP"
 
-#: ../libpurple/protocols/jabber/jabber.c:1034
-#: ../libpurple/protocols/jabber/jabber.c:1043
+#: ../libpurple/protocols/jabber/jabber.c:1059
+#: ../libpurple/protocols/jabber/jabber.c:1068
 msgid "Register"
 msgstr "�舒�亠亞亳���亳�仂于舒��"
 
-#: ../libpurple/protocols/jabber/jabber.c:1039
+#: ../libpurple/protocols/jabber/jabber.c:1064
 #, c-format
 msgid "Change Account Registration at %s"
 msgstr "�亰仄亠仆亳�� �亠亞亳���舒�亳� ����仆仂亶 亰舒仗亳�亳 仆舒 %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1040
+#: ../libpurple/protocols/jabber/jabber.c:1065
 #, c-format
 msgid "Register New Account at %s"
 msgstr "�舒�亠亞亳���亳�仂于舒�� 仆仂于�� ����仆�� 亰舒仗亳�� 仆舒 %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1043
+#: ../libpurple/protocols/jabber/jabber.c:1068
 msgid "Change Registration"
 msgstr "�亰仄亠仆亳�� �亠亞亳���舒�亳�"
 
-#: ../libpurple/protocols/jabber/jabber.c:1151
-#: ../libpurple/protocols/jabber/jabber.c:1152
-#, fuzzy
+#: ../libpurple/protocols/jabber/jabber.c:1177
+#: ../libpurple/protocols/jabber/jabber.c:1178
 msgid "Error unregistering account"
-msgstr "��亳弍从舒 亳亰仄亠仆亠仆亳� 亳仆�仂�仄舒�亳亳 仂弍 ����仆仂亶 亰舒仗亳�亳"
-
-#: ../libpurple/protocols/jabber/jabber.c:1157
-#: ../libpurple/protocols/jabber/jabber.c:1158
+msgstr "��亳弍从舒 仂�仄亠仆� �亠亞亳���舒�亳亳 ����仆仂亶 亰舒仗亳�亳"
+
+#: ../libpurple/protocols/jabber/jabber.c:1183
+#: ../libpurple/protocols/jabber/jabber.c:1184
 msgid "Account successfully unregistered"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1315
+#: ../libpurple/protocols/jabber/jabber.c:1347
 msgid "Initializing Stream"
 msgstr "�仆亳�亳舒仍亳亰舒�亳� 仗仂�仂从舒"
 
-#: ../libpurple/protocols/jabber/jabber.c:1320
+#: ../libpurple/protocols/jabber/jabber.c:1352
 msgid "Initializing SSL/TLS"
 msgstr "�仆亳�亳舒仍亳亰舒�亳� SSL/TLS"
 
-#: ../libpurple/protocols/jabber/jabber.c:1324
+#: ../libpurple/protocols/jabber/jabber.c:1356
 #: ../libpurple/protocols/msn/session.c:408
-#: ../libpurple/protocols/msnp9/session.c:361
+#: ../libpurple/protocols/msnp9/session.c:360
 msgid "Authenticating"
 msgstr "���亠仆�亳�亳从舒�亳�"
 
-#: ../libpurple/protocols/jabber/jabber.c:1333
+#: ../libpurple/protocols/jabber/jabber.c:1365
 msgid "Re-initializing Stream"
 msgstr "�仂于�仂�仆舒� 亳仆亳�亳舒仍亳亰舒�亳� 仗仂�仂从舒"
 
-#: ../libpurple/protocols/jabber/jabber.c:1427
-#: ../libpurple/protocols/jabber/jabber.c:1879
-#: ../libpurple/protocols/jabber/jabber.c:1922
+#: ../libpurple/protocols/jabber/jabber.c:1459
+#: ../libpurple/protocols/jabber/jabber.c:1917
 #: ../libpurple/protocols/jabber/jabber.c:1960
-#: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:5652
+#: ../libpurple/protocols/jabber/jabber.c:1998
+#: ../libpurple/protocols/oscar/oscar.c:827
+#: ../libpurple/protocols/oscar/oscar.c:5731
 msgid "Not Authorized"
 msgstr "�亠 舒于�仂�亳亰仂于舒仆"
 
-#: ../libpurple/protocols/jabber/jabber.c:1475
+#: ../libpurple/protocols/jabber/jabber.c:1507
 msgid "Both"
 msgstr "�弍亠"
 
-#: ../libpurple/protocols/jabber/jabber.c:1477
+#: ../libpurple/protocols/jabber/jabber.c:1509
 msgid "From (To pending)"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1479
+#: ../libpurple/protocols/jabber/jabber.c:1511
 msgid "From"
 msgstr "��"
 
-#: ../libpurple/protocols/jabber/jabber.c:1482
+#: ../libpurple/protocols/jabber/jabber.c:1514
 msgid "To"
 msgstr "�仍�"
 
-#: ../libpurple/protocols/jabber/jabber.c:1484
+#: ../libpurple/protocols/jabber/jabber.c:1516
 msgid "None (To pending)"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1486
+#: ../libpurple/protocols/jabber/jabber.c:1518
 #: ../pidgin/plugins/gevolution/eds-utils.c:73
 #: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr "�亠�"
 
-#: ../libpurple/protocols/jabber/jabber.c:1489
+#: ../libpurple/protocols/jabber/jabber.c:1521
 msgid "Subscription"
 msgstr "�仂亟仗亳�从舒"
 
-#: ../libpurple/protocols/jabber/jabber.c:1499
-#: ../libpurple/protocols/jabber/jabber.c:1502
-#: ../libpurple/protocols/jabber/jabber.c:1571
-#: ../libpurple/protocols/jabber/jabber.c:1585
-#: ../libpurple/protocols/jabber/jabber.c:1599
-#: ../libpurple/protocols/jabber/jabber.c:1613
-#: ../libpurple/protocols/jabber/jabber.c:1627
+#: ../libpurple/protocols/jabber/jabber.c:1531
+#: ../libpurple/protocols/jabber/jabber.c:1534
+#: ../libpurple/protocols/jabber/jabber.c:1609
+#: ../libpurple/protocols/jabber/jabber.c:1623
+#: ../libpurple/protocols/jabber/jabber.c:1637
+#: ../libpurple/protocols/jabber/jabber.c:1651
+#: ../libpurple/protocols/jabber/jabber.c:1665
 #: ../libpurple/protocols/jabber/usermood.c:184
 #: ../libpurple/protocols/silc/buddy.c:1560
 #: ../libpurple/protocols/silc/ops.c:1212
@@ -5670,446 +5870,447 @@
 msgid "Mood"
 msgstr "�舒���仂亠仆亳亠"
 
-#: ../libpurple/protocols/jabber/jabber.c:1507
-#: ../libpurple/protocols/msn/msn.c:647
-#, fuzzy
-msgid "Current media"
-msgstr "丐亠从��亳亶 仄舒�从亠�"
-
-#: ../libpurple/protocols/jabber/jabber.c:1572
-#: ../libpurple/protocols/jabber/jabber.c:1586
-#: ../libpurple/protocols/jabber/jabber.c:1600
-#: ../libpurple/protocols/jabber/jabber.c:1614
-#: ../libpurple/protocols/jabber/jabber.c:1628
+#: ../libpurple/protocols/jabber/jabber.c:1543
+#: ../libpurple/protocols/msn/msn.c:642
+msgid "Now Listening"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1610
+#: ../libpurple/protocols/jabber/jabber.c:1624
+#: ../libpurple/protocols/jabber/jabber.c:1638
+#: ../libpurple/protocols/jabber/jabber.c:1652
+#: ../libpurple/protocols/jabber/jabber.c:1666
 msgid "Mood Text"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1574
-#: ../libpurple/protocols/jabber/jabber.c:1588
-#: ../libpurple/protocols/jabber/jabber.c:1602
-#: ../libpurple/protocols/jabber/jabber.c:1616
-#: ../libpurple/protocols/jabber/jabber.c:1630
+#: ../libpurple/protocols/jabber/jabber.c:1612
+#: ../libpurple/protocols/jabber/jabber.c:1626
+#: ../libpurple/protocols/jabber/jabber.c:1640
+#: ../libpurple/protocols/jabber/jabber.c:1654
+#: ../libpurple/protocols/jabber/jabber.c:1668
 #, fuzzy
 msgid "Allow Buzz"
 msgstr "�舒亰�亠�亳��"
 
-#: ../libpurple/protocols/jabber/jabber.c:1648
+#: ../libpurple/protocols/jabber/jabber.c:1686
 #, fuzzy
 msgid "Tune Artist"
 msgstr "丱�亟仂亢仆亳从亳"
 
-#: ../libpurple/protocols/jabber/jabber.c:1649
+#: ../libpurple/protocols/jabber/jabber.c:1687
 #, fuzzy
 msgid "Tune Title"
 msgstr "�舒亰于舒仆亳亠"
 
-#: ../libpurple/protocols/jabber/jabber.c:1650
+#: ../libpurple/protocols/jabber/jabber.c:1688
 msgid "Tune Album"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1651
+#: ../libpurple/protocols/jabber/jabber.c:1689
 msgid "Tune Genre"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1652
+#: ../libpurple/protocols/jabber/jabber.c:1690
 #, fuzzy
 msgid "Tune Comment"
 msgstr "�仂仄仄亠仆�舒�亳亶 �仂弍亠�亠亟仆亳从舒"
 
-#: ../libpurple/protocols/jabber/jabber.c:1653
+#: ../libpurple/protocols/jabber/jabber.c:1691
 msgid "Tune Track"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1654
+#: ../libpurple/protocols/jabber/jabber.c:1692
 msgid "Tune Time"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1655
+#: ../libpurple/protocols/jabber/jabber.c:1693
 msgid "Tune Year"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1656
+#: ../libpurple/protocols/jabber/jabber.c:1694
 msgid "Tune URL"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1672
+#: ../libpurple/protocols/jabber/jabber.c:1710
 msgid "Password Changed"
 msgstr "�舒�仂仍� 亳亰仄亠仆�仆"
 
-#: ../libpurple/protocols/jabber/jabber.c:1673
+#: ../libpurple/protocols/jabber/jabber.c:1711
 msgid "Your password has been changed."
 msgstr "�舒�仂仍� 弍�仍 亳亰仄亠仆�仆."
 
-#: ../libpurple/protocols/jabber/jabber.c:1679
-#: ../libpurple/protocols/jabber/jabber.c:1680
+#: ../libpurple/protocols/jabber/jabber.c:1717
+#: ../libpurple/protocols/jabber/jabber.c:1718
 msgid "Error changing password"
 msgstr "��亳弍从舒 亳亰仄亠仆亠仆亳� 仗舒�仂仍�"
 
-#: ../libpurple/protocols/jabber/jabber.c:1737
+#: ../libpurple/protocols/jabber/jabber.c:1775
 msgid "Password (again)"
 msgstr "�舒�仂仍� (亠�� �舒亰)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1743
-#: ../libpurple/protocols/jabber/jabber.c:1744
+#: ../libpurple/protocols/jabber/jabber.c:1781
+#: ../libpurple/protocols/jabber/jabber.c:1782
 msgid "Change XMPP Password"
 msgstr "�亰仄亠仆亳�� 仗舒�仂仍� XMPP"
 
-#: ../libpurple/protocols/jabber/jabber.c:1744
+#: ../libpurple/protocols/jabber/jabber.c:1782
 msgid "Please enter your new password"
 msgstr "�于亠亟亳�亠 仆仂于�亶 仗舒�仂仍�"
 
-#: ../libpurple/protocols/jabber/jabber.c:1758
-#: ../libpurple/protocols/oscar/oscar.c:6438
+#: ../libpurple/protocols/jabber/jabber.c:1796
+#: ../libpurple/protocols/oscar/oscar.c:6517
 #: ../libpurple/protocols/silc/silc.c:1236
-#: ../libpurple/protocols/silc10/silc.c:1007
+#: ../libpurple/protocols/silc10/silc.c:1010
 msgid "Set User Info..."
 msgstr "丕��舒仆仂于亳�� 仗仂仍�亰仂于舒�亠仍��从�� 亳仆�仂�仄舒�亳�..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1763
-#: ../libpurple/protocols/oscar/oscar.c:6449
+#: ../libpurple/protocols/jabber/jabber.c:1801
+#: ../libpurple/protocols/oscar/oscar.c:6528
 #: ../libpurple/protocols/silc/silc.c:1232
-#: ../libpurple/protocols/silc10/silc.c:1003
+#: ../libpurple/protocols/silc10/silc.c:1006
 msgid "Change Password..."
 msgstr "�亰仄亠仆亳�� 仗舒�仂仍�..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1768
+#: ../libpurple/protocols/jabber/jabber.c:1806
 msgid "Search for Users..."
 msgstr "��从舒�� 仗仂仍�亰仂于舒�亠仍亠亶..."
 
-#: ../libpurple/protocols/jabber/jabber.c:1859
+#: ../libpurple/protocols/jabber/jabber.c:1897
 msgid "Bad Request"
 msgstr "�亠于亠�仆�亶 亰舒仗�仂�"
 
-#: ../libpurple/protocols/jabber/jabber.c:1861
+#: ../libpurple/protocols/jabber/jabber.c:1899
 msgid "Conflict"
 msgstr "�仂仆�仍亳从�"
 
-#: ../libpurple/protocols/jabber/jabber.c:1863
+#: ../libpurple/protocols/jabber/jabber.c:1901
 msgid "Feature Not Implemented"
 msgstr "个�仆从�亳� 仆亠 �亠舒仍亳亰仂于舒仆舒"
 
-#: ../libpurple/protocols/jabber/jabber.c:1865
+#: ../libpurple/protocols/jabber/jabber.c:1903
 msgid "Forbidden"
 msgstr "�舒仗�亠�亠仆仂"
 
-#: ../libpurple/protocols/jabber/jabber.c:1867
+#: ../libpurple/protocols/jabber/jabber.c:1905
 msgid "Gone"
 msgstr "丕��仍"
 
-#: ../libpurple/protocols/jabber/jabber.c:1869
-#: ../libpurple/protocols/jabber/jabber.c:1950
+#: ../libpurple/protocols/jabber/jabber.c:1907
+#: ../libpurple/protocols/jabber/jabber.c:1988
 msgid "Internal Server Error"
 msgstr "�仆���亠仆仆�� 仂�亳弍从舒 �亠�于亠�舒"
 
-#: ../libpurple/protocols/jabber/jabber.c:1871
+#: ../libpurple/protocols/jabber/jabber.c:1909
 msgid "Item Not Found"
 msgstr "亅仍亠仄亠仆� 仆亠 仆舒亶亟亠仆"
 
-#: ../libpurple/protocols/jabber/jabber.c:1873
+#: ../libpurple/protocols/jabber/jabber.c:1911
 msgid "Malformed XMPP ID"
 msgstr "�亠于亠�仆仂 ��仂�仄亳�仂于舒仆仆�亶 XMPP ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:1875
+#: ../libpurple/protocols/jabber/jabber.c:1913
 msgid "Not Acceptable"
 msgstr "�亠亟仂仗���亳仄仂"
 
-#: ../libpurple/protocols/jabber/jabber.c:1877
+#: ../libpurple/protocols/jabber/jabber.c:1915
 msgid "Not Allowed"
 msgstr "�亠 �舒亰�亠�亠仆仂"
 
-#: ../libpurple/protocols/jabber/jabber.c:1881
+#: ../libpurple/protocols/jabber/jabber.c:1919
 msgid "Payment Required"
 msgstr "丐�亠弍�亠��� 仗仍舒�舒"
 
-#: ../libpurple/protocols/jabber/jabber.c:1883
+#: ../libpurple/protocols/jabber/jabber.c:1921
 msgid "Recipient Unavailable"
 msgstr "�仂仍��舒�亠仍� 仆亠亟仂���仗亠仆"
 
-#: ../libpurple/protocols/jabber/jabber.c:1887
+#: ../libpurple/protocols/jabber/jabber.c:1925
 msgid "Registration Required"
 msgstr "丐�亠弍�亠��� �亠亞亳���舒�亳�"
 
-#: ../libpurple/protocols/jabber/jabber.c:1889
+#: ../libpurple/protocols/jabber/jabber.c:1927
 msgid "Remote Server Not Found"
 msgstr "丕亟舒仍�仆仆�亶 �亠�于亠� 仆亠 仆舒亶亟亠仆"
 
-#: ../libpurple/protocols/jabber/jabber.c:1891
+#: ../libpurple/protocols/jabber/jabber.c:1929
 msgid "Remote Server Timeout"
 msgstr "���亠从仍仂 于�亠仄� 仂亢亳亟舒仆亳� �亟舒仍�仆仆仂亞仂 �亠�于亠�舒"
 
-#: ../libpurple/protocols/jabber/jabber.c:1893
+#: ../libpurple/protocols/jabber/jabber.c:1931
 msgid "Server Overloaded"
 msgstr "弌亠�于亠� 仗亠�亠亞��亢亠仆"
 
-#: ../libpurple/protocols/jabber/jabber.c:1895
+#: ../libpurple/protocols/jabber/jabber.c:1933
 msgid "Service Unavailable"
 msgstr "弌仍�亢弍舒 仆亠亟仂���仗仆舒"
 
-#: ../libpurple/protocols/jabber/jabber.c:1897
+#: ../libpurple/protocols/jabber/jabber.c:1935
 msgid "Subscription Required"
 msgstr "丐�亠弍�亠��� 仗仂亟仗亳�从舒"
 
-#: ../libpurple/protocols/jabber/jabber.c:1899
+#: ../libpurple/protocols/jabber/jabber.c:1937
 msgid "Unexpected Request"
 msgstr "�亠仗�亠亟于亳亟亠仆仆�亶 亰舒仗�仂�"
 
-#: ../libpurple/protocols/jabber/jabber.c:1907
+#: ../libpurple/protocols/jabber/jabber.c:1945
 msgid "Authorization Aborted"
 msgstr "�于�仂�亳亰舒�亳� 仗�亠�于舒仆舒"
 
-#: ../libpurple/protocols/jabber/jabber.c:1909
+#: ../libpurple/protocols/jabber/jabber.c:1947
 msgid "Incorrect encoding in authorization"
 msgstr "�亠仗�舒于亳仍�仆舒� 从仂亟亳�仂于从舒 于 舒于�仂�亳亰舒�亳亳"
 
-#: ../libpurple/protocols/jabber/jabber.c:1911
+#: ../libpurple/protocols/jabber/jabber.c:1949
 msgid "Invalid authzid"
 msgstr "�亠于亠�仆�亶 亳亟亠仆�亳�亳从舒�仂� 舒于�仂�亳亰舒�亳亳"
 
-#: ../libpurple/protocols/jabber/jabber.c:1913
+#: ../libpurple/protocols/jabber/jabber.c:1951
 msgid "Invalid Authorization Mechanism"
 msgstr "�亠于亠�仆�亶 仄亠�舒仆亳亰仄 舒于�仂�亳亰舒�亳亳"
 
-#: ../libpurple/protocols/jabber/jabber.c:1916
+#: ../libpurple/protocols/jabber/jabber.c:1954
 msgid "Authorization mechanism too weak"
 msgstr "�亠�舒仆亳亰仄 舒于�仂�亳亰舒�亳亳 �仍亳�从仂仄 �仍舒弍"
 
-#: ../libpurple/protocols/jabber/jabber.c:1924
+#: ../libpurple/protocols/jabber/jabber.c:1962
 msgid "Temporary Authentication Failure"
 msgstr "��亠仄亠仆仆舒� 仂�亳弍从舒 舒��亠仆�亳�亳从舒�亳亳"
 
-#: ../libpurple/protocols/jabber/jabber.c:1927
+#: ../libpurple/protocols/jabber/jabber.c:1965
 msgid "Authentication Failure"
 msgstr "��亳弍从舒 舒��亠仆�亳�亳从舒�亳亳"
 
-#: ../libpurple/protocols/jabber/jabber.c:1935
+#: ../libpurple/protocols/jabber/jabber.c:1973
 msgid "Bad Format"
 msgstr "�亠于亠�仆�亶 �仂�仄舒�"
 
-#: ../libpurple/protocols/jabber/jabber.c:1937
+#: ../libpurple/protocols/jabber/jabber.c:1975
 msgid "Bad Namespace Prefix"
 msgstr "�亠于亠�仆�亶 仗�亠�亳从� 仗�仂���舒仆��于舒 亳仄�仆"
 
-#: ../libpurple/protocols/jabber/jabber.c:1940
+#: ../libpurple/protocols/jabber/jabber.c:1978
 msgid "Resource Conflict"
 msgstr "�仂仆�仍亳从� �亠����仂于"
 
-#: ../libpurple/protocols/jabber/jabber.c:1942
+#: ../libpurple/protocols/jabber/jabber.c:1980
 #: ../libpurple/protocols/silc/silc.c:350
-#: ../libpurple/protocols/silc10/ops.c:1720
+#: ../libpurple/protocols/silc10/ops.c:1725
 msgid "Connection Timeout"
 msgstr "���亠从仍仂 于�亠仄� 仂亢亳亟舒仆亳� �仂亠亟亳仆亠仆亳�"
 
-#: ../libpurple/protocols/jabber/jabber.c:1944
+#: ../libpurple/protocols/jabber/jabber.c:1982
 msgid "Host Gone"
 msgstr "丕亰亠仍 ���仍"
 
-#: ../libpurple/protocols/jabber/jabber.c:1946
+#: ../libpurple/protocols/jabber/jabber.c:1984
 msgid "Host Unknown"
 msgstr "丕亰亠仍 仆亠亳亰于亠��亠仆"
 
-#: ../libpurple/protocols/jabber/jabber.c:1948
+#: ../libpurple/protocols/jabber/jabber.c:1986
 msgid "Improper Addressing"
 msgstr "�亠仗�舒于亳仍�仆舒� 舒亟�亠�舒�亳�"
 
-#: ../libpurple/protocols/jabber/jabber.c:1952
+#: ../libpurple/protocols/jabber/jabber.c:1990
 msgid "Invalid ID"
 msgstr "�亠于亠�仆�亶 ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:1954
+#: ../libpurple/protocols/jabber/jabber.c:1992
 msgid "Invalid Namespace"
 msgstr "�亠于亠�仆仂亠 仗�仂���舒仆��于仂 亳仄�仆"
 
-#: ../libpurple/protocols/jabber/jabber.c:1956
+#: ../libpurple/protocols/jabber/jabber.c:1994
 msgid "Invalid XML"
 msgstr "�亠于亠�仆�亶 XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1958
+#: ../libpurple/protocols/jabber/jabber.c:1996
 msgid "Non-matching Hosts"
 msgstr "�亠�仂�亠�舒亠仄�亠 �亰仍�"
 
-#: ../libpurple/protocols/jabber/jabber.c:1962
+#: ../libpurple/protocols/jabber/jabber.c:2000
 msgid "Policy Violation"
 msgstr "�舒���亠仆亳亠 仗�舒于亳仍"
 
-#: ../libpurple/protocols/jabber/jabber.c:1964
+#: ../libpurple/protocols/jabber/jabber.c:2002
 msgid "Remote Connection Failed"
 msgstr "�亠 �亟舒仍仂�� ���舒仆仂于亳�� �亟舒仍�仆仆仂亠 �仂亠亟亳仆亠仆亳亠"
 
-#: ../libpurple/protocols/jabber/jabber.c:1966
+#: ../libpurple/protocols/jabber/jabber.c:2004
 msgid "Resource Constraint"
 msgstr "�亠亟仂��舒�仂从 �亠����仂于"
 
-#: ../libpurple/protocols/jabber/jabber.c:1968
+#: ../libpurple/protocols/jabber/jabber.c:2006
 msgid "Restricted XML"
 msgstr "�亞�舒仆亳�亠仆仆�亶 XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1970
+#: ../libpurple/protocols/jabber/jabber.c:2008
 msgid "See Other Host"
 msgstr "�弍�舒�亳�亠�� 从 亟��亞仂仄� �亰仍�"
 
-#: ../libpurple/protocols/jabber/jabber.c:1972
+#: ../libpurple/protocols/jabber/jabber.c:2010
 msgid "System Shutdown"
 msgstr "��从仍��亠仆亳亠 �亳��亠仄�"
 
-#: ../libpurple/protocols/jabber/jabber.c:1974
+#: ../libpurple/protocols/jabber/jabber.c:2012
 msgid "Undefined Condition"
 msgstr "�亠仂仗�亠亟亠仍�仆仆仂亠 �仂��仂�仆亳亠"
 
-#: ../libpurple/protocols/jabber/jabber.c:1976
+#: ../libpurple/protocols/jabber/jabber.c:2014
 msgid "Unsupported Encoding"
 msgstr "�亠仗仂亟亟亠�亢亳于舒亠仄舒� 从仂亟亳�仂于从舒"
 
-#: ../libpurple/protocols/jabber/jabber.c:1978
+#: ../libpurple/protocols/jabber/jabber.c:2016
 msgid "Unsupported Stanza Type"
 msgstr "�亠仗仂亟亟亠�亢亳于舒亠仄�亶 �亳仗 ���仂��"
 
-#: ../libpurple/protocols/jabber/jabber.c:1980
+#: ../libpurple/protocols/jabber/jabber.c:2018
 msgid "Unsupported Version"
 msgstr "�亠仗仂亟亟亠�亢亳于舒亠仄舒� 于亠��亳�"
 
-#: ../libpurple/protocols/jabber/jabber.c:1982
+#: ../libpurple/protocols/jabber/jabber.c:2020
 msgid "XML Not Well Formed"
 msgstr "XML 仆亠 ��仂�仄亳�仂于舒仆 亟仂仍亢仆�仄 仂弍�舒亰仂仄"
 
-#: ../libpurple/protocols/jabber/jabber.c:1984
+#: ../libpurple/protocols/jabber/jabber.c:2022
 msgid "Stream Error"
 msgstr "��亳弍从舒 仗仂�仂从舒"
 
-#: ../libpurple/protocols/jabber/jabber.c:2069
+#: ../libpurple/protocols/jabber/jabber.c:2107
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "�亠 �亟舒���� 于�亞仆舒�� 仗仂仍�亰仂于舒�亠仍� %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2089
+#: ../libpurple/protocols/jabber/jabber.c:2127
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2094
+#: ../libpurple/protocols/jabber/jabber.c:2132
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2113
+#: ../libpurple/protocols/jabber/jabber.c:2151
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2118
+#: ../libpurple/protocols/jabber/jabber.c:2156
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2171
+#: ../libpurple/protocols/jabber/jabber.c:2209
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "�亠 �亟舒���� �亟舒仍亳�� 仗仂仍�亰仂于舒�亠仍� %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2202
+#: ../libpurple/protocols/jabber/jabber.c:2240
 #, fuzzy, c-format
 msgid "Unable to ping user %s"
 msgstr "�亠 �亟舒���� 于�亞仆舒�� 仗仂仍�亰仂于舒�亠仍� %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2220
-#: ../libpurple/protocols/jabber/jabber.c:2231
+#: ../libpurple/protocols/jabber/jabber.c:2258
+#: ../libpurple/protocols/jabber/jabber.c:2269
 #, c-format
 msgid "Unable to buzz, because there is nothing known about user %s."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2226
+#: ../libpurple/protocols/jabber/jabber.c:2264
 #, c-format
 msgid "Unable to buzz, because user %s might be offline."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2257
+#: ../libpurple/protocols/jabber/jabber.c:2295
 #, fuzzy, c-format
 msgid "Unable to buzz, because the user %s does not support it."
 msgstr ""
 "�亠 �亟舒���� 仂�仗�舒于亳�� �舒亶仍 亟仍� %s, 仗仂仍�亰仂于舒�亠仍� 仆亠 仗仂亟亟亠�亢亳于舒亠� 仗�亳�仄 �舒亶仍仂于"
 
-#: ../libpurple/protocols/jabber/jabber.c:2279
-#: ../libpurple/protocols/yahoo/yahoo.c:4130
+#. Yahoo only supports one attention command: the 'buzz'.
+#. This is index number YAHOO_BUZZ.
+#: ../libpurple/protocols/jabber/jabber.c:2315
+#: ../libpurple/protocols/yahoo/yahoo.c:4163
 msgid "Buzz"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2280
+#: ../libpurple/protocols/jabber/jabber.c:2316
 #: ../libpurple/protocols/jabber/message.c:308
-#: ../libpurple/protocols/yahoo/yahoo.c:4131
+#: ../libpurple/protocols/yahoo/yahoo.c:4164
 #, c-format
 msgid "%s has buzzed you!"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2281
-#: ../libpurple/protocols/yahoo/yahoo.c:4132
+#: ../libpurple/protocols/jabber/jabber.c:2316
+#: ../libpurple/protocols/yahoo/yahoo.c:4164
 #, c-format
 msgid "Buzzing %s..."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2313
+#: ../libpurple/protocols/jabber/jabber.c:2347
 msgid "config:  Configure a chat room."
 msgstr "config:  �舒���仂亳�� 从仂仄仆舒��."
 
-#: ../libpurple/protocols/jabber/jabber.c:2317
+#: ../libpurple/protocols/jabber/jabber.c:2351
 msgid "configure:  Configure a chat room."
 msgstr "configure:  �舒���仂亳�� 从仂仄仆舒��."
 
-#: ../libpurple/protocols/jabber/jabber.c:2326
+#: ../libpurple/protocols/jabber/jabber.c:2360
 msgid "part [room]:  Leave the room."
 msgstr "part [从仂仄仆舒�舒]:  �仂从亳仆��� 从仂仄仆舒��."
 
-#: ../libpurple/protocols/jabber/jabber.c:2331
+#: ../libpurple/protocols/jabber/jabber.c:2365
 msgid "register:  Register with a chat room."
 msgstr "register:  �舒�亠亞亳���亳�仂于舒�� 从仂仄仆舒��."
 
-#: ../libpurple/protocols/jabber/jabber.c:2337
+#: ../libpurple/protocols/jabber/jabber.c:2371
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [仆仂于舒� �亠仄舒]:  ��仂�仄仂��亠�� 亳仍亳 亳亰仄亠仆亳�� �亠仄�."
 
-#: ../libpurple/protocols/jabber/jabber.c:2343
+#: ../libpurple/protocols/jabber/jabber.c:2377
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;仗仂仍�亰仂于舒�亠仍�&gt; [从仂仄仆舒�舒]:  ��亞仆舒�� 仗仂仍�亰仂于舒�亠仍� 亳亰 从仂仄仆舒��."
 
-#: ../libpurple/protocols/jabber/jabber.c:2349
+#: ../libpurple/protocols/jabber/jabber.c:2383
 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:2355
+#: ../libpurple/protocols/jabber/jabber.c:2389
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2361
+#: ../libpurple/protocols/jabber/jabber.c:2395
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr ""
 "invite &lt;仗仂仍�亰仂于舒�亠仍�&gt; [�仂仂弍�亠仆亳亠]:  ��亳亞仍舒�亳�� 仗仂仍�亰仂于舒�亠仍� 于 从仂仄仆舒��."
 
-#: ../libpurple/protocols/jabber/jabber.c:2367
+#: ../libpurple/protocols/jabber/jabber.c:2401
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr ""
 "join: &lt;从仂仄仆舒�舒&gt; [�亠�于亠�]:  ��亳�仂亠亟亳仆亳���� 从 �舒�� 仆舒 ��仂仄 �亠�于亠�亠."
 
-#: ../libpurple/protocols/jabber/jabber.c:2373
+#: ../libpurple/protocols/jabber/jabber.c:2407
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;仗仂仍�亰仂于舒�亠仍�&gt; [从仂仄仆舒�舒]:  丕亟舒仍亳�� 仗仂仍�亰仂于舒�亠仍� 亳亰 从仂仄仆舒��."
 
-#: ../libpurple/protocols/jabber/jabber.c:2378
+#: ../libpurple/protocols/jabber/jabber.c:2412
 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:2384
+#: ../libpurple/protocols/jabber/jabber.c:2418
 msgid "ping &lt;jid&gt;:\tPing a user/component/server."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2389
-#: ../libpurple/protocols/yahoo/yahoo.c:4156
+#: ../libpurple/protocols/jabber/jabber.c:2423
+#: ../libpurple/protocols/yahoo/yahoo.c:4187
 msgid "buzz: Buzz a user to get their attention"
 msgstr ""
 
@@ -6129,7 +6330,7 @@
 msgstr "�仂亟�仍� 仗�仂�仂从仂仍舒 XMPP"
 
 #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
-#: ../libpurple/protocols/jabber/libxmpp.c:205 ../pidgin/gtkaccount.c:509
+#: ../libpurple/protocols/jabber/libxmpp.c:205 ../pidgin/gtkaccount.c:478
 msgid "Domain"
 msgstr "�仂仄亠仆"
 
@@ -6146,8 +6347,8 @@
 msgstr "�舒亰�亠�亳�� 亳亟亠仆�亳�亳从舒�亳� 仗�仂���仄 �亠从��仂仄 �亠�亠亰 仆亠�亳��仂于舒仆仆�亠 仗仂�仂从亳"
 
 #: ../libpurple/protocols/jabber/libxmpp.c:227
-#: ../libpurple/protocols/myspace/myspace.c:3305
-#: ../libpurple/protocols/simple/simple.c:2089
+#: ../libpurple/protocols/myspace/myspace.c:3466
+#: ../libpurple/protocols/simple/simple.c:2105
 msgid "Connect port"
 msgstr "弌仂亠亟亳仆����� 仆舒 仗仂��"
 
@@ -6155,12 +6356,17 @@
 #. * able to set the first port to try (like LastConnectedPort in Windows client).
 #. Account options
 #: ../libpurple/protocols/jabber/libxmpp.c:231
-#: ../libpurple/protocols/myspace/myspace.c:3302
+#: ../libpurple/protocols/myspace/myspace.c:3463
 #: ../libpurple/protocols/silc/silc.c:2057
-#: ../libpurple/protocols/silc10/silc.c:1860 ../pidgin/gtkaccount.c:840
+#: ../libpurple/protocols/silc10/silc.c:1863 ../pidgin/gtkaccount.c:809
 msgid "Connect server"
 msgstr "弌仂亠亟亳仆����� � �亠�于亠�仂仄"
 
+#: ../libpurple/protocols/jabber/libxmpp.c:236
+#, fuzzy
+msgid "File transfer proxies"
+msgstr "�仂�� 仗亠�亠亟舒�亳 �舒亶仍仂于"
+
 #: ../libpurple/protocols/jabber/message.c:106
 #, c-format
 msgid "%s has left the conversation."
@@ -6199,16 +6405,16 @@
 msgid "XML Parse error"
 msgstr "��亳弍从舒 �舒亰弍仂�舒 XML"
 
-#: ../libpurple/protocols/jabber/presence.c:435
+#: ../libpurple/protocols/jabber/presence.c:441
 msgid "Unknown Error in presence"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/presence.c:516
-#: ../libpurple/protocols/jabber/presence.c:517
+#: ../libpurple/protocols/jabber/presence.c:522
+#: ../libpurple/protocols/jabber/presence.c:523
 msgid "Create New Room"
 msgstr "弌仂亰亟舒�� 仆仂于�� 从仂仄仆舒��"
 
-#: ../libpurple/protocols/jabber/presence.c:518
+#: ../libpurple/protocols/jabber/presence.c:524
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -6216,58 +6422,60 @@
 "�� �仂亰亟舒��亠 仆仂于�� 从仂仄仆舒��. 丱仂�亳�亠 仆舒���仂亳�� 亠� 亳仍亳 仗�亳仆��� ���舒仆仂于从亳 仗仂 "
 "�仄仂仍�舒仆亳�?"
 
-#: ../libpurple/protocols/jabber/presence.c:524
+#: ../libpurple/protocols/jabber/presence.c:530
 msgid "_Configure Room"
 msgstr "_�舒���仂亳�� 从仂仄仆舒��"
 
-#: ../libpurple/protocols/jabber/presence.c:525
+#: ../libpurple/protocols/jabber/presence.c:531
 msgid "_Accept Defaults"
 msgstr "_��亳仆��� ���舒仆仂于从亳 仗仂 �仄仂仍�舒仆亳�"
 
-#: ../libpurple/protocols/jabber/presence.c:567
+#: ../libpurple/protocols/jabber/presence.c:573
 #, c-format
 msgid "Error in chat %s"
 msgstr "��亳弍从舒 于 �舒�亠 %s"
 
-#: ../libpurple/protocols/jabber/presence.c:571
+#: ../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
+#: ../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
+#: ../libpurple/protocols/jabber/si.c:1073
 #, c-format
 msgid "Unable to send file to %s, invalid JID"
 msgstr "�亠 �亟舒���� 仂�仗�舒于亳�� �舒亶仍 亟仍� %s, 仆亠于亠�仆�亶 JID"
 
-#: ../libpurple/protocols/jabber/si.c:840
+#: ../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
+#: ../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
+#: ../libpurple/protocols/jabber/si.c:1092
+#, fuzzy, c-format
+msgid "Please select the resource of %s to which you would like to send a file"
+msgstr ""
+"�于亠亟亳�亠 亳亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍� 亳仍亳 仗�亠于亟仂仆亳仄 仗亠��仂仆�, 亳仆�仂�仄舒�亳� 仂 "
+"从仂�仂�仂亶 于� �仂�亠仍亳 弍� 仗�仂�仄仂��亠��."
+
+#: ../libpurple/protocols/jabber/si.c:1108
 msgid "Select a Resource"
 msgstr "��弍�舒�� �亠����"
 
@@ -6415,7 +6623,7 @@
 
 #: ../libpurple/protocols/msn/error.c:75
 #: ../libpurple/protocols/msnp9/error.c:75
-#: ../libpurple/protocols/zephyr/zephyr.c:756
+#: ../libpurple/protocols/zephyr/zephyr.c:760
 #, c-format
 msgid "User is offline"
 msgstr "�仂仍�亰仂于舒�亠仍� 仆亠 于 �亠�亳"
@@ -6494,7 +6702,7 @@
 
 #: ../libpurple/protocols/msn/error.c:124
 #: ../libpurple/protocols/msnp9/error.c:124
-#: ../libpurple/protocols/oscar/oscar.c:120
+#: ../libpurple/protocols/oscar/oscar.c:121
 #, c-format
 msgid "Not logged in"
 msgstr "�亠 于 �亠�亳"
@@ -6637,10 +6845,10 @@
 
 #: ../libpurple/protocols/msn/error.c:222
 #: ../libpurple/protocols/msnp9/error.c:222
-#: ../libpurple/protocols/oscar/oscar.c:1377
+#: ../libpurple/protocols/oscar/oscar.c:1422
 #: ../libpurple/protocols/silc/silc.c:338
-#: ../libpurple/protocols/silc10/ops.c:1709
-#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1393
+#: ../libpurple/protocols/silc10/ops.c:1713
+#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1424
 #, c-format
 msgid "Authentication failed"
 msgstr "���亠仆�亳�亳从舒�亳� 亰舒于亠��亳仍舒�� 仆亠�亟舒�仆仂"
@@ -6687,455 +6895,474 @@
 msgid "MSN Error: %s\n"
 msgstr "��亳弍从舒 MSN: %s\n"
 
-#: ../libpurple/protocols/msn/msn.c:130 ../libpurple/protocols/msnp9/msn.c:130
+#: ../libpurple/protocols/msn/msn.c:128 ../libpurple/protocols/msnp9/msn.c:129
 msgid "Nudge"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:131 ../libpurple/protocols/msnp9/msn.c:131
+#: ../libpurple/protocols/msn/msn.c:129 ../libpurple/protocols/msnp9/msn.c:130
 #, c-format
 msgid "%s has nudged you!"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:132 ../libpurple/protocols/msnp9/msn.c:132
+#: ../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/msnp9/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:286 ../libpurple/protocols/msnp9/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:287 ../libpurple/protocols/msnp9/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:305 ../libpurple/protocols/msnp9/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:322 ../libpurple/protocols/msnp9/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:339 ../libpurple/protocols/msnp9/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:354 ../libpurple/protocols/msnp9/msn.c:350
+#: ../libpurple/protocols/msn/msn.c:350 ../libpurple/protocols/msnp9/msn.c:347
 msgid "Allow MSN Mobile pages?"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:355 ../libpurple/protocols/msnp9/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?"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:361 ../libpurple/protocols/msnp9/msn.c:357
+#: ../libpurple/protocols/msn/msn.c:357 ../libpurple/protocols/msnp9/msn.c:354
 msgid "Allow"
 msgstr "�舒亰�亠�亳��"
 
-#: ../libpurple/protocols/msn/msn.c:362 ../libpurple/protocols/msnp9/msn.c:358
+#: ../libpurple/protocols/msn/msn.c:358 ../libpurple/protocols/msnp9/msn.c:355
 msgid "Disallow"
 msgstr "�舒仗�亠�亳��"
 
-#: ../libpurple/protocols/msn/msn.c:378 ../libpurple/protocols/msnp9/msn.c:374
+#: ../libpurple/protocols/msn/msn.c:374 ../libpurple/protocols/msnp9/msn.c:371
 msgid "This Hotmail account may not be active."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:404 ../libpurple/protocols/msnp9/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:406 ../libpurple/protocols/msnp9/msn.c:402
+#: ../libpurple/protocols/msn/msn.c:402 ../libpurple/protocols/msnp9/msn.c:399
 msgid "Page"
 msgstr "弌��舒仆亳�舒"
 
-#: ../libpurple/protocols/msn/msn.c:688 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/msnp9/msn.c:583
+#: ../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:3088
-#: ../libpurple/protocols/yahoo/yahoo.c:3772
+#: ../libpurple/protocols/yahoo/yahoo.c:3134
+#: ../libpurple/protocols/yahoo/yahoo.c:3823
 msgid "Be Right Back"
 msgstr "弌从仂�仂 于亠�仆���"
 
-#: ../libpurple/protocols/msn/msn.c:694 ../libpurple/protocols/msn/state.c:31
-#: ../libpurple/protocols/msnp9/msn.c:587
+#: ../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:2839
-#: ../libpurple/protocols/novell/novell.c:2969
+#: ../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:1483
 #: ../libpurple/protocols/silc10/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:3090
-#: ../libpurple/protocols/yahoo/yahoo.c:3775
+#: ../libpurple/protocols/yahoo/yahoo.c:3136
+#: ../libpurple/protocols/yahoo/yahoo.c:3826
 msgid "Busy"
 msgstr "�舒仆��"
 
-#: ../libpurple/protocols/msn/msn.c:699 ../libpurple/protocols/msnp9/msn.c:591
-#: ../libpurple/protocols/yahoo/yahoo.c:3098
-#: ../libpurple/protocols/yahoo/yahoo.c:3787
+#: ../libpurple/protocols/msn/msn.c:707 ../libpurple/protocols/msnp9/msn.c:602
+#: ../libpurple/protocols/yahoo/yahoo.c:3144
+#: ../libpurple/protocols/yahoo/yahoo.c:3838
 msgid "On the Phone"
 msgstr "�舒亰亞仂于舒�亳于舒� 仗仂 �亠仍亠�仂仆�"
 
-#: ../libpurple/protocols/msn/msn.c:704 ../libpurple/protocols/msnp9/msn.c:595
-#: ../libpurple/protocols/yahoo/yahoo.c:3102
-#: ../libpurple/protocols/yahoo/yahoo.c:3793
+#: ../libpurple/protocols/msn/msn.c:712 ../libpurple/protocols/msnp9/msn.c:606
+#: ../libpurple/protocols/yahoo/yahoo.c:3148
+#: ../libpurple/protocols/yahoo/yahoo.c:3844
 msgid "Out to Lunch"
 msgstr "�仂��仍 仗亠�亠从��亳��"
 
-#: ../libpurple/protocols/msn/msn.c:723
+#. 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:724
+#: ../libpurple/protocols/msn/msn.c:732
 msgid "Album"
 msgstr "�仍�弍仂仄"
 
-#: ../libpurple/protocols/msn/msn.c:742 ../libpurple/protocols/msnp9/msn.c:623
+#: ../libpurple/protocols/msn/msn.c:750 ../libpurple/protocols/msnp9/msn.c:634
 msgid "Set Friendly Name..."
 msgstr "�于亠��亳 亟��亢亠�从仂亠 亳仄�..."
 
-#: ../libpurple/protocols/msn/msn.c:747 ../libpurple/protocols/msnp9/msn.c:628
+#: ../libpurple/protocols/msn/msn.c:755 ../libpurple/protocols/msnp9/msn.c:639
 msgid "Set Home Phone Number..."
 msgstr "�于亠��亳 仆仂仄亠� 亟仂仄舒�仆亠亞仂 �亠仍亠�仂仆舒..."
 
-#: ../libpurple/protocols/msn/msn.c:751 ../libpurple/protocols/msnp9/msn.c:632
+#: ../libpurple/protocols/msn/msn.c:759 ../libpurple/protocols/msnp9/msn.c:643
 msgid "Set Work Phone Number..."
 msgstr "�于亠��亳 仆仂仄亠� �舒弍仂�亠亞仂 �亠仍亠�仂仆舒..."
 
-#: ../libpurple/protocols/msn/msn.c:755 ../libpurple/protocols/msnp9/msn.c:636
+#: ../libpurple/protocols/msn/msn.c:763 ../libpurple/protocols/msnp9/msn.c:647
 msgid "Set Mobile Phone Number..."
 msgstr "�于亠��亳 仆仂仄亠� 仄仂弍亳仍�仆仂亞仂 �亠仍亠�仂仆舒..."
 
-#: ../libpurple/protocols/msn/msn.c:761 ../libpurple/protocols/msnp9/msn.c:642
+#: ../libpurple/protocols/msn/msn.c:769 ../libpurple/protocols/msnp9/msn.c:653
 msgid "Enable/Disable Mobile Devices..."
 msgstr "�舒亰�亠�亳��/亰舒仗�亠�亳�� 仄仂弍亳仍�仆�亠 ����仂亶��于舒..."
 
-#: ../libpurple/protocols/msn/msn.c:766 ../libpurple/protocols/msnp9/msn.c:647
+#: ../libpurple/protocols/msn/msn.c:774 ../libpurple/protocols/msnp9/msn.c:658
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "�舒亰�亠�亳��/亰舒仗�亠�亳�� 仄仂弍亳仍�仆�亠 ���舒仆亳��..."
 
-#: ../libpurple/protocols/msn/msn.c:777 ../libpurple/protocols/msnp9/msn.c:658
+#: ../libpurple/protocols/msn/msn.c:785 ../libpurple/protocols/msnp9/msn.c:669
 msgid "Open Hotmail Inbox"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:801 ../libpurple/protocols/msnp9/msn.c:682
+#: ../libpurple/protocols/msn/msn.c:809 ../libpurple/protocols/msnp9/msn.c:693
 msgid "Send to Mobile"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:811 ../libpurple/protocols/msnp9/msn.c:692
-#: ../libpurple/protocols/novell/novell.c:3425
+#: ../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:849 ../libpurple/protocols/msnp9/msn.c:731
+#: ../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:879 ../libpurple/protocols/msnp9/msn.c:761
+#: ../libpurple/protocols/msn/msn.c:887 ../libpurple/protocols/msnp9/msn.c:772
 msgid "Failed to connect to server."
 msgstr "�亠 �亟舒仍仂�� �仂亠亟亳仆亳���� � �亠�于亠�仂仄."
 
-#: ../libpurple/protocols/msn/msn.c:1663 ../libpurple/protocols/msn/msn.c:2006
-#: ../libpurple/protocols/msnp9/msn.c:1516
-#: ../libpurple/protocols/msnp9/msn.c:1859
+#: ../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:1729
-#: ../libpurple/protocols/msnp9/msn.c:1582 ../pidgin/plugins/convcolors.c:309
-#: ../pidgin/plugins/pidginrc.c:360
+#: ../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:1736
-#: ../libpurple/protocols/msnp9/msn.c:1589
-#: ../libpurple/protocols/myspace/user.c:115
-#: ../libpurple/protocols/oscar/oscar.c:3765
+#: ../libpurple/protocols/msn/msn.c:1744
+#: ../libpurple/protocols/msnp9/msn.c:1600
+#: ../libpurple/protocols/myspace/user.c:125
+#: ../libpurple/protocols/oscar/oscar.c:3802
 #: ../libpurple/protocols/qq/buddy_info.c:45
 #: ../libpurple/protocols/qq/qq.c:222
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1081
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1087
 msgid "Age"
 msgstr "�仂亰�舒��"
 
-#: ../libpurple/protocols/msn/msn.c:1738
-#: ../libpurple/protocols/msnp9/msn.c:1591
+#: ../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:1739
-#: ../libpurple/protocols/msnp9/msn.c:1592
-#: ../libpurple/protocols/myspace/user.c:123
+#: ../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:1076
-#: ../libpurple/protocols/zephyr/zephyr.c:798
-#: ../libpurple/protocols/zephyr/zephyr.c:1215
+#: ../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:1744 ../libpurple/protocols/msn/msn.c:1936
-#: ../libpurple/protocols/msn/msn.c:1942 ../libpurple/protocols/msn/msn.c:1949
-#: ../libpurple/protocols/msnp9/msn.c:1597
-#: ../libpurple/protocols/msnp9/msn.c:1789
-#: ../libpurple/protocols/msnp9/msn.c:1795
-#: ../libpurple/protocols/msnp9/msn.c:1802
+#: ../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:1750 ../libpurple/protocols/msn/msn.c:1870
-#: ../libpurple/protocols/msn/msn.c:1876 ../libpurple/protocols/msn/msn.c:1883
-#: ../libpurple/protocols/msn/msn.c:1891 ../libpurple/protocols/msn/msn.c:1898
-#: ../libpurple/protocols/msnp9/msn.c:1603
-#: ../libpurple/protocols/msnp9/msn.c:1723
-#: ../libpurple/protocols/msnp9/msn.c:1729
-#: ../libpurple/protocols/msnp9/msn.c:1736
-#: ../libpurple/protocols/msnp9/msn.c:1744
-#: ../libpurple/protocols/msnp9/msn.c:1751
+#: ../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:1767
-#: ../libpurple/protocols/msnp9/msn.c:1620
+#: ../libpurple/protocols/msn/msn.c:1775
+#: ../libpurple/protocols/msnp9/msn.c:1631
 msgid "Social"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1769
-#: ../libpurple/protocols/msnp9/msn.c:1622
-#: ../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:1770
-#: ../libpurple/protocols/msnp9/msn.c:1623
+#: ../libpurple/protocols/msn/msn.c:1778
+#: ../libpurple/protocols/msnp9/msn.c:1634
 msgid "Interests"
 msgstr "�仆�亠�亠��"
 
-#: ../libpurple/protocols/msn/msn.c:1771
-#: ../libpurple/protocols/msnp9/msn.c:1624
+#: ../libpurple/protocols/msn/msn.c:1779
+#: ../libpurple/protocols/msnp9/msn.c:1635
 msgid "Pets"
 msgstr "�仂仄舒�仆亳亠 亢亳于仂�仆�亠"
 
-#: ../libpurple/protocols/msn/msn.c:1772
-#: ../libpurple/protocols/msnp9/msn.c:1625
+#: ../libpurple/protocols/msn/msn.c:1780
+#: ../libpurple/protocols/msnp9/msn.c:1636
 msgid "Hometown"
 msgstr "�仂亟仆仂亶 亞仂�仂亟"
 
-#: ../libpurple/protocols/msn/msn.c:1773
-#: ../libpurple/protocols/msnp9/msn.c:1626
+#: ../libpurple/protocols/msn/msn.c:1781
+#: ../libpurple/protocols/msnp9/msn.c:1637
 msgid "Places Lived"
 msgstr "�亠��舒 仗�仂亢亳于舒仆亳�"
 
-#: ../libpurple/protocols/msn/msn.c:1774
-#: ../libpurple/protocols/msnp9/msn.c:1627
+#: ../libpurple/protocols/msn/msn.c:1782
+#: ../libpurple/protocols/msnp9/msn.c:1638
 msgid "Fashion"
 msgstr "�仂亟舒"
 
-#: ../libpurple/protocols/msn/msn.c:1775
-#: ../libpurple/protocols/msnp9/msn.c:1628
+#: ../libpurple/protocols/msn/msn.c:1783
+#: ../libpurple/protocols/msnp9/msn.c:1639
 msgid "Humor"
 msgstr "豫仄仂�"
 
-#: ../libpurple/protocols/msn/msn.c:1776
-#: ../libpurple/protocols/msnp9/msn.c:1629
+#: ../libpurple/protocols/msn/msn.c:1784
+#: ../libpurple/protocols/msnp9/msn.c:1640
 msgid "Music"
 msgstr "��亰�从舒"
 
-#: ../libpurple/protocols/msn/msn.c:1777 ../libpurple/protocols/msn/msn.c:1958
-#: ../libpurple/protocols/msn/msn.c:1964
-#: ../libpurple/protocols/msnp9/msn.c:1630
-#: ../libpurple/protocols/msnp9/msn.c:1811
-#: ../libpurple/protocols/msnp9/msn.c:1817
-#: ../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:1794
-#: ../libpurple/protocols/msnp9/msn.c:1647
+#: ../libpurple/protocols/msn/msn.c:1802
+#: ../libpurple/protocols/msnp9/msn.c:1658
 msgid "Contact Info"
 msgstr "�仂仆�舒从�仆舒� 亳仆�仂�仄舒�亳�"
 
-#: ../libpurple/protocols/msn/msn.c:1795
-#: ../libpurple/protocols/msnp9/msn.c:1648
+#: ../libpurple/protocols/msn/msn.c:1803
+#: ../libpurple/protocols/msnp9/msn.c:1659
 msgid "Personal"
 msgstr "�亠��仂仆舒仍�仆仂亠"
 
-#: ../libpurple/protocols/msn/msn.c:1798
-#: ../libpurple/protocols/msnp9/msn.c:1651
+#: ../libpurple/protocols/msn/msn.c:1806
+#: ../libpurple/protocols/msnp9/msn.c:1662
 msgid "Significant Other"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1799
-#: ../libpurple/protocols/msnp9/msn.c:1652
-msgid "Home Phone"
-msgstr "�仂仄舒�仆亳亶 �亠仍亠�仂仆"
-
-#: ../libpurple/protocols/msn/msn.c:1800
-#: ../libpurple/protocols/msnp9/msn.c:1653
-msgid "Home Phone 2"
-msgstr "�仂仄舒�仆亳亶 �亠仍亠�仂仆 2"
-
-#: ../libpurple/protocols/msn/msn.c:1801
-#: ../libpurple/protocols/msnp9/msn.c:1654
-#: ../libpurple/protocols/oscar/oscar.c:3803
-msgid "Home Address"
-msgstr "�仂仄舒�仆亳亶 舒亟�亠�"
-
-#: ../libpurple/protocols/msn/msn.c:1802
-#: ../libpurple/protocols/msnp9/msn.c:1655
-msgid "Personal Mobile"
-msgstr "�亠��仂仆舒仍�仆�亶 仄仂弍亳仍�仆�亶 �亠仍亠�仂仆"
-
-#: ../libpurple/protocols/msn/msn.c:1803
-#: ../libpurple/protocols/msnp9/msn.c:1656
-msgid "Home Fax"
-msgstr "�仂仄舒�仆亳亶 �舒从�"
-
-#: ../libpurple/protocols/msn/msn.c:1804
-#: ../libpurple/protocols/msnp9/msn.c:1657
-msgid "Personal E-Mail"
-msgstr "�亠��仂仆舒仍�仆�亶 e-mail"
-
-#: ../libpurple/protocols/msn/msn.c:1805
-#: ../libpurple/protocols/msnp9/msn.c:1658
-msgid "Personal IM"
-msgstr ""
-
 #: ../libpurple/protocols/msn/msn.c:1807
-#: ../libpurple/protocols/msnp9/msn.c:1660
+#: ../libpurple/protocols/msnp9/msn.c:1663
+msgid "Home Phone"
+msgstr "�仂仄舒�仆亳亶 �亠仍亠�仂仆"
+
+#: ../libpurple/protocols/msn/msn.c:1808
+#: ../libpurple/protocols/msnp9/msn.c:1664
+msgid "Home Phone 2"
+msgstr "�仂仄舒�仆亳亶 �亠仍亠�仂仆 2"
+
+#: ../libpurple/protocols/msn/msn.c:1809
+#: ../libpurple/protocols/msnp9/msn.c:1665
+#: ../libpurple/protocols/oscar/oscar.c:3840
+msgid "Home Address"
+msgstr "�仂仄舒�仆亳亶 舒亟�亠�"
+
+#: ../libpurple/protocols/msn/msn.c:1810
+#: ../libpurple/protocols/msnp9/msn.c:1666
+msgid "Personal Mobile"
+msgstr "�亠��仂仆舒仍�仆�亶 仄仂弍亳仍�仆�亶 �亠仍亠�仂仆"
+
+#: ../libpurple/protocols/msn/msn.c:1811
+#: ../libpurple/protocols/msnp9/msn.c:1667
+msgid "Home Fax"
+msgstr "�仂仄舒�仆亳亶 �舒从�"
+
+#: ../libpurple/protocols/msn/msn.c:1812
+#: ../libpurple/protocols/msnp9/msn.c:1668
+msgid "Personal E-Mail"
+msgstr "�亠��仂仆舒仍�仆�亶 e-mail"
+
+#: ../libpurple/protocols/msn/msn.c:1813
+#: ../libpurple/protocols/msnp9/msn.c:1669
+msgid "Personal IM"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:1815
+#: ../libpurple/protocols/msnp9/msn.c:1671
 msgid "Anniversary"
 msgstr ""
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1823
-#: ../libpurple/protocols/msnp9/msn.c:1676
+#: ../libpurple/protocols/msn/msn.c:1831
+#: ../libpurple/protocols/msnp9/msn.c:1687
 msgid "Work"
 msgstr "�舒弍仂�舒"
 
-#: ../libpurple/protocols/msn/msn.c:1825
-#: ../libpurple/protocols/msnp9/msn.c:1678
+#: ../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:1826
-#: ../libpurple/protocols/msnp9/msn.c:1679
-#: ../libpurple/protocols/oscar/oscar.c:3824
+#: ../libpurple/protocols/msn/msn.c:1834
+#: ../libpurple/protocols/msnp9/msn.c:1690
+#: ../libpurple/protocols/oscar/oscar.c:3861
 msgid "Company"
 msgstr "�仂仄仗舒仆亳�"
 
-#: ../libpurple/protocols/msn/msn.c:1827
-#: ../libpurple/protocols/msnp9/msn.c:1680
+#: ../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:1828
-#: ../libpurple/protocols/msnp9/msn.c:1681
+#: ../libpurple/protocols/msn/msn.c:1836
+#: ../libpurple/protocols/msnp9/msn.c:1692
 msgid "Profession"
 msgstr "��仂�亠��亳�"
 
-#: ../libpurple/protocols/msn/msn.c:1829
-#: ../libpurple/protocols/msnp9/msn.c:1682
+#: ../libpurple/protocols/msn/msn.c:1837
+#: ../libpurple/protocols/msnp9/msn.c:1693
 msgid "Work Phone"
 msgstr "�舒弍仂�亳亶 �亠仍亠�仂仆"
 
-#: ../libpurple/protocols/msn/msn.c:1830
-#: ../libpurple/protocols/msnp9/msn.c:1683
+#: ../libpurple/protocols/msn/msn.c:1838
+#: ../libpurple/protocols/msnp9/msn.c:1694
 msgid "Work Phone 2"
 msgstr "�舒弍仂�亳亶 �亠仍亠�仂仆 2"
 
-#: ../libpurple/protocols/msn/msn.c:1831
-#: ../libpurple/protocols/msnp9/msn.c:1684
-#: ../libpurple/protocols/oscar/oscar.c:3816
+#: ../libpurple/protocols/msn/msn.c:1839
+#: ../libpurple/protocols/msnp9/msn.c:1695
+#: ../libpurple/protocols/oscar/oscar.c:3853
 msgid "Work Address"
 msgstr "�舒弍仂�亳亶 舒亟�亠�"
 
-#: ../libpurple/protocols/msn/msn.c:1832
-#: ../libpurple/protocols/msnp9/msn.c:1685
+#: ../libpurple/protocols/msn/msn.c:1840
+#: ../libpurple/protocols/msnp9/msn.c:1696
 msgid "Work Mobile"
 msgstr "�舒弍仂�亳亶 仄仂弍亳仍�仆�亶 �亠仍亠�仂仆"
 
-#: ../libpurple/protocols/msn/msn.c:1833
-#: ../libpurple/protocols/msnp9/msn.c:1686
+#: ../libpurple/protocols/msn/msn.c:1841
+#: ../libpurple/protocols/msnp9/msn.c:1697
 msgid "Work Pager"
 msgstr "�舒弍仂�亳亶 仗亠亶亟亢亠�"
 
-#: ../libpurple/protocols/msn/msn.c:1834
-#: ../libpurple/protocols/msnp9/msn.c:1687
+#: ../libpurple/protocols/msn/msn.c:1842
+#: ../libpurple/protocols/msnp9/msn.c:1698
 msgid "Work Fax"
 msgstr "�舒弍仂�亳亶 �舒从�"
 
-#: ../libpurple/protocols/msn/msn.c:1835
-#: ../libpurple/protocols/msnp9/msn.c:1688
+#: ../libpurple/protocols/msn/msn.c:1843
+#: ../libpurple/protocols/msnp9/msn.c:1699
 msgid "Work E-Mail"
 msgstr "�舒弍仂�亳亶 e-mail"
 
-#: ../libpurple/protocols/msn/msn.c:1836
-#: ../libpurple/protocols/msnp9/msn.c:1689
+#: ../libpurple/protocols/msn/msn.c:1844
+#: ../libpurple/protocols/msnp9/msn.c:1700
 msgid "Work IM"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1837
-#: ../libpurple/protocols/msnp9/msn.c:1690
+#: ../libpurple/protocols/msn/msn.c:1845
+#: ../libpurple/protocols/msnp9/msn.c:1701
 msgid "Start Date"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:1907 ../libpurple/protocols/msn/msn.c:1913
-#: ../libpurple/protocols/msn/msn.c:1920 ../libpurple/protocols/msn/msn.c:1927
-#: ../libpurple/protocols/msnp9/msn.c:1760
-#: ../libpurple/protocols/msnp9/msn.c:1766
-#: ../libpurple/protocols/msnp9/msn.c:1773
-#: ../libpurple/protocols/msnp9/msn.c:1780
+#: ../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:1972
-#: ../libpurple/protocols/msnp9/msn.c:1825
+#: ../libpurple/protocols/msn/msn.c:1980
+#: ../libpurple/protocols/msnp9/msn.c:1836
 msgid "Last Updated"
 msgstr "�仂�仍亠亟仆亠亠 仂弍仆仂于仍亠仆亳亠"
 
-#: ../libpurple/protocols/msn/msn.c:1983
-#: ../libpurple/protocols/msnp9/msn.c:1836
+#: ../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:2007
-#: ../libpurple/protocols/msnp9/msn.c:1860
+#: ../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:2008
-#: ../libpurple/protocols/msnp9/msn.c:1861
+#: ../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 "
 "public profile."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2012
-#: ../libpurple/protocols/msnp9/msn.c:1865
+#: ../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."
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2020
-#: ../libpurple/protocols/msnp9/msn.c:1873
-#: ../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 仗�仂�亳仍�"
 
@@ -7149,28 +7376,28 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2307 ../libpurple/protocols/msn/msn.c:2309
+#: ../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:2344
-#: ../libpurple/protocols/msnp9/msn.c:2195
+#: ../libpurple/protocols/msn/msn.c:2352
+#: ../libpurple/protocols/msnp9/msn.c:2206
 msgid "Use HTTP Method"
 msgstr "��仗仂仍�亰仂于舒�� 仄亠�仂亟 HTTP"
 
-#: ../libpurple/protocols/msn/msn.c:2349
-#: ../libpurple/protocols/msnp9/msn.c:2200
+#: ../libpurple/protocols/msn/msn.c:2357
+#: ../libpurple/protocols/msnp9/msn.c:2211
 #, fuzzy
 msgid "HTTP Method Server"
 msgstr "丐亠��仂于�亶 �亠�于亠� IPC"
 
-#: ../libpurple/protocols/msn/msn.c:2354
-#: ../libpurple/protocols/msnp9/msn.c:2205
+#: ../libpurple/protocols/msn/msn.c:2362
+#: ../libpurple/protocols/msnp9/msn.c:2216
 msgid "Show custom smileys"
 msgstr ""
 
-#: ../libpurple/protocols/msn/msn.c:2362
-#: ../libpurple/protocols/msnp9/msn.c:2213
+#: ../libpurple/protocols/msn/msn.c:2370
+#: ../libpurple/protocols/msnp9/msn.c:2224
 msgid "nudge: nudge a user to get their attention"
 msgstr ""
 
@@ -7200,8 +7427,8 @@
 #: ../libpurple/protocols/msn/notification.c:931
 #: ../libpurple/protocols/msn/session.c:387
 #: ../libpurple/protocols/msnp9/notification.c:184
-#: ../libpurple/protocols/msnp9/notification.c:532
-#: ../libpurple/protocols/msnp9/session.c:340
+#: ../libpurple/protocols/msnp9/notification.c:534
+#: ../libpurple/protocols/msnp9/session.c:339
 msgid "Unknown error."
 msgstr "�亠亳亰于亠��仆舒� 仂�亳弍从舒."
 
@@ -7222,57 +7449,57 @@
 msgstr "�亠亳亰于亠��仆舒� 仂�亳弍从舒 (%d)"
 
 #: ../libpurple/protocols/msn/notification.c:837
-#: ../libpurple/protocols/sametime/sametime.c:4471
+#: ../libpurple/protocols/sametime/sametime.c:4479
 msgid "Unable to add user"
 msgstr "�亠 �亟舒���� 亟仂弍舒于亳�� 仗仂仍�亰仂于舒�亠仍�"
 
 #: ../libpurple/protocols/msn/notification.c:897
-#: ../libpurple/protocols/msnp9/notification.c:498
+#: ../libpurple/protocols/msnp9/notification.c:500
 #, c-format
 msgid "Unable to add user on %s (%s)"
 msgstr "�亠 �亟舒���� 亟仂弍舒于亳�� 仗仂仍�亰仂于舒�亠仍� 仆舒 %s (%s)"
 
 #: ../libpurple/protocols/msn/notification.c:901
-#: ../libpurple/protocols/msnp9/notification.c:502
+#: ../libpurple/protocols/msnp9/notification.c:504
 #, c-format
 msgid "Unable to block user on %s (%s)"
 msgstr "�亠 �亟舒���� 亰舒弍仍仂从亳�仂于舒�� 仗仂仍�亰仂于舒�亠仍� 仆舒 %s (%s)"
 
 #: ../libpurple/protocols/msn/notification.c:905
-#: ../libpurple/protocols/msnp9/notification.c:506
+#: ../libpurple/protocols/msnp9/notification.c:508
 #, c-format
 msgid "Unable to permit user on %s (%s)"
 msgstr "�亠 �亟舒���� 亟仂仗���亳�� 仗仂仍�亰仂于舒�亠仍� 仆舒 %s (%s)"
 
 #: ../libpurple/protocols/msn/notification.c:913
-#: ../libpurple/protocols/msnp9/notification.c:514
+#: ../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:922
-#: ../libpurple/protocols/msnp9/notification.c:523
+#: ../libpurple/protocols/msnp9/notification.c:525
 #, c-format
 msgid "%s is not a valid passport account."
 msgstr "%s 仆亠 �于仍�亠��� 亟仂仗���亳仄仂亶 仗舒�仗仂��仆仂亶 ����仆仂亶 亰舒仗亳���."
 
 #: ../libpurple/protocols/msn/notification.c:927
-#: ../libpurple/protocols/msnp9/notification.c:528
+#: ../libpurple/protocols/msnp9/notification.c:530
 msgid "Service Temporarily Unavailable."
 msgstr "弌仍�亢弍舒 于�亠仄亠仆仆仂 仆亠亟仂���仗仆舒."
 
-#: ../libpurple/protocols/msn/notification.c:1263
-#: ../libpurple/protocols/msnp9/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:1318
-#: ../libpurple/protocols/msnp9/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:1931
-#: ../libpurple/protocols/msnp9/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 "
@@ -7308,8 +7535,9 @@
 #: ../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/yahoochat.c:1416
-#: ../libpurple/protocols/yahoo/yahoochat.c:1442
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1564
+#: ../libpurple/protocols/yahoo/yahoochat.c:1425
+#: ../libpurple/protocols/yahoo/yahoochat.c:1451
 msgid "Unable to connect"
 msgstr "�亠 �亟舒���� ���舒仆仂于亳�� �仂亠亟亳仆亠仆亳亠"
 
@@ -7334,40 +7562,40 @@
 "%s"
 
 #: ../libpurple/protocols/msn/session.c:349
-#: ../libpurple/protocols/msnp9/session.c:302
+#: ../libpurple/protocols/msnp9/session.c:301
 msgid "Our protocol is not supported by the server."
 msgstr "�舒� 仗�仂�仂从仂仍 仆亠 仗仂亟亟亠�亢亳于舒亠��� �亠�于亠�仂仄."
 
 #: ../libpurple/protocols/msn/session.c:354
-#: ../libpurple/protocols/msnp9/session.c:307
+#: ../libpurple/protocols/msnp9/session.c:306
 msgid "Error parsing HTTP."
 msgstr "��亳弍从舒 �舒亰弍仂�舒 HTTP."
 
 #: ../libpurple/protocols/msn/session.c:358
-#: ../libpurple/protocols/msnp9/session.c:311
+#: ../libpurple/protocols/msnp9/session.c:310
 #: ../libpurple/protocols/oscar/flap_connection.c:387
-#: ../libpurple/protocols/yahoo/yahoo.c:207
+#: ../libpurple/protocols/yahoo/yahoo.c:155
 msgid "You have signed on from another location."
 msgstr "�� 仗仂亟从仍��亠仆� 亳亰 亟��亞仂亞仂 仄亠��舒."
 
 #: ../libpurple/protocols/msn/session.c:364
-#: ../libpurple/protocols/msnp9/session.c:317
+#: ../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:370
-#: ../libpurple/protocols/msnp9/session.c:323
+#: ../libpurple/protocols/msnp9/session.c:322
 msgid "The MSN servers are going down temporarily."
 msgstr "弌亠�于亠�� MSN 于�亠仄亠仆仆仂 于�从仍��舒����."
 
 #: ../libpurple/protocols/msn/session.c:375
-#: ../libpurple/protocols/msnp9/session.c:328
+#: ../libpurple/protocols/msnp9/session.c:327
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "�亠 �亟舒���� 舒��亠仆�亳�亳�亳�仂于舒��: %s"
 
 #: ../libpurple/protocols/msn/session.c:381
-#: ../libpurple/protocols/msnp9/session.c:334
+#: ../libpurple/protocols/msnp9/session.c:333
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
@@ -7375,28 +7603,28 @@
 
 #: ../libpurple/protocols/msn/session.c:403
 #: ../libpurple/protocols/msn/session.c:405
-#: ../libpurple/protocols/msnp9/session.c:356
-#: ../libpurple/protocols/msnp9/session.c:358
+#: ../libpurple/protocols/msnp9/session.c:355
+#: ../libpurple/protocols/msnp9/session.c:357
 msgid "Handshaking"
 msgstr "弌仂亞仍舒�仂于舒仆亳亠"
 
 #: ../libpurple/protocols/msn/session.c:406
-#: ../libpurple/protocols/msnp9/session.c:359
+#: ../libpurple/protocols/msnp9/session.c:358
 msgid "Starting authentication"
 msgstr "�舒仗��从 舒��亠仆�亳�亳从舒�亳亳"
 
 #: ../libpurple/protocols/msn/session.c:407
-#: ../libpurple/protocols/msnp9/session.c:360
+#: ../libpurple/protocols/msnp9/session.c:359
 msgid "Getting cookie"
 msgstr "�仂仍��亠仆亳亠 亟舒仆仆��"
 
 #: ../libpurple/protocols/msn/session.c:409
-#: ../libpurple/protocols/msnp9/session.c:362
+#: ../libpurple/protocols/msnp9/session.c:361
 msgid "Sending cookie"
 msgstr "��仗�舒于从舒 亟舒仆仆��"
 
 #: ../libpurple/protocols/msn/session.c:410
-#: ../libpurple/protocols/msnp9/session.c:363
+#: ../libpurple/protocols/msnp9/session.c:362
 msgid "Retrieving buddy list"
 msgstr "�舒亞��亰从舒 �仗亳�从舒 �仂弍亠�亠亟仆亳从仂于"
 
@@ -7415,64 +7643,64 @@
 msgid "Out To Lunch"
 msgstr "�仂��仍 仗亠�亠从��亳��"
 
-#: ../libpurple/protocols/msn/switchboard.c:398
-#: ../libpurple/protocols/msnp9/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:406
-#: ../libpurple/protocols/msnp9/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:410
-#: ../libpurple/protocols/msnp9/switchboard.c:412
+#: ../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:414
-#: ../libpurple/protocols/msnp9/switchboard.c:416
+#: ../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:418
-#: ../libpurple/protocols/msnp9/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:422
-#: ../libpurple/protocols/msnp9/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:429
-#: ../libpurple/protocols/msnp9/switchboard.c:431
+#: ../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:437
-#: ../libpurple/protocols/msnp9/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:243
-#: ../libpurple/protocols/msnp9/userlist.c:252
+#: ../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:312
-#: ../libpurple/protocols/msnp9/userlist.c:321
+#: ../libpurple/protocols/msnp9/userlist.c:331
 #, c-format
 msgid "%s has removed you from his or her buddy list."
 msgstr "%s �亟舒仍亳仍 于舒� 亳亰 �于仂亠亞仂 �仗亳�从舒 �仂弍亠�亠亟仆亳从仂于."
@@ -7481,17 +7709,17 @@
 #. * 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:643
+#: ../libpurple/protocols/msnp9/userlist.c:653
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "�亠 �亟舒���� 亟仂弍舒于亳�� \"%s\"."
 
 #: ../libpurple/protocols/msn/userlist.c:696
-#: ../libpurple/protocols/msnp9/userlist.c:645
+#: ../libpurple/protocols/msnp9/userlist.c:655
 msgid "The screen name specified is invalid."
 msgstr "丕从舒亰舒仆仆�亶 亳亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍� 仆亠亟仂仗���亳仄."
 
-#: ../libpurple/protocols/msnp9/msn.c:549
+#: ../libpurple/protocols/msnp9/msn.c:546
 msgid "Has you"
 msgstr ""
 
@@ -7505,8 +7733,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msnp9/msn.c:2159
-#: ../libpurple/protocols/msnp9/msn.c:2161
+#: ../libpurple/protocols/msnp9/msn.c:2170
+#: ../libpurple/protocols/msnp9/msn.c:2172
 msgid "MSN Protocol Plugin"
 msgstr "�仂亟�仍� 仗�仂�仂从仂仍舒 MSN"
 
@@ -7525,282 +7753,320 @@
 "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:1820
-msgid "MySpaceIM Error"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:352
+#: ../libpurple/protocols/myspace/myspace.c:345
 #, fuzzy
 msgid "Reading challenge"
 msgstr "��亳弍从舒 ��亠仆亳�"
 
-#: ../libpurple/protocols/myspace/myspace.c:360
+#: ../libpurple/protocols/myspace/myspace.c:353
 #, fuzzy
 msgid "Unexpected challenge length from server"
 msgstr "�亠于亠�仆�亶 亰舒仗�仂� � �亠�于亠�舒"
 
-#: ../libpurple/protocols/myspace/myspace.c:364
+#: ../libpurple/protocols/myspace/myspace.c:357
 #, fuzzy
 msgid "Logging in"
 msgstr "���仆舒仍�"
 
-#: ../libpurple/protocols/myspace/myspace.c:1296
+#: ../libpurple/protocols/myspace/myspace.c:1322
 #, c-format
 msgid "Connection to server lost (no data received within %d seconds)"
 msgstr ""
 
 #. Can't write _()'d strings in array initializers. Workaround.
-#: ../libpurple/protocols/myspace/myspace.c:1339
+#: ../libpurple/protocols/myspace/myspace.c:1365
 #, fuzzy
 msgid "New mail messages"
 msgstr "��仗�舒于亳�� �仂仂弍�亠仆亳亠"
 
-#: ../libpurple/protocols/myspace/myspace.c:1340
+#: ../libpurple/protocols/myspace/myspace.c:1366
 msgid "New blog comments"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:1341
+#: ../libpurple/protocols/myspace/myspace.c:1367
 msgid "New profile comments"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:1342
+#: ../libpurple/protocols/myspace/myspace.c:1368
 msgid "New friend requests!"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:1343
+#: ../libpurple/protocols/myspace/myspace.c:1369
 msgid "New picture comments"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:1371
+#: ../libpurple/protocols/myspace/myspace.c:1399
 msgid "MySpace"
 msgstr ""
 
+#: ../libpurple/protocols/myspace/myspace.c:1585
+#, fuzzy
+msgid "MySpaceIM - No Username Set"
+msgstr "�亠� 亳仄亠仆亳"
+
+#: ../libpurple/protocols/myspace/myspace.c:1586
+msgid "You appear to have no MySpace username."
+msgstr ""
+
+#: ../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:1554
+#: ../libpurple/protocols/myspace/myspace.c:1611
 #: ../libpurple/protocols/sametime/sametime.c:1546
 msgid "Connected"
 msgstr "弌仂亠亟亳仆亠仆亳亠 ���舒仆仂于仍亠仆仂"
 
-#: ../libpurple/protocols/myspace/myspace.c:1565
-#: ../libpurple/protocols/myspace/myspace.c:1568
-#, fuzzy
-msgid "No username set"
-msgstr "�亠� 亳仄亠仆亳"
-
-#: ../libpurple/protocols/myspace/myspace.c:1566
-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:1794
+#: ../libpurple/protocols/myspace/myspace.c:1846
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "��亳弍从舒 仗�仂�仂从仂仍舒, 从仂亟 %d: %s"
 
-#: ../libpurple/protocols/myspace/myspace.c:1990
-#: ../libpurple/protocols/myspace/myspace.c:2024
+#: ../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 ""
+
+#: ../libpurple/protocols/myspace/myspace.c:1891
+msgid "MySpaceIM Error"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:2069
+#: ../libpurple/protocols/myspace/myspace.c:2103
 msgid "Failed to add buddy"
 msgstr "�亠 �亟舒仍仂�� 亟仂弍舒于亳�� �仂弍亠�亠亟仆亳从舒"
 
-#: ../libpurple/protocols/myspace/myspace.c:1990
+#: ../libpurple/protocols/myspace/myspace.c:2069
 #, fuzzy
 msgid "'addbuddy' command failed."
 msgstr "�舒亞��亰亳�� �仗亳�仂从 �仂弍亠�亠亟仆亳从仂于 亳亰 �舒亶仍舒..."
 
-#: ../libpurple/protocols/myspace/myspace.c:2024
-#: ../libpurple/protocols/myspace/myspace.c:2261
+#: ../libpurple/protocols/myspace/myspace.c:2103
+#: ../libpurple/protocols/myspace/myspace.c:2348
 #, fuzzy
 msgid "persist command failed"
 msgstr "��亳弍从舒 从仂仄仄��舒�亳仂仆仆仂亶 仗舒仆亠仍亳"
 
-#: ../libpurple/protocols/myspace/myspace.c:2129
+#: ../libpurple/protocols/myspace/myspace.c:2208
 #, c-format
 msgid "No such user: %s"
 msgstr "�亠� �舒从仂亞仂 仗仂仍�亰仂于舒�亠仍�: %s"
 
-#: ../libpurple/protocols/myspace/myspace.c:2130
+#: ../libpurple/protocols/myspace/myspace.c:2210
 #, fuzzy
 msgid "User lookup"
 msgstr "�仂仄仆舒�� 仗仂仍�亰仂于舒�亠仍�"
 
-#: ../libpurple/protocols/myspace/myspace.c:2242
-#: ../libpurple/protocols/myspace/myspace.c:2261
-#: ../libpurple/protocols/myspace/myspace.c:2283
+#: ../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:2242
+#: ../libpurple/protocols/myspace/myspace.c:2329
 msgid "'delbuddy' command failed"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:2283
+#: ../libpurple/protocols/myspace/myspace.c:2370
 #, fuzzy
 msgid "blocklist command failed"
 msgstr "��亳弍从舒 从仂仄仄��舒�亳仂仆仆仂亶 仗舒仆亠仍亳"
 
-#: ../libpurple/protocols/myspace/myspace.c:2331
+#: ../libpurple/protocols/myspace/myspace.c:2484
 #, fuzzy
 msgid "Invalid input condition"
 msgstr "�舒于亠��亠仆亳亠 ���舒仆仂于仍亠仆亳� �仂亠亟亳仆亠仆亳�"
 
-#: ../libpurple/protocols/myspace/myspace.c:2351
-#: ../libpurple/protocols/myspace/myspace.c:2388
-#, fuzzy
-msgid "Read buffer full"
+#: ../libpurple/protocols/myspace/myspace.c:2539
+#, fuzzy
+msgid "Read buffer full (2)"
 msgstr "��亠�亠亟� 仗仂仍仆舒"
 
-#: ../libpurple/protocols/myspace/myspace.c:2430
+#: ../libpurple/protocols/myspace/myspace.c:2582
 msgid "Unparseable message"
 msgstr "�亠�舒亰弍亳�舒亠仄仂亠 �仂仂弍�亠仆亳亠"
 
-#: ../libpurple/protocols/myspace/myspace.c:2499
+#: ../libpurple/protocols/myspace/myspace.c:2653
 #, c-format
 msgid "Couldn't connect to host: %s (%d)"
 msgstr "�亠 �亟舒仍仂�� �仂亠亟亳仆亳���� � �亰仍仂仄: %s (%d)"
 
-#: ../libpurple/protocols/myspace/myspace.c:2670
+#: ../libpurple/protocols/myspace/myspace.c:2831
 #, fuzzy
 msgid "IM Friends"
 msgstr "�从仆舒 _仄亞仆仂于亠仆仆�� �仂仂弍�亠仆亳亶"
 
-#: ../libpurple/protocols/myspace/myspace.c:2769
+#: ../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:2770
+#: ../libpurple/protocols/myspace/myspace.c:2932
 msgid "Add contacts from server"
 msgstr "�仂弍舒于亳�� 从仂仆�舒从�� � �亠�于亠�舒"
 
-#: ../libpurple/protocols/myspace/myspace.c:2822
-#: ../libpurple/protocols/myspace/myspace.c:2887
+#: ../libpurple/protocols/myspace/myspace.c:2984
+#: ../libpurple/protocols/myspace/myspace.c:3048
 msgid "Add friends from MySpace.com"
 msgstr "�仂弍舒于亳�� 亟��亰亠亶 � MySpace.com"
 
-#: ../libpurple/protocols/myspace/myspace.c:2823
+#: ../libpurple/protocols/myspace/myspace.c:2985
 #, fuzzy
 msgid "Importing friends failed"
 msgstr "�亠 �亟舒仍仂�� 仗亠�亠亟舒�� �于亠亟仂仄仍亠仆亳亠"
 
 #. TODO: find out how
-#: ../libpurple/protocols/myspace/myspace.c:2879
+#: ../libpurple/protocols/myspace/myspace.c:3041
 #, fuzzy
 msgid "Find people..."
 msgstr "�舒亶�亳 �仂弍亠�亠亟仆亳从仂于..."
 
-#: ../libpurple/protocols/myspace/myspace.c:2882
+#: ../libpurple/protocols/myspace/myspace.c:3044
 #, fuzzy
 msgid "Change IM name..."
 msgstr "�亰仄亠仆亳�� 仗舒�仂仍�..."
 
-#: ../libpurple/protocols/myspace/myspace.c:3184
+#: ../libpurple/protocols/myspace/myspace.c:3345
 msgid "myim URL handler"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:3185
+#: ../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:3186
+#: ../libpurple/protocols/myspace/myspace.c:3347
 msgid "Enable the proper MySpaceIM account and try again."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:3309
+#: ../libpurple/protocols/myspace/myspace.c:3470
 msgid "Show display name in status text"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:3312
+#: ../libpurple/protocols/myspace/myspace.c:3473
 msgid "Show headline in status text"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:3317
+#: ../libpurple/protocols/myspace/myspace.c:3478
 #, fuzzy
 msgid "Send emoticons"
 msgstr "�舒�舒仄亠��� 亰于�从舒"
 
-#: ../libpurple/protocols/myspace/myspace.c:3322
+#: ../libpurple/protocols/myspace/myspace.c:3483
 msgid "Screen resolution (dots per inch)"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:3325
+#: ../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
+#: ../libpurple/protocols/myspace/user.c:105
+#: ../libpurple/protocols/zephyr/zephyr.c:790
+#: ../libpurple/protocols/zephyr/zephyr.c:1164
 msgid "User"
 msgstr "�仂仍�亰仂于舒�亠仍�"
 
-#: ../libpurple/protocols/myspace/user.c:105
-#: ../libpurple/protocols/oscar/oscar.c:2974
+#: ../libpurple/protocols/myspace/user.c:115
+#: ../libpurple/protocols/oscar/oscar.c:3032
 msgid "Profile"
 msgstr "��仂�亳仍�"
 
-#: ../libpurple/protocols/myspace/user.c:128
+#: ../libpurple/protocols/myspace/user.c:138
 #, fuzzy
 msgid "Headline"
 msgstr "_�仄�:"
 
-#: ../libpurple/protocols/myspace/user.c:133
+#: ../libpurple/protocols/myspace/user.c:153
 #, fuzzy
 msgid "Song"
 msgstr "�于�从亳"
 
-#: ../libpurple/protocols/myspace/user.c:141
+#: ../libpurple/protocols/myspace/user.c:162
 msgid "Total Friends"
 msgstr "��亠亞仂 亟��亰亠亶"
 
-#: ../libpurple/protocols/myspace/user.c:159
+#: ../libpurple/protocols/myspace/user.c:180
 msgid "Client Version"
 msgstr "�亠��亳� 从仍亳亠仆�舒"
 
+#. Protocol won't log in now without a username set.. Disconnect
+#: ../libpurple/protocols/myspace/user.c:570
+#, fuzzy
+msgid "No username set"
+msgstr "�亠� 亳仄亠仆亳"
+
+#: ../libpurple/protocols/myspace/user.c:577
+#: ../libpurple/protocols/myspace/user.c:671
+msgid "MySpaceIM - Please Set a Username"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/user.c:578
+msgid "Please enter a username to check its availability:"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/user.c:658
+#, fuzzy
+msgid "MySpaceIM - Username Available"
+msgstr "弌仍�亢弍舒 仆亠亟仂���仗仆舒"
+
+#: ../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
+#, fuzzy
+msgid "This username is unavailable."
+msgstr "亅�舒 �亠仄舒 仆亠 亳仄亠亠� 亟仂���仗仆�� �仄舒亶仍亳从仂于."
+
+#: ../libpurple/protocols/myspace/user.c:673
+#, fuzzy
+msgid "Please try another username:"
+msgstr "�于亠亟亳�亠 仆仂于仂亠 亳仄� 亟仍� %s"
+
 #. TODO: icons for each zap
 #. 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:51
-#: ../libpurple/protocols/myspace/zap.c:214
+#: ../libpurple/protocols/myspace/zap.c:48
+#: ../libpurple/protocols/myspace/zap.c:221
 msgid "Zap"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:51
+#: ../libpurple/protocols/myspace/zap.c:48
 #, c-format
 msgid "%s has zapped you!"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:51
+#: ../libpurple/protocols/myspace/zap.c:49
 #, c-format
 msgid "Zapping %s..."
 msgstr ""
 
 #. Whack means "to hit or strike someone with a sharp blow"
-#: ../libpurple/protocols/myspace/zap.c:54
+#: ../libpurple/protocols/myspace/zap.c:52
 msgid "Whack"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:54
+#: ../libpurple/protocols/myspace/zap.c:53
 #, c-format
 msgid "%s has whacked you!"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:54
+#: ../libpurple/protocols/myspace/zap.c:53
 #, c-format
 msgid "Whacking %s..."
 msgstr ""
@@ -7808,7 +8074,7 @@
 #. 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:59
+#: ../libpurple/protocols/myspace/zap.c:58
 msgid "Torch"
 msgstr ""
 
@@ -7827,57 +8093,57 @@
 msgid "Smooch"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:62
+#: ../libpurple/protocols/myspace/zap.c:63
 #, c-format
 msgid "%s has smooched you!"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:62
+#: ../libpurple/protocols/myspace/zap.c:63
 #, c-format
 msgid "Smooching %s..."
 msgstr ""
 
 #. A hug is a display of affection; wrapping your arms around someone
-#: ../libpurple/protocols/myspace/zap.c:65
+#: ../libpurple/protocols/myspace/zap.c:66
 msgid "Hug"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:65
+#: ../libpurple/protocols/myspace/zap.c:66
 #, c-format
 msgid "%s has hugged you!"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:65
+#: ../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:68
+#: ../libpurple/protocols/myspace/zap.c:70
 msgid "Slap"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:68
+#: ../libpurple/protocols/myspace/zap.c:71
 #, c-format
 msgid "%s has slapped you!"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:68
+#: ../libpurple/protocols/myspace/zap.c:71
 #, c-format
 msgid "Slapping %s..."
 msgstr ""
 
 #. Goose means "to pinch someone on their butt"
-#: ../libpurple/protocols/myspace/zap.c:71
+#: ../libpurple/protocols/myspace/zap.c:74
 msgid "Goose"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:71
+#: ../libpurple/protocols/myspace/zap.c:75
 #, c-format
 msgid "%s has goosed you!"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:71
+#: ../libpurple/protocols/myspace/zap.c:75
 #, c-format
 msgid "Goosing %s..."
 msgstr ""
@@ -7885,16 +8151,16 @@
 #. 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:76
+#: ../libpurple/protocols/myspace/zap.c:80
 msgid "High-five"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:76
+#: ../libpurple/protocols/myspace/zap.c:81
 #, c-format
 msgid "%s has high-fived you!"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:76
+#: ../libpurple/protocols/myspace/zap.c:81
 #, c-format
 msgid "High-fiving %s..."
 msgstr ""
@@ -7902,16 +8168,16 @@
 #. 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:81
+#: ../libpurple/protocols/myspace/zap.c:86
 msgid "Punk"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:81
+#: ../libpurple/protocols/myspace/zap.c:87
 #, c-format
 msgid "%s has punk'd you!"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:81
+#: ../libpurple/protocols/myspace/zap.c:87
 #, c-format
 msgid "Punking %s..."
 msgstr ""
@@ -7923,16 +8189,16 @@
 #. * 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:90
+#: ../libpurple/protocols/myspace/zap.c:96
 msgid "Raspberry"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:90
+#: ../libpurple/protocols/myspace/zap.c:97
 #, c-format
 msgid "%s has raspberried you!"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:90
+#: ../libpurple/protocols/myspace/zap.c:97
 #, c-format
 msgid "Raspberrying %s..."
 msgstr ""
@@ -8180,7 +8446,7 @@
 msgstr ""
 
 #: ../libpurple/protocols/novell/novell.c:1511
-#: ../libpurple/protocols/sametime/sametime.c:4168
+#: ../libpurple/protocols/sametime/sametime.c:4176
 msgid "User ID"
 msgstr "�仂仍�亰仂于舒�亠仍��从亳亶 ID"
 
@@ -8235,11 +8501,11 @@
 msgid "Would you like to join the conversation?"
 msgstr "丱仂�亳�亠 仗�亳�仂亠亟亳仆亳���� 从 弍亠�亠亟亠?"
 
-#: ../libpurple/protocols/novell/novell.c:2027
+#: ../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:2084
+#: ../libpurple/protocols/novell/novell.c:2085
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -8247,7 +8513,7 @@
 "�亠�仂��仆仂, %s 仆亠 于 �亠�亳 亳 仆亠 仗仂仍��亳仍 �仂仂弍�亠仆亳亠, 从仂�仂�仂亠 于� �仂仍�从仂 ��仂 "
 "仂�仗�舒于亳仍亳."
 
-#: ../libpurple/protocols/novell/novell.c:2184
+#: ../libpurple/protocols/novell/novell.c:2185
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
@@ -8255,11 +8521,11 @@
 "�亠 �亟舒���� �仂亠亟亳仆亳���� � �亠�于亠�仂仄. �于亠亟亳�亠 舒亟�亠� �亠�于亠�舒, � 从仂�仂��仄 于� "
 "�仂�亳�亠 �仂亠亟亳仆亳����."
 
-#: ../libpurple/protocols/novell/novell.c:2213
+#: ../libpurple/protocols/novell/novell.c:2214
 msgid "Error. SSL support is not installed."
 msgstr "��亳弍从舒. �仂亟亟亠�亢从舒 SSL 仆亠 ���舒仆仂于仍亠仆舒."
 
-#: ../libpurple/protocols/novell/novell.c:2521
+#: ../libpurple/protocols/novell/novell.c:2522
 #, c-format
 msgid "This conference has been closed. No more messages can be sent."
 msgstr ""
@@ -8276,33 +8542,43 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/novell/novell.c:3535
-#: ../libpurple/protocols/novell/novell.c:3537
+#: ../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:3562
+#: ../libpurple/protocols/novell/novell.c:3563
 msgid "Server address"
 msgstr "�亟�亠� �亠�于亠�舒"
 
-#: ../libpurple/protocols/novell/novell.c:3566
+#: ../libpurple/protocols/novell/novell.c:3567
 msgid "Server port"
 msgstr "�仂�� �亠�于亠�舒"
 
+#: ../libpurple/protocols/oscar/family_chatnav.c:62
+#, fuzzy
+msgid "Could not join chat room"
+msgstr "�亠 �亟舒仍仂�� ���舒仆仂于亳�� �仂亠亟亳仆亠仆亳亠"
+
+#: ../libpurple/protocols/oscar/family_chatnav.c:63
+#, fuzzy
+msgid "Invalid chat room name"
+msgstr "�亠于亠�仆仂亠 亳仄� 从仂仄仆舒��"
+
 #: ../libpurple/protocols/oscar/flap_connection.c:391
-#: ../libpurple/protocols/yahoo/yahoo.c:2473
-#: ../libpurple/protocols/yahoo/yahoo.c:2641
-#: ../libpurple/protocols/yahoo/ycht.c:482 ../libpurple/proxy.c:584
-#: ../libpurple/proxy.c:1129 ../libpurple/proxy.c:1238
-#: ../libpurple/proxy.c:1338 ../libpurple/proxy.c:1466
+#: ../libpurple/protocols/yahoo/yahoo.c:2505
+#: ../libpurple/protocols/yahoo/yahoo.c:2673
+#: ../libpurple/protocols/yahoo/ycht.c:482 ../libpurple/proxy.c:609
+#: ../libpurple/proxy.c:1160 ../libpurple/proxy.c:1269
+#: ../libpurple/proxy.c:1369 ../libpurple/proxy.c:1497
 msgid "Server closed the connection."
 msgstr "弌亠�于亠� �舒亰仂�于舒仍 �仂亠亟亳仆亠仆亳亠."
 
 #: ../libpurple/protocols/oscar/flap_connection.c:393
-#: ../libpurple/protocols/yahoo/yahoo.c:2466
-#: ../libpurple/protocols/yahoo/yahoo.c:2634 ../libpurple/proxy.c:596
-#: ../libpurple/proxy.c:1141 ../libpurple/proxy.c:1250
-#: ../libpurple/proxy.c:1350 ../libpurple/proxy.c:1478
+#: ../libpurple/protocols/yahoo/yahoo.c:2498
+#: ../libpurple/protocols/yahoo/yahoo.c:2666 ../libpurple/proxy.c:621
+#: ../libpurple/proxy.c:1172 ../libpurple/proxy.c:1281
+#: ../libpurple/proxy.c:1381 ../libpurple/proxy.c:1509
 #, c-format
 msgid ""
 "Lost connection with server:\n"
@@ -8312,9 +8588,9 @@
 "%s"
 
 #: ../libpurple/protocols/oscar/flap_connection.c:396
-#: ../libpurple/proxy.c:1158 ../libpurple/proxy.c:1263
-#: ../libpurple/proxy.c:1362 ../libpurple/proxy.c:1434
-#: ../libpurple/proxy.c:1491
+#: ../libpurple/proxy.c:1189 ../libpurple/proxy.c:1294
+#: ../libpurple/proxy.c:1393 ../libpurple/proxy.c:1465
+#: ../libpurple/proxy.c:1522
 msgid "Received invalid data on connection with server."
 msgstr "��亳 �仂亠亟亳仆亠仆亳亳 � �亠�于亠�仂仄 仗仂仍��亠仆� 仆亠亟仂仗���亳仄�亠 亟舒仆仆�亠."
 
@@ -8349,8 +8625,8 @@
 msgstr "�仂亟�仍� 仗�仂�仂从仂仍舒 ICQ"
 
 #: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4421
-#: ../libpurple/protocols/zephyr/zephyr.c:2997
+#: ../libpurple/protocols/yahoo/yahoo.c:4452
+#: ../libpurple/protocols/zephyr/zephyr.c:2982
 msgid "Encoding"
 msgstr "�仂亟亳�仂于从舒"
 
@@ -8391,103 +8667,103 @@
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:116
+#: ../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
+#: ../libpurple/protocols/oscar/oscar.c:122
 msgid "Service unavailable"
 msgstr "弌仍�亢弍舒 仆亠亟仂���仗仆舒"
 
-#: ../libpurple/protocols/oscar/oscar.c:122
+#: ../libpurple/protocols/oscar/oscar.c:123
 msgid "Service not defined"
 msgstr "弌仍�亢弍舒 仆亠 仂仗�亠亟亠仍亠仆舒"
 
-#: ../libpurple/protocols/oscar/oscar.c:123
+#: ../libpurple/protocols/oscar/oscar.c:124
 msgid "Obsolete SNAC"
 msgstr "丕��舒�亠于�亳亶 SNAC"
 
-#: ../libpurple/protocols/oscar/oscar.c:124
+#: ../libpurple/protocols/oscar/oscar.c:125
 msgid "Not supported by host"
 msgstr "�亠 仗仂亟亟亠�亢亳于舒亠��� �亰仍仂仄"
 
-#: ../libpurple/protocols/oscar/oscar.c:125
+#: ../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
-msgid "Responses lost"
-msgstr "��从仍亳从亳 仗仂�亠��仆�"
-
 #: ../libpurple/protocols/oscar/oscar.c:129
-msgid "Request denied"
-msgstr "�舒仗�仂� 仂�于亠�亞仆��"
+msgid "Responses lost"
+msgstr "��从仍亳从亳 仗仂�亠��仆�"
 
 #: ../libpurple/protocols/oscar/oscar.c:130
-msgid "Busted SNAC payload"
-msgstr ""
+msgid "Request denied"
+msgstr "�舒仗�仂� 仂�于亠�亞仆��"
 
 #: ../libpurple/protocols/oscar/oscar.c:131
+msgid "Busted SNAC payload"
+msgstr ""
+
+#: ../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:349
 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 "
@@ -8495,7 +8771,7 @@
 "your AIM/ICQ account.)"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:457
+#: ../libpurple/protocols/oscar/oscar.c:458
 #, c-format
 msgid ""
 "(There was an error receiving this message.  Either you and %s have "
@@ -8505,153 +8781,140 @@
 "从仂亟亳�仂于从亳, 仍亳弍仂 从仍亳亠仆� %s �仂亟亠�亢亳� 仂�亳弍从亳.)"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:639 ../pidgin/gtkutils.c:2392
-#: ../pidgin/gtkutils.c:2422
+#: ../libpurple/protocols/oscar/oscar.c:640 ../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:643
 msgid "Voice"
 msgstr "�仂仍仂�"
 
-#: ../libpurple/protocols/oscar/oscar.c:645
+#: ../libpurple/protocols/oscar/oscar.c:646
 msgid "AIM Direct IM"
 msgstr "���仄仂亠 �仂亠亟亳仆亠仆亳亠 AIM"
 
-#: ../libpurple/protocols/oscar/oscar.c:648
-#: ../libpurple/protocols/silc/silc.c:911
-#: ../libpurple/protocols/silc/util.c:559
-#: ../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:6060
+#: ../libpurple/protocols/oscar/oscar.c:652
+#: ../libpurple/protocols/oscar/oscar.c:6139
 msgid "Get File"
 msgstr "�仂仍��亳�� �舒亶仍"
 
-#: ../libpurple/protocols/oscar/oscar.c:658
+#: ../libpurple/protocols/oscar/oscar.c:659
 msgid "Games"
 msgstr "�亞��"
 
-#: ../libpurple/protocols/oscar/oscar.c:661
+#: ../libpurple/protocols/oscar/oscar.c:662
 msgid "Add-Ins"
 msgstr "�仂仗仂仍仆亠仆亳�"
 
-#: ../libpurple/protocols/oscar/oscar.c:664
+#: ../libpurple/protocols/oscar/oscar.c:665
 msgid "Send Buddy List"
 msgstr "��仗�舒于亳�� �仗亳�仂从 �仂弍亠�亠亟仆亳从仂于"
 
-#: ../libpurple/protocols/oscar/oscar.c:667
+#: ../libpurple/protocols/oscar/oscar.c:668
 msgid "ICQ Direct Connect"
 msgstr "���仄仂亠 �仂亠亟亳仆亠仆亳亠 ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:670
+#: ../libpurple/protocols/oscar/oscar.c:671
 msgid "AP User"
 msgstr "�仂仍�亰仂于舒�亠仍� AP"
 
-#: ../libpurple/protocols/oscar/oscar.c:673
+#: ../libpurple/protocols/oscar/oscar.c:674
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: ../libpurple/protocols/oscar/oscar.c:676
+#: ../libpurple/protocols/oscar/oscar.c:677
 msgid "Nihilist"
 msgstr "�亳亞亳仍亳��"
 
-#: ../libpurple/protocols/oscar/oscar.c:679
+#: ../libpurple/protocols/oscar/oscar.c:680
 msgid "ICQ Server Relay"
 msgstr "�亠仍亠亶仆�亶 �亠�于亠� ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:682
+#: ../libpurple/protocols/oscar/oscar.c:683
 msgid "Old ICQ UTF8"
 msgstr "弌�舒��亶 ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:685
+#: ../libpurple/protocols/oscar/oscar.c:686
 msgid "Trillian Encryption"
 msgstr "丿亳��仂于舒仆亳亠 Trillian"
 
-#: ../libpurple/protocols/oscar/oscar.c:688
+#: ../libpurple/protocols/oscar/oscar.c:689
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:691
+#: ../libpurple/protocols/oscar/oscar.c:692
 msgid "Hiptop"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:694
+#: ../libpurple/protocols/oscar/oscar.c:695
 msgid "Security Enabled"
 msgstr "�亠亰仂仗舒�仆仂��� 于从仍��亠仆舒"
 
-#: ../libpurple/protocols/oscar/oscar.c:697
+#: ../libpurple/protocols/oscar/oscar.c:698
 msgid "Video Chat"
 msgstr "�亳亟亠仂�舒�"
 
-#: ../libpurple/protocols/oscar/oscar.c:701
+#: ../libpurple/protocols/oscar/oscar.c:702
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: ../libpurple/protocols/oscar/oscar.c:704
+#: ../libpurple/protocols/oscar/oscar.c:705
 msgid "Live Video"
 msgstr "�亳于仂亠 于亳亟亠仂"
 
-#: ../libpurple/protocols/oscar/oscar.c:707
+#: ../libpurple/protocols/oscar/oscar.c:708
 msgid "Camera"
 msgstr "�舒仄亠�舒"
 
-#: ../libpurple/protocols/oscar/oscar.c:725
-#: ../libpurple/protocols/oscar/oscar.c:5830
+#: ../libpurple/protocols/oscar/oscar.c:726
+#: ../libpurple/protocols/oscar/oscar.c:5909
 #, c-format
 msgid "Free For Chat"
 msgstr "�仂�仂于 仗仂仂弍�舒����"
 
-#: ../libpurple/protocols/oscar/oscar.c:729
-#: ../libpurple/protocols/oscar/oscar.c:5865
+#: ../libpurple/protocols/oscar/oscar.c:730
+#: ../libpurple/protocols/oscar/oscar.c:5944
 #, c-format
 msgid "Not Available"
 msgstr "�亠亟仂���仗亠仆"
 
-#: ../libpurple/protocols/oscar/oscar.c:731
-#: ../libpurple/protocols/oscar/oscar.c:5851
+#: ../libpurple/protocols/oscar/oscar.c:732
+#: ../libpurple/protocols/oscar/oscar.c:5930
 #, c-format
 msgid "Occupied"
 msgstr "�舒仆��"
 
-#: ../libpurple/protocols/oscar/oscar.c:735
+#: ../libpurple/protocols/oscar/oscar.c:736
 #, c-format
 msgid "Web Aware"
 msgstr "弌�舒��� 仆舒 于亠弍-���舒仆亳�舒�"
 
-#: ../libpurple/protocols/oscar/oscar.c:737 ../libpurple/protocols/qq/qq.c:184
+#: ../libpurple/protocols/oscar/oscar.c:738 ../libpurple/protocols/qq/qq.c:184
 #: ../libpurple/protocols/qq/qq.c:289
-#: ../libpurple/protocols/yahoo/yahoo.c:3106 ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:557 ../pidgin/gtkstatusbox.c:1060
+#: ../libpurple/protocols/yahoo/yahoo.c:3152 ../libpurple/status.c:157
+#: ../pidgin/gtkdocklet.c:557 ../pidgin/gtkstatusbox.c:1084
 #, c-format
 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:3717
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1156
+#: ../libpurple/protocols/oscar/oscar.c:839
+#: ../libpurple/protocols/oscar/oscar.c:3754
+#: ../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:2901
+#: ../libpurple/protocols/oscar/oscar.c:846
+#: ../libpurple/protocols/oscar/oscar.c:2959
 msgid "Warning Level"
 msgstr "丕�仂于亠仆� 仗�亠亟�仗�亠亢亟亠仆亳�"
 
-#: ../libpurple/protocols/oscar/oscar.c:855
+#: ../libpurple/protocols/oscar/oscar.c:856
 msgid "Buddy Comment"
 msgstr "�仂仄仄亠仆�舒�亳亶 �仂弍亠�亠亟仆亳从舒"
 
-#: ../libpurple/protocols/oscar/oscar.c:995
+#: ../libpurple/protocols/oscar/oscar.c:996
 #, c-format
 msgid ""
 "Could not connect to authentication server:\n"
@@ -8660,7 +8923,7 @@
 "�亠 �亟舒仍仂�� ���舒仆仂于亳�� �仂亠亟亳仆亠仆亳亠 � �亠�于亠�仂仄 舒��亠仆�亳�亳从舒�亳亳:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1003
+#: ../libpurple/protocols/oscar/oscar.c:1004
 #, c-format
 msgid ""
 "Could not connect to BOS server:\n"
@@ -8669,54 +8932,55 @@
 "�亠 �亟舒仍仂�� ���舒仆仂于亳�� �仂亠亟亳仆亠仆亳亠 � BOS-�亠�于亠�仂仄:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1043
-msgid "Screen name sent"
-msgstr "�亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍� 仂�仗�舒于仍亠仆"
-
-#: ../libpurple/protocols/oscar/oscar.c:1048
+#: ../libpurple/protocols/oscar/oscar.c:1044
+#, fuzzy
+msgid "Username sent"
+msgstr "�亠� 亳仄亠仆亳"
+
+#: ../libpurple/protocols/oscar/oscar.c:1049
 msgid "Connection established, cookie sent"
 msgstr "弌仂亠亟亳仆亠仆亳亠 ���舒仆仂于仍亠仆仂, 亟舒仆仆�亠 仂�仗�舒于仍亠仆�"
 
 #. TODO: Don't call this with ssi
-#: ../libpurple/protocols/oscar/oscar.c:1077
+#: ../libpurple/protocols/oscar/oscar.c:1078
 msgid "Finalizing connection"
 msgstr "�舒于亠��亠仆亳亠 ���舒仆仂于仍亠仆亳� �仂亠亟亳仆亠仆亳�"
 
-#: ../libpurple/protocols/oscar/oscar.c:1262
-#, 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."
+#: ../libpurple/protocols/oscar/oscar.c:1306
+#, c-format
+msgid ""
+"Unable to login: Could not sign on as %s because the username is invalid.  "
+"Usernames must be a valid email address, or start with a letter and contain "
+"only letters, numbers and spaces, or contain only numbers."
 msgstr ""
 
 #. Unregistered screen name
-#: ../libpurple/protocols/oscar/oscar.c:1347
-#: ../libpurple/protocols/yahoo/yahoo.c:2108
-msgid "Invalid screen name."
-msgstr "�亠于亠�仆�亶 亳亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍�."
-
-#: ../libpurple/protocols/oscar/oscar.c:1353
+#: ../libpurple/protocols/oscar/oscar.c:1392
+#, fuzzy
+msgid "Invalid username."
+msgstr "�亠于亠�仆仂亠 亳仄�"
+
+#: ../libpurple/protocols/oscar/oscar.c:1398
 #: ../libpurple/protocols/qq/login_logout.c:485
 #: ../libpurple/protocols/simple/simple.c:1112
-#: ../libpurple/protocols/yahoo/yahoo.c:2130
+#: ../libpurple/protocols/yahoo/yahoo.c:2149
 msgid "Incorrect password."
 msgstr "�亠仗�舒于亳仍�仆�亶 仗舒�仂仍�."
 
 #. Suspended account
-#: ../libpurple/protocols/oscar/oscar.c:1357
+#: ../libpurple/protocols/oscar/oscar.c:1402
 msgid "Your account is currently suspended."
 msgstr "�舒�舒 ����仆舒� 亰舒仗亳�� �亠亶�舒� 亰舒弍仍仂从亳�仂于舒仆舒."
 
 #. service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1361
+#: ../libpurple/protocols/oscar/oscar.c:1406
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "弌仍�亢弍舒 AOL Instant Messenger 于�亠仄亠仆仆仂 仆亠亟仂���仗仆舒."
 
 #. screen name connecting too frequently
 #. IP address connecting too frequently
-#: ../libpurple/protocols/oscar/oscar.c:1365
-#: ../libpurple/protocols/oscar/oscar.c:1374
+#: ../libpurple/protocols/oscar/oscar.c:1410
+#: ../libpurple/protocols/oscar/oscar.c:1419
 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."
@@ -8725,52 +8989,43 @@
 "仗仂仗��舒亶�亠�� �仆仂于舒. ��仍亳 于� 仗�仂亟仂仍亢亳�亠 仗仂仗��从亳, 于舒仄 仗�亳亟���� 亢亟舒�� 亠�� 亟仂仍��亠."
 
 #. client too old
-#: ../libpurple/protocols/oscar/oscar.c:1369
+#: ../libpurple/protocols/oscar/oscar.c:1414
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "�亠��亳� 从仍亳亠仆�舒, 从仂�仂�仂亶 于� 仗仂仍�亰�亠�亠��, �仍亳�从仂仄 ��舒�舒. �弍仆仂于亳�亠 亟仂 %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1407
+#: ../libpurple/protocols/oscar/oscar.c:1452
 msgid "Could Not Connect"
 msgstr "�亠 �亟舒仍仂�� ���舒仆仂于亳�� �仂亠亟亳仆亠仆亳亠"
 
-#: ../libpurple/protocols/oscar/oscar.c:1411
+#: ../libpurple/protocols/oscar/oscar.c:1456
 msgid "Received authorization"
 msgstr "�仂仍��亠仆舒 舒于�仂�亳亰舒�亳�"
 
-#: ../libpurple/protocols/oscar/oscar.c:1434
+#: ../libpurple/protocols/oscar/oscar.c:1479
 msgid "The SecurID key entered is invalid."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1447
+#: ../libpurple/protocols/oscar/oscar.c:1492
 msgid "Enter SecurID"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1448
+#: ../libpurple/protocols/oscar/oscar.c:1493
 msgid "Enter the 6 digit number from the digital display."
 msgstr ""
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
-#. *
-#. * @since 2.3.0
 #.
-#. *
-#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
-#. *
-#. * @deprecated Please use purple_request_ok_cancel_with_hint instead.
-#.
-#: ../libpurple/protocols/oscar/oscar.c:1450
-#: ../libpurple/protocols/oscar/oscar.c:2242
-#: ../libpurple/protocols/oscar/oscar.c:2291
-#: ../libpurple/protocols/oscar/oscar.c:5935
-#: ../libpurple/protocols/oscar/oscar.c:6216 ../libpurple/request.h:1828
-#: ../libpurple/request.h:1841
+#: ../libpurple/protocols/oscar/oscar.c:1495
+#: ../libpurple/protocols/oscar/oscar.c:2300
+#: ../libpurple/protocols/oscar/oscar.c:2349
+#: ../libpurple/protocols/oscar/oscar.c:6014
+#: ../libpurple/protocols/oscar/oscar.c:6295 ../libpurple/request.h:1458
 msgid "_OK"
 msgstr "_OK"
 
-#: ../libpurple/protocols/oscar/oscar.c:1489
-#: ../libpurple/protocols/oscar/oscar.c:1532
+#: ../libpurple/protocols/oscar/oscar.c:1534
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -8779,54 +9034,55 @@
 "弌仂亠亟亳仆亠仆亳亠 � 于舒仄亳 于�从仂�亠 仄仂亢亠� 弍��� �舒亰仂�于舒仆仂. �仂亰仄仂亢仆仂, 于� 亰舒�仂�亳�亠 "
 "亳�仗仂仍�亰仂于舒�� TOC, 仗仂从舒 ��仂 仆亠 弍�亟亠� 亳�仗�舒于仍亠仆仂. 弌仄仂��亳�亠 仂弍仆仂于仍亠仆亳� 仆舒 %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:1492
-#: ../libpurple/protocols/oscar/oscar.c:1535
+#: ../libpurple/protocols/oscar/oscar.c:1537
+#: ../libpurple/protocols/oscar/oscar.c:1581
 msgid "Unable to get a valid AIM login hash."
 msgstr "�亠 �亟舒���� 仗仂仍��亳�� 亟仂仗���亳仄�亶 ��� 于�仂亟舒 AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:1620
+#: ../libpurple/protocols/oscar/oscar.c:1578
+#: ../libpurple/protocols/oscar/oscar.c:1677
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr ""
 "弌仂亠亟亳仆亠仆亳亠 � 于舒仄亳 于�从仂�亠 仄仂亢亠� 弍��� �舒亰仂�于舒仆仂. 弌仄仂��亳�亠 仂弍仆仂于仍亠仆亳� 仆舒 %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:1623
+#: ../libpurple/protocols/oscar/oscar.c:1680
 msgid "Unable to get a valid login hash."
 msgstr "�亠 �亟舒���� 仗仂仍��亳�� 亟仂仗���亳仄�亶 ��� 于�仂亟舒."
 
-#: ../libpurple/protocols/oscar/oscar.c:1653
+#: ../libpurple/protocols/oscar/oscar.c:1710
 msgid "Password sent"
 msgstr "�舒�仂仍� 仂�仗�舒于仍亠仆"
 
-#: ../libpurple/protocols/oscar/oscar.c:1709
+#: ../libpurple/protocols/oscar/oscar.c:1766
 msgid "Unable to initialize connection"
 msgstr "�亠 �亟舒���� 亳仆亳�亳舒仍亳亰亳�仂于舒�� �仂亠亟亳仆亠仆亳亠"
 
-#: ../libpurple/protocols/oscar/oscar.c:2200
+#: ../libpurple/protocols/oscar/oscar.c:2256
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2240
+#: ../libpurple/protocols/oscar/oscar.c:2298
 msgid "Authorization Request Message:"
 msgstr "弌仂仂弍�亠仆亳亠 亰舒仗�仂�舒 舒于�仂�亳亰舒�亳亳:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2241
+#: ../libpurple/protocols/oscar/oscar.c:2299
 msgid "Please authorize me!"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2282
-#: ../libpurple/protocols/oscar/oscar.c:2290
-#: ../libpurple/protocols/oscar/oscar.c:2417
-#: ../libpurple/protocols/oscar/oscar.c:5311
-#: ../libpurple/protocols/yahoo/yahoo.c:1032
+#: ../libpurple/protocols/oscar/oscar.c:2340
+#: ../libpurple/protocols/oscar/oscar.c:2348
+#: ../libpurple/protocols/oscar/oscar.c:2475
+#: ../libpurple/protocols/oscar/oscar.c:5386
+#: ../libpurple/protocols/yahoo/yahoo.c:991
 msgid "No reason given."
 msgstr "��亳�亳仆舒 仆亠 �从舒亰舒仆舒."
 
-#: ../libpurple/protocols/oscar/oscar.c:2289
+#: ../libpurple/protocols/oscar/oscar.c:2347
 msgid "Authorization Denied Message:"
 msgstr "弌仂仂弍�亠仆亳亠 仂�从舒亰舒 于 舒于�仂�亳亰舒�亳亳:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2417
+#: ../libpurple/protocols/oscar/oscar.c:2475
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -8837,18 +9093,18 @@
 "�仍亠亟���亠亶 仗�亳�亳仆亠:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2418
+#: ../libpurple/protocols/oscar/oscar.c:2476
 msgid "ICQ authorization denied."
 msgstr "� 舒于�仂�亳亰舒�亳亳 ICQ 仂�从舒亰舒仆仂."
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2425
+#: ../libpurple/protocols/oscar/oscar.c:2483
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr ""
 "�仂仍�亰仂于舒�亠仍� %u 亟舒仍 �于仂� �仂亞仍舒�亳亠 亟仂弍舒于亳�� 亠亞仂 于 于舒� �仗亳�仂从 �仂弍亠�亠亟仆亳从仂于."
 
-#: ../libpurple/protocols/oscar/oscar.c:2433
+#: ../libpurple/protocols/oscar/oscar.c:2491
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -8856,12 +9112,12 @@
 "From: %s [%s]\n"
 "%s"
 msgstr ""
-"�� 仗�亳仆�仍亳 �仗亠�亳舒仍�仆仂亠 �仂仂弍�亠仆亳亠\n"
+"�� 仗仂仍��亳仍亳 �仗亠�亳舒仍�仆仂亠 �仂仂弍�亠仆亳亠\n"
 "\n"
 "��: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2441
+#: ../libpurple/protocols/oscar/oscar.c:2499
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -8869,12 +9125,12 @@
 "From: %s [%s]\n"
 "%s"
 msgstr ""
-"�� 仗�亳仆�仍亳 ICQ-���舒仆亳��\n"
+"�� 仗仂仍��亳仍亳 ICQ-���舒仆亳��\n"
 "\n"
 "��: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2449
+#: ../libpurple/protocols/oscar/oscar.c:2507
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -8882,29 +9138,29 @@
 "Message is:\n"
 "%s"
 msgstr ""
-"�� 仗�亳仆�仍亳 ICQ e-mail 仂� %s [%s]\n"
+"�� 仗仂仍��亳仍亳 ICQ e-mail 仂� %s [%s]\n"
 "\n"
 "弌仂仂弍�亠仆亳亠:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2470
+#: ../libpurple/protocols/oscar/oscar.c:2528
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "�仂仍�亰仂于舒�亠仍� ICQ %u 仂�仗�舒于亳仍 于舒仄 �仂弍亠�亠亟仆亳从舒: %s (%s)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2476
+#: ../libpurple/protocols/oscar/oscar.c:2534
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "丱仂�亳�亠 亟仂弍舒于亳�� ��仂亞仂 �仂弍亠�亠亟仆亳从舒 于 �仗亳�仂从 �仂弍亠�亠亟仆亳从仂于?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2481 ../pidgin/gtkroomlist.c:318
+#: ../libpurple/protocols/oscar/oscar.c:2539 ../pidgin/gtkroomlist.c:320
 msgid "_Add"
 msgstr "_�仂弍舒于亳��"
 
-#: ../libpurple/protocols/oscar/oscar.c:2482
+#: ../libpurple/protocols/oscar/oscar.c:2540
 msgid "_Decline"
 msgstr "_��从仍仂仆亳��"
 
-#: ../libpurple/protocols/oscar/oscar.c:2606
+#: ../libpurple/protocols/oscar/oscar.c:2664
 #, 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."
@@ -8912,7 +9168,7 @@
 msgstr[1] "�� 仆亠 仗仂仍��亳仍亳 %hu �仂仂弍�亠仆亳� 仂� %s, �舒从 从舒从 仂仆亳 弍�仍亳 仆亠从仂��亠从�仆�."
 msgstr[2] "�� 仆亠 仗仂仍��亳仍亳 %hu �仂仂弍�亠仆亳亶 仂� %s, �舒从 从舒从 仂仆亳 弍�仍亳 仆亠从仂��亠从�仆�."
 
-#: ../libpurple/protocols/oscar/oscar.c:2615
+#: ../libpurple/protocols/oscar/oscar.c:2673
 #, 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."
@@ -8923,7 +9179,7 @@
 msgstr[2] ""
 "�� 仆亠 仗仂仍��亳仍亳 %hu �仂仂弍�亠仆亳亶 仂� %s, �舒从 从舒从 仂仆亳 弍�仍亳 �仍亳�从仂仄 于亠仍亳从亳."
 
-#: ../libpurple/protocols/oscar/oscar.c:2624
+#: ../libpurple/protocols/oscar/oscar.c:2682
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -8936,7 +9192,7 @@
 msgstr[2] ""
 "�� 仆亠 仗仂仍��亳仍亳 %hu �仂仂弍�亠仆亳亶 仂� %s, �舒从 从舒从 弍�仍 仗�亠于��亠仆 仗�亠亟亠仍 仂�亠仆从亳."
 
-#: ../libpurple/protocols/oscar/oscar.c:2633
+#: ../libpurple/protocols/oscar/oscar.c:2691
 #, 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."
@@ -8947,7 +9203,7 @@
 msgstr[2] ""
 "�� 仆亠 仗仂仍��亳仍亳 %hu �仂仂弍�亠仆亳亶 仂� %s, 仗仂�仂仄� ��仂 仂仆 �仍亳�从仂仄 仆舒亟仂亠亟仍亳于."
 
-#: ../libpurple/protocols/oscar/oscar.c:2642
+#: ../libpurple/protocols/oscar/oscar.c:2700
 #, 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."
@@ -8958,7 +9214,7 @@
 msgstr[2] ""
 "�� 仆亠 仗仂仍��亳仍亳 %hu �仂仂弍�亠仆亳亶 仂� %s, 仗仂�仂仄� ��仂 于� �仍亳�从仂仄 仆舒亟仂亠亟仍亳于�."
 
-#: ../libpurple/protocols/oscar/oscar.c:2651
+#: ../libpurple/protocols/oscar/oscar.c:2709
 #, 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."
@@ -8967,47 +9223,47 @@
 msgstr[2] "�� 仆亠 仗仂仍��亳仍亳 %hu �仂仂弍�亠仆亳亶 仂� %s 仗仂 仆亠亳亰于亠��仆仂亶 仗�亳�亳仆亠."
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2806
+#: ../libpurple/protocols/oscar/oscar.c:2864
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "�亠 �亟舒���� 仂�仗�舒于亳�� �仂仂弍�亠仆亳亠: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2806
-#: ../libpurple/protocols/oscar/oscar.c:2811
-#: ../libpurple/protocols/oscar/oscar.c:2875
+#: ../libpurple/protocols/oscar/oscar.c:2864
+#: ../libpurple/protocols/oscar/oscar.c:2869
+#: ../libpurple/protocols/oscar/oscar.c:2933
 msgid "Unknown reason."
 msgstr "��亳�亳仆舒 仆亠亳亰于亠��仆舒."
 
-#: ../libpurple/protocols/oscar/oscar.c:2809
-#: ../libpurple/protocols/sametime/sametime.c:2451
+#: ../libpurple/protocols/oscar/oscar.c:2867
+#: ../libpurple/protocols/sametime/sametime.c:2459
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "�亠 �亟舒���� 仂�仗�舒于亳�� �仂仂弍�亠仆亳亠 亟仍� %s:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2875
+#: ../libpurple/protocols/oscar/oscar.c:2933
 #, c-format
 msgid "User information not available: %s"
 msgstr "�仂仍�亰仂于舒�亠仍��从舒� 亳仆�仂�仄舒�亳� 仆亠亟仂���仗仆舒: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2906
+#: ../libpurple/protocols/oscar/oscar.c:2964
 msgid "Online Since"
 msgstr "� �亠�亳 �"
 
-#: ../libpurple/protocols/oscar/oscar.c:2911
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1185
+#: ../libpurple/protocols/oscar/oscar.c:2969
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1191
 msgid "Member Since"
 msgstr "丼仍亠仆 �"
 
-#: ../libpurple/protocols/oscar/oscar.c:2946
+#: ../libpurple/protocols/oscar/oscar.c:3004
 msgid "Available Message"
 msgstr "弌�舒���仆仂亠 �仂仂弍�亠仆亳亠"
 
-#: ../libpurple/protocols/oscar/oscar.c:3054
+#: ../libpurple/protocols/oscar/oscar.c:3108
 msgid "Your AIM connection may be lost."
 msgstr "�舒�亠 �仂亠亟亳仆亠仆亳亠 AIM 仄仂亢亠� 弍��� 仗仂�亠��仆仂."
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3242
+#: ../libpurple/protocols/oscar/oscar.c:3296
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -9015,7 +9271,7 @@
 "[�亠 �亟舒���� 仂�仂弍�舒亰亳�� �仂仂弍�亠仆亳亠 仂� ��仂亞仂 仗仂仍�亰仂于舒�亠仍�, �舒从 从舒从 仂仆仂 �仂亟亠�亢亳� "
 "仆亠亟仂仗���亳仄�亠 �亳仄于仂仍�.]"
 
-#: ../libpurple/protocols/oscar/oscar.c:3406
+#: ../libpurple/protocols/oscar/oscar.c:3460
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -9023,127 +9279,118 @@
 "�仂�仍亠亟仆亠亠 仗�亠亟仗�亳仆��仂亠 于舒仄亳 亟亠亶��于亳亠 仆亠 仄仂亢亠� 弍��� 于�仗仂仍仆亠仆仂, �舒从 从舒从 于� "
 "仗�亠于��亳仍亳 仗�亠亟亠仍. �仂亟仂亢亟亳�亠 10 �亠从�仆亟 亳 仗仂仗��舒亶�亠�� �仆仂于舒."
 
-#: ../libpurple/protocols/oscar/oscar.c:3489
+#: ../libpurple/protocols/oscar/oscar.c:3545
 #: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "�� 弍�仍亳 仂��仂亠亟亳仆亠仆� 仂� �舒�舒 %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:3739
-#: ../libpurple/protocols/silc/util.c:591
-#: ../libpurple/protocols/silc10/util.c:581
+#: ../libpurple/protocols/oscar/oscar.c:3776
+#: ../libpurple/protocols/silc/util.c:596
+#: ../libpurple/protocols/silc10/util.c:586
 msgid "Mobile Phone"
 msgstr "�仂弍亳仍�仆�亶 �亠仍亠�仂仆"
 
-#: ../libpurple/protocols/oscar/oscar.c:3769
+#: ../libpurple/protocols/oscar/oscar.c:3806
 msgid "Personal Web Page"
 msgstr "�亠��仂仆舒仍�仆舒� Web-���舒仆亳�舒"
 
-#: ../libpurple/protocols/oscar/oscar.c:3793
+#: ../libpurple/protocols/oscar/oscar.c:3830
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "�仂仗仂仍仆亳�亠仍�仆舒� 亳仆�仂�仄舒�亳�"
 
-#: ../libpurple/protocols/oscar/oscar.c:3801
-#: ../libpurple/protocols/oscar/oscar.c:3814
+#: ../libpurple/protocols/oscar/oscar.c:3838
+#: ../libpurple/protocols/oscar/oscar.c:3851
 msgid "Zip Code"
 msgstr "�仆亟亠从�"
 
-#: ../libpurple/protocols/oscar/oscar.c:3825
+#: ../libpurple/protocols/oscar/oscar.c:3862
 msgid "Division"
 msgstr "��亟亠仍"
 
-#: ../libpurple/protocols/oscar/oscar.c:3826
+#: ../libpurple/protocols/oscar/oscar.c:3863
 msgid "Position"
 msgstr "�仂仍亢仆仂���"
 
-#: ../libpurple/protocols/oscar/oscar.c:3828
+#: ../libpurple/protocols/oscar/oscar.c:3865
 msgid "Web Page"
 msgstr "Web-���舒仆亳�舒"
 
-#: ../libpurple/protocols/oscar/oscar.c:3831
+#: ../libpurple/protocols/oscar/oscar.c:3868
 msgid "Work Information"
 msgstr "�仆�仂�仄舒�亳� 仂 �舒弍仂�亠"
 
-#: ../libpurple/protocols/oscar/oscar.c:3887
+#: ../libpurple/protocols/oscar/oscar.c:3924
 msgid "Pop-Up Message"
 msgstr "��仗仍�于舒��亠亠 �仂仂弍�亠仆亳亠"
 
-#: ../libpurple/protocols/oscar/oscar.c:3927
-#, c-format
-msgid "The following screen name is associated with %s"
-msgid_plural "The following screen names are associated with %s"
+#: ../libpurple/protocols/oscar/oscar.c:3964
+#, fuzzy, c-format
+msgid "The following username is associated with %s"
+msgid_plural "The following usernames are associated with %s"
 msgstr[0] "弌仍亠亟���亳亶 亳亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍� �仂仂�仆亠��仆 � %s"
 msgstr[1] "弌仍亠亟���亳亠 亳亟亠仆�亳�亳从舒�仂�� 仗仂仍�亰仂于舒�亠仍亠亶 �仂仂�仆亠�亠仆� � %s"
 msgstr[2] "弌仍亠亟���亳亠 亳亟亠仆�亳�亳从舒�仂�� 仗仂仍�亰仂于舒�亠仍亠亶 �仂仂�仆亠�亠仆� � %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3932
-msgid "Screen name"
-msgstr "�亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍�"
-
-#: ../libpurple/protocols/oscar/oscar.c:3958
+#: ../libpurple/protocols/oscar/oscar.c:3995
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "�亳�亠亞仂 仆亠 仆舒亶亟亠仆仂 亟仍� 舒亟�亠�舒 e-mail %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3979
+#: ../libpurple/protocols/oscar/oscar.c:4016
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "�� 亟仂仍亢仆� 仗仂仍��亳�� e-mail � 仗�仂��弍仂亶 仗仂亟�于亠�亟亳�� %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:3981
+#: ../libpurple/protocols/oscar/oscar.c:4018
 msgid "Account Confirmation Requested"
 msgstr "�舒仗�仂�亠仆仂 仗仂亟�于亠�亢亟亠仆亳亠 ����仆仂亶 亰舒仗亳�亳"
 
-#: ../libpurple/protocols/oscar/oscar.c:4012
-#, c-format
-msgid "Error Changing Account Info"
-msgstr "��亳弍从舒 亳亰仄亠仆亠仆亳� 亳仆�仂�仄舒�亳亳 仂弍 ����仆仂亶 亰舒仗亳�亳"
-
-#: ../libpurple/protocols/oscar/oscar.c:4015
-#, c-format
-msgid ""
-"Error 0x%04x: Unable to format screen name because the requested screen name "
-"differs from the original."
+#: ../libpurple/protocols/oscar/oscar.c:4051
+#, fuzzy, c-format
+msgid ""
+"Error 0x%04x: Unable to format username because the requested name differs "
+"from the original."
 msgstr ""
 "��亳弍从舒 0x%04x: �亠 �亟舒���� 仂��仂�仄舒�亳�仂于舒�� 亳亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍�, �舒从 "
 "从舒从 亰舒仗�仂�亠仆仆�亶 亳亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍� 仂�仍亳�舒亠��� 仂� 仂�亳亞亳仆舒仍�仆仂亞仂."
 
-#: ../libpurple/protocols/oscar/oscar.c:4018
-#, c-format
-msgid "Error 0x%04x: Unable to format screen name because it is invalid."
+#: ../libpurple/protocols/oscar/oscar.c:4053
+#, fuzzy, c-format
+msgid "Error 0x%04x: Unable to format username because it is invalid."
 msgstr ""
 "��亳弍从舒 0x%04x: �亠 �亟舒���� 仂��仂�仄舒�亳�仂于舒�� 亳亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍�, �舒从 "
 "从舒从 仂仆 仆亠亟仂仗���亳仄."
 
-#: ../libpurple/protocols/oscar/oscar.c:4021
-#, c-format
-msgid ""
-"Error 0x%04x: Unable to format screen name because the requested screen name "
-"is too long."
+#: ../libpurple/protocols/oscar/oscar.c:4055
+#, fuzzy, c-format
+msgid ""
+"Error 0x%04x: Unable to format username because the requested name is too "
+"long."
 msgstr ""
 "��亳弍从舒 0x%04x: �亠 �亟舒���� 仂��仂�仄舒�亳�仂于舒�� 亳亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍�, �舒从 "
 "从舒从 亰舒仗�仂�亠仆仆�亶 亳亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍� �仍亳�从仂仄 于亠仍亳从."
 
-#: ../libpurple/protocols/oscar/oscar.c:4024
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:4057
+#, fuzzy, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
-"request pending for this screen name."
+"request pending for this username."
 msgstr ""
 "��亳弍从舒 0x%04x: �亠 �亟舒���� 亳亰仄亠仆亳�� 舒亟�亠� e-mail, �舒从 从舒从 亟仍� ��仂亞仂 "
 "亳亟亠仆�亳�亳从舒�仂�舒 仗仂仍�亰仂于舒�亠仍� �亢亠 亠��� 仂亢亳亟舒��亳亶 亰舒仗�仂�."
 
-#: ../libpurple/protocols/oscar/oscar.c:4027
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:4059
+#, fuzzy, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
-"too many screen names associated with it."
+"too many usernames associated with it."
 msgstr ""
 "��亳弍从舒 0x%04x: �亠 �亟舒���� 亳亰仄亠仆亳�� 舒亟�亠� e-mail, �舒从 从舒从 � 亰舒亟舒仆仆�仄 舒亟�亠�仂仄 "
 "�仂仂�仆亠�亠仆仂 �仍亳�从仂仄 仄仆仂亞仂 亳亟亠仆�亳�亳从舒�仂�仂于 仗仂仍�亰仂于舒�亠仍亠亶."
 
-#: ../libpurple/protocols/oscar/oscar.c:4030
+#: ../libpurple/protocols/oscar/oscar.c:4061
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
@@ -9152,32 +9399,36 @@
 "��亳弍从舒 0x%04x: �亠 �亟舒���� 亳亰仄亠仆亳�� 舒亟�亠� e-mail, �舒从 从舒从 亰舒亟舒仆仆�亶 舒亟�亠� "
 "仆亠于亠�亠仆."
 
-#: ../libpurple/protocols/oscar/oscar.c:4033
+#: ../libpurple/protocols/oscar/oscar.c:4063
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "��亳弍从舒 0x%04x: �亠亳亰于亠��仆舒� 仂�亳弍从舒."
 
-#: ../libpurple/protocols/oscar/oscar.c:4043
+#: ../libpurple/protocols/oscar/oscar.c:4065
+msgid "Error Changing Account Info"
+msgstr "��亳弍从舒 亳亰仄亠仆亠仆亳� 亳仆�仂�仄舒�亳亳 仂弍 ����仆仂亶 亰舒仗亳�亳"
+
+#: ../libpurple/protocols/oscar/oscar.c:4071
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "�亟�亠� e-mail 亟仍� %s: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4045
+#: ../libpurple/protocols/oscar/oscar.c:4073
 msgid "Account Info"
 msgstr "�仆�仂�仄舒�亳� 仂弍 ����仆仂亶 亰舒仗亳�亳"
 
-#: ../libpurple/protocols/oscar/oscar.c:4228
+#: ../libpurple/protocols/oscar/oscar.c:4259
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 "�舒�亠 亳亰仂弍�舒亢亠仆亳亠 仆亠 弍�仍仂 仂�仗�舒于仍亠仆仂. �� 亟仂仍亢仆� 亳仄亠�� 仗��仄仂亠 �仂亠亟亳仆亠仆亳亠 亟仍� "
 "仂�仗�舒于从亳 亳亰仂弍�舒亢亠仆亳亶."
 
-#: ../libpurple/protocols/oscar/oscar.c:4499
+#: ../libpurple/protocols/oscar/oscar.c:4530
 msgid "Unable to set AIM profile."
 msgstr "�亠 �亟舒���� ���舒仆仂于亳�� 仗�仂�亳仍� AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:4500
+#: ../libpurple/protocols/oscar/oscar.c:4531
 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 "
@@ -9187,7 +9438,7 @@
 "于�仂亟舒. �舒� 仗�仂�亳仍� 仂��舒���� 仆亠���舒仆仂于仍亠仆仆�仄; 仗仂仗��舒亶�亠�� ���舒仆仂于亳�� 亠亞仂 亠�� "
 "�舒亰, 从仂亞亟舒 弍�亟亠�亠 仗仂仍仆仂���� 仗仂亟从仍��亠仆�."
 
-#: ../libpurple/protocols/oscar/oscar.c:4514
+#: ../libpurple/protocols/oscar/oscar.c:4545
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
@@ -9202,11 +9453,11 @@
 msgstr[2] ""
 "�舒从�亳仄舒仍�仆�亶 �舒亰仄亠� 仗�仂�亳仍� 于 %d 弍舒亶� 弍�仍 仗�亠于��亠仆. ��仂�亳仍� 弍�仍 ��亠亰舒仆."
 
-#: ../libpurple/protocols/oscar/oscar.c:4519
+#: ../libpurple/protocols/oscar/oscar.c:4550
 msgid "Profile too long."
 msgstr "��仂�亳仍� �仍亳�从仂仄 于亠仍亳从."
 
-#: ../libpurple/protocols/oscar/oscar.c:4564
+#: ../libpurple/protocols/oscar/oscar.c:4594
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -9224,29 +9475,29 @@
 "�舒从�亳仄舒仍�仆�亶 �舒亰仄亠� �仂仂弍�亠仆亳� 仂弍 仂������于亳亳 于 %d 弍舒亶� 弍�仍 仗�亠于��亠仆. "
 "弌仂仂弍�亠仆亳亠 仂弍 仂������于亳亳 弍�仍仂 ��亠亰舒仆仂."
 
-#: ../libpurple/protocols/oscar/oscar.c:4569
+#: ../libpurple/protocols/oscar/oscar.c:4599
 msgid "Away message too long."
 msgstr "弌仂仂弍�亠仆亳亠 仂弍 仂������于亳亳 �仍亳�从仂仄 于亠仍亳从仂."
 
-#: ../libpurple/protocols/oscar/oscar.c:4642
-#, 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 ""
-
-#: ../libpurple/protocols/oscar/oscar.c:4644
-#: ../libpurple/protocols/oscar/oscar.c:5097
-#: ../libpurple/protocols/oscar/oscar.c:5112
+#: ../libpurple/protocols/oscar/oscar.c:4672
+#, c-format
+msgid ""
+"Could not add the buddy %s because the username is invalid.  Usernames must "
+"be a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:4674
+#: ../libpurple/protocols/oscar/oscar.c:5155
+#: ../libpurple/protocols/oscar/oscar.c:5170
 msgid "Unable To Add"
 msgstr "�亠 �亟舒���� 亟仂弍舒于亳��"
 
-#: ../libpurple/protocols/oscar/oscar.c:4763
+#: ../libpurple/protocols/oscar/oscar.c:4793
 msgid "Unable To Retrieve Buddy List"
 msgstr "�亠 �亟舒���� 亰舒亞��亰亳�� �仗亳�仂从 �仂弍亠�亠亟仆亳从仂于"
 
-#: ../libpurple/protocols/oscar/oscar.c:4764
+#: ../libpurple/protocols/oscar/oscar.c:4794
 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 minutes."
@@ -9255,15 +9506,15 @@
 "�仂弍亠�亠亟仆亳从仂于 仆亠 仗仂�亠��仆 亳, 于亠�仂��仆仂, ��舒仆亠� 亟仂���仗亠仆 于 �亠�亠仆亳亠 仆亠�从仂仍�从亳� "
 "仄亳仆��."
 
-#: ../libpurple/protocols/oscar/oscar.c:4947
-#: ../libpurple/protocols/oscar/oscar.c:4949
-#: ../libpurple/protocols/oscar/oscar.c:5177
-#: ../libpurple/protocols/oscar/oscar.c:5178
-#: ../libpurple/protocols/oscar/oscar.c:5183
+#: ../libpurple/protocols/oscar/oscar.c:4996
+#: ../libpurple/protocols/oscar/oscar.c:4998
+#: ../libpurple/protocols/oscar/oscar.c:5237
+#: ../libpurple/protocols/oscar/oscar.c:5238
+#: ../libpurple/protocols/oscar/oscar.c:5243
 msgid "Orphans"
 msgstr "弌亳�仂��"
 
-#: ../libpurple/protocols/oscar/oscar.c:5095
+#: ../libpurple/protocols/oscar/oscar.c:5153
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -9272,17 +9523,17 @@
 "�亠 �亟舒仍仂�� 亟仂弍舒于亳�� �仂弍亠�亠亟仆亳从舒 %s, �舒从 从舒从 于 �仗亳�从亠 �仂弍亠�亠亟仆亳从仂于 �仍亳�从仂仄 "
 "仄仆仂亞仂 �仂弍亠�亠亟仆亳从仂于. 丕亟舒仍亳�亠 仂亟亳仆 亳 仗仂仗��舒亶�亠�� �仆仂于舒."
 
-#: ../libpurple/protocols/oscar/oscar.c:5095
-#: ../libpurple/protocols/oscar/oscar.c:5110
+#: ../libpurple/protocols/oscar/oscar.c:5153
+#: ../libpurple/protocols/oscar/oscar.c:5168
 msgid "(no name)"
 msgstr "(仆亠� 亳仄亠仆亳)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5109
+#: ../libpurple/protocols/oscar/oscar.c:5167
 #, c-format
 msgid "Could not add the buddy %s for an unknown reason."
 msgstr "�亠 �亟舒仍仂�� 亟仂弍舒于亳�� �仂弍亠�亠亟仆亳从舒 %s 仗仂 仆亠亳亰于亠��仆仂亶 仗�亳�亳仆亠."
 
-#: ../libpurple/protocols/oscar/oscar.c:5226
+#: ../libpurple/protocols/oscar/oscar.c:5301
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -9291,22 +9542,22 @@
 "�仂仍�亰仂于舒�亠仍� %s �舒亰�亠�亳仍 亟仂弍舒于亳�� 亠亞仂 于 于舒� �仗亳�仂从 �仂弍亠�亠亟仆亳从仂于. 丱仂�亳�亠 "
 "亟仂弍舒于亳�� 亠亞仂?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5234
+#: ../libpurple/protocols/oscar/oscar.c:5309
 msgid "Authorization Given"
 msgstr "�于�仂�亳亰舒�亳� 亟舒仆舒"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5307
+#: ../libpurple/protocols/oscar/oscar.c:5382
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "�仂仍�亰仂于舒�亠仍� %s �舒亰�亠�亳仍 亟仂弍舒于亳�� 亠亞仂 于 于舒� �仗亳�仂从 �仂弍亠�亠亟仆亳从仂于."
 
-#: ../libpurple/protocols/oscar/oscar.c:5308
+#: ../libpurple/protocols/oscar/oscar.c:5383
 msgid "Authorization Granted"
 msgstr "�于�仂�亳亰舒�亳� 亟舒仆舒"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5311
+#: ../libpurple/protocols/oscar/oscar.c:5386
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -9317,53 +9568,49 @@
 "�仍亠亟���亠亶 仗�亳�亳仆亠:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5312
+#: ../libpurple/protocols/oscar/oscar.c:5387
 msgid "Authorization Denied"
 msgstr "� 舒于�仂�亳亰舒�亳亳 仂�从舒亰舒仆仂"
 
-#: ../libpurple/protocols/oscar/oscar.c:5348
+#: ../libpurple/protocols/oscar/oscar.c:5423
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "_�弍仄亠仆:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5388
-msgid "Invalid chat name specified."
-msgstr "丕从舒亰舒仆仂 仆亠于亠�仆仂亠 亳仄� �舒�舒."
-
-#: ../libpurple/protocols/oscar/oscar.c:5457
+#: ../libpurple/protocols/oscar/oscar.c:5536
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 "�亰仂弍�舒亢亠仆亳亠 仆亠 弍�仍仂 仂�仗�舒于仍亠仆仂. �� 仆亠 仄仂亢亠�亠 仂�仗�舒于仍��� 亳亰仂弍�舒亢亠仆亳� 于 �舒�舒� "
 "AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:5619
-#: ../libpurple/protocols/oscar/oscar.c:5624
+#: ../libpurple/protocols/oscar/oscar.c:5698
+#: ../libpurple/protocols/oscar/oscar.c:5703
 msgid "Away Message"
 msgstr "弌仂仂弍�亠仆亳亠 仂弍 仂������于亳亳"
 
-#: ../libpurple/protocols/oscar/oscar.c:5624
+#: ../libpurple/protocols/oscar/oscar.c:5703
 msgid "<i>(retrieving)</i>"
 msgstr "<i>(亰舒亞��亰从舒)</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:5824
+#: ../libpurple/protocols/oscar/oscar.c:5903
 msgid "iTunes Music Store Link"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5932
+#: ../libpurple/protocols/oscar/oscar.c:6011
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "�仂仄仄亠仆�舒�亳亶 �仂弍亠�亠亟仆亳从舒 亟仍� %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5933
+#: ../libpurple/protocols/oscar/oscar.c:6012
 msgid "Buddy Comment:"
 msgstr "�仂仄仄亠仆�舒�亳亶 �仂弍亠�亠亟仆亳从舒:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5980
+#: ../libpurple/protocols/oscar/oscar.c:6059
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "�� 于�弍�舒仍亳 仂�从���亳亠 仗��仄仂亞仂 �仂亠亟亳仆亠仆亳� � %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:5984
+#: ../libpurple/protocols/oscar/oscar.c:6063
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
@@ -9371,66 +9618,67 @@
 "丐舒从 从舒从 ��仂 �舒�从�仂亠� 于舒� IP-舒亟�亠�, ��仂 仄仂亢仆仂 ��亳�舒�� �亞�仂亰仂亶 弍亠亰仂仗舒�仆仂��亳. "
 "丱仂�亳�亠 仗�仂亟仂仍亢亳��?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5990
+#: ../libpurple/protocols/oscar/oscar.c:6069
 #: ../libpurple/protocols/oscar/peer.c:1047
 msgid "C_onnect"
 msgstr "_丕��舒仆仂于亳�� �仂亠亟亳仆亠仆亳亠"
 
-#: ../libpurple/protocols/oscar/oscar.c:6025
+#: ../libpurple/protocols/oscar/oscar.c:6104
 msgid "Get AIM Info"
 msgstr "�仂仍��亳�� 亳仆�仂�仄舒�亳� AIM"
 
-#: ../libpurple/protocols/oscar/oscar.c:6031
+#: ../libpurple/protocols/oscar/oscar.c:6110
 msgid "Edit Buddy Comment"
 msgstr "�亰仄亠仆亳�� 从仂仄仄亠仆�舒�亳亶 �仂弍亠�亠亟仆亳从舒"
 
-#: ../libpurple/protocols/oscar/oscar.c:6039
+#: ../libpurple/protocols/oscar/oscar.c:6118
 msgid "Get Status Msg"
 msgstr "�仂仍��亳�� �仂仂弍�亠仆亳亠 仂 ��舒���亠"
 
-#: ../libpurple/protocols/oscar/oscar.c:6052
+#: ../libpurple/protocols/oscar/oscar.c:6131
 msgid "Direct IM"
 msgstr "���仄仂亠 �仂亠亟亳仆亠仆亳亠"
 
-#: ../libpurple/protocols/oscar/oscar.c:6074
+#: ../libpurple/protocols/oscar/oscar.c:6153
 msgid "Re-request Authorization"
 msgstr "�仂于�仂�仆�亶 亰舒仗�仂� 舒于�仂�亳亰舒�亳亳"
 
-#: ../libpurple/protocols/oscar/oscar.c:6133
+#: ../libpurple/protocols/oscar/oscar.c:6212
 msgid "Require authorization"
 msgstr "丐�亠弍仂于舒�� 舒于�仂�亳亰舒�亳�"
 
-#: ../libpurple/protocols/oscar/oscar.c:6136
+#: ../libpurple/protocols/oscar/oscar.c:6215
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "弌�舒��� 仆舒 于亠弍-���舒仆亳�舒� (于�亰�于舒亠� 仗仂�于仍亠仆亳亠 弌����!)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6141
+#: ../libpurple/protocols/oscar/oscar.c:6220
 msgid "ICQ Privacy Options"
 msgstr "�舒�舒仄亠��� 从仂仆�亳亟亠仆�亳舒仍�仆仂��亳 ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:6160
+#: ../libpurple/protocols/oscar/oscar.c:6239
 msgid "The new formatting is invalid."
 msgstr "�仂于仂亠 �仂�仄舒�亳�仂于舒仆亳亠 仆亠亟仂仗���亳仄仂."
 
-#: ../libpurple/protocols/oscar/oscar.c:6161
-msgid "Screen name formatting can change only capitalization and whitespace."
+#: ../libpurple/protocols/oscar/oscar.c:6240
+#, fuzzy
+msgid "Username formatting can change only capitalization and whitespace."
 msgstr ""
 "个仂�仄舒�亳�仂于舒仆亳亠 亳亟亠仆�亳�亳从舒�仂�舒 仗仂仍�亰仂于舒�亠仍� 仄仂亢亠� 于仍亳��� �仂仍�从仂 仆舒 �亠亞亳��� "
 "弍�从于 亳 仗�仂弍亠仍�."
 
-#: ../libpurple/protocols/oscar/oscar.c:6214
+#: ../libpurple/protocols/oscar/oscar.c:6293
 msgid "Change Address To:"
 msgstr "�亰仄亠仆亳�� 舒亟�亠� 仆舒:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6260
+#: ../libpurple/protocols/oscar/oscar.c:6339
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>于� 仆亠 仂亢亳亟舒亠�亠 舒于�仂�亳亰舒�亳�</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6263
+#: ../libpurple/protocols/oscar/oscar.c:6342
 msgid "You are awaiting authorization from the following buddies"
 msgstr "�� 仂亢亳亟舒亠�亠 舒于�仂�亳亰舒�亳� 仂� �仍亠亟���亳� �仂弍亠�亠亟仆亳从仂于"
 
-#: ../libpurple/protocols/oscar/oscar.c:6264
+#: ../libpurple/protocols/oscar/oscar.c:6343
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -9438,76 +9686,70 @@
 "�� 仄仂亢亠�亠 亰舒仗�仂�亳�� 舒于�仂�亳亰舒�亳� 仂� ��亳� �仂弍亠�亠亟仆亳从仂于 仗仂于�仂�仆仂, ��仍从仆�于 仆舒 "
 "仆亳� 仗�舒于仂亶 从仆仂仗从仂亶 仄��亳 亳 于�弍�舒于 \"�仂于�仂�仆�亶 亰舒仗�仂� 舒于�仂�亳亰舒�亳亳\"."
 
-#: ../libpurple/protocols/oscar/oscar.c:6281
+#: ../libpurple/protocols/oscar/oscar.c:6360
 msgid "Find Buddy by E-Mail"
 msgstr "�舒亶�亳 �仂弍亠�亠亟仆亳从舒 仗仂 e-mail"
 
-#: ../libpurple/protocols/oscar/oscar.c:6282
+#: ../libpurple/protocols/oscar/oscar.c:6361
 msgid "Search for a buddy by e-mail address"
 msgstr "��从舒�� �仂弍亠�亠亟仆亳从舒 仗仂 舒亟�亠�� e-mail"
 
-#: ../libpurple/protocols/oscar/oscar.c:6283
+#: ../libpurple/protocols/oscar/oscar.c:6362
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "�于亠亟亳�亠 舒亟�亠� e-mail �仂弍亠�亠亟仆亳从舒, 从仂�仂�仂亞仂 于� 亳�亠�亠."
 
-#: ../libpurple/protocols/oscar/oscar.c:6286
+#: ../libpurple/protocols/oscar/oscar.c:6365
 msgid "_Search"
 msgstr "_��从舒��"
 
-#: ../libpurple/protocols/oscar/oscar.c:6444
+#: ../libpurple/protocols/oscar/oscar.c:6523
 msgid "Set User Info (URL)..."
 msgstr "丕��舒仆仂于亳�� 仗仂仍�亰仂于舒�亠仍��从�� 亳仆�仂�仄舒�亳� (URL)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6455
+#: ../libpurple/protocols/oscar/oscar.c:6534
 msgid "Change Password (URL)"
 msgstr "�亰仄亠仆亳�� 仗舒�仂仍� (URL)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6459
+#: ../libpurple/protocols/oscar/oscar.c:6538
 msgid "Configure IM Forwarding (URL)"
 msgstr "�舒���仂亳�� 仗亠�亠仆舒仗�舒于仍亠仆亳亠 �仂仂弍�亠仆亳亶 (URL)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6469
+#: ../libpurple/protocols/oscar/oscar.c:6548
 msgid "Set Privacy Options..."
 msgstr "丕��舒仆仂于亳�� 仗舒�舒仄亠��� 从仂仆�亳亟亠仆�亳舒仍�仆仂��亳..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6476
+#: ../libpurple/protocols/oscar/oscar.c:6555
 msgid "Confirm Account"
 msgstr "�仂亟�于亠�亟亳�� ����仆�� 亰舒仗亳��"
 
-#: ../libpurple/protocols/oscar/oscar.c:6480
+#: ../libpurple/protocols/oscar/oscar.c:6559
 msgid "Display Currently Registered E-Mail Address"
 msgstr "�仂从舒亰舒�� �亠从��亳亶 亰舒�亠亞亳���亳�仂于舒仆仆�亶 舒亟�亠� e-mail"
 
-#: ../libpurple/protocols/oscar/oscar.c:6484
+#: ../libpurple/protocols/oscar/oscar.c:6563
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "�亰仄亠仆亳�� �亠从��亳亶 亰舒�亠亞亳���亳�仂于舒仆仆�亶 舒亟�亠� e-mail..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6491
+#: ../libpurple/protocols/oscar/oscar.c:6570
 msgid "Show Buddies Awaiting Authorization"
 msgstr "�仂从舒亰舒�� �仂弍亠�亠亟仆亳从仂于 弍亠亰 舒于�仂�亳亰舒�亳亳"
 
-#: ../libpurple/protocols/oscar/oscar.c:6497
+#: ../libpurple/protocols/oscar/oscar.c:6576
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "��从舒�� �仂弍亠�亠亟仆亳从舒 仗仂 舒亟�亠�� e-mail..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6502
+#: ../libpurple/protocols/oscar/oscar.c:6581
 msgid "Search for Buddy by Information"
 msgstr "��从舒�� �仂弍亠�亠亟仆亳从舒 仗仂 亳仆�仂�仄舒�亳亳"
 
-#: ../libpurple/protocols/oscar/oscar.c:6570
-msgid "Use recent buddies group"
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:6573
-msgid "Show how long you have been idle"
-msgstr "�仂从舒亰�于舒��, 从舒从 亟仂仍亞仂 于� 弍亠亰亟亠亶��于仂于舒仍亳"
-
-#: ../libpurple/protocols/oscar/oscar.c:6728
-msgid ""
-"Always use ICQ proxy server for file transfers\n"
-"(slower, but does not reveal your IP address)"
+#: ../libpurple/protocols/oscar/oscar.c:6769
+#, fuzzy
+msgid ""
+"Always use AIM/ICQ proxy server for\n"
+"file transfers and direct IM (slower,\n"
+"but does not reveal your IP address)"
 msgstr ""
 "��亠亞亟舒 亳�仗仂仍�亰仂于舒�� 仗�仂从�亳-�亠�于亠� ICQ 亟仍� 仗亠�亠亟舒�亳 �舒亶仍仂于\n"
 "(仄亠亟仍亠仆仆亠亠, 仆仂 仆亠 �舒�从��于舒亠� 于舒� IP-舒亟�亠�)"
@@ -9717,7 +9959,7 @@
 msgstr ""
 
 #: ../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"
@@ -9732,7 +9974,7 @@
 
 #. 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 "�亰于亳仆亳�亠, 于� 仆亠 于 仄仂�仄 于从��亠..."
 
@@ -9771,7 +10013,7 @@
 #. 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 "��仗�舒于亳��"
 
@@ -9827,7 +10069,7 @@
 
 #: ../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"
@@ -9839,16 +10081,16 @@
 #: ../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 ""
 
 #: ../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 "丕亟仂于仍亠�于仂�亳��"
 
@@ -9936,32 +10178,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
 msgid "Do you want to approve the request?"
 msgstr "丱仂�亳�亠 �亟仂于仍亠�于仂�亳�� 亰舒仗�仂�?"
 
-#: ../libpurple/protocols/qq/group_opt.c:137
+#: ../libpurple/protocols/qq/group_opt.c:113
 msgid "Enter your reason:"
 msgstr "�于亠亟亳�亠 仗�亳�亳仆�:"
 
-#: ../libpurple/protocols/qq/group_opt.c:235
+#: ../libpurple/protocols/qq/group_opt.c:211
 msgid "You have successfully modified Qun member"
 msgstr ""
 
-#: ../libpurple/protocols/qq/group_opt.c:305
+#: ../libpurple/protocols/qq/group_opt.c:281
 msgid "You have successfully modified Qun information"
 msgstr ""
 
-#: ../libpurple/protocols/qq/group_opt.c:392
+#: ../libpurple/protocols/qq/group_opt.c:368
 msgid "You have successfully created a Qun"
 msgstr ""
 
-#: ../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 ""
 
-#: ../libpurple/protocols/qq/group_opt.c:398
+#: ../libpurple/protocols/qq/group_opt.c:374
 msgid "Setup"
 msgstr ""
 
@@ -9981,14 +10223,21 @@
 msgid "Error requesting login token"
 msgstr "��亳弍从舒 亰舒仗�仂�舒 仄舒�从亠�舒 于�仂亟舒"
 
-#: ../libpurple/protocols/qq/login_logout.c:489
-msgid "Unable to login, check debug log"
-msgstr ""
+#: ../libpurple/protocols/qq/login_logout.c:490
+#, fuzzy
+msgid "Unable to login. Check debug log."
+msgstr "�亠 �亟舒���� 亰舒亞��亰亳�� 仄仂亟�仍�"
+
+#: ../libpurple/protocols/qq/login_logout.c:493
+#, fuzzy
+msgid "Unable to login"
+msgstr "�亠 �亟舒���� 亰舒亞��亰亳�� 仄仂亟�仍�"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
 #: ../libpurple/protocols/qq/qq.c:140 ../libpurple/protocols/toc/toc.c:173
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:109
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:189
+#: ../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 "�亠 �亟舒���� ���舒仆仂于亳�� �仂亠亟亳仆亠仆亳亠."
@@ -10127,48 +10376,48 @@
 msgid "Login failed, no reply"
 msgstr "�亠 �亟舒仍仂�� 于仂亶�亳 于 �亠��, 仆亠� 仂�于亠�舒"
 
-#: ../libpurple/protocols/qq/sys_msg.c:110
+#: ../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
+#: ../libpurple/protocols/qq/sys_msg.c:179
 #, c-format
 msgid "%s has added you [%s] to his or her buddy list"
 msgstr "%s 亟仂弍舒于亳仍 于舒� [%s] 于 �于仂亶 �仗亳�仂从 �仂弍亠�亠亟仆亳从仂于"
 
-#: ../libpurple/protocols/qq/sys_msg.c:192
+#: ../libpurple/protocols/qq/sys_msg.c:195
 #, c-format
 msgid "User %s rejected your request"
 msgstr "�仂仍�亰仂于舒�亠仍� %s 仂�于亠�亞 于舒� 亰舒仗�仂�"
 
-#: ../libpurple/protocols/qq/sys_msg.c:212
+#: ../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
+#: ../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 仂������于�亠� 于 �仗亳�从亠 �仂弍亠�亠亟仆亳从仂于"
@@ -10246,92 +10495,92 @@
 msgid "Sametime Administrator Announcement"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:1734
+#: ../libpurple/protocols/sametime/sametime.c:1736
 msgid "Connection reset"
 msgstr "弌弍�仂� �仂亠亟亳仆亠仆亳�"
 
-#: ../libpurple/protocols/sametime/sametime.c:1746
+#: ../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:1771
-#: ../libpurple/protocols/sametime/sametime.c:3772
+#: ../libpurple/protocols/sametime/sametime.c:1773
+#: ../libpurple/protocols/sametime/sametime.c:3780
 msgid "Unable to connect to host"
 msgstr "�亠 �亟舒���� �仂亠亟亳仆亳���� � �亰仍仂仄"
 
-#: ../libpurple/protocols/sametime/sametime.c:1812
+#: ../libpurple/protocols/sametime/sametime.c:1814
 #, c-format
 msgid "Announcement from %s"
 msgstr "�弍��于仍亠仆亳亠 仂� %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:1986
+#: ../libpurple/protocols/sametime/sametime.c:1988
 msgid "Conference Closed"
 msgstr "�仂仆�亠�亠仆�亳� 亰舒从���舒"
 
-#: ../libpurple/protocols/sametime/sametime.c:2445
+#: ../libpurple/protocols/sametime/sametime.c:2453
 msgid "Unable to send message: "
 msgstr "�亠 �亟舒���� 仂�仗�舒于亳�� �仂仂弍�亠仆亳亠: "
 
-#: ../libpurple/protocols/sametime/sametime.c:3001
+#: ../libpurple/protocols/sametime/sametime.c:3009
 msgid "Place Closed"
 msgstr "�亠��仂 亰舒从���仂"
 
-#: ../libpurple/protocols/sametime/sametime.c:3271
+#: ../libpurple/protocols/sametime/sametime.c:3279
 msgid "Microphone"
 msgstr "�亳从�仂�仂仆"
 
-#: ../libpurple/protocols/sametime/sametime.c:3272
+#: ../libpurple/protocols/sametime/sametime.c:3280
 msgid "Speakers"
 msgstr "�仂仍仂仆从亳"
 
-#: ../libpurple/protocols/sametime/sametime.c:3273
+#: ../libpurple/protocols/sametime/sametime.c:3281
 msgid "Video Camera"
 msgstr "�亳亟亠仂从舒仄亠�舒"
 
-#: ../libpurple/protocols/sametime/sametime.c:3311
-#: ../libpurple/protocols/sametime/sametime.c:4191
+#: ../libpurple/protocols/sametime/sametime.c:3319
+#: ../libpurple/protocols/sametime/sametime.c:4199
 msgid "Supports"
 msgstr "�仂亟亟亠�亢亳于舒亠���"
 
-#: ../libpurple/protocols/sametime/sametime.c:3316
-#: ../libpurple/protocols/sametime/sametime.c:4165
+#: ../libpurple/protocols/sametime/sametime.c:3324
+#: ../libpurple/protocols/sametime/sametime.c:4173
 msgid "External User"
 msgstr "�仆亠�仆亳亶 仗仂仍�亰仂于舒�亠仍�"
 
-#: ../libpurple/protocols/sametime/sametime.c:3422
+#: ../libpurple/protocols/sametime/sametime.c:3430
 msgid "Create conference with user"
 msgstr "弌仂亰亟舒�� 从仂仆�亠�亠仆�亳� � 仗仂仍�亰仂于舒�亠仍亠仄"
 
-#: ../libpurple/protocols/sametime/sametime.c:3423
+#: ../libpurple/protocols/sametime/sametime.c:3431
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
 "sent to %s"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3427
+#: ../libpurple/protocols/sametime/sametime.c:3435
 msgid "New Conference"
 msgstr "�仂于舒� 从仂仆�亠�亠仆�亳�"
 
-#: ../libpurple/protocols/sametime/sametime.c:3429
+#: ../libpurple/protocols/sametime/sametime.c:3437
 msgid "Create"
 msgstr "弌仂亰亟舒��"
 
-#: ../libpurple/protocols/sametime/sametime.c:3494
+#: ../libpurple/protocols/sametime/sametime.c:3502
 msgid "Available Conferences"
 msgstr "�仂���仗仆�亠 从仂仆�亠�亠仆�亳亳"
 
-#: ../libpurple/protocols/sametime/sametime.c:3500
+#: ../libpurple/protocols/sametime/sametime.c:3508
 msgid "Create New Conference..."
 msgstr "弌仂亰亟舒�� 仆仂于�� 从仂仆�亠�亠仆�亳�..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3507
+#: ../libpurple/protocols/sametime/sametime.c:3515
 msgid "Invite user to a conference"
 msgstr "��亳亞仍舒�亳�� 仗仂仍�亰仂于舒�亠仍� 于 从仂仆�亠�亠仆�亳�"
 
-#: ../libpurple/protocols/sametime/sametime.c:3508
+#: ../libpurple/protocols/sametime/sametime.c:3516
 #, c-format
 msgid ""
 "Select a conference from the list below to send an invite to user %s. Select "
@@ -10339,69 +10588,69 @@
 "this user to."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3513
+#: ../libpurple/protocols/sametime/sametime.c:3521
 msgid "Invite to Conference"
 msgstr "��亳亞仍舒�亳�� 于 从仂仆�亠�亠仆�亳�"
 
-#: ../libpurple/protocols/sametime/sametime.c:3604
+#: ../libpurple/protocols/sametime/sametime.c:3612
 msgid "Invite to Conference..."
 msgstr "��亳亞仍舒�亳�� 于 从仂仆�亠�亠仆�亳�..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3609
+#: ../libpurple/protocols/sametime/sametime.c:3617
 msgid "Send TEST Announcement"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3628 ../pidgin/gtkconv.c:4437
+#: ../libpurple/protocols/sametime/sametime.c:3636 ../pidgin/gtkconv.c:4426
 msgid "Topic:"
 msgstr "丐亠仄舒:"
 
-#: ../libpurple/protocols/sametime/sametime.c:3656
+#: ../libpurple/protocols/sametime/sametime.c:3664
 msgid "No Sametime Community Server specified"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3681
+#: ../libpurple/protocols/sametime/sametime.c:3689
 #, c-format
 msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
 "Please enter one below to continue logging in."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3686
+#: ../libpurple/protocols/sametime/sametime.c:3694
 msgid "Meanwhile Connection Setup"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3687
+#: ../libpurple/protocols/sametime/sametime.c:3695
 msgid "No Sametime Community Server Specified"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3689
+#: ../libpurple/protocols/sametime/sametime.c:3697
 msgid "Connect"
 msgstr "丕��舒仆仂于亳�� �仂亠亟亳仆亠仆亳亠"
 
-#: ../libpurple/protocols/sametime/sametime.c:4181
+#: ../libpurple/protocols/sametime/sametime.c:4189
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "�亠亳亰于亠��仆仂 (0x%04x)<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:4183
+#: ../libpurple/protocols/sametime/sametime.c:4191
 msgid "Last Known Client"
 msgstr "�仂�仍亠亟仆亳亶 亳亰于亠��仆�亶 从仍亳亠仆�"
 
-#: ../libpurple/protocols/sametime/sametime.c:4347
-#: ../libpurple/protocols/sametime/sametime.c:5552
+#: ../libpurple/protocols/sametime/sametime.c:4355
+#: ../libpurple/protocols/sametime/sametime.c:5560
 msgid "User Name"
 msgstr "�仄� 仗仂仍�亰仂于舒�亠仍�"
 
-#: ../libpurple/protocols/sametime/sametime.c:4350
-#: ../libpurple/protocols/sametime/sametime.c:5555
+#: ../libpurple/protocols/sametime/sametime.c:4358
+#: ../libpurple/protocols/sametime/sametime.c:5563
 msgid "Sametime ID"
 msgstr "Sametime ID"
 
-#: ../libpurple/protocols/sametime/sametime.c:4374
+#: ../libpurple/protocols/sametime/sametime.c:4382
 msgid "An ambiguous user ID was entered"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:4375
+#: ../libpurple/protocols/sametime/sametime.c:4383
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
@@ -10411,22 +10660,22 @@
 "��弍亠�亳�亠 亳亰 �仗亳�从舒 仆亳亢亠 仂亟仆仂亞仂 亳亰 仆亳� 亟仍� 亟仂弍舒于仍亠仆亳� 亠亞仂 于 �仗亳�仂从 "
 "�仂弍亠�亠亟仆亳从仂于."
 
-#: ../libpurple/protocols/sametime/sametime.c:4380
+#: ../libpurple/protocols/sametime/sametime.c:4388
 msgid "Select User"
 msgstr "��弍亠�亳�亠 仗仂仍�亰仂于舒�亠仍�"
 
-#: ../libpurple/protocols/sametime/sametime.c:4464
+#: ../libpurple/protocols/sametime/sametime.c:4472
 msgid "Unable to add user: user not found"
 msgstr "�亠 �亟舒���� 亟仂弍舒于亳�� 仗仂仍�亰仂于舒�亠仍�: 仗仂仍�亰仂于舒�亠仍� 仆亠 仆舒亶亟亠仆"
 
-#: ../libpurple/protocols/sametime/sametime.c:4466
+#: ../libpurple/protocols/sametime/sametime.c:4474
 #, c-format
 msgid ""
 "The identifier '%s' did not match any users in your Sametime community. This "
 "entry has been removed from your buddy list."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5057
+#: ../libpurple/protocols/sametime/sametime.c:5065
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -10435,63 +10684,63 @@
 "��亳弍从舒 ��亠仆亳� �舒亶仍舒 %s: \n"
 "%s\n"
 
-#: ../libpurple/protocols/sametime/sametime.c:5192
+#: ../libpurple/protocols/sametime/sametime.c:5200
 msgid "Remotely Stored Buddy List"
 msgstr "弌仂��舒仆�亠仄�亶 �亟舒仍�仆仆仂 �仗亳�仂从 �仂弍亠�亠亟仆亳从仂于"
 
-#: ../libpurple/protocols/sametime/sametime.c:5197
+#: ../libpurple/protocols/sametime/sametime.c:5205
 msgid "Buddy List Storage Mode"
 msgstr "�亠亢亳仄 ��舒仆亠仆亳� �仗亳�从舒 �仂弍亠�亠亟仆亳从仂于"
 
-#: ../libpurple/protocols/sametime/sametime.c:5200
+#: ../libpurple/protocols/sametime/sametime.c:5208
 msgid "Local Buddy List Only"
 msgstr "丐仂仍�从仂 仍仂从舒仍�仆�亶 �仗亳�仂从 �仂弍亠�亠亟仆亳从仂于"
 
-#: ../libpurple/protocols/sametime/sametime.c:5202
+#: ../libpurple/protocols/sametime/sametime.c:5210
 msgid "Merge List from Server"
 msgstr "�弍�亠亟亳仆亳�� �仂 �仗亳�从仂仄 � �亠�于亠�舒"
 
-#: ../libpurple/protocols/sametime/sametime.c:5204
+#: ../libpurple/protocols/sametime/sametime.c:5212
 msgid "Merge and Save List to Server"
 msgstr "�弍�亠亟亳仆亳�� 亳 �仂��舒仆亳�� �仗亳�仂从 仆舒 �亠�于亠�亠"
 
-#: ../libpurple/protocols/sametime/sametime.c:5206
+#: ../libpurple/protocols/sametime/sametime.c:5214
 msgid "Synchronize List with Server"
 msgstr "弌亳仆��仂仆亳亰亳�仂于舒�� �仂 �仗亳�从仂仄 � �亠�于亠�舒"
 
-#: ../libpurple/protocols/sametime/sametime.c:5261
+#: ../libpurple/protocols/sametime/sametime.c:5269
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "�仄仗仂��亳�仂于舒�� �仗亳�仂从 Sametime 亟仍� ����仆仂亶 亰舒仗亳�亳 %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5301
+#: ../libpurple/protocols/sametime/sametime.c:5309
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "亅从�仗仂��亳�仂于舒�� �仗亳�仂从 Sametime 亟仍� ����仆仂亶 亰舒仗亳�亳 %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5355
+#: ../libpurple/protocols/sametime/sametime.c:5363
 msgid "Unable to add group: group exists"
 msgstr "�亠 �亟舒���� 亟仂弍舒于亳�� 亞��仗仗�: 亞��仗仗舒 ���亠��于�亠�"
 
-#: ../libpurple/protocols/sametime/sametime.c:5356
+#: ../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:5359
-#: ../libpurple/protocols/sametime/sametime.c:5489
+#: ../libpurple/protocols/sametime/sametime.c:5367
+#: ../libpurple/protocols/sametime/sametime.c:5497
 msgid "Unable to add group"
 msgstr "�亠 �亟舒���� 亟仂弍舒于亳�� 亞��仗仗�"
 
-#: ../libpurple/protocols/sametime/sametime.c:5418
+#: ../libpurple/protocols/sametime/sametime.c:5426
 msgid "Possible Matches"
 msgstr "�亠�仂��仆�亠 �仂于仗舒亟亠仆亳�"
 
-#: ../libpurple/protocols/sametime/sametime.c:5434
+#: ../libpurple/protocols/sametime/sametime.c:5442
 msgid "Notes Address Book group results"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5435
+#: ../libpurple/protocols/sametime/sametime.c:5443
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -10499,37 +10748,37 @@
 "to your buddy list."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5440
+#: ../libpurple/protocols/sametime/sametime.c:5448
 msgid "Select Notes Address Book"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5483
+#: ../libpurple/protocols/sametime/sametime.c:5491
 msgid "Unable to add group: group not found"
 msgstr "�亠 �亟舒���� 亟仂弍舒于亳�� 亞��仗仗�: 亞��仗仗舒 仆亠 仆舒亶亟亠仆舒"
 
-#: ../libpurple/protocols/sametime/sametime.c:5485
+#: ../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:5526
+#: ../libpurple/protocols/sametime/sametime.c:5534
 msgid "Notes Address Book Group"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5527
+#: ../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:5576
+#: ../libpurple/protocols/sametime/sametime.c:5584
 #, c-format
 msgid "Search results for '%s'"
 msgstr "�亠亰�仍��舒�� 仗仂亳�从舒 亟仍� '%s'"
 
-#: ../libpurple/protocols/sametime/sametime.c:5577
+#: ../libpurple/protocols/sametime/sametime.c:5585
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -10540,59 +10789,59 @@
 "仄仂亢亠�亠 亟仂弍舒于亳�� ��亳� 仗仂仍�亰仂于舒�亠仍亠亶 于 �仗亳�仂从 �仂弍亠�亠亟仆亳从仂于 亳仍亳 仂�仗�舒于亳�� 亳仄 "
 "�仂仂弍�亠仆亳� � 仗仂仄仂��� 从仆仂仗仂从 亟亠亶��于亳� 仆亳亢亠."
 
-#: ../libpurple/protocols/sametime/sametime.c:5584 ../pidgin/gtknotify.c:763
+#: ../libpurple/protocols/sametime/sametime.c:5592 ../pidgin/gtknotify.c:770
 msgid "Search Results"
 msgstr "�亠亰�仍��舒�� 仗仂亳�从舒"
 
-#: ../libpurple/protocols/sametime/sametime.c:5609
+#: ../libpurple/protocols/sametime/sametime.c:5617
 msgid "No matches"
 msgstr "�亠� �仂于仗舒亟亠仆亳亶"
 
-#: ../libpurple/protocols/sametime/sametime.c:5610
+#: ../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:5614
+#: ../libpurple/protocols/sametime/sametime.c:5622
 msgid "No Matches"
 msgstr "�亠� �仂于仗舒亟亠仆亳亶"
 
-#: ../libpurple/protocols/sametime/sametime.c:5651
+#: ../libpurple/protocols/sametime/sametime.c:5659
 msgid "Search for a user"
 msgstr "��从舒�� 仗仂仍�亰仂于舒�亠仍�"
 
-#: ../libpurple/protocols/sametime/sametime.c:5652
+#: ../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."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5655
+#: ../libpurple/protocols/sametime/sametime.c:5663
 msgid "User Search"
 msgstr "�仂亳�从 仗仂仍�亰仂于舒�亠仍亠亶"
 
-#: ../libpurple/protocols/sametime/sametime.c:5668
+#: ../libpurple/protocols/sametime/sametime.c:5676
 msgid "Import Sametime List..."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5672
-msgid "Export Sametime List..."
-msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:5676
-msgid "Add Notes Address Book Group..."
-msgstr ""
-
 #: ../libpurple/protocols/sametime/sametime.c:5680
+msgid "Export Sametime List..."
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:5684
+msgid "Add Notes Address Book Group..."
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:5688
 msgid "User Search..."
 msgstr "�仂亳�从 仗仂仍�亰仂于舒�亠仍亠亶..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5786
+#: ../libpurple/protocols/sametime/sametime.c:5794
 msgid "Force login (ignore server redirects)"
 msgstr ""
 
 #. pretend to be Sametime Connect
-#: ../libpurple/protocols/sametime/sametime.c:5796
+#: ../libpurple/protocols/sametime/sametime.c:5804
 msgid "Hide client identity"
 msgstr ""
 
@@ -10793,7 +11042,7 @@
 "You cannot receive buddy notifications until you import his/her public key.  "
 "You can use the Get Public Key command to get the public key."
 msgstr ""
-"�� 仆亠 仄仂亢亠�亠 仗�亳仆亳仄舒�� �于亠亟仂仄仍亠仆亳� �仂弍亠�亠亟仆亳从舒, 仗仂从舒 仆亠 亳仄仗仂��亳��亠�亠 亠亞仂 "
+"�� 仆亠 仄仂亢亠�亠 仗仂仍��舒�� �于亠亟仂仄仍亠仆亳� �仂弍亠�亠亟仆亳从舒, 仗仂从舒 仆亠 亳仄仗仂��亳��亠�亠 亠亞仂 "
 "仗�弍仍亳�仆�亶 从仍��. �� 仄仂亢亠�亠 亳�仗仂仍�亰仂于舒�� 从仂仄舒仆亟� \"�仂仍��亳�� 仗�弍仍亳�仆�亶 从仍��\" "
 "亟仍� 仗仂仍��亠仆亳� 仗�弍仍亳�仆仂亞仂 从仍��舒."
 
@@ -10879,98 +11128,98 @@
 
 #: ../libpurple/protocols/silc/buddy.c:1496
 #: ../libpurple/protocols/silc/silc.c:886
-#: ../libpurple/protocols/silc/util.c:522
+#: ../libpurple/protocols/silc/util.c:525
 #: ../libpurple/protocols/silc10/buddy.c:1496
-#: ../libpurple/protocols/silc10/silc.c:654
-#: ../libpurple/protocols/silc10/util.c:512
+#: ../libpurple/protocols/silc10/silc.c:660
+#: ../libpurple/protocols/silc10/util.c:515
 msgid "Happy"
 msgstr "弌�舒��仍亳于�亶"
 
 #: ../libpurple/protocols/silc/buddy.c:1498
 #: ../libpurple/protocols/silc/silc.c:888
-#: ../libpurple/protocols/silc/util.c:524
+#: ../libpurple/protocols/silc/util.c:527
 #: ../libpurple/protocols/silc10/buddy.c:1498
-#: ../libpurple/protocols/silc10/silc.c:656
-#: ../libpurple/protocols/silc10/util.c:514
+#: ../libpurple/protocols/silc10/silc.c:662
+#: ../libpurple/protocols/silc10/util.c:517
 msgid "Sad"
 msgstr "�亠�舒仍�仆�亶"
 
 #: ../libpurple/protocols/silc/buddy.c:1500
 #: ../libpurple/protocols/silc/silc.c:890
-#: ../libpurple/protocols/silc/util.c:526
+#: ../libpurple/protocols/silc/util.c:529
 #: ../libpurple/protocols/silc10/buddy.c:1500
-#: ../libpurple/protocols/silc10/silc.c:658
-#: ../libpurple/protocols/silc10/util.c:516
+#: ../libpurple/protocols/silc10/silc.c:664
+#: ../libpurple/protocols/silc10/util.c:519
 msgid "Angry"
 msgstr "�舒��亠�亢亠仆仆�亶"
 
 #: ../libpurple/protocols/silc/buddy.c:1502
 #: ../libpurple/protocols/silc/silc.c:892
-#: ../libpurple/protocols/silc/util.c:528
+#: ../libpurple/protocols/silc/util.c:531
 #: ../libpurple/protocols/silc10/buddy.c:1502
-#: ../libpurple/protocols/silc10/silc.c:660
-#: ../libpurple/protocols/silc10/util.c:518
+#: ../libpurple/protocols/silc10/silc.c:666
+#: ../libpurple/protocols/silc10/util.c:521
 msgid "Jealous"
 msgstr "�亠于仆���亳亶"
 
 #: ../libpurple/protocols/silc/buddy.c:1504
 #: ../libpurple/protocols/silc/silc.c:894
-#: ../libpurple/protocols/silc/util.c:530
+#: ../libpurple/protocols/silc/util.c:533
 #: ../libpurple/protocols/silc10/buddy.c:1504
-#: ../libpurple/protocols/silc10/silc.c:662
-#: ../libpurple/protocols/silc10/util.c:520
+#: ../libpurple/protocols/silc10/silc.c:668
+#: ../libpurple/protocols/silc10/util.c:523
 msgid "Ashamed"
 msgstr "弌��亟��亳亶��"
 
 #: ../libpurple/protocols/silc/buddy.c:1506
 #: ../libpurple/protocols/silc/silc.c:896
-#: ../libpurple/protocols/silc/util.c:532
+#: ../libpurple/protocols/silc/util.c:535
 #: ../libpurple/protocols/silc10/buddy.c:1506
-#: ../libpurple/protocols/silc10/silc.c:664
-#: ../libpurple/protocols/silc10/util.c:522
+#: ../libpurple/protocols/silc10/silc.c:670
+#: ../libpurple/protocols/silc10/util.c:525
 msgid "Invincible"
 msgstr "�亠仗仂弍亠亟亳仄�亶"
 
 #: ../libpurple/protocols/silc/buddy.c:1508
-#: ../libpurple/protocols/silc/util.c:534
+#: ../libpurple/protocols/silc/util.c:537
 #: ../libpurple/protocols/silc10/buddy.c:1508
-#: ../libpurple/protocols/silc10/util.c:524
+#: ../libpurple/protocols/silc10/util.c:527
 msgid "In Love"
 msgstr "�仍�弍仍�仆仆�亶"
 
 #: ../libpurple/protocols/silc/buddy.c:1510
 #: ../libpurple/protocols/silc/silc.c:900
-#: ../libpurple/protocols/silc/util.c:536
+#: ../libpurple/protocols/silc/util.c:539
 #: ../libpurple/protocols/silc10/buddy.c:1510
-#: ../libpurple/protocols/silc10/silc.c:668
-#: ../libpurple/protocols/silc10/util.c:526
+#: ../libpurple/protocols/silc10/silc.c:674
+#: ../libpurple/protocols/silc10/util.c:529
 msgid "Sleepy"
 msgstr "弌仂仆仆�亶"
 
 #: ../libpurple/protocols/silc/buddy.c:1512
 #: ../libpurple/protocols/silc/silc.c:902
-#: ../libpurple/protocols/silc/util.c:538
+#: ../libpurple/protocols/silc/util.c:541
 #: ../libpurple/protocols/silc10/buddy.c:1512
-#: ../libpurple/protocols/silc10/silc.c:670
-#: ../libpurple/protocols/silc10/util.c:528
+#: ../libpurple/protocols/silc10/silc.c:676
+#: ../libpurple/protocols/silc10/util.c:531
 msgid "Bored"
 msgstr "弌从��舒��亳亶"
 
 #: ../libpurple/protocols/silc/buddy.c:1514
 #: ../libpurple/protocols/silc/silc.c:904
-#: ../libpurple/protocols/silc/util.c:540
+#: ../libpurple/protocols/silc/util.c:543
 #: ../libpurple/protocols/silc10/buddy.c:1514
-#: ../libpurple/protocols/silc10/silc.c:672
-#: ../libpurple/protocols/silc10/util.c:530
+#: ../libpurple/protocols/silc10/silc.c:678
+#: ../libpurple/protocols/silc10/util.c:533
 msgid "Excited"
 msgstr "�仂亰弍�亢亟�仆仆�亶"
 
 #: ../libpurple/protocols/silc/buddy.c:1516
 #: ../libpurple/protocols/silc/silc.c:906
-#: ../libpurple/protocols/silc/util.c:542
+#: ../libpurple/protocols/silc/util.c:545
 #: ../libpurple/protocols/silc10/buddy.c:1516
-#: ../libpurple/protocols/silc10/silc.c:674
-#: ../libpurple/protocols/silc10/util.c:532
+#: ../libpurple/protocols/silc10/silc.c:680
+#: ../libpurple/protocols/silc10/util.c:535
 msgid "Anxious"
 msgstr "�亰舒弍仂�亠仆仆�亶"
 
@@ -11006,8 +11255,8 @@
 #: ../libpurple/protocols/silc/ops.c:1239
 #: ../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 "丼舒�仂于仂亶 仗仂��"
 
@@ -11191,8 +11440,8 @@
 #: ../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 "�舒�仂仍�仆舒� ��舒亰舒"
 
@@ -11299,21 +11548,21 @@
 #: ../libpurple/protocols/silc/chat.c:1245
 #: ../libpurple/protocols/silc/silc.c:1360
 #: ../libpurple/protocols/silc10/chat.c:1299
-#: ../libpurple/protocols/silc10/silc.c:1140
+#: ../libpurple/protocols/silc10/silc.c:1143
 msgid "Call Command"
 msgstr "��亰于舒�� 从仂仄舒仆亟�"
 
 #: ../libpurple/protocols/silc/chat.c:1245
 #: ../libpurple/protocols/silc/silc.c:1361
 #: ../libpurple/protocols/silc10/chat.c:1299
-#: ../libpurple/protocols/silc10/silc.c:1140
+#: ../libpurple/protocols/silc10/silc.c:1143
 msgid "Cannot call command"
 msgstr "�亠 �亟舒���� 于�亰于舒�� 从仂仄舒仆亟�"
 
 #: ../libpurple/protocols/silc/chat.c:1246
 #: ../libpurple/protocols/silc/silc.c:1362
 #: ../libpurple/protocols/silc10/chat.c:1300
-#: ../libpurple/protocols/silc10/silc.c:1141
+#: ../libpurple/protocols/silc10/silc.c:1144
 msgid "Unknown command"
 msgstr "�亠亳亰于亠��仆舒� 从仂仄舒仆亟舒"
 
@@ -11473,7 +11722,7 @@
 #: ../libpurple/protocols/silc/ops.c:1018
 #: ../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 "��亞舒仆亳亰舒�亳�"
 
@@ -11508,7 +11757,7 @@
 #: ../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 "�舒��仂��亠亠 亳仄�"
 
@@ -11539,7 +11788,7 @@
 #: ../libpurple/protocols/silc/ops.c:1373
 #: ../libpurple/protocols/silc/silc.c:1220
 #: ../libpurple/protocols/silc10/ops.c:1371
-#: ../libpurple/protocols/silc10/silc.c:991
+#: ../libpurple/protocols/silc10/silc.c:994
 msgid "Detach From Server"
 msgstr "�舒亰仂�于舒�� �仂亠亟亳仆亠仆亳亠 � �亠�于亠�仂仄"
 
@@ -11652,24 +11901,24 @@
 #: ../libpurple/protocols/silc/ops.c:1728
 #: ../libpurple/protocols/silc/ops.c:1779
 #: ../libpurple/protocols/silc/silc.c:385
-#: ../libpurple/protocols/silc10/ops.c:1811
-#: ../libpurple/protocols/silc10/ops.c:1858
-#: ../libpurple/protocols/silc10/silc.c:190
+#: ../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:1730
-#: ../libpurple/protocols/silc10/ops.c:1813
+#: ../libpurple/protocols/silc10/ops.c:1819
 msgid "Authenticating connection"
 msgstr "���亠仆�亳�亳从舒�亳� �仂亠亟亳仆亠仆亳�"
 
 #: ../libpurple/protocols/silc/ops.c:1781
-#: ../libpurple/protocols/silc10/ops.c:1860
+#: ../libpurple/protocols/silc10/ops.c:1866
 msgid "Verifying server public key"
 msgstr "��仂于亠�从舒 仗�弍仍亳�仆仂亞仂 从仍��舒 �亠�于亠�舒"
 
 #: ../libpurple/protocols/silc/ops.c:1818
-#: ../libpurple/protocols/silc10/ops.c:1902
+#: ../libpurple/protocols/silc10/ops.c:1908
 msgid "Passphrase required"
 msgstr "丐�亠弍�亠��� 仗舒�仂仍�仆舒� ��舒亰舒"
 
@@ -11711,22 +11960,22 @@
 msgstr "�亠仗仂亟亟亠�亢亳于舒亠仄�亶 �亳仗 仗�弍仍亳�仆仂亞仂 从仍��舒"
 
 #: ../libpurple/protocols/silc/silc.c:319
-#: ../libpurple/protocols/silc10/ops.c:1749
+#: ../libpurple/protocols/silc10/ops.c:1755
 msgid "Disconnected by server"
 msgstr "弌仂亠亟亳仆亠仆亳亠 �舒亰仂�于舒仆仂 �亠�于亠�仂仄"
 
 #: ../libpurple/protocols/silc/silc.c:327
-#: ../libpurple/protocols/silc10/ops.c:1700
+#: ../libpurple/protocols/silc10/ops.c:1701
 msgid "Error during connecting to SILC Server"
 msgstr "��亳弍从舒 于仂 于�亠仄� �仂亠亟亳仆亠仆亳� � �亠�于亠�仂仄 SILC"
 
 #: ../libpurple/protocols/silc/silc.c:333
-#: ../libpurple/protocols/silc10/ops.c:1705
+#: ../libpurple/protocols/silc10/ops.c:1707
 msgid "Key Exchange failed"
 msgstr "�亠 �亟舒仍仂�� 于�仗仂仍仆亳�� 仂弍仄亠仆 从仍��舒仄亳"
 
 #: ../libpurple/protocols/silc/silc.c:343
-#: ../libpurple/protocols/silc10/ops.c:1714
+#: ../libpurple/protocols/silc10/ops.c:1718
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
@@ -11735,62 +11984,64 @@
 
 #: ../libpurple/protocols/silc/silc.c:373
 #: ../libpurple/protocols/silc/silc.c:420
-#: ../libpurple/protocols/silc10/silc.c:161
+#: ../libpurple/protocols/silc10/silc.c:163
 msgid "Connection failed"
 msgstr "�亠 �亟舒仍仂�� ���舒仆仂于亳�� �仂亠亟亳仆亠仆亳亠"
 
 #: ../libpurple/protocols/silc/silc.c:388
-#: ../libpurple/protocols/silc10/silc.c:193
+#: ../libpurple/protocols/silc10/silc.c:196
 msgid "Performing key exchange"
 msgstr "��仗仂仍仆亠仆亳亠 仂弍仄亠仆舒 从仍��舒仄亳"
 
 #. Progress
 #: ../libpurple/protocols/silc/silc.c:445
-#: ../libpurple/protocols/silc10/silc.c:325
+#: ../libpurple/protocols/silc10/silc.c:329
 msgid "Connecting to SILC Server"
 msgstr "弌仂亠亟亳仆亠仆亳亠 � �亠�于亠�仂仄 SILC"
 
 #: ../libpurple/protocols/silc/silc.c:455
+#: ../libpurple/protocols/silc10/silc.c:340
 msgid "Could not load SILC key pair"
 msgstr "�亠 �亟舒仍仂�� 亰舒亞��亰亳�� 仗舒�� 从仍��亠亶 SILC"
 
 #: ../libpurple/protocols/silc/silc.c:469
-#: ../libpurple/protocols/silc10/silc.c:355
+#: ../libpurple/protocols/silc10/silc.c:361
 msgid "Unable to create connection"
 msgstr "�亠 �亟舒���� �仂亰亟舒�� �仂亠亟亳仆亠仆亳亠"
 
 #: ../libpurple/protocols/silc/silc.c:499
-#: ../libpurple/protocols/silc10/silc.c:267
+#: ../libpurple/protocols/silc10/silc.c:271
 msgid "Out of memory"
 msgstr "�亠亟仂��舒�仂�仆仂 仗舒仄��亳"
 
 #: ../libpurple/protocols/silc/silc.c:550
-#: ../libpurple/protocols/silc10/silc.c:313
+#: ../libpurple/protocols/silc10/silc.c:317
 msgid "Cannot initialize SILC protocol"
 msgstr "�亠 �亟舒���� 亳仆亳�亳舒仍亳亰亳�仂于舒�� 仗�仂�仂从仂仍 SILC"
 
 #: ../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:882
-#: ../libpurple/protocols/silc10/silc.c:650
+#: ../libpurple/protocols/silc10/silc.c:656
 msgid "Your Current Mood"
 msgstr "�舒�亠 �亠从��亠亠 仆舒���仂亠仆亳亠"
 
 #: ../libpurple/protocols/silc/silc.c:884
-#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1741
+#: ../libpurple/protocols/silc10/silc.c:658 ../pidgin/gtkprefs.c:1685
 #, c-format
 msgid "Normal"
 msgstr "�仂�仄舒仍�仆仂"
 
 #: ../libpurple/protocols/silc/silc.c:898
-#: ../libpurple/protocols/silc10/silc.c:666
+#: ../libpurple/protocols/silc10/silc.c:672
 msgid "In love"
 msgstr "�仍�弍仍�仆仆�亶"
 
 #: ../libpurple/protocols/silc/silc.c:909
-#: ../libpurple/protocols/silc10/silc.c:677
+#: ../libpurple/protocols/silc10/silc.c:683
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -11799,46 +12050,46 @@
 "��亠亟仗仂�亳�舒亠仄�亠 于舒仄亳 �仗仂�仂弍� 从仂仆�舒从�舒"
 
 #: ../libpurple/protocols/silc/silc.c:917
-#: ../libpurple/protocols/silc/util.c:567
-#: ../libpurple/protocols/silc10/silc.c:685
-#: ../libpurple/protocols/silc10/util.c:557
+#: ../libpurple/protocols/silc/util.c:571
+#: ../libpurple/protocols/silc10/silc.c:691
+#: ../libpurple/protocols/silc10/util.c:561
 msgid "SMS"
 msgstr "SMS"
 
 #: ../libpurple/protocols/silc/silc.c:919
-#: ../libpurple/protocols/silc/util.c:569
-#: ../libpurple/protocols/silc10/silc.c:687
-#: ../libpurple/protocols/silc10/util.c:559
+#: ../libpurple/protocols/silc/util.c:573
+#: ../libpurple/protocols/silc10/silc.c:693
+#: ../libpurple/protocols/silc10/util.c:563
 msgid "MMS"
 msgstr "MMS"
 
 #: ../libpurple/protocols/silc/silc.c:921
-#: ../libpurple/protocols/silc10/silc.c:689
+#: ../libpurple/protocols/silc10/silc.c:695
 msgid "Video conferencing"
 msgstr "�亳亟亠仂从仂仆�亠�亠仆�亳�"
 
 #: ../libpurple/protocols/silc/silc.c:926
-#: ../libpurple/protocols/silc10/silc.c:694
+#: ../libpurple/protocols/silc10/silc.c:700
 msgid "Your Current Status"
 msgstr "�舒� �亠从��亳亶 ��舒���"
 
 #: ../libpurple/protocols/silc/silc.c:933
-#: ../libpurple/protocols/silc10/silc.c:701
+#: ../libpurple/protocols/silc10/silc.c:707
 msgid "Online Services"
 msgstr "弌亠�亠于�亠 �仍�亢弍�"
 
 #: ../libpurple/protocols/silc/silc.c:936
-#: ../libpurple/protocols/silc10/silc.c:704
+#: ../libpurple/protocols/silc10/silc.c:710
 msgid "Let others see what services you are using"
 msgstr "�仂亰于仂仍亳�� 亟��亞亳仄 于亳亟亠��, 从舒从亳亠 �仍�亢弍� 于� 亳�仗仂仍�亰�亠�亠"
 
 #: ../libpurple/protocols/silc/silc.c:942
-#: ../libpurple/protocols/silc10/silc.c:710
+#: ../libpurple/protocols/silc10/silc.c:716
 msgid "Let others see what computer you are using"
 msgstr "�仂亰于仂仍亳�� 亟��亞亳仄 于亳亟亠��, 从舒从仂亶 从仂仄仗���亠� 于� 亳�仗仂仍�亰�亠�亠"
 
 #: ../libpurple/protocols/silc/silc.c:949
-#: ../libpurple/protocols/silc10/silc.c:717
+#: ../libpurple/protocols/silc10/silc.c:723
 msgid "Your VCard File"
 msgstr "�舒� �舒亶仍 VCard"
 
@@ -11848,13 +12099,13 @@
 
 #: ../libpurple/protocols/silc/silc.c:959
 #: ../libpurple/protocols/silc/silc.c:960
-#: ../libpurple/protocols/silc10/silc.c:729
-#: ../libpurple/protocols/silc10/silc.c:730
+#: ../libpurple/protocols/silc10/silc.c:735
+#: ../libpurple/protocols/silc10/silc.c:736
 msgid "User Online Status Attributes"
 msgstr "���亳弍��� �亠�亠于仂亞仂 ��舒���舒 仗仂仍�亰仂于舒�亠仍�"
 
 #: ../libpurple/protocols/silc/silc.c:961
-#: ../libpurple/protocols/silc10/silc.c:731
+#: ../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 "
@@ -11867,21 +12118,21 @@
 #: ../libpurple/protocols/silc/silc.c:1002
 #: ../libpurple/protocols/silc/silc.c:1008
 #: ../libpurple/protocols/silc/silc.c:1629
-#: ../libpurple/protocols/silc10/silc.c:772
 #: ../libpurple/protocols/silc10/silc.c:778
-#: ../libpurple/protocols/silc10/silc.c:1418
+#: ../libpurple/protocols/silc10/silc.c:784
+#: ../libpurple/protocols/silc10/silc.c:1421
 msgid "Message of the Day"
 msgstr "弌仂仂弍�亠仆亳亠 亟仆�"
 
 #: ../libpurple/protocols/silc/silc.c:1002
-#: ../libpurple/protocols/silc10/silc.c:772
+#: ../libpurple/protocols/silc10/silc.c:778
 msgid "No Message of the Day available"
 msgstr "�亠� 亟仂���仗仆仂亞仂 �仂仂弍�亠仆亳� 亟仆�"
 
 #: ../libpurple/protocols/silc/silc.c:1003
 #: ../libpurple/protocols/silc/silc.c:1624
-#: ../libpurple/protocols/silc10/silc.c:773
-#: ../libpurple/protocols/silc10/silc.c:1413
+#: ../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 "�亠� �仂仂弍�亠仆亳� 亟仆�, �仂仂�仆亠��仆仆仂亞仂 � ��亳仄 �仂亠亟亳仆亠仆亳亠仄"
 
@@ -11889,201 +12140,201 @@
 #: ../libpurple/protocols/silc/silc.c:1100
 #: ../libpurple/protocols/silc/silc.c:1171
 #: ../libpurple/protocols/silc/silc.c:1172
-#: ../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/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:1054
-#: ../libpurple/protocols/silc10/silc.c:824
+#: ../libpurple/protocols/silc10/silc.c:830
 msgid "Passphrases do not match"
 msgstr "�舒�仂仍�仆�亠 ��舒亰� 仆亠 �仂于仗舒亟舒��"
 
 #: ../libpurple/protocols/silc/silc.c:1100
-#: ../libpurple/protocols/silc10/silc.c:868
+#: ../libpurple/protocols/silc10/silc.c:874
 msgid "Key Pair Generation failed"
 msgstr "�亠 �亟舒仍仂�� 于�仗仂仍仆亳�� 亞亠仆亠�舒�亳� 仗舒�� 从仍��亠亶"
 
 #: ../libpurple/protocols/silc/silc.c:1139
-#: ../libpurple/protocols/silc10/silc.c:907
+#: ../libpurple/protocols/silc10/silc.c:913
 msgid "Key length"
 msgstr "�仍亳仆舒 从仍��舒"
 
 #: ../libpurple/protocols/silc/silc.c:1141
-#: ../libpurple/protocols/silc10/silc.c:909
+#: ../libpurple/protocols/silc10/silc.c:915
 msgid "Public key file"
 msgstr "个舒亶仍 仗�弍仍亳�仆仂亞仂 从仍��舒"
 
 #: ../libpurple/protocols/silc/silc.c:1143
-#: ../libpurple/protocols/silc10/silc.c:911
+#: ../libpurple/protocols/silc10/silc.c:917
 msgid "Private key file"
 msgstr "个舒亶仍 仍亳�仆仂亞仂 从仍��舒"
 
 #: ../libpurple/protocols/silc/silc.c:1166
-#: ../libpurple/protocols/silc10/silc.c:934
+#: ../libpurple/protocols/silc10/silc.c:940
 msgid "Passphrase (retype)"
 msgstr "�舒�仂仍�仆舒� ��舒亰舒 (仆舒弍亠�亳�亠 亠�� �舒亰)"
 
 #: ../libpurple/protocols/silc/silc.c:1173
-#: ../libpurple/protocols/silc10/silc.c:941
+#: ../libpurple/protocols/silc10/silc.c:947
 msgid "Generate Key Pair"
 msgstr "弌亞亠仆亠�亳�仂于舒�� 仗舒�� 从仍��亠亶"
 
 #: ../libpurple/protocols/silc/silc.c:1216
-#: ../libpurple/protocols/silc10/silc.c:987
+#: ../libpurple/protocols/silc10/silc.c:990
 msgid "Online Status"
 msgstr "弌亠�亠于仂亶 ��舒���"
 
 #: ../libpurple/protocols/silc/silc.c:1224
-#: ../libpurple/protocols/silc10/silc.c:995
+#: ../libpurple/protocols/silc10/silc.c:998
 msgid "View Message of the Day"
 msgstr "��仂�仄仂��亠�� �仂仂弍�亠仆亳亠 亟仆�"
 
 #: ../libpurple/protocols/silc/silc.c:1228
-#: ../libpurple/protocols/silc10/silc.c:999
+#: ../libpurple/protocols/silc10/silc.c:1002
 msgid "Create SILC Key Pair..."
 msgstr "弌仂亰亟舒�� 仗舒�� 从仍��亠亶 SILC..."
 
 #: ../libpurple/protocols/silc/silc.c:1320
-#: ../libpurple/protocols/silc10/silc.c:1098
+#: ../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:1500
-#: ../libpurple/protocols/silc10/silc.c:1289
+#: ../libpurple/protocols/silc10/silc.c:1292
 msgid "Topic too long"
 msgstr "丐亠仄舒 �仍亳�从仂仄 于亠仍亳从舒"
 
 #: ../libpurple/protocols/silc/silc.c:1581
-#: ../libpurple/protocols/silc10/silc.c:1370
+#: ../libpurple/protocols/silc10/silc.c:1373
 msgid "You must specify a nick"
 msgstr "�� 亟仂仍亢仆� �从舒亰舒�� 仗�亠于亟仂仆亳仄"
 
 #: ../libpurple/protocols/silc/silc.c:1683
-#: ../libpurple/protocols/silc10/silc.c:1472
+#: ../libpurple/protocols/silc10/silc.c:1475
 #, c-format
 msgid "channel %s not found"
 msgstr "从舒仆舒仍 %s 仆亠 仆舒亶亟亠仆"
 
 #: ../libpurple/protocols/silc/silc.c:1688
-#: ../libpurple/protocols/silc10/silc.c:1477
+#: ../libpurple/protocols/silc10/silc.c:1480
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "�亠亢亳仄� 从舒仆舒仍舒 亟仍� %s: %s"
 
 #: ../libpurple/protocols/silc/silc.c:1690
-#: ../libpurple/protocols/silc10/silc.c:1479
+#: ../libpurple/protocols/silc10/silc.c:1482
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "仆亠� ���舒仆仂于仍亠仆仆�� �亠亢亳仄仂于 从舒仆舒仍舒 仆舒 %s"
 
 #: ../libpurple/protocols/silc/silc.c:1703
-#: ../libpurple/protocols/silc10/silc.c:1492
+#: ../libpurple/protocols/silc10/silc.c:1495
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "�亠 �亟舒仍仂�� ���舒仆仂于亳�� �亠亢亳仄� 从舒仆舒仍舒 亟仍� %s"
 
 #: ../libpurple/protocols/silc/silc.c:1733
-#: ../libpurple/protocols/silc10/silc.c:1522
+#: ../libpurple/protocols/silc10/silc.c:1525
 #, c-format
 msgid "Unknown command: %s, (may be a client bug)"
 msgstr "�亠亳亰于亠��仆舒� 从仂仄舒仆亟舒: %s, (于仂亰仄仂亢仆仂, 仂�亳弍从舒 于 从仍亳亠仆�亠)"
 
 #: ../libpurple/protocols/silc/silc.c:1796
-#: ../libpurple/protocols/silc10/silc.c:1585
+#: ../libpurple/protocols/silc10/silc.c:1588
 msgid "part [channel]:  Leave the chat"
 msgstr "part [从舒仆舒仍]:  �仂从亳仆��� �舒�"
 
 #: ../libpurple/protocols/silc/silc.c:1800
-#: ../libpurple/protocols/silc10/silc.c:1589
+#: ../libpurple/protocols/silc10/silc.c:1592
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [从舒仆舒仍]:  �仂从亳仆��� �舒�"
 
 #: ../libpurple/protocols/silc/silc.c:1804
-#: ../libpurple/protocols/silc10/silc.c:1593
+#: ../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:1809
-#: ../libpurple/protocols/silc10/silc.c:1598
+#: ../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:1813
-#: ../libpurple/protocols/silc10/silc.c:1602
+#: ../libpurple/protocols/silc10/silc.c:1605
 msgid "list:  List channels on this network"
 msgstr "list:  ��于亠��亳 �仗亳�仂从 从舒仆舒仍仂于 于 ��仂亶 �亠�亳"
 
 #: ../libpurple/protocols/silc/silc.c:1817
-#: ../libpurple/protocols/silc10/silc.c:1606
+#: ../libpurple/protocols/silc10/silc.c:1609
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;仗�亠于亟仂仆亳仄&gt;:  ��仂�仄仂��亠�� 亳仆�仂�仄舒�亳� 仂 仗仂仍�亰仂于舒�亠仍亠"
 
 #: ../libpurple/protocols/silc/silc.c:1821
-#: ../libpurple/protocols/silc10/silc.c:1610
-#: ../libpurple/protocols/zephyr/zephyr.c:2685
+#: ../libpurple/protocols/silc10/silc.c:1613
+#: ../libpurple/protocols/zephyr/zephyr.c:2700
 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:1825
-#: ../libpurple/protocols/silc10/silc.c:1614
+#: ../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:1829
-#: ../libpurple/protocols/silc10/silc.c:1618
+#: ../libpurple/protocols/silc10/silc.c:1621
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd:  ��仂�仄仂��亠�� �仂仂弍�亠仆亳亠 亟仆� �亠�于亠�舒"
 
 #: ../libpurple/protocols/silc/silc.c:1833
-#: ../libpurple/protocols/silc10/silc.c:1622
+#: ../libpurple/protocols/silc10/silc.c:1625
 msgid "detach:  Detach this session"
 msgstr "detach:  ��亠�于舒�� ��� �亠��亳�"
 
 #: ../libpurple/protocols/silc/silc.c:1837
-#: ../libpurple/protocols/silc10/silc.c:1626
+#: ../libpurple/protocols/silc10/silc.c:1629
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr ""
 "quit [�仂仂弍�亠仆亳亠]:  �舒亰仂�于舒�� �仂亠亟亳仆亠仆亳亠 � �亠�于亠�仂仄, �仂仂弍�亠仆亳亠 仆亠仂弍�亰舒�亠仍�仆仂"
 
 #: ../libpurple/protocols/silc/silc.c:1841
-#: ../libpurple/protocols/silc10/silc.c:1630
+#: ../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:1847
-#: ../libpurple/protocols/silc10/silc.c:1636
+#: ../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:1851
-#: ../libpurple/protocols/silc10/silc.c:1640
+#: ../libpurple/protocols/silc10/silc.c:1643
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;仆仂于�亶 仗�亠于亟仂仆亳仄&gt;:  �亰仄亠仆亳�� �于仂亶 仗�亠于亟仂仆亳仄"
 
 #: ../libpurple/protocols/silc/silc.c:1855
-#: ../libpurple/protocols/silc10/silc.c:1644
+#: ../libpurple/protocols/silc10/silc.c:1647
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;仗�亠于亟仂仆亳仄&gt;:  ��仂�仄仂��亠�� 亳仆�仂�仄舒�亳� 仂 仗仂仍�亰仂于舒�亠仍亠"
 
 #: ../libpurple/protocols/silc/silc.c:1859
-#: ../libpurple/protocols/silc10/silc.c:1648
+#: ../libpurple/protocols/silc10/silc.c:1651
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
 msgstr ""
 
 #: ../libpurple/protocols/silc/silc.c:1863
-#: ../libpurple/protocols/silc10/silc.c:1652
+#: ../libpurple/protocols/silc10/silc.c:1655
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
@@ -12092,67 +12343,67 @@
 "仗仂仍�亰仂于舒�亠仍� 仆舒 从舒仆舒仍亠"
 
 #: ../libpurple/protocols/silc/silc.c:1867
-#: ../libpurple/protocols/silc10/silc.c:1656
+#: ../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:1871
-#: ../libpurple/protocols/silc10/silc.c:1660
+#: ../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:1875
-#: ../libpurple/protocols/silc10/silc.c:1664
+#: ../libpurple/protocols/silc10/silc.c:1667
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
 msgstr ""
 
 #: ../libpurple/protocols/silc/silc.c:1879
-#: ../libpurple/protocols/silc10/silc.c:1668
+#: ../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:1883
-#: ../libpurple/protocols/silc10/silc.c:1672
+#: ../libpurple/protocols/silc10/silc.c:1675
 msgid "info [server]:  View server administrative details"
 msgstr "info [�亠�于亠�]:  ��仂�仄仂��亠�� 舒亟仄亳仆亳���舒�亳于仆�亠 仗仂亟�仂弍仆仂��亳 仂 �亠�于亠�亠"
 
 #: ../libpurple/protocols/silc/silc.c:1887
-#: ../libpurple/protocols/silc10/silc.c:1676
+#: ../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:1891
-#: ../libpurple/protocols/silc10/silc.c:1680
+#: ../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:1895
-#: ../libpurple/protocols/silc10/silc.c:1684
+#: ../libpurple/protocols/silc10/silc.c:1687
 msgid "stats:  View server and network statistics"
 msgstr "stats:  ��仂�仄仂��亠�� ��舒�亳��亳从� �亠�于亠�舒 亳 �亠�亳"
 
 #: ../libpurple/protocols/silc/silc.c:1899
-#: ../libpurple/protocols/silc10/silc.c:1688
+#: ../libpurple/protocols/silc10/silc.c:1691
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:  �仂�仍舒�� PING �亠�于亠��"
 
 #: ../libpurple/protocols/silc/silc.c:1904
-#: ../libpurple/protocols/silc10/silc.c:1693
+#: ../libpurple/protocols/silc10/silc.c:1696
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr ""
 "users &lt;从舒仆舒仍&gt;:  ��于亠��亳 �仗亳�仂从 仗仂仍�亰仂于舒�亠仍亠亶, 仗�亳�����于���亳� 仆舒 从舒仆舒仍亠"
 
 #: ../libpurple/protocols/silc/silc.c:1908
-#: ../libpurple/protocols/silc10/silc.c:1697
+#: ../libpurple/protocols/silc10/silc.c:1700
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -12168,38 +12419,38 @@
 #. *< version
 #. *  summary
 #: ../libpurple/protocols/silc/silc.c:2019
-#: ../libpurple/protocols/silc10/silc.c:1822
+#: ../libpurple/protocols/silc10/silc.c:1825
 msgid "SILC Protocol Plugin"
 msgstr "�仂亟�仍� 仗�仂�仂从仂仍舒 SILC"
 
 #. *  description
 #: ../libpurple/protocols/silc/silc.c:2021
-#: ../libpurple/protocols/silc10/silc.c:1824
+#: ../libpurple/protocols/silc10/silc.c:1827
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "��仂�仂从仂仍 Secure Internet Live Conferencing (SILC)"
 
 #: ../libpurple/protocols/silc/silc.c:2053
-#: ../libpurple/protocols/silc10/silc.c:1856 ../pidgin/gtkprefs.c:2138
+#: ../libpurple/protocols/silc10/silc.c:1859 ../pidgin/gtkprefs.c:2040
 msgid "Network"
 msgstr "弌亠��"
 
 #: ../libpurple/protocols/silc/silc.c:2064
-#: ../libpurple/protocols/silc10/silc.c:1867
+#: ../libpurple/protocols/silc10/silc.c:1870
 msgid "Public Key file"
 msgstr "个舒亶仍 仗�弍仍亳�仆仂亞仂 从仍��舒"
 
 #: ../libpurple/protocols/silc/silc.c:2068
-#: ../libpurple/protocols/silc10/silc.c:1871
+#: ../libpurple/protocols/silc10/silc.c:1874
 msgid "Private Key file"
 msgstr "个舒亶仍 仍亳�仆仂亞仂 从仍��舒"
 
 #: ../libpurple/protocols/silc/silc.c:2078
-#: ../libpurple/protocols/silc10/silc.c:1881
+#: ../libpurple/protocols/silc10/silc.c:1884
 msgid "Cipher"
 msgstr "丿亳��"
 
 #: ../libpurple/protocols/silc/silc.c:2088
-#: ../libpurple/protocols/silc10/silc.c:1891
+#: ../libpurple/protocols/silc10/silc.c:1894
 msgid "HMAC"
 msgstr "HMAC"
 
@@ -12208,27 +12459,27 @@
 msgstr ""
 
 #: ../libpurple/protocols/silc/silc.c:2095
-#: ../libpurple/protocols/silc10/silc.c:1894
+#: ../libpurple/protocols/silc10/silc.c:1897
 msgid "Public key authentication"
 msgstr "���亠仆�亳�亳从舒�亳� 仗�弍仍亳�仆仂亞仂 从仍��舒"
 
 #: ../libpurple/protocols/silc/silc.c:2098
-#: ../libpurple/protocols/silc10/silc.c:1897
+#: ../libpurple/protocols/silc10/silc.c:1900
 msgid "Block IMs without Key Exchange"
 msgstr "�仍仂从亳�仂于舒�� �仂仂弍�亠仆亳� 弍亠亰 仂弍仄亠仆舒 从仍��舒仄亳"
 
 #: ../libpurple/protocols/silc/silc.c:2101
-#: ../libpurple/protocols/silc10/silc.c:1900
+#: ../libpurple/protocols/silc10/silc.c:1903
 msgid "Block messages to whiteboard"
 msgstr ""
 
 #: ../libpurple/protocols/silc/silc.c:2104
-#: ../libpurple/protocols/silc10/silc.c:1903
+#: ../libpurple/protocols/silc10/silc.c:1906
 msgid "Automatically open whiteboard"
 msgstr ""
 
 #: ../libpurple/protocols/silc/silc.c:2107
-#: ../libpurple/protocols/silc10/silc.c:1906
+#: ../libpurple/protocols/silc10/silc.c:1909
 msgid "Digitally sign and verify all messages"
 msgstr "�亠仍舒�� �亳��仂于�� 仗仂亟仗亳�� 亳 仗�仂于亠�从� 于�亠� �仂仂弍�亠仆亳亶"
 
@@ -12324,28 +12575,28 @@
 msgid "Public Key Information"
 msgstr "�仆�仂�仄舒�亳� 仂 仗�弍仍亳�仆仂仄 从仍��亠"
 
-#: ../libpurple/protocols/silc/util.c:565
-#: ../libpurple/protocols/silc10/util.c:555
+#: ../libpurple/protocols/silc/util.c:569
+#: ../libpurple/protocols/silc10/util.c:559
 msgid "Paging"
 msgstr ""
 
-#: ../libpurple/protocols/silc/util.c:571
-#: ../libpurple/protocols/silc10/util.c:561
+#: ../libpurple/protocols/silc/util.c:575
+#: ../libpurple/protocols/silc10/util.c:565
 msgid "Video Conferencing"
 msgstr "�亳亟亠仂从仂仆�亠�亠仆�亳�"
 
-#: ../libpurple/protocols/silc/util.c:589
-#: ../libpurple/protocols/silc10/util.c:579
+#: ../libpurple/protocols/silc/util.c:594
+#: ../libpurple/protocols/silc10/util.c:584
 msgid "Computer"
 msgstr "�仂仄仗���亠�"
 
-#: ../libpurple/protocols/silc/util.c:593
-#: ../libpurple/protocols/silc10/util.c:583
+#: ../libpurple/protocols/silc/util.c:598
+#: ../libpurple/protocols/silc10/util.c:588
 msgid "PDA"
 msgstr "PDA"
 
-#: ../libpurple/protocols/silc/util.c:595
-#: ../libpurple/protocols/silc10/util.c:585
+#: ../libpurple/protocols/silc/util.c:600
+#: ../libpurple/protocols/silc10/util.c:590
 msgid "Terminal"
 msgstr "丐亠�仄亳仆舒仍"
 
@@ -12369,69 +12620,65 @@
 msgid "No server statistics available"
 msgstr "�亠� 亟仂���仗仆仂亶 ��舒�亳��亳从亳 �亠�于亠�舒"
 
-#: ../libpurple/protocols/silc10/ops.c:1931
+#: ../libpurple/protocols/silc10/ops.c:1937
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "��亳弍从舒: �亠�仂仂�于亠���于亳亠 于亠��亳亳, 仂弍仆仂于亳�亠 �于仂亶 从仍亳亠仆�"
 
-#: ../libpurple/protocols/silc10/ops.c:1934
+#: ../libpurple/protocols/silc10/ops.c:1940
 #, c-format
 msgid "Failure: Remote does not trust/support your public key"
 msgstr "��亳弍从舒: 丕亟舒仍�仆仆舒� �亳��亠仄舒 仆亠 仗�亳亰仆舒��/仗仂亟亟亠�亢亳于舒亠� 于舒� 仗�弍仍亳�仆�亶 从仍��"
 
-#: ../libpurple/protocols/silc10/ops.c:1937
+#: ../libpurple/protocols/silc10/ops.c:1943
 #, c-format
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "��亳弍从舒: 丕亟舒仍�仆仆舒� �亳��亠仄舒 仆亠 仗仂亟亟亠�亢亳于舒亠� 仗�亠亟仍仂亢亠仆仆�� 亞��仗仗� KE"
 
-#: ../libpurple/protocols/silc10/ops.c:1940
+#: ../libpurple/protocols/silc10/ops.c:1946
 #, c-format
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "��亳弍从舒: 丕亟舒仍�仆仆舒� �亳��亠仄舒 仆亠 仗仂亟亟亠�亢亳于舒亠� 仗�亠亟仍仂亢亠仆仆�亶 �亳��"
 
-#: ../libpurple/protocols/silc10/ops.c:1943
+#: ../libpurple/protocols/silc10/ops.c:1949
 #, c-format
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "��亳弍从舒: 丕亟舒仍�仆仆舒� �亳��亠仄舒 仆亠 仗仂亟亟亠�亢亳于舒亠� 仗�亠亟仍仂亢亠仆仆�亶 PKCS"
 
-#: ../libpurple/protocols/silc10/ops.c:1946
+#: ../libpurple/protocols/silc10/ops.c:1952
 #, c-format
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "��亳弍从舒: 丕亟舒仍�仆仆舒� �亳��亠仄舒 仆亠 仗仂亟亟亠�亢亳于舒亠� 仗�亠亟仍仂亢亠仆仆�� ���-��仆从�亳�"
 
-#: ../libpurple/protocols/silc10/ops.c:1949
+#: ../libpurple/protocols/silc10/ops.c:1955
 #, c-format
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "��亳弍从舒: 丕亟舒仍�仆仆舒� �亳��亠仄舒 仆亠 仗仂亟亟亠�亢亳于舒亠� 仗�亠亟仍仂亢亠仆仆�亶 HMAC"
 
-#: ../libpurple/protocols/silc10/ops.c:1951
+#: ../libpurple/protocols/silc10/ops.c:1957
 #, c-format
 msgid "Failure: Incorrect signature"
 msgstr "��亳弍从舒: �亠仗�舒于亳仍�仆舒� 仗仂亟仗亳��"
 
-#: ../libpurple/protocols/silc10/ops.c:1953
+#: ../libpurple/protocols/silc10/ops.c:1959
 #, c-format
 msgid "Failure: Invalid cookie"
 msgstr "��亳弍从舒: �亠于亠�仆�亠 亟舒仆仆�亠"
 
-#: ../libpurple/protocols/silc10/ops.c:1964
+#: ../libpurple/protocols/silc10/ops.c:1970
 #, c-format
 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"
@@ -12441,7 +12688,7 @@
 msgstr "�亠 �亟舒仍仂�� 亰舒仗亳�舒��"
 
 #: ../libpurple/protocols/simple/simple.c:443
-#: ../libpurple/protocols/simple/simple.c:1691
+#: ../libpurple/protocols/simple/simple.c:1713
 msgid "Could not connect"
 msgstr "�亠 �亟舒仍仂�� ���舒仆仂于亳�� �仂亠亟亳仆亠仆亳亠"
 
@@ -12449,22 +12696,22 @@
 msgid "Unknown server response."
 msgstr "�亠亳亰于亠��仆�亶 仂�从仍亳从 仂� �亠�于亠�舒."
 
-#: ../libpurple/protocols/simple/simple.c:1727
-#: ../libpurple/protocols/simple/simple.c:1773
-#: ../libpurple/protocols/simple/simple.c:1788
-#: ../libpurple/protocols/simple/simple.c:1843
+#: ../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:1752
+#: ../libpurple/protocols/simple/simple.c:1774
 msgid "Couldn't resolve host"
 msgstr "�亠 �亟舒仍仂�� �舒亰�亠�亳�� 亳仄� �亰仍舒"
 
-#: ../libpurple/protocols/simple/simple.c:1853
+#: ../libpurple/protocols/simple/simple.c:1875
 msgid "Could not resolve hostname"
 msgstr "�亠 �亟舒仍仂�� �舒亰�亠�亳�� 亳仄� �亰仍舒"
 
-#: ../libpurple/protocols/simple/simple.c:1871
+#: ../libpurple/protocols/simple/simple.c:1893
 msgid "SIP screen names may not contain whitespaces or @ symbols"
 msgstr ""
 "�亟亠仆�亳�亳从舒�仂�� 仗仂仍�亰仂于舒�亠仍亠亶 SIP 仆亠 仄仂亞�� �仂亟亠�亢舒�� 仗�仂弍亠仍� 亳仍亳 �亳仄于仂仍� @"
@@ -12477,36 +12724,36 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:2057
+#: ../libpurple/protocols/simple/simple.c:2073
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "�仂亟�仍� 仗�仂�仂从仂仍舒 SIP/SIMPLE"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:2058
+#: ../libpurple/protocols/simple/simple.c:2074
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "�仂亟�仍� 仗�仂�仂从仂仍舒 SIP/SIMPLE"
 
-#: ../libpurple/protocols/simple/simple.c:2086
+#: ../libpurple/protocols/simple/simple.c:2102
 msgid "Publish status (note: everyone may watch you)"
 msgstr ""
 
-#: ../libpurple/protocols/simple/simple.c:2092
+#: ../libpurple/protocols/simple/simple.c:2108
 msgid "Use UDP"
 msgstr "��仗仂仍�亰仂于舒�� UDP"
 
-#: ../libpurple/protocols/simple/simple.c:2094
+#: ../libpurple/protocols/simple/simple.c:2110
 msgid "Use proxy"
 msgstr "��仗仂仍�亰仂于舒�� 仗�仂从�亳"
 
-#: ../libpurple/protocols/simple/simple.c:2096
+#: ../libpurple/protocols/simple/simple.c:2112
 msgid "Proxy"
 msgstr "��仂从�亳"
 
-#: ../libpurple/protocols/simple/simple.c:2098
+#: ../libpurple/protocols/simple/simple.c:2114
 msgid "Auth User"
 msgstr ""
 
-#: ../libpurple/protocols/simple/simple.c:2100
+#: ../libpurple/protocols/simple/simple.c:2116
 msgid "Auth Domain"
 msgstr ""
 
@@ -12680,8 +12927,8 @@
 msgid "Password Change Successful"
 msgstr "�舒�仂仍� 亳亰仄亠仆�仆 ��仗亠�仆仂"
 
-#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:6241
-#: ../pidgin/gtkblist.c:6599
+#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:6399
+#: ../pidgin/gtkblist.c:6736
 msgid "_Group:"
 msgstr "_���仗仗舒:"
 
@@ -12743,25 +12990,25 @@
 msgid "TOC Protocol Plugin"
 msgstr "�仂亟�仍� 仗�仂�仂从仂仍舒 TOC"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:784
+#: ../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:840
+#: ../libpurple/protocols/yahoo/yahoo.c:803
 msgid "Your Yahoo! message did not get sent."
 msgstr "�舒�亠 �仂仂弍�亠仆亳亠 Yahoo! 仆亠 仂�仗�舒于仍亠仆仂."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:962
+#: ../libpurple/protocols/yahoo/yahoo.c:916
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "弌亳��亠仄仆仂亠 �仂仂弍�亠仆亳亠 Yahoo! 亟仍� %s:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1031
+#: ../libpurple/protocols/yahoo/yahoo.c:990
 msgid "Authorization denied message:"
 msgstr "弌仂仂弍�亠仆亳亠 仂�从舒亰舒 于 舒于�仂�亳亰舒�亳亳:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1049
+#: ../libpurple/protocols/yahoo/yahoo.c:1008
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -12769,16 +13016,16 @@
 msgstr ""
 "%s (仗仂于�仂�仆仂) 仆亠 �舒亰�亠�亳仍 亟仂弍舒于亳�� 亠亞仂 于 于舒� �仗亳�仂从 仗仂 �仍亠亟���亠亶 仗�亳�亳仆亠: %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1052
+#: ../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:1054
+#: ../libpurple/protocols/yahoo/yahoo.c:1013
 msgid "Add buddy rejected"
 msgstr "� 亟仂弍舒于仍亠仆亳亳 �仂弍亠�亠亟仆亳从舒 仂�从舒亰舒仆仂"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1996
+#: ../libpurple/protocols/yahoo/yahoo.c:1997
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -12786,62 +13033,66 @@
 "Check %s for updates."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1999
+#: ../libpurple/protocols/yahoo/yahoo.c:2000
 msgid "Failed Yahoo! Authentication"
 msgstr "���亠仆�亳�亳从舒�亳� Yahoo! 亰舒于亠��亳仍舒�� 仆亠�亟舒�仆仂"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2065
+#: ../libpurple/protocols/yahoo/yahoo.c:2078
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
 "\"Yes\" will remove and ignore the buddy."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2068
+#: ../libpurple/protocols/yahoo/yahoo.c:2081
 msgid "Ignore buddy?"
 msgstr "�亞仆仂�亳�仂于舒�� �仂弍亠�亠亟仆亳从舒?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2133
+#: ../libpurple/protocols/yahoo/yahoo.c:2127
+msgid "Invalid screen name."
+msgstr "�亠于亠�仆�亶 亳亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍�."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:2152
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "�舒�舒 ����仆舒� 亰舒仗亳�� 亰舒弍仍仂从亳�仂于舒仆舒, 于仂亶亟亳�亠 � 于亠弍-�舒亶�舒 Yahoo!."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2136
+#: ../libpurple/protocols/yahoo/yahoo.c:2155
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 "�亠亳亰于亠��仆舒� 仂�亳弍从舒 仆仂仄亠� %d. ��仂亟 � 于亠弍-�舒亶�舒 Yahoo! 仄仂亢亠� 亳�仗�舒于亳�� ��仂."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2189
+#: ../libpurple/protocols/yahoo/yahoo.c:2208
 #, 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:2192
+#: ../libpurple/protocols/yahoo/yahoo.c:2211
 msgid "Could not add buddy to server list"
 msgstr "�亠 �亟舒仍仂�� 亟仂弍舒于亳�� �仂弍亠�亠亟仆亳从舒 于 �仗亳�仂从 仆舒 �亠�于亠�亠"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2311
+#: ../libpurple/protocols/yahoo/yahoo.c:2333
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2657
+#: ../libpurple/protocols/yahoo/yahoo.c:2689
 msgid "Received unexpected HTTP response from server."
 msgstr "�仂仍��亠仆 仆亠仗�亠亟于亳亟亠仆仆�亶 HTTP-仂�从仍亳从 仂� �亠�于亠�舒."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2682
-#: ../libpurple/protocols/yahoo/yahoo.c:2870
-#: ../libpurple/protocols/yahoo/yahoo.c:2974
-#: ../libpurple/protocols/yahoo/yahoo.c:2985
-#: ../libpurple/protocols/yahoo/yahoochat.c:1514
-#: ../libpurple/protocols/yahoo/yahoochat.c:1584
+#: ../libpurple/protocols/yahoo/yahoo.c:2718
+#: ../libpurple/protocols/yahoo/yahoo.c:2906
+#: ../libpurple/protocols/yahoo/yahoo.c:3011
+#: ../libpurple/protocols/yahoo/yahoo.c:3022
+#: ../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:2708
+#: ../libpurple/protocols/yahoo/yahoo.c:2744
 #, c-format
 msgid ""
 "Lost connection with %s:\n"
@@ -12850,7 +13101,7 @@
 "弌仂亠亟亳仆亠仆亳亠 � %s 仗仂�亠��仆仂:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2733
+#: ../libpurple/protocols/yahoo/yahoo.c:2769
 #, c-format
 msgid ""
 "Could not establish a connection with %s:\n"
@@ -12859,103 +13110,104 @@
 "�亠 �亟舒仍仂�� ���舒仆仂于亳�� �仂亠亟亳仆亠仆亳亠 � %s:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3092
-#: ../libpurple/protocols/yahoo/yahoo.c:3778
+#: ../libpurple/protocols/yahoo/yahoo.c:3138
+#: ../libpurple/protocols/yahoo/yahoo.c:3829
 msgid "Not at Home"
 msgstr "�亠 亟仂仄舒"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3094
-#: ../libpurple/protocols/yahoo/yahoo.c:3781
+#: ../libpurple/protocols/yahoo/yahoo.c:3140
+#: ../libpurple/protocols/yahoo/yahoo.c:3832
 msgid "Not at Desk"
 msgstr "�亠 亰舒 ��仂仍仂仄"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3096
-#: ../libpurple/protocols/yahoo/yahoo.c:3784
+#: ../libpurple/protocols/yahoo/yahoo.c:3142
+#: ../libpurple/protocols/yahoo/yahoo.c:3835
 msgid "Not in Office"
 msgstr "�亠 于 仂�亳�亠"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3100
-#: ../libpurple/protocols/yahoo/yahoo.c:3790
+#: ../libpurple/protocols/yahoo/yahoo.c:3146
+#: ../libpurple/protocols/yahoo/yahoo.c:3841
 msgid "On Vacation"
 msgstr "� 仂�仗��从亠"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3104
-#: ../libpurple/protocols/yahoo/yahoo.c:3796
+#: ../libpurple/protocols/yahoo/yahoo.c:3150
+#: ../libpurple/protocols/yahoo/yahoo.c:3847
 msgid "Stepped Out"
 msgstr "���亠仍"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3197
-#: ../libpurple/protocols/yahoo/yahoo.c:3227
+#: ../libpurple/protocols/yahoo/yahoo.c:3243
+#: ../libpurple/protocols/yahoo/yahoo.c:3273
 msgid "Not on server list"
 msgstr "�亠 于 �仗亳�从亠 仆舒 �亠�于亠�亠"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3244
-#: ../libpurple/protocols/yahoo/yahoo.c:3302
+#: ../libpurple/protocols/yahoo/yahoo.c:3290
+#: ../libpurple/protocols/yahoo/yahoo.c:3348
 msgid "Appear Online"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3247
-#: ../libpurple/protocols/yahoo/yahoo.c:3323
+#: ../libpurple/protocols/yahoo/yahoo.c:3293
+#: ../libpurple/protocols/yahoo/yahoo.c:3369
 msgid "Appear Permanently Offline"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3265
+#: ../libpurple/protocols/yahoo/yahoo.c:3311
 msgid "Presence"
 msgstr "��亳�����于亳亠"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3308
+#: ../libpurple/protocols/yahoo/yahoo.c:3354
 msgid "Appear Offline"
 msgstr "�亠�仂��仆仂 仆亠 于 �亠�亳"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3317
+#: ../libpurple/protocols/yahoo/yahoo.c:3363
 msgid "Don't Appear Permanently Offline"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3365
+#: ../libpurple/protocols/yahoo/yahoo.c:3411
 msgid "Join in Chat"
 msgstr "��亳�仂亠亟亳仆亳���� 于 �舒�亠"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3371
+#: ../libpurple/protocols/yahoo/yahoo.c:3417
 msgid "Initiate Conference"
 msgstr "弌仂亰亟舒�� 从仂仆�亠�亠仆�亳�"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3399
+#: ../libpurple/protocols/yahoo/yahoo.c:3445
 msgid "Presence Settings"
 msgstr "�舒���仂亶从亳 仗�亳�����于亳�"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3405
+#: ../libpurple/protocols/yahoo/yahoo.c:3451
 msgid "Start Doodling"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3506
+#: ../libpurple/protocols/yahoo/yahoo.c:3557
 msgid "Activate which ID?"
 msgstr "�舒从仂亶 ID 舒从�亳于亳�仂于舒��?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3517
-msgid "Join who in chat?"
+#: ../libpurple/protocols/yahoo/yahoo.c:3568
+#, fuzzy
+msgid "Join whom in chat?"
 msgstr "� 从仂仄� 仗�亳�仂亠亟亳仆亳���� 于 �舒�亠?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3529
+#: ../libpurple/protocols/yahoo/yahoo.c:3580
 msgid "Activate ID..."
 msgstr "�从�亳于亳�仂于舒�� ID..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3533
+#: ../libpurple/protocols/yahoo/yahoo.c:3584
 msgid "Join User in Chat..."
 msgstr "��亳�仂亠亟亳仆亳���� 从 仗仂仍�亰仂于舒�亠仍� 于 �舒�亠..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3538
+#: ../libpurple/protocols/yahoo/yahoo.c:3589
 msgid "Open Inbox"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4147
+#: ../libpurple/protocols/yahoo/yahoo.c:4178
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join &lt;从仂仄仆舒�舒&gt;:  ��亳�仂亠亟亳仆亳���� 从 �舒�� 于 �亠�亳 Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4152
+#: ../libpurple/protocols/yahoo/yahoo.c:4183
 msgid "list: List rooms on the Yahoo network"
 msgstr "list: ��于亠��亳 �仗亳�仂从 从仂仄仆舒� 于 �亠�亳 Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4160
+#: ../libpurple/protocols/yahoo/yahoo.c:4191
 msgid "doodle: Request user to start a Doodle session"
 msgstr ""
 
@@ -12969,56 +13221,56 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4369
-#: ../libpurple/protocols/yahoo/yahoo.c:4371
+#: ../libpurple/protocols/yahoo/yahoo.c:4400
+#: ../libpurple/protocols/yahoo/yahoo.c:4402
 msgid "Yahoo Protocol Plugin"
 msgstr "�仂亟�仍� 仗�仂�仂从仂仍舒 Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4394
+#: ../libpurple/protocols/yahoo/yahoo.c:4425
 msgid "Yahoo Japan"
 msgstr "Yahoo Japan"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4397
+#: ../libpurple/protocols/yahoo/yahoo.c:4428
 msgid "Pager server"
 msgstr "弌亠�于亠� 仗亠亶亟亢亠�舒"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4400
+#: ../libpurple/protocols/yahoo/yahoo.c:4431
 msgid "Japan Pager server"
 msgstr "弌亠�于亠� 仗亠亶亟亢亠�舒 Japan"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4403
+#: ../libpurple/protocols/yahoo/yahoo.c:4434
 msgid "Pager port"
 msgstr "�仂�� 仗亠亶亟亢亠�舒"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4406
+#: ../libpurple/protocols/yahoo/yahoo.c:4437
 msgid "File transfer server"
 msgstr "弌亠�于亠� 仗亠�亠亟舒�亳 �舒亶仍仂于"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4409
+#: ../libpurple/protocols/yahoo/yahoo.c:4440
 msgid "Japan file transfer server"
 msgstr "弌亠�于亠� 仗亠�亠亟舒�亳 �舒亶仍仂于 Japan"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4412
+#: ../libpurple/protocols/yahoo/yahoo.c:4443
 msgid "File transfer port"
 msgstr "�仂�� 仗亠�亠亟舒�亳 �舒亶仍仂于"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4415
+#: ../libpurple/protocols/yahoo/yahoo.c:4446
 msgid "Chat room locale"
 msgstr "亊亰�从仂于仂亶 �仂�仄舒� �舒�舒"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4418
+#: ../libpurple/protocols/yahoo/yahoo.c:4449
 msgid "Ignore conference and chatroom invitations"
 msgstr "�亞仆仂�亳�仂于舒�� 仗�亳亞仍舒�亠仆亳� 于 从仂仆�亠�亠仆�亳亳 亳 �舒��"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4426
+#: ../libpurple/protocols/yahoo/yahoo.c:4457
 msgid "Chat room list URL"
 msgstr "URL �仗亳�从舒 �舒�仂于"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4429
+#: ../libpurple/protocols/yahoo/yahoo.c:4460
 msgid "Yahoo Chat server"
 msgstr "弌亠�于亠� �舒�舒 Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4432
+#: ../libpurple/protocols/yahoo/yahoo.c:4463
 msgid "Yahoo Chat port"
 msgstr "�仂�� �舒�舒 Yahoo"
 
@@ -13029,12 +13281,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 "�亠 �亟舒���� ���舒仆仂于亳�� 亟亠�从�亳仗�仂� �舒亶仍舒."
 
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1409
+#, fuzzy, c-format
+msgid "%s is trying to send you a group of %d files.\n"
+msgstr "%s 仗�亠亟仍舒亞舒亠� 仂�仗�舒于从� �舒亶仍舒 %s"
+
 #: ../libpurple/protocols/yahoo/yahoo_packet.c:307
 msgid "Write Error"
 msgstr "��亳弍从舒 亰舒仗亳�亳"
@@ -13061,135 +13320,135 @@
 "��仍亳 于� �仂�亳�亠 仗�仂�仄仂��亠�� ��仂� 仗�仂�亳仍�, 于舒仄 仗�亳亟���� 仂�从���� ��� ���仍从� 于 "
 "于舒�亠仄 弍�舒�亰亠�亠:"
 
-#: ../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."
 msgstr ""
 
-#: ../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."
 msgstr ""
 
-#: ../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 "
 "profile. If you know that the user exists, please try again later."
 msgstr ""
 
-#: ../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 ""
 
-#: ../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"
 msgstr ""
 
-#: ../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
-msgid "Webcams"
-msgstr ""
-
 #: ../libpurple/protocols/yahoo/yahoochat.c:1514
-#: ../libpurple/protocols/yahoo/yahoochat.c:1584
+msgid "Webcams"
+msgstr ""
+
+#: ../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 "�仂仄仆舒�� 仗仂仍�亰仂于舒�亠仍�"
 
@@ -13206,7 +13465,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)"
@@ -13214,100 +13473,100 @@
 "(��仂亳亰仂�仍舒 仂�亳弍从舒 仗�亳 仗�亠仂弍�舒亰仂于舒仆亳亳 ��仂亞仂 �仂仂弍�亠仆亳�.\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:2369
 msgid "_Class:"
 msgstr "_�仍舒��:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2360
+#: ../libpurple/protocols/zephyr/zephyr.c:2375
 msgid "_Instance:"
 msgstr "_�仆��舒仆�亳�:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2366
+#: ../libpurple/protocols/zephyr/zephyr.c:2381
 msgid "_Recipient:"
 msgstr "_�仂仍��舒�亠仍�:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2377
+#: ../libpurple/protocols/zephyr/zephyr.c:2392
 #, 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:2705
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;仗�亠于亟仂仆亳仄&gt;: �舒亶�亳 仗仂仍�亰仂于舒�亠仍�"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2695
+#: ../libpurple/protocols/zephyr/zephyr.c:2710
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;仗�亠于亟仂仆亳仄&gt;: �舒亶�亳 仗仂仍�亰仂于舒�亠仍�"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2700
+#: ../libpurple/protocols/zephyr/zephyr.c:2715
 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:2720
 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:2725
 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:2731
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2721
+#: ../libpurple/protocols/zephyr/zephyr.c:2736
 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:2742
 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:2748
 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:2754
 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:2759
 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:2835
 msgid "Resubscribe"
 msgstr "�仂亟仗亳�舒���� 仗仂于�仂�仆仂"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2853
+#: ../libpurple/protocols/zephyr/zephyr.c:2838
 msgid "Retrieve subscriptions from server"
 msgstr "�舒亞��亰亳�� 仗仂亟仗亳�从亳 � �亠�于亠�舒"
 
@@ -13321,45 +13580,45 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/zephyr/zephyr.c:2946
-#: ../libpurple/protocols/zephyr/zephyr.c:2948
+#: ../libpurple/protocols/zephyr/zephyr.c:2931
+#: ../libpurple/protocols/zephyr/zephyr.c:2933
 msgid "Zephyr Protocol Plugin"
 msgstr "�仂亟�仍� 仗�仂�仂从仂仍舒 Zephyr"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2973
+#: ../libpurple/protocols/zephyr/zephyr.c:2958
 msgid "Use tzc"
 msgstr "��仗仂仍�亰仂于舒�� tzc"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2976
+#: ../libpurple/protocols/zephyr/zephyr.c:2961
 msgid "tzc command"
 msgstr "�仂仄舒仆亟舒 tzc"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2979
+#: ../libpurple/protocols/zephyr/zephyr.c:2964
 msgid "Export to .anyone"
 msgstr "亅从�仗仂��亳�仂于舒�� 于 .anyone"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2982
+#: ../libpurple/protocols/zephyr/zephyr.c:2967
 msgid "Export to .zephyr.subs"
 msgstr "亅从�仗仂��亳�仂于舒�� 于 .zephyr.subs"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2985
+#: ../libpurple/protocols/zephyr/zephyr.c:2970
 msgid "Import from .anyone"
 msgstr "�仄仗仂��亳�仂于舒�� 亳亰 .anyone"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2988
+#: ../libpurple/protocols/zephyr/zephyr.c:2973
 msgid "Import from .zephyr.subs"
 msgstr "�仄仗仂��亳�仂于舒�� 亳亰 .zephyr.subs"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2991
+#: ../libpurple/protocols/zephyr/zephyr.c:2976
 msgid "Realm"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2994
+#: ../libpurple/protocols/zephyr/zephyr.c:2979
 msgid "Exposure"
 msgstr ""
 
-#: ../libpurple/proxy.c:461 ../libpurple/proxy.c:902 ../libpurple/proxy.c:1061
-#: ../libpurple/proxy.c:1632
+#: ../libpurple/proxy.c:486 ../libpurple/proxy.c:933 ../libpurple/proxy.c:1092
+#: ../libpurple/proxy.c:1663
 #, c-format
 msgid ""
 "Unable to create socket:\n"
@@ -13368,60 +13627,46 @@
 "�亠 �亟舒���� �仂亰亟舒�� �仂从亠�:\n"
 "%s"
 
-#: ../libpurple/proxy.c:662
+#: ../libpurple/proxy.c:687
 #, c-format
 msgid "Unable to parse response from HTTP proxy: %s\n"
 msgstr ""
 
-#: ../libpurple/proxy.c:702 ../libpurple/proxy.c:750 ../libpurple/proxy.c:786
-#: ../libpurple/proxy.c:798
+#: ../libpurple/proxy.c:727 ../libpurple/proxy.c:776 ../libpurple/proxy.c:814
+#: ../libpurple/proxy.c:826
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "��亳弍从舒 �仂亠亟亳仆亠仆亳� � HTTP-仗�仂从�亳 %d"
 
-#: ../libpurple/proxy.c:794
+#: ../libpurple/proxy.c:822
 #, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling."
 msgstr "�仂���仗 亰舒仗�亠��仆: 仗�仂从�亳-�亠�于亠� HTTP 亰舒仗�亠�舒亠� ��仆仆亠仍亳�仂于舒仆亳亠 仗仂��舒 %d."
 
-#: ../libpurple/proxy.c:1022
+#: ../libpurple/proxy.c:1053
 #, c-format
 msgid "Error resolving %s"
 msgstr "��亳弍从舒 �舒亰�亠�亠仆亳� 亳仄亠仆亳 %s"
 
-#: ../libpurple/proxy.c:1730
+#: ../libpurple/proxy.c:1761
 msgid "Could not resolve host name"
 msgstr "�亠 �亟舒仍仂�� �舒亰�亠�亳�� 亳仄� �亰仍舒"
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
-#. *
-#. * @since 2.3.0
 #.
-#. *
-#. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
-#. *
-#. * @deprecated Please use purple_request_yes_no_with_hint instead.
-#.
-#: ../libpurple/request.h:1802 ../libpurple/request.h:1815
+#: ../libpurple/request.h:1448
 msgid "_Yes"
 msgstr "_�舒"
 
-#: ../libpurple/request.h:1802 ../libpurple/request.h:1815
+#: ../libpurple/request.h:1448
 msgid "_No"
 msgstr "_�亠�"
 
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
-#. *
-#. * @since 2.3.0
 #.
-#. *
-#. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
-#. *
-#. * @deprecated Please use purple_request_accept_cancel_with_hint instead.
-#.
-#: ../libpurple/request.h:1854 ../libpurple/request.h:1867
+#: ../libpurple/request.h:1468
 msgid "_Accept"
 msgstr "_��亳仆���"
 
@@ -13432,26 +13677,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:356
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr ""
 
-#: ../libpurple/server.c:347
+#: ../libpurple/server.c:401
 #, c-format
 msgid "%s has requested your attention!"
 msgstr ""
 
-#: ../libpurple/server.c:793
+#: ../libpurple/server.c:898
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -13460,12 +13705,12 @@
 "%s 仗�亳亞仍舒�舒亠� %s 于 �舒� %s:\n"
 "%s"
 
-#: ../libpurple/server.c:798
+#: ../libpurple/server.c:903
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s 仗�亳亞仍舒�舒亠� %s 于 �舒� %s\n"
 
-#: ../libpurple/server.c:802
+#: ../libpurple/server.c:907
 msgid "Accept chat invitation?"
 msgstr "��亳仆��� 仗�亳亞仍舒�亠仆亳亠 于 �舒�?"
 
@@ -13490,7 +13735,7 @@
 msgstr "�亠 ���舒仆仂于仍亠仆"
 
 #: ../libpurple/status.c:156 ../pidgin/gtkdocklet.c:553
-#: ../pidgin/gtkstatusbox.c:1059
+#: ../pidgin/gtkstatusbox.c:1083
 msgid "Do not disturb"
 msgstr "�亠 弍亠�仗仂从仂亳��"
 
@@ -13508,50 +13753,35 @@
 
 #: ../libpurple/status.c:610
 #, c-format
-msgid "%s changed status from %s to %s"
-msgstr "%s 亳亰仄亠仆亳仍 ��舒��� � %s 仆舒 %s"
-
-#: ../libpurple/status.c:613
-#, c-format
 msgid "%s (%s) changed status from %s to %s"
 msgstr "%s (%s) 亳亰仄亠仆亳仍 ��舒��� � %s 仆舒 %s"
 
-#: ../libpurple/status.c:624
-#, c-format
-msgid "%s is now %s"
-msgstr "%s �亠仗亠�� %s"
-
-#: ../libpurple/status.c:626
+#: ../libpurple/status.c:621
 #, c-format
 msgid "%s (%s) is now %s"
 msgstr "%s (%s) �亠仗亠�� %s"
 
-#: ../libpurple/status.c:632
-#, c-format
-msgid "%s is no longer %s"
-msgstr "%s 弍仂仍��亠 仆亠 %s"
-
-#: ../libpurple/status.c:634
+#: ../libpurple/status.c:627
 #, c-format
 msgid "%s (%s) is no longer %s"
 msgstr "%s (%s) 弍仂仍��亠 仆亠 %s"
 
-#: ../libpurple/status.c:1247
+#: ../libpurple/status.c:1242
 #, c-format
 msgid "%s became idle"
 msgstr "%s 仆舒�舒仍 弍亠亰亟亠亶��于仂于舒��"
 
-#: ../libpurple/status.c:1264
+#: ../libpurple/status.c:1262
 #, c-format
 msgid "%s became unidle"
 msgstr "%s 仗亠�亠��舒仍 弍亠亰亟亠亶��于仂于舒��"
 
-#: ../libpurple/status.c:1327
+#: ../libpurple/status.c:1328
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s 仆舒�舒仍 弍亠亰亟亠亶��于仂于舒��"
 
-#: ../libpurple/status.c:1329
+#: ../libpurple/status.c:1330
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s 仗亠�亠��舒仍 弍亠亰亟亠亶��于仂于舒��"
@@ -13561,12 +13791,12 @@
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2783
+#: ../libpurple/util.c:2804
 #, c-format
 msgid "Error Reading %s"
 msgstr "��亳弍从舒 ��亠仆亳� %s"
 
-#: ../libpurple/util.c:2784
+#: ../libpurple/util.c:2805
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -13575,15 +13805,15 @@
 "��仂亳亰仂�仍舒 仂�亳弍从舒 仗�亳 ��亠仆亳亳 %s. 个舒亶仍 仆亠 弍�仍 亰舒亞��亢亠仆, 舒 ��舒��亶 �舒亶仍 弍�仍 "
 "仗亠�亠亳仄亠仆仂于舒仆 于 %s~."
 
-#: ../libpurple/util.c:3281
+#: ../libpurple/util.c:3304
 msgid "Calculating..."
 msgstr "�仂亟����..."
 
-#: ../libpurple/util.c:3284
+#: ../libpurple/util.c:3307
 msgid "Unknown."
 msgstr "�亠亳亰于亠��仆仂."
 
-#: ../libpurple/util.c:3310
+#: ../libpurple/util.c:3333
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -13591,7 +13821,7 @@
 msgstr[1] "%d �亠从�仆亟�"
 msgstr[2] "%d �亠从�仆亟"
 
-#: ../libpurple/util.c:3322
+#: ../libpurple/util.c:3345
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -13599,7 +13829,7 @@
 msgstr[1] "%d 亟仆�"
 msgstr[2] "%d 亟仆亠亶"
 
-#: ../libpurple/util.c:3330
+#: ../libpurple/util.c:3353
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
@@ -13607,7 +13837,7 @@
 msgstr[1] "%s, %d �舒�舒"
 msgstr[2] "%s, %d �舒�仂于"
 
-#: ../libpurple/util.c:3336
+#: ../libpurple/util.c:3359
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -13615,7 +13845,7 @@
 msgstr[1] "%d �舒�舒"
 msgstr[2] "%d �舒�仂于"
 
-#: ../libpurple/util.c:3344
+#: ../libpurple/util.c:3367
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
@@ -13623,7 +13853,7 @@
 msgstr[1] "%s, %d 仄亳仆���"
 msgstr[2] "%s, %d 仄亳仆��"
 
-#: ../libpurple/util.c:3350
+#: ../libpurple/util.c:3373
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -13631,38 +13861,72 @@
 msgstr[1] "%d 仄亳仆���"
 msgstr[2] "%d 仄亳仆��"
 
-#: ../libpurple/util.c:3610
+#: ../libpurple/util.c:3633
 #, c-format
 msgid "Could not open %s: Redirected too many times"
 msgstr ""
 
-#: ../libpurple/util.c:3647 ../libpurple/util.c:3943
+#: ../libpurple/util.c:3670 ../libpurple/util.c:3966
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "�亠 �亟舒���� �仂亠亟亳仆亳���� � %s"
 
-#: ../libpurple/util.c:3770
+#: ../libpurple/util.c:3793
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
 "server may be trying something malicious."
 msgstr ""
 
-#: ../libpurple/util.c:3805
+#: ../libpurple/util.c:3828
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "��亳弍从舒 ��亠仆亳� 亳亰 %s: %s"
 
-#: ../libpurple/util.c:3836
+#: ../libpurple/util.c:3859
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "��亳弍从舒 亰舒仗亳�亳 于 %s: %s"
 
-#: ../libpurple/util.c:3861
+#: ../libpurple/util.c:3884
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "�亠 �亟舒���� �仂亠亟亳仆亳���� � %s: %s"
 
+#: ../libpurple/util.c:4697
+#, c-format
+msgid " - %s"
+msgstr ""
+
+#: ../libpurple/util.c:4703
+#, fuzzy, c-format
+msgid " (%s)"
+msgstr "%s (%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
+#, fuzzy, c-format
+msgid "Remote host closed connection."
+msgstr "丕亟舒仍�仆仆�亶 仗仂仍�亰仂于舒�亠仍� �舒亰仂�于舒仍 �仂亠亟亳仆亠仆亳亠."
+
+#. 10060
+#: ../libpurple/win32/libc_interface.c:326
+#, fuzzy, c-format
+msgid "Connection timed out."
+msgstr "���亠从仍仂 于�亠仄� 仂亢亳亟舒仆亳� �仂亠亟亳仆亠仆亳�"
+
+#. 10061
+#: ../libpurple/win32/libc_interface.c:328
+#, fuzzy, c-format
+msgid "Connection refused."
+msgstr "弌弍�仂� �仂亠亟亳仆亠仆亳�"
+
 #: ../pidgin.desktop.in.h:1
 msgid "Internet Messenger"
 msgstr "�仍亳亠仆� 仂弍仄亠仆舒 仄亞仆仂于亠仆仆�仄亳 �仂仂弍�亠仆亳�仄亳"
@@ -13684,71 +13948,71 @@
 msgstr "��亳亠仆�舒�亳� 仍仂�从舒."
 
 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:410
+#: ../pidgin/gtkaccount.c:379
 msgid "Login Options"
 msgstr "�舒�舒仄亠��� 于�仂亟舒"
 
-#: ../pidgin/gtkaccount.c:431
+#: ../pidgin/gtkaccount.c:400
 msgid "Pro_tocol:"
 msgstr "�_�仂�仂从仂仍:"
 
-#: ../pidgin/gtkaccount.c:442
+#: ../pidgin/gtkaccount.c:411
 msgid "Screen _name:"
 msgstr "_�亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍�:"
 
-#: ../pidgin/gtkaccount.c:532
+#: ../pidgin/gtkaccount.c:501
 msgid "_Local alias:"
 msgstr "_�仂从舒仍�仆�亶 仗�亠于亟仂仆亳仄:"
 
-#: ../pidgin/gtkaccount.c:536
+#: ../pidgin/gtkaccount.c:505
 msgid "Remember pass_word"
 msgstr "�_舒仗仂仄仆亳�� 仗舒�仂仍�"
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:594
+#: ../pidgin/gtkaccount.c:563
 msgid "User Options"
 msgstr "�舒�舒仄亠��� 仗仂仍�亰仂于舒�亠仍�"
 
-#: ../pidgin/gtkaccount.c:607
+#: ../pidgin/gtkaccount.c:576
 msgid "New _mail notifications"
 msgstr "丕于亠亟仂仄仍亠仆亳� 仂 仆仂于仂亶 仗仂_��亠"
 
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:612
+#: ../pidgin/gtkaccount.c:581
 msgid "Use this buddy _icon for this account:"
 msgstr "��仗仂仍�亰仂于舒�� ��仂� _亰仆舒�仂从 �仂弍亠�亠亟仆亳从舒 亟仍� ��仂亶 ����仆仂亶 亰舒仗亳�亳:"
 
 #. Build the protocol options frame.
-#: ../pidgin/gtkaccount.c:734
+#: ../pidgin/gtkaccount.c:703
 #, c-format
 msgid "%s Options"
 msgstr "�舒�舒仄亠��� %s"
 
-#: ../pidgin/gtkaccount.c:939
+#: ../pidgin/gtkaccount.c:908
 msgid "Use GNOME Proxy Settings"
 msgstr "��仗仂仍�亰仂于舒�� 仆舒���仂亶从亳 仗�仂从�亳 GNOME"
 
-#: ../pidgin/gtkaccount.c:940
+#: ../pidgin/gtkaccount.c:909
 msgid "Use Global Proxy Settings"
 msgstr "��仗仂仍�亰仂于舒�� 亞仍仂弍舒仍�仆�亠 仆舒���仂亶从亳 仗�仂从�亳"
 
-#: ../pidgin/gtkaccount.c:946
+#: ../pidgin/gtkaccount.c:915
 msgid "No Proxy"
 msgstr "�亠� 仗�仂从�亳"
 
-#: ../pidgin/gtkaccount.c:952
+#: ../pidgin/gtkaccount.c:921
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../pidgin/gtkaccount.c:958
+#: ../pidgin/gtkaccount.c:927
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../pidgin/gtkaccount.c:964
+#: ../pidgin/gtkaccount.c:933
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:970 ../pidgin/gtkprefs.c:1283
+#: ../pidgin/gtkaccount.c:939 ../pidgin/gtkprefs.c:1230
 msgid "Use Environmental Settings"
 msgstr "��仗仂仍�亰仂于舒�� 仆舒���仂亶从亳 仂从��亢亠仆亳�"
 
@@ -13757,72 +14021,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:1009
+#: ../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:1012
+#: ../pidgin/gtkaccount.c:981
 msgid "you can see the butterflies mating"
 msgstr "于� 仄仂亢亠�亠 �于亳亟亠�� �仗舒�亳于舒��亳��� 弍舒弍仂�亠从"
 
-#: ../pidgin/gtkaccount.c:1033
+#: ../pidgin/gtkaccount.c:1002
 msgid "Proxy Options"
 msgstr "�舒�舒仄亠��� 仗�仂从�亳"
 
-#: ../pidgin/gtkaccount.c:1047 ../pidgin/gtkprefs.c:1277
+#: ../pidgin/gtkaccount.c:1016 ../pidgin/gtkprefs.c:1224
 msgid "Proxy _type:"
 msgstr "丐_亳仗 仗�仂从�亳:"
 
-#: ../pidgin/gtkaccount.c:1056 ../pidgin/gtkprefs.c:1298
+#: ../pidgin/gtkaccount.c:1025 ../pidgin/gtkprefs.c:1245
 msgid "_Host:"
 msgstr "_丕亰亠仍:"
 
-#: ../pidgin/gtkaccount.c:1060 ../pidgin/gtkprefs.c:1316
+#: ../pidgin/gtkaccount.c:1029 ../pidgin/gtkprefs.c:1263
 msgid "_Port:"
 msgstr "�_仂��:"
 
-#: ../pidgin/gtkaccount.c:1068
+#: ../pidgin/gtkaccount.c:1037
 msgid "_Username:"
 msgstr "_�仄� 仗仂仍�亰仂于舒�亠仍�:"
 
-#: ../pidgin/gtkaccount.c:1075 ../pidgin/gtkprefs.c:1353
+#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1300
 msgid "Pa_ssword:"
 msgstr "�舒_�仂仍�:"
 
-#: ../pidgin/gtkaccount.c:1199
+#: ../pidgin/gtkaccount.c:1169
 msgid "Unable to save new account"
 msgstr "�亠 �亟舒���� �仂��舒仆亳�� 仆仂于�� ����仆�� 亰舒仗亳��"
 
-#: ../pidgin/gtkaccount.c:1200
+#: ../pidgin/gtkaccount.c:1170
 msgid "An account already exists with the specified criteria."
 msgstr ""
 
-#: ../pidgin/gtkaccount.c:1478
+#: ../pidgin/gtkaccount.c:1447
 msgid "Add Account"
 msgstr "�仂弍舒于亳�� ����仆�� 亰舒仗亳��"
 
-#: ../pidgin/gtkaccount.c:1497
+#: ../pidgin/gtkaccount.c:1464
 msgid "_Basic"
 msgstr "_��仆仂于仆�亠"
 
-#: ../pidgin/gtkaccount.c:1504
+#: ../pidgin/gtkaccount.c:1471
 msgid "Create this new account on the server"
 msgstr "弌仂亰亟舒�� ��� 仆仂于�� ����仆�� 亰舒仗亳�� 仆舒 �亠�于亠�亠"
 
-#: ../pidgin/gtkaccount.c:1520
+#: ../pidgin/gtkaccount.c:1485
 msgid "_Advanced"
 msgstr "_�仂仗仂仍仆亳�亠仍�仆�亠"
 
-#: ../pidgin/gtkaccount.c:1978 ../pidgin/gtkplugin.c:595
+#: ../pidgin/gtkaccount.c:1906 ../pidgin/gtkplugin.c:639
+#: ../pidgin/plugins/convcolors.c:327
 msgid "Enabled"
 msgstr "�从仍��亠仆仂"
 
-#: ../pidgin/gtkaccount.c:2006
+#: ../pidgin/gtkaccount.c:1934
 msgid "Protocol"
 msgstr "��仂�仂从仂仍"
 
-#: ../pidgin/gtkaccount.c:2207
+#: ../pidgin/gtkaccount.c:2137
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -13846,7 +14111,7 @@
 "����仆�� 亰舒仗亳�亠亶 仗仂亰亢亠 �亠�亠亰 仄亠仆� <b>丕���仆�亠 亰舒仗亳�亳->�仂弍舒于亳��/�亰仄亠仆亳��</b> "
 "仂从仆舒 �仗亳�从舒 �仂弍亠�亠亟仆亳从仂于."
 
-#: ../pidgin/gtkblist.c:543
+#: ../pidgin/gtkblist.c:549
 #, c-format
 msgid "You have %d contact named %s. Would you like to merge them?"
 msgid_plural ""
@@ -13855,18 +14120,23 @@
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../pidgin/gtkblist.c:544
+#: ../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:546
+#: ../pidgin/gtkblist.c:552
 msgid "_Merge"
 msgstr "_�弍�亠亟亳仆亳��"
 
-#: ../pidgin/gtkblist.c:961
+#: ../pidgin/gtkblist.c:953 ../pidgin/gtkblist.c:6683
+#, fuzzy
+msgid "Room _List"
+msgstr "弌仗亳�仂从 从仂仄仆舒�"
+
+#: ../pidgin/gtkblist.c:973
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
@@ -13874,326 +14144,351 @@
 "�于亠亟亳�亠 �仂仂�于亠���于����� 亳仆�仂�仄舒�亳� 仂 �舒�亠, 从 从仂�仂�仂仄� 于� �仂�亠仍亳 弍� "
 "仗�亳�仂亠亟亳仆亳����.\n"
 
-#: ../pidgin/gtkblist.c:972 ../pidgin/gtkblist.c:6560
-#: ../pidgin/gtkpounce.c:554 ../pidgin/gtkroomlist.c:709
+#: ../pidgin/gtkblist.c:985 ../pidgin/gtkblist.c:6718
+#: ../pidgin/gtkpounce.c:546 ../pidgin/gtkroomlist.c:547
 msgid "_Account:"
 msgstr "丕_���仆舒� 亰舒仗亳��:"
 
-#: ../pidgin/gtkblist.c:1261 ../pidgin/gtkprivacy.c:605
-#: ../pidgin/gtkprivacy.c:619
+#: ../pidgin/gtkblist.c:1263 ../pidgin/gtkprivacy.c:549
+#: ../pidgin/gtkprivacy.c:563
 msgid "_Block"
 msgstr "_�仍仂从亳�仂于舒��"
 
-#: ../pidgin/gtkblist.c:1261
+#: ../pidgin/gtkblist.c:1263
 msgid "Un_block"
 msgstr "�舒亰_弍仍仂从亳�仂于舒��"
 
-#: ../pidgin/gtkblist.c:1304
+#: ../pidgin/gtkblist.c:1306
 msgid "Move to"
 msgstr "�亠�亠仄亠��亳�� 于"
 
-#: ../pidgin/gtkblist.c:1344
+#: ../pidgin/gtkblist.c:1346
 msgid "Get _Info"
 msgstr "_�仆�仂�仄舒�亳�"
 
-#: ../pidgin/gtkblist.c:1347 ../pidgin/pidginstock.c:90
+#: ../pidgin/gtkblist.c:1349 ../pidgin/pidginstock.c:90
 msgid "I_M"
 msgstr "�亞仆仂于亠仆仆仂亠 �仂仂弍_�亠仆亳亠"
 
-#: ../pidgin/gtkblist.c:1353
+#: ../pidgin/gtkblist.c:1355
 msgid "_Send File..."
 msgstr "_��仗�舒于亳�� �舒亶仍..."
 
-#: ../pidgin/gtkblist.c:1360
+#: ../pidgin/gtkblist.c:1362
 msgid "Add Buddy _Pounce..."
 msgstr "�仂弍舒于亳�� 仗_�舒于亳仍仂..."
 
-#: ../pidgin/gtkblist.c:1365 ../pidgin/gtkblist.c:1369
-#: ../pidgin/gtkblist.c:1484 ../pidgin/gtkblist.c:1507
+#: ../pidgin/gtkblist.c:1367 ../pidgin/gtkblist.c:1371
+#: ../pidgin/gtkblist.c:1486 ../pidgin/gtkblist.c:1509
 msgid "View _Log"
 msgstr "��仂�仄仂��亠�� _亢��仆舒仍"
 
-#: ../pidgin/gtkblist.c:1375
+#: ../pidgin/gtkblist.c:1377
 msgid "Hide when offline"
 msgstr "弌从��于舒��, 从仂亞亟舒 仆亠 于 �亠�亳"
 
-#: ../pidgin/gtkblist.c:1375
+#: ../pidgin/gtkblist.c:1377
 msgid "Show when offline"
 msgstr "�仂从舒亰�于舒��, 从仂亞亟舒 仆亠 于 �亠�亳"
 
-#: ../pidgin/gtkblist.c:1389 ../pidgin/gtkblist.c:1398
-#: ../pidgin/gtkblist.c:1492 ../pidgin/gtkblist.c:1513
+#: ../pidgin/gtkblist.c:1391 ../pidgin/gtkblist.c:1400
+#: ../pidgin/gtkblist.c:1494 ../pidgin/gtkblist.c:1515
 msgid "_Alias..."
 msgstr "_��亠于亟仂仆亳仄..."
 
-#: ../pidgin/gtkblist.c:1392 ../pidgin/gtkblist.c:1400
-#: ../pidgin/gtkblist.c:1494 ../pidgin/gtkblist.c:1515
+#: ../pidgin/gtkblist.c:1394 ../pidgin/gtkblist.c:1402
+#: ../pidgin/gtkblist.c:1496 ../pidgin/gtkblist.c:1517
 msgid "_Remove"
 msgstr "_丕亟舒仍亳��"
 
-#: ../pidgin/gtkblist.c:1450
+#: ../pidgin/gtkblist.c:1452
 msgid "Add _Buddy..."
 msgstr "�仂弍舒于亳�� _�仂弍亠�亠亟仆亳从舒..."
 
-#: ../pidgin/gtkblist.c:1453
+#: ../pidgin/gtkblist.c:1455
 msgid "Add C_hat..."
 msgstr "�仂弍舒于亳�� _�舒�..."
 
-#: ../pidgin/gtkblist.c:1456
+#: ../pidgin/gtkblist.c:1458
 msgid "_Delete Group"
 msgstr "_丕亟舒仍亳�� 亞��仗仗�"
 
-#: ../pidgin/gtkblist.c:1458
+#: ../pidgin/gtkblist.c:1460
 msgid "_Rename"
 msgstr "�亠�亠_亳仄亠仆仂于舒��"
 
 #. join button
-#: ../pidgin/gtkblist.c:1478 ../pidgin/gtkroomlist.c:316
-#: ../pidgin/gtkroomlist.c:773 ../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:1480
+#: ../pidgin/gtkblist.c:1482
 msgid "Auto-Join"
 msgstr "��亳�仂亠亟亳仆����� 舒于�仂仄舒�亳�亠�从亳"
 
-#: ../pidgin/gtkblist.c:1482
+#: ../pidgin/gtkblist.c:1484
 msgid "Persistent"
 msgstr "�亠仗�亠��于舒��亳亶��"
 
-#: ../pidgin/gtkblist.c:1520 ../pidgin/gtkblist.c:1543
+#: ../pidgin/gtkblist.c:1522 ../pidgin/gtkblist.c:1545
 msgid "_Collapse"
 msgstr "_弌于亠�仆���"
 
-#: ../pidgin/gtkblist.c:1548
+#: ../pidgin/gtkblist.c:1550
 msgid "_Expand"
 msgstr "�_舒亰于亠�仆���"
 
-#: ../pidgin/gtkblist.c:1799 ../pidgin/gtkblist.c:1811
-#: ../pidgin/gtkblist.c:5225 ../pidgin/gtkblist.c:5238
+#: ../pidgin/gtkblist.c:1801 ../pidgin/gtkblist.c:1813
+#: ../pidgin/gtkblist.c:5364 ../pidgin/gtkblist.c:5377
 msgid "/Tools/Mute Sounds"
 msgstr "/�仆����仄亠仆��/��从仍��亳�� 亰于�从亳"
 
-#: ../pidgin/gtkblist.c:2271 ../pidgin/gtkconv.c:4922
+#: ../pidgin/gtkblist.c:2273 ../pidgin/gtkconv.c:4813
 #: ../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
+#, fuzzy
+msgid "Unknown node type"
+msgstr "�亠亳亰于亠��仆�亶 从仂亟 仂�亳弍从亳 %d"
+
 #. Buddies menu
-#: ../pidgin/gtkblist.c:3103
+#: ../pidgin/gtkblist.c:3054
 msgid "/_Buddies"
 msgstr "/_弌仂弍亠�亠亟仆亳从亳"
 
-#: ../pidgin/gtkblist.c:3104
+#: ../pidgin/gtkblist.c:3055
 msgid "/Buddies/New Instant _Message..."
 msgstr "/弌仂弍亠�亠亟仆亳从亳/�仂于仂亠 仄亞仆仂于亠仆仆仂亠 �仂仂弍_�亠仆亳亠..."
 
-#: ../pidgin/gtkblist.c:3105
+#: ../pidgin/gtkblist.c:3056
 msgid "/Buddies/Join a _Chat..."
 msgstr "/弌仂弍亠�亠亟仆亳从亳/��亳�仂亠亟亳仆亳���� 从 _�舒��..."
 
-#: ../pidgin/gtkblist.c:3106
+#: ../pidgin/gtkblist.c:3057
 msgid "/Buddies/Get User _Info..."
 msgstr "/弌仂弍亠�亠亟仆亳从亳/�仂仍��亳�� 仗仂仍�亰仂于舒�亠仍��从�� _亳仆�仂�仄舒�亳�..."
 
-#: ../pidgin/gtkblist.c:3107
+#: ../pidgin/gtkblist.c:3058
 msgid "/Buddies/View User _Log..."
 msgstr "/弌仂弍亠�亠亟仆亳从亳/��仂�仄仂��亠�� _亢��仆舒仍 仗仂仍�亰仂于舒�亠仍�..."
 
-#: ../pidgin/gtkblist.c:3109
+#: ../pidgin/gtkblist.c:3060
 msgid "/Buddies/Sh_ow"
 msgstr "/弌仂弍亠�亠亟仆亳从亳/_�仂从舒亰�于舒��"
 
-#: ../pidgin/gtkblist.c:3110
+#: ../pidgin/gtkblist.c:3061
 msgid "/Buddies/Show/_Offline Buddies"
 msgstr "/弌仂弍亠�亠亟仆亳从亳/�仂从舒亰�于舒��/弌仂弍亠�亠亟仆亳从仂于 _仆亠 于 �亠�亳"
 
-#: ../pidgin/gtkblist.c:3111
+#: ../pidgin/gtkblist.c:3062
 msgid "/Buddies/Show/_Empty Groups"
 msgstr "/弌仂弍亠�亠亟仆亳从亳/�仂从舒亰�于舒��/�_����亠 亞��仗仗�"
 
-#: ../pidgin/gtkblist.c:3112
+#: ../pidgin/gtkblist.c:3063
 msgid "/Buddies/Show/Buddy _Details"
 msgstr "/弌仂弍亠�亠亟仆亳从亳/�仂从舒亰�于舒��/_�仂亟�仂弍仆仂��亳 仂 �仂弍亠�亠亟仆亳从舒�"
 
-#: ../pidgin/gtkblist.c:3113
+#: ../pidgin/gtkblist.c:3064
 msgid "/Buddies/Show/Idle _Times"
 msgstr "/弌仂弍亠�亠亟仆亳从亳/�仂从舒亰�于舒��/_��亠仄� 弍亠亰亟亠亶��于亳�"
 
-#: ../pidgin/gtkblist.c:3114
+#: ../pidgin/gtkblist.c:3065
 msgid "/Buddies/Show/_Protocol Icons"
 msgstr "/弌仂弍亠�亠亟仆亳从亳/�仂从舒亰�于舒��/_�仆舒�从亳 仗�仂�仂从仂仍仂于"
 
-#: ../pidgin/gtkblist.c:3115
+#: ../pidgin/gtkblist.c:3066
 msgid "/Buddies/_Sort Buddies"
 msgstr "/弌仂弍亠�亠亟仆亳从亳/_弌仂��亳�仂于舒�� �仂弍亠�亠亟仆亳从仂于"
 
-#: ../pidgin/gtkblist.c:3117
+#: ../pidgin/gtkblist.c:3068
 msgid "/Buddies/_Add Buddy..."
 msgstr "/弌仂弍亠�亠亟仆亳从亳/_�仂弍舒于亳�� �仂弍亠�亠亟仆亳从舒..."
 
-#: ../pidgin/gtkblist.c:3118
+#: ../pidgin/gtkblist.c:3069
 msgid "/Buddies/Add C_hat..."
 msgstr "/弌仂弍亠�亠亟仆亳从亳/�仂弍舒于亳�� �_舒�..."
 
-#: ../pidgin/gtkblist.c:3119
+#: ../pidgin/gtkblist.c:3070
 msgid "/Buddies/Add _Group..."
 msgstr "/弌仂弍亠�亠亟仆亳从亳/�仂弍舒于亳�� _亞��仗仗�..."
 
-#: ../pidgin/gtkblist.c:3121
+#: ../pidgin/gtkblist.c:3072
 msgid "/Buddies/_Quit"
 msgstr "/弌仂弍亠�亠亟仆亳从亳/�_�亶�亳"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:3124
+#: ../pidgin/gtkblist.c:3075
 msgid "/_Accounts"
 msgstr "/_丕���仆�亠 亰舒仗亳�亳"
 
-#: ../pidgin/gtkblist.c:3125 ../pidgin/gtkblist.c:7262
+#: ../pidgin/gtkblist.c:3076 ../pidgin/gtkblist.c:7403
 msgid "/Accounts/Manage"
 msgstr "/丕���仆�亠 亰舒仗亳�亳/丕仗�舒于仍亠仆亳亠"
 
 #. Tools
-#: ../pidgin/gtkblist.c:3128
+#: ../pidgin/gtkblist.c:3079
 msgid "/_Tools"
 msgstr "/_�仆����仄亠仆��"
 
-#: ../pidgin/gtkblist.c:3129
+#: ../pidgin/gtkblist.c:3080
 msgid "/Tools/Buddy _Pounces"
 msgstr "/�仆����仄亠仆��/_弌仍亠亢亠仆亳亠 亰舒 �仂弍亠�亠亟仆亳从舒仄亳"
 
-#: ../pidgin/gtkblist.c:3130
+#: ../pidgin/gtkblist.c:3081
 msgid "/Tools/_Certificates"
 msgstr "/�仆����仄亠仆��/弌_亠��亳�亳从舒��"
 
-#: ../pidgin/gtkblist.c:3131
+#: ../pidgin/gtkblist.c:3082
 msgid "/Tools/Plu_gins"
 msgstr "/�仆����仄亠仆��/_�仂亟�仍亳"
 
-#: ../pidgin/gtkblist.c:3132
+#: ../pidgin/gtkblist.c:3083
 msgid "/Tools/Pr_eferences"
 msgstr "/�仆����仄亠仆��/_�舒���仂亶从亳"
 
-#: ../pidgin/gtkblist.c:3133
+#: ../pidgin/gtkblist.c:3084
 msgid "/Tools/Pr_ivacy"
 msgstr "/�仆����仄亠仆��/�_仂仆�亳亟亠仆�亳舒仍�仆仂���"
 
-#: ../pidgin/gtkblist.c:3135
+#: ../pidgin/gtkblist.c:3086
 msgid "/Tools/_File Transfers"
 msgstr "/�仆����仄亠仆��/�亠�亠亟舒�舒 _�舒亶仍仂于"
 
-#: ../pidgin/gtkblist.c:3136
+#: ../pidgin/gtkblist.c:3087
 msgid "/Tools/R_oom List"
 msgstr "/�仆����仄亠仆��/弌仗亳�仂从 _从仂仄仆舒�"
 
-#: ../pidgin/gtkblist.c:3137
+#: ../pidgin/gtkblist.c:3088
 msgid "/Tools/System _Log"
 msgstr "/�仆����仄亠仆��/弌亳��亠仄仆�亶 _亢��仆舒仍"
 
-#: ../pidgin/gtkblist.c:3139
+#: ../pidgin/gtkblist.c:3090
 msgid "/Tools/Mute _Sounds"
 msgstr "/�仆����仄亠仆��/��从仍��亳�� _亰于�从亳"
 
 #. Help
-#: ../pidgin/gtkblist.c:3141
+#: ../pidgin/gtkblist.c:3092
 msgid "/_Help"
 msgstr "/_�仂仄仂��"
 
-#: ../pidgin/gtkblist.c:3142
+#: ../pidgin/gtkblist.c:3093
 msgid "/Help/Online _Help"
 msgstr "/�仂仄仂��/�仂仄仂�� 于 _�亠�亳"
 
-#: ../pidgin/gtkblist.c:3143
+#: ../pidgin/gtkblist.c:3094
 msgid "/Help/_Debug Window"
 msgstr "/�仂仄仂��/�从仆仂 _仂�仍舒亟从亳"
 
-#: ../pidgin/gtkblist.c:3145 ../pidgin/gtkblist.c:3147
+#: ../pidgin/gtkblist.c:3096 ../pidgin/gtkblist.c:3098
 msgid "/Help/_About"
 msgstr "/�仂仄仂��/� _仗�仂亞�舒仄仄亠"
 
-#: ../pidgin/gtkblist.c:3176
-#, c-format
-msgid ""
-"\n"
-"<b>Account:</b> %s"
+#: ../pidgin/gtkblist.c:3128
+#, fuzzy, c-format
+msgid "<b>Account:</b> %s"
+msgstr ""
+"\n"
+"<b>丕���仆舒� 亰舒仗亳��:</b> %s"
+
+#: ../pidgin/gtkblist.c:3136
+#, fuzzy, c-format
+msgid ""
+"\n"
+"<b>Topic:</b> %s"
 msgstr ""
 "\n"
 "<b>丕���仆舒� 亰舒仗亳��:</b> %s"
 
-#: ../pidgin/gtkblist.c:3254
+#: ../pidgin/gtkblist.c:3136
+#, fuzzy
+msgid "(no topic set)"
+msgstr "丐亠仄舒 仆亠 ���舒仆仂于仍亠仆舒"
+
+#: ../pidgin/gtkblist.c:3213
 msgid "Buddy Alias"
 msgstr "��亠于亟仂仆亳仄 �仂弍亠�亠亟仆亳从舒"
 
-#: ../pidgin/gtkblist.c:3283
+#: ../pidgin/gtkblist.c:3242
 msgid "Logged In"
 msgstr "� �亠�亳"
 
-#: ../pidgin/gtkblist.c:3329
+#: ../pidgin/gtkblist.c:3288
 msgid "Last Seen"
 msgstr "�仂�仍亠亟仆亠亠 仗仂�于仍亠仆亳亠"
 
-#: ../pidgin/gtkblist.c:3350
+#: ../pidgin/gtkblist.c:3309
 msgid "Spooky"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3352
+#: ../pidgin/gtkblist.c:3311
 msgid "Awesome"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3354
+#: ../pidgin/gtkblist.c:3313
 msgid "Rockin'"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3693
+#: ../pidgin/gtkblist.c:3329
+#, fuzzy
+msgid "Total Buddies"
+msgstr "弌仂弍亠�亠亟仆亳从亳"
+
+#: ../pidgin/gtkblist.c:3696
 #, c-format
 msgid "Idle %dd %dh %02dm"
 msgstr "�亠亰亟亠亶��于�亠� %d亟 %d� %02d仄"
 
-#: ../pidgin/gtkblist.c:3695
+#: ../pidgin/gtkblist.c:3698
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "�亠亰亟亠亶��于�亠� %d� %02d仄"
 
-#: ../pidgin/gtkblist.c:3697
+#: ../pidgin/gtkblist.c:3700
 #, c-format
 msgid "Idle %dm"
 msgstr "�亠亰亟亠亶��于�亠� %d仄"
 
-#: ../pidgin/gtkblist.c:3851
+#: ../pidgin/gtkblist.c:3854
 msgid "/Buddies/New Instant Message..."
 msgstr "/弌仂弍亠�亠亟仆亳从亳/�仂于仂亠 仄亞仆仂于亠仆仆仂亠 �仂仂弍�亠仆亳亠..."
 
-#: ../pidgin/gtkblist.c:3852 ../pidgin/gtkblist.c:3885
-msgid "/Buddies/Join a Chat..."
-msgstr "/弌仂弍亠�亠亟仆亳从亳/��亳�仂亠亟亳仆亳���� 从 �舒��..."
-
-#: ../pidgin/gtkblist.c:3853
-msgid "/Buddies/Get User Info..."
-msgstr "/弌仂弍亠�亠亟仆亳从亳/�仂仍��亳�� 仗仂仍�亰仂于舒�亠仍��从�� 亳仆�仂�仄舒�亳�..."
-
-#: ../pidgin/gtkblist.c:3854
-msgid "/Buddies/Add Buddy..."
-msgstr "/弌仂弍亠�亠亟仆亳从亳/�仂弍舒于亳�� �仂弍亠�亠亟仆亳从舒..."
-
 #: ../pidgin/gtkblist.c:3855 ../pidgin/gtkblist.c:3888
+msgid "/Buddies/Join a Chat..."
+msgstr "/弌仂弍亠�亠亟仆亳从亳/��亳�仂亠亟亳仆亳���� 从 �舒��..."
+
+#: ../pidgin/gtkblist.c:3856
+msgid "/Buddies/Get User Info..."
+msgstr "/弌仂弍亠�亠亟仆亳从亳/�仂仍��亳�� 仗仂仍�亰仂于舒�亠仍��从�� 亳仆�仂�仄舒�亳�..."
+
+#: ../pidgin/gtkblist.c:3857
+msgid "/Buddies/Add Buddy..."
+msgstr "/弌仂弍亠�亠亟仆亳从亳/�仂弍舒于亳�� �仂弍亠�亠亟仆亳从舒..."
+
+#: ../pidgin/gtkblist.c:3858 ../pidgin/gtkblist.c:3891
 msgid "/Buddies/Add Chat..."
 msgstr "/弌仂弍亠�亠亟仆亳从亳/�仂弍舒于亳�� �舒�..."
 
-#: ../pidgin/gtkblist.c:3856
+#: ../pidgin/gtkblist.c:3859
 msgid "/Buddies/Add Group..."
 msgstr "/弌仂弍亠�亠亟仆亳从亳/�仂弍舒于亳�� 亞��仗仗�..."
 
-#: ../pidgin/gtkblist.c:3891
+#: ../pidgin/gtkblist.c:3894
 msgid "/Tools/Privacy"
 msgstr "/�仆����仄亠仆��/�仂仆�亳亟亠仆�亳舒仍�仆仂���"
 
-#: ../pidgin/gtkblist.c:3894
+#: ../pidgin/gtkblist.c:3897
 msgid "/Tools/Room List"
 msgstr "/�仆����仄亠仆��/弌仗亳�仂从 从仂仄仆舒�"
 
-#: ../pidgin/gtkblist.c:4026 ../pidgin/gtkdocklet.c:155
+#: ../pidgin/gtkblist.c:4029 ../pidgin/gtkdocklet.c:155
 #: ../pidgin/gtkdocklet.c:160
 #, c-format
 msgid "%d unread message from %s\n"
@@ -14202,70 +14497,69 @@
 msgstr[1] "%d 仆亠仗�仂�亳�舒仆仆�� �仂仂弍�亠仆亳� 仂� %s\n"
 msgstr[2] "%d 仆亠仗�仂�亳�舒仆仆�� �仂仂弍�亠仆亳亶 仂� %s\n"
 
-#: ../pidgin/gtkblist.c:4189
+#: ../pidgin/gtkblist.c:4192
 msgid "Manually"
 msgstr "����仆��"
 
-#: ../pidgin/gtkblist.c:4192
+#: ../pidgin/gtkblist.c:4195
 msgid "By status"
 msgstr "�仂 ��舒����"
 
-#: ../pidgin/gtkblist.c:4193
+#: ../pidgin/gtkblist.c:4196
 msgid "By log size"
 msgstr "�仂 �舒亰仄亠�� 亢��仆舒仍舒"
 
-#: ../pidgin/gtkblist.c:4483
+#: ../pidgin/gtkblist.c:4533
 #, c-format
 msgid "%s disconnected"
 msgstr "弌仂亠亟亳仆亠仆亳亠 � %s �舒亰仂�于舒仆仂"
 
-#: ../pidgin/gtkblist.c:4485
+#: ../pidgin/gtkblist.c:4535
 #, fuzzy, c-format
 msgid "%s disabled"
 msgstr "�仂仄舒仆亟舒 仂�从仍��亠仆舒"
 
-#: ../pidgin/gtkblist.c:4489
+#: ../pidgin/gtkblist.c:4539
 #, fuzzy
 msgid "Reconnect"
 msgstr "丕��舒仆仂于亳�� �仂亠亟亳仆亠仆亳亠"
 
-#: ../pidgin/gtkblist.c:4489 ../pidgin/gtkblist.c:4577
+#: ../pidgin/gtkblist.c:4539 ../pidgin/gtkblist.c:4658
 #, fuzzy
 msgid "Re-enable"
 msgstr "�仂于�仂�仆仂 于从仍��亳�� ����仆�� 亰舒仗亳��"
 
-#: ../pidgin/gtkblist.c:4493 ../pidgin/gtkblist.c:4580
-#: ../pidgin/gtkconv.c:1679
-msgid "Ignore"
-msgstr "�亞仆仂�亳�仂于舒��"
-
-#: ../pidgin/gtkblist.c:4604
+#: ../pidgin/gtkblist.c:4656
+msgid "Welcome back!"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:4692
 #, fuzzy, c-format
-msgid "%d account was disabled because you signed on from another location."
+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."
+"%d accounts were disabled because you signed on from another location:"
 msgstr[0] "�� 仗仂亟从仍��亠仆� 亳亰 亟��亞仂亞仂 仄亠��舒."
 msgstr[1] "�� 仗仂亟从仍��亠仆� 亳亰 亟��亞仂亞仂 仄亠��舒."
 msgstr[2] "�� 仗仂亟从仍��亠仆� 亳亰 亟��亞仂亞仂 仄亠��舒."
 
-#: ../pidgin/gtkblist.c:4831
+#: ../pidgin/gtkblist.c:4971
 msgid "<b>Username:</b>"
 msgstr "<b>�仄� 仗仂仍�亰仂于舒�亠仍�:</b>"
 
-#: ../pidgin/gtkblist.c:4838
+#: ../pidgin/gtkblist.c:4978
 msgid "<b>Password:</b>"
 msgstr "<b>�舒�仂仍�:</b>"
 
-#: ../pidgin/gtkblist.c:4849
+#: ../pidgin/gtkblist.c:4989
 msgid "_Login"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:4934
+#: ../pidgin/gtkblist.c:5073
 msgid "/Accounts"
 msgstr "/丕���仆�亠 亰舒仗亳�亳"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4948
+#: ../pidgin/gtkblist.c:5087
 #, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
@@ -14284,27 +14578,27 @@
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:5219
+#: ../pidgin/gtkblist.c:5358
 msgid "/Buddies/Show/Offline Buddies"
 msgstr "/弌仂弍亠�亠亟仆亳从亳/�仂从舒亰�于舒��/弌仂弍亠�亠亟仆亳从仂于 仆亠 于 �亠�亳"
 
-#: ../pidgin/gtkblist.c:5222
+#: ../pidgin/gtkblist.c:5361
 msgid "/Buddies/Show/Empty Groups"
 msgstr "/弌仂弍亠�亠亟仆亳从亳/�仂从舒亰�于舒��/�����亠 亞��仗仗�"
 
-#: ../pidgin/gtkblist.c:5228
+#: ../pidgin/gtkblist.c:5367
 msgid "/Buddies/Show/Buddy Details"
 msgstr "/弌仂弍亠�亠亟仆亳从亳/�仂从舒亰�于舒��/�仂亟�仂弍仆仂��亳 仂 �仂弍亠�亠亟仆亳从舒�"
 
-#: ../pidgin/gtkblist.c:5231
+#: ../pidgin/gtkblist.c:5370
 msgid "/Buddies/Show/Idle Times"
 msgstr "/弌仂弍亠�亠亟仆亳从亳/�仂从舒亰�于舒��/��亠仄� 弍亠亰亟亠亶��于亳�"
 
-#: ../pidgin/gtkblist.c:5234
+#: ../pidgin/gtkblist.c:5373
 msgid "/Buddies/Show/Protocol Icons"
 msgstr "/弌仂弍亠�亠亟仆亳从亳/�仂从舒亰�于舒��/�仆舒�从亳 仗�仂�仂从仂仍仂于"
 
-#: ../pidgin/gtkblist.c:6166
+#: ../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. "
@@ -14316,30 +14610,30 @@
 "仗仂仍�亰仂于舒�亠仍�, 从仂亞亟舒 ��仂 于仂亰仄仂亢仆仂.\n"
 
 #. Set up stuff for the account box
-#: ../pidgin/gtkblist.c:6189
+#: ../pidgin/gtkblist.c:6347
 msgid "A_ccount:"
 msgstr "_丕���仆舒� 亰舒仗亳��:"
 
 #. End of account box
-#: ../pidgin/gtkblist.c:6201
+#: ../pidgin/gtkblist.c:6359
 msgid "_Screen name:"
 msgstr "_�亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍�:"
 
-#: ../pidgin/gtkblist.c:6223 ../pidgin/gtkblist.c:6581
+#: ../pidgin/gtkblist.c:6381 ../pidgin/gtkblist.c:6731
 msgid "A_lias:"
 msgstr "_��亠于亟仂仆亳仄:"
 
-#: ../pidgin/gtkblist.c:6491
+#: ../pidgin/gtkblist.c:6648
 msgid "This protocol does not support chat rooms."
 msgstr "亅�仂� 仗�仂�仂从仂仍 仆亠 仗仂亟亟亠�亢亳于舒亠� �舒��."
 
-#: ../pidgin/gtkblist.c:6507
+#: ../pidgin/gtkblist.c:6664
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "�� 仆亠 仗仂亟从仍��亠仆� 仗仂 仗�仂�仂从仂仍舒仄, 亳仄亠��亳仄 仗仂亟亟亠�亢从� �舒�仂于."
 
-#: ../pidgin/gtkblist.c:6550
+#: ../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"
@@ -14347,75 +14641,75 @@
 "�于亠亟亳�亠 仗�亠于亟仂仆亳仄 亳 �仂仂�于亠���于����� 亳仆�仂�仄舒�亳� 仂 �舒�亠, 从仂�仂��亶 于� �仂�亠仍亳 弍� "
 "亟仂弍舒于亳�� 于 �仗亳�仂从 �仂弍亠�亠亟仆亳从仂于.\n"
 
-#: ../pidgin/gtkblist.c:6609
-msgid "Autojoin when account becomes online."
-msgstr ""
-
-#: ../pidgin/gtkblist.c:6610
-msgid "Hide chat when the window is closed."
-msgstr ""
-
-#: ../pidgin/gtkblist.c:6636
+#: ../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:7282
+#: ../pidgin/gtkblist.c:7423
 msgid "<PurpleMain>/Accounts/"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:7306
+#: ../pidgin/gtkblist.c:7447
 msgid "_Edit Account"
 msgstr "_�亰仄亠仆亳�� ����仆�� 亰舒仗亳��"
 
-#: ../pidgin/gtkblist.c:7319 ../pidgin/gtkconv.c:3146
+#: ../pidgin/gtkblist.c:7460 ../pidgin/gtkconv.c:3132
 msgid "No actions available"
 msgstr "�亠� 亟仂���仗仆�� 亟亠亶��于亳亶"
 
-#: ../pidgin/gtkblist.c:7327
+#: ../pidgin/gtkblist.c:7468
 msgid "_Disable"
 msgstr "_��从仍��亳��"
 
-#: ../pidgin/gtkblist.c:7339
+#: ../pidgin/gtkblist.c:7480
 msgid "Enable Account"
 msgstr "�从仍��亳�� ����仆�� 亰舒仗亳��"
 
-#: ../pidgin/gtkblist.c:7345
+#: ../pidgin/gtkblist.c:7486
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:7394
+#: ../pidgin/gtkblist.c:7535
 msgid "/Tools"
 msgstr "/�仆����仄亠仆��"
 
-#: ../pidgin/gtkblist.c:7464
+#: ../pidgin/gtkblist.c:7605
 msgid "/Buddies/Sort Buddies"
 msgstr "/弌仂弍亠�亠亟仆亳从亳/弌仂��亳�仂于舒�� �仂弍亠�亠亟仆亳从仂于"
 
 #. Widget creation function
-#: ../pidgin/gtkcertmgr.c:531
+#: ../pidgin/gtkcertmgr.c:541
 msgid "SSL Servers"
 msgstr "SSL-�亠�于亠��"
 
-#: ../pidgin/gtkconv.c:524
+#: ../pidgin/gtkconv.c:485
 msgid "Unknown command."
 msgstr "�亠亳亰于亠��仆舒� 从仂仄舒仆亟舒."
 
-#: ../pidgin/gtkconv.c:796 ../pidgin/gtkconv.c:822
+#: ../pidgin/gtkconv.c:755 ../pidgin/gtkconv.c:781
 msgid "That buddy is not on the same protocol as this chat."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:816
+#: ../pidgin/gtkconv.c:775
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr ""
 "�� 仆亠 仗仂亟从仍��亠仆� � ����仆仂亶 亰舒仗亳���, 仗仂亰于仂仍���亠亶 仗�亳亞仍舒�亳�� ��仂亞仂 �仂弍亠�亠亟仆亳从舒."
 
-#: ../pidgin/gtkconv.c:869
+#: ../pidgin/gtkconv.c:828
 msgid "Invite Buddy Into Chat Room"
 msgstr "��亳亞仍舒�亳�� �仂弍亠�亠亟仆亳从舒 于 �舒�"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:899
+#: ../pidgin/gtkconv.c:858
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -14423,179 +14717,183 @@
 "�于亠亟亳�亠 亳仄� 仗仂仍�亰仂于舒�亠仍�, 从仂�仂�仂亞仂 于� �仂�亳�亠 仗�亳亞仍舒�亳��, 于仄亠��亠 � "
 "仆亠仂弍�亰舒�亠仍�仆�仄 �亠从��仂仄 仗�亳亞仍舒�亠仆亳�."
 
-#: ../pidgin/gtkconv.c:920
+#: ../pidgin/gtkconv.c:879
 msgid "_Buddy:"
 msgstr "_弌仂弍亠�亠亟仆亳从:"
 
-#: ../pidgin/gtkconv.c:931 ../pidgin/gtksavedstatuses.c:1200
-#: ../pidgin/gtksavedstatuses.c:1536
+#: ../pidgin/gtkconv.c:890 ../pidgin/gtksavedstatuses.c:1166
+#: ../pidgin/gtksavedstatuses.c:1484
 msgid "_Message:"
 msgstr "弌仂仂弍_�亠仆亳亠:"
 
-#: ../pidgin/gtkconv.c:995
+#: ../pidgin/gtkconv.c:954
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>�亠�亠亟舒 � %s</h1>\n"
 
-#: ../pidgin/gtkconv.c:1033
+#: ../pidgin/gtkconv.c:992
 msgid "Save Conversation"
 msgstr "弌仂��舒仆亳�� 弍亠�亠亟�"
 
-#: ../pidgin/gtkconv.c:1179 ../pidgin/gtkdebug.c:168 ../pidgin/gtkdebug.c:748
+#: ../pidgin/gtkconv.c:1138 ../pidgin/gtkdebug.c:167 ../pidgin/gtkdebug.c:740
 msgid "Find"
 msgstr "�舒亶�亳"
 
-#: ../pidgin/gtkconv.c:1205 ../pidgin/gtkdebug.c:196
+#: ../pidgin/gtkconv.c:1164 ../pidgin/gtkdebug.c:195
 msgid "_Search for:"
 msgstr "_��从舒��:"
 
-#: ../pidgin/gtkconv.c:1676
+#: ../pidgin/gtkconv.c:1665
 msgid "Un-Ignore"
 msgstr "�亠 亳亞仆仂�亳�仂于舒��"
 
-#: ../pidgin/gtkconv.c:1699
+#: ../pidgin/gtkconv.c:1668
+msgid "Ignore"
+msgstr "�亞仆仂�亳�仂于舒��"
+
+#: ../pidgin/gtkconv.c:1688
 msgid "Get Away Message"
 msgstr "�仂仍��亳�� �仂仂弍�亠仆亳亠 仂弍 仂������于亳亳"
 
-#: ../pidgin/gtkconv.c:1722
+#: ../pidgin/gtkconv.c:1711
 msgid "Last said"
 msgstr "�仂�仍亠亟仆亠亠 �从舒亰舒仆仆仂亠"
 
-#: ../pidgin/gtkconv.c:2671
+#: ../pidgin/gtkconv.c:2664
 msgid "Unable to save icon file to disk."
 msgstr "�亠 �亟舒���� �仂��舒仆亳�� �舒亶仍 亰仆舒�从舒 仆舒 亟亳�从."
 
-#: ../pidgin/gtkconv.c:2722
+#: ../pidgin/gtkconv.c:2715
 msgid "Save Icon"
 msgstr "弌仂��舒仆亳�� 亰仆舒�仂从"
 
-#: ../pidgin/gtkconv.c:2774
+#: ../pidgin/gtkconv.c:2767
 msgid "Animate"
 msgstr "�仆亳仄亳�仂于舒��"
 
-#: ../pidgin/gtkconv.c:2779
+#: ../pidgin/gtkconv.c:2772
 msgid "Hide Icon"
 msgstr "弌从���� 亰仆舒�仂从"
 
-#: ../pidgin/gtkconv.c:2782
+#: ../pidgin/gtkconv.c:2775
 msgid "Save Icon As..."
 msgstr "弌仂��舒仆亳�� 亰仆舒�仂从 从舒从..."
 
-#: ../pidgin/gtkconv.c:2786
+#: ../pidgin/gtkconv.c:2779
 msgid "Set Custom Icon..."
 msgstr "丕��舒仆仂于亳�� �仂弍��于亠仆仆�亶 亰仆舒�仂从..."
 
-#: ../pidgin/gtkconv.c:2799
+#: ../pidgin/gtkconv.c:2792
 msgid "Remove Custom Icon"
 msgstr "丕亟舒仍亳�� �仂弍��于亠仆仆�亶 亰仆舒�仂从"
 
-#: ../pidgin/gtkconv.c:2931
+#: ../pidgin/gtkconv.c:2917
 msgid "Show All"
 msgstr ""
 
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2950
+#: ../pidgin/gtkconv.c:2936
 msgid "/_Conversation"
 msgstr "/_�亠�亠亟舒"
 
-#: ../pidgin/gtkconv.c:2952
+#: ../pidgin/gtkconv.c:2938
 msgid "/Conversation/New Instant _Message..."
 msgstr "/�亠�亠亟舒/�仂于仂亠 仄亞仆仂于亠仆仆仂亠 �仂仂弍_�亠仆亳亠..."
 
-#: ../pidgin/gtkconv.c:2957
+#: ../pidgin/gtkconv.c:2943
 msgid "/Conversation/_Find..."
 msgstr "/�亠�亠亟舒/_�舒亶�亳..."
 
-#: ../pidgin/gtkconv.c:2959
+#: ../pidgin/gtkconv.c:2945
 msgid "/Conversation/View _Log"
 msgstr "/�亠�亠亟舒/��仂�仄仂��亠�� _亢��仆舒仍"
 
-#: ../pidgin/gtkconv.c:2960
+#: ../pidgin/gtkconv.c:2946
 msgid "/Conversation/_Save As..."
 msgstr "/�亠�亠亟舒/弌仂_��舒仆亳�� 从舒从..."
 
-#: ../pidgin/gtkconv.c:2962
+#: ../pidgin/gtkconv.c:2948
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/�亠�亠亟舒/�_�亳��亳��"
 
-#: ../pidgin/gtkconv.c:2966
+#: ../pidgin/gtkconv.c:2952
 msgid "/Conversation/Se_nd File..."
 msgstr "/�亠�亠亟舒/��仗�舒于亳�� _�舒亶仍..."
 
+#: ../pidgin/gtkconv.c:2953
+msgid "/Conversation/Add Buddy _Pounce..."
+msgstr "/�亠�亠亟舒/�仂弍舒于亳�� 仗_�舒于亳仍仂..."
+
+#: ../pidgin/gtkconv.c:2955
+msgid "/Conversation/_Get Info"
+msgstr "/�亠�亠亟舒/�仂仍��亳�� _亳仆�仂�仄舒�亳�"
+
+#: ../pidgin/gtkconv.c:2957
+msgid "/Conversation/In_vite..."
+msgstr "/�亠�亠亟舒/��亳亞_仍舒�亳��..."
+
+#: ../pidgin/gtkconv.c:2959
+msgid "/Conversation/M_ore"
+msgstr "/�亠�亠亟舒/_���"
+
+#: ../pidgin/gtkconv.c:2963
+msgid "/Conversation/Al_ias..."
+msgstr "/�亠�亠亟舒/_��亠于亟仂仆亳仄..."
+
+#: ../pidgin/gtkconv.c:2965
+msgid "/Conversation/_Block..."
+msgstr "/�亠�亠亟舒/_�仍仂从亳�仂于舒��..."
+
 #: ../pidgin/gtkconv.c:2967
-msgid "/Conversation/Add Buddy _Pounce..."
-msgstr "/�亠�亠亟舒/�仂弍舒于亳�� 仗_�舒于亳仍仂..."
+msgid "/Conversation/_Unblock..."
+msgstr "/�亠�亠亟舒/�舒亰_弍仍仂从亳�仂于舒��..."
 
 #: ../pidgin/gtkconv.c:2969
-msgid "/Conversation/_Get Info"
-msgstr "/�亠�亠亟舒/�仂仍��亳�� _亳仆�仂�仄舒�亳�"
+msgid "/Conversation/_Add..."
+msgstr "/�亠�亠亟舒/_�仂弍舒于亳��..."
 
 #: ../pidgin/gtkconv.c:2971
-msgid "/Conversation/In_vite..."
-msgstr "/�亠�亠亟舒/��亳亞_仍舒�亳��..."
-
-#: ../pidgin/gtkconv.c:2973
-msgid "/Conversation/M_ore"
-msgstr "/�亠�亠亟舒/_���"
-
-#: ../pidgin/gtkconv.c:2977
-msgid "/Conversation/Al_ias..."
-msgstr "/�亠�亠亟舒/_��亠于亟仂仆亳仄..."
-
-#: ../pidgin/gtkconv.c:2979
-msgid "/Conversation/_Block..."
-msgstr "/�亠�亠亟舒/_�仍仂从亳�仂于舒��..."
-
-#: ../pidgin/gtkconv.c:2981
-msgid "/Conversation/_Unblock..."
-msgstr "/�亠�亠亟舒/�舒亰_弍仍仂从亳�仂于舒��..."
-
-#: ../pidgin/gtkconv.c:2983
-msgid "/Conversation/_Add..."
-msgstr "/�亠�亠亟舒/_�仂弍舒于亳��..."
-
-#: ../pidgin/gtkconv.c:2985
 msgid "/Conversation/_Remove..."
 msgstr "/�亠�亠亟舒/_丕亟舒仍亳��..."
 
-#: ../pidgin/gtkconv.c:2990
+#: ../pidgin/gtkconv.c:2976
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/�亠�亠亟舒/���舒于亳�� _���仍从�..."
 
-#: ../pidgin/gtkconv.c:2992
+#: ../pidgin/gtkconv.c:2978
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/�亠�亠亟舒/���舒于亳�� 亳亰_仂弍�舒亢亠仆亳亠..."
 
-#: ../pidgin/gtkconv.c:2998
+#: ../pidgin/gtkconv.c:2984
 msgid "/Conversation/_Close"
 msgstr "/�亠�亠亟舒/_�舒从����"
 
 #. Options
-#: ../pidgin/gtkconv.c:3002
+#: ../pidgin/gtkconv.c:2988
 msgid "/_Options"
 msgstr "/_�舒�舒仄亠���"
 
-#: ../pidgin/gtkconv.c:3003
+#: ../pidgin/gtkconv.c:2989
 msgid "/Options/Enable _Logging"
 msgstr "/�舒�舒仄亠���/�亠��亳 _亢��仆舒仍"
 
-#: ../pidgin/gtkconv.c:3004
+#: ../pidgin/gtkconv.c:2990
 msgid "/Options/Enable _Sounds"
 msgstr "/�舒�舒仄亠���/�仂�仗�仂亳亰于仂亟亳�� _亰于�从亳"
 
-#: ../pidgin/gtkconv.c:3006
+#: ../pidgin/gtkconv.c:2992
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/�舒�舒仄亠���/�仂从舒亰�于舒�� _仗舒仆亠仍亳 �仂�仄舒�亳�仂于舒仆亳�"
 
-#: ../pidgin/gtkconv.c:3007
+#: ../pidgin/gtkconv.c:2993
 msgid "/Options/Show Ti_mestamps"
 msgstr "/�舒�舒仄亠���/�仂从舒亰�于舒�� _于�亠仄� �仂仂弍�亠仆亳亶"
 
-#: ../pidgin/gtkconv.c:3134
+#: ../pidgin/gtkconv.c:3120
 msgid "/Conversation/More"
 msgstr "/�亠�亠亟舒/���"
 
-#: ../pidgin/gtkconv.c:3190
+#: ../pidgin/gtkconv.c:3176
 msgid "/Options"
 msgstr "/�舒�舒仄亠���"
 
@@ -14604,97 +14902,100 @@
 #. 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:3225 ../pidgin/gtkconv.c:3257
+#: ../pidgin/gtkconv.c:3211 ../pidgin/gtkconv.c:3243
 msgid "/Conversation"
 msgstr "/�亠�亠亟舒"
 
-#: ../pidgin/gtkconv.c:3265
+#: ../pidgin/gtkconv.c:3251
 msgid "/Conversation/View Log"
 msgstr "/�亠�亠亟舒/��仂�仄仂��亠�� 亢��仆舒仍"
 
-#: ../pidgin/gtkconv.c:3271
+#: ../pidgin/gtkconv.c:3257
 msgid "/Conversation/Send File..."
 msgstr "/�亠�亠亟舒/��仗�舒于亳�� �舒亶仍..."
 
-#: ../pidgin/gtkconv.c:3275
+#: ../pidgin/gtkconv.c:3261
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/�亠�亠亟舒/�仂弍舒于亳�� 仗�舒于亳仍仂..."
 
-#: ../pidgin/gtkconv.c:3281
+#: ../pidgin/gtkconv.c:3267
 msgid "/Conversation/Get Info"
 msgstr "/�亠�亠亟舒/�仂仍��亳�� 亳仆�仂�仄舒�亳�"
 
-#: ../pidgin/gtkconv.c:3285
+#: ../pidgin/gtkconv.c:3271
 msgid "/Conversation/Invite..."
 msgstr "/�亠�亠亟舒/��亳亞仍舒�亳��..."
 
-#: ../pidgin/gtkconv.c:3291
+#: ../pidgin/gtkconv.c:3277
 msgid "/Conversation/Alias..."
 msgstr "/�亠�亠亟舒/��亠于亟仂仆亳仄..."
 
-#: ../pidgin/gtkconv.c:3295
+#: ../pidgin/gtkconv.c:3281
 msgid "/Conversation/Block..."
 msgstr "/�亠�亠亟舒/�仍仂从亳�仂于舒��..."
 
-#: ../pidgin/gtkconv.c:3299
+#: ../pidgin/gtkconv.c:3285
 msgid "/Conversation/Unblock..."
 msgstr "/�亠�亠亟舒/�舒亰弍仍仂从亳�仂于舒��..."
 
-#: ../pidgin/gtkconv.c:3303
+#: ../pidgin/gtkconv.c:3289
 msgid "/Conversation/Add..."
 msgstr "/�亠�亠亟舒/�仂弍舒于亳��..."
 
-#: ../pidgin/gtkconv.c:3307
+#: ../pidgin/gtkconv.c:3293
 msgid "/Conversation/Remove..."
 msgstr "/�亠�亠亟舒/丕亟舒仍亳��..."
 
-#: ../pidgin/gtkconv.c:3313
+#: ../pidgin/gtkconv.c:3299
 msgid "/Conversation/Insert Link..."
 msgstr "/�亠�亠亟舒/���舒于亳�� ���仍从�..."
 
-#: ../pidgin/gtkconv.c:3317
+#: ../pidgin/gtkconv.c:3303
 msgid "/Conversation/Insert Image..."
 msgstr "/�亠�亠亟舒/���舒于亳�� 亳亰仂弍�舒亢亠仆亳亠..."
 
-#: ../pidgin/gtkconv.c:3323
+#: ../pidgin/gtkconv.c:3309
 msgid "/Options/Enable Logging"
 msgstr "/�舒�舒仄亠���/�亠��亳 亢��仆舒仍"
 
-#: ../pidgin/gtkconv.c:3326
+#: ../pidgin/gtkconv.c:3312
 msgid "/Options/Enable Sounds"
 msgstr "/�舒�舒仄亠���/�仂�仗�仂亳亰于仂亟亳�� 亰于�从亳"
 
-#: ../pidgin/gtkconv.c:3339
+#: ../pidgin/gtkconv.c:3325
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/�舒�舒仄亠���/�仂从舒亰�于舒�� 仗舒仆亠仍亳 �仂�仄舒�亳�仂于舒仆亳�"
 
-#: ../pidgin/gtkconv.c:3342
+#: ../pidgin/gtkconv.c:3328
 msgid "/Options/Show Timestamps"
 msgstr "/�舒�舒仄亠���/�仂从舒亰�于舒�� 于�亠仄� �仂仂弍�亠仆亳亶"
 
-#: ../pidgin/gtkconv.c:3419 ../pidgin/gtkconv.c:3461
+#: ../pidgin/gtkconv.c:3406
 msgid "User is typing..."
 msgstr "�仂仍�亰仂于舒�亠仍� 仆舒弍亳�舒亠� �仂仂弍�亠仆亳亠..."
 
-#: ../pidgin/gtkconv.c:3464
-msgid "User has typed something and stopped"
-msgstr "�仂仍�亰仂于舒�亠仍� ��仂-�仂 仆舒弍�舒仍 亳 仂��舒仆仂于亳仍��"
+#: ../pidgin/gtkconv.c:3476
+#, fuzzy, c-format
+msgid ""
+"\n"
+"%s has stopped typing"
+msgstr "%s 仗�亠从�舒�亳仍 仆舒弍仂� �仂仂弍�亠仆亳� 亟仍� 于舒� (%s)"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3648 ../pidgin/gtkconv.c:8248
+#: ../pidgin/gtkconv.c:3642 ../pidgin/gtkconv.c:8313
 msgid "S_end To"
 msgstr "_�亟�亠�舒�"
 
-#: ../pidgin/gtkconv.c:4360
+#: ../pidgin/gtkconv.c:4354
 msgid "_Send"
 msgstr "_��仗�舒于亳��"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4473
+#: ../pidgin/gtkconv.c:4492
 msgid "0 people in room"
 msgstr "0 仗仂仍�亰仂于舒�亠仍亠亶 于 从仂仄仆舒�亠"
 
-#: ../pidgin/gtkconv.c:5846 ../pidgin/gtkconv.c:5967
+#: ../pidgin/gtkconv.c:5791 ../pidgin/gtkconv.c:5912
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
@@ -14702,139 +15003,139 @@
 msgstr[1] "%d 仗仂仍�亰仂于舒�亠仍� 于 从仂仄仆舒�亠"
 msgstr[2] "%d 仗仂仍�亰仂于舒�亠仍亠亶 于 从仂仄仆舒�亠"
 
-#: ../pidgin/gtkconv.c:6574 ../pidgin/gtkstatusbox.c:660
+#: ../pidgin/gtkconv.c:6539 ../pidgin/gtkstatusbox.c:679
 msgid "Typing"
 msgstr "�舒弍亳�舒亠� �仂仂弍�亠仆亳亠"
 
-#: ../pidgin/gtkconv.c:6578
+#: ../pidgin/gtkconv.c:6543
 msgid "Stopped Typing"
 msgstr "��亠从�舒�亳仍 仆舒弍仂� �仂仂弍�亠仆亳�"
 
-#: ../pidgin/gtkconv.c:6581
+#: ../pidgin/gtkconv.c:6546
 msgid "Nick Said"
 msgstr "��仂亳亰仆亠�亠仆仂 亳仄�"
 
-#: ../pidgin/gtkconv.c:6584 ../pidgin/gtkdocklet.c:685
+#: ../pidgin/gtkconv.c:6549 ../pidgin/gtkdocklet.c:686
 msgid "Unread Messages"
 msgstr "�亠仗�仂�亳�舒仆仆�亠 �仂仂弍�亠仆亳�"
 
-#: ../pidgin/gtkconv.c:6590
+#: ../pidgin/gtkconv.c:6555
 msgid "New Event"
 msgstr "�仂于仂亠 �仂弍��亳亠"
 
-#: ../pidgin/gtkconv.c:7767
+#: ../pidgin/gtkconv.c:7785
 msgid "clear: Clears all conversation scrollbacks."
 msgstr "clear: ��亳��亳�� 于�亠 仂从仆舒 弍亠�亠亟."
 
-#: ../pidgin/gtkconv.c:7930
+#: ../pidgin/gtkconv.c:7989
 msgid "Confirm close"
 msgstr "�仂亟�于亠�亟亳�� 亰舒从���亳亠"
 
-#: ../pidgin/gtkconv.c:7962
+#: ../pidgin/gtkconv.c:8021
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "���� 仆亠仗�仂�亳�舒仆仆�亠 �仂仂弍�亠仆亳�. �� 亟亠亶��于亳�亠仍�仆仂 �仂�亳�亠 亰舒从���� 仂从仆仂?"
 
-#: ../pidgin/gtkconv.c:8581
+#: ../pidgin/gtkconv.c:8654
 msgid "Close other tabs"
 msgstr "�舒从���� 亟��亞亳亠 于从仍舒亟从亳"
 
-#: ../pidgin/gtkconv.c:8587
+#: ../pidgin/gtkconv.c:8660
 msgid "Close all tabs"
 msgstr "�舒从���� 于�亠 于从仍舒亟从亳"
 
-#: ../pidgin/gtkconv.c:8595
+#: ../pidgin/gtkconv.c:8668
 msgid "Detach this tab"
 msgstr "��亟亠仍亳�� ��� 于从仍舒亟从�"
 
-#: ../pidgin/gtkconv.c:8601
+#: ../pidgin/gtkconv.c:8674
 msgid "Close this tab"
 msgstr "�舒从���� ��� 于从仍舒亟从�"
 
-#: ../pidgin/gtkconv.c:9106
+#: ../pidgin/gtkconv.c:9188
 msgid "Close conversation"
 msgstr "�舒从���� 弍亠�亠亟�"
 
-#: ../pidgin/gtkconv.c:9708
+#: ../pidgin/gtkconv.c:9792
 msgid "Last created window"
 msgstr "�仂�仍亠亟仆亠亠 �仂亰亟舒仆仆仂亠 仂从仆仂"
 
-#: ../pidgin/gtkconv.c:9710
+#: ../pidgin/gtkconv.c:9794
 msgid "Separate IM and Chat windows"
 msgstr "��亟亠仍�仆�亠 仂从仆舒 仄亞仆仂于亠仆仆�� �仂仂弍�亠仆亳亶 亳 �舒�仂于"
 
-#: ../pidgin/gtkconv.c:9712 ../pidgin/gtkprefs.c:1510
+#: ../pidgin/gtkconv.c:9796 ../pidgin/gtkprefs.c:1466
 msgid "New window"
 msgstr "�仂于仂亠 仂从仆仂"
 
-#: ../pidgin/gtkconv.c:9714
+#: ../pidgin/gtkconv.c:9798
 msgid "By group"
 msgstr "�仂 亞��仗仗亠"
 
-#: ../pidgin/gtkconv.c:9716
+#: ../pidgin/gtkconv.c:9800
 msgid "By account"
 msgstr "�仂 ����仆仂亶 亰舒仗亳�亳"
 
-#: ../pidgin/gtkdebug.c:235
+#: ../pidgin/gtkdebug.c:234
 msgid "Save Debug Log"
 msgstr "弌仂��舒仆亳�� 仂�仍舒亟仂�仆�� 亳仆�仂�仄舒�亳� 于 亢��仆舒仍"
 
-#: ../pidgin/gtkdebug.c:583
+#: ../pidgin/gtkdebug.c:582
 msgid "Invert"
 msgstr "�仆于亠��亳�仂于舒��"
 
-#: ../pidgin/gtkdebug.c:586
+#: ../pidgin/gtkdebug.c:585
 msgid "Highlight matches"
 msgstr "�仂亟�于亠�亳�� �仂于仗舒亟亠仆亳�"
 
-#: ../pidgin/gtkdebug.c:653
+#: ../pidgin/gtkdebug.c:652
 msgid "_Icon Only"
 msgstr "丐仂仍�从仂 _亰仆舒�从亳"
 
-#: ../pidgin/gtkdebug.c:654
+#: ../pidgin/gtkdebug.c:653
 msgid "_Text Only"
 msgstr "丐仂仍�从仂 _�亠从��"
 
-#: ../pidgin/gtkdebug.c:655
+#: ../pidgin/gtkdebug.c:654
 msgid "_Both Icon & Text"
 msgstr "�仆舒�从亳 _亳 �亠从��"
 
-#: ../pidgin/gtkdebug.c:780
+#: ../pidgin/gtkdebug.c:772
 msgid "Filter"
 msgstr "个亳仍���"
 
-#: ../pidgin/gtkdebug.c:799
+#: ../pidgin/gtkdebug.c:791
 msgid "Right click for more options."
 msgstr "乂�仍从仆亳�亠 仗�舒于仂亶 从仆仂仗从仂亶 仄��亳 亟仍� 亟仂���仗舒 从 亟��亞亳仄 仗舒�舒仄亠��舒仄."
 
-#: ../pidgin/gtkdebug.c:829
+#: ../pidgin/gtkdebug.c:821
 msgid "Level "
 msgstr "丕�仂于亠仆� "
 
-#: ../pidgin/gtkdebug.c:830 ../pidgin/gtkdebug.c:836
+#: ../pidgin/gtkdebug.c:822 ../pidgin/gtkdebug.c:828
 msgid "Select the debug filter level."
 msgstr ""
 
-#: ../pidgin/gtkdebug.c:838
+#: ../pidgin/gtkdebug.c:830
 msgid "All"
 msgstr "��亠"
 
-#: ../pidgin/gtkdebug.c:839
+#: ../pidgin/gtkdebug.c:831
 msgid "Misc"
 msgstr "�舒亰仆仂亠"
 
-#: ../pidgin/gtkdebug.c:841
+#: ../pidgin/gtkdebug.c:833
 msgid "Warning"
 msgstr "��亠亟�仗�亠亢亟亠仆亳亠"
 
-#: ../pidgin/gtkdebug.c:842
+#: ../pidgin/gtkdebug.c:834
 msgid "Error "
 msgstr "��亳弍从舒 "
 
-#: ../pidgin/gtkdebug.c:843
+#: ../pidgin/gtkdebug.c:835
 msgid "Fatal Error"
 msgstr "�亠亳�仗�舒于亳仄舒� 仂�亳弍从舒"
 
-#: ../pidgin/gtkdialogs.c:72 ../pidgin/gtkdialogs.c:117
+#: ../pidgin/gtkdialogs.c:72 ../pidgin/gtkdialogs.c:119
 msgid "lead developer"
 msgstr "于亠亟��亳亶 �舒亰�舒弍仂��亳从"
 
@@ -14847,6 +15148,7 @@
 #: ../pidgin/gtkdialogs.c:85 ../pidgin/gtkdialogs.c:86
 #: ../pidgin/gtkdialogs.c:87 ../pidgin/gtkdialogs.c:90
 #: ../pidgin/gtkdialogs.c:92 ../pidgin/gtkdialogs.c:93
+#: ../pidgin/gtkdialogs.c:94
 msgid "developer"
 msgstr "�舒亰�舒弍仂��亳从"
 
@@ -14858,335 +15160,347 @@
 msgid "support/QA"
 msgstr "仗仂亟亟亠�亢从舒 亳 从仂仆��仂仍� 从舒�亠��于舒"
 
-#: ../pidgin/gtkdialogs.c:91 ../pidgin/gtkdialogs.c:112
+#: ../pidgin/gtkdialogs.c:91 ../pidgin/gtkdialogs.c:114
 msgid "developer & webmaster"
 msgstr "�舒亰�舒弍仂��亳从 亳 于亠弍-仄舒��亠�"
 
-#: ../pidgin/gtkdialogs.c:99
+#: ../pidgin/gtkdialogs.c:101
 msgid "Senior Contributor/QA"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:108
+#: ../pidgin/gtkdialogs.c:110
 msgid "win32 port"
 msgstr "仗仂�� win32"
 
-#: ../pidgin/gtkdialogs.c:109 ../pidgin/gtkdialogs.c:110
+#: ../pidgin/gtkdialogs.c:111 ../pidgin/gtkdialogs.c:112
 msgid "maintainer"
 msgstr "�仂仗�仂于仂亢亟舒��亳亶"
 
-#: ../pidgin/gtkdialogs.c:111
+#: ../pidgin/gtkdialogs.c:113
 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:116
 msgid "hacker and designated driver [lazy bum]"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:115
+#: ../pidgin/gtkdialogs.c:117
 msgid "XMPP developer"
 msgstr "XMPP-�舒亰�舒弍仂��亳从"
 
-#: ../pidgin/gtkdialogs.c:116
+#: ../pidgin/gtkdialogs.c:118
 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:230
 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:231
 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:232
+#: ../pidgin/gtkdialogs.c:233
 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:234
 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:235
 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
-msgid "Australian English"
-msgstr "�于���舒仍亳亶�从亳亶 舒仆亞仍亳亶�从亳亶"
-
 #: ../pidgin/gtkdialogs.c:157
+msgid "Australian English"
+msgstr "�于���舒仍亳亶�从亳亶 舒仆亞仍亳亶�从亳亶"
+
+#: ../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:236
+#: ../pidgin/gtkdialogs.c:237 ../pidgin/gtkdialogs.c:238
+#: ../pidgin/gtkdialogs.c:239
 msgid "Spanish"
 msgstr "��仗舒仆�从亳亶"
 
-#: ../pidgin/gtkdialogs.c:161
+#: ../pidgin/gtkdialogs.c:162
 msgid "Estonian"
 msgstr "亅��仂仆�从亳亶"
 
-#: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:163
+#: ../pidgin/gtkdialogs.c:163 ../pidgin/gtkdialogs.c:164
 msgid "Euskera(Basque)"
 msgstr "�舒�从�从亳亶"
 
-#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:165
-#: ../pidgin/gtkdialogs.c:166
+#: ../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:240
+#: ../pidgin/gtkdialogs.c:241
 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:242
+#: ../pidgin/gtkdialogs.c:243 ../pidgin/gtkdialogs.c:244
+#: ../pidgin/gtkdialogs.c:245
 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:246
 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:247
 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:248
 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:249
 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:250
+#: ../pidgin/gtkdialogs.c:251 ../pidgin/gtkdialogs.c:252
 msgid "Japanese"
 msgstr "亊仗仂仆�从亳亶"
 
-#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:249
+#: ../pidgin/gtkdialogs.c:180 ../pidgin/gtkdialogs.c:253
 msgid "Georgian"
 msgstr "���亰亳仆�从亳亶"
 
-#: ../pidgin/gtkdialogs.c:179
+#: ../pidgin/gtkdialogs.c:180
 msgid "Ubuntu Georgian Translators"
 msgstr "�亠�亠于仂亟�亳从亳 Ubuntu 仆舒 亞��亰亳仆�从亳亶"
 
-#: ../pidgin/gtkdialogs.c:180
+#: ../pidgin/gtkdialogs.c:181
 msgid "Kannada"
 msgstr "�舒仆仆舒亟舒"
 
-#: ../pidgin/gtkdialogs.c:180
+#: ../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:254
+#: ../pidgin/gtkdialogs.c:255
 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
+#: ../pidgin/gtkdialogs.c:186
 msgid "Lao"
 msgstr "�舒仂��从亳亶"
 
-#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:252
-#: ../pidgin/gtkdialogs.c:253
+#: ../pidgin/gtkdialogs.c:187 ../pidgin/gtkdialogs.c:256
+#: ../pidgin/gtkdialogs.c:257
 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:258
 msgid "Macedonian"
 msgstr "�舒从亠亟仂仆�从亳亶"
 
-#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:255
-#: ../pidgin/gtkdialogs.c:256
+#: ../pidgin/gtkdialogs.c:191 ../pidgin/gtkdialogs.c:259
+#: ../pidgin/gtkdialogs.c:260
 msgid "Bokm奪l Norwegian"
 msgstr "��从仄仂仍"
 
-#: ../pidgin/gtkdialogs.c:191
+#: ../pidgin/gtkdialogs.c:192
 msgid "Nepali"
 msgstr "�亠仗舒仍��从亳亶"
 
-#: ../pidgin/gtkdialogs.c:192
-msgid "Dutch, Flemish"
-msgstr "�亳亟亠�仍舒仆亟�从亳亶, �仍舒仄舒仆亟�从亳亶"
-
 #: ../pidgin/gtkdialogs.c:193
+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
+#: ../pidgin/gtkdialogs.c:195
+msgid "Punjabi"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:196 ../pidgin/gtkdialogs.c:197
+#: ../pidgin/gtkdialogs.c:198 ../pidgin/gtkdialogs.c:261
 msgid "Polish"
 msgstr "�仂仍��从亳亶"
 
-#: ../pidgin/gtkdialogs.c:197
+#: ../pidgin/gtkdialogs.c:199
 msgid "Portuguese"
 msgstr "�仂���亞舒仍��从亳亶"
 
-#: ../pidgin/gtkdialogs.c:198
-msgid "Portuguese-Brazil"
-msgstr "�仂���亞舒仍��从亳亶-弍�舒亰亳仍��从亳亶"
-
-#: ../pidgin/gtkdialogs.c:199
-msgid "Pashto"
-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:262
+#: ../pidgin/gtkdialogs.c:263
 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:264 ../pidgin/gtkdialogs.c:265
+#: ../pidgin/gtkdialogs.c:266
 msgid "Slovak"
 msgstr "弌仍仂于舒�从亳亶"
 
-#: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:263
+#: ../pidgin/gtkdialogs.c:206 ../pidgin/gtkdialogs.c:267
 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:268 ../pidgin/gtkdialogs.c:269
 msgid "Serbian"
 msgstr "弌亠�弍�从亳亶"
 
-#: ../pidgin/gtkdialogs.c:208 ../pidgin/gtkdialogs.c:266
-#: ../pidgin/gtkdialogs.c:267
-msgid "Swedish"
-msgstr "丿于亠亟�从亳亶"
-
-#: ../pidgin/gtkdialogs.c:209
-msgid "Tamil"
-msgstr "丐舒仄亳仍��从亳亶"
-
 #: ../pidgin/gtkdialogs.c:210
+msgid "Sinhala"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:211 ../pidgin/gtkdialogs.c:270
+#: ../pidgin/gtkdialogs.c:271
+msgid "Swedish"
+msgstr "丿于亠亟�从亳亶"
+
+#: ../pidgin/gtkdialogs.c:212
+msgid "Tamil"
+msgstr "丐舒仄亳仍��从亳亶"
+
+#: ../pidgin/gtkdialogs.c:213
 msgid "Telugu"
 msgstr "丐亠仍�亞�"
 
-#: ../pidgin/gtkdialogs.c:211
+#: ../pidgin/gtkdialogs.c:214
 msgid "Thai"
 msgstr "丐舒亶�从亳亶"
 
-#: ../pidgin/gtkdialogs.c:212 ../pidgin/gtkdialogs.c:268
+#: ../pidgin/gtkdialogs.c:215 ../pidgin/gtkdialogs.c:272
 msgid "Turkish"
 msgstr "丐��亠�从亳亶"
 
-#: ../pidgin/gtkdialogs.c:213
+#: ../pidgin/gtkdialogs.c:216
+msgid "Urdu"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:217
 msgid "Vietnamese"
 msgstr "��亠�仆舒仄�从亳亶"
 
-#: ../pidgin/gtkdialogs.c:213
+#: ../pidgin/gtkdialogs.c:217
 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:218 ../pidgin/gtkdialogs.c:273
 msgid "Simplified Chinese"
 msgstr "丕仗�仂��仆仆�亶 从亳�舒亶�从亳亶"
 
-#: ../pidgin/gtkdialogs.c:215 ../pidgin/gtkdialogs.c:216
-#: ../pidgin/gtkdialogs.c:217
+#: ../pidgin/gtkdialogs.c:219 ../pidgin/gtkdialogs.c:220
+#: ../pidgin/gtkdialogs.c:221
 msgid "Hong Kong Chinese"
 msgstr "�仂仆从仂仆亞�从亳亶 从亳�舒亶�从亳亶"
 
-#: ../pidgin/gtkdialogs.c:218 ../pidgin/gtkdialogs.c:219
-#: ../pidgin/gtkdialogs.c:270
+#: ../pidgin/gtkdialogs.c:222 ../pidgin/gtkdialogs.c:223
+#: ../pidgin/gtkdialogs.c:274
 msgid "Traditional Chinese"
 msgstr "丐�舒亟亳�亳仂仆仆�亶 从亳�舒亶�从亳亶"
 
-#: ../pidgin/gtkdialogs.c:225
+#: ../pidgin/gtkdialogs.c:229
 msgid "Amharic"
 msgstr "�仄�舒��从亳亶"
 
-#: ../pidgin/gtkdialogs.c:368
+#: ../pidgin/gtkdialogs.c:359
 #, c-format
 msgid "About %s"
 msgstr "� %s"
 
-#: ../pidgin/gtkdialogs.c:411
+#: ../pidgin/gtkdialogs.c:395
 #, c-format
 msgid ""
 "%s is a graphical modular messaging client based on libpurple which is "
@@ -15209,62 +15523,58 @@
 "仗�仂亠从�舒.  �仂仍仆�亶 �仗亳�仂从 ��舒��仆亳从仂于 仗�仂亠从�舒 �仄仂��亳�亠 于 �舒亶仍亠 'COPYRIGHT'.  �� "
 "仆亠 仗�亠亟仂��舒于仍�亠仄 仆亳从舒从亳� 亞舒�舒仆�亳亶 仆舒 ��� 仗�仂亞�舒仄仄�.<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:429
+#: ../pidgin/gtkdialogs.c:413
 #, c-format
 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:434
+#: ../pidgin/gtkdialogs.c:418
 msgid "Current Developers"
 msgstr "丐亠从��亳亠 �舒亰�舒弍仂��亳从亳"
 
-#: ../pidgin/gtkdialogs.c:449
+#: ../pidgin/gtkdialogs.c:433
 msgid "Crazy Patch Writers"
 msgstr "�亟亠�亢亳仄�亠 仗亳�舒�亠仍亳 亰舒仗仍舒�仂从"
 
-#: ../pidgin/gtkdialogs.c:464
+#: ../pidgin/gtkdialogs.c:448
 msgid "Retired Developers"
 msgstr "�舒亰�舒弍仂��亳从亳, 仂�仂�亠亟�亳亠 仂� 亟亠仍"
 
-#: ../pidgin/gtkdialogs.c:479
+#: ../pidgin/gtkdialogs.c:463
 msgid "Retired Crazy Patch Writers"
 msgstr "�亟亠�亢亳仄�亠 仗亳�舒�亠仍亳 亰舒仗仍舒�仂从, 仂�仂�亠亟�亳亠 仂� 亟亠仍"
 
-#: ../pidgin/gtkdialogs.c:494
+#: ../pidgin/gtkdialogs.c:478
 msgid "Artists"
 msgstr "丱�亟仂亢仆亳从亳"
 
-#: ../pidgin/gtkdialogs.c:509
+#: ../pidgin/gtkdialogs.c:493
 msgid "Current Translators"
 msgstr "丐亠从��亳亠 仗亠�亠于仂亟�亳从亳"
 
-#: ../pidgin/gtkdialogs.c:529
+#: ../pidgin/gtkdialogs.c:513
 msgid "Past Translators"
 msgstr "��亠亟�亟��亳亠 仗亠�亠于仂亟�亳从亳"
 
-#: ../pidgin/gtkdialogs.c:547
+#: ../pidgin/gtkdialogs.c:531
 msgid "Debugging Information"
 msgstr "��仍舒亟仂�仆舒� 亳仆�仂�仄舒�亳�"
 
-#: ../pidgin/gtkdialogs.c:764 ../pidgin/gtkdialogs.c:907
-#: ../pidgin/gtkdialogs.c:988
+#: ../pidgin/gtkdialogs.c:747 ../pidgin/gtkdialogs.c:886
+#: ../pidgin/gtkdialogs.c:967
 msgid "_Name"
 msgstr "_�仄�"
 
-#: ../pidgin/gtkdialogs.c:769
-msgid "Buddy"
-msgstr "弌仂弍亠�亠亟仆亳从"
-
-#: ../pidgin/gtkdialogs.c:773 ../pidgin/gtkdialogs.c:912
-#: ../pidgin/gtkdialogs.c:993
+#: ../pidgin/gtkdialogs.c:752 ../pidgin/gtkdialogs.c:891
+#: ../pidgin/gtkdialogs.c:972
 msgid "_Account"
 msgstr "_丕���仆舒� 亰舒仗亳��"
 
-#: ../pidgin/gtkdialogs.c:920
+#: ../pidgin/gtkdialogs.c:899
 msgid "Get User Info"
 msgstr "�仂仍��亳�� 仗仂仍�亰仂于舒�亠仍��从�� 亳仆�仂�仄舒�亳�"
 
-#: ../pidgin/gtkdialogs.c:922
+#: ../pidgin/gtkdialogs.c:901
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
@@ -15272,11 +15582,11 @@
 "�于亠亟亳�亠 亳亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍� 亳仍亳 仗�亠于亟仂仆亳仄 仗亠��仂仆�, 亳仆�仂�仄舒�亳� 仂 "
 "从仂�仂�仂亶 于� �仂�亠仍亳 弍� 仗�仂�仄仂��亠��."
 
-#: ../pidgin/gtkdialogs.c:1012
+#: ../pidgin/gtkdialogs.c:991
 msgid "View User Log"
 msgstr "��仂�仄仂��亠�� 亢��仆舒仍 仗仂仍�亰仂于舒�亠仍�"
 
-#: ../pidgin/gtkdialogs.c:1014
+#: ../pidgin/gtkdialogs.c:993
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
@@ -15284,32 +15594,32 @@
 "�于亠亟亳�亠 亳亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍� 亳仍亳 仗�亠于亟仂仆亳仄 仗亠��仂仆�, 亢��仆舒仍 从仂�仂�仂亶 于� "
 "�仂�亠仍亳 弍� 仗�仂�仄仂��亠��."
 
-#: ../pidgin/gtkdialogs.c:1034
+#: ../pidgin/gtkdialogs.c:1013
 msgid "Alias Contact"
 msgstr "��亠于亟仂仆亳仄 从仂仆�舒从�舒"
 
-#: ../pidgin/gtkdialogs.c:1035
+#: ../pidgin/gtkdialogs.c:1014
 msgid "Enter an alias for this contact."
 msgstr "�于亠亟亳�亠 仗�亠于亟仂仆亳仄 亟仍� ��仂亞仂 从仂仆�舒从�舒."
 
-#: ../pidgin/gtkdialogs.c:1057
+#: ../pidgin/gtkdialogs.c:1036
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "�于亠亟亳�亠 仗�亠于亟仂仆亳仄 亟仍� %s."
 
-#: ../pidgin/gtkdialogs.c:1059
+#: ../pidgin/gtkdialogs.c:1038
 msgid "Alias Buddy"
 msgstr "��亠于亟仂仆亳仄 �仂弍亠�亠亟仆亳从舒"
 
-#: ../pidgin/gtkdialogs.c:1080
+#: ../pidgin/gtkdialogs.c:1059
 msgid "Alias Chat"
 msgstr "��亠于亟仂仆亳仄 �舒�舒"
 
-#: ../pidgin/gtkdialogs.c:1081
+#: ../pidgin/gtkdialogs.c:1060
 msgid "Enter an alias for this chat."
 msgstr "�于亠亟亳�亠 仗�亠于亟仂仆亳仄 亟仍� ��仂亞仂 �舒�舒."
 
-#: ../pidgin/gtkdialogs.c:1120
+#: ../pidgin/gtkdialogs.c:1099
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -15327,15 +15637,15 @@
 "�� �亟舒仍亳�亠 从仂仆�舒从�, �仂亟亠�亢舒�亳亶 %s 亳 %d 亟��亞亳� �仂弍亠�亠亟仆亳从仂于 亳亰 �仗亳�从舒 "
 "�仂弍亠�亠亟仆亳从仂于. 丱仂�亳�亠 仗�仂亟仂仍亢亳��?"
 
-#: ../pidgin/gtkdialogs.c:1128
+#: ../pidgin/gtkdialogs.c:1107
 msgid "Remove Contact"
 msgstr "丕亟舒仍亳�� 从仂仆�舒从�"
 
-#: ../pidgin/gtkdialogs.c:1131
+#: ../pidgin/gtkdialogs.c:1110
 msgid "_Remove Contact"
 msgstr "_丕亟舒仍亳�� 从仂仆�舒从�"
 
-#: ../pidgin/gtkdialogs.c:1162
+#: ../pidgin/gtkdialogs.c:1141
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
@@ -15343,15 +15653,15 @@
 msgstr ""
 "�� 亟仂弍舒于亳�亠 �仂亟亠�亢亳仄仂亠 亞��仗仗� %s 从 �仂亟亠�亢亳仄仂仄� 亞��仗仗� %s. 丱仂�亳�亠 仗�仂亟仂仍亢亳��?"
 
-#: ../pidgin/gtkdialogs.c:1169
+#: ../pidgin/gtkdialogs.c:1148
 msgid "Merge Groups"
 msgstr "�弍�亠亟亳仆亳�� 亞��仗仗�"
 
-#: ../pidgin/gtkdialogs.c:1172
+#: ../pidgin/gtkdialogs.c:1151
 msgid "_Merge Groups"
 msgstr "_�弍�亠亟亳仆亳�� 亞��仗仗�"
 
-#: ../pidgin/gtkdialogs.c:1222
+#: ../pidgin/gtkdialogs.c:1201
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -15360,40 +15670,40 @@
 "�� �亟舒仍亳�亠 亞��仗仗� %s 亳 于�亠� 亠� �仍亠仆仂于 亳亰 �仗亳�从舒 �仂弍亠�亠亟仆亳从仂于. 丱仂�亳�亠 "
 "仗�仂亟仂仍亢亳��?"
 
-#: ../pidgin/gtkdialogs.c:1225
+#: ../pidgin/gtkdialogs.c:1204
 msgid "Remove Group"
 msgstr "丕亟舒仍亳�� 亞��仗仗�"
 
-#: ../pidgin/gtkdialogs.c:1228
+#: ../pidgin/gtkdialogs.c:1207
 msgid "_Remove Group"
 msgstr "_丕亟舒仍亳�� 亞��仗仗�"
 
-#: ../pidgin/gtkdialogs.c:1261
+#: ../pidgin/gtkdialogs.c:1240
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "�� �亟舒仍亳�亠 %s 亳亰 �仗亳�从舒 �仂弍亠�亠亟仆亳从仂于. 丱仂�亳�亠 仗�仂亟仂仍亢亳��?"
 
-#: ../pidgin/gtkdialogs.c:1264
+#: ../pidgin/gtkdialogs.c:1243
 msgid "Remove Buddy"
 msgstr "丕亟舒仍亳�� �仂弍亠�亠亟仆亳从舒"
 
+#: ../pidgin/gtkdialogs.c:1246
+msgid "_Remove Buddy"
+msgstr "_丕亟舒仍亳�� �仂弍亠�亠亟仆亳从舒"
+
 #: ../pidgin/gtkdialogs.c:1267
-msgid "_Remove Buddy"
-msgstr "_丕亟舒仍亳�� �仂弍亠�亠亟仆亳从舒"
-
-#: ../pidgin/gtkdialogs.c:1288
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr "�� �亟舒仍亳�亠 �舒� %s 亳亰 �仗亳�从舒 �仂弍亠�亠亟仆亳从仂于. 丱仂�亳�亠 仗�仂亟仂仍亢亳��?"
 
-#: ../pidgin/gtkdialogs.c:1291
+#: ../pidgin/gtkdialogs.c:1270
 msgid "Remove Chat"
 msgstr "丕亟舒仍亳�� �舒�"
 
-#: ../pidgin/gtkdialogs.c:1294
+#: ../pidgin/gtkdialogs.c:1273
 msgid "_Remove Chat"
 msgstr "_丕亟舒仍亳�� �舒�"
 
@@ -15406,23 +15716,23 @@
 msgid "Change Status"
 msgstr "�亰仄亠仆亳�� ��舒���"
 
-#: ../pidgin/gtkdocklet.c:680
+#: ../pidgin/gtkdocklet.c:681
 msgid "Show Buddy List"
 msgstr "�仂从舒亰�于舒�� �仗亳�仂从 �仂弍亠�亠亟仆亳从仂于"
 
-#: ../pidgin/gtkdocklet.c:706
+#: ../pidgin/gtkdocklet.c:707
 msgid "New Message..."
 msgstr "�仂于仂亠 �仂仂弍�亠仆亳亠..."
 
-#: ../pidgin/gtkdocklet.c:721
+#: ../pidgin/gtkdocklet.c:722
 msgid "Mute Sounds"
 msgstr "��从仍��亳�� 亰于�从亳"
 
-#: ../pidgin/gtkdocklet.c:728
+#: ../pidgin/gtkdocklet.c:729
 msgid "Blink on New Message"
 msgstr "�亠��舒�� 仗�亳 仆舒仍亳�亳亳 仆仂于仂亞仂 �仂仂弍�亠仆亳�"
 
-#: ../pidgin/gtkdocklet.c:738
+#: ../pidgin/gtkdocklet.c:739
 msgid "Quit"
 msgstr "��亶�亳"
 
@@ -15489,66 +15799,100 @@
 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 "_�仂亰仂弍仆仂于亳��"
 
-#: ../pidgin/gtkimhtml.c:815
+#: ../pidgin/gtkimhtml.c:816
 msgid "Paste as Plain _Text"
 msgstr "���舒于亳�� 从舒从 仗�仂��仂亶 _�亠从��"
 
-#: ../pidgin/gtkimhtml.c:832 ../pidgin/gtkimhtmltoolbar.c:1199
+#: ../pidgin/gtkimhtml.c:833 ../pidgin/gtkimhtmltoolbar.c:1197
 msgid "_Reset formatting"
 msgstr "_�仂���舒仆仂于亳�� �仂�仄舒�亳�仂于舒仆亳亠"
 
-#: ../pidgin/gtkimhtml.c:1359
+#: ../pidgin/gtkimhtml.c:1391
 msgid "Hyperlink color"
 msgstr "丶于亠� 亞亳仗亠����仍从亳"
 
-#: ../pidgin/gtkimhtml.c:1360
+#: ../pidgin/gtkimhtml.c:1392
 msgid "Color to draw hyperlinks."
 msgstr "丶于亠� 亟仍� 仂�仂弍�舒亢亠仆亳� 亞亳仗亠����仍仂从."
 
-#: ../pidgin/gtkimhtml.c:1363
+#: ../pidgin/gtkimhtml.c:1395
 msgid "Hyperlink prelight color"
 msgstr "丶于亠� 仗仂亟�于亠�从亳 亞亳仗亠����仍从亳"
 
-#: ../pidgin/gtkimhtml.c:1364
+#: ../pidgin/gtkimhtml.c:1396
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "丶于亠� 亟仍� 仂�仂弍�舒亢亠仆亳� 亞亳仗亠����仍仂从 仗�亳 仆舒于亠亟亠仆亳亳 仆舒 仆亳� 从���仂�舒 仄��亳."
 
-#: ../pidgin/gtkimhtml.c:1581
+#: ../pidgin/gtkimhtml.c:1399 ../pidgin/plugins/pidginrc.c:52
+#, fuzzy
+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
+#, fuzzy
+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:1593
+#: ../pidgin/gtkimhtml.c:1644
 msgid "_Open Link in Browser"
 msgstr "_��从���� ���仍从� 于 弍�舒�亰亠�亠"
 
-#: ../pidgin/gtkimhtml.c:1603
+#: ../pidgin/gtkimhtml.c:1654
 msgid "_Copy Link Location"
 msgstr "_弌从仂仗亳�仂于舒�� ���仍从�"
 
-#: ../pidgin/gtkimhtml.c:3353
+#: ../pidgin/gtkimhtml.c:3421
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -15558,7 +15902,7 @@
 "\n"
 "��亳仆亳仄舒亠��� 亰舒 PNG."
 
-#: ../pidgin/gtkimhtml.c:3356
+#: ../pidgin/gtkimhtml.c:3424
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -15568,7 +15912,7 @@
 "\n"
 "��亳仆亳仄舒亠��� 亰舒 PNG."
 
-#: ../pidgin/gtkimhtml.c:3385
+#: ../pidgin/gtkimhtml.c:3453
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -15579,7 +15923,7 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3388
+#: ../pidgin/gtkimhtml.c:3456
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -15590,16 +15934,16 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3466 ../pidgin/gtkimhtml.c:3478
+#: ../pidgin/gtkimhtml.c:3537 ../pidgin/gtkimhtml.c:3549
 msgid "Save Image"
 msgstr "弌仂��舒仆亳�� 亳亰仂弍�舒亢亠仆亳亠"
 
-#: ../pidgin/gtkimhtml.c:3506
+#: ../pidgin/gtkimhtml.c:3577
 #, c-format
 msgid "_Save Image..."
 msgstr "_弌仂��舒仆亳�� 亳亰仂弍�舒亢亠仆亳亠..."
 
-#: ../pidgin/gtkimhtmltoolbar.c:163
+#: ../pidgin/gtkimhtmltoolbar.c:164
 msgid "Select Font"
 msgstr "��弍�舒�� ��亳��"
 
@@ -15607,19 +15951,19 @@
 msgid "Select Text Color"
 msgstr "��弍�舒�� �于亠� �亠从��舒"
 
-#: ../pidgin/gtkimhtmltoolbar.c:323
+#: ../pidgin/gtkimhtmltoolbar.c:324
 msgid "Select Background Color"
 msgstr "��弍�舒�� �于亠� �仂仆舒"
 
-#: ../pidgin/gtkimhtmltoolbar.c:412
+#: ../pidgin/gtkimhtmltoolbar.c:413
 msgid "_URL"
 msgstr "_URL"
 
-#: ../pidgin/gtkimhtmltoolbar.c:420
+#: ../pidgin/gtkimhtmltoolbar.c:421
 msgid "_Description"
 msgstr "_�仗亳�舒仆亳亠"
 
-#: ../pidgin/gtkimhtmltoolbar.c:423
+#: ../pidgin/gtkimhtmltoolbar.c:424
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
@@ -15627,157 +15971,165 @@
 "�于亠亟亳�亠 URL 亳 仂仗亳�舒仆亳亠 ���仍从亳, 从仂�仂��� 于� �仂�亳�亠 于��舒于亳��. �仗亳�舒仆亳亠 "
 "仆亠仂弍�亰舒�亠仍�仆仂."
 
-#: ../pidgin/gtkimhtmltoolbar.c:427
+#: ../pidgin/gtkimhtmltoolbar.c:428
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "�于亠亟亳�亠 URL ���仍从亳, 从仂�仂��� 于� �仂�亳�亠 于��舒于亳��."
 
-#: ../pidgin/gtkimhtmltoolbar.c:432 ../pidgin/gtkimhtmltoolbar.c:1106
+#: ../pidgin/gtkimhtmltoolbar.c:433 ../pidgin/gtkimhtmltoolbar.c:1104
 msgid "Insert Link"
 msgstr "���舒于亳�� ���仍从�"
 
-#: ../pidgin/gtkimhtmltoolbar.c:436 ../pidgin/gtkimhtmltoolbar.c:1267
+#: ../pidgin/gtkimhtmltoolbar.c:437 ../pidgin/gtkimhtmltoolbar.c:1265
 msgid "_Insert"
 msgstr "_���舒于亳��"
 
-#: ../pidgin/gtkimhtmltoolbar.c:516
+#: ../pidgin/gtkimhtmltoolbar.c:518
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "�亠 �亟舒仍仂�� �仂��舒仆亳�� 亳亰仂弍�舒亢亠仆亳亠: %s\n"
 
-#: ../pidgin/gtkimhtmltoolbar.c:542 ../pidgin/gtkimhtmltoolbar.c:552
+#: ../pidgin/gtkimhtmltoolbar.c:544 ../pidgin/gtkimhtmltoolbar.c:554
 msgid "Insert Image"
 msgstr "���舒于亳�� 亳亰仂弍�舒亢亠仆亳亠"
 
-#: ../pidgin/gtkimhtmltoolbar.c:765
+#: ../pidgin/gtkimhtmltoolbar.c:712
+msgid "Smile!"
+msgstr "丕仍�弍舒亶�亠��!"
+
+#: ../pidgin/gtkimhtmltoolbar.c:764
 msgid "This theme has no available smileys."
 msgstr "亅�舒 �亠仄舒 仆亠 亳仄亠亠� 亟仂���仗仆�� �仄舒亶仍亳从仂于."
 
-#. show everything
-#: ../pidgin/gtkimhtmltoolbar.c:782
-msgid "Smile!"
-msgstr "丕仍�弍舒亶�亠��!"
-
-#: ../pidgin/gtkimhtmltoolbar.c:850 ../pidgin/gtkimhtmltoolbar.c:1224
+#: ../pidgin/gtkimhtmltoolbar.c:848 ../pidgin/gtkimhtmltoolbar.c:1222
 msgid "_Font"
 msgstr "_丿�亳��"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1058
+#: ../pidgin/gtkimhtmltoolbar.c:1056
 #, fuzzy
 msgid "Group Items"
 msgstr "ID 亞��仗仗�"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1058
+#: ../pidgin/gtkimhtmltoolbar.c:1056
 msgid "Ungroup Items"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:1092 ../pidgin/plugins/convcolors.c:287
+#: ../pidgin/gtkimhtmltoolbar.c:1090 ../pidgin/plugins/convcolors.c:342
 msgid "Bold"
 msgstr "�亳�仆�亶"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1093 ../pidgin/plugins/convcolors.c:294
+#: ../pidgin/gtkimhtmltoolbar.c:1091 ../pidgin/plugins/convcolors.c:351
 msgid "Italic"
 msgstr "�舒从仍仂仆仆�亶"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1094 ../pidgin/plugins/convcolors.c:301
+#: ../pidgin/gtkimhtmltoolbar.c:1092 ../pidgin/plugins/convcolors.c:360
 msgid "Underline"
 msgstr "�仂亟���从仆���亶"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1095
+#: ../pidgin/gtkimhtmltoolbar.c:1093
 msgid "Strikethrough"
 msgstr "�亠�亠���从仆���亶"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1097
+#: ../pidgin/gtkimhtmltoolbar.c:1095
 msgid "Increase Font Size"
 msgstr "丕于亠仍亳�亳�� �舒亰仄亠� ��亳��舒"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1098
+#: ../pidgin/gtkimhtmltoolbar.c:1096
 msgid "Decrease Font Size"
 msgstr "丕仄亠仆��亳�� �舒亰仄亠� ��亳��舒"
 
+#: ../pidgin/gtkimhtmltoolbar.c:1098
+msgid "Font Face"
+msgstr "�弍仍亳从 ��亳��舒"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1099
+msgid "Background Color"
+msgstr "丶于亠� �仂仆舒"
+
 #: ../pidgin/gtkimhtmltoolbar.c:1100
-msgid "Font Face"
-msgstr "�弍仍亳从 ��亳��舒"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1101
-msgid "Background Color"
-msgstr "丶于亠� �仂仆舒"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1102
 msgid "Foreground Color"
 msgstr "丶于亠� �亠从��舒"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1104
+#: ../pidgin/gtkimhtmltoolbar.c:1102
 msgid "Reset Formatting"
 msgstr "�仂���舒仆仂于亳�� �仂�仄舒�亳�仂于舒仆亳亠"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1107
+#: ../pidgin/gtkimhtmltoolbar.c:1105
 msgid "Insert IM Image"
 msgstr "���舒于亳�� 亳亰仂弍�舒亢亠仆亳亠"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1108
+#: ../pidgin/gtkimhtmltoolbar.c:1106
 msgid "Insert Smiley"
 msgstr "���舒于亳�� �仄舒亶仍亳从"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1184
+#: ../pidgin/gtkimhtmltoolbar.c:1182
 msgid "<b>_Bold</b>"
 msgstr "<b>_�亳�仆�亶</b>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1185
+#: ../pidgin/gtkimhtmltoolbar.c:1183
 msgid "<i>_Italic</i>"
 msgstr "<i>_�舒从仍仂仆仆�亶</i>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1186
+#: ../pidgin/gtkimhtmltoolbar.c:1184
 msgid "<u>_Underline</u>"
 msgstr "<u>_�仂亟���从仆���亶</u>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1187
+#: ../pidgin/gtkimhtmltoolbar.c:1185
 msgid "<span strikethrough='true'>Strikethrough</span>"
 msgstr "<span strikethrough='true'>�亠�亠���从仆���亶</span>"
 
+#: ../pidgin/gtkimhtmltoolbar.c:1186
+msgid "<span size='larger'>_Larger</span>"
+msgstr "<span size='larger'>_�仂仍��亳亶</span>"
+
 #: ../pidgin/gtkimhtmltoolbar.c:1188
-msgid "<span size='larger'>_Larger</span>"
-msgstr "<span size='larger'>_�仂仍��亳亶</span>"
+msgid "_Normal"
+msgstr "_弌�亠亟仆亳亶"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1190
-msgid "_Normal"
-msgstr "_弌�亠亟仆亳亶"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1192
 msgid "<span size='smaller'>_Smaller</span>"
 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:1196
+#: ../pidgin/gtkimhtmltoolbar.c:1194
 msgid "_Font face"
 msgstr "_�弍仍亳从 ��亳��舒"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1197
+#: ../pidgin/gtkimhtmltoolbar.c:1195
 msgid "Foreground _color"
 msgstr "丶于亠� _�亠从��舒"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1198
+#: ../pidgin/gtkimhtmltoolbar.c:1196
 msgid "Bac_kground color"
 msgstr "丶于亠� _�仂仆舒"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1275
+#: ../pidgin/gtkimhtmltoolbar.c:1273
 msgid "_Image"
 msgstr "_�亰仂弍�舒亢亠仆亳亠"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1281
+#: ../pidgin/gtkimhtmltoolbar.c:1279
 msgid "_Link"
 msgstr "_弌��仍从�"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1287
+#: ../pidgin/gtkimhtmltoolbar.c:1285
 msgid "_Horizontal rule"
 msgstr "_�弍亰舒�仆�� 仍亳仆亳�"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1309
+#: ../pidgin/gtkimhtmltoolbar.c:1307
 msgid "_Smile!"
 msgstr "_丕仍�弍舒亶�亠��!"
 
-#: ../pidgin/gtklog.c:293
+#: ../pidgin/gtklog.c:245
+#, fuzzy
+msgid "Log Deletion Failed"
+msgstr "�亠 �亟舒仍仂�� ���舒仆仂于亳�� SSL-�仂亠亟亳仆亠仆亳亠"
+
+#: ../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 "
@@ -15786,7 +16138,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 %"
@@ -15795,7 +16147,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 %"
@@ -15803,6 +16155,16 @@
 msgstr ""
 "�� 亟亠亶��于亳�亠仍�仆仂 �仂�亳�亠 弍亠亰于仂亰于�舒�仆仂 �亟舒仍亳�� �亳��亠仄仆�亶 亢��仆舒仍, 仆舒�舒��亶 于 %s?"
 
+#: ../pidgin/gtklog.c:323
+#, fuzzy
+msgid "Delete Log?"
+msgstr "丕亟舒仍亳��"
+
+#: ../pidgin/gtklog.c:334
+#, fuzzy
+msgid "Delete Log..."
+msgstr "丕亟舒仍亳��"
+
 #: ../pidgin/gtklog.c:453
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
@@ -15813,60 +16175,17 @@
 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:714
-#, c-format
-msgid "Conversations in %s"
-msgstr "�亠�亠亟� 于 %s"
-
-#: ../pidgin/gtklog.c:722 ../pidgin/gtklog.c:793
-#, c-format
-msgid "Conversations with %s"
-msgstr "�亠�亠亟� � %s"
-
-#: ../pidgin/gtklog.c:823
-msgid "System Log"
-msgstr "弌亳��亠仄仆�亶 亢��仆舒仍"
-
-#: ../pidgin/gtkmain.c:386
+#: ../pidgin/gtkmain.c:399
 #, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s. �舒弍亠�亳�亠 `%s -h' 亟仍� 仗仂仍��亠仆亳� 亟仂仗仂仍仆亳�亠仍�仆仂亶 亳仆�仂�仄舒�亳亳.\n"
 
-#: ../pidgin/gtkmain.c:388
+#: ../pidgin/gtkmain.c:402
 #, fuzzy, c-format
 msgid ""
 "%s %s\n"
@@ -15877,8 +16196,9 @@
 "  -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"
+"  -l, --login[=NAME]  enable specified account(s) (optional argument NAME\n"
+"                      specifies account(s) to use, separated by commas.\n"
+"                      Without this only the first account will be enabled).\n"
 "  --display=DISPLAY   X display to use\n"
 "  -v, --version       display the current version and exit\n"
 msgstr ""
@@ -15896,7 +16216,37 @@
 "  --display=DISPLAY   X display to use\n"
 "  -v, --version       仗仂从舒亰舒�� �亠从���� 于亠��亳� 亳 于�亶�亳\n"
 
-#: ../pidgin/gtkmain.c:516
+#: ../pidgin/gtkmain.c:415
+#, fuzzy, c-format
+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]  enable specified account(s) (optional argument NAME\n"
+"                      specifies account(s) to use, separated by commas.\n"
+"                      Without this only the first account will be enabled).\n"
+"  -v, --version       display the current version and exit\n"
+msgstr ""
+"%s %s\n"
+"��仗仂仍�亰仂于舒仆亳亠: %s [��豫丼]...\n"
+"\n"
+"  -c, --config=��丐    亳�仗仂仍�亰仂于舒�� 从舒�舒仍仂亞 ��丐 亟仍� �舒亶仍仂于 从仂仆�亳亞��舒�亳亳\n"
+"  -d, --debug         于�于仂亟亳�� 仂�仍舒亟仂�仆�� 亳仆�仂�仄舒�亳� 仆舒 ��舒仆亟舒��仆�亶 于�于仂亟\n"
+"  -h, --help          仗仂从舒亰舒�� ��� �仗�舒于从� 亳 于�亶�亳\n"
+"  -m, --multiple      仆亠 仂亞�舒仆亳�亳于舒���� 亠亟亳仆��于亠仆仆仂亶 从仂仗亳亠亶 仗�仂亞�舒仄仄�\n"
+"  -n, --nologin       仆亠 于�仂亟亳�� 舒于�仂仄舒�亳�亠�从亳\n"
+"  -l, --login[=��亊]   于仂亶�亳 舒于�仂仄舒�亳�亠�从亳 (仆亠仂弍�亰舒�亠仍�仆�亶 舒�亞�仄亠仆� ��亊\n"
+"                      亰舒亟舒�� 仂亟仆� 亳仍亳 仆亠�从仂仍�从仂 ����仆�� 亰舒仗亳�亠亶,\n"
+"                      �舒亰亟亠仍�仆仆�� 亰舒仗���仄亳)\n"
+"  --display=DISPLAY   X display to use\n"
+"  -v, --version       仗仂从舒亰舒�� �亠从���� 于亠��亳� 亳 于�亶�亳\n"
+
+#: ../pidgin/gtkmain.c:545
 #, c-format
 msgid ""
 "%s %s has segfaulted and attempted to dump a core file.\n"
@@ -15920,19 +16270,19 @@
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../pidgin/gtkmain.c:706 ../pidgin/pidgin.h:51
+#: ../pidgin/gtkmain.c:739 ../pidgin/pidgin.h:51
 msgid "Pidgin"
 msgstr "Pidgin"
 
-#: ../pidgin/gtknotify.c:350
+#: ../pidgin/gtknotify.c:354
 msgid "Open All Messages"
 msgstr "��从���� 于�亠 �仂仂弍�亠仆亳�"
 
-#: ../pidgin/gtknotify.c:403
+#: ../pidgin/gtknotify.c:408
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">�舒仄 仗�亳�仍舒 仗仂��舒!</span>"
 
-#: ../pidgin/gtknotify.c:546
+#: ../pidgin/gtknotify.c:551
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
@@ -15940,7 +16290,7 @@
 msgstr[1] "%s 亳仄亠亠� %d 仆仂于�� �仂仂弍�亠仆亳�."
 msgstr[2] "%s 亳仄亠亠� %d 仆仂于�� �仂仂弍�亠仆亳亶."
 
-#: ../pidgin/gtknotify.c:570
+#: ../pidgin/gtknotify.c:575
 #, fuzzy, c-format
 msgid "<b>%d new e-mail.</b>"
 msgid_plural "<b>%d new e-mails.</b>"
@@ -15948,49 +16298,49 @@
 msgstr[1] "<b>�仂亟�仂弍仆仂��亳 仂 仄仂亟�仍亠</b>"
 msgstr[2] "<b>�仂亟�仂弍仆仂��亳 仂 仄仂亟�仍亠</b>"
 
-#: ../pidgin/gtknotify.c:998
+#: ../pidgin/gtknotify.c:1008
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "�仂仄舒仆亟舒 亰舒仗��从舒 弍�舒�亰亠�舒 \"%s\" 仆亠于亠�仆舒."
 
-#: ../pidgin/gtknotify.c:1000 ../pidgin/gtknotify.c:1012
-#: ../pidgin/gtknotify.c:1025 ../pidgin/gtknotify.c:1153
+#: ../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:1010 ../pidgin/gtknotify.c:1023
+#: ../pidgin/gtknotify.c:1020 ../pidgin/gtknotify.c:1033
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "��亳弍从舒 亰舒仗��从舒 \"%s\": %s"
 
-#: ../pidgin/gtknotify.c:1154
+#: ../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:308
+#: ../pidgin/gtkplugin.c:309
 msgid "Could not unload plugin"
 msgstr "�亠 �亟舒仍仂�� 于�亞��亰亳�� 仄仂亟�仍�"
 
-#: ../pidgin/gtkplugin.c:309
+#: ../pidgin/gtkplugin.c:310
 msgid ""
 "The plugin could not be unloaded now, but will be disabled at the next "
 "startup."
 msgstr ""
 
-#: ../pidgin/gtkplugin.c:417
+#: ../pidgin/gtkplugin.c:418
 #, c-format
 msgid ""
 "%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
@@ -16001,7 +16351,7 @@
 "<span weight=\"bold\">�亠弍-�舒亶�:</span>\t%s\n"
 "<span weight=\"bold\">�仄� �舒亶仍舒:</span>\t%s"
 
-#: ../pidgin/gtkplugin.c:427
+#: ../pidgin/gtkplugin.c:428
 #, c-format
 msgid ""
 "%s\n"
@@ -16009,11 +16359,16 @@
 "Check the plugin website for an update.</span>"
 msgstr ""
 
-#: ../pidgin/gtkplugin.c:562
+#: ../pidgin/gtkplugin.c:565
+#, fuzzy
+msgid "Author"
+msgstr "�于�仂�亳亰仂于舒��"
+
+#: ../pidgin/gtkplugin.c:606
 msgid "Configure Pl_ugin"
 msgstr "_�舒���仂亳�� 仄仂亟�仍�"
 
-#: ../pidgin/gtkplugin.c:625
+#: ../pidgin/gtkplugin.c:673
 msgid "<b>Plugin Details</b>"
 msgstr "<b>�仂亟�仂弍仆仂��亳 仂 仄仂亟�仍亠</b>"
 
@@ -16022,112 +16377,107 @@
 msgstr "��弍�舒�� �舒亶仍"
 
 #. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:547
+#: ../pidgin/gtkpounce.c:539
 msgid "Pounce on Whom"
 msgstr "�舒 从亠仄 �仍亠亟亳��"
 
-#: ../pidgin/gtkpounce.c:574
+#: ../pidgin/gtkpounce.c:566
 msgid "_Buddy name:"
 msgstr "_�仄� �仂弍亠�亠亟仆亳从舒:"
 
-#: ../pidgin/gtkpounce.c:608
+#: ../pidgin/gtkpounce.c:600
 msgid "Si_gns on"
 msgstr "_��仂亟亳�"
 
-#: ../pidgin/gtkpounce.c:610
+#: ../pidgin/gtkpounce.c:602
 msgid "Signs o_ff"
 msgstr "�_��仂亟亳�"
 
+#: ../pidgin/gtkpounce.c:604
+msgid "Goes a_way"
+msgstr "���仂_亟亳�"
+
+#: ../pidgin/gtkpounce.c:606
+msgid "Ret_urns from away"
+msgstr "�仂_亰于�舒�舒亠���"
+
+#: ../pidgin/gtkpounce.c:608
+msgid "Becomes _idle"
+msgstr "�舒�亳仆舒亠� 弍亠亰亟亠_亶��于仂于舒��"
+
+#: ../pidgin/gtkpounce.c:610
+msgid "Is no longer i_dle"
+msgstr "�亠�亠��舒�� 弍亠亰亟亠亶��于仂于舒�_�"
+
 #: ../pidgin/gtkpounce.c:612
-msgid "Goes a_way"
-msgstr "���仂_亟亳�"
+msgid "Starts _typing"
+msgstr "�舒�亳仆舒亠� 仆_舒弍仂� �仂仂弍�亠仆亳�"
 
 #: ../pidgin/gtkpounce.c:614
-msgid "Ret_urns from away"
-msgstr "�仂_亰于�舒�舒亠���"
+msgid "P_auses while typing"
+msgstr "��亳仂��舒仆舒于仍亳于舒亠� 仆舒_弍仂� �仂仂弍�亠仆亳�"
 
 #: ../pidgin/gtkpounce.c:616
-msgid "Becomes _idle"
-msgstr "�舒�亳仆舒亠� 弍亠亰亟亠_亶��于仂于舒��"
+msgid "Stops t_yping"
+msgstr "��亠从�舒�舒亠� 仆舒弍仂_� �仂仂弍�亠仆亳�"
 
 #: ../pidgin/gtkpounce.c:618
-msgid "Is no longer i_dle"
-msgstr "�亠�亠��舒�� 弍亠亰亟亠亶��于仂于舒�_�"
-
-#: ../pidgin/gtkpounce.c:620
-msgid "Starts _typing"
-msgstr "�舒�亳仆舒亠� 仆_舒弍仂� �仂仂弍�亠仆亳�"
-
-#: ../pidgin/gtkpounce.c:622
-msgid "P_auses while typing"
-msgstr "��亳仂��舒仆舒于仍亳于舒亠� 仆舒_弍仂� �仂仂弍�亠仆亳�"
-
-#: ../pidgin/gtkpounce.c:624
-msgid "Stops t_yping"
-msgstr "��亠从�舒�舒亠� 仆舒弍仂_� �仂仂弍�亠仆亳�"
-
-#: ../pidgin/gtkpounce.c:626
 msgid "Sends a _message"
 msgstr "��仗�舒于仍�亠� �仂仂弍_�亠仆亳亠"
 
-#: ../pidgin/gtkpounce.c:669
+#: ../pidgin/gtkpounce.c:661
 msgid "Ope_n an IM window"
 msgstr "��从���� 仂从_仆仂 仄亞仆仂于亠仆仆�� �仂仂弍�亠仆亳亶"
 
-#: ../pidgin/gtkpounce.c:671
+#: ../pidgin/gtkpounce.c:663
 msgid "_Pop up a notification"
 msgstr "��于亠��亳 �于亠亟仂仄_仍亠仆亳亠"
 
-#: ../pidgin/gtkpounce.c:673
+#: ../pidgin/gtkpounce.c:665
 msgid "Send a _message"
 msgstr "��仗�舒于亳�� _�仂仂弍�亠仆亳亠"
 
-#: ../pidgin/gtkpounce.c:675
+#: ../pidgin/gtkpounce.c:667
 msgid "E_xecute a command"
 msgstr "��仗仂仍仆亳�� 从仂_仄舒仆亟�"
 
+#: ../pidgin/gtkpounce.c:669
+msgid "P_lay a sound"
+msgstr "�仂�仗�仂亳亰于亠��亳 亰于_�从"
+
+#: ../pidgin/gtkpounce.c:675
+msgid "Brows_e..."
+msgstr "_��从����..."
+
 #: ../pidgin/gtkpounce.c:677
-msgid "P_lay a sound"
-msgstr "�仂�仗�仂亳亰于亠��亳 亰于_�从"
-
-#: ../pidgin/gtkpounce.c:683
-msgid "Brows_e..."
-msgstr "_��从����..."
-
-#: ../pidgin/gtkpounce.c:685
 msgid "Br_owse..."
 msgstr "��_从����..."
 
-#: ../pidgin/gtkpounce.c:686
+#: ../pidgin/gtkpounce.c:678
 msgid "Pre_view"
 msgstr "丐_亠��"
 
-#: ../pidgin/gtkpounce.c:818
+#: ../pidgin/gtkpounce.c:810
 msgid "P_ounce only when my status is not Available"
 msgstr "��仗仂仍仆_��� �仂仍�从仂 仗�亳 ��舒���亠, 仂�仍亳�仆仂仄 仂� \"�仂���仗亠仆\""
 
-#: ../pidgin/gtkpounce.c:823
+#: ../pidgin/gtkpounce.c:815
 msgid "_Recurring"
 msgstr "_�仂于�仂�亠仆亳亠"
 
-#: ../pidgin/gtkpounce.c:1266
+#: ../pidgin/gtkpounce.c:1259
 msgid "Pounce Target"
 msgstr "�弍�亠从� �仍亠亢亠仆亳�"
 
-#: ../pidgin/gtkprefs.c:386
-#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:1
-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:698
+#: ../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."
@@ -16135,136 +16485,136 @@
 "��弍亠�亳�亠 �亠仄� �仄舒亶仍亳从仂于, 从仂�仂��� 于� �仂�亠仍亳 弍� 亳�仗仂仍�亰仂于舒��. �仂于�亠 �亠仄� 仄仂亞�� "
 "弍��� ���舒仆仂于仍亠仆� 仗亠�亠�舒�从亳于舒仆亳亠仄 亳� 于 �仗亳�仂从 �亠仄."
 
-#: ../pidgin/gtkprefs.c:733
+#: ../pidgin/gtkprefs.c:681
 msgid "Icon"
 msgstr "�仆舒�仂从"
 
-#: ../pidgin/gtkprefs.c:895
+#: ../pidgin/gtkprefs.c:843
 msgid "System Tray Icon"
 msgstr "�仆舒�仂从 �亳��亠仄仆仂亞仂 仍仂�从舒"
 
-#: ../pidgin/gtkprefs.c:896
+#: ../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:905
+#: ../pidgin/gtkprefs.c:853
 msgid "Conversation Window Hiding"
 msgstr "弌从���亳亠 仂从仂仆 弍亠�亠亟"
 
-#: ../pidgin/gtkprefs.c:906
+#: ../pidgin/gtkprefs.c:854
 msgid "_Hide new IM conversations:"
 msgstr "_弌从��于舒�� 仆仂于�亠 弍亠�亠亟�:"
 
-#: ../pidgin/gtkprefs.c:909 ../pidgin/gtkprefs.c:2045
+#: ../pidgin/gtkprefs.c:857 ../pidgin/gtkprefs.c:1965
 msgid "When away"
 msgstr "�仂 于�亠仄� 仂������于亳�"
 
 #. All the tab options!
-#: ../pidgin/gtkprefs.c:917
+#: ../pidgin/gtkprefs.c:865
 msgid "Tabs"
 msgstr "�从仍舒亟从亳"
 
-#: ../pidgin/gtkprefs.c:919
+#: ../pidgin/gtkprefs.c:867
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "�仂从舒亰�于舒�� 仄亞仆仂于亠仆仆�亠 �仂仂弍�亠仆亳� 亳 �舒�� 于 仂从仆舒� � _于从仍舒亟从舒仄亳"
 
-#: ../pidgin/gtkprefs.c:933
+#: ../pidgin/gtkprefs.c:881
 msgid "Show close b_utton on tabs"
 msgstr "�仂从舒亰�于舒�� _从仆仂仗从� 亰舒从���亳� 仆舒 于从仍舒亟从舒�"
 
-#: ../pidgin/gtkprefs.c:936
+#: ../pidgin/gtkprefs.c:884
 msgid "_Placement:"
 msgstr "_�舒�仗仂仍仂亢亠仆亳亠:"
 
-#: ../pidgin/gtkprefs.c:938
+#: ../pidgin/gtkprefs.c:886
 msgid "Top"
 msgstr "�于亠���"
 
-#: ../pidgin/gtkprefs.c:939
+#: ../pidgin/gtkprefs.c:887
 msgid "Bottom"
 msgstr "�仆亳亰�"
 
-#: ../pidgin/gtkprefs.c:940
+#: ../pidgin/gtkprefs.c:888
 msgid "Left"
 msgstr "弌仍亠于舒"
 
-#: ../pidgin/gtkprefs.c:941
+#: ../pidgin/gtkprefs.c:889
 msgid "Right"
 msgstr "弌仗�舒于舒"
 
-#: ../pidgin/gtkprefs.c:943
+#: ../pidgin/gtkprefs.c:891
 msgid "Left Vertical"
 msgstr "弌仍亠于舒 于亠��亳从舒仍�仆仂"
 
-#: ../pidgin/gtkprefs.c:944
+#: ../pidgin/gtkprefs.c:892
 msgid "Right Vertical"
 msgstr "弌仗�舒于舒 于亠��亳从舒仍�仆仂"
 
-#: ../pidgin/gtkprefs.c:951
+#: ../pidgin/gtkprefs.c:899
 msgid "N_ew conversations:"
 msgstr "_�仂于�亠 弍亠�亠亟�:"
 
-#: ../pidgin/gtkprefs.c:997
+#: ../pidgin/gtkprefs.c:944
 msgid "Show _formatting on incoming messages"
 msgstr "�仂从舒亰�于舒�� _�仂�仄舒�亳�仂于舒仆亳亠 于仂 于�仂亟��亳� �仂仂弍�亠仆亳��"
 
-#: ../pidgin/gtkprefs.c:999
+#: ../pidgin/gtkprefs.c:946
 msgid "Close IMs immediately when the tab is closed"
-msgstr "�舒从��于舒�� 仄亞仆仂于亠仆仆�亠 �仂仂弍�亠仆亳� 仆亠仄亠亟仍亠仆仆仂 仗�亳 亰舒从���亳亳 于从仍舒亟从亳"
-
-#: ../pidgin/gtkprefs.c:1002
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:949
 msgid "Show _detailed information"
 msgstr "�仂从舒亰�于舒�� _仗仂亟�仂弍仆�� 亳仆�仂�仄舒�亳�"
 
-#: ../pidgin/gtkprefs.c:1004
+#: ../pidgin/gtkprefs.c:951
 msgid "Enable buddy ic_on animation"
 msgstr "�舒亰�亠�亳�� _舒仆亳仄舒�亳� 亰仆舒�从仂于 �仂弍亠�亠亟仆亳从仂于"
 
-#: ../pidgin/gtkprefs.c:1011
+#: ../pidgin/gtkprefs.c:958
 msgid "_Notify buddies that you are typing to them"
 msgstr "_丕于亠亟仂仄仍��� �仂弍亠�亠亟仆亳从仂于, ��仂 于� 仆舒弍亳�舒亠�亠 亳仄 �仂仂弍�亠仆亳亠"
 
-#: ../pidgin/gtkprefs.c:1014
+#: ../pidgin/gtkprefs.c:961
 msgid "Highlight _misspelled words"
 msgstr "�仂亟�于亠�亳于舒�� �仍仂于舒 � _仂�亳弍从舒仄亳"
 
-#: ../pidgin/gtkprefs.c:1018
+#: ../pidgin/gtkprefs.c:965
 msgid "Use smooth-scrolling"
 msgstr "��仗仂仍�亰仂于舒�� 仗仍舒于仆�� 仗�仂从���从�"
 
-#: ../pidgin/gtkprefs.c:1021
+#: ../pidgin/gtkprefs.c:968
 msgid "F_lash window when IMs are received"
-msgstr "_�亠��舒�� 仂从仆仂仄 仗�亳 仗�亳仆��亳亳 仄亞仆仂于亠仆仆�� �仂仂弍�亠仆亳亶"
-
-#: ../pidgin/gtkprefs.c:1023
+msgstr "_�亠��舒�� 仂从仆仂仄 仗�亳 仗仂仍��亠仆亳亳 仄亞仆仂于亠仆仆�� �仂仂弍�亠仆亳亶"
+
+#: ../pidgin/gtkprefs.c:970
 msgid "Minimi_ze new conversation windows"
 msgstr "_弌于仂�舒�亳于舒�� 仆仂于�亠 仂从仆舒 弍亠�亠亟"
 
-#: ../pidgin/gtkprefs.c:1027
+#: ../pidgin/gtkprefs.c:974
 msgid "Font"
 msgstr "丿�亳��"
 
-#: ../pidgin/gtkprefs.c:1029
+#: ../pidgin/gtkprefs.c:976
 msgid "Use document font from _theme"
 msgstr "��仗仂仍�亰仂于舒�� ��亳�� 亟仂从�仄亠仆�舒 亳亰 _�亠仄�"
 
-#: ../pidgin/gtkprefs.c:1031
+#: ../pidgin/gtkprefs.c:978
 msgid "Use font from _theme"
 msgstr "��仗仂仍�亰仂于舒�� ��亳�� 亳亰 _�亠仄�"
 
-#: ../pidgin/gtkprefs.c:1033
+#: ../pidgin/gtkprefs.c:984
 msgid "Conversation _font:"
 msgstr "_丿�亳�� 弍亠�亠亟�:"
 
-#: ../pidgin/gtkprefs.c:1047
+#: ../pidgin/gtkprefs.c:991
 msgid "Default Formatting"
 msgstr "个仂�仄舒�亳�仂于舒仆亳亠 仗仂 �仄仂仍�舒仆亳�"
 
-#: ../pidgin/gtkprefs.c:1066
+#: ../pidgin/gtkprefs.c:1010
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting."
@@ -16272,155 +16622,164 @@
 "丐舒从 弍�亟亠� 于�亞仍�亟亠�� �亠从�� 于舒�亳� �仂仂弍�亠仆亳亶 � 亳�仗仂仍�亰仂于舒仆亳亠仄 仗�仂�仂从仂仍仂于, "
 "仗仂亟亟亠�亢亳于舒��亳� �仂�仄舒�亳�仂于舒仆亳亠."
 
-#: ../pidgin/gtkprefs.c:1126
+#: ../pidgin/gtkprefs.c:1070
 msgid "Cannot start proxy configuration program."
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1138
+#: ../pidgin/gtkprefs.c:1082
 #, fuzzy
 msgid "Cannot start browser configuration program."
 msgstr "�亠 �亟舒���� 仗仂仍��亳�� 仗仂仍�亰仂于舒�亠仍��从�� 亳仆�仂�仄舒�亳�"
 
-#: ../pidgin/gtkprefs.c:1158
+#: ../pidgin/gtkprefs.c:1102
 msgid "ST_UN server:"
 msgstr "ST_UN-�亠�于亠�:"
 
-#: ../pidgin/gtkprefs.c:1170
+#: ../pidgin/gtkprefs.c:1114
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">��亳仄亠�: stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1174
+#: ../pidgin/gtkprefs.c:1118
 msgid "_Autodetect IP address"
 msgstr "�仗�亠亟亠仍��� IP-舒亟�亠� _舒于�仂仄舒�亳�亠�从亳"
 
-#: ../pidgin/gtkprefs.c:1183
+#: ../pidgin/gtkprefs.c:1127
 msgid "Public _IP:"
 msgstr "��弍仍亳�仆�亶 _IP:"
 
-#: ../pidgin/gtkprefs.c:1214
+#: ../pidgin/gtkprefs.c:1158
 msgid "Ports"
 msgstr "�仂���"
 
-#: ../pidgin/gtkprefs.c:1217
+#: ../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:1220
+#: ../pidgin/gtkprefs.c:1167
 msgid "_Start port:"
 msgstr "_�舒�舒仍�仆�亶 仗仂��:"
 
-#: ../pidgin/gtkprefs.c:1227
+#: ../pidgin/gtkprefs.c:1174
 msgid "_End port:"
 msgstr "_�仂仆亠�仆�亶 仗仂��:"
 
-#: ../pidgin/gtkprefs.c:1235
+#: ../pidgin/gtkprefs.c:1182
 #, fuzzy
 msgid "Proxy Server &amp; Browser"
 msgstr "��仂从�亳-�亠�于亠�"
 
-#: ../pidgin/gtkprefs.c:1243
+#: ../pidgin/gtkprefs.c:1190
 msgid "<b>Proxy configuration program was not found.</b>"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1251
+#: ../pidgin/gtkprefs.c:1198
 msgid "<b>Browser configuration program was not found.</b>"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1256
+#: ../pidgin/gtkprefs.c:1203
 msgid ""
 "Proxy & Browser preferences are configured\n"
 "in GNOME Preferences"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1263
+#: ../pidgin/gtkprefs.c:1210
 msgid "Configure _Proxy"
 msgstr "�舒���仂亳�� _仗�仂从�亳"
 
-#: ../pidgin/gtkprefs.c:1268
+#: ../pidgin/gtkprefs.c:1215
 msgid "Configure _Browser"
 msgstr "�舒���仂亳�� _弍�舒�亰亠�"
 
-#: ../pidgin/gtkprefs.c:1274
+#: ../pidgin/gtkprefs.c:1221
 msgid "Proxy Server"
 msgstr "��仂从�亳-�亠�于亠�"
 
-#: ../pidgin/gtkprefs.c:1279
+#: ../pidgin/gtkprefs.c:1226
 msgid "No proxy"
 msgstr "�亠� 仗�仂从�亳"
 
-#: ../pidgin/gtkprefs.c:1335
+#: ../pidgin/gtkprefs.c:1282
 msgid "_User:"
 msgstr "_�仂仍�亰仂于舒�亠仍�:"
 
-#: ../pidgin/gtkprefs.c:1423
+#: ../pidgin/gtkprefs.c:1370
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
-#: ../pidgin/gtkprefs.c:1424
+#: ../pidgin/gtkprefs.c:1371
 msgid "Opera"
 msgstr "Opera"
 
-#: ../pidgin/gtkprefs.c:1425
+#: ../pidgin/gtkprefs.c:1372
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../pidgin/gtkprefs.c:1426
+#: ../pidgin/gtkprefs.c:1373
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../pidgin/gtkprefs.c:1427
+#: ../pidgin/gtkprefs.c:1374
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../pidgin/gtkprefs.c:1428
+#: ../pidgin/gtkprefs.c:1375
+#, fuzzy
+msgid "Desktop Default"
+msgstr "_��亳仆��� ���舒仆仂于从亳 仗仂 �仄仂仍�舒仆亳�"
+
+#: ../pidgin/gtkprefs.c:1376
 msgid "GNOME Default"
 msgstr "��舒�亰亠� GNOME 仗仂 �仄仂仍�舒仆亳�"
 
-#: ../pidgin/gtkprefs.c:1429
+#: ../pidgin/gtkprefs.c:1377
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../pidgin/gtkprefs.c:1430
+#: ../pidgin/gtkprefs.c:1378
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../pidgin/gtkprefs.c:1431
+#: ../pidgin/gtkprefs.c:1379
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../pidgin/gtkprefs.c:1432
+#: ../pidgin/gtkprefs.c:1380
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1441
+#: ../pidgin/gtkprefs.c:1389
 msgid "Manual"
 msgstr "���亞仂亶"
 
-#: ../pidgin/gtkprefs.c:1494
+#: ../pidgin/gtkprefs.c:1450
 msgid "Browser Selection"
 msgstr "��弍仂� 弍�舒�亰亠�舒"
 
-#: ../pidgin/gtkprefs.c:1498
+#: ../pidgin/gtkprefs.c:1454
 msgid "_Browser:"
 msgstr "_��舒�亰亠�:"
 
-#: ../pidgin/gtkprefs.c:1506
+#: ../pidgin/gtkprefs.c:1462
 msgid "_Open link in:"
 msgstr "_��从��于舒�� ���仍从� 于:"
 
-#: ../pidgin/gtkprefs.c:1508
+#: ../pidgin/gtkprefs.c:1464
 msgid "Browser default"
 msgstr "�仂 �仄仂仍�舒仆亳�"
 
-#: ../pidgin/gtkprefs.c:1509
+#: ../pidgin/gtkprefs.c:1465
 msgid "Existing window"
 msgstr "弌��亠��于���亠亠 仂从仆仂"
 
-#: ../pidgin/gtkprefs.c:1511
+#: ../pidgin/gtkprefs.c:1467
 msgid "New tab"
 msgstr "�仂于舒� 于从仍舒亟从舒"
 
-#: ../pidgin/gtkprefs.c:1525
+#: ../pidgin/gtkprefs.c:1484
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -16429,69 +16788,69 @@
 "_����仆��:\n"
 "(%s 亟仍� URL)"
 
-#: ../pidgin/gtkprefs.c:1566
+#: ../pidgin/gtkprefs.c:1510
 msgid "Log _format:"
 msgstr "_个仂�仄舒� 亢��仆舒仍舒:"
 
-#: ../pidgin/gtkprefs.c:1571
+#: ../pidgin/gtkprefs.c:1515
 msgid "Log all _instant messages"
 msgstr "�舒仗亳��于舒�� 于�亠 _仄亞仆仂于亠仆仆�亠 �仂仂弍�亠仆亳�"
 
-#: ../pidgin/gtkprefs.c:1573
+#: ../pidgin/gtkprefs.c:1517
 msgid "Log all c_hats"
 msgstr "�舒仗亳��于舒�� 于�亠 _�舒��"
 
-#: ../pidgin/gtkprefs.c:1575
+#: ../pidgin/gtkprefs.c:1519
 msgid "Log all _status changes to system log"
 msgstr "�舒仗亳��于舒�� 于�亠 亳亰仄亠仆亠仆亳� _��舒���舒 于 �亳��亠仄仆�亶 亢��仆舒仍"
 
-#: ../pidgin/gtkprefs.c:1725
+#: ../pidgin/gtkprefs.c:1669
 msgid "Sound Selection"
 msgstr "��弍仂� 亰于�从舒"
 
-#: ../pidgin/gtkprefs.c:1735
+#: ../pidgin/gtkprefs.c:1679
 #, c-format
 msgid "Quietest"
 msgstr "��亠仆� �亳�仂"
 
-#: ../pidgin/gtkprefs.c:1737
+#: ../pidgin/gtkprefs.c:1681
 #, c-format
 msgid "Quieter"
 msgstr "丐亳�仂"
 
-#: ../pidgin/gtkprefs.c:1739
+#: ../pidgin/gtkprefs.c:1683
 #, c-format
 msgid "Quiet"
 msgstr "�亳亢亠 ��亠亟仆亠亞仂"
 
-#: ../pidgin/gtkprefs.c:1743
+#: ../pidgin/gtkprefs.c:1687
 #, c-format
 msgid "Loud"
 msgstr "���亠 ��亠亟仆亠亞仂"
 
-#: ../pidgin/gtkprefs.c:1745
+#: ../pidgin/gtkprefs.c:1689
 #, c-format
 msgid "Louder"
 msgstr "��仂仄从仂"
 
-#: ../pidgin/gtkprefs.c:1747
+#: ../pidgin/gtkprefs.c:1691
 #, c-format
 msgid "Loudest"
 msgstr "��亠仆� 亞�仂仄从仂"
 
-#: ../pidgin/gtkprefs.c:1813
+#: ../pidgin/gtkprefs.c:1754
 msgid "_Method:"
 msgstr "_�亠�仂亟:"
 
-#: ../pidgin/gtkprefs.c:1815
+#: ../pidgin/gtkprefs.c:1756
 msgid "Console beep"
 msgstr "弌亳亞仆舒仍 亟亳仆舒仄亳从仂仄"
 
-#: ../pidgin/gtkprefs.c:1822
+#: ../pidgin/gtkprefs.c:1763
 msgid "No sounds"
 msgstr "�亠� 亰于�从仂于"
 
-#: ../pidgin/gtkprefs.c:1830
+#: ../pidgin/gtkprefs.c:1776
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -16500,202 +16859,202 @@
 "_�仂仄舒仆亟舒 于仂�仗�仂亳亰于亠亟亠仆亳� 亰于�从舒:\n"
 "(%s 亟仍� 亳仄亠仆亳 �舒亶仍舒)"
 
-#: ../pidgin/gtkprefs.c:1857
+#: ../pidgin/gtkprefs.c:1785
 msgid "Sounds when conversation has _focus"
 msgstr "�于�从亳, 从仂亞亟舒 仂从仆仂 弍亠�亠亟� 于 _�仂从��亠"
 
-#: ../pidgin/gtkprefs.c:1859
+#: ../pidgin/gtkprefs.c:1787
 msgid "Enable sounds:"
 msgstr "�仂�仗�仂亳亰于仂亟亳�� 亰于�从亳:"
 
-#: ../pidgin/gtkprefs.c:1870
+#: ../pidgin/gtkprefs.c:1804
 msgid "Volume:"
 msgstr "��仂仄从仂���:"
 
-#: ../pidgin/gtkprefs.c:1950
+#: ../pidgin/gtkprefs.c:1871
 msgid "Play"
 msgstr "�仂�仗�仂亳亰于仂亟亳��"
 
-#: ../pidgin/gtkprefs.c:2028
+#: ../pidgin/gtkprefs.c:1948
 msgid "_Report idle time:"
 msgstr "弌仂仂弍�舒�� _于�亠仄� 弍亠亰亟亠亶��于亳�:"
 
-#: ../pidgin/gtkprefs.c:2033
+#: ../pidgin/gtkprefs.c:1953
 msgid "Based on keyboard or mouse use"
 msgstr "��仆仂于�于舒��� 仆舒 亳�仗仂仍�亰仂于舒仆亳亳 从仍舒于亳舒���� 亳仍亳 仄��亳"
 
-#: ../pidgin/gtkprefs.c:2042
+#: ../pidgin/gtkprefs.c:1962
 msgid "_Auto-reply:"
 msgstr "_�于�仂仄舒�亳�亠�从亳亶 仂�于亠�:"
 
-#: ../pidgin/gtkprefs.c:2046
+#: ../pidgin/gtkprefs.c:1966
 msgid "When both away and idle"
 msgstr "�仂 于�亠仄� 仂������于亳� 亳 弍亠亰亟亠亶��于亳�"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:2052
+#: ../pidgin/gtkprefs.c:1972
 msgid "Auto-away"
 msgstr "�于�仂-\"��仂��仍\""
 
-#: ../pidgin/gtkprefs.c:2054
+#: ../pidgin/gtkprefs.c:1974
 msgid "Change status when _idle"
 msgstr "�亠仆��� ��舒��� 仗�亳 _弍亠亰亟亠亶��于亳亳"
 
-#: ../pidgin/gtkprefs.c:2058
+#: ../pidgin/gtkprefs.c:1978
 msgid "_Minutes before becoming idle:"
 msgstr "_�亳仆�� 亟仂 仆舒�舒仍舒 弍亠亰亟亠亶��于亳�:"
 
-#: ../pidgin/gtkprefs.c:2066
+#: ../pidgin/gtkprefs.c:1985
 msgid "Change _status to:"
 msgstr "�亠仆��� _��舒��� 仆舒:"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:2087
+#: ../pidgin/gtkprefs.c:1998
 msgid "Status at Startup"
 msgstr "弌�舒��� 仗�亳 亰舒仗��从亠"
 
-#: ../pidgin/gtkprefs.c:2089
+#: ../pidgin/gtkprefs.c:2000
 msgid "Use status from last _exit at startup"
 msgstr "��仗仂仍�亰仂于舒�� 仗�亳 亰舒仗��从亠 ��舒���, 弍�于�亳亶 亟仂 于_��仂亟舒"
 
-#: ../pidgin/gtkprefs.c:2095
+#: ../pidgin/gtkprefs.c:2007
 msgid "Status to a_pply at startup:"
 msgstr "_��亳仄亠仆亳�� 仗�亳 亰舒仗��从亠 ��舒���:"
 
-#: ../pidgin/gtkprefs.c:2134
+#: ../pidgin/gtkprefs.c:2036
 msgid "Interface"
 msgstr "�仆�亠��亠亶�"
 
-#: ../pidgin/gtkprefs.c:2136
+#: ../pidgin/gtkprefs.c:2038
 msgid "Smiley Themes"
 msgstr "丐亠仄� �仄舒亶仍亳从仂于"
 
-#: ../pidgin/gtkprefs.c:2143
+#: ../pidgin/gtkprefs.c:2045
 msgid "Browser"
 msgstr "��舒�亰亠�"
 
-#: ../pidgin/gtkprefs.c:2147
+#: ../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:372
+#: ../pidgin/gtkprivacy.c:352
 msgid "Privacy"
 msgstr "�仂仆�亳亟亠仆�亳舒仍�仆仂���"
 
-#: ../pidgin/gtkprivacy.c:384
+#: ../pidgin/gtkprivacy.c:362
 msgid "Changes to privacy settings take effect immediately."
 msgstr "�亰仄亠仆亠仆亳� 仆舒���仂亠从 从仂仆�亳亟亠仆�亳舒仍�仆仂��亳 于���仗舒�� 于 �亳仍� 仆亠仄亠亟仍亠仆仆仂."
 
-#. "Set privacy for:" label
-#: ../pidgin/gtkprivacy.c:396
+#: ../pidgin/gtkprivacy.c:371
 msgid "Set privacy for:"
 msgstr "丕��舒仆仂于亳�� 从仂仆�亳亟亠仆�亳舒仍�仆仂��� 亟仍�:"
 
-#: ../pidgin/gtkprivacy.c:559 ../pidgin/gtkprivacy.c:576
+#. Remove All button
+#: ../pidgin/gtkprivacy.c:417
+#, fuzzy
+msgid "Remove Al_l"
+msgstr "丕亟舒仍亳��"
+
+#: ../pidgin/gtkprivacy.c:503 ../pidgin/gtkprivacy.c:520
 msgid "Permit User"
 msgstr "�仂仗���亳�� 仗仂仍�亰仂于舒�亠仍�"
 
-#: ../pidgin/gtkprivacy.c:560
+#: ../pidgin/gtkprivacy.c:504
 msgid "Type a user you permit to contact you."
 msgstr "丕从舒亢亳�亠 仗仂仍�亰仂于舒�亠仍�, 从仂�仂�仂亞仂 于� 亟仂仗��从舒亠�亠 从 仂弍�亠仆亳� � 于舒仄亳."
 
-#: ../pidgin/gtkprivacy.c:561
+#: ../pidgin/gtkprivacy.c:505
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr ""
 "�于亠亟亳�亠 亳仄� 仗仂仍�亰仂于舒�亠仍�, 从仂�仂�仂亞仂 于� �仂�亳�亠 亟仂仗���亳�� 从 仂弍�亠仆亳� � 于舒仄亳."
 
-#: ../pidgin/gtkprivacy.c:564 ../pidgin/gtkprivacy.c:580
+#: ../pidgin/gtkprivacy.c:508 ../pidgin/gtkprivacy.c:524
 msgid "_Permit"
 msgstr "_�仂仗���亳��"
 
-#: ../pidgin/gtkprivacy.c:570
+#: ../pidgin/gtkprivacy.c:514
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "�仂亰于仂仍亳�� %s 仂弍�舒���� � 于舒仄亳?"
 
-#: ../pidgin/gtkprivacy.c:572
+#: ../pidgin/gtkprivacy.c:516
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "�� 亟亠亶��于亳�亠仍�仆仂 �仂�亳�亠 仗仂亰于仂仍亳�� %s 仂弍�舒���� � 于舒仄亳?"
 
-#: ../pidgin/gtkprivacy.c:601 ../pidgin/gtkprivacy.c:615
+#: ../pidgin/gtkprivacy.c:545 ../pidgin/gtkprivacy.c:559
 msgid "Block User"
 msgstr "�仍仂从亳�仂于舒�� 仗仂仍�亰仂于舒�亠仍�"
 
-#: ../pidgin/gtkprivacy.c:602
+#: ../pidgin/gtkprivacy.c:546
 msgid "Type a user to block."
 msgstr "丕从舒亢亳�亠 弍仍仂从亳��亠仄仂亞仂 仗仂仍�亰仂于舒�亠仍�."
 
-#: ../pidgin/gtkprivacy.c:603
+#: ../pidgin/gtkprivacy.c:547
 msgid "Please enter the name of the user you wish to block."
 msgstr "�于亠亟亳�亠 亳仄� 仗仂仍�亰仂于舒�亠仍�, 从仂�仂�仂亞仂 于� �仂�亳�亠 弍仍仂从亳�仂于舒��."
 
-#: ../pidgin/gtkprivacy.c:611
+#: ../pidgin/gtkprivacy.c:555
 #, c-format
 msgid "Block %s?"
 msgstr "�仍仂从亳�仂于舒�� %s?"
 
-#: ../pidgin/gtkprivacy.c:613
+#: ../pidgin/gtkprivacy.c:557
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "�� 亟亠亶��于亳�亠仍�仆仂 �仂�亳�亠 弍仍仂从亳�仂于舒�� %s?"
 
-#: ../pidgin/gtkrequest.c:322
+#: ../pidgin/gtkrequest.c:274
 msgid "Apply"
 msgstr "��亳仄亠仆亳��"
 
-#: ../pidgin/gtkrequest.c:1651
+#: ../pidgin/gtkrequest.c:1503
 msgid "That file already exists"
 msgstr "丐舒从仂亶 �舒亶仍 �亢亠 ���亠��于�亠�"
 
-#: ../pidgin/gtkrequest.c:1652
+#: ../pidgin/gtkrequest.c:1504
 msgid "Would you like to overwrite it?"
 msgstr "丱仂�亳�亠 仗亠�亠亰舒仗亳�舒�� 亠亞仂?"
 
-#: ../pidgin/gtkrequest.c:1655
+#: ../pidgin/gtkrequest.c:1507
 msgid "Overwrite"
 msgstr "�亠�亠亰舒仗亳�舒��"
 
-#: ../pidgin/gtkrequest.c:1656
+#: ../pidgin/gtkrequest.c:1508
 msgid "Choose New Name"
 msgstr "��弍�舒�� 仆仂于仂亠 亳仄�"
 
-#: ../pidgin/gtkrequest.c:1797 ../pidgin/gtkrequest.c:1811
+#: ../pidgin/gtkrequest.c:1649 ../pidgin/gtkrequest.c:1663
 msgid "Select Folder..."
 msgstr "��弍�舒�� 仗舒仗从�..."
 
-#. Create the window.
-#: ../pidgin/gtkroomlist.c:518 ../pidgin/gtkroomlist.c:688
-msgid "Room List"
-msgstr "弌仗亳�仂从 从仂仄仆舒�"
-
 #. list button
-#: ../pidgin/gtkroomlist.c:756
+#: ../pidgin/gtkroomlist.c:577
 msgid "_Get List"
 msgstr "_�仂仍��亳�� �仗亳�仂从"
 
 #. add button
-#: ../pidgin/gtkroomlist.c:764
+#: ../pidgin/gtkroomlist.c:585
 msgid "_Add Chat"
 msgstr "_�仂弍舒于亳�� �舒�"
 
@@ -16704,114 +17063,114 @@
 msgstr "�� 亟亠亶��于亳�亠仍�仆仂 �仂�亳�亠 �亟舒仍亳�� 于�弍�舒仆仆�亠 �仂��舒仆�仆仆�亠 ��舒����?"
 
 #. Use button
-#: ../pidgin/gtksavedstatuses.c:620 ../pidgin/gtksavedstatuses.c:1273
+#: ../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:976
+#: ../pidgin/gtksavedstatuses.c:961
 msgid "Different"
 msgstr "��仍亳�舒��亳亶��"
 
-#: ../pidgin/gtksavedstatuses.c:1165
+#: ../pidgin/gtksavedstatuses.c:1153
 msgid "_Title:"
 msgstr "_�舒亰于舒仆亳亠:"
 
-#: ../pidgin/gtksavedstatuses.c:1184 ../pidgin/gtksavedstatuses.c:1505
+#: ../pidgin/gtksavedstatuses.c:1161 ../pidgin/gtksavedstatuses.c:1453
 msgid "_Status:"
 msgstr "_弌�舒���:"
 
 #. Different status message expander
-#: ../pidgin/gtksavedstatuses.c:1217
+#: ../pidgin/gtksavedstatuses.c:1177
 msgid "Use a _different status for some accounts"
 msgstr "��仗仂仍�亰仂于舒�� _仂�仍亳�舒��亳亶�� ��舒��� 亟仍� 仆亠从仂�仂��� ����仆�� 亰舒仗亳�亠亶"
 
 #. Save & Use button
-#: ../pidgin/gtksavedstatuses.c:1281
+#: ../pidgin/gtksavedstatuses.c:1236
 msgid "Sa_ve & Use"
 msgstr "弌仂��舒仆亳�� _亳 仗�亳仄亠仆亳��"
 
-#: ../pidgin/gtksavedstatuses.c:1488
+#: ../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/gtkstatusbox.c:1072
+#: ../pidgin/gtkstatusbox.c:1096
 msgid "New status..."
 msgstr "�仂于�亶 ��舒���..."
 
-#: ../pidgin/gtkstatusbox.c:1073
+#: ../pidgin/gtkstatusbox.c:1097
 msgid "Saved statuses..."
 msgstr "弌仂��舒仆�仆仆�亠 ��舒����..."
 
-#: ../pidgin/gtkutils.c:634
+#: ../pidgin/gtkutils.c:683
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../pidgin/gtkutils.c:1401 ../pidgin/gtkutils.c:1424
+#: ../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:1404 ../pidgin/gtkutils.c:1426
+#: ../pidgin/gtkutils.c:1453 ../pidgin/gtkutils.c:1475
 msgid "Failed to load image"
 msgstr "�亠 �亟舒仍仂�� 亰舒亞��亰亳�� 亳亰仂弍�舒亢亠仆亳亠"
 
-#: ../pidgin/gtkutils.c:1500
+#: ../pidgin/gtkutils.c:1549
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "�亠仍�亰� 仂�仗�舒于亳�� 仗舒仗从� %s."
 
-#: ../pidgin/gtkutils.c:1501
+#: ../pidgin/gtkutils.c:1550
 #, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
 "individually."
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1535 ../pidgin/gtkutils.c:1547
-#: ../pidgin/gtkutils.c:1554
+#: ../pidgin/gtkutils.c:1584 ../pidgin/gtkutils.c:1596
+#: ../pidgin/gtkutils.c:1603
 msgid "You have dragged an image"
 msgstr "�� 仗亠�亠�舒�亳仍亳 亳亰仂弍�舒亢亠仆亳亠"
 
-#: ../pidgin/gtkutils.c:1536
+#: ../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."
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1542 ../pidgin/gtkutils.c:1562
+#: ../pidgin/gtkutils.c:1591 ../pidgin/gtkutils.c:1611
 msgid "Set as buddy icon"
 msgstr "丕��舒仆仂于亳�� 于 从舒�亠��于亠 亰仆舒�从舒 �仂弍亠�亠亟仆亳从舒"
 
-#: ../pidgin/gtkutils.c:1543 ../pidgin/gtkutils.c:1563
+#: ../pidgin/gtkutils.c:1592 ../pidgin/gtkutils.c:1612
 msgid "Send image file"
 msgstr "��仗�舒于亳�� �舒亶仍 亳亰仂弍�舒亢亠仆亳�"
 
-#: ../pidgin/gtkutils.c:1544 ../pidgin/gtkutils.c:1563
+#: ../pidgin/gtkutils.c:1593 ../pidgin/gtkutils.c:1612
 msgid "Insert in message"
 msgstr "���舒于亳�� 于 �仂仂弍�亠仆亳亠"
 
-#: ../pidgin/gtkutils.c:1548
+#: ../pidgin/gtkutils.c:1597
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr ""
 "丱仂�亳�亠 ���舒仆仂于亳�� ��仂 亳亰仂弍�舒亢亠仆亳亠 于 从舒�亠��于亠 亰仆舒�从舒 �仂弍亠�亠亟仆亳从舒 亟仍� ��仂亞仂 "
 "仗仂仍�亰仂于舒�亠仍�?"
 
-#: ../pidgin/gtkutils.c:1555
+#: ../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:1556
+#: ../pidgin/gtkutils.c:1605
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -16822,17 +17181,17 @@
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: ../pidgin/gtkutils.c:1615
+#: ../pidgin/gtkutils.c:1664
 msgid "Cannot send launcher"
 msgstr "�亠仍�亰� 仂�仗�舒于亳�� ��仍�从"
 
-#: ../pidgin/gtkutils.c:1615
+#: ../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."
 msgstr ""
 
-#: ../pidgin/gtkutils.c:2350
+#: ../pidgin/gtkutils.c:2402
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -16843,25 +17202,25 @@
 "<b>�舒亰仄亠� �舒亶仍舒:</b> %s\n"
 "<b>�舒亰仄亠� 亳亰仂弍�舒亢亠仆亳�:</b> %dx%d"
 
-#: ../pidgin/gtkutils.c:2646
+#: ../pidgin/gtkutils.c:2704
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:2648
+#: ../pidgin/gtkutils.c:2706
 msgid "Icon Error"
 msgstr "��亳弍从舒 亰仆舒�从舒"
 
-#: ../pidgin/gtkutils.c:2649
+#: ../pidgin/gtkutils.c:2707
 msgid "Could not set icon"
 msgstr "�亠 �亟舒仍仂�� ���舒仆仂于亳�� 亰仆舒�仂从"
 
-#: ../pidgin/gtkutils.c:2749
+#: ../pidgin/gtkutils.c:2807
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "�亠 �亟舒仍仂�� 仂�从���� �舒亶仍 '%s': %s"
 
-#: ../pidgin/gtkutils.c:2798
+#: ../pidgin/gtkutils.c:2856
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -16899,6 +17258,11 @@
 msgid "_Open Mail"
 msgstr "��从���� _仗仂���"
 
+#: ../pidgin/pidgintooltip.c:100
+#, fuzzy
+msgid "Pidgin Tooltip"
+msgstr "Pidgin"
+
 #: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:2
 msgid "Pidgin smileys"
 msgstr "弌仄舒亶仍亳从亳 Pidgin"
@@ -16915,35 +17279,31 @@
 msgid "none"
 msgstr "仆亠�"
 
-#: ../pidgin/plugins/cap/cap.c:451
-msgid "Display Statistics"
-msgstr "��于亠��亳 ��舒�亳��亳从�"
-
-#: ../pidgin/plugins/cap/cap.c:464 ../pidgin/plugins/cap/cap.c:467
+#: ../pidgin/plugins/cap/cap.c:444 ../pidgin/plugins/cap/cap.c:447
 msgid "Response Probability:"
 msgstr "�亠�仂��仆仂��� 仂�从仍亳从舒:"
 
-#: ../pidgin/plugins/cap/cap.c:813
+#: ../pidgin/plugins/cap/cap.c:772
 msgid "Statistics Configuration"
 msgstr "�舒���仂亶从舒 ��舒�亳��亳从亳"
 
 #. msg_difference spinner
-#: ../pidgin/plugins/cap/cap.c:816
+#: ../pidgin/plugins/cap/cap.c:775
 msgid "Maximum response timeout:"
 msgstr "�舒从�亳仄舒仍�仆仂亠 于�亠仄� 仂亢亳亟舒仆亳� 仂�从仍亳从舒:"
 
-#: ../pidgin/plugins/cap/cap.c:819 ../pidgin/plugins/cap/cap.c:826
-#: ../pidgin/plugins/cap/cap.c:833 ../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:823
+#: ../pidgin/plugins/cap/cap.c:782
 msgid "Maximum last-seen difference:"
 msgstr ""
 
 #. threshold spinner
-#: ../pidgin/plugins/cap/cap.c:830
+#: ../pidgin/plugins/cap/cap.c:789
 msgid "Threshold:"
 msgstr "�仂�仂亞仂于舒� 于亠仍亳�亳仆舒:"
 
@@ -16953,18 +17313,18 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/cap/cap.c:938
+#: ../pidgin/plugins/cap/cap.c:897
 msgid "Contact Availability Prediction"
 msgstr ""
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/cap/cap.c:940
+#: ../pidgin/plugins/cap/cap.c:899
 msgid "Contact Availability Prediction plugin."
 msgstr ""
 
 #. *  summary
-#: ../pidgin/plugins/cap/cap.c:941
+#: ../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."
@@ -17042,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:245
+#: ../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 "��亳仄亠仆��� 于 仄亞仆仂于亠仆仆�� �仂仂弍�亠仆亳��"
 
@@ -17529,7 +17889,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/notify.c:907
+#: ../pidgin/plugins/notify.c:905
 msgid "Message Notification"
 msgstr "丕于亠亟仂仄仍亠仆亳亠 仂 �仂仂弍�亠仆亳亳"
 
@@ -17537,7 +17897,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/notify.c:910 ../pidgin/plugins/notify.c:912
+#: ../pidgin/plugins/notify.c:908 ../pidgin/plugins/notify.c:910
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr ""
 "��亠亟仂��舒于仍�亠� 仄仆仂亢亠��于仂 �仗仂�仂弍仂于 �于亠亟仂仄仍亠仆亳� 于舒� 仂 仆亠仗�仂�亳�舒仆仆�� �仂仂弍�亠仆亳��."
@@ -17574,53 +17934,58 @@
 "- ��仗�舒于仍�亠� �仂仂弍�亠仆亳亠 仗仂仍�亰仂于舒�亠仍�仄 亳亰 于舒�亠亞仂 �仗亳�从舒 ��舒亰� 仗仂�仍亠 亳� "
 "仗仂亟从仍��亠仆亳�"
 
-#: ../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
+#, fuzzy
+msgid "Highlighted Message Name Color"
+msgstr "�仂亟�于亠�亠仆仆�亠 �仂仂弍�亠仆亳�"
+
+#: ../pidgin/plugins/pidginrc.c:66
 msgid "GtkTreeView Horizontal Separation"
 msgstr "�仂�亳亰仂仆�舒仍�仆仂亠 �舒亰亟亠仍亠仆亳亠 GtkTreeView"
 
-#: ../pidgin/plugins/pidginrc.c:69
+#: ../pidgin/plugins/pidginrc.c:81
 msgid "Conversation Entry"
 msgstr "�弍仍舒��� 于于仂亟舒 仂从仆舒 弍亠�亠亟�"
 
-#: ../pidgin/plugins/pidginrc.c:70
+#: ../pidgin/plugins/pidginrc.c:82
 msgid "Request Dialog"
 msgstr "�亳舒仍仂亞 亰舒仗�仂�舒"
 
-#: ../pidgin/plugins/pidginrc.c:71
+#: ../pidgin/plugins/pidginrc.c:83
 msgid "Notify Dialog"
 msgstr "�亳舒仍仂亞 �于亠亟仂仄仍亠仆亳�"
 
-#: ../pidgin/plugins/pidginrc.c:247
+#: ../pidgin/plugins/pidginrc.c:259
 msgid "Select Color"
 msgstr "��弍亠�亳�亠 �于亠�"
 
-#: ../pidgin/plugins/pidginrc.c:294
+#: ../pidgin/plugins/pidginrc.c:306
 #, c-format
 msgid "Select Interface Font"
 msgstr "��弍亠�亳�亠 ��亳��"
 
-#: ../pidgin/plugins/pidginrc.c:297
+#: ../pidgin/plugins/pidginrc.c:309
 #, c-format
 msgid "Select Font for %s"
 msgstr "��弍亠�亳�亠 ��亳�� 亟仍� %s"
 
-#: ../pidgin/plugins/pidginrc.c:365
+#: ../pidgin/plugins/pidginrc.c:377
 msgid "GTK+ Interface Font"
 msgstr "丿�亳�� 亳仆�亠��亠亶�舒 GTK+"
 
-#: ../pidgin/plugins/pidginrc.c:385
+#: ../pidgin/plugins/pidginrc.c:397
 msgid "GTK+ Text Shortcut Theme"
 msgstr ""
 
@@ -17644,36 +18009,36 @@
 #. widget_bool_widgets[i]);
 #. }
 #.
-#: ../pidgin/plugins/pidginrc.c:422
+#: ../pidgin/plugins/pidginrc.c:434
 msgid "Interface colors"
 msgstr "丶于亠�舒 亳仆�亠��亠亶�舒"
 
-#: ../pidgin/plugins/pidginrc.c:446
+#: ../pidgin/plugins/pidginrc.c:458
 msgid "Widget Sizes"
 msgstr "�舒亰仄亠� 于亳亟亢亠�仂于"
 
-#: ../pidgin/plugins/pidginrc.c:467
+#: ../pidgin/plugins/pidginrc.c:479
 msgid "Fonts"
 msgstr "丿�亳���"
 
-#: ../pidgin/plugins/pidginrc.c:491
+#: ../pidgin/plugins/pidginrc.c:503
 msgid "Gtkrc File Tools"
 msgstr ""
 
-#: ../pidgin/plugins/pidginrc.c:496
+#: ../pidgin/plugins/pidginrc.c:508
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
 msgstr "�舒仗亳�舒�� 仆舒���仂亶从亳 于 %s%sgtkrc-2.0"
 
-#: ../pidgin/plugins/pidginrc.c:505
+#: ../pidgin/plugins/pidginrc.c:517
 msgid "Re-read gtkrc files"
 msgstr "�仂于�仂�仆仂 仗�仂�亳�舒�� �舒亶仍� gtkrc"
 
-#: ../pidgin/plugins/pidginrc.c:543
+#: ../pidgin/plugins/pidginrc.c:555
 msgid "Pidgin GTK+ Theme Control"
 msgstr "丕仗�舒于仍亠仆亳亠 �亠仄仂亶 GTK+ 亟仍� Pidgin"
 
-#: ../pidgin/plugins/pidginrc.c:545 ../pidgin/plugins/pidginrc.c:546
+#: ../pidgin/plugins/pidginrc.c:557 ../pidgin/plugins/pidginrc.c:558
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "��亠亟仂��舒于仍�亠� 亟仂���仗 从 �舒��仂 亳�仗仂仍�亰�亠仄�仄 仆舒���仂亶从舒仄 gtkrc."
 
@@ -17748,60 +18113,60 @@
 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:2372
+#: ../pidgin/plugins/spellchk.c:2349
 msgid "Text replacement"
 msgstr "�舒仄亠�亠仆亳亠 �亠从��舒"
 
-#: ../pidgin/plugins/spellchk.c:2374 ../pidgin/plugins/spellchk.c:2375
+#: ../pidgin/plugins/spellchk.c:2351 ../pidgin/plugins/spellchk.c:2352
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr ""
 "�舒仄亠�舒亠� �亠从�� 于 亳��仂亟��亳� �仂仂弍�亠仆亳�� 于 �仂仂�于亠���于亳亳 � 仗�舒于亳仍舒仄亳, "
@@ -17825,7 +18190,7 @@
 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 "��于仂亟亳�� 仂�仄亠�从亳 于�亠仄亠仆亳 从舒亢亟�亠"
 
@@ -17835,19 +18200,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 仄亳仆��."
 
@@ -18009,7 +18374,7 @@
 
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:341
 msgid "_Flash window when chat messages are received"
-msgstr "_�亠��舒�� 仂从仆仂仄 仗�亳 仗�亳仆��亳亳 �仂仂弍�亠仆亳亶 于 �舒�舒�"
+msgstr "_�亠��舒�� 仂从仆仂仄 仗�亳 仗仂仍��亠仆亳亳 �仂仂弍�亠仆亳亶 于 �舒�舒�"
 
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:371
 msgid "Windows Pidgin Options"