Mercurial > pidgin

--- a/po/ChangeLog	Thu May 15 10:19:37 2008 +0000
+++ b/po/ChangeLog	Thu May 15 10:23:25 2008 +0000
@@ -5,6 +5,7 @@
 	* Portuguese (Brazilian) translation updated (Rodrigo Luiz
 	  Marques Flores)
 	* Romanian translation updated (Mi�u Moldovan)
+	* Russian translation updated (Dmitry Beloglazov)
 	* Spanish translation updated (Javier Fern叩ndez-Sanguino)

 version 2.4.1
--- a/po/ru.po	Thu May 15 10:19:37 2008 +0000
+++ b/po/ru.po	Thu May 15 10:23:25 2008 +0000
@@ -9,8 +9,8 @@
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-28 12:08+0300\n"
-"PO-Revision-Date: 2008-03-29 19:00+0300\n"
+"POT-Creation-Date: 2008-05-13 10:06+0400\n"
+"PO-Revision-Date: 2008-05-14 15:00+0400\n"
 "Last-Translator: Dmitry Beloglazov <dmaa@users.sf.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -52,7 +52,7 @@
 "  -n, --nologin       仆亠 于�仂亟亳�� 舒于�仂仄舒�亳�亠�从亳\n"
 "  -v, --version       仗仂从舒亰舒�� �亠从���� 于亠��亳� 亳 于�亶�亳\n"

-#: ../finch/finch.c:327 ../pidgin/gtkmain.c:737
+#: ../finch/finch.c:327 ../pidgin/gtkmain.c:738
 #, c-format
 msgid ""
 "%s encountered errors migrating your settings from %s to %s. Please "
@@ -60,18 +60,18 @@
 "http://developer.pidgin.im"
 msgstr ""

-#: ../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:2079
-#: ../libpurple/protocols/jabber/chat.c:677
-#: ../libpurple/protocols/jabber/chat.c:688
+#: ../finch/gntaccount.c:124 ../finch/gntaccount.c:484 ../finch/gntblist.c:595
+#: ../finch/gntblist.c:759 ../finch/gntblist.c:772 ../finch/gntplugin.c:196
+#: ../finch/gntplugin.c:244 ../finch/gntrequest.c:380 ../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:2080
+#: ../libpurple/protocols/jabber/chat.c:682
+#: ../libpurple/protocols/jabber/chat.c:693
 #: ../libpurple/protocols/jabber/jabber.c:1594
 #: ../libpurple/protocols/qq/group_join.c:328
 #: ../libpurple/protocols/qq/im.c:576 ../libpurple/protocols/silc/ops.c:76
-#: ../libpurple/protocols/silc/ops.c:1475
+#: ../libpurple/protocols/silc/ops.c:1473
 #: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error"
 msgstr "��亳弍从舒"
@@ -81,8 +81,8 @@
 msgstr "丕���仆舒� 亰舒仗亳�� 仆亠 弍�仍舒 亟仂弍舒于仍亠仆舒"

 #: ../finch/gntaccount.c:125
-msgid "Screenname of an account must be non-empty."
-msgstr "�亟亠仆�亳�亳从舒�仂� ����仆仂亶 亰舒仗亳�亳 亟仂仍亢亠仆 弍��� 仆亠仗����仄."
+msgid "Username of an account must be non-empty."
+msgstr "�仄� ����仆仂亶 亰舒仗亳�亳 亟仂仍亢仆仂 弍��� 仆亠仗����仄."

 #: ../finch/gntaccount.c:437
 msgid "New mail notifications"
@@ -101,7 +101,7 @@
 msgstr ""

 #: ../finch/gntaccount.c:496 ../finch/gntconn.c:138
-#: ../pidgin/gtkaccount.c:1447 ../pidgin/gtkblist.c:4588
+#: ../pidgin/gtkaccount.c:1449 ../pidgin/gtkblist.c:4671
 msgid "Modify Account"
 msgstr "�亰仄亠仆亳�� ����仆�� 亰舒仗亳��"

@@ -115,8 +115,8 @@

 #: ../finch/gntaccount.c:529
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:294
-msgid "Screen name:"
-msgstr "�亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍�:"
+msgid "Username:"
+msgstr "�仄� 仗仂仍�亰仂于舒�亠仍�:"

 #: ../finch/gntaccount.c:542
 msgid "Password:"
@@ -129,27 +129,27 @@
 #. Cancel button
 #. Cancel
 #: ../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:2604 ../finch/gntblist.c:2655
-#: ../finch/gntblist.c:2719 ../finch/gntcertmgr.c:90 ../finch/gntplugin.c:532
-#: ../finch/gntpounce.c:471 ../finch/gntpounce.c:679 ../finch/gntprefs.c:265
-#: ../finch/gntsound.c:1064 ../finch/gntstatus.c:145 ../finch/gntstatus.c:485
-#: ../finch/gntstatus.c:610 ../finch/plugins/gnthistory.c:178
-#: ../libpurple/account.c:1118 ../libpurple/account.c:1421
-#: ../libpurple/account.c:1456 ../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:758
-#: ../libpurple/protocols/jabber/buddy.c:2473
-#: ../libpurple/protocols/jabber/buddy.c:2509
-#: ../libpurple/protocols/jabber/chat.c:786
+#: ../finch/gntaccount.c:890 ../finch/gntblist.c:641 ../finch/gntblist.c:747
+#: ../finch/gntblist.c:782 ../finch/gntblist.c:1134 ../finch/gntblist.c:1360
+#: ../finch/gntblist.c:1494 ../finch/gntblist.c:2661 ../finch/gntblist.c:2712
+#: ../finch/gntblist.c:2776 ../finch/gntblist.c:2838 ../finch/gntcertmgr.c:90
+#: ../finch/gntplugin.c:532 ../finch/gntpounce.c:471 ../finch/gntpounce.c:679
+#: ../finch/gntprefs.c:265 ../finch/gntsound.c:1064 ../finch/gntstatus.c:145
+#: ../finch/gntstatus.c:485 ../finch/gntstatus.c:610
+#: ../finch/plugins/gnthistory.c:178 ../libpurple/account.c:1118
+#: ../libpurple/account.c:1437 ../libpurple/account.c:1472
+#: ../libpurple/conversation.c:1235 ../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:759
+#: ../libpurple/protocols/jabber/buddy.c:2474
+#: ../libpurple/protocols/jabber/buddy.c:2510
+#: ../libpurple/protocols/jabber/chat.c:791
 #: ../libpurple/protocols/jabber/jabber.c:1063
 #: ../libpurple/protocols/jabber/jabber.c:1072
 #: ../libpurple/protocols/jabber/jabber.c:1787
-#: ../libpurple/protocols/jabber/si.c:1109
-#: ../libpurple/protocols/jabber/usermood.c:202
+#: ../libpurple/protocols/jabber/si.c:1113
+#: ../libpurple/protocols/jabber/usermood.c:199
 #: ../libpurple/protocols/jabber/usernick.c:78
 #: ../libpurple/protocols/jabber/xdata.c:403
 #: ../libpurple/protocols/msn/msn.c:301 ../libpurple/protocols/msn/msn.c:318
@@ -161,7 +161,7 @@
 #: ../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/oscar.c:6209
 #: ../libpurple/protocols/oscar/peer.c:1048
 #: ../libpurple/protocols/qq/buddy_info.c:525
 #: ../libpurple/protocols/qq/buddy_opt.c:214
@@ -174,20 +174,20 @@
 #: ../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:3439
-#: ../libpurple/protocols/sametime/sametime.c:3525
-#: ../libpurple/protocols/sametime/sametime.c:3699
-#: ../libpurple/protocols/sametime/sametime.c:5452
-#: ../libpurple/protocols/sametime/sametime.c:5542
-#: ../libpurple/protocols/sametime/sametime.c:5667
+#: ../libpurple/protocols/sametime/sametime.c:3440
+#: ../libpurple/protocols/sametime/sametime.c:3526
+#: ../libpurple/protocols/sametime/sametime.c:3700
+#: ../libpurple/protocols/sametime/sametime.c:5453
+#: ../libpurple/protocols/sametime/sametime.c:5543
+#: ../libpurple/protocols/sametime/sametime.c:5668
 #: ../libpurple/protocols/silc/buddy.c:455
 #: ../libpurple/protocols/silc/buddy.c:1079
 #: ../libpurple/protocols/silc/buddy.c:1194
-#: ../libpurple/protocols/silc/chat.c:620
-#: ../libpurple/protocols/silc/chat.c:750
-#: ../libpurple/protocols/silc/ops.c:1835
-#: ../libpurple/protocols/silc/silc.c:966
-#: ../libpurple/protocols/silc/silc.c:1174
+#: ../libpurple/protocols/silc/chat.c:619
+#: ../libpurple/protocols/silc/chat.c:753
+#: ../libpurple/protocols/silc/ops.c:1833
+#: ../libpurple/protocols/silc/silc.c:1039
+#: ../libpurple/protocols/silc/silc.c:1247
 #: ../libpurple/protocols/silc10/buddy.c:468
 #: ../libpurple/protocols/silc10/buddy.c:1087
 #: ../libpurple/protocols/silc10/buddy.c:1192
@@ -197,21 +197,21 @@
 #: ../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:6796
-#: ../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:294 ../pidgin/gtkpounce.c:1113
+#: ../libpurple/protocols/yahoo/yahoo.c:3564
+#: ../libpurple/protocols/yahoo/yahoo.c:3575 ../pidgin/gtkaccount.c:1843
+#: ../pidgin/gtkaccount.c:2404 ../pidgin/gtkblist.c:684
+#: ../pidgin/gtkblist.c:6879 ../pidgin/gtkcertmgr.c:197
+#: ../pidgin/gtkdialogs.c:768 ../pidgin/gtkdialogs.c:907
+#: ../pidgin/gtkdialogs.c:999 ../pidgin/gtkdialogs.c:1019
+#: ../pidgin/gtkdialogs.c:1043 ../pidgin/gtkdialogs.c:1065
+#: ../pidgin/gtkdialogs.c:1113 ../pidgin/gtkdialogs.c:1154
+#: ../pidgin/gtkdialogs.c:1210 ../pidgin/gtkdialogs.c:1249
+#: ../pidgin/gtkdialogs.c:1276 ../pidgin/gtkimhtmltoolbar.c:438
+#: ../pidgin/gtklog.c:327 ../pidgin/gtkplugin.c:302 ../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
+#: ../pidgin/gtkstatusbox.c:1619
 msgid "Cancel"
 msgstr "��仄亠仆亳��"

@@ -220,14 +220,14 @@
 #: ../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:1061 ../finch/gntstatus.c:488 ../finch/gntstatus.c:598
-#: ../libpurple/account.c:1455 ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:757 ../pidgin/gtkdebug.c:746
-#: ../pidgin/gtkrequest.c:279
+#: ../libpurple/account.c:1471 ../libpurple/plugins/buddynote.c:50
+#: ../libpurple/protocols/jabber/buddy.c:758 ../pidgin/gtkblist.c:684
+#: ../pidgin/gtkdebug.c:746 ../pidgin/gtkrequest.c:279
 msgid "Save"
 msgstr "弌仂��舒仆亳��"

-#: ../finch/gntaccount.c:632 ../pidgin/gtkaccount.c:1832
-#: ../pidgin/gtksavedstatuses.c:333 ../pidgin/gtkstatusbox.c:1604
+#: ../finch/gntaccount.c:632 ../pidgin/gtkaccount.c:1834
+#: ../pidgin/gtksavedstatuses.c:333 ../pidgin/gtkstatusbox.c:1613
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "�� 亟亠亶��于亳�亠仍�仆仂 �仂�亳�亠 �亟舒仍亳�� %s?"
@@ -240,14 +240,14 @@
 #: ../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:1840 ../pidgin/gtklog.c:326
+#: ../pidgin/gtkaccount.c:1842 ../pidgin/gtklog.c:326
 #: ../pidgin/gtkpounce.c:1112 ../pidgin/gtkrequest.c:276
-#: ../pidgin/gtksavedstatuses.c:344 ../pidgin/gtkstatusbox.c:1609
+#: ../pidgin/gtksavedstatuses.c:344 ../pidgin/gtkstatusbox.c:1618
 msgid "Delete"
 msgstr "丕亟舒仍亳��"

-#: ../finch/gntaccount.c:670 ../finch/gntblist.c:2471 ../finch/gntui.c:94
-#: ../pidgin/gtkaccount.c:2261 ../pidgin/gtkdocklet.c:716
+#: ../finch/gntaccount.c:670 ../finch/gntblist.c:2528 ../finch/gntui.c:94
+#: ../pidgin/gtkaccount.c:2263 ../pidgin/gtkdocklet.c:716
 msgid "Accounts"
 msgstr "丕���仆�亠 亰舒仗亳�亳"

@@ -256,17 +256,17 @@
 msgstr "�� 仄仂亢亠�亠 于从仍��舒��/于�从仍��舒�� ����仆�亠 亰舒仗亳�亳 亳亰 �仍亠亟���亠亞仂 �仗亳�从舒."

 #. Add button
-#: ../finch/gntaccount.c:699 ../finch/gntaccount.c:889 ../finch/gntblist.c:619
-#: ../finch/gntblist.c:698 ../finch/gntblist.c:733 ../finch/gntblist.c:2823
+#: ../finch/gntaccount.c:699 ../finch/gntaccount.c:889 ../finch/gntblist.c:640
+#: ../finch/gntblist.c:747 ../finch/gntblist.c:782 ../finch/gntblist.c:2947
 #: ../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:5541
-#: ../libpurple/protocols/silc/chat.c:619
-#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2401
-#: ../pidgin/gtkblist.c:6795 ../pidgin/gtkconv.c:1696
+#: ../libpurple/protocols/sametime/sametime.c:5542
+#: ../libpurple/protocols/silc/chat.c:618
+#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2403
+#: ../pidgin/gtkblist.c:6878 ../pidgin/gtkconv.c:1721
 #: ../pidgin/gtkrequest.c:277
 msgid "Add"
 msgstr "�仂弍舒于亳��"
@@ -276,33 +276,33 @@
 msgid "Modify"
 msgstr "�亰仄亠仆亳��"

-#: ../finch/gntaccount.c:812 ../pidgin/gtkaccount.c:2348
+#: ../finch/gntaccount.c:812 ../pidgin/gtkaccount.c:2350
 #, 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:885 ../pidgin/gtkaccount.c:2400
+#: ../finch/gntaccount.c:885 ../pidgin/gtkaccount.c:2402
 msgid "Add buddy to your list?"
 msgstr "�仂弍舒于亳�� �仂弍亠�亠亟仆亳从舒 于 �仗亳�仂从?"

-#: ../finch/gntaccount.c:945 ../pidgin/gtkaccount.c:2458
+#: ../finch/gntaccount.c:945 ../pidgin/gtkaccount.c:2460
 #, 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:970 ../finch/gntaccount.c:973
-#: ../finch/gntaccount.c:1000 ../pidgin/gtkaccount.c:2481
-#: ../pidgin/gtkaccount.c:2488
+#: ../finch/gntaccount.c:1000 ../pidgin/gtkaccount.c:2483
+#: ../pidgin/gtkaccount.c:2490
 msgid "Authorize buddy?"
 msgstr "�于�仂�亳亰仂于舒�� �仂弍亠�亠亟仆亳从舒?"

 #: ../finch/gntaccount.c:977 ../finch/gntaccount.c:1004
-#: ../pidgin/gtkaccount.c:2482 ../pidgin/gtkaccount.c:2489
+#: ../pidgin/gtkaccount.c:2484 ../pidgin/gtkaccount.c:2491
 msgid "Authorize"
 msgstr "�于�仂�亳亰仂于舒��"

 #: ../finch/gntaccount.c:978 ../finch/gntaccount.c:1005
-#: ../pidgin/gtkaccount.c:2483 ../pidgin/gtkaccount.c:2490
+#: ../pidgin/gtkaccount.c:2485 ../pidgin/gtkaccount.c:2492
 msgid "Deny"
 msgstr "��从舒亰舒��"

@@ -334,50 +334,66 @@
 msgid "Default"
 msgstr "�仂 �仄仂仍�舒仆亳�"

-#: ../finch/gntblist.c:563
-msgid "You must provide a screename for the buddy."
-msgstr "�� 亟仂仍亢仆� 亰舒亟舒�� 亳亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍� 亟仍� �仂弍亠�亠亟仆亳从舒."
-
-#: ../finch/gntblist.c:565
+#: ../finch/gntblist.c:584
+msgid "You must provide a username for the buddy."
+msgstr "�� 亟仂仍亢仆� 亰舒亟舒�� 亳仄� 仗仂仍�亰仂于舒�亠仍� 亟仍� �仂弍亠�亠亟仆亳从舒."
+
+#: ../finch/gntblist.c:586
 msgid "You must provide a group."
 msgstr "�� 亟仂仍亢仆� 亰舒亟舒�� 亞��仗仗�."

-#: ../finch/gntblist.c:567
+#: ../finch/gntblist.c:588
 msgid "You must select an account."
 msgstr "�� 亟仂仍亢仆� 于�弍�舒�� ����仆�� 亰舒仗亳��."

-#: ../finch/gntblist.c:569
+#: ../finch/gntblist.c:590
 msgid "The selected account is not online."
 msgstr ""

-#: ../finch/gntblist.c:574
+#: ../finch/gntblist.c:595
 msgid "Error adding buddy"
 msgstr "��亳弍从舒 亟仂弍舒于仍亠仆亳� �仂弍亠�亠亟仆亳从舒"

-#: ../finch/gntblist.c:601 ../pidgin/gtkaccount.c:1914
+#: ../finch/gntblist.c:622 ../libpurple/protocols/irc/irc.c:974
+#: ../libpurple/protocols/irc/msgs.c:364
+#: ../libpurple/protocols/jabber/jabber.c:974
+#: ../libpurple/protocols/jabber/jabber.c:976
+#: ../libpurple/protocols/oscar/oscar.c:2944
+#: ../libpurple/protocols/oscar/oscar.c:3961
+#: ../libpurple/protocols/silc/buddy.c:1542
+#: ../libpurple/protocols/silc/ops.c:1210
+#: ../libpurple/protocols/silc/ops.c:1213
+#: ../libpurple/protocols/silc/ops.c:1349
+#: ../libpurple/protocols/silc/ops.c:1352
+#: ../libpurple/protocols/silc/silc.c:1221
+#: ../libpurple/protocols/silc10/buddy.c:1542
+#: ../libpurple/protocols/silc10/ops.c:1191
+#: ../libpurple/protocols/silc10/ops.c:1194
+#: ../libpurple/protocols/silc10/ops.c:1340
+#: ../libpurple/protocols/silc10/ops.c:1343
+#: ../libpurple/protocols/silc10/silc.c:922 ../pidgin/gtkaccount.c:1916
 #: ../pidgin/gtksavedstatuses.c:971
-msgid "Screen Name"
-msgstr "�亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍�"
-
-#: ../finch/gntblist.c:604
+msgid "Username"
+msgstr "�仄� 仗仂仍�亰仂于舒�亠仍�"
+
+#: ../finch/gntblist.c:625
 msgid "Alias (optional)"
 msgstr "��亠于亟仂仆亳仄 (仆亠 仂弍�亰舒�亠仍亠仆)"

-#: ../finch/gntblist.c:607
-#, fuzzy
+#: ../finch/gntblist.c:628
 msgid "Add in group"
-msgstr "�仂弍舒于亳�� 亞��仗仗�"
-
-#: ../finch/gntblist.c:611 ../finch/gntblist.c:678 ../finch/gntblist.c:1648
-#: ../finch/gntblist.c:2585 ../finch/gntblist.c:2641 ../finch/gntblist.c:2706
-#: ../finch/gntnotify.c:174 ../finch/gntstatus.c:576
+msgstr "�仂弍舒于亳�� 于 亞��仗仗�"
+
+#: ../finch/gntblist.c:632 ../finch/gntblist.c:726 ../finch/gntblist.c:1705
+#: ../finch/gntblist.c:2642 ../finch/gntblist.c:2698 ../finch/gntblist.c:2763
+#: ../finch/gntblist.c:2823 ../finch/gntnotify.c:174 ../finch/gntstatus.c:576
 #: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:3237 ../pidgin/gtknotify.c:517
+#: ../pidgin/gtkblist.c:3319 ../pidgin/gtknotify.c:530
 #: ../pidgin/gtkpounce.c:1281 ../pidgin/plugins/gevolution/gevolution.c:447
 msgid "Account"
 msgstr "丕���仆舒� 亰舒仗亳��"

-#: ../finch/gntblist.c:617 ../finch/gntblist.c:1126
+#: ../finch/gntblist.c:638 ../finch/gntblist.c:1183
 #: ../libpurple/protocols/silc/buddy.c:725
 #: ../libpurple/protocols/silc/buddy.c:1030
 #: ../libpurple/protocols/silc/buddy.c:1075
@@ -386,203 +402,204 @@
 #: ../libpurple/protocols/silc10/buddy.c:1036
 #: ../libpurple/protocols/silc10/buddy.c:1083
 #: ../libpurple/protocols/silc10/buddy.c:1183
-#: ../libpurple/protocols/yahoo/yahoo.c:3400 ../pidgin/gtkblist.c:6344
+#: ../libpurple/protocols/yahoo/yahoo.c:3400 ../pidgin/gtkblist.c:6427
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:449
 msgid "Add Buddy"
 msgstr "�仂弍舒于亳�� �仂弍亠�亠亟仆亳从舒"

-#: ../finch/gntblist.c:617
+#: ../finch/gntblist.c:638
 msgid "Please enter buddy information."
 msgstr "�于亠亟亳�亠 亳仆�仂�仄舒�亳� 仂 �仂弍亠�亠亟仆亳从亠."

-#: ../finch/gntblist.c:647 ../libpurple/blist.c:1237
+#: ../finch/gntblist.c:694 ../libpurple/blist.c:1237
 msgid "Chats"
 msgstr "丼舒��"

 #. Extract their Name and put it in
-#: ../finch/gntblist.c:684 ../finch/gntblist.c:2580 ../finch/gntblist.c:2636
-#: ../finch/gntroomlist.c:298 ../libpurple/protocols/jabber/jabber.c:991
+#: ../finch/gntblist.c:732 ../finch/gntblist.c:2637 ../finch/gntblist.c:2693
+#: ../finch/gntblist.c:2818 ../finch/gntroomlist.c:298
+#: ../libpurple/protocols/jabber/jabber.c:991
 #: ../libpurple/protocols/jabber/jabber.c:994
 #: ../libpurple/protocols/msn/msn.c:1754 ../libpurple/protocols/msn/msn.c:1819
 #: ../libpurple/protocols/msn/msn.c:1846
 #: ../libpurple/protocols/msnp9/msn.c:1595
 #: ../libpurple/protocols/msnp9/msn.c:1660
 #: ../libpurple/protocols/msnp9/msn.c:1687
-#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:656
+#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:766
 #: ../pidgin/gtkroomlist.c:749
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:123
 msgid "Name"
 msgstr "�仄�"

-#: ../finch/gntblist.c:687 ../finch/gntblist.c:1589
+#: ../finch/gntblist.c:735 ../finch/gntblist.c:1646
 #: ../libpurple/protocols/msn/msn.c:1573
 #: ../libpurple/protocols/msnp9/msn.c:1413
-#: ../libpurple/protocols/silc/chat.c:610
+#: ../libpurple/protocols/silc/chat.c:609
 #: ../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
+#: ../libpurple/protocols/zephyr/zephyr.c:1167 ../pidgin/gtkdialogs.c:1018
+#: ../pidgin/gtkdialogs.c:1042 ../pidgin/gtkdialogs.c:1064
 #: ../pidgin/gtkrequest.c:280
 msgid "Alias"
 msgstr "��亠于亟仂仆亳仄"

-#: ../finch/gntblist.c:690 ../finch/gntblist.c:2839
+#: ../finch/gntblist.c:738 ../finch/gntblist.c:2963
 msgid "Group"
 msgstr "���仗仗舒"

-#: ../finch/gntblist.c:693 ../finch/gntblist.c:1093
+#: ../finch/gntblist.c:742 ../finch/gntblist.c:1150
 msgid "Auto-join"
 msgstr "��亳�仂亠亟亳仆����� 舒于�仂仄舒�亳�亠�从亳"

-#: ../finch/gntblist.c:696 ../finch/gntblist.c:1128 ../pidgin/gtkblist.c:6709
+#: ../finch/gntblist.c:745 ../finch/gntblist.c:1185 ../pidgin/gtkblist.c:6792
 msgid "Add Chat"
 msgstr "�仂弍舒于亳�� �舒�"

-#: ../finch/gntblist.c:697
+#: ../finch/gntblist.c:746
 msgid "You can edit more information from the context menu later."
 msgstr "�� 仄仂亢亠�亠 亳亰仄亠仆亳�� 弍仂仍��亠 亳仆�仂�仄舒�亳亳 仗仂亰亢亠 亳亰 从仂仆�亠从��仆仂亞仂 仄亠仆�."

-#: ../finch/gntblist.c:710 ../finch/gntblist.c:723
+#: ../finch/gntblist.c:759 ../finch/gntblist.c:772
 msgid "Error adding group"
 msgstr "��亳弍从舒 亟仂弍舒于仍亠仆亳� 亞��仗仗�"

-#: ../finch/gntblist.c:711
+#: ../finch/gntblist.c:760
 msgid "You must give a name for the group to add."
 msgstr "�� 亟仂仍亢仆� 亟舒�� 亳仄� 亟仂弍舒于仍�亠仄仂亶 亞��仗仗亠."

-#: ../finch/gntblist.c:724
+#: ../finch/gntblist.c:773
 msgid "A group with the name already exists."
 msgstr "���仗仗舒 � �舒从亳仄 亳仄亠仆亠仄 �亢亠 ���亠��于�亠�."

-#: ../finch/gntblist.c:731 ../finch/gntblist.c:1130
-#: ../libpurple/protocols/sametime/sametime.c:5451
-#: ../libpurple/protocols/sametime/sametime.c:5539 ../pidgin/gtkblist.c:6792
+#: ../finch/gntblist.c:780 ../finch/gntblist.c:1187
+#: ../libpurple/protocols/sametime/sametime.c:5452
+#: ../libpurple/protocols/sametime/sametime.c:5540 ../pidgin/gtkblist.c:6875
 msgid "Add Group"
 msgstr "�仂弍舒于亳�� 亞��仗仗�"

-#: ../finch/gntblist.c:731
+#: ../finch/gntblist.c:780
 msgid "Enter the name of the group"
 msgstr "�于亠亟亳�亠 亳仄� 亞��仗仗�"

-#: ../finch/gntblist.c:1076
+#: ../finch/gntblist.c:1133 ../pidgin/gtkblist.c:683
 msgid "Edit Chat"
 msgstr "�亰仄亠仆亳�� �舒�"

-#: ../finch/gntblist.c:1076
+#: ../finch/gntblist.c:1133
 msgid "Please Update the necessary fields."
 msgstr "�弍仆仂于亳�亠 仆�亢仆�亠 仗仂仍�."

-#: ../finch/gntblist.c:1077 ../finch/gntstatus.c:205
+#: ../finch/gntblist.c:1134 ../finch/gntstatus.c:205
 msgid "Edit"
 msgstr "�亰仄亠仆亳��"

-#: ../finch/gntblist.c:1102
+#: ../finch/gntblist.c:1159
 msgid "Edit Settings"
 msgstr "�亰仄亠仆亳�� 仆舒���仂亶从亳"

-#: ../finch/gntblist.c:1138 ../pidgin/gtkutils.c:980
+#: ../finch/gntblist.c:1195 ../pidgin/gtkutils.c:982
 msgid "Information"
 msgstr "�仆�仂�仄舒�亳�"

-#: ../finch/gntblist.c:1138 ../pidgin/gtkutils.c:980
+#: ../finch/gntblist.c:1195 ../pidgin/gtkutils.c:982
 msgid "Retrieving..."
 msgstr "�舒亞��亰从舒..."

-#: ../finch/gntblist.c:1192 ../finch/gntconv.c:591
-#: ../libpurple/protocols/silc/chat.c:903
+#: ../finch/gntblist.c:1249 ../finch/gntconv.c:591
+#: ../libpurple/protocols/silc/chat.c:906
 #: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
 msgstr "�仂仍��亳�� 亳仆�仂�仄舒�亳�"

-#: ../finch/gntblist.c:1196
+#: ../finch/gntblist.c:1253
 msgid "Add Buddy Pounce"
 msgstr "�仂弍舒于亳�� 仗�舒于亳仍仂"

 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:1203 ../finch/gntconv.c:603
-#: ../libpurple/protocols/jabber/si.c:1109
+#: ../finch/gntblist.c:1260 ../finch/gntconv.c:603
+#: ../libpurple/protocols/jabber/si.c:1113
 #: ../libpurple/protocols/oscar/oscar.c:655 ../libpurple/protocols/qq/qq.c:588
-#: ../pidgin/gtkconv.c:1644
+#: ../pidgin/gtkconv.c:1669
 msgid "Send File"
 msgstr "��仗�舒于亳�� �舒亶仍"

-#: ../finch/gntblist.c:1210 ../libpurple/protocols/gg/gg.c:1629
+#: ../finch/gntblist.c:1267 ../libpurple/protocols/gg/gg.c:1629
 #: ../libpurple/protocols/msn/msn.c:674 ../libpurple/protocols/msnp9/msn.c:562
 msgid "Blocked"
 msgstr "�舒弍仍仂从亳�仂于舒仆"

-#: ../finch/gntblist.c:1216 ../finch/gntblist.c:1605
+#: ../finch/gntblist.c:1273 ../finch/gntblist.c:1662 ../finch/gntblist.c:2832
 msgid "View Log"
 msgstr "��仂�仄仂��亠�� 亢��仆舒仍"

-#: ../finch/gntblist.c:1298
+#: ../finch/gntblist.c:1355
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr "�于亠亟亳�亠 仆仂于仂亠 亳仄� 亟仍� %s"

-#: ../finch/gntblist.c:1300 ../finch/gntblist.c:1589
+#: ../finch/gntblist.c:1357 ../finch/gntblist.c:1646
 msgid "Rename"
 msgstr "�亠�亠亳仄亠仆仂于舒��"

-#: ../finch/gntblist.c:1300
+#: ../finch/gntblist.c:1357
 msgid "Set Alias"
 msgstr "�舒亟舒�� 仗�亠于亟仂仆亳仄"

-#: ../finch/gntblist.c:1301
+#: ../finch/gntblist.c:1358
 msgid "Enter empty string to reset the name."
 msgstr "�于亠亟亳�亠 仗����� ���仂从� 亟仍� �弍�仂�舒 亳仄亠仆亳."

-#: ../finch/gntblist.c:1415
+#: ../finch/gntblist.c:1472
 msgid "Removing this contact will also remove all the buddies in the contact"
 msgstr ""
 "丕亟舒仍亠仆亳亠 ��仂亞仂 从仂仆�舒从�舒 仗�亳于亠亟�� 从 �亟舒仍亠仆亳� 于�亠� 于�仂亟��亳� 于 仆亠亞仂 �仂弍亠�亠亟仆亳从仂于"

-#: ../finch/gntblist.c:1423
+#: ../finch/gntblist.c:1480
 msgid "Removing this group will also remove all the buddies in the group"
 msgstr ""
 "丕亟舒仍亠仆亳亠 ��仂亶 亞��仗仗� 仗�亳于亠亟�� 从 �亟舒仍亠仆亳� 于�亠� 于�仂亟��亳� 于 仆亠� �仂弍亠�亠亟仆亳从仂于"

-#: ../finch/gntblist.c:1428
+#: ../finch/gntblist.c:1485
 #, c-format
 msgid "Are you sure you want to remove %s?"
 msgstr "�� 亟亠亶��于亳�亠仍�仆仂 �仂�亳�亠 �亟舒仍亳�� %s?"

 #. XXX: anything to do with the returned ui-handle?
-#: ../finch/gntblist.c:1431
+#: ../finch/gntblist.c:1488
 msgid "Confirm Remove"
 msgstr "�仂亟�于亠�亟亳�� �亟舒仍亠仆亳亠"

-#: ../finch/gntblist.c:1436 ../finch/gntblist.c:1591 ../finch/gntft.c:243
-#: ../pidgin/gtkconv.c:1693 ../pidgin/gtkrequest.c:278
-#: ../pidgin/gtkstatusbox.c:267
+#: ../finch/gntblist.c:1493 ../finch/gntblist.c:1648 ../finch/gntft.c:243
+#: ../pidgin/gtkconv.c:1718 ../pidgin/gtkrequest.c:278
+#: ../pidgin/gtkstatusbox.c:268
 msgid "Remove"
 msgstr "丕亟舒仍亳��"

 #. Buddy List
-#: ../finch/gntblist.c:1565 ../finch/gntblist.c:2880 ../finch/gntprefs.c:258
-#: ../finch/gntui.c:95 ../pidgin/gtkblist.c:5083
+#: ../finch/gntblist.c:1622 ../finch/gntblist.c:3004 ../finch/gntprefs.c:258
+#: ../finch/gntui.c:95 ../pidgin/gtkblist.c:5166
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:326
 msgid "Buddy List"
 msgstr "弌仗亳�仂从 �仂弍亠�亠亟仆亳从仂于"

-#: ../finch/gntblist.c:1596
+#: ../finch/gntblist.c:1653
 msgid "Place tagged"
 msgstr "�亠��仂 仗仂仄亠�亠仆仂"

-#: ../finch/gntblist.c:1601
+#: ../finch/gntblist.c:1658
 msgid "Toggle Tag"
 msgstr "�弍�舒�亳�� 仗仂仄亠�从�"

 #. General
-#: ../finch/gntblist.c:1641 ../libpurple/protocols/gg/gg.c:638
+#: ../finch/gntblist.c:1698 ../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:314
-#: ../libpurple/protocols/jabber/buddy.c:1284
-#: ../libpurple/protocols/jabber/buddy.c:2264
-#: ../libpurple/protocols/jabber/buddy.c:2456
+#: ../libpurple/protocols/jabber/buddy.c:309
+#: ../libpurple/protocols/jabber/buddy.c:1285
+#: ../libpurple/protocols/jabber/buddy.c:2265
+#: ../libpurple/protocols/jabber/buddy.c:2457
 #: ../libpurple/protocols/jabber/jabber.c:1002
 #: ../libpurple/protocols/jabber/jabber.c:1614
 #: ../libpurple/protocols/jabber/jabber.c:1628
@@ -594,79 +611,78 @@
 #: ../libpurple/protocols/msnp9/msn.c:1598
 #: ../libpurple/protocols/qq/buddy_info.c:43
 #: ../libpurple/protocols/silc/buddy.c:1538
-#: ../libpurple/protocols/silc/ops.c:1017
-#: ../libpurple/protocols/silc/ops.c:1201
-#: ../libpurple/protocols/silc/ops.c:1339
+#: ../libpurple/protocols/silc/ops.c:1016
+#: ../libpurple/protocols/silc/ops.c:1199
+#: ../libpurple/protocols/silc/ops.c:1337
 #: ../libpurple/protocols/silc10/buddy.c:1538
 #: ../libpurple/protocols/silc10/ops.c:1036
 #: ../libpurple/protocols/silc10/ops.c:1179
 #: ../libpurple/protocols/silc10/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1073 ../pidgin/gtkblist.c:3261
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1073 ../pidgin/gtkblist.c:3343
 msgid "Nickname"
 msgstr "��亠于亟仂仆亳仄"

 #. Idle stuff
-#: ../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
+#: ../finch/gntblist.c:1720 ../finch/gntprefs.c:261
+#: ../libpurple/protocols/bonjour/bonjour.c:377
+#: ../libpurple/protocols/jabber/buddy.c:818
+#: ../libpurple/protocols/jabber/buddy.c:982
 #: ../libpurple/protocols/msn/msn.c:621 ../libpurple/protocols/msn/msn.c:639
 #: ../libpurple/protocols/msn/msn.c:647 ../libpurple/protocols/msn/state.c:32
 #: ../libpurple/protocols/msnp9/msn.c:541
 #: ../libpurple/protocols/msnp9/state.c:32
 #: ../libpurple/protocols/novell/novell.c:2843
-#: ../libpurple/protocols/oscar/oscar.c:2980
+#: ../libpurple/protocols/oscar/oscar.c:2968
 #: ../libpurple/protocols/yahoo/yahoo.c:3154
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3289
-#: ../pidgin/gtkblist.c:3749 ../pidgin/gtkprefs.c:1946
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3371
+#: ../pidgin/gtkblist.c:3831 ../pidgin/gtkprefs.c:2056
 msgid "Idle"
 msgstr "�亠亰亟亠亶��于亳亠"

-#: ../finch/gntblist.c:1677
+#: ../finch/gntblist.c:1734
 msgid "On Mobile"
 msgstr ""

-#: ../finch/gntblist.c:1978 ../pidgin/gtkdocklet.c:582
+#: ../finch/gntblist.c:2035 ../pidgin/gtkdocklet.c:582
 msgid "New..."
 msgstr "�仂于�亶..."

-#: ../finch/gntblist.c:1985 ../pidgin/gtkdocklet.c:583
+#: ../finch/gntblist.c:2042 ../pidgin/gtkdocklet.c:583
 msgid "Saved..."
 msgstr "弌仂��舒仆�仆仆�亶..."

-#: ../finch/gntblist.c:2439 ../finch/gntplugin.c:352 ../finch/gntui.c:100
-#: ../pidgin/gtkdocklet.c:717 ../pidgin/gtkplugin.c:605
+#: ../finch/gntblist.c:2496 ../finch/gntplugin.c:352 ../finch/gntui.c:100
+#: ../pidgin/gtkdocklet.c:717 ../pidgin/gtkplugin.c:715
 msgid "Plugins"
 msgstr "�仂亟�仍亳"

-#: ../finch/gntblist.c:2593 ../finch/gntblist.c:2598
+#: ../finch/gntblist.c:2650 ../finch/gntblist.c:2655
 msgid "Block/Unblock"
 msgstr "�仍仂从亳�仂于舒��/�舒亰弍仍仂从亳�仂于舒��"

-#: ../finch/gntblist.c:2594 ../libpurple/protocols/gg/gg.c:1665
+#: ../finch/gntblist.c:2651 ../libpurple/protocols/gg/gg.c:1665
 msgid "Block"
 msgstr "�仍仂从亳�仂于舒��"

-#: ../finch/gntblist.c:2595 ../libpurple/protocols/gg/gg.c:1661
+#: ../finch/gntblist.c:2652 ../libpurple/protocols/gg/gg.c:1661
 msgid "Unblock"
 msgstr "�舒亰弍仍仂从亳�仂于舒��"

-#: ../finch/gntblist.c:2600
-#, fuzzy
-msgid ""
-"Please enter the screen name or alias of the person you would like to Block/"
+#: ../finch/gntblist.c:2657
+msgid ""
+"Please enter the username or alias of the person you would like to Block/"
 "Unblock."
 msgstr ""
-"�于亠亟亳�亠 亳亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍� 亳仍亳 仗�亠于亟仂仆亳仄 仗亠��仂仆�, 从仂�仂�仂亶 于� �仂�亠仍亳 "
-"弍� 仂�仗�舒于亳�� �仂仂弍�亠仆亳亠."
+"�于亠亟亳�亠 亳仄� 仗仂仍�亰仂于舒�亠仍� 亳仍亳 仗�亠于亟仂仆亳仄 仗亠��仂仆�, 从仂�仂��� 于� �仂�亠仍亳 弍� "
+"弍仍仂从亳�仂于舒��/�舒亰弍仍仂从亳�仂于舒��."

 #. Not multiline
 #. Not masked?
 #. No hints?
-#: ../finch/gntblist.c:2603 ../finch/gntblist.c:2654 ../finch/gntcertmgr.c:89
-#: ../finch/gntconn.c:137 ../finch/gntnotify.c:80
+#: ../finch/gntblist.c:2660 ../finch/gntblist.c:2711 ../finch/gntblist.c:2837
+#: ../finch/gntcertmgr.c:89 ../finch/gntconn.c:137 ../finch/gntnotify.c:80
 #: ../finch/plugins/gnthistory.c:177 ../libpurple/account.c:1117
-#: ../libpurple/account.c:1420 ../libpurple/protocols/gg/gg.c:507
+#: ../libpurple/account.c:1436 ../libpurple/protocols/gg/gg.c:507
 #: ../libpurple/protocols/gg/gg.c:666 ../libpurple/protocols/gg/gg.c:803
 #: ../libpurple/protocols/jabber/jabber.c:1786
 #: ../libpurple/protocols/jabber/xdata.c:402
@@ -678,15 +694,15 @@
 #: ../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/oscar/oscar.c:6208
 #: ../libpurple/protocols/silc/buddy.c:454
 #: ../libpurple/protocols/silc/buddy.c:1193
-#: ../libpurple/protocols/silc/chat.c:449
-#: ../libpurple/protocols/silc/chat.c:486
-#: ../libpurple/protocols/silc/chat.c:749
-#: ../libpurple/protocols/silc/ops.c:1308
-#: ../libpurple/protocols/silc/ops.c:1834
-#: ../libpurple/protocols/silc/silc.c:965
+#: ../libpurple/protocols/silc/chat.c:448
+#: ../libpurple/protocols/silc/chat.c:485
+#: ../libpurple/protocols/silc/chat.c:752
+#: ../libpurple/protocols/silc/ops.c:1306
+#: ../libpurple/protocols/silc/ops.c:1832
+#: ../libpurple/protocols/silc/silc.c:1038
 #: ../libpurple/protocols/silc10/buddy.c:467
 #: ../libpurple/protocols/silc10/buddy.c:1191
 #: ../libpurple/protocols/silc10/chat.c:425
@@ -696,98 +712,109 @@
 #: ../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
+#: ../libpurple/protocols/yahoo/yahoo.c:3563
+#: ../libpurple/protocols/yahoo/yahoo.c:3574 ../pidgin/gtkcertmgr.c:195
+#: ../pidgin/gtkdialogs.c:767 ../pidgin/gtkdialogs.c:906
+#: ../pidgin/gtkdialogs.c:998 ../pidgin/gtkrequest.c:272
 msgid "OK"
 msgstr "OK"

-#: ../finch/gntblist.c:2649 ../pidgin/gtkdialogs.c:760
+#: ../finch/gntblist.c:2706 ../pidgin/gtkdialogs.c:762
 msgid "New Instant Message"
 msgstr "�仂于仂亠 仄亞仆仂于亠仆仆仂亠 �仂仂弍�亠仆亳亠"

-#: ../finch/gntblist.c:2651 ../pidgin/gtkdialogs.c:762
-msgid ""
-"Please enter the screen name or alias of the person you would like to IM."
-msgstr ""
-"�于亠亟亳�亠 亳亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍� 亳仍亳 仗�亠于亟仂仆亳仄 仗亠��仂仆�, 从仂�仂�仂亶 于� �仂�亠仍亳 "
-"弍� 仂�仗�舒于亳�� �仂仂弍�亠仆亳亠."
-
-#: ../finch/gntblist.c:2702
+#: ../finch/gntblist.c:2708 ../pidgin/gtkdialogs.c:764
+msgid "Please enter the username or alias of the person you would like to IM."
+msgstr ""
+"�于亠亟亳�亠 亳仄� 仗仂仍�亰仂于舒�亠仍� 亳仍亳 仗�亠于亟仂仆亳仄 仗亠��仂仆�, 从仂�仂�仂亶 于� �仂�亠仍亳 弍� "
+"仂�仗�舒于亳�� �仂仂弍�亠仆亳亠."
+
+#: ../finch/gntblist.c:2759
 msgid "Channel"
 msgstr "�舒仆舒仍"

-#: ../finch/gntblist.c:2714 ../pidgin/gtkblist.c:962
+#: ../finch/gntblist.c:2771 ../pidgin/gtkblist.c:1036
 msgid "Join a Chat"
 msgstr "��亳�仂亠亟亳仆亳���� 从 �舒��"

-#: ../finch/gntblist.c:2716
+#: ../finch/gntblist.c:2773
 msgid "Please enter the name of the chat you want to join."
 msgstr "�于亠亟亳�亠 亳仄� �舒�舒, 从 从仂�仂�仂仄� 于� �仂�亳�亠 仗�亳�仂亠亟亳仆亳����."

-#: ../finch/gntblist.c:2718 ../finch/gntnotify.c:394
+#: ../finch/gntblist.c:2775 ../finch/gntnotify.c:394
 msgid "Join"
 msgstr "��亳�仂亠亟亳仆亳����"

+#: ../finch/gntblist.c:2834 ../pidgin/gtkdialogs.c:995
+msgid ""
+"Please enter the username or alias of the person whose log you would like to "
+"view."
+msgstr ""
+"�于亠亟亳�亠 亳仄� 仗仂仍�亰仂于舒�亠仍� 亳仍亳 仗�亠于亟仂仆亳仄 仗亠��仂仆�, 亢��仆舒仍 从仂�仂�仂亶 于� �仂�亠仍亳 弍� "
+"仗�仂�仄仂��亠��."
+
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2763 ../finch/gntpounce.c:459 ../pidgin/gtkpounce.c:802
+#: ../finch/gntblist.c:2882 ../finch/gntpounce.c:459 ../pidgin/gtkpounce.c:802
 msgid "Options"
 msgstr "�舒�舒仄亠���"

-#: ../finch/gntblist.c:2769
+#: ../finch/gntblist.c:2888
 msgid "Send IM..."
 msgstr "��仗�舒于亳�� 仄亞仆仂于亠仆仆仂亠 �仂仂弍�亠仆亳亠..."

-#: ../finch/gntblist.c:2774
+#: ../finch/gntblist.c:2893
 msgid "Block/Unblock..."
 msgstr "�仍仂从亳�仂于舒��/�舒亰弍仍仂从亳�仂于舒��..."

-#: ../finch/gntblist.c:2779
+#: ../finch/gntblist.c:2898
 msgid "Join Chat..."
 msgstr "��亳�仂亠亟亳仆亳���� 从 �舒��..."

-#: ../finch/gntblist.c:2784
+#: ../finch/gntblist.c:2903 ../finch/gntconv.c:611
+msgid "View Log..."
+msgstr "��仂�仄仂��亠�� 亢��仆舒仍..."
+
+#: ../finch/gntblist.c:2908
 msgid "Show"
 msgstr "�仂从舒亰�于舒��"

-#: ../finch/gntblist.c:2789
+#: ../finch/gntblist.c:2913
 msgid "Empty groups"
 msgstr "�����亠 亞��仗仗�"

-#: ../finch/gntblist.c:2796
+#: ../finch/gntblist.c:2920
 msgid "Offline buddies"
 msgstr "弌仂弍亠�亠亟仆亳从仂于 仆亠 于 �亠�亳"

-#: ../finch/gntblist.c:2803
+#: ../finch/gntblist.c:2927
 msgid "Sort"
 msgstr "弌仂��亳�仂于舒��"

-#: ../finch/gntblist.c:2808
+#: ../finch/gntblist.c:2932
 msgid "By Status"
 msgstr "�仂 ��舒����"

-#: ../finch/gntblist.c:2813 ../pidgin/gtkblist.c:4240
+#: ../finch/gntblist.c:2937 ../pidgin/gtkblist.c:4322
 msgid "Alphabetically"
 msgstr "�仂 舒仍�舒于亳��"

-#: ../finch/gntblist.c:2818
+#: ../finch/gntblist.c:2942
 msgid "By Log Size"
 msgstr "�仂 �舒亰仄亠�� 亢��仆舒仍舒"

-#: ../finch/gntblist.c:2829
+#: ../finch/gntblist.c:2953
 msgid "Buddy"
 msgstr "弌仂弍亠�亠亟仆亳从"

-#: ../finch/gntblist.c:2834 ../libpurple/protocols/oscar/oscar.c:649
-#: ../libpurple/protocols/silc/silc.c:911
-#: ../libpurple/protocols/silc/util.c:563
+#: ../finch/gntblist.c:2958 ../libpurple/protocols/oscar/oscar.c:649
+#: ../libpurple/protocols/silc/silc.c:984
+#: ../libpurple/protocols/silc/util.c:559
 #: ../libpurple/protocols/silc10/silc.c:685
 #: ../libpurple/protocols/silc10/util.c:553
 msgid "Chat"
 msgstr "丼舒�"

-#: ../finch/gntblist.c:2844 ../finch/plugins/grouping.c:255
+#: ../finch/gntblist.c:2968 ../finch/plugins/grouping.c:255
 msgid "Grouping"
 msgstr "���仗仗亳�仂于舒仆亳亠"

@@ -861,9 +888,8 @@
 "%s"

 #: ../finch/gntcertmgr.c:197
-#, fuzzy
 msgid "SSL Host Certificate"
-msgstr "/�仆����仄亠仆��/_�舒���仂亶从亳"
+msgstr ""

 #: ../finch/gntcertmgr.c:232 ../pidgin/gtkcertmgr.c:371
 #, c-format
@@ -879,13 +905,13 @@
 msgstr "�亠仆亠亟亢亠� �亠��亳�亳从舒�仂于"

 #. Creating the user splits
-#: ../finch/gntcertmgr.c:297 ../libpurple/protocols/bonjour/bonjour.c:694
-#: ../libpurple/protocols/silc/silc.c:1150
+#: ../finch/gntcertmgr.c:297 ../libpurple/protocols/bonjour/bonjour.c:695
+#: ../libpurple/protocols/silc/silc.c:1223
 #: ../libpurple/protocols/silc10/silc.c:924 ../pidgin/gtkcertmgr.c:446
 msgid "Hostname"
 msgstr "�仄� �亰仍舒"

-#: ../finch/gntcertmgr.c:314 ../finch/gntnotify.c:388 ../pidgin/gtkconv.c:1672
+#: ../finch/gntcertmgr.c:314 ../finch/gntnotify.c:388 ../pidgin/gtkconv.c:1697
 #: ../pidgin/gtkdebug.c:832
 msgid "Info"
 msgstr "�仆�仂�仄舒�亳�"
@@ -895,8 +921,8 @@
 #: ../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:417 ../libpurple/protocols/msnp9/msn.c:400
-#: ../libpurple/protocols/silc/util.c:388
-#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2375
+#: ../libpurple/protocols/silc/util.c:385
+#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2377
 #: ../pidgin/gtkrequest.c:275
 msgid "Close"
 msgstr "�舒从����"
@@ -934,25 +960,25 @@
 msgid "No such command."
 msgstr "�亠� �舒从仂亶 从仂仄舒仆亟�."

-#: ../finch/gntconv.c:163 ../pidgin/gtkconv.c:492
+#: ../finch/gntconv.c:163 ../pidgin/gtkconv.c:494
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr ""
 "弌亳仆�舒从�亳�亠�从舒� 仂�亳弍从舒:  �� 于于亠仍亳 仆亠于亠�仆仂亠 从仂仍亳�亠��于仂 舒�亞�仄亠仆�仂于 亟仍� ��仂亶 "
 "从仂仄舒仆亟�."

-#: ../finch/gntconv.c:168 ../pidgin/gtkconv.c:498
+#: ../finch/gntconv.c:168 ../pidgin/gtkconv.c:500
 msgid "Your command failed for an unknown reason."
 msgstr "�舒�舒 从仂仄舒仆亟舒 仆亠 弍�仍舒 于�仗仂仍仆亠仆舒 仗仂 仆亠亳亰于亠��仆仂亶 仗�亳�亳仆亠."

-#: ../finch/gntconv.c:173 ../pidgin/gtkconv.c:505
+#: ../finch/gntconv.c:173 ../pidgin/gtkconv.c:507
 msgid "That command only works in chats, not IMs."
 msgstr "亅�舒 从仂仄舒仆亟舒 �舒弍仂�舒亠� �仂仍�从仂 于 �舒�舒�, 仆亠 于 仄亞仆仂于亠仆仆�� �仂仂弍�亠仆亳��."

-#: ../finch/gntconv.c:176 ../pidgin/gtkconv.c:508
+#: ../finch/gntconv.c:176 ../pidgin/gtkconv.c:510
 msgid "That command only works in IMs, not chats."
 msgstr "亅�舒 从仂仄舒仆亟舒 �舒弍仂�舒亠� �仂仍�从仂 于 仄亞仆仂于亠仆仆�� �仂仂弍�亠仆亳��, 仆亠 于 �舒�舒�."

-#: ../finch/gntconv.c:180 ../pidgin/gtkconv.c:513
+#: ../finch/gntconv.c:180 ../pidgin/gtkconv.c:515
 msgid "That command doesn't work on this protocol."
 msgstr "亅�舒 从仂仄舒仆亟舒 仆亠 �舒弍仂�舒亠� � ��亳仄 仗�仂�仂从仂仍仂仄."

@@ -973,7 +999,7 @@
 msgid "%s [%s]"
 msgstr "%s [%s]"

-#: ../finch/gntconv.c:296 ../finch/gntconv.c:882 ../pidgin/gtkconv.c:3470
+#: ../finch/gntconv.c:296 ../finch/gntconv.c:882 ../pidgin/gtkconv.c:3566
 #, c-format
 msgid ""
 "\n"
@@ -986,12 +1012,12 @@
 msgid "You have left this chat."
 msgstr "�� 仗仂从亳仆�仍亳 ��仂� �舒�."

-#: ../finch/gntconv.c:433 ../pidgin/gtkconv.c:1378
+#: ../finch/gntconv.c:433 ../pidgin/gtkconv.c:1403
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr ""
 "�亠亟亠仆亳亠 亢��仆舒仍舒 仆舒�舒�仂. �仂�仍亠亟���亳亠 �仂仂弍�亠仆亳� 于 ��仂亶 弍亠�亠亟亠 弍�亟�� 亰舒仗亳�舒仆�."

-#: ../finch/gntconv.c:437 ../pidgin/gtkconv.c:1386
+#: ../finch/gntconv.c:437 ../pidgin/gtkconv.c:1411
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr ""
@@ -1018,10 +1044,6 @@
 msgid "Add Buddy Pounce..."
 msgstr "�仂弍舒于亳�� 仗�舒于亳仍仂..."

-#: ../finch/gntconv.c:611
-msgid "View Log..."
-msgstr "��仂�仄仂��亠�� 亢��仆舒仍..."
-
 #: ../finch/gntconv.c:615
 msgid "Enable Logging"
 msgstr "�亠��亳 亢��仆舒仍"
@@ -1039,15 +1061,15 @@
 msgid "List of users:\n"
 msgstr "弌仗亳�仂从 仗仂仍�亰仂于舒�亠仍亠亶:\n"

-#: ../finch/gntconv.c:1132 ../pidgin/gtkconv.c:337
+#: ../finch/gntconv.c:1132 ../pidgin/gtkconv.c:339
 msgid "Supported debug options are:  version"
 msgstr "�仂亟亟亠�亢亳于舒亠仄�亠 仗舒�舒仄亠��� 仂�仍舒亟从亳:  version"

-#: ../finch/gntconv.c:1168 ../pidgin/gtkconv.c:389
+#: ../finch/gntconv.c:1168 ../pidgin/gtkconv.c:391
 msgid "No such command (in this context)."
 msgstr "�亠� �舒从仂亶 从仂仄舒仆亟� (于 ��仂仄 从仂仆�亠从��亠)."

-#: ../finch/gntconv.c:1171 ../pidgin/gtkconv.c:392
+#: ../finch/gntconv.c:1171 ../pidgin/gtkconv.c:394
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -1055,7 +1077,7 @@
 "��仗仂仍�亰�亶�亠 \"/help &lt;从仂仄舒仆亟舒&gt;\" 亟仍� 仗仂仄仂�亳 仗仂 从仂仆从�亠�仆仂亶 从仂仄舒仆亟亠.\n"
 "弌仍亠亟���亳亠 从仂仄舒仆亟� 亟仂���仗仆� 于 ��仂仄 从仂仆�亠从��亠:\n"

-#: ../finch/gntconv.c:1244 ../pidgin/gtkconv.c:7769
+#: ../finch/gntconv.c:1244 ../pidgin/gtkconv.c:7932
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -1063,12 +1085,12 @@
 "say &lt;�仂仂弍�亠仆亳亠&gt;:  ��仗�舒于亳�� 仂弍��仆仂亠 �仂仂弍�亠仆亳亠, 从舒从 亠�仍亳 弍� 于� 仆亠 "
 "亳�仗仂仍�亰仂于舒仍亳 从仂仄舒仆亟�."

-#: ../finch/gntconv.c:1247 ../pidgin/gtkconv.c:7772
+#: ../finch/gntconv.c:1247 ../pidgin/gtkconv.c:7935
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
 "me &lt;亟亠亶��于亳亠&gt;:  ��仗�舒于亳�� 亟亠亶��于亳亠 于 ��亳仍亠 IRC �仂弍亠�亠亟仆亳从� 亳仍亳 于 �舒�."

-#: ../finch/gntconv.c:1250 ../pidgin/gtkconv.c:7775
+#: ../finch/gntconv.c:1250 ../pidgin/gtkconv.c:7938
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -1076,11 +1098,11 @@
 "debug &lt;仗舒�舒仄亠��&gt;:  ��仗�舒于亳�� �舒亰仍亳�仆�� 仂�仍舒亟仂�仆�� 亳仆�仂�仄舒�亳� 于 �亠从���� "
 "弍亠�亠亟�."

-#: ../finch/gntconv.c:1253 ../pidgin/gtkconv.c:7778
+#: ../finch/gntconv.c:1253 ../pidgin/gtkconv.c:7941
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: ��亳��亳�� 仂从仆仂 弍亠�亠亟�."

-#: ../finch/gntconv.c:1256 ../pidgin/gtkconv.c:7784
+#: ../finch/gntconv.c:1256 ../pidgin/gtkconv.c:7947
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;从仂仄舒仆亟舒&gt;:  �仂仍��亳�� 仗仂仄仂�� 仗仂 从仂仆从�亠�仆仂亶 从仂仄舒仆亟亠."

@@ -1112,7 +1134,7 @@
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: ��于亠��亳 仂从仆仂 �仂��舒仆�仆仆�� ��舒���仂于."

-#: ../finch/gntdebug.c:231 ../pidgin/gtkconv.c:942 ../pidgin/gtkconv.c:2652
+#: ../finch/gntdebug.c:231 ../pidgin/gtkconv.c:967 ../pidgin/gtkconv.c:2707
 #: ../pidgin/gtkdebug.c:219 ../pidgin/gtkft.c:543
 msgid "Unable to open file."
 msgstr "�亠 �亟舒���� 仂�从���� �舒亶仍."
@@ -1170,12 +1192,12 @@

 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
 #: ../finch/gntft.c:217 ../finch/gntstatus.c:547 ../finch/gntstatus.c:576
-#: ../libpurple/protocols/bonjour/bonjour.c:380
+#: ../libpurple/protocols/bonjour/bonjour.c:381
 #: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1584
 #: ../libpurple/protocols/gg/gg.c:1592
-#: ../libpurple/protocols/jabber/buddy.c:808
-#: ../libpurple/protocols/jabber/buddy.c:812
-#: ../libpurple/protocols/jabber/buddy.c:971
+#: ../libpurple/protocols/jabber/buddy.c:809
+#: ../libpurple/protocols/jabber/buddy.c:813
+#: ../libpurple/protocols/jabber/buddy.c:972
 #: ../libpurple/protocols/jabber/jabber.c:1579
 #: ../libpurple/protocols/msn/msn.c:631 ../libpurple/protocols/msn/msn.c:641
 #: ../libpurple/protocols/msn/msn.c:646 ../libpurple/protocols/msn/msn.c:649
@@ -1184,12 +1206,12 @@
 #: ../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:3314
-#: ../libpurple/protocols/sametime/sametime.c:4205
-#: ../libpurple/protocols/yahoo/yahoo.c:3305 ../pidgin/gtkblist.c:3333
-#: ../pidgin/gtkblist.c:3347 ../pidgin/gtkblist.c:3349
+#: ../libpurple/protocols/oscar/oscar.c:2756
+#: ../libpurple/protocols/oscar/oscar.c:3819
+#: ../libpurple/protocols/sametime/sametime.c:3315
+#: ../libpurple/protocols/sametime/sametime.c:4206
+#: ../libpurple/protocols/yahoo/yahoo.c:3305 ../pidgin/gtkblist.c:3415
+#: ../pidgin/gtkblist.c:3429 ../pidgin/gtkblist.c:3431
 #: ../pidgin/gtksavedstatuses.c:990 ../pidgin/gtksavedstatuses.c:1134
 msgid "Status"
 msgstr "弌�舒���"
@@ -1218,58 +1240,68 @@
 msgid "Failed"
 msgstr "�亠 �亟舒仍仂��"

-#: ../finch/gntft.c:434 ../pidgin/gtkft.c:134
+#: ../finch/gntft.c:436 ../pidgin/gtkft.c:134
 #, c-format
 msgid "%.2f KiB/s"
 msgstr "%.2f �亳�/�"

-#: ../finch/gntft.c:445
+#: ../finch/gntft.c:447
+msgid "Sent"
+msgstr "��仗�舒于仍亠仆仂"
+
+#: ../finch/gntft.c:447
+msgid "Received"
+msgstr "�仂仍��亠仆仂"
+
+#: ../finch/gntft.c:448 ../pidgin/gtkft.c:160 ../pidgin/gtkft.c:1080
+msgid "Finished"
+msgstr "�舒于亠��亠仆仂"
+
+#: ../finch/gntft.c:450
 #, c-format
 msgid "The file was saved as %s."
-msgstr ""
-
-#: ../finch/gntft.c:446 ../finch/gntft.c:447 ../pidgin/gtkft.c:160
-#: ../pidgin/gtkft.c:1080
-msgid "Finished"
-msgstr "�舒于亠��亠仆仂"
-
-#: ../finch/gntft.c:452 ../libpurple/protocols/msn/session.c:404
-#: ../libpurple/protocols/msnp9/session.c:356
-msgid "Transferring"
-msgstr "�亠�亠亟舒�舒"
-
-#: ../finch/gntlog.c:183
+msgstr "个舒亶仍 弍�仍 �仂��舒仆�仆 从舒从 %s."
+
+#: ../finch/gntft.c:457
+msgid "Sending"
+msgstr "��仗�舒于从舒"
+
+#: ../finch/gntft.c:457
+msgid "Receiving"
+msgstr "�仂仍��亠仆亳亠"
+
+#: ../finch/gntlog.c:184
 #, c-format
 msgid "Conversation in %s on %s"
 msgstr "�亠�亠亟舒 于 %s 仆舒 %s"

-#: ../finch/gntlog.c:186
+#: ../finch/gntlog.c:187
 #, c-format
 msgid "Conversation with %s on %s"
 msgstr "�亠�亠亟舒 � %s 仆舒 %s"

-#: ../finch/gntlog.c:231 ../pidgin/gtklog.c:503
+#: ../finch/gntlog.c:230 ../pidgin/gtklog.c:503
 msgid "%B %Y"
 msgstr "%B %Y"

-#: ../finch/gntlog.c:271 ../pidgin/gtklog.c:550
+#: ../finch/gntlog.c:270 ../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
+#: ../finch/gntlog.c:274 ../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
+#: ../finch/gntlog.c:277 ../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
+#: ../finch/gntlog.c:283 ../pidgin/gtklog.c:566
 msgid "No logs were found"
 msgstr "���仆舒仍� 仆亠 仆舒亶亟亠仆�"

@@ -1305,11 +1337,11 @@
 msgid "You have mail!"
 msgstr "�舒仄 仗�亳�仍舒 仗仂��舒!"

-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:524
+#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:537
 msgid "Sender"
 msgstr "��仗�舒于亳�亠仍�"

-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:531
+#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:544
 msgid "Subject"
 msgstr "丐亠仄舒"

@@ -1321,17 +1353,17 @@
 msgstr[1] "%s (%s) 亳仄亠亠� %d 仆仂于�� �仂仂弍�亠仆亳�."
 msgstr[2] "%s (%s) 亳仄亠亠� %d 仆仂于�� �仂仂弍�亠仆亳亶."

-#: ../finch/gntnotify.c:226 ../pidgin/gtknotify.c:346
+#: ../finch/gntnotify.c:226 ../pidgin/gtknotify.c:352
 msgid "New Mail"
 msgstr "�仂于舒� 仗仂��舒"

-#: ../finch/gntnotify.c:291 ../pidgin/gtknotify.c:959
+#: ../finch/gntnotify.c:291 ../pidgin/gtknotify.c:984
 #, c-format
 msgid "Info for %s"
 msgstr "�仆�仂�仄舒�亳� 亟仍� %s"

 #: ../finch/gntnotify.c:292 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:960
+#: ../pidgin/gtknotify.c:985
 msgid "Buddy Information"
 msgstr "�仆�仂�仄舒�亳� 仂 �仂弍亠�亠亟仆亳从亠"

@@ -1339,11 +1371,11 @@
 msgid "Continue"
 msgstr "��仂亟仂仍亢亳��"

-#: ../finch/gntnotify.c:391 ../pidgin/gtkconv.c:1633
+#: ../finch/gntnotify.c:391 ../pidgin/gtkconv.c:1658
 msgid "IM"
 msgstr "�亞仆仂于亠仆仆仂亠 �仂仂弍�亠仆亳亠"

-#: ../finch/gntnotify.c:397 ../libpurple/protocols/sametime/sametime.c:3524
+#: ../finch/gntnotify.c:397 ../libpurple/protocols/sametime/sametime.c:3525
 msgid "Invite"
 msgstr "��亳亞仍舒�亳��"

@@ -1351,6 +1383,10 @@
 msgid "(none)"
 msgstr "(仆亠�)"

+#: ../finch/gntnotify.c:426
+msgid "URI"
+msgstr "URI"
+
 #: ../finch/gntplugin.c:84 ../finch/gntplugin.c:93
 msgid "ERROR"
 msgstr "�丿����"
@@ -1377,7 +1413,7 @@
 "�亠��亳�: %s\n"
 "�仗亳�舒仆亳亠: %s\n"
 "�于�仂�: %s\n"
-"�亠弍-�舒亶�: %s\n"
+"Web-�舒亶�: %s\n"
 "�仄� �舒亶仍舒: %s\n"

 #: ../finch/gntplugin.c:197
@@ -1425,7 +1461,7 @@
 #. Back to instant-apply! I win!  BU-HAHAHA!
 #. Create the window
 #: ../finch/gntplugin.c:524 ../finch/gntplugin.c:531 ../finch/gntprefs.c:264
-#: ../finch/gntui.c:103 ../pidgin/gtkdocklet.c:718 ../pidgin/gtkprefs.c:2070
+#: ../finch/gntui.c:103 ../pidgin/gtkdocklet.c:718 ../pidgin/gtkprefs.c:2180
 msgid "Preferences"
 msgstr "�舒���仂亶从亳"

@@ -1613,12 +1649,12 @@
 msgid "Based on keyboard use"
 msgstr "��仆仂于�于舒��� 仆舒 亳�仗仂仍�亰仂于舒仆亳亳 从仍舒于亳舒����"

-#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:1951
+#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:2061
 msgid "From last sent message"
 msgstr "弌 仄仂仄亠仆�舒 仗仂�仍亠亟仆亠亶 仂�仗�舒于从亳 �仂仂弍�亠仆亳�"

-#: ../finch/gntprefs.c:96 ../pidgin/gtkprefs.c:848 ../pidgin/gtkprefs.c:856
-#: ../pidgin/gtkprefs.c:1950 ../pidgin/gtkprefs.c:1964
+#: ../finch/gntprefs.c:96 ../pidgin/gtkprefs.c:948 ../pidgin/gtkprefs.c:956
+#: ../pidgin/gtkprefs.c:2060 ../pidgin/gtkprefs.c:2074
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:333
 msgid "Never"
 msgstr "�亳从仂亞亟舒"
@@ -1668,31 +1704,39 @@
 msgstr "�亠仆��� ��舒��� 仆舒"

 #. Conversations
-#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:942 ../pidgin/gtkprefs.c:2037
+#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:1046 ../pidgin/gtkprefs.c:2147
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:340
 msgid "Conversations"
 msgstr "�亠�亠亟�"

 #: ../finch/gntprefs.c:260 ../finch/plugins/gnthistory.c:151
-#: ../pidgin/gtkprefs.c:1507 ../pidgin/gtkprefs.c:2048
+#: ../pidgin/gtkprefs.c:1617 ../pidgin/gtkprefs.c:2158
 msgid "Logging"
 msgstr "���仆舒仍�"

-#: ../finch/gntrequest.c:621
+#: ../finch/gntrequest.c:381
+msgid "You must fill all the required fields."
+msgstr "�� 亟仂仍亢仆� 亰舒仗仂仍仆亳�� 于�亠 仂弍�亰舒�亠仍�仆�亠 仗仂仍�."
+
+#: ../finch/gntrequest.c:382
+msgid "The required fields are underlined."
+msgstr "�弍�亰舒�亠仍�仆�亠 仗仂仍� 仗仂亟���从仆���."
+
+#: ../finch/gntrequest.c:640
 msgid "Not implemented yet."
 msgstr "��� 仆亠 �亠舒仍亳亰仂于舒仆仂."

-#: ../finch/gntrequest.c:726 ../pidgin/gtkrequest.c:1552
-#: ../pidgin/gtkrequest.c:1598
+#: ../finch/gntrequest.c:745 ../pidgin/gtkrequest.c:1553
+#: ../pidgin/gtkrequest.c:1599
 msgid "Save File..."
 msgstr "弌仂��舒仆亳�� �舒亶仍..."

-#: ../finch/gntrequest.c:726 ../pidgin/gtkrequest.c:1553
-#: ../pidgin/gtkrequest.c:1599
+#: ../finch/gntrequest.c:745 ../pidgin/gtkrequest.c:1554
+#: ../pidgin/gtkrequest.c:1600
 msgid "Open File..."
 msgstr "��从���� �舒亶仍..."

-#: ../finch/gntrequest.c:743
+#: ../finch/gntrequest.c:762
 msgid "Choose Location..."
 msgstr "��弍�舒�� 仄亠��仂仗仂仍仂亢亠仆亳亠..."

@@ -1746,8 +1790,8 @@
 msgstr "���亞亳亠 亞仂于仂��� 于 �舒�亠"

 #: ../finch/gntsound.c:106 ../pidgin/gtksound.c:73
-msgid "Someone says your screen name in chat"
-msgstr "��仂-�仂 仗�仂亳亰仆仂�亳� 于舒�亠 亳仄� 于 �舒�亠"
+msgid "Someone says your username in chat"
+msgstr "��仂-�仂 仗�仂亳亰仆仂�亳� 于舒�亠 亳仄� 仗仂仍�亰仂于舒�亠仍� 于 �舒�亠"

 #: ../finch/gntsound.c:367 ../pidgin/gtksound.c:309
 msgid "GStreamer Failure"
@@ -1757,8 +1801,8 @@
 msgid "GStreamer failed to initialize."
 msgstr "�亠 �亟舒仍仂�� 亳仆亳�亳舒仍亳亰亳�仂于舒�� GStreamer."

-#: ../finch/gntsound.c:722 ../finch/gntsound.c:808 ../pidgin/gtkprefs.c:1631
-#: ../pidgin/gtkprefs.c:1720 ../pidgin/gtkprefs.c:1893
+#: ../finch/gntsound.c:722 ../finch/gntsound.c:808 ../pidgin/gtkprefs.c:1741
+#: ../pidgin/gtkprefs.c:1830 ../pidgin/gtkprefs.c:2003
 msgid "(default)"
 msgstr "(仗仂 �仄仂仍�舒仆亳�)"

@@ -1774,7 +1818,7 @@
 msgid "Profiles"
 msgstr "��仂�亳仍亳"

-#: ../finch/gntsound.c:960 ../pidgin/gtkprefs.c:1758
+#: ../finch/gntsound.c:960 ../pidgin/gtkprefs.c:1868
 msgid "Automatic"
 msgstr "�于�仂仄舒�亳�亠�从亳"

@@ -1782,7 +1826,7 @@
 msgid "Console Beep"
 msgstr "弌亳亞仆舒仍 亟亳仆舒仄亳从仂仄"

-#: ../finch/gntsound.c:964 ../pidgin/gtkprefs.c:1762
+#: ../finch/gntsound.c:964 ../pidgin/gtkprefs.c:1872
 msgid "Command"
 msgstr "�仂仄舒仆亟舒"

@@ -1790,7 +1834,7 @@
 msgid "No Sound"
 msgstr "�亠� 亰于�从舒"

-#: ../finch/gntsound.c:967 ../pidgin/gtkprefs.c:1753
+#: ../finch/gntsound.c:967 ../pidgin/gtkprefs.c:1863
 msgid "Sound Method"
 msgstr "�亠�仂亟 于仂�仗�仂亳亰于亠亟亠仆亳� 亰于�从舒"

@@ -1808,7 +1852,7 @@
 "(%s 亟仍� 亳仄亠仆亳 �舒亶仍舒)"

 #. Sound options
-#: ../finch/gntsound.c:987 ../pidgin/gtkprefs.c:1784
+#: ../finch/gntsound.c:987 ../pidgin/gtkprefs.c:1894
 msgid "Sound Options"
 msgstr "�舒�舒仄亠��� 亰于�从舒"

@@ -1816,18 +1860,18 @@
 msgid "Sounds when conversation has focus"
 msgstr "�于�从亳, 从仂亞亟舒 仂从仆仂 弍亠�亠亟� 于 �仂从��亠"

-#: ../finch/gntsound.c:996 ../pidgin/gtkprefs.c:846 ../pidgin/gtkprefs.c:858
-#: ../pidgin/gtkprefs.c:1791 ../pidgin/plugins/timestamp_format.c:42
+#: ../finch/gntsound.c:996 ../pidgin/gtkprefs.c:946 ../pidgin/gtkprefs.c:958
+#: ../pidgin/gtkprefs.c:1901 ../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:997 ../pidgin/gtkprefs.c:1789
+#: ../finch/gntsound.c:997 ../pidgin/gtkprefs.c:1899
 msgid "Only when available"
 msgstr "丐仂仍�从仂 于仂 于�亠仄� 仗�亳�����于亳�"

-#: ../finch/gntsound.c:998 ../pidgin/gtkprefs.c:1790
+#: ../finch/gntsound.c:998 ../pidgin/gtkprefs.c:1900
 msgid "Only when not available"
 msgstr "丐仂仍�从仂 于仂 于�亠仄� 仂������于亳�"

@@ -1836,11 +1880,11 @@
 msgstr "��仂仄从仂���(0-100):"

 #. Sound events
-#: ../finch/gntsound.c:1024 ../pidgin/gtkprefs.c:1819
+#: ../finch/gntsound.c:1024 ../pidgin/gtkprefs.c:1929
 msgid "Sound Events"
 msgstr "�于�从仂于�亠 �仂弍��亳�"

-#: ../finch/gntsound.c:1026 ../pidgin/gtkprefs.c:1878
+#: ../finch/gntsound.c:1026 ../pidgin/gtkprefs.c:1988
 msgid "Event"
 msgstr "弌仂弍��亳亠"

@@ -1848,15 +1892,15 @@
 msgid "File"
 msgstr "个舒亶仍"

-#: ../finch/gntsound.c:1045 ../pidgin/gtkprefs.c:1897
+#: ../finch/gntsound.c:1045 ../pidgin/gtkprefs.c:2007
 msgid "Test"
 msgstr "丐亠��"

-#: ../finch/gntsound.c:1048 ../pidgin/gtkprefs.c:1901
+#: ../finch/gntsound.c:1048 ../pidgin/gtkprefs.c:2011
 msgid "Reset"
 msgstr "弌弍�仂�"

-#: ../finch/gntsound.c:1051 ../pidgin/gtkprefs.c:1905
+#: ../finch/gntsound.c:1051 ../pidgin/gtkprefs.c:2015
 msgid "Choose..."
 msgstr "��弍�舒��..."

@@ -1874,8 +1918,8 @@
 msgstr "弌仂��舒仆�仆仆�亠 ��舒����"

 #: ../finch/gntstatus.c:183 ../finch/gntstatus.c:539
-#: ../libpurple/protocols/jabber/buddy.c:326
-#: ../libpurple/protocols/jabber/buddy.c:1396
+#: ../libpurple/protocols/jabber/buddy.c:321
+#: ../libpurple/protocols/jabber/buddy.c:1397
 #: ../libpurple/protocols/msn/msn.c:747
 #: ../libpurple/protocols/myspace/myspace.c:171
 #: ../libpurple/protocols/novell/novell.c:1493
@@ -1896,9 +1940,9 @@
 #. 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:292
-#: ../libpurple/protocols/bonjour/bonjour.c:299
-#: ../libpurple/protocols/bonjour/bonjour.c:382
+#: ../libpurple/protocols/bonjour/bonjour.c:293
+#: ../libpurple/protocols/bonjour/bonjour.c:300
+#: ../libpurple/protocols/bonjour/bonjour.c:383
 #: ../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
@@ -1917,21 +1961,21 @@
 #: ../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:5669
+#: ../libpurple/protocols/oscar/oscar.c:5887
 #: ../libpurple/protocols/oscar/oscar.c:5901
-#: ../libpurple/protocols/oscar/oscar.c:5915
+#: ../libpurple/protocols/oscar/oscar.c:5917
+#: ../libpurple/protocols/oscar/oscar.c:5924
 #: ../libpurple/protocols/oscar/oscar.c:5931
-#: ../libpurple/protocols/oscar/oscar.c:5938
-#: ../libpurple/protocols/oscar/oscar.c:5945
-#: ../libpurple/protocols/sametime/sametime.c:3337
-#: ../libpurple/protocols/sametime/sametime.c:3343
-#: ../libpurple/protocols/sametime/sametime.c:3349
-#: ../libpurple/protocols/sametime/sametime.c:3428
+#: ../libpurple/protocols/sametime/sametime.c:3338
+#: ../libpurple/protocols/sametime/sametime.c:3344
+#: ../libpurple/protocols/sametime/sametime.c:3350
+#: ../libpurple/protocols/sametime/sametime.c:3429
 #: ../libpurple/protocols/silc/buddy.c:1554
 #: ../libpurple/protocols/silc10/buddy.c:1554
 #: ../libpurple/protocols/simple/simple.c:247
-#: ../libpurple/protocols/yahoo/yahoo.c:3813
-#: ../libpurple/protocols/yahoo/yahoo.c:3819
+#: ../libpurple/protocols/yahoo/yahoo.c:3817
+#: ../libpurple/protocols/yahoo/yahoo.c:3823
 #: ../libpurple/protocols/zephyr/zephyr.c:2352
 #: ../pidgin/gtksavedstatuses.c:526 ../pidgin/gtksavedstatuses.c:1001
 msgid "Message"
@@ -1987,7 +2031,7 @@
 msgid "Certificates"
 msgstr "弌亠��亳�亳从舒��"

-#: ../finch/gntui.c:102 ../pidgin/gtkprefs.c:2039
+#: ../finch/gntui.c:102 ../pidgin/gtkprefs.c:2149
 msgid "Sounds"
 msgstr "�于�从亳"

@@ -2087,16 +2131,16 @@
 msgid "Toaster plugin"
 msgstr "�仂亟�仍� �于亠亟仂仄仍亠仆亳亶"

-#: ../finch/plugins/gnthistory.c:114 ../pidgin/plugins/history.c:125
+#: ../finch/plugins/gnthistory.c:114 ../pidgin/plugins/history.c:132
 #, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
 msgstr "<b>�亠�亠亟舒 � %s 仆舒 %s:</b><br>"

-#: ../finch/plugins/gnthistory.c:172 ../pidgin/plugins/history.c:153
+#: ../finch/plugins/gnthistory.c:172 ../pidgin/plugins/history.c:159
 msgid "History Plugin Requires Logging"
 msgstr "�仂亟�仍� 亳��仂�亳亳 ��亠弍�亠� 于亠亟亠仆亳� 亢��仆舒仍舒"

-#: ../finch/plugins/gnthistory.c:173 ../pidgin/plugins/history.c:154
+#: ../finch/plugins/gnthistory.c:173 ../pidgin/plugins/history.c:160
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
 "\n"
@@ -2112,11 +2156,11 @@
 msgid "GntHistory"
 msgstr "Gnt-亳��仂�亳�"

-#: ../finch/plugins/gnthistory.c:219 ../pidgin/plugins/history.c:197
+#: ../finch/plugins/gnthistory.c:219 ../pidgin/plugins/history.c:203
 msgid "Shows recently logged conversations in new conversations."
 msgstr "�仂从舒亰�于舒亠� 亰舒仗亳�亳 仆亠亟舒于仆亳� 弍亠�亠亟 于 仆仂于�� 弍亠�亠亟舒�."

-#: ../finch/plugins/gnthistory.c:220 ../pidgin/plugins/history.c:198
+#: ../finch/plugins/gnthistory.c:220 ../pidgin/plugins/history.c:204
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
@@ -2130,19 +2174,19 @@

 #: ../finch/plugins/grouping.c:44 ../finch/plugins/grouping.c:145
 #: ../libpurple/protocols/gg/gg.c:1010
-#: ../libpurple/protocols/jabber/buddy.c:2081
+#: ../libpurple/protocols/jabber/buddy.c:2082
 #: ../libpurple/protocols/novell/novell.c:2846
 #: ../libpurple/protocols/oscar/oscar.c:829
-#: ../libpurple/protocols/oscar/oscar.c:5733
+#: ../libpurple/protocols/oscar/oscar.c:5719
 #: ../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:3333 ../pidgin/gtkblist.c:3725
-#: ../pidgin/gtkdocklet.c:561 ../pidgin/gtkstatusbox.c:1085
+#: ../libpurple/protocols/yahoo/yahoo.c:3156 ../libpurple/status.c:155
+#: ../pidgin/gtkblist.c:3415 ../pidgin/gtkblist.c:3807
+#: ../pidgin/gtkdocklet.c:561 ../pidgin/gtkstatusbox.c:1090
 msgid "Offline"
 msgstr "�亠 于 �亠�亳"

-#: ../finch/plugins/grouping.c:117 ../pidgin/gtkblist.c:3369
+#: ../finch/plugins/grouping.c:117 ../pidgin/gtkblist.c:3451
 msgid "Online Buddies"
 msgstr "弌仂弍亠�亠亟仆亳从仂于 于 �亠�亳"

@@ -2159,14 +2203,12 @@
 msgstr ""

 #: ../finch/plugins/grouping.c:217
-#, fuzzy
 msgid "No Grouping"
-msgstr "�亠� 亰于�从舒"
+msgstr ""

 #: ../finch/plugins/grouping.c:257 ../finch/plugins/grouping.c:258
-#, fuzzy
 msgid "Provides alternate buddylist grouping options."
-msgstr "��亠亟仂��舒于仍�亠� 亳仆�亠亞�舒�亳� � Evolution."
+msgstr ""

 #: ../finch/plugins/lastlog.c:69
 msgid "Lastlog"
@@ -2189,7 +2231,8 @@
 msgid "accounts"
 msgstr "����仆�亠 亰舒仗亳�亳"

-#: ../libpurple/account.c:1063 ../libpurple/protocols/jabber/auth.c:199
+#: ../libpurple/account.c:1063 ../libpurple/protocols/jabber/auth.c:204
+#: ../libpurple/protocols/silc/silc.c:473
 msgid "Password is required to sign on."
 msgstr "�仍� 仗仂亟从仍��亠仆亳� ��亠弍�亠��� 仗舒�仂仍�."

@@ -2221,44 +2264,44 @@
 msgid "New passwords do not match."
 msgstr "�仂于�亠 仗舒�仂仍亳 仆亠 �仂于仗舒亟舒��."

-#: ../libpurple/account.c:1366
+#: ../libpurple/account.c:1370
 msgid "Fill out all fields completely."
 msgstr "�舒仗仂仍仆亳�亠 于�亠 仗仂仍�."

-#: ../libpurple/account.c:1389
+#: ../libpurple/account.c:1402
 msgid "Original password"
 msgstr "���仂亟仆�亶 仗舒�仂仍�"

-#: ../libpurple/account.c:1396
+#: ../libpurple/account.c:1410
 msgid "New password"
 msgstr "�仂于�亶 仗舒�仂仍�"

-#: ../libpurple/account.c:1403
+#: ../libpurple/account.c:1418
 msgid "New password (again)"
 msgstr "�仂于�亶 仗舒�仂仍� (亠�� �舒亰)"

-#: ../libpurple/account.c:1409
+#: ../libpurple/account.c:1425
 #, c-format
 msgid "Change password for %s"
 msgstr "�亰仄亠仆亳�� 仗舒�仂仍� 亟仍� %s"

-#: ../libpurple/account.c:1417
+#: ../libpurple/account.c:1433
 msgid "Please enter your current password and your new password."
 msgstr "�于亠亟亳�亠 于舒� �亠从��亳亶 亳 于舒� 仆仂于�亶 仗舒�仂仍亳."

-#: ../libpurple/account.c:1448
+#: ../libpurple/account.c:1464
 #, c-format
 msgid "Change user information for %s"
 msgstr "�亰仄亠仆亳�� 仗仂仍�亰仂于舒�亠仍��从�� 亳仆�仂�仄舒�亳� 亟仍� %s"

-#: ../libpurple/account.c:1451 ../libpurple/protocols/toc/toc.c:1670
+#: ../libpurple/account.c:1467 ../libpurple/protocols/toc/toc.c:1670
 msgid "Set User Info"
 msgstr "丕��舒仆仂于亳�� 仗仂仍�亰仂于舒�亠仍��从�� 亳仆�仂�仄舒�亳�"

-#: ../libpurple/account.c:1922 ../libpurple/protocols/gg/gg.c:1019
-#: ../libpurple/protocols/jabber/buddy.c:812
-#: ../libpurple/protocols/jabber/buddy.c:2077
-#: ../libpurple/protocols/jabber/buddy.c:2094
+#: ../libpurple/account.c:1938 ../libpurple/protocols/gg/gg.c:1019
+#: ../libpurple/protocols/jabber/buddy.c:813
+#: ../libpurple/protocols/jabber/buddy.c:2078
+#: ../libpurple/protocols/jabber/buddy.c:2095
 #: ../libpurple/protocols/novell/novell.c:2849
 #: ../libpurple/protocols/qq/qq.c:233 ../pidgin/gtkft.c:166
 msgid "Unknown"
@@ -2266,7 +2309,7 @@

 #: ../libpurple/blist.c:521 ../libpurple/blist.c:1348
 #: ../libpurple/blist.c:1558 ../libpurple/protocols/jabber/roster.c:69
-#: ../libpurple/protocols/myspace/myspace.c:3435 ../pidgin/gtkblist.c:6234
+#: ../libpurple/protocols/myspace/myspace.c:3442 ../pidgin/gtkblist.c:6317
 #: ../pidgin/plugins/gevolution/gevo-util.c:67
 #: ../pidgin/plugins/gevolution/gevolution.c:96
 msgid "Buddies"
@@ -2445,7 +2488,7 @@
 msgstr "+++ %s 于��亠仍"

 #: ../libpurple/connection.c:530 ../libpurple/plugin.c:277
-#: ../libpurple/protocols/jabber/buddy.c:2397
+#: ../libpurple/protocols/jabber/buddy.c:2398
 #: ../libpurple/protocols/msn/servconn.c:141
 #: ../libpurple/protocols/msn/session.c:377
 #: ../libpurple/protocols/msnp9/servconn.c:139
@@ -2467,45 +2510,45 @@
 msgid "The message is too large."
 msgstr "弌仂仂弍�亠仆亳亠 �仍亳�从仂仄 于亠仍亳从仂."

-#: ../libpurple/conversation.c:183 ../libpurple/protocols/bonjour/jabber.c:272
-#: ../libpurple/protocols/bonjour/jabber.c:315
+#: ../libpurple/conversation.c:183 ../libpurple/protocols/bonjour/jabber.c:296
+#: ../libpurple/protocols/bonjour/jabber.c:339
 msgid "Unable to send message."
 msgstr "�亠 �亟舒���� 仂�仗�舒于亳�� �仂仂弍�亠仆亳亠."

-#: ../libpurple/conversation.c:1218
+#: ../libpurple/conversation.c:1231
 msgid "Send Message"
 msgstr "��仗�舒于亳�� �仂仂弍�亠仆亳亠"

-#: ../libpurple/conversation.c:1221
+#: ../libpurple/conversation.c:1234
 msgid "_Send Message"
 msgstr "_��仗�舒于亳�� �仂仂弍�亠仆亳亠"

-#: ../libpurple/conversation.c:1627
+#: ../libpurple/conversation.c:1640
 #, c-format
 msgid "%s entered the room."
 msgstr "%s 于仂��仍 于 从仂仄仆舒��."

-#: ../libpurple/conversation.c:1630
+#: ../libpurple/conversation.c:1643
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] 于仂��仍 于 从仂仄仆舒��."

-#: ../libpurple/conversation.c:1740
+#: ../libpurple/conversation.c:1753
 #, c-format
 msgid "You are now known as %s"
 msgstr "�� �亠仗亠�� 亳亰于亠��仆� 从舒从 %s"

-#: ../libpurple/conversation.c:1760
+#: ../libpurple/conversation.c:1773
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s �亠仗亠�� 亳亰于亠��亠仆 从舒从 %s"

-#: ../libpurple/conversation.c:1835
+#: ../libpurple/conversation.c:1848
 #, c-format
 msgid "%s left the room."
 msgstr "%s 于��亠仍 亳亰 从仂仄仆舒��."

-#: ../libpurple/conversation.c:1838
+#: ../libpurple/conversation.c:1851
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s 于��亠仍 亳亰 从仂仄仆舒�� (%s)."
@@ -2525,7 +2568,7 @@
 msgid "Failed to get serv name: %s"
 msgstr "�亠 �亟舒仍仂�� 仗仂仍��亳�� 亳仄� �亠�于亠�舒: %s"

-#: ../libpurple/dbus-server.h:84
+#: ../libpurple/dbus-server.h:86
 msgid "Purple's D-BUS server is not running for the reason listed below"
 msgstr ""

@@ -2881,15 +2924,15 @@
 msgid "Old flat format"
 msgstr "弌�舒��亶 仗仍仂�从亳亶 �仂�仄舒�"

-#: ../libpurple/log.c:838
+#: ../libpurple/log.c:850
 msgid "Logging of this conversation failed."
 msgstr "�亠 �亟舒仍仂�� 于�仗仂仍仆亳�� 于亠亟亠仆亳亠 亢��仆舒仍舒 ��仂亶 弍亠�亠亟�."

-#: ../libpurple/log.c:1281
+#: ../libpurple/log.c:1293
 msgid "XML"
 msgstr "XML"

-#: ../libpurple/log.c:1365
+#: ../libpurple/log.c:1377
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -2898,7 +2941,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"

-#: ../libpurple/log.c:1367
+#: ../libpurple/log.c:1379
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -2907,16 +2950,16 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"

-#: ../libpurple/log.c:1425 ../libpurple/log.c:1558
+#: ../libpurple/log.c:1437 ../libpurple/log.c:1570
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>�亠 �亟舒���� 仆舒亶�亳 仗��� 从 亢��仆舒仍�!</b></font>"

-#: ../libpurple/log.c:1437 ../libpurple/log.c:1567
+#: ../libpurple/log.c:1449 ../libpurple/log.c:1579
 #, 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:1499
+#: ../libpurple/log.c:1511
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
@@ -3007,12 +3050,12 @@
 #: ../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: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:6297
-#: ../libpurple/protocols/oscar/oscar.c:6367 ../libpurple/request.h:1401
+#: ../libpurple/protocols/oscar/oscar.c:2290
+#: ../libpurple/protocols/oscar/oscar.c:2338
+#: ../libpurple/protocols/oscar/oscar.c:6001
+#: ../libpurple/protocols/oscar/oscar.c:6056
+#: ../libpurple/protocols/oscar/oscar.c:6283
+#: ../libpurple/protocols/oscar/oscar.c:6353 ../libpurple/request.h:1401
 #: ../libpurple/request.h:1411
 msgid "_Cancel"
 msgstr "�_�仄亠仆亳��"
@@ -3248,7 +3291,7 @@

 #: ../libpurple/plugins/joinpart.c:232
 msgid "Minimum Room Size"
-msgstr ""
+msgstr "�亳仆亳仄舒仍�仆�亶 �舒亰仄亠� 从仂仄仆舒��"

 #: ../libpurple/plugins/joinpart.c:238
 msgid "User Inactivity Timeout (in minutes)"
@@ -3296,7 +3339,7 @@

 #: ../libpurple/plugins/log_reader.c:1570
 #: ../libpurple/plugins/log_reader.c:1573
-#: ../libpurple/plugins/statenotify.c:80
+#: ../libpurple/plugins/statenotify.c:84
 #, c-format
 msgid "%s has signed off."
 msgstr "%s 仆亠 于 �亠�亳."
@@ -3328,7 +3371,7 @@
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
 #: ../libpurple/plugins/log_reader.c:2699
-#: ../libpurple/plugins/log_reader.c:2835
+#: ../libpurple/plugins/log_reader.c:2855
 msgid "Adium"
 msgstr "Adium"

@@ -3336,7 +3379,7 @@
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
 #: ../libpurple/plugins/log_reader.c:2712
-#: ../libpurple/plugins/log_reader.c:2840
+#: ../libpurple/plugins/log_reader.c:2860
 msgid "Fire"
 msgstr "Fire"

@@ -3344,7 +3387,7 @@
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
 #: ../libpurple/plugins/log_reader.c:2724
-#: ../libpurple/plugins/log_reader.c:2844
+#: ../libpurple/plugins/log_reader.c:2864
 msgid "Messenger Plus!"
 msgstr "Messenger Plus!"

@@ -3352,7 +3395,7 @@
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
 #: ../libpurple/plugins/log_reader.c:2738
-#: ../libpurple/plugins/log_reader.c:2849
+#: ../libpurple/plugins/log_reader.c:2869
 msgid "QIP"
 msgstr "QIP"

@@ -3360,7 +3403,7 @@
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
 #: ../libpurple/plugins/log_reader.c:2750
-#: ../libpurple/plugins/log_reader.c:2853
+#: ../libpurple/plugins/log_reader.c:2873
 msgid "MSN Messenger"
 msgstr "MSN Messenger"

@@ -3368,7 +3411,7 @@
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
 #: ../libpurple/plugins/log_reader.c:2762
-#: ../libpurple/plugins/log_reader.c:2857
+#: ../libpurple/plugins/log_reader.c:2877
 msgid "Trillian"
 msgstr "Trillian"

@@ -3376,25 +3419,25 @@
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
 #: ../libpurple/plugins/log_reader.c:2774
-#: ../libpurple/plugins/log_reader.c:2861
+#: ../libpurple/plugins/log_reader.c:2881
 msgid "aMSN"
 msgstr "aMSN"

 #. Add general preferences.
-#: ../libpurple/plugins/log_reader.c:2817
+#: ../libpurple/plugins/log_reader.c:2837
 msgid "General Log Reading Configuration"
 msgstr "��仆仂于仆�亠 仆舒���仂亶从亳 �亳��亠仄� ��亠仆亳� 亢��仆舒仍仂于"

-#: ../libpurple/plugins/log_reader.c:2821
+#: ../libpurple/plugins/log_reader.c:2841
 msgid "Fast size calculations"
 msgstr "�����仂亠 于��亳�仍亠仆亳亠 �舒亰仄亠�舒"

-#: ../libpurple/plugins/log_reader.c:2825
+#: ../libpurple/plugins/log_reader.c:2845
 msgid "Use name heuristics"
 msgstr ""

 #. Add Log Directory preferences.
-#: ../libpurple/plugins/log_reader.c:2831
+#: ../libpurple/plugins/log_reader.c:2851
 msgid "Log Directory"
 msgstr "�舒�舒仍仂亞 亢��仆舒仍舒"

@@ -3404,21 +3447,21 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/log_reader.c:2890
+#: ../libpurple/plugins/log_reader.c:2910
 msgid "Log Reader"
 msgstr "弌亳��亠仄舒 ��亠仆亳� 亢��仆舒仍仂于"

 #. *< name
 #. *< version
 #. * summary
-#: ../libpurple/plugins/log_reader.c:2894
+#: ../libpurple/plugins/log_reader.c:2914
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr ""
 "�从仍��舒亠� 亢��仆舒仍� 亟��亞亳� 从仍亳亠仆�仂于 仂弍仄亠仆舒 �仂仂弍�亠仆亳�仄亳 于 �亳��亠仄� 仗�仂�仄仂��舒 "
 "亢��仆舒仍仂于."

 #. * description
-#: ../libpurple/plugins/log_reader.c:2898
+#: ../libpurple/plugins/log_reader.c:2918
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, and Trillian.\n"
@@ -3467,10 +3510,10 @@
 #: ../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."
+"the username in the conversation window."
 msgstr ""
 "�仂弍舒于仍�亠� 仆仂于�� ���仂从� 从 仆舒�舒仍� 从舒亢亟仂亞仂 �仂仂弍�亠仆亳�, 于�仍亠亟��于亳亠 �亠亞仂 于 仂从仆亠 "
-"弍亠�亠亟� �舒仄仂 �仂仂弍�亠仆亳亠 于�于仂亟亳��� 仆亳亢亠 亳亟亠仆�亳�亳从舒�仂�舒 仗仂仍�亰仂于舒�亠仍�."
+"弍亠�亠亟� �舒仄仂 �仂仂弍�亠仆亳亠 于�于仂亟亳��� 仆亳亢亠 亳仄亠仆亳 仗仂仍�亰仂于舒�亠仍�."

 #: ../libpurple/plugins/offlinemsg.c:23
 msgid "Offline Message Emulation"
@@ -3689,44 +3732,44 @@
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "��亠亟仂��舒于仍�亠� 仂弍���从� 于仂从��亞 弍亳弍仍亳仂�亠从 仗仂亟亟亠�亢从亳 SSL."

-#: ../libpurple/plugins/statenotify.c:50
+#: ../libpurple/plugins/statenotify.c:54
 #, c-format
 msgid "%s is no longer away."
 msgstr "%s 于亠�仆�仍��."

-#: ../libpurple/plugins/statenotify.c:52
+#: ../libpurple/plugins/statenotify.c:56
 #, c-format
 msgid "%s has gone away."
 msgstr "%s 仂�仂��仍."

-#: ../libpurple/plugins/statenotify.c:62
+#: ../libpurple/plugins/statenotify.c:66
 #, c-format
 msgid "%s has become idle."
 msgstr "%s 仆舒�舒仍 弍亠亰亟亠亶��于仂于舒��."

-#: ../libpurple/plugins/statenotify.c:64
+#: ../libpurple/plugins/statenotify.c:68
 #, c-format
 msgid "%s is no longer idle."
 msgstr "%s 仗亠�亠��舒仍 弍亠亰亟亠亶��于仂于舒��."

-#: ../libpurple/plugins/statenotify.c:73
+#: ../libpurple/plugins/statenotify.c:77
 #, c-format
 msgid "%s has signed on."
 msgstr "%s 于 �亠�亳."

-#: ../libpurple/plugins/statenotify.c:91
+#: ../libpurple/plugins/statenotify.c:95
 msgid "Notify When"
 msgstr "�仂亞亟舒 �于亠亟仂仄仍���"

-#: ../libpurple/plugins/statenotify.c:94
+#: ../libpurple/plugins/statenotify.c:98
 msgid "Buddy Goes _Away"
 msgstr "弌仂弍亠�亠亟仆亳从 _仂��仂亟亳�"

-#: ../libpurple/plugins/statenotify.c:97
+#: ../libpurple/plugins/statenotify.c:101
 msgid "Buddy Goes _Idle"
 msgstr "弌仂弍亠�亠亟仆亳从 仆舒�亳仆舒亠� _弍亠亰亟亠亶��于仂于舒��"

-#: ../libpurple/plugins/statenotify.c:100
+#: ../libpurple/plugins/statenotify.c:104
 msgid "Buddy _Signs On/Off"
 msgstr "弌仂弍亠�亠亟仆亳从 _于�仂亟亳�/于��仂亟亳�"

@@ -3736,7 +3779,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/statenotify.c:148
+#: ../libpurple/plugins/statenotify.c:152
 msgid "Buddy State Notification"
 msgstr "丕于亠亟仂仄仍亠仆亳亠 仂 ��舒���亠 �仂弍亠�亠亟仆亳从舒"

@@ -3744,8 +3787,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/statenotify.c:151
-#: ../libpurple/plugins/statenotify.c:154
+#: ../libpurple/plugins/statenotify.c:155
+#: ../libpurple/plugins/statenotify.c:158
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
@@ -3767,58 +3810,58 @@
 "install ActiveTCL from http://www.activestate.com\n"
 msgstr ""

-#: ../libpurple/protocols/bonjour/bonjour.c:101
+#: ../libpurple/protocols/bonjour/bonjour.c:102
 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:120
+#: ../libpurple/protocols/bonjour/bonjour.c:121
 msgid "Unable to listen for incoming IM connections\n"
 msgstr "�亠 �亟舒���� 仗�仂�仍��亳于舒�� 于�仂亟��亳亠 �仂亠亟亳仆亠仆亳�\n"

-#: ../libpurple/protocols/bonjour/bonjour.c:147
+#: ../libpurple/protocols/bonjour/bonjour.c:148
 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:392
-#: ../libpurple/protocols/bonjour/bonjour.c:698
+#: ../libpurple/protocols/bonjour/bonjour.c:393
+#: ../libpurple/protocols/bonjour/bonjour.c:699
 #: ../libpurple/protocols/gg/gg.c:633
 #: ../libpurple/protocols/jabber/jabber.c:1006
 msgid "First name"
 msgstr "�仄�"

-#: ../libpurple/protocols/bonjour/bonjour.c:394
-#: ../libpurple/protocols/bonjour/bonjour.c:701
+#: ../libpurple/protocols/bonjour/bonjour.c:395
+#: ../libpurple/protocols/bonjour/bonjour.c:702
 #: ../libpurple/protocols/gg/gg.c:628
 #: ../libpurple/protocols/jabber/jabber.c:1010
 msgid "Last name"
 msgstr "个舒仄亳仍亳�"

-#: ../libpurple/protocols/bonjour/bonjour.c:398
-#: ../libpurple/protocols/jabber/buddy.c:323
-#: ../libpurple/protocols/jabber/buddy.c:1362
-#: ../libpurple/protocols/jabber/buddy.c:1372
-#: ../libpurple/protocols/jabber/buddy.c:2266
-#: ../libpurple/protocols/silc/ops.c:1056
-#: ../libpurple/protocols/silc/util.c:565
+#: ../libpurple/protocols/bonjour/bonjour.c:399
+#: ../libpurple/protocols/jabber/buddy.c:318
+#: ../libpurple/protocols/jabber/buddy.c:1363
+#: ../libpurple/protocols/jabber/buddy.c:1373
+#: ../libpurple/protocols/jabber/buddy.c:2267
+#: ../libpurple/protocols/silc/ops.c:1055
+#: ../libpurple/protocols/silc/util.c:561
 #: ../libpurple/protocols/silc10/ops.c:1075
 #: ../libpurple/protocols/silc10/util.c:555
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1068
 msgid "E-Mail"
 msgstr "E-mail"

-#: ../libpurple/protocols/bonjour/bonjour.c:401
-#: ../libpurple/protocols/bonjour/bonjour.c:707
+#: ../libpurple/protocols/bonjour/bonjour.c:402
+#: ../libpurple/protocols/bonjour/bonjour.c:708
 msgid "AIM Account"
 msgstr "丕���仆舒� 亰舒仗亳�� AIM"

-#: ../libpurple/protocols/bonjour/bonjour.c:404
-#: ../libpurple/protocols/bonjour/bonjour.c:710
+#: ../libpurple/protocols/bonjour/bonjour.c:405
+#: ../libpurple/protocols/bonjour/bonjour.c:711
 msgid "XMPP Account"
 msgstr "丕���仆舒� 亰舒仗亳�� XMPP"

@@ -3832,20 +3875,20 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:508
-#: ../libpurple/protocols/bonjour/bonjour.c:510
+#: ../libpurple/protocols/bonjour/bonjour.c:509
+#: ../libpurple/protocols/bonjour/bonjour.c:511
 msgid "Bonjour Protocol Plugin"
 msgstr "�仂亟�仍� 仗�仂�仂从仂仍舒 Bonjour"

-#: ../libpurple/protocols/bonjour/bonjour.c:651
+#: ../libpurple/protocols/bonjour/bonjour.c:652
 msgid "Purple Person"
 msgstr ""

-#: ../libpurple/protocols/bonjour/bonjour.c:704
+#: ../libpurple/protocols/bonjour/bonjour.c:705
 #: ../libpurple/protocols/gg/gg.c:478
 #: ../libpurple/protocols/jabber/jabber.c:998
-#: ../libpurple/protocols/silc/silc.c:913
-#: ../libpurple/protocols/silc/silc.c:1154
+#: ../libpurple/protocols/silc/silc.c:986
+#: ../libpurple/protocols/silc/silc.c:1227
 #: ../libpurple/protocols/silc10/silc.c:687
 #: ../libpurple/protocols/silc10/silc.c:928
 msgid "E-mail"
@@ -3855,32 +3898,32 @@
 msgid "Bonjour"
 msgstr "Bonjour"

-#: ../libpurple/protocols/bonjour/jabber.c:407
+#: ../libpurple/protocols/bonjour/jabber.c:431
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s 亰舒从��仍 弍亠�亠亟�."

-#: ../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
+#: ../libpurple/protocols/bonjour/jabber.c:481
+#: ../libpurple/protocols/bonjour/jabber.c:546
+#: ../libpurple/protocols/bonjour/jabber.c:591
+#: ../libpurple/protocols/bonjour/jabber.c:768
+#: ../libpurple/protocols/bonjour/jabber.c:786
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "�亠 �亟舒���� 仂�仗�舒于亳�� �仂仂弍�亠仆亳亠, 仆亠 �亟舒仍仂�� 仆舒�舒�� 弍亠�亠亟�."

-#: ../libpurple/protocols/bonjour/jabber.c:661
+#: ../libpurple/protocols/bonjour/jabber.c:685
 msgid "Cannot open socket"
 msgstr "�亠 �亟舒���� 仂�从���� �仂从亠�"

-#: ../libpurple/protocols/bonjour/jabber.c:671
+#: ../libpurple/protocols/bonjour/jabber.c:695
 msgid "Error setting socket options"
 msgstr "��亳弍从舒 ���舒仆仂于从亳 仗舒�舒仄亠��仂于 �仂从亠�舒"

-#: ../libpurple/protocols/bonjour/jabber.c:697
+#: ../libpurple/protocols/bonjour/jabber.c:721
 msgid "Could not bind socket to port"
 msgstr "�亠 �亟舒仍仂�� �于�亰舒�� �仂从亠� � 仗仂��仂仄"

-#: ../libpurple/protocols/bonjour/jabber.c:707
+#: ../libpurple/protocols/bonjour/jabber.c:731
 msgid "Could not listen on socket"
 msgstr "�亠 �亟舒仍仂�� 仂���亠��于亳�� 仗�仂�仍��亳于舒仆亳亠 �仂从亠�舒"

@@ -3993,8 +4036,8 @@
 #: ../libpurple/protocols/gg/gg.c:643 ../libpurple/protocols/gg/gg.c:1056
 #: ../libpurple/protocols/gg/gg.c:1128
 #: ../libpurple/protocols/jabber/jabber.c:1018
-#: ../libpurple/protocols/oscar/oscar.c:3836
-#: ../libpurple/protocols/oscar/oscar.c:3849
+#: ../libpurple/protocols/oscar/oscar.c:3828
+#: ../libpurple/protocols/oscar/oscar.c:3841
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "�仂�仂亟"
@@ -4006,7 +4049,7 @@
 #: ../libpurple/protocols/gg/gg.c:651 ../libpurple/protocols/msn/msn.c:1759
 #: ../libpurple/protocols/msnp9/msn.c:1600
 #: ../libpurple/protocols/myspace/user.c:129
-#: ../libpurple/protocols/oscar/oscar.c:3779
+#: ../libpurple/protocols/oscar/oscar.c:3771
 #: ../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
@@ -4019,14 +4062,14 @@
 msgstr "��亢�亳仆舒 亳仍亳 亢亠仆�亳仆舒"

 #: ../libpurple/protocols/gg/gg.c:653
-#: ../libpurple/protocols/oscar/oscar.c:3779
+#: ../libpurple/protocols/oscar/oscar.c:3771
 #: ../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:3779
+#: ../libpurple/protocols/oscar/oscar.c:3771
 #: ../libpurple/protocols/qq/buddy_info.c:84
 #: ../libpurple/protocols/qq/qq.c:230
 msgid "Female"
@@ -4086,7 +4129,7 @@
 msgstr "�仂弍舒于亳�� 从 �舒��..."

 #: ../libpurple/protocols/gg/gg.c:1013
-#: ../libpurple/protocols/jabber/buddy.c:2083
+#: ../libpurple/protocols/jabber/buddy.c:2084
 #: ../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
@@ -4095,8 +4138,8 @@
 #: ../libpurple/protocols/msnp9/state.c:38
 #: ../libpurple/protocols/novell/novell.c:2834
 #: ../libpurple/protocols/qq/qq.c:281
-#: ../libpurple/protocols/yahoo/yahoo.c:3158 ../libpurple/status.c:155
-#: ../pidgin/gtkdocklet.c:545 ../pidgin/gtkstatusbox.c:1081
+#: ../libpurple/protocols/yahoo/yahoo.c:3158 ../libpurple/status.c:156
+#: ../pidgin/gtkdocklet.c:545 ../pidgin/gtkstatusbox.c:1086
 msgid "Available"
 msgstr "�仂���仗亠仆"

@@ -4104,33 +4147,33 @@
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
 #: ../libpurple/protocols/gg/gg.c:1016 ../libpurple/protocols/irc/irc.c:544
-#: ../libpurple/protocols/irc/msgs.c:312
-#: ../libpurple/protocols/jabber/buddy.c:2087
+#: ../libpurple/protocols/irc/msgs.c:358
+#: ../libpurple/protocols/jabber/buddy.c:2088
 #: ../libpurple/protocols/novell/novell.c:2837
 #: ../libpurple/protocols/oscar/oscar.c:734
-#: ../libpurple/protocols/oscar/oscar.c:5761
+#: ../libpurple/protocols/oscar/oscar.c:5747
 #: ../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:3715
-#: ../libpurple/protocols/yahoo/yahoo.c:3789 ../libpurple/status.c:158
-#: ../pidgin/gtkdocklet.c:549 ../pidgin/gtkprefs.c:1960
-#: ../pidgin/gtkstatusbox.c:1082
+#: ../libpurple/protocols/yahoo/yahoo.c:3719
+#: ../libpurple/protocols/yahoo/yahoo.c:3793 ../libpurple/status.c:159
+#: ../pidgin/gtkdocklet.c:549 ../pidgin/gtkprefs.c:2070
+#: ../pidgin/gtkstatusbox.c:1087
 #, c-format
 msgid "Away"
 msgstr "��仂��仍"

 #: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1119
-#: ../libpurple/protocols/oscar/oscar.c:2767
-#: ../libpurple/protocols/oscar/oscar.c:3746
+#: ../libpurple/protocols/oscar/oscar.c:2755
+#: ../libpurple/protocols/oscar/oscar.c:3738
 msgid "UIN"
 msgstr "UIN"

 #: ../libpurple/protocols/gg/gg.c:1048 ../libpurple/protocols/gg/gg.c:1122
-#: ../libpurple/protocols/jabber/buddy.c:2260
-#: ../libpurple/protocols/jabber/buddy.c:2446
-#: ../libpurple/protocols/oscar/oscar.c:3757
-#: ../libpurple/protocols/silc/ops.c:1005
+#: ../libpurple/protocols/jabber/buddy.c:2261
+#: ../libpurple/protocols/jabber/buddy.c:2447
+#: ../libpurple/protocols/oscar/oscar.c:3749
+#: ../libpurple/protocols/silc/ops.c:1004
 #: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
 msgstr "�仄�"
@@ -4140,7 +4183,7 @@
 msgstr "�仂亟 �仂亢亟亠仆亳�"

 #: ../libpurple/protocols/gg/gg.c:1113 ../libpurple/protocols/gg/gg.c:1182
-#: ../libpurple/protocols/oscar/oscar.c:3958
+#: ../libpurple/protocols/oscar/oscar.c:3950
 msgid "Unable to display the search results."
 msgstr "�亠 �亟舒���� 仂�仂弍�舒亰亳�� �亠亰�仍��舒�� 仗仂亳�从舒."

@@ -4257,23 +4300,23 @@
 msgstr "�仂仍�亰仂于舒�亠仍� Gadu-Gadu"

 #: ../libpurple/protocols/irc/cmds.c:43
-#: ../libpurple/protocols/silc/silc.c:1780
+#: ../libpurple/protocols/silc/silc.c:1853
 #: ../libpurple/protocols/silc10/silc.c:1572
 #, c-format
 msgid "Unknown command: %s"
 msgstr "�亠亳亰于亠��仆舒� 从仂仄舒仆亟舒: %s"

 #: ../libpurple/protocols/irc/cmds.c:509
-#: ../libpurple/protocols/jabber/chat.c:591
-#: ../libpurple/protocols/silc/silc.c:1488
+#: ../libpurple/protocols/jabber/chat.c:596
+#: ../libpurple/protocols/silc/silc.c:1561
 #: ../libpurple/protocols/silc10/silc.c:1280
 #, c-format
 msgid "current topic is: %s"
 msgstr "�亠从��舒� �亠仄舒: %s"

 #: ../libpurple/protocols/irc/cmds.c:513
-#: ../libpurple/protocols/jabber/chat.c:595
-#: ../libpurple/protocols/silc/silc.c:1492
+#: ../libpurple/protocols/jabber/chat.c:600
+#: ../libpurple/protocols/silc/silc.c:1565
 #: ../libpurple/protocols/silc10/silc.c:1284
 msgid "No topic is set"
 msgstr "丐亠仄舒 仆亠 ���舒仆仂于仍亠仆舒"
@@ -4283,9 +4326,9 @@
 #: ../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
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1110
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1514
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1565
 msgid "File Transfer Failed"
 msgstr "�亠 �亟舒仍仂�� 仗�仂亳亰于亠��亳 仗亠�亠亟舒�� �舒亶仍仂于"

@@ -4313,7 +4356,7 @@

 #: ../libpurple/protocols/irc/irc.c:129 ../libpurple/protocols/irc/irc.c:169
 #: ../libpurple/protocols/irc/irc.c:633 ../libpurple/protocols/irc/irc.c:662
-#: ../libpurple/protocols/myspace/myspace.c:2532
+#: ../libpurple/protocols/myspace/myspace.c:2539
 msgid "Server has disconnected"
 msgstr "弌亠�于亠� �舒亰仂�于舒仍 �仂亠亟亳仆亠仆亳亠"

@@ -4345,10 +4388,10 @@
 #: ../libpurple/protocols/novell/novell.c:2199
 #: ../libpurple/protocols/oscar/oscar.c:1335
 #: ../libpurple/protocols/qq/qq.c:136
-#: ../libpurple/protocols/sametime/sametime.c:3777
+#: ../libpurple/protocols/sametime/sametime.c:3778
 #: ../libpurple/protocols/simple/simple.c:1915
 #: ../libpurple/protocols/yahoo/yahoo.c:2984
-#: ../libpurple/protocols/zephyr/zephyr.c:1585 ../pidgin/gtkstatusbox.c:681
+#: ../libpurple/protocols/zephyr/zephyr.c:1585 ../pidgin/gtkstatusbox.c:686
 msgid "Connecting"
 msgstr "弌仂亠亟亳仆亠仆亳亠"

@@ -4371,21 +4414,21 @@
 msgstr "�亠 �亟舒仍仂�� �仂亠亟亳仆亳���� � �亰仍仂仄"

 #: ../libpurple/protocols/irc/irc.c:628 ../libpurple/protocols/irc/irc.c:657
-#: ../libpurple/protocols/myspace/myspace.c:2526
+#: ../libpurple/protocols/myspace/myspace.c:2533
 msgid "Read error"
 msgstr "��亳弍从舒 ��亠仆亳�"

 #: ../libpurple/protocols/irc/irc.c:798
-#: ../libpurple/protocols/silc/chat.c:1398
+#: ../libpurple/protocols/silc/chat.c:1401
 #: ../libpurple/protocols/silc10/chat.c:1426
 #: ../libpurple/protocols/yahoo/yahoochat.c:1508
 msgid "Users"
 msgstr "�仂仍�亰仂于舒�亠仍亳"

 #: ../libpurple/protocols/irc/irc.c:801
-#: ../libpurple/protocols/sametime/sametime.c:3425
-#: ../libpurple/protocols/silc/chat.c:1401
-#: ../libpurple/protocols/silc/ops.c:1408
+#: ../libpurple/protocols/sametime/sametime.c:3426
+#: ../libpurple/protocols/silc/chat.c:1404
+#: ../libpurple/protocols/silc/ops.c:1406
 #: ../libpurple/protocols/silc10/chat.c:1429
 #: ../libpurple/protocols/silc10/ops.c:1382
 #: ../libpurple/protocols/yahoo/yahoochat.c:1517
@@ -4410,14 +4453,14 @@
 msgstr "�舒亳仄亠仆亠亠 仗仍仂�仂亶 仄仂亟�仍� 仗�仂�仂从仂仍舒 IRC"

 #. host to connect to
-#: ../libpurple/protocols/irc/irc.c:965 ../libpurple/protocols/irc/msgs.c:325
+#: ../libpurple/protocols/irc/irc.c:965 ../libpurple/protocols/irc/msgs.c:371
 #: ../libpurple/protocols/msn/msn.c:2357
 #: ../libpurple/protocols/msnp9/msn.c:2197
-#: ../libpurple/protocols/oscar/oscar.c:6763
+#: ../libpurple/protocols/oscar/oscar.c:6749
 #: ../libpurple/protocols/qq/qq.c:756
-#: ../libpurple/protocols/sametime/sametime.c:5782
-#: ../libpurple/protocols/silc/ops.c:1264
-#: ../libpurple/protocols/silc/ops.c:1358
+#: ../libpurple/protocols/sametime/sametime.c:5783
+#: ../libpurple/protocols/silc/ops.c:1262
+#: ../libpurple/protocols/silc/ops.c:1356
 #: ../libpurple/protocols/silc10/ops.c:1244
 #: ../libpurple/protocols/silc10/ops.c:1347
 #: ../libpurple/protocols/simple/simple.c:2099
@@ -4428,10 +4471,10 @@
 #. port to connect to
 #: ../libpurple/protocols/irc/irc.c:968 ../libpurple/protocols/msn/msn.c:2362
 #: ../libpurple/protocols/msnp9/msn.c:2202
-#: ../libpurple/protocols/oscar/oscar.c:6766
+#: ../libpurple/protocols/oscar/oscar.c:6752
 #: ../libpurple/protocols/qq/qq.c:759
-#: ../libpurple/protocols/sametime/sametime.c:5787
-#: ../libpurple/protocols/silc/silc.c:2061
+#: ../libpurple/protocols/sametime/sametime.c:5788
+#: ../libpurple/protocols/silc/silc.c:2143
 #: ../libpurple/protocols/silc10/silc.c:1867
 #: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
@@ -4441,28 +4484,8 @@
 msgid "Encodings"
 msgstr "�仂亟亳�仂于从亳"

-#: ../libpurple/protocols/irc/irc.c:974 ../libpurple/protocols/irc/msgs.c:318
-#: ../libpurple/protocols/jabber/jabber.c:974
-#: ../libpurple/protocols/jabber/jabber.c:976
-#: ../libpurple/protocols/oscar/oscar.c:2956
-#: ../libpurple/protocols/oscar/oscar.c:3969
-#: ../libpurple/protocols/silc/buddy.c:1542
-#: ../libpurple/protocols/silc/ops.c:1212
-#: ../libpurple/protocols/silc/ops.c:1215
-#: ../libpurple/protocols/silc/ops.c:1351
-#: ../libpurple/protocols/silc/ops.c:1354
-#: ../libpurple/protocols/silc/silc.c:1148
-#: ../libpurple/protocols/silc10/buddy.c:1542
-#: ../libpurple/protocols/silc10/ops.c:1191
-#: ../libpurple/protocols/silc10/ops.c:1194
-#: ../libpurple/protocols/silc10/ops.c:1340
-#: ../libpurple/protocols/silc10/ops.c:1343
-#: ../libpurple/protocols/silc10/silc.c:922
-msgid "Username"
-msgstr "�仄� 仗仂仍�亰仂于舒�亠仍�"
-
-#: ../libpurple/protocols/irc/irc.c:977 ../libpurple/protocols/irc/msgs.c:319
-#: ../libpurple/protocols/silc/silc.c:1152
+#: ../libpurple/protocols/irc/irc.c:977 ../libpurple/protocols/irc/msgs.c:365
+#: ../libpurple/protocols/silc/silc.c:1225
 #: ../libpurple/protocols/silc10/silc.c:926
 msgid "Real name"
 msgstr "�舒��仂��亠亠 亳仄�"
@@ -4475,154 +4498,169 @@
 msgid "Use SSL"
 msgstr "��仗仂仍�亰仂于舒�� SSL"

-#: ../libpurple/protocols/irc/msgs.c:189
+#: ../libpurple/protocols/irc/msgs.c:192
 msgid "Bad mode"
 msgstr "�亠于亠�仆�亶 �亠亢亳仄"

-#: ../libpurple/protocols/irc/msgs.c:200
+#: ../libpurple/protocols/irc/msgs.c:214
+#, c-format
+msgid "Ban on %s by %s, set %ld seconds ago"
+msgstr ""
+
+#: ../libpurple/protocols/irc/msgs.c:217
+#, fuzzy, c-format
+msgid "Ban on %s"
+msgstr "��亳�亳仆舒: %s"
+
+#: ../libpurple/protocols/irc/msgs.c:232
+#, fuzzy
+msgid "End of ban list"
+msgstr "�������于�亠� 于 �仗亳�从亠"
+
+#: ../libpurple/protocols/irc/msgs.c:246
 #, c-format
 msgid "You are banned from %s."
 msgstr "�舒� 于�亞仆舒仍亳 亳亰 %s."

-#: ../libpurple/protocols/irc/msgs.c:201
+#: ../libpurple/protocols/irc/msgs.c:247
 msgid "Banned"
 msgstr "�亰亞仆舒仆"

-#: ../libpurple/protocols/irc/msgs.c:218
+#: ../libpurple/protocols/irc/msgs.c:264
 #, c-format
 msgid "Cannot ban %s: banlist is full"
 msgstr ""

-#: ../libpurple/protocols/irc/msgs.c:303
+#: ../libpurple/protocols/irc/msgs.c:349
 msgid " <i>(ircop)</i>"
 msgstr " <i>(仂仗亠�舒�仂� IRC)</i>"

-#: ../libpurple/protocols/irc/msgs.c:304
+#: ../libpurple/protocols/irc/msgs.c:350
 msgid " <i>(identified)</i>"
 msgstr " <i>(亳亟亠仆�亳�亳�亳�仂于舒仆)</i>"

-#: ../libpurple/protocols/irc/msgs.c:305
-#: ../libpurple/protocols/oscar/oscar.c:3747
-#: ../libpurple/protocols/silc/ops.c:1437
+#: ../libpurple/protocols/irc/msgs.c:351
+#: ../libpurple/protocols/oscar/oscar.c:3739
+#: ../libpurple/protocols/silc/ops.c:1435
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
 msgstr "��亠于亟仂仆亳仄"

-#: ../libpurple/protocols/irc/msgs.c:331
-#: ../libpurple/protocols/silc/ops.c:1283
+#: ../libpurple/protocols/irc/msgs.c:377
+#: ../libpurple/protocols/silc/ops.c:1281
 #: ../libpurple/protocols/silc10/ops.c:1272
 msgid "Currently on"
 msgstr "弌亠亶�舒� 仆舒"

-#: ../libpurple/protocols/irc/msgs.c:336
+#: ../libpurple/protocols/irc/msgs.c:382
 msgid "Idle for"
 msgstr "�亠亰亟亠亶��于�亠�"

-#: ../libpurple/protocols/irc/msgs.c:339
+#: ../libpurple/protocols/irc/msgs.c:385
 msgid "Online since"
 msgstr "� �亠�亳 �"

-#: ../libpurple/protocols/irc/msgs.c:343
+#: ../libpurple/protocols/irc/msgs.c:389
 msgid "<b>Defining adjective:</b>"
 msgstr ""

-#: ../libpurple/protocols/irc/msgs.c:343
+#: ../libpurple/protocols/irc/msgs.c:389
 msgid "Glorious"
 msgstr ""

-#: ../libpurple/protocols/irc/msgs.c:422
+#: ../libpurple/protocols/irc/msgs.c:473
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s �仄亠仆亳仍 �亠仄� 仆舒: %s"

-#: ../libpurple/protocols/irc/msgs.c:424
+#: ../libpurple/protocols/irc/msgs.c:475
 #, c-format
 msgid "%s has cleared the topic."
 msgstr "%s 仂�亳��亳仍 �亠仄�."

-#: ../libpurple/protocols/irc/msgs.c:432
+#: ../libpurple/protocols/irc/msgs.c:483
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "丐亠仄舒 亟仍� %s: %s"

-#: ../libpurple/protocols/irc/msgs.c:450
+#: ../libpurple/protocols/irc/msgs.c:501
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "�亠亳亰于亠��仆仂亠 �仂仂弍�亠仆亳亠 '%s'"

-#: ../libpurple/protocols/irc/msgs.c:451
+#: ../libpurple/protocols/irc/msgs.c:502
 msgid "Unknown message"
 msgstr "�亠亳亰于亠��仆仂亠 �仂仂弍�亠仆亳亠"

-#: ../libpurple/protocols/irc/msgs.c:451
+#: ../libpurple/protocols/irc/msgs.c:502
 msgid "The IRC server received a message it did not understand."
 msgstr "弌亠�于亠� IRC 仆亠 仗仂仆�仍 仗仂仍��亠仆仆仂亠 �仂仂弍�亠仆亳亠."

-#: ../libpurple/protocols/irc/msgs.c:472
+#: ../libpurple/protocols/irc/msgs.c:523
 #, c-format
 msgid "Users on %s: %s"
 msgstr "�仂仍�亰仂于舒�亠仍亳 仆舒 %s: %s"

-#: ../libpurple/protocols/irc/msgs.c:579
+#: ../libpurple/protocols/irc/msgs.c:630
 msgid "Time Response"
 msgstr "��从仍亳从 于�亠仄亠仆亳"

-#: ../libpurple/protocols/irc/msgs.c:580
+#: ../libpurple/protocols/irc/msgs.c:631
 msgid "The IRC server's local time is:"
 msgstr "�仂从舒仍�仆仂亠 于�亠仄� �亠�于亠�舒 IRC:"

-#: ../libpurple/protocols/irc/msgs.c:591
+#: ../libpurple/protocols/irc/msgs.c:642
 msgid "No such channel"
 msgstr "�亠� �舒从仂亞仂 从舒仆舒仍舒"

 #. does this happen?
-#: ../libpurple/protocols/irc/msgs.c:602
+#: ../libpurple/protocols/irc/msgs.c:653
 msgid "no such channel"
 msgstr "仆亠� �舒从仂亞仂 从舒仆舒仍舒"

-#: ../libpurple/protocols/irc/msgs.c:605
+#: ../libpurple/protocols/irc/msgs.c:656
 msgid "User is not logged in"
 msgstr "�仂仍�亰仂于舒�亠仍� 仆亠 于 �亠�亳"

-#: ../libpurple/protocols/irc/msgs.c:610
+#: ../libpurple/protocols/irc/msgs.c:661
 msgid "No such nick or channel"
 msgstr "�亠� �舒从仂亞仂 仗�亠于亟仂仆亳仄舒 亳仍亳 从舒仆舒仍舒"

-#: ../libpurple/protocols/irc/msgs.c:630
+#: ../libpurple/protocols/irc/msgs.c:681
 msgid "Could not send"
 msgstr "�亠 �亟舒仍仂�� 仂�仗�舒于亳��"

-#: ../libpurple/protocols/irc/msgs.c:686
+#: ../libpurple/protocols/irc/msgs.c:737
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "��亳�仂亠亟亳仆亠仆亳亠 从 %s ��亠弍�亠� 仗�亳亞仍舒�亠仆亳�."

-#: ../libpurple/protocols/irc/msgs.c:687
+#: ../libpurple/protocols/irc/msgs.c:738
 msgid "Invitation only"
 msgstr "丐仂仍�从仂 仗仂 仗�亳亞仍舒�亠仆亳�"

-#: ../libpurple/protocols/irc/msgs.c:803
+#: ../libpurple/protocols/irc/msgs.c:854
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "�� 弍�仍亳 �亟舒仍亠仆� 仂仗亠�舒�仂�仂仄 %s: (%s)"

 #. Remove user from channel
-#: ../libpurple/protocols/irc/msgs.c:808 ../libpurple/protocols/silc/ops.c:714
+#: ../libpurple/protocols/irc/msgs.c:859 ../libpurple/protocols/silc/ops.c:714
 #: ../libpurple/protocols/silc10/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "丕亟舒仍�仆 仂仗亠�舒�仂�仂仄 %s (%s)"

-#: ../libpurple/protocols/irc/msgs.c:831
+#: ../libpurple/protocols/irc/msgs.c:882
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "�亠亢亳仄 (%s %s) ���舒仆仂于仍亠仆 %s"

-#: ../libpurple/protocols/irc/msgs.c:919 ../libpurple/protocols/irc/msgs.c:920
+#: ../libpurple/protocols/irc/msgs.c:970 ../libpurple/protocols/irc/msgs.c:971
 msgid "Invalid nickname"
 msgstr "�亠于亠�仆�亶 仗�亠于亟仂仆亳仄"

-#: ../libpurple/protocols/irc/msgs.c:921
+#: ../libpurple/protocols/irc/msgs.c:972
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
@@ -4630,7 +4668,7 @@
 "��弍�舒仆仆�亶 于舒仄亳 仗�亠于亟仂仆亳仄 弍�仍 仂�于亠�亞仆�� �亠�于亠�仂仄. �亠�仂��仆仂, 仂仆 �仂亟亠�亢亳� "
 "仆亠亟仂仗���亳仄�亠 �亳仄于仂仍�."

-#: ../libpurple/protocols/irc/msgs.c:926
+#: ../libpurple/protocols/irc/msgs.c:977
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
@@ -4638,53 +4676,53 @@
 "��弍�舒仆仆仂亠 于舒仄亳 亳仄� ����仆仂亶 亰舒仗亳�亳 弍�仍仂 仂�于亠�亞仆��仂 �亠�于亠�仂仄. �亠�仂��仆仂, 仂仆仂 "
 "�仂亟亠�亢亳� 仆亠亟仂仗���亳仄�亠 �亳仄于仂仍�."

-#: ../libpurple/protocols/irc/msgs.c:965
+#: ../libpurple/protocols/irc/msgs.c:1016
 msgid "Cannot change nick"
 msgstr "�亠 �亟舒���� 亳亰仄亠仆亳�� 仗�亠于亟仂仆亳仄"

-#: ../libpurple/protocols/irc/msgs.c:965
+#: ../libpurple/protocols/irc/msgs.c:1016
 msgid "Could not change nick"
 msgstr "�亠 �亟舒仍仂�� 亳亰仄亠仆亳�� 仗�亠于亟仂仆亳仄"

-#: ../libpurple/protocols/irc/msgs.c:986
+#: ../libpurple/protocols/irc/msgs.c:1041
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "�� 仗仂从亳仆�仍亳 从舒仆舒仍%s%s"

-#: ../libpurple/protocols/irc/msgs.c:1028
+#: ../libpurple/protocols/irc/msgs.c:1085
 msgid "Error: invalid PONG from server"
 msgstr "��亳弍从舒: 仆亠于亠�仆�亶 PONG � �亠�于亠�舒"

-#: ../libpurple/protocols/irc/msgs.c:1030
+#: ../libpurple/protocols/irc/msgs.c:1087
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "��于亠� PING -- 亰舒亟亠�亢从舒: %lu �亠从�仆亟"

-#: ../libpurple/protocols/irc/msgs.c:1121
+#: ../libpurple/protocols/irc/msgs.c:1178
 #, c-format
 msgid "Cannot join %s: Registration is required."
 msgstr "�亠 �亟舒���� 仗�亳�仂亠亟亳仆亳���� 从 %s: 丐�亠弍�亠��� �亠亞亳���舒�亳�."

-#: ../libpurple/protocols/irc/msgs.c:1122
-#: ../libpurple/protocols/silc/ops.c:1108
+#: ../libpurple/protocols/irc/msgs.c:1179
+#: ../libpurple/protocols/silc/ops.c:1106
 #: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Cannot join channel"
 msgstr "�亠 �亟舒���� 仗�亳�仂亠亟亳仆亳���� 从 从舒仆舒仍�"

-#: ../libpurple/protocols/irc/msgs.c:1156
+#: ../libpurple/protocols/irc/msgs.c:1213
 msgid "Nick or channel is temporarily unavailable."
 msgstr "��亠于亟仂仆亳仄 亳仍亳 从舒仆舒仍 于�亠仄亠仆仆仂 仆亠亟仂���仗亠仆."

-#: ../libpurple/protocols/irc/msgs.c:1168
+#: ../libpurple/protocols/irc/msgs.c:1225
 #, c-format
 msgid "Wallops from %s"
 msgstr ""

-#: ../libpurple/protocols/irc/parse.c:122
+#: ../libpurple/protocols/irc/parse.c:124
 msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr "action &lt;亟亠亶��于亳亠 亟仍� 于�仗仂仍仆亠仆亳�&gt;:  ��仗仂仍仆亳�� 亟亠亶��于亳亠."

-#: ../libpurple/protocols/irc/parse.c:123
+#: ../libpurple/protocols/irc/parse.c:125
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
@@ -4692,11 +4730,11 @@
 "away [�仂仂弍�亠仆亳亠]:  丕��舒仆仂于亳�� �仂仂弍�亠仆亳亠 仂弍 仂������于亳亳. ��仍亳 �仂仂弍�亠仆亳亠 仆亠 "
 "亰舒亟舒仆仂, �亟舒仍亳�� �仂仂弍�亠仆亳亠 仂弍 仂������于亳亳."

-#: ../libpurple/protocols/irc/parse.c:124
+#: ../libpurple/protocols/irc/parse.c:126
 msgid "chanserv: Send a command to chanserv"
 msgstr "chanserv: �仂�仍舒�� 从仂仄舒仆亟� 亟仍� chanserv"

-#: ../libpurple/protocols/irc/parse.c:125
+#: ../libpurple/protocols/irc/parse.c:127
 msgid ""
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
@@ -4704,7 +4742,7 @@
 "deop &lt;仗�亠于亟仂仆亳仄1&gt; [仗�亠于亟仂仆亳仄2] ...:  �舒弍�舒�� � 仗仂仍�亰仂于舒�亠仍� ��舒��� "
 "仂仗亠�舒�仂�舒 从舒仆舒仍舒. �� 亟仂仍亢仆� 弍��� 仂仗亠�舒�仂�仂仄 从舒仆舒仍舒 亟仍� ��仂亞仂."

-#: ../libpurple/protocols/irc/parse.c:126
+#: ../libpurple/protocols/irc/parse.c:128
 msgid ""
 "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
 "someone, preventing them from speaking if the channel is moderated (+m). You "
@@ -4714,7 +4752,7 @@
 "亞仂仍仂�舒 仆舒 从舒仆舒仍亠, 仍亳�舒� 亠亞仂 于仂亰仄仂亢仆仂��亳 亞仂于仂�亳��, 亠�仍亳 从舒仆舒仍 仄仂亟亠�亳��亠仄�亶 "
 "(+m). �� 亟仂仍亢仆� 弍��� 仂仗亠�舒�仂�仂仄 从舒仆舒仍舒 亟仍� ��仂亞仂."

-#: ../libpurple/protocols/irc/parse.c:127
+#: ../libpurple/protocols/irc/parse.c:129
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
@@ -4722,19 +4760,19 @@
 "invite &lt;仗�亠于亟仂仆亳仄&gt; [从仂仄仆舒�舒]:  ��亳亞仍舒�亳�� 仗仂仍�亰仂于舒�亠仍� 仗�亳�仂亠亟亳仆亳���� "
 "从 于舒仄 仆舒 �从舒亰舒仆仆仂仄 亳仍亳 �亠从��亠仄 从舒仆舒仍亠."

-#: ../libpurple/protocols/irc/parse.c:128
+#: ../libpurple/protocols/irc/parse.c:130
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
 msgstr ""

-#: ../libpurple/protocols/irc/parse.c:129
+#: ../libpurple/protocols/irc/parse.c:131
 msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
 msgstr ""

-#: ../libpurple/protocols/irc/parse.c:130
+#: ../libpurple/protocols/irc/parse.c:132
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
@@ -4742,7 +4780,7 @@
 "kick &lt;仗�亠于亟仂仆亳仄&gt; [�仂仂弍�亠仆亳亠]:  丕亟舒仍亳�� 仗仂仍�亰仂于舒�亠仍� � 从舒仆舒仍舒. �� "
 "亟仂仍亢仆� 弍��� 仂仗亠�舒�仂�仂仄 从舒仆舒仍舒 亟仍� ��仂亞仂."

-#: ../libpurple/protocols/irc/parse.c:131
+#: ../libpurple/protocols/irc/parse.c:133
 msgid ""
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
@@ -4750,15 +4788,15 @@
 "list:  ��于亠��亳 �仗亳�仂从 从舒仆舒仍仂于 于 �亠�亳. <i>�仄亠亶�亠 于 于亳亟�, ��仂 仆亠从仂�仂��亠 "
 "�亠�于亠�� 亰舒 ��仂 仄仂亞�� �舒亰仂�于舒�� �仂亠亟亳仆亠仆亳亠 � 于舒仄亳.</i>"

-#: ../libpurple/protocols/irc/parse.c:132
+#: ../libpurple/protocols/irc/parse.c:134
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;亟亠亶��于亳亠 亟仍� 于�仗仂仍仆亠仆亳�&gt;:  ��仗仂仍仆亳�� 亟亠亶��于亳亠."

-#: ../libpurple/protocols/irc/parse.c:133
+#: ../libpurple/protocols/irc/parse.c:135
 msgid "memoserv: Send a command to memoserv"
 msgstr "memoserv: �仂�仍舒�� 从仂仄舒仆亟� 亟仍� memoserv"

-#: ../libpurple/protocols/irc/parse.c:134
+#: ../libpurple/protocols/irc/parse.c:136
 msgid ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
 "or user mode."
@@ -4766,34 +4804,34 @@
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;仗�亠于亟仂仆亳仄|从舒仆舒仍&gt;:  丕��舒仆仂于亳�� 亳仍亳 "
 "�仆��� �亠亢亳仄 仗仂仍�亰仂于舒�亠仍� 亳仍亳 从舒仆舒仍舒."

-#: ../libpurple/protocols/irc/parse.c:135
+#: ../libpurple/protocols/irc/parse.c:137
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
 msgstr ""

-#: ../libpurple/protocols/irc/parse.c:136
+#: ../libpurple/protocols/irc/parse.c:138
 msgid "names [channel]:  List the users currently in a channel."
 msgstr ""
 "names [从舒仆舒仍]:  ��于亠��亳 �仗亳�仂从 仗仂仍�亰仂于舒�亠仍亠亶, 仗�亳�����于���亳� �亠亶�舒� 仆舒 "
 "从舒仆舒仍亠."

-#: ../libpurple/protocols/irc/parse.c:137
+#: ../libpurple/protocols/irc/parse.c:139
 #: ../libpurple/protocols/jabber/jabber.c:2358
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;仆仂于�亶 仗�亠于亟仂仆亳仄&gt;:  �亰仄亠仆亳�� �于仂亶 仗�亠于亟仂仆亳仄."

-#: ../libpurple/protocols/irc/parse.c:138
+#: ../libpurple/protocols/irc/parse.c:140
 msgid "nickserv: Send a command to nickserv"
 msgstr "nickserv: �仂�仍舒�� 从仂仄舒仆亟� 亟仍� nickserv"

-#: ../libpurple/protocols/irc/parse.c:139
+#: ../libpurple/protocols/irc/parse.c:141
 #, 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
+#: ../libpurple/protocols/irc/parse.c:142
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
@@ -4801,17 +4839,17 @@
 "op &lt;仗�亠于亟仂仆亳仄1&gt; [仗�亠于亟仂仆亳仄2] ...:  �舒�� 仗仂仍�亰仂于舒�亠仍� ��舒��� 仂仗亠�舒�仂�舒 "
 "从舒仆舒仍舒. �� 亟仂仍亢仆� 弍��� 仂仗亠�舒�仂�仂仄 从舒仆舒仍舒 亟仍� ��仂亞仂."

-#: ../libpurple/protocols/irc/parse.c:141
+#: ../libpurple/protocols/irc/parse.c:143
 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:142
+#: ../libpurple/protocols/irc/parse.c:144
 msgid "operserv: Send a command to operserv"
 msgstr "operserv: �仂�仍舒�� 从仂仄舒仆亟� 亟仍� operserv"

-#: ../libpurple/protocols/irc/parse.c:143
+#: ../libpurple/protocols/irc/parse.c:145
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
@@ -4819,7 +4857,7 @@
 "part [从仂仄仆舒�舒] [�仂仂弍�亠仆亳亠]:  �仂从亳仆��� �从舒亰舒仆仆�亶 亳仍亳 �亠从��亳亶 从舒仆舒仍. 弌仂仂弍�亠仆亳亠 "
 "仆亠 仂弍�亰舒�亠仍�仆仂."

-#: ../libpurple/protocols/irc/parse.c:144
+#: ../libpurple/protocols/irc/parse.c:146
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
@@ -4827,22 +4865,22 @@
 "ping [仗�亠于亟仂仆亳仄]:  �舒仗�仂�亳�� 于亠仍亳�亳仆� 亰舒亟亠�亢从亳 �于�亰亳 � 仗仂仍�亰仂于舒�亠仍亠仄 (亳仍亳 � "
 "�亠�于亠�仂仄, 亠�仍亳 仗仂仍�亰仂于舒�亠仍� 仆亠 �从舒亰舒仆)."

-#: ../libpurple/protocols/irc/parse.c:145
+#: ../libpurple/protocols/irc/parse.c:147
 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:146
+#: ../libpurple/protocols/irc/parse.c:148
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr ""
 "quit [�仂仂弍�亠仆亳亠]:  �舒亰仂�于舒�� �仂亠亟亳仆亠仆亳亠 � �亠�于亠�仂仄. 弌仂仂弍�亠仆亳亠 仆亠 仂弍�亰舒�亠仍�仆仂."

-#: ../libpurple/protocols/irc/parse.c:147
+#: ../libpurple/protocols/irc/parse.c:149
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...]:  �仂�仍舒�� 从仂仄舒仆亟� 弍亠亰 仂弍�舒弍仂�从亳 仆亠仗仂��亠亟��于亠仆仆仂 �亠�于亠��."

-#: ../libpurple/protocols/irc/parse.c:148
+#: ../libpurple/protocols/irc/parse.c:150
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
@@ -4850,24 +4888,24 @@
 "remove &lt;仗�亠于亟仂仆亳仄&gt; [�仂仂弍�亠仆亳亠]:  丕亟舒仍亳�� 仗仂仍�亰仂于舒�亠仍� 亳亰 从仂仄仆舒��. �� "
 "亟仂仍亢仆� 弍��� 仂仗亠�舒�仂�仂仄 从舒仆舒仍舒 亟仍� ��仂亞仂."

-#: ../libpurple/protocols/irc/parse.c:149
+#: ../libpurple/protocols/irc/parse.c:151
 msgid "time: Displays the current local time at the IRC server."
 msgstr "time: ��于仂亟亳� �亠从��亠亠 仍仂从舒仍�仆仂亠 于�亠仄� 仆舒 �亠�于亠�亠 IRC."

-#: ../libpurple/protocols/irc/parse.c:150
+#: ../libpurple/protocols/irc/parse.c:152
 msgid "topic [new topic]:  View or change the channel topic."
 msgstr "topic [仆仂于舒� �亠仄舒]:  ��仂�仄仂��亠�� 亳仍亳 亳亰仄亠仆亳�� �亠仄� 从舒仆舒仍舒."

-#: ../libpurple/protocols/irc/parse.c:151
+#: ../libpurple/protocols/irc/parse.c:153
 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:152
+#: ../libpurple/protocols/irc/parse.c:154
 msgid "version [nick]: send CTCP VERSION request to a user"
 msgstr ""

-#: ../libpurple/protocols/irc/parse.c:153
+#: ../libpurple/protocols/irc/parse.c:155
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
@@ -4875,37 +4913,37 @@
 "voice &lt;仗�亠于亟仂仆亳仄1&gt; [仗�亠于亟仂仆亳仄2] ...:  �舒�� 仗仂仍�亰仂于舒�亠仍� ��舒��� 亞仂仍仂�舒 "
 "仆舒 从舒仆舒仍亠. �� 亟仂仍亢仆� 弍��� 仂仗亠�舒�仂�仂仄 从舒仆舒仍舒 亟仍� ��仂亞仂."

-#: ../libpurple/protocols/irc/parse.c:154
+#: ../libpurple/protocols/irc/parse.c:156
 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:155
+#: ../libpurple/protocols/irc/parse.c:157
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr "whois [�亠�于亠�] &lt;仗�亠于亟仂仆亳仄&gt;:  �仂仍��亳�� 亳仆�仂�仄舒�亳� 仂 仗仂仍�亰仂于舒�亠仍亠."

-#: ../libpurple/protocols/irc/parse.c:156
+#: ../libpurple/protocols/irc/parse.c:158
 msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
 msgstr ""
 "whowas &lt;仗�亠于亟仂仆亳仄&gt;:  �仂仍��亳�� 亳仆�仂�仄舒�亳� 仂 仗仂仍�亰仂于舒�亠仍亠, 于��亠亟�亠仄 亳亰 "
 "�亠�亳."

-#: ../libpurple/protocols/irc/parse.c:521
+#: ../libpurple/protocols/irc/parse.c:523
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "��亠仄� 仂�于亠�舒 仂� %s: %lu �亠从�仆亟"

-#: ../libpurple/protocols/irc/parse.c:522
+#: ../libpurple/protocols/irc/parse.c:524
 msgid "PONG"
 msgstr "PONG"

-#: ../libpurple/protocols/irc/parse.c:522
+#: ../libpurple/protocols/irc/parse.c:524
 msgid "CTCP PING reply"
 msgstr "��于亠� CTCP PING"

-#: ../libpurple/protocols/irc/parse.c:634
-#: ../libpurple/protocols/irc/parse.c:641 ../libpurple/protocols/toc/toc.c:191
+#: ../libpurple/protocols/irc/parse.c:636
+#: ../libpurple/protocols/irc/parse.c:643 ../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."
@@ -4931,13 +4969,19 @@
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
 msgstr "弌亠�于亠� ��亠弍�亠� TLS/SSL 亟仍� 于�仂亟舒. �仂亟亟亠�亢从舒 TLS/SSL 仆亠 仆舒亶亟亠仆舒."

-#: ../libpurple/protocols/jabber/auth.c:120
+#: ../libpurple/protocols/jabber/auth.c:60
+#, fuzzy
+msgid "You require encryption, but no TLS/SSL support found."
+msgstr "弌亠�于亠� ��亠弍�亠� TLS/SSL 亟仍� 于�仂亟舒. �仂亟亟亠�亢从舒 TLS/SSL 仆亠 仆舒亶亟亠仆舒."
+
+#: ../libpurple/protocols/jabber/auth.c:125
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
 "弌亠�于亠� ��亠弍�亠� 舒��亠仆�亳�亳从舒�亳� 仗�仂���仄 �亠从��仂仄 �亠�亠亰 仆亠�亳��仂于舒仆仆�亶 仗仂�仂从"

-#: ../libpurple/protocols/jabber/auth.c:323
-#: ../libpurple/protocols/jabber/auth.c:532
+#: ../libpurple/protocols/jabber/auth.c:328
+#: ../libpurple/protocols/jabber/auth.c:535
+#: ../libpurple/protocols/jabber/auth.c:729
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
@@ -4946,437 +4990,429 @@
 "%s ��亠弍�亠� 舒��亠仆�亳�亳从舒�亳� 仗�仂���仄 �亠从��仂仄 �亠�亠亰 仆亠�亳��仂于舒仆仆仂亠 �仂亠亟亳仆亠仆亳亠. "
 "�仂亰于仂仍亳�� ��仂 亳 仗�仂亟仂仍亢亳�� 舒��亠仆�亳�亳从舒�亳�?"

-#: ../libpurple/protocols/jabber/auth.c:325
-#: ../libpurple/protocols/jabber/auth.c:326
-#: ../libpurple/protocols/jabber/auth.c:534
-#: ../libpurple/protocols/jabber/auth.c:535
-#: ../libpurple/protocols/jabber/auth.c:726
-#: ../libpurple/protocols/jabber/auth.c:727
+#: ../libpurple/protocols/jabber/auth.c:330
+#: ../libpurple/protocols/jabber/auth.c:331
+#: ../libpurple/protocols/jabber/auth.c:537
+#: ../libpurple/protocols/jabber/auth.c:538
+#: ../libpurple/protocols/jabber/auth.c:731
+#: ../libpurple/protocols/jabber/auth.c:732
 msgid "Plaintext Authentication"
 msgstr "���亠仆�亳�亳从舒�亳� 仗�仂���仄 �亠从��仂仄"

-#: ../libpurple/protocols/jabber/auth.c:480
-#: ../libpurple/protocols/jabber/auth.c:659
-#: ../libpurple/protocols/jabber/auth.c:907
-#: ../libpurple/protocols/jabber/auth.c:1058
-#: ../libpurple/protocols/jabber/auth.c:1085
-#: ../libpurple/protocols/jabber/auth.c:1109
+#: ../libpurple/protocols/jabber/auth.c:489
+#: ../libpurple/protocols/jabber/auth.c:662
+#: ../libpurple/protocols/jabber/auth.c:913
+#: ../libpurple/protocols/jabber/auth.c:1064
+#: ../libpurple/protocols/jabber/auth.c:1091
+#: ../libpurple/protocols/jabber/auth.c:1137
 #: ../libpurple/protocols/jabber/jabber.c:127
 msgid "Invalid response from server."
 msgstr "�亠于亠�仆�亶 仂�从仍亳从 仂� �亠�于亠�舒."

-#: ../libpurple/protocols/jabber/auth.c:548
-#: ../libpurple/protocols/jabber/auth.c:739
+#: ../libpurple/protocols/jabber/auth.c:551
+#: ../libpurple/protocols/jabber/auth.c:745
 msgid "Server does not use any supported authentication method"
 msgstr "弌亠�于亠� 仆亠 亳�仗仂仍�亰�亠� 仆亳 仂亟仆仂亞仂 仗仂亟亟亠�亢亳于舒亠仄仂亞仂 仄亠�仂亟舒 舒��亠仆�亳�亳从舒�亳亳"

-#: ../libpurple/protocols/jabber/auth.c:728
-msgid ""
-"This server requires plaintext authentication over an unencrypted "
-"connection.  Allow this and continue authentication?"
-msgstr ""
-"亅�仂� �亠�于亠� ��亠弍�亠� 舒��亠仆�亳�亳从舒�亳� 仗�仂���仄 �亠从��仂仄 �亠�亠亰 仆亠�亳��仂于舒仆仆仂亠 "
-"�仂亠亟亳仆亠仆亳亠. �仂亰于仂仍亳�� ��仂 亳 仗�仂亟仂仍亢亳�� 舒��亠仆�亳�亳从舒�亳�?"
-
-#: ../libpurple/protocols/jabber/auth.c:930
-#: ../libpurple/protocols/jabber/auth.c:955
+#: ../libpurple/protocols/jabber/auth.c:936
+#: ../libpurple/protocols/jabber/auth.c:961
 msgid "Invalid challenge from server"
 msgstr "�亠于亠�仆�亶 亰舒仗�仂� � �亠�于亠�舒"

-#: ../libpurple/protocols/jabber/auth.c:1031
+#: ../libpurple/protocols/jabber/auth.c:1037
 msgid "SASL error"
 msgstr "��亳弍从舒 SASL"

-#: ../libpurple/protocols/jabber/buddy.c:311
-#: ../libpurple/protocols/jabber/buddy.c:1256
-#: ../libpurple/protocols/sametime/sametime.c:4183
-#: ../libpurple/protocols/silc/ops.c:1001
+#: ../libpurple/protocols/jabber/buddy.c:306
+#: ../libpurple/protocols/jabber/buddy.c:1257
+#: ../libpurple/protocols/sametime/sametime.c:4184
+#: ../libpurple/protocols/silc/ops.c:1000
 #: ../libpurple/protocols/silc10/ops.c:1020
 msgid "Full Name"
 msgstr "�仂仍仆仂亠 亳仄�"

-#: ../libpurple/protocols/jabber/buddy.c:312
-#: ../libpurple/protocols/jabber/buddy.c:1268
-#: ../libpurple/protocols/silc/ops.c:1013
+#: ../libpurple/protocols/jabber/buddy.c:307
+#: ../libpurple/protocols/jabber/buddy.c:1269
+#: ../libpurple/protocols/silc/ops.c:1012
 #: ../libpurple/protocols/silc10/ops.c:1032
 msgid "Family Name"
 msgstr "个舒仄亳仍亳�"

-#: ../libpurple/protocols/jabber/buddy.c:313
-#: ../libpurple/protocols/jabber/buddy.c:1271
+#: ../libpurple/protocols/jabber/buddy.c:308
+#: ../libpurple/protocols/jabber/buddy.c:1272
 msgid "Given Name"
 msgstr "�仄�"

-#: ../libpurple/protocols/jabber/buddy.c:315
+#: ../libpurple/protocols/jabber/buddy.c:310
 #: ../libpurple/protocols/jabber/jabber.c:1034
 msgid "URL"
 msgstr "URL"

-#: ../libpurple/protocols/jabber/buddy.c:316
-#: ../libpurple/protocols/jabber/buddy.c:1319
+#: ../libpurple/protocols/jabber/buddy.c:311
+#: ../libpurple/protocols/jabber/buddy.c:1320
 msgid "Street Address"
 msgstr "�亟�亠�"

-#: ../libpurple/protocols/jabber/buddy.c:317
-#: ../libpurple/protocols/jabber/buddy.c:1316
+#: ../libpurple/protocols/jabber/buddy.c:312
+#: ../libpurple/protocols/jabber/buddy.c:1317
 msgid "Extended Address"
 msgstr "�仂仗仂仍仆亳�亠仍�仆�亶 舒亟�亠�"

-#: ../libpurple/protocols/jabber/buddy.c:318
-#: ../libpurple/protocols/jabber/buddy.c:1322
+#: ../libpurple/protocols/jabber/buddy.c:313
+#: ../libpurple/protocols/jabber/buddy.c:1323
 msgid "Locality"
 msgstr "�舒�亠仍�仆仆�亶 仗�仆从�"

-#: ../libpurple/protocols/jabber/buddy.c:319
-#: ../libpurple/protocols/jabber/buddy.c:1325
+#: ../libpurple/protocols/jabber/buddy.c:314
+#: ../libpurple/protocols/jabber/buddy.c:1326
 msgid "Region"
 msgstr "�亠亞亳仂仆"

-#: ../libpurple/protocols/jabber/buddy.c:320
-#: ../libpurple/protocols/jabber/buddy.c:1328
+#: ../libpurple/protocols/jabber/buddy.c:315
+#: ../libpurple/protocols/jabber/buddy.c:1329
 msgid "Postal Code"
 msgstr "�仂��仂于�亶 从仂亟"

-#: ../libpurple/protocols/jabber/buddy.c:321
-#: ../libpurple/protocols/jabber/buddy.c:1332
-#: ../libpurple/protocols/silc/silc.c:1158
+#: ../libpurple/protocols/jabber/buddy.c:316
+#: ../libpurple/protocols/jabber/buddy.c:1333
+#: ../libpurple/protocols/silc/silc.c:1231
 #: ../libpurple/protocols/silc10/silc.c:932
 msgid "Country"
 msgstr "弌��舒仆舒"

-#: ../libpurple/protocols/jabber/buddy.c:322
-#: ../libpurple/protocols/jabber/buddy.c:1343
-#: ../libpurple/protocols/jabber/buddy.c:1350
+#: ../libpurple/protocols/jabber/buddy.c:317
+#: ../libpurple/protocols/jabber/buddy.c:1344
+#: ../libpurple/protocols/jabber/buddy.c:1351
 msgid "Telephone"
 msgstr "丐亠仍亠�仂仆"

-#: ../libpurple/protocols/jabber/buddy.c:324
-#: ../libpurple/protocols/jabber/buddy.c:1387
+#: ../libpurple/protocols/jabber/buddy.c:319
+#: ../libpurple/protocols/jabber/buddy.c:1388
 msgid "Organization Name"
 msgstr "�舒亰于舒仆亳亠 仂�亞舒仆亳亰舒�亳亳"

-#: ../libpurple/protocols/jabber/buddy.c:325
-#: ../libpurple/protocols/jabber/buddy.c:1390
+#: ../libpurple/protocols/jabber/buddy.c:320
+#: ../libpurple/protocols/jabber/buddy.c:1391
 msgid "Organization Unit"
 msgstr "��亟亠仍"

-#: ../libpurple/protocols/jabber/buddy.c:327
-#: ../libpurple/protocols/jabber/buddy.c:1399
+#: ../libpurple/protocols/jabber/buddy.c:322
+#: ../libpurple/protocols/jabber/buddy.c:1400
 msgid "Role"
 msgstr "�仂仍亢仆仂���"

-#: ../libpurple/protocols/jabber/buddy.c:328
-#: ../libpurple/protocols/jabber/buddy.c:1287
+#: ../libpurple/protocols/jabber/buddy.c:323
+#: ../libpurple/protocols/jabber/buddy.c:1288
 #: ../libpurple/protocols/msn/msn.c:1828
 #: ../libpurple/protocols/msnp9/msn.c:1669
-#: ../libpurple/protocols/oscar/oscar.c:3796
+#: ../libpurple/protocols/oscar/oscar.c:3788
 msgid "Birthday"
 msgstr "�舒�舒 �仂亢亟亠仆亳�"

-#: ../libpurple/protocols/jabber/buddy.c:329
-#: ../libpurple/protocols/jabber/buddy.c:1402
-#: ../libpurple/protocols/jabber/chat.c:775
-#: ../libpurple/protocols/jabber/usermood.c:193 ../pidgin/gtkblist.c:3345
-#: ../pidgin/gtkplugin.c:568 ../pidgin/gtkprefs.c:688
+#: ../libpurple/protocols/jabber/buddy.c:324
+#: ../libpurple/protocols/jabber/buddy.c:1403
+#: ../libpurple/protocols/jabber/chat.c:780
+#: ../libpurple/protocols/jabber/usermood.c:190 ../pidgin/gtkblist.c:3427
+#: ../pidgin/gtkplugin.c:582 ../pidgin/gtkprefs.c:688
 msgid "Description"
 msgstr "�仗亳�舒仆亳亠"

-#: ../libpurple/protocols/jabber/buddy.c:752
 #: ../libpurple/protocols/jabber/buddy.c:753
+#: ../libpurple/protocols/jabber/buddy.c:754
 msgid "Edit XMPP vCard"
 msgstr "�亰仄亠仆亳�� XMPP vCard"

-#: ../libpurple/protocols/jabber/buddy.c:754
+#: ../libpurple/protocols/jabber/buddy.c:755
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
 msgstr ""
 "��亠 仆亳亢亠�仍亠亟���亳亠 仗�仆从�� 仆亠 仂弍�亰舒�亠仍�仆�. �舒仗仂仍仆�亶�亠 仗仂 �于仂亠仄� ��仄仂��亠仆亳�."

-#: ../libpurple/protocols/jabber/buddy.c:825
-#: ../libpurple/protocols/jabber/buddy.c:990
+#: ../libpurple/protocols/jabber/buddy.c:826
+#: ../libpurple/protocols/jabber/buddy.c:991
 msgid "Client"
 msgstr "�仍亳亠仆�"

-#: ../libpurple/protocols/jabber/buddy.c:829
-#: ../libpurple/protocols/jabber/buddy.c:994
+#: ../libpurple/protocols/jabber/buddy.c:830
+#: ../libpurple/protocols/jabber/buddy.c:995
 msgid "Operating System"
 msgstr "�仗亠�舒�亳仂仆仆舒� �亳��亠仄舒"

-#: ../libpurple/protocols/jabber/buddy.c:845
-#: ../libpurple/protocols/jabber/buddy.c:1005
+#: ../libpurple/protocols/jabber/buddy.c:846
+#: ../libpurple/protocols/jabber/buddy.c:1006
 msgid "Last Activity"
 msgstr "�仂�仍亠亟仆�� 舒从�亳于仆仂���"

-#: ../libpurple/protocols/jabber/buddy.c:847
-#: ../libpurple/protocols/jabber/buddy.c:1007
+#: ../libpurple/protocols/jabber/buddy.c:848
+#: ../libpurple/protocols/jabber/buddy.c:1008
 msgid "Service Discovery Info"
 msgstr ""

-#: ../libpurple/protocols/jabber/buddy.c:849
-#: ../libpurple/protocols/jabber/buddy.c:1009
+#: ../libpurple/protocols/jabber/buddy.c:850
+#: ../libpurple/protocols/jabber/buddy.c:1010
 msgid "Service Discovery Items"
 msgstr ""

-#: ../libpurple/protocols/jabber/buddy.c:851
-#: ../libpurple/protocols/jabber/buddy.c:1011
+#: ../libpurple/protocols/jabber/buddy.c:852
+#: ../libpurple/protocols/jabber/buddy.c:1012
 #, fuzzy
 msgid "Extended Stanza Addressing"
 msgstr "�仂仗仂仍仆亳�亠仍�仆�亶 舒亟�亠�"

-#: ../libpurple/protocols/jabber/buddy.c:853
-#: ../libpurple/protocols/jabber/buddy.c:1013
+#: ../libpurple/protocols/jabber/buddy.c:854
+#: ../libpurple/protocols/jabber/buddy.c:1014
 msgid "Multi-User Chat"
 msgstr "�仆仂亞仂仗仂仍�亰仂于舒�亠仍��从亳亶 �舒�"

-#: ../libpurple/protocols/jabber/buddy.c:855
-#: ../libpurple/protocols/jabber/buddy.c:1015
+#: ../libpurple/protocols/jabber/buddy.c:856
+#: ../libpurple/protocols/jabber/buddy.c:1016
 #, fuzzy
 msgid "Multi-User Chat Extended Presence Information"
 msgstr "�仂仍�亰仂于舒�亠仍� 仆亠 亳仄亠亠� 亳仆�仂�仄舒�亳亳 从舒�舒仍仂亞舒."

-#: ../libpurple/protocols/jabber/buddy.c:857
-#: ../libpurple/protocols/jabber/buddy.c:1017
+#: ../libpurple/protocols/jabber/buddy.c:858
+#: ../libpurple/protocols/jabber/buddy.c:1018
 msgid "In-Band Bytestreams"
 msgstr ""

-#: ../libpurple/protocols/jabber/buddy.c:859
-#: ../libpurple/protocols/jabber/buddy.c:1019
+#: ../libpurple/protocols/jabber/buddy.c:860
+#: ../libpurple/protocols/jabber/buddy.c:1020
 msgid "Ad-Hoc Commands"
 msgstr ""

-#: ../libpurple/protocols/jabber/buddy.c:861
-#: ../libpurple/protocols/jabber/buddy.c:1021
+#: ../libpurple/protocols/jabber/buddy.c:862
+#: ../libpurple/protocols/jabber/buddy.c:1022
 msgid "PubSub Service"
 msgstr ""

-#: ../libpurple/protocols/jabber/buddy.c:863
-#: ../libpurple/protocols/jabber/buddy.c:1023
+#: ../libpurple/protocols/jabber/buddy.c:864
+#: ../libpurple/protocols/jabber/buddy.c:1024
 msgid "SOCKS5 Bytestreams"
 msgstr ""

-#: ../libpurple/protocols/jabber/buddy.c:865
-#: ../libpurple/protocols/jabber/buddy.c:1025
+#: ../libpurple/protocols/jabber/buddy.c:866
+#: ../libpurple/protocols/jabber/buddy.c:1026
 msgid "Out of Band Data"
 msgstr ""

-#: ../libpurple/protocols/jabber/buddy.c:867
-#: ../libpurple/protocols/jabber/buddy.c:1027
+#: ../libpurple/protocols/jabber/buddy.c:868
+#: ../libpurple/protocols/jabber/buddy.c:1028
 msgid "XHTML-IM"
 msgstr "XHTML-IM"

-#: ../libpurple/protocols/jabber/buddy.c:869
-#: ../libpurple/protocols/jabber/buddy.c:1029
+#: ../libpurple/protocols/jabber/buddy.c:870
+#: ../libpurple/protocols/jabber/buddy.c:1030
 msgid "In-Band Registration"
 msgstr ""

-#: ../libpurple/protocols/jabber/buddy.c:871
-#: ../libpurple/protocols/jabber/buddy.c:1031
+#: ../libpurple/protocols/jabber/buddy.c:872
+#: ../libpurple/protocols/jabber/buddy.c:1032
 msgid "User Location"
 msgstr "�亠��仂仗仂仍仂亢亠仆亳亠 仗仂仍�亰仂于舒�亠仍�"

-#: ../libpurple/protocols/jabber/buddy.c:873
-#: ../libpurple/protocols/jabber/buddy.c:1033
+#: ../libpurple/protocols/jabber/buddy.c:874
+#: ../libpurple/protocols/jabber/buddy.c:1034
 msgid "User Avatar"
 msgstr "�于舒�舒�舒 仗仂仍�亰仂于舒�亠仍�"

-#: ../libpurple/protocols/jabber/buddy.c:875
-#: ../libpurple/protocols/jabber/buddy.c:1035
+#: ../libpurple/protocols/jabber/buddy.c:876
+#: ../libpurple/protocols/jabber/buddy.c:1036
 msgid "Chat State Notifications"
 msgstr "丕于亠亟仂仄仍亠仆亳� 仂 �仂��仂�仆亳亳 �舒�舒"

-#: ../libpurple/protocols/jabber/buddy.c:877
-#: ../libpurple/protocols/jabber/buddy.c:1037
+#: ../libpurple/protocols/jabber/buddy.c:878
+#: ../libpurple/protocols/jabber/buddy.c:1038
 msgid "Software Version"
 msgstr "�亠��亳� 仗�仂亞�舒仄仄仆仂亞仂 仂弍亠�仗亠�亠仆亳�"

-#: ../libpurple/protocols/jabber/buddy.c:879
-#: ../libpurple/protocols/jabber/buddy.c:1039
+#: ../libpurple/protocols/jabber/buddy.c:880
+#: ../libpurple/protocols/jabber/buddy.c:1040
 msgid "Stream Initiation"
 msgstr "弌仂亰亟舒仆亳亠 仗仂�仂从舒"

-#: ../libpurple/protocols/jabber/buddy.c:881
-#: ../libpurple/protocols/jabber/buddy.c:1041
-#: ../libpurple/protocols/sametime/sametime.c:3286
+#: ../libpurple/protocols/jabber/buddy.c:882
+#: ../libpurple/protocols/jabber/buddy.c:1042
+#: ../libpurple/protocols/sametime/sametime.c:3287
 msgid "File Transfer"
 msgstr "�亠�亠亟舒�舒 �舒亶仍仂于"

-#: ../libpurple/protocols/jabber/buddy.c:883
-#: ../libpurple/protocols/jabber/buddy.c:1043
+#: ../libpurple/protocols/jabber/buddy.c:884
+#: ../libpurple/protocols/jabber/buddy.c:1044
 #, fuzzy
 msgid "User Mood"
 msgstr "�亠亢亳仄� 仗仂仍�亰仂于舒�亠仍�"

-#: ../libpurple/protocols/jabber/buddy.c:885
-#: ../libpurple/protocols/jabber/buddy.c:1045
+#: ../libpurple/protocols/jabber/buddy.c:886
+#: ../libpurple/protocols/jabber/buddy.c:1046
 msgid "User Activity"
 msgstr "�从�亳于仆仂��� 仗仂仍�亰仂于舒�亠仍�"

-#: ../libpurple/protocols/jabber/buddy.c:887
-#: ../libpurple/protocols/jabber/buddy.c:1047
+#: ../libpurple/protocols/jabber/buddy.c:888
+#: ../libpurple/protocols/jabber/buddy.c:1048
 #, fuzzy
 msgid "Entity Capabilities"
 msgstr "�仂亰仄仂亢仆仂��亳"

-#: ../libpurple/protocols/jabber/buddy.c:889
-#: ../libpurple/protocols/jabber/buddy.c:1049
+#: ../libpurple/protocols/jabber/buddy.c:890
+#: ../libpurple/protocols/jabber/buddy.c:1050
 msgid "Encrypted Session Negotiations"
 msgstr ""

-#: ../libpurple/protocols/jabber/buddy.c:891
-#: ../libpurple/protocols/jabber/buddy.c:1051
+#: ../libpurple/protocols/jabber/buddy.c:892
+#: ../libpurple/protocols/jabber/buddy.c:1052
 msgid "User Tune"
 msgstr ""

-#: ../libpurple/protocols/jabber/buddy.c:893
-#: ../libpurple/protocols/jabber/buddy.c:1053
+#: ../libpurple/protocols/jabber/buddy.c:894
+#: ../libpurple/protocols/jabber/buddy.c:1054
 msgid "Roster Item Exchange"
 msgstr ""

-#: ../libpurple/protocols/jabber/buddy.c:895
-#: ../libpurple/protocols/jabber/buddy.c:1055
+#: ../libpurple/protocols/jabber/buddy.c:896
+#: ../libpurple/protocols/jabber/buddy.c:1056
 msgid "Reachability Address"
 msgstr ""

-#: ../libpurple/protocols/jabber/buddy.c:897
-#: ../libpurple/protocols/jabber/buddy.c:1057
+#: ../libpurple/protocols/jabber/buddy.c:898
+#: ../libpurple/protocols/jabber/buddy.c:1058
 msgid "User Profile"
 msgstr "��仂�亳仍� 仗仂仍�亰仂于舒�亠仍�"

-#: ../libpurple/protocols/jabber/buddy.c:899
-#: ../libpurple/protocols/jabber/buddy.c:1059
+#: ../libpurple/protocols/jabber/buddy.c:900
+#: ../libpurple/protocols/jabber/buddy.c:1060
 msgid "Jingle"
 msgstr ""

-#: ../libpurple/protocols/jabber/buddy.c:901
-#: ../libpurple/protocols/jabber/buddy.c:1061
+#: ../libpurple/protocols/jabber/buddy.c:902
+#: ../libpurple/protocols/jabber/buddy.c:1062
 msgid "Jingle Audio"
 msgstr ""

-#: ../libpurple/protocols/jabber/buddy.c:903
-#: ../libpurple/protocols/jabber/buddy.c:1063
+#: ../libpurple/protocols/jabber/buddy.c:904
+#: ../libpurple/protocols/jabber/buddy.c:1064
 msgid "User Nickname"
 msgstr "��亠于亟仂仆亳仄 仗仂仍�亰仂于舒�亠仍�"

-#: ../libpurple/protocols/jabber/buddy.c:905
-#: ../libpurple/protocols/jabber/buddy.c:1065
+#: ../libpurple/protocols/jabber/buddy.c:906
+#: ../libpurple/protocols/jabber/buddy.c:1066
 msgid "Jingle ICE UDP"
 msgstr ""

-#: ../libpurple/protocols/jabber/buddy.c:907
-#: ../libpurple/protocols/jabber/buddy.c:1067
+#: ../libpurple/protocols/jabber/buddy.c:908
+#: ../libpurple/protocols/jabber/buddy.c:1068
 msgid "Jingle ICE TCP"
 msgstr ""

-#: ../libpurple/protocols/jabber/buddy.c:909
-#: ../libpurple/protocols/jabber/buddy.c:1069
+#: ../libpurple/protocols/jabber/buddy.c:910
+#: ../libpurple/protocols/jabber/buddy.c:1070
 msgid "Jingle Raw UDP"
 msgstr ""

-#: ../libpurple/protocols/jabber/buddy.c:911
-#: ../libpurple/protocols/jabber/buddy.c:1071
+#: ../libpurple/protocols/jabber/buddy.c:912
+#: ../libpurple/protocols/jabber/buddy.c:1072
 msgid "Jingle Video"
 msgstr ""

-#: ../libpurple/protocols/jabber/buddy.c:913
-#: ../libpurple/protocols/jabber/buddy.c:1073
+#: ../libpurple/protocols/jabber/buddy.c:914
+#: ../libpurple/protocols/jabber/buddy.c:1074
 msgid "Jingle DTMF"
 msgstr ""

-#: ../libpurple/protocols/jabber/buddy.c:915
-#: ../libpurple/protocols/jabber/buddy.c:1075
+#: ../libpurple/protocols/jabber/buddy.c:916
+#: ../libpurple/protocols/jabber/buddy.c:1076
 msgid "Message Receipts"
 msgstr "�仂仍��亠仆亳亠 �仂仂弍�亠仆亳亶"

-#: ../libpurple/protocols/jabber/buddy.c:917
-#: ../libpurple/protocols/jabber/buddy.c:1077
+#: ../libpurple/protocols/jabber/buddy.c:918
+#: ../libpurple/protocols/jabber/buddy.c:1078
 #, fuzzy
 msgid "Public Key Publishing"
 msgstr "个舒亶仍 仗�弍仍亳�仆仂亞仂 从仍��舒"

-#: ../libpurple/protocols/jabber/buddy.c:919
-#: ../libpurple/protocols/jabber/buddy.c:1079
+#: ../libpurple/protocols/jabber/buddy.c:920
+#: ../libpurple/protocols/jabber/buddy.c:1080
 msgid "User Chatting"
 msgstr ""

-#: ../libpurple/protocols/jabber/buddy.c:921
-#: ../libpurple/protocols/jabber/buddy.c:1081
+#: ../libpurple/protocols/jabber/buddy.c:922
+#: ../libpurple/protocols/jabber/buddy.c:1082
 msgid "User Browsing"
 msgstr ""

-#: ../libpurple/protocols/jabber/buddy.c:923
-#: ../libpurple/protocols/jabber/buddy.c:1083
+#: ../libpurple/protocols/jabber/buddy.c:924
+#: ../libpurple/protocols/jabber/buddy.c:1084
 msgid "User Gaming"
 msgstr ""

-#: ../libpurple/protocols/jabber/buddy.c:925
-#: ../libpurple/protocols/jabber/buddy.c:1085
+#: ../libpurple/protocols/jabber/buddy.c:926
+#: ../libpurple/protocols/jabber/buddy.c:1086
 msgid "User Viewing"
 msgstr ""

-#: ../libpurple/protocols/jabber/buddy.c:927
-#: ../libpurple/protocols/jabber/buddy.c:1087
-#: ../libpurple/protocols/silc/ops.c:1615
-#: ../libpurple/protocols/silc/ops.c:1620
+#: ../libpurple/protocols/jabber/buddy.c:928
+#: ../libpurple/protocols/jabber/buddy.c:1088
+#: ../libpurple/protocols/silc/ops.c:1613
+#: ../libpurple/protocols/silc/ops.c:1618
 #: ../libpurple/protocols/silc10/ops.c:1612
 #: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping"
 msgstr ""

-#: ../libpurple/protocols/jabber/buddy.c:929
-#: ../libpurple/protocols/jabber/buddy.c:1089
+#: ../libpurple/protocols/jabber/buddy.c:930
+#: ../libpurple/protocols/jabber/buddy.c:1090
 #, fuzzy
 msgid "Stanza Encryption"
 msgstr "丿亳��仂于舒仆亳亠 Trillian"

-#: ../libpurple/protocols/jabber/buddy.c:931
-#: ../libpurple/protocols/jabber/buddy.c:1091
+#: ../libpurple/protocols/jabber/buddy.c:932
+#: ../libpurple/protocols/jabber/buddy.c:1092
 msgid "Entity Time"
 msgstr ""

-#: ../libpurple/protocols/jabber/buddy.c:933
-#: ../libpurple/protocols/jabber/buddy.c:1093
+#: ../libpurple/protocols/jabber/buddy.c:934
+#: ../libpurple/protocols/jabber/buddy.c:1094
 msgid "Delayed Delivery"
 msgstr ""

-#: ../libpurple/protocols/jabber/buddy.c:935
-#: ../libpurple/protocols/jabber/buddy.c:1095
+#: ../libpurple/protocols/jabber/buddy.c:936
+#: ../libpurple/protocols/jabber/buddy.c:1096
 msgid "Collaborative Data Objects"
 msgstr ""

-#: ../libpurple/protocols/jabber/buddy.c:937
-#: ../libpurple/protocols/jabber/buddy.c:1097
+#: ../libpurple/protocols/jabber/buddy.c:938
+#: ../libpurple/protocols/jabber/buddy.c:1098
 msgid "File Repository and Sharing"
 msgstr ""

-#: ../libpurple/protocols/jabber/buddy.c:939
-#: ../libpurple/protocols/jabber/buddy.c:1099
+#: ../libpurple/protocols/jabber/buddy.c:940
+#: ../libpurple/protocols/jabber/buddy.c:1100
 msgid "STUN Service Discovery for Jingle"
 msgstr ""

-#: ../libpurple/protocols/jabber/buddy.c:941
-#: ../libpurple/protocols/jabber/buddy.c:1101
+#: ../libpurple/protocols/jabber/buddy.c:942
+#: ../libpurple/protocols/jabber/buddy.c:1102
 msgid "Simplified Encrypted Session Negotiation"
 msgstr ""

-#: ../libpurple/protocols/jabber/buddy.c:943
-#: ../libpurple/protocols/jabber/buddy.c:1103
+#: ../libpurple/protocols/jabber/buddy.c:944
+#: ../libpurple/protocols/jabber/buddy.c:1104
 msgid "Hop Check"
 msgstr ""

-#: ../libpurple/protocols/jabber/buddy.c:951
-#: ../libpurple/protocols/jabber/buddy.c:1111
-#: ../libpurple/protocols/oscar/oscar.c:2974
+#: ../libpurple/protocols/jabber/buddy.c:952
+#: ../libpurple/protocols/jabber/buddy.c:1112
+#: ../libpurple/protocols/oscar/oscar.c:2962
 msgid "Capabilities"
 msgstr "�仂亰仄仂亢仆仂��亳"

-#: ../libpurple/protocols/jabber/buddy.c:963
+#: ../libpurple/protocols/jabber/buddy.c:964
 #: ../libpurple/protocols/jabber/libxmpp.c:209
-#: ../libpurple/protocols/jabber/si.c:1094
+#: ../libpurple/protocols/jabber/si.c:1098
 msgid "Resource"
 msgstr "�亠����"

-#: ../libpurple/protocols/jabber/buddy.c:965
+#: ../libpurple/protocols/jabber/buddy.c:966
 #: ../libpurple/protocols/jabber/jabber.c:1610
 #: ../libpurple/protocols/jabber/jabber.c:1624
 #: ../libpurple/protocols/jabber/jabber.c:1638
@@ -5385,167 +5421,167 @@
 msgid "Priority"
 msgstr "��亳仂�亳�亠�"

-#: ../libpurple/protocols/jabber/buddy.c:1274
-#: ../libpurple/protocols/silc/ops.c:1009
+#: ../libpurple/protocols/jabber/buddy.c:1275
+#: ../libpurple/protocols/silc/ops.c:1008
 #: ../libpurple/protocols/silc10/ops.c:1028
 msgid "Middle Name"
 msgstr "���亠��于仂"

-#: ../libpurple/protocols/jabber/buddy.c:1307
+#: ../libpurple/protocols/jabber/buddy.c:1308
 #: ../libpurple/protocols/jabber/jabber.c:1014
-#: ../libpurple/protocols/oscar/oscar.c:3835
-#: ../libpurple/protocols/oscar/oscar.c:3848
+#: ../libpurple/protocols/oscar/oscar.c:3827
+#: ../libpurple/protocols/oscar/oscar.c:3840
 #: ../libpurple/protocols/qq/buddy_info.c:56
-#: ../libpurple/protocols/silc/ops.c:1045
+#: ../libpurple/protocols/silc/ops.c:1044
 #: ../libpurple/protocols/silc10/ops.c:1064
 msgid "Address"
 msgstr "�亟�亠�"

-#: ../libpurple/protocols/jabber/buddy.c:1313
+#: ../libpurple/protocols/jabber/buddy.c:1314
 msgid "P.O. Box"
 msgstr "�仆亟亠从�"

-#: ../libpurple/protocols/jabber/buddy.c:1423
+#: ../libpurple/protocols/jabber/buddy.c:1424
 msgid "Photo"
 msgstr "个仂�仂亞�舒�亳�"

-#: ../libpurple/protocols/jabber/buddy.c:1423
+#: ../libpurple/protocols/jabber/buddy.c:1424
 msgid "Logo"
 msgstr "�仂亞仂�亳仗"

-#: ../libpurple/protocols/jabber/buddy.c:1992
+#: ../libpurple/protocols/jabber/buddy.c:1993
 msgid "Un-hide From"
 msgstr "�仂从舒亰舒���� 亟仍�"

-#: ../libpurple/protocols/jabber/buddy.c:1996
+#: ../libpurple/protocols/jabber/buddy.c:1997
 msgid "Temporarily Hide From"
 msgstr "��亠仄亠仆仆仂 �从������ 仂�"

 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:2004
+#: ../libpurple/protocols/jabber/buddy.c:2005
 msgid "Cancel Presence Notification"
 msgstr "��仄亠仆亳�� �于亠亟仂仄仍亠仆亳亠 仂 仗�亳�����于亳亳"

-#: ../libpurple/protocols/jabber/buddy.c:2011
+#: ../libpurple/protocols/jabber/buddy.c:2012
 msgid "(Re-)Request authorization"
 msgstr "(�仂于�仂�仆仂) �舒仗�仂�亳�� 舒于�仂�亳亰舒�亳�"

 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:2020
+#: ../libpurple/protocols/jabber/buddy.c:2021
 msgid "Unsubscribe"
 msgstr "��仗亳�舒����"

-#: ../libpurple/protocols/jabber/buddy.c:2035
+#: ../libpurple/protocols/jabber/buddy.c:2036
 msgid "Log In"
 msgstr "�仂亶�亳"

-#: ../libpurple/protocols/jabber/buddy.c:2039
+#: ../libpurple/protocols/jabber/buddy.c:2040
 msgid "Log Out"
 msgstr "��亶�亳"

-#: ../libpurple/protocols/jabber/buddy.c:2085
+#: ../libpurple/protocols/jabber/buddy.c:2086
 #: ../libpurple/protocols/jabber/jabber.c:1623
 msgid "Chatty"
 msgstr "�仂�仂于 仗仂仂弍�舒����"

-#: ../libpurple/protocols/jabber/buddy.c:2089
+#: ../libpurple/protocols/jabber/buddy.c:2090
 msgid "Extended Away"
 msgstr "�舒��亳�亠仆仆�亶 \"��仂��仍\""

-#: ../libpurple/protocols/jabber/buddy.c:2091
+#: ../libpurple/protocols/jabber/buddy.c:2092
 #: ../libpurple/protocols/jabber/jabber.c:1665
 #: ../libpurple/protocols/oscar/oscar.c:728
-#: ../libpurple/protocols/oscar/oscar.c:5937
-#: ../libpurple/protocols/sametime/sametime.c:3348
+#: ../libpurple/protocols/oscar/oscar.c:5923
+#: ../libpurple/protocols/sametime/sametime.c:3349
 #, c-format
 msgid "Do Not Disturb"
 msgstr "�亠 弍亠�仗仂从仂亳��"

-#: ../libpurple/protocols/jabber/buddy.c:2258
+#: ../libpurple/protocols/jabber/buddy.c:2259
 msgid "JID"
 msgstr "JID"

-#: ../libpurple/protocols/jabber/buddy.c:2262
-#: ../libpurple/protocols/jabber/buddy.c:2451
-#: ../libpurple/protocols/oscar/oscar.c:3758
+#: ../libpurple/protocols/jabber/buddy.c:2263
+#: ../libpurple/protocols/jabber/buddy.c:2452
+#: ../libpurple/protocols/oscar/oscar.c:3750
 msgid "Last Name"
 msgstr "个舒仄亳仍亳�"

-#: ../libpurple/protocols/jabber/buddy.c:2294
+#: ../libpurple/protocols/jabber/buddy.c:2295
 msgid "The following are the results of your search"
 msgstr "弌仍亠亟���亠亠 �于仍�亠��� �亠亰�仍��舒�舒仄亳 于舒�亠亞仂 仗仂亳�从舒"

 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:2379
+#: ../libpurple/protocols/jabber/buddy.c:2380
 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:2399
+#: ../libpurple/protocols/jabber/buddy.c:2400
 msgid "Directory Query Failed"
 msgstr "�亠 �亟舒仍仂�� 仂仗�仂�亳�� 从舒�舒仍仂亞"

-#: ../libpurple/protocols/jabber/buddy.c:2400
+#: ../libpurple/protocols/jabber/buddy.c:2401
 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:2434
+#: ../libpurple/protocols/jabber/buddy.c:2435
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "�仆����从�亳亳 �亠�于亠�舒: %s"

-#: ../libpurple/protocols/jabber/buddy.c:2441
+#: ../libpurple/protocols/jabber/buddy.c:2442
 msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr ""

-#: ../libpurple/protocols/jabber/buddy.c:2461
+#: ../libpurple/protocols/jabber/buddy.c:2462
 #: ../libpurple/protocols/novell/novell.c:1497
-#: ../libpurple/protocols/oscar/oscar.c:3761
-#: ../libpurple/protocols/oscar/oscar.c:3770
+#: ../libpurple/protocols/oscar/oscar.c:3753
+#: ../libpurple/protocols/oscar/oscar.c:3762
 msgid "E-Mail Address"
 msgstr "�亟�亠� e-mail"

-#: ../libpurple/protocols/jabber/buddy.c:2470
 #: ../libpurple/protocols/jabber/buddy.c:2471
+#: ../libpurple/protocols/jabber/buddy.c:2472
 msgid "Search for XMPP users"
 msgstr "��从舒�� 仗仂仍�亰仂于舒�亠仍亠亶 XMPP"

 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:2472
+#: ../libpurple/protocols/jabber/buddy.c:2473
 #: ../libpurple/protocols/qq/group.c:123
 #: ../libpurple/protocols/qq/group_im.c:147
 #: ../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:5666
+#: ../libpurple/protocols/sametime/sametime.c:5667
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:474
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:356
 msgid "Search"
 msgstr "��从舒��"

-#: ../libpurple/protocols/jabber/buddy.c:2487
+#: ../libpurple/protocols/jabber/buddy.c:2488
 msgid "Invalid Directory"
 msgstr "�亠于亠�仆�亶 从舒�舒仍仂亞"

-#: ../libpurple/protocols/jabber/buddy.c:2504
+#: ../libpurple/protocols/jabber/buddy.c:2505
 msgid "Enter a User Directory"
 msgstr "�于亠亟亳�亠 从舒�舒仍仂亞 仗仂仍�亰仂于舒�亠仍亠亶"

-#: ../libpurple/protocols/jabber/buddy.c:2505
+#: ../libpurple/protocols/jabber/buddy.c:2506
 msgid "Select a user directory to search"
 msgstr "��弍亠�亳�亠 从舒�舒仍仂亞 仗仂仍�亰仂于舒�亠仍亠亶 亟仍� 仗仂亳�从舒"

-#: ../libpurple/protocols/jabber/buddy.c:2508
+#: ../libpurple/protocols/jabber/buddy.c:2509
 msgid "Search Directory"
 msgstr "�仂亳�从 于 从舒�舒仍仂亞亠"

 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5417
+#: ../libpurple/protocols/oscar/oscar.c:5403
 #: ../libpurple/protocols/yahoo/yahoochat.c:1057
 msgid "_Room:"
 msgstr "_�仂仄仆舒�舒:"
@@ -5558,81 +5594,81 @@
 msgid "_Handle:"
 msgstr "_�仄�:"

-#: ../libpurple/protocols/jabber/chat.c:223
+#: ../libpurple/protocols/jabber/chat.c:226
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s 仆亠 �于仍�亠��� 亟仂仗���亳仄�仄 亳仄亠仆亠仄 从仂仄仆舒��"

-#: ../libpurple/protocols/jabber/chat.c:224
+#: ../libpurple/protocols/jabber/chat.c:227
 msgid "Invalid Room Name"
 msgstr "�亠于亠�仆仂亠 亳仄� 从仂仄仆舒��"

-#: ../libpurple/protocols/jabber/chat.c:229
+#: ../libpurple/protocols/jabber/chat.c:232
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s 仆亠 �于仍�亠��� 亟仂仗���亳仄�仄 亳仄亠仆亠仄 �亠�于亠�舒"

-#: ../libpurple/protocols/jabber/chat.c:230
-#: ../libpurple/protocols/jabber/chat.c:231
+#: ../libpurple/protocols/jabber/chat.c:233
+#: ../libpurple/protocols/jabber/chat.c:234
 msgid "Invalid Server Name"
 msgstr "�亠于亠�仆仂亠 亳仄� �亠�于亠�舒"

-#: ../libpurple/protocols/jabber/chat.c:235
+#: ../libpurple/protocols/jabber/chat.c:238
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s 仆亠 �于仍�亠��� 亟仂仗���亳仄�仄 亳仄亠仆亠仄 从仂仄仆舒��"

-#: ../libpurple/protocols/jabber/chat.c:236
-#: ../libpurple/protocols/jabber/chat.c:237
+#: ../libpurple/protocols/jabber/chat.c:239
+#: ../libpurple/protocols/jabber/chat.c:240
 msgid "Invalid Room Handle"
 msgstr "�亠于亠�仆仂亠 亳仄� 从仂仄仆舒��"

-#: ../libpurple/protocols/jabber/chat.c:396
+#: ../libpurple/protocols/jabber/chat.c:401
 msgid "Configuration error"
 msgstr "��亳弍从舒 仆舒���仂亶从亳"

-#: ../libpurple/protocols/jabber/chat.c:405
-#: ../libpurple/protocols/jabber/chat.c:548
+#: ../libpurple/protocols/jabber/chat.c:410
+#: ../libpurple/protocols/jabber/chat.c:553
 msgid "Unable to configure"
 msgstr "�亠 �亟舒���� 仆舒���仂亳��"

-#: ../libpurple/protocols/jabber/chat.c:420
+#: ../libpurple/protocols/jabber/chat.c:425
 msgid "Room Configuration Error"
 msgstr "��亳弍从舒 仆舒���仂亶从亳 从仂仄仆舒��"

-#: ../libpurple/protocols/jabber/chat.c:421
+#: ../libpurple/protocols/jabber/chat.c:426
 msgid "This room is not capable of being configured"
 msgstr "亅�舒 从仂仄仆舒�舒 仆亠 亳仄亠亠� 于仂亰仄仂亢仆仂��亳 仆舒���仂亶从亳"

-#: ../libpurple/protocols/jabber/chat.c:470
-#: ../libpurple/protocols/jabber/chat.c:539
+#: ../libpurple/protocols/jabber/chat.c:475
+#: ../libpurple/protocols/jabber/chat.c:544
 msgid "Registration error"
 msgstr "��亳弍从舒 �亠亞亳���舒�亳亳"

-#: ../libpurple/protocols/jabber/chat.c:627
+#: ../libpurple/protocols/jabber/chat.c:632
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "�亰仄亠仆亠仆亳亠 仗�亠于亟仂仆亳仄舒 仆亠 仗仂亟亟亠�亢亳于舒亠��� 于 �舒�舒� 仆亠-MUC"

-#: ../libpurple/protocols/jabber/chat.c:678
-#: ../libpurple/protocols/jabber/chat.c:689
-#: ../libpurple/protocols/silc/ops.c:1475
+#: ../libpurple/protocols/jabber/chat.c:683
+#: ../libpurple/protocols/jabber/chat.c:694
+#: ../libpurple/protocols/silc/ops.c:1473
 #: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error retrieving room list"
 msgstr "��亳弍从舒 亰舒亞��亰从亳 �仗亳�从舒 从仂仄仆舒�"

-#: ../libpurple/protocols/jabber/chat.c:737
+#: ../libpurple/protocols/jabber/chat.c:742
 msgid "Invalid Server"
 msgstr "�亠于亠�仆�亶 �亠�于亠�"

-#: ../libpurple/protocols/jabber/chat.c:781
+#: ../libpurple/protocols/jabber/chat.c:786
 msgid "Enter a Conference Server"
 msgstr "�仂亶�亳 仆舒 �亠�于亠� 从仂仆�亠�亠仆�亳亶"

-#: ../libpurple/protocols/jabber/chat.c:782
+#: ../libpurple/protocols/jabber/chat.c:787
 msgid "Select a conference server to query"
 msgstr "��弍亠�亳�亠 �亠�于亠� 从仂仆�亠�亠仆�亳亶 亟仍� 仂仗�仂�舒"

-#: ../libpurple/protocols/jabber/chat.c:785
+#: ../libpurple/protocols/jabber/chat.c:790
 msgid "Find Rooms"
 msgstr "��从舒�� 从仂仄仆舒��"

@@ -5647,9 +5683,8 @@
 msgstr "��亳弍从舒 亰舒仗亳�亳"

 #: ../libpurple/protocols/jabber/jabber.c:401
-#, fuzzy
 msgid "Ping timeout"
-msgstr "��仂��仂亶 �亠从��"
+msgstr ""

 #: ../libpurple/protocols/jabber/jabber.c:451
 #: ../libpurple/protocols/jabber/jabber.c:491
@@ -5657,7 +5692,7 @@
 msgstr "��亳弍从舒 ��亠仆亳�"

 #: ../libpurple/protocols/jabber/jabber.c:528
-#: ../libpurple/protocols/oscar/flap_connection.c:398
+#: ../libpurple/protocols/oscar/flap_connection.c:403
 #: ../libpurple/protocols/yahoo/yahoo.c:2594
 #: ../libpurple/protocols/yahoo/yahoo.c:2626
 #, c-format
@@ -5722,8 +5757,8 @@
 msgstr "丕亢亠 亰舒�亠亞亳���亳�仂于舒仆仂"

 #: ../libpurple/protocols/jabber/jabber.c:1022
-#: ../libpurple/protocols/oscar/oscar.c:3837
-#: ../libpurple/protocols/oscar/oscar.c:3850
+#: ../libpurple/protocols/oscar/oscar.c:3829
+#: ../libpurple/protocols/oscar/oscar.c:3842
 msgid "State"
 msgstr "�弍仍舒���"

@@ -5732,9 +5767,9 @@
 msgstr "�仂��仂于�亶 从仂亟"

 #: ../libpurple/protocols/jabber/jabber.c:1030
-#: ../libpurple/protocols/silc/ops.c:1050
-#: ../libpurple/protocols/silc/silc.c:915
-#: ../libpurple/protocols/silc/util.c:567
+#: ../libpurple/protocols/silc/ops.c:1049
+#: ../libpurple/protocols/silc/silc.c:988
+#: ../libpurple/protocols/silc/util.c:563
 #: ../libpurple/protocols/silc10/ops.c:1069
 #: ../libpurple/protocols/silc10/silc.c:689
 #: ../libpurple/protocols/silc10/util.c:557
@@ -5816,7 +5851,7 @@
 #: ../libpurple/protocols/jabber/jabber.c:1963
 #: ../libpurple/protocols/jabber/jabber.c:2001
 #: ../libpurple/protocols/oscar/oscar.c:827
-#: ../libpurple/protocols/oscar/oscar.c:5731
+#: ../libpurple/protocols/oscar/oscar.c:5717
 msgid "Not Authorized"
 msgstr "�亠 舒于�仂�亳亰仂于舒仆"

@@ -5857,9 +5892,9 @@
 #: ../libpurple/protocols/jabber/jabber.c:1640
 #: ../libpurple/protocols/jabber/jabber.c:1654
 #: ../libpurple/protocols/jabber/jabber.c:1668
-#: ../libpurple/protocols/jabber/usermood.c:184
+#: ../libpurple/protocols/jabber/usermood.c:181
 #: ../libpurple/protocols/silc/buddy.c:1560
-#: ../libpurple/protocols/silc/ops.c:1227
+#: ../libpurple/protocols/silc/ops.c:1225
 #: ../libpurple/protocols/silc10/buddy.c:1560
 #: ../libpurple/protocols/silc10/ops.c:1207
 msgid "Mood"
@@ -5883,19 +5918,16 @@
 #: ../libpurple/protocols/jabber/jabber.c:1643
 #: ../libpurple/protocols/jabber/jabber.c:1657
 #: ../libpurple/protocols/jabber/jabber.c:1671
-#, fuzzy
 msgid "Allow Buzz"
-msgstr "�舒亰�亠�亳��"
+msgstr ""

 #: ../libpurple/protocols/jabber/jabber.c:1689
-#, fuzzy
 msgid "Tune Artist"
-msgstr "丱�亟仂亢仆亳从亳"
+msgstr ""

 #: ../libpurple/protocols/jabber/jabber.c:1690
-#, fuzzy
 msgid "Tune Title"
-msgstr "�舒亰于舒仆亳亠"
+msgstr ""

 #: ../libpurple/protocols/jabber/jabber.c:1691
 msgid "Tune Album"
@@ -5906,9 +5938,8 @@
 msgstr ""

 #: ../libpurple/protocols/jabber/jabber.c:1693
-#, fuzzy
 msgid "Tune Comment"
-msgstr "�仂仄仄亠仆�舒�亳亶 �仂弍亠�亠亟仆亳从舒"
+msgstr ""

 #: ../libpurple/protocols/jabber/jabber.c:1694
 msgid "Tune Track"
@@ -5953,16 +5984,16 @@
 msgstr "�于亠亟亳�亠 仆仂于�亶 仗舒�仂仍�"

 #: ../libpurple/protocols/jabber/jabber.c:1799
-#: ../libpurple/protocols/oscar/oscar.c:6518
-#: ../libpurple/protocols/silc/silc.c:1236
+#: ../libpurple/protocols/oscar/oscar.c:6504
+#: ../libpurple/protocols/silc/silc.c:1309
 #: ../libpurple/protocols/silc10/silc.c:1010
 msgid "Set User Info..."
 msgstr "丕��舒仆仂于亳�� 仗仂仍�亰仂于舒�亠仍��从�� 亳仆�仂�仄舒�亳�..."

 #. if (js->protocol_options & CHANGE_PASSWORD) {
 #: ../libpurple/protocols/jabber/jabber.c:1804
-#: ../libpurple/protocols/oscar/oscar.c:6529
-#: ../libpurple/protocols/silc/silc.c:1232
+#: ../libpurple/protocols/oscar/oscar.c:6515
+#: ../libpurple/protocols/silc/silc.c:1305
 #: ../libpurple/protocols/silc10/silc.c:1006
 msgid "Change Password..."
 msgstr "�亰仄亠仆亳�� 仗舒�仂仍�..."
@@ -6202,9 +6233,9 @@
 msgstr "�亠 �亟舒���� �亟舒仍亳�� 仗仂仍�亰仂于舒�亠仍� %s"

 #: ../libpurple/protocols/jabber/jabber.c:2243
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to ping user %s"
-msgstr "�亠 �亟舒���� 于�亞仆舒�� 仗仂仍�亰仂于舒�亠仍� %s"
+msgstr ""

 #: ../libpurple/protocols/jabber/jabber.c:2261
 #: ../libpurple/protocols/jabber/jabber.c:2272
@@ -6218,27 +6249,26 @@
 msgstr ""

 #: ../libpurple/protocols/jabber/jabber.c:2298
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to buzz, because the user %s does not support it."
 msgstr ""
-"�亠 �亟舒���� 仂�仗�舒于亳�� �舒亶仍 亟仍� %s, 仗仂仍�亰仂于舒�亠仍� 仆亠 仗仂亟亟亠�亢亳于舒亠� 仗�亳�仄 �舒亶仍仂于"

 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
 #: ../libpurple/protocols/jabber/jabber.c:2318
-#: ../libpurple/protocols/yahoo/yahoo.c:4163
+#: ../libpurple/protocols/yahoo/yahoo.c:4167
 msgid "Buzz"
 msgstr ""

 #: ../libpurple/protocols/jabber/jabber.c:2319
 #: ../libpurple/protocols/jabber/message.c:308
-#: ../libpurple/protocols/yahoo/yahoo.c:4164
+#: ../libpurple/protocols/yahoo/yahoo.c:4168
 #, c-format
 msgid "%s has buzzed you!"
 msgstr ""

 #: ../libpurple/protocols/jabber/jabber.c:2319
-#: ../libpurple/protocols/yahoo/yahoo.c:4164
+#: ../libpurple/protocols/yahoo/yahoo.c:4168
 #, c-format
 msgid "Buzzing %s..."
 msgstr ""
@@ -6264,8 +6294,8 @@
 msgstr "topic [仆仂于舒� �亠仄舒]:  ��仂�仄仂��亠�� 亳仍亳 亳亰仄亠仆亳�� �亠仄�."

 #: ../libpurple/protocols/jabber/jabber.c:2380
-msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
-msgstr "ban &lt;仗仂仍�亰仂于舒�亠仍�&gt; [从仂仄仆舒�舒]:  ��亞仆舒�� 仗仂仍�亰仂于舒�亠仍� 亳亰 从仂仄仆舒��."
+msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
+msgstr "ban &lt;仗仂仍�亰仂于舒�亠仍�&gt; [仗�亳�亳仆舒]:  ��亞仆舒�� 仗仂仍�亰仂于舒�亠仍� 亳亰 从仂仄仆舒��."

 #: ../libpurple/protocols/jabber/jabber.c:2386
 msgid ""
@@ -6285,13 +6315,13 @@
 "invite &lt;仗仂仍�亰仂于舒�亠仍�&gt; [�仂仂弍�亠仆亳亠]:  ��亳亞仍舒�亳�� 仗仂仍�亰仂于舒�亠仍� 于 从仂仄仆舒��."

 #: ../libpurple/protocols/jabber/jabber.c:2404
-msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
-msgstr ""
-"join: &lt;从仂仄仆舒�舒&gt; [�亠�于亠�]:  ��亳�仂亠亟亳仆亳���� 从 �舒�� 仆舒 ��仂仄 �亠�于亠�亠."
+msgid "join: &lt;room&gt; [password]:  Join a chat on this server."
+msgstr ""
+"join: &lt;从仂仄仆舒�舒&gt; [仗舒�仂仍�]:  ��亳�仂亠亟亳仆亳���� 从 �舒�� 仆舒 ��仂仄 �亠�于亠�亠."

 #: ../libpurple/protocols/jabber/jabber.c:2410
-msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
-msgstr "kick &lt;仗仂仍�亰仂于舒�亠仍�&gt; [从仂仄仆舒�舒]:  丕亟舒仍亳�� 仗仂仍�亰仂于舒�亠仍� 亳亰 从仂仄仆舒��."
+msgid "kick &lt;user&gt; [reason]:  Kick a user from the room."
+msgstr "kick &lt;仗仂仍�亰仂于舒�亠仍�&gt; [仗�亳�亳仆舒]:  丕亟舒仍亳�� 仗仂仍�亰仂于舒�亠仍� 亳亰 从仂仄仆舒��."

 #: ../libpurple/protocols/jabber/jabber.c:2415
 msgid ""
@@ -6305,7 +6335,7 @@
 msgstr ""

 #: ../libpurple/protocols/jabber/jabber.c:2426
-#: ../libpurple/protocols/yahoo/yahoo.c:4187
+#: ../libpurple/protocols/yahoo/yahoo.c:4191
 msgid "buzz: Buzz a user to get their attention"
 msgstr ""

@@ -6341,12 +6371,8 @@
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "�舒亰�亠�亳�� 亳亟亠仆�亳�亳从舒�亳� 仗�仂���仄 �亠从��仂仄 �亠�亠亰 仆亠�亳��仂于舒仆仆�亠 仗仂�仂从亳"

-#: ../libpurple/protocols/jabber/libxmpp.c:229
-msgid "Use GSSAPI (Kerberos v5) for authentication"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/libxmpp.c:235
-#: ../libpurple/protocols/myspace/myspace.c:3468
+#: ../libpurple/protocols/jabber/libxmpp.c:227
+#: ../libpurple/protocols/myspace/myspace.c:3475
 #: ../libpurple/protocols/simple/simple.c:2105
 msgid "Connect port"
 msgstr "弌仂亠亟亳仆����� 仆舒 仗仂��"
@@ -6354,14 +6380,14 @@
 #. TODO: default to automatically try different ports. Make the user be
 #. * able to set the first port to try (like LastConnectedPort in Windows client).
 #. Account options
-#: ../libpurple/protocols/jabber/libxmpp.c:239
-#: ../libpurple/protocols/myspace/myspace.c:3465
-#: ../libpurple/protocols/silc/silc.c:2057
-#: ../libpurple/protocols/silc10/silc.c:1863 ../pidgin/gtkaccount.c:809
+#: ../libpurple/protocols/jabber/libxmpp.c:231
+#: ../libpurple/protocols/myspace/myspace.c:3472
+#: ../libpurple/protocols/silc/silc.c:2139
+#: ../libpurple/protocols/silc10/silc.c:1863 ../pidgin/gtkaccount.c:811
 msgid "Connect server"
 msgstr "弌仂亠亟亳仆����� � �亠�于亠�仂仄"

-#: ../libpurple/protocols/jabber/libxmpp.c:244
+#: ../libpurple/protocols/jabber/libxmpp.c:236
 msgid "File transfer proxies"
 msgstr "��仂从�亳 仗亠�亠亟舒�亳 �舒亶仍仂于"

@@ -6403,16 +6429,16 @@
 msgid "XML Parse error"
 msgstr "��亳弍从舒 �舒亰弍仂�舒 XML"

-#: ../libpurple/protocols/jabber/presence.c:441
+#: ../libpurple/protocols/jabber/presence.c:453
 msgid "Unknown Error in presence"
 msgstr ""

-#: ../libpurple/protocols/jabber/presence.c:522
-#: ../libpurple/protocols/jabber/presence.c:523
+#: ../libpurple/protocols/jabber/presence.c:534
+#: ../libpurple/protocols/jabber/presence.c:535
 msgid "Create New Room"
 msgstr "弌仂亰亟舒�� 仆仂于�� 从仂仄仆舒��"

-#: ../libpurple/protocols/jabber/presence.c:524
+#: ../libpurple/protocols/jabber/presence.c:536
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -6420,83 +6446,80 @@
 "�� �仂亰亟舒��亠 仆仂于�� 从仂仄仆舒��. 丱仂�亳�亠 仆舒���仂亳�� 亠� 亳仍亳 仗�亳仆��� ���舒仆仂于从亳 仗仂 "
 "�仄仂仍�舒仆亳�?"

-#: ../libpurple/protocols/jabber/presence.c:530
+#: ../libpurple/protocols/jabber/presence.c:542
 msgid "_Configure Room"
 msgstr "_�舒���仂亳�� 从仂仄仆舒��"

-#: ../libpurple/protocols/jabber/presence.c:531
+#: ../libpurple/protocols/jabber/presence.c:543
 msgid "_Accept Defaults"
 msgstr "_��亳仆��� ���舒仆仂于从亳 仗仂 �仄仂仍�舒仆亳�"

-#: ../libpurple/protocols/jabber/presence.c:573
+#: ../libpurple/protocols/jabber/presence.c:585
 #, c-format
 msgid "Error in chat %s"
 msgstr "��亳弍从舒 于 �舒�亠 %s"

-#: ../libpurple/protocols/jabber/presence.c:577
+#: ../libpurple/protocols/jabber/presence.c:589
 #, c-format
 msgid "Error joining chat %s"
 msgstr "��亳弍从舒 仗�亳�仂亠亟亳仆亠仆亳� 从 �舒�� %s"

-#: ../libpurple/protocols/jabber/si.c:1009
+#: ../libpurple/protocols/jabber/si.c:1013
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr ""
 "�亠 �亟舒���� 仂�仗�舒于亳�� �舒亶仍 亟仍� %s, 仗仂仍�亰仂于舒�亠仍� 仆亠 仗仂亟亟亠�亢亳于舒亠� 仗�亳�仄 �舒亶仍仂于"

-#: ../libpurple/protocols/jabber/si.c:1010
-#: ../libpurple/protocols/jabber/si.c:1011
-#: ../libpurple/protocols/jabber/si.c:1080
+#: ../libpurple/protocols/jabber/si.c:1014
+#: ../libpurple/protocols/jabber/si.c:1015
+#: ../libpurple/protocols/jabber/si.c:1084
 msgid "File Send Failed"
 msgstr "�亠 �亟舒仍仂�� 仂�仗�舒于亳�� �舒亶仍"

-#: ../libpurple/protocols/jabber/si.c:1073
+#: ../libpurple/protocols/jabber/si.c:1077
 #, c-format
 msgid "Unable to send file to %s, invalid JID"
 msgstr "�亠 �亟舒���� 仂�仗�舒于亳�� �舒亶仍 亟仍� %s, 仆亠于亠�仆�亶 JID"

-#: ../libpurple/protocols/jabber/si.c:1075
+#: ../libpurple/protocols/jabber/si.c:1079
 #, c-format
 msgid "Unable to send file to %s, user is not online"
 msgstr "�亠 �亟舒���� 仂�仗�舒于亳�� �舒亶仍 亟仍� %s, 仗仂仍�亰仂于舒�亠仍� 仆亠 于 �亠�亳"

-#: ../libpurple/protocols/jabber/si.c:1077
+#: ../libpurple/protocols/jabber/si.c:1081
 #, c-format
 msgid "Unable to send file to %s, not subscribed to user presence"
 msgstr ""
 "�亠 �亟舒���� 仂�仗�舒于亳�� �舒亶仍 亟仍� %s, 仆亠� 仗仂亟仗亳�从亳 仆舒 仗�亳�����于亳亠 仗仂仍�亰仂于舒�亠仍�"

-#: ../libpurple/protocols/jabber/si.c:1092
-#, fuzzy, c-format
+#: ../libpurple/protocols/jabber/si.c:1096
+#, 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
+msgstr "��弍亠�亳�亠 �亠���� %s, 从仂�仂�仂仄� 于� �仂�亠仍亳 弍� 仂�仗�舒于亳�� �舒亶仍"
+
+#: ../libpurple/protocols/jabber/si.c:1112
 msgid "Select a Resource"
 msgstr "��弍�舒�� �亠����"

-#: ../libpurple/protocols/jabber/usermood.c:197
-#: ../libpurple/protocols/jabber/usermood.c:198
+#: ../libpurple/protocols/jabber/usermood.c:194
+#: ../libpurple/protocols/jabber/usermood.c:195
 msgid "Edit User Mood"
 msgstr ""

-#: ../libpurple/protocols/jabber/usermood.c:199
+#: ../libpurple/protocols/jabber/usermood.c:196
 msgid "Please select your mood from the list."
 msgstr ""

-#: ../libpurple/protocols/jabber/usermood.c:201
+#: ../libpurple/protocols/jabber/usermood.c:198
 #: ../libpurple/protocols/jabber/usernick.c:78
 msgid "Set"
 msgstr "丕��舒仆仂于亳��"

-#: ../libpurple/protocols/jabber/usermood.c:209
+#: ../libpurple/protocols/jabber/usermood.c:206
 msgid "Set Mood..."
 msgstr ""

 #: ../libpurple/protocols/jabber/usernick.c:76
-#, fuzzy
 msgid "Set User Nickname"
 msgstr "丕��舒仆仂于亳�� 仗�亠于亟仂仆亳仄 仗仂仍�亰仂于舒�亠仍�"

@@ -6523,7 +6546,7 @@
 msgid "Select an action"
 msgstr "��弍�舒�� 亟亠亶��于亳亠"

-#: ../libpurple/protocols/msn/contact.c:776
+#: ../libpurple/protocols/msn/contact.c:782
 msgid "Unable to retrieve MSN Address Book"
 msgstr "�亠 �亟舒���� 亰舒亞��亰亳�� 舒亟�亠�仆�� 从仆亳亞� MSN"

@@ -6592,8 +6615,8 @@
 #: ../libpurple/protocols/msn/error.c:59
 #: ../libpurple/protocols/msnp9/error.c:59
 #, c-format
-msgid "Invalid screen name"
-msgstr "�亠于亠�仆�亶 亳亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍�"
+msgid "Invalid username"
+msgstr "�亠于亠�仆仂亠 亳仄� 仗仂仍�亰仂于舒�亠仍�"

 #: ../libpurple/protocols/msn/error.c:62
 #: ../libpurple/protocols/msnp9/error.c:62
@@ -6690,7 +6713,7 @@
 #: ../libpurple/protocols/msnp9/error.c:116
 #, c-format
 msgid "Required fields missing"
-msgstr "�亠仂弍�仂亟亳仄�亠 仗仂仍� 仗�仂仗��亠仆�"
+msgstr "��仂仗��亠仆� 仂弍�亰舒�亠仍�仆�亠 仗仂仍�"

 #: ../libpurple/protocols/msn/error.c:120
 #: ../libpurple/protocols/msnp9/error.c:120
@@ -6977,7 +7000,7 @@
 #: ../libpurple/protocols/msnp9/msn.c:594
 #: ../libpurple/protocols/msnp9/state.c:33
 #: ../libpurple/protocols/yahoo/yahoo.c:3134
-#: ../libpurple/protocols/yahoo/yahoo.c:3823
+#: ../libpurple/protocols/yahoo/yahoo.c:3827
 msgid "Be Right Back"
 msgstr "弌从仂�仂 于亠�仆���"

@@ -6991,19 +7014,19 @@
 #: ../libpurple/protocols/silc10/buddy.c:1483
 #: ../libpurple/protocols/silc10/silc.c:47
 #: ../libpurple/protocols/yahoo/yahoo.c:3136
-#: ../libpurple/protocols/yahoo/yahoo.c:3826
+#: ../libpurple/protocols/yahoo/yahoo.c:3830
 msgid "Busy"
 msgstr "�舒仆��"

 #: ../libpurple/protocols/msn/msn.c:721 ../libpurple/protocols/msnp9/msn.c:602
 #: ../libpurple/protocols/yahoo/yahoo.c:3144
-#: ../libpurple/protocols/yahoo/yahoo.c:3838
+#: ../libpurple/protocols/yahoo/yahoo.c:3842
 msgid "On the Phone"
 msgstr "�舒亰亞仂于舒�亳于舒� 仗仂 �亠仍亠�仂仆�"

 #: ../libpurple/protocols/msn/msn.c:726 ../libpurple/protocols/msnp9/msn.c:606
 #: ../libpurple/protocols/yahoo/yahoo.c:3148
-#: ../libpurple/protocols/yahoo/yahoo.c:3844
+#: ../libpurple/protocols/yahoo/yahoo.c:3848
 msgid "Out to Lunch"
 msgstr "�仂��仍 仗亠�亠从��亳��"

@@ -7084,7 +7107,7 @@
 #: ../libpurple/protocols/msn/msn.c:1758
 #: ../libpurple/protocols/msnp9/msn.c:1599
 #: ../libpurple/protocols/myspace/user.c:125
-#: ../libpurple/protocols/oscar/oscar.c:3802
+#: ../libpurple/protocols/oscar/oscar.c:3794
 #: ../libpurple/protocols/qq/buddy_info.c:45
 #: ../libpurple/protocols/qq/qq.c:222
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1088
@@ -7211,7 +7234,7 @@

 #: ../libpurple/protocols/msn/msn.c:1823
 #: ../libpurple/protocols/msnp9/msn.c:1664
-#: ../libpurple/protocols/oscar/oscar.c:3840
+#: ../libpurple/protocols/oscar/oscar.c:3832
 msgid "Home Address"
 msgstr "�仂仄舒�仆亳亶 舒亟�亠�"

@@ -7248,14 +7271,14 @@

 #: ../libpurple/protocols/msn/msn.c:1847
 #: ../libpurple/protocols/msnp9/msn.c:1688
-#: ../libpurple/protocols/silc/ops.c:1025
+#: ../libpurple/protocols/silc/ops.c:1024
 #: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "�舒亰于舒仆亳亠 �舒弍仂��"

 #: ../libpurple/protocols/msn/msn.c:1848
 #: ../libpurple/protocols/msnp9/msn.c:1689
-#: ../libpurple/protocols/oscar/oscar.c:3861
+#: ../libpurple/protocols/oscar/oscar.c:3853
 msgid "Company"
 msgstr "�仂仄仗舒仆亳�"

@@ -7282,7 +7305,7 @@

 #: ../libpurple/protocols/msn/msn.c:1853
 #: ../libpurple/protocols/msnp9/msn.c:1694
-#: ../libpurple/protocols/oscar/oscar.c:3853
+#: ../libpurple/protocols/oscar/oscar.c:3845
 msgid "Work Address"
 msgstr "�舒弍仂�亳亶 舒亟�亠�"

@@ -7333,7 +7356,7 @@
 #: ../libpurple/protocols/msn/msn.c:2005
 #: ../libpurple/protocols/msnp9/msn.c:1846
 #: ../libpurple/protocols/qq/buddy_info.c:60
-#: ../libpurple/protocols/silc/ops.c:1041
+#: ../libpurple/protocols/silc/ops.c:1040
 #: ../libpurple/protocols/silc10/ops.c:1060
 msgid "Homepage"
 msgstr "�仂仄舒�仆�� ���舒仆亳�舒"
@@ -7399,18 +7422,18 @@
 msgid "nudge: nudge a user to get their attention"
 msgstr ""

-#: ../libpurple/protocols/msn/nexus.c:70
+#: ../libpurple/protocols/msn/nexus.c:71
 msgid "Windows Live ID authentication:Unable to connect"
 msgstr ""

 #. we must have failed!
-#: ../libpurple/protocols/msn/nexus.c:126
+#: ../libpurple/protocols/msn/nexus.c:124
 msgid ""
 "Windows Live ID authentication: cannot find authenticate token in server "
 "response"
 msgstr ""

-#: ../libpurple/protocols/msn/nexus.c:172
+#: ../libpurple/protocols/msn/nexus.c:171
 #, fuzzy
 msgid "Windows Live ID authentication Failed"
 msgstr "��亳弍从舒: ���亠仆�亳�亳从舒�亳� 亰舒于亠��亳仍舒�� 仆亠�亟舒�仆仂"
@@ -7422,7 +7445,7 @@
 msgstr "%s 仆亠 �于仍�亠��� 亟仂仗���亳仄仂亶 亞��仗仗仂亶."

 #: ../libpurple/protocols/msn/notification.c:191
-#: ../libpurple/protocols/msn/notification.c:931
+#: ../libpurple/protocols/msn/notification.c:935
 #: ../libpurple/protocols/msn/session.c:387
 #: ../libpurple/protocols/msnp9/notification.c:184
 #: ../libpurple/protocols/msnp9/notification.c:534
@@ -7436,67 +7459,67 @@
 msgid "%s on %s (%s)"
 msgstr "%s 仆舒 %s (%s)"

-#: ../libpurple/protocols/msn/notification.c:509
+#: ../libpurple/protocols/msn/notification.c:513
 #, fuzzy, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s 仂�仗�舒于亳仍 于舒仄 �仂仂弍�亠仆亳亠"

-#: ../libpurple/protocols/msn/notification.c:836
+#: ../libpurple/protocols/msn/notification.c:840
 #, c-format
 msgid "Unknown error (%d)"
 msgstr "�亠亳亰于亠��仆舒� 仂�亳弍从舒 (%d)"

-#: ../libpurple/protocols/msn/notification.c:837
-#: ../libpurple/protocols/sametime/sametime.c:4480
+#: ../libpurple/protocols/msn/notification.c:841
+#: ../libpurple/protocols/sametime/sametime.c:4481
 msgid "Unable to add user"
 msgstr "�亠 �亟舒���� 亟仂弍舒于亳�� 仗仂仍�亰仂于舒�亠仍�"

-#: ../libpurple/protocols/msn/notification.c:897
+#: ../libpurple/protocols/msn/notification.c:901
 #: ../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/msn/notification.c:905
 #: ../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/msn/notification.c:909
 #: ../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/msn/notification.c:917
 #: ../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/msn/notification.c:926
 #: ../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/msn/notification.c:931
 #: ../libpurple/protocols/msnp9/notification.c:530
 msgid "Service Temporarily Unavailable."
 msgstr "弌仍�亢弍舒 于�亠仄亠仆仆仂 仆亠亟仂���仗仆舒."

-#: ../libpurple/protocols/msn/notification.c:1332
+#: ../libpurple/protocols/msn/notification.c:1336
 #: ../libpurple/protocols/msnp9/notification.c:898
 msgid "Unable to rename group"
 msgstr "�亠 �亟舒���� 仗亠�亠亳仄亠仆仂于舒�� 亞��仗仗�"

-#: ../libpurple/protocols/msn/notification.c:1387
+#: ../libpurple/protocols/msn/notification.c:1391
 #: ../libpurple/protocols/msnp9/notification.c:953
 msgid "Unable to delete group"
 msgstr "�亠 �亟舒���� �亟舒仍亳�� 亞��仗仗�"

-#: ../libpurple/protocols/msn/notification.c:2001
+#: ../libpurple/protocols/msn/notification.c:2008
 #: ../libpurple/protocols/msnp9/notification.c:1372
 #, c-format
 msgid ""
@@ -7533,7 +7556,7 @@
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:272
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:307
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:338
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1564
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1565
 #: ../libpurple/protocols/yahoo/yahoochat.c:1425
 #: ../libpurple/protocols/yahoo/yahoochat.c:1451
 msgid "Unable to connect"
@@ -7571,7 +7594,7 @@

 #: ../libpurple/protocols/msn/session.c:358
 #: ../libpurple/protocols/msnp9/session.c:310
-#: ../libpurple/protocols/oscar/flap_connection.c:387
+#: ../libpurple/protocols/oscar/flap_connection.c:392
 #: ../libpurple/protocols/yahoo/yahoo.c:155
 msgid "You have signed on from another location."
 msgstr "�� 仗仂亟从仍��亠仆� 亳亰 亟��亞仂亞仂 仄亠��舒."
@@ -7606,6 +7629,11 @@
 msgid "Handshaking"
 msgstr "弌仂亞仍舒�仂于舒仆亳亠"

+#: ../libpurple/protocols/msn/session.c:404
+#: ../libpurple/protocols/msnp9/session.c:356
+msgid "Transferring"
+msgstr "�亠�亠亟舒�舒"
+
 #: ../libpurple/protocols/msn/session.c:406
 #: ../libpurple/protocols/msnp9/session.c:358
 msgid "Starting authentication"
@@ -7642,43 +7670,43 @@
 msgstr "�仂��仍 仗亠�亠从��亳��"

 #: ../libpurple/protocols/msn/switchboard.c:406
-#: ../libpurple/protocols/msnp9/switchboard.c:408
+#: ../libpurple/protocols/msnp9/switchboard.c:411
 msgid "Message may have not been sent because a timeout occurred:"
 msgstr "弌仂仂弍�亠仆亳亠 仄仂亞仍仂 弍��� 仆亠 仂�仗�舒于仍亠仆仂, �舒从 从舒从 亳��亠从仍仂 于�亠仄� 仂亢亳亟舒仆亳�:"

 #: ../libpurple/protocols/msn/switchboard.c:414
-#: ../libpurple/protocols/msnp9/switchboard.c:416
+#: ../libpurple/protocols/msnp9/switchboard.c:419
 msgid "Message could not be sent, not allowed while invisible:"
 msgstr ""
 "弌仂仂弍�亠仆亳亠 仆亠 仄仂亢亠� 弍��� 仂�仗�舒于仍亠仆仂, 仆亠 �舒亰�亠�亠仆仂 仗�亳 ��舒���亠 \"�亠于亳亟亳仄�亶\":"

 #: ../libpurple/protocols/msn/switchboard.c:418
-#: ../libpurple/protocols/msnp9/switchboard.c:420
+#: ../libpurple/protocols/msnp9/switchboard.c:423
 msgid "Message could not be sent because the user is offline:"
 msgstr "弌仂仂弍�亠仆亳亠 仆亠 仄仂亢亠� 弍��� 仂�仗�舒于仍亠仆仂, �舒从 从舒从 仗仂仍�亰仂于舒�亠仍� 仆亠 于 �亠�亳:"

 #: ../libpurple/protocols/msn/switchboard.c:422
-#: ../libpurple/protocols/msnp9/switchboard.c:424
+#: ../libpurple/protocols/msnp9/switchboard.c:427
 msgid "Message could not be sent because a connection error occurred:"
 msgstr ""
 "弌仂仂弍�亠仆亳亠 仆亠 仄仂亢亠� 弍��� 仂�仗�舒于仍亠仆仂, �舒从 从舒从 仗�仂亳亰仂�仍舒 仂�亳弍从舒 �仂亠亟亳仆亠仆亳�:"

 #: ../libpurple/protocols/msn/switchboard.c:426
-#: ../libpurple/protocols/msnp9/switchboard.c:428
+#: ../libpurple/protocols/msnp9/switchboard.c:431
 msgid "Message could not be sent because we are sending too quickly:"
 msgstr ""
 "弌仂仂弍�亠仆亳亠 仆亠 仄仂亢亠� 弍��� 仂�仗�舒于仍亠仆仂, �舒从 从舒从 仂�仗�舒于从舒 仗�仂亳��仂亟亳� �仍亳�从仂仄 "
 "弍����仂:"

 #: ../libpurple/protocols/msn/switchboard.c:430
-#: ../libpurple/protocols/msnp9/switchboard.c:432
+#: ../libpurple/protocols/msnp9/switchboard.c:435
 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:437
-#: ../libpurple/protocols/msnp9/switchboard.c:439
+#: ../libpurple/protocols/msnp9/switchboard.c:442
 msgid ""
 "Message could not be sent because an error with the switchboard occurred:"
 msgstr ""
@@ -7686,7 +7714,7 @@
 "仗舒仆亠仍亳:"

 #: ../libpurple/protocols/msn/switchboard.c:445
-#: ../libpurple/protocols/msnp9/switchboard.c:447
+#: ../libpurple/protocols/msnp9/switchboard.c:450
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr ""
 "弌仂仂弍�亠仆亳亠 仄仂亞仍仂 弍��� 仆亠 仂�仗�舒于仍亠仆仂, �舒从 从舒从 仗�仂亳亰仂�仍舒 仆亠亳亰于亠��仆舒� 仂�亳弍从舒:"
@@ -7706,16 +7734,16 @@
 #. only notify the user about problems adding to the friends list
 #. * maybe we should do something else for other lists, but it probably
 #. * won't cause too many problems if we just ignore it
-#: ../libpurple/protocols/msn/userlist.c:714
+#: ../libpurple/protocols/msn/userlist.c:713
 #: ../libpurple/protocols/msnp9/userlist.c:653
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "�亠 �亟舒���� 亟仂弍舒于亳�� \"%s\"."

-#: ../libpurple/protocols/msn/userlist.c:717
+#: ../libpurple/protocols/msn/userlist.c:716
 #: ../libpurple/protocols/msnp9/userlist.c:655
-msgid "The screen name specified is invalid."
-msgstr "丕从舒亰舒仆仆�亶 亳亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍� 仆亠亟仂仗���亳仄."
+msgid "The username specified is invalid."
+msgstr "丕从舒亰舒仆仆仂亠 亳仄� 仗仂仍�亰仂于舒�亠仍� 仆亠亟仂仗���亳仄仂."

 #: ../libpurple/protocols/msnp9/msn.c:546
 msgid "Has you"
@@ -7752,78 +7780,73 @@
 msgstr ""

 #: ../libpurple/protocols/myspace/myspace.c:345
-#, fuzzy
 msgid "Reading challenge"
-msgstr "��亳弍从舒 ��亠仆亳�"
+msgstr ""

 #: ../libpurple/protocols/myspace/myspace.c:355
-#, fuzzy
 msgid "Unexpected challenge length from server"
-msgstr "�亠于亠�仆�亶 亰舒仗�仂� � �亠�于亠�舒"
+msgstr ""

 #: ../libpurple/protocols/myspace/myspace.c:359
-#, fuzzy
 msgid "Logging in"
-msgstr "���仆舒仍�"
-
-#: ../libpurple/protocols/myspace/myspace.c:1324
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:1331
 #, 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:1367
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:1374
 msgid "New mail messages"
-msgstr "��仗�舒于亳�� �仂仂弍�亠仆亳亠"
-
-#: ../libpurple/protocols/myspace/myspace.c:1368
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:1375
 msgid "New blog comments"
 msgstr ""

-#: ../libpurple/protocols/myspace/myspace.c:1369
+#: ../libpurple/protocols/myspace/myspace.c:1376
 msgid "New profile comments"
 msgstr ""

-#: ../libpurple/protocols/myspace/myspace.c:1370
+#: ../libpurple/protocols/myspace/myspace.c:1377
 msgid "New friend requests!"
 msgstr ""

-#: ../libpurple/protocols/myspace/myspace.c:1371
+#: ../libpurple/protocols/myspace/myspace.c:1378
 msgid "New picture comments"
 msgstr ""

-#: ../libpurple/protocols/myspace/myspace.c:1401
+#: ../libpurple/protocols/myspace/myspace.c:1408
 msgid "MySpace"
 msgstr ""

-#: ../libpurple/protocols/myspace/myspace.c:1587
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:1594
 msgid "MySpaceIM - No Username Set"
-msgstr "�亠� 亳仄亠仆亳"
-
-#: ../libpurple/protocols/myspace/myspace.c:1588
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:1595
 msgid "You appear to have no MySpace username."
 msgstr ""

-#: ../libpurple/protocols/myspace/myspace.c:1589
+#: ../libpurple/protocols/myspace/myspace.c:1596
 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:1613
-#: ../libpurple/protocols/sametime/sametime.c:1547
+#: ../libpurple/protocols/myspace/myspace.c:1620
+#: ../libpurple/protocols/sametime/sametime.c:1548
 msgid "Connected"
 msgstr "弌仂亠亟亳仆亠仆亳亠 ���舒仆仂于仍亠仆仂"

-#: ../libpurple/protocols/myspace/myspace.c:1848
+#: ../libpurple/protocols/myspace/myspace.c:1855
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "��亳弍从舒 仗�仂�仂从仂仍舒, 从仂亟 %d: %s"

-#: ../libpurple/protocols/myspace/myspace.c:1870
+#: ../libpurple/protocols/myspace/myspace.c:1877
 #, c-format
 msgid ""
 "%s Your password is %d characters, greater than the expected maximum length "
@@ -7832,137 +7855,129 @@
 "again."
 msgstr ""

-#: ../libpurple/protocols/myspace/myspace.c:1893
+#: ../libpurple/protocols/myspace/myspace.c:1900
 msgid "MySpaceIM Error"
 msgstr ""

-#: ../libpurple/protocols/myspace/myspace.c:2071
-#: ../libpurple/protocols/myspace/myspace.c:2105
+#: ../libpurple/protocols/myspace/myspace.c:2078
+#: ../libpurple/protocols/myspace/myspace.c:2112
 msgid "Failed to add buddy"
 msgstr "�亠 �亟舒仍仂�� 亟仂弍舒于亳�� �仂弍亠�亠亟仆亳从舒"

-#: ../libpurple/protocols/myspace/myspace.c:2071
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:2078
 msgid "'addbuddy' command failed."
-msgstr "�舒亞��亰亳�� �仗亳�仂从 �仂弍亠�亠亟仆亳从仂于 亳亰 �舒亶仍舒..."
-
-#: ../libpurple/protocols/myspace/myspace.c:2105
-#: ../libpurple/protocols/myspace/myspace.c:2350
-#, fuzzy
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:2112
+#: ../libpurple/protocols/myspace/myspace.c:2357
 msgid "persist command failed"
-msgstr "��亳弍从舒 从仂仄仄��舒�亳仂仆仆仂亶 仗舒仆亠仍亳"
-
-#: ../libpurple/protocols/myspace/myspace.c:2210
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:2217
 #, c-format
 msgid "No such user: %s"
 msgstr "�亠� �舒从仂亞仂 仗仂仍�亰仂于舒�亠仍�: %s"

-#: ../libpurple/protocols/myspace/myspace.c:2212
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:2219
 msgid "User lookup"
-msgstr "�仂仄仆舒�� 仗仂仍�亰仂于舒�亠仍�"
-
-#: ../libpurple/protocols/myspace/myspace.c:2331
-#: ../libpurple/protocols/myspace/myspace.c:2350
-#: ../libpurple/protocols/myspace/myspace.c:2372
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:2338
+#: ../libpurple/protocols/myspace/myspace.c:2357
+#: ../libpurple/protocols/myspace/myspace.c:2379
 msgid "Failed to remove buddy"
 msgstr "�亠 �亟舒仍仂�� �亟舒仍亳�� �仂弍亠�亠亟仆亳从舒"

-#: ../libpurple/protocols/myspace/myspace.c:2331
+#: ../libpurple/protocols/myspace/myspace.c:2338
 msgid "'delbuddy' command failed"
 msgstr ""

-#: ../libpurple/protocols/myspace/myspace.c:2372
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:2379
 msgid "blocklist command failed"
-msgstr "��亳弍从舒 从仂仄仄��舒�亳仂仆仆仂亶 仗舒仆亠仍亳"
-
-#: ../libpurple/protocols/myspace/myspace.c:2486
-#, fuzzy
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:2493
 msgid "Invalid input condition"
-msgstr "�舒于亠��亠仆亳亠 ���舒仆仂于仍亠仆亳� �仂亠亟亳仆亠仆亳�"
-
-#: ../libpurple/protocols/myspace/myspace.c:2541
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:2548
 #, fuzzy
 msgid "Read buffer full (2)"
 msgstr "��亠�亠亟� 仗仂仍仆舒"

-#: ../libpurple/protocols/myspace/myspace.c:2584
+#: ../libpurple/protocols/myspace/myspace.c:2591
 msgid "Unparseable message"
 msgstr "�亠�舒亰弍亳�舒亠仄仂亠 �仂仂弍�亠仆亳亠"

-#: ../libpurple/protocols/myspace/myspace.c:2655
+#: ../libpurple/protocols/myspace/myspace.c:2662
 #, c-format
 msgid "Couldn't connect to host: %s (%d)"
 msgstr "�亠 �亟舒仍仂�� �仂亠亟亳仆亳���� � �亰仍仂仄: %s (%d)"

-#: ../libpurple/protocols/myspace/myspace.c:2833
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:2840
 msgid "IM Friends"
-msgstr "�从仆舒 _仄亞仆仂于亠仆仆�� �仂仂弍�亠仆亳亶"
-
-#: ../libpurple/protocols/myspace/myspace.c:2933
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:2940
 #, 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:2934
+#: ../libpurple/protocols/myspace/myspace.c:2941
 msgid "Add contacts from server"
 msgstr "�仂弍舒于亳�� 从仂仆�舒从�� � �亠�于亠�舒"

-#: ../libpurple/protocols/myspace/myspace.c:2986
-#: ../libpurple/protocols/myspace/myspace.c:3050
+#: ../libpurple/protocols/myspace/myspace.c:2993
+#: ../libpurple/protocols/myspace/myspace.c:3057
 msgid "Add friends from MySpace.com"
 msgstr "�仂弍舒于亳�� 亟��亰亠亶 � MySpace.com"

-#: ../libpurple/protocols/myspace/myspace.c:2987
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:2994
 msgid "Importing friends failed"
-msgstr "�亠 �亟舒仍仂�� 仗亠�亠亟舒�� �于亠亟仂仄仍亠仆亳亠"
+msgstr ""

 #. TODO: find out how
-#: ../libpurple/protocols/myspace/myspace.c:3043
+#: ../libpurple/protocols/myspace/myspace.c:3050
 #, fuzzy
 msgid "Find people..."
 msgstr "�舒亶�亳 �仂弍亠�亠亟仆亳从仂于..."

-#: ../libpurple/protocols/myspace/myspace.c:3046
+#: ../libpurple/protocols/myspace/myspace.c:3053
 #, fuzzy
 msgid "Change IM name..."
 msgstr "�亰仄亠仆亳�� 仗舒�仂仍�..."

-#: ../libpurple/protocols/myspace/myspace.c:3347
+#: ../libpurple/protocols/myspace/myspace.c:3354
 msgid "myim URL handler"
 msgstr ""

-#: ../libpurple/protocols/myspace/myspace.c:3348
+#: ../libpurple/protocols/myspace/myspace.c:3355
 msgid "No suitable MySpaceIM account could be found to open this myim URL."
 msgstr ""

-#: ../libpurple/protocols/myspace/myspace.c:3349
+#: ../libpurple/protocols/myspace/myspace.c:3356
 msgid "Enable the proper MySpaceIM account and try again."
 msgstr ""

-#: ../libpurple/protocols/myspace/myspace.c:3472
+#: ../libpurple/protocols/myspace/myspace.c:3479
 msgid "Show display name in status text"
 msgstr ""

-#: ../libpurple/protocols/myspace/myspace.c:3475
+#: ../libpurple/protocols/myspace/myspace.c:3482
 msgid "Show headline in status text"
 msgstr ""

-#: ../libpurple/protocols/myspace/myspace.c:3480
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:3487
 msgid "Send emoticons"
-msgstr "�舒�舒仄亠��� 亰于�从舒"
-
-#: ../libpurple/protocols/myspace/myspace.c:3485
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:3492
 msgid "Screen resolution (dots per inch)"
 msgstr ""

-#: ../libpurple/protocols/myspace/myspace.c:3488
+#: ../libpurple/protocols/myspace/myspace.c:3495
 msgid "Base font size (points)"
 msgstr ""

@@ -7973,14 +7988,13 @@
 msgstr "�仂仍�亰仂于舒�亠仍�"

 #: ../libpurple/protocols/myspace/user.c:115
-#: ../libpurple/protocols/oscar/oscar.c:3032
+#: ../libpurple/protocols/oscar/oscar.c:3020
 msgid "Profile"
 msgstr "��仂�亳仍�"

 #: ../libpurple/protocols/myspace/user.c:138
-#, fuzzy
 msgid "Headline"
-msgstr "_�仄�:"
+msgstr "�舒亞仂仍仂于仂从"

 #: ../libpurple/protocols/myspace/user.c:153
 msgid "Song"
@@ -8009,9 +8023,8 @@
 msgstr ""

 #: ../libpurple/protocols/myspace/user.c:658
-#, fuzzy
 msgid "MySpaceIM - Username Available"
-msgstr "弌仍�亢弍舒 仆亠亟仂���仗仆舒"
+msgstr ""

 #: ../libpurple/protocols/myspace/user.c:659
 msgid "This username is available. Would you like to set it?"
@@ -8270,12 +8283,12 @@
 msgstr "�仍舒于仆�亶 舒��亳于 仆亠 仆舒���仂亠仆"

 #: ../libpurple/protocols/novell/nmuser.c:1922
-msgid "Incorrect screen name or password"
-msgstr "�亠仗�舒于亳仍�仆�亶 亳亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍� 亳仍亳 仗舒�仂仍�"
+msgid "Incorrect username or password"
+msgstr "�亠仗�舒于亳仍�仆仂亠 亳仄� 仗仂仍�亰仂于舒�亠仍� 亳仍亳 仗舒�仂仍�"

 #: ../libpurple/protocols/novell/nmuser.c:1925
-msgid "Could not recognize the host of the screen name you entered"
-msgstr "�亠 �亟舒仍仂�� �亰仆舒�� �亰亠仍 于于亠亟�仆仆仂亞仂 亳亟亠仆�亳�亳从舒�仂�舒 仗仂仍�亰仂于舒�亠仍�"
+msgid "Could not recognize the host of the username you entered"
+msgstr "�亠 �亟舒仍仂�� �亰仆舒�� �亰亠仍 于于亠亟�仆仆仂亞仂 亳仄亠仆亳 仗仂仍�亰仂于舒�亠仍�"

 #: ../libpurple/protocols/novell/nmuser.c:1928
 msgid ""
@@ -8294,8 +8307,8 @@
 msgstr "�� 亟仂��亳亞仍亳 仗�亠亟亠仍舒 亟仂仗���亳仄仂亞仂 从仂仍亳�亠��于舒 从仂仆�舒从�仂于"

 #: ../libpurple/protocols/novell/nmuser.c:1938
-msgid "You have entered an incorrect screen name"
-msgstr "�� 于于亠仍亳 仆亠仗�舒于亳仍�仆�亶 亳亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍�"
+msgid "You have entered an incorrect username"
+msgstr "�� 于于亠仍亳 仆亠仗�舒于亳仍�仆仂亠 亳仄� 仗仂仍�亰仂于舒�亠仍�"

 #: ../libpurple/protocols/novell/nmuser.c:1941
 msgid "An error occurred while updating the directory"
@@ -8440,7 +8453,7 @@
 msgstr ""

 #: ../libpurple/protocols/novell/novell.c:1511
-#: ../libpurple/protocols/sametime/sametime.c:4177
+#: ../libpurple/protocols/sametime/sametime.c:4178
 msgid "User ID"
 msgstr "�仂仍�亰仂于舒�亠仍��从亳亶 ID"

@@ -8557,7 +8570,7 @@
 msgid "Invalid chat room name"
 msgstr "�亠于亠�仆仂亠 亳仄� �舒�舒"

-#: ../libpurple/protocols/oscar/flap_connection.c:391
+#: ../libpurple/protocols/oscar/flap_connection.c:396
 #: ../libpurple/protocols/yahoo/yahoo.c:2505
 #: ../libpurple/protocols/yahoo/yahoo.c:2673
 #: ../libpurple/protocols/yahoo/ycht.c:482 ../libpurple/proxy.c:609
@@ -8566,7 +8579,7 @@
 msgid "Server closed the connection."
 msgstr "弌亠�于亠� �舒亰仂�于舒仍 �仂亠亟亳仆亠仆亳亠."

-#: ../libpurple/protocols/oscar/flap_connection.c:393
+#: ../libpurple/protocols/oscar/flap_connection.c:398
 #: ../libpurple/protocols/yahoo/yahoo.c:2498
 #: ../libpurple/protocols/yahoo/yahoo.c:2666 ../libpurple/proxy.c:621
 #: ../libpurple/proxy.c:1173 ../libpurple/proxy.c:1282
@@ -8579,7 +8592,7 @@
 "弌仂亠亟亳仆亠仆亳亠 � �亠�于亠�仂仄 仗仂�亠��仆仂:\n"
 "%s"

-#: ../libpurple/protocols/oscar/flap_connection.c:396
+#: ../libpurple/protocols/oscar/flap_connection.c:401
 #: ../libpurple/proxy.c:1190 ../libpurple/proxy.c:1295
 #: ../libpurple/proxy.c:1400 ../libpurple/proxy.c:1490
 #: ../libpurple/proxy.c:1554
@@ -8617,7 +8630,7 @@
 msgstr "�仂亟�仍� 仗�仂�仂从仂仍舒 ICQ"

 #: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4452
+#: ../libpurple/protocols/yahoo/yahoo.c:4456
 #: ../libpurple/protocols/zephyr/zephyr.c:2982
 msgid "Encoding"
 msgstr "�仂亟亳�仂于从舒"
@@ -8769,12 +8782,12 @@
 "(There was an error receiving this message.  Either you and %s have "
 "different encodings selected, or %s has a buggy client.)"
 msgstr ""
-"(��仂亳亰仂�仍舒 仂�亳弍从舒 仗�亳 仗�亳�仄亠 ��仂亞仂 �仂仂弍�亠仆亳�. �亳弍仂 � 于舒� 亳 %s 于�弍�舒仆� �舒亰仆�亠 "
-"从仂亟亳�仂于从亳, 仍亳弍仂 从仍亳亠仆� %s �仂亟亠�亢亳� 仂�亳弍从亳.)"
+"(��仂亳亰仂�仍舒 仂�亳弍从舒 仗�亳 仗仂仍��亠仆亳亳 ��仂亞仂 �仂仂弍�亠仆亳�. �亳弍仂 � 于舒� 亳 %s 于�弍�舒仆� "
+"�舒亰仆�亠 从仂亟亳�仂于从亳, 仍亳弍仂 从仍亳亠仆� %s �仂亟亠�亢亳� 仂�亳弍从亳.)"

 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:640 ../pidgin/gtkutils.c:2444
-#: ../pidgin/gtkutils.c:2474
+#: ../libpurple/protocols/oscar/oscar.c:640 ../pidgin/gtkutils.c:2446
+#: ../pidgin/gtkutils.c:2476
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:336
 msgid "Buddy Icon"
 msgstr "�仆舒�仂从 �仂弍亠�亠亟仆亳从舒"
@@ -8788,7 +8801,7 @@
 msgstr "���仄仂亠 �仂亠亟亳仆亠仆亳亠 AIM"

 #: ../libpurple/protocols/oscar/oscar.c:652
-#: ../libpurple/protocols/oscar/oscar.c:6139
+#: ../libpurple/protocols/oscar/oscar.c:6125
 msgid "Get File"
 msgstr "�仂仍��亳�� �舒亶仍"

@@ -8861,19 +8874,19 @@
 msgstr "�舒仄亠�舒"

 #: ../libpurple/protocols/oscar/oscar.c:726
-#: ../libpurple/protocols/oscar/oscar.c:5909
+#: ../libpurple/protocols/oscar/oscar.c:5895
 #, c-format
 msgid "Free For Chat"
 msgstr "�仂�仂于 仗仂仂弍�舒����"

 #: ../libpurple/protocols/oscar/oscar.c:730
-#: ../libpurple/protocols/oscar/oscar.c:5944
+#: ../libpurple/protocols/oscar/oscar.c:5930
 #, c-format
 msgid "Not Available"
 msgstr "�亠亟仂���仗亠仆"

 #: ../libpurple/protocols/oscar/oscar.c:732
-#: ../libpurple/protocols/oscar/oscar.c:5930
+#: ../libpurple/protocols/oscar/oscar.c:5916
 #, c-format
 msgid "Occupied"
 msgstr "�舒仆��"
@@ -8885,20 +8898,20 @@

 #: ../libpurple/protocols/oscar/oscar.c:738 ../libpurple/protocols/qq/qq.c:184
 #: ../libpurple/protocols/qq/qq.c:289
-#: ../libpurple/protocols/yahoo/yahoo.c:3152 ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:557 ../pidgin/gtkstatusbox.c:1084
+#: ../libpurple/protocols/yahoo/yahoo.c:3152 ../libpurple/status.c:158
+#: ../pidgin/gtkdocklet.c:557 ../pidgin/gtkstatusbox.c:1089
 #, c-format
 msgid "Invisible"
 msgstr "�亠于亳亟亳仄�亶"

 #: ../libpurple/protocols/oscar/oscar.c:839
-#: ../libpurple/protocols/oscar/oscar.c:3754
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1100
+#: ../libpurple/protocols/oscar/oscar.c:3746
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1210
 msgid "IP Address"
 msgstr "IP-舒亟�亠�"

 #: ../libpurple/protocols/oscar/oscar.c:846
-#: ../libpurple/protocols/oscar/oscar.c:2959
+#: ../libpurple/protocols/oscar/oscar.c:2947
 msgid "Warning Level"
 msgstr "丕�仂于亠仆� 仗�亠亟�仗�亠亢亟亠仆亳�"

@@ -8947,6 +8960,7 @@

 #. Unregistered screen name
 #: ../libpurple/protocols/oscar/oscar.c:1392
+#: ../libpurple/protocols/yahoo/yahoo.c:2127
 msgid "Invalid username."
 msgstr "�亠于亠�仆仂亠 亳仄� 仗仂仍�亰仂于舒�亠仍�."

@@ -9008,10 +9022,10 @@
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
 #: ../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:6296 ../libpurple/request.h:1401
+#: ../libpurple/protocols/oscar/oscar.c:2289
+#: ../libpurple/protocols/oscar/oscar.c:2337
+#: ../libpurple/protocols/oscar/oscar.c:6000
+#: ../libpurple/protocols/oscar/oscar.c:6282 ../libpurple/request.h:1401
 msgid "_OK"
 msgstr "_OK"

@@ -9048,31 +9062,31 @@
 msgid "Unable to initialize connection"
 msgstr "�亠 �亟舒���� 亳仆亳�亳舒仍亳亰亳�仂于舒�� �仂亠亟亳仆亠仆亳亠"

-#: ../libpurple/protocols/oscar/oscar.c:2256
+#: ../libpurple/protocols/oscar/oscar.c:2258
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr ""

-#: ../libpurple/protocols/oscar/oscar.c:2298
+#: ../libpurple/protocols/oscar/oscar.c:2287
 msgid "Authorization Request Message:"
 msgstr "弌仂仂弍�亠仆亳亠 亰舒仗�仂�舒 舒于�仂�亳亰舒�亳亳:"

-#: ../libpurple/protocols/oscar/oscar.c:2299
+#: ../libpurple/protocols/oscar/oscar.c:2288
 msgid "Please authorize me!"
 msgstr ""

-#: ../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/oscar/oscar.c:2328
+#: ../libpurple/protocols/oscar/oscar.c:2336
+#: ../libpurple/protocols/oscar/oscar.c:2463
+#: ../libpurple/protocols/oscar/oscar.c:5372
 #: ../libpurple/protocols/yahoo/yahoo.c:991
 msgid "No reason given."
 msgstr "��亳�亳仆舒 仆亠 �从舒亰舒仆舒."

-#: ../libpurple/protocols/oscar/oscar.c:2347
+#: ../libpurple/protocols/oscar/oscar.c:2335
 msgid "Authorization Denied Message:"
 msgstr "弌仂仂弍�亠仆亳亠 仂�从舒亰舒 于 舒于�仂�亳亰舒�亳亳:"

-#: ../libpurple/protocols/oscar/oscar.c:2475
+#: ../libpurple/protocols/oscar/oscar.c:2463
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -9083,18 +9097,18 @@
 "�仍亠亟���亠亶 仗�亳�亳仆亠:\n"
 "%s"

-#: ../libpurple/protocols/oscar/oscar.c:2476
+#: ../libpurple/protocols/oscar/oscar.c:2464
 msgid "ICQ authorization denied."
 msgstr "� 舒于�仂�亳亰舒�亳亳 ICQ 仂�从舒亰舒仆仂."

 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2483
+#: ../libpurple/protocols/oscar/oscar.c:2471
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr ""
 "�仂仍�亰仂于舒�亠仍� %u 亟舒仍 �于仂� �仂亞仍舒�亳亠 亟仂弍舒于亳�� 亠亞仂 于 于舒� �仗亳�仂从 �仂弍亠�亠亟仆亳从仂于."

-#: ../libpurple/protocols/oscar/oscar.c:2491
+#: ../libpurple/protocols/oscar/oscar.c:2479
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -9107,7 +9121,7 @@
 "��: %s [%s]\n"
 "%s"

-#: ../libpurple/protocols/oscar/oscar.c:2499
+#: ../libpurple/protocols/oscar/oscar.c:2487
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -9120,7 +9134,7 @@
 "��: %s [%s]\n"
 "%s"

-#: ../libpurple/protocols/oscar/oscar.c:2507
+#: ../libpurple/protocols/oscar/oscar.c:2495
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -9133,24 +9147,24 @@
 "弌仂仂弍�亠仆亳亠:\n"
 "%s"

-#: ../libpurple/protocols/oscar/oscar.c:2528
+#: ../libpurple/protocols/oscar/oscar.c:2516
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "�仂仍�亰仂于舒�亠仍� ICQ %u 仂�仗�舒于亳仍 于舒仄 �仂弍亠�亠亟仆亳从舒: %s (%s)"

-#: ../libpurple/protocols/oscar/oscar.c:2534
+#: ../libpurple/protocols/oscar/oscar.c:2522
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "丱仂�亳�亠 亟仂弍舒于亳�� ��仂亞仂 �仂弍亠�亠亟仆亳从舒 于 �仗亳�仂从 �仂弍亠�亠亟仆亳从仂于?"

-#: ../libpurple/protocols/oscar/oscar.c:2539 ../pidgin/gtkroomlist.c:320
+#: ../libpurple/protocols/oscar/oscar.c:2527 ../pidgin/gtkroomlist.c:320
 msgid "_Add"
 msgstr "_�仂弍舒于亳��"

-#: ../libpurple/protocols/oscar/oscar.c:2540
+#: ../libpurple/protocols/oscar/oscar.c:2528
 msgid "_Decline"
 msgstr "_��从仍仂仆亳��"

-#: ../libpurple/protocols/oscar/oscar.c:2664
+#: ../libpurple/protocols/oscar/oscar.c:2652
 #, 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."
@@ -9158,7 +9172,7 @@
 msgstr[1] "�� 仆亠 仗仂仍��亳仍亳 %hu �仂仂弍�亠仆亳� 仂� %s, �舒从 从舒从 仂仆亳 弍�仍亳 仆亠从仂��亠从�仆�."
 msgstr[2] "�� 仆亠 仗仂仍��亳仍亳 %hu �仂仂弍�亠仆亳亶 仂� %s, �舒从 从舒从 仂仆亳 弍�仍亳 仆亠从仂��亠从�仆�."

-#: ../libpurple/protocols/oscar/oscar.c:2673
+#: ../libpurple/protocols/oscar/oscar.c:2661
 #, 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."
@@ -9169,7 +9183,7 @@
 msgstr[2] ""
 "�� 仆亠 仗仂仍��亳仍亳 %hu �仂仂弍�亠仆亳亶 仂� %s, �舒从 从舒从 仂仆亳 弍�仍亳 �仍亳�从仂仄 于亠仍亳从亳."

-#: ../libpurple/protocols/oscar/oscar.c:2682
+#: ../libpurple/protocols/oscar/oscar.c:2670
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -9182,7 +9196,7 @@
 msgstr[2] ""
 "�� 仆亠 仗仂仍��亳仍亳 %hu �仂仂弍�亠仆亳亶 仂� %s, �舒从 从舒从 弍�仍 仗�亠于��亠仆 仗�亠亟亠仍 仂�亠仆从亳."

-#: ../libpurple/protocols/oscar/oscar.c:2691
+#: ../libpurple/protocols/oscar/oscar.c:2679
 #, 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."
@@ -9193,7 +9207,7 @@
 msgstr[2] ""
 "�� 仆亠 仗仂仍��亳仍亳 %hu �仂仂弍�亠仆亳亶 仂� %s, 仗仂�仂仄� ��仂 仂仆 �仍亳�从仂仄 仆舒亟仂亠亟仍亳于."

-#: ../libpurple/protocols/oscar/oscar.c:2700
+#: ../libpurple/protocols/oscar/oscar.c:2688
 #, 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."
@@ -9204,7 +9218,7 @@
 msgstr[2] ""
 "�� 仆亠 仗仂仍��亳仍亳 %hu �仂仂弍�亠仆亳亶 仂� %s, 仗仂�仂仄� ��仂 于� �仍亳�从仂仄 仆舒亟仂亠亟仍亳于�."

-#: ../libpurple/protocols/oscar/oscar.c:2709
+#: ../libpurple/protocols/oscar/oscar.c:2697
 #, 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."
@@ -9213,47 +9227,47 @@
 msgstr[2] "�� 仆亠 仗仂仍��亳仍亳 %hu �仂仂弍�亠仆亳亶 仂� %s 仗仂 仆亠亳亰于亠��仆仂亶 仗�亳�亳仆亠."

 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2864
+#: ../libpurple/protocols/oscar/oscar.c:2852
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "�亠 �亟舒���� 仂�仗�舒于亳�� �仂仂弍�亠仆亳亠: %s"

-#: ../libpurple/protocols/oscar/oscar.c:2864
-#: ../libpurple/protocols/oscar/oscar.c:2869
-#: ../libpurple/protocols/oscar/oscar.c:2933
+#: ../libpurple/protocols/oscar/oscar.c:2852
+#: ../libpurple/protocols/oscar/oscar.c:2857
+#: ../libpurple/protocols/oscar/oscar.c:2921
 msgid "Unknown reason."
 msgstr "��亳�亳仆舒 仆亠亳亰于亠��仆舒."

-#: ../libpurple/protocols/oscar/oscar.c:2867
-#: ../libpurple/protocols/sametime/sametime.c:2460
+#: ../libpurple/protocols/oscar/oscar.c:2855
+#: ../libpurple/protocols/sametime/sametime.c:2461
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "�亠 �亟舒���� 仂�仗�舒于亳�� �仂仂弍�亠仆亳亠 亟仍� %s:"

-#: ../libpurple/protocols/oscar/oscar.c:2933
+#: ../libpurple/protocols/oscar/oscar.c:2921
 #, c-format
 msgid "User information not available: %s"
 msgstr "�仂仍�亰仂于舒�亠仍��从舒� 亳仆�仂�仄舒�亳� 仆亠亟仂���仗仆舒: %s"

-#: ../libpurple/protocols/oscar/oscar.c:2964
+#: ../libpurple/protocols/oscar/oscar.c:2952
 msgid "Online Since"
 msgstr "� �亠�亳 �"

-#: ../libpurple/protocols/oscar/oscar.c:2969
+#: ../libpurple/protocols/oscar/oscar.c:2957
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1192
 msgid "Member Since"
 msgstr "丼仍亠仆 �"

-#: ../libpurple/protocols/oscar/oscar.c:3004
+#: ../libpurple/protocols/oscar/oscar.c:2992
 msgid "Available Message"
 msgstr "弌�舒���仆仂亠 �仂仂弍�亠仆亳亠"

-#: ../libpurple/protocols/oscar/oscar.c:3108
+#: ../libpurple/protocols/oscar/oscar.c:3096
 msgid "Your AIM connection may be lost."
 msgstr "�舒�亠 �仂亠亟亳仆亠仆亳亠 AIM 仄仂亢亠� 弍��� 仗仂�亠��仆仂."

 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3296
+#: ../libpurple/protocols/oscar/oscar.c:3284
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -9261,7 +9275,7 @@
 "[�亠 �亟舒���� 仂�仂弍�舒亰亳�� �仂仂弍�亠仆亳亠 仂� ��仂亞仂 仗仂仍�亰仂于舒�亠仍�, �舒从 从舒从 仂仆仂 �仂亟亠�亢亳� "
 "仆亠亟仂仗���亳仄�亠 �亳仄于仂仍�.]"

-#: ../libpurple/protocols/oscar/oscar.c:3460
+#: ../libpurple/protocols/oscar/oscar.c:3448
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -9269,53 +9283,53 @@
 "�仂�仍亠亟仆亠亠 仗�亠亟仗�亳仆��仂亠 于舒仄亳 亟亠亶��于亳亠 仆亠 仄仂亢亠� 弍��� 于�仗仂仍仆亠仆仂, �舒从 从舒从 于� "
 "仗�亠于��亳仍亳 仗�亠亟亠仍. �仂亟仂亢亟亳�亠 10 �亠从�仆亟 亳 仗仂仗��舒亶�亠�� �仆仂于舒."

-#: ../libpurple/protocols/oscar/oscar.c:3545
+#: ../libpurple/protocols/oscar/oscar.c:3533
 #: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "�� 弍�仍亳 仂��仂亠亟亳仆亠仆� 仂� �舒�舒 %s."

-#: ../libpurple/protocols/oscar/oscar.c:3776
-#: ../libpurple/protocols/silc/util.c:596
+#: ../libpurple/protocols/oscar/oscar.c:3768
+#: ../libpurple/protocols/silc/util.c:591
 #: ../libpurple/protocols/silc10/util.c:586
 msgid "Mobile Phone"
 msgstr "�仂弍亳仍�仆�亶 �亠仍亠�仂仆"

-#: ../libpurple/protocols/oscar/oscar.c:3806
+#: ../libpurple/protocols/oscar/oscar.c:3798
 msgid "Personal Web Page"
 msgstr "�亠��仂仆舒仍�仆舒� web-���舒仆亳�舒"

-#: ../libpurple/protocols/oscar/oscar.c:3830
+#: ../libpurple/protocols/oscar/oscar.c:3822
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "�仂仗仂仍仆亳�亠仍�仆舒� 亳仆�仂�仄舒�亳�"

-#: ../libpurple/protocols/oscar/oscar.c:3838
-#: ../libpurple/protocols/oscar/oscar.c:3851
+#: ../libpurple/protocols/oscar/oscar.c:3830
+#: ../libpurple/protocols/oscar/oscar.c:3843
 msgid "Zip Code"
 msgstr "�仆亟亠从�"

-#: ../libpurple/protocols/oscar/oscar.c:3862
+#: ../libpurple/protocols/oscar/oscar.c:3854
 msgid "Division"
 msgstr "��亟亠仍"

-#: ../libpurple/protocols/oscar/oscar.c:3863
+#: ../libpurple/protocols/oscar/oscar.c:3855
 msgid "Position"
 msgstr "�仂仍亢仆仂���"

-#: ../libpurple/protocols/oscar/oscar.c:3865
+#: ../libpurple/protocols/oscar/oscar.c:3857
 msgid "Web Page"
 msgstr "Web-���舒仆亳�舒"

-#: ../libpurple/protocols/oscar/oscar.c:3868
+#: ../libpurple/protocols/oscar/oscar.c:3860
 msgid "Work Information"
 msgstr "�仆�仂�仄舒�亳� 仂 �舒弍仂�亠"

-#: ../libpurple/protocols/oscar/oscar.c:3924
+#: ../libpurple/protocols/oscar/oscar.c:3916
 msgid "Pop-Up Message"
 msgstr "��仗仍�于舒��亠亠 �仂仂弍�亠仆亳亠"

-#: ../libpurple/protocols/oscar/oscar.c:3964
+#: ../libpurple/protocols/oscar/oscar.c:3956
 #, c-format
 msgid "The following username is associated with %s"
 msgid_plural "The following usernames are associated with %s"
@@ -9323,64 +9337,64 @@
 msgstr[1] "弌仍亠亟���亳亠 亳仄亠仆舒 仗仂仍�亰仂于舒�亠仍亠亶 �仂仂�仆亠�亠仆� � %s"
 msgstr[2] "弌仍亠亟���亳亠 亳仄亠仆舒 仗仂仍�亰仂于舒�亠仍亠亶 �仂仂�仆亠�亠仆� � %s"

-#: ../libpurple/protocols/oscar/oscar.c:3995
+#: ../libpurple/protocols/oscar/oscar.c:3987
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "�亳�亠亞仂 仆亠 仆舒亶亟亠仆仂 亟仍� 舒亟�亠�舒 e-mail %s"

-#: ../libpurple/protocols/oscar/oscar.c:4016
+#: ../libpurple/protocols/oscar/oscar.c:4008
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "�� 亟仂仍亢仆� 仗仂仍��亳�� e-mail � 仗�仂��弍仂亶 仗仂亟�于亠�亟亳�� %s."

-#: ../libpurple/protocols/oscar/oscar.c:4018
+#: ../libpurple/protocols/oscar/oscar.c:4010
 msgid "Account Confirmation Requested"
 msgstr "�舒仗�仂�亠仆仂 仗仂亟�于亠�亢亟亠仆亳亠 ����仆仂亶 亰舒仗亳�亳"

-#: ../libpurple/protocols/oscar/oscar.c:4051
-#, fuzzy, c-format
+#: ../libpurple/protocols/oscar/oscar.c:4043
+#, 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:4053
-#, fuzzy, c-format
+"��亳弍从舒 0x%04x: �亠 �亟舒���� 仂��仂�仄舒�亳�仂于舒�� 亳仄� 仗仂仍�亰仂于舒�亠仍�, �舒从 从舒从 "
+"亰舒仗�仂�亠仆仆仂亠 亳仄� 仂�仍亳�舒亠��� 仂� 仂�亳亞亳仆舒仍�仆仂亞仂."
+
+#: ../libpurple/protocols/oscar/oscar.c:4045
+#, c-format
 msgid "Error 0x%04x: Unable to format username because it is invalid."
 msgstr ""
-"��亳弍从舒 0x%04x: �亠 �亟舒���� 仂��仂�仄舒�亳�仂于舒�� 亳亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍�, �舒从 "
-"从舒从 仂仆 仆亠亟仂仗���亳仄."
-
-#: ../libpurple/protocols/oscar/oscar.c:4055
-#, fuzzy, c-format
+"��亳弍从舒 0x%04x: �亠 �亟舒���� 仂��仂�仄舒�亳�仂于舒�� 亳仄� 仗仂仍�亰仂于舒�亠仍�, �舒从 从舒从 仂仆仂 "
+"仆亠亟仂仗���亳仄仂."
+
+#: ../libpurple/protocols/oscar/oscar.c:4047
+#, 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:4057
-#, fuzzy, c-format
+"��亳弍从舒 0x%04x: �亠 �亟舒���� 仂��仂�仄舒�亳�仂于舒�� 亳仄� 仗仂仍�亰仂于舒�亠仍�, �舒从 从舒从 "
+"亰舒仗�仂�亠仆仆仂亠 亳仄� �仍亳�从仂仄 于亠仍亳从仂."
+
+#: ../libpurple/protocols/oscar/oscar.c:4049
+#, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this username."
 msgstr ""
-"��亳弍从舒 0x%04x: �亠 �亟舒���� 亳亰仄亠仆亳�� 舒亟�亠� e-mail, �舒从 从舒从 亟仍� ��仂亞仂 "
-"亳亟亠仆�亳�亳从舒�仂�舒 仗仂仍�亰仂于舒�亠仍� �亢亠 亠��� 仂亢亳亟舒��亳亶 亰舒仗�仂�."
-
-#: ../libpurple/protocols/oscar/oscar.c:4059
-#, fuzzy, c-format
+"��亳弍从舒 0x%04x: �亠 �亟舒���� 亳亰仄亠仆亳�� 舒亟�亠� e-mail, �舒从 从舒从 亟仍� ��仂亞仂 亳仄亠仆亳 "
+"仗仂仍�亰仂于舒�亠仍� �亢亠 亠��� 仂亢亳亟舒��亳亶 亰舒仗�仂�."
+
+#: ../libpurple/protocols/oscar/oscar.c:4051
+#, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
 "too many usernames associated with it."
 msgstr ""
 "��亳弍从舒 0x%04x: �亠 �亟舒���� 亳亰仄亠仆亳�� 舒亟�亠� e-mail, �舒从 从舒从 � 亰舒亟舒仆仆�仄 舒亟�亠�仂仄 "
-"�仂仂�仆亠�亠仆仂 �仍亳�从仂仄 仄仆仂亞仂 亳亟亠仆�亳�亳从舒�仂�仂于 仗仂仍�亰仂于舒�亠仍亠亶."
-
-#: ../libpurple/protocols/oscar/oscar.c:4061
+"�仂仂�仆亠�亠仆仂 �仍亳�从仂仄 仄仆仂亞仂 亳仄�仆 仗仂仍�亰仂于舒�亠仍亠亶."
+
+#: ../libpurple/protocols/oscar/oscar.c:4053
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
@@ -9389,36 +9403,36 @@
 "��亳弍从舒 0x%04x: �亠 �亟舒���� 亳亰仄亠仆亳�� 舒亟�亠� e-mail, �舒从 从舒从 亰舒亟舒仆仆�亶 舒亟�亠� "
 "仆亠于亠�亠仆."

-#: ../libpurple/protocols/oscar/oscar.c:4063
+#: ../libpurple/protocols/oscar/oscar.c:4055
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "��亳弍从舒 0x%04x: �亠亳亰于亠��仆舒� 仂�亳弍从舒."

-#: ../libpurple/protocols/oscar/oscar.c:4065
+#: ../libpurple/protocols/oscar/oscar.c:4057
 msgid "Error Changing Account Info"
 msgstr "��亳弍从舒 亳亰仄亠仆亠仆亳� 亳仆�仂�仄舒�亳亳 仂弍 ����仆仂亶 亰舒仗亳�亳"

-#: ../libpurple/protocols/oscar/oscar.c:4071
+#: ../libpurple/protocols/oscar/oscar.c:4063
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "�亟�亠� e-mail 亟仍� %s: %s"

-#: ../libpurple/protocols/oscar/oscar.c:4073
+#: ../libpurple/protocols/oscar/oscar.c:4065
 msgid "Account Info"
 msgstr "�仆�仂�仄舒�亳� 仂弍 ����仆仂亶 亰舒仗亳�亳"

-#: ../libpurple/protocols/oscar/oscar.c:4259
+#: ../libpurple/protocols/oscar/oscar.c:4251
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 "�舒�亠 亳亰仂弍�舒亢亠仆亳亠 仆亠 弍�仍仂 仂�仗�舒于仍亠仆仂. �� 亟仂仍亢仆� 亳仄亠�� 仗��仄仂亠 �仂亠亟亳仆亠仆亳亠 亟仍� "
 "仂�仗�舒于从亳 亳亰仂弍�舒亢亠仆亳亶."

-#: ../libpurple/protocols/oscar/oscar.c:4530
+#: ../libpurple/protocols/oscar/oscar.c:4522
 msgid "Unable to set AIM profile."
 msgstr "�亠 �亟舒���� ���舒仆仂于亳�� 仗�仂�亳仍� AIM."

-#: ../libpurple/protocols/oscar/oscar.c:4531
+#: ../libpurple/protocols/oscar/oscar.c:4523
 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 "
@@ -9428,7 +9442,7 @@
 "于�仂亟舒. �舒� 仗�仂�亳仍� 仂��舒���� 仆亠���舒仆仂于仍亠仆仆�仄; 仗仂仗��舒亶�亠�� ���舒仆仂于亳�� 亠亞仂 亠�� "
 "�舒亰, 从仂亞亟舒 弍�亟亠�亠 仗仂仍仆仂���� 仗仂亟从仍��亠仆�."

-#: ../libpurple/protocols/oscar/oscar.c:4545
+#: ../libpurple/protocols/oscar/oscar.c:4537
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
@@ -9443,11 +9457,11 @@
 msgstr[2] ""
 "�舒从�亳仄舒仍�仆�亶 �舒亰仄亠� 仗�仂�亳仍� 于 %d 弍舒亶� 弍�仍 仗�亠于��亠仆. ��仂�亳仍� 弍�仍 ��亠亰舒仆."

-#: ../libpurple/protocols/oscar/oscar.c:4550
+#: ../libpurple/protocols/oscar/oscar.c:4542
 msgid "Profile too long."
 msgstr "��仂�亳仍� �仍亳�从仂仄 于亠仍亳从."

-#: ../libpurple/protocols/oscar/oscar.c:4594
+#: ../libpurple/protocols/oscar/oscar.c:4586
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -9465,11 +9479,11 @@
 "�舒从�亳仄舒仍�仆�亶 �舒亰仄亠� �仂仂弍�亠仆亳� 仂弍 仂������于亳亳 于 %d 弍舒亶� 弍�仍 仗�亠于��亠仆. "
 "弌仂仂弍�亠仆亳亠 仂弍 仂������于亳亳 弍�仍仂 ��亠亰舒仆仂."

-#: ../libpurple/protocols/oscar/oscar.c:4599
+#: ../libpurple/protocols/oscar/oscar.c:4591
 msgid "Away message too long."
 msgstr "弌仂仂弍�亠仆亳亠 仂弍 仂������于亳亳 �仍亳�从仂仄 于亠仍亳从仂."

-#: ../libpurple/protocols/oscar/oscar.c:4672
+#: ../libpurple/protocols/oscar/oscar.c:4664
 #, c-format
 msgid ""
 "Could not add the buddy %s because the username is invalid.  Usernames must "
@@ -9477,17 +9491,17 @@
 "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
+#: ../libpurple/protocols/oscar/oscar.c:4666
+#: ../libpurple/protocols/oscar/oscar.c:5141
+#: ../libpurple/protocols/oscar/oscar.c:5156
 msgid "Unable To Add"
 msgstr "�亠 �亟舒���� 亟仂弍舒于亳��"

-#: ../libpurple/protocols/oscar/oscar.c:4793
+#: ../libpurple/protocols/oscar/oscar.c:4785
 msgid "Unable To Retrieve Buddy List"
 msgstr "�亠 �亟舒���� 亰舒亞��亰亳�� �仗亳�仂从 �仂弍亠�亠亟仆亳从仂于"

-#: ../libpurple/protocols/oscar/oscar.c:4794
+#: ../libpurple/protocols/oscar/oscar.c:4786
 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."
@@ -9496,15 +9510,15 @@
 "�仂弍亠�亠亟仆亳从仂于 仆亠 仗仂�亠��仆 亳, 于亠�仂��仆仂, ��舒仆亠� 亟仂���仗亠仆 于 �亠�亠仆亳亠 仆亠�从仂仍�从亳� "
 "仄亳仆��."

-#: ../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
+#: ../libpurple/protocols/oscar/oscar.c:4982
+#: ../libpurple/protocols/oscar/oscar.c:4984
+#: ../libpurple/protocols/oscar/oscar.c:5223
+#: ../libpurple/protocols/oscar/oscar.c:5224
+#: ../libpurple/protocols/oscar/oscar.c:5229
 msgid "Orphans"
 msgstr "弌亳�仂��"

-#: ../libpurple/protocols/oscar/oscar.c:5153
+#: ../libpurple/protocols/oscar/oscar.c:5139
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -9513,41 +9527,41 @@
 "�亠 �亟舒仍仂�� 亟仂弍舒于亳�� �仂弍亠�亠亟仆亳从舒 %s, �舒从 从舒从 于 �仗亳�从亠 �仂弍亠�亠亟仆亳从仂于 �仍亳�从仂仄 "
 "仄仆仂亞仂 �仂弍亠�亠亟仆亳从仂于. 丕亟舒仍亳�亠 仂亟仆仂亞仂 亳 仗仂仗��舒亶�亠�� �仆仂于舒."

-#: ../libpurple/protocols/oscar/oscar.c:5153
-#: ../libpurple/protocols/oscar/oscar.c:5168
+#: ../libpurple/protocols/oscar/oscar.c:5139
+#: ../libpurple/protocols/oscar/oscar.c:5154
 msgid "(no name)"
 msgstr "(仆亠� 亳仄亠仆亳)"

-#: ../libpurple/protocols/oscar/oscar.c:5167
+#: ../libpurple/protocols/oscar/oscar.c:5153
 #, c-format
 msgid "Could not add the buddy %s for an unknown reason."
 msgstr "�亠 �亟舒仍仂�� 亟仂弍舒于亳�� �仂弍亠�亠亟仆亳从舒 %s 仗仂 仆亠亳亰于亠��仆仂亶 仗�亳�亳仆亠."

-#: ../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 "
-"want to add them?"
+#: ../libpurple/protocols/oscar/oscar.c:5287
+#, fuzzy, c-format
+msgid ""
+"The user %s has given you permission to add him or her to your buddy list.  "
+"Do you want to add this user?"
 msgstr ""
 "�仂仍�亰仂于舒�亠仍� %s �舒亰�亠�亳仍 亟仂弍舒于亳�� 亠亞仂 于 于舒� �仗亳�仂从 �仂弍亠�亠亟仆亳从仂于. 丱仂�亳�亠 "
 "亟仂弍舒于亳�� 亠亞仂?"

-#: ../libpurple/protocols/oscar/oscar.c:5309
+#: ../libpurple/protocols/oscar/oscar.c:5295
 msgid "Authorization Given"
 msgstr "�于�仂�亳亰舒�亳� 亟舒仆舒"

 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5382
+#: ../libpurple/protocols/oscar/oscar.c:5368
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "�仂仍�亰仂于舒�亠仍� %s �舒亰�亠�亳仍 亟仂弍舒于亳�� 亠亞仂 于 于舒� �仗亳�仂从 �仂弍亠�亠亟仆亳从仂于."

-#: ../libpurple/protocols/oscar/oscar.c:5383
+#: ../libpurple/protocols/oscar/oscar.c:5369
 msgid "Authorization Granted"
 msgstr "�于�仂�亳亰舒�亳� 亟舒仆舒"

 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5386
+#: ../libpurple/protocols/oscar/oscar.c:5372
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -9558,49 +9572,49 @@
 "�仍亠亟���亠亶 仗�亳�亳仆亠:\n"
 "%s"

-#: ../libpurple/protocols/oscar/oscar.c:5387
+#: ../libpurple/protocols/oscar/oscar.c:5373
 msgid "Authorization Denied"
 msgstr "� 舒于�仂�亳亰舒�亳亳 仂�从舒亰舒仆仂"

-#: ../libpurple/protocols/oscar/oscar.c:5423
+#: ../libpurple/protocols/oscar/oscar.c:5409
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "_�弍仄亠仆:"

-#: ../libpurple/protocols/oscar/oscar.c:5536
+#: ../libpurple/protocols/oscar/oscar.c:5522
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 "�亰仂弍�舒亢亠仆亳亠 仆亠 弍�仍仂 仂�仗�舒于仍亠仆仂. �� 仆亠 仄仂亢亠�亠 仂�仗�舒于仍��� 亳亰仂弍�舒亢亠仆亳� 于 �舒�舒� "
 "AIM."

-#: ../libpurple/protocols/oscar/oscar.c:5698
-#: ../libpurple/protocols/oscar/oscar.c:5703
+#: ../libpurple/protocols/oscar/oscar.c:5684
+#: ../libpurple/protocols/oscar/oscar.c:5689
 msgid "Away Message"
 msgstr "弌仂仂弍�亠仆亳亠 仂弍 仂������于亳亳"

-#: ../libpurple/protocols/oscar/oscar.c:5703
+#: ../libpurple/protocols/oscar/oscar.c:5689
 msgid "<i>(retrieving)</i>"
 msgstr "<i>(亰舒亞��亰从舒)</i>"

-#: ../libpurple/protocols/oscar/oscar.c:5903
+#: ../libpurple/protocols/oscar/oscar.c:5889
 msgid "iTunes Music Store Link"
 msgstr ""

-#: ../libpurple/protocols/oscar/oscar.c:6011
+#: ../libpurple/protocols/oscar/oscar.c:5997
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "�仂仄仄亠仆�舒�亳亶 �仂弍亠�亠亟仆亳从舒 亟仍� %s"

-#: ../libpurple/protocols/oscar/oscar.c:6012
+#: ../libpurple/protocols/oscar/oscar.c:5998
 msgid "Buddy Comment:"
 msgstr "�仂仄仄亠仆�舒�亳亶 �仂弍亠�亠亟仆亳从舒:"

-#: ../libpurple/protocols/oscar/oscar.c:6059
+#: ../libpurple/protocols/oscar/oscar.c:6045
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "�� 于�弍�舒仍亳 仂�从���亳亠 仗��仄仂亞仂 �仂亠亟亳仆亠仆亳� � %s."

-#: ../libpurple/protocols/oscar/oscar.c:6063
+#: ../libpurple/protocols/oscar/oscar.c:6049
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
@@ -9608,67 +9622,66 @@
 "丐舒从 从舒从 ��仂 �舒�从�仂亠� 于舒� IP-舒亟�亠�, ��仂 仄仂亢仆仂 ��亳�舒�� �亞�仂亰仂亶 弍亠亰仂仗舒�仆仂��亳. "
 "丱仂�亳�亠 仗�仂亟仂仍亢亳��?"

-#: ../libpurple/protocols/oscar/oscar.c:6069
+#: ../libpurple/protocols/oscar/oscar.c:6055
 #: ../libpurple/protocols/oscar/peer.c:1047
 msgid "C_onnect"
 msgstr "_丕��舒仆仂于亳�� �仂亠亟亳仆亠仆亳亠"

-#: ../libpurple/protocols/oscar/oscar.c:6104
+#: ../libpurple/protocols/oscar/oscar.c:6090
 msgid "Get AIM Info"
 msgstr "�仂仍��亳�� 亳仆�仂�仄舒�亳� AIM"

-#: ../libpurple/protocols/oscar/oscar.c:6110
+#: ../libpurple/protocols/oscar/oscar.c:6096
 msgid "Edit Buddy Comment"
 msgstr "�亰仄亠仆亳�� 从仂仄仄亠仆�舒�亳亶 �仂弍亠�亠亟仆亳从舒"

-#: ../libpurple/protocols/oscar/oscar.c:6118
+#: ../libpurple/protocols/oscar/oscar.c:6104
 msgid "Get Status Msg"
 msgstr "�仂仍��亳�� �仂仂弍�亠仆亳亠 仂 ��舒���亠"

-#: ../libpurple/protocols/oscar/oscar.c:6131
+#: ../libpurple/protocols/oscar/oscar.c:6117
 msgid "Direct IM"
 msgstr "���仄仂亠 �仂亠亟亳仆亠仆亳亠"

-#: ../libpurple/protocols/oscar/oscar.c:6153
+#: ../libpurple/protocols/oscar/oscar.c:6139
 msgid "Re-request Authorization"
 msgstr "�仂于�仂�仆�亶 亰舒仗�仂� 舒于�仂�亳亰舒�亳亳"

-#: ../libpurple/protocols/oscar/oscar.c:6212
+#: ../libpurple/protocols/oscar/oscar.c:6198
 msgid "Require authorization"
 msgstr "丐�亠弍仂于舒�� 舒于�仂�亳亰舒�亳�"

-#: ../libpurple/protocols/oscar/oscar.c:6215
+#: ../libpurple/protocols/oscar/oscar.c:6201
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "弌�舒��� 仆舒 web-���舒仆亳�舒� (于�亰�于舒亠� 仗仂�于仍亠仆亳亠 弌����!)"

-#: ../libpurple/protocols/oscar/oscar.c:6220
+#: ../libpurple/protocols/oscar/oscar.c:6206
 msgid "ICQ Privacy Options"
 msgstr "�舒�舒仄亠��� 从仂仆�亳亟亠仆�亳舒仍�仆仂��亳 ICQ"

-#: ../libpurple/protocols/oscar/oscar.c:6240
+#: ../libpurple/protocols/oscar/oscar.c:6226
 msgid "The new formatting is invalid."
 msgstr "�仂于仂亠 �仂�仄舒�亳�仂于舒仆亳亠 仆亠亟仂仗���亳仄仂."

-#: ../libpurple/protocols/oscar/oscar.c:6241
-#, fuzzy
+#: ../libpurple/protocols/oscar/oscar.c:6227
 msgid "Username formatting can change only capitalization and whitespace."
 msgstr ""
-"个仂�仄舒�亳�仂于舒仆亳亠 亳亟亠仆�亳�亳从舒�仂�舒 仗仂仍�亰仂于舒�亠仍� 仄仂亢亠� 于仍亳��� �仂仍�从仂 仆舒 �亠亞亳��� "
-"弍�从于 亳 仗�仂弍亠仍�."
-
-#: ../libpurple/protocols/oscar/oscar.c:6294
+"个仂�仄舒�亳�仂于舒仆亳亠 亳仄亠仆亳 仗仂仍�亰仂于舒�亠仍� 仄仂亢亠� 于仍亳��� �仂仍�从仂 仆舒 �亠亞亳��� 弍�从于 亳 "
+"仗�仂弍亠仍�."
+
+#: ../libpurple/protocols/oscar/oscar.c:6280
 msgid "Change Address To:"
 msgstr "�亰仄亠仆亳�� 舒亟�亠� 仆舒:"

-#: ../libpurple/protocols/oscar/oscar.c:6340
+#: ../libpurple/protocols/oscar/oscar.c:6326
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>于� 仆亠 仂亢亳亟舒亠�亠 舒于�仂�亳亰舒�亳�</i>"

-#: ../libpurple/protocols/oscar/oscar.c:6343
+#: ../libpurple/protocols/oscar/oscar.c:6329
 msgid "You are awaiting authorization from the following buddies"
 msgstr "�� 仂亢亳亟舒亠�亠 舒于�仂�亳亰舒�亳� 仂� �仍亠亟���亳� �仂弍亠�亠亟仆亳从仂于"

-#: ../libpurple/protocols/oscar/oscar.c:6344
+#: ../libpurple/protocols/oscar/oscar.c:6330
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -9676,72 +9689,72 @@
 "�� 仄仂亢亠�亠 亰舒仗�仂�亳�� 舒于�仂�亳亰舒�亳� 仂� ��亳� �仂弍亠�亠亟仆亳从仂于 仗仂于�仂�仆仂, ��仍从仆�于 仆舒 "
 "仆亳� 仗�舒于仂亶 从仆仂仗从仂亶 仄��亳 亳 于�弍�舒于 \"�仂于�仂�仆�亶 亰舒仗�仂� 舒于�仂�亳亰舒�亳亳\"."

-#: ../libpurple/protocols/oscar/oscar.c:6361
+#: ../libpurple/protocols/oscar/oscar.c:6347
 msgid "Find Buddy by E-Mail"
 msgstr "�舒亶�亳 �仂弍亠�亠亟仆亳从舒 仗仂 e-mail"

-#: ../libpurple/protocols/oscar/oscar.c:6362
+#: ../libpurple/protocols/oscar/oscar.c:6348
 msgid "Search for a buddy by e-mail address"
 msgstr "��从舒�� �仂弍亠�亠亟仆亳从舒 仗仂 舒亟�亠�� e-mail"

-#: ../libpurple/protocols/oscar/oscar.c:6363
+#: ../libpurple/protocols/oscar/oscar.c:6349
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "�于亠亟亳�亠 舒亟�亠� e-mail �仂弍亠�亠亟仆亳从舒, 从仂�仂�仂亞仂 于� 亳�亠�亠."

-#: ../libpurple/protocols/oscar/oscar.c:6366
+#: ../libpurple/protocols/oscar/oscar.c:6352
 msgid "_Search"
 msgstr "_��从舒��"

-#: ../libpurple/protocols/oscar/oscar.c:6524
+#: ../libpurple/protocols/oscar/oscar.c:6510
 msgid "Set User Info (web)..."
 msgstr "丕��舒仆仂于亳�� 仗仂仍�亰仂于舒�亠仍��从�� 亳仆�仂�仄舒�亳� (web)..."

-#: ../libpurple/protocols/oscar/oscar.c:6535
+#: ../libpurple/protocols/oscar/oscar.c:6521
 msgid "Change Password (web)"
 msgstr "�亰仄亠仆亳�� 仗舒�仂仍� (web)"

-#: ../libpurple/protocols/oscar/oscar.c:6539
+#: ../libpurple/protocols/oscar/oscar.c:6525
 msgid "Configure IM Forwarding (web)"
 msgstr "�舒���仂亳�� 仗亠�亠舒亟�亠�舒�亳� 仄亞仆仂于亠仆仆�� �仂仂弍�亠仆亳亶 (web)"

 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6549
+#: ../libpurple/protocols/oscar/oscar.c:6535
 msgid "Set Privacy Options..."
 msgstr "丕��舒仆仂于亳�� 仗舒�舒仄亠��� 从仂仆�亳亟亠仆�亳舒仍�仆仂��亳..."

 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6556
+#: ../libpurple/protocols/oscar/oscar.c:6542
 msgid "Confirm Account"
 msgstr "�仂亟�于亠�亟亳�� ����仆�� 亰舒仗亳��"

-#: ../libpurple/protocols/oscar/oscar.c:6560
+#: ../libpurple/protocols/oscar/oscar.c:6546
 msgid "Display Currently Registered E-Mail Address"
 msgstr "�仂从舒亰舒�� �亠从��亳亶 亰舒�亠亞亳���亳�仂于舒仆仆�亶 舒亟�亠� e-mail"

-#: ../libpurple/protocols/oscar/oscar.c:6564
+#: ../libpurple/protocols/oscar/oscar.c:6550
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "�亰仄亠仆亳�� �亠从��亳亶 亰舒�亠亞亳���亳�仂于舒仆仆�亶 舒亟�亠� e-mail..."

-#: ../libpurple/protocols/oscar/oscar.c:6571
+#: ../libpurple/protocols/oscar/oscar.c:6557
 msgid "Show Buddies Awaiting Authorization"
 msgstr "�仂从舒亰舒�� �仂弍亠�亠亟仆亳从仂于 弍亠亰 舒于�仂�亳亰舒�亳亳"

-#: ../libpurple/protocols/oscar/oscar.c:6577
+#: ../libpurple/protocols/oscar/oscar.c:6563
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "��从舒�� �仂弍亠�亠亟仆亳从舒 仗仂 舒亟�亠�� e-mail..."

-#: ../libpurple/protocols/oscar/oscar.c:6582
+#: ../libpurple/protocols/oscar/oscar.c:6568
 msgid "Search for Buddy by Information"
 msgstr "��从舒�� �仂弍亠�亠亟仆亳从舒 仗仂 亳仆�仂�仄舒�亳亳"

-#: ../libpurple/protocols/oscar/oscar.c:6770
-#, fuzzy
+#: ../libpurple/protocols/oscar/oscar.c:6756
 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"
+"��亠亞亟舒 亳�仗仂仍�亰仂于舒�� 仗�仂从�亳-�亠�于亠� AIM/ICQ\n"
+"亟仍� 仗亠�亠亟舒�亳 �舒亶仍仂于 亳 仗��仄仂亞仂 �仂亠亟亳仆亠仆亳�\n"
 "(仄亠亟仍亠仆仆亠亠, 仆仂 仆亠 �舒�从��于舒亠� 于舒� IP-舒亟�亠�)"

 #: ../libpurple/protocols/oscar/peer.c:699
@@ -10214,20 +10227,18 @@
 msgstr "��亳弍从舒 亰舒仗�仂�舒 仄舒�从亠�舒 于�仂亟舒"

 #: ../libpurple/protocols/qq/login_logout.c:490
-#, fuzzy
 msgid "Unable to login. Check debug log."
-msgstr "�亠 �亟舒���� 亰舒亞��亰亳�� 仄仂亟�仍�"
+msgstr ""

 #: ../libpurple/protocols/qq/login_logout.c:493
-#, fuzzy
 msgid "Unable to login"
-msgstr "�亠 �亟舒���� 亰舒亞��亰亳�� 仄仂亟�仍�"
+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:158
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:238
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1194
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1195
 #: ../libpurple/protocols/yahoo/ycht.c:550
 msgid "Unable to connect."
 msgstr "�亠 �亟舒���� ���舒仆仂于亳�� �仂亠亟亳仆亠仆亳亠."
@@ -10416,161 +10427,161 @@
 msgid "Connection closed (writing)"
 msgstr "弌仂亠亟亳仆亠仆亳亠 �舒亰仂�于舒仆仂 (亰舒仗亳��)"

-#: ../libpurple/protocols/sametime/sametime.c:1293
+#: ../libpurple/protocols/sametime/sametime.c:1294
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>�舒亰于舒仆亳亠 亞��仗仗�:</b> %s<br>"

-#: ../libpurple/protocols/sametime/sametime.c:1294
+#: ../libpurple/protocols/sametime/sametime.c:1295
 #, c-format
 msgid "<b>Notes Group ID:</b> %s<br>"
 msgstr ""

-#: ../libpurple/protocols/sametime/sametime.c:1296
+#: ../libpurple/protocols/sametime/sametime.c:1297
 #, c-format
 msgid "Info for Group %s"
 msgstr "�仆�仂�仄舒�亳� 亟仍� 亞��仗仗� %s"

-#: ../libpurple/protocols/sametime/sametime.c:1298
+#: ../libpurple/protocols/sametime/sametime.c:1299
 msgid "Notes Address Book Information"
 msgstr ""

-#: ../libpurple/protocols/sametime/sametime.c:1330
+#: ../libpurple/protocols/sametime/sametime.c:1331
 msgid "Invite Group to Conference..."
 msgstr ""

-#: ../libpurple/protocols/sametime/sametime.c:1340
+#: ../libpurple/protocols/sametime/sametime.c:1341
 msgid "Get Notes Address Book Info"
 msgstr ""

-#: ../libpurple/protocols/sametime/sametime.c:1507
+#: ../libpurple/protocols/sametime/sametime.c:1508
 msgid "Sending Handshake"
 msgstr ""

-#: ../libpurple/protocols/sametime/sametime.c:1512
+#: ../libpurple/protocols/sametime/sametime.c:1513
 msgid "Waiting for Handshake Acknowledgement"
 msgstr ""

-#: ../libpurple/protocols/sametime/sametime.c:1517
+#: ../libpurple/protocols/sametime/sametime.c:1518
 msgid "Handshake Acknowledged, Sending Login"
 msgstr ""

-#: ../libpurple/protocols/sametime/sametime.c:1522
+#: ../libpurple/protocols/sametime/sametime.c:1523
 msgid "Waiting for Login Acknowledgement"
 msgstr ""

-#: ../libpurple/protocols/sametime/sametime.c:1527
+#: ../libpurple/protocols/sametime/sametime.c:1528
 msgid "Login Redirected"
 msgstr ""

-#: ../libpurple/protocols/sametime/sametime.c:1533
+#: ../libpurple/protocols/sametime/sametime.c:1534
 msgid "Forcing Login"
 msgstr ""

-#: ../libpurple/protocols/sametime/sametime.c:1537
+#: ../libpurple/protocols/sametime/sametime.c:1538
 msgid "Login Acknowledged"
 msgstr ""

-#: ../libpurple/protocols/sametime/sametime.c:1542
+#: ../libpurple/protocols/sametime/sametime.c:1543
 msgid "Starting Services"
 msgstr "�舒仗��从 �仍�亢弍"

-#: ../libpurple/protocols/sametime/sametime.c:1679
+#: ../libpurple/protocols/sametime/sametime.c:1680
 #, c-format
 msgid ""
 "A Sametime administrator has issued the following announcement on server %s"
 msgstr ""

-#: ../libpurple/protocols/sametime/sametime.c:1684
+#: ../libpurple/protocols/sametime/sametime.c:1685
 msgid "Sametime Administrator Announcement"
 msgstr ""

-#: ../libpurple/protocols/sametime/sametime.c:1737
+#: ../libpurple/protocols/sametime/sametime.c:1738
 msgid "Connection reset"
 msgstr "弌弍�仂� �仂亠亟亳仆亠仆亳�"

-#: ../libpurple/protocols/sametime/sametime.c:1749
+#: ../libpurple/protocols/sametime/sametime.c:1750
 #, c-format
 msgid "Error reading from socket: %s"
 msgstr "��亳弍从舒 仗�亳 ��亠仆亳亳 亳亰 �仂从亠�舒: %s"

 #. this is a regular connect, error out
-#: ../libpurple/protocols/sametime/sametime.c:1774
-#: ../libpurple/protocols/sametime/sametime.c:3781
+#: ../libpurple/protocols/sametime/sametime.c:1775
+#: ../libpurple/protocols/sametime/sametime.c:3782
 msgid "Unable to connect to host"
 msgstr "�亠 �亟舒���� �仂亠亟亳仆亳���� � �亰仍仂仄"

-#: ../libpurple/protocols/sametime/sametime.c:1815
+#: ../libpurple/protocols/sametime/sametime.c:1816
 #, c-format
 msgid "Announcement from %s"
 msgstr "�弍��于仍亠仆亳亠 仂� %s"

-#: ../libpurple/protocols/sametime/sametime.c:1989
+#: ../libpurple/protocols/sametime/sametime.c:1990
 msgid "Conference Closed"
 msgstr "�仂仆�亠�亠仆�亳� 亰舒从���舒"

-#: ../libpurple/protocols/sametime/sametime.c:2454
+#: ../libpurple/protocols/sametime/sametime.c:2455
 msgid "Unable to send message: "
 msgstr "�亠 �亟舒���� 仂�仗�舒于亳�� �仂仂弍�亠仆亳亠: "

-#: ../libpurple/protocols/sametime/sametime.c:3010
+#: ../libpurple/protocols/sametime/sametime.c:3011
 msgid "Place Closed"
 msgstr "�亠��仂 亰舒从���仂"

-#: ../libpurple/protocols/sametime/sametime.c:3280
+#: ../libpurple/protocols/sametime/sametime.c:3281
 msgid "Microphone"
 msgstr "�亳从�仂�仂仆"

-#: ../libpurple/protocols/sametime/sametime.c:3281
+#: ../libpurple/protocols/sametime/sametime.c:3282
 msgid "Speakers"
 msgstr "�仂仍仂仆从亳"

-#: ../libpurple/protocols/sametime/sametime.c:3282
+#: ../libpurple/protocols/sametime/sametime.c:3283
 msgid "Video Camera"
 msgstr "�亳亟亠仂从舒仄亠�舒"

-#: ../libpurple/protocols/sametime/sametime.c:3320
-#: ../libpurple/protocols/sametime/sametime.c:4200
+#: ../libpurple/protocols/sametime/sametime.c:3321
+#: ../libpurple/protocols/sametime/sametime.c:4201
 msgid "Supports"
 msgstr "�仂亟亟亠�亢亳于舒亠���"

-#: ../libpurple/protocols/sametime/sametime.c:3325
-#: ../libpurple/protocols/sametime/sametime.c:4174
+#: ../libpurple/protocols/sametime/sametime.c:3326
+#: ../libpurple/protocols/sametime/sametime.c:4175
 msgid "External User"
 msgstr "�仆亠�仆亳亶 仗仂仍�亰仂于舒�亠仍�"

-#: ../libpurple/protocols/sametime/sametime.c:3431
+#: ../libpurple/protocols/sametime/sametime.c:3432
 msgid "Create conference with user"
 msgstr "弌仂亰亟舒�� 从仂仆�亠�亠仆�亳� � 仗仂仍�亰仂于舒�亠仍亠仄"

-#: ../libpurple/protocols/sametime/sametime.c:3432
+#: ../libpurple/protocols/sametime/sametime.c:3433
 #, 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:3436
+#: ../libpurple/protocols/sametime/sametime.c:3437
 msgid "New Conference"
 msgstr "�仂于舒� 从仂仆�亠�亠仆�亳�"

-#: ../libpurple/protocols/sametime/sametime.c:3438
+#: ../libpurple/protocols/sametime/sametime.c:3439
 msgid "Create"
 msgstr "弌仂亰亟舒��"

-#: ../libpurple/protocols/sametime/sametime.c:3503
+#: ../libpurple/protocols/sametime/sametime.c:3504
 msgid "Available Conferences"
 msgstr "�仂���仗仆�亠 从仂仆�亠�亠仆�亳亳"

-#: ../libpurple/protocols/sametime/sametime.c:3509
+#: ../libpurple/protocols/sametime/sametime.c:3510
 msgid "Create New Conference..."
 msgstr "弌仂亰亟舒�� 仆仂于�� 从仂仆�亠�亠仆�亳�..."

-#: ../libpurple/protocols/sametime/sametime.c:3516
+#: ../libpurple/protocols/sametime/sametime.c:3517
 msgid "Invite user to a conference"
 msgstr "��亳亞仍舒�亳�� 仗仂仍�亰仂于舒�亠仍� 于 从仂仆�亠�亠仆�亳�"

-#: ../libpurple/protocols/sametime/sametime.c:3517
+#: ../libpurple/protocols/sametime/sametime.c:3518
 #, c-format
 msgid ""
 "Select a conference from the list below to send an invite to user %s. Select "
@@ -10578,69 +10589,69 @@
 "this user to."
 msgstr ""

-#: ../libpurple/protocols/sametime/sametime.c:3522
+#: ../libpurple/protocols/sametime/sametime.c:3523
 msgid "Invite to Conference"
 msgstr "��亳亞仍舒�亳�� 于 从仂仆�亠�亠仆�亳�"

-#: ../libpurple/protocols/sametime/sametime.c:3613
+#: ../libpurple/protocols/sametime/sametime.c:3614
 msgid "Invite to Conference..."
 msgstr "��亳亞仍舒�亳�� 于 从仂仆�亠�亠仆�亳�..."

-#: ../libpurple/protocols/sametime/sametime.c:3618
+#: ../libpurple/protocols/sametime/sametime.c:3619
 msgid "Send TEST Announcement"
 msgstr ""

-#: ../libpurple/protocols/sametime/sametime.c:3637 ../pidgin/gtkconv.c:4420
+#: ../libpurple/protocols/sametime/sametime.c:3638 ../pidgin/gtkconv.c:4524
 msgid "Topic:"
 msgstr "丐亠仄舒:"

-#: ../libpurple/protocols/sametime/sametime.c:3665
+#: ../libpurple/protocols/sametime/sametime.c:3666
 msgid "No Sametime Community Server specified"
 msgstr ""

-#: ../libpurple/protocols/sametime/sametime.c:3690
+#: ../libpurple/protocols/sametime/sametime.c:3691
 #, 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:3695
+#: ../libpurple/protocols/sametime/sametime.c:3696
 msgid "Meanwhile Connection Setup"
 msgstr ""

-#: ../libpurple/protocols/sametime/sametime.c:3696
+#: ../libpurple/protocols/sametime/sametime.c:3697
 msgid "No Sametime Community Server Specified"
 msgstr ""

-#: ../libpurple/protocols/sametime/sametime.c:3698
+#: ../libpurple/protocols/sametime/sametime.c:3699
 msgid "Connect"
 msgstr "丕��舒仆仂于亳�� �仂亠亟亳仆亠仆亳亠"

-#: ../libpurple/protocols/sametime/sametime.c:4190
+#: ../libpurple/protocols/sametime/sametime.c:4191
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "�亠亳亰于亠��仆仂 (0x%04x)<br>"

-#: ../libpurple/protocols/sametime/sametime.c:4192
+#: ../libpurple/protocols/sametime/sametime.c:4193
 msgid "Last Known Client"
 msgstr "�仂�仍亠亟仆亳亶 亳亰于亠��仆�亶 从仍亳亠仆�"

-#: ../libpurple/protocols/sametime/sametime.c:4356
-#: ../libpurple/protocols/sametime/sametime.c:5561
+#: ../libpurple/protocols/sametime/sametime.c:4357
+#: ../libpurple/protocols/sametime/sametime.c:5562
 msgid "User Name"
 msgstr "�仄� 仗仂仍�亰仂于舒�亠仍�"

-#: ../libpurple/protocols/sametime/sametime.c:4359
-#: ../libpurple/protocols/sametime/sametime.c:5564
+#: ../libpurple/protocols/sametime/sametime.c:4360
+#: ../libpurple/protocols/sametime/sametime.c:5565
 msgid "Sametime ID"
 msgstr "Sametime ID"

-#: ../libpurple/protocols/sametime/sametime.c:4383
+#: ../libpurple/protocols/sametime/sametime.c:4384
 msgid "An ambiguous user ID was entered"
 msgstr ""

-#: ../libpurple/protocols/sametime/sametime.c:4384
+#: ../libpurple/protocols/sametime/sametime.c:4385
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
@@ -10650,22 +10661,22 @@
 "��弍亠�亳�亠 亳亰 �仗亳�从舒 仆亳亢亠 仂亟仆仂亞仂 亳亰 仆亳� 亟仍� 亟仂弍舒于仍亠仆亳� 亠亞仂 于 �仗亳�仂从 "
 "�仂弍亠�亠亟仆亳从仂于."

-#: ../libpurple/protocols/sametime/sametime.c:4389
+#: ../libpurple/protocols/sametime/sametime.c:4390
 msgid "Select User"
 msgstr "��弍亠�亳�亠 仗仂仍�亰仂于舒�亠仍�"

-#: ../libpurple/protocols/sametime/sametime.c:4473
+#: ../libpurple/protocols/sametime/sametime.c:4474
 msgid "Unable to add user: user not found"
 msgstr "�亠 �亟舒���� 亟仂弍舒于亳�� 仗仂仍�亰仂于舒�亠仍�: 仗仂仍�亰仂于舒�亠仍� 仆亠 仆舒亶亟亠仆"

-#: ../libpurple/protocols/sametime/sametime.c:4475
+#: ../libpurple/protocols/sametime/sametime.c:4476
 #, 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:5066
+#: ../libpurple/protocols/sametime/sametime.c:5067
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -10674,63 +10685,63 @@
 "��亳弍从舒 ��亠仆亳� �舒亶仍舒 %s: \n"
 "%s\n"

-#: ../libpurple/protocols/sametime/sametime.c:5201
+#: ../libpurple/protocols/sametime/sametime.c:5202
 msgid "Remotely Stored Buddy List"
 msgstr "弌仂��舒仆�亠仄�亶 �亟舒仍�仆仆仂 �仗亳�仂从 �仂弍亠�亠亟仆亳从仂于"

-#: ../libpurple/protocols/sametime/sametime.c:5206
+#: ../libpurple/protocols/sametime/sametime.c:5207
 msgid "Buddy List Storage Mode"
 msgstr "�亠亢亳仄 ��舒仆亠仆亳� �仗亳�从舒 �仂弍亠�亠亟仆亳从仂于"

-#: ../libpurple/protocols/sametime/sametime.c:5209
+#: ../libpurple/protocols/sametime/sametime.c:5210
 msgid "Local Buddy List Only"
 msgstr "丐仂仍�从仂 仍仂从舒仍�仆�亶 �仗亳�仂从 �仂弍亠�亠亟仆亳从仂于"

-#: ../libpurple/protocols/sametime/sametime.c:5211
+#: ../libpurple/protocols/sametime/sametime.c:5212
 msgid "Merge List from Server"
 msgstr "�弍�亠亟亳仆亳�� �仂 �仗亳�从仂仄 � �亠�于亠�舒"

-#: ../libpurple/protocols/sametime/sametime.c:5213
+#: ../libpurple/protocols/sametime/sametime.c:5214
 msgid "Merge and Save List to Server"
 msgstr "�弍�亠亟亳仆亳�� 亳 �仂��舒仆亳�� �仗亳�仂从 仆舒 �亠�于亠�亠"

-#: ../libpurple/protocols/sametime/sametime.c:5215
+#: ../libpurple/protocols/sametime/sametime.c:5216
 msgid "Synchronize List with Server"
 msgstr "弌亳仆��仂仆亳亰亳�仂于舒�� �仂 �仗亳�从仂仄 � �亠�于亠�舒"

-#: ../libpurple/protocols/sametime/sametime.c:5270
+#: ../libpurple/protocols/sametime/sametime.c:5271
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "�仄仗仂��亳�仂于舒�� �仗亳�仂从 Sametime 亟仍� ����仆仂亶 亰舒仗亳�亳 %s"

-#: ../libpurple/protocols/sametime/sametime.c:5310
+#: ../libpurple/protocols/sametime/sametime.c:5311
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "亅从�仗仂��亳�仂于舒�� �仗亳�仂从 Sametime 亟仍� ����仆仂亶 亰舒仗亳�亳 %s"

-#: ../libpurple/protocols/sametime/sametime.c:5364
+#: ../libpurple/protocols/sametime/sametime.c:5365
 msgid "Unable to add group: group exists"
 msgstr "�亠 �亟舒���� 亟仂弍舒于亳�� 亞��仗仗�: 亞��仗仗舒 ���亠��于�亠�"

-#: ../libpurple/protocols/sametime/sametime.c:5365
+#: ../libpurple/protocols/sametime/sametime.c:5366
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "���仗仗舒 � 亳仄亠仆亠仄 '%s' �亢亠 仗�亳�����于�亠� 于 �仗亳�从亠 �仂弍亠�亠亟仆亳从仂于."

-#: ../libpurple/protocols/sametime/sametime.c:5368
-#: ../libpurple/protocols/sametime/sametime.c:5498
+#: ../libpurple/protocols/sametime/sametime.c:5369
+#: ../libpurple/protocols/sametime/sametime.c:5499
 msgid "Unable to add group"
 msgstr "�亠 �亟舒���� 亟仂弍舒于亳�� 亞��仗仗�"

-#: ../libpurple/protocols/sametime/sametime.c:5427
+#: ../libpurple/protocols/sametime/sametime.c:5428
 msgid "Possible Matches"
 msgstr "�亠�仂��仆�亠 �仂于仗舒亟亠仆亳�"

-#: ../libpurple/protocols/sametime/sametime.c:5443
+#: ../libpurple/protocols/sametime/sametime.c:5444
 msgid "Notes Address Book group results"
 msgstr ""

-#: ../libpurple/protocols/sametime/sametime.c:5444
+#: ../libpurple/protocols/sametime/sametime.c:5445
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -10738,37 +10749,37 @@
 "to your buddy list."
 msgstr ""

-#: ../libpurple/protocols/sametime/sametime.c:5449
+#: ../libpurple/protocols/sametime/sametime.c:5450
 msgid "Select Notes Address Book"
 msgstr ""

-#: ../libpurple/protocols/sametime/sametime.c:5492
+#: ../libpurple/protocols/sametime/sametime.c:5493
 msgid "Unable to add group: group not found"
 msgstr "�亠 �亟舒���� 亟仂弍舒于亳�� 亞��仗仗�: 亞��仗仗舒 仆亠 仆舒亶亟亠仆舒"

-#: ../libpurple/protocols/sametime/sametime.c:5494
+#: ../libpurple/protocols/sametime/sametime.c:5495
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
 "Sametime community."
 msgstr ""

-#: ../libpurple/protocols/sametime/sametime.c:5535
+#: ../libpurple/protocols/sametime/sametime.c:5536
 msgid "Notes Address Book Group"
 msgstr ""

-#: ../libpurple/protocols/sametime/sametime.c:5536
+#: ../libpurple/protocols/sametime/sametime.c:5537
 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:5585
+#: ../libpurple/protocols/sametime/sametime.c:5586
 #, c-format
 msgid "Search results for '%s'"
 msgstr "�亠亰�仍��舒�� 仗仂亳�从舒 亟仍� '%s'"

-#: ../libpurple/protocols/sametime/sametime.c:5586
+#: ../libpurple/protocols/sametime/sametime.c:5587
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -10779,59 +10790,59 @@
 "仄仂亢亠�亠 亟仂弍舒于亳�� ��亳� 仗仂仍�亰仂于舒�亠仍亠亶 于 �仗亳�仂从 �仂弍亠�亠亟仆亳从仂于 亳仍亳 仂�仗�舒于亳�� 亳仄 "
 "�仂仂弍�亠仆亳� � 仗仂仄仂��� 从仆仂仗仂从 亟亠亶��于亳� 仆亳亢亠."

-#: ../libpurple/protocols/sametime/sametime.c:5593 ../pidgin/gtknotify.c:770
+#: ../libpurple/protocols/sametime/sametime.c:5594 ../pidgin/gtknotify.c:794
 msgid "Search Results"
 msgstr "�亠亰�仍��舒�� 仗仂亳�从舒"

-#: ../libpurple/protocols/sametime/sametime.c:5618
+#: ../libpurple/protocols/sametime/sametime.c:5619
 msgid "No matches"
 msgstr "�亠� �仂于仗舒亟亠仆亳亶"

-#: ../libpurple/protocols/sametime/sametime.c:5619
+#: ../libpurple/protocols/sametime/sametime.c:5620
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr ""

-#: ../libpurple/protocols/sametime/sametime.c:5623
+#: ../libpurple/protocols/sametime/sametime.c:5624
 msgid "No Matches"
 msgstr "�亠� �仂于仗舒亟亠仆亳亶"

-#: ../libpurple/protocols/sametime/sametime.c:5660
+#: ../libpurple/protocols/sametime/sametime.c:5661
 msgid "Search for a user"
 msgstr "��从舒�� 仗仂仍�亰仂于舒�亠仍�"

-#: ../libpurple/protocols/sametime/sametime.c:5661
+#: ../libpurple/protocols/sametime/sametime.c:5662
 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:5664
+#: ../libpurple/protocols/sametime/sametime.c:5665
 msgid "User Search"
 msgstr "�仂亳�从 仗仂仍�亰仂于舒�亠仍亠亶"

-#: ../libpurple/protocols/sametime/sametime.c:5677
+#: ../libpurple/protocols/sametime/sametime.c:5678
 msgid "Import Sametime List..."
 msgstr ""

-#: ../libpurple/protocols/sametime/sametime.c:5681
+#: ../libpurple/protocols/sametime/sametime.c:5682
 msgid "Export Sametime List..."
 msgstr ""

-#: ../libpurple/protocols/sametime/sametime.c:5685
+#: ../libpurple/protocols/sametime/sametime.c:5686
 msgid "Add Notes Address Book Group..."
 msgstr ""

-#: ../libpurple/protocols/sametime/sametime.c:5689
+#: ../libpurple/protocols/sametime/sametime.c:5690
 msgid "User Search..."
 msgstr "�仂亳�从 仗仂仍�亰仂于舒�亠仍亠亶..."

-#: ../libpurple/protocols/sametime/sametime.c:5795
+#: ../libpurple/protocols/sametime/sametime.c:5796
 msgid "Force login (ignore server redirects)"
 msgstr ""

 #. pretend to be Sametime Connect
-#: ../libpurple/protocols/sametime/sametime.c:5805
+#: ../libpurple/protocols/sametime/sametime.c:5806
 msgid "Hide client identity"
 msgstr ""

@@ -10962,8 +10973,8 @@
 #: ../libpurple/protocols/silc/buddy.c:496
 #: ../libpurple/protocols/silc/buddy.c:507
 #: ../libpurple/protocols/silc/buddy.c:540
-#: ../libpurple/protocols/silc/ops.c:1518
-#: ../libpurple/protocols/silc/ops.c:1529
+#: ../libpurple/protocols/silc/ops.c:1516
+#: ../libpurple/protocols/silc/ops.c:1527
 #: ../libpurple/protocols/silc10/buddy.c:513
 #: ../libpurple/protocols/silc10/buddy.c:548
 #: ../libpurple/protocols/silc10/ops.c:1494
@@ -10972,8 +10983,8 @@
 msgstr "�仂仍��亳�� 仗�弍仍亳�仆�亶 从仍��"

 #: ../libpurple/protocols/silc/buddy.c:541
-#: ../libpurple/protocols/silc/ops.c:1519
-#: ../libpurple/protocols/silc/ops.c:1530
+#: ../libpurple/protocols/silc/ops.c:1517
+#: ../libpurple/protocols/silc/ops.c:1528
 #: ../libpurple/protocols/silc10/buddy.c:549
 #: ../libpurple/protocols/silc10/ops.c:1495
 #: ../libpurple/protocols/silc10/ops.c:1506
@@ -10989,7 +11000,7 @@

 #: ../libpurple/protocols/silc/buddy.c:623
 #: ../libpurple/protocols/silc/buddy.c:1030
-#: ../libpurple/protocols/silc/chat.c:239
+#: ../libpurple/protocols/silc/chat.c:238
 #: ../libpurple/protocols/silc10/buddy.c:636
 #: ../libpurple/protocols/silc10/buddy.c:1036
 #: ../libpurple/protocols/silc10/chat.c:237
@@ -10997,11 +11008,11 @@
 msgstr "�亠 �亟舒仍仂�� 亰舒亞��亰亳�� 仗�弍仍亳�仆�亶 从仍��"

 #: ../libpurple/protocols/silc/buddy.c:701
-#: ../libpurple/protocols/silc/ops.c:1068
-#: ../libpurple/protocols/silc/ops.c:1183
-#: ../libpurple/protocols/silc/ops.c:1305
-#: ../libpurple/protocols/silc/ops.c:1306
-#: ../libpurple/protocols/silc/ops.c:1324
+#: ../libpurple/protocols/silc/ops.c:1066
+#: ../libpurple/protocols/silc/ops.c:1181
+#: ../libpurple/protocols/silc/ops.c:1303
+#: ../libpurple/protocols/silc/ops.c:1304
+#: ../libpurple/protocols/silc/ops.c:1322
 #: ../libpurple/protocols/silc10/buddy.c:713
 #: ../libpurple/protocols/silc10/ops.c:1087
 #: ../libpurple/protocols/silc10/ops.c:1159
@@ -11012,8 +11023,8 @@
 msgstr "�仂仍�亰仂于舒�亠仍��从舒� 亳仆�仂�仄舒�亳�"

 #: ../libpurple/protocols/silc/buddy.c:702
-#: ../libpurple/protocols/silc/ops.c:1184
-#: ../libpurple/protocols/silc/ops.c:1325
+#: ../libpurple/protocols/silc/ops.c:1182
+#: ../libpurple/protocols/silc/ops.c:1323
 #: ../libpurple/protocols/silc10/buddy.c:714
 #: ../libpurple/protocols/silc10/ops.c:1160
 #: ../libpurple/protocols/silc10/ops.c:1314
@@ -11117,8 +11128,8 @@
 msgstr "�仂弍仂�"

 #: ../libpurple/protocols/silc/buddy.c:1496
-#: ../libpurple/protocols/silc/silc.c:886
-#: ../libpurple/protocols/silc/util.c:525
+#: ../libpurple/protocols/silc/silc.c:959
+#: ../libpurple/protocols/silc/util.c:522
 #: ../libpurple/protocols/silc10/buddy.c:1496
 #: ../libpurple/protocols/silc10/silc.c:660
 #: ../libpurple/protocols/silc10/util.c:515
@@ -11126,8 +11137,8 @@
 msgstr "弌�舒��仍亳于�亶"

 #: ../libpurple/protocols/silc/buddy.c:1498
-#: ../libpurple/protocols/silc/silc.c:888
-#: ../libpurple/protocols/silc/util.c:527
+#: ../libpurple/protocols/silc/silc.c:961
+#: ../libpurple/protocols/silc/util.c:524
 #: ../libpurple/protocols/silc10/buddy.c:1498
 #: ../libpurple/protocols/silc10/silc.c:662
 #: ../libpurple/protocols/silc10/util.c:517
@@ -11135,8 +11146,8 @@
 msgstr "�亠�舒仍�仆�亶"

 #: ../libpurple/protocols/silc/buddy.c:1500
-#: ../libpurple/protocols/silc/silc.c:890
-#: ../libpurple/protocols/silc/util.c:529
+#: ../libpurple/protocols/silc/silc.c:963
+#: ../libpurple/protocols/silc/util.c:526
 #: ../libpurple/protocols/silc10/buddy.c:1500
 #: ../libpurple/protocols/silc10/silc.c:664
 #: ../libpurple/protocols/silc10/util.c:519
@@ -11144,8 +11155,8 @@
 msgstr "�舒��亠�亢亠仆仆�亶"

 #: ../libpurple/protocols/silc/buddy.c:1502
-#: ../libpurple/protocols/silc/silc.c:892
-#: ../libpurple/protocols/silc/util.c:531
+#: ../libpurple/protocols/silc/silc.c:965
+#: ../libpurple/protocols/silc/util.c:528
 #: ../libpurple/protocols/silc10/buddy.c:1502
 #: ../libpurple/protocols/silc10/silc.c:666
 #: ../libpurple/protocols/silc10/util.c:521
@@ -11153,8 +11164,8 @@
 msgstr "�亠于仆���亳亶"

 #: ../libpurple/protocols/silc/buddy.c:1504
-#: ../libpurple/protocols/silc/silc.c:894
-#: ../libpurple/protocols/silc/util.c:533
+#: ../libpurple/protocols/silc/silc.c:967
+#: ../libpurple/protocols/silc/util.c:530
 #: ../libpurple/protocols/silc10/buddy.c:1504
 #: ../libpurple/protocols/silc10/silc.c:668
 #: ../libpurple/protocols/silc10/util.c:523
@@ -11162,8 +11173,8 @@
 msgstr "弌��亟��亳亶��"

 #: ../libpurple/protocols/silc/buddy.c:1506
-#: ../libpurple/protocols/silc/silc.c:896
-#: ../libpurple/protocols/silc/util.c:535
+#: ../libpurple/protocols/silc/silc.c:969
+#: ../libpurple/protocols/silc/util.c:532
 #: ../libpurple/protocols/silc10/buddy.c:1506
 #: ../libpurple/protocols/silc10/silc.c:670
 #: ../libpurple/protocols/silc10/util.c:525
@@ -11171,15 +11182,15 @@
 msgstr "�亠仗仂弍亠亟亳仄�亶"

 #: ../libpurple/protocols/silc/buddy.c:1508
-#: ../libpurple/protocols/silc/util.c:537
+#: ../libpurple/protocols/silc/util.c:534
 #: ../libpurple/protocols/silc10/buddy.c:1508
 #: ../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:539
+#: ../libpurple/protocols/silc/silc.c:973
+#: ../libpurple/protocols/silc/util.c:536
 #: ../libpurple/protocols/silc10/buddy.c:1510
 #: ../libpurple/protocols/silc10/silc.c:674
 #: ../libpurple/protocols/silc10/util.c:529
@@ -11187,8 +11198,8 @@
 msgstr "弌仂仆仆�亶"

 #: ../libpurple/protocols/silc/buddy.c:1512
-#: ../libpurple/protocols/silc/silc.c:902
-#: ../libpurple/protocols/silc/util.c:541
+#: ../libpurple/protocols/silc/silc.c:975
+#: ../libpurple/protocols/silc/util.c:538
 #: ../libpurple/protocols/silc10/buddy.c:1512
 #: ../libpurple/protocols/silc10/silc.c:676
 #: ../libpurple/protocols/silc10/util.c:531
@@ -11196,8 +11207,8 @@
 msgstr "弌从��舒��亳亶"

 #: ../libpurple/protocols/silc/buddy.c:1514
-#: ../libpurple/protocols/silc/silc.c:904
-#: ../libpurple/protocols/silc/util.c:543
+#: ../libpurple/protocols/silc/silc.c:977
+#: ../libpurple/protocols/silc/util.c:540
 #: ../libpurple/protocols/silc10/buddy.c:1514
 #: ../libpurple/protocols/silc10/silc.c:678
 #: ../libpurple/protocols/silc10/util.c:533
@@ -11205,8 +11216,8 @@
 msgstr "�仂亰弍�亢亟�仆仆�亶"

 #: ../libpurple/protocols/silc/buddy.c:1516
-#: ../libpurple/protocols/silc/silc.c:906
-#: ../libpurple/protocols/silc/util.c:545
+#: ../libpurple/protocols/silc/silc.c:979
+#: ../libpurple/protocols/silc/util.c:542
 #: ../libpurple/protocols/silc10/buddy.c:1516
 #: ../libpurple/protocols/silc10/silc.c:680
 #: ../libpurple/protocols/silc10/util.c:535
@@ -11214,35 +11225,35 @@
 msgstr "�亰舒弍仂�亠仆仆�亶"

 #: ../libpurple/protocols/silc/buddy.c:1548
-#: ../libpurple/protocols/silc/ops.c:1222
+#: ../libpurple/protocols/silc/ops.c:1220
 #: ../libpurple/protocols/silc10/buddy.c:1548
 #: ../libpurple/protocols/silc10/ops.c:1202
 msgid "User Modes"
 msgstr "�亠亢亳仄� 仗仂仍�亰仂于舒�亠仍�"

 #: ../libpurple/protocols/silc/buddy.c:1565
-#: ../libpurple/protocols/silc/ops.c:1239
+#: ../libpurple/protocols/silc/ops.c:1237
 #: ../libpurple/protocols/silc10/buddy.c:1565
 #: ../libpurple/protocols/silc10/ops.c:1219
 msgid "Preferred Contact"
 msgstr "��亠亟仗仂�亳�舒亠仄�亶 从仂仆�舒从�"

 #: ../libpurple/protocols/silc/buddy.c:1570
-#: ../libpurple/protocols/silc/ops.c:1244
+#: ../libpurple/protocols/silc/ops.c:1242
 #: ../libpurple/protocols/silc10/buddy.c:1570
 #: ../libpurple/protocols/silc10/ops.c:1224
 msgid "Preferred Language"
 msgstr "��亠亟仗仂�亳�舒亠仄�亶 �亰�从"

 #: ../libpurple/protocols/silc/buddy.c:1575
-#: ../libpurple/protocols/silc/ops.c:1249
+#: ../libpurple/protocols/silc/ops.c:1247
 #: ../libpurple/protocols/silc10/buddy.c:1575
 #: ../libpurple/protocols/silc10/ops.c:1229
 msgid "Device"
 msgstr "丕���仂亶��于仂"

 #: ../libpurple/protocols/silc/buddy.c:1580
-#: ../libpurple/protocols/silc/ops.c:1254
+#: ../libpurple/protocols/silc/ops.c:1252
 #: ../libpurple/protocols/silc10/buddy.c:1580
 #: ../libpurple/protocols/silc10/ops.c:1234
 #: ../libpurple/protocols/silc10/silc.c:728
@@ -11251,7 +11262,7 @@
 msgstr "丼舒�仂于仂亶 仗仂��"

 #: ../libpurple/protocols/silc/buddy.c:1585
-#: ../libpurple/protocols/silc/ops.c:1259
+#: ../libpurple/protocols/silc/ops.c:1257
 #: ../libpurple/protocols/silc10/buddy.c:1585
 #: ../libpurple/protocols/silc10/ops.c:1239
 msgid "Geolocation"
@@ -11278,14 +11289,14 @@
 msgstr "�仂仍��亳�� 仗�弍仍亳�仆�亶 从仍��..."

 #: ../libpurple/protocols/silc/buddy.c:1671
-#: ../libpurple/protocols/silc/ops.c:1627
+#: ../libpurple/protocols/silc/ops.c:1625
 #: ../libpurple/protocols/silc10/buddy.c:1670
 #: ../libpurple/protocols/silc10/ops.c:1624
 msgid "Kill User"
 msgstr "丕弍亳�� 仗仂仍�亰仂于舒�亠仍�"

 #: ../libpurple/protocols/silc/buddy.c:1681
-#: ../libpurple/protocols/silc/chat.c:997
+#: ../libpurple/protocols/silc/chat.c:1000
 #: ../libpurple/protocols/silc10/buddy.c:1680
 #: ../libpurple/protocols/silc10/chat.c:977
 msgid "Draw On Whiteboard"
@@ -11303,7 +11314,7 @@
 msgstr "�舒仆舒仍 %s 仂������于�亠� 于 �亠�亳"

 #: ../libpurple/protocols/silc/chat.c:81
-#: ../libpurple/protocols/silc/chat.c:177
+#: ../libpurple/protocols/silc/chat.c:176
 #: ../libpurple/protocols/silc10/chat.c:81
 #: ../libpurple/protocols/silc10/chat.c:174
 msgid "Channel Information"
@@ -11369,28 +11380,28 @@
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr ""

-#: ../libpurple/protocols/silc/chat.c:238
+#: ../libpurple/protocols/silc/chat.c:237
 #: ../libpurple/protocols/silc10/chat.c:236
 msgid "Add Channel Public Key"
 msgstr "�仂弍舒于亳�� 仗�弍仍亳�仆�亶 从仍�� 从舒仆舒仍舒"

 #. Add new public key
-#: ../libpurple/protocols/silc/chat.c:306
+#: ../libpurple/protocols/silc/chat.c:305
 #: ../libpurple/protocols/silc10/chat.c:291
 msgid "Open Public Key..."
 msgstr "��从���� 仗�弍仍亳�仆�亶 从仍��..."

-#: ../libpurple/protocols/silc/chat.c:425
+#: ../libpurple/protocols/silc/chat.c:424
 #: ../libpurple/protocols/silc10/chat.c:401
 msgid "Channel Passphrase"
 msgstr "�舒�仂仍�仆舒� ��舒亰舒 从舒仆舒仍舒"

-#: ../libpurple/protocols/silc/chat.c:432
+#: ../libpurple/protocols/silc/chat.c:431
 #: ../libpurple/protocols/silc10/chat.c:408
 msgid "Channel Public Keys List"
 msgstr "弌仗亳�仂从 仗�弍仍亳�仆�� 从仍��亠亶 从舒仆舒仍舒"

-#: ../libpurple/protocols/silc/chat.c:437
+#: ../libpurple/protocols/silc/chat.c:436
 #: ../libpurple/protocols/silc10/chat.c:413
 #, c-format
 msgid ""
@@ -11401,11 +11412,11 @@
 "able to join."
 msgstr ""

+#: ../libpurple/protocols/silc/chat.c:445
 #: ../libpurple/protocols/silc/chat.c:446
-#: ../libpurple/protocols/silc/chat.c:447
+#: ../libpurple/protocols/silc/chat.c:482
 #: ../libpurple/protocols/silc/chat.c:483
-#: ../libpurple/protocols/silc/chat.c:484
-#: ../libpurple/protocols/silc/chat.c:931
+#: ../libpurple/protocols/silc/chat.c:934
 #: ../libpurple/protocols/silc10/chat.c:422
 #: ../libpurple/protocols/silc10/chat.c:423
 #: ../libpurple/protocols/silc10/chat.c:461
@@ -11414,143 +11425,143 @@
 msgid "Channel Authentication"
 msgstr "���亠仆�亳�亳从舒�亳� 从舒仆舒仍舒"

-#: ../libpurple/protocols/silc/chat.c:448
-#: ../libpurple/protocols/silc/chat.c:485
+#: ../libpurple/protocols/silc/chat.c:447
+#: ../libpurple/protocols/silc/chat.c:484
 #: ../libpurple/protocols/silc10/chat.c:424
 #: ../libpurple/protocols/silc10/chat.c:463
 msgid "Add / Remove"
 msgstr "�仂弍舒于亳�� / 丕亟舒仍亳��"

-#: ../libpurple/protocols/silc/chat.c:601
+#: ../libpurple/protocols/silc/chat.c:600
 #: ../libpurple/protocols/silc10/chat.c:581
 msgid "Group Name"
 msgstr "�仄� 亞��仗仗�"

-#: ../libpurple/protocols/silc/chat.c:605
-#: ../libpurple/protocols/silc/ops.c:1832
-#: ../libpurple/protocols/silc/silc.c:1163
+#: ../libpurple/protocols/silc/chat.c:604
+#: ../libpurple/protocols/silc/ops.c:1830
+#: ../libpurple/protocols/silc/silc.c:1236
 #: ../libpurple/protocols/silc10/chat.c:585
 #: ../libpurple/protocols/silc10/ops.c:1907
 #: ../libpurple/protocols/silc10/silc.c:937
 msgid "Passphrase"
 msgstr "�舒�仂仍�仆舒� ��舒亰舒"

-#: ../libpurple/protocols/silc/chat.c:616
+#: ../libpurple/protocols/silc/chat.c:615
 #: ../libpurple/protocols/silc10/chat.c:596
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "�于亠亟亳�亠 亳仄� 仍亳�仆仂亶 亞��仗仗� 亳 仗舒�仂仍�仆�� ��舒亰� 从舒仆舒仍舒 %s."

-#: ../libpurple/protocols/silc/chat.c:618
+#: ../libpurple/protocols/silc/chat.c:617
 #: ../libpurple/protocols/silc10/chat.c:598
 msgid "Add Channel Private Group"
 msgstr "�仂弍舒于亳�� 仍亳�仆�� 亞��仗仗� 从舒仆舒仍舒"

-#: ../libpurple/protocols/silc/chat.c:746
+#: ../libpurple/protocols/silc/chat.c:749
 #: ../libpurple/protocols/silc10/chat.c:726
 msgid "User Limit"
 msgstr "��亠亟亠仍 从仂仍亳�亠��于舒 仗仂仍�亰仂于舒�亠仍亠亶"

-#: ../libpurple/protocols/silc/chat.c:747
+#: ../libpurple/protocols/silc/chat.c:750
 #: ../libpurple/protocols/silc10/chat.c:727
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr ""
 "丕��舒仆仂于亳�� 仗�亠亟亠仍 从仂仍亳�亠��于舒 仗仂仍�亰仂于舒�亠仍亠亶 仆舒 从舒仆舒仍亠. 丕��舒仆仂于亳�亠 于 仆仂仍� 亟仍� "
 "�弍�仂�舒 仗�亠亟亠仍舒 从仂仍亳�亠��于舒 仗仂仍�亰仂于舒�亠仍亠亶."

-#: ../libpurple/protocols/silc/chat.c:911
+#: ../libpurple/protocols/silc/chat.c:914
 #: ../libpurple/protocols/silc10/chat.c:891
 msgid "Invite List"
 msgstr "弌仗亳�仂从 仗�亳亞仍舒��仆仆��"

-#: ../libpurple/protocols/silc/chat.c:916
+#: ../libpurple/protocols/silc/chat.c:919
 #: ../libpurple/protocols/silc10/chat.c:896
 msgid "Ban List"
 msgstr "弌仗亳�仂从 亳亰亞仆舒仆仆��"

-#: ../libpurple/protocols/silc/chat.c:924
+#: ../libpurple/protocols/silc/chat.c:927
 #: ../libpurple/protocols/silc10/chat.c:904
 msgid "Add Private Group"
 msgstr "�仂弍舒于亳�� 仍亳�仆�� 亞��仗仗�"

-#: ../libpurple/protocols/silc/chat.c:937
+#: ../libpurple/protocols/silc/chat.c:940
 #: ../libpurple/protocols/silc10/chat.c:917
 msgid "Reset Permanent"
 msgstr "弌弍�仂�亳�� 仗亠�仄舒仆亠仆�仆仂"

-#: ../libpurple/protocols/silc/chat.c:942
+#: ../libpurple/protocols/silc/chat.c:945
 #: ../libpurple/protocols/silc10/chat.c:922
 msgid "Set Permanent"
 msgstr "丕��舒仆仂于亳�� 仗亠�仄舒仆亠仆�仆仂"

-#: ../libpurple/protocols/silc/chat.c:950
+#: ../libpurple/protocols/silc/chat.c:953
 #: ../libpurple/protocols/silc10/chat.c:930
 msgid "Set User Limit"
 msgstr "丕��舒仆仂于亳�� 仗�亠亟亠仍 从仂仍亳�亠��于舒 仗仂仍�亰仂于舒�亠仍亠亶"

-#: ../libpurple/protocols/silc/chat.c:956
+#: ../libpurple/protocols/silc/chat.c:959
 #: ../libpurple/protocols/silc10/chat.c:936
 msgid "Reset Topic Restriction"
 msgstr "弌弍�仂�亳�� 仂亞�舒仆亳�亠仆亳亠 �亠仄�"

-#: ../libpurple/protocols/silc/chat.c:961
+#: ../libpurple/protocols/silc/chat.c:964
 #: ../libpurple/protocols/silc10/chat.c:941
 msgid "Set Topic Restriction"
 msgstr "丕��舒仆仂于亳�� 仂亞�舒仆亳�亠仆亳亠 �亠仄�"

-#: ../libpurple/protocols/silc/chat.c:968
+#: ../libpurple/protocols/silc/chat.c:971
 #: ../libpurple/protocols/silc10/chat.c:948
 msgid "Reset Private Channel"
 msgstr "弌弍�仂�亳�� 仍亳�仆�亶 从舒仆舒仍"

-#: ../libpurple/protocols/silc/chat.c:973
+#: ../libpurple/protocols/silc/chat.c:976
 #: ../libpurple/protocols/silc10/chat.c:953
 msgid "Set Private Channel"
 msgstr "丕��舒仆仂于亳�� 仍亳�仆�亶 从舒仆舒仍"

-#: ../libpurple/protocols/silc/chat.c:980
+#: ../libpurple/protocols/silc/chat.c:983
 #: ../libpurple/protocols/silc10/chat.c:960
 msgid "Reset Secret Channel"
 msgstr "弌弍�仂�亳�� �亠从�亠�仆�亶 从舒仆舒仍"

-#: ../libpurple/protocols/silc/chat.c:985
+#: ../libpurple/protocols/silc/chat.c:988
 #: ../libpurple/protocols/silc10/chat.c:965
 msgid "Set Secret Channel"
 msgstr "丕��舒仆仂于亳�� �亠从�亠�仆�亶 从舒仆舒仍"

-#: ../libpurple/protocols/silc/chat.c:1046
+#: ../libpurple/protocols/silc/chat.c:1049
 #: ../libpurple/protocols/silc10/chat.c:1102
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
 msgstr "�� �仄仂亢亠�亠 于仂亶�亳 于 仍亳�仆�� 亞��仗仗� 仗仂�仍亠 �仂亞仂, 从舒从 于仂亶亟��亠 仆舒 从舒仆舒仍 %s."

-#: ../libpurple/protocols/silc/chat.c:1048
+#: ../libpurple/protocols/silc/chat.c:1051
 #: ../libpurple/protocols/silc10/chat.c:1104
 msgid "Join Private Group"
 msgstr "��亳�仂亠亟亳仆亳���� 从 仍亳�仆仂亶 亞��仗仗亠"

-#: ../libpurple/protocols/silc/chat.c:1049
+#: ../libpurple/protocols/silc/chat.c:1052
 #: ../libpurple/protocols/silc10/chat.c:1105
 msgid "Cannot join private group"
 msgstr "�亠 �亟舒���� 仗�亳�仂亠亟亳仆亳���� 从 仍亳�仆仂亶 亞��仗仗亠"

-#: ../libpurple/protocols/silc/chat.c:1245
-#: ../libpurple/protocols/silc/silc.c:1360
+#: ../libpurple/protocols/silc/chat.c:1248
+#: ../libpurple/protocols/silc/silc.c:1433
 #: ../libpurple/protocols/silc10/chat.c:1299
 #: ../libpurple/protocols/silc10/silc.c:1143
 msgid "Call Command"
 msgstr "��亰于舒�� 从仂仄舒仆亟�"

-#: ../libpurple/protocols/silc/chat.c:1245
-#: ../libpurple/protocols/silc/silc.c:1361
+#: ../libpurple/protocols/silc/chat.c:1248
+#: ../libpurple/protocols/silc/silc.c:1434
 #: ../libpurple/protocols/silc10/chat.c:1299
 #: ../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/silc/chat.c:1249
+#: ../libpurple/protocols/silc/silc.c:1435
 #: ../libpurple/protocols/silc10/chat.c:1300
 #: ../libpurple/protocols/silc10/silc.c:1144
 msgid "Unknown command"
@@ -11694,152 +11705,152 @@
 msgid "Server signoff"
 msgstr "��从仍��亳���� 仂� �亠�于亠�舒"

-#: ../libpurple/protocols/silc/ops.c:998
+#: ../libpurple/protocols/silc/ops.c:997
 #: ../libpurple/protocols/silc10/ops.c:1017
 msgid "Personal Information"
 msgstr "�亠��仂仆舒仍�仆舒� 亳仆�仂�仄舒�亳�"

-#: ../libpurple/protocols/silc/ops.c:1021
+#: ../libpurple/protocols/silc/ops.c:1020
 #: ../libpurple/protocols/silc10/ops.c:1040
 msgid "Birth Day"
 msgstr "�亠仆� �仂亢亟亠仆亳�"

-#: ../libpurple/protocols/silc/ops.c:1029
+#: ../libpurple/protocols/silc/ops.c:1028
 #: ../libpurple/protocols/silc10/ops.c:1048
 msgid "Job Role"
 msgstr "�仂仍亢仆仂���"

-#: ../libpurple/protocols/silc/ops.c:1033
-#: ../libpurple/protocols/silc/silc.c:1156
+#: ../libpurple/protocols/silc/ops.c:1032
+#: ../libpurple/protocols/silc/silc.c:1229
 #: ../libpurple/protocols/silc10/ops.c:1052
 #: ../libpurple/protocols/silc10/silc.c:930
 msgid "Organization"
 msgstr "��亞舒仆亳亰舒�亳�"

-#: ../libpurple/protocols/silc/ops.c:1037
+#: ../libpurple/protocols/silc/ops.c:1036
 #: ../libpurple/protocols/silc10/ops.c:1056
 msgid "Unit"
 msgstr "��亟亠仍"

-#: ../libpurple/protocols/silc/ops.c:1061
+#: ../libpurple/protocols/silc/ops.c:1060
 #: ../libpurple/protocols/silc10/ops.c:1080
 msgid "Note"
 msgstr "�舒仄亠�从亳"

-#: ../libpurple/protocols/silc/ops.c:1108
+#: ../libpurple/protocols/silc/ops.c:1106
 #: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Join Chat"
 msgstr "��亳�仂亠亟亳仆亳���� 从 �舒��"

-#: ../libpurple/protocols/silc/ops.c:1142
+#: ../libpurple/protocols/silc/ops.c:1140
 #: ../libpurple/protocols/silc10/chat.c:1039
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "�� �于仍�亠�亠�� 仂�仆仂于舒�亠仍亠仄 从舒仆舒仍舒 仆舒 <I>%s</I>"

-#: ../libpurple/protocols/silc/ops.c:1146
+#: ../libpurple/protocols/silc/ops.c:1144
 #: ../libpurple/protocols/silc10/chat.c:1043
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "��仆仂于舒�亠仍亠仄 从舒仆舒仍舒 仆舒 <I>%s</I> �于仍�亠��� <I>%s</I>"

-#: ../libpurple/protocols/silc/ops.c:1205
-#: ../libpurple/protocols/silc/ops.c:1343
+#: ../libpurple/protocols/silc/ops.c:1203
+#: ../libpurple/protocols/silc/ops.c:1341
 #: ../libpurple/protocols/silc10/ops.c:1183
 #: ../libpurple/protocols/silc10/ops.c:1332
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1078
 msgid "Real Name"
 msgstr "�舒��仂��亠亠 亳仄�"

-#: ../libpurple/protocols/silc/ops.c:1233
+#: ../libpurple/protocols/silc/ops.c:1231
 #: ../libpurple/protocols/silc10/ops.c:1213
 msgid "Status Text"
 msgstr "丐亠从�� ��舒���舒"

-#: ../libpurple/protocols/silc/ops.c:1295
-#: ../libpurple/protocols/silc/ops.c:1369
+#: ../libpurple/protocols/silc/ops.c:1293
+#: ../libpurple/protocols/silc/ops.c:1367
 #: ../libpurple/protocols/silc10/ops.c:1285
 #: ../libpurple/protocols/silc10/ops.c:1357
 msgid "Public Key Fingerprint"
 msgstr ""

-#: ../libpurple/protocols/silc/ops.c:1296
-#: ../libpurple/protocols/silc/ops.c:1370
+#: ../libpurple/protocols/silc/ops.c:1294
+#: ../libpurple/protocols/silc/ops.c:1368
 #: ../libpurple/protocols/silc10/ops.c:1286
 #: ../libpurple/protocols/silc10/ops.c:1358
 msgid "Public Key Babbleprint"
 msgstr ""

-#: ../libpurple/protocols/silc/ops.c:1309
+#: ../libpurple/protocols/silc/ops.c:1307
 #: ../libpurple/protocols/silc10/ops.c:1298
 msgid "_More..."
 msgstr "_���..."

-#: ../libpurple/protocols/silc/ops.c:1388
-#: ../libpurple/protocols/silc/silc.c:1220
+#: ../libpurple/protocols/silc/ops.c:1386
+#: ../libpurple/protocols/silc/silc.c:1293
 #: ../libpurple/protocols/silc10/ops.c:1371
 #: ../libpurple/protocols/silc10/silc.c:994
 msgid "Detach From Server"
 msgstr "�舒亰仂�于舒�� �仂亠亟亳仆亠仆亳亠 � �亠�于亠�仂仄"

-#: ../libpurple/protocols/silc/ops.c:1388
+#: ../libpurple/protocols/silc/ops.c:1386
 #: ../libpurple/protocols/silc10/ops.c:1371
 msgid "Cannot detach"
 msgstr "�亠 �亟舒���� �舒亰仂�于舒�� �仂亠亟亳仆亠仆亳亠"

-#: ../libpurple/protocols/silc/ops.c:1408
+#: ../libpurple/protocols/silc/ops.c:1406
 #: ../libpurple/protocols/silc10/ops.c:1382
 msgid "Cannot set topic"
 msgstr "�亠 �亟舒���� ���舒仆仂于亳�� �亠仄�"

-#: ../libpurple/protocols/silc/ops.c:1437
+#: ../libpurple/protocols/silc/ops.c:1435
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Failed to change nickname"
 msgstr "�亠 �亟舒仍仂�� 亳亰仄亠仆亳�� 仗�亠于亟仂仆亳仄"

-#: ../libpurple/protocols/silc/ops.c:1486
+#: ../libpurple/protocols/silc/ops.c:1484
 #: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Roomlist"
 msgstr "弌仗亳�仂从 从仂仄仆舒�"

-#: ../libpurple/protocols/silc/ops.c:1486
+#: ../libpurple/protocols/silc/ops.c:1484
 #: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Cannot get room list"
 msgstr "�亠 �亟舒���� 仗仂仍��亳�� �仗亳�仂从 从仂仄仆舒�"

-#: ../libpurple/protocols/silc/ops.c:1487
+#: ../libpurple/protocols/silc/ops.c:1485
 msgid "Network is empty"
 msgstr "弌亠�� 仗���舒"

-#: ../libpurple/protocols/silc/ops.c:1531
+#: ../libpurple/protocols/silc/ops.c:1529
 #: ../libpurple/protocols/silc10/ops.c:1507
 msgid "No public key was received"
 msgstr "�亠 弍�仍仂 仗仂仍��亠仆仂 仗�弍仍亳�仆�� 从仍��亠亶"

-#: ../libpurple/protocols/silc/ops.c:1543
-#: ../libpurple/protocols/silc/ops.c:1556
+#: ../libpurple/protocols/silc/ops.c:1541
+#: ../libpurple/protocols/silc/ops.c:1554
 #: ../libpurple/protocols/silc10/ops.c:1519
 #: ../libpurple/protocols/silc10/ops.c:1532
 msgid "Server Information"
 msgstr "�仆�仂�仄舒�亳� 仂 �亠�于亠�亠"

-#: ../libpurple/protocols/silc/ops.c:1544
+#: ../libpurple/protocols/silc/ops.c:1542
 #: ../libpurple/protocols/silc10/ops.c:1520
 msgid "Cannot get server information"
 msgstr "�亠 �亟舒���� 仗仂仍��亳�� 亳仆�仂�仄舒�亳� 仂 �亠�于亠�亠"

-#: ../libpurple/protocols/silc/ops.c:1567
+#: ../libpurple/protocols/silc/ops.c:1565
 #: ../libpurple/protocols/silc10/ops.c:1549
 #: ../libpurple/protocols/silc10/ops.c:1558
 msgid "Server Statistics"
 msgstr "弌�舒�亳��亳从舒 �亠�于亠�舒"

-#: ../libpurple/protocols/silc/ops.c:1568
+#: ../libpurple/protocols/silc/ops.c:1566
 #: ../libpurple/protocols/silc10/ops.c:1550
 msgid "Cannot get server statistics"
 msgstr "�亠 �亟舒���� 仗仂仍��亳�� ��舒�亳��亳从� �亠�于亠�舒"

-#: ../libpurple/protocols/silc/ops.c:1575
+#: ../libpurple/protocols/silc/ops.c:1573
 #: ../libpurple/protocols/silc10/ops.c:1581
 #, c-format
 msgid ""
@@ -11860,54 +11871,54 @@
 "Total router operators: %d\n"
 msgstr ""

-#: ../libpurple/protocols/silc/ops.c:1607
+#: ../libpurple/protocols/silc/ops.c:1605
 #: ../libpurple/protocols/silc10/ops.c:1604
 msgid "Network Statistics"
 msgstr "弌�舒�亳��亳从舒 �亠�亳"

-#: ../libpurple/protocols/silc/ops.c:1615
+#: ../libpurple/protocols/silc/ops.c:1613
 #: ../libpurple/protocols/silc10/ops.c:1612
 msgid "Ping failed"
 msgstr ""

-#: ../libpurple/protocols/silc/ops.c:1620
+#: ../libpurple/protocols/silc/ops.c:1618
 #: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping reply received from server"
 msgstr ""

-#: ../libpurple/protocols/silc/ops.c:1628
+#: ../libpurple/protocols/silc/ops.c:1626
 #: ../libpurple/protocols/silc10/ops.c:1625
 msgid "Could not kill user"
 msgstr "�亠 �亟舒仍仂�� �弍亳�� 仗仂仍�亰仂于舒�亠仍�"

-#: ../libpurple/protocols/silc/ops.c:1667
+#: ../libpurple/protocols/silc/ops.c:1665
 msgid "WATCH"
 msgstr "����豫��丐亂"

-#: ../libpurple/protocols/silc/ops.c:1667
+#: ../libpurple/protocols/silc/ops.c:1665
 msgid "Cannot watch user"
 msgstr "�亠 �亟舒���� 仆舒弍仍�亟舒�� 亰舒 仗仂仍�亰仂于舒�亠仍亠仄"

-#: ../libpurple/protocols/silc/ops.c:1743
-#: ../libpurple/protocols/silc/ops.c:1794
-#: ../libpurple/protocols/silc/silc.c:385
+#: ../libpurple/protocols/silc/ops.c:1741
+#: ../libpurple/protocols/silc/ops.c:1792
+#: ../libpurple/protocols/silc/silc.c:394
 #: ../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:1745
+#: ../libpurple/protocols/silc/ops.c:1743
 #: ../libpurple/protocols/silc10/ops.c:1819
 msgid "Authenticating connection"
 msgstr "���亠仆�亳�亳从舒�亳� �仂亠亟亳仆亠仆亳�"

-#: ../libpurple/protocols/silc/ops.c:1796
+#: ../libpurple/protocols/silc/ops.c:1794
 #: ../libpurple/protocols/silc10/ops.c:1866
 msgid "Verifying server public key"
 msgstr "��仂于亠�从舒 仗�弍仍亳�仆仂亞仂 从仍��舒 �亠�于亠�舒"

-#: ../libpurple/protocols/silc/ops.c:1833
+#: ../libpurple/protocols/silc/ops.c:1831
 #: ../libpurple/protocols/silc10/ops.c:1908
 msgid "Passphrase required"
 msgstr "丐�亠弍�亠��� 仗舒�仂仍�仆舒� ��舒亰舒"
@@ -11978,59 +11989,61 @@
 msgid "Connection failed"
 msgstr "�亠 �亟舒仍仂�� ���舒仆仂于亳�� �仂亠亟亳仆亠仆亳亠"

-#: ../libpurple/protocols/silc/silc.c:388
+#: ../libpurple/protocols/silc/silc.c:397
 #: ../libpurple/protocols/silc10/silc.c:196
 msgid "Performing key exchange"
 msgstr "��仗仂仍仆亠仆亳亠 仂弍仄亠仆舒 从仍��舒仄亳"

+#: ../libpurple/protocols/silc/silc.c:449
+#: ../libpurple/protocols/silc10/silc.c:361
+msgid "Unable to create connection"
+msgstr "�亠 �亟舒���� �仂亰亟舒�� �仂亠亟亳仆亠仆亳亠"
+
+#: ../libpurple/protocols/silc/silc.c:492
+#: ../libpurple/protocols/silc/silc.c:508
+#: ../libpurple/protocols/silc/silc.c:537
+#: ../libpurple/protocols/silc10/silc.c:340
+msgid "Could not load SILC key pair"
+msgstr "�亠 �亟舒仍仂�� 亰舒亞��亰亳�� 仗舒�� 从仍��亠亶 SILC"
+
 #. Progress
-#: ../libpurple/protocols/silc/silc.c:445
+#: ../libpurple/protocols/silc/silc.c:522
 #: ../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:361
-msgid "Unable to create connection"
-msgstr "�亠 �亟舒���� �仂亰亟舒�� �仂亠亟亳仆亠仆亳亠"
-
-#: ../libpurple/protocols/silc/silc.c:499
+#: ../libpurple/protocols/silc/silc.c:568
 #: ../libpurple/protocols/silc10/silc.c:271
 msgid "Out of memory"
 msgstr "�亠亟仂��舒�仂�仆仂 仗舒仄��亳"

-#: ../libpurple/protocols/silc/silc.c:550
+#: ../libpurple/protocols/silc/silc.c:619
 #: ../libpurple/protocols/silc10/silc.c:317
 msgid "Cannot initialize SILC protocol"
 msgstr "�亠 �亟舒���� 亳仆亳�亳舒仍亳亰亳�仂于舒�� 仗�仂�仂从仂仍 SILC"

-#: ../libpurple/protocols/silc/silc.c:559
+#: ../libpurple/protocols/silc/silc.c:632
 #: ../libpurple/protocols/silc10/silc.c:324
 msgid "Error loading SILC key pair"
 msgstr "��亳弍从舒 亰舒亞��亰从亳 仗舒�� 从仍��亠亶 SILC"

-#: ../libpurple/protocols/silc/silc.c:882
+#: ../libpurple/protocols/silc/silc.c:955
 #: ../libpurple/protocols/silc10/silc.c:656
 msgid "Your Current Mood"
 msgstr "�舒�亠 �亠从��亠亠 仆舒���仂亠仆亳亠"

-#: ../libpurple/protocols/silc/silc.c:884
-#: ../libpurple/protocols/silc10/silc.c:658 ../pidgin/gtkprefs.c:1685
+#: ../libpurple/protocols/silc/silc.c:957
+#: ../libpurple/protocols/silc10/silc.c:658 ../pidgin/gtkprefs.c:1795
 #, c-format
 msgid "Normal"
 msgstr "�仂�仄舒仍�仆仂"

-#: ../libpurple/protocols/silc/silc.c:898
+#: ../libpurple/protocols/silc/silc.c:971
 #: ../libpurple/protocols/silc10/silc.c:672
 msgid "In love"
 msgstr "�仍�弍仍�仆仆�亶"

-#: ../libpurple/protocols/silc/silc.c:909
+#: ../libpurple/protocols/silc/silc.c:982
 #: ../libpurple/protocols/silc10/silc.c:683
 msgid ""
 "\n"
@@ -12039,62 +12052,62 @@
 "\n"
 "��亠亟仗仂�亳�舒亠仄�亠 于舒仄亳 �仗仂�仂弍� 从仂仆�舒从�舒"

-#: ../libpurple/protocols/silc/silc.c:917
-#: ../libpurple/protocols/silc/util.c:571
+#: ../libpurple/protocols/silc/silc.c:990
+#: ../libpurple/protocols/silc/util.c:567
 #: ../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:573
+#: ../libpurple/protocols/silc/silc.c:992
+#: ../libpurple/protocols/silc/util.c:569
 #: ../libpurple/protocols/silc10/silc.c:693
 #: ../libpurple/protocols/silc10/util.c:563
 msgid "MMS"
 msgstr "MMS"

-#: ../libpurple/protocols/silc/silc.c:921
+#: ../libpurple/protocols/silc/silc.c:994
 #: ../libpurple/protocols/silc10/silc.c:695
 msgid "Video conferencing"
 msgstr "�亳亟亠仂从仂仆�亠�亠仆�亳�"

-#: ../libpurple/protocols/silc/silc.c:926
+#: ../libpurple/protocols/silc/silc.c:999
 #: ../libpurple/protocols/silc10/silc.c:700
 msgid "Your Current Status"
 msgstr "�舒� �亠从��亳亶 ��舒���"

-#: ../libpurple/protocols/silc/silc.c:933
+#: ../libpurple/protocols/silc/silc.c:1006
 #: ../libpurple/protocols/silc10/silc.c:707
 msgid "Online Services"
 msgstr "弌亠�亠于�亠 �仍�亢弍�"

-#: ../libpurple/protocols/silc/silc.c:936
+#: ../libpurple/protocols/silc/silc.c:1009
 #: ../libpurple/protocols/silc10/silc.c:710
 msgid "Let others see what services you are using"
 msgstr "�仂亰于仂仍亳�� 亟��亞亳仄 于亳亟亠��, 从舒从亳亠 �仍�亢弍� 于� 亳�仗仂仍�亰�亠�亠"

-#: ../libpurple/protocols/silc/silc.c:942
+#: ../libpurple/protocols/silc/silc.c:1015
 #: ../libpurple/protocols/silc10/silc.c:716
 msgid "Let others see what computer you are using"
 msgstr "�仂亰于仂仍亳�� 亟��亞亳仄 于亳亟亠��, 从舒从仂亶 从仂仄仗���亠� 于� 亳�仗仂仍�亰�亠�亠"

-#: ../libpurple/protocols/silc/silc.c:949
+#: ../libpurple/protocols/silc/silc.c:1022
 #: ../libpurple/protocols/silc10/silc.c:723
 msgid "Your VCard File"
 msgstr "�舒� �舒亶仍 VCard"

-#: ../libpurple/protocols/silc/silc.c:955
+#: ../libpurple/protocols/silc/silc.c:1028
 msgid "Timezone (UTC)"
 msgstr "丼舒�仂于仂亶 仗仂�� (UTC)"

-#: ../libpurple/protocols/silc/silc.c:959
-#: ../libpurple/protocols/silc/silc.c:960
+#: ../libpurple/protocols/silc/silc.c:1032
+#: ../libpurple/protocols/silc/silc.c:1033
 #: ../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/silc/silc.c:1034
 #: ../libpurple/protocols/silc10/silc.c:737
 msgid ""
 "You can let other users see your online status information and your personal "
@@ -12105,31 +12118,31 @@
 "��舒���亠 亳 于舒�� 仗亠��仂仆舒仍�仆�� 亳仆�仂�仄舒�亳�. �于亠亟亳�亠 亳仆�仂�仄舒�亳� 仂 �亠弍亠, 从仂�仂��� "
 "于� �仂�亠仍亳 弍� �亟亠仍舒�� 亟仂���仗仆仂亶 亟仍� 仗�仂�仄仂��舒 亟��亞亳仄亳 仗仂仍�亰仂于舒�亠仍�仄亳."

-#: ../libpurple/protocols/silc/silc.c:1002
-#: ../libpurple/protocols/silc/silc.c:1008
-#: ../libpurple/protocols/silc/silc.c:1629
+#: ../libpurple/protocols/silc/silc.c:1075
+#: ../libpurple/protocols/silc/silc.c:1081
+#: ../libpurple/protocols/silc/silc.c:1702
 #: ../libpurple/protocols/silc10/silc.c:778
 #: ../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/silc/silc.c:1075
 #: ../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/silc/silc.c:1076
+#: ../libpurple/protocols/silc/silc.c:1697
 #: ../libpurple/protocols/silc10/silc.c:779
 #: ../libpurple/protocols/silc10/silc.c:1416
 msgid "There is no Message of the Day associated with this connection"
 msgstr "�亠� �仂仂弍�亠仆亳� 亟仆�, �仂仂�仆亠��仆仆仂亞仂 � ��亳仄 �仂亠亟亳仆亠仆亳亠仄"

-#: ../libpurple/protocols/silc/silc.c:1054
-#: ../libpurple/protocols/silc/silc.c:1100
-#: ../libpurple/protocols/silc/silc.c:1171
-#: ../libpurple/protocols/silc/silc.c:1172
+#: ../libpurple/protocols/silc/silc.c:1127
+#: ../libpurple/protocols/silc/silc.c:1173
+#: ../libpurple/protocols/silc/silc.c:1244
+#: ../libpurple/protocols/silc/silc.c:1245
 #: ../libpurple/protocols/silc10/silc.c:830
 #: ../libpurple/protocols/silc10/silc.c:874
 #: ../libpurple/protocols/silc10/silc.c:945
@@ -12137,134 +12150,134 @@
 msgid "Create New SILC Key Pair"
 msgstr "弌仂亰亟舒�� 仆仂于�� 仗舒�� 从仍��亠亶 SILC"

-#: ../libpurple/protocols/silc/silc.c:1054
+#: ../libpurple/protocols/silc/silc.c:1127
 #: ../libpurple/protocols/silc10/silc.c:830
 msgid "Passphrases do not match"
 msgstr "�舒�仂仍�仆�亠 ��舒亰� 仆亠 �仂于仗舒亟舒��"

-#: ../libpurple/protocols/silc/silc.c:1100
+#: ../libpurple/protocols/silc/silc.c:1173
 #: ../libpurple/protocols/silc10/silc.c:874
 msgid "Key Pair Generation failed"
 msgstr "�亠 �亟舒仍仂�� 于�仗仂仍仆亳�� 亞亠仆亠�舒�亳� 仗舒�� 从仍��亠亶"

-#: ../libpurple/protocols/silc/silc.c:1139
+#: ../libpurple/protocols/silc/silc.c:1212
 #: ../libpurple/protocols/silc10/silc.c:913
 msgid "Key length"
 msgstr "�仍亳仆舒 从仍��舒"

-#: ../libpurple/protocols/silc/silc.c:1141
+#: ../libpurple/protocols/silc/silc.c:1214
 #: ../libpurple/protocols/silc10/silc.c:915
 msgid "Public key file"
 msgstr "个舒亶仍 仗�弍仍亳�仆仂亞仂 从仍��舒"

-#: ../libpurple/protocols/silc/silc.c:1143
+#: ../libpurple/protocols/silc/silc.c:1216
 #: ../libpurple/protocols/silc10/silc.c:917
 msgid "Private key file"
 msgstr "个舒亶仍 仍亳�仆仂亞仂 从仍��舒"

-#: ../libpurple/protocols/silc/silc.c:1166
+#: ../libpurple/protocols/silc/silc.c:1239
 #: ../libpurple/protocols/silc10/silc.c:940
 msgid "Passphrase (retype)"
 msgstr "�舒�仂仍�仆舒� ��舒亰舒 (仆舒弍亠�亳�亠 亠�� �舒亰)"

-#: ../libpurple/protocols/silc/silc.c:1173
+#: ../libpurple/protocols/silc/silc.c:1246
 #: ../libpurple/protocols/silc10/silc.c:947
 msgid "Generate Key Pair"
 msgstr "弌亞亠仆亠�亳�仂于舒�� 仗舒�� 从仍��亠亶"

-#: ../libpurple/protocols/silc/silc.c:1216
+#: ../libpurple/protocols/silc/silc.c:1289
 #: ../libpurple/protocols/silc10/silc.c:990
 msgid "Online Status"
 msgstr "弌亠�亠于仂亶 ��舒���"

-#: ../libpurple/protocols/silc/silc.c:1224
+#: ../libpurple/protocols/silc/silc.c:1297
 #: ../libpurple/protocols/silc10/silc.c:998
 msgid "View Message of the Day"
 msgstr "��仂�仄仂��亠�� �仂仂弍�亠仆亳亠 亟仆�"

-#: ../libpurple/protocols/silc/silc.c:1228
+#: ../libpurple/protocols/silc/silc.c:1301
 #: ../libpurple/protocols/silc10/silc.c:1002
 msgid "Create SILC Key Pair..."
 msgstr "弌仂亰亟舒�� 仗舒�� 从仍��亠亶 SILC..."

-#: ../libpurple/protocols/silc/silc.c:1320
+#: ../libpurple/protocols/silc/silc.c:1393
 #: ../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/silc/silc.c:1573
 #: ../libpurple/protocols/silc10/silc.c:1292
 msgid "Topic too long"
 msgstr "丐亠仄舒 �仍亳�从仂仄 于亠仍亳从舒"

-#: ../libpurple/protocols/silc/silc.c:1581
+#: ../libpurple/protocols/silc/silc.c:1654
 #: ../libpurple/protocols/silc10/silc.c:1373
 msgid "You must specify a nick"
 msgstr "�� 亟仂仍亢仆� �从舒亰舒�� 仗�亠于亟仂仆亳仄"

-#: ../libpurple/protocols/silc/silc.c:1683
+#: ../libpurple/protocols/silc/silc.c:1756
 #: ../libpurple/protocols/silc10/silc.c:1475
 #, c-format
 msgid "channel %s not found"
 msgstr "从舒仆舒仍 %s 仆亠 仆舒亶亟亠仆"

-#: ../libpurple/protocols/silc/silc.c:1688
+#: ../libpurple/protocols/silc/silc.c:1761
 #: ../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/silc/silc.c:1763
 #: ../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/silc/silc.c:1776
 #: ../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/silc/silc.c:1806
 #: ../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/silc/silc.c:1869
 #: ../libpurple/protocols/silc10/silc.c:1588
 msgid "part [channel]:  Leave the chat"
 msgstr "part [从舒仆舒仍]:  �仂从亳仆��� �舒�"

-#: ../libpurple/protocols/silc/silc.c:1800
+#: ../libpurple/protocols/silc/silc.c:1873
 #: ../libpurple/protocols/silc10/silc.c:1592
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [从舒仆舒仍]:  �仂从亳仆��� �舒�"

-#: ../libpurple/protocols/silc/silc.c:1804
+#: ../libpurple/protocols/silc/silc.c:1877
 #: ../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/silc/silc.c:1882
 #: ../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/silc/silc.c:1886
 #: ../libpurple/protocols/silc10/silc.c:1605
 msgid "list:  List channels on this network"
 msgstr "list:  ��于亠��亳 �仗亳�仂从 从舒仆舒仍仂于 于 ��仂亶 �亠�亳"

-#: ../libpurple/protocols/silc/silc.c:1817
+#: ../libpurple/protocols/silc/silc.c:1890
 #: ../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/silc/silc.c:1894
 #: ../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"
@@ -12272,58 +12285,58 @@
 "msg &lt;仗�亠于亟仂仆亳仄&gt; &lt;�仂仂弍�亠仆亳亠&gt;:  ��仗�舒于亳�� 仗仂仍�亰仂于舒�亠仍� 仍亳�仆仂亠 "
 "�仂仂弍�亠仆亳亠"

-#: ../libpurple/protocols/silc/silc.c:1825
+#: ../libpurple/protocols/silc/silc.c:1898
 #: ../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/silc/silc.c:1902
 #: ../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/silc/silc.c:1906
 #: ../libpurple/protocols/silc10/silc.c:1625
 msgid "detach:  Detach this session"
 msgstr "detach:  ��亠�于舒�� ��� �亠��亳�"

-#: ../libpurple/protocols/silc/silc.c:1837
+#: ../libpurple/protocols/silc/silc.c:1910
 #: ../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/silc/silc.c:1914
 #: ../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/silc/silc.c:1920
 #: ../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/silc/silc.c:1924
 #: ../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/silc/silc.c:1928
 #: ../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/silc/silc.c:1932
 #: ../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/silc/silc.c:1936
 #: ../libpurple/protocols/silc10/silc.c:1655
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
@@ -12332,67 +12345,67 @@
 "cumode &lt;从舒仆舒仍&gt; +|-&lt;�亠亢亳仄�&gt; &lt;仗�亠于亟仂仆亳仄&gt;:  �亰仄亠仆亳�� �亠亢亳仄� "
 "仗仂仍�亰仂于舒�亠仍� 仆舒 从舒仆舒仍亠"

-#: ../libpurple/protocols/silc/silc.c:1867
+#: ../libpurple/protocols/silc/silc.c:1940
 #: ../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/silc/silc.c:1944
 #: ../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/silc/silc.c:1948
 #: ../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/silc/silc.c:1952
 #: ../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/silc/silc.c:1956
 #: ../libpurple/protocols/silc10/silc.c:1675
 msgid "info [server]:  View server administrative details"
 msgstr "info [�亠�于亠�]:  ��仂�仄仂��亠�� 舒亟仄亳仆亳���舒�亳于仆�亠 仗仂亟�仂弍仆仂��亳 仂 �亠�于亠�亠"

-#: ../libpurple/protocols/silc/silc.c:1887
+#: ../libpurple/protocols/silc/silc.c:1960
 #: ../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/silc/silc.c:1964
 #: ../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/silc/silc.c:1968
 #: ../libpurple/protocols/silc10/silc.c:1687
 msgid "stats:  View server and network statistics"
 msgstr "stats:  ��仂�仄仂��亠�� ��舒�亳��亳从� �亠�于亠�舒 亳 �亠�亳"

-#: ../libpurple/protocols/silc/silc.c:1899
+#: ../libpurple/protocols/silc/silc.c:1972
 #: ../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/silc/silc.c:1977
 #: ../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/silc/silc.c:1981
 #: ../libpurple/protocols/silc10/silc.c:1700
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
@@ -12408,67 +12421,67 @@
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/protocols/silc/silc.c:2019
+#: ../libpurple/protocols/silc/silc.c:2092
 #: ../libpurple/protocols/silc10/silc.c:1825
 msgid "SILC Protocol Plugin"
 msgstr "�仂亟�仍� 仗�仂�仂从仂仍舒 SILC"

 #. *  description
-#: ../libpurple/protocols/silc/silc.c:2021
+#: ../libpurple/protocols/silc/silc.c:2094
 #: ../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:1859 ../pidgin/gtkprefs.c:2040
+#: ../libpurple/protocols/silc/silc.c:2135
+#: ../libpurple/protocols/silc10/silc.c:1859 ../pidgin/gtkprefs.c:2150
 msgid "Network"
 msgstr "弌亠��"

-#: ../libpurple/protocols/silc/silc.c:2064
+#: ../libpurple/protocols/silc/silc.c:2146
 #: ../libpurple/protocols/silc10/silc.c:1870
 msgid "Public Key file"
 msgstr "个舒亶仍 仗�弍仍亳�仆仂亞仂 从仍��舒"

-#: ../libpurple/protocols/silc/silc.c:2068
+#: ../libpurple/protocols/silc/silc.c:2150
 #: ../libpurple/protocols/silc10/silc.c:1874
 msgid "Private Key file"
 msgstr "个舒亶仍 仍亳�仆仂亞仂 从仍��舒"

-#: ../libpurple/protocols/silc/silc.c:2078
+#: ../libpurple/protocols/silc/silc.c:2160
 #: ../libpurple/protocols/silc10/silc.c:1884
 msgid "Cipher"
 msgstr "丿亳��"

-#: ../libpurple/protocols/silc/silc.c:2088
+#: ../libpurple/protocols/silc/silc.c:2170
 #: ../libpurple/protocols/silc10/silc.c:1894
 msgid "HMAC"
 msgstr "HMAC"

-#: ../libpurple/protocols/silc/silc.c:2091
+#: ../libpurple/protocols/silc/silc.c:2173
 msgid "Use Perfect Forward Secrecy"
 msgstr ""

-#: ../libpurple/protocols/silc/silc.c:2095
+#: ../libpurple/protocols/silc/silc.c:2177
 #: ../libpurple/protocols/silc10/silc.c:1897
 msgid "Public key authentication"
 msgstr "���亠仆�亳�亳从舒�亳� 仗�弍仍亳�仆仂亞仂 从仍��舒"

-#: ../libpurple/protocols/silc/silc.c:2098
+#: ../libpurple/protocols/silc/silc.c:2180
 #: ../libpurple/protocols/silc10/silc.c:1900
 msgid "Block IMs without Key Exchange"
 msgstr "�仍仂从亳�仂于舒�� �仂仂弍�亠仆亳� 弍亠亰 仂弍仄亠仆舒 从仍��舒仄亳"

-#: ../libpurple/protocols/silc/silc.c:2101
+#: ../libpurple/protocols/silc/silc.c:2183
 #: ../libpurple/protocols/silc10/silc.c:1903
 msgid "Block messages to whiteboard"
 msgstr ""

-#: ../libpurple/protocols/silc/silc.c:2104
+#: ../libpurple/protocols/silc/silc.c:2186
 #: ../libpurple/protocols/silc10/silc.c:1906
 msgid "Automatically open whiteboard"
 msgstr ""

-#: ../libpurple/protocols/silc/silc.c:2107
+#: ../libpurple/protocols/silc/silc.c:2189
 #: ../libpurple/protocols/silc10/silc.c:1909
 msgid "Digitally sign and verify all messages"
 msgstr "�亠仍舒�� �亳��仂于�� 仗仂亟仗亳�� 亳 仗�仂于亠�从� 于�亠� �仂仂弍�亠仆亳亶"
@@ -12488,60 +12501,60 @@
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
 #. sum: 3 tabs or 24 characters)
-#: ../libpurple/protocols/silc/util.c:364
+#: ../libpurple/protocols/silc/util.c:363
 #: ../libpurple/protocols/silc10/util.c:355
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "�舒��仂��亠亠 亳仄�: \t%s\n"

-#: ../libpurple/protocols/silc/util.c:366
+#: ../libpurple/protocols/silc/util.c:365
 #: ../libpurple/protocols/silc10/util.c:357
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "�仄� 仗仂仍�亰仂于舒�亠仍�: \t%s\n"

-#: ../libpurple/protocols/silc/util.c:368
+#: ../libpurple/protocols/silc/util.c:367
 #: ../libpurple/protocols/silc10/util.c:359
 #, c-format
 msgid "E-Mail: \t\t%s\n"
 msgstr "E-mail: \t\t%s\n"

-#: ../libpurple/protocols/silc/util.c:370
+#: ../libpurple/protocols/silc/util.c:369
 #: ../libpurple/protocols/silc10/util.c:361
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "�仄� �亰仍舒: \t%s\n"

-#: ../libpurple/protocols/silc/util.c:372
+#: ../libpurple/protocols/silc/util.c:371
 #: ../libpurple/protocols/silc10/util.c:363
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "��亞舒仆亳亰舒�亳�: \t%s\n"

-#: ../libpurple/protocols/silc/util.c:374
+#: ../libpurple/protocols/silc/util.c:373
 #: ../libpurple/protocols/silc10/util.c:365
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "弌��舒仆舒: \t%s\n"

-#: ../libpurple/protocols/silc/util.c:375
+#: ../libpurple/protocols/silc/util.c:374
 #: ../libpurple/protocols/silc10/util.c:366
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr "�仍亞仂�亳�仄: \t%s\n"

-#: ../libpurple/protocols/silc/util.c:376
+#: ../libpurple/protocols/silc/util.c:375
 #: ../libpurple/protocols/silc10/util.c:367
 #, c-format
 msgid "Key Length: \t%d bits\n"
 msgstr "�仍亳仆舒 从仍��舒: \t%d 弍亳�\n"

-#: ../libpurple/protocols/silc/util.c:378
+#: ../libpurple/protocols/silc/util.c:377
 #, c-format
 msgid "Version: \t%s\n"
 msgstr "�亠��亳�: \t%s\n"

-#: ../libpurple/protocols/silc/util.c:380
+#: ../libpurple/protocols/silc/util.c:379
 #: ../libpurple/protocols/silc10/util.c:369
 #, c-format
 msgid ""
@@ -12550,7 +12563,7 @@
 "\n"
 msgstr ""

-#: ../libpurple/protocols/silc/util.c:381
+#: ../libpurple/protocols/silc/util.c:380
 #: ../libpurple/protocols/silc10/util.c:370
 #, c-format
 msgid ""
@@ -12558,34 +12571,34 @@
 "%s"
 msgstr ""

-#: ../libpurple/protocols/silc/util.c:385
-#: ../libpurple/protocols/silc/util.c:386
+#: ../libpurple/protocols/silc/util.c:382
+#: ../libpurple/protocols/silc/util.c:383
 #: ../libpurple/protocols/silc10/util.c:374
 #: ../libpurple/protocols/silc10/util.c:375
 msgid "Public Key Information"
 msgstr "�仆�仂�仄舒�亳� 仂 仗�弍仍亳�仆仂仄 从仍��亠"

-#: ../libpurple/protocols/silc/util.c:569
+#: ../libpurple/protocols/silc/util.c:565
 #: ../libpurple/protocols/silc10/util.c:559
 msgid "Paging"
 msgstr ""

-#: ../libpurple/protocols/silc/util.c:575
+#: ../libpurple/protocols/silc/util.c:571
 #: ../libpurple/protocols/silc10/util.c:565
 msgid "Video Conferencing"
 msgstr "�亳亟亠仂从仂仆�亠�亠仆�亳�"

-#: ../libpurple/protocols/silc/util.c:594
+#: ../libpurple/protocols/silc/util.c:589
 #: ../libpurple/protocols/silc10/util.c:584
 msgid "Computer"
 msgstr "�仂仄仗���亠�"

-#: ../libpurple/protocols/silc/util.c:598
+#: ../libpurple/protocols/silc/util.c:593
 #: ../libpurple/protocols/silc10/util.c:588
 msgid "PDA"
 msgstr "PDA"

-#: ../libpurple/protocols/silc/util.c:600
+#: ../libpurple/protocols/silc/util.c:595
 #: ../libpurple/protocols/silc10/util.c:590
 msgid "Terminal"
 msgstr "丐亠�仄亳仆舒仍"
@@ -12702,9 +12715,8 @@
 msgstr "�亠 �亟舒仍仂�� �舒亰�亠�亳�� 亳仄� �亰仍舒"

 #: ../libpurple/protocols/simple/simple.c:1893
-msgid "SIP screen names may not contain whitespaces or @ symbols"
-msgstr ""
-"�亟亠仆�亳�亳从舒�仂�� 仗仂仍�亰仂于舒�亠仍亠亶 SIP 仆亠 仄仂亞�� �仂亟亠�亢舒�� 仗�仂弍亠仍� 亳仍亳 �亳仄于仂仍� @"
+msgid "SIP usernames may not contain whitespaces or @ symbols"
+msgstr "�仄亠仆舒 仗仂仍�亰仂于舒�亠仍亠亶 SIP 仆亠 仄仂亞�� �仂亟亠�亢舒�� 仗�仂弍亠仍� 亳仍亳 �亳仄于仂仍� @"

 #. *< type
 #. *< ui_requirement
@@ -12865,8 +12877,8 @@

 #: ../libpurple/protocols/toc/toc.c:549
 #, c-format
-msgid "Incorrect screen name or password."
-msgstr "�亠仗�舒于亳仍�仆�亶 亳亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍� 亳仍亳 仗舒�仂仍�."
+msgid "Incorrect username or password."
+msgstr "�亠仗�舒于亳仍�仆仂亠 亳仄� 仗仂仍�亰仂于舒�亠仍� 亳仍亳 仗舒�仂仍�."

 #: ../libpurple/protocols/toc/toc.c:552
 #, c-format
@@ -12917,7 +12929,7 @@
 msgid "Password Change Successful"
 msgstr "�舒�仂仍� 亳亰仄亠仆�仆 ��仗亠�仆仂"

-#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:6764
+#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:6847
 msgid "_Group:"
 msgstr "_���仗仗舒:"

@@ -13037,10 +13049,6 @@
 msgid "Ignore buddy?"
 msgstr "�亞仆仂�亳�仂于舒�� �仂弍亠�亠亟仆亳从舒?"

-#: ../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 "�舒�舒 ����仆舒� 亰舒仗亳�� 亰舒弍仍仂从亳�仂于舒仆舒, 于仂亶亟亳�亠 � web-�舒亶�舒 Yahoo!."
@@ -13100,27 +13108,27 @@
 "%s"

 #: ../libpurple/protocols/yahoo/yahoo.c:3138
-#: ../libpurple/protocols/yahoo/yahoo.c:3829
+#: ../libpurple/protocols/yahoo/yahoo.c:3833
 msgid "Not at Home"
 msgstr "�亠 亟仂仄舒"

 #: ../libpurple/protocols/yahoo/yahoo.c:3140
-#: ../libpurple/protocols/yahoo/yahoo.c:3832
+#: ../libpurple/protocols/yahoo/yahoo.c:3836
 msgid "Not at Desk"
 msgstr "�亠 亰舒 ��仂仍仂仄"

 #: ../libpurple/protocols/yahoo/yahoo.c:3142
-#: ../libpurple/protocols/yahoo/yahoo.c:3835
+#: ../libpurple/protocols/yahoo/yahoo.c:3839
 msgid "Not in Office"
 msgstr "�亠 于 仂�亳�亠"

 #: ../libpurple/protocols/yahoo/yahoo.c:3146
-#: ../libpurple/protocols/yahoo/yahoo.c:3841
+#: ../libpurple/protocols/yahoo/yahoo.c:3845
 msgid "On Vacation"
 msgstr "� 仂�仗��从亠"

 #: ../libpurple/protocols/yahoo/yahoo.c:3150
-#: ../libpurple/protocols/yahoo/yahoo.c:3847
+#: ../libpurple/protocols/yahoo/yahoo.c:3851
 msgid "Stepped Out"
 msgstr "���亠仍"

@@ -13167,35 +13175,35 @@
 msgid "Start Doodling"
 msgstr ""

-#: ../libpurple/protocols/yahoo/yahoo.c:3557
+#: ../libpurple/protocols/yahoo/yahoo.c:3561
 msgid "Activate which ID?"
 msgstr "�舒从仂亶 ID 舒从�亳于亳�仂于舒��?"

-#: ../libpurple/protocols/yahoo/yahoo.c:3568
+#: ../libpurple/protocols/yahoo/yahoo.c:3572
 msgid "Join whom in chat?"
 msgstr "� 从仂仄� 仗�亳�仂亠亟亳仆亳���� 于 �舒�亠?"

-#: ../libpurple/protocols/yahoo/yahoo.c:3580
+#: ../libpurple/protocols/yahoo/yahoo.c:3584
 msgid "Activate ID..."
 msgstr "�从�亳于亳�仂于舒�� ID..."

-#: ../libpurple/protocols/yahoo/yahoo.c:3584
+#: ../libpurple/protocols/yahoo/yahoo.c:3588
 msgid "Join User in Chat..."
 msgstr "��亳�仂亠亟亳仆亳���� 从 仗仂仍�亰仂于舒�亠仍� 于 �舒�亠..."

-#: ../libpurple/protocols/yahoo/yahoo.c:3589
+#: ../libpurple/protocols/yahoo/yahoo.c:3593
 msgid "Open Inbox"
 msgstr ""

-#: ../libpurple/protocols/yahoo/yahoo.c:4178
+#: ../libpurple/protocols/yahoo/yahoo.c:4182
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join &lt;从仂仄仆舒�舒&gt;:  ��亳�仂亠亟亳仆亳���� 从 �舒�� 于 �亠�亳 Yahoo"

-#: ../libpurple/protocols/yahoo/yahoo.c:4183
+#: ../libpurple/protocols/yahoo/yahoo.c:4187
 msgid "list: List rooms on the Yahoo network"
 msgstr "list: ��于亠��亳 �仗亳�仂从 从仂仄仆舒� 于 �亠�亳 Yahoo"

-#: ../libpurple/protocols/yahoo/yahoo.c:4191
+#: ../libpurple/protocols/yahoo/yahoo.c:4195
 msgid "doodle: Request user to start a Doodle session"
 msgstr ""

@@ -13209,56 +13217,56 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4400
-#: ../libpurple/protocols/yahoo/yahoo.c:4402
+#: ../libpurple/protocols/yahoo/yahoo.c:4404
+#: ../libpurple/protocols/yahoo/yahoo.c:4406
 msgid "Yahoo Protocol Plugin"
 msgstr "�仂亟�仍� 仗�仂�仂从仂仍舒 Yahoo"

-#: ../libpurple/protocols/yahoo/yahoo.c:4425
+#: ../libpurple/protocols/yahoo/yahoo.c:4429
 msgid "Yahoo Japan"
 msgstr "Yahoo Japan"

-#: ../libpurple/protocols/yahoo/yahoo.c:4428
+#: ../libpurple/protocols/yahoo/yahoo.c:4432
 msgid "Pager server"
 msgstr "弌亠�于亠� 仗亠亶亟亢亠�舒"

-#: ../libpurple/protocols/yahoo/yahoo.c:4431
+#: ../libpurple/protocols/yahoo/yahoo.c:4435
 msgid "Japan Pager server"
 msgstr "弌亠�于亠� 仗亠亶亟亢亠�舒 Japan"

-#: ../libpurple/protocols/yahoo/yahoo.c:4434
+#: ../libpurple/protocols/yahoo/yahoo.c:4438
 msgid "Pager port"
 msgstr "�仂�� 仗亠亶亟亢亠�舒"

-#: ../libpurple/protocols/yahoo/yahoo.c:4437
+#: ../libpurple/protocols/yahoo/yahoo.c:4441
 msgid "File transfer server"
 msgstr "弌亠�于亠� 仗亠�亠亟舒�亳 �舒亶仍仂于"

-#: ../libpurple/protocols/yahoo/yahoo.c:4440
+#: ../libpurple/protocols/yahoo/yahoo.c:4444
 msgid "Japan file transfer server"
 msgstr "弌亠�于亠� 仗亠�亠亟舒�亳 �舒亶仍仂于 Japan"

-#: ../libpurple/protocols/yahoo/yahoo.c:4443
+#: ../libpurple/protocols/yahoo/yahoo.c:4447
 msgid "File transfer port"
 msgstr "�仂�� 仗亠�亠亟舒�亳 �舒亶仍仂于"

-#: ../libpurple/protocols/yahoo/yahoo.c:4446
+#: ../libpurple/protocols/yahoo/yahoo.c:4450
 msgid "Chat room locale"
 msgstr "亊亰�从仂于仂亶 �仂�仄舒� �舒�舒"

-#: ../libpurple/protocols/yahoo/yahoo.c:4449
+#: ../libpurple/protocols/yahoo/yahoo.c:4453
 msgid "Ignore conference and chatroom invitations"
 msgstr "�亞仆仂�亳�仂于舒�� 仗�亳亞仍舒�亠仆亳� 于 从仂仆�亠�亠仆�亳亳 亳 �舒��"

-#: ../libpurple/protocols/yahoo/yahoo.c:4457
+#: ../libpurple/protocols/yahoo/yahoo.c:4461
 msgid "Chat room list URL"
 msgstr "URL �仗亳�从舒 �舒�仂于"

-#: ../libpurple/protocols/yahoo/yahoo.c:4460
+#: ../libpurple/protocols/yahoo/yahoo.c:4464
 msgid "Yahoo Chat server"
 msgstr "弌亠�于亠� �舒�舒 Yahoo"

-#: ../libpurple/protocols/yahoo/yahoo.c:4463
+#: ../libpurple/protocols/yahoo/yahoo.c:4467
 msgid "Yahoo Chat port"
 msgstr "�仂�� �舒�舒 Yahoo"

@@ -13272,15 +13280,15 @@
 #: ../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
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1111
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1515
 msgid "Unable to establish file descriptor."
 msgstr "�亠 �亟舒���� ���舒仆仂于亳�� 亟亠�从�亳仗�仂� �舒亶仍舒."

-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1409
-#, fuzzy, c-format
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1410
+#, c-format
 msgid "%s is trying to send you a group of %d files.\n"
-msgstr "%s 仗�亠亟仍舒亞舒亠� 仂�仗�舒于从� �舒亶仍舒 %s"
+msgstr ""

 #: ../libpurple/protocols/yahoo/yahoo_packet.c:307
 msgid "Write Error"
@@ -13718,58 +13726,58 @@
 msgid "Unknown SSL error"
 msgstr "�亠亳亰于亠��仆舒� 仂�亳弍从舒 SSL"

-#: ../libpurple/status.c:153
+#: ../libpurple/status.c:154
 msgid "Unset"
 msgstr "�亠 ���舒仆仂于仍亠仆"

-#: ../libpurple/status.c:156 ../pidgin/gtkdocklet.c:553
-#: ../pidgin/gtkstatusbox.c:1083
+#: ../libpurple/status.c:157 ../pidgin/gtkdocklet.c:553
+#: ../pidgin/gtkstatusbox.c:1088
 msgid "Do not disturb"
 msgstr "�亠 弍亠�仗仂从仂亳��"

-#: ../libpurple/status.c:159
+#: ../libpurple/status.c:160
 msgid "Extended away"
 msgstr "�舒��亳�亠仆仆�亶 \"��仂��仍\""

-#: ../libpurple/status.c:160
+#: ../libpurple/status.c:161
 msgid "Mobile"
 msgstr ""

-#: ../libpurple/status.c:161
+#: ../libpurple/status.c:162
 msgid "Listening to music"
 msgstr ""

-#: ../libpurple/status.c:610
+#: ../libpurple/status.c:611
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
 msgstr "%s (%s) 亳亰仄亠仆亳仍 ��舒��� � %s 仆舒 %s"

-#: ../libpurple/status.c:621
+#: ../libpurple/status.c:622
 #, c-format
 msgid "%s (%s) is now %s"
 msgstr "%s (%s) �亠仗亠�� %s"

-#: ../libpurple/status.c:627
+#: ../libpurple/status.c:628
 #, c-format
 msgid "%s (%s) is no longer %s"
 msgstr "%s (%s) 弍仂仍��亠 仆亠 %s"

-#: ../libpurple/status.c:1242
+#: ../libpurple/status.c:1243
 #, c-format
 msgid "%s became idle"
 msgstr "%s 仆舒�舒仍 弍亠亰亟亠亶��于仂于舒��"

-#: ../libpurple/status.c:1262
+#: ../libpurple/status.c:1263
 #, c-format
 msgid "%s became unidle"
 msgstr "%s 仗亠�亠��舒仍 弍亠亰亟亠亶��于仂于舒��"

-#: ../libpurple/status.c:1328
+#: ../libpurple/status.c:1329
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s 仆舒�舒仍 弍亠亰亟亠亶��于仂于舒��"

-#: ../libpurple/status.c:1330
+#: ../libpurple/status.c:1331
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s 仗亠�亠��舒仍 弍亠亰亟亠亶��于仂于舒��"
@@ -13881,12 +13889,12 @@
 msgid "Unable to connect to %s: %s"
 msgstr "�亠 �亟舒���� �仂亠亟亳仆亳���� � %s: %s"

-#: ../libpurple/util.c:4697
+#: ../libpurple/util.c:4696
 #, c-format
 msgid " - %s"
 msgstr " - %s"

-#: ../libpurple/util.c:4703
+#: ../libpurple/util.c:4702
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
@@ -13944,63 +13952,63 @@
 msgid "Pro_tocol:"
 msgstr "�_�仂�仂从仂仍:"

-#: ../pidgin/gtkaccount.c:411
-msgid "Screen _name:"
-msgstr "_�亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍�:"
+#: ../pidgin/gtkaccount.c:411 ../pidgin/gtkaccount.c:1039
+msgid "_Username:"
+msgstr "_�仄� 仗仂仍�亰仂于舒�亠仍�:"

 #: ../pidgin/gtkaccount.c:501
-msgid "_Local alias:"
-msgstr "_�仂从舒仍�仆�亶 仗�亠于亟仂仆亳仄:"
-
-#: ../pidgin/gtkaccount.c:505
 msgid "Remember pass_word"
 msgstr "�_舒仗仂仄仆亳�� 仗舒�仂仍�"

 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:563
+#: ../pidgin/gtkaccount.c:555
 msgid "User Options"
 msgstr "�舒�舒仄亠��� 仗仂仍�亰仂于舒�亠仍�"

-#: ../pidgin/gtkaccount.c:576
+#: ../pidgin/gtkaccount.c:568
+msgid "_Local alias:"
+msgstr "_�仂从舒仍�仆�亶 仗�亠于亟仂仆亳仄:"
+
+#: ../pidgin/gtkaccount.c:572
 msgid "New _mail notifications"
 msgstr "丕于亠亟仂仄仍亠仆亳� 仂 仆仂于仂亶 仗仂_��亠"

 #. Buddy icon
-#: ../pidgin/gtkaccount.c:581
+#: ../pidgin/gtkaccount.c:577
 msgid "Use this buddy _icon for this account:"
 msgstr "��仗仂仍�亰仂于舒�� ��仂� _亰仆舒�仂从 �仂弍亠�亠亟仆亳从舒 亟仍� ��仂亶 ����仆仂亶 亰舒仗亳�亳:"

 #. Build the protocol options frame.
-#: ../pidgin/gtkaccount.c:703
+#: ../pidgin/gtkaccount.c:705
 #, c-format
 msgid "%s Options"
 msgstr "�舒�舒仄亠��� %s"

-#: ../pidgin/gtkaccount.c:908
+#: ../pidgin/gtkaccount.c:910
 msgid "Use GNOME Proxy Settings"
 msgstr "��仗仂仍�亰仂于舒�� 仆舒���仂亶从亳 仗�仂从�亳 GNOME"

-#: ../pidgin/gtkaccount.c:909
+#: ../pidgin/gtkaccount.c:911
 msgid "Use Global Proxy Settings"
 msgstr "��仗仂仍�亰仂于舒�� 亞仍仂弍舒仍�仆�亠 仆舒���仂亶从亳 仗�仂从�亳"

-#: ../pidgin/gtkaccount.c:915
+#: ../pidgin/gtkaccount.c:917
 msgid "No Proxy"
 msgstr "�亠� 仗�仂从�亳"

-#: ../pidgin/gtkaccount.c:921
+#: ../pidgin/gtkaccount.c:923
 msgid "HTTP"
 msgstr "HTTP"

-#: ../pidgin/gtkaccount.c:927
+#: ../pidgin/gtkaccount.c:929
 msgid "SOCKS 4"
 msgstr "SOCKS 4"

-#: ../pidgin/gtkaccount.c:933
+#: ../pidgin/gtkaccount.c:935
 msgid "SOCKS 5"
 msgstr "SOCKS 5"

-#: ../pidgin/gtkaccount.c:939 ../pidgin/gtkprefs.c:1230
+#: ../pidgin/gtkaccount.c:941 ../pidgin/gtkprefs.c:1340
 msgid "Use Environmental Settings"
 msgstr "��仗仂仍�亰仂于舒�� 仆舒���仂亶从亳 仂从��亢亠仆亳�"

@@ -14009,73 +14017,69 @@
 #. 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:978
+#: ../pidgin/gtkaccount.c:980
 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:981
+#: ../pidgin/gtkaccount.c:983
 msgid "you can see the butterflies mating"
 msgstr "于� 仄仂亢亠�亠 �于亳亟亠�� �仗舒�亳于舒��亳��� 弍舒弍仂�亠从"

-#: ../pidgin/gtkaccount.c:1002
+#: ../pidgin/gtkaccount.c:1004
 msgid "Proxy Options"
 msgstr "�舒�舒仄亠��� 仗�仂从�亳"

-#: ../pidgin/gtkaccount.c:1016 ../pidgin/gtkprefs.c:1224
+#: ../pidgin/gtkaccount.c:1018 ../pidgin/gtkprefs.c:1334
 msgid "Proxy _type:"
 msgstr "丐_亳仗 仗�仂从�亳:"

-#: ../pidgin/gtkaccount.c:1025 ../pidgin/gtkprefs.c:1245
+#: ../pidgin/gtkaccount.c:1027 ../pidgin/gtkprefs.c:1355
 msgid "_Host:"
 msgstr "_丕亰亠仍:"

-#: ../pidgin/gtkaccount.c:1029 ../pidgin/gtkprefs.c:1263
+#: ../pidgin/gtkaccount.c:1031 ../pidgin/gtkprefs.c:1373
 msgid "_Port:"
 msgstr "�_仂��:"

-#: ../pidgin/gtkaccount.c:1037
-msgid "_Username:"
-msgstr "_�仄� 仗仂仍�亰仂于舒�亠仍�:"
-
-#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1300
+#: ../pidgin/gtkaccount.c:1046 ../pidgin/gtkprefs.c:1410
 msgid "Pa_ssword:"
 msgstr "�舒_�仂仍�:"

-#: ../pidgin/gtkaccount.c:1169
+#: ../pidgin/gtkaccount.c:1171
 msgid "Unable to save new account"
 msgstr "�亠 �亟舒���� �仂��舒仆亳�� 仆仂于�� ����仆�� 亰舒仗亳��"

-#: ../pidgin/gtkaccount.c:1170
+#: ../pidgin/gtkaccount.c:1172
 msgid "An account already exists with the specified criteria."
 msgstr ""

-#: ../pidgin/gtkaccount.c:1447
+#: ../pidgin/gtkaccount.c:1449
 msgid "Add Account"
 msgstr "�仂弍舒于亳�� ����仆�� 亰舒仗亳��"

-#: ../pidgin/gtkaccount.c:1464
+#: ../pidgin/gtkaccount.c:1466
 msgid "_Basic"
 msgstr "_��仆仂于仆�亠"

-#: ../pidgin/gtkaccount.c:1471
+#: ../pidgin/gtkaccount.c:1473
 msgid "Create this new account on the server"
 msgstr "弌仂亰亟舒�� ��� 仆仂于�� ����仆�� 亰舒仗亳�� 仆舒 �亠�于亠�亠"

-#: ../pidgin/gtkaccount.c:1485
+#: ../pidgin/gtkaccount.c:1487
 msgid "_Advanced"
 msgstr "_�仂仗仂仍仆亳�亠仍�仆�亠"

-#: ../pidgin/gtkaccount.c:1906 ../pidgin/gtkplugin.c:643
+#: ../pidgin/gtkaccount.c:1908 ../pidgin/gtkplugin.c:753
 #: ../pidgin/plugins/convcolors.c:327
 msgid "Enabled"
 msgstr "�从仍��亠仆仂"

-#: ../pidgin/gtkaccount.c:1934
+#: ../pidgin/gtkaccount.c:1936
 msgid "Protocol"
 msgstr "��仂�仂从仂仍"

-#: ../pidgin/gtkaccount.c:2137
+#: ../pidgin/gtkaccount.c:2139
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -14115,11 +14119,15 @@
 "choosing 'Expand' from the contact's context menu"
 msgstr ""

-#: ../pidgin/gtkblist.c:964 ../pidgin/gtkblist.c:6711
+#: ../pidgin/gtkblist.c:683
+msgid "Please update the necessary fields."
+msgstr "�弍仆仂于亳�亠 仆�亢仆�亠 仗仂仍�."
+
+#: ../pidgin/gtkblist.c:1038 ../pidgin/gtkblist.c:6794
 msgid "Room _List"
 msgstr "_弌仗亳�仂从 从仂仄仆舒�"

-#: ../pidgin/gtkblist.c:984
+#: ../pidgin/gtkblist.c:1058
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
@@ -14127,107 +14135,111 @@
 "�于亠亟亳�亠 �仂仂�于亠���于����� 亳仆�仂�仄舒�亳� 仂 �舒�亠, 从 从仂�仂�仂仄� 于� �仂�亠仍亳 弍� "
 "仗�亳�仂亠亟亳仆亳����.\n"

-#: ../pidgin/gtkblist.c:996 ../pidgin/gtkblist.c:6746
+#: ../pidgin/gtkblist.c:1070 ../pidgin/gtkblist.c:6829
 #: ../pidgin/gtkpounce.c:546 ../pidgin/gtkroomlist.c:547
 msgid "_Account:"
 msgstr "丕_���仆舒� 亰舒仗亳��:"

-#: ../pidgin/gtkblist.c:1274 ../pidgin/gtkprivacy.c:549
+#: ../pidgin/gtkblist.c:1349 ../pidgin/gtkprivacy.c:549
 #: ../pidgin/gtkprivacy.c:563
 msgid "_Block"
 msgstr "_�仍仂从亳�仂于舒��"

-#: ../pidgin/gtkblist.c:1274
+#: ../pidgin/gtkblist.c:1349
 msgid "Un_block"
 msgstr "�舒亰_弍仍仂从亳�仂于舒��"

-#: ../pidgin/gtkblist.c:1317
+#: ../pidgin/gtkblist.c:1392
 msgid "Move to"
 msgstr "�亠�亠仄亠��亳�� 于"

-#: ../pidgin/gtkblist.c:1357
+#: ../pidgin/gtkblist.c:1432
 msgid "Get _Info"
 msgstr "_�仆�仂�仄舒�亳�"

-#: ../pidgin/gtkblist.c:1360 ../pidgin/pidginstock.c:90
+#: ../pidgin/gtkblist.c:1435 ../pidgin/pidginstock.c:90
 msgid "I_M"
 msgstr "�亞仆仂于亠仆仆仂亠 �仂仂弍_�亠仆亳亠"

-#: ../pidgin/gtkblist.c:1366
+#: ../pidgin/gtkblist.c:1441
 msgid "_Send File..."
 msgstr "_��仗�舒于亳�� �舒亶仍..."

-#: ../pidgin/gtkblist.c:1373
+#: ../pidgin/gtkblist.c:1448
 msgid "Add Buddy _Pounce..."
 msgstr "�仂弍舒于亳�� 仗_�舒于亳仍仂..."

-#: ../pidgin/gtkblist.c:1378 ../pidgin/gtkblist.c:1382
-#: ../pidgin/gtkblist.c:1502 ../pidgin/gtkblist.c:1525
+#: ../pidgin/gtkblist.c:1453 ../pidgin/gtkblist.c:1457
+#: ../pidgin/gtkblist.c:1577 ../pidgin/gtkblist.c:1602
 msgid "View _Log"
 msgstr "��仂�仄仂��亠�� _亢��仆舒仍"

-#: ../pidgin/gtkblist.c:1388 ../pidgin/gtkblist.c:1475
+#: ../pidgin/gtkblist.c:1463 ../pidgin/gtkblist.c:1550
 msgid "Hide when offline"
 msgstr "弌从��于舒��, 从仂亞亟舒 仆亠 于 �亠�亳"

-#: ../pidgin/gtkblist.c:1388 ../pidgin/gtkblist.c:1475
+#: ../pidgin/gtkblist.c:1463 ../pidgin/gtkblist.c:1550
 msgid "Show when offline"
 msgstr "�仂从舒亰�于舒��, 从仂亞亟舒 仆亠 于 �亠�亳"

-#: ../pidgin/gtkblist.c:1402 ../pidgin/gtkblist.c:1411
-#: ../pidgin/gtkblist.c:1510 ../pidgin/gtkblist.c:1531
+#: ../pidgin/gtkblist.c:1477 ../pidgin/gtkblist.c:1486
+#: ../pidgin/gtkblist.c:1587 ../pidgin/gtkblist.c:1608
 msgid "_Alias..."
 msgstr "_��亠于亟仂仆亳仄..."

-#: ../pidgin/gtkblist.c:1405 ../pidgin/gtkblist.c:1413
-#: ../pidgin/gtkblist.c:1512 ../pidgin/gtkblist.c:1533
+#: ../pidgin/gtkblist.c:1480 ../pidgin/gtkblist.c:1488
+#: ../pidgin/gtkblist.c:1589 ../pidgin/gtkblist.c:1610
 msgid "_Remove"
 msgstr "_丕亟舒仍亳��"

-#: ../pidgin/gtkblist.c:1463
+#: ../pidgin/gtkblist.c:1538
 msgid "Add _Buddy..."
 msgstr "�仂弍舒于亳�� _�仂弍亠�亠亟仆亳从舒..."

-#: ../pidgin/gtkblist.c:1466
+#: ../pidgin/gtkblist.c:1541
 msgid "Add C_hat..."
 msgstr "�仂弍舒于亳�� _�舒�..."

-#: ../pidgin/gtkblist.c:1469
+#: ../pidgin/gtkblist.c:1544
 msgid "_Delete Group"
 msgstr "_丕亟舒仍亳�� 亞��仗仗�"

-#: ../pidgin/gtkblist.c:1471
+#: ../pidgin/gtkblist.c:1546
 msgid "_Rename"
 msgstr "�亠�亠_亳仄亠仆仂于舒��"

 #. join button
-#: ../pidgin/gtkblist.c:1496 ../pidgin/gtkroomlist.c:318
+#: ../pidgin/gtkblist.c:1571 ../pidgin/gtkroomlist.c:318
 #: ../pidgin/gtkroomlist.c:594 ../pidgin/pidginstock.c:88
 msgid "_Join"
 msgstr "�_�亳�仂亠亟亳仆亳����"

-#: ../pidgin/gtkblist.c:1498
+#: ../pidgin/gtkblist.c:1573
 msgid "Auto-Join"
 msgstr "��亳�仂亠亟亳仆����� 舒于�仂仄舒�亳�亠�从亳"

-#: ../pidgin/gtkblist.c:1500
+#: ../pidgin/gtkblist.c:1575
 msgid "Persistent"
 msgstr "�亠仗�亠��于舒��亳亶��"

-#: ../pidgin/gtkblist.c:1538 ../pidgin/gtkblist.c:1561
+#: ../pidgin/gtkblist.c:1585
+msgid "_Edit Settings..."
+msgstr "_�亰仄亠仆亳�� 仆舒���仂亶从亳..."
+
+#: ../pidgin/gtkblist.c:1615 ../pidgin/gtkblist.c:1638
 msgid "_Collapse"
 msgstr "_弌于亠�仆���"

-#: ../pidgin/gtkblist.c:1566
+#: ../pidgin/gtkblist.c:1643
 msgid "_Expand"
 msgstr "�_舒亰于亠�仆���"

-#: ../pidgin/gtkblist.c:1817 ../pidgin/gtkblist.c:1829
-#: ../pidgin/gtkblist.c:5410 ../pidgin/gtkblist.c:5423
+#: ../pidgin/gtkblist.c:1894 ../pidgin/gtkblist.c:1906
+#: ../pidgin/gtkblist.c:5493 ../pidgin/gtkblist.c:5506
 msgid "/Tools/Mute Sounds"
 msgstr "/�仆����仄亠仆��/��从仍��亳�� 亰于�从亳"

-#: ../pidgin/gtkblist.c:2289 ../pidgin/gtkconv.c:4807
+#: ../pidgin/gtkblist.c:2366 ../pidgin/gtkconv.c:4926
 #: ../pidgin/gtkpounce.c:437
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
@@ -14237,149 +14249,156 @@
 #. 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:2640
+#: ../pidgin/gtkblist.c:2717
 #, fuzzy
 msgid "Unknown node type"
 msgstr "�亠亳亰于亠��仆�亶 从仂亟 仂�亳弍从亳 %d"

 #. Buddies menu
-#: ../pidgin/gtkblist.c:3076
+#: ../pidgin/gtkblist.c:3153
 msgid "/_Buddies"
 msgstr "/_弌仂弍亠�亠亟仆亳从亳"

-#: ../pidgin/gtkblist.c:3077
+#: ../pidgin/gtkblist.c:3154
 msgid "/Buddies/New Instant _Message..."
 msgstr "/弌仂弍亠�亠亟仆亳从亳/�仂于仂亠 仄亞仆仂于亠仆仆仂亠 �仂仂弍_�亠仆亳亠..."

-#: ../pidgin/gtkblist.c:3078
+#: ../pidgin/gtkblist.c:3155
 msgid "/Buddies/Join a _Chat..."
 msgstr "/弌仂弍亠�亠亟仆亳从亳/��亳�仂亠亟亳仆亳���� 从 _�舒��..."

-#: ../pidgin/gtkblist.c:3079
+#: ../pidgin/gtkblist.c:3156
 msgid "/Buddies/Get User _Info..."
 msgstr "/弌仂弍亠�亠亟仆亳从亳/�仂仍��亳�� 仗仂仍�亰仂于舒�亠仍��从�� _亳仆�仂�仄舒�亳�..."

-#: ../pidgin/gtkblist.c:3080
+#: ../pidgin/gtkblist.c:3157
 msgid "/Buddies/View User _Log..."
 msgstr "/弌仂弍亠�亠亟仆亳从亳/��仂�仄仂��亠�� _亢��仆舒仍 仗仂仍�亰仂于舒�亠仍�..."

-#: ../pidgin/gtkblist.c:3082
+#: ../pidgin/gtkblist.c:3159
 msgid "/Buddies/Sh_ow"
 msgstr "/弌仂弍亠�亠亟仆亳从亳/_�仂从舒亰�于舒��"

-#: ../pidgin/gtkblist.c:3083
+#: ../pidgin/gtkblist.c:3160
 msgid "/Buddies/Show/_Offline Buddies"
 msgstr "/弌仂弍亠�亠亟仆亳从亳/�仂从舒亰�于舒��/弌仂弍亠�亠亟仆亳从仂于 _仆亠 于 �亠�亳"

-#: ../pidgin/gtkblist.c:3084
+#: ../pidgin/gtkblist.c:3161
 msgid "/Buddies/Show/_Empty Groups"
 msgstr "/弌仂弍亠�亠亟仆亳从亳/�仂从舒亰�于舒��/�_����亠 亞��仗仗�"

-#: ../pidgin/gtkblist.c:3085
+#: ../pidgin/gtkblist.c:3162
 msgid "/Buddies/Show/Buddy _Details"
 msgstr "/弌仂弍亠�亠亟仆亳从亳/�仂从舒亰�于舒��/_�仂亟�仂弍仆仂��亳 仂 �仂弍亠�亠亟仆亳从舒�"

-#: ../pidgin/gtkblist.c:3086
+#: ../pidgin/gtkblist.c:3163
 msgid "/Buddies/Show/Idle _Times"
 msgstr "/弌仂弍亠�亠亟仆亳从亳/�仂从舒亰�于舒��/_��亠仄� 弍亠亰亟亠亶��于亳�"

-#: ../pidgin/gtkblist.c:3087
+#: ../pidgin/gtkblist.c:3164
 msgid "/Buddies/Show/_Protocol Icons"
 msgstr "/弌仂弍亠�亠亟仆亳从亳/�仂从舒亰�于舒��/_�仆舒�从亳 仗�仂�仂从仂仍仂于"

-#: ../pidgin/gtkblist.c:3088
+#: ../pidgin/gtkblist.c:3165
 msgid "/Buddies/_Sort Buddies"
 msgstr "/弌仂弍亠�亠亟仆亳从亳/_弌仂��亳�仂于舒�� �仂弍亠�亠亟仆亳从仂于"

-#: ../pidgin/gtkblist.c:3090
+#: ../pidgin/gtkblist.c:3167
 msgid "/Buddies/_Add Buddy..."
 msgstr "/弌仂弍亠�亠亟仆亳从亳/_�仂弍舒于亳�� �仂弍亠�亠亟仆亳从舒..."

-#: ../pidgin/gtkblist.c:3091
+#: ../pidgin/gtkblist.c:3168
 msgid "/Buddies/Add C_hat..."
 msgstr "/弌仂弍亠�亠亟仆亳从亳/�仂弍舒于亳�� �_舒�..."

-#: ../pidgin/gtkblist.c:3092
+#: ../pidgin/gtkblist.c:3169
 msgid "/Buddies/Add _Group..."
 msgstr "/弌仂弍亠�亠亟仆亳从亳/�仂弍舒于亳�� _亞��仗仗�..."

-#: ../pidgin/gtkblist.c:3094
+#: ../pidgin/gtkblist.c:3171
 msgid "/Buddies/_Quit"
 msgstr "/弌仂弍亠�亠亟仆亳从亳/�_�亶�亳"

 #. Accounts menu
-#: ../pidgin/gtkblist.c:3097
+#: ../pidgin/gtkblist.c:3174
 msgid "/_Accounts"
 msgstr "/_丕���仆�亠 亰舒仗亳�亳"

-#: ../pidgin/gtkblist.c:3098 ../pidgin/gtkblist.c:7431
+#: ../pidgin/gtkblist.c:3175 ../pidgin/gtkblist.c:7514
 msgid "/Accounts/Manage"
 msgstr "/丕���仆�亠 亰舒仗亳�亳/丕仗�舒于仍亠仆亳亠"

 #. Tools
-#: ../pidgin/gtkblist.c:3101
+#: ../pidgin/gtkblist.c:3178
 msgid "/_Tools"
 msgstr "/_�仆����仄亠仆��"

-#: ../pidgin/gtkblist.c:3102
+#: ../pidgin/gtkblist.c:3179
 msgid "/Tools/Buddy _Pounces"
 msgstr "/�仆����仄亠仆��/_弌仍亠亢亠仆亳亠 亰舒 �仂弍亠�亠亟仆亳从舒仄亳"

-#: ../pidgin/gtkblist.c:3103
+#: ../pidgin/gtkblist.c:3180
 msgid "/Tools/_Certificates"
 msgstr "/�仆����仄亠仆��/弌_亠��亳�亳从舒��"

-#: ../pidgin/gtkblist.c:3104
+#: ../pidgin/gtkblist.c:3181
 msgid "/Tools/Plu_gins"
 msgstr "/�仆����仄亠仆��/_�仂亟�仍亳"

-#: ../pidgin/gtkblist.c:3105
+#: ../pidgin/gtkblist.c:3182
 msgid "/Tools/Pr_eferences"
 msgstr "/�仆����仄亠仆��/_�舒���仂亶从亳"

-#: ../pidgin/gtkblist.c:3106
+#: ../pidgin/gtkblist.c:3183
 msgid "/Tools/Pr_ivacy"
 msgstr "/�仆����仄亠仆��/�_仂仆�亳亟亠仆�亳舒仍�仆仂���"

-#: ../pidgin/gtkblist.c:3108
+#: ../pidgin/gtkblist.c:3185
 msgid "/Tools/_File Transfers"
 msgstr "/�仆����仄亠仆��/�亠�亠亟舒�舒 _�舒亶仍仂于"

-#: ../pidgin/gtkblist.c:3109
+#: ../pidgin/gtkblist.c:3186
 msgid "/Tools/R_oom List"
 msgstr "/�仆����仄亠仆��/弌仗亳�仂从 _从仂仄仆舒�"

-#: ../pidgin/gtkblist.c:3110
+#: ../pidgin/gtkblist.c:3187
 msgid "/Tools/System _Log"
 msgstr "/�仆����仄亠仆��/弌亳��亠仄仆�亶 _亢��仆舒仍"

-#: ../pidgin/gtkblist.c:3112
+#: ../pidgin/gtkblist.c:3189
 msgid "/Tools/Mute _Sounds"
 msgstr "/�仆����仄亠仆��/��从仍��亳�� _亰于�从亳"

 #. Help
-#: ../pidgin/gtkblist.c:3114
+#: ../pidgin/gtkblist.c:3191
 msgid "/_Help"
 msgstr "/_�仂仄仂��"

-#: ../pidgin/gtkblist.c:3115
+#: ../pidgin/gtkblist.c:3192
 msgid "/Help/Online _Help"
 msgstr "/�仂仄仂��/�仂仄仂�� 于 _�亠�亳"

-#: ../pidgin/gtkblist.c:3116
+#: ../pidgin/gtkblist.c:3193
 msgid "/Help/_Debug Window"
 msgstr "/�仂仄仂��/�从仆仂 _仂�仍舒亟从亳"

-#: ../pidgin/gtkblist.c:3118 ../pidgin/gtkblist.c:3120
+#: ../pidgin/gtkblist.c:3195 ../pidgin/gtkblist.c:3197
 msgid "/Help/_About"
 msgstr "/�仂仄仂��/� _仗�仂亞�舒仄仄亠"

-#: ../pidgin/gtkblist.c:3151
+#: ../pidgin/gtkblist.c:3228
 #, c-format
 msgid "<b>Account:</b> %s"
 msgstr "<b>丕���仆舒� 亰舒仗亳��:</b> %s"

-#: ../pidgin/gtkblist.c:3171
+#: ../pidgin/gtkblist.c:3247
+#, c-format
+msgid ""
+"\n"
+"<b>Occupants:</b> %d"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:3252
 #, c-format
 msgid ""
 "\n"
@@ -14388,86 +14407,86 @@
 "\n"
 "<b>丐亠仄舒:</b> %s"

-#: ../pidgin/gtkblist.c:3171
+#: ../pidgin/gtkblist.c:3252
 msgid "(no topic set)"
 msgstr "(�亠仄舒 仆亠 ���舒仆仂于仍亠仆舒)"

-#: ../pidgin/gtkblist.c:3249
+#: ../pidgin/gtkblist.c:3331
 msgid "Buddy Alias"
 msgstr "��亠于亟仂仆亳仄 �仂弍亠�亠亟仆亳从舒"

-#: ../pidgin/gtkblist.c:3278
+#: ../pidgin/gtkblist.c:3360
 msgid "Logged In"
 msgstr "� �亠�亳"

-#: ../pidgin/gtkblist.c:3324
+#: ../pidgin/gtkblist.c:3406
 msgid "Last Seen"
 msgstr "�仂�仍亠亟仆亠亠 仗仂�于仍亠仆亳亠"

-#: ../pidgin/gtkblist.c:3345
+#: ../pidgin/gtkblist.c:3427
 msgid "Spooky"
 msgstr ""

-#: ../pidgin/gtkblist.c:3347
+#: ../pidgin/gtkblist.c:3429
 msgid "Awesome"
 msgstr ""

-#: ../pidgin/gtkblist.c:3349
+#: ../pidgin/gtkblist.c:3431
 msgid "Rockin'"
 msgstr ""

-#: ../pidgin/gtkblist.c:3380
+#: ../pidgin/gtkblist.c:3462
 msgid "Total Buddies"
 msgstr "��亠亞仂 �仂弍亠�亠亟仆亳从仂于"

-#: ../pidgin/gtkblist.c:3742
+#: ../pidgin/gtkblist.c:3824
 #, c-format
 msgid "Idle %dd %dh %02dm"
 msgstr "�亠亰亟亠亶��于�亠� %d亟 %d� %02d仄"

-#: ../pidgin/gtkblist.c:3744
+#: ../pidgin/gtkblist.c:3826
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "�亠亰亟亠亶��于�亠� %d� %02d仄"

-#: ../pidgin/gtkblist.c:3746
+#: ../pidgin/gtkblist.c:3828
 #, c-format
 msgid "Idle %dm"
 msgstr "�亠亰亟亠亶��于�亠� %d仄"

-#: ../pidgin/gtkblist.c:3900
+#: ../pidgin/gtkblist.c:3982
 msgid "/Buddies/New Instant Message..."
 msgstr "/弌仂弍亠�亠亟仆亳从亳/�仂于仂亠 仄亞仆仂于亠仆仆仂亠 �仂仂弍�亠仆亳亠..."

-#: ../pidgin/gtkblist.c:3901 ../pidgin/gtkblist.c:3934
+#: ../pidgin/gtkblist.c:3983 ../pidgin/gtkblist.c:4016
 msgid "/Buddies/Join a Chat..."
 msgstr "/弌仂弍亠�亠亟仆亳从亳/��亳�仂亠亟亳仆亳���� 从 �舒��..."

-#: ../pidgin/gtkblist.c:3902
+#: ../pidgin/gtkblist.c:3984
 msgid "/Buddies/Get User Info..."
 msgstr "/弌仂弍亠�亠亟仆亳从亳/�仂仍��亳�� 仗仂仍�亰仂于舒�亠仍��从�� 亳仆�仂�仄舒�亳�..."

-#: ../pidgin/gtkblist.c:3903
+#: ../pidgin/gtkblist.c:3985
 msgid "/Buddies/Add Buddy..."
 msgstr "/弌仂弍亠�亠亟仆亳从亳/�仂弍舒于亳�� �仂弍亠�亠亟仆亳从舒..."

-#: ../pidgin/gtkblist.c:3904 ../pidgin/gtkblist.c:3937
+#: ../pidgin/gtkblist.c:3986 ../pidgin/gtkblist.c:4019
 msgid "/Buddies/Add Chat..."
 msgstr "/弌仂弍亠�亠亟仆亳从亳/�仂弍舒于亳�� �舒�..."

-#: ../pidgin/gtkblist.c:3905
+#: ../pidgin/gtkblist.c:3987
 msgid "/Buddies/Add Group..."
 msgstr "/弌仂弍亠�亠亟仆亳从亳/�仂弍舒于亳�� 亞��仗仗�..."

-#: ../pidgin/gtkblist.c:3940
+#: ../pidgin/gtkblist.c:4022
 msgid "/Tools/Privacy"
 msgstr "/�仆����仄亠仆��/�仂仆�亳亟亠仆�亳舒仍�仆仂���"

-#: ../pidgin/gtkblist.c:3943
+#: ../pidgin/gtkblist.c:4025
 msgid "/Tools/Room List"
 msgstr "/�仆����仄亠仆��/弌仗亳�仂从 从仂仄仆舒�"

-#: ../pidgin/gtkblist.c:4075 ../pidgin/gtkdocklet.c:155
+#: ../pidgin/gtkblist.c:4157 ../pidgin/gtkdocklet.c:155
 #: ../pidgin/gtkdocklet.c:160
 #, c-format
 msgid "%d unread message from %s\n"
@@ -14476,41 +14495,41 @@
 msgstr[1] "%d 仆亠仗�仂�亳�舒仆仆�� �仂仂弍�亠仆亳� 仂� %s\n"
 msgstr[2] "%d 仆亠仗�仂�亳�舒仆仆�� �仂仂弍�亠仆亳亶 仂� %s\n"

-#: ../pidgin/gtkblist.c:4238
+#: ../pidgin/gtkblist.c:4320
 msgid "Manually"
 msgstr "����仆��"

-#: ../pidgin/gtkblist.c:4241
+#: ../pidgin/gtkblist.c:4323
 msgid "By status"
 msgstr "�仂 ��舒����"

-#: ../pidgin/gtkblist.c:4242
+#: ../pidgin/gtkblist.c:4324
 msgid "By log size"
 msgstr "�仂 �舒亰仄亠�� 亢��仆舒仍舒"

-#: ../pidgin/gtkblist.c:4579
+#: ../pidgin/gtkblist.c:4662
 #, c-format
 msgid "%s disconnected"
 msgstr "弌仂亠亟亳仆亠仆亳亠 � %s �舒亰仂�于舒仆仂"

-#: ../pidgin/gtkblist.c:4581
+#: ../pidgin/gtkblist.c:4664
 #, c-format
 msgid "%s disabled"
 msgstr "%s 于�从仍��亠仆仂"

-#: ../pidgin/gtkblist.c:4585
+#: ../pidgin/gtkblist.c:4668
 msgid "Reconnect"
 msgstr "�亠�亠���舒仆仂于亳�� �仂亠亟亳仆亠仆亳亠"

-#: ../pidgin/gtkblist.c:4585 ../pidgin/gtkblist.c:4704
+#: ../pidgin/gtkblist.c:4668 ../pidgin/gtkblist.c:4787
 msgid "Re-enable"
 msgstr "�从仍��亳�� 仗仂于�仂�仆仂"

-#: ../pidgin/gtkblist.c:4702
+#: ../pidgin/gtkblist.c:4785
 msgid "Welcome back!"
 msgstr ""

-#: ../pidgin/gtkblist.c:4738
+#: ../pidgin/gtkblist.c:4821
 #, fuzzy, c-format
 msgid "%d account was disabled because you signed on from another location:"
 msgid_plural ""
@@ -14519,24 +14538,24 @@
 msgstr[1] "�� 仗仂亟从仍��亠仆� 亳亰 亟��亞仂亞仂 仄亠��舒."
 msgstr[2] "�� 仗仂亟从仍��亠仆� 亳亰 亟��亞仂亞仂 仄亠��舒."

-#: ../pidgin/gtkblist.c:5017
+#: ../pidgin/gtkblist.c:5100
 msgid "<b>Username:</b>"
 msgstr "<b>�仄� 仗仂仍�亰仂于舒�亠仍�:</b>"

-#: ../pidgin/gtkblist.c:5024
+#: ../pidgin/gtkblist.c:5107
 msgid "<b>Password:</b>"
 msgstr "<b>�舒�仂仍�:</b>"

-#: ../pidgin/gtkblist.c:5035
+#: ../pidgin/gtkblist.c:5118
 msgid "_Login"
 msgstr ""

-#: ../pidgin/gtkblist.c:5119
+#: ../pidgin/gtkblist.c:5202
 msgid "/Accounts"
 msgstr "/丕���仆�亠 亰舒仗亳�亳"

 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:5133
+#: ../pidgin/gtkblist.c:5216
 #, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
@@ -14555,56 +14574,53 @@
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:5404
+#: ../pidgin/gtkblist.c:5487
 msgid "/Buddies/Show/Offline Buddies"
 msgstr "/弌仂弍亠�亠亟仆亳从亳/�仂从舒亰�于舒��/弌仂弍亠�亠亟仆亳从仂于 仆亠 于 �亠�亳"

-#: ../pidgin/gtkblist.c:5407
+#: ../pidgin/gtkblist.c:5490
 msgid "/Buddies/Show/Empty Groups"
 msgstr "/弌仂弍亠�亠亟仆亳从亳/�仂从舒亰�于舒��/�����亠 亞��仗仗�"

-#: ../pidgin/gtkblist.c:5413
+#: ../pidgin/gtkblist.c:5496
 msgid "/Buddies/Show/Buddy Details"
 msgstr "/弌仂弍亠�亠亟仆亳从亳/�仂从舒亰�于舒��/�仂亟�仂弍仆仂��亳 仂 �仂弍亠�亠亟仆亳从舒�"

-#: ../pidgin/gtkblist.c:5416
+#: ../pidgin/gtkblist.c:5499
 msgid "/Buddies/Show/Idle Times"
 msgstr "/弌仂弍亠�亠亟仆亳从亳/�仂从舒亰�于舒��/��亠仄� 弍亠亰亟亠亶��于亳�"

-#: ../pidgin/gtkblist.c:5419
+#: ../pidgin/gtkblist.c:5502
 msgid "/Buddies/Show/Protocol Icons"
 msgstr "/弌仂弍亠�亠亟仆亳从亳/�仂从舒亰�于舒��/�仆舒�从亳 仗�仂�仂从仂仍仂于"

-#: ../pidgin/gtkblist.c:6372
+#: ../pidgin/gtkblist.c:6455
 msgid "Add a buddy.\n"
 msgstr "�仂弍舒于亳�� �仂弍亠�亠亟仆亳从舒.\n"

-#: ../pidgin/gtkblist.c:6387
-#, fuzzy
-msgid "Buddy's _screen name:"
-msgstr "_�亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍�:"
-
-#: ../pidgin/gtkblist.c:6409
-#, fuzzy
+#: ../pidgin/gtkblist.c:6470
+msgid "Buddy's _username:"
+msgstr "_�仄� 仗仂仍�亰仂于舒�亠仍� �仂弍亠�亠亟仆亳从舒:"
+
+#: ../pidgin/gtkblist.c:6492
 msgid "(Optional) A_lias:"
-msgstr "�亠仂弍�亰舒�亠仍�仆舒� 亳仆�仂�仄舒�亳�:"
-
-#: ../pidgin/gtkblist.c:6427
-#, fuzzy
+msgstr "_��亠于亟仂仆亳仄 (仆亠 仂弍�亰舒�亠仍亠仆):"
+
+#: ../pidgin/gtkblist.c:6510
 msgid "Add buddy to _group:"
-msgstr "�仂弍舒于亳�� �仂弍亠�亠亟仆亳从舒 于 �仗亳�仂从?"
-
-#: ../pidgin/gtkblist.c:6676
+msgstr "�仂弍舒于亳�� �仂弍亠�亠亟仆亳从舒 于 _亞��仗仗�:"
+
+#: ../pidgin/gtkblist.c:6759
 msgid "This protocol does not support chat rooms."
 msgstr "亅�仂� 仗�仂�仂从仂仍 仆亠 仗仂亟亟亠�亢亳于舒亠� �舒��."

-#: ../pidgin/gtkblist.c:6692
+#: ../pidgin/gtkblist.c:6775
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "�� 仆亠 仗仂亟从仍��亠仆� 仗仂 仗�仂�仂从仂仍舒仄, 亳仄亠��亳仄 仗仂亟亟亠�亢从� �舒�仂于."

-#: ../pidgin/gtkblist.c:6736
+#: ../pidgin/gtkblist.c:6819
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -14612,51 +14628,51 @@
 "�于亠亟亳�亠 仗�亠于亟仂仆亳仄 亳 �仂仂�于亠���于����� 亳仆�仂�仄舒�亳� 仂 �舒�亠, 从仂�仂��亶 于� �仂�亠仍亳 弍� "
 "亟仂弍舒于亳�� 于 �仗亳�仂从 �仂弍亠�亠亟仆亳从仂于.\n"

-#: ../pidgin/gtkblist.c:6759
+#: ../pidgin/gtkblist.c:6842
 msgid "A_lias:"
 msgstr "_��亠于亟仂仆亳仄:"

-#: ../pidgin/gtkblist.c:6766
+#: ../pidgin/gtkblist.c:6849
 msgid "Auto_join when account becomes online."
 msgstr ""

-#: ../pidgin/gtkblist.c:6767
+#: ../pidgin/gtkblist.c:6850
 msgid "_Hide chat when the window is closed."
 msgstr ""

-#: ../pidgin/gtkblist.c:6793
+#: ../pidgin/gtkblist.c:6876
 msgid "Please enter the name of the group to be added."
 msgstr "�于亠亟亳�亠 亳仄� 亟仂弍舒于仍�亠仄仂亶 亞��仗仗�."

-#: ../pidgin/gtkblist.c:7451
+#: ../pidgin/gtkblist.c:7534
 msgid "<PurpleMain>/Accounts/"
 msgstr ""

-#: ../pidgin/gtkblist.c:7475
+#: ../pidgin/gtkblist.c:7558
 msgid "_Edit Account"
 msgstr "_�亰仄亠仆亳�� ����仆�� 亰舒仗亳��"

-#: ../pidgin/gtkblist.c:7488 ../pidgin/gtkconv.c:3128
+#: ../pidgin/gtkblist.c:7571 ../pidgin/gtkconv.c:3220
 msgid "No actions available"
 msgstr "�亠� 亟仂���仗仆�� 亟亠亶��于亳亶"

-#: ../pidgin/gtkblist.c:7496
+#: ../pidgin/gtkblist.c:7579
 msgid "_Disable"
 msgstr "_��从仍��亳��"

-#: ../pidgin/gtkblist.c:7508
+#: ../pidgin/gtkblist.c:7591
 msgid "Enable Account"
 msgstr "�从仍��亳�� ����仆�� 亰舒仗亳��"

-#: ../pidgin/gtkblist.c:7514
+#: ../pidgin/gtkblist.c:7597
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr ""

-#: ../pidgin/gtkblist.c:7563
+#: ../pidgin/gtkblist.c:7646
 msgid "/Tools"
 msgstr "/�仆����仄亠仆��"

-#: ../pidgin/gtkblist.c:7633
+#: ../pidgin/gtkblist.c:7716
 msgid "/Buddies/Sort Buddies"
 msgstr "/弌仂弍亠�亠亟仆亳从亳/弌仂��亳�仂于舒�� �仂弍亠�亠亟仆亳从仂于"

@@ -14665,26 +14681,26 @@
 msgid "SSL Servers"
 msgstr "SSL-�亠�于亠��"

-#: ../pidgin/gtkconv.c:485
+#: ../pidgin/gtkconv.c:487
 msgid "Unknown command."
 msgstr "�亠亳亰于亠��仆舒� 从仂仄舒仆亟舒."

-#: ../pidgin/gtkconv.c:749 ../pidgin/gtkconv.c:775
+#: ../pidgin/gtkconv.c:771 ../pidgin/gtkconv.c:798
 msgid "That buddy is not on the same protocol as this chat."
 msgstr ""

-#: ../pidgin/gtkconv.c:769
+#: ../pidgin/gtkconv.c:792
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr ""
 "�� 仆亠 仗仂亟从仍��亠仆� � ����仆仂亶 亰舒仗亳���, 仗仂亰于仂仍���亠亶 仗�亳亞仍舒�亳�� ��仂亞仂 �仂弍亠�亠亟仆亳从舒."

-#: ../pidgin/gtkconv.c:822
+#: ../pidgin/gtkconv.c:846
 msgid "Invite Buddy Into Chat Room"
 msgstr "��亳亞仍舒�亳�� �仂弍亠�亠亟仆亳从舒 于 �舒�"

 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:852
+#: ../pidgin/gtkconv.c:876
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -14692,183 +14708,187 @@
 "�于亠亟亳�亠 亳仄� 仗仂仍�亰仂于舒�亠仍�, 从仂�仂�仂亞仂 于� �仂�亳�亠 仗�亳亞仍舒�亳��, 于仄亠��亠 � "
 "仆亠仂弍�亰舒�亠仍�仆�仄 �亠从��仂仄 仗�亳亞仍舒�亠仆亳�."

-#: ../pidgin/gtkconv.c:873
+#: ../pidgin/gtkconv.c:897
 msgid "_Buddy:"
 msgstr "_弌仂弍亠�亠亟仆亳从:"

-#: ../pidgin/gtkconv.c:884 ../pidgin/gtksavedstatuses.c:1166
+#: ../pidgin/gtkconv.c:910 ../pidgin/gtksavedstatuses.c:1166
 #: ../pidgin/gtksavedstatuses.c:1484
 msgid "_Message:"
 msgstr "弌仂仂弍_�亠仆亳亠:"

-#: ../pidgin/gtkconv.c:948
+#: ../pidgin/gtkconv.c:973
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>�亠�亠亟舒 � %s</h1>\n"

-#: ../pidgin/gtkconv.c:986
+#: ../pidgin/gtkconv.c:1011
 msgid "Save Conversation"
 msgstr "弌仂��舒仆亳�� 弍亠�亠亟�"

-#: ../pidgin/gtkconv.c:1132 ../pidgin/gtkdebug.c:167 ../pidgin/gtkdebug.c:740
+#: ../pidgin/gtkconv.c:1157 ../pidgin/gtkdebug.c:167 ../pidgin/gtkdebug.c:740
 msgid "Find"
 msgstr "�舒亶�亳"

-#: ../pidgin/gtkconv.c:1158 ../pidgin/gtkdebug.c:195
+#: ../pidgin/gtkconv.c:1183 ../pidgin/gtkdebug.c:195
 msgid "_Search for:"
 msgstr "_��从舒��:"

-#: ../pidgin/gtkconv.c:1659
+#: ../pidgin/gtkconv.c:1684
 msgid "Un-Ignore"
 msgstr "�亠 亳亞仆仂�亳�仂于舒��"

-#: ../pidgin/gtkconv.c:1662
+#: ../pidgin/gtkconv.c:1687
 msgid "Ignore"
 msgstr "�亞仆仂�亳�仂于舒��"

-#: ../pidgin/gtkconv.c:1682
+#: ../pidgin/gtkconv.c:1707
 msgid "Get Away Message"
 msgstr "�仂仍��亳�� �仂仂弍�亠仆亳亠 仂弍 仂������于亳亳"

-#: ../pidgin/gtkconv.c:1705
+#: ../pidgin/gtkconv.c:1730
 msgid "Last said"
 msgstr "�仂�仍亠亟仆亠亠 �从舒亰舒仆仆仂亠"

-#: ../pidgin/gtkconv.c:2660
+#: ../pidgin/gtkconv.c:2715
 msgid "Unable to save icon file to disk."
 msgstr "�亠 �亟舒���� �仂��舒仆亳�� �舒亶仍 亰仆舒�从舒 仆舒 亟亳�从."

-#: ../pidgin/gtkconv.c:2711
+#: ../pidgin/gtkconv.c:2793
 msgid "Save Icon"
 msgstr "弌仂��舒仆亳�� 亰仆舒�仂从"

-#: ../pidgin/gtkconv.c:2763
+#: ../pidgin/gtkconv.c:2851
 msgid "Animate"
 msgstr "�仆亳仄亳�仂于舒��"

-#: ../pidgin/gtkconv.c:2768
+#: ../pidgin/gtkconv.c:2856
 msgid "Hide Icon"
 msgstr "弌从���� 亰仆舒�仂从"

-#: ../pidgin/gtkconv.c:2771
+#: ../pidgin/gtkconv.c:2859
 msgid "Save Icon As..."
 msgstr "弌仂��舒仆亳�� 亰仆舒�仂从 从舒从..."

-#: ../pidgin/gtkconv.c:2775
+#: ../pidgin/gtkconv.c:2863
 msgid "Set Custom Icon..."
 msgstr "丕��舒仆仂于亳�� �仂弍��于亠仆仆�亶 亰仆舒�仂从..."

-#: ../pidgin/gtkconv.c:2788
+#: ../pidgin/gtkconv.c:2867
+msgid "Change Size"
+msgstr "�亰仄亠仆亳�� �舒亰仄亠�"
+
+#: ../pidgin/gtkconv.c:2880
 msgid "Remove Custom Icon"
 msgstr "丕亟舒仍亳�� �仂弍��于亠仆仆�亶 亰仆舒�仂从"

-#: ../pidgin/gtkconv.c:2913
+#: ../pidgin/gtkconv.c:3005
 msgid "Show All"
 msgstr ""

 #. Conversation menu
-#: ../pidgin/gtkconv.c:2932
+#: ../pidgin/gtkconv.c:3024
 msgid "/_Conversation"
 msgstr "/_�亠�亠亟舒"

-#: ../pidgin/gtkconv.c:2934
+#: ../pidgin/gtkconv.c:3026
 msgid "/Conversation/New Instant _Message..."
 msgstr "/�亠�亠亟舒/�仂于仂亠 仄亞仆仂于亠仆仆仂亠 �仂仂弍_�亠仆亳亠..."

-#: ../pidgin/gtkconv.c:2939
+#: ../pidgin/gtkconv.c:3031
 msgid "/Conversation/_Find..."
 msgstr "/�亠�亠亟舒/_�舒亶�亳..."

-#: ../pidgin/gtkconv.c:2941
+#: ../pidgin/gtkconv.c:3033
 msgid "/Conversation/View _Log"
 msgstr "/�亠�亠亟舒/��仂�仄仂��亠�� _亢��仆舒仍"

-#: ../pidgin/gtkconv.c:2942
+#: ../pidgin/gtkconv.c:3034
 msgid "/Conversation/_Save As..."
 msgstr "/�亠�亠亟舒/弌仂_��舒仆亳�� 从舒从..."

-#: ../pidgin/gtkconv.c:2944
+#: ../pidgin/gtkconv.c:3036
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/�亠�亠亟舒/�_�亳��亳��"

-#: ../pidgin/gtkconv.c:2948
+#: ../pidgin/gtkconv.c:3040
 msgid "/Conversation/Se_nd File..."
 msgstr "/�亠�亠亟舒/��仗�舒于亳�� _�舒亶仍..."

-#: ../pidgin/gtkconv.c:2949
+#: ../pidgin/gtkconv.c:3041
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/�亠�亠亟舒/�仂弍舒于亳�� 仗_�舒于亳仍仂..."

-#: ../pidgin/gtkconv.c:2951
+#: ../pidgin/gtkconv.c:3043
 msgid "/Conversation/_Get Info"
 msgstr "/�亠�亠亟舒/�仂仍��亳�� _亳仆�仂�仄舒�亳�"

-#: ../pidgin/gtkconv.c:2953
+#: ../pidgin/gtkconv.c:3045
 msgid "/Conversation/In_vite..."
 msgstr "/�亠�亠亟舒/��亳亞_仍舒�亳��..."

-#: ../pidgin/gtkconv.c:2955
+#: ../pidgin/gtkconv.c:3047
 msgid "/Conversation/M_ore"
 msgstr "/�亠�亠亟舒/_���"

-#: ../pidgin/gtkconv.c:2959
+#: ../pidgin/gtkconv.c:3051
 msgid "/Conversation/Al_ias..."
 msgstr "/�亠�亠亟舒/_��亠于亟仂仆亳仄..."

-#: ../pidgin/gtkconv.c:2961
+#: ../pidgin/gtkconv.c:3053
 msgid "/Conversation/_Block..."
 msgstr "/�亠�亠亟舒/_�仍仂从亳�仂于舒��..."

-#: ../pidgin/gtkconv.c:2963
+#: ../pidgin/gtkconv.c:3055
 msgid "/Conversation/_Unblock..."
 msgstr "/�亠�亠亟舒/�舒亰_弍仍仂从亳�仂于舒��..."

-#: ../pidgin/gtkconv.c:2965
+#: ../pidgin/gtkconv.c:3057
 msgid "/Conversation/_Add..."
 msgstr "/�亠�亠亟舒/_�仂弍舒于亳��..."

-#: ../pidgin/gtkconv.c:2967
+#: ../pidgin/gtkconv.c:3059
 msgid "/Conversation/_Remove..."
 msgstr "/�亠�亠亟舒/_丕亟舒仍亳��..."

-#: ../pidgin/gtkconv.c:2972
+#: ../pidgin/gtkconv.c:3064
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/�亠�亠亟舒/���舒于亳�� _���仍从�..."

-#: ../pidgin/gtkconv.c:2974
+#: ../pidgin/gtkconv.c:3066
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/�亠�亠亟舒/���舒于亳�� 亳亰_仂弍�舒亢亠仆亳亠..."

-#: ../pidgin/gtkconv.c:2980
+#: ../pidgin/gtkconv.c:3072
 msgid "/Conversation/_Close"
 msgstr "/�亠�亠亟舒/_�舒从����"

 #. Options
-#: ../pidgin/gtkconv.c:2984
+#: ../pidgin/gtkconv.c:3076
 msgid "/_Options"
 msgstr "/_�舒�舒仄亠���"

-#: ../pidgin/gtkconv.c:2985
+#: ../pidgin/gtkconv.c:3077
 msgid "/Options/Enable _Logging"
 msgstr "/�舒�舒仄亠���/�亠��亳 _亢��仆舒仍"

-#: ../pidgin/gtkconv.c:2986
+#: ../pidgin/gtkconv.c:3078
 msgid "/Options/Enable _Sounds"
 msgstr "/�舒�舒仄亠���/�仂�仗�仂亳亰于仂亟亳�� _亰于�从亳"

-#: ../pidgin/gtkconv.c:2988
+#: ../pidgin/gtkconv.c:3080
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/�舒�舒仄亠���/�仂从舒亰�于舒�� _仗舒仆亠仍亳 �仂�仄舒�亳�仂于舒仆亳�"

-#: ../pidgin/gtkconv.c:2989
+#: ../pidgin/gtkconv.c:3081
 msgid "/Options/Show Ti_mestamps"
 msgstr "/�舒�舒仄亠���/�仂从舒亰�于舒�� _于�亠仄� �仂仂弍�亠仆亳亶"

-#: ../pidgin/gtkconv.c:3116
+#: ../pidgin/gtkconv.c:3208
 msgid "/Conversation/More"
 msgstr "/�亠�亠亟舒/���"

-#: ../pidgin/gtkconv.c:3172
+#: ../pidgin/gtkconv.c:3264
 msgid "/Options"
 msgstr "/�舒�舒仄亠���"

@@ -14877,79 +14897,79 @@
 #. 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:3207 ../pidgin/gtkconv.c:3239
+#: ../pidgin/gtkconv.c:3299 ../pidgin/gtkconv.c:3331
 msgid "/Conversation"
 msgstr "/�亠�亠亟舒"

-#: ../pidgin/gtkconv.c:3247
+#: ../pidgin/gtkconv.c:3339
 msgid "/Conversation/View Log"
 msgstr "/�亠�亠亟舒/��仂�仄仂��亠�� 亢��仆舒仍"

-#: ../pidgin/gtkconv.c:3253
+#: ../pidgin/gtkconv.c:3345
 msgid "/Conversation/Send File..."
 msgstr "/�亠�亠亟舒/��仗�舒于亳�� �舒亶仍..."

-#: ../pidgin/gtkconv.c:3257
+#: ../pidgin/gtkconv.c:3349
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/�亠�亠亟舒/�仂弍舒于亳�� 仗�舒于亳仍仂..."

-#: ../pidgin/gtkconv.c:3263
+#: ../pidgin/gtkconv.c:3355
 msgid "/Conversation/Get Info"
 msgstr "/�亠�亠亟舒/�仂仍��亳�� 亳仆�仂�仄舒�亳�"

-#: ../pidgin/gtkconv.c:3267
+#: ../pidgin/gtkconv.c:3359
 msgid "/Conversation/Invite..."
 msgstr "/�亠�亠亟舒/��亳亞仍舒�亳��..."

-#: ../pidgin/gtkconv.c:3273
+#: ../pidgin/gtkconv.c:3365
 msgid "/Conversation/Alias..."
 msgstr "/�亠�亠亟舒/��亠于亟仂仆亳仄..."

-#: ../pidgin/gtkconv.c:3277
+#: ../pidgin/gtkconv.c:3369
 msgid "/Conversation/Block..."
 msgstr "/�亠�亠亟舒/�仍仂从亳�仂于舒��..."

-#: ../pidgin/gtkconv.c:3281
+#: ../pidgin/gtkconv.c:3373
 msgid "/Conversation/Unblock..."
 msgstr "/�亠�亠亟舒/�舒亰弍仍仂从亳�仂于舒��..."

-#: ../pidgin/gtkconv.c:3285
+#: ../pidgin/gtkconv.c:3377
 msgid "/Conversation/Add..."
 msgstr "/�亠�亠亟舒/�仂弍舒于亳��..."

-#: ../pidgin/gtkconv.c:3289
+#: ../pidgin/gtkconv.c:3381
 msgid "/Conversation/Remove..."
 msgstr "/�亠�亠亟舒/丕亟舒仍亳��..."

-#: ../pidgin/gtkconv.c:3295
+#: ../pidgin/gtkconv.c:3387
 msgid "/Conversation/Insert Link..."
 msgstr "/�亠�亠亟舒/���舒于亳�� ���仍从�..."

-#: ../pidgin/gtkconv.c:3299
+#: ../pidgin/gtkconv.c:3391
 msgid "/Conversation/Insert Image..."
 msgstr "/�亠�亠亟舒/���舒于亳�� 亳亰仂弍�舒亢亠仆亳亠..."

-#: ../pidgin/gtkconv.c:3305
+#: ../pidgin/gtkconv.c:3397
 msgid "/Options/Enable Logging"
 msgstr "/�舒�舒仄亠���/�亠��亳 亢��仆舒仍"

-#: ../pidgin/gtkconv.c:3308
+#: ../pidgin/gtkconv.c:3400
 msgid "/Options/Enable Sounds"
 msgstr "/�舒�舒仄亠���/�仂�仗�仂亳亰于仂亟亳�� 亰于�从亳"

-#: ../pidgin/gtkconv.c:3321
+#: ../pidgin/gtkconv.c:3413
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/�舒�舒仄亠���/�仂从舒亰�于舒�� 仗舒仆亠仍亳 �仂�仄舒�亳�仂于舒仆亳�"

-#: ../pidgin/gtkconv.c:3324
+#: ../pidgin/gtkconv.c:3416
 msgid "/Options/Show Timestamps"
 msgstr "/�舒�舒仄亠���/�仂从舒亰�于舒�� 于�亠仄� �仂仂弍�亠仆亳亶"

-#: ../pidgin/gtkconv.c:3402
+#: ../pidgin/gtkconv.c:3494
 msgid "User is typing..."
 msgstr "�仂仍�亰仂于舒�亠仍� 仆舒弍亳�舒亠� �仂仂弍�亠仆亳亠..."

-#: ../pidgin/gtkconv.c:3472
+#: ../pidgin/gtkconv.c:3568
 #, c-format
 msgid ""
 "\n"
@@ -14959,20 +14979,20 @@
 "%s 仗�亠从�舒�亳仍 仆舒弍仂� �仂仂弍�亠仆亳�"

 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3638 ../pidgin/gtkconv.c:8309
+#: ../pidgin/gtkconv.c:3748 ../pidgin/gtkconv.c:8472
 msgid "S_end To"
 msgstr "_�亟�亠�舒�"

-#: ../pidgin/gtkconv.c:4350
+#: ../pidgin/gtkconv.c:4431 ../pidgin/plugins/sendbutton.c:44
 msgid "_Send"
 msgstr "_��仗�舒于亳��"

 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4486
+#: ../pidgin/gtkconv.c:4590
 msgid "0 people in room"
 msgstr "0 仗仂仍�亰仂于舒�亠仍亠亶 于 从仂仄仆舒�亠"

-#: ../pidgin/gtkconv.c:5784 ../pidgin/gtkconv.c:5905
+#: ../pidgin/gtkconv.c:5932 ../pidgin/gtkconv.c:6053
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
@@ -14980,75 +15000,75 @@
 msgstr[1] "%d 仗仂仍�亰仂于舒�亠仍� 于 从仂仄仆舒�亠"
 msgstr[2] "%d 仗仂仍�亰仂于舒�亠仍亠亶 于 从仂仄仆舒�亠"

-#: ../pidgin/gtkconv.c:6535 ../pidgin/gtkstatusbox.c:679
+#: ../pidgin/gtkconv.c:6687 ../pidgin/gtkstatusbox.c:684
 msgid "Typing"
 msgstr "�舒弍亳�舒亠� �仂仂弍�亠仆亳亠"

-#: ../pidgin/gtkconv.c:6539
+#: ../pidgin/gtkconv.c:6691
 msgid "Stopped Typing"
 msgstr "��亠从�舒�亳仍 仆舒弍仂� �仂仂弍�亠仆亳�"

-#: ../pidgin/gtkconv.c:6542
+#: ../pidgin/gtkconv.c:6694
 msgid "Nick Said"
 msgstr "��仂亳亰仆亠�亠仆仂 亳仄�"

-#: ../pidgin/gtkconv.c:6545 ../pidgin/gtkdocklet.c:686
+#: ../pidgin/gtkconv.c:6697 ../pidgin/gtkdocklet.c:686
 msgid "Unread Messages"
 msgstr "�亠仗�仂�亳�舒仆仆�亠 �仂仂弍�亠仆亳�"

-#: ../pidgin/gtkconv.c:6551
+#: ../pidgin/gtkconv.c:6703
 msgid "New Event"
 msgstr "�仂于仂亠 �仂弍��亳亠"

-#: ../pidgin/gtkconv.c:7781
+#: ../pidgin/gtkconv.c:7944
 msgid "clear: Clears all conversation scrollbacks."
 msgstr "clear: ��亳��亳�� 于�亠 仂从仆舒 弍亠�亠亟."

-#: ../pidgin/gtkconv.c:7985
+#: ../pidgin/gtkconv.c:8148
 msgid "Confirm close"
 msgstr "�仂亟�于亠�亟亳�� 亰舒从���亳亠"

-#: ../pidgin/gtkconv.c:8017
+#: ../pidgin/gtkconv.c:8180
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "���� 仆亠仗�仂�亳�舒仆仆�亠 �仂仂弍�亠仆亳�. �� 亟亠亶��于亳�亠仍�仆仂 �仂�亳�亠 亰舒从���� 仂从仆仂?"

-#: ../pidgin/gtkconv.c:8650
+#: ../pidgin/gtkconv.c:8813
 msgid "Close other tabs"
 msgstr "�舒从���� 亟��亞亳亠 于从仍舒亟从亳"

-#: ../pidgin/gtkconv.c:8656
+#: ../pidgin/gtkconv.c:8819
 msgid "Close all tabs"
 msgstr "�舒从���� 于�亠 于从仍舒亟从亳"

-#: ../pidgin/gtkconv.c:8664
+#: ../pidgin/gtkconv.c:8827
 msgid "Detach this tab"
 msgstr "��亟亠仍亳�� ��� 于从仍舒亟从�"

-#: ../pidgin/gtkconv.c:8670
+#: ../pidgin/gtkconv.c:8833
 msgid "Close this tab"
 msgstr "�舒从���� ��� 于从仍舒亟从�"

-#: ../pidgin/gtkconv.c:9184
+#: ../pidgin/gtkconv.c:9355
 msgid "Close conversation"
 msgstr "�舒从���� 弍亠�亠亟�"

-#: ../pidgin/gtkconv.c:9788
+#: ../pidgin/gtkconv.c:9959
 msgid "Last created window"
 msgstr "�仂�仍亠亟仆亠亠 �仂亰亟舒仆仆仂亠 仂从仆仂"

-#: ../pidgin/gtkconv.c:9790
+#: ../pidgin/gtkconv.c:9961
 msgid "Separate IM and Chat windows"
 msgstr "��亟亠仍�仆�亠 仂从仆舒 仄亞仆仂于亠仆仆�� �仂仂弍�亠仆亳亶 亳 �舒�仂于"

-#: ../pidgin/gtkconv.c:9792 ../pidgin/gtkprefs.c:1466
+#: ../pidgin/gtkconv.c:9963 ../pidgin/gtkprefs.c:1576
 msgid "New window"
 msgstr "�仂于仂亠 仂从仆仂"

-#: ../pidgin/gtkconv.c:9794
+#: ../pidgin/gtkconv.c:9965
 msgid "By group"
 msgstr "�仂 亞��仗仗亠"

-#: ../pidgin/gtkconv.c:9796
+#: ../pidgin/gtkconv.c:9967
 msgid "By account"
 msgstr "�仂 ����仆仂亶 亰舒仗亳�亳"

@@ -15112,7 +15132,7 @@
 msgid "Fatal Error"
 msgstr "�亠亳�仗�舒于亳仄舒� 仂�亳弍从舒"

-#: ../pidgin/gtkdialogs.c:72 ../pidgin/gtkdialogs.c:119
+#: ../pidgin/gtkdialogs.c:72 ../pidgin/gtkdialogs.c:120
 msgid "lead developer"
 msgstr "于亠亟��亳亶 �舒亰�舒弍仂��亳从"

@@ -15137,7 +15157,7 @@
 msgid "support/QA"
 msgstr "仗仂亟亟亠�亢从舒 亳 从仂仆��仂仍� 从舒�亠��于舒"

-#: ../pidgin/gtkdialogs.c:91 ../pidgin/gtkdialogs.c:114
+#: ../pidgin/gtkdialogs.c:91 ../pidgin/gtkdialogs.c:115
 msgid "developer & webmaster"
 msgstr "�舒亰�舒弍仂��亳从 亳 web-仄舒��亠�"

@@ -15145,339 +15165,340 @@
 msgid "Senior Contributor/QA"
 msgstr ""

-#: ../pidgin/gtkdialogs.c:110
+#: ../pidgin/gtkdialogs.c:111
 msgid "win32 port"
 msgstr "仗仂�� win32"

-#: ../pidgin/gtkdialogs.c:111 ../pidgin/gtkdialogs.c:112
+#: ../pidgin/gtkdialogs.c:112 ../pidgin/gtkdialogs.c:113
 msgid "maintainer"
 msgstr "�仂仗�仂于仂亢亟舒��亳亶"

-#: ../pidgin/gtkdialogs.c:113
+#: ../pidgin/gtkdialogs.c:114
 msgid "libfaim maintainer"
 msgstr "�仂仗�仂于仂亢亟舒��亳亶 libfaim"

 #. If "lazy bum" translates literally into a serious insult, use something else or omit it.
-#: ../pidgin/gtkdialogs.c:116
+#: ../pidgin/gtkdialogs.c:117
 msgid "hacker and designated driver [lazy bum]"
 msgstr ""

-#: ../pidgin/gtkdialogs.c:117
+#: ../pidgin/gtkdialogs.c:118
 msgid "XMPP developer"
 msgstr "XMPP-�舒亰�舒弍仂��亳从"

-#: ../pidgin/gtkdialogs.c:118
+#: ../pidgin/gtkdialogs.c:119
 msgid "original author"
 msgstr "仂�亳亞亳仆舒仍�仆�亶 舒于�仂�"

-#: ../pidgin/gtkdialogs.c:134
+#: ../pidgin/gtkdialogs.c:135
 msgid "Afrikaans"
 msgstr "���亳从舒舒仆�"

-#: ../pidgin/gtkdialogs.c:135 ../pidgin/gtkdialogs.c:230
+#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:231
 msgid "Arabic"
 msgstr "��舒弍�从亳亶"

-#: ../pidgin/gtkdialogs.c:136
+#: ../pidgin/gtkdialogs.c:137
 msgid "Belarusian Latin"
 msgstr "�亠仍仂����从舒� 仍舒�亳仆亳�舒"

-#: ../pidgin/gtkdialogs.c:137 ../pidgin/gtkdialogs.c:138
-#: ../pidgin/gtkdialogs.c:231
+#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
+#: ../pidgin/gtkdialogs.c:232
 msgid "Bulgarian"
 msgstr "�仂仍亞舒��从亳亶"

-#: ../pidgin/gtkdialogs.c:139 ../pidgin/gtkdialogs.c:140
-#: ../pidgin/gtkdialogs.c:141 ../pidgin/gtkdialogs.c:142
+#: ../pidgin/gtkdialogs.c:140 ../pidgin/gtkdialogs.c:141
+#: ../pidgin/gtkdialogs.c:142 ../pidgin/gtkdialogs.c:143
 msgid "Bengali"
 msgstr "�亠仆亞舒仍��从亳亶"

-#: ../pidgin/gtkdialogs.c:143
+#: ../pidgin/gtkdialogs.c:144
 msgid "Bosnian"
 msgstr "�仂�仆亳亶�从亳亶"

-#: ../pidgin/gtkdialogs.c:144 ../pidgin/gtkdialogs.c:232
-#: ../pidgin/gtkdialogs.c:233
+#: ../pidgin/gtkdialogs.c:145 ../pidgin/gtkdialogs.c:233
+#: ../pidgin/gtkdialogs.c:234
 msgid "Catalan"
 msgstr "�舒�舒仍舒仆�从亳亶"

-#: ../pidgin/gtkdialogs.c:145 ../pidgin/gtkdialogs.c:146
+#: ../pidgin/gtkdialogs.c:146 ../pidgin/gtkdialogs.c:147
 msgid "Valencian-Catalan"
 msgstr "�舒仍亠仆�亳亶�从亳亶-从舒�舒仍舒仆�从亳亶"

-#: ../pidgin/gtkdialogs.c:147 ../pidgin/gtkdialogs.c:234
+#: ../pidgin/gtkdialogs.c:148 ../pidgin/gtkdialogs.c:235
+#: ../pidgin/gtkdialogs.c:236
 msgid "Czech"
 msgstr "丼亠��从亳亶"

-#: ../pidgin/gtkdialogs.c:148 ../pidgin/gtkdialogs.c:149
+#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:150
 msgid "Danish"
 msgstr "�舒��从亳亶"

-#: ../pidgin/gtkdialogs.c:150 ../pidgin/gtkdialogs.c:151
-#: ../pidgin/gtkdialogs.c:235
+#: ../pidgin/gtkdialogs.c:151 ../pidgin/gtkdialogs.c:152
+#: ../pidgin/gtkdialogs.c:237
 msgid "German"
 msgstr "�亠仄亠�从亳亶"

-#: ../pidgin/gtkdialogs.c:152 ../pidgin/gtkdialogs.c:153
-#: ../pidgin/gtkdialogs.c:154
+#: ../pidgin/gtkdialogs.c:153 ../pidgin/gtkdialogs.c:154
+#: ../pidgin/gtkdialogs.c:155
 msgid "Dzongkha"
 msgstr "�亰仂仆亞-从�"

-#: ../pidgin/gtkdialogs.c:155 ../pidgin/gtkdialogs.c:156
+#: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:157
 msgid "Greek"
 msgstr "��亠�亠�从亳亶"

-#: ../pidgin/gtkdialogs.c:157
+#: ../pidgin/gtkdialogs.c:158
 msgid "Australian English"
 msgstr "�于���舒仍亳亶�从亳亶 舒仆亞仍亳亶�从亳亶"

-#: ../pidgin/gtkdialogs.c:158
+#: ../pidgin/gtkdialogs.c:159
 msgid "Canadian English"
 msgstr "�舒仆舒亟�从亳亶 舒仆亞仍亳亶�从亳亶"

-#: ../pidgin/gtkdialogs.c:159
+#: ../pidgin/gtkdialogs.c:160
 msgid "British English"
 msgstr "��亳�舒仆�从亳亶 舒仆亞仍亳亶�从亳亶"

-#: ../pidgin/gtkdialogs.c:160
+#: ../pidgin/gtkdialogs.c:161
 msgid "Esperanto"
 msgstr "亅�仗亠�舒仆�仂"

-#: ../pidgin/gtkdialogs.c:161 ../pidgin/gtkdialogs.c:236
-#: ../pidgin/gtkdialogs.c:237 ../pidgin/gtkdialogs.c:238
-#: ../pidgin/gtkdialogs.c:239
+#: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:238
+#: ../pidgin/gtkdialogs.c:239 ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:241
 msgid "Spanish"
 msgstr "��仗舒仆�从亳亶"

-#: ../pidgin/gtkdialogs.c:162
+#: ../pidgin/gtkdialogs.c:163
 msgid "Estonian"
 msgstr "亅��仂仆�从亳亶"

-#: ../pidgin/gtkdialogs.c:163 ../pidgin/gtkdialogs.c:164
+#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:165
 msgid "Euskera(Basque)"
 msgstr "�舒�从�从亳亶"

-#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:166
-#: ../pidgin/gtkdialogs.c:167
+#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:167
+#: ../pidgin/gtkdialogs.c:168
 msgid "Persian"
 msgstr "�亠��亳亟�从亳亶"

-#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:240
-#: ../pidgin/gtkdialogs.c:241
+#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:242
+#: ../pidgin/gtkdialogs.c:243
 msgid "Finnish"
 msgstr "个亳仆�从亳亶"

-#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:242
-#: ../pidgin/gtkdialogs.c:243 ../pidgin/gtkdialogs.c:244
-#: ../pidgin/gtkdialogs.c:245
+#: ../pidgin/gtkdialogs.c:170 ../pidgin/gtkdialogs.c:244
+#: ../pidgin/gtkdialogs.c:245 ../pidgin/gtkdialogs.c:246
+#: ../pidgin/gtkdialogs.c:247
 msgid "French"
 msgstr "个�舒仆��亰�从亳亶"

-#: ../pidgin/gtkdialogs.c:170 ../pidgin/gtkdialogs.c:171
-#: ../pidgin/gtkdialogs.c:246
+#: ../pidgin/gtkdialogs.c:171 ../pidgin/gtkdialogs.c:172
+#: ../pidgin/gtkdialogs.c:248
 msgid "Galician"
 msgstr "�舒仍亳�亳亶�从亳亶"

-#: ../pidgin/gtkdialogs.c:172 ../pidgin/gtkdialogs.c:173
+#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:174
 msgid "Gujarati"
 msgstr "��亟亢舒�舒�亳"

-#: ../pidgin/gtkdialogs.c:173
+#: ../pidgin/gtkdialogs.c:174
 msgid "Gujarati Language Team"
 msgstr "�仂仄舒仆亟舒 仗亠�亠于仂亟�亳从仂于 仆舒 亞�亟亢舒�舒�亳"

-#: ../pidgin/gtkdialogs.c:174 ../pidgin/gtkdialogs.c:247
+#: ../pidgin/gtkdialogs.c:175 ../pidgin/gtkdialogs.c:249
 msgid "Hebrew"
 msgstr "�于�亳�"

-#: ../pidgin/gtkdialogs.c:175
+#: ../pidgin/gtkdialogs.c:176
 msgid "Hindi"
 msgstr "丱亳仆亟亳"

-#: ../pidgin/gtkdialogs.c:176 ../pidgin/gtkdialogs.c:248
+#: ../pidgin/gtkdialogs.c:177 ../pidgin/gtkdialogs.c:250
 msgid "Hungarian"
 msgstr "�亠仆亞亠��从亳亶"

-#: ../pidgin/gtkdialogs.c:177
+#: ../pidgin/gtkdialogs.c:178
 msgid "Indonesian"
 msgstr "�仆亟仂仆亠亰亳亶�从亳亶"

-#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:249
+#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:251
 msgid "Italian"
 msgstr "��舒仍��仆�从亳亶"

-#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:250
-#: ../pidgin/gtkdialogs.c:251 ../pidgin/gtkdialogs.c:252
+#: ../pidgin/gtkdialogs.c:180 ../pidgin/gtkdialogs.c:252
+#: ../pidgin/gtkdialogs.c:253 ../pidgin/gtkdialogs.c:254
 msgid "Japanese"
 msgstr "亊仗仂仆�从亳亶"

-#: ../pidgin/gtkdialogs.c:180 ../pidgin/gtkdialogs.c:253
+#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:255
 msgid "Georgian"
 msgstr "���亰亳仆�从亳亶"

-#: ../pidgin/gtkdialogs.c:180
+#: ../pidgin/gtkdialogs.c:181
 msgid "Ubuntu Georgian Translators"
 msgstr "�亠�亠于仂亟�亳从亳 Ubuntu 仆舒 亞��亰亳仆�从亳亶"

-#: ../pidgin/gtkdialogs.c:181
+#: ../pidgin/gtkdialogs.c:182
 msgid "Kannada"
 msgstr "�舒仆仆舒亟舒"

-#: ../pidgin/gtkdialogs.c:181
+#: ../pidgin/gtkdialogs.c:182
 msgid "Kannada Translation team"
 msgstr "�仂仄舒仆亟舒 仗亠�亠于仂亟�亳从仂于 仆舒 从舒仆仆舒亟舒"

-#: ../pidgin/gtkdialogs.c:182 ../pidgin/gtkdialogs.c:254
-#: ../pidgin/gtkdialogs.c:255
+#: ../pidgin/gtkdialogs.c:183 ../pidgin/gtkdialogs.c:256
+#: ../pidgin/gtkdialogs.c:257
 msgid "Korean"
 msgstr "�仂�亠亶�从亳亶"

-#: ../pidgin/gtkdialogs.c:183 ../pidgin/gtkdialogs.c:184
-#: ../pidgin/gtkdialogs.c:185
+#: ../pidgin/gtkdialogs.c:184 ../pidgin/gtkdialogs.c:185
+#: ../pidgin/gtkdialogs.c:186
 msgid "Kurdish"
 msgstr "���亟�从亳亶"

-#: ../pidgin/gtkdialogs.c:186
+#: ../pidgin/gtkdialogs.c:187
 msgid "Lao"
 msgstr "�舒仂��从亳亶"

-#: ../pidgin/gtkdialogs.c:187 ../pidgin/gtkdialogs.c:256
-#: ../pidgin/gtkdialogs.c:257
+#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:258
+#: ../pidgin/gtkdialogs.c:259
 msgid "Lithuanian"
 msgstr "�亳�仂于�从亳亶"

-#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:189
-#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:258
+#: ../pidgin/gtkdialogs.c:189 ../pidgin/gtkdialogs.c:190
+#: ../pidgin/gtkdialogs.c:191 ../pidgin/gtkdialogs.c:260
 msgid "Macedonian"
 msgstr "�舒从亠亟仂仆�从亳亶"

-#: ../pidgin/gtkdialogs.c:191 ../pidgin/gtkdialogs.c:259
-#: ../pidgin/gtkdialogs.c:260
+#: ../pidgin/gtkdialogs.c:192 ../pidgin/gtkdialogs.c:261
+#: ../pidgin/gtkdialogs.c:262
 msgid "Bokm奪l Norwegian"
 msgstr "��从仄仂仍"

-#: ../pidgin/gtkdialogs.c:192
+#: ../pidgin/gtkdialogs.c:193
 msgid "Nepali"
 msgstr "�亠仗舒仍��从亳亶"

-#: ../pidgin/gtkdialogs.c:193
+#: ../pidgin/gtkdialogs.c:194
 msgid "Dutch, Flemish"
 msgstr "�亳亟亠�仍舒仆亟�从亳亶, �仍舒仄舒仆亟�从亳亶"

-#: ../pidgin/gtkdialogs.c:194
+#: ../pidgin/gtkdialogs.c:195
 msgid "Norwegian Nynorsk"
 msgstr "�仂�于亠亢�从亳亶 仆�仆仂��从"

-#: ../pidgin/gtkdialogs.c:195
+#: ../pidgin/gtkdialogs.c:196
 msgid "Punjabi"
 msgstr "�舒仆亟亢舒弍亳"

-#: ../pidgin/gtkdialogs.c:196 ../pidgin/gtkdialogs.c:197
-#: ../pidgin/gtkdialogs.c:198 ../pidgin/gtkdialogs.c:261
+#: ../pidgin/gtkdialogs.c:197 ../pidgin/gtkdialogs.c:198
+#: ../pidgin/gtkdialogs.c:199 ../pidgin/gtkdialogs.c:263
 msgid "Polish"
 msgstr "�仂仍��从亳亶"

-#: ../pidgin/gtkdialogs.c:199
+#: ../pidgin/gtkdialogs.c:200
 msgid "Portuguese"
 msgstr "�仂���亞舒仍��从亳亶"

-#: ../pidgin/gtkdialogs.c:200
+#: ../pidgin/gtkdialogs.c:201
 msgid "Portuguese-Brazil"
 msgstr "�仂���亞舒仍��从亳亶-弍�舒亰亳仍��从亳亶"

-#: ../pidgin/gtkdialogs.c:201
+#: ../pidgin/gtkdialogs.c:202
 msgid "Pashto"
 msgstr "�舒��仂"

-#: ../pidgin/gtkdialogs.c:202
+#: ../pidgin/gtkdialogs.c:203
 msgid "Romanian"
 msgstr "��仄�仆�从亳亶"

-#: ../pidgin/gtkdialogs.c:203 ../pidgin/gtkdialogs.c:262
-#: ../pidgin/gtkdialogs.c:263
+#: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:264
+#: ../pidgin/gtkdialogs.c:265
 msgid "Russian"
 msgstr "����从亳亶"

-#: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:205
-#: ../pidgin/gtkdialogs.c:264 ../pidgin/gtkdialogs.c:265
-#: ../pidgin/gtkdialogs.c:266
+#: ../pidgin/gtkdialogs.c:205 ../pidgin/gtkdialogs.c:206
+#: ../pidgin/gtkdialogs.c:266 ../pidgin/gtkdialogs.c:267
+#: ../pidgin/gtkdialogs.c:268
 msgid "Slovak"
 msgstr "弌仍仂于舒�从亳亶"

-#: ../pidgin/gtkdialogs.c:206 ../pidgin/gtkdialogs.c:267
+#: ../pidgin/gtkdialogs.c:207 ../pidgin/gtkdialogs.c:269
 msgid "Slovenian"
 msgstr "弌仍仂于亠仆�从亳亶"

-#: ../pidgin/gtkdialogs.c:207
+#: ../pidgin/gtkdialogs.c:208
 msgid "Albanian"
 msgstr "�仍弍舒仆�从亳亶"

-#: ../pidgin/gtkdialogs.c:208 ../pidgin/gtkdialogs.c:209
-#: ../pidgin/gtkdialogs.c:268 ../pidgin/gtkdialogs.c:269
+#: ../pidgin/gtkdialogs.c:209 ../pidgin/gtkdialogs.c:210
+#: ../pidgin/gtkdialogs.c:270 ../pidgin/gtkdialogs.c:271
 msgid "Serbian"
 msgstr "弌亠�弍�从亳亶"

-#: ../pidgin/gtkdialogs.c:210
+#: ../pidgin/gtkdialogs.c:211
 msgid "Sinhala"
 msgstr "弌亳仆亞舒仍��从亳亶"

-#: ../pidgin/gtkdialogs.c:211 ../pidgin/gtkdialogs.c:270
-#: ../pidgin/gtkdialogs.c:271
+#: ../pidgin/gtkdialogs.c:212 ../pidgin/gtkdialogs.c:272
+#: ../pidgin/gtkdialogs.c:273
 msgid "Swedish"
 msgstr "丿于亠亟�从亳亶"

-#: ../pidgin/gtkdialogs.c:212
+#: ../pidgin/gtkdialogs.c:213
 msgid "Tamil"
 msgstr "丐舒仄亳仍��从亳亶"

-#: ../pidgin/gtkdialogs.c:213
+#: ../pidgin/gtkdialogs.c:214
 msgid "Telugu"
 msgstr "丐亠仍�亞�"

-#: ../pidgin/gtkdialogs.c:214
+#: ../pidgin/gtkdialogs.c:215
 msgid "Thai"
 msgstr "丐舒亶�从亳亶"

-#: ../pidgin/gtkdialogs.c:215 ../pidgin/gtkdialogs.c:272
+#: ../pidgin/gtkdialogs.c:216 ../pidgin/gtkdialogs.c:274
 msgid "Turkish"
 msgstr "丐��亠�从亳亶"

-#: ../pidgin/gtkdialogs.c:216
+#: ../pidgin/gtkdialogs.c:217
 msgid "Urdu"
 msgstr "丕�亟�"

-#: ../pidgin/gtkdialogs.c:217
+#: ../pidgin/gtkdialogs.c:218
 msgid "Vietnamese"
 msgstr "��亠�仆舒仄�从亳亶"

-#: ../pidgin/gtkdialogs.c:217
+#: ../pidgin/gtkdialogs.c:218
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh 亳 从仂仄舒仆亟舒 Gnome-Vi"

-#: ../pidgin/gtkdialogs.c:218 ../pidgin/gtkdialogs.c:273
+#: ../pidgin/gtkdialogs.c:219 ../pidgin/gtkdialogs.c:275
 msgid "Simplified Chinese"
 msgstr "丕仗�仂��仆仆�亶 从亳�舒亶�从亳亶"

-#: ../pidgin/gtkdialogs.c:219 ../pidgin/gtkdialogs.c:220
-#: ../pidgin/gtkdialogs.c:221
+#: ../pidgin/gtkdialogs.c:220 ../pidgin/gtkdialogs.c:221
+#: ../pidgin/gtkdialogs.c:222
 msgid "Hong Kong Chinese"
 msgstr "�仂仆从仂仆亞�从亳亶 从亳�舒亶�从亳亶"

-#: ../pidgin/gtkdialogs.c:222 ../pidgin/gtkdialogs.c:223
-#: ../pidgin/gtkdialogs.c:274
+#: ../pidgin/gtkdialogs.c:223 ../pidgin/gtkdialogs.c:224
+#: ../pidgin/gtkdialogs.c:276
 msgid "Traditional Chinese"
 msgstr "丐�舒亟亳�亳仂仆仆�亶 从亳�舒亶�从亳亶"

-#: ../pidgin/gtkdialogs.c:229
+#: ../pidgin/gtkdialogs.c:230
 msgid "Amharic"
 msgstr "�仄�舒��从亳亶"

-#: ../pidgin/gtkdialogs.c:359
+#: ../pidgin/gtkdialogs.c:361
 #, c-format
 msgid "About %s"
 msgstr "� %s"

-#: ../pidgin/gtkdialogs.c:395
+#: ../pidgin/gtkdialogs.c:397
 #, c-format
 msgid ""
 "%s is a graphical modular messaging client based on libpurple which is "
@@ -15500,103 +15521,95 @@
 "仗�仂亠从�舒.  �仂仍仆�亶 �仗亳�仂从 ��舒��仆亳从仂于 仗�仂亠从�舒 �仄仂��亳�亠 于 �舒亶仍亠 'COPYRIGHT'.  �� "
 "仆亠 仗�亠亟仂��舒于仍�亠仄 仆亳从舒从亳� 亞舒�舒仆�亳亶 仆舒 ��� 仗�仂亞�舒仄仄�.<BR><BR>"

-#: ../pidgin/gtkdialogs.c:413
+#: ../pidgin/gtkdialogs.c:415
 #, 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:418
+#: ../pidgin/gtkdialogs.c:420
 msgid "Current Developers"
 msgstr "丐亠从��亳亠 �舒亰�舒弍仂��亳从亳"

-#: ../pidgin/gtkdialogs.c:433
+#: ../pidgin/gtkdialogs.c:435
 msgid "Crazy Patch Writers"
 msgstr "�亟亠�亢亳仄�亠 仗亳�舒�亠仍亳 亰舒仗仍舒�仂从"

-#: ../pidgin/gtkdialogs.c:448
+#: ../pidgin/gtkdialogs.c:450
 msgid "Retired Developers"
 msgstr "�舒亰�舒弍仂��亳从亳, 仂�仂�亠亟�亳亠 仂� 亟亠仍"

-#: ../pidgin/gtkdialogs.c:463
+#: ../pidgin/gtkdialogs.c:465
 msgid "Retired Crazy Patch Writers"
 msgstr "�亟亠�亢亳仄�亠 仗亳�舒�亠仍亳 亰舒仗仍舒�仂从, 仂�仂�亠亟�亳亠 仂� 亟亠仍"

-#: ../pidgin/gtkdialogs.c:478
+#: ../pidgin/gtkdialogs.c:480
 msgid "Artists"
 msgstr "丱�亟仂亢仆亳从亳"

-#: ../pidgin/gtkdialogs.c:493
+#: ../pidgin/gtkdialogs.c:495
 msgid "Current Translators"
 msgstr "丐亠从��亳亠 仗亠�亠于仂亟�亳从亳"

-#: ../pidgin/gtkdialogs.c:513
+#: ../pidgin/gtkdialogs.c:515
 msgid "Past Translators"
 msgstr "��亠亟�亟��亳亠 仗亠�亠于仂亟�亳从亳"

-#: ../pidgin/gtkdialogs.c:531
+#: ../pidgin/gtkdialogs.c:533
 msgid "Debugging Information"
 msgstr "��仍舒亟仂�仆舒� 亳仆�仂�仄舒�亳�"

-#: ../pidgin/gtkdialogs.c:747 ../pidgin/gtkdialogs.c:886
-#: ../pidgin/gtkdialogs.c:967
+#: ../pidgin/gtkdialogs.c:749 ../pidgin/gtkdialogs.c:888
+#: ../pidgin/gtkdialogs.c:969
 msgid "_Name"
 msgstr "_�仄�"

-#: ../pidgin/gtkdialogs.c:752 ../pidgin/gtkdialogs.c:891
-#: ../pidgin/gtkdialogs.c:972
+#: ../pidgin/gtkdialogs.c:754 ../pidgin/gtkdialogs.c:893
+#: ../pidgin/gtkdialogs.c:974
 msgid "_Account"
 msgstr "_丕���仆舒� 亰舒仗亳��"

-#: ../pidgin/gtkdialogs.c:899
-msgid "Get User Info"
-msgstr "�仂仍��亳�� 仗仂仍�亰仂于舒�亠仍��从�� 亳仆�仂�仄舒�亳�"
-
 #: ../pidgin/gtkdialogs.c:901
-msgid ""
-"Please enter the screen name or alias of the person whose info you would "
-"like to view."
-msgstr ""
-"�于亠亟亳�亠 亳亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍� 亳仍亳 仗�亠于亟仂仆亳仄 仗亠��仂仆�, 亳仆�仂�仄舒�亳� 仂 "
-"从仂�仂�仂亶 于� �仂�亠仍亳 弍� 仗�仂�仄仂��亠��."
-
-#: ../pidgin/gtkdialogs.c:991
-msgid "View User Log"
-msgstr "��仂�仄仂��亠�� 亢��仆舒仍 仗仂仍�亰仂于舒�亠仍�"
+msgid "Get User Info"
+msgstr "�仂仍��亳�� 仗仂仍�亰仂于舒�亠仍��从�� 亳仆�仂�仄舒�亳�"
+
+#: ../pidgin/gtkdialogs.c:903
+msgid ""
+"Please enter the username or alias of the person whose info you would like "
+"to view."
+msgstr ""
+"�于亠亟亳�亠 亳仄� 仗仂仍�亰仂于舒�亠仍� 亳仍亳 仗�亠于亟仂仆亳仄 仗亠��仂仆�, 亳仆�仂�仄舒�亳� 仂 从仂�仂�仂亶 于� "
+"�仂�亠仍亳 弍� 仗�仂�仄仂��亠��."

 #: ../pidgin/gtkdialogs.c:993
-msgid ""
-"Please enter the screen name or alias of the person whose log you would like "
-"to view."
-msgstr ""
-"�于亠亟亳�亠 亳亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍� 亳仍亳 仗�亠于亟仂仆亳仄 仗亠��仂仆�, 亢��仆舒仍 从仂�仂�仂亶 于� "
-"�仂�亠仍亳 弍� 仗�仂�仄仂��亠��."
-
-#: ../pidgin/gtkdialogs.c:1013
+msgid "View User Log"
+msgstr "��仂�仄仂��亠�� 亢��仆舒仍 仗仂仍�亰仂于舒�亠仍�"
+
+#: ../pidgin/gtkdialogs.c:1015
 msgid "Alias Contact"
 msgstr "��亠于亟仂仆亳仄 从仂仆�舒从�舒"

-#: ../pidgin/gtkdialogs.c:1014
+#: ../pidgin/gtkdialogs.c:1016
 msgid "Enter an alias for this contact."
 msgstr "�于亠亟亳�亠 仗�亠于亟仂仆亳仄 亟仍� ��仂亞仂 从仂仆�舒从�舒."

-#: ../pidgin/gtkdialogs.c:1036
+#: ../pidgin/gtkdialogs.c:1038
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "�于亠亟亳�亠 仗�亠于亟仂仆亳仄 亟仍� %s."

-#: ../pidgin/gtkdialogs.c:1038
+#: ../pidgin/gtkdialogs.c:1040
 msgid "Alias Buddy"
 msgstr "��亠于亟仂仆亳仄 �仂弍亠�亠亟仆亳从舒"

-#: ../pidgin/gtkdialogs.c:1059
+#: ../pidgin/gtkdialogs.c:1061
 msgid "Alias Chat"
 msgstr "��亠于亟仂仆亳仄 �舒�舒"

-#: ../pidgin/gtkdialogs.c:1060
+#: ../pidgin/gtkdialogs.c:1062
 msgid "Enter an alias for this chat."
 msgstr "�于亠亟亳�亠 仗�亠于亟仂仆亳仄 亟仍� ��仂亞仂 �舒�舒."

-#: ../pidgin/gtkdialogs.c:1099
+#: ../pidgin/gtkdialogs.c:1101
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -15614,15 +15627,15 @@
 "�� �亟舒仍亳�亠 从仂仆�舒从�, �仂亟亠�亢舒�亳亶 %s 亳 %d 亟��亞亳� �仂弍亠�亠亟仆亳从仂于 亳亰 �仗亳�从舒 "
 "�仂弍亠�亠亟仆亳从仂于. 丱仂�亳�亠 仗�仂亟仂仍亢亳��?"

-#: ../pidgin/gtkdialogs.c:1107
+#: ../pidgin/gtkdialogs.c:1109
 msgid "Remove Contact"
 msgstr "丕亟舒仍亳�� 从仂仆�舒从�"

-#: ../pidgin/gtkdialogs.c:1110
+#: ../pidgin/gtkdialogs.c:1112
 msgid "_Remove Contact"
 msgstr "_丕亟舒仍亳�� 从仂仆�舒从�"

-#: ../pidgin/gtkdialogs.c:1141
+#: ../pidgin/gtkdialogs.c:1143
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
@@ -15630,15 +15643,15 @@
 msgstr ""
 "�� 亟仂弍舒于亳�亠 �仂亟亠�亢亳仄仂亠 亞��仗仗� %s 从 �仂亟亠�亢亳仄仂仄� 亞��仗仗� %s. 丱仂�亳�亠 仗�仂亟仂仍亢亳��?"

-#: ../pidgin/gtkdialogs.c:1148
+#: ../pidgin/gtkdialogs.c:1150
 msgid "Merge Groups"
 msgstr "�弍�亠亟亳仆亳�� 亞��仗仗�"

-#: ../pidgin/gtkdialogs.c:1151
+#: ../pidgin/gtkdialogs.c:1153
 msgid "_Merge Groups"
 msgstr "_�弍�亠亟亳仆亳�� 亞��仗仗�"

-#: ../pidgin/gtkdialogs.c:1201
+#: ../pidgin/gtkdialogs.c:1203
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -15647,40 +15660,40 @@
 "�� �亟舒仍亳�亠 亞��仗仗� %s 亳 于�亠� 亠� �仍亠仆仂于 亳亰 �仗亳�从舒 �仂弍亠�亠亟仆亳从仂于. 丱仂�亳�亠 "
 "仗�仂亟仂仍亢亳��?"

-#: ../pidgin/gtkdialogs.c:1204
+#: ../pidgin/gtkdialogs.c:1206
 msgid "Remove Group"
 msgstr "丕亟舒仍亳�� 亞��仗仗�"

-#: ../pidgin/gtkdialogs.c:1207
+#: ../pidgin/gtkdialogs.c:1209
 msgid "_Remove Group"
 msgstr "_丕亟舒仍亳�� 亞��仗仗�"

-#: ../pidgin/gtkdialogs.c:1240
+#: ../pidgin/gtkdialogs.c:1242
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "�� �亟舒仍亳�亠 %s 亳亰 �仗亳�从舒 �仂弍亠�亠亟仆亳从仂于. 丱仂�亳�亠 仗�仂亟仂仍亢亳��?"

-#: ../pidgin/gtkdialogs.c:1243
+#: ../pidgin/gtkdialogs.c:1245
 msgid "Remove Buddy"
 msgstr "丕亟舒仍亳�� �仂弍亠�亠亟仆亳从舒"

-#: ../pidgin/gtkdialogs.c:1246
+#: ../pidgin/gtkdialogs.c:1248
 msgid "_Remove Buddy"
 msgstr "_丕亟舒仍亳�� �仂弍亠�亠亟仆亳从舒"

-#: ../pidgin/gtkdialogs.c:1267
+#: ../pidgin/gtkdialogs.c:1269
 #, 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:1270
+#: ../pidgin/gtkdialogs.c:1272
 msgid "Remove Chat"
 msgstr "丕亟舒仍亳�� �舒�"

-#: ../pidgin/gtkdialogs.c:1273
+#: ../pidgin/gtkdialogs.c:1275
 msgid "_Remove Chat"
 msgstr "_丕亟舒仍亳�� �舒�"

@@ -15719,11 +15732,11 @@

 #: ../pidgin/gtkft.c:274
 msgid "<b>Receiving As:</b>"
-msgstr "<b>��亳�仄 从舒从:</b>"
+msgstr "<b>�仂仍��亠仆亳亠 从舒从:</b>"

 #: ../pidgin/gtkft.c:276
 msgid "<b>Receiving From:</b>"
-msgstr "<b>��亳�仄 仂�:</b>"
+msgstr "<b>�仂仍��亠仆亳亠 仂�:</b>"

 #: ../pidgin/gtkft.c:280
 msgid "<b>Sending To:</b>"
@@ -15799,77 +15812,102 @@
 msgid "_Resume"
 msgstr "_�仂亰仂弍仆仂于亳��"

-#: ../pidgin/gtkimhtml.c:820
+#: ../pidgin/gtkimhtml.c:842
 msgid "Paste as Plain _Text"
 msgstr "���舒于亳�� 从舒从 仗�仂��仂亶 _�亠从��"

-#: ../pidgin/gtkimhtml.c:837 ../pidgin/gtkimhtmltoolbar.c:1197
+#: ../pidgin/gtkimhtml.c:859 ../pidgin/gtkimhtmltoolbar.c:1196
 msgid "_Reset formatting"
 msgstr "_�仂���舒仆仂于亳�� �仂�仄舒�亳�仂于舒仆亳亠"

-#: ../pidgin/gtkimhtml.c:1395
+#: ../pidgin/gtkimhtml.c:867
+msgid "Disable _smileys in selected text"
+msgstr ""
+
+#: ../pidgin/gtkimhtml.c:1430
 msgid "Hyperlink color"
 msgstr "丶于亠� 亞亳仗亠����仍从亳"

-#: ../pidgin/gtkimhtml.c:1396
+#: ../pidgin/gtkimhtml.c:1431
 msgid "Color to draw hyperlinks."
 msgstr "丶于亠� 亟仍� 仂�仂弍�舒亢亠仆亳� 亞亳仗亠����仍仂从."

-#: ../pidgin/gtkimhtml.c:1399
+#: ../pidgin/gtkimhtml.c:1434
 msgid "Hyperlink prelight color"
 msgstr "丶于亠� 仗仂亟�于亠�从亳 亞亳仗亠����仍从亳"

-#: ../pidgin/gtkimhtml.c:1400
+#: ../pidgin/gtkimhtml.c:1435
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "丶于亠� 亟仍� 仂�仂弍�舒亢亠仆亳� 亞亳仗亠����仍仂从 仗�亳 仆舒于亠亟亠仆亳亳 仆舒 仆亳� 从���仂�舒 仄��亳."

-#: ../pidgin/gtkimhtml.c:1403 ../pidgin/plugins/pidginrc.c:52
+#: ../pidgin/gtkimhtml.c:1438 ../pidgin/plugins/pidginrc.c:52
 #, fuzzy
 msgid "Sent Message Name Color"
 msgstr "��仗�舒于仍亠仆仆�亠 �仂仂弍�亠仆亳�"

-#: ../pidgin/gtkimhtml.c:1404
+#: ../pidgin/gtkimhtml.c:1439
 msgid "Color to draw the name of a message you sent."
 msgstr ""

-#: ../pidgin/gtkimhtml.c:1407 ../pidgin/plugins/pidginrc.c:53
+#: ../pidgin/gtkimhtml.c:1442 ../pidgin/plugins/pidginrc.c:53
 #, fuzzy
 msgid "Received Message Name Color"
 msgstr "�仂仍��亠仆仆�亠 �仂仂弍�亠仆亳�"

-#: ../pidgin/gtkimhtml.c:1408
+#: ../pidgin/gtkimhtml.c:1443
 msgid "Color to draw the name of a message you received."
 msgstr ""

-#: ../pidgin/gtkimhtml.c:1411
+#: ../pidgin/gtkimhtml.c:1446
 msgid "\"Attention\" Name Color"
 msgstr ""

-#: ../pidgin/gtkimhtml.c:1412
+#: ../pidgin/gtkimhtml.c:1447
 msgid "Color to draw the name of a message you received containing your name."
 msgstr ""

-#: ../pidgin/gtkimhtml.c:1415 ../pidgin/plugins/pidginrc.c:55
+#: ../pidgin/gtkimhtml.c:1450 ../pidgin/plugins/pidginrc.c:55
 msgid "Action Message Name Color"
 msgstr ""

-#: ../pidgin/gtkimhtml.c:1416
+#: ../pidgin/gtkimhtml.c:1451
 msgid "Color to draw the name of an action message."
 msgstr ""

-#: ../pidgin/gtkimhtml.c:1636
+#: ../pidgin/gtkimhtml.c:1460
+#, fuzzy
+msgid "Typing notification color"
+msgstr "丕亟舒仍亠仆亳亠 �于亠亟仂仄仍亠仆亳亶"
+
+#: ../pidgin/gtkimhtml.c:1461
+msgid "The color to use for the typing notification font"
+msgstr ""
+
+#: ../pidgin/gtkimhtml.c:1464
+msgid "Typing notification font"
+msgstr ""
+
+#: ../pidgin/gtkimhtml.c:1465
+msgid "The font to use for the typing notification"
+msgstr ""
+
+#: ../pidgin/gtkimhtml.c:1468 ../pidgin/gtkimhtml.c:1469
+msgid "Enable typing notification"
+msgstr ""
+
+#: ../pidgin/gtkimhtml.c:1688
 msgid "_Copy E-Mail Address"
 msgstr "_弌从仂仗亳�仂于舒�� 舒亟�亠� e-mail"

-#: ../pidgin/gtkimhtml.c:1648
+#: ../pidgin/gtkimhtml.c:1700
 msgid "_Open Link in Browser"
 msgstr "_��从���� ���仍从� 于 弍�舒�亰亠�亠"

-#: ../pidgin/gtkimhtml.c:1658
+#: ../pidgin/gtkimhtml.c:1710
 msgid "_Copy Link Location"
 msgstr "_弌从仂仗亳�仂于舒�� ���仍从�"

-#: ../pidgin/gtkimhtml.c:3421
+#: ../pidgin/gtkimhtml.c:3482
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -15879,7 +15917,7 @@
 "\n"
 "��亳仆亳仄舒亠��� 亰舒 PNG."

-#: ../pidgin/gtkimhtml.c:3424
+#: ../pidgin/gtkimhtml.c:3485
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -15889,7 +15927,7 @@
 "\n"
 "��亳仆亳仄舒亠��� 亰舒 PNG."

-#: ../pidgin/gtkimhtml.c:3453
+#: ../pidgin/gtkimhtml.c:3514
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -15900,7 +15938,7 @@
 "\n"
 "%s"

-#: ../pidgin/gtkimhtml.c:3456
+#: ../pidgin/gtkimhtml.c:3517
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -15911,11 +15949,11 @@
 "\n"
 "%s"

-#: ../pidgin/gtkimhtml.c:3537 ../pidgin/gtkimhtml.c:3549
+#: ../pidgin/gtkimhtml.c:3598 ../pidgin/gtkimhtml.c:3610
 msgid "Save Image"
 msgstr "弌仂��舒仆亳�� 亳亰仂弍�舒亢亠仆亳亠"

-#: ../pidgin/gtkimhtml.c:3577
+#: ../pidgin/gtkimhtml.c:3638
 #, c-format
 msgid "_Save Image..."
 msgstr "_弌仂��舒仆亳�� 亳亰仂弍�舒亢亠仆亳亠..."
@@ -15952,11 +15990,11 @@
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "�于亠亟亳�亠 URL ���仍从亳, 从仂�仂��� 于� �仂�亳�亠 于��舒于亳��."

-#: ../pidgin/gtkimhtmltoolbar.c:433 ../pidgin/gtkimhtmltoolbar.c:1104
+#: ../pidgin/gtkimhtmltoolbar.c:433 ../pidgin/gtkimhtmltoolbar.c:1103
 msgid "Insert Link"
 msgstr "���舒于亳�� ���仍从�"

-#: ../pidgin/gtkimhtmltoolbar.c:437 ../pidgin/gtkimhtmltoolbar.c:1265
+#: ../pidgin/gtkimhtmltoolbar.c:437 ../pidgin/gtkimhtmltoolbar.c:1264
 msgid "_Insert"
 msgstr "_���舒于亳��"

@@ -15973,134 +16011,132 @@
 msgid "Smile!"
 msgstr "丕仍�弍舒亶�亠��!"

-#: ../pidgin/gtkimhtmltoolbar.c:764
+#: ../pidgin/gtkimhtmltoolbar.c:763
 msgid "This theme has no available smileys."
 msgstr "亅�舒 �亠仄舒 仆亠 亳仄亠亠� 亟仂���仗仆�� �仄舒亶仍亳从仂于."

-#: ../pidgin/gtkimhtmltoolbar.c:848 ../pidgin/gtkimhtmltoolbar.c:1222
+#: ../pidgin/gtkimhtmltoolbar.c:847 ../pidgin/gtkimhtmltoolbar.c:1221
 msgid "_Font"
 msgstr "_丿�亳��"

-#: ../pidgin/gtkimhtmltoolbar.c:1056
-#, fuzzy
+#: ../pidgin/gtkimhtmltoolbar.c:1055
 msgid "Group Items"
-msgstr "ID 亞��仗仗�"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1056
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:1055
 msgid "Ungroup Items"
 msgstr ""

-#: ../pidgin/gtkimhtmltoolbar.c:1090 ../pidgin/plugins/convcolors.c:342
+#: ../pidgin/gtkimhtmltoolbar.c:1089 ../pidgin/plugins/convcolors.c:342
 msgid "Bold"
 msgstr "�亳�仆�亶"

-#: ../pidgin/gtkimhtmltoolbar.c:1091 ../pidgin/plugins/convcolors.c:351
+#: ../pidgin/gtkimhtmltoolbar.c:1090 ../pidgin/plugins/convcolors.c:351
 msgid "Italic"
 msgstr "�舒从仍仂仆仆�亶"

-#: ../pidgin/gtkimhtmltoolbar.c:1092 ../pidgin/plugins/convcolors.c:360
+#: ../pidgin/gtkimhtmltoolbar.c:1091 ../pidgin/plugins/convcolors.c:360
 msgid "Underline"
 msgstr "�仂亟���从仆���亶"

-#: ../pidgin/gtkimhtmltoolbar.c:1093
+#: ../pidgin/gtkimhtmltoolbar.c:1092
 msgid "Strikethrough"
 msgstr "�亠�亠���从仆���亶"

-#: ../pidgin/gtkimhtmltoolbar.c:1095
+#: ../pidgin/gtkimhtmltoolbar.c:1094
 msgid "Increase Font Size"
 msgstr "丕于亠仍亳�亳�� �舒亰仄亠� ��亳��舒"

-#: ../pidgin/gtkimhtmltoolbar.c:1096
+#: ../pidgin/gtkimhtmltoolbar.c:1095
 msgid "Decrease Font Size"
 msgstr "丕仄亠仆��亳�� �舒亰仄亠� ��亳��舒"

-#: ../pidgin/gtkimhtmltoolbar.c:1098
+#: ../pidgin/gtkimhtmltoolbar.c:1097
 msgid "Font Face"
 msgstr "�弍仍亳从 ��亳��舒"

-#: ../pidgin/gtkimhtmltoolbar.c:1099
+#: ../pidgin/gtkimhtmltoolbar.c:1098
 msgid "Background Color"
 msgstr "丶于亠� �仂仆舒"

-#: ../pidgin/gtkimhtmltoolbar.c:1100
+#: ../pidgin/gtkimhtmltoolbar.c:1099
 msgid "Foreground Color"
 msgstr "丶于亠� �亠从��舒"

-#: ../pidgin/gtkimhtmltoolbar.c:1102
+#: ../pidgin/gtkimhtmltoolbar.c:1101
 msgid "Reset Formatting"
 msgstr "�仂���舒仆仂于亳�� �仂�仄舒�亳�仂于舒仆亳亠"

-#: ../pidgin/gtkimhtmltoolbar.c:1105
+#: ../pidgin/gtkimhtmltoolbar.c:1104
 msgid "Insert IM Image"
 msgstr "���舒于亳�� 亳亰仂弍�舒亢亠仆亳亠"

-#: ../pidgin/gtkimhtmltoolbar.c:1106
+#: ../pidgin/gtkimhtmltoolbar.c:1105
 msgid "Insert Smiley"
 msgstr "���舒于亳�� �仄舒亶仍亳从"

-#: ../pidgin/gtkimhtmltoolbar.c:1182
+#: ../pidgin/gtkimhtmltoolbar.c:1181
 msgid "<b>_Bold</b>"
 msgstr "<b>_�亳�仆�亶</b>"

-#: ../pidgin/gtkimhtmltoolbar.c:1183
+#: ../pidgin/gtkimhtmltoolbar.c:1182
 msgid "<i>_Italic</i>"
 msgstr "<i>_�舒从仍仂仆仆�亶</i>"

+#: ../pidgin/gtkimhtmltoolbar.c:1183
+msgid "<u>_Underline</u>"
+msgstr "<u>_�仂亟���从仆���亶</u>"
+
 #: ../pidgin/gtkimhtmltoolbar.c:1184
-msgid "<u>_Underline</u>"
-msgstr "<u>_�仂亟���从仆���亶</u>"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1185
 msgid "<span strikethrough='true'>Strikethrough</span>"
 msgstr "<span strikethrough='true'>�亠�亠���从仆���亶</span>"

-#: ../pidgin/gtkimhtmltoolbar.c:1186
+#: ../pidgin/gtkimhtmltoolbar.c:1185
 msgid "<span size='larger'>_Larger</span>"
 msgstr "<span size='larger'>_�仂仍��亳亶</span>"

-#: ../pidgin/gtkimhtmltoolbar.c:1188
+#: ../pidgin/gtkimhtmltoolbar.c:1187
 msgid "_Normal"
 msgstr "_弌�亠亟仆亳亶"

-#: ../pidgin/gtkimhtmltoolbar.c:1190
+#: ../pidgin/gtkimhtmltoolbar.c:1189
 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:1194
+#: ../pidgin/gtkimhtmltoolbar.c:1193
 msgid "_Font face"
 msgstr "_�弍仍亳从 ��亳��舒"

+#: ../pidgin/gtkimhtmltoolbar.c:1194
+msgid "Foreground _color"
+msgstr "丶于亠� _�亠从��舒"
+
 #: ../pidgin/gtkimhtmltoolbar.c:1195
-msgid "Foreground _color"
-msgstr "丶于亠� _�亠从��舒"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1196
 msgid "Bac_kground color"
 msgstr "丶于亠� _�仂仆舒"

-#: ../pidgin/gtkimhtmltoolbar.c:1273
+#: ../pidgin/gtkimhtmltoolbar.c:1272
 msgid "_Image"
 msgstr "_�亰仂弍�舒亢亠仆亳亠"

-#: ../pidgin/gtkimhtmltoolbar.c:1279
+#: ../pidgin/gtkimhtmltoolbar.c:1278
 msgid "_Link"
 msgstr "_弌��仍从�"

-#: ../pidgin/gtkimhtmltoolbar.c:1285
+#: ../pidgin/gtkimhtmltoolbar.c:1284
 msgid "_Horizontal rule"
 msgstr "_�弍亰舒�仆�� 仍亳仆亳�"

-#: ../pidgin/gtkimhtmltoolbar.c:1307
+#: ../pidgin/gtkimhtmltoolbar.c:1306
 msgid "_Smile!"
 msgstr "_丕仍�弍舒亶�亠��!"

 #: ../pidgin/gtklog.c:245
-#, fuzzy
 msgid "Log Deletion Failed"
-msgstr "�亠 �亟舒仍仂�� ���舒仆仂于亳�� SSL-�仂亠亟亳仆亠仆亳亠"
+msgstr ""

 #: ../pidgin/gtklog.c:246
 msgid "Check permissions and try again."
@@ -16155,12 +16191,12 @@
 msgid "_Browse logs folder"
 msgstr ""

-#: ../pidgin/gtkmain.c:385
+#: ../pidgin/gtkmain.c:386
 #, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s. �舒弍亠�亳�亠 `%s -h' 亟仍� 仗仂仍��亠仆亳� 亟仂仗仂仍仆亳�亠仍�仆仂亶 亳仆�仂�仄舒�亳亳.\n"

-#: ../pidgin/gtkmain.c:388
+#: ../pidgin/gtkmain.c:389
 #, fuzzy, c-format
 msgid ""
 "%s %s\n"
@@ -16191,7 +16227,7 @@
 "  --display=DISPLAY   X display to use\n"
 "  -v, --version       仗仂从舒亰舒�� �亠从���� 于亠��亳� 亳 于�亶�亳\n"

-#: ../pidgin/gtkmain.c:401
+#: ../pidgin/gtkmain.c:402
 #, fuzzy, c-format
 msgid ""
 "%s %s\n"
@@ -16221,7 +16257,7 @@
 "  --display=DISPLAY   X display to use\n"
 "  -v, --version       仗仂从舒亰舒�� �亠从���� 于亠��亳� 亳 于�亶�亳\n"

-#: ../pidgin/gtkmain.c:531
+#: ../pidgin/gtkmain.c:532
 #, c-format
 msgid ""
 "%s %s has segfaulted and attempted to dump a core file.\n"
@@ -16245,19 +16281,19 @@

 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../pidgin/gtkmain.c:725 ../pidgin/pidgin.h:51
+#: ../pidgin/gtkmain.c:726 ../pidgin/pidgin.h:51
 msgid "Pidgin"
 msgstr "Pidgin"

-#: ../pidgin/gtknotify.c:354
+#: ../pidgin/gtknotify.c:360
 msgid "Open All Messages"
 msgstr "��从���� 于�亠 �仂仂弍�亠仆亳�"

-#: ../pidgin/gtknotify.c:408
+#: ../pidgin/gtknotify.c:414
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">�舒仄 仗�亳�仍舒 仗仂��舒!</span>"

-#: ../pidgin/gtknotify.c:551
+#: ../pidgin/gtknotify.c:570
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
@@ -16265,7 +16301,7 @@
 msgstr[1] "%s 亳仄亠亠� %d 仆仂于�� �仂仂弍�亠仆亳�."
 msgstr[2] "%s 亳仄亠亠� %d 仆仂于�� �仂仂弍�亠仆亳亶."

-#: ../pidgin/gtknotify.c:575
+#: ../pidgin/gtknotify.c:599
 #, fuzzy, c-format
 msgid "<b>%d new e-mail.</b>"
 msgid_plural "<b>%d new e-mails.</b>"
@@ -16273,76 +16309,76 @@
 msgstr[1] "<b>�仂亟�仂弍仆仂��亳 仂 仄仂亟�仍亠</b>"
 msgstr[2] "<b>�仂亟�仂弍仆仂��亳 仂 仄仂亟�仍亠</b>"

-#: ../pidgin/gtknotify.c:1008
+#: ../pidgin/gtknotify.c:1033
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "�仂仄舒仆亟舒 亰舒仗��从舒 弍�舒�亰亠�舒 \"%s\" 仆亠于亠�仆舒."

-#: ../pidgin/gtknotify.c:1010 ../pidgin/gtknotify.c:1022
-#: ../pidgin/gtknotify.c:1035 ../pidgin/gtknotify.c:1172
+#: ../pidgin/gtknotify.c:1035 ../pidgin/gtknotify.c:1047
+#: ../pidgin/gtknotify.c:1060 ../pidgin/gtknotify.c:1197
 msgid "Unable to open URL"
 msgstr "�亠 �亟舒���� 仂�从���� URL"

-#: ../pidgin/gtknotify.c:1020 ../pidgin/gtknotify.c:1033
+#: ../pidgin/gtknotify.c:1045 ../pidgin/gtknotify.c:1058
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "��亳弍从舒 亰舒仗��从舒 \"%s\": %s"

-#: ../pidgin/gtknotify.c:1173
+#: ../pidgin/gtknotify.c:1198
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "��仍 于�弍�舒仆 弍�舒�亰亠� \"���亞仂亶\", 仆仂 从仂仄舒仆亟舒 仆亠 弍�仍舒 亰舒亟舒仆舒."

-#: ../pidgin/gtkplugin.c:270
+#: ../pidgin/gtkplugin.c:278
 msgid "The following plugins will be unloaded."
 msgstr "弌仍亠亟���亳亠 仄仂亟�仍亳 弍�亟�� 于�亞��亢亠仆�."

-#: ../pidgin/gtkplugin.c:289
+#: ../pidgin/gtkplugin.c:297
 msgid "Multiple plugins will be unloaded."
 msgstr "�亠�从仂仍�从仂 仄仂亟�仍亠亶 弍�亟亠� 于�亞��亢亠仆仂."

-#: ../pidgin/gtkplugin.c:293
+#: ../pidgin/gtkplugin.c:301
 msgid "Unload Plugins"
 msgstr "��亞��亰亳�� 仄仂亟�仍亳"

-#: ../pidgin/gtkplugin.c:313
+#: ../pidgin/gtkplugin.c:318
 msgid "Could not unload plugin"
 msgstr "�亠 �亟舒仍仂�� 于�亞��亰亳�� 仄仂亟�仍�"

-#: ../pidgin/gtkplugin.c:314
+#: ../pidgin/gtkplugin.c:319
 msgid ""
 "The plugin could not be unloaded now, but will be disabled at the next "
 "startup."
 msgstr ""

-#: ../pidgin/gtkplugin.c:422
-#, c-format
-msgid ""
-"%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
-"<span weight=\"bold\">Website:</span>\t\t%s\n"
-"<span weight=\"bold\">Filename:</span>\t\t%s"
-msgstr ""
-"%s%s<span weight=\"bold\">�于�仂�:</span>\t\t%s\n"
-"<span weight=\"bold\">Web-�舒亶�:</span>\t%s\n"
-"<span weight=\"bold\">�仄� �舒亶仍舒:</span>\t%s"
-
-#: ../pidgin/gtkplugin.c:432
-#, c-format
-msgid ""
-"%s\n"
-"<span foreground=\"#ff0000\" weight=\"bold\">Error: %s\n"
+#: ../pidgin/gtkplugin.c:454
+#, c-format
+msgid ""
+"<span foreground=\"red\" weight=\"bold\">Error: %s\n"
 "Check the plugin website for an update.</span>"
 msgstr ""

-#: ../pidgin/gtkplugin.c:569
+#: ../pidgin/gtkplugin.c:583
 msgid "Author"
 msgstr "�于�仂�"

-#: ../pidgin/gtkplugin.c:610
+#: ../pidgin/gtkplugin.c:661
+msgid "<b>Written by:</b>"
+msgstr "<b>�于�仂�:</b>"
+
+#: ../pidgin/gtkplugin.c:685
+msgid "<b>Web site:</b>"
+msgstr "<b>Web-�舒亶�:</b>"
+
+#: ../pidgin/gtkplugin.c:694
+msgid "<b>Filename:</b>"
+msgstr "<b>�仄� �舒亶仍舒:</b>"
+
+#: ../pidgin/gtkplugin.c:720
 msgid "Configure Pl_ugin"
 msgstr "_�舒���仂亳�� 仄仂亟�仍�"

-#: ../pidgin/gtkplugin.c:677
+#: ../pidgin/gtkplugin.c:788
 msgid "<b>Plugin Details</b>"
 msgstr "<b>�仂亟�仂弍仆仂��亳 仂 仄仂亟�仍亠</b>"

@@ -16463,132 +16499,144 @@
 msgid "Icon"
 msgstr "�仆舒�仂从"

-#: ../pidgin/gtkprefs.c:843
+#: ../pidgin/gtkprefs.c:894
+msgid "Keyboard Shortcuts"
+msgstr "�仂���亳亠 从仍舒于亳�亳"
+
+#: ../pidgin/gtkprefs.c:914
+msgid "Cl_ose conversations with the Escape key"
+msgstr "�_舒从��于舒�� 弍亠�亠亟� 从仍舒于亳�亠亶 Escape"
+
+#: ../pidgin/gtkprefs.c:943
 msgid "System Tray Icon"
 msgstr "�仆舒�仂从 �亳��亠仄仆仂亞仂 仍仂�从舒"

-#: ../pidgin/gtkprefs.c:844
+#: ../pidgin/gtkprefs.c:944
 msgid "_Show system tray icon:"
 msgstr "_�仂从舒亰�于舒�� 亰仆舒�仂从 �亳��亠仄仆仂亞仂 仍仂�从舒:"

-#: ../pidgin/gtkprefs.c:847
+#: ../pidgin/gtkprefs.c:947
 msgid "On unread messages"
 msgstr "��亳 仆舒仍亳�亳亳 仆亠仗�仂�亳�舒仆仆�� �仂仂弍�亠仆亳亶"

-#: ../pidgin/gtkprefs.c:853
+#: ../pidgin/gtkprefs.c:953
 msgid "Conversation Window Hiding"
 msgstr "弌从���亳亠 仂从仂仆 弍亠�亠亟"

-#: ../pidgin/gtkprefs.c:854
+#: ../pidgin/gtkprefs.c:954
 msgid "_Hide new IM conversations:"
 msgstr "_弌从��于舒�� 仆仂于�亠 弍亠�亠亟�:"

-#: ../pidgin/gtkprefs.c:857 ../pidgin/gtkprefs.c:1965
+#: ../pidgin/gtkprefs.c:957 ../pidgin/gtkprefs.c:2075
 msgid "When away"
 msgstr "�仂 于�亠仄� 仂������于亳�"

 #. All the tab options!
-#: ../pidgin/gtkprefs.c:865
+#: ../pidgin/gtkprefs.c:965
 msgid "Tabs"
 msgstr "�从仍舒亟从亳"

-#: ../pidgin/gtkprefs.c:867
+#: ../pidgin/gtkprefs.c:967
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "�仂从舒亰�于舒�� 仄亞仆仂于亠仆仆�亠 �仂仂弍�亠仆亳� 亳 �舒�� 于 仂从仆舒� � _于从仍舒亟从舒仄亳"

-#: ../pidgin/gtkprefs.c:881
+#: ../pidgin/gtkprefs.c:981
 msgid "Show close b_utton on tabs"
 msgstr "�仂从舒亰�于舒�� _从仆仂仗从� 亰舒从���亳� 仆舒 于从仍舒亟从舒�"

-#: ../pidgin/gtkprefs.c:884
+#: ../pidgin/gtkprefs.c:984
 msgid "_Placement:"
 msgstr "_�舒�仗仂仍仂亢亠仆亳亠:"

-#: ../pidgin/gtkprefs.c:886
+#: ../pidgin/gtkprefs.c:986
 msgid "Top"
 msgstr "�于亠���"

-#: ../pidgin/gtkprefs.c:887
+#: ../pidgin/gtkprefs.c:987
 msgid "Bottom"
 msgstr "�仆亳亰�"

-#: ../pidgin/gtkprefs.c:888
+#: ../pidgin/gtkprefs.c:988
 msgid "Left"
 msgstr "弌仍亠于舒"

-#: ../pidgin/gtkprefs.c:889
+#: ../pidgin/gtkprefs.c:989
 msgid "Right"
 msgstr "弌仗�舒于舒"

-#: ../pidgin/gtkprefs.c:891
+#: ../pidgin/gtkprefs.c:991
 msgid "Left Vertical"
 msgstr "弌仍亠于舒 于亠��亳从舒仍�仆仂"

-#: ../pidgin/gtkprefs.c:892
+#: ../pidgin/gtkprefs.c:992
 msgid "Right Vertical"
 msgstr "弌仗�舒于舒 于亠��亳从舒仍�仆仂"

-#: ../pidgin/gtkprefs.c:899
+#: ../pidgin/gtkprefs.c:999
 msgid "N_ew conversations:"
 msgstr "_�仂于�亠 弍亠�亠亟�:"

-#: ../pidgin/gtkprefs.c:944
+#: ../pidgin/gtkprefs.c:1048
 msgid "Show _formatting on incoming messages"
 msgstr "�仂从舒亰�于舒�� _�仂�仄舒�亳�仂于舒仆亳亠 于仂 于�仂亟��亳� �仂仂弍�亠仆亳��"

-#: ../pidgin/gtkprefs.c:946
+#: ../pidgin/gtkprefs.c:1050
 msgid "Close IMs immediately when the tab is closed"
 msgstr "�舒从��于舒�� 仄亞仆仂于亠仆仆�亠 �仂仂弍�亠仆亳� 仆亠仄亠亟仍亠仆仆仂 仗�亳 亰舒从���亳亳 于从仍舒亟从亳"

-#: ../pidgin/gtkprefs.c:949
+#: ../pidgin/gtkprefs.c:1053
 msgid "Show _detailed information"
 msgstr "�仂从舒亰�于舒�� _仗仂亟�仂弍仆�� 亳仆�仂�仄舒�亳�"

-#: ../pidgin/gtkprefs.c:951
+#: ../pidgin/gtkprefs.c:1055
 msgid "Enable buddy ic_on animation"
 msgstr "�舒亰�亠�亳�� _舒仆亳仄舒�亳� 亰仆舒�从仂于 �仂弍亠�亠亟仆亳从仂于"

-#: ../pidgin/gtkprefs.c:958
+#: ../pidgin/gtkprefs.c:1062
 msgid "_Notify buddies that you are typing to them"
 msgstr "_丕于亠亟仂仄仍��� �仂弍亠�亠亟仆亳从仂于, ��仂 于� 仆舒弍亳�舒亠�亠 亳仄 �仂仂弍�亠仆亳亠"

-#: ../pidgin/gtkprefs.c:961
+#: ../pidgin/gtkprefs.c:1065
 msgid "Highlight _misspelled words"
 msgstr "�仂亟�于亠�亳于舒�� �仍仂于舒 � _仂�亳弍从舒仄亳"

-#: ../pidgin/gtkprefs.c:965
+#: ../pidgin/gtkprefs.c:1069
 msgid "Use smooth-scrolling"
 msgstr "��仗仂仍�亰仂于舒�� 仗仍舒于仆�� 仗�仂从���从�"

-#: ../pidgin/gtkprefs.c:968
+#: ../pidgin/gtkprefs.c:1072
 msgid "F_lash window when IMs are received"
 msgstr "_�亠��舒�� 仂从仆仂仄 仗�亳 仗仂仍��亠仆亳亳 仄亞仆仂于亠仆仆�� �仂仂弍�亠仆亳亶"

-#: ../pidgin/gtkprefs.c:970
+#: ../pidgin/gtkprefs.c:1074
 msgid "Minimi_ze new conversation windows"
 msgstr "_弌于仂�舒�亳于舒�� 仆仂于�亠 仂从仆舒 弍亠�亠亟"

-#: ../pidgin/gtkprefs.c:974
+#: ../pidgin/gtkprefs.c:1078
+msgid "Minimum input area height in lines:"
+msgstr "�亳仆亳仄舒仍�仆舒� 于��仂�舒 仂弍仍舒��亳 于于仂亟舒 (于 ���仂从舒�):"
+
+#: ../pidgin/gtkprefs.c:1084
 msgid "Font"
 msgstr "丿�亳��"

-#: ../pidgin/gtkprefs.c:976
+#: ../pidgin/gtkprefs.c:1086
 msgid "Use document font from _theme"
 msgstr "��仗仂仍�亰仂于舒�� ��亳�� 亟仂从�仄亠仆�舒 亳亰 _�亠仄�"

-#: ../pidgin/gtkprefs.c:978
+#: ../pidgin/gtkprefs.c:1088
 msgid "Use font from _theme"
 msgstr "��仗仂仍�亰仂于舒�� ��亳�� 亳亰 _�亠仄�"

-#: ../pidgin/gtkprefs.c:984
+#: ../pidgin/gtkprefs.c:1094
 msgid "Conversation _font:"
 msgstr "_丿�亳�� 弍亠�亠亟�:"

-#: ../pidgin/gtkprefs.c:991
+#: ../pidgin/gtkprefs.c:1101
 msgid "Default Formatting"
 msgstr "个仂�仄舒�亳�仂于舒仆亳亠 仗仂 �仄仂仍�舒仆亳�"

-#: ../pidgin/gtkprefs.c:1010
+#: ../pidgin/gtkprefs.c:1120
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting."
@@ -16596,162 +16644,162 @@
 "丐舒从 弍�亟亠� 于�亞仍�亟亠�� �亠从�� 于舒�亳� �仂仂弍�亠仆亳亶 � 亳�仗仂仍�亰仂于舒仆亳亠仄 仗�仂�仂从仂仍仂于, "
 "仗仂亟亟亠�亢亳于舒��亳� �仂�仄舒�亳�仂于舒仆亳亠."

-#: ../pidgin/gtkprefs.c:1070
+#: ../pidgin/gtkprefs.c:1180
 msgid "Cannot start proxy configuration program."
 msgstr ""

-#: ../pidgin/gtkprefs.c:1082
+#: ../pidgin/gtkprefs.c:1192
 #, fuzzy
 msgid "Cannot start browser configuration program."
 msgstr "�亠 �亟舒���� 仗仂仍��亳�� 仗仂仍�亰仂于舒�亠仍��从�� 亳仆�仂�仄舒�亳�"

-#: ../pidgin/gtkprefs.c:1102
+#: ../pidgin/gtkprefs.c:1212
 msgid "ST_UN server:"
 msgstr "ST_UN-�亠�于亠�:"

-#: ../pidgin/gtkprefs.c:1114
+#: ../pidgin/gtkprefs.c:1224
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">��亳仄亠�: stunserver.org</span>"

-#: ../pidgin/gtkprefs.c:1118
+#: ../pidgin/gtkprefs.c:1228
 msgid "_Autodetect IP address"
 msgstr "�仗�亠亟亠仍��� IP-舒亟�亠� _舒于�仂仄舒�亳�亠�从亳"

-#: ../pidgin/gtkprefs.c:1127
+#: ../pidgin/gtkprefs.c:1237
 msgid "Public _IP:"
 msgstr "��弍仍亳�仆�亶 _IP:"

-#: ../pidgin/gtkprefs.c:1158
+#: ../pidgin/gtkprefs.c:1268
 msgid "Ports"
 msgstr "�仂���"

-#: ../pidgin/gtkprefs.c:1161
+#: ../pidgin/gtkprefs.c:1271
 msgid "_Enable automatic router port forwarding"
 msgstr "_�舒亰�亠�亳�� 舒于�仂仄舒�亳�亠�从�� 仗亠�亠舒亟�亠�舒�亳� 仗仂��仂于 仄舒�����亳亰舒�仂�舒"

-#: ../pidgin/gtkprefs.c:1164
+#: ../pidgin/gtkprefs.c:1274
 msgid "_Manually specify range of ports to listen on"
 msgstr "丕从舒亰舒�� 亟亳舒仗舒亰仂仆 仗�仂�仍��亳于舒亠仄�� 仗仂��仂于 _于���仆��"

-#: ../pidgin/gtkprefs.c:1167
+#: ../pidgin/gtkprefs.c:1277
 msgid "_Start port:"
 msgstr "_�舒�舒仍�仆�亶 仗仂��:"

-#: ../pidgin/gtkprefs.c:1174
+#: ../pidgin/gtkprefs.c:1284
 msgid "_End port:"
 msgstr "_�仂仆亠�仆�亶 仗仂��:"

-#: ../pidgin/gtkprefs.c:1182
+#: ../pidgin/gtkprefs.c:1292
 msgid "Proxy Server &amp; Browser"
 msgstr "��仂从�亳-�亠�于亠� &amp; 弍�舒�亰亠�"

-#: ../pidgin/gtkprefs.c:1190
+#: ../pidgin/gtkprefs.c:1300
 msgid "<b>Proxy configuration program was not found.</b>"
 msgstr ""

-#: ../pidgin/gtkprefs.c:1198
+#: ../pidgin/gtkprefs.c:1308
 msgid "<b>Browser configuration program was not found.</b>"
 msgstr ""

-#: ../pidgin/gtkprefs.c:1203
+#: ../pidgin/gtkprefs.c:1313
 msgid ""
 "Proxy & Browser preferences are configured\n"
 "in GNOME Preferences"
 msgstr ""

-#: ../pidgin/gtkprefs.c:1210
+#: ../pidgin/gtkprefs.c:1320
 msgid "Configure _Proxy"
 msgstr "�舒���仂亳�� _仗�仂从�亳"

-#: ../pidgin/gtkprefs.c:1215
+#: ../pidgin/gtkprefs.c:1325
 msgid "Configure _Browser"
 msgstr "�舒���仂亳�� _弍�舒�亰亠�"

-#: ../pidgin/gtkprefs.c:1221
+#: ../pidgin/gtkprefs.c:1331
 msgid "Proxy Server"
 msgstr "��仂从�亳-�亠�于亠�"

-#: ../pidgin/gtkprefs.c:1226
+#: ../pidgin/gtkprefs.c:1336
 msgid "No proxy"
 msgstr "�亠� 仗�仂从�亳"

-#: ../pidgin/gtkprefs.c:1282
+#: ../pidgin/gtkprefs.c:1392
 msgid "_User:"
 msgstr "_�仂仍�亰仂于舒�亠仍�:"

-#: ../pidgin/gtkprefs.c:1370
+#: ../pidgin/gtkprefs.c:1480
 msgid "Seamonkey"
 msgstr "Seamonkey"

-#: ../pidgin/gtkprefs.c:1371
+#: ../pidgin/gtkprefs.c:1481
 msgid "Opera"
 msgstr "Opera"

-#: ../pidgin/gtkprefs.c:1372
+#: ../pidgin/gtkprefs.c:1482
 msgid "Netscape"
 msgstr "Netscape"

-#: ../pidgin/gtkprefs.c:1373
+#: ../pidgin/gtkprefs.c:1483
 msgid "Mozilla"
 msgstr "Mozilla"

-#: ../pidgin/gtkprefs.c:1374
+#: ../pidgin/gtkprefs.c:1484
 msgid "Konqueror"
 msgstr "Konqueror"

-#: ../pidgin/gtkprefs.c:1375
+#: ../pidgin/gtkprefs.c:1485
 msgid "Desktop Default"
 msgstr "��仗仂仍�亰�亠仄�亶 仗仂 �仄仂仍�舒仆亳�"

-#: ../pidgin/gtkprefs.c:1376
+#: ../pidgin/gtkprefs.c:1486
 msgid "GNOME Default"
 msgstr "��仗仂仍�亰�亠仄�亶 于 GNOME 仗仂 �仄仂仍�舒仆亳�"

-#: ../pidgin/gtkprefs.c:1377
+#: ../pidgin/gtkprefs.c:1487
 msgid "Galeon"
 msgstr "Galeon"

-#: ../pidgin/gtkprefs.c:1378
+#: ../pidgin/gtkprefs.c:1488
 msgid "Firefox"
 msgstr "Firefox"

-#: ../pidgin/gtkprefs.c:1379
+#: ../pidgin/gtkprefs.c:1489
 msgid "Firebird"
 msgstr "Firebird"

-#: ../pidgin/gtkprefs.c:1380
+#: ../pidgin/gtkprefs.c:1490
 msgid "Epiphany"
 msgstr "Epiphany"

-#: ../pidgin/gtkprefs.c:1389
+#: ../pidgin/gtkprefs.c:1499
 msgid "Manual"
 msgstr "���亞仂亶"

-#: ../pidgin/gtkprefs.c:1450
+#: ../pidgin/gtkprefs.c:1560
 msgid "Browser Selection"
 msgstr "��弍仂� 弍�舒�亰亠�舒"

-#: ../pidgin/gtkprefs.c:1454
+#: ../pidgin/gtkprefs.c:1564
 msgid "_Browser:"
 msgstr "_��舒�亰亠�:"

-#: ../pidgin/gtkprefs.c:1462
+#: ../pidgin/gtkprefs.c:1572
 msgid "_Open link in:"
 msgstr "_��从��于舒�� ���仍从� 于:"

-#: ../pidgin/gtkprefs.c:1464
+#: ../pidgin/gtkprefs.c:1574
 msgid "Browser default"
 msgstr "�仂 �仄仂仍�舒仆亳�"

-#: ../pidgin/gtkprefs.c:1465
+#: ../pidgin/gtkprefs.c:1575
 msgid "Existing window"
 msgstr "弌��亠��于���亠亠 仂从仆仂"

-#: ../pidgin/gtkprefs.c:1467
+#: ../pidgin/gtkprefs.c:1577
 msgid "New tab"
 msgstr "�仂于舒� 于从仍舒亟从舒"

-#: ../pidgin/gtkprefs.c:1484
+#: ../pidgin/gtkprefs.c:1594
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -16760,69 +16808,69 @@
 "_����仆��:\n"
 "(%s 亟仍� URL)"

-#: ../pidgin/gtkprefs.c:1510
+#: ../pidgin/gtkprefs.c:1620
 msgid "Log _format:"
 msgstr "_个仂�仄舒� 亢��仆舒仍舒:"

-#: ../pidgin/gtkprefs.c:1515
+#: ../pidgin/gtkprefs.c:1625
 msgid "Log all _instant messages"
 msgstr "�舒仗亳��于舒�� 于�亠 _仄亞仆仂于亠仆仆�亠 �仂仂弍�亠仆亳�"

-#: ../pidgin/gtkprefs.c:1517
+#: ../pidgin/gtkprefs.c:1627
 msgid "Log all c_hats"
 msgstr "�舒仗亳��于舒�� 于�亠 _�舒��"

-#: ../pidgin/gtkprefs.c:1519
+#: ../pidgin/gtkprefs.c:1629
 msgid "Log all _status changes to system log"
 msgstr "�舒仗亳��于舒�� 于�亠 亳亰仄亠仆亠仆亳� _��舒���舒 于 �亳��亠仄仆�亶 亢��仆舒仍"

-#: ../pidgin/gtkprefs.c:1669
+#: ../pidgin/gtkprefs.c:1779
 msgid "Sound Selection"
 msgstr "��弍仂� 亰于�从舒"

-#: ../pidgin/gtkprefs.c:1679
+#: ../pidgin/gtkprefs.c:1789
 #, c-format
 msgid "Quietest"
 msgstr "��亠仆� �亳�仂"

-#: ../pidgin/gtkprefs.c:1681
+#: ../pidgin/gtkprefs.c:1791
 #, c-format
 msgid "Quieter"
 msgstr "丐亳�仂"

-#: ../pidgin/gtkprefs.c:1683
+#: ../pidgin/gtkprefs.c:1793
 #, c-format
 msgid "Quiet"
 msgstr "�亳亢亠 ��亠亟仆亠亞仂"

-#: ../pidgin/gtkprefs.c:1687
+#: ../pidgin/gtkprefs.c:1797
 #, c-format
 msgid "Loud"
 msgstr "���亠 ��亠亟仆亠亞仂"

-#: ../pidgin/gtkprefs.c:1689
+#: ../pidgin/gtkprefs.c:1799
 #, c-format
 msgid "Louder"
 msgstr "��仂仄从仂"

-#: ../pidgin/gtkprefs.c:1691
+#: ../pidgin/gtkprefs.c:1801
 #, c-format
 msgid "Loudest"
 msgstr "��亠仆� 亞�仂仄从仂"

-#: ../pidgin/gtkprefs.c:1754
+#: ../pidgin/gtkprefs.c:1864
 msgid "_Method:"
 msgstr "_�亠�仂亟:"

-#: ../pidgin/gtkprefs.c:1756
+#: ../pidgin/gtkprefs.c:1866
 msgid "Console beep"
 msgstr "弌亳亞仆舒仍 亟亳仆舒仄亳从仂仄"

-#: ../pidgin/gtkprefs.c:1763
+#: ../pidgin/gtkprefs.c:1873
 msgid "No sounds"
 msgstr "�亠� 亰于�从仂于"

-#: ../pidgin/gtkprefs.c:1776
+#: ../pidgin/gtkprefs.c:1886
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -16831,81 +16879,81 @@
 "_�仂仄舒仆亟舒 于仂�仗�仂亳亰于亠亟亠仆亳� 亰于�从舒:\n"
 "(%s 亟仍� 亳仄亠仆亳 �舒亶仍舒)"

-#: ../pidgin/gtkprefs.c:1785
+#: ../pidgin/gtkprefs.c:1895
 msgid "Sounds when conversation has _focus"
 msgstr "�于�从亳, 从仂亞亟舒 仂从仆仂 弍亠�亠亟� 于 _�仂从��亠"

-#: ../pidgin/gtkprefs.c:1787
+#: ../pidgin/gtkprefs.c:1897
 msgid "Enable sounds:"
 msgstr "�仂�仗�仂亳亰于仂亟亳�� 亰于�从亳:"

-#: ../pidgin/gtkprefs.c:1804
+#: ../pidgin/gtkprefs.c:1914
 msgid "Volume:"
 msgstr "��仂仄从仂���:"

-#: ../pidgin/gtkprefs.c:1871
+#: ../pidgin/gtkprefs.c:1981
 msgid "Play"
 msgstr "�仂�仗�仂亳亰于仂亟亳��"

-#: ../pidgin/gtkprefs.c:1948
+#: ../pidgin/gtkprefs.c:2058
 msgid "_Report idle time:"
 msgstr "弌仂仂弍�舒�� _于�亠仄� 弍亠亰亟亠亶��于亳�:"

-#: ../pidgin/gtkprefs.c:1953
+#: ../pidgin/gtkprefs.c:2063
 msgid "Based on keyboard or mouse use"
 msgstr "��仆仂于�于舒��� 仆舒 亳�仗仂仍�亰仂于舒仆亳亳 从仍舒于亳舒���� 亳仍亳 仄��亳"

-#: ../pidgin/gtkprefs.c:1962
+#: ../pidgin/gtkprefs.c:2072
 msgid "_Auto-reply:"
 msgstr "_�于�仂仄舒�亳�亠�从亳亶 仂�于亠�:"

-#: ../pidgin/gtkprefs.c:1966
+#: ../pidgin/gtkprefs.c:2076
 msgid "When both away and idle"
 msgstr "�仂 于�亠仄� 仂������于亳� 亳 弍亠亰亟亠亶��于亳�"

 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1972
+#: ../pidgin/gtkprefs.c:2082
 msgid "Auto-away"
 msgstr "�于�仂-\"��仂��仍\""

-#: ../pidgin/gtkprefs.c:1974
+#: ../pidgin/gtkprefs.c:2084
 msgid "Change status when _idle"
 msgstr "�亠仆��� ��舒��� 仗�亳 _弍亠亰亟亠亶��于亳亳"

-#: ../pidgin/gtkprefs.c:1978
+#: ../pidgin/gtkprefs.c:2088
 msgid "_Minutes before becoming idle:"
 msgstr "_�亳仆�� 亟仂 仆舒�舒仍舒 弍亠亰亟亠亶��于亳�:"

-#: ../pidgin/gtkprefs.c:1985
+#: ../pidgin/gtkprefs.c:2095
 msgid "Change _status to:"
 msgstr "�亠仆��� _��舒��� 仆舒:"

 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1998
+#: ../pidgin/gtkprefs.c:2108
 msgid "Status at Startup"
 msgstr "弌�舒��� 仗�亳 亰舒仗��从亠"

-#: ../pidgin/gtkprefs.c:2000
+#: ../pidgin/gtkprefs.c:2110
 msgid "Use status from last _exit at startup"
 msgstr "��仗仂仍�亰仂于舒�� 仗�亳 亰舒仗��从亠 ��舒���, 弍�于�亳亶 亟仂 于_��仂亟舒"

-#: ../pidgin/gtkprefs.c:2007
+#: ../pidgin/gtkprefs.c:2117
 msgid "Status to a_pply at startup:"
 msgstr "_��亳仄亠仆亳�� 仗�亳 亰舒仗��从亠 ��舒���:"

-#: ../pidgin/gtkprefs.c:2036
+#: ../pidgin/gtkprefs.c:2146
 msgid "Interface"
 msgstr "�仆�亠��亠亶�"

-#: ../pidgin/gtkprefs.c:2038
+#: ../pidgin/gtkprefs.c:2148
 msgid "Smiley Themes"
 msgstr "丐亠仄� �仄舒亶仍亳从仂于"

-#: ../pidgin/gtkprefs.c:2045
+#: ../pidgin/gtkprefs.c:2155
 msgid "Browser"
 msgstr "��舒�亰亠�"

-#: ../pidgin/gtkprefs.c:2049
+#: ../pidgin/gtkprefs.c:2159
 msgid "Status / Idle"
 msgstr "弌�舒��� / �亠亰亟亠亶��于亳亠"

@@ -16999,23 +17047,23 @@
 msgid "Apply"
 msgstr "��亳仄亠仆亳��"

-#: ../pidgin/gtkrequest.c:1503
+#: ../pidgin/gtkrequest.c:1504
 msgid "That file already exists"
 msgstr "丐舒从仂亶 �舒亶仍 �亢亠 ���亠��于�亠�"

-#: ../pidgin/gtkrequest.c:1504
+#: ../pidgin/gtkrequest.c:1505
 msgid "Would you like to overwrite it?"
 msgstr "丱仂�亳�亠 仗亠�亠亰舒仗亳�舒�� 亠亞仂?"

-#: ../pidgin/gtkrequest.c:1507
+#: ../pidgin/gtkrequest.c:1508
 msgid "Overwrite"
 msgstr "�亠�亠亰舒仗亳�舒��"

-#: ../pidgin/gtkrequest.c:1508
+#: ../pidgin/gtkrequest.c:1509
 msgid "Choose New Name"
 msgstr "��弍�舒�� 仆仂于仂亠 亳仄�"

-#: ../pidgin/gtkrequest.c:1649 ../pidgin/gtkrequest.c:1663
+#: ../pidgin/gtkrequest.c:1650 ../pidgin/gtkrequest.c:1664
 msgid "Select Folder..."
 msgstr "��弍�舒�� 仗舒仗从�..."

@@ -17069,79 +17117,84 @@
 msgid "Status for %s"
 msgstr "弌�舒��� 亟仍� %s"

-#: ../pidgin/gtkstatusbox.c:683
+#: ../pidgin/gtkstatusbox.c:688
 msgid "Waiting for network connection"
 msgstr "�亢亳亟舒仆亳亠 �亠�亠于仂亞仂 �仂亠亟亳仆亠仆亳�"

-#: ../pidgin/gtkstatusbox.c:1096
+#: ../pidgin/gtkstatusbox.c:1101
 msgid "New status..."
 msgstr "�仂于�亶 ��舒���..."

-#: ../pidgin/gtkstatusbox.c:1097
+#: ../pidgin/gtkstatusbox.c:1102
 msgid "Saved statuses..."
 msgstr "弌仂��舒仆�仆仆�亠 ��舒����..."

-#: ../pidgin/gtkutils.c:683
+#: ../pidgin/gtkstatusbox.c:1737
+#, fuzzy
+msgid "Status Selector"
+msgstr "丐亠从�� ��舒���舒"
+
+#: ../pidgin/gtkutils.c:685
 msgid "Google Talk"
 msgstr "Google Talk"

-#: ../pidgin/gtkutils.c:1450 ../pidgin/gtkutils.c:1473
+#: ../pidgin/gtkutils.c:1452 ../pidgin/gtkutils.c:1475
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "��仂亳亰仂�仍舒 �仍亠亟���舒� 仂�亳弍从舒 仗�亳 亰舒亞��亰从亠 %s: %s"

-#: ../pidgin/gtkutils.c:1453 ../pidgin/gtkutils.c:1475
+#: ../pidgin/gtkutils.c:1455 ../pidgin/gtkutils.c:1477
 msgid "Failed to load image"
 msgstr "�亠 �亟舒仍仂�� 亰舒亞��亰亳�� 亳亰仂弍�舒亢亠仆亳亠"

-#: ../pidgin/gtkutils.c:1549
+#: ../pidgin/gtkutils.c:1551
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "�亠仍�亰� 仂�仗�舒于亳�� 仗舒仗从� %s."

-#: ../pidgin/gtkutils.c:1550
+#: ../pidgin/gtkutils.c:1552
 #, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
 "individually."
 msgstr ""

-#: ../pidgin/gtkutils.c:1584 ../pidgin/gtkutils.c:1596
-#: ../pidgin/gtkutils.c:1603
+#: ../pidgin/gtkutils.c:1586 ../pidgin/gtkutils.c:1598
+#: ../pidgin/gtkutils.c:1605
 msgid "You have dragged an image"
 msgstr "�� 仗亠�亠�舒�亳仍亳 亳亰仂弍�舒亢亠仆亳亠"

-#: ../pidgin/gtkutils.c:1585
+#: ../pidgin/gtkutils.c:1587
 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:1591 ../pidgin/gtkutils.c:1611
+#: ../pidgin/gtkutils.c:1593 ../pidgin/gtkutils.c:1613
 msgid "Set as buddy icon"
 msgstr "丕��舒仆仂于亳�� 于 从舒�亠��于亠 亰仆舒�从舒 �仂弍亠�亠亟仆亳从舒"

-#: ../pidgin/gtkutils.c:1592 ../pidgin/gtkutils.c:1612
+#: ../pidgin/gtkutils.c:1594 ../pidgin/gtkutils.c:1614
 msgid "Send image file"
 msgstr "��仗�舒于亳�� �舒亶仍 亳亰仂弍�舒亢亠仆亳�"

-#: ../pidgin/gtkutils.c:1593 ../pidgin/gtkutils.c:1612
+#: ../pidgin/gtkutils.c:1595 ../pidgin/gtkutils.c:1614
 msgid "Insert in message"
 msgstr "���舒于亳�� 于 �仂仂弍�亠仆亳亠"

-#: ../pidgin/gtkutils.c:1597
+#: ../pidgin/gtkutils.c:1599
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr ""
 "丱仂�亳�亠 ���舒仆仂于亳�� ��仂 亳亰仂弍�舒亢亠仆亳亠 于 从舒�亠��于亠 亰仆舒�从舒 �仂弍亠�亠亟仆亳从舒 亟仍� ��仂亞仂 "
 "仗仂仍�亰仂于舒�亠仍�?"

-#: ../pidgin/gtkutils.c:1604
+#: ../pidgin/gtkutils.c:1606
 msgid ""
 "You can send this image as a file transfer, or use it as the buddy icon for "
 "this user."
 msgstr ""

-#: ../pidgin/gtkutils.c:1605
+#: ../pidgin/gtkutils.c:1607
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -17152,17 +17205,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:1664
+#: ../pidgin/gtkutils.c:1666
 msgid "Cannot send launcher"
 msgstr "�亠仍�亰� 仂�仗�舒于亳�� ��仍�从"

-#: ../pidgin/gtkutils.c:1664
+#: ../pidgin/gtkutils.c:1666
 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:2402
+#: ../pidgin/gtkutils.c:2404
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -17173,25 +17226,25 @@
 "<b>�舒亰仄亠� �舒亶仍舒:</b> %s\n"
 "<b>�舒亰仄亠� 亳亰仂弍�舒亢亠仆亳�:</b> %dx%d"

-#: ../pidgin/gtkutils.c:2704
+#: ../pidgin/gtkutils.c:2706
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr ""

-#: ../pidgin/gtkutils.c:2706
+#: ../pidgin/gtkutils.c:2708
 msgid "Icon Error"
 msgstr "��亳弍从舒 亰仆舒�从舒"

-#: ../pidgin/gtkutils.c:2707
+#: ../pidgin/gtkutils.c:2709
 msgid "Could not set icon"
 msgstr "�亠 �亟舒仍仂�� ���舒仆仂于亳�� 亰仆舒�仂从"

-#: ../pidgin/gtkutils.c:2807
+#: ../pidgin/gtkutils.c:2809
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "�亠 �亟舒仍仂�� 仂�从���� �舒亶仍 '%s': %s"

-#: ../pidgin/gtkutils.c:2856
+#: ../pidgin/gtkutils.c:2858
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -17296,9 +17349,7 @@

 #. *  summary
 #: ../pidgin/plugins/cap/cap.c:897
-msgid ""
-"The contact availability plugin (cap) is used to display statistical "
-"information about buddies in a users contact list."
+msgid "Displays statistical information about your buddies' availability"
 msgstr ""

 #: ../pidgin/plugins/contact_priority.c:61
@@ -17498,20 +17549,17 @@
 #. *  description
 #: ../pidgin/plugins/gestures/gestures.c:300
 msgid ""
-"Allows support for mouse gestures in conversation windows.\n"
-"Drag the middle mouse button to perform certain actions:\n"
-"\n"
-"Drag down and then to the right to close a conversation.\n"
-"Drag up and then to the left to switch to the previous conversation.\n"
-"Drag up and then to the right to switch to the next conversation."
-msgstr ""
-"�仂亰于仂仍�亠� 亳�仗仂仍�亰仂于舒�� 亢亠��� 仄���� 于 仂从仆舒� 弍亠�亠亟.\n"
-"�亠�亠亟于亳亞舒亶�亠 仄���, �亟亠�亢亳于舒� 仆舒亢舒�仂亶 ��亠亟仆�� 从仆仂仗从�, 亟仍� 于�仗仂仍仆亠仆亳� "
-"�仍亠亟���亳� 亟亠亶��于亳亶:\n"
-"\n"
-"�仆亳亰 亳 于仗�舒于仂 亟仍� 亰舒从���亳� 弍亠�亠亟�.\n"
-"�于亠�� 亳 于仍亠于仂 亟仍� 仗亠�亠�仂亟舒 从 仗�亠亟�亟��亠亶 弍亠�亠亟亠.\n"
-"�于亠�� 亳 于仗�舒于仂 亟仍� 仗亠�亠�仂亟舒 从 �仍亠亟���亠亶 弍亠�亠亟亠."
+"Allows support for mouse gestures in conversation windows. Drag the middle "
+"mouse button to perform certain actions:\n"
+" �� Drag down and then to the right to close a conversation.\n"
+" �� Drag up and then to the left to switch to the previous conversation.\n"
+" �� Drag up and then to the right to switch to the next conversation."
+msgstr ""
+"�仂亰于仂仍�亠� 亳�仗仂仍�亰仂于舒�� 亢亠��� 仄���� 于 仂从仆舒� 弍亠�亠亟. �亠�亠亟于亳亞舒亶�亠 仄���, "
+"�亟亠�亢亳于舒� 仆舒亢舒�仂亶 ��亠亟仆�� 从仆仂仗从�, 亟仍� 于�仗仂仍仆亠仆亳� �仍亠亟���亳� 亟亠亶��于亳亶:\n"
+" �� �仆亳亰 亳 于仗�舒于仂 亟仍� 亰舒从���亳� 弍亠�亠亟�.\n"
+" �� �于亠�� 亳 于仍亠于仂 亟仍� 仗亠�亠�仂亟舒 从 仗�亠亟�亟��亠亶 弍亠�亠亟亠.\n"
+" �� �于亠�� 亳 于仗�舒于仂 亟仍� 仗亠�亠�仂亟舒 从 �仍亠亟���亠亶 弍亠�亠亟亠."

 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:143
 msgid "Instant Messaging"
@@ -17615,9 +17663,8 @@
 msgstr "�亳亢亠 于于亠亟亳�亠 亳仆�仂�仄舒�亳� 仂 仗亠��仂仆亠."

 #: ../pidgin/plugins/gevolution/new_person_dialog.c:270
-msgid "Please enter the buddy's screen name and account type below."
-msgstr ""
-"�亳亢亠 于于亠亟亳�亠 亳亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍� �仂弍亠�亠亟仆亳从舒 亳 �亳仗 ����仆仂亶 亰舒仗亳�亳."
+msgid "Please enter the buddy's username and account type below."
+msgstr "�亳亢亠 于于亠亟亳�亠 亳仄� 仗仂仍�亰仂于舒�亠仍� �仂弍亠�亠亟仆亳从舒 亳 �亳仗 ����仆仂亶 亰舒仗亳�亳."

 #: ../pidgin/plugins/gevolution/new_person_dialog.c:290
 msgid "Account type:"
@@ -17668,7 +17715,7 @@
 "\n"
 "<b>�舒仄亠�从亳 仂 �仂弍亠�亠亟仆亳从亠</b>: %s"

-#: ../pidgin/plugins/history.c:195
+#: ../pidgin/plugins/history.c:201
 msgid "History"
 msgstr "���仂�亳�"

@@ -17712,15 +17759,19 @@
 msgid "Draw a line to indicate new messages in a conversation."
 msgstr "��仂于仂亟亳� 仍亳仆亳�, 仂�亟亠仍����� 仆仂于�亠 �仂仂弍�亠仆亳� 于 弍亠�亠亟亠."

-#: ../pidgin/plugins/markerline.c:246
+#: ../pidgin/plugins/markerline.c:240
+msgid "Jump to markerline"
+msgstr "�亠�亠亶�亳 从 �舒亰亟亠仍亳�亠仍�仆仂亶 仍亳仆亳亳"
+
+#: ../pidgin/plugins/markerline.c:274
 msgid "Draw Markerline in "
 msgstr "��仂于仂亟亳�� �舒亰亟亠仍亳�亠仍�仆�� 仍亳仆亳� 于 "

-#: ../pidgin/plugins/markerline.c:250 ../pidgin/plugins/notify.c:682
+#: ../pidgin/plugins/markerline.c:278 ../pidgin/plugins/notify.c:693
 msgid "_IM windows"
 msgstr "�从仆舒 _仄亞仆仂于亠仆仆�� �仂仂弍�亠仆亳亶"

-#: ../pidgin/plugins/markerline.c:254 ../pidgin/plugins/notify.c:689
+#: ../pidgin/plugins/markerline.c:282 ../pidgin/plugins/notify.c:700
 msgid "C_hat windows"
 msgstr "�从仆舒 _�舒�仂于"

@@ -17783,74 +17834,80 @@
 msgstr ""

 #. ---------- "Notify For" ----------
-#: ../pidgin/plugins/notify.c:678
+#: ../pidgin/plugins/notify.c:689
 msgid "Notify For"
 msgstr "丕于亠亟仂仄仍亠仆亳亠 亟仍�"

-#: ../pidgin/plugins/notify.c:697
-msgid "\t_Only when someone says your screen name"
-msgstr "\t_丐仂仍�从仂 �仂亞亟舒, 从仂亞亟舒 从�仂-�仂 仗�仂亳亰仆仂�亳� 于舒�亠 亳仄�"
-
-#: ../pidgin/plugins/notify.c:707
+#: ../pidgin/plugins/notify.c:708
+msgid "\t_Only when someone says your username"
+msgstr "\t_丐仂仍�从仂 �仂亞亟舒, 从仂亞亟舒 从�仂-�仂 仗�仂亳亰仆仂�亳� 于舒�亠 亳仄� 仗仂仍�亰仂于舒�亠仍�"
+
+#: ../pidgin/plugins/notify.c:718
 msgid "_Focused windows"
 msgstr "�从仆舒 于 _�仂从��亠"

 #. ---------- "Notification Methods" ----------
-#: ../pidgin/plugins/notify.c:715
+#: ../pidgin/plugins/notify.c:726
 msgid "Notification Methods"
 msgstr "�亠�仂亟� �于亠亟仂仄仍亠仆亳�"

-#: ../pidgin/plugins/notify.c:722
+#: ../pidgin/plugins/notify.c:733
 msgid "Prepend _string into window title:"
 msgstr "�仂弍舒于仍��� _���仂从� 于 仆舒�舒仍仂 亰舒亞仂仍仂于从舒 仂从仆舒:"

 #. Count method button
-#: ../pidgin/plugins/notify.c:741
+#: ../pidgin/plugins/notify.c:752
 msgid "Insert c_ount of new messages into window title"
 msgstr "���舒于仍��� _从仂仍亳�亠��于仂 仆仂于�� �仂仂弍�亠仆亳亶 于 亰舒亞仂仍仂于仂从 仂从仆舒"

 #. Count xprop method button
-#: ../pidgin/plugins/notify.c:750
+#: ../pidgin/plugins/notify.c:761
 msgid "Insert count of new message into _X property"
 msgstr "���舒于仍��� 从仂仍亳�亠��于仂 仆仂于�� �仂仂弍�亠仆亳亶 于 �于仂亶��于舒 _X"

 #. Urgent method button
-#: ../pidgin/plugins/notify.c:758
+#: ../pidgin/plugins/notify.c:769
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "丕��舒仆仂于亳�� 仗仂亟�从舒亰从� \"弌_��丼��\" 仂从仂仆仆仂亞仂 仄亠仆亠亟亢亠�舒"

 #. Raise window method button
-#: ../pidgin/plugins/notify.c:767
+#: ../pidgin/plugins/notify.c:778
 msgid "R_aise conversation window"
 msgstr "_�仂亟仆亳仄舒�� 仂从仆仂 弍亠�亠亟�"

+#. Present conversation method button
+#: ../pidgin/plugins/notify.c:786
+#, fuzzy
+msgid "_Present conversation window"
+msgstr "_�仂亟仆亳仄舒�� 仂从仆仂 弍亠�亠亟�"
+
 #. ---------- "Notification Removals" ----------
-#: ../pidgin/plugins/notify.c:775
+#: ../pidgin/plugins/notify.c:794
 msgid "Notification Removal"
 msgstr "丕亟舒仍亠仆亳亠 �于亠亟仂仄仍亠仆亳亶"

 #. Remove on focus button
-#: ../pidgin/plugins/notify.c:780
+#: ../pidgin/plugins/notify.c:799
 msgid "Remove when conversation window _gains focus"
 msgstr "丕亟舒仍���, 从仂亞亟舒 仂从仆仂 弍亠�亠亟� 仂从舒亰�于舒亠��� 于 �_仂从��亠"

 #. Remove on click button
-#: ../pidgin/plugins/notify.c:787
+#: ../pidgin/plugins/notify.c:806
 msgid "Remove when conversation window _receives click"
 msgstr "丕亟舒仍���, 从仂亞亟舒 仂从仆仂 弍亠�亠亟� 仗仂仍��舒亠� _�亠仍�仂从"

 #. Remove on type button
-#: ../pidgin/plugins/notify.c:795
+#: ../pidgin/plugins/notify.c:814
 msgid "Remove when _typing in conversation window"
 msgstr "丕亟舒仍��� 仗�亳 _仆舒弍仂�亠 �仂仂弍�亠仆亳� 于 仂从仆亠 弍亠�亠亟�"

 #. Remove on message send button
-#: ../pidgin/plugins/notify.c:803
+#: ../pidgin/plugins/notify.c:822
 msgid "Remove when a _message gets sent"
 msgstr "丕亟舒仍��� 仗�亳 仂�仗�_舒于从亠 �仂仂弍�亠仆亳�"

 #. Remove on conversation switch button
-#: ../pidgin/plugins/notify.c:812
+#: ../pidgin/plugins/notify.c:831
 msgid "Remove on switch to conversation ta_b"
 msgstr "丕亟舒仍��� 仗�亳 仗亠�亠从仍��亠仆亳亳 仆舒 _于从仍舒亟从� 弍亠�亠亟�"

@@ -17860,7 +17917,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/notify.c:905
+#: ../pidgin/plugins/notify.c:924
 msgid "Message Notification"
 msgstr "丕于亠亟仂仄仍亠仆亳亠 仂 �仂仂弍�亠仆亳亳"

@@ -17868,7 +17925,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/notify.c:908 ../pidgin/plugins/notify.c:910
+#: ../pidgin/plugins/notify.c:927 ../pidgin/plugins/notify.c:929
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr ""
 "��亠亟仂��舒于仍�亠� 仄仆仂亢亠��于仂 �仗仂�仂弍仂于 �于亠亟仂仄仍亠仆亳� 于舒� 仂 仆亠仗�仂�亳�舒仆仆�� �仂仂弍�亠仆亳��."
@@ -18076,6 +18133,33 @@
 "�亠�亳仂亟亳�亠�从亳 仗�仂于亠��亠� 仆舒仍亳�亳亠 仆仂于�� 于亠��亳亶 亳 �于亠亟仂仄仍�亠� 仂 仆亳� 仗仂仍�亰仂于舒�亠仍�, "
 "仗�亳于仂亟� �仗亳�仂从 亳亰仄亠仆亠仆亳亶."

+#. *< major version
+#. *< minor version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/sendbutton.c:138
+msgid "Send Button"
+msgstr "�仆仂仗从舒 仂�仗�舒于从亳"
+
+#. *< name
+#. *< version
+#: ../pidgin/plugins/sendbutton.c:140
+msgid "Conversation Window Send Button."
+msgstr "�仆仂仗从舒 仂�仗�舒于从亳 仂从仆舒 弍亠�亠亟�."
+
+#. *< summary
+#: ../pidgin/plugins/sendbutton.c:141
+msgid ""
+"Adds a Send button to the entry area of the conversation window. Intended "
+"for when no physical keyboard is present."
+msgstr ""
+"�仂弍舒于仍�亠� 从仆仂仗从� 仂�仗�舒于从亳 从 仂弍仍舒��亳 于于仂亟舒 仂从仆舒 弍亠�亠亟�. ��亠亟仆舒亰仆舒�舒亠��� 亟仍� "
+"�仍��舒�, 从仂亞亟舒 �亳亰亳�亠�从舒� 从仍舒于亳舒���舒 仂������于�亠�."
+
 #: ../pidgin/plugins/spellchk.c:1970
 msgid "Duplicate Correction"
 msgstr "丕亟舒仍亠仆亳亠 仗仂于�仂�仂于"