Mercurial > pidgin.yaz

--- a/po/ChangeLog	Tue Mar 25 14:33:32 2008 +0000
+++ b/po/ChangeLog	Tue Mar 25 14:34:32 2008 +0000
@@ -1,6 +1,7 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul

 version 2.4.1
+	* Arabic translation updated (Khaled Hosny)
 	* Finnish translation updated (Timo Jyrinki)
 	* French translation updated (�ric Boumaour)
 	* German translation updated (Jochen Kemnade, Bj旦rn Voigt)
--- a/po/ar.po	Tue Mar 25 14:33:32 2008 +0000
+++ b/po/ar.po	Tue Mar 25 14:34:32 2008 +0000
@@ -1,17 +1,17 @@
-# translation of pidgin2.po to Arabic
 # translation of Pidgin to Arabic
 #
 # Mohamed Magdy <alnokta@yahoo.com>, 2006.
 # Youssef Chahibi <chahibi@gmail.com>, 2007.
 # Afief Halumi <Afief.h@gmail.com>, 2007.
 # AbdulAziz AlSharif <a.a-a.s@hotmail.com>, 2007.
-# Khaled Hosny <khaledhosny@eglug.org> & Ahmad Gharbeia 悖忰�惆 愃惘惡�悸 <gharbeia@gmail.com>, 2007, 2008.
-msgid ""
-msgstr ""
-"Project-Id-Version: pidgin2\n"
+# Khaled Hosny <khaledhosny@eglug.org>, 2007, 2008
+# Ahmad Gharbeia 悖忰�惆 愃惘惡�悸 <gharbeia@gmail.com>, 2008.
+msgid ""
+msgstr ""
+"Project-Id-Version: pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-12 03:21-0500\n"
-"PO-Revision-Date: 2008-01-13 12:08+0200\n"
+"POT-Creation-Date: 2008-03-22 03:22-0400\n"
+"PO-Revision-Date: 2008-03-24 17:08+0200\n"
 "Last-Translator: Khaled Hosny <khaledhosny@eglug.org>\n"
 "Language-Team: Arabic <doc@arabeyes.org>\n"
 "MIME-Version: 1.0\n"
@@ -55,7 +55,7 @@
 "  -n, --nologin       �悋 惠�悴 悛��悋\n"
 "  -v, --version       �惴�惘 悋�悒惶惆悋惘悸 悋�忰悋��悸 � �悽惠��\n"

-#: ../finch/finch.c:327 ../pidgin/gtkmain.c:741
+#: ../finch/finch.c:327 ../pidgin/gtkmain.c:737
 #, c-format
 msgid ""
 "%s encountered errors migrating your settings from %s to %s. Please "
@@ -65,18 +65,18 @@
 "�悋悴� %s 悖悽愀悋悄 悖惓�悋悄 ��� 悒惺惆悋惆悋惠� �� %s 悒�� %s. �� �惷�� 悋�忰惶 � 悋愕惠��� 悋���� "
 "�惆��悋. �悖惡�愃 惺� �悵悋 悋�悽愀悖 �� http://developer.pidgin.im"

-#: ../finch/gntaccount.c:124 ../finch/gntaccount.c:484 ../finch/gntblist.c:391
-#: ../finch/gntblist.c:524 ../finch/gntblist.c:537 ../finch/gntplugin.c:196
+#: ../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:2034
+#: ../libpurple/protocols/jabber/buddy.c:2079
 #: ../libpurple/protocols/jabber/chat.c:677
 #: ../libpurple/protocols/jabber/chat.c:688
-#: ../libpurple/protocols/jabber/jabber.c:1582
+#: ../libpurple/protocols/jabber/jabber.c:1594
 #: ../libpurple/protocols/qq/group_join.c:328
-#: ../libpurple/protocols/qq/im.c:576 ../libpurple/protocols/silc/ops.c:57
-#: ../libpurple/protocols/silc/ops.c:1460
+#: ../libpurple/protocols/qq/im.c:576 ../libpurple/protocols/silc/ops.c:76
+#: ../libpurple/protocols/silc/ops.c:1475
 #: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error"
 msgstr "惺�愀�"
@@ -105,8 +105,8 @@
 msgid "(You probably forgot to 'make install'.)"
 msgstr "(惘惡�悋 �愕�惠 悖� 惠��悵 'make install'.)"

-#: ../finch/gntaccount.c:496 ../finch/gntconn.c:137
-#: ../pidgin/gtkaccount.c:1447 ../pidgin/gtkblist.c:4531
+#: ../finch/gntaccount.c:496 ../finch/gntconn.c:138
+#: ../pidgin/gtkaccount.c:1447 ../pidgin/gtkblist.c:4588
 msgid "Modify Account"
 msgstr "惺惆�� 悋�忰愕悋惡"

@@ -119,7 +119,7 @@
 msgstr "悋�惡惘�惠����:"

 #: ../finch/gntaccount.c:529
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:290
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:294
 msgid "Screen name:"
 msgstr "悋愕� 悋�愆悋愆悸:"

@@ -133,37 +133,40 @@

 #. Cancel button
 #. Cancel
-#: ../finch/gntaccount.c:575 ../finch/gntaccount.c:638
-#: ../finch/gntaccount.c:889 ../finch/gntblist.c:435 ../finch/gntblist.c:512
-#: ../finch/gntblist.c:547 ../finch/gntblist.c:892 ../finch/gntblist.c:1094
-#: ../finch/gntblist.c:1190 ../finch/gntblist.c:2355 ../finch/gntblist.c:2418
-#: ../finch/gntcertmgr.c:91 ../finch/gntplugin.c:532 ../finch/gntpounce.c:472
-#: ../finch/gntpounce.c:680 ../finch/gntprefs.c:265 ../finch/gntsound.c:1058
-#: ../finch/gntstatus.c:145 ../finch/gntstatus.c:485 ../finch/gntstatus.c:610
-#: ../finch/plugins/gnthistory.c:181 ../libpurple/account.c:1116
-#: ../libpurple/account.c:1419 ../libpurple/account.c:1454
-#: ../libpurple/conversation.c:1219 ../libpurple/plugins/buddynote.c:51
-#: ../libpurple/protocols/gg/gg.c:508 ../libpurple/protocols/gg/gg.c:667
-#: ../libpurple/protocols/gg/gg.c:804 ../libpurple/protocols/gg/gg.c:886
-#: ../libpurple/protocols/jabber/buddy.c:728
-#: ../libpurple/protocols/jabber/buddy.c:2428
-#: ../libpurple/protocols/jabber/buddy.c:2464
+#: ../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
-#: ../libpurple/protocols/jabber/jabber.c:1051
-#: ../libpurple/protocols/jabber/jabber.c:1060
-#: ../libpurple/protocols/jabber/jabber.c:1775
+#: ../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/usernick.c:78
-#: ../libpurple/protocols/jabber/xdata.c:400
-#: ../libpurple/protocols/msn/msn.c:291 ../libpurple/protocols/msn/msn.c:308
-#: ../libpurple/protocols/msn/msn.c:325 ../libpurple/protocols/msn/msn.c:342
-#: ../libpurple/protocols/msn/msn.c:363 ../libpurple/protocols/msnp9/msn.c:287
-#: ../libpurple/protocols/msnp9/msn.c:304
-#: ../libpurple/protocols/msnp9/msn.c:321
-#: ../libpurple/protocols/msnp9/msn.c:338
-#: ../libpurple/protocols/msnp9/msn.c:359
-#: ../libpurple/protocols/oscar/oscar.c:6135
+#: ../libpurple/protocols/jabber/xdata.c:403
+#: ../libpurple/protocols/msn/msn.c:301 ../libpurple/protocols/msn/msn.c:318
+#: ../libpurple/protocols/msn/msn.c:335 ../libpurple/protocols/msn/msn.c:352
+#: ../libpurple/protocols/msn/msn.c:373 ../libpurple/protocols/msnp9/msn.c:284
+#: ../libpurple/protocols/msnp9/msn.c:301
+#: ../libpurple/protocols/msnp9/msn.c:318
+#: ../libpurple/protocols/msnp9/msn.c:335
+#: ../libpurple/protocols/msnp9/msn.c:356
+#: ../libpurple/protocols/myspace/user.c:582
+#: ../libpurple/protocols/myspace/user.c:676
+#: ../libpurple/protocols/oscar/oscar.c:6223
 #: ../libpurple/protocols/oscar/peer.c:1048
 #: ../libpurple/protocols/qq/buddy_info.c:525
 #: ../libpurple/protocols/qq/buddy_opt.c:214
@@ -171,23 +174,23 @@
 #: ../libpurple/protocols/qq/group.c:124
 #: ../libpurple/protocols/qq/group_join.c:140
 #: ../libpurple/protocols/qq/group_join.c:365
-#: ../libpurple/protocols/qq/group_opt.c:119
-#: ../libpurple/protocols/qq/group_opt.c:374
-#: ../libpurple/protocols/qq/sys_msg.c:113
-#: ../libpurple/protocols/qq/sys_msg.c:172
-#: ../libpurple/protocols/qq/sys_msg.c:266
-#: ../libpurple/protocols/sametime/sametime.c:3430
-#: ../libpurple/protocols/sametime/sametime.c:3516
-#: ../libpurple/protocols/sametime/sametime.c:3690
-#: ../libpurple/protocols/sametime/sametime.c:5443
-#: ../libpurple/protocols/sametime/sametime.c:5533
-#: ../libpurple/protocols/sametime/sametime.c:5658
+#: ../libpurple/protocols/qq/group_opt.c:120
+#: ../libpurple/protocols/qq/group_opt.c:375
+#: ../libpurple/protocols/qq/sys_msg.c:115
+#: ../libpurple/protocols/qq/sys_msg.c:175
+#: ../libpurple/protocols/qq/sys_msg.c:269
+#: ../libpurple/protocols/sametime/sametime.c: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/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:1820
+#: ../libpurple/protocols/silc/ops.c:1835
 #: ../libpurple/protocols/silc/silc.c:966
 #: ../libpurple/protocols/silc/silc.c:1174
 #: ../libpurple/protocols/silc10/buddy.c:468
@@ -195,41 +198,41 @@
 #: ../libpurple/protocols/silc10/buddy.c:1192
 #: ../libpurple/protocols/silc10/chat.c:600
 #: ../libpurple/protocols/silc10/chat.c:730
-#: ../libpurple/protocols/silc10/ops.c:1904
-#: ../libpurple/protocols/silc10/silc.c:736
-#: ../libpurple/protocols/silc10/silc.c:942
-#: ../libpurple/protocols/yahoo/yahoo.c:1045
-#: ../libpurple/protocols/yahoo/yahoo.c:3554
-#: ../libpurple/protocols/yahoo/yahoo.c:3565 ../pidgin/gtkaccount.c:1840
-#: ../pidgin/gtkaccount.c:2398 ../pidgin/gtkblist.c:6705
-#: ../pidgin/gtkcertmgr.c:197 ../pidgin/gtkdialogs.c:765
-#: ../pidgin/gtkdialogs.c:904 ../pidgin/gtkdialogs.c:996
-#: ../pidgin/gtkdialogs.c:1016 ../pidgin/gtkdialogs.c:1040
-#: ../pidgin/gtkdialogs.c:1062 ../pidgin/gtkdialogs.c:1110
-#: ../pidgin/gtkdialogs.c:1151 ../pidgin/gtkdialogs.c:1207
-#: ../pidgin/gtkdialogs.c:1246 ../pidgin/gtkdialogs.c:1273
-#: ../pidgin/gtkimhtmltoolbar.c:438 ../pidgin/gtklog.c:328
-#: ../pidgin/gtkplugin.c:290 ../pidgin/gtkpounce.c:1113
-#: ../pidgin/gtkprivacy.c:526 ../pidgin/gtkprivacy.c:542
-#: ../pidgin/gtkprivacy.c:567 ../pidgin/gtkprivacy.c:581
+#: ../libpurple/protocols/silc10/ops.c:1910
+#: ../libpurple/protocols/silc10/silc.c:742
+#: ../libpurple/protocols/silc10/silc.c:948
+#: ../libpurple/protocols/yahoo/yahoo.c:993
+#: ../libpurple/protocols/yahoo/yahoo.c:3560
+#: ../libpurple/protocols/yahoo/yahoo.c:3571 ../pidgin/gtkaccount.c:1841
+#: ../pidgin/gtkaccount.c:2402 ../pidgin/gtkblist.c: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
+#: ../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:1601
+#: ../pidgin/gtkstatusbox.c:1610
 msgid "Cancel"
-msgstr "悋�愃�"
+msgstr "悖�愃�"

 #. Save button
 #. Save
-#: ../finch/gntaccount.c:579 ../finch/gntcertmgr.c:311 ../finch/gntdebug.c:297
-#: ../finch/gntplugin.c:532 ../finch/gntpounce.c:478 ../finch/gntprefs.c:265
-#: ../finch/gntsound.c:1055 ../finch/gntstatus.c:488 ../finch/gntstatus.c:598
-#: ../libpurple/account.c:1453 ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:727 ../pidgin/gtkdebug.c:746
+#: ../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
 msgid "Save"
 msgstr "悋忰�惴"

 #: ../finch/gntaccount.c:632 ../pidgin/gtkaccount.c:1832
-#: ../pidgin/gtksavedstatuses.c:333 ../pidgin/gtkstatusbox.c:1595
+#: ../pidgin/gtksavedstatuses.c:333 ../pidgin/gtkstatusbox.c:1604
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "悖�惠悖�惆 悖�� 惠惘�惆 忰悵� %s�"
@@ -239,127 +242,146 @@
 msgstr "悋忰悵� 悋�忰愕悋惡"

 #. Delete button
-#: ../finch/gntaccount.c:637 ../finch/gntaccount.c:707
-#: ../finch/gntcertmgr.c:319 ../finch/gntpounce.c:679 ../finch/gntpounce.c:742
+#: ../finch/gntaccount.c:638 ../finch/gntaccount.c:708
+#: ../finch/gntcertmgr.c:318 ../finch/gntpounce.c:678 ../finch/gntpounce.c:741
 #: ../finch/gntstatus.c:144 ../finch/gntstatus.c:210
-#: ../pidgin/gtkaccount.c:1839 ../pidgin/gtklog.c:327
+#: ../pidgin/gtkaccount.c:1840 ../pidgin/gtklog.c:326
 #: ../pidgin/gtkpounce.c:1112 ../pidgin/gtkrequest.c:276
-#: ../pidgin/gtksavedstatuses.c:344 ../pidgin/gtkstatusbox.c:1600
+#: ../pidgin/gtksavedstatuses.c:344 ../pidgin/gtkstatusbox.c:1609
 msgid "Delete"
 msgstr "悋忰悵�"

-#: ../finch/gntaccount.c:669 ../finch/gntblist.c:2252 ../finch/gntui.c:90
-#: ../pidgin/gtkaccount.c:2257 ../pidgin/gtkdocklet.c:716
+#: ../finch/gntaccount.c:670 ../finch/gntblist.c:2471 ../finch/gntui.c:94
+#: ../pidgin/gtkaccount.c:2261 ../pidgin/gtkdocklet.c:716
 msgid "Accounts"
 msgstr "悋�忰愕悋惡悋惠"

-#: ../finch/gntaccount.c:675
+#: ../finch/gntaccount.c:676
 msgid "You can enable/disable accounts from the following list."
 msgstr "����� 惠�惺�� 悖� 惠惺愀�� 悋�忰愕悋惡悋惠 �� 悋��悋悧�悸 悋�惠悋��悸."

 #. Add button
-#: ../finch/gntaccount.c:698 ../finch/gntaccount.c:888 ../finch/gntblist.c:434
-#: ../finch/gntblist.c:512 ../finch/gntblist.c:547 ../finch/gntblist.c:2510
-#: ../finch/gntcertmgr.c:306 ../finch/gntnotify.c:385 ../finch/gntpounce.c:726
+#: ../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/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:114
-#: ../libpurple/protocols/qq/sys_msg.c:173
-#: ../libpurple/protocols/qq/sys_msg.c:267
-#: ../libpurple/protocols/sametime/sametime.c:5532
+#: ../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:2397
-#: ../pidgin/gtkblist.c:6704 ../pidgin/gtkconv.c:1691
+#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2401
+#: ../pidgin/gtkblist.c:6795 ../pidgin/gtkconv.c:1696
 #: ../pidgin/gtkrequest.c:277
 msgid "Add"
 msgstr "悖惷�"

 #. Modify button
-#: ../finch/gntaccount.c:703 ../finch/gntpounce.c:734
+#: ../finch/gntaccount.c:704 ../finch/gntpounce.c:733
 msgid "Modify"
 msgstr "惺惆��"

-#: ../finch/gntaccount.c:811 ../pidgin/gtkaccount.c:2344
+#: ../finch/gntaccount.c:812 ../pidgin/gtkaccount.c:2348
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s 悴惺� %s %s%s惶惆���"

-#: ../finch/gntaccount.c:884 ../pidgin/gtkaccount.c:2396
+#: ../finch/gntaccount.c:885 ../pidgin/gtkaccount.c:2400
 msgid "Add buddy to your list?"
 msgstr "悖惠惘�惆 悒惷悋�悸 悋�惶惆�� 悒�� �悋悧�惠��"

-#: ../finch/gntaccount.c:944 ../pidgin/gtkaccount.c:2454
+#: ../finch/gntaccount.c:945 ../pidgin/gtkaccount.c:2458
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 msgstr "%s%s%s%s ��惆 悒惷悋�悸 %s 悒�� �悋悧�悸 悖惶惆�悋悄�%s%s"

-#: ../finch/gntaccount.c:969 ../finch/gntaccount.c:972
-#: ../finch/gntaccount.c:999 ../pidgin/gtkaccount.c:2477
-#: ../pidgin/gtkaccount.c:2484
+#: ../finch/gntaccount.c:970 ../finch/gntaccount.c:973
+#: ../finch/gntaccount.c:1000 ../pidgin/gtkaccount.c:2481
+#: ../pidgin/gtkaccount.c:2488
 msgid "Authorize buddy?"
 msgstr "悖悖�惡� 悋�惶惆���"

-#: ../finch/gntaccount.c:976 ../finch/gntaccount.c:1003
-#: ../pidgin/gtkaccount.c:2478 ../pidgin/gtkaccount.c:2485
+#: ../finch/gntaccount.c:977 ../finch/gntaccount.c:1004
+#: ../pidgin/gtkaccount.c:2482 ../pidgin/gtkaccount.c:2489
 msgid "Authorize"
 msgstr "悋�惡�"

-#: ../finch/gntaccount.c:977 ../finch/gntaccount.c:1004
-#: ../pidgin/gtkaccount.c:2479 ../pidgin/gtkaccount.c:2486
+#: ../finch/gntaccount.c:978 ../finch/gntaccount.c:1005
+#: ../pidgin/gtkaccount.c:2483 ../pidgin/gtkaccount.c:2490
 msgid "Deny"
 msgstr "悋惘�惷"

-#: ../finch/gntblist.c:380
+#: ../finch/gntblist.c:265
+#, c-format
+msgid ""
+"Online: %d\n"
+"Total: %d"
+msgstr ""
+"�惠惶�: %Id\n"
+"悋��悴��惺: %Id"
+
+#: ../finch/gntblist.c:274
+#, c-format
+msgid "Account: %s (%s)"
+msgstr "忰愕悋惡: %s (%s)"
+
+#: ../finch/gntblist.c:286
+#, c-format
+msgid ""
+"\n"
+"Last Seen: %s ago"
+msgstr ""
+"\n"
+"愆��惆 �惡� %s"
+
+#: ../finch/gntblist.c:306 ../pidgin/gtkprefs.c:327
+#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:1
+msgid "Default"
+msgstr "悋��惡惆悧�"
+
+#: ../finch/gntblist.c:563
 msgid "You must provide a screename for the buddy."
 msgstr "�悴惡 悖� 惠�忰惆惆 悋愕� 愆悋愆悸 ��悵悋 悋�惶惆��."

-#: ../finch/gntblist.c:382
+#: ../finch/gntblist.c:565
 msgid "You must provide a group."
 msgstr "�悴惡 悖� 惠�忰惆惆 �悴��惺悸."

-#: ../finch/gntblist.c:384
+#: ../finch/gntblist.c:567
 msgid "You must select an account."
 msgstr "�悴惡 悖� 惠悽惠悋惘 忰愕悋惡�悋."

-#: ../finch/gntblist.c:386
+#: ../finch/gntblist.c:569
 msgid "The selected account is not online."
 msgstr "悋�忰愕悋惡 悋��悽惠悋惘 ��愕 �惠惶�悋 悋�悛�."

-#: ../finch/gntblist.c:391
+#: ../finch/gntblist.c:574
 msgid "Error adding buddy"
 msgstr "惺愀� 悖惓�悋悄 悒惷悋�悸 悋�惶惆��"

-#: ../finch/gntblist.c:416 ../libpurple/protocols/oscar/oscar.c:2897
-#: ../pidgin/gtkaccount.c:1913 ../pidgin/gtksavedstatuses.c:969
+#: ../finch/gntblist.c:601 ../pidgin/gtkaccount.c:1914
+#: ../pidgin/gtksavedstatuses.c:971
 msgid "Screen Name"
 msgstr "悋愕� 悋�愆悋愆悸"

-#: ../finch/gntblist.c:419 ../finch/gntblist.c:501 ../finch/gntblist.c:1339
-#: ../libpurple/protocols/msn/msn.c:1549
-#: ../libpurple/protocols/msnp9/msn.c:1402
-#: ../libpurple/protocols/silc/chat.c:610
-#: ../libpurple/protocols/silc10/chat.c:590
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:704
-#: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:1015
-#: ../pidgin/gtkdialogs.c:1039 ../pidgin/gtkdialogs.c:1061
-#: ../pidgin/gtkrequest.c:280
-msgid "Alias"
-msgstr "悋����悸"
-
-#: ../finch/gntblist.c:422 ../finch/gntblist.c:504
-msgid "Group"
-msgstr "悋��悴��惺悸"
-
-#: ../finch/gntblist.c:426 ../finch/gntblist.c:492 ../finch/gntblist.c:1394
-#: ../finch/gntblist.c:2341 ../finch/gntblist.c:2405 ../finch/gntnotify.c:174
-#: ../finch/gntstatus.c:576 ../libpurple/plugins/idle.c:153
-#: ../libpurple/plugins/idle.c:190 ../pidgin/gtkblist.c:3199
-#: ../pidgin/gtknotify.c:516 ../pidgin/gtkpounce.c:1280
-#: ../pidgin/plugins/gevolution/gevolution.c:445
+#: ../finch/gntblist.c:604
+msgid "Alias (optional)"
+msgstr "悋�����悸 (悋悽惠�悋惘�)"
+
+#: ../finch/gntblist.c:607
+msgid "Add in group"
+msgstr "悖惷� ���悴��惺悸"
+
+#: ../finch/gntblist.c:611 ../finch/gntblist.c:678 ../finch/gntblist.c:1648
+#: ../finch/gntblist.c:2585 ../finch/gntblist.c:2641 ../finch/gntblist.c:2706
+#: ../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/gtkpounce.c:1281 ../pidgin/plugins/gevolution/gevolution.c:447
 msgid "Account"
 msgstr "悋�忰愕悋惡"

-#: ../finch/gntblist.c:432 ../finch/gntblist.c:941
+#: ../finch/gntblist.c:617 ../finch/gntblist.c:1126
 #: ../libpurple/protocols/silc/buddy.c:725
 #: ../libpurple/protocols/silc/buddy.c:1030
 #: ../libpurple/protocols/silc/buddy.c:1075
@@ -368,290 +390,301 @@
 #: ../libpurple/protocols/silc10/buddy.c:1036
 #: ../libpurple/protocols/silc10/buddy.c:1083
 #: ../libpurple/protocols/silc10/buddy.c:1183
-#: ../libpurple/protocols/yahoo/yahoo.c:3399 ../pidgin/gtkblist.c:6235
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
+#: ../libpurple/protocols/yahoo/yahoo.c:3400 ../pidgin/gtkblist.c:6344
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:449
 msgid "Add Buddy"
 msgstr "悖惷� 惶惆��悋"

-#: ../finch/gntblist.c:432
+#: ../finch/gntblist.c:617
 msgid "Please enter buddy information."
 msgstr "�� �惷�� 悖惆悽� �惺���悋惠 悋�惶惆��."

-#: ../finch/gntblist.c:461 ../libpurple/blist.c:1210
+#: ../finch/gntblist.c:647 ../libpurple/blist.c:1237
 msgid "Chats"
 msgstr "惆惘惆愆悋惠"

 #. Extract their Name and put it in
-#: ../finch/gntblist.c:498 ../finch/gntblist.c:2336 ../finch/gntroomlist.c:298
-#: ../libpurple/protocols/jabber/jabber.c:979
-#: ../libpurple/protocols/jabber/jabber.c:982
-#: ../libpurple/protocols/msn/msn.c:1730 ../libpurple/protocols/msn/msn.c:1795
-#: ../libpurple/protocols/msn/msn.c:1822
-#: ../libpurple/protocols/msnp9/msn.c:1585
-#: ../libpurple/protocols/msnp9/msn.c:1650
-#: ../libpurple/protocols/msnp9/msn.c:1677
-#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:652
+#: ../finch/gntblist.c:684 ../finch/gntblist.c:2580 ../finch/gntblist.c:2636
+#: ../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
 #: ../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:507 ../finch/gntblist.c:908
+#: ../finch/gntblist.c:687 ../finch/gntblist.c:1589
+#: ../libpurple/protocols/msn/msn.c:1573
+#: ../libpurple/protocols/msnp9/msn.c:1413
+#: ../libpurple/protocols/silc/chat.c:610
+#: ../libpurple/protocols/silc10/chat.c:590
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:704
+#: ../libpurple/protocols/zephyr/zephyr.c:792
+#: ../libpurple/protocols/zephyr/zephyr.c:1167 ../pidgin/gtkdialogs.c:1016
+#: ../pidgin/gtkdialogs.c:1040 ../pidgin/gtkdialogs.c:1062
+#: ../pidgin/gtkrequest.c:280
+msgid "Alias"
+msgstr "悋����悸"
+
+#: ../finch/gntblist.c:690 ../finch/gntblist.c:2839
+msgid "Group"
+msgstr "悋��悴��惺悸"
+
+#: ../finch/gntblist.c:693 ../finch/gntblist.c:1093
 msgid "Auto-join"
 msgstr "悋�惷�悋� 惠��悋悧�"

-#: ../finch/gntblist.c:510 ../finch/gntblist.c:943 ../pidgin/gtkblist.c:6618
+#: ../finch/gntblist.c:696 ../finch/gntblist.c:1128 ../pidgin/gtkblist.c:6709
 msgid "Add Chat"
 msgstr "悖惷� 惆惘惆愆悸"

-#: ../finch/gntblist.c:511
+#: ../finch/gntblist.c:697
 msgid "You can edit more information from the context menu later."
 msgstr "����� ���悋 惡惺惆 惠忰惘�惘 悋��慍�惆 �� 悋��惺���悋惠 �� �悋悧�悸 悋�愕�悋�."

-#: ../finch/gntblist.c:524 ../finch/gntblist.c:537
+#: ../finch/gntblist.c:710 ../finch/gntblist.c:723
 msgid "Error adding group"
 msgstr "愃愀� 悖惓�悋悄 悒惷悋�悸 悋��悴��惺悸"

-#: ../finch/gntblist.c:525
+#: ../finch/gntblist.c:711
 msgid "You must give a name for the group to add."
 msgstr "�悴惡 悖� 惠惺愀� 悋愕��悋 ���悴��惺悸 悋�惠� 惠惘�惆 悒惷悋�惠�悋."

-#: ../finch/gntblist.c:538
+#: ../finch/gntblist.c:724
 msgid "A group with the name already exists."
 msgstr "惠�悴惆 �悴��惺悸 惡悵悋惠 悋�悋愕�."

-#: ../finch/gntblist.c:545 ../finch/gntblist.c:945
-#: ../libpurple/protocols/sametime/sametime.c:5442
-#: ../libpurple/protocols/sametime/sametime.c:5530 ../pidgin/gtkblist.c:6701
+#: ../finch/gntblist.c:731 ../finch/gntblist.c:1130
+#: ../libpurple/protocols/sametime/sametime.c:5451
+#: ../libpurple/protocols/sametime/sametime.c:5539 ../pidgin/gtkblist.c:6792
 msgid "Add Group"
 msgstr "悖惷� �悴��惺悸"

-#: ../finch/gntblist.c:545
+#: ../finch/gntblist.c:731
 msgid "Enter the name of the group"
 msgstr "悖惆悽� 悋愕� 悋��悴��惺悸"

-#: ../finch/gntblist.c:891
+#: ../finch/gntblist.c:1076
 msgid "Edit Chat"
 msgstr "忰惘�惘 悋�惆惘惆愆悸"

-#: ../finch/gntblist.c:891
+#: ../finch/gntblist.c:1076
 msgid "Please Update the necessary fields."
 msgstr "�� �惷�� 忰惆��惓 悋�忰��� 悋�惷惘�惘��悸 ."

-#: ../finch/gntblist.c:892 ../finch/gntstatus.c:205
+#: ../finch/gntblist.c:1077 ../finch/gntstatus.c:205
 msgid "Edit"
 msgstr "忰惘�惘"

-#: ../finch/gntblist.c:917
+#: ../finch/gntblist.c:1102
 msgid "Edit Settings"
 msgstr "忰惘�惘 悋�悽惶悋悧惶"

-#: ../finch/gntblist.c:953 ../pidgin/gtkutils.c:980
+#: ../finch/gntblist.c:1138 ../pidgin/gtkutils.c:980
 msgid "Information"
 msgstr "�惺���悋惠"

-#: ../finch/gntblist.c:953 ../pidgin/gtkutils.c:980
+#: ../finch/gntblist.c:1138 ../pidgin/gtkutils.c:980
 msgid "Retrieving..."
 msgstr "�悴惘� 悋�悴�惡..."

-#: ../finch/gntblist.c:993 ../finch/gntconv.c:535
+#: ../finch/gntblist.c:1192 ../finch/gntconv.c:591
 #: ../libpurple/protocols/silc/chat.c:903
 #: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
 msgstr "悋悴�惡 �惺���悋惠"

-#: ../finch/gntblist.c:997
+#: ../finch/gntblist.c:1196
 msgid "Add Buddy Pounce"
 msgstr "悖惷� 悒愆惺悋惘 惶惆��"

 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:1004 ../finch/gntconv.c:547
+#: ../finch/gntblist.c:1203 ../finch/gntconv.c:603
 #: ../libpurple/protocols/jabber/si.c:1109
-#: ../libpurple/protocols/oscar/oscar.c:654 ../libpurple/protocols/qq/qq.c:588
-#: ../pidgin/gtkconv.c:1639
+#: ../libpurple/protocols/oscar/oscar.c:655 ../libpurple/protocols/qq/qq.c:588
+#: ../pidgin/gtkconv.c:1644
 msgid "Send File"
 msgstr "悖惘愕� ���悋"

-#: ../finch/gntblist.c:1008
+#: ../finch/gntblist.c:1210 ../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
 msgid "View Log"
 msgstr "悋惺惘惷 悋�愕悴��"

-#: ../finch/gntblist.c:1089
+#: ../finch/gntblist.c:1298
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr "�� �惷�� 悖惆悽� 悋愕� %s 悋�悴惆�惆"

-#: ../finch/gntblist.c:1091 ../finch/gntblist.c:1339
+#: ../finch/gntblist.c:1300 ../finch/gntblist.c:1589
 msgid "Rename"
 msgstr "愃��惘 悋�悋愕�"

-#: ../finch/gntblist.c:1091
+#: ../finch/gntblist.c:1300
 msgid "Set Alias"
 msgstr "悖惆悽� 悋����悸"

-#: ../finch/gntblist.c:1092
+#: ../finch/gntblist.c:1301
 msgid "Enter empty string to reset the name."
 msgstr "悖惡�� �悋惘愃悋 �惠惶��惘 悋�悋愕�."

-#: ../finch/gntblist.c:1168
+#: ../finch/gntblist.c:1415
 msgid "Removing this contact will also remove all the buddies in the contact"
 msgstr "悒悵悋 悖慍�惠 �悵悋 悋��惘悋愕� 愕�慍悋� �悵�� 悴��惺 悋�悖惶惆�悋悄 ���"

-#: ../finch/gntblist.c:1176
+#: ../finch/gntblist.c:1423
 msgid "Removing this group will also remove all the buddies in the group"
 msgstr "悒悵悋 悖慍�惠 �悵� 悋��悴��惺悸 愕�慍悋� �悵�� 悴��惺 悋�悖惶惆�悋悄 ���悋"

-#: ../finch/gntblist.c:1181
+#: ../finch/gntblist.c:1428
 #, c-format
 msgid "Are you sure you want to remove %s?"
 msgstr "悖�惠悖�惆 �� 惘愃惡惠� �� 悒慍悋�悸 %s�"

 #. XXX: anything to do with the returned ui-handle?
-#: ../finch/gntblist.c:1184
+#: ../finch/gntblist.c:1431
 msgid "Confirm Remove"
 msgstr "悖���惆 悋�悒慍悋�悸"

-#: ../finch/gntblist.c:1189 ../finch/gntblist.c:1341 ../finch/gntft.c:236
-#: ../pidgin/gtkconv.c:1688 ../pidgin/gtkrequest.c:278
+#: ../finch/gntblist.c:1436 ../finch/gntblist.c:1591 ../finch/gntft.c:243
+#: ../pidgin/gtkconv.c:1693 ../pidgin/gtkrequest.c:278
 #: ../pidgin/gtkstatusbox.c:267
 msgid "Remove"
 msgstr "悖慍��"

 #. Buddy List
-#: ../finch/gntblist.c:1315 ../finch/gntblist.c:2563 ../finch/gntprefs.c:258
-#: ../finch/gntui.c:91 ../pidgin/gtkblist.c:4975
+#: ../finch/gntblist.c:1565 ../finch/gntblist.c:2880 ../finch/gntprefs.c:258
+#: ../finch/gntui.c:95 ../pidgin/gtkblist.c:5083
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:326
 msgid "Buddy List"
 msgstr "�悋悧�悸 悋�悖惶惆�悋悄"

-#: ../finch/gntblist.c:1346
+#: ../finch/gntblist.c:1596
 msgid "Place tagged"
 msgstr "��愕��� 悋���悋�"

-#: ../finch/gntblist.c:1351
+#: ../finch/gntblist.c:1601
 msgid "Toggle Tag"
 msgstr "惡惆�� 悋��愕�"

 #. General
-#: ../finch/gntblist.c:1387 ../libpurple/protocols/gg/gg.c:638
+#: ../finch/gntblist.c:1641 ../libpurple/protocols/gg/gg.c:638
 #: ../libpurple/protocols/gg/gg.c:1052 ../libpurple/protocols/gg/gg.c:1125
 #: ../libpurple/protocols/gg/gg.c:2228
-#: ../libpurple/protocols/jabber/buddy.c:286
-#: ../libpurple/protocols/jabber/buddy.c:1249
-#: ../libpurple/protocols/jabber/buddy.c:2219
-#: ../libpurple/protocols/jabber/buddy.c:2411
-#: ../libpurple/protocols/jabber/jabber.c:990
-#: ../libpurple/protocols/jabber/jabber.c:1602
-#: ../libpurple/protocols/jabber/jabber.c:1616
-#: ../libpurple/protocols/jabber/jabber.c:1630
-#: ../libpurple/protocols/jabber/jabber.c:1644
-#: ../libpurple/protocols/jabber/jabber.c:1658
-#: ../libpurple/protocols/msn/msn.c:1557 ../libpurple/protocols/msn/msn.c:1733
-#: ../libpurple/protocols/msnp9/msn.c:1410
-#: ../libpurple/protocols/msnp9/msn.c:1588
+#: ../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/jabber.c:1002
+#: ../libpurple/protocols/jabber/jabber.c:1614
+#: ../libpurple/protocols/jabber/jabber.c:1628
+#: ../libpurple/protocols/jabber/jabber.c:1642
+#: ../libpurple/protocols/jabber/jabber.c:1656
+#: ../libpurple/protocols/jabber/jabber.c:1670
+#: ../libpurple/protocols/msn/msn.c:1581 ../libpurple/protocols/msn/msn.c:1757
+#: ../libpurple/protocols/msnp9/msn.c:1421
+#: ../libpurple/protocols/msnp9/msn.c:1598
 #: ../libpurple/protocols/qq/buddy_info.c:43
 #: ../libpurple/protocols/silc/buddy.c:1538
-#: ../libpurple/protocols/silc/ops.c:1002
-#: ../libpurple/protocols/silc/ops.c:1186
-#: ../libpurple/protocols/silc/ops.c:1324
+#: ../libpurple/protocols/silc/ops.c:1017
+#: ../libpurple/protocols/silc/ops.c:1201
+#: ../libpurple/protocols/silc/ops.c:1339
 #: ../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:1066 ../pidgin/gtkblist.c:3223
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1073 ../pidgin/gtkblist.c:3261
 msgid "Nickname"
 msgstr "悋�悋愕� 悋��愕惠惺悋惘"

 #. Idle stuff
-#: ../finch/gntblist.c:1409 ../finch/gntprefs.c:261
+#: ../finch/gntblist.c:1663 ../finch/gntprefs.c:261
 #: ../libpurple/protocols/bonjour/bonjour.c:376
-#: ../libpurple/protocols/jabber/buddy.c:787
-#: ../libpurple/protocols/jabber/buddy.c:951
-#: ../libpurple/protocols/msn/msn.c:611 ../libpurple/protocols/msn/msn.c:629
-#: ../libpurple/protocols/msn/msn.c:637 ../libpurple/protocols/msn/state.c:32
-#: ../libpurple/protocols/msnp9/msn.c:544
+#: ../libpurple/protocols/jabber/buddy.c:817
+#: ../libpurple/protocols/jabber/buddy.c:981
+#: ../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:2842
-#: ../libpurple/protocols/oscar/oscar.c:2921
-#: ../libpurple/protocols/yahoo/yahoo.c:3153
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3251
-#: ../pidgin/gtkblist.c:3701 ../pidgin/gtkprefs.c:1929
+#: ../libpurple/protocols/novell/novell.c:2843
+#: ../libpurple/protocols/oscar/oscar.c:2980
+#: ../libpurple/protocols/yahoo/yahoo.c:3154
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3289
+#: ../pidgin/gtkblist.c:3749 ../pidgin/gtkprefs.c:1946
 msgid "Idle"
 msgstr "愕悋��"

-#: ../finch/gntblist.c:1423
+#: ../finch/gntblist.c:1677
 msgid "On Mobile"
 msgstr "�惠忰惆惓 �� 悋��悋惠�"

-#: ../finch/gntblist.c:1504
-#, c-format
-msgid ""
-"Online: %d\n"
-"Total: %d"
-msgstr ""
-"�惠惶�: %Id\n"
-"悋��悴��惺: %Id"
-
-#: ../finch/gntblist.c:1513
-#, c-format
-msgid "Account: %s (%s)"
-msgstr "忰愕悋惡: %s (%s)"
-
-#: ../finch/gntblist.c:1525
-#, c-format
-msgid ""
-"\n"
-"Last Seen: %s ago"
-msgstr ""
-"\n"
-"愆��惆 �惡� %s"
-
-#: ../finch/gntblist.c:1777 ../pidgin/gtkdocklet.c:582
+#: ../finch/gntblist.c:1978 ../pidgin/gtkdocklet.c:582
 msgid "New..."
 msgstr "悴惆�惆..."

-#: ../finch/gntblist.c:1784 ../pidgin/gtkdocklet.c:583
+#: ../finch/gntblist.c:1985 ../pidgin/gtkdocklet.c:583
 msgid "Saved..."
 msgstr "忰���惴..."

-#: ../finch/gntblist.c:2220 ../finch/gntplugin.c:352 ../finch/gntui.c:96
-#: ../pidgin/gtkdocklet.c:717 ../pidgin/gtkplugin.c:601
+#: ../finch/gntblist.c:2439 ../finch/gntplugin.c:352 ../finch/gntui.c:100
+#: ../pidgin/gtkdocklet.c:717 ../pidgin/gtkplugin.c:605
 msgid "Plugins"
 msgstr "��忰�悋惠"

-#: ../finch/gntblist.c:2349 ../pidgin/gtkdialogs.c:759
-msgid "New Instant Message"
-msgstr "惘愕悋�悸 ��惘�悸 悴惆�惆悸"
-
-#: ../finch/gntblist.c:2351 ../pidgin/gtkdialogs.c:761
-msgid "Please enter the screen name or alias of the person you would like to IM."
-msgstr "�� �惷�� 悖惆悽� 悋愕� 悋�愆悋愆悸 悖� ���悸 悋�愆悽惶 悋�悵� 惠�惆 �忰悋惆惓惠�."
+#: ../finch/gntblist.c:2593 ../finch/gntblist.c:2598
+msgid "Block/Unblock"
+msgstr "悋忰惴惘/悖�愃� 悋�忰惴惘"
+
+#: ../finch/gntblist.c:2594 ../libpurple/protocols/gg/gg.c:1665
+msgid "Block"
+msgstr "悋忰惴惘"
+
+#: ../finch/gntblist.c:2595 ../libpurple/protocols/gg/gg.c:1661
+msgid "Unblock"
+msgstr "悖�愃� 悋�忰惴惘"
+
+#: ../finch/gntblist.c:2600
+msgid ""
+"Please enter the screen name or alias of the person you would like to Block/"
+"Unblock."
+msgstr "�� �惷�� 悖惆悽� 悋愕� 悋�愆悋愆悸 悖� ���悸 悋�愆悽惶 悋�悵� 惠�惆 忰惴惘�/惘�惺 悋�忰惴惘 惺��."

 #. Not multiline
 #. Not masked?
 #. No hints?
-#: ../finch/gntblist.c:2354 ../finch/gntcertmgr.c:90 ../finch/gntconn.c:136
-#: ../finch/gntnotify.c:80 ../finch/plugins/gnthistory.c:180
-#: ../libpurple/account.c:1115 ../libpurple/account.c:1418
-#: ../libpurple/protocols/gg/gg.c:507 ../libpurple/protocols/gg/gg.c:666
-#: ../libpurple/protocols/gg/gg.c:803
-#: ../libpurple/protocols/jabber/jabber.c:1774
-#: ../libpurple/protocols/jabber/xdata.c:399
-#: ../libpurple/protocols/msn/msn.c:290 ../libpurple/protocols/msn/msn.c:307
-#: ../libpurple/protocols/msn/msn.c:324 ../libpurple/protocols/msn/msn.c:341
-#: ../libpurple/protocols/msnp9/msn.c:286
-#: ../libpurple/protocols/msnp9/msn.c:303
-#: ../libpurple/protocols/msnp9/msn.c:320
-#: ../libpurple/protocols/msnp9/msn.c:337
-#: ../libpurple/protocols/oscar/oscar.c:6134
+#: ../finch/gntblist.c:2603 ../finch/gntblist.c:2654 ../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/protocols/gg/gg.c:666 ../libpurple/protocols/gg/gg.c:803
+#: ../libpurple/protocols/jabber/jabber.c:1786
+#: ../libpurple/protocols/jabber/xdata.c:402
+#: ../libpurple/protocols/msn/msn.c:300 ../libpurple/protocols/msn/msn.c:317
+#: ../libpurple/protocols/msn/msn.c:334 ../libpurple/protocols/msn/msn.c:351
+#: ../libpurple/protocols/msnp9/msn.c:283
+#: ../libpurple/protocols/msnp9/msn.c:300
+#: ../libpurple/protocols/msnp9/msn.c:317
+#: ../libpurple/protocols/msnp9/msn.c:334
+#: ../libpurple/protocols/myspace/user.c:581
+#: ../libpurple/protocols/myspace/user.c:675
+#: ../libpurple/protocols/oscar/oscar.c:6222
 #: ../libpurple/protocols/silc/buddy.c:454
 #: ../libpurple/protocols/silc/buddy.c:1193
 #: ../libpurple/protocols/silc/chat.c:449
 #: ../libpurple/protocols/silc/chat.c:486
 #: ../libpurple/protocols/silc/chat.c:749
-#: ../libpurple/protocols/silc/ops.c:1293
-#: ../libpurple/protocols/silc/ops.c:1819
+#: ../libpurple/protocols/silc/ops.c:1308
+#: ../libpurple/protocols/silc/ops.c:1834
 #: ../libpurple/protocols/silc/silc.c:965
 #: ../libpurple/protocols/silc10/buddy.c:467
 #: ../libpurple/protocols/silc10/buddy.c:1191
@@ -659,86 +692,114 @@
 #: ../libpurple/protocols/silc10/chat.c:464
 #: ../libpurple/protocols/silc10/chat.c:729
 #: ../libpurple/protocols/silc10/ops.c:1297
-#: ../libpurple/protocols/silc10/ops.c:1903
-#: ../libpurple/protocols/silc10/silc.c:735
-#: ../libpurple/protocols/yahoo/yahoo.c:1044
-#: ../libpurple/protocols/yahoo/yahoo.c:3553
-#: ../libpurple/protocols/yahoo/yahoo.c:3564 ../pidgin/gtkcertmgr.c:195
-#: ../pidgin/gtkdialogs.c:764 ../pidgin/gtkdialogs.c:903
-#: ../pidgin/gtkdialogs.c:995 ../pidgin/gtkrequest.c:272
+#: ../libpurple/protocols/silc10/ops.c:1909
+#: ../libpurple/protocols/silc10/silc.c:741
+#: ../libpurple/protocols/yahoo/yahoo.c:992
+#: ../libpurple/protocols/yahoo/yahoo.c:3559
+#: ../libpurple/protocols/yahoo/yahoo.c:3570 ../pidgin/gtkcertmgr.c:195
+#: ../pidgin/gtkdialogs.c:765 ../pidgin/gtkdialogs.c:904
+#: ../pidgin/gtkdialogs.c:996 ../pidgin/gtkrequest.c:272
 msgid "OK"
 msgstr "��悋��"

-#: ../finch/gntblist.c:2401
+#: ../finch/gntblist.c:2649 ../pidgin/gtkdialogs.c:760
+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
 msgid "Channel"
 msgstr "悋���悋悸"

-#: ../finch/gntblist.c:2413 ../pidgin/gtkblist.c:950
+#: ../finch/gntblist.c:2714 ../pidgin/gtkblist.c:962
 msgid "Join a Chat"
 msgstr "悋�惷� �惆惘惆愆悸"

-#: ../finch/gntblist.c:2415
+#: ../finch/gntblist.c:2716
 msgid "Please enter the name of the chat you want to join."
 msgstr "悖惆悽� 悋愕� 悋�惆惘惆愆悸 悋�惠� 惠惘�惆 悋�悋�惷�悋� 悒���悋."

-#: ../finch/gntblist.c:2417 ../finch/gntnotify.c:394
+#: ../finch/gntblist.c:2718 ../finch/gntnotify.c:394
 msgid "Join"
 msgstr "悋�惷�"

 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2455 ../finch/gntpounce.c:460 ../pidgin/gtkpounce.c:802
+#: ../finch/gntblist.c:2763 ../finch/gntpounce.c:459 ../pidgin/gtkpounce.c:802
 msgid "Options"
 msgstr "悽�悋惘悋惠"

-#: ../finch/gntblist.c:2461
+#: ../finch/gntblist.c:2769
 msgid "Send IM..."
 msgstr "悖惘愕� 惘愕悋�悸 ��惘�悸..."

-#: ../finch/gntblist.c:2466
+#: ../finch/gntblist.c:2774
+msgid "Block/Unblock..."
+msgstr "悋忰惴惘/悖�愃� 悋�忰惴惘..."
+
+#: ../finch/gntblist.c:2779
 msgid "Join Chat..."
 msgstr "悋�惷� �惆惘惆愆悸..."

-#: ../finch/gntblist.c:2471
+#: ../finch/gntblist.c:2784
 msgid "Show"
-msgstr "悋惴�惘"
-
-#: ../finch/gntblist.c:2476
+msgstr "悖惴�惘"
+
+#: ../finch/gntblist.c:2789
 msgid "Empty groups"
 msgstr "悋��悴��惺悋惠 悋�悽悋��悸"

-#: ../finch/gntblist.c:2483
+#: ../finch/gntblist.c:2796
 msgid "Offline buddies"
 msgstr "悋�悖惶惆�悋悄 愃�惘 悋��惠��惶���"

-#: ../finch/gntblist.c:2490
+#: ../finch/gntblist.c:2803
 msgid "Sort"
 msgstr "惘惠�惡"

-#: ../finch/gntblist.c:2495
+#: ../finch/gntblist.c:2808
 msgid "By Status"
 msgstr "忰愕惡 悋�忰悋�悸"

-#: ../finch/gntblist.c:2500 ../pidgin/gtkblist.c:4193
+#: ../finch/gntblist.c:2813 ../pidgin/gtkblist.c:4240
 msgid "Alphabetically"
 msgstr "�悴悋悧�悋"

-#: ../finch/gntblist.c:2505
+#: ../finch/gntblist.c:2818
 msgid "By Log Size"
 msgstr "忰愕惡 忰悴� 悋�愕悴�"

-#: ../finch/gntcertmgr.c:86 ../pidgin/gtkcertmgr.c:188
+#: ../finch/gntblist.c:2829
+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
+#: ../libpurple/protocols/silc10/silc.c:685
+#: ../libpurple/protocols/silc10/util.c:553
+msgid "Chat"
+msgstr "悋�惆惘惆愆悸"
+
+#: ../finch/gntblist.c:2844 ../finch/plugins/grouping.c:255
+msgid "Grouping"
+msgstr "悋�惠悴��惺"
+
+#: ../finch/gntcertmgr.c:85 ../pidgin/gtkcertmgr.c:188
 msgid "Certificate Import"
 msgstr "悋愕惠�惘悋惆 悋�愆�悋惆悸"

-#: ../finch/gntcertmgr.c:87 ../pidgin/gtkcertmgr.c:189
+#: ../finch/gntcertmgr.c:86 ../pidgin/gtkcertmgr.c:189
 msgid "Specify a hostname"
 msgstr "忰惆惆 悋愕� ��惷��"

-#: ../finch/gntcertmgr.c:88 ../pidgin/gtkcertmgr.c:190
+#: ../finch/gntcertmgr.c:87 ../pidgin/gtkcertmgr.c:190
 msgid "Type the host name this certificate is for."
 msgstr "悖惆悽� 悋愕� 悋��惷�� 惶悋忰惡 �悵� 悋�愆�悋惆悸."

-#: ../finch/gntcertmgr.c:97 ../pidgin/gtkcertmgr.c:210
+#: ../finch/gntcertmgr.c:96 ../pidgin/gtkcertmgr.c:210
 #, c-format
 msgid ""
 "File %s could not be imported.\n"
@@ -747,19 +808,19 @@
 "惠惺悵�惘 惠惶惆�惘 悋���� %s.\n"
 "惠悖��惆 悖� 悋���� ��惘�悄 �惡惠�愕�� PEM.\n"

-#: ../finch/gntcertmgr.c:99 ../pidgin/gtkcertmgr.c:212
+#: ../finch/gntcertmgr.c:98 ../pidgin/gtkcertmgr.c:212
 msgid "Certificate Import Error"
 msgstr "惺愀� �� 悋愕惠�惘悋惆 悋愆�悋惆悸"

-#: ../finch/gntcertmgr.c:100 ../pidgin/gtkcertmgr.c:213
+#: ../finch/gntcertmgr.c:99 ../pidgin/gtkcertmgr.c:213
 msgid "X.509 certificate import failed"
 msgstr "�愆� 悋愕惠�惘悋惆 愆�悋惆悸 X.509"

-#: ../finch/gntcertmgr.c:110 ../pidgin/gtkcertmgr.c:224
+#: ../finch/gntcertmgr.c:109 ../pidgin/gtkcertmgr.c:224
 msgid "Select a PEM certificate"
 msgstr "悋悽惠惘 愆�悋惆悸 PEM"

-#: ../finch/gntcertmgr.c:127 ../pidgin/gtkcertmgr.c:245
+#: ../finch/gntcertmgr.c:126 ../pidgin/gtkcertmgr.c:245
 #, c-format
 msgid ""
 "Export to file %s failed.\n"
@@ -768,24 +829,24 @@
 "�愆� 惠惶惆�惘 悋���� %s.\n"
 "惠悖�惆 �� 悖� �� 惶�悋忰�悸 悋��惠悋惡悸 �� 悋��愕悋惘 悋��惆�\n"

-#: ../finch/gntcertmgr.c:129 ../pidgin/gtkcertmgr.c:247
+#: ../finch/gntcertmgr.c:128 ../pidgin/gtkcertmgr.c:247
 msgid "Certificate Export Error"
 msgstr "惺愀� �� 惠惶惆�惘 悋�愆�悋惆悸"

-#: ../finch/gntcertmgr.c:130 ../pidgin/gtkcertmgr.c:248
+#: ../finch/gntcertmgr.c:129 ../pidgin/gtkcertmgr.c:248
 msgid "X.509 certificate export failed"
 msgstr "�愆� 惠惶惆�惘 愆�悋惆悸 X.509"

-#: ../finch/gntcertmgr.c:159 ../pidgin/gtkcertmgr.c:299
+#: ../finch/gntcertmgr.c:158 ../pidgin/gtkcertmgr.c:298
 msgid "PEM X.509 Certificate Export"
 msgstr "惠惶惆�惘 愆�悋惆悸 PEM X.509"

-#: ../finch/gntcertmgr.c:188
+#: ../finch/gntcertmgr.c:187
 #, c-format
 msgid "Certificate for %s"
 msgstr "愆�悋惆悸 %s"

-#: ../finch/gntcertmgr.c:195
+#: ../finch/gntcertmgr.c:194
 #, c-format
 msgid ""
 "Common name: %s\n"
@@ -798,57 +859,57 @@
 "惡惶�悸 SHA1:\n"
 "%s"

-#: ../finch/gntcertmgr.c:198
+#: ../finch/gntcertmgr.c:197
 msgid "SSL Host Certificate"
 msgstr "愆�悋惆悸 SSL ���惷��"

-#: ../finch/gntcertmgr.c:233 ../pidgin/gtkcertmgr.c:372
+#: ../finch/gntcertmgr.c:232 ../pidgin/gtkcertmgr.c:371
 #, c-format
 msgid "Really delete certificate for %s?"
 msgstr "悖惠惘�惆 忰�悋 忰悵� 愆�悋惆悸 %s�"

-#: ../finch/gntcertmgr.c:236 ../pidgin/gtkcertmgr.c:374
+#: ../finch/gntcertmgr.c:235 ../pidgin/gtkcertmgr.c:373
 msgid "Confirm certificate delete"
 msgstr "悖��惆 忰悵� 悋�愆�悋惆悸"

-#: ../finch/gntcertmgr.c:293 ../pidgin/gtkcertmgr.c:602
+#: ../finch/gntcertmgr.c:292 ../pidgin/gtkcertmgr.c:613
 msgid "Certificate Manager"
 msgstr "�惆�惘 悋�愆��悋惆悋惠"

 #. Creating the user splits
-#: ../finch/gntcertmgr.c:298 ../libpurple/protocols/bonjour/bonjour.c:693
+#: ../finch/gntcertmgr.c:297 ../libpurple/protocols/bonjour/bonjour.c:694
 #: ../libpurple/protocols/silc/silc.c:1150
-#: ../libpurple/protocols/silc10/silc.c:918 ../pidgin/gtkcertmgr.c:433
+#: ../libpurple/protocols/silc10/silc.c:924 ../pidgin/gtkcertmgr.c:446
 msgid "Hostname"
 msgstr "悋愕� 悋��惷��"

-#: ../finch/gntcertmgr.c:315 ../finch/gntnotify.c:388 ../pidgin/gtkconv.c:1667
+#: ../finch/gntcertmgr.c:314 ../finch/gntnotify.c:388 ../pidgin/gtkconv.c:1672
 #: ../pidgin/gtkdebug.c:832
 msgid "Info"
 msgstr "�惺���悋惠"

 #. Close button
-#: ../finch/gntcertmgr.c:324 ../finch/gntft.c:246 ../finch/gntnotify.c:182
-#: ../finch/gntplugin.c:220 ../finch/gntplugin.c:413 ../finch/gntpounce.c:751
+#: ../finch/gntcertmgr.c:323 ../finch/gntft.c:253 ../finch/gntnotify.c:182
+#: ../finch/gntplugin.c:220 ../finch/gntplugin.c:413 ../finch/gntpounce.c:750
 #: ../finch/gntroomlist.c:275 ../finch/gntstatus.c:216
-#: ../libpurple/protocols/msn/msn.c:407 ../libpurple/protocols/msnp9/msn.c:403
+#: ../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:2371
+#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2375
 #: ../pidgin/gtkrequest.c:275
 msgid "Close"
 msgstr "悖愃��"

-#: ../finch/gntconn.c:125
+#: ../finch/gntconn.c:126
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"

-#: ../finch/gntconn.c:128
+#: ../finch/gntconn.c:129
 #, c-format
 msgid "%s disconnected."
 msgstr "%s �愀惺 悋�悋惠惶悋�."

-#: ../finch/gntconn.c:129
+#: ../finch/gntconn.c:130
 #, c-format
 msgid ""
 "%s\n"
@@ -860,57 +921,57 @@
 "\n"
 "�� �忰悋�� ���愆 悒惺悋惆悸 悋惠惶悋� 悋�忰愕悋惡 �惡� 悖� 惠惺悋�悴 悋�惺愀� � 惠惺�惆 惠�惺�� 悋�忰愕悋惡."

-#: ../finch/gntconn.c:138
+#: ../finch/gntconn.c:139
 msgid "Re-enable Account"
 msgstr "悖惺�惆 惠�惺�� 悋�忰愕悋惡"

-#: ../finch/gntconn.c:155
+#: ../finch/gntconn.c:156
 msgid ""
 "The account has disconnected and you are no longer in this chat. You will be "
 "automatically rejoined in the chat when the account reconnects."
 msgstr ""
-"��惆 悋��惶� �悵悋 悋�忰愕悋惡 ��� 惠惺惆 ��惷�悋 ��悵� 悋�惆惘惆愆悸. 愕��惺悋惆 悋�惷�悋�� 惠��悋悧�悋 惺�惆�悋 "
-"�惠惶� �悵悋 悋�忰愕悋惡 惓悋��悋."
-
-#: ../finch/gntconv.c:144
+"��惆 悋��惶� �悵悋 悋�忰愕悋惡 ��� 惠惺惆 �愆悋惘�悋 �� �悵� 悋�惆惘惆愆悸. 愕��惺悋惆 悋�惷�悋�� 惠��悋悧�悋 "
+"惺�惆�悋 �惠惶� �悵悋 悋�忰愕悋惡 �悴惆惆悋."
+
+#: ../finch/gntconv.c:159
 msgid "No such command."
 msgstr "�悵悋 悋�悖�惘 愃�惘 ��悴�惆."

-#: ../finch/gntconv.c:148 ../pidgin/gtkconv.c:481
+#: ../finch/gntconv.c:163 ../pidgin/gtkconv.c:492
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr "悽愀悖 �忰��: 悖惆悽�惠 惺惆惆悋 悽悋愀悧悋 �� 悋��惺愀�悋惠 ��悵悋 悋�悖�惘."

-#: ../finch/gntconv.c:153 ../pidgin/gtkconv.c:487
+#: ../finch/gntconv.c:168 ../pidgin/gtkconv.c:498
 msgid "Your command failed for an unknown reason."
 msgstr "�愆� 悋�悖�惘 悋�悵� 悖惶惆惘惠� �愕惡惡 �悴���."

-#: ../finch/gntconv.c:158 ../pidgin/gtkconv.c:494
+#: ../finch/gntconv.c:173 ../pidgin/gtkconv.c:505
 msgid "That command only works in chats, not IMs."
 msgstr "�惺�� �悵悋 悋�悖�惘 ��愀 �惺 悋�惆惘惆愆悋惠 � ��愕 悋�惘愕悋悧� 悋���惘�悸."

-#: ../finch/gntconv.c:161 ../pidgin/gtkconv.c:497
+#: ../finch/gntconv.c:176 ../pidgin/gtkconv.c:508
 msgid "That command only works in IMs, not chats."
 msgstr "�惺�� �悵悋 悋�悖�惘 ��愀 �惺 悋�惘愕悋悧� 悋���惘�悸 � ��愕 悋�惆惘惆愆悋惠."

-#: ../finch/gntconv.c:165 ../pidgin/gtkconv.c:502
+#: ../finch/gntconv.c:180 ../pidgin/gtkconv.c:513
 msgid "That command doesn't work on this protocol."
 msgstr "�悋�惺�� �悵悋 悋�悖�惘 �惺 �悵悋 悋�惡惘�惠����."

-#: ../finch/gntconv.c:173
+#: ../finch/gntconv.c:188
 msgid "Message was not sent, because you are not signed on."
 msgstr "�� 惠�惘愕� 悋�惘愕悋�悸 �悖�� �愕惠 �悋�悴悋."

-#: ../finch/gntconv.c:252
+#: ../finch/gntconv.c:268
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"

-#: ../finch/gntconv.c:275
+#: ../finch/gntconv.c:291
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"

-#: ../finch/gntconv.c:280 ../finch/gntconv.c:812 ../pidgin/gtkconv.c:3459
+#: ../finch/gntconv.c:296 ../finch/gntconv.c:882 ../pidgin/gtkconv.c:3470
 #, c-format
 msgid ""
 "\n"
@@ -919,64 +980,68 @@
 "\n"
 "%s ��惠惡..."

-#: ../finch/gntconv.c:299
+#: ../finch/gntconv.c:315
 msgid "You have left this chat."
 msgstr "��惆 �悋惘�惠 �悵� 悋�惆惘惆愆悸."

-#: ../finch/gntconv.c:415 ../pidgin/gtkconv.c:1373
+#: ../finch/gntconv.c:433 ../pidgin/gtkconv.c:1378
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr "惡惆悖 悋�惠愕悴��. 悋�惘愕悋悧� 悋��悋忰�悸 �� �悵� 悋��忰悋惆惓悸 愕惠愕悴�."

-#: ../finch/gntconv.c:421 ../pidgin/gtkconv.c:1381
+#: ../finch/gntconv.c:437 ../pidgin/gtkconv.c:1386
 msgid "Logging stopped. Future messages in this conversation will not be logged."
 msgstr "悖����� 悋�惠愕悴��. 悋�惘愕悋悧� 悋��悋忰�悸 �� �悵� 悋��忰悋惆惓悸 �� 惠愕悴�."

-#: ../finch/gntconv.c:470
+#: ../finch/gntconv.c:523
 msgid "Send To"
 msgstr "悖惘愕� 悒��"

-#: ../finch/gntconv.c:514
+#: ../finch/gntconv.c:568
 msgid "Conversation"
 msgstr "�忰悋惆惓悸"

-#: ../finch/gntconv.c:520
+#: ../finch/gntconv.c:574
 msgid "Clear Scrollback"
 msgstr "悋悽� �悋 愕惡� �� �悋�悵悸 悋��忰悋惆惓悸"

-#: ../finch/gntconv.c:524 ../finch/gntprefs.c:191
+#: ../finch/gntconv.c:578 ../finch/gntprefs.c:191
 msgid "Show Timestamps"
 msgstr "悋惺惘惷 悋�悖悽惠悋� 悋�慍���悸"

-#: ../finch/gntconv.c:540
+#: ../finch/gntconv.c:596
 msgid "Add Buddy Pounce..."
 msgstr "悖惷� 悒愆惺悋惘 惶惆��..."

-#: ../finch/gntconv.c:555
+#: ../finch/gntconv.c:611
+msgid "View Log..."
+msgstr "悋惺惘惷 悋�愕悴��..."
+
+#: ../finch/gntconv.c:615
 msgid "Enable Logging"
 msgstr "�惺�� 悋�惠愕悴��"

-#: ../finch/gntconv.c:561
+#: ../finch/gntconv.c:621
 msgid "Enable Sounds"
 msgstr "�惺�� 悋�悖惶�悋惠"

-#: ../finch/gntconv.c:769
+#: ../finch/gntconv.c:835
 msgid "<AUTO-REPLY> "
 msgstr "<惘惆-惠��悋悧�>"

 #. Print the list of users in the room
-#: ../finch/gntconv.c:900
+#: ../finch/gntconv.c:970
 msgid "List of users:\n"
 msgstr "�悋悧�悸 悋��愕惠悽惆���:\n"

-#: ../finch/gntconv.c:1062 ../pidgin/gtkconv.c:333
+#: ../finch/gntconv.c:1132 ../pidgin/gtkconv.c:337
 msgid "Supported debug options are:  version"
 msgstr "悽�悋惘悋惠 悋�惠���忰 悋��惆惺��悸 ��: 悋�悒惶惆悋惘悸"

-#: ../finch/gntconv.c:1098 ../pidgin/gtkconv.c:385
+#: ../finch/gntconv.c:1168 ../pidgin/gtkconv.c:389
 msgid "No such command (in this context)."
 msgstr "悋�悖�惘 悋�悵� 悖惆悽�惠� 愃�惘 ��悴�惆 (�� �悵悋 悋�愕�悋�)."

-#: ../finch/gntconv.c:1101 ../pidgin/gtkconv.c:388
+#: ../finch/gntconv.c:1171 ../pidgin/gtkconv.c:392
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -984,64 +1049,64 @@
 "悋愕惠悽惆�  \"/help &lt;command&gt;\" ���愕悋惺惆悸 �� 悖�惘 惡惺���.\n"
 "悋�悖�悋�惘 悋�惠悋��悸 �惠悋忰悸 �� �悵悋 悋�愕�悋�:\n"

-#: ../finch/gntconv.c:1174 ../pidgin/gtkconv.c:7745
+#: ../finch/gntconv.c:1244 ../pidgin/gtkconv.c:7769
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
 msgstr "say &lt;惘愕悋�悸&gt;: �惘愕� 惘愕悋�悸 �悋��惺惠悋惆 � �悖�� �� 惠愕惠悽惆� �悵悋 悋�悖�惘."

-#: ../finch/gntconv.c:1177 ../pidgin/gtkconv.c:7748
+#: ../finch/gntconv.c:1247 ../pidgin/gtkconv.c:7772
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr "me &lt;悒悴惘悋悄&gt;: �惘愕� �惺�悋 惺�� ��愀 悛���悛惘��愕� ��惶惆�� 悖� 悋�惆惘惆愆悸."

-#: ../finch/gntconv.c:1180 ../pidgin/gtkconv.c:7751
+#: ../finch/gntconv.c:1250 ../pidgin/gtkconv.c:7775
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr "debug &lt;option&gt;:  �惘愕� �惺���悋惠 �惠��惺悸 ��惠���忰 悒�� 悋��忰悋惆惓悸 悋�忰悋��悸."

-#: ../finch/gntconv.c:1183 ../pidgin/gtkconv.c:7754
+#: ../finch/gntconv.c:1253 ../pidgin/gtkconv.c:7778
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: ��愕忰 �悋 愕惡� �� �悋�悵悸 悋��忰悋惆惓悸."

-#: ../finch/gntconv.c:1186 ../pidgin/gtkconv.c:7760
+#: ../finch/gntconv.c:1256 ../pidgin/gtkconv.c:7784
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;command&gt;:  �愕悋惺惆悸 忰�� 悖�惘 惡惺���."

-#: ../finch/gntconv.c:1189
+#: ../finch/gntconv.c:1259
 msgid "users:  Show the list of users in the chat."
 msgstr "users: �惺惘惷 �悋悧�悸 悋��愕惠悽惆��� �� 悋�惆惘惆愆悸."

-#: ../finch/gntconv.c:1194
+#: ../finch/gntconv.c:1264
 msgid "plugins: Show the plugins window."
 msgstr "plugins: �惴�惘 �悋�悵悸 悋���忰�悋惠."

-#: ../finch/gntconv.c:1197
+#: ../finch/gntconv.c:1267
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist: �惺惘惷 �悋悧�悸 悋�悖惶惆�悋悄."

-#: ../finch/gntconv.c:1200
+#: ../finch/gntconv.c:1270
 msgid "accounts: Show the accounts window."
 msgstr "accounts: �惺惘惷 �悋�悵悸 悋�忰愕悋惡悋惠."

-#: ../finch/gntconv.c:1203
+#: ../finch/gntconv.c:1273
 msgid "debugwin: Show the debug window."
 msgstr "debugwin: �惺惘惷 �悋�悵悸 悋�惠���忰."

-#: ../finch/gntconv.c:1206
+#: ../finch/gntconv.c:1276
 msgid "prefs: Show the preference window."
 msgstr "prefs: �惺惘惷 �悋�悵悸 悋�惠�惷��悋惠."

-#: ../finch/gntconv.c:1209
+#: ../finch/gntconv.c:1279
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: �惺惘惷 �悋�悵悸 悋�忰悋�悋惠 悋��忰��惴悸."

-#: ../finch/gntdebug.c:231 ../pidgin/gtkconv.c:937 ../pidgin/gtkconv.c:2645
+#: ../finch/gntdebug.c:231 ../pidgin/gtkconv.c:942 ../pidgin/gtkconv.c:2652
 #: ../pidgin/gtkdebug.c:219 ../pidgin/gtkft.c:543
 msgid "Unable to open file."
 msgstr "惠惺悵�惘 �惠忰 悋����."

-#: ../finch/gntdebug.c:271 ../finch/gntui.c:94 ../pidgin/gtkdebug.c:689
+#: ../finch/gntdebug.c:271 ../finch/gntui.c:98 ../pidgin/gtkdebug.c:689
 msgid "Debug Window"
 msgstr "�悋�悵悸 悋�惠���忰"

@@ -1061,107 +1126,167 @@
 msgid "Pause"
 msgstr "悖�惡惓"

-#: ../finch/gntft.c:119 ../pidgin/gtkft.c:229
+#: ../finch/gntft.c:120 ../pidgin/gtkft.c:229
 #, c-format
 msgid "File Transfers - %d%% of %d files"
 msgstr "��� 悋����悋惠 - %Id%% �� %Id ���悋惠"

 #. Create the window.
-#: ../finch/gntft.c:124 ../finch/gntft.c:205 ../finch/gntui.c:95
+#: ../finch/gntft.c:125 ../finch/gntft.c:212 ../finch/gntui.c:99
 #: ../pidgin/gtkft.c:234 ../pidgin/gtkft.c:761
 msgid "File Transfers"
 msgstr "��� 悋����悋惠"

-#: ../finch/gntft.c:210 ../pidgin/gtkft.c:645
+#: ../finch/gntft.c:217 ../pidgin/gtkft.c:645
 msgid "Progress"
 msgstr "悋�惠�惆�"

-#: ../finch/gntft.c:210 ../pidgin/gtkft.c:652
+#: ../finch/gntft.c:217 ../pidgin/gtkft.c:652
 msgid "Filename"
 msgstr "悋愕� 悋����"

-#: ../finch/gntft.c:210 ../pidgin/gtkft.c:659
+#: ../finch/gntft.c:217 ../pidgin/gtkft.c:659
 msgid "Size"
 msgstr "悋�忰悴�"

-#: ../finch/gntft.c:210
+#: ../finch/gntft.c:217
 msgid "Speed"
 msgstr "悋�愕惘惺悸"

-#: ../finch/gntft.c:210 ../pidgin/gtkft.c:666
+#: ../finch/gntft.c:217 ../pidgin/gtkft.c:666
 msgid "Remaining"
 msgstr "悋��惠惡��"

 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
-#: ../finch/gntft.c:210 ../finch/gntstatus.c:547 ../finch/gntstatus.c:576
+#: ../finch/gntft.c:217 ../finch/gntstatus.c:547 ../finch/gntstatus.c:576
 #: ../libpurple/protocols/bonjour/bonjour.c:380
 #: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1584
 #: ../libpurple/protocols/gg/gg.c:1592
-#: ../libpurple/protocols/jabber/buddy.c:778
-#: ../libpurple/protocols/jabber/buddy.c:782
-#: ../libpurple/protocols/jabber/buddy.c:941
-#: ../libpurple/protocols/jabber/jabber.c:1567
-#: ../libpurple/protocols/msn/msn.c:621 ../libpurple/protocols/msn/msn.c:631
-#: ../libpurple/protocols/msn/msn.c:636 ../libpurple/protocols/msn/msn.c:639
-#: ../libpurple/protocols/msnp9/msn.c:543
-#: ../libpurple/protocols/novell/novell.c:2852
-#: ../libpurple/protocols/oscar/oscar.c:821
-#: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:2709
-#: ../libpurple/protocols/oscar/oscar.c:3761
-#: ../libpurple/protocols/sametime/sametime.c:3305
-#: ../libpurple/protocols/sametime/sametime.c:4196
-#: ../libpurple/protocols/yahoo/yahoo.c:3304 ../pidgin/gtkblist.c:3295
-#: ../pidgin/gtkblist.c:3309 ../pidgin/gtkblist.c:3311
-#: ../pidgin/gtksavedstatuses.c:988 ../pidgin/gtksavedstatuses.c:1132
+#: ../libpurple/protocols/jabber/buddy.c:808
+#: ../libpurple/protocols/jabber/buddy.c:812
+#: ../libpurple/protocols/jabber/buddy.c:971
+#: ../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
+#: ../libpurple/protocols/msnp9/msn.c:540
+#: ../libpurple/protocols/novell/novell.c:2853
+#: ../libpurple/protocols/oscar/oscar.c:822
+#: ../libpurple/protocols/oscar/oscar.c:827
+#: ../libpurple/protocols/oscar/oscar.c:829
+#: ../libpurple/protocols/oscar/oscar.c:2768
+#: ../libpurple/protocols/oscar/oscar.c:3827
+#: ../libpurple/protocols/sametime/sametime.c: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
+#: ../pidgin/gtksavedstatuses.c:990 ../pidgin/gtksavedstatuses.c:1134
 msgid "Status"
 msgstr "悋�忰悋�悸"

-#: ../finch/gntft.c:220
+#: ../finch/gntft.c:227
 msgid "Close this window when all transfers finish"
 msgstr "悖愃�� 悋��悋�悵悸 惡惺惆 悋�惠�悋悄 �� 悋����悋惠"

-#: ../finch/gntft.c:227
+#: ../finch/gntft.c:234
 msgid "Clear finished transfers"
 msgstr "悖悽�� 悋����悋惠 悋�惠悋�悸"

-#: ../finch/gntft.c:241 ../finch/gntroomlist.c:272
+#: ../finch/gntft.c:248 ../finch/gntroomlist.c:272
 msgid "Stop"
 msgstr "��"

-#: ../finch/gntft.c:314 ../pidgin/gtkft.c:169 ../pidgin/gtkft.c:934
+#: ../finch/gntft.c:321 ../pidgin/gtkft.c:169 ../pidgin/gtkft.c:934
 msgid "Waiting for transfer to begin"
 msgstr "�� 悋�惠惴悋惘 惡惆悄 悋����"

-#: ../finch/gntft.c:381 ../pidgin/gtkft.c:163 ../pidgin/gtkft.c:1015
+#: ../finch/gntft.c:388 ../pidgin/gtkft.c:163 ../pidgin/gtkft.c:1015
 msgid "Canceled"
 msgstr "悖��愃���"

-#: ../finch/gntft.c:383 ../pidgin/gtkft.c:1017
+#: ../finch/gntft.c:390 ../pidgin/gtkft.c:1017
 msgid "Failed"
 msgstr "�愆�"

-#: ../finch/gntft.c:429 ../pidgin/gtkft.c:134
+#: ../finch/gntft.c:434 ../pidgin/gtkft.c:134
 #, c-format
 msgid "%.2f KiB/s"
 msgstr "%.2f �.惡/惓悋��悸"

-#: ../finch/gntft.c:440
+#: ../finch/gntft.c:445
 #, c-format
 msgid "The file was saved as %s."
 msgstr "忰���惴 悋����� 惡悋愕� %s."

-#: ../finch/gntft.c:441 ../finch/gntft.c:442 ../pidgin/gtkft.c:160
-#: ../pidgin/gtkft.c:1077
+#: ../finch/gntft.c:446 ../finch/gntft.c:447 ../pidgin/gtkft.c:160
+#: ../pidgin/gtkft.c:1080
 msgid "Finished"
 msgstr "惠�"

-#: ../finch/gntft.c:447 ../libpurple/protocols/msn/session.c:404
+#: ../finch/gntft.c:452 ../libpurple/protocols/msn/session.c:404
 #: ../libpurple/protocols/msnp9/session.c:356
 msgid "Transferring"
 msgstr "���"

+#: ../finch/gntlog.c:183
+#, c-format
+msgid "Conversation in %s on %s"
+msgstr "�忰悋惆惓悸 �� %s 惺�� %s"
+
+#: ../finch/gntlog.c:186
+#, c-format
+msgid "Conversation with %s on %s"
+msgstr "�忰悋惆惓悸 �惺 %s 惺�� %s"
+
+#: ../finch/gntlog.c:231 ../pidgin/gtklog.c:503
+msgid "%B %Y"
+msgstr "%B %Y"
+
+#: ../finch/gntlog.c:271 ../pidgin/gtklog.c:550
+msgid ""
+"System events will only be logged if the \"Log all status changes to system "
+"log\" preference is enabled."
+msgstr ""
+"悖忰惆悋惓 悋��惴悋� 愕惠愕悴� ��愀 悒悵悋 �悋� 悽�悋惘 \"愕悴� 悴��惺 惠愃��惘悋惠 悋�忰悋�悋惠 �� 愕悴� 悋��惴悋�"
+"\"  ��惺�悋."
+
+#: ../finch/gntlog.c:275 ../pidgin/gtklog.c:554
+msgid ""
+"Instant messages will only be logged if the \"Log all instant messages\" "
+"preference is enabled."
+msgstr "悋�惘愕悋悧� 悋���惘�悸 愕惠愕悴� ��愀 悒悵悋 �悋� 悽�悋惘 \"愕悴� 悴��惺 悋�惘愕悋悧� 悋���惘�悸\" ��惺�悋."
+
+#: ../finch/gntlog.c:278 ../pidgin/gtklog.c:557
+msgid "Chats will only be logged if the \"Log all chats\" preference is enabled."
+msgstr "悋�惆惘惆愆悋惠 愕惠愕悴� ��愀 悒悵悋 �悋� 悽�悋惘 \"愕悴� 悴��惺 悋�惆惘惆愆悋惠\" ��惺�悋.."
+
+#: ../finch/gntlog.c:284 ../pidgin/gtklog.c:566
+msgid "No logs were found"
+msgstr "�悋 惠�悴惆 愕悴�悋惠"
+
+#: ../finch/gntlog.c:330 ../pidgin/gtklog.c:646
+msgid "Total log size:"
+msgstr "忰悴� 悋�愕悴� 悋�悒悴�悋��:"
+
+#. Search box *********
+#: ../finch/gntlog.c:338
+msgid "Scroll/Search: "
+msgstr "��/悋惡忰惓: "
+
+#: ../finch/gntlog.c:382 ../pidgin/gtklog.c:716
+#, c-format
+msgid "Conversations in %s"
+msgstr "�忰悋惆惓悋惠 �� %s"
+
+#: ../finch/gntlog.c:390 ../finch/gntlog.c:448 ../pidgin/gtklog.c:724
+#: ../pidgin/gtklog.c:799
+#, c-format
+msgid "Conversations with %s"
+msgstr "�忰悋惆惓悋惠 �惺 %s"
+
+#: ../finch/gntlog.c:473 ../pidgin/gtklog.c:824
+msgid "System Log"
+msgstr "愕悴� 悋��惴悋�"
+
 #: ../finch/gntnotify.c:165
 msgid "Emails"
 msgstr "惡惘�惆 悒��惠惘���"
@@ -1170,11 +1295,11 @@
 msgid "You have mail!"
 msgstr "�惆�� 惡惘�惆"

-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:523
+#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:524
 msgid "Sender"
 msgstr "悋��惘愕��"

-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:530
+#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:531
 msgid "Subject"
 msgstr "悋���惷�惺"

@@ -1193,13 +1318,13 @@
 msgid "New Mail"
 msgstr "惡惘�惆 悴惆�惆"

-#: ../finch/gntnotify.c:291 ../pidgin/gtknotify.c:957
+#: ../finch/gntnotify.c:291 ../pidgin/gtknotify.c:959
 #, c-format
 msgid "Info for %s"
 msgstr "�惺���悋惠 惺� %s"

 #: ../finch/gntnotify.c:292 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:958
+#: ../pidgin/gtknotify.c:960
 msgid "Buddy Information"
 msgstr "�惺���悋惠 悋�惶惆��"

@@ -1207,11 +1332,11 @@
 msgid "Continue"
 msgstr "悋愕惠�惘"

-#: ../finch/gntnotify.c:391 ../pidgin/gtkconv.c:1628
+#: ../finch/gntnotify.c:391 ../pidgin/gtkconv.c:1633
 msgid "IM"
 msgstr "惘愕悋�悸 ��惘�悸"

-#: ../finch/gntnotify.c:397 ../libpurple/protocols/sametime/sametime.c:3515
+#: ../finch/gntnotify.c:397 ../libpurple/protocols/sametime/sametime.c:3524
 msgid "Invite"
 msgstr "悋惆惺�"

@@ -1290,185 +1415,185 @@
 #. 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:99 ../pidgin/gtkdocklet.c:718 ../pidgin/gtkprefs.c:2053
+#: ../finch/gntui.c:103 ../pidgin/gtkdocklet.c:718 ../pidgin/gtkprefs.c:2070
 msgid "Preferences"
 msgstr "悋�惠�惷��悋惠"

-#: ../finch/gntpounce.c:194 ../pidgin/gtkpounce.c:256
+#: ../finch/gntpounce.c:193 ../pidgin/gtkpounce.c:256
 msgid "Please enter a buddy to pounce."
 msgstr "�� �惷�� 悖惆悽� 惶惆��悋 �悒愆惺悋惘�."

-#: ../finch/gntpounce.c:339 ../pidgin/gtkpounce.c:524
+#: ../finch/gntpounce.c:338 ../pidgin/gtkpounce.c:524
 msgid "New Buddy Pounce"
 msgstr "悒愆惺悋惘 惶惆�� 悴惆�惆"

-#: ../finch/gntpounce.c:339 ../pidgin/gtkpounce.c:524
+#: ../finch/gntpounce.c:338 ../pidgin/gtkpounce.c:524
 msgid "Edit Buddy Pounce"
 msgstr "忰惘��惘 悒愆惺悋惘 悋�惶惆��"

-#: ../finch/gntpounce.c:344
+#: ../finch/gntpounce.c:343
 msgid "Pounce Who"
 msgstr "�� 惠�愆惺惘"

 #. Account:
-#: ../finch/gntpounce.c:347 ../finch/gntstatus.c:456
+#: ../finch/gntpounce.c:346 ../finch/gntstatus.c:456
 msgid "Account:"
 msgstr "忰愕悋惡:"

-#: ../finch/gntpounce.c:369
+#: ../finch/gntpounce.c:368
 msgid "Buddy name:"
 msgstr "悋愕� 悋�惶惆��:"

 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:387 ../pidgin/gtkpounce.c:592
+#: ../finch/gntpounce.c:386 ../pidgin/gtkpounce.c:592
 msgid "Pounce When Buddy..."
 msgstr "悖愆惺惘 惺�惆�悋 ���� 悋�惶惆��..."

-#: ../finch/gntpounce.c:389
+#: ../finch/gntpounce.c:388
 msgid "Signs on"
 msgstr "��悴"

+#: ../finch/gntpounce.c:389
+msgid "Signs off"
+msgstr "�悽惘悴"
+
 #: ../finch/gntpounce.c:390
-msgid "Signs off"
-msgstr "�悽惘悴"
+msgid "Goes away"
+msgstr "�悵�惡 惡惺�惆悋"

 #: ../finch/gntpounce.c:391
-msgid "Goes away"
-msgstr "�悵�惡 惡惺�惆悋"
+msgid "Returns from away"
+msgstr "�惺�惆 �� 愃�悋惡�"

 #: ../finch/gntpounce.c:392
-msgid "Returns from away"
-msgstr "�惺�惆 �� 愃�悋惡�"
+msgid "Becomes idle"
+msgstr "�惶惡忰 愕悋��悋"

 #: ../finch/gntpounce.c:393
-msgid "Becomes idle"
-msgstr "�惶惡忰 愕悋��悋"
+msgid "Is no longer idle"
+msgstr "�� �惺惆 愕悋��悋"

 #: ../finch/gntpounce.c:394
-msgid "Is no longer idle"
-msgstr "�� �惺惆 愕悋��悋"
-
-#: ../finch/gntpounce.c:395
 msgid "Starts typing"
 msgstr "�惡惆悖 �� 悋��惠悋惡悸"

-#: ../finch/gntpounce.c:396
+#: ../finch/gntpounce.c:395
 msgid "Pauses while typing"
 msgstr "��惡惓 悖惓�悋悄 悋��惠悋惡悸"

+#: ../finch/gntpounce.c:396
+msgid "Stops typing"
+msgstr "��� 惺� 悋��惠悋惡悸"
+
 #: ../finch/gntpounce.c:397
-msgid "Stops typing"
-msgstr "��� 惺� 悋��惠悋惡悸"
-
-#: ../finch/gntpounce.c:398
 msgid "Sends a message"
 msgstr "�惘愕� 惘愕悋�悸"

 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:427 ../pidgin/gtkpounce.c:653
+#: ../finch/gntpounce.c:426 ../pidgin/gtkpounce.c:653
 msgid "Action"
 msgstr "悒悴惘悋悄"

-#: ../finch/gntpounce.c:429
+#: ../finch/gntpounce.c:428
 msgid "Open an IM window"
 msgstr "悋�惠忰 �悋�悵悸 惠惘悋愕� ��惘�"

+#: ../finch/gntpounce.c:429
+msgid "Pop up a notification"
+msgstr "悖惴�惘 惠����悋 ��惡惓�悋"
+
 #: ../finch/gntpounce.c:430
-msgid "Pop up a notification"
-msgstr "悋惴�惘 惠�惡��悋 ��惡惓�悋"
-
-#: ../finch/gntpounce.c:431
 msgid "Send a message"
 msgstr "悖惘愕� 惘愕悋�悸"

-#: ../finch/gntpounce.c:432
+#: ../finch/gntpounce.c:431
 msgid "Execute a command"
 msgstr "��悵 悖�惘悋"

-#: ../finch/gntpounce.c:433
+#: ../finch/gntpounce.c:432
 msgid "Play a sound"
 msgstr "悖惶惆惘 惶�惠悋"

-#: ../finch/gntpounce.c:461
-msgid "Pounce only when my status is not available"
-msgstr "悖愆惺惘 ��愀 惺�惆�悋 惠��� 悋�忰悋�悸 \"愃�惘 �惠悋忰\""
-
-#: ../finch/gntpounce.c:463 ../pidgin/gtkpounce.c:1293
+#: ../finch/gntpounce.c:460
+msgid "Pounce only when my status is not Available"
+msgstr "悖愆惺惘 ��愀 惺�惆�悋 惠��� 悋�忰悋�悸 \"愃�惘 ��悴�惆\""
+
+#: ../finch/gntpounce.c:462 ../pidgin/gtkpounce.c:1294
 msgid "Recurring"
 msgstr "惆�惘��"

-#: ../finch/gntpounce.c:631
+#: ../finch/gntpounce.c:630
 msgid "Cannot create pounce"
 msgstr "惠惺悵�惘 悒�愆悋悄 悋�悒愆惺悋惘"

-#: ../finch/gntpounce.c:632
+#: ../finch/gntpounce.c:631
 msgid "You do not have any accounts."
 msgstr "��愕惠 �惆�� 悖�悸 忰愕悋惡悋惠."

-#: ../finch/gntpounce.c:633
+#: ../finch/gntpounce.c:632
 msgid "You must create an account first before you can create a pounce."
 msgstr "�悴惡 悖� 惠�愆悧 忰愕悋惡悋 �惡� 悖� 惠�愆悧 悒愆惺悋惘悋."

-#: ../finch/gntpounce.c:675 ../pidgin/gtkpounce.c:1108
+#: ../finch/gntpounce.c:674 ../pidgin/gtkpounce.c:1108
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "悖�惠悖�惆 �� 惘愃惡惠� ��  忰悵� 悒愆惺悋惘  %s �悖悴� %s�"

-#: ../finch/gntpounce.c:709 ../finch/gntui.c:92 ../pidgin/gtkpounce.c:1336
+#: ../finch/gntpounce.c:708 ../finch/gntui.c:96 ../pidgin/gtkpounce.c:1337
 msgid "Buddy Pounces"
 msgstr "悒愆惺悋惘悋惠 悋�惶惆��"

-#: ../finch/gntpounce.c:823 ../pidgin/gtkpounce.c:1435
+#: ../finch/gntpounce.c:817 ../pidgin/gtkpounce.c:1436
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s 惡惆悖 惡悋��惠悋惡悸 悒��� (%s)"

-#: ../finch/gntpounce.c:825 ../pidgin/gtkpounce.c:1437
+#: ../finch/gntpounce.c:818 ../pidgin/gtkpounce.c:1438
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s �惡惓 惡���悋 ��惠惡 悒��� (%s)"

-#: ../finch/gntpounce.c:827 ../pidgin/gtkpounce.c:1439
+#: ../finch/gntpounce.c:819 ../pidgin/gtkpounce.c:1440
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s ��悴 (%s)"

-#: ../finch/gntpounce.c:829 ../pidgin/gtkpounce.c:1441
+#: ../finch/gntpounce.c:820 ../pidgin/gtkpounce.c:1442
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s 惺悋惆 �� 悋�愕��� (%s)"

-#: ../finch/gntpounce.c:831 ../pidgin/gtkpounce.c:1443
+#: ../finch/gntpounce.c:821 ../pidgin/gtkpounce.c:1444
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s 惺悋惆 �� 愃�悋惡� (%s)"

-#: ../finch/gntpounce.c:833 ../pidgin/gtkpounce.c:1445
+#: ../finch/gntpounce.c:822 ../pidgin/gtkpounce.c:1446
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s 惠��� 惺� 悋��惠悋惡悸 悒��� (%s)"

-#: ../finch/gntpounce.c:835 ../pidgin/gtkpounce.c:1447
+#: ../finch/gntpounce.c:823 ../pidgin/gtkpounce.c:1448
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s 悽惘悴 (%s)"

-#: ../finch/gntpounce.c:837 ../pidgin/gtkpounce.c:1449
+#: ../finch/gntpounce.c:824 ../pidgin/gtkpounce.c:1450
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s 悖惶惡忰 愕悋���悋 (%s)"

-#: ../finch/gntpounce.c:839 ../pidgin/gtkpounce.c:1451
+#: ../finch/gntpounce.c:825 ../pidgin/gtkpounce.c:1452
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s 悵�惡 惡惺�惆�悋. (%s)"

-#: ../finch/gntpounce.c:841 ../pidgin/gtkpounce.c:1453
+#: ../finch/gntpounce.c:826 ../pidgin/gtkpounce.c:1454
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s 悖惘愕� 悒��� 惘愕悋�悸. (%s)"

-#: ../finch/gntpounce.c:842 ../pidgin/gtkpounce.c:1454
+#: ../finch/gntpounce.c:845 ../pidgin/gtkpounce.c:1455
 msgid "Unknown pounce event. Please report this!"
 msgstr "忰惆惓 悒愆惺悋惘 �悴���. �� �惷�� 悖惡�愃 惺� �悵悋!"

@@ -1476,37 +1601,37 @@
 msgid "Based on keyboard use"
 msgstr "惡�悋悄 惺�� 悋愕惠悽惆悋� ��忰悸 悋���悋惠�忰"

-#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:1934
+#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:1951
 msgid "From last sent message"
 msgstr "�� 悛悽惘 惘愕悋�悸 悖�惘愕��惠"

-#: ../finch/gntprefs.c:96 ../pidgin/gtkprefs.c:840 ../pidgin/gtkprefs.c:848
-#: ../pidgin/gtkprefs.c:1933 ../pidgin/gtkprefs.c:1947
+#: ../finch/gntprefs.c:96 ../pidgin/gtkprefs.c:848 ../pidgin/gtkprefs.c:856
+#: ../pidgin/gtkprefs.c:1950 ../pidgin/gtkprefs.c:1964
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:333
 msgid "Never"
 msgstr "悖惡惆�悋"

 #: ../finch/gntprefs.c:184
 msgid "Show Idle Time"
-msgstr "悋惴�惘 慍�� 悋�愕���"
+msgstr "悖惴�惘 慍�� 悋�愕���"

 #: ../finch/gntprefs.c:185
 msgid "Show Offline Buddies"
-msgstr "悋惴�惘 悋�悖惶惆�悋悄 愃�惘 悋��惠��惶���"
+msgstr "悖惴�惘 悋�悖惶惆�悋悄 愃�惘 悋��惠��惶���"

 #: ../finch/gntprefs.c:192
 msgid "Notify buddies when you are typing"
 msgstr "悖惡�愃 悋�悖惶惆�悋悄 悖�� 惠�惠惡"

-#: ../finch/gntprefs.c:198 ../finch/plugins/gnthistory.c:156
+#: ../finch/gntprefs.c:198 ../finch/plugins/gnthistory.c:153
 msgid "Log format"
 msgstr "惠�愕�� 悋�愕悴�"

-#: ../finch/gntprefs.c:199 ../finch/plugins/gnthistory.c:146
+#: ../finch/gntprefs.c:199 ../finch/plugins/gnthistory.c:143
 msgid "Log IMs"
 msgstr "愕悴�� 悋�惘愕悋悧� 悋���惘�悸"

-#: ../finch/gntprefs.c:200 ../finch/plugins/gnthistory.c:147
+#: ../finch/gntprefs.c:200 ../finch/plugins/gnthistory.c:144
 msgid "Log chats"
 msgstr "愕悴�� 悋�惆惘惆愆悋惠"

@@ -1531,31 +1656,31 @@
 msgstr "愃��惘 悋�忰悋�悸 悒��"

 #. Conversations
-#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:934 ../pidgin/gtkprefs.c:2020
+#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:942 ../pidgin/gtkprefs.c:2037
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:340
 msgid "Conversations"
 msgstr "�忰悋惆惓悋惠"

-#: ../finch/gntprefs.c:260 ../finch/plugins/gnthistory.c:154
-#: ../pidgin/gtkprefs.c:1487 ../pidgin/gtkprefs.c:2031
+#: ../finch/gntprefs.c:260 ../finch/plugins/gnthistory.c:151
+#: ../pidgin/gtkprefs.c:1507 ../pidgin/gtkprefs.c:2048
 msgid "Logging"
 msgstr "惠愕悴��"

-#: ../finch/gntrequest.c:615
+#: ../finch/gntrequest.c:621
 msgid "Not implemented yet."
 msgstr "�� �愀惡� 惡惺惆."

-#: ../finch/gntrequest.c:720 ../pidgin/gtkrequest.c:1547
-#: ../pidgin/gtkrequest.c:1593
+#: ../finch/gntrequest.c:726 ../pidgin/gtkrequest.c:1552
+#: ../pidgin/gtkrequest.c:1598
 msgid "Save File..."
 msgstr "悋忰�惴 悋����..."

-#: ../finch/gntrequest.c:720 ../pidgin/gtkrequest.c:1548
-#: ../pidgin/gtkrequest.c:1594
+#: ../finch/gntrequest.c:726 ../pidgin/gtkrequest.c:1553
+#: ../pidgin/gtkrequest.c:1599
 msgid "Open File..."
 msgstr "悋�惠忰 ���悋..."

-#: ../finch/gntrequest.c:737
+#: ../finch/gntrequest.c:743
 msgid "Choose Location..."
 msgstr "悋悽惠惘 ��惷惺悋..."

@@ -1568,100 +1693,100 @@
 msgstr "悋悴�惡"

 #. Create the window.
-#: ../finch/gntroomlist.c:285 ../finch/gntui.c:97 ../pidgin/gtkroomlist.c:530
+#: ../finch/gntroomlist.c:285 ../finch/gntui.c:101 ../pidgin/gtkroomlist.c:530
 msgid "Room List"
 msgstr "�悋悧�悸 悋�愃惘�"

-#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:62
+#: ../finch/gntsound.c:96 ../pidgin/gtksound.c:62
 msgid "Buddy logs in"
 msgstr "���悴 惶惆��"

-#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:63
+#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:63
 msgid "Buddy logs out"
 msgstr "悽惘�悴 悋�惶惆��"

-#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:64
+#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:64
 msgid "Message received"
 msgstr "惠愕��惠 惘愕悋�悸"

-#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:65
+#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:65
 msgid "Message received begins conversation"
 msgstr "惠愕���� 惘愕悋�悸 �惡惆悖 �忰悋惆惓悸"

-#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:66
+#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:66
 msgid "Message sent"
 msgstr "悖�惘愕��惠 悋�惘愕悋�悸"

-#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:67
+#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:67
 msgid "Person enters chat"
 msgstr "�惆悽� 愆悽惶� 悋�惆惘惆愆悸"

-#: ../finch/gntsound.c:103 ../pidgin/gtksound.c:68
+#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:68
 msgid "Person leaves chat"
 msgstr "�惠惘� 愆悽惶� 悋�惆惘惆愆悸"

-#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:69
+#: ../finch/gntsound.c:103 ../pidgin/gtksound.c:69
 msgid "You talk in chat"
 msgstr "惠惠忰惆惓 �� 悋�惆惘惆愆悸"

-#: ../finch/gntsound.c:105 ../pidgin/gtksound.c:70
+#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:70
 msgid "Others talk in chat"
 msgstr "�惠忰惆惓 悛悽惘�� �� 悋�惆惘惆愆悸"

-#: ../finch/gntsound.c:107 ../pidgin/gtksound.c:73
+#: ../finch/gntsound.c:106 ../pidgin/gtksound.c:73
 msgid "Someone says your screen name in chat"
 msgstr "�悵�惘 愆悽惶� 悋愕��� �� 悋�惆惘惆愆悸"

-#: ../finch/gntsound.c:361 ../pidgin/gtksound.c:306
+#: ../finch/gntsound.c:367 ../pidgin/gtksound.c:309
 msgid "GStreamer Failure"
 msgstr "�愆� GStreamer"

-#: ../finch/gntsound.c:362 ../pidgin/gtksound.c:307
+#: ../finch/gntsound.c:368 ../pidgin/gtksound.c:310
 msgid "GStreamer failed to initialize."
 msgstr "�愆� 悋愕惠惡惆悋悄 GStreamer."

-#: ../finch/gntsound.c:716 ../finch/gntsound.c:802 ../pidgin/gtkprefs.c:1611
-#: ../pidgin/gtkprefs.c:1700 ../pidgin/gtkprefs.c:1876
+#: ../finch/gntsound.c:722 ../finch/gntsound.c:808 ../pidgin/gtkprefs.c:1631
+#: ../pidgin/gtkprefs.c:1720 ../pidgin/gtkprefs.c:1893
 msgid "(default)"
 msgstr "(悋��惡惆悧�)"

-#: ../finch/gntsound.c:729
+#: ../finch/gntsound.c:735
 msgid "Select Sound File ..."
 msgstr "悋悽惠惘 ��� 惶�惠..."

-#: ../finch/gntsound.c:904
+#: ../finch/gntsound.c:910
 msgid "Sound Preferences"
 msgstr "惠�惷��悋惠 悋�惶�惠"

-#: ../finch/gntsound.c:915
+#: ../finch/gntsound.c:921
 msgid "Profiles"
 msgstr "�悋忰悋惠"

-#: ../finch/gntsound.c:954 ../pidgin/gtkprefs.c:1741
+#: ../finch/gntsound.c:960 ../pidgin/gtkprefs.c:1758
 msgid "Automatic"
 msgstr "惠��悋悧�"

-#: ../finch/gntsound.c:957
+#: ../finch/gntsound.c:963
 msgid "Console Beep"
 msgstr "惶悋�惘悸 悋��惘�悋惡"

-#: ../finch/gntsound.c:958 ../pidgin/gtkprefs.c:1745
+#: ../finch/gntsound.c:964 ../pidgin/gtkprefs.c:1762
 msgid "Command"
 msgstr "悖�惘"

-#: ../finch/gntsound.c:959
+#: ../finch/gntsound.c:965
 msgid "No Sound"
 msgstr "惡�悋 惶�惠"

-#: ../finch/gntsound.c:961 ../pidgin/gtkprefs.c:1736
+#: ../finch/gntsound.c:967 ../pidgin/gtkprefs.c:1753
 msgid "Sound Method"
 msgstr "愀惘��悸 悋�惶�惠"

-#: ../finch/gntsound.c:966
+#: ../finch/gntsound.c:972
 msgid "Method: "
 msgstr "悋�愀惘��悸:"

-#: ../finch/gntsound.c:973
+#: ../finch/gntsound.c:979
 #, c-format
 msgid ""
 "Sound Command\n"
@@ -1671,55 +1796,55 @@
 "(%s �悋愕� 悋����)"

 #. Sound options
-#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:1767
+#: ../finch/gntsound.c:987 ../pidgin/gtkprefs.c:1784
 msgid "Sound Options"
 msgstr "悽�悋惘悋惠 悋�惶�惠"

-#: ../finch/gntsound.c:982
+#: ../finch/gntsound.c:988
 msgid "Sounds when conversation has focus"
 msgstr "悖惶惆惘 惶�惠�悋 惺�惆�悋 惠惶惡忰 悋��忰悋惆惓悸 �忰� 悋�悋�惠惡悋�"

-#: ../finch/gntsound.c:990 ../pidgin/gtkprefs.c:838 ../pidgin/gtkprefs.c:850
-#: ../pidgin/gtkprefs.c:1774 ../pidgin/plugins/timestamp_format.c:42
+#: ../finch/gntsound.c:996 ../pidgin/gtkprefs.c:846 ../pidgin/gtkprefs.c:858
+#: ../pidgin/gtkprefs.c:1791 ../pidgin/plugins/timestamp_format.c:42
 #: ../pidgin/plugins/timestamp_format.c:51
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:334
 msgid "Always"
 msgstr "惆悋悧��悋"

-#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:1772
+#: ../finch/gntsound.c:997 ../pidgin/gtkprefs.c:1789
 msgid "Only when available"
 msgstr "��愀 惺�惆�悋 ���� �惠悋忰悋"

-#: ../finch/gntsound.c:992 ../pidgin/gtkprefs.c:1773
+#: ../finch/gntsound.c:998 ../pidgin/gtkprefs.c:1790
 msgid "Only when not available"
 msgstr "��愀 惺�惆�悋 �悋 ���� �惠悋忰悋"

-#: ../finch/gntsound.c:999
+#: ../finch/gntsound.c:1005
 msgid "Volume(0-100):"
 msgstr "悋�惶�惠(0-100):"

 #. Sound events
-#: ../finch/gntsound.c:1018 ../pidgin/gtkprefs.c:1802
+#: ../finch/gntsound.c:1024 ../pidgin/gtkprefs.c:1819
 msgid "Sound Events"
 msgstr "悋�悖忰惆悋惓 悋�惶�惠��悸"

-#: ../finch/gntsound.c:1020 ../pidgin/gtkprefs.c:1861
+#: ../finch/gntsound.c:1026 ../pidgin/gtkprefs.c:1878
 msgid "Event"
 msgstr "忰惆惓"

-#: ../finch/gntsound.c:1020
+#: ../finch/gntsound.c:1026
 msgid "File"
 msgstr "���"

-#: ../finch/gntsound.c:1039 ../pidgin/gtkprefs.c:1880
+#: ../finch/gntsound.c:1045 ../pidgin/gtkprefs.c:1897
 msgid "Test"
 msgstr "悋悽惠惡惘"

-#: ../finch/gntsound.c:1042 ../pidgin/gtkprefs.c:1884
+#: ../finch/gntsound.c:1048 ../pidgin/gtkprefs.c:1901
 msgid "Reset"
 msgstr "惶��惘"

-#: ../finch/gntsound.c:1045 ../pidgin/gtkprefs.c:1888
+#: ../finch/gntsound.c:1051 ../pidgin/gtkprefs.c:1905
 msgid "Choose..."
 msgstr "悋悽惠惘..."

@@ -1737,9 +1862,10 @@
 msgstr "悋�忰悋�悋惠 悋��忰��惴悸"

 #: ../finch/gntstatus.c:183 ../finch/gntstatus.c:539
-#: ../libpurple/protocols/jabber/buddy.c:298
-#: ../libpurple/protocols/jabber/buddy.c:1361
-#: ../libpurple/protocols/msn/msn.c:723
+#: ../libpurple/protocols/jabber/buddy.c:326
+#: ../libpurple/protocols/jabber/buddy.c:1396
+#: ../libpurple/protocols/msn/msn.c:747
+#: ../libpurple/protocols/myspace/myspace.c:171
 #: ../libpurple/protocols/novell/novell.c:1493
 #: ../pidgin/gtksavedstatuses.c:500
 msgid "Title"
@@ -1765,37 +1891,37 @@
 #: ../libpurple/protocols/gg/gg.c:1605 ../libpurple/protocols/gg/gg.c:1615
 #: ../libpurple/protocols/gg/gg.c:1621 ../libpurple/protocols/gg/gg.c:1630
 #: ../libpurple/protocols/gg/gg.c:1635 ../libpurple/protocols/irc/irc.c:245
-#: ../libpurple/protocols/jabber/jabber.c:1599
-#: ../libpurple/protocols/jabber/jabber.c:1613
-#: ../libpurple/protocols/jabber/jabber.c:1627
-#: ../libpurple/protocols/jabber/jabber.c:1641
-#: ../libpurple/protocols/jabber/jabber.c:1655
-#: ../libpurple/protocols/jabber/jabber.c:1671
-#: ../libpurple/protocols/msn/msn.c:675 ../libpurple/protocols/msn/msn.c:681
-#: ../libpurple/protocols/msn/msn.c:687 ../libpurple/protocols/msn/msn.c:693
-#: ../libpurple/protocols/msn/msn.c:698 ../libpurple/protocols/msn/msn.c:703
+#: ../libpurple/protocols/jabber/jabber.c:1611
+#: ../libpurple/protocols/jabber/jabber.c:1625
+#: ../libpurple/protocols/jabber/jabber.c:1639
+#: ../libpurple/protocols/jabber/jabber.c:1653
+#: ../libpurple/protocols/jabber/jabber.c:1667
+#: ../libpurple/protocols/jabber/jabber.c:1683
+#: ../libpurple/protocols/msn/msn.c:699 ../libpurple/protocols/msn/msn.c:705
+#: ../libpurple/protocols/msn/msn.c:711 ../libpurple/protocols/msn/msn.c:717
+#: ../libpurple/protocols/msn/msn.c:722 ../libpurple/protocols/msn/msn.c:727
 #: ../libpurple/protocols/myspace/myspace.c:148
-#: ../libpurple/protocols/novell/novell.c:2855
-#: ../libpurple/protocols/novell/novell.c:2958
-#: ../libpurple/protocols/novell/novell.c:2964
-#: ../libpurple/protocols/novell/novell.c:2970
-#: ../libpurple/protocols/oscar/oscar.c:5595
-#: ../libpurple/protocols/oscar/oscar.c:5813
-#: ../libpurple/protocols/oscar/oscar.c:5827
-#: ../libpurple/protocols/oscar/oscar.c:5843
-#: ../libpurple/protocols/oscar/oscar.c:5850
-#: ../libpurple/protocols/oscar/oscar.c:5857
-#: ../libpurple/protocols/sametime/sametime.c:3328
-#: ../libpurple/protocols/sametime/sametime.c:3334
-#: ../libpurple/protocols/sametime/sametime.c:3340
-#: ../libpurple/protocols/sametime/sametime.c:3419
+#: ../libpurple/protocols/novell/novell.c:2856
+#: ../libpurple/protocols/novell/novell.c:2959
+#: ../libpurple/protocols/novell/novell.c:2965
+#: ../libpurple/protocols/novell/novell.c:2971
+#: ../libpurple/protocols/oscar/oscar.c:5683
+#: ../libpurple/protocols/oscar/oscar.c:5901
+#: ../libpurple/protocols/oscar/oscar.c:5915
+#: ../libpurple/protocols/oscar/oscar.c:5931
+#: ../libpurple/protocols/oscar/oscar.c:5938
+#: ../libpurple/protocols/oscar/oscar.c:5945
+#: ../libpurple/protocols/sametime/sametime.c:3337
+#: ../libpurple/protocols/sametime/sametime.c:3343
+#: ../libpurple/protocols/sametime/sametime.c:3349
+#: ../libpurple/protocols/sametime/sametime.c:3428
 #: ../libpurple/protocols/silc/buddy.c:1554
 #: ../libpurple/protocols/silc10/buddy.c:1554
 #: ../libpurple/protocols/simple/simple.c:247
-#: ../libpurple/protocols/yahoo/yahoo.c:3807
 #: ../libpurple/protocols/yahoo/yahoo.c:3813
-#: ../libpurple/protocols/zephyr/zephyr.c:2337
-#: ../pidgin/gtksavedstatuses.c:526 ../pidgin/gtksavedstatuses.c:999
+#: ../libpurple/protocols/yahoo/yahoo.c:3819
+#: ../libpurple/protocols/zephyr/zephyr.c:2352
+#: ../pidgin/gtksavedstatuses.c:526 ../pidgin/gtksavedstatuses.c:1001
 msgid "Message"
 msgstr "惘愕悋�悸"

@@ -1845,15 +1971,15 @@
 msgid "Save & Use"
 msgstr "悋忰�惴�悋 � 悋愕惠悽惆��悋"

-#: ../finch/gntui.c:93
+#: ../finch/gntui.c:97
 msgid "Certificates"
 msgstr "悋�愆��悋惆悋惠"

-#: ../finch/gntui.c:98 ../pidgin/gtkprefs.c:2022
+#: ../finch/gntui.c:102 ../pidgin/gtkprefs.c:2039
 msgid "Sounds"
 msgstr "悋�悖惶�悋惠"

-#: ../finch/gntui.c:100
+#: ../finch/gntui.c:104
 msgid "Statuses"
 msgstr "悋�忰悋�悋惠"

@@ -1949,16 +2075,16 @@
 msgid "Toaster plugin"
 msgstr "��忰�悸 悋��忰�惶悸"

-#: ../finch/plugins/gnthistory.c:117 ../pidgin/plugins/history.c:125
+#: ../finch/plugins/gnthistory.c:114 ../pidgin/plugins/history.c:125
 #, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
 msgstr "<b>�忰悋惆惓悸 �惺 %s 惺�� %s:</b><br>"

-#: ../finch/plugins/gnthistory.c:175 ../pidgin/plugins/history.c:153
+#: ../finch/plugins/gnthistory.c:172 ../pidgin/plugins/history.c:153
 msgid "History Plugin Requires Logging"
 msgstr "��忰�悸 悋��忰��惴悋惠 惠惠愀�惡 悋�愕悴��"

-#: ../finch/plugins/gnthistory.c:176 ../pidgin/plugins/history.c:154
+#: ../finch/plugins/gnthistory.c:173 ../pidgin/plugins/history.c:154
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
 "\n"
@@ -1969,15 +2095,15 @@
 "\n"
 "惠�惺�� 悋�愕悴�悋惠 ��惠惘悋愕� ��惘� �/悖� 悋�惆惘惆愆悋惠 愕��惺� 悋��忰��惴悋惠 �悵悋惠 ��惺 悋��忰悋惆惓悸."

-#: ../finch/plugins/gnthistory.c:220
+#: ../finch/plugins/gnthistory.c:217
 msgid "GntHistory"
 msgstr "GntHistory"

-#: ../finch/plugins/gnthistory.c:222 ../pidgin/plugins/history.c:197
+#: ../finch/plugins/gnthistory.c:219 ../pidgin/plugins/history.c:197
 msgid "Shows recently logged conversations in new conversations."
 msgstr "悋惺惘惷 悋��忰悋惆惓悋惠 悋��愕悴�悸 忰惆�惓�悋 �� �忰悋惆惓悋惠 悴惆�惆悸."

-#: ../finch/plugins/gnthistory.c:223 ../pidgin/plugins/history.c:198
+#: ../finch/plugins/gnthistory.c:220 ../pidgin/plugins/history.c:198
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
@@ -1985,6 +2111,48 @@
 "惺�惆�悋 惠惡惆悖 �忰悋惆惓悸 悴惆�惆悸 愕惠惆惘悴 �悵� 悋���忰�悸 �惶� 悋��忰悋惆惓悸 悋�愕悋惡�悸 �� 悋��忰悋惆惓悸 "
 "悋�忰悋��悸."

+#: ../finch/plugins/grouping.c:42 ../libpurple/protocols/oscar/oscar.c:740
+msgid "Online"
+msgstr "�惠惶�"
+
+#: ../finch/plugins/grouping.c:44 ../finch/plugins/grouping.c:145
+#: ../libpurple/protocols/gg/gg.c:1010
+#: ../libpurple/protocols/jabber/buddy.c:2081
+#: ../libpurple/protocols/novell/novell.c:2846
+#: ../libpurple/protocols/oscar/oscar.c:829
+#: ../libpurple/protocols/oscar/oscar.c:5733
+#: ../libpurple/protocols/qq/qq.c:171 ../libpurple/protocols/qq/qq.c:178
+#: ../libpurple/protocols/qq/qq.c:293
+#: ../libpurple/protocols/yahoo/yahoo.c:3156 ../libpurple/status.c:154
+#: ../pidgin/gtkblist.c:3333 ../pidgin/gtkblist.c:3725
+#: ../pidgin/gtkdocklet.c:561 ../pidgin/gtkstatusbox.c:1085
+msgid "Offline"
+msgstr "愃�惘 �惠惶�"
+
+#: ../finch/plugins/grouping.c:117 ../pidgin/gtkblist.c:3369
+msgid "Online Buddies"
+msgstr "悋�悖惶惆�悋悄 悋��惠��惶���"
+
+#: ../finch/plugins/grouping.c:117
+msgid "Offline Buddies"
+msgstr "悋�悖惶惆�悋悄 愃�惘 悋��惠��惶���"
+
+#: ../finch/plugins/grouping.c:127
+msgid "Online/Offline"
+msgstr "�惠惶�/愃�惘 �惠�惶�"
+
+#: ../finch/plugins/grouping.c:168
+msgid "Meebo"
+msgstr "��惡�"
+
+#: ../finch/plugins/grouping.c:217
+msgid "No Grouping"
+msgstr "惡�悋 惠悴��惺"
+
+#: ../finch/plugins/grouping.c:257 ../finch/plugins/grouping.c:258
+msgid "Provides alternate buddylist grouping options."
+msgstr "���惘 悽惶悋悧惶 悋�惠悴��惺 悋�惡惆�� ���悋悧� 悋�悖惶惆�悋悄."
+
 #: ../finch/plugins/lastlog.c:69
 msgid "Lastlog"
 msgstr "悛悽惘 愕悴�"
@@ -2002,88 +2170,88 @@
 msgid "Lastlog plugin."
 msgstr "��忰�悸 悛悽惘 愕悴�."

-#: ../libpurple/account.c:886
+#: ../libpurple/account.c:887
 msgid "accounts"
 msgstr "悋�忰愕悋惡悋惠"

-#: ../libpurple/account.c:1061 ../libpurple/protocols/jabber/auth.c:199
+#: ../libpurple/account.c:1063 ../libpurple/protocols/jabber/auth.c:199
 msgid "Password is required to sign on."
 msgstr "���悸 悋�愕惘 �愀��惡悸 �����悴."

-#: ../libpurple/account.c:1095
+#: ../libpurple/account.c:1097
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "悖惆悽� ���悸 愕惘 %s (%s)"

-#: ../libpurple/account.c:1102
+#: ../libpurple/account.c:1104
 msgid "Enter Password"
 msgstr "悖惆悽� ���悸 悋�愕惘"

-#: ../libpurple/account.c:1107
+#: ../libpurple/account.c:1109
 msgid "Save password"
 msgstr "悋忰�惴 ���悸 悋�愕惘"

-#: ../libpurple/account.c:1142 ../libpurple/connection.c:107
-#: ../libpurple/connection.c:180
+#: ../libpurple/account.c:1144 ../libpurple/connection.c:118
+#: ../libpurple/connection.c:191
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "�悋 惠�悴惆 ��忰�悸 惡惘�惠���� �悖悴� %s"

-#: ../libpurple/account.c:1144 ../libpurple/connection.c:110
+#: ../libpurple/account.c:1146 ../libpurple/connection.c:121
 msgid "Connection Error"
 msgstr "惺�愀� �� 悋�悋惠惶悋�"

-#: ../libpurple/account.c:1355 ../libpurple/protocols/gg/gg.c:708
-#: ../libpurple/protocols/jabber/jabber.c:1727
+#: ../libpurple/account.c:1357 ../libpurple/protocols/gg/gg.c:708
+#: ../libpurple/protocols/jabber/jabber.c:1739
 msgid "New passwords do not match."
 msgstr "���悋惠 悋�愕惘 悋�悴惆�惆悸 愃�惘 �愀悋惡�悸."

-#: ../libpurple/account.c:1364
+#: ../libpurple/account.c:1366
 msgid "Fill out all fields completely."
 msgstr "悋��悖 �� 悋�忰��� 惡悋��悋��."

-#: ../libpurple/account.c:1387
+#: ../libpurple/account.c:1389
 msgid "Original password"
 msgstr "���悸 悋�愕惘 悋�悖惶��悸"

-#: ../libpurple/account.c:1394
+#: ../libpurple/account.c:1396
 msgid "New password"
 msgstr "���悸 愕惘 悴惆�惆悸"

-#: ../libpurple/account.c:1401
+#: ../libpurple/account.c:1403
 msgid "New password (again)"
 msgstr "���悸 悋�愕惘 悋�悴惆�惆悸 (�悴惆惆�悋)"

-#: ../libpurple/account.c:1407
+#: ../libpurple/account.c:1409
 #, c-format
 msgid "Change password for %s"
 msgstr "愃��惘 ���悸 愕惘 %s"

-#: ../libpurple/account.c:1415
+#: ../libpurple/account.c:1417
 msgid "Please enter your current password and your new password."
 msgstr "�� �惷�� 悖惆悽� ���悸 悋�愕惘 悋�忰悋��悸 ����悸 悋�愕惘 悋�悴惆�惆悸."

-#: ../libpurple/account.c:1446
+#: ../libpurple/account.c:1448
 #, c-format
 msgid "Change user information for %s"
 msgstr "愃��惘 �惺���悋惠 悋��愕惠悽惆� �悖悴� %s"

-#: ../libpurple/account.c:1449 ../libpurple/protocols/toc/toc.c:1670
+#: ../libpurple/account.c:1451 ../libpurple/protocols/toc/toc.c:1670
 msgid "Set User Info"
 msgstr "悋��悖 �惺���悋惠 悋��愕惠悽惆�"

-#: ../libpurple/account.c:1920 ../libpurple/protocols/gg/gg.c:1019
-#: ../libpurple/protocols/jabber/buddy.c:782
-#: ../libpurple/protocols/jabber/buddy.c:2032
-#: ../libpurple/protocols/jabber/buddy.c:2049
-#: ../libpurple/protocols/novell/novell.c:2848
+#: ../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/protocols/novell/novell.c:2849
 #: ../libpurple/protocols/qq/qq.c:233 ../pidgin/gtkft.c:166
 msgid "Unknown"
 msgstr "�悴���"

-#: ../libpurple/blist.c:521 ../libpurple/blist.c:1321
-#: ../libpurple/blist.c:1531 ../libpurple/protocols/jabber/roster.c:69
-#: ../libpurple/protocols/myspace/myspace.c:3300 ../pidgin/gtkblist.c:6125
+#: ../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
 #: ../pidgin/plugins/gevolution/gevo-util.c:67
 #: ../pidgin/plugins/gevolution/gevolution.c:96
 msgid "Buddies"
@@ -2147,9 +2315,9 @@

 #: ../libpurple/certificate.c:1209 ../libpurple/protocols/qq/buddy_opt.c:214
 #: ../libpurple/protocols/qq/group_im.c:144
-#: ../libpurple/protocols/qq/group_opt.c:102
-#: ../libpurple/protocols/qq/sys_msg.c:90
-#: ../libpurple/protocols/qq/sys_msg.c:246
+#: ../libpurple/protocols/qq/group_opt.c:103
+#: ../libpurple/protocols/qq/sys_msg.c:91
+#: ../libpurple/protocols/qq/sys_msg.c:249
 msgid "Reject"
 msgstr "悋惘�惷"

@@ -2246,26 +2414,26 @@
 msgid "Certificate Information"
 msgstr "�惺���悋惠 悋�愆�悋惆悸"

-#: ../libpurple/connection.c:109
+#: ../libpurple/connection.c:120
 msgid "Registration Error"
 msgstr "悽愀悖 �� 悋�惠愕悴��"

-#: ../libpurple/connection.c:182
+#: ../libpurple/connection.c:193
 msgid "Unregistration Error"
 msgstr "悽愀悖 �� 悒�愃悋悄 悋�惠愕悴��"

-#: ../libpurple/connection.c:336
+#: ../libpurple/connection.c:347
 #, c-format
 msgid "+++ %s signed on"
 msgstr "+++ %s ��悴"

-#: ../libpurple/connection.c:366
+#: ../libpurple/connection.c:377
 #, c-format
 msgid "+++ %s signed off"
 msgstr "+++ %s 悽惘悴"

-#: ../libpurple/connection.c:511 ../libpurple/plugin.c:277
-#: ../libpurple/protocols/jabber/buddy.c:2352
+#: ../libpurple/connection.c:530 ../libpurple/plugin.c:277
+#: ../libpurple/protocols/jabber/buddy.c:2397
 #: ../libpurple/protocols/msn/servconn.c:141
 #: ../libpurple/protocols/msn/session.c:377
 #: ../libpurple/protocols/msnp9/servconn.c:139
@@ -2292,55 +2460,55 @@
 msgid "Unable to send message."
 msgstr "惠惺悵�惘 悒惘愕悋� 悋�惘愕悋�悸."

-#: ../libpurple/conversation.c:1215
+#: ../libpurple/conversation.c:1218
 msgid "Send Message"
 msgstr "悖惘愕� 惘愕悋�悸"

-#: ../libpurple/conversation.c:1218
+#: ../libpurple/conversation.c:1221
 msgid "_Send Message"
 msgstr "悖_惘愕� 惘愕悋�悸"

-#: ../libpurple/conversation.c:1624
+#: ../libpurple/conversation.c:1627
 #, c-format
 msgid "%s entered the room."
 msgstr "%s 惆悽� 悋�愃惘�悸."

-#: ../libpurple/conversation.c:1627
+#: ../libpurple/conversation.c:1630
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] 惆悽� 悋�愃惘�悸."

-#: ../libpurple/conversation.c:1737
+#: ../libpurple/conversation.c:1740
 #, c-format
 msgid "You are now known as %s"
 msgstr "%s 悖�惠 悋�悛� �惺惘�� 惡悋愕�"

-#: ../libpurple/conversation.c:1757
+#: ../libpurple/conversation.c:1760
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s ��惺惘� 悋�悛� 惡悋愕� %s"

-#: ../libpurple/conversation.c:1832
+#: ../libpurple/conversation.c:1835
 #, c-format
 msgid "%s left the room."
 msgstr "%s 惠惘� 悋�愃惘�悸."

-#: ../libpurple/conversation.c:1835
+#: ../libpurple/conversation.c:1838
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s 惠惘� 悋�愃惘�悸 (%s)."

-#: ../libpurple/dbus-server.c:584
+#: ../libpurple/dbus-server.c:586
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "惠惺悵��惘 悋�悋惠惶悋�: %s"

-#: ../libpurple/dbus-server.c:596
+#: ../libpurple/dbus-server.c:598
 #, c-format
 msgid "Failed to get name: %s"
 msgstr "惠惺悵�惘 悋�忰惶�� 惺�� 悋�悋愕�: %s"

-#: ../libpurple/dbus-server.c:610
+#: ../libpurple/dbus-server.c:612
 #, c-format
 msgid "Failed to get serv name: %s"
 msgstr "惠惺悵�惘 悋�忰惶�� 惺�� 悋愕� 悋�悽悋惆��: %s"
@@ -2353,15 +2521,15 @@
 msgid "No name"
 msgstr "惡�悋 悋愕�"

-#: ../libpurple/dnsquery.c:511
+#: ../libpurple/dnsquery.c:532
 msgid "Unable to create new resolver process\n"
 msgstr "惠惺悵�惘 悒�愆悋悄 惶�惘�惘悸 悋愕惠悴�悋悄 悴惆�惆悸\n"

-#: ../libpurple/dnsquery.c:516
+#: ../libpurple/dnsquery.c:537
 msgid "Unable to send request to resolver process\n"
 msgstr "惠惺悵�惘 悒惘愕悋� 悋�愀�惡 �惶�惘�惘悸 悋�悋愕惠悴�悋悄\n"

-#: ../libpurple/dnsquery.c:549 ../libpurple/dnsquery.c:698
+#: ../libpurple/dnsquery.c:570 ../libpurple/dnsquery.c:719
 #, c-format
 msgid ""
 "Error resolving %s:\n"
@@ -2370,13 +2538,13 @@
 "惺愀� �� 悋愕惠悴�悋悄 %s:\n"
 "%s"

-#: ../libpurple/dnsquery.c:552 ../libpurple/dnsquery.c:712
-#: ../libpurple/dnsquery.c:830
+#: ../libpurple/dnsquery.c:573 ../libpurple/dnsquery.c:733
+#: ../libpurple/dnsquery.c:851
 #, c-format
 msgid "Error resolving %s: %d"
 msgstr "惺愀� �� 悋愕惠悴�悋悄 %s: %Id"

-#: ../libpurple/dnsquery.c:574
+#: ../libpurple/dnsquery.c:595
 #, c-format
 msgid ""
 "Error reading from resolver process:\n"
@@ -2385,20 +2553,20 @@
 "惺愀� �� 悋��惘悋悄悸 �� 惶�惘�惘悸 悋�悋愕惠悴�悋悄:\n"
 "%s"

-#: ../libpurple/dnsquery.c:578
+#: ../libpurple/dnsquery.c:599
 msgid "EOF while reading from resolver process"
 msgstr "��悋�悸 悋���� (EOF) 悖惓�悋悄 悋��惘悋悄悸 �� 惶�惘�惘悸 悋�悋愕惠悴�悋悄"

-#: ../libpurple/dnsquery.c:762
+#: ../libpurple/dnsquery.c:783
 #, c-format
 msgid "Thread creation failure: %s"
 msgstr "�愆� 悒�愆悋悄 悋�悽�愀: %s"

-#: ../libpurple/dnsquery.c:763
+#: ../libpurple/dnsquery.c:784
 msgid "Unknown reason"
 msgstr "愕惡惡 �悴���"

-#: ../libpurple/ft.c:209
+#: ../libpurple/ft.c:210
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -2407,7 +2575,7 @@
 "惺愀� �� �惘悋悄悸 %s: \n"
 "%s.\n"

-#: ../libpurple/ft.c:213
+#: ../libpurple/ft.c:214
 #, c-format
 msgid ""
 "Error writing %s: \n"
@@ -2416,7 +2584,7 @@
 "惺愀� �� �惠悋惡悸 %s: \n"
 "%s.\n"

-#: ../libpurple/ft.c:217
+#: ../libpurple/ft.c:218
 #, c-format
 msgid ""
 "Error accessing %s: \n"
@@ -2425,39 +2593,39 @@
 "惺愀� �� 悋���悋悵 悒�� %s: \n"
 "%s.\n"

-#: ../libpurple/ft.c:253
+#: ../libpurple/ft.c:254
 msgid "Directory is not writable."
 msgstr "悋�惆��� �悋 ���� 悋��惠悋惡悸 ���."

-#: ../libpurple/ft.c:268
+#: ../libpurple/ft.c:269
 msgid "Cannot send a file of 0 bytes."
 msgstr "�悋 ���� 悒惘愕悋� ��� 忰悴�� 惶�惘 惡悋�惠."

-#: ../libpurple/ft.c:278
+#: ../libpurple/ft.c:279
 msgid "Cannot send a directory."
 msgstr "�悋 ���� 悒惘愕悋� 惆���."

-#: ../libpurple/ft.c:287
+#: ../libpurple/ft.c:288
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s��愕 ���悋 惠���惆�悋. �� 悖悽悋愀惘 惡悋��惠悋惡悸 ����.\n"

-#: ../libpurple/ft.c:347
+#: ../libpurple/ft.c:348
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s �惘�惆 悖� �惘愕� 悒��� %s (%s)"

-#: ../libpurple/ft.c:354
+#: ../libpurple/ft.c:355
 #, c-format
 msgid "%s wants to send you a file"
 msgstr "%s �惘�惆 悖� �惘愕� ���悋 悒���"

-#: ../libpurple/ft.c:397
+#: ../libpurple/ft.c:398
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "悖悖�惡� 愀�惡 悒惘愕悋� ��� �� %s�"

-#: ../libpurple/ft.c:401
+#: ../libpurple/ft.c:402
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -2468,60 +2636,60 @@
 "悋��惷�� 悋�惡惺�惆: %s\n"
 "悋����悵 悋�惡惺�惆: %Id"

-#: ../libpurple/ft.c:436
+#: ../libpurple/ft.c:437
 #, c-format
 msgid "%s is offering to send file %s"
 msgstr "%s �惺惘惷 惺��� 悒惘愕悋� ��� %s"

-#: ../libpurple/ft.c:489
+#: ../libpurple/ft.c:490
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s ��愕 悋愕�悋 惶忰�忰悋 ����.\n"

-#: ../libpurple/ft.c:510
+#: ../libpurple/ft.c:511
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "�悴惘� 惺惘惷 悒惘愕悋� %s 悒�� %s"

-#: ../libpurple/ft.c:522
+#: ../libpurple/ft.c:523
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr "惡惆悄 ��� %s �� %s"

-#: ../libpurple/ft.c:683
+#: ../libpurple/ft.c:700
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "悋�惠�� ��� 悋���� %s"

-#: ../libpurple/ft.c:686
+#: ../libpurple/ft.c:703
 msgid "File transfer complete"
 msgstr "悋�惠�� ��� 悋����"

-#: ../libpurple/ft.c:1109
+#: ../libpurple/ft.c:1138
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "悖�愃�惠� ��� %s"

-#: ../libpurple/ft.c:1114
+#: ../libpurple/ft.c:1143
 msgid "File transfer cancelled"
 msgstr "悖��愃��� ��� 悋����"

-#: ../libpurple/ft.c:1172
+#: ../libpurple/ft.c:1201
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s 悖�愃� ��� %s"

-#: ../libpurple/ft.c:1177
+#: ../libpurple/ft.c:1206
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s 悖�愃� ��� 悋����"

-#: ../libpurple/ft.c:1234
+#: ../libpurple/ft.c:1263
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "�愆� ��� 悋���� 悒�� %s."

-#: ../libpurple/ft.c:1236
+#: ../libpurple/ft.c:1265
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "�愆� ��� 悋���� �� %s."
@@ -2832,14 +3000,14 @@

 #: ../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:1450
-#: ../libpurple/protocols/oscar/oscar.c:2242
-#: ../libpurple/protocols/oscar/oscar.c:2291
-#: ../libpurple/protocols/oscar/oscar.c:5927
-#: ../libpurple/protocols/oscar/oscar.c:5982
-#: ../libpurple/protocols/oscar/oscar.c:6208
-#: ../libpurple/protocols/oscar/oscar.c:6278 ../libpurple/request.h:1454
-#: ../libpurple/request.h:1464 ../pidgin/gtkblist.c:551
+#: ../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/request.h:1411
 msgid "_Cancel"
 msgstr "悋_�愃�"

@@ -2880,10 +3048,10 @@
 "悖惡�愃� 惡�悋�悵悸 ��惡惓�悸 惺�惆�悋 ��惠�� ��� 悋����悋惠 悋�惠��悋悧�\n"
 "(��愀 悒悵悋 �� 惠�� ��悋� �忰悋惆惓悸 �惺 悋��惘愕�)"

-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1806
-#: ../libpurple/protocols/msn/msn.c:1836
-#: ../libpurple/protocols/msnp9/msn.c:1661
-#: ../libpurple/protocols/msnp9/msn.c:1691
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1830
+#: ../libpurple/protocols/msn/msn.c:1860
+#: ../libpurple/protocols/msnp9/msn.c:1671
+#: ../libpurple/protocols/msnp9/msn.c:1701
 msgid "Notes"
 msgstr "��悋忰惴悋惠"

@@ -3062,15 +3230,15 @@
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
 msgstr "惆惺� 悽悋惆��� 悋悽惠惡悋惘 IPC. 惠愕悴� 悖�悋�惘 IPC."

-#: ../libpurple/plugins/joinpart.c:229
+#: ../libpurple/plugins/joinpart.c:228
 msgid "Join/Part Hiding Configuration"
 msgstr "悒惺惆悋惆悋惠 忰悴惡 悋�悋�惷�悋� � 悋��惘悋�"

-#: ../libpurple/plugins/joinpart.c:233
+#: ../libpurple/plugins/joinpart.c:232
 msgid "Minimum Room Size"
 msgstr "悋�忰悴� 悋�悖惆�� ��愃惘�悸"

-#: ../libpurple/plugins/joinpart.c:239
+#: ../libpurple/plugins/joinpart.c:238
 msgid "User Inactivity Timeout (in minutes)"
 msgstr "�惆悸 惺惆� �愆悋愀 悋��愕惠悽惆� (惡悋�惆�悋悧�)"

@@ -3080,19 +3248,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/joinpart.c:270
+#: ../libpurple/plugins/joinpart.c:269
 msgid "Join/Part Hiding"
 msgstr "悒悽�悋悄 悋�悋�惷�悋� � 悋��惘悋�"

 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/plugins/joinpart.c:273
+#: ../libpurple/plugins/joinpart.c:272
 msgid "Hides extraneous join/part messages."
 msgstr "�悽�� 惘愕悋悧� 悋�悋�惷�悋� � 悋��惘悋� 悋�悽悋惘悴�悸."

 #. *  description
-#: ../libpurple/plugins/joinpart.c:275
+#: ../libpurple/plugins/joinpart.c:274
 msgid ""
 "This plugin hides join/part messages in large rooms, except for those users "
 "actively taking part in a conversation."
@@ -3292,7 +3460,9 @@
 msgid ""
 "Prepends a newline to messages so that the rest of the message appears below "
 "the screen name in the conversation window."
-msgstr "惠惷�� 愕愀惘悋 悴惆�惆悋 �� 悖�� 悋�惘愕悋悧� �惠惴�惘 悋�惘愕悋�悸 惠忰惠 ���悸 悋��愕惠悽惆� �� �悋�悵悸 悋��忰悋惆惓悸. "
+msgstr ""
+"惠惷�� 愕愀惘悋 悴惆�惆悋 �� 悖�� 悋�惘愕悋悧� �惠惴�惘 悋�惘愕悋�悸 惠忰惠 ���悸 悋��愕惠悽惆� �� �悋�悵悸 "
+"悋��忰悋惆惓悸."

 #: ../libpurple/plugins/offlinemsg.c:23
 msgid "Offline Message Emulation"
@@ -3315,7 +3485,9 @@
 msgid ""
 "\"%s\" is currently offline. Do you want to save the rest of the messages in "
 "a pounce and automatically send them when \"%s\" logs back in?"
-msgstr "��\"%s\"  愃�惘 �惠惶� 忰悋��悋. �� 惠惘�惆 忰�惴 悋��惠惡�� �� 悋�惘愕悋悧� �� 悒愆惺悋惘 � 悒惘愕悋��悋 惠��悋悧��悋 惺�惆�悋 ��悴 \"%s\" 惓悋��悸�"
+msgstr ""
+"��\"%s\"  愃�惘 �惠惶� 忰悋��悋. �� 惠惘�惆 忰�惴 悋��惠惡�� �� 悋�惘愕悋悧� �� 悒愆惺悋惘 � 悒惘愕悋��悋 "
+"惠��悋悧��悋 惺�惆�悋 ��悴 \"%s\" 惓悋��悸�"

 #: ../libpurple/plugins/offlinemsg.c:160
 msgid "Offline Message"
@@ -3327,11 +3499,11 @@

 #: ../libpurple/plugins/offlinemsg.c:165
 #: ../libpurple/protocols/msn/dialog.c:141
-#: ../libpurple/protocols/msn/msn.c:663
+#: ../libpurple/protocols/msn/msn.c:675
 #: ../libpurple/protocols/msnp9/dialog.c:133
-#: ../libpurple/protocols/msnp9/msn.c:550
-#: ../libpurple/protocols/msnp9/msn.c:564
-#: ../libpurple/protocols/novell/novell.c:1928
+#: ../libpurple/protocols/msnp9/msn.c:547
+#: ../libpurple/protocols/msnp9/msn.c:563
+#: ../libpurple/protocols/novell/novell.c:1929
 #: ../libpurple/protocols/silc/buddy.c:317
 #: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:308
 #: ../libpurple/protocols/silc10/buddy.c:314
@@ -3342,11 +3514,11 @@

 #: ../libpurple/plugins/offlinemsg.c:166
 #: ../libpurple/protocols/msn/dialog.c:142
-#: ../libpurple/protocols/msn/msn.c:663
+#: ../libpurple/protocols/msn/msn.c:675
 #: ../libpurple/protocols/msnp9/dialog.c:134
-#: ../libpurple/protocols/msnp9/msn.c:550
-#: ../libpurple/protocols/msnp9/msn.c:564
-#: ../libpurple/protocols/novell/novell.c:1929
+#: ../libpurple/protocols/msnp9/msn.c:547
+#: ../libpurple/protocols/msnp9/msn.c:563
+#: ../libpurple/protocols/novell/novell.c:1930
 #: ../libpurple/protocols/silc/buddy.c:318
 #: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:309
 #: ../libpurple/protocols/silc10/buddy.c:315
@@ -3613,39 +3785,39 @@

 #. Creating the options for the protocol
 #: ../libpurple/protocols/bonjour/bonjour.c:392
-#: ../libpurple/protocols/bonjour/bonjour.c:697
+#: ../libpurple/protocols/bonjour/bonjour.c:698
 #: ../libpurple/protocols/gg/gg.c:633
-#: ../libpurple/protocols/jabber/jabber.c:994
+#: ../libpurple/protocols/jabber/jabber.c:1006
 msgid "First name"
 msgstr "悋�悋愕� 悋�悖��"

 #: ../libpurple/protocols/bonjour/bonjour.c:394
-#: ../libpurple/protocols/bonjour/bonjour.c:700
+#: ../libpurple/protocols/bonjour/bonjour.c:701
 #: ../libpurple/protocols/gg/gg.c:628
-#: ../libpurple/protocols/jabber/jabber.c:998
+#: ../libpurple/protocols/jabber/jabber.c:1010
 msgid "Last name"
 msgstr "悋愕� 悋�惺悋悧�悸"

 #: ../libpurple/protocols/bonjour/bonjour.c:398
-#: ../libpurple/protocols/jabber/buddy.c:295
-#: ../libpurple/protocols/jabber/buddy.c:1327
-#: ../libpurple/protocols/jabber/buddy.c:1337
-#: ../libpurple/protocols/jabber/buddy.c:2221
-#: ../libpurple/protocols/silc/ops.c:1041
-#: ../libpurple/protocols/silc/util.c:561
+#: ../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/silc10/ops.c:1075
-#: ../libpurple/protocols/silc10/util.c:551
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
+#: ../libpurple/protocols/silc10/util.c:555
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1068
 msgid "E-Mail"
 msgstr "悋�惡惘�惆 悋�悒��惠惘���"

 #: ../libpurple/protocols/bonjour/bonjour.c:401
-#: ../libpurple/protocols/bonjour/bonjour.c:706
+#: ../libpurple/protocols/bonjour/bonjour.c:707
 msgid "AIM Account"
 msgstr "忰愕悋惡 AIM"

 #: ../libpurple/protocols/bonjour/bonjour.c:404
-#: ../libpurple/protocols/bonjour/bonjour.c:709
+#: ../libpurple/protocols/bonjour/bonjour.c:710
 msgid "XMPP Account"
 msgstr "忰愕悋惡 XMPP"

@@ -3668,13 +3840,13 @@
 msgid "Purple Person"
 msgstr "愆悽惶 悖惘悴�悋��"

-#: ../libpurple/protocols/bonjour/bonjour.c:703
+#: ../libpurple/protocols/bonjour/bonjour.c:704
 #: ../libpurple/protocols/gg/gg.c:478
-#: ../libpurple/protocols/jabber/jabber.c:986
+#: ../libpurple/protocols/jabber/jabber.c:998
 #: ../libpurple/protocols/silc/silc.c:913
 #: ../libpurple/protocols/silc/silc.c:1154
-#: ../libpurple/protocols/silc10/silc.c:681
-#: ../libpurple/protocols/silc10/silc.c:922
+#: ../libpurple/protocols/silc10/silc.c:687
+#: ../libpurple/protocols/silc10/silc.c:928
 msgid "E-mail"
 msgstr "悋�惡惘�惆 悋�悒��惠惘���"

@@ -3711,11 +3883,15 @@
 msgid "Could not listen on socket"
 msgstr "�悋 ���� 悋�悋愕惠�悋惺 悒�� 悋���惡愕"

-#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1845
+#: ../libpurple/protocols/bonjour/mdns_win32.c:110
+msgid "Error communicating with local mDNSResponder."
+msgstr "惺愀� 悖惓�悋悄 悋�惠�悋惶� �惺 mDNSResponder."
+
+#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1908
 msgid "Invalid proxy settings"
 msgstr "悽惶悋悧惶 悋��愕�愀 愃�惘 惶悋�忰悸"

-#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1845
+#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1908
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -3786,9 +3962,9 @@
 msgstr "悋�惠�� 悋�惠愕悴�� 惡�悴悋忰!"

 #: ../libpurple/protocols/gg/gg.c:483 ../libpurple/protocols/gg/gg.c:776
-#: ../libpurple/protocols/jabber/jabber.c:969
-#: ../libpurple/protocols/jabber/jabber.c:972
-#: ../libpurple/protocols/jabber/jabber.c:1760
+#: ../libpurple/protocols/jabber/jabber.c:981
+#: ../libpurple/protocols/jabber/jabber.c:984
+#: ../libpurple/protocols/jabber/jabber.c:1772
 msgid "Password"
 msgstr "���悸 悋�愕�惘"

@@ -3814,9 +3990,9 @@

 #: ../libpurple/protocols/gg/gg.c:643 ../libpurple/protocols/gg/gg.c:1056
 #: ../libpurple/protocols/gg/gg.c:1128
-#: ../libpurple/protocols/jabber/jabber.c:1006
-#: ../libpurple/protocols/oscar/oscar.c:3770
-#: ../libpurple/protocols/oscar/oscar.c:3783
+#: ../libpurple/protocols/jabber/jabber.c:1018
+#: ../libpurple/protocols/oscar/oscar.c:3836
+#: ../libpurple/protocols/oscar/oscar.c:3849
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "悋��惆��悸"
@@ -3825,14 +4001,14 @@
 msgid "Year of birth"
 msgstr "愕�悸 悋����悋惆"

-#: ../libpurple/protocols/gg/gg.c:651 ../libpurple/protocols/msn/msn.c:1735
-#: ../libpurple/protocols/msnp9/msn.c:1590
-#: ../libpurple/protocols/myspace/user.c:119
-#: ../libpurple/protocols/oscar/oscar.c:3713
+#: ../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/qq/buddy_info.c:46
 #: ../libpurple/protocols/qq/qq.c:227 ../libpurple/protocols/qq/qq.c:230
 #: ../libpurple/protocols/qq/qq.c:233 ../libpurple/protocols/qq/qq.c:237
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1091
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1098
 msgid "Gender"
 msgstr "悋�悴�愕"

@@ -3841,14 +4017,14 @@
 msgstr "悵�惘 悖� 悖�惓�"

 #: ../libpurple/protocols/gg/gg.c:653
-#: ../libpurple/protocols/oscar/oscar.c:3713
+#: ../libpurple/protocols/oscar/oscar.c:3779
 #: ../libpurple/protocols/qq/buddy_info.c:83
 #: ../libpurple/protocols/qq/qq.c:227
 msgid "Male"
 msgstr "悵�惘"

 #: ../libpurple/protocols/gg/gg.c:654
-#: ../libpurple/protocols/oscar/oscar.c:3713
+#: ../libpurple/protocols/oscar/oscar.c:3779
 #: ../libpurple/protocols/qq/buddy_info.c:84
 #: ../libpurple/protocols/qq/qq.c:230
 msgid "Female"
@@ -3907,31 +4083,18 @@
 msgid "Add to chat..."
 msgstr "悖愆惘� �� 悋�惆惘惆愆悸..."

-#: ../libpurple/protocols/gg/gg.c:1010
-#: ../libpurple/protocols/jabber/buddy.c:2036
-#: ../libpurple/protocols/novell/novell.c:2845
-#: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:5645
-#: ../libpurple/protocols/qq/qq.c:171 ../libpurple/protocols/qq/qq.c:178
-#: ../libpurple/protocols/qq/qq.c:293
-#: ../libpurple/protocols/yahoo/yahoo.c:3155 ../libpurple/status.c:154
-#: ../pidgin/gtkblist.c:3295 ../pidgin/gtkblist.c:3677
-#: ../pidgin/gtkdocklet.c:561 ../pidgin/gtkstatusbox.c:1069
-msgid "Offline"
-msgstr "愃�惘 �惠惶�"
-
 #: ../libpurple/protocols/gg/gg.c:1013
-#: ../libpurple/protocols/jabber/buddy.c:2038
+#: ../libpurple/protocols/jabber/buddy.c:2083
 #: ../libpurple/protocols/msn/state.c:29 ../libpurple/protocols/msn/state.c:30
 #: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38
 #: ../libpurple/protocols/msnp9/state.c:29
 #: ../libpurple/protocols/msnp9/state.c:30
 #: ../libpurple/protocols/msnp9/state.c:37
 #: ../libpurple/protocols/msnp9/state.c:38
-#: ../libpurple/protocols/novell/novell.c:2833
+#: ../libpurple/protocols/novell/novell.c:2834
 #: ../libpurple/protocols/qq/qq.c:281
-#: ../libpurple/protocols/yahoo/yahoo.c:3157 ../libpurple/status.c:155
-#: ../pidgin/gtkdocklet.c:545 ../pidgin/gtkstatusbox.c:1065
+#: ../libpurple/protocols/yahoo/yahoo.c:3158 ../libpurple/status.c:155
+#: ../pidgin/gtkdocklet.c:545 ../pidgin/gtkstatusbox.c:1081
 msgid "Available"
 msgstr "�惠悋忰"

@@ -3940,31 +4103,31 @@
 #. 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:2042
-#: ../libpurple/protocols/novell/novell.c:2836
-#: ../libpurple/protocols/oscar/oscar.c:733
-#: ../libpurple/protocols/oscar/oscar.c:5673
+#: ../libpurple/protocols/jabber/buddy.c:2087
+#: ../libpurple/protocols/novell/novell.c:2837
+#: ../libpurple/protocols/oscar/oscar.c:734
+#: ../libpurple/protocols/oscar/oscar.c:5761
 #: ../libpurple/protocols/qq/qq.c:181 ../libpurple/protocols/qq/qq.c:285
 #: ../libpurple/protocols/silc/buddy.c:1479
 #: ../libpurple/protocols/silc10/buddy.c:1479
-#: ../libpurple/protocols/yahoo/yahoo.c:3709
-#: ../libpurple/protocols/yahoo/yahoo.c:3783 ../libpurple/status.c:158
-#: ../pidgin/gtkdocklet.c:549 ../pidgin/gtkprefs.c:1943
-#: ../pidgin/gtkstatusbox.c:1066
+#: ../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
 msgid "Away"
 msgstr "愃悋悧惡"

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

 #: ../libpurple/protocols/gg/gg.c:1048 ../libpurple/protocols/gg/gg.c:1122
-#: ../libpurple/protocols/jabber/buddy.c:2215
-#: ../libpurple/protocols/jabber/buddy.c:2401
-#: ../libpurple/protocols/oscar/oscar.c:3691
-#: ../libpurple/protocols/silc/ops.c:990
+#: ../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/silc10/ops.c:1024
 msgid "First Name"
 msgstr "悋�悋愕� 悋�悖��"
@@ -3974,7 +4137,7 @@
 msgstr "愕�悸 悋����悋惆"

 #: ../libpurple/protocols/gg/gg.c:1113 ../libpurple/protocols/gg/gg.c:1182
-#: ../libpurple/protocols/oscar/oscar.c:3892
+#: ../libpurple/protocols/oscar/oscar.c:3958
 msgid "Unable to display the search results."
 msgstr "惠惺悵�惘 惺惘惷 �惠悋悧悴 悋�惡忰惓."

@@ -4018,23 +4181,10 @@
 msgid "Connection failed."
 msgstr "�愆� 悋�悋惠惶悋�."

-#: ../libpurple/protocols/gg/gg.c:1629 ../libpurple/protocols/msn/msn.c:662
-#: ../libpurple/protocols/msnp9/msn.c:563
-msgid "Blocked"
-msgstr "�忰惴�惘"
-
 #: ../libpurple/protocols/gg/gg.c:1652
 msgid "Add to chat"
 msgstr "悖惷� 悒�� 悋�惆惘惆愆悸"

-#: ../libpurple/protocols/gg/gg.c:1661
-msgid "Unblock"
-msgstr "悋�愃� 悋�忰惴惘"
-
-#: ../libpurple/protocols/gg/gg.c:1665
-msgid "Block"
-msgstr "悋忰惴惘"
-
 #: ../libpurple/protocols/gg/gg.c:1682
 msgid "Chat _name:"
 msgstr "悋_愕� 悋�惆惘惆愆悸:"
@@ -4105,39 +4255,39 @@

 #: ../libpurple/protocols/irc/cmds.c:43
 #: ../libpurple/protocols/silc/silc.c:1780
-#: ../libpurple/protocols/silc10/silc.c:1566
+#: ../libpurple/protocols/silc10/silc.c:1572
 #, c-format
 msgid "Unknown command: %s"
 msgstr "悖�惘 �悴���: %s"

-#: ../libpurple/protocols/irc/cmds.c:511
+#: ../libpurple/protocols/irc/cmds.c:509
 #: ../libpurple/protocols/jabber/chat.c:591
 #: ../libpurple/protocols/silc/silc.c:1488
-#: ../libpurple/protocols/silc10/silc.c:1274
+#: ../libpurple/protocols/silc10/silc.c:1280
 #, c-format
 msgid "current topic is: %s"
 msgstr "悋���惷�惺 悋�忰悋��: %s"

-#: ../libpurple/protocols/irc/cmds.c:515
+#: ../libpurple/protocols/irc/cmds.c:513
 #: ../libpurple/protocols/jabber/chat.c:595
 #: ../libpurple/protocols/silc/silc.c:1492
-#: ../libpurple/protocols/silc10/silc.c:1278
+#: ../libpurple/protocols/silc10/silc.c:1284
 msgid "No topic is set"
 msgstr "�� ��忰惆惆 悖� ��惷�惺"

-#: ../libpurple/protocols/irc/dcc_send.c:293
-#: ../libpurple/protocols/irc/dcc_send.c:334
+#: ../libpurple/protocols/irc/dcc_send.c:298
+#: ../libpurple/protocols/irc/dcc_send.c:339
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:318
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:327
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:336
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1108
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1508
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1559
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1109
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1513
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1564
 msgid "File Transfer Failed"
 msgstr "�愆� 悒惘愕悋� 悋����"

-#: ../libpurple/protocols/irc/dcc_send.c:294
-#: ../libpurple/protocols/irc/dcc_send.c:335
+#: ../libpurple/protocols/irc/dcc_send.c:299
+#: ../libpurple/protocols/irc/dcc_send.c:340
 msgid "Could not open a listening port."
 msgstr "�悋 ���� �惠忰 ���悵 悋愕惠�悋惺."

@@ -4159,8 +4309,8 @@
 msgstr "\"惘愕悋�悸 悋����\" �悖悴� %s "

 #: ../libpurple/protocols/irc/irc.c:129 ../libpurple/protocols/irc/irc.c:169
-#: ../libpurple/protocols/irc/irc.c:632 ../libpurple/protocols/irc/irc.c:661
-#: ../libpurple/protocols/myspace/myspace.c:2407
+#: ../libpurple/protocols/irc/irc.c:633 ../libpurple/protocols/irc/irc.c:662
+#: ../libpurple/protocols/myspace/myspace.c:2532
 msgid "Server has disconnected"
 msgstr "�愀惺 悋�悽悋惆��� 悋�悋惠惶悋�"

@@ -4185,57 +4335,57 @@
 #. 1. connect to server
 #. connect to the server
 #: ../libpurple/protocols/irc/irc.c:332
-#: ../libpurple/protocols/jabber/jabber.c:1334
+#: ../libpurple/protocols/jabber/jabber.c:1346
 #: ../libpurple/protocols/msn/session.c:402
 #: ../libpurple/protocols/msnp9/session.c:354
-#: ../libpurple/protocols/myspace/myspace.c:302
-#: ../libpurple/protocols/novell/novell.c:2198
-#: ../libpurple/protocols/oscar/oscar.c:1289
+#: ../libpurple/protocols/myspace/myspace.c:295
+#: ../libpurple/protocols/novell/novell.c:2199
+#: ../libpurple/protocols/oscar/oscar.c:1335
 #: ../libpurple/protocols/qq/qq.c:136
-#: ../libpurple/protocols/sametime/sametime.c:3768
+#: ../libpurple/protocols/sametime/sametime.c:3777
 #: ../libpurple/protocols/simple/simple.c:1915
-#: ../libpurple/protocols/yahoo/yahoo.c:2985
-#: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:665
+#: ../libpurple/protocols/yahoo/yahoo.c:2984
+#: ../libpurple/protocols/zephyr/zephyr.c:1585 ../pidgin/gtkstatusbox.c:681
 msgid "Connecting"
 msgstr "�惠�惶�"

 #: ../libpurple/protocols/irc/irc.c:342
-#: ../libpurple/protocols/jabber/jabber.c:662
-#: ../libpurple/protocols/jabber/jabber.c:1143
+#: ../libpurple/protocols/jabber/jabber.c:674
+#: ../libpurple/protocols/jabber/jabber.c:1155
 msgid "SSL support unavailable"
 msgstr "�悋 �惠��惘 惆惺� SSL"

 #: ../libpurple/protocols/irc/irc.c:355
-#: ../libpurple/protocols/myspace/myspace.c:320
+#: ../libpurple/protocols/myspace/myspace.c:313
 #: ../libpurple/protocols/simple/simple.c:469
 #: ../libpurple/protocols/simple/simple.c:1825
 msgid "Couldn't create socket"
 msgstr "惠惺悵��惘 悒�愆悋悄 ��惡愕"

 #: ../libpurple/protocols/irc/irc.c:437
-#: ../libpurple/protocols/oscar/oscar.c:1285
+#: ../libpurple/protocols/oscar/oscar.c:1331
 msgid "Couldn't connect to host"
 msgstr "�悋 ���� 悋�悋惠惶悋� 惡悋�悽悋惆��"

-#: ../libpurple/protocols/irc/irc.c:627 ../libpurple/protocols/irc/irc.c:656
-#: ../libpurple/protocols/myspace/myspace.c:2401
+#: ../libpurple/protocols/irc/irc.c:628 ../libpurple/protocols/irc/irc.c:657
+#: ../libpurple/protocols/myspace/myspace.c:2526
 msgid "Read error"
 msgstr "悽愀悖 �� 悋��惘悋悄悸"

-#: ../libpurple/protocols/irc/irc.c:797
+#: ../libpurple/protocols/irc/irc.c:798
 #: ../libpurple/protocols/silc/chat.c:1398
 #: ../libpurple/protocols/silc10/chat.c:1426
-#: ../libpurple/protocols/yahoo/yahoochat.c:1497
+#: ../libpurple/protocols/yahoo/yahoochat.c:1508
 msgid "Users"
 msgstr "悋��愕惠悽惆���"

-#: ../libpurple/protocols/irc/irc.c:800
-#: ../libpurple/protocols/sametime/sametime.c:3416
+#: ../libpurple/protocols/irc/irc.c:801
+#: ../libpurple/protocols/sametime/sametime.c:3425
 #: ../libpurple/protocols/silc/chat.c:1401
-#: ../libpurple/protocols/silc/ops.c:1393
+#: ../libpurple/protocols/silc/ops.c:1408
 #: ../libpurple/protocols/silc10/chat.c:1429
 #: ../libpurple/protocols/silc10/ops.c:1382
-#: ../libpurple/protocols/yahoo/yahoochat.c:1506
+#: ../libpurple/protocols/yahoo/yahoochat.c:1517
 msgid "Topic"
 msgstr "悋���惷�惺"

@@ -4247,68 +4397,70 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:938
+#: ../libpurple/protocols/irc/irc.c:939
 msgid "IRC Protocol Plugin"
 msgstr "��忰�悸 惡惘�惠���� IRC"

 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:939
+#: ../libpurple/protocols/irc/irc.c:940
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "��忰�悸 惡惘�惠���� IRC 悋�悖�� 愕�悄悋"

 #. host to connect to
-#: ../libpurple/protocols/irc/irc.c:964 ../libpurple/protocols/irc/msgs.c:325
-#: ../libpurple/protocols/msn/msn.c:2333
-#: ../libpurple/protocols/msnp9/msn.c:2186
-#: ../libpurple/protocols/oscar/oscar.c:6712
+#: ../libpurple/protocols/irc/irc.c:965 ../libpurple/protocols/irc/msgs.c:325
+#: ../libpurple/protocols/msn/msn.c:2357
+#: ../libpurple/protocols/msnp9/msn.c:2197
+#: ../libpurple/protocols/oscar/oscar.c:6763
 #: ../libpurple/protocols/qq/qq.c:756
-#: ../libpurple/protocols/sametime/sametime.c:5773
-#: ../libpurple/protocols/silc/ops.c:1249
-#: ../libpurple/protocols/silc/ops.c:1343
+#: ../libpurple/protocols/sametime/sametime.c:5782
+#: ../libpurple/protocols/silc/ops.c:1264
+#: ../libpurple/protocols/silc/ops.c:1358
 #: ../libpurple/protocols/silc10/ops.c:1244
 #: ../libpurple/protocols/silc10/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:2106
+#: ../libpurple/protocols/simple/simple.c:2099
 #: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "悽悋惆��"

 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:967 ../libpurple/protocols/msn/msn.c:2338
-#: ../libpurple/protocols/msnp9/msn.c:2191
-#: ../libpurple/protocols/oscar/oscar.c:6715
+#: ../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/qq/qq.c:759
-#: ../libpurple/protocols/sametime/sametime.c:5778
+#: ../libpurple/protocols/sametime/sametime.c:5787
 #: ../libpurple/protocols/silc/silc.c:2061
-#: ../libpurple/protocols/silc10/silc.c:1861
+#: ../libpurple/protocols/silc10/silc.c:1867
 #: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "���悵"

-#: ../libpurple/protocols/irc/irc.c:970
+#: ../libpurple/protocols/irc/irc.c:971
 msgid "Encodings"
 msgstr "悋�惠惘��慍悋惠"

-#: ../libpurple/protocols/irc/irc.c:973 ../libpurple/protocols/irc/msgs.c:318
-#: ../libpurple/protocols/jabber/jabber.c:962
-#: ../libpurple/protocols/jabber/jabber.c:964
+#: ../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:1197
-#: ../libpurple/protocols/silc/ops.c:1200
-#: ../libpurple/protocols/silc/ops.c:1336
-#: ../libpurple/protocols/silc/ops.c:1339
+#: ../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:916
+#: ../libpurple/protocols/silc10/silc.c:922
 msgid "Username"
 msgstr "悋愕� 悋��愕惠悽惆�"

-#: ../libpurple/protocols/irc/irc.c:976 ../libpurple/protocols/irc/msgs.c:319
+#: ../libpurple/protocols/irc/irc.c:977 ../libpurple/protocols/irc/msgs.c:319
 #: ../libpurple/protocols/silc/silc.c:1152
-#: ../libpurple/protocols/silc10/silc.c:920
+#: ../libpurple/protocols/silc10/silc.c:926
 msgid "Real name"
 msgstr "悋�悋愕� 悋�忰����"

@@ -4316,7 +4468,7 @@
 #. option = purple_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: ../libpurple/protocols/irc/irc.c:984
+#: ../libpurple/protocols/irc/irc.c:985
 msgid "Use SSL"
 msgstr "悋愕惠悽惆� SSL"

@@ -4347,14 +4499,14 @@
 msgstr " <i>(�惺惘��)</i>"

 #: ../libpurple/protocols/irc/msgs.c:305
-#: ../libpurple/protocols/oscar/oscar.c:3681
-#: ../libpurple/protocols/silc/ops.c:1422
+#: ../libpurple/protocols/oscar/oscar.c:3747
+#: ../libpurple/protocols/silc/ops.c:1437
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
 msgstr "悋����悸"

 #: ../libpurple/protocols/irc/msgs.c:331
-#: ../libpurple/protocols/silc/ops.c:1268
+#: ../libpurple/protocols/silc/ops.c:1283
 #: ../libpurple/protocols/silc10/ops.c:1272
 msgid "Currently on"
 msgstr "忰悋���悋 惺��"
@@ -4408,115 +4560,115 @@
 msgid "Users on %s: %s"
 msgstr "悋��愕惠悽惆��� 惺�� %s: %s"

-#: ../libpurple/protocols/irc/msgs.c:577
+#: ../libpurple/protocols/irc/msgs.c:579
 msgid "Time Response"
 msgstr "��惠 悋�悋愕惠悴悋惡悸"

-#: ../libpurple/protocols/irc/msgs.c:578
+#: ../libpurple/protocols/irc/msgs.c:580
 msgid "The IRC server's local time is:"
 msgstr "悋���惠 悋��忰�� �悽悋惆�� IRC ��:"

-#: ../libpurple/protocols/irc/msgs.c:589
+#: ../libpurple/protocols/irc/msgs.c:591
 msgid "No such channel"
 msgstr "�悋 ��悋悸 惡�悵悋 悋�悋愕�"

 #. does this happen?
-#: ../libpurple/protocols/irc/msgs.c:600
+#: ../libpurple/protocols/irc/msgs.c:602
 msgid "no such channel"
 msgstr "�悋 ��悋悸 惡�悵悋 悋�悋愕�"

-#: ../libpurple/protocols/irc/msgs.c:603
+#: ../libpurple/protocols/irc/msgs.c:605
 msgid "User is not logged in"
 msgstr "�� ���悴 悋��愕惠悽惆�"

-#: ../libpurple/protocols/irc/msgs.c:608
+#: ../libpurple/protocols/irc/msgs.c:610
 msgid "No such nick or channel"
 msgstr "�悋 ���悸 悖� ��悋悸 惡�悵悋 悋�悋愕�"

-#: ../libpurple/protocols/irc/msgs.c:628
+#: ../libpurple/protocols/irc/msgs.c:630
 msgid "Could not send"
 msgstr "惠惺悵�惘 悋�悒惘愕悋�"

-#: ../libpurple/protocols/irc/msgs.c:684
+#: ../libpurple/protocols/irc/msgs.c:686
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "悋�悋�惷�悋� 悒�� %s 惡悋�惆惺�悋惠 ��愀."

-#: ../libpurple/protocols/irc/msgs.c:685
+#: ../libpurple/protocols/irc/msgs.c:687
 msgid "Invitation only"
 msgstr "惡悋�惆惺�悸 ��愀"

-#: ../libpurple/protocols/irc/msgs.c:801
+#: ../libpurple/protocols/irc/msgs.c:803
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "��惆 愀惘惆� %s: (%s)"

 #. Remove user from channel
-#: ../libpurple/protocols/irc/msgs.c:806 ../libpurple/protocols/silc/ops.c:699
+#: ../libpurple/protocols/irc/msgs.c:808 ../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:829
+#: ../libpurple/protocols/irc/msgs.c:831
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "愀�惘 (%s %s) 惡�悋愕愀悸 %s"

-#: ../libpurple/protocols/irc/msgs.c:914 ../libpurple/protocols/irc/msgs.c:915
+#: ../libpurple/protocols/irc/msgs.c:919 ../libpurple/protocols/irc/msgs.c:920
 msgid "Invalid nickname"
 msgstr "���悸 愃�惘 惶悋�忰悸"

-#: ../libpurple/protocols/irc/msgs.c:916
+#: ../libpurple/protocols/irc/msgs.c:921
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
 msgstr "惘�惷 悋�悽悋惆�� 悋����悸 悋�惠� 悋悽惠惘惠�悋. �� 悋��忰惠�� 悖��悋 惠忰�� �忰悋惘� 愃�惘 惶悋�忰悸."

-#: ../libpurple/protocols/irc/msgs.c:921
+#: ../libpurple/protocols/irc/msgs.c:926
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
 msgstr "惘�惷 悋�悽悋惆�� 悋愕� 悋�忰愕悋惡 悋�悵� 悋悽惠惘惠�.  �� 悋��忰惠�� 悖��悋 惠忰惠�� �忰悋惘� 愃�惘 惶悋�忰悸."

-#: ../libpurple/protocols/irc/msgs.c:960
+#: ../libpurple/protocols/irc/msgs.c:965
 msgid "Cannot change nick"
 msgstr "惠惺悵�惘 惠愃��惘 悋����悸"

-#: ../libpurple/protocols/irc/msgs.c:960
+#: ../libpurple/protocols/irc/msgs.c:965
 msgid "Could not change nick"
 msgstr "惠惺悵�惘 惠愃��惘 悋����悸"

-#: ../libpurple/protocols/irc/msgs.c:981
+#: ../libpurple/protocols/irc/msgs.c:986
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "��惆 �悋惘�惠 悋���悋悸%s%s"

-#: ../libpurple/protocols/irc/msgs.c:1023
+#: ../libpurple/protocols/irc/msgs.c:1028
 msgid "Error: invalid PONG from server"
 msgstr "惺愀�: 惡��悴 愃�惘 惶忰�忰 �� 悋�悽悋惆��"

-#: ../libpurple/protocols/irc/msgs.c:1025
+#: ../libpurple/protocols/irc/msgs.c:1030
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "惘惆 惡���悴 -- 惠悖悽��惘: %lu 惓悋��悸"

-#: ../libpurple/protocols/irc/msgs.c:1116
+#: ../libpurple/protocols/irc/msgs.c:1121
 #, c-format
 msgid "Cannot join %s: Registration is required."
 msgstr "惠惺悵惘 悋�悋�惷�悋� 悒�� %s: 悋�惠愕悴�� 惷惘�惘�."

-#: ../libpurple/protocols/irc/msgs.c:1117
-#: ../libpurple/protocols/silc/ops.c:1093
+#: ../libpurple/protocols/irc/msgs.c:1122
+#: ../libpurple/protocols/silc/ops.c:1108
 #: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Cannot join channel"
 msgstr "�悋 ���� 悋�悋�惷�悋� 悒�� 悋���悋悸"

-#: ../libpurple/protocols/irc/msgs.c:1151
+#: ../libpurple/protocols/irc/msgs.c:1156
 msgid "Nick or channel is temporarily unavailable."
 msgstr "悋����悸 悖� 悋���悋悸 愃�惘 �惠悋忰悸 �悗�惠�悋."

-#: ../libpurple/protocols/irc/msgs.c:1163
+#: ../libpurple/protocols/irc/msgs.c:1168
 #, c-format
 msgid "Wallops from %s"
 msgstr "���悸 �� %s"
@@ -4634,7 +4786,7 @@
 "悋惺惘惷 悋��愕惠悽惆��� 悋���悴�惆�� �� 悋���悋悸 忰悋��悋."

 #: ../libpurple/protocols/irc/parse.c:137
-#: ../libpurple/protocols/jabber/jabber.c:2350
+#: ../libpurple/protocols/jabber/jabber.c:2358
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr ""
 "nick &lt;new nickname&gt;:\n"
@@ -4791,9 +4943,9 @@
 msgstr "�愀惺 悋�悋惠惶悋�."

 #: ../libpurple/protocols/jabber/adhoccommands.c:143
-#: ../libpurple/protocols/jabber/jabber.c:723
-#: ../libpurple/protocols/jabber/jabber.c:753
-#: ../libpurple/protocols/jabber/jabber.c:1930
+#: ../libpurple/protocols/jabber/jabber.c:735
+#: ../libpurple/protocols/jabber/jabber.c:765
+#: ../libpurple/protocols/jabber/jabber.c:1942
 msgid "Unknown Error"
 msgstr "悽愀悖 �悴���"

@@ -4815,7 +4967,7 @@
 msgstr "�惠愀�惡 悋�悽悋惆�� 悋�惠�惓�� 惡悋��惶 悋�惶惘�忰 惺惡惘 ��悋悸 愃�惘 �惺��悋悸"

 #: ../libpurple/protocols/jabber/auth.c:323
-#: ../libpurple/protocols/jabber/auth.c:525
+#: ../libpurple/protocols/jabber/auth.c:532
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
@@ -4826,29 +4978,29 @@

 #: ../libpurple/protocols/jabber/auth.c:325
 #: ../libpurple/protocols/jabber/auth.c:326
-#: ../libpurple/protocols/jabber/auth.c:527
-#: ../libpurple/protocols/jabber/auth.c:528
-#: ../libpurple/protocols/jabber/auth.c:719
-#: ../libpurple/protocols/jabber/auth.c:720
+#: ../libpurple/protocols/jabber/auth.c:534
+#: ../libpurple/protocols/jabber/auth.c:535
+#: ../libpurple/protocols/jabber/auth.c:726
+#: ../libpurple/protocols/jabber/auth.c:727
 msgid "Plaintext Authentication"
 msgstr "悋愕惠�惓悋� 惡悋��惶 悋�惶惘�忰"

-#: ../libpurple/protocols/jabber/auth.c:479
-#: ../libpurple/protocols/jabber/auth.c:652
-#: ../libpurple/protocols/jabber/auth.c:900
-#: ../libpurple/protocols/jabber/auth.c:1049
-#: ../libpurple/protocols/jabber/auth.c:1076
-#: ../libpurple/protocols/jabber/auth.c:1100
+#: ../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/jabber.c:127
 msgid "Invalid response from server."
 msgstr "悋愕惠悴悋惡悸 愃�惘 惶忰�忰悸 �� 悋�悽悋惆��."

-#: ../libpurple/protocols/jabber/auth.c:541
-#: ../libpurple/protocols/jabber/auth.c:732
+#: ../libpurple/protocols/jabber/auth.c:548
+#: ../libpurple/protocols/jabber/auth.c:739
 msgid "Server does not use any supported authentication method"
 msgstr "�悋 �愕惠悽惆� 悋�悽悋惆�� 悖� 愀惘��悸 悋愕惠�惓悋� �惆惺��悸"

-#: ../libpurple/protocols/jabber/auth.c:721
+#: ../libpurple/protocols/jabber/auth.c:728
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
@@ -4856,499 +5008,499 @@
 "�惠愀�惡 �悵悋 悋�悽悋惆�� 悋�悋愕惠�惓悋� 惡悋��惶 悋�惶惘�忰 惺惡惘 悋惠惶悋� 愃�惘 ��惺���. 悖悖愕�忰 惡�悵悋 "
 "�悖��� 悋�悋愕惠�惓悋��  "

-#: ../libpurple/protocols/jabber/auth.c:923
-#: ../libpurple/protocols/jabber/auth.c:948
+#: ../libpurple/protocols/jabber/auth.c:930
+#: ../libpurple/protocols/jabber/auth.c:955
 msgid "Invalid challenge from server"
 msgstr "惠忰惆� 愃�惘 惶忰�忰 �� 悋�悽悋惆��"

-#: ../libpurple/protocols/jabber/auth.c:1022
+#: ../libpurple/protocols/jabber/auth.c:1031
 msgid "SASL error"
 msgstr "惺愀� �� SASL"

-#: ../libpurple/protocols/jabber/buddy.c:283
-#: ../libpurple/protocols/jabber/buddy.c:1221
-#: ../libpurple/protocols/sametime/sametime.c:4174
-#: ../libpurple/protocols/silc/ops.c:986
+#: ../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/silc10/ops.c:1020
 msgid "Full Name"
 msgstr "悋�悋愕� 悋��悋��"

-#: ../libpurple/protocols/jabber/buddy.c:284
-#: ../libpurple/protocols/jabber/buddy.c:1233
-#: ../libpurple/protocols/silc/ops.c:998
+#: ../libpurple/protocols/jabber/buddy.c:312
+#: ../libpurple/protocols/jabber/buddy.c:1268
+#: ../libpurple/protocols/silc/ops.c:1013
 #: ../libpurple/protocols/silc10/ops.c:1032
 msgid "Family Name"
 msgstr "悋愕� 悋�惺悋悧�悸"

-#: ../libpurple/protocols/jabber/buddy.c:285
-#: ../libpurple/protocols/jabber/buddy.c:1236
+#: ../libpurple/protocols/jabber/buddy.c:313
+#: ../libpurple/protocols/jabber/buddy.c:1271
 msgid "Given Name"
 msgstr "悋�悋愕� 悋�愆悽惶�"

-#: ../libpurple/protocols/jabber/buddy.c:287
-#: ../libpurple/protocols/jabber/jabber.c:1022
+#: ../libpurple/protocols/jabber/buddy.c:315
+#: ../libpurple/protocols/jabber/jabber.c:1034
 msgid "URL"
 msgstr "�愕悋惘"

-#: ../libpurple/protocols/jabber/buddy.c:288
-#: ../libpurple/protocols/jabber/buddy.c:1284
+#: ../libpurple/protocols/jabber/buddy.c:316
+#: ../libpurple/protocols/jabber/buddy.c:1319
 msgid "Street Address"
 msgstr "惺��悋� 悋�愆悋惘惺"

-#: ../libpurple/protocols/jabber/buddy.c:289
-#: ../libpurple/protocols/jabber/buddy.c:1281
+#: ../libpurple/protocols/jabber/buddy.c:317
+#: ../libpurple/protocols/jabber/buddy.c:1316
 msgid "Extended Address"
 msgstr "悋�惺��悋� 悋�惠�惶���"

-#: ../libpurple/protocols/jabber/buddy.c:290
-#: ../libpurple/protocols/jabber/buddy.c:1287
+#: ../libpurple/protocols/jabber/buddy.c:318
+#: ../libpurple/protocols/jabber/buddy.c:1322
 msgid "Locality"
 msgstr "悋��忰��悸"

-#: ../libpurple/protocols/jabber/buddy.c:291
-#: ../libpurple/protocols/jabber/buddy.c:1290
+#: ../libpurple/protocols/jabber/buddy.c:319
+#: ../libpurple/protocols/jabber/buddy.c:1325
 msgid "Region"
 msgstr "悋�悒����"

-#: ../libpurple/protocols/jabber/buddy.c:292
-#: ../libpurple/protocols/jabber/buddy.c:1293
+#: ../libpurple/protocols/jabber/buddy.c:320
+#: ../libpurple/protocols/jabber/buddy.c:1328
 msgid "Postal Code"
 msgstr "悋�惘�慍 悋�惡惘�惆�"

-#: ../libpurple/protocols/jabber/buddy.c:293
-#: ../libpurple/protocols/jabber/buddy.c:1297
+#: ../libpurple/protocols/jabber/buddy.c:321
+#: ../libpurple/protocols/jabber/buddy.c:1332
 #: ../libpurple/protocols/silc/silc.c:1158
-#: ../libpurple/protocols/silc10/silc.c:926
+#: ../libpurple/protocols/silc10/silc.c:932
 msgid "Country"
 msgstr "悋�惆��悸"

-#: ../libpurple/protocols/jabber/buddy.c:294
-#: ../libpurple/protocols/jabber/buddy.c:1308
-#: ../libpurple/protocols/jabber/buddy.c:1315
+#: ../libpurple/protocols/jabber/buddy.c:322
+#: ../libpurple/protocols/jabber/buddy.c:1343
+#: ../libpurple/protocols/jabber/buddy.c:1350
 msgid "Telephone"
 msgstr "悋��悋惠�"

-#: ../libpurple/protocols/jabber/buddy.c:296
-#: ../libpurple/protocols/jabber/buddy.c:1352
+#: ../libpurple/protocols/jabber/buddy.c:324
+#: ../libpurple/protocols/jabber/buddy.c:1387
 msgid "Organization Name"
 msgstr "悋愕� 悋���惴�悸"

-#: ../libpurple/protocols/jabber/buddy.c:297
-#: ../libpurple/protocols/jabber/buddy.c:1355
+#: ../libpurple/protocols/jabber/buddy.c:325
+#: ../libpurple/protocols/jabber/buddy.c:1390
 msgid "Organization Unit"
 msgstr "悋��忰惆悸 悋�惠�惴���悸"

-#: ../libpurple/protocols/jabber/buddy.c:299
-#: ../libpurple/protocols/jabber/buddy.c:1364
+#: ../libpurple/protocols/jabber/buddy.c:327
+#: ../libpurple/protocols/jabber/buddy.c:1399
 msgid "Role"
 msgstr "悋�惆��惘"

-#: ../libpurple/protocols/jabber/buddy.c:300
-#: ../libpurple/protocols/jabber/buddy.c:1252
-#: ../libpurple/protocols/msn/msn.c:1804
-#: ../libpurple/protocols/msnp9/msn.c:1659
-#: ../libpurple/protocols/oscar/oscar.c:3730
+#: ../libpurple/protocols/jabber/buddy.c:328
+#: ../libpurple/protocols/jabber/buddy.c:1287
+#: ../libpurple/protocols/msn/msn.c:1828
+#: ../libpurple/protocols/msnp9/msn.c:1669
+#: ../libpurple/protocols/oscar/oscar.c:3796
 msgid "Birthday"
 msgstr "惠悋惘�悽 悋����悋惆"

-#: ../libpurple/protocols/jabber/buddy.c:301
-#: ../libpurple/protocols/jabber/buddy.c:1367
+#: ../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:3307
-#: ../pidgin/gtkprefs.c:680
+#: ../libpurple/protocols/jabber/usermood.c:193 ../pidgin/gtkblist.c:3345
+#: ../pidgin/gtkplugin.c:568 ../pidgin/gtkprefs.c:688
 msgid "Description"
 msgstr "悋��惶�"

-#: ../libpurple/protocols/jabber/buddy.c:722
-#: ../libpurple/protocols/jabber/buddy.c:723
+#: ../libpurple/protocols/jabber/buddy.c:752
+#: ../libpurple/protocols/jabber/buddy.c:753
 msgid "Edit XMPP vCard"
 msgstr "忰惘��惘 XMPP vCard"

-#: ../libpurple/protocols/jabber/buddy.c:724
+#: ../libpurple/protocols/jabber/buddy.c:754
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
 msgstr "悴��惺 悋�惺�悋惶惘 悋�惠悋��悸 悋悽惠�悋惘�悸. 悖惆悽� ��愀 悋��惺���悋惠 悋�惠� �悋 �慍惺悴� 悋�悒�惶悋忰 惺��悋."

-#: ../libpurple/protocols/jabber/buddy.c:795
-#: ../libpurple/protocols/jabber/buddy.c:960
+#: ../libpurple/protocols/jabber/buddy.c:825
+#: ../libpurple/protocols/jabber/buddy.c:990
 msgid "Client"
 msgstr "悋�惺���"

-#: ../libpurple/protocols/jabber/buddy.c:799
-#: ../libpurple/protocols/jabber/buddy.c:964
+#: ../libpurple/protocols/jabber/buddy.c:829
+#: ../libpurple/protocols/jabber/buddy.c:994
 msgid "Operating System"
 msgstr "�惴悋� 悋�惠愆愃��"

-#: ../libpurple/protocols/jabber/buddy.c:815
-#: ../libpurple/protocols/jabber/buddy.c:975
-msgid "Last Activity"
-msgstr "悛悽惘 �愆悋愀"
-
-#: ../libpurple/protocols/jabber/buddy.c:817
-#: ../libpurple/protocols/jabber/buddy.c:977
-msgid "Service Discovery Info"
-msgstr "�惺���悋惠 悋�惠愆悋� 悋�悽惆�悸"
-
-#: ../libpurple/protocols/jabber/buddy.c:819
-#: ../libpurple/protocols/jabber/buddy.c:979
-msgid "Service Discovery Items"
-msgstr "惺�悋惶惘 悋�惠愆悋� 悋�悽惆�悸"
-
-#: ../libpurple/protocols/jabber/buddy.c:821
-#: ../libpurple/protocols/jabber/buddy.c:981
-msgid "Extended Stanza Addressing"
-msgstr "惺���悸 悋�悖惡�悋惠 悋���惠惆�悸"
-
-#: ../libpurple/protocols/jabber/buddy.c:823
-#: ../libpurple/protocols/jabber/buddy.c:983
-msgid "Multi-User Chat"
-msgstr "惆惘惆愆悸 �惠惺惆惆悸 悋��愕惠悽惆���"
-
-#: ../libpurple/protocols/jabber/buddy.c:825
-#: ../libpurple/protocols/jabber/buddy.c:985
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "�惺���悋惠 悋�惠�悋悴惆 悋���惠惆悸 ��惆惘惆愆悸 �惠惺惆惆悸 悋��愕惠悽惆���"
-
-#: ../libpurple/protocols/jabber/buddy.c:827
-#: ../libpurple/protocols/jabber/buddy.c:987
-msgid "In-Band Bytestreams"
-msgstr "惠�悋惘 惡悋�惠悋惠 惆悋悽� 悋�忰慍�悸"
-
-#: ../libpurple/protocols/jabber/buddy.c:829
-#: ../libpurple/protocols/jabber/buddy.c:989
-msgid "Ad-Hoc Commands"
-msgstr "悖�悋�惘 �忰惴�悸"
-
-#: ../libpurple/protocols/jabber/buddy.c:831
-#: ../libpurple/protocols/jabber/buddy.c:991
-msgid "PubSub Service"
-msgstr "悽惆�悸 PubSub"
-
-#: ../libpurple/protocols/jabber/buddy.c:833
-#: ../libpurple/protocols/jabber/buddy.c:993
-msgid "SOCKS5 Bytestreams"
-msgstr "惠�悋惘 惡悋�惠悋惠 SOCKS5"
-
-#: ../libpurple/protocols/jabber/buddy.c:835
-#: ../libpurple/protocols/jabber/buddy.c:995
-msgid "Out of Band Data"
-msgstr "惡�悋�悋惠 悽悋惘悴 悋�忰慍�悸"
-
-#: ../libpurple/protocols/jabber/buddy.c:837
-#: ../libpurple/protocols/jabber/buddy.c:997
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-#: ../libpurple/protocols/jabber/buddy.c:839
-#: ../libpurple/protocols/jabber/buddy.c:999
-msgid "In-Band Registration"
-msgstr "悋�惠愕悴�� 惆悋悽� 悋�忰慍�悸"
-
-#: ../libpurple/protocols/jabber/buddy.c:841
-#: ../libpurple/protocols/jabber/buddy.c:1001
-msgid "User Location"
-msgstr "��惷惺 悋��愕惠悽惆�"
-
-#: ../libpurple/protocols/jabber/buddy.c:843
-#: ../libpurple/protocols/jabber/buddy.c:1003
-msgid "User Avatar"
-msgstr "悖����悸 悋��愕惠悽惆�"
-
 #: ../libpurple/protocols/jabber/buddy.c:845
 #: ../libpurple/protocols/jabber/buddy.c:1005
-msgid "Chat State Notifications"
-msgstr "惠���� 忰悋�悸 悋�惆惘惆愆悸"
+msgid "Last Activity"
+msgstr "悛悽惘 �愆悋愀"

 #: ../libpurple/protocols/jabber/buddy.c:847
 #: ../libpurple/protocols/jabber/buddy.c:1007
-msgid "Software Version"
-msgstr "悒惶惆悋惘悸 悋�惡惘�悴�悸"
+msgid "Service Discovery Info"
+msgstr "�惺���悋惠 悋�惠愆悋� 悋�悽惆�悸"

 #: ../libpurple/protocols/jabber/buddy.c:849
 #: ../libpurple/protocols/jabber/buddy.c:1009
-msgid "Stream Initiation"
-msgstr "惡惆悖 悋�惠�悋惘"
+msgid "Service Discovery Items"
+msgstr "惺�悋惶惘 悋�惠愆悋� 悋�悽惆�悸"

 #: ../libpurple/protocols/jabber/buddy.c:851
 #: ../libpurple/protocols/jabber/buddy.c:1011
-#: ../libpurple/protocols/sametime/sametime.c:3277
-msgid "File Transfer"
-msgstr "��� 悋�����悋惠 "
+msgid "Extended Stanza Addressing"
+msgstr "惺���悸 悋�悖惡�悋惠 悋���惠惆�悸"

 #: ../libpurple/protocols/jabber/buddy.c:853
 #: ../libpurple/protocols/jabber/buddy.c:1013
-msgid "User Mood"
-msgstr "�慍悋悴 悋��愕惠悽惆�"
+msgid "Multi-User Chat"
+msgstr "惆惘惆愆悸 �惠惺惆惆悸 悋��愕惠悽惆���"

 #: ../libpurple/protocols/jabber/buddy.c:855
 #: ../libpurple/protocols/jabber/buddy.c:1015
-msgid "User Activity"
-msgstr "�愆悋愀 悋��愕惠悽惆�"
+msgid "Multi-User Chat Extended Presence Information"
+msgstr "�惺���悋惠 悋�惠�悋悴惆 悋���惠惆悸 ��惆惘惆愆悸 �惠惺惆惆悸 悋��愕惠悽惆���"

 #: ../libpurple/protocols/jabber/buddy.c:857
 #: ../libpurple/protocols/jabber/buddy.c:1017
-msgid "Entity Capabilities"
-msgstr "悒��悋�悋惠 悋���悋�"
+msgid "In-Band Bytestreams"
+msgstr "惠�悋惘 惡悋�惠悋惠 惆悋悽� 悋�忰慍�悸"

 #: ../libpurple/protocols/jabber/buddy.c:859
 #: ../libpurple/protocols/jabber/buddy.c:1019
-msgid "Encrypted Session Negotiations"
-msgstr "��悋�惷悋惠 悋�悴�愕悋惠 悋��惺��悋悸"
+msgid "Ad-Hoc Commands"
+msgstr "悖�悋�惘 �忰惴�悸"

 #: ../libpurple/protocols/jabber/buddy.c:861
 #: ../libpurple/protocols/jabber/buddy.c:1021
-msgid "User Tune"
-msgstr "�愃�悸 悋��愕惠悽惆�"
+msgid "PubSub Service"
+msgstr "悽惆�悸 PubSub"

 #: ../libpurple/protocols/jabber/buddy.c:863
 #: ../libpurple/protocols/jabber/buddy.c:1023
-msgid "Roster Item Exchange"
-msgstr "惠惡悋惆� 惆�惘悋�� ��惺�悋惶惘"
+msgid "SOCKS5 Bytestreams"
+msgstr "惠�悋惘 惡悋�惠悋惠 SOCKS5"

 #: ../libpurple/protocols/jabber/buddy.c:865
 #: ../libpurple/protocols/jabber/buddy.c:1025
-msgid "Reachability Address"
-msgstr "惺��悋� 悋��惶���悸"
+msgid "Out of Band Data"
+msgstr "惡�悋�悋惠 悽悋惘悴 悋�忰慍�悸"

 #: ../libpurple/protocols/jabber/buddy.c:867
 #: ../libpurple/protocols/jabber/buddy.c:1027
-msgid "User Profile"
-msgstr "�悋忰悸 悋��愕惠悽惆�"
+msgid "XHTML-IM"
+msgstr "XHTML-IM"

 #: ../libpurple/protocols/jabber/buddy.c:869
 #: ../libpurple/protocols/jabber/buddy.c:1029
-msgid "Jingle"
-msgstr "Jingle"
+msgid "In-Band Registration"
+msgstr "悋�惠愕悴�� 惆悋悽� 悋�忰慍�悸"

 #: ../libpurple/protocols/jabber/buddy.c:871
 #: ../libpurple/protocols/jabber/buddy.c:1031
-msgid "Jingle Audio"
-msgstr "Jingle Audio"
+msgid "User Location"
+msgstr "��惷惺 悋��愕惠悽惆�"

 #: ../libpurple/protocols/jabber/buddy.c:873
 #: ../libpurple/protocols/jabber/buddy.c:1033
-msgid "User Nickname"
-msgstr "���悸 悋��愕惠悽惆�"
+msgid "User Avatar"
+msgstr "悖����悸 悋��愕惠悽惆�"

 #: ../libpurple/protocols/jabber/buddy.c:875
 #: ../libpurple/protocols/jabber/buddy.c:1035
-msgid "Jingle ICE UDP"
-msgstr "Jingle ICE UDP"
+msgid "Chat State Notifications"
+msgstr "惠���� 忰悋�悸 悋�惆惘惆愆悸"

 #: ../libpurple/protocols/jabber/buddy.c:877
 #: ../libpurple/protocols/jabber/buddy.c:1037
-msgid "Jingle ICE TCP"
-msgstr "Jingle ICE TCP"
+msgid "Software Version"
+msgstr "悒惶惆悋惘悸 悋�惡惘�悴�悸"

 #: ../libpurple/protocols/jabber/buddy.c:879
 #: ../libpurple/protocols/jabber/buddy.c:1039
-msgid "Jingle Raw UDP"
-msgstr "Jingle Raw UDP"
+msgid "Stream Initiation"
+msgstr "惡惆悖 悋�惠�悋惘"

 #: ../libpurple/protocols/jabber/buddy.c:881
 #: ../libpurple/protocols/jabber/buddy.c:1041
-msgid "Jingle Video"
-msgstr "��惆�� Jingle"
+#: ../libpurple/protocols/sametime/sametime.c:3286
+msgid "File Transfer"
+msgstr "��� 悋�����悋惠 "

 #: ../libpurple/protocols/jabber/buddy.c:883
 #: ../libpurple/protocols/jabber/buddy.c:1043
-msgid "Jingle DTMF"
-msgstr "Jingle DTMF"
+msgid "User Mood"
+msgstr "�慍悋悴 悋��愕惠悽惆�"

 #: ../libpurple/protocols/jabber/buddy.c:885
 #: ../libpurple/protocols/jabber/buddy.c:1045
-msgid "Message Receipts"
-msgstr "悒�惶悋�悋惠 悋�惘愕悋悧�"
+msgid "User Activity"
+msgstr "�愆悋愀 悋��愕惠悽惆�"

 #: ../libpurple/protocols/jabber/buddy.c:887
 #: ../libpurple/protocols/jabber/buddy.c:1047
-msgid "Public Key Publishing"
-msgstr "�愆惘 悋���惠悋忰 悋�惺���"
+msgid "Entity Capabilities"
+msgstr "悒��悋�悋惠 悋���悋�"

 #: ../libpurple/protocols/jabber/buddy.c:889
 #: ../libpurple/protocols/jabber/buddy.c:1049
-msgid "User Chatting"
-msgstr "悋��愕惠悽惆� �惆惘惆愆"
+msgid "Encrypted Session Negotiations"
+msgstr "��悋�惷悋惠 悋�悴�愕悋惠 悋��惺��悋悸"

 #: ../libpurple/protocols/jabber/buddy.c:891
 #: ../libpurple/protocols/jabber/buddy.c:1051
-msgid "User Browsing"
-msgstr "悋��愕惠悽惆� �惠惶��忰"
+msgid "User Tune"
+msgstr "�愃�悸 悋��愕惠悽惆�"

 #: ../libpurple/protocols/jabber/buddy.c:893
 #: ../libpurple/protocols/jabber/buddy.c:1053
-msgid "User Gaming"
-msgstr "悋��愕惠悽惆� ��惺惡"
+msgid "Roster Item Exchange"
+msgstr "惠惡悋惆� 惆�惘悋�� ��惺�悋惶惘"

 #: ../libpurple/protocols/jabber/buddy.c:895
 #: ../libpurple/protocols/jabber/buddy.c:1055
-msgid "User Viewing"
-msgstr "悋��愕惠悽惆� �愀悋�惺"
+msgid "Reachability Address"
+msgstr "惺��悋� 悋��惶���悸"

 #: ../libpurple/protocols/jabber/buddy.c:897
 #: ../libpurple/protocols/jabber/buddy.c:1057
-#: ../libpurple/protocols/silc/ops.c:1600
-#: ../libpurple/protocols/silc/ops.c:1605
+msgid "User Profile"
+msgstr "�悋忰悸 悋��愕惠悽惆�"
+
+#: ../libpurple/protocols/jabber/buddy.c:899
+#: ../libpurple/protocols/jabber/buddy.c:1059
+msgid "Jingle"
+msgstr "Jingle"
+
+#: ../libpurple/protocols/jabber/buddy.c:901
+#: ../libpurple/protocols/jabber/buddy.c:1061
+msgid "Jingle Audio"
+msgstr "Jingle Audio"
+
+#: ../libpurple/protocols/jabber/buddy.c:903
+#: ../libpurple/protocols/jabber/buddy.c:1063
+msgid "User Nickname"
+msgstr "���悸 悋��愕惠悽惆�"
+
+#: ../libpurple/protocols/jabber/buddy.c:905
+#: ../libpurple/protocols/jabber/buddy.c:1065
+msgid "Jingle ICE UDP"
+msgstr "Jingle ICE UDP"
+
+#: ../libpurple/protocols/jabber/buddy.c:907
+#: ../libpurple/protocols/jabber/buddy.c:1067
+msgid "Jingle ICE TCP"
+msgstr "Jingle ICE TCP"
+
+#: ../libpurple/protocols/jabber/buddy.c:909
+#: ../libpurple/protocols/jabber/buddy.c:1069
+msgid "Jingle Raw UDP"
+msgstr "Jingle Raw UDP"
+
+#: ../libpurple/protocols/jabber/buddy.c:911
+#: ../libpurple/protocols/jabber/buddy.c:1071
+msgid "Jingle Video"
+msgstr "��惆�� Jingle"
+
+#: ../libpurple/protocols/jabber/buddy.c:913
+#: ../libpurple/protocols/jabber/buddy.c:1073
+msgid "Jingle DTMF"
+msgstr "Jingle DTMF"
+
+#: ../libpurple/protocols/jabber/buddy.c:915
+#: ../libpurple/protocols/jabber/buddy.c:1075
+msgid "Message Receipts"
+msgstr "悒�惶悋�悋惠 悋�惘愕悋悧�"
+
+#: ../libpurple/protocols/jabber/buddy.c:917
+#: ../libpurple/protocols/jabber/buddy.c:1077
+msgid "Public Key Publishing"
+msgstr "�愆惘 悋���惠悋忰 悋�惺���"
+
+#: ../libpurple/protocols/jabber/buddy.c:919
+#: ../libpurple/protocols/jabber/buddy.c:1079
+msgid "User Chatting"
+msgstr "悋��愕惠悽惆� �惆惘惆愆"
+
+#: ../libpurple/protocols/jabber/buddy.c:921
+#: ../libpurple/protocols/jabber/buddy.c:1081
+msgid "User Browsing"
+msgstr "悋��愕惠悽惆� �惠惶��忰"
+
+#: ../libpurple/protocols/jabber/buddy.c:923
+#: ../libpurple/protocols/jabber/buddy.c:1083
+msgid "User Gaming"
+msgstr "悋��愕惠悽惆� ��惺惡"
+
+#: ../libpurple/protocols/jabber/buddy.c:925
+#: ../libpurple/protocols/jabber/buddy.c:1085
+msgid "User Viewing"
+msgstr "悋��愕惠悽惆� �愀悋�惺"
+
+#: ../libpurple/protocols/jabber/buddy.c:927
+#: ../libpurple/protocols/jabber/buddy.c:1087
+#: ../libpurple/protocols/silc/ops.c:1615
+#: ../libpurple/protocols/silc/ops.c:1620
 #: ../libpurple/protocols/silc10/ops.c:1612
 #: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping"
 msgstr "惡���悴"

-#: ../libpurple/protocols/jabber/buddy.c:899
-#: ../libpurple/protocols/jabber/buddy.c:1059
+#: ../libpurple/protocols/jabber/buddy.c:929
+#: ../libpurple/protocols/jabber/buddy.c:1089
 msgid "Stanza Encryption"
 msgstr "惠惺��悸 悋�悖惡�悋惠"

-#: ../libpurple/protocols/jabber/buddy.c:901
-#: ../libpurple/protocols/jabber/buddy.c:1061
+#: ../libpurple/protocols/jabber/buddy.c:931
+#: ../libpurple/protocols/jabber/buddy.c:1091
 msgid "Entity Time"
 msgstr "��惠 悋���悋�"

-#: ../libpurple/protocols/jabber/buddy.c:903
-#: ../libpurple/protocols/jabber/buddy.c:1063
+#: ../libpurple/protocols/jabber/buddy.c:933
+#: ../libpurple/protocols/jabber/buddy.c:1093
 msgid "Delayed Delivery"
 msgstr "惠愕��� �惠悖悽惘"

-#: ../libpurple/protocols/jabber/buddy.c:905
-#: ../libpurple/protocols/jabber/buddy.c:1065
+#: ../libpurple/protocols/jabber/buddy.c:935
+#: ../libpurple/protocols/jabber/buddy.c:1095
 msgid "Collaborative Data Objects"
 msgstr "惺�悋惶惘 悋�惡�悋�悋惠 悋�惠愆悋惘���悸"

-#: ../libpurple/protocols/jabber/buddy.c:907
-#: ../libpurple/protocols/jabber/buddy.c:1067
+#: ../libpurple/protocols/jabber/buddy.c:937
+#: ../libpurple/protocols/jabber/buddy.c:1097
 msgid "File Repository and Sharing"
 msgstr "�愕惠�惆惺 悋����悋惠 �悋��愆悋惘�悸"

-#: ../libpurple/protocols/jabber/buddy.c:909
-#: ../libpurple/protocols/jabber/buddy.c:1069
+#: ../libpurple/protocols/jabber/buddy.c:939
+#: ../libpurple/protocols/jabber/buddy.c:1099
 msgid "STUN Service Discovery for Jingle"
 msgstr "悋�惠愆悋� 悽惆�悸 STUN �� Jingle"

-#: ../libpurple/protocols/jabber/buddy.c:911
-#: ../libpurple/protocols/jabber/buddy.c:1071
+#: ../libpurple/protocols/jabber/buddy.c:941
+#: ../libpurple/protocols/jabber/buddy.c:1101
 msgid "Simplified Encrypted Session Negotiation"
 msgstr "悋�惠�悋�惷 悋��惡愕愀 �悴�愕悸 �惺��悋悸"

-#: ../libpurple/protocols/jabber/buddy.c:913
-#: ../libpurple/protocols/jabber/buddy.c:1073
+#: ../libpurple/protocols/jabber/buddy.c:943
+#: ../libpurple/protocols/jabber/buddy.c:1103
 msgid "Hop Check"
 msgstr "惠惆��� 悋���慍悋惠"

-#: ../libpurple/protocols/jabber/buddy.c:921
-#: ../libpurple/protocols/jabber/buddy.c:1081
-#: ../libpurple/protocols/oscar/oscar.c:2915
+#: ../libpurple/protocols/jabber/buddy.c:951
+#: ../libpurple/protocols/jabber/buddy.c:1111
+#: ../libpurple/protocols/oscar/oscar.c:2974
 msgid "Capabilities"
 msgstr "悋�悒��悋�悋惠"

-#: ../libpurple/protocols/jabber/buddy.c:933
+#: ../libpurple/protocols/jabber/buddy.c:963
 #: ../libpurple/protocols/jabber/libxmpp.c:209
 #: ../libpurple/protocols/jabber/si.c:1094
 msgid "Resource"
 msgstr "��惘惆"

-#: ../libpurple/protocols/jabber/buddy.c:935
-#: ../libpurple/protocols/jabber/jabber.c:1598
-#: ../libpurple/protocols/jabber/jabber.c:1612
-#: ../libpurple/protocols/jabber/jabber.c:1626
-#: ../libpurple/protocols/jabber/jabber.c:1640
-#: ../libpurple/protocols/jabber/jabber.c:1654
+#: ../libpurple/protocols/jabber/buddy.c:965
+#: ../libpurple/protocols/jabber/jabber.c:1610
+#: ../libpurple/protocols/jabber/jabber.c:1624
+#: ../libpurple/protocols/jabber/jabber.c:1638
+#: ../libpurple/protocols/jabber/jabber.c:1652
+#: ../libpurple/protocols/jabber/jabber.c:1666
 msgid "Priority"
 msgstr "悋�悖�����悸"

-#: ../libpurple/protocols/jabber/buddy.c:1239
-#: ../libpurple/protocols/silc/ops.c:994
+#: ../libpurple/protocols/jabber/buddy.c:1274
+#: ../libpurple/protocols/silc/ops.c:1009
 #: ../libpurple/protocols/silc10/ops.c:1028
 msgid "Middle Name"
 msgstr "悋�悋愕� 悋�悖�愕愀"

-#: ../libpurple/protocols/jabber/buddy.c:1272
-#: ../libpurple/protocols/jabber/jabber.c:1002
-#: ../libpurple/protocols/oscar/oscar.c:3769
-#: ../libpurple/protocols/oscar/oscar.c:3782
+#: ../libpurple/protocols/jabber/buddy.c:1307
+#: ../libpurple/protocols/jabber/jabber.c:1014
+#: ../libpurple/protocols/oscar/oscar.c:3835
+#: ../libpurple/protocols/oscar/oscar.c:3848
 #: ../libpurple/protocols/qq/buddy_info.c:56
-#: ../libpurple/protocols/silc/ops.c:1030
+#: ../libpurple/protocols/silc/ops.c:1045
 #: ../libpurple/protocols/silc10/ops.c:1064
 msgid "Address"
 msgstr "悋�惺��悋�"

-#: ../libpurple/protocols/jabber/buddy.c:1278
+#: ../libpurple/protocols/jabber/buddy.c:1313
 msgid "P.O. Box"
 msgstr "惶�惆�� 悋�惡惘�惆"

-#: ../libpurple/protocols/jabber/buddy.c:1388
+#: ../libpurple/protocols/jabber/buddy.c:1423
 msgid "Photo"
 msgstr "惶�惘悸"

-#: ../libpurple/protocols/jabber/buddy.c:1388
+#: ../libpurple/protocols/jabber/buddy.c:1423
 msgid "Logo"
 msgstr "愆惺悋惘"

-#: ../libpurple/protocols/jabber/buddy.c:1947
+#: ../libpurple/protocols/jabber/buddy.c:1992
 msgid "Un-hide From"
-msgstr "悋�愃� 悋�悒悽�悋悄 惺�"
-
-#: ../libpurple/protocols/jabber/buddy.c:1951
+msgstr "悖�愃� 悋�悒悽�悋悄 惺�"
+
+#: ../libpurple/protocols/jabber/buddy.c:1996
 msgid "Temporarily Hide From"
 msgstr "悋悽�� �悗�惠悋 惺�"

 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1959
+#: ../libpurple/protocols/jabber/buddy.c:2004
 msgid "Cancel Presence Notification"
-msgstr "悋�愃� 惠���� 悋�惠�悋悴惆"
-
-#: ../libpurple/protocols/jabber/buddy.c:1966
+msgstr "悖�愃� 惠���� 悋�惠�悋悴惆"
+
+#: ../libpurple/protocols/jabber/buddy.c:2011
 msgid "(Re-)Request authorization"
 msgstr "(悖惺�惆) 愀�惡 悋�悋愕惠�惓悋�"

 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:1975
+#: ../libpurple/protocols/jabber/buddy.c:2020
 msgid "Unsubscribe"
-msgstr "悋�愃� 悋�悋愆惠惘悋�"
-
-#: ../libpurple/protocols/jabber/buddy.c:1990
+msgstr "悖�愃� 悋�悋愆惠惘悋�"
+
+#: ../libpurple/protocols/jabber/buddy.c:2035
 msgid "Log In"
 msgstr "��悴�"

-#: ../libpurple/protocols/jabber/buddy.c:1994
+#: ../libpurple/protocols/jabber/buddy.c:2039
 msgid "Log Out"
 msgstr "悋悽惘悴"

-#: ../libpurple/protocols/jabber/buddy.c:2040
-#: ../libpurple/protocols/jabber/jabber.c:1611
+#: ../libpurple/protocols/jabber/buddy.c:2085
+#: ../libpurple/protocols/jabber/jabber.c:1623
 msgid "Chatty"
 msgstr "惓惘惓悋惘"

-#: ../libpurple/protocols/jabber/buddy.c:2044
+#: ../libpurple/protocols/jabber/buddy.c:2089
 msgid "Extended Away"
 msgstr "愃悋悧惡 愀���悋"

-#: ../libpurple/protocols/jabber/buddy.c:2046
-#: ../libpurple/protocols/jabber/jabber.c:1653
-#: ../libpurple/protocols/oscar/oscar.c:727
-#: ../libpurple/protocols/oscar/oscar.c:5849
-#: ../libpurple/protocols/sametime/sametime.c:3339
+#: ../libpurple/protocols/jabber/buddy.c:2091
+#: ../libpurple/protocols/jabber/jabber.c:1665
+#: ../libpurple/protocols/oscar/oscar.c:728
+#: ../libpurple/protocols/oscar/oscar.c:5937
+#: ../libpurple/protocols/sametime/sametime.c:3348
 msgid "Do Not Disturb"
 msgstr "悋�惘悴悋悄 惺惆� 悋�悒慍惺悋悴"

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

-#: ../libpurple/protocols/jabber/buddy.c:2217
-#: ../libpurple/protocols/jabber/buddy.c:2406
-#: ../libpurple/protocols/oscar/oscar.c:3692
+#: ../libpurple/protocols/jabber/buddy.c:2262
+#: ../libpurple/protocols/jabber/buddy.c:2451
+#: ../libpurple/protocols/oscar/oscar.c:3758
 msgid "Last Name"
 msgstr "悋愕� 悋�惺悋悧�悸"

-#: ../libpurple/protocols/jabber/buddy.c:2249
+#: ../libpurple/protocols/jabber/buddy.c:2294
 msgid "The following are the results of your search"
 msgstr "���悋 ��� �惠悋悧悴 惡忰惓�"

 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:2334
+#: ../libpurple/protocols/jabber/buddy.c:2379
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
@@ -5356,69 +5508,69 @@
 "悋惡忰惓 惺� ��惘悋愕� 惺� 愀惘�� 悒惆悽悋� �惺悋��惘 悋�惡忰惓 �� 悋�忰��� 悋���悋愕惡悸. ��悋忰惴悸: 悋�忰��� "
 "惠惆惺� 悋�惡忰惓 惡悋�悴�悋�惘 (%)"

-#: ../libpurple/protocols/jabber/buddy.c:2354
+#: ../libpurple/protocols/jabber/buddy.c:2399
 msgid "Directory Query Failed"
 msgstr "�愆� 悋愕惠惺�悋� 悋�惆���"

-#: ../libpurple/protocols/jabber/buddy.c:2355
+#: ../libpurple/protocols/jabber/buddy.c:2400
 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:2389
+#: ../libpurple/protocols/jabber/buddy.c:2434
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "惠惺���悋惠 悋�悽悋惆��: %s"

-#: ../libpurple/protocols/jabber/buddy.c:2396
+#: ../libpurple/protocols/jabber/buddy.c:2441
 msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr "悋��悖 �悋忰惆悸 悖� 悖�惓惘 �� 悋�忰��� ��惡忰惓 惺� �愕惠悽惆�� XMPP 悋��愀悋惡���."

-#: ../libpurple/protocols/jabber/buddy.c:2416
+#: ../libpurple/protocols/jabber/buddy.c:2461
 #: ../libpurple/protocols/novell/novell.c:1497
-#: ../libpurple/protocols/oscar/oscar.c:3695
-#: ../libpurple/protocols/oscar/oscar.c:3704
+#: ../libpurple/protocols/oscar/oscar.c:3761
+#: ../libpurple/protocols/oscar/oscar.c:3770
 msgid "E-Mail Address"
 msgstr "惺��悋� 悋�惡惘�惆 悋�悋��惠惘���"

-#: ../libpurple/protocols/jabber/buddy.c:2425
-#: ../libpurple/protocols/jabber/buddy.c:2426
+#: ../libpurple/protocols/jabber/buddy.c:2470
+#: ../libpurple/protocols/jabber/buddy.c:2471
 msgid "Search for XMPP users"
 msgstr "悋惡忰惓 惺� �愕惠悽惆�� XMPP"

 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:2427
+#: ../libpurple/protocols/jabber/buddy.c:2472
 #: ../libpurple/protocols/qq/group.c:123
 #: ../libpurple/protocols/qq/group_im.c:147
-#: ../libpurple/protocols/qq/sys_msg.c:174
-#: ../libpurple/protocols/qq/sys_msg.c:250
-#: ../libpurple/protocols/qq/sys_msg.c:268
-#: ../libpurple/protocols/sametime/sametime.c:5657
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:470
+#: ../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
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:474
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:356
 msgid "Search"
 msgstr "悋惡忰惓"

-#: ../libpurple/protocols/jabber/buddy.c:2442
+#: ../libpurple/protocols/jabber/buddy.c:2487
 msgid "Invalid Directory"
 msgstr "惆��� 愃�惘 惶悋�忰"

-#: ../libpurple/protocols/jabber/buddy.c:2459
+#: ../libpurple/protocols/jabber/buddy.c:2504
 msgid "Enter a User Directory"
 msgstr "悖惆悽�� 惆��� �愕惠悽惆���"

-#: ../libpurple/protocols/jabber/buddy.c:2460
+#: ../libpurple/protocols/jabber/buddy.c:2505
 msgid "Select a user directory to search"
 msgstr "悋悽惠惘 惆��� �愕惠悽惆��� ��惡忰惓"

-#: ../libpurple/protocols/jabber/buddy.c:2463
+#: ../libpurple/protocols/jabber/buddy.c:2508
 msgid "Search Directory"
 msgstr "惆��� 悋�惡忰惓"

 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5329
-#: ../libpurple/protocols/yahoo/yahoochat.c:1048
+#: ../libpurple/protocols/oscar/oscar.c:5417
+#: ../libpurple/protocols/yahoo/yahoochat.c:1057
 msgid "_Room:"
 msgstr "_愃惘�悸:"

@@ -5487,7 +5639,7 @@

 #: ../libpurple/protocols/jabber/chat.c:678
 #: ../libpurple/protocols/jabber/chat.c:689
-#: ../libpurple/protocols/silc/ops.c:1460
+#: ../libpurple/protocols/silc/ops.c:1475
 #: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error retrieving room list"
 msgstr "惺愀� �� 悴�惡 �悋悧�悸 悋�愃惘�"
@@ -5522,15 +5674,15 @@
 msgid "Ping timeout"
 msgstr "���悸 惡���悴"

-#: ../libpurple/protocols/jabber/jabber.c:447
-#: ../libpurple/protocols/jabber/jabber.c:486
+#: ../libpurple/protocols/jabber/jabber.c:451
+#: ../libpurple/protocols/jabber/jabber.c:491
 msgid "Read Error"
 msgstr "惺愀� �� 悋��惘悋悄悸"

-#: ../libpurple/protocols/jabber/jabber.c:523
+#: ../libpurple/protocols/jabber/jabber.c:528
 #: ../libpurple/protocols/oscar/flap_connection.c:398
-#: ../libpurple/protocols/yahoo/yahoo.c:2595
-#: ../libpurple/protocols/yahoo/yahoo.c:2627
+#: ../libpurple/protocols/yahoo/yahoo.c:2594
+#: ../libpurple/protocols/yahoo/yahoo.c:2626
 #, c-format
 msgid ""
 "Could not establish a connection with the server:\n"
@@ -5539,609 +5691,611 @@
 "惠惺悵��惘 悋�悋惠惶悋� 惡悋�悽悋惆��:\n"
 "%s"

-#: ../libpurple/protocols/jabber/jabber.c:573
+#: ../libpurple/protocols/jabber/jabber.c:585
 msgid "Unable to create socket"
 msgstr "惠惺悵�惘 悒�愆悋悄 ��惡愕"

-#: ../libpurple/protocols/jabber/jabber.c:623
-#: ../libpurple/protocols/jabber/jabber.c:1108
+#: ../libpurple/protocols/jabber/jabber.c:635
+#: ../libpurple/protocols/jabber/jabber.c:1120
 msgid "Invalid XMPP ID"
 msgstr "���悸 XMPP 愃�惘 惶忰�忰悸"

-#: ../libpurple/protocols/jabber/jabber.c:630
+#: ../libpurple/protocols/jabber/jabber.c:642
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "���悸 XMPP 愃�惘 惶忰�忰悸. �悴惡 惠忰惆�惆 悋��愀悋�."

-#: ../libpurple/protocols/jabber/jabber.c:708
+#: ../libpurple/protocols/jabber/jabber.c:720
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "�悴忰 惠愕悴�� %s@%s"

-#: ../libpurple/protocols/jabber/jabber.c:714
+#: ../libpurple/protocols/jabber/jabber.c:726
 #, c-format
 msgid "Registration to %s successful"
 msgstr "�悴忰 悋�惠愕悴�� �� %s"

-#: ../libpurple/protocols/jabber/jabber.c:716
-#: ../libpurple/protocols/jabber/jabber.c:717
+#: ../libpurple/protocols/jabber/jabber.c:728
+#: ../libpurple/protocols/jabber/jabber.c:729
 msgid "Registration Successful"
 msgstr "�悴忰 悋�惠愕悴��"

-#: ../libpurple/protocols/jabber/jabber.c:725
-#: ../libpurple/protocols/jabber/jabber.c:726
+#: ../libpurple/protocols/jabber/jabber.c:737
+#: ../libpurple/protocols/jabber/jabber.c:738
 msgid "Registration Failed"
 msgstr "�愆� 悋�惠愕悴��"

-#: ../libpurple/protocols/jabber/jabber.c:744
+#: ../libpurple/protocols/jabber/jabber.c:756
 #, c-format
 msgid "Registration from %s successfully removed"
 msgstr "悖慍�� 悋�惠愕悴�� �� %s 惡�悴悋忰"

-#: ../libpurple/protocols/jabber/jabber.c:746
-#: ../libpurple/protocols/jabber/jabber.c:747
+#: ../libpurple/protocols/jabber/jabber.c:758
+#: ../libpurple/protocols/jabber/jabber.c:759
 msgid "Unregistration Successful"
 msgstr "�悴忰 悒�愃悋悄 悋�惠愕悴��"

-#: ../libpurple/protocols/jabber/jabber.c:755
-#: ../libpurple/protocols/jabber/jabber.c:756
+#: ../libpurple/protocols/jabber/jabber.c:767
+#: ../libpurple/protocols/jabber/jabber.c:768
 msgid "Unregistration Failed"
 msgstr "�愆� 悒�愃悋悄 悋�惠愕悴��"

-#: ../libpurple/protocols/jabber/jabber.c:922
-#: ../libpurple/protocols/jabber/jabber.c:923
+#: ../libpurple/protocols/jabber/jabber.c:934
+#: ../libpurple/protocols/jabber/jabber.c:935
 msgid "Already Registered"
 msgstr "�愕悴� 惡悋��惺�"

-#: ../libpurple/protocols/jabber/jabber.c:1010
-#: ../libpurple/protocols/oscar/oscar.c:3771
-#: ../libpurple/protocols/oscar/oscar.c:3784
+#: ../libpurple/protocols/jabber/jabber.c:1022
+#: ../libpurple/protocols/oscar/oscar.c:3837
+#: ../libpurple/protocols/oscar/oscar.c:3850
 msgid "State"
 msgstr "悋�悒����"

-#: ../libpurple/protocols/jabber/jabber.c:1014
+#: ../libpurple/protocols/jabber/jabber.c:1026
 msgid "Postal code"
 msgstr "悋�惘�慍 悋�惡惘�惆�"

-#: ../libpurple/protocols/jabber/jabber.c:1018
-#: ../libpurple/protocols/silc/ops.c:1035
+#: ../libpurple/protocols/jabber/jabber.c:1030
+#: ../libpurple/protocols/silc/ops.c:1050
 #: ../libpurple/protocols/silc/silc.c:915
-#: ../libpurple/protocols/silc/util.c:563
+#: ../libpurple/protocols/silc/util.c:567
 #: ../libpurple/protocols/silc10/ops.c:1069
-#: ../libpurple/protocols/silc10/silc.c:683
-#: ../libpurple/protocols/silc10/util.c:553
+#: ../libpurple/protocols/silc10/silc.c:689
+#: ../libpurple/protocols/silc10/util.c:557
 msgid "Phone"
 msgstr "�悋惠�"

-#: ../libpurple/protocols/jabber/jabber.c:1026
+#: ../libpurple/protocols/jabber/jabber.c:1038
 msgid "Date"
 msgstr "悋�惠悋惘�悽"

-#: ../libpurple/protocols/jabber/jabber.c:1030
+#: ../libpurple/protocols/jabber/jabber.c:1042
 msgid "Unregister"
-msgstr "悋�愃 悋�惠愕悴��"
-
-#: ../libpurple/protocols/jabber/jabber.c:1037
+msgstr "悖�愃 悋�惠愕悴��"
+
+#: ../libpurple/protocols/jabber/jabber.c:1049
 msgid "Please fill out the information below to change your account registration."
 msgstr "�� �惷�� 悋��悖 悋��惺���悋惠 悖惆�悋� �惠愃�惘 惠愕悴�� 忰愕悋惡�."

-#: ../libpurple/protocols/jabber/jabber.c:1040
+#: ../libpurple/protocols/jabber/jabber.c:1052
 msgid "Please fill out the information below to register your new account."
 msgstr "�� �惷�� 悋��悖 悋��惺���悋惠 悖惆�悋� �惠愕悴�� 忰愕悋惡 悴惆�惆 ��."

-#: ../libpurple/protocols/jabber/jabber.c:1048
-#: ../libpurple/protocols/jabber/jabber.c:1049
+#: ../libpurple/protocols/jabber/jabber.c:1060
+#: ../libpurple/protocols/jabber/jabber.c:1061
 msgid "Register New XMPP Account"
 msgstr "愕悴�� 忰愕悋惡 XMPP 悴惆�惆"

-#: ../libpurple/protocols/jabber/jabber.c:1050
-#: ../libpurple/protocols/jabber/jabber.c:1059
+#: ../libpurple/protocols/jabber/jabber.c:1062
+#: ../libpurple/protocols/jabber/jabber.c:1071
 msgid "Register"
 msgstr "愕悴��"

-#: ../libpurple/protocols/jabber/jabber.c:1055
+#: ../libpurple/protocols/jabber/jabber.c:1067
 #, c-format
 msgid "Change Account Registration at %s"
 msgstr "愃��惘 惠愕悴�� 悋�忰愕悋惡 �� %s"

-#: ../libpurple/protocols/jabber/jabber.c:1056
+#: ../libpurple/protocols/jabber/jabber.c:1068
 #, c-format
 msgid "Register New Account at %s"
 msgstr "愕悴�� 忰愕悋惡悋 悴惆�惆 �� %s"

-#: ../libpurple/protocols/jabber/jabber.c:1059
+#: ../libpurple/protocols/jabber/jabber.c:1071
 msgid "Change Registration"
 msgstr "愃��惘 悋�惠愕悴��"

-#: ../libpurple/protocols/jabber/jabber.c:1168
-#: ../libpurple/protocols/jabber/jabber.c:1169
+#: ../libpurple/protocols/jabber/jabber.c:1180
+#: ../libpurple/protocols/jabber/jabber.c:1181
 msgid "Error unregistering account"
 msgstr "惺愀� �� 悒�愃悋悄 惠愕悴�� 悋�忰愕悋惡"

-#: ../libpurple/protocols/jabber/jabber.c:1174
-#: ../libpurple/protocols/jabber/jabber.c:1175
+#: ../libpurple/protocols/jabber/jabber.c:1186
+#: ../libpurple/protocols/jabber/jabber.c:1187
 msgid "Account successfully unregistered"
 msgstr "悖�愃� 惠愕悴�� 悋�忰愕悋惡 惡�悴悋忰"

-#: ../libpurple/protocols/jabber/jabber.c:1338
+#: ../libpurple/protocols/jabber/jabber.c:1350
 msgid "Initializing Stream"
 msgstr "�悴惘� 悋愕惠惡惆悋悄 悋�惠�悋惘"

-#: ../libpurple/protocols/jabber/jabber.c:1343
+#: ../libpurple/protocols/jabber/jabber.c:1355
 msgid "Initializing SSL/TLS"
 msgstr "�悴惘� 悋愕惠惡惆悋悄 SSL/TLS"

-#: ../libpurple/protocols/jabber/jabber.c:1347
+#: ../libpurple/protocols/jabber/jabber.c:1359
 #: ../libpurple/protocols/msn/session.c:408
 #: ../libpurple/protocols/msnp9/session.c:360
 msgid "Authenticating"
 msgstr "�悴惘� 悋�悋愕惠�惓悋�"

-#: ../libpurple/protocols/jabber/jabber.c:1356
+#: ../libpurple/protocols/jabber/jabber.c:1368
 msgid "Re-initializing Stream"
 msgstr "惠悴惘� 悒惺悋惆悸 悋愕惠惡惆悋悄 悋�惠�悋惘"

-#: ../libpurple/protocols/jabber/jabber.c:1450
-#: ../libpurple/protocols/jabber/jabber.c:1908
-#: ../libpurple/protocols/jabber/jabber.c:1951
-#: ../libpurple/protocols/jabber/jabber.c:1989
-#: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:5643
+#: ../libpurple/protocols/jabber/jabber.c:1462
+#: ../libpurple/protocols/jabber/jabber.c:1920
+#: ../libpurple/protocols/jabber/jabber.c:1963
+#: ../libpurple/protocols/jabber/jabber.c:2001
+#: ../libpurple/protocols/oscar/oscar.c:827
+#: ../libpurple/protocols/oscar/oscar.c:5731
 msgid "Not Authorized"
 msgstr "愃�惘 �惶惘忰"

-#: ../libpurple/protocols/jabber/jabber.c:1498
+#: ../libpurple/protocols/jabber/jabber.c:1510
 msgid "Both"
 msgstr "��悋��悋"

-#: ../libpurple/protocols/jabber/jabber.c:1500
+#: ../libpurple/protocols/jabber/jabber.c:1512
 msgid "From (To pending)"
 msgstr "�� (悒�� ��惘悴悖)"

-#: ../libpurple/protocols/jabber/jabber.c:1502
+#: ../libpurple/protocols/jabber/jabber.c:1514
 msgid "From"
 msgstr "���"

-#: ../libpurple/protocols/jabber/jabber.c:1505
+#: ../libpurple/protocols/jabber/jabber.c:1517
 msgid "To"
 msgstr "悒��"

-#: ../libpurple/protocols/jabber/jabber.c:1507
+#: ../libpurple/protocols/jabber/jabber.c:1519
 msgid "None (To pending)"
 msgstr "�悋愆�悄 (悒�� ��惘悴悖)"

-#: ../libpurple/protocols/jabber/jabber.c:1509
+#: ../libpurple/protocols/jabber/jabber.c:1521
 #: ../pidgin/plugins/gevolution/eds-utils.c:73
 #: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr "�悋 愆�悄"

-#: ../libpurple/protocols/jabber/jabber.c:1512
+#: ../libpurple/protocols/jabber/jabber.c:1524
 msgid "Subscription"
 msgstr "悋�悋愆惠惘悋�"

-#: ../libpurple/protocols/jabber/jabber.c:1522
-#: ../libpurple/protocols/jabber/jabber.c:1525
-#: ../libpurple/protocols/jabber/jabber.c:1600
-#: ../libpurple/protocols/jabber/jabber.c:1614
-#: ../libpurple/protocols/jabber/jabber.c:1628
-#: ../libpurple/protocols/jabber/jabber.c:1642
-#: ../libpurple/protocols/jabber/jabber.c:1656
+#: ../libpurple/protocols/jabber/jabber.c:1534
+#: ../libpurple/protocols/jabber/jabber.c:1537
+#: ../libpurple/protocols/jabber/jabber.c:1612
+#: ../libpurple/protocols/jabber/jabber.c:1626
+#: ../libpurple/protocols/jabber/jabber.c:1640
+#: ../libpurple/protocols/jabber/jabber.c:1654
+#: ../libpurple/protocols/jabber/jabber.c:1668
 #: ../libpurple/protocols/jabber/usermood.c:184
 #: ../libpurple/protocols/silc/buddy.c:1560
-#: ../libpurple/protocols/silc/ops.c:1212
+#: ../libpurple/protocols/silc/ops.c:1227
 #: ../libpurple/protocols/silc10/buddy.c:1560
 #: ../libpurple/protocols/silc10/ops.c:1207
 msgid "Mood"
 msgstr "悋��慍悋悴"

-#: ../libpurple/protocols/jabber/jabber.c:1534
-#: ../libpurple/protocols/msn/msn.c:646
+#: ../libpurple/protocols/jabber/jabber.c:1546
+#: ../libpurple/protocols/msn/msn.c:656
 msgid "Now Listening"
 msgstr "悋�悛� �愕惠�惺"

-#: ../libpurple/protocols/jabber/jabber.c:1601
+#: ../libpurple/protocols/jabber/jabber.c:1613
+#: ../libpurple/protocols/jabber/jabber.c:1627
+#: ../libpurple/protocols/jabber/jabber.c:1641
+#: ../libpurple/protocols/jabber/jabber.c:1655
+#: ../libpurple/protocols/jabber/jabber.c:1669
+msgid "Mood Text"
+msgstr "�惶 悋��慍悋悴"
+
 #: ../libpurple/protocols/jabber/jabber.c:1615
 #: ../libpurple/protocols/jabber/jabber.c:1629
 #: ../libpurple/protocols/jabber/jabber.c:1643
 #: ../libpurple/protocols/jabber/jabber.c:1657
-msgid "Mood Text"
-msgstr "�惶 悋��慍悋悴"
-
-#: ../libpurple/protocols/jabber/jabber.c:1603
-#: ../libpurple/protocols/jabber/jabber.c:1617
-#: ../libpurple/protocols/jabber/jabber.c:1631
-#: ../libpurple/protocols/jabber/jabber.c:1645
-#: ../libpurple/protocols/jabber/jabber.c:1659
+#: ../libpurple/protocols/jabber/jabber.c:1671
 msgid "Allow Buzz"
 msgstr "悋愕�忰 惡悋�惘��悸"

-#: ../libpurple/protocols/jabber/jabber.c:1677
+#: ../libpurple/protocols/jabber/jabber.c:1689
 msgid "Tune Artist"
 msgstr "悋愕� 悋���愕����"

-#: ../libpurple/protocols/jabber/jabber.c:1678
+#: ../libpurple/protocols/jabber/jabber.c:1690
 msgid "Tune Title"
 msgstr "惺��悋� 悋��忰�"

-#: ../libpurple/protocols/jabber/jabber.c:1679
+#: ../libpurple/protocols/jabber/jabber.c:1691
 msgid "Tune Album"
 msgstr "悖�惡�� 悋��忰�"

-#: ../libpurple/protocols/jabber/jabber.c:1680
+#: ../libpurple/protocols/jabber/jabber.c:1692
 msgid "Tune Genre"
 msgstr "��惺 悋��忰�"

-#: ../libpurple/protocols/jabber/jabber.c:1681
+#: ../libpurple/protocols/jabber/jabber.c:1693
 msgid "Tune Comment"
 msgstr "惠惺��� 悋��忰�"

-#: ../libpurple/protocols/jabber/jabber.c:1682
+#: ../libpurple/protocols/jabber/jabber.c:1694
 msgid "Tune Track"
 msgstr "��愀�惺悸 悋��忰�"

-#: ../libpurple/protocols/jabber/jabber.c:1683
+#: ../libpurple/protocols/jabber/jabber.c:1695
 msgid "Tune Time"
 msgstr "�惆悸 悋��忰�"

-#: ../libpurple/protocols/jabber/jabber.c:1684
+#: ../libpurple/protocols/jabber/jabber.c:1696
 msgid "Tune Year"
 msgstr "愕�悸 悋��忰�"

-#: ../libpurple/protocols/jabber/jabber.c:1685
+#: ../libpurple/protocols/jabber/jabber.c:1697
 msgid "Tune URL"
 msgstr "�愕悋惘 悋��忰�"

-#: ../libpurple/protocols/jabber/jabber.c:1701
+#: ../libpurple/protocols/jabber/jabber.c:1713
 msgid "Password Changed"
 msgstr "愃���惘惠 ���悸 悋�愕惘"

-#: ../libpurple/protocols/jabber/jabber.c:1702
+#: ../libpurple/protocols/jabber/jabber.c:1714
 msgid "Your password has been changed."
 msgstr "惠� 惠愃��惘 ���悸 悋�愕惘�."

-#: ../libpurple/protocols/jabber/jabber.c:1708
-#: ../libpurple/protocols/jabber/jabber.c:1709
+#: ../libpurple/protocols/jabber/jabber.c:1720
+#: ../libpurple/protocols/jabber/jabber.c:1721
 msgid "Error changing password"
 msgstr "惺愀� 悖惓�悋悄 惠愃��惘 ���悸 悋�愕惘"

-#: ../libpurple/protocols/jabber/jabber.c:1766
+#: ../libpurple/protocols/jabber/jabber.c:1778
 msgid "Password (again)"
 msgstr "���悸 悋�愕惘 (�悴惆惆�悋)"

-#: ../libpurple/protocols/jabber/jabber.c:1772
-#: ../libpurple/protocols/jabber/jabber.c:1773
+#: ../libpurple/protocols/jabber/jabber.c:1784
+#: ../libpurple/protocols/jabber/jabber.c:1785
 msgid "Change XMPP Password"
 msgstr "愃��惘 ���悸 愕惘 XMPP"

-#: ../libpurple/protocols/jabber/jabber.c:1773
+#: ../libpurple/protocols/jabber/jabber.c:1785
 msgid "Please enter your new password"
 msgstr "悖惆悽� ���悸 悋�愕惘 悋�悴惆�惆悸"

-#: ../libpurple/protocols/jabber/jabber.c:1787
-#: ../libpurple/protocols/oscar/oscar.c:6429
+#: ../libpurple/protocols/jabber/jabber.c:1799
+#: ../libpurple/protocols/oscar/oscar.c:6518
 #: ../libpurple/protocols/silc/silc.c:1236
-#: ../libpurple/protocols/silc10/silc.c:1004
+#: ../libpurple/protocols/silc10/silc.c:1010
 msgid "Set User Info..."
 msgstr "悋惷惡愀 �惺���悋惠 悋��愕惠悽惆�..."

 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1792
-#: ../libpurple/protocols/oscar/oscar.c:6440
+#: ../libpurple/protocols/jabber/jabber.c:1804
+#: ../libpurple/protocols/oscar/oscar.c:6529
 #: ../libpurple/protocols/silc/silc.c:1232
-#: ../libpurple/protocols/silc10/silc.c:1000
+#: ../libpurple/protocols/silc10/silc.c:1006
 msgid "Change Password..."
 msgstr "愃��惘 ���悸 悋�愕惘..."

 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1797
+#: ../libpurple/protocols/jabber/jabber.c:1809
 msgid "Search for Users..."
 msgstr "悋惡忰惓 惺� 悋��愕惠悽惆���..."

-#: ../libpurple/protocols/jabber/jabber.c:1888
+#: ../libpurple/protocols/jabber/jabber.c:1900
 msgid "Bad Request"
 msgstr "愀�惡 愕��悄"

-#: ../libpurple/protocols/jabber/jabber.c:1890
+#: ../libpurple/protocols/jabber/jabber.c:1902
 msgid "Conflict"
 msgstr "惠惷悋惘惡"

-#: ../libpurple/protocols/jabber/jabber.c:1892
+#: ../libpurple/protocols/jabber/jabber.c:1904
 msgid "Feature Not Implemented"
 msgstr "悋�悽悋惶�悸 愃�惘 �愀惡�悸"

-#: ../libpurple/protocols/jabber/jabber.c:1894
+#: ../libpurple/protocols/jabber/jabber.c:1906
 msgid "Forbidden"
 msgstr "����惺"

-#: ../libpurple/protocols/jabber/jabber.c:1896
+#: ../libpurple/protocols/jabber/jabber.c:1908
 msgid "Gone"
 msgstr "惘忰�"

-#: ../libpurple/protocols/jabber/jabber.c:1898
-#: ../libpurple/protocols/jabber/jabber.c:1979
+#: ../libpurple/protocols/jabber/jabber.c:1910
+#: ../libpurple/protocols/jabber/jabber.c:1991
 msgid "Internal Server Error"
 msgstr "悽愀悖 惆悋悽�� �� 悋�悽悋惆��"

-#: ../libpurple/protocols/jabber/jabber.c:1900
+#: ../libpurple/protocols/jabber/jabber.c:1912
 msgid "Item Not Found"
 msgstr "悋�惺�惶惘 愃�惘 ��悴�惆"

-#: ../libpurple/protocols/jabber/jabber.c:1902
+#: ../libpurple/protocols/jabber/jabber.c:1914
 msgid "Malformed XMPP ID"
 msgstr "���悸 XMPP �惺愀�惡悸"

-#: ../libpurple/protocols/jabber/jabber.c:1904
+#: ../libpurple/protocols/jabber/jabber.c:1916
 msgid "Not Acceptable"
 msgstr "愃�惘 ��惡��"

-#: ../libpurple/protocols/jabber/jabber.c:1906
+#: ../libpurple/protocols/jabber/jabber.c:1918
 msgid "Not Allowed"
 msgstr "愃�惘 �愕��忰 "

-#: ../libpurple/protocols/jabber/jabber.c:1910
+#: ../libpurple/protocols/jabber/jabber.c:1922
 msgid "Payment Required"
 msgstr "惠惠愀�惡 悋�惆�惺"

-#: ../libpurple/protocols/jabber/jabber.c:1912
+#: ../libpurple/protocols/jabber/jabber.c:1924
 msgid "Recipient Unavailable"
 msgstr "悋��愕惠�� 愃�惘 �惠��惘"

-#: ../libpurple/protocols/jabber/jabber.c:1916
+#: ../libpurple/protocols/jabber/jabber.c:1928
 msgid "Registration Required"
 msgstr "惠惠愀�惡 悋�惠愕悴��"

-#: ../libpurple/protocols/jabber/jabber.c:1918
+#: ../libpurple/protocols/jabber/jabber.c:1930
 msgid "Remote Server Not Found"
 msgstr "悋�悽悋惆�� 悋�惡惺�惆 愃�惘 ��悴�惆"

-#: ../libpurple/protocols/jabber/jabber.c:1920
+#: ../libpurple/protocols/jabber/jabber.c:1932
 msgid "Remote Server Timeout"
 msgstr "悋�惠�惠 ���悸 悋�悽悋惆�� 悋�惡惺�惆"

-#: ../libpurple/protocols/jabber/jabber.c:1922
+#: ../libpurple/protocols/jabber/jabber.c:1934
 msgid "Server Overloaded"
 msgstr "悋�悽悋惆�� �忰�� ��� 愀悋�惠�"

-#: ../libpurple/protocols/jabber/jabber.c:1924
+#: ../libpurple/protocols/jabber/jabber.c:1936
 msgid "Service Unavailable"
 msgstr "悋�悽惆�悸 愃�惘 �惠��惘悸"

-#: ../libpurple/protocols/jabber/jabber.c:1926
+#: ../libpurple/protocols/jabber/jabber.c:1938
 msgid "Subscription Required"
 msgstr "惠惠愀�惡 悋�悋愆惠惘悋�"

-#: ../libpurple/protocols/jabber/jabber.c:1928
+#: ../libpurple/protocols/jabber/jabber.c:1940
 msgid "Unexpected Request"
 msgstr "愀�惡 愃�惘 �惠��惺"

-#: ../libpurple/protocols/jabber/jabber.c:1936
+#: ../libpurple/protocols/jabber/jabber.c:1948
 msgid "Authorization Aborted"
 msgstr "悖�忰惡愀 悋�惠惶惘�忰"

-#: ../libpurple/protocols/jabber/jabber.c:1938
+#: ../libpurple/protocols/jabber/jabber.c:1950
 msgid "Incorrect encoding in authorization"
 msgstr "惠惘��慍 愃�惘 惶忰�忰 �� 悋�惠惶惘�忰"

-#: ../libpurple/protocols/jabber/jabber.c:1940
+#: ../libpurple/protocols/jabber/jabber.c:1952
 msgid "Invalid authzid"
 msgstr "惠惶惘�忰 愃�惘 惶悋�忰"

-#: ../libpurple/protocols/jabber/jabber.c:1942
+#: ../libpurple/protocols/jabber/jabber.c:1954
 msgid "Invalid Authorization Mechanism"
 msgstr "悛��悸 惠惶惘�忰 愃�惘 惶悋�忰悸"

-#: ../libpurple/protocols/jabber/jabber.c:1945
+#: ../libpurple/protocols/jabber/jabber.c:1957
 msgid "Authorization mechanism too weak"
 msgstr "悛��悸 悋�惠惶惘�忰 惷惺��悸 悴惆�悋"

-#: ../libpurple/protocols/jabber/jabber.c:1953
+#: ../libpurple/protocols/jabber/jabber.c:1965
 msgid "Temporary Authentication Failure"
 msgstr "�愆�� �悗���惠 �� 悋�悋愕惠�惓悋�"

-#: ../libpurple/protocols/jabber/jabber.c:1956
+#: ../libpurple/protocols/jabber/jabber.c:1968
 msgid "Authentication Failure"
 msgstr "�愆� 悋�悋愕惠�惓悋�"

-#: ../libpurple/protocols/jabber/jabber.c:1964
+#: ../libpurple/protocols/jabber/jabber.c:1976
 msgid "Bad Format"
 msgstr "惶�愃悸 愃�惘 惶悋�忰悸"

-#: ../libpurple/protocols/jabber/jabber.c:1966
+#: ../libpurple/protocols/jabber/jabber.c:1978
 msgid "Bad Namespace Prefix"
 msgstr "愕悋惡�悸 �愀悋� 悖愕�悋悄� 愃�惘 惶悋�忰悸"

-#: ../libpurple/protocols/jabber/jabber.c:1969
+#: ../libpurple/protocols/jabber/jabber.c:1981
 msgid "Resource Conflict"
 msgstr "惠惷悋惘惡 �� 悋���悋惘惆"

-#: ../libpurple/protocols/jabber/jabber.c:1971
+#: ../libpurple/protocols/jabber/jabber.c:1983
 #: ../libpurple/protocols/silc/silc.c:350
-#: ../libpurple/protocols/silc10/ops.c:1720
+#: ../libpurple/protocols/silc10/ops.c:1725
 msgid "Connection Timeout"
 msgstr "悋�惠�惠 ���悸 悋�悋惠惶悋�"

-#: ../libpurple/protocols/jabber/jabber.c:1973
+#: ../libpurple/protocols/jabber/jabber.c:1985
 msgid "Host Gone"
 msgstr "悋悽惠�� 悋��惷��"

-#: ../libpurple/protocols/jabber/jabber.c:1975
-msgid "Host Unknown"
-msgstr "�惷�� �悴���"
-
-#: ../libpurple/protocols/jabber/jabber.c:1977
-msgid "Improper Addressing"
-msgstr "惺���悸 悽悋愀悧悸"
-
-#: ../libpurple/protocols/jabber/jabber.c:1981
-msgid "Invalid ID"
-msgstr "���悸 愃�惘 惶忰�忰悸"
-
-#: ../libpurple/protocols/jabber/jabber.c:1983
-msgid "Invalid Namespace"
-msgstr "�愀悋� 悖愕�悋悄 愃�惘 惶忰�忰"
-
-#: ../libpurple/protocols/jabber/jabber.c:1985
-msgid "Invalid XML"
-msgstr "XML 愃�惘 惶忰�忰"
-
 #: ../libpurple/protocols/jabber/jabber.c:1987
-msgid "Non-matching Hosts"
-msgstr "�悋 �惷���� �愀悋惡���"
-
-#: ../libpurple/protocols/jabber/jabber.c:1991
-msgid "Policy Violation"
-msgstr "悋�惠�悋� 愕�悋愕悸"
+msgid "Host Unknown"
+msgstr "�惷�� �悴���"
+
+#: ../libpurple/protocols/jabber/jabber.c:1989
+msgid "Improper Addressing"
+msgstr "惺���悸 悽悋愀悧悸"

 #: ../libpurple/protocols/jabber/jabber.c:1993
-msgid "Remote Connection Failed"
-msgstr "�愆� 悋�悋惠惶悋� 悋�惡惺�惆"
+msgid "Invalid ID"
+msgstr "���悸 愃�惘 惶忰�忰悸"

 #: ../libpurple/protocols/jabber/jabber.c:1995
+msgid "Invalid Namespace"
+msgstr "�愀悋� 悖愕�悋悄 愃�惘 惶忰�忰"
+
+#: ../libpurple/protocols/jabber/jabber.c:1997
+msgid "Invalid XML"
+msgstr "XML 愃�惘 惶忰�忰"
+
+#: ../libpurple/protocols/jabber/jabber.c:1999
+msgid "Non-matching Hosts"
+msgstr "�悋 �惷���� �愀悋惡���"
+
+#: ../libpurple/protocols/jabber/jabber.c:2003
+msgid "Policy Violation"
+msgstr "悋�惠�悋� 愕�悋愕悸"
+
+#: ../libpurple/protocols/jabber/jabber.c:2005
+msgid "Remote Connection Failed"
+msgstr "�愆� 悋�悋惠惶悋� 悋�惡惺�惆"
+
+#: ../libpurple/protocols/jabber/jabber.c:2007
 msgid "Resource Constraint"
 msgstr "�忰惆�惆�悸 �� 悋���惘惆"

-#: ../libpurple/protocols/jabber/jabber.c:1997
+#: ../libpurple/protocols/jabber/jabber.c:2009
 msgid "Restricted XML"
 msgstr "XML ���惆悸"

-#: ../libpurple/protocols/jabber/jabber.c:1999
+#: ../libpurple/protocols/jabber/jabber.c:2011
 msgid "See Other Host"
 msgstr "愀悋�惺 �惷��悋 悛悽惘"

-#: ../libpurple/protocols/jabber/jabber.c:2001
+#: ../libpurple/protocols/jabber/jabber.c:2013
 msgid "System Shutdown"
 msgstr "悒愀�悋悄 悋��惴悋�"

-#: ../libpurple/protocols/jabber/jabber.c:2003
+#: ../libpurple/protocols/jabber/jabber.c:2015
 msgid "Undefined Condition"
 msgstr "愆惘愀 愃�惘 ��惺惘��"

-#: ../libpurple/protocols/jabber/jabber.c:2005
+#: ../libpurple/protocols/jabber/jabber.c:2017
 msgid "Unsupported Encoding"
 msgstr "惠惘��慍 愃�惘 �惆惺��"

-#: ../libpurple/protocols/jabber/jabber.c:2007
+#: ../libpurple/protocols/jabber/jabber.c:2019
 msgid "Unsupported Stanza Type"
 msgstr "��惺 悖惡�悋惠 愃�惘 �惆惺��"

-#: ../libpurple/protocols/jabber/jabber.c:2009
+#: ../libpurple/protocols/jabber/jabber.c:2021
 msgid "Unsupported Version"
 msgstr "悒惶惆悋惘悸 愃�惘 �惆惺��悸"

-#: ../libpurple/protocols/jabber/jabber.c:2011
+#: ../libpurple/protocols/jabber/jabber.c:2023
 msgid "XML Not Well Formed"
 msgstr "XML 愃�惘 惶忰�忰 悋�惠愆���'"

-#: ../libpurple/protocols/jabber/jabber.c:2013
+#: ../libpurple/protocols/jabber/jabber.c:2025
 msgid "Stream Error"
 msgstr "惺愀� �� 悋�惠�悋惘"

-#: ../libpurple/protocols/jabber/jabber.c:2098
+#: ../libpurple/protocols/jabber/jabber.c:2110
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "惠惺悵�惘 忰惴惘 悋��愕惠悽惆� %s"

-#: ../libpurple/protocols/jabber/jabber.c:2118
+#: ../libpurple/protocols/jabber/jabber.c:2130
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "悋�惠愕悋惡 �悴���: \"%s\""

-#: ../libpurple/protocols/jabber/jabber.c:2123
+#: ../libpurple/protocols/jabber/jabber.c:2135
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "惠惺悵�惘 悋�惠愕悋惡 悋��愕惠悽惆� %s ��� \"%s\""

-#: ../libpurple/protocols/jabber/jabber.c:2142
+#: ../libpurple/protocols/jabber/jabber.c:2154
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "惆�惘 �悴���: \"%s\""

-#: ../libpurple/protocols/jabber/jabber.c:2147
+#: ../libpurple/protocols/jabber/jabber.c:2159
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "惠惺悵�惘 �惷惺 惆�惘 \"%s\" ���愕惠悽惆�: %s"

-#: ../libpurple/protocols/jabber/jabber.c:2200
+#: ../libpurple/protocols/jabber/jabber.c:2212
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "惠惺悵�惘 惘�� 悋��愕惠悽惆� %s"

-#: ../libpurple/protocols/jabber/jabber.c:2231
+#: ../libpurple/protocols/jabber/jabber.c:2243
 #, c-format
 msgid "Unable to ping user %s"
 msgstr "惠惺悵�惘 悒惘愕悋� ping ���愕惠悽惆� %s"

-#: ../libpurple/protocols/jabber/jabber.c:2249
-#: ../libpurple/protocols/jabber/jabber.c:2260
+#: ../libpurple/protocols/jabber/jabber.c:2261
+#: ../libpurple/protocols/jabber/jabber.c:2272
 #, c-format
 msgid "Unable to buzz, because there is nothing known about user %s."
 msgstr "惠惺悵�惘 悋�惘��� �悖�� �悋 ��惺惘� 悖� 愆�悄 惺� 悋��愕惠悽惆� %s."

-#: ../libpurple/protocols/jabber/jabber.c:2255
+#: ../libpurple/protocols/jabber/jabber.c:2267
 #, c-format
 msgid "Unable to buzz, because user %s might be offline."
 msgstr "惠惺悵�惘 悋�惘��� �悖� 悋��愕惠悽惆� %s �惆 �悋 ���� �惠惶�悋."

-#: ../libpurple/protocols/jabber/jabber.c:2286
+#: ../libpurple/protocols/jabber/jabber.c:2298
 #, c-format
 msgid "Unable to buzz, because the user %s does not support it."
 msgstr "惠惺悵�惘 悋�惘��� �悖� 悋��愕惠悽惆� %s �悋 �惆惺��."

-#: ../libpurple/protocols/jabber/jabber.c:2308
-#: ../libpurple/protocols/yahoo/yahoo.c:4175
+#. 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
 msgid "Buzz"
 msgstr "惘�"

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

-#: ../libpurple/protocols/jabber/jabber.c:2310
-#: ../libpurple/protocols/yahoo/yahoo.c:4177
+#: ../libpurple/protocols/jabber/jabber.c:2319
+#: ../libpurple/protocols/yahoo/yahoo.c:4164
 #, c-format
 msgid "Buzzing %s..."
 msgstr "�惘� 惺�� %s..."

-#: ../libpurple/protocols/jabber/jabber.c:2342
+#: ../libpurple/protocols/jabber/jabber.c:2350
 msgid "config:  Configure a chat room."
 msgstr ""
 "config:\n"
 "悋惷惡愀 愃惘�悸 悋�惆惘惆愆悸."

-#: ../libpurple/protocols/jabber/jabber.c:2346
+#: ../libpurple/protocols/jabber/jabber.c:2354
 msgid "configure:  Configure a chat room."
 msgstr ""
 "configure:\n"
 "悋惷惡愀 愃惘�悸 惆惘惆愆悸."

-#: ../libpurple/protocols/jabber/jabber.c:2355
+#: ../libpurple/protocols/jabber/jabber.c:2363
 msgid "part [room]:  Leave the room."
 msgstr ""
 "part [room]:\n"
 "愃悋惆惘 悋�愃惘�悸."

-#: ../libpurple/protocols/jabber/jabber.c:2360
+#: ../libpurple/protocols/jabber/jabber.c:2368
 msgid "register:  Register with a chat room."
 msgstr ""
 "register:\n"
 "愕悴�� �� 愃惘�悸 惆惘惆愆悸."

-#: ../libpurple/protocols/jabber/jabber.c:2366
+#: ../libpurple/protocols/jabber/jabber.c:2374
 msgid "topic [new topic]:  View or change the topic."
 msgstr ""
 "topic [new topic]:\n"
 "悋惺惘惷 悖� 愃��惘 悋���惷�惺."

-#: ../libpurple/protocols/jabber/jabber.c:2372
+#: ../libpurple/protocols/jabber/jabber.c:2380
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr ""
 "ban &lt;user&gt; [room]:\n"
 "悋愀惘惆 �愕惠悽惆�悋 �� 悋�愃惘�悸."

-#: ../libpurple/protocols/jabber/jabber.c:2378
+#: ../libpurple/protocols/jabber/jabber.c:2386
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -6149,7 +6303,7 @@
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;:\n"
 "忰惆�惆 惺�悋�悸 悋���愕惠悽惆� 惡悋�愃惘�悸."

-#: ../libpurple/protocols/jabber/jabber.c:2384
+#: ../libpurple/protocols/jabber/jabber.c:2392
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -6157,38 +6311,38 @@
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;:\n"
 "忰惆惆 惆�惘 �愕惠悽惆� �� 愃惘�悸."

-#: ../libpurple/protocols/jabber/jabber.c:2390
+#: ../libpurple/protocols/jabber/jabber.c:2398
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr ""
 "invite &lt;user&gt; [message]:\n"
 "悋惆惺 �愕惠悽惆�悋 悒�� 愃惘�悸."

-#: ../libpurple/protocols/jabber/jabber.c:2396
+#: ../libpurple/protocols/jabber/jabber.c:2404
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr ""
 "join: &lt;room&gt; [server]:\n"
 "悋�惷� 悒�� 惆惘惆愆悸 惺�� �悵悋 悋�悽悋惆��"

-#: ../libpurple/protocols/jabber/jabber.c:2402
+#: ../libpurple/protocols/jabber/jabber.c:2410
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr ""
 "kick &lt;user&gt; [room]:\n"
 "悋惘�� �愕惠悽惆�悋 悽悋惘悴 悋�愃惘�悸."

-#: ../libpurple/protocols/jabber/jabber.c:2407
+#: ../libpurple/protocols/jabber/jabber.c:2415
 msgid "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
 "msg &lt;user&gt; &lt;message&gt;:\n"
 "悋惘愕� 惘愕悋�悸 悽悋惶悸 悒�� �愕惠悽惆� 悛悽惘."

-#: ../libpurple/protocols/jabber/jabber.c:2413
+#: ../libpurple/protocols/jabber/jabber.c:2421
 msgid "ping &lt;jid&gt;:\tPing a user/component/server."
 msgstr ""
 "ping &lt;jid&gt;:\n"
 "悖惘愕�� 惡���悴 ��愕惠悽惆�/�������/悽悋惆��."

-#: ../libpurple/protocols/jabber/jabber.c:2418
-#: ../libpurple/protocols/yahoo/yahoo.c:4201
+#: ../libpurple/protocols/jabber/jabber.c:2426
+#: ../libpurple/protocols/yahoo/yahoo.c:4187
 msgid "buzz: Buzz a user to get their attention"
 msgstr "��buzz: 惘� 惺�� �愕惠悽惆� �惠悴悵惡 悋�惠惡悋��."

@@ -6224,23 +6378,27 @@
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "悋愕�忰 惡悋�悋愕惠�惓悋� 惡悋��惶 悋�惶惘�忰 惺惡惘 惠�悋惘悋惠 愃�惘 ��惺��悋悸"

-#: ../libpurple/protocols/jabber/libxmpp.c:227
-#: ../libpurple/protocols/myspace/myspace.c:3333
-#: ../libpurple/protocols/simple/simple.c:2112
+#: ../libpurple/protocols/jabber/libxmpp.c:229
+msgid "Use GSSAPI (Kerberos v5) for authentication"
+msgstr "悋愕惠悽惆� ��GSSAPI (Kerberos v5)�� ��悋愕惠�惓悋�"
+
+#: ../libpurple/protocols/jabber/libxmpp.c:235
+#: ../libpurple/protocols/myspace/myspace.c:3468
+#: ../libpurple/protocols/simple/simple.c:2105
 msgid "Connect port"
 msgstr "���悵 悋�悋惠惶悋�"

 #. TODO: default to automatically try different ports. Make the user be
 #. * able to set the first port to try (like LastConnectedPort in Windows client).
 #. Account options
-#: ../libpurple/protocols/jabber/libxmpp.c:231
-#: ../libpurple/protocols/myspace/myspace.c:3330
+#: ../libpurple/protocols/jabber/libxmpp.c:239
+#: ../libpurple/protocols/myspace/myspace.c:3465
 #: ../libpurple/protocols/silc/silc.c:2057
-#: ../libpurple/protocols/silc10/silc.c:1857 ../pidgin/gtkaccount.c:809
+#: ../libpurple/protocols/silc10/silc.c:1863 ../pidgin/gtkaccount.c:809
 msgid "Connect server"
 msgstr "悋惠惶� 惡悋�悽悋惆��"

-#: ../libpurple/protocols/jabber/libxmpp.c:236
+#: ../libpurple/protocols/jabber/libxmpp.c:244
 msgid "File transfer proxies"
 msgstr "�愕愀悋悄 ��� 悋����悋惠"

@@ -6343,7 +6501,7 @@

 #: ../libpurple/protocols/jabber/si.c:1092
 #, c-format
-msgid "Please select which resource of %s you would like to send a file to"
+msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "�� �惷�� 忰惆惆 ���惘�惆 %s 悋�悵� 惠�惆 悒惘愕悋� ��� 悒���"

 #: ../libpurple/protocols/jabber/si.c:1108
@@ -6386,11 +6544,11 @@
 msgid "Set Nickname..."
 msgstr "忰惆惆 悋����悸..."

-#: ../libpurple/protocols/jabber/xdata.c:378
+#: ../libpurple/protocols/jabber/xdata.c:381
 msgid "Actions"
 msgstr "悖�惺悋�"

-#: ../libpurple/protocols/jabber/xdata.c:380
+#: ../libpurple/protocols/jabber/xdata.c:383
 msgid "Select an action"
 msgstr "悋悽惠惘 �惺�悋"

@@ -6481,7 +6639,7 @@

 #: ../libpurple/protocols/msn/error.c:75
 #: ../libpurple/protocols/msnp9/error.c:75
-#: ../libpurple/protocols/zephyr/zephyr.c:756
+#: ../libpurple/protocols/zephyr/zephyr.c:760
 msgid "User is offline"
 msgstr "悋��愕惠悽惆� 愃�惘 �惠惶�"

@@ -6667,10 +6825,10 @@

 #: ../libpurple/protocols/msn/error.c:222
 #: ../libpurple/protocols/msnp9/error.c:222
-#: ../libpurple/protocols/oscar/oscar.c:1376
+#: ../libpurple/protocols/oscar/oscar.c:1422
 #: ../libpurple/protocols/silc/silc.c:338
-#: ../libpurple/protocols/silc10/ops.c:1709
-#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1393
+#: ../libpurple/protocols/silc10/ops.c:1713
+#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1448
 msgid "Authentication failed"
 msgstr "�愆� 悋�悋愕惠�惓悋�"

@@ -6711,49 +6869,49 @@
 msgid "MSN Error: %s\n"
 msgstr "悽愀悖 MSN: %s\n"

-#: ../libpurple/protocols/msn/msn.c:130 ../libpurple/protocols/msnp9/msn.c:130
+#: ../libpurple/protocols/msn/msn.c:128 ../libpurple/protocols/msnp9/msn.c:129
 msgid "Nudge"
 msgstr "��慍悸"

-#: ../libpurple/protocols/msn/msn.c:131 ../libpurple/protocols/msnp9/msn.c:131
+#: ../libpurple/protocols/msn/msn.c:129 ../libpurple/protocols/msnp9/msn.c:130
 #, c-format
 msgid "%s has nudged you!"
 msgstr "��慍� %s"

-#: ../libpurple/protocols/msn/msn.c:132 ../libpurple/protocols/msnp9/msn.c:132
+#: ../libpurple/protocols/msn/msn.c:129 ../libpurple/protocols/msnp9/msn.c:130
 #, c-format
 msgid "Nudging %s..."
 msgstr "惠��慍 %s..."

-#: ../libpurple/protocols/msn/msn.c:174 ../libpurple/protocols/msnp9/msn.c:174
+#: ../libpurple/protocols/msn/msn.c:170 ../libpurple/protocols/msnp9/msn.c:171
 msgid "Your new MSN friendly name is too long."
 msgstr "悋愕�� 悋��惆�� �� MSN 悖愀�� �� 悋��愕��忰."

-#: ../libpurple/protocols/msn/msn.c:286 ../libpurple/protocols/msnp9/msn.c:282
+#: ../libpurple/protocols/msn/msn.c:296 ../libpurple/protocols/msnp9/msn.c:279
 msgid "Set your friendly name."
 msgstr "悋惷惡愀 悋愕�� 悋��惆��."

-#: ../libpurple/protocols/msn/msn.c:287 ../libpurple/protocols/msnp9/msn.c:283
+#: ../libpurple/protocols/msn/msn.c:297 ../libpurple/protocols/msnp9/msn.c:280
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "�悵悋 �� 悋�悋愕� 悋�悵� 愕�惘悋� 悖惶惆�悋悗� 惺�� MSN "

-#: ../libpurple/protocols/msn/msn.c:305 ../libpurple/protocols/msnp9/msn.c:301
+#: ../libpurple/protocols/msn/msn.c:315 ../libpurple/protocols/msnp9/msn.c:298
 msgid "Set your home phone number."
 msgstr "悖惆悽� 惘�� �悋惠� ��慍��."

-#: ../libpurple/protocols/msn/msn.c:322 ../libpurple/protocols/msnp9/msn.c:318
+#: ../libpurple/protocols/msn/msn.c:332 ../libpurple/protocols/msnp9/msn.c:315
 msgid "Set your work phone number."
 msgstr "悖惆悽� 惘�� �悋惠� 惺���."

-#: ../libpurple/protocols/msn/msn.c:339 ../libpurple/protocols/msnp9/msn.c:335
+#: ../libpurple/protocols/msn/msn.c:349 ../libpurple/protocols/msnp9/msn.c:332
 msgid "Set your mobile phone number."
 msgstr "悖惆悽� 惘�� �悋惠�� 悋��忰���."

-#: ../libpurple/protocols/msn/msn.c:354 ../libpurple/protocols/msnp9/msn.c:350
+#: ../libpurple/protocols/msn/msn.c:364 ../libpurple/protocols/msnp9/msn.c:347
 msgid "Allow MSN Mobile pages?"
 msgstr "悖悖愕�忰 惡惶�忰悋惠 MSN ���忰����"

-#: ../libpurple/protocols/msn/msn.c:355 ../libpurple/protocols/msnp9/msn.c:351
+#: ../libpurple/protocols/msn/msn.c:365 ../libpurple/protocols/msnp9/msn.c:348
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
@@ -6761,390 +6919,409 @@
 "�� 惠惘�惆 悖� 惠愕�忰 ��� �� �悋悧�悸 悖惶惆�悋悧� 惡悖� �惘愕��悋 惶�忰悋惠 MSN 悋��忰��� 悒�� �悋惠�� "
 "悖� 悖悴�慍惠� 悋���悋�悸 悋�悋悽惘��"

-#: ../libpurple/protocols/msn/msn.c:361 ../libpurple/protocols/msnp9/msn.c:357
+#: ../libpurple/protocols/msn/msn.c:371 ../libpurple/protocols/msnp9/msn.c:354
 msgid "Allow"
 msgstr "悋愕�忰"

-#: ../libpurple/protocols/msn/msn.c:362 ../libpurple/protocols/msnp9/msn.c:358
+#: ../libpurple/protocols/msn/msn.c:372 ../libpurple/protocols/msnp9/msn.c:355
 msgid "Disallow"
 msgstr "�悋 惠愕�忰"

-#: ../libpurple/protocols/msn/msn.c:378 ../libpurple/protocols/msnp9/msn.c:374
+#: ../libpurple/protocols/msn/msn.c:388 ../libpurple/protocols/msnp9/msn.c:371
 msgid "This Hotmail account may not be active."
 msgstr "忰愕悋惡 ��惠��� �悵悋 �惆 �悋 ���� ���惺�悋."

-#: ../libpurple/protocols/msn/msn.c:404 ../libpurple/protocols/msnp9/msn.c:400
+#: ../libpurple/protocols/msn/msn.c:414 ../libpurple/protocols/msnp9/msn.c:397
 msgid "Send a mobile message."
 msgstr "悖惘愕� 惘愕悋�悸 悒�� �忰���."

-#: ../libpurple/protocols/msn/msn.c:406 ../libpurple/protocols/msnp9/msn.c:402
+#: ../libpurple/protocols/msn/msn.c:416 ../libpurple/protocols/msnp9/msn.c:399
 msgid "Page"
 msgstr "惶�忰悸"

-#: ../libpurple/protocols/msn/msn.c:686 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/msnp9/msn.c:583
+#: ../libpurple/protocols/msn/msn.c:679 ../libpurple/protocols/msnp9/msn.c:567
+msgid "Home Phone Number"
+msgstr "惘�� �悋惠� 悋���慍�"
+
+#: ../libpurple/protocols/msn/msn.c:683 ../libpurple/protocols/msnp9/msn.c:571
+msgid "Work Phone Number"
+msgstr "惘�� �悋惠� 悋�惺��"
+
+#: ../libpurple/protocols/msn/msn.c:687 ../libpurple/protocols/msnp9/msn.c:575
+msgid "Mobile Phone Number"
+msgstr "惘�� 悋��悋惠� 悋��忰���"
+
+#: ../libpurple/protocols/msn/msn.c:710 ../libpurple/protocols/msn/state.c:33
+#: ../libpurple/protocols/msnp9/msn.c:594
 #: ../libpurple/protocols/msnp9/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:3133
-#: ../libpurple/protocols/yahoo/yahoo.c:3817
+#: ../libpurple/protocols/yahoo/yahoo.c:3134
+#: ../libpurple/protocols/yahoo/yahoo.c:3823
 msgid "Be Right Back"
 msgstr "愕悖惺�惆 忰悋��悋"

-#: ../libpurple/protocols/msn/msn.c:692 ../libpurple/protocols/msn/state.c:31
-#: ../libpurple/protocols/msnp9/msn.c:587
+#: ../libpurple/protocols/msn/msn.c:716 ../libpurple/protocols/msn/state.c:31
+#: ../libpurple/protocols/msnp9/msn.c:598
 #: ../libpurple/protocols/msnp9/state.c:31
-#: ../libpurple/protocols/novell/novell.c:2839
-#: ../libpurple/protocols/novell/novell.c:2969
+#: ../libpurple/protocols/novell/novell.c:2840
+#: ../libpurple/protocols/novell/novell.c:2970
 #: ../libpurple/protocols/silc/buddy.c:1483
 #: ../libpurple/protocols/silc/silc.c:56
 #: ../libpurple/protocols/silc10/buddy.c:1483
 #: ../libpurple/protocols/silc10/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:3135
-#: ../libpurple/protocols/yahoo/yahoo.c:3820
+#: ../libpurple/protocols/yahoo/yahoo.c:3136
+#: ../libpurple/protocols/yahoo/yahoo.c:3826
 msgid "Busy"
 msgstr "�愆愃��"

-#: ../libpurple/protocols/msn/msn.c:697 ../libpurple/protocols/msnp9/msn.c:591
-#: ../libpurple/protocols/yahoo/yahoo.c:3143
-#: ../libpurple/protocols/yahoo/yahoo.c:3832
+#: ../libpurple/protocols/msn/msn.c:721 ../libpurple/protocols/msnp9/msn.c:602
+#: ../libpurple/protocols/yahoo/yahoo.c:3144
+#: ../libpurple/protocols/yahoo/yahoo.c:3838
 msgid "On the Phone"
 msgstr "惺�� 悋��悋惠�"

-#: ../libpurple/protocols/msn/msn.c:702 ../libpurple/protocols/msnp9/msn.c:595
-#: ../libpurple/protocols/yahoo/yahoo.c:3147
-#: ../libpurple/protocols/yahoo/yahoo.c:3838
+#: ../libpurple/protocols/msn/msn.c:726 ../libpurple/protocols/msnp9/msn.c:606
+#: ../libpurple/protocols/yahoo/yahoo.c:3148
+#: ../libpurple/protocols/yahoo/yahoo.c:3844
 msgid "Out to Lunch"
 msgstr "悽惘悴惠 ��愃惆悋悄"

-#: ../libpurple/protocols/msn/msn.c:721
+#. primitive
+#. ID
+#. name - use default
+#. savable
+#. should be user_settable some day
+#. independent
+#: ../libpurple/protocols/msn/msn.c:745
+#: ../libpurple/protocols/myspace/myspace.c:170
 msgid "Artist"
 msgstr "悋���悋���"

-#: ../libpurple/protocols/msn/msn.c:722
+#: ../libpurple/protocols/msn/msn.c:746
 msgid "Album"
 msgstr "悖�惡��"

-#: ../libpurple/protocols/msn/msn.c:740 ../libpurple/protocols/msnp9/msn.c:623
+#: ../libpurple/protocols/msn/msn.c:764 ../libpurple/protocols/msnp9/msn.c:634
 msgid "Set Friendly Name..."
 msgstr "悖惆悽� 悋愕�悋 �惆��悋..."

-#: ../libpurple/protocols/msn/msn.c:745 ../libpurple/protocols/msnp9/msn.c:628
+#: ../libpurple/protocols/msn/msn.c:769 ../libpurple/protocols/msnp9/msn.c:639
 msgid "Set Home Phone Number..."
 msgstr "悖惆悽� 惘�� �悋惠� 悋���慍�..."

-#: ../libpurple/protocols/msn/msn.c:749 ../libpurple/protocols/msnp9/msn.c:632
+#: ../libpurple/protocols/msn/msn.c:773 ../libpurple/protocols/msnp9/msn.c:643
 msgid "Set Work Phone Number..."
 msgstr "悖惆悽� 惘�� �悋惠� 悋�惺��..."

-#: ../libpurple/protocols/msn/msn.c:753 ../libpurple/protocols/msnp9/msn.c:636
+#: ../libpurple/protocols/msn/msn.c:777 ../libpurple/protocols/msnp9/msn.c:647
 msgid "Set Mobile Phone Number..."
 msgstr "悖惆悽� 惘�� 悋��悋惠� 悋��忰���..."

-#: ../libpurple/protocols/msn/msn.c:759 ../libpurple/protocols/msnp9/msn.c:642
+#: ../libpurple/protocols/msn/msn.c:783 ../libpurple/protocols/msnp9/msn.c:653
 msgid "Enable/Disable Mobile Devices..."
 msgstr "�惺��/惺愀�� 悋�悖悴�慍悸 悋��忰���悸..."

-#: ../libpurple/protocols/msn/msn.c:764 ../libpurple/protocols/msnp9/msn.c:647
+#: ../libpurple/protocols/msn/msn.c:788 ../libpurple/protocols/msnp9/msn.c:658
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "悋愕�忰/悋惘�惷 悋�惶�忰悋惠 悋��惠���悸..."

-#: ../libpurple/protocols/msn/msn.c:775 ../libpurple/protocols/msnp9/msn.c:658
+#: ../libpurple/protocols/msn/msn.c:799 ../libpurple/protocols/msnp9/msn.c:669
 msgid "Open Hotmail Inbox"
 msgstr "悋�惠忰 �悋惘惆 ��惠���"

-#: ../libpurple/protocols/msn/msn.c:799 ../libpurple/protocols/msnp9/msn.c:682
+#: ../libpurple/protocols/msn/msn.c:823 ../libpurple/protocols/msnp9/msn.c:693
 msgid "Send to Mobile"
 msgstr "悖惘愕� 悒�� �忰���"

-#: ../libpurple/protocols/msn/msn.c:809 ../libpurple/protocols/msnp9/msn.c:692
-#: ../libpurple/protocols/novell/novell.c:3425
+#: ../libpurple/protocols/msn/msn.c:833 ../libpurple/protocols/msnp9/msn.c:703
+#: ../libpurple/protocols/novell/novell.c:3426
 msgid "Initiate _Chat"
 msgstr "悋惡惆悖 _惆惘惆愆悸"

-#: ../libpurple/protocols/msn/msn.c:847 ../libpurple/protocols/msnp9/msn.c:731
+#: ../libpurple/protocols/msn/msn.c:871 ../libpurple/protocols/msnp9/msn.c:742
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "MSN 惠惠愀�惡 惆惺� SSL. 惘悴悋悄� 惓惡惠 ��惠惡悸 SSL �惆惺��悸."

-#: ../libpurple/protocols/msn/msn.c:877 ../libpurple/protocols/msnp9/msn.c:761
+#: ../libpurple/protocols/msn/msn.c:901 ../libpurple/protocols/msnp9/msn.c:772
 msgid "Failed to connect to server."
 msgstr "�愆� 悋�悋惠惶悋� 惡悋�悽悋惆��."

-#: ../libpurple/protocols/msn/msn.c:1661 ../libpurple/protocols/msn/msn.c:2004
-#: ../libpurple/protocols/msnp9/msn.c:1516
-#: ../libpurple/protocols/msnp9/msn.c:1859
+#: ../libpurple/protocols/msn/msn.c:1685 ../libpurple/protocols/msn/msn.c:2028
+#: ../libpurple/protocols/msnp9/msn.c:1526
+#: ../libpurple/protocols/msnp9/msn.c:1869
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:808
 msgid "Error retrieving profile"
 msgstr "惺愀� �� 悴�惡 悋��悋忰悸"

-#: ../libpurple/protocols/msn/msn.c:1727
-#: ../libpurple/protocols/msnp9/msn.c:1582 ../pidgin/plugins/convcolors.c:371
+#: ../libpurple/protocols/msn/msn.c:1751
+#: ../libpurple/protocols/msnp9/msn.c:1592 ../pidgin/plugins/convcolors.c:371
 #: ../pidgin/plugins/pidginrc.c:372
 msgid "General"
 msgstr "惺悋�"

-#: ../libpurple/protocols/msn/msn.c:1734
-#: ../libpurple/protocols/msnp9/msn.c:1589
-#: ../libpurple/protocols/myspace/user.c:115
-#: ../libpurple/protocols/oscar/oscar.c:3736
+#: ../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/qq/buddy_info.c:45
 #: ../libpurple/protocols/qq/qq.c:222
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1081
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1088
 msgid "Age"
 msgstr "悋�惺�惘"

-#: ../libpurple/protocols/msn/msn.c:1736
-#: ../libpurple/protocols/msnp9/msn.c:1591
+#: ../libpurple/protocols/msn/msn.c:1760
+#: ../libpurple/protocols/msnp9/msn.c:1601
 #: ../libpurple/protocols/qq/buddy_info.c:51
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1096
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1103
 msgid "Occupation"
 msgstr "悋����悸"

-#: ../libpurple/protocols/msn/msn.c:1737
-#: ../libpurple/protocols/msnp9/msn.c:1592
-#: ../libpurple/protocols/myspace/user.c:123
+#: ../libpurple/protocols/msn/msn.c:1761
+#: ../libpurple/protocols/msnp9/msn.c:1602
+#: ../libpurple/protocols/myspace/user.c:133
 #: ../libpurple/protocols/novell/novell.c:1487
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1076
-#: ../libpurple/protocols/zephyr/zephyr.c:798
-#: ../libpurple/protocols/zephyr/zephyr.c:1215
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1083
+#: ../libpurple/protocols/zephyr/zephyr.c:802
+#: ../libpurple/protocols/zephyr/zephyr.c:1175
 msgid "Location"
 msgstr "悋���惷惺"

-#: ../libpurple/protocols/msn/msn.c:1742 ../libpurple/protocols/msn/msn.c:1934
-#: ../libpurple/protocols/msn/msn.c:1940 ../libpurple/protocols/msn/msn.c:1947
-#: ../libpurple/protocols/msnp9/msn.c:1597
-#: ../libpurple/protocols/msnp9/msn.c:1789
-#: ../libpurple/protocols/msnp9/msn.c:1795
-#: ../libpurple/protocols/msnp9/msn.c:1802
+#: ../libpurple/protocols/msn/msn.c:1766 ../libpurple/protocols/msn/msn.c:1958
+#: ../libpurple/protocols/msn/msn.c:1964 ../libpurple/protocols/msn/msn.c:1971
+#: ../libpurple/protocols/msnp9/msn.c:1607
+#: ../libpurple/protocols/msnp9/msn.c:1799
+#: ../libpurple/protocols/msnp9/msn.c:1805
+#: ../libpurple/protocols/msnp9/msn.c:1812
 msgid "Hobbies and Interests"
 msgstr "悋���悋�悋惠 � 悋�悋�惠�悋�悋惠"

-#: ../libpurple/protocols/msn/msn.c:1748 ../libpurple/protocols/msn/msn.c:1868
-#: ../libpurple/protocols/msn/msn.c:1874 ../libpurple/protocols/msn/msn.c:1881
-#: ../libpurple/protocols/msn/msn.c:1889 ../libpurple/protocols/msn/msn.c:1896
-#: ../libpurple/protocols/msnp9/msn.c:1603
-#: ../libpurple/protocols/msnp9/msn.c:1723
-#: ../libpurple/protocols/msnp9/msn.c:1729
-#: ../libpurple/protocols/msnp9/msn.c:1736
-#: ../libpurple/protocols/msnp9/msn.c:1744
-#: ../libpurple/protocols/msnp9/msn.c:1751
+#: ../libpurple/protocols/msn/msn.c:1772 ../libpurple/protocols/msn/msn.c:1892
+#: ../libpurple/protocols/msn/msn.c:1898 ../libpurple/protocols/msn/msn.c:1905
+#: ../libpurple/protocols/msn/msn.c:1913 ../libpurple/protocols/msn/msn.c:1920
+#: ../libpurple/protocols/msnp9/msn.c:1613
+#: ../libpurple/protocols/msnp9/msn.c:1733
+#: ../libpurple/protocols/msnp9/msn.c:1739
+#: ../libpurple/protocols/msnp9/msn.c:1746
+#: ../libpurple/protocols/msnp9/msn.c:1754
+#: ../libpurple/protocols/msnp9/msn.c:1761
 msgid "A Little About Me"
 msgstr "悋����� 惺��"

-#: ../libpurple/protocols/msn/msn.c:1765
-#: ../libpurple/protocols/msnp9/msn.c:1620
+#: ../libpurple/protocols/msn/msn.c:1789
+#: ../libpurple/protocols/msnp9/msn.c:1630
 msgid "Social"
 msgstr "悋悴惠�悋惺�悋惠"

-#: ../libpurple/protocols/msn/msn.c:1767
-#: ../libpurple/protocols/msnp9/msn.c:1622
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1086
+#: ../libpurple/protocols/msn/msn.c:1791
+#: ../libpurple/protocols/msnp9/msn.c:1632
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1093
 msgid "Marital Status"
 msgstr "悋�忰悋�悸 悋�慍�悴�悸"

-#: ../libpurple/protocols/msn/msn.c:1768
-#: ../libpurple/protocols/msnp9/msn.c:1623
+#: ../libpurple/protocols/msn/msn.c:1792
+#: ../libpurple/protocols/msnp9/msn.c:1633
 msgid "Interests"
 msgstr "悋�悋�惠�悋�悋惠"

-#: ../libpurple/protocols/msn/msn.c:1769
-#: ../libpurple/protocols/msnp9/msn.c:1624
+#: ../libpurple/protocols/msn/msn.c:1793
+#: ../libpurple/protocols/msnp9/msn.c:1634
 msgid "Pets"
 msgstr "悋�忰��悋�悋惠 悋�悖���悸"

-#: ../libpurple/protocols/msn/msn.c:1770
-#: ../libpurple/protocols/msnp9/msn.c:1625
+#: ../libpurple/protocols/msn/msn.c:1794
+#: ../libpurple/protocols/msnp9/msn.c:1635
 msgid "Hometown"
 msgstr "悋�惡�惆悸"

-#: ../libpurple/protocols/msn/msn.c:1771
-#: ../libpurple/protocols/msnp9/msn.c:1626
+#: ../libpurple/protocols/msn/msn.c:1795
+#: ../libpurple/protocols/msnp9/msn.c:1636
 msgid "Places Lived"
 msgstr "悖�悋�� 悋�悒�悋�悸"

-#: ../libpurple/protocols/msn/msn.c:1772
-#: ../libpurple/protocols/msnp9/msn.c:1627
+#: ../libpurple/protocols/msn/msn.c:1796
+#: ../libpurple/protocols/msnp9/msn.c:1637
 msgid "Fashion"
 msgstr "悋���惷悸"

-#: ../libpurple/protocols/msn/msn.c:1773
-#: ../libpurple/protocols/msnp9/msn.c:1628
+#: ../libpurple/protocols/msn/msn.c:1797
+#: ../libpurple/protocols/msnp9/msn.c:1638
 msgid "Humor"
 msgstr "悋�惆惺悋惡悋惠"

-#: ../libpurple/protocols/msn/msn.c:1774
-#: ../libpurple/protocols/msnp9/msn.c:1629
+#: ../libpurple/protocols/msn/msn.c:1798
+#: ../libpurple/protocols/msnp9/msn.c:1639
 msgid "Music"
 msgstr "��愕��悋"

-#: ../libpurple/protocols/msn/msn.c:1775 ../libpurple/protocols/msn/msn.c:1956
-#: ../libpurple/protocols/msn/msn.c:1962
-#: ../libpurple/protocols/msnp9/msn.c:1630
-#: ../libpurple/protocols/msnp9/msn.c:1811
-#: ../libpurple/protocols/msnp9/msn.c:1817
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1138
+#: ../libpurple/protocols/msn/msn.c:1799 ../libpurple/protocols/msn/msn.c:1980
+#: ../libpurple/protocols/msn/msn.c:1986
+#: ../libpurple/protocols/msnp9/msn.c:1640
+#: ../libpurple/protocols/msnp9/msn.c:1821
+#: ../libpurple/protocols/msnp9/msn.c:1827
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1145
 msgid "Favorite Quote"
 msgstr "����悸 悖惓�惘悸"

-#: ../libpurple/protocols/msn/msn.c:1792
-#: ../libpurple/protocols/msnp9/msn.c:1647
+#: ../libpurple/protocols/msn/msn.c:1816
+#: ../libpurple/protocols/msnp9/msn.c:1657
 msgid "Contact Info"
 msgstr "�惺���悋惠 悋�悋惠惶悋�"

-#: ../libpurple/protocols/msn/msn.c:1793
-#: ../libpurple/protocols/msnp9/msn.c:1648
+#: ../libpurple/protocols/msn/msn.c:1817
+#: ../libpurple/protocols/msnp9/msn.c:1658
 msgid "Personal"
 msgstr "愆悽惶�"

-#: ../libpurple/protocols/msn/msn.c:1796
-#: ../libpurple/protocols/msnp9/msn.c:1651
+#: ../libpurple/protocols/msn/msn.c:1820
+#: ../libpurple/protocols/msnp9/msn.c:1661
 msgid "Significant Other"
 msgstr "�惶�� 悋�悛悽惘"

-#: ../libpurple/protocols/msn/msn.c:1797
-#: ../libpurple/protocols/msnp9/msn.c:1652
+#: ../libpurple/protocols/msn/msn.c:1821
+#: ../libpurple/protocols/msnp9/msn.c:1662
 msgid "Home Phone"
 msgstr "�悋惠� 悋���慍�"

-#: ../libpurple/protocols/msn/msn.c:1798
-#: ../libpurple/protocols/msnp9/msn.c:1653
+#: ../libpurple/protocols/msn/msn.c:1822
+#: ../libpurple/protocols/msnp9/msn.c:1663
 msgid "Home Phone 2"
 msgstr "�悋惠� 悋���慍� 2"

-#: ../libpurple/protocols/msn/msn.c:1799
-#: ../libpurple/protocols/msnp9/msn.c:1654
-#: ../libpurple/protocols/oscar/oscar.c:3774
+#: ../libpurple/protocols/msn/msn.c:1823
+#: ../libpurple/protocols/msnp9/msn.c:1664
+#: ../libpurple/protocols/oscar/oscar.c:3840
 msgid "Home Address"
 msgstr "惺��悋� 悋���慍�"

-#: ../libpurple/protocols/msn/msn.c:1800
-#: ../libpurple/protocols/msnp9/msn.c:1655
+#: ../libpurple/protocols/msn/msn.c:1824
+#: ../libpurple/protocols/msnp9/msn.c:1665
 msgid "Personal Mobile"
 msgstr "悋��忰��� 悋�愆悽惶�"

-#: ../libpurple/protocols/msn/msn.c:1801
-#: ../libpurple/protocols/msnp9/msn.c:1656
+#: ../libpurple/protocols/msn/msn.c:1825
+#: ../libpurple/protocols/msnp9/msn.c:1666
 msgid "Home Fax"
 msgstr "�悋�愕 悋���慍�"

-#: ../libpurple/protocols/msn/msn.c:1802
-#: ../libpurple/protocols/msnp9/msn.c:1657
+#: ../libpurple/protocols/msn/msn.c:1826
+#: ../libpurple/protocols/msnp9/msn.c:1667
 msgid "Personal E-Mail"
 msgstr "悋�惡惘�惆 悋�悒��惠惘��� 悋�愆悽惶�"

-#: ../libpurple/protocols/msn/msn.c:1803
-#: ../libpurple/protocols/msnp9/msn.c:1658
+#: ../libpurple/protocols/msn/msn.c:1827
+#: ../libpurple/protocols/msnp9/msn.c:1668
 msgid "Personal IM"
 msgstr "悋�惠惘悋愕� 悋���惘� 悋�愆悽惶�"

-#: ../libpurple/protocols/msn/msn.c:1805
-#: ../libpurple/protocols/msnp9/msn.c:1660
+#: ../libpurple/protocols/msn/msn.c:1829
+#: ../libpurple/protocols/msnp9/msn.c:1670
 msgid "Anniversary"
 msgstr "悋�悵�惘� 悋�愕����悸"

 #. Business
-#: ../libpurple/protocols/msn/msn.c:1821
-#: ../libpurple/protocols/msnp9/msn.c:1676
+#: ../libpurple/protocols/msn/msn.c:1845
+#: ../libpurple/protocols/msnp9/msn.c:1686
 msgid "Work"
 msgstr "悋�惺��"

-#: ../libpurple/protocols/msn/msn.c:1823
-#: ../libpurple/protocols/msnp9/msn.c:1678
-#: ../libpurple/protocols/silc/ops.c:1010
+#: ../libpurple/protocols/msn/msn.c:1847
+#: ../libpurple/protocols/msnp9/msn.c:1688
+#: ../libpurple/protocols/silc/ops.c:1025
 #: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "悋��愕��� 悋��惴���"

-#: ../libpurple/protocols/msn/msn.c:1824
-#: ../libpurple/protocols/msnp9/msn.c:1679
-#: ../libpurple/protocols/oscar/oscar.c:3795
+#: ../libpurple/protocols/msn/msn.c:1848
+#: ../libpurple/protocols/msnp9/msn.c:1689
+#: ../libpurple/protocols/oscar/oscar.c:3861
 msgid "Company"
 msgstr "悋�愆惘�悸"

-#: ../libpurple/protocols/msn/msn.c:1825
-#: ../libpurple/protocols/msnp9/msn.c:1680
+#: ../libpurple/protocols/msn/msn.c:1849
+#: ../libpurple/protocols/msnp9/msn.c:1690
 #: ../libpurple/protocols/novell/novell.c:1489
 msgid "Department"
 msgstr "悋���愕��"

-#: ../libpurple/protocols/msn/msn.c:1826
-#: ../libpurple/protocols/msnp9/msn.c:1681
+#: ../libpurple/protocols/msn/msn.c:1850
+#: ../libpurple/protocols/msnp9/msn.c:1691
 msgid "Profession"
 msgstr "悋�忰惘�悸"

-#: ../libpurple/protocols/msn/msn.c:1827
-#: ../libpurple/protocols/msnp9/msn.c:1682
+#: ../libpurple/protocols/msn/msn.c:1851
+#: ../libpurple/protocols/msnp9/msn.c:1692
 msgid "Work Phone"
 msgstr "�悋惠� 悋�惺��"

-#: ../libpurple/protocols/msn/msn.c:1828
-#: ../libpurple/protocols/msnp9/msn.c:1683
+#: ../libpurple/protocols/msn/msn.c:1852
+#: ../libpurple/protocols/msnp9/msn.c:1693
 msgid "Work Phone 2"
 msgstr "�悋惠� 悋�惺�� 2"

-#: ../libpurple/protocols/msn/msn.c:1829
-#: ../libpurple/protocols/msnp9/msn.c:1684
-#: ../libpurple/protocols/oscar/oscar.c:3787
+#: ../libpurple/protocols/msn/msn.c:1853
+#: ../libpurple/protocols/msnp9/msn.c:1694
+#: ../libpurple/protocols/oscar/oscar.c:3853
 msgid "Work Address"
 msgstr "惺��悋� 悋�惺��"

-#: ../libpurple/protocols/msn/msn.c:1830
-#: ../libpurple/protocols/msnp9/msn.c:1685
+#: ../libpurple/protocols/msn/msn.c:1854
+#: ../libpurple/protocols/msnp9/msn.c:1695
 msgid "Work Mobile"
 msgstr "�忰��� 悋�惺��"

-#: ../libpurple/protocols/msn/msn.c:1831
-#: ../libpurple/protocols/msnp9/msn.c:1686
+#: ../libpurple/protocols/msn/msn.c:1855
+#: ../libpurple/protocols/msnp9/msn.c:1696
 msgid "Work Pager"
 msgstr "悴�悋慍 悋愕惠惆惺悋悄 悋�惺��"

-#: ../libpurple/protocols/msn/msn.c:1832
-#: ../libpurple/protocols/msnp9/msn.c:1687
+#: ../libpurple/protocols/msn/msn.c:1856
+#: ../libpurple/protocols/msnp9/msn.c:1697
 msgid "Work Fax"
 msgstr "�悋�愕 悋�惺��"

-#: ../libpurple/protocols/msn/msn.c:1833
-#: ../libpurple/protocols/msnp9/msn.c:1688
+#: ../libpurple/protocols/msn/msn.c:1857
+#: ../libpurple/protocols/msnp9/msn.c:1698
 msgid "Work E-Mail"
 msgstr "悋�惡惘�惆 悋�悒��惠惘��� ��惺��"

-#: ../libpurple/protocols/msn/msn.c:1834
-#: ../libpurple/protocols/msnp9/msn.c:1689
+#: ../libpurple/protocols/msn/msn.c:1858
+#: ../libpurple/protocols/msnp9/msn.c:1699
 msgid "Work IM"
 msgstr "惠惘悋愕� 悋�惺�� 悋���惘�"

-#: ../libpurple/protocols/msn/msn.c:1835
-#: ../libpurple/protocols/msnp9/msn.c:1690
+#: ../libpurple/protocols/msn/msn.c:1859
+#: ../libpurple/protocols/msnp9/msn.c:1700
 msgid "Start Date"
 msgstr "惠悋惘�悽 悋�惡惆悄"

-#: ../libpurple/protocols/msn/msn.c:1905 ../libpurple/protocols/msn/msn.c:1911
-#: ../libpurple/protocols/msn/msn.c:1918 ../libpurple/protocols/msn/msn.c:1925
-#: ../libpurple/protocols/msnp9/msn.c:1760
-#: ../libpurple/protocols/msnp9/msn.c:1766
-#: ../libpurple/protocols/msnp9/msn.c:1773
-#: ../libpurple/protocols/msnp9/msn.c:1780
+#: ../libpurple/protocols/msn/msn.c:1929 ../libpurple/protocols/msn/msn.c:1935
+#: ../libpurple/protocols/msn/msn.c:1942 ../libpurple/protocols/msn/msn.c:1949
+#: ../libpurple/protocols/msnp9/msn.c:1770
+#: ../libpurple/protocols/msnp9/msn.c:1776
+#: ../libpurple/protocols/msnp9/msn.c:1783
+#: ../libpurple/protocols/msnp9/msn.c:1790
 msgid "Favorite Things"
 msgstr "悖愆�悋悄 ��惷�悸"

-#: ../libpurple/protocols/msn/msn.c:1970
-#: ../libpurple/protocols/msnp9/msn.c:1825
+#: ../libpurple/protocols/msn/msn.c:1994
+#: ../libpurple/protocols/msnp9/msn.c:1835
 msgid "Last Updated"
 msgstr "悋�惠忰惆�惓 悋�悖悽�惘"

-#: ../libpurple/protocols/msn/msn.c:1981
-#: ../libpurple/protocols/msnp9/msn.c:1836
+#: ../libpurple/protocols/msn/msn.c:2005
+#: ../libpurple/protocols/msnp9/msn.c:1846
 #: ../libpurple/protocols/qq/buddy_info.c:60
-#: ../libpurple/protocols/silc/ops.c:1026
+#: ../libpurple/protocols/silc/ops.c:1041
 #: ../libpurple/protocols/silc10/ops.c:1060
 msgid "Homepage"
 msgstr "悋�惶�忰悸 悋�悖���"

-#: ../libpurple/protocols/msn/msn.c:2005
-#: ../libpurple/protocols/msnp9/msn.c:1860
+#: ../libpurple/protocols/msn/msn.c:2029
+#: ../libpurple/protocols/msnp9/msn.c:1870
 msgid "The user has not created a public profile."
 msgstr "�� ��愆悧 悋��愕惠悽惆� �悋忰悸 惺����悸."

-#: ../libpurple/protocols/msn/msn.c:2006
-#: ../libpurple/protocols/msnp9/msn.c:1861
+#: ../libpurple/protocols/msn/msn.c:2030
+#: ../libpurple/protocols/msnp9/msn.c:1871
 msgid ""
 "MSN reported not being able to find the user's profile. This either means "
 "that the user does not exist, or that the user exists but has not created a "
@@ -7153,16 +7330,16 @@
 "悖惡�愃 MSN 惡惺惆� 惠���� �� 悋�惺惓�惘 惺�� �悋忰悸 悋��愕惠悽惆�. �惆 �惺�� �悵悋 悖� 悋��愕惠悽惆� 愃�惘 "
 "��悴�惆 悖� 悖�� ��悴�惆 ���� �� ���愆悧 �悋忰悸 惺���悸."

-#: ../libpurple/protocols/msn/msn.c:2010
-#: ../libpurple/protocols/msnp9/msn.c:1865
+#: ../libpurple/protocols/msn/msn.c:2034
+#: ../libpurple/protocols/msnp9/msn.c:1875
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
 msgstr "惠惺悵�惘 悋�惺惓�惘 惺�� 悖�悸 �惺���悋惠 �� �悋忰悸 悋��愕惠悽惆�. 悋��愕惠悽惆� 愃悋�惡�悋 �悋 �悴�惆 ��."

-#: ../libpurple/protocols/msn/msn.c:2018
-#: ../libpurple/protocols/msnp9/msn.c:1873
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1240
+#: ../libpurple/protocols/msn/msn.c:2042
+#: ../libpurple/protocols/msnp9/msn.c:1883
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1247
 msgid "Profile URL"
 msgstr "�愕悋惘 悋��悋忰悸"

@@ -7176,27 +7353,27 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2305 ../libpurple/protocols/msn/msn.c:2307
+#: ../libpurple/protocols/msn/msn.c:2329 ../libpurple/protocols/msn/msn.c:2331
 msgid "Windows Live Messenger Protocol Plugin"
 msgstr "��忰�悸 惡惘�惠���� Windows Live Messenger"

-#: ../libpurple/protocols/msn/msn.c:2342
-#: ../libpurple/protocols/msnp9/msn.c:2195
+#: ../libpurple/protocols/msn/msn.c:2366
+#: ../libpurple/protocols/msnp9/msn.c:2206
 msgid "Use HTTP Method"
 msgstr "悋愕惠悽惆� 愀惘��悸 HTTP"

-#: ../libpurple/protocols/msn/msn.c:2347
-#: ../libpurple/protocols/msnp9/msn.c:2200
+#: ../libpurple/protocols/msn/msn.c:2371
+#: ../libpurple/protocols/msnp9/msn.c:2211
 msgid "HTTP Method Server"
 msgstr "悽悋惆�� 悋悽惠惡悋惘  HTTP"

-#: ../libpurple/protocols/msn/msn.c:2352
-#: ../libpurple/protocols/msnp9/msn.c:2205
+#: ../libpurple/protocols/msn/msn.c:2376
+#: ../libpurple/protocols/msnp9/msn.c:2216
 msgid "Show custom smileys"
 msgstr "悋惺惘惷 悋�惡愕�悋惠 悋��悽惶惶悸"

-#: ../libpurple/protocols/msn/msn.c:2360
-#: ../libpurple/protocols/msnp9/msn.c:2213
+#: ../libpurple/protocols/msn/msn.c:2384
+#: ../libpurple/protocols/msnp9/msn.c:2224
 msgid "nudge: nudge a user to get their attention"
 msgstr ""
 "悋��慍 �愕惠悽惆�悋 �惠愕惠惆惺� 悋�惠惡悋��nudge:\n"
@@ -7249,7 +7426,7 @@
 msgstr "惺�愀� �悴��� (%Id)"

 #: ../libpurple/protocols/msn/notification.c:837
-#: ../libpurple/protocols/sametime/sametime.c:4471
+#: ../libpurple/protocols/sametime/sametime.c:4480
 msgid "Unable to add user"
 msgstr "惠惺悵�惘惠 悒惷悋�悸 �愕惠悽惆�"

@@ -7288,18 +7465,18 @@
 msgid "Service Temporarily Unavailable."
 msgstr "悋�悽惆�悸 愃�惘 �惠悋忰悸 �悗�惠�悋."

-#: ../libpurple/protocols/msn/notification.c:1276
-#: ../libpurple/protocols/msnp9/notification.c:866
+#: ../libpurple/protocols/msn/notification.c:1328
+#: ../libpurple/protocols/msnp9/notification.c:898
 msgid "Unable to rename group"
 msgstr "惠惺悵�惘 惠愃��惘 悋愕� 悋��悴��惺悸"

-#: ../libpurple/protocols/msn/notification.c:1331
-#: ../libpurple/protocols/msnp9/notification.c:921
+#: ../libpurple/protocols/msn/notification.c:1383
+#: ../libpurple/protocols/msnp9/notification.c:953
 msgid "Unable to delete group"
 msgstr "惠惺悵�惘 忰悵� 悋��悴��惺悸"

-#: ../libpurple/protocols/msn/notification.c:1945
-#: ../libpurple/protocols/msnp9/notification.c:1340
+#: ../libpurple/protocols/msn/notification.c:1997
+#: ../libpurple/protocols/msnp9/notification.c:1372
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -7362,9 +7539,9 @@
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:272
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:307
 #: ../libpurple/protocols/qq/udp_proxy_s5.c:338
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1559
-#: ../libpurple/protocols/yahoo/yahoochat.c:1416
-#: ../libpurple/protocols/yahoo/yahoochat.c:1442
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1564
+#: ../libpurple/protocols/yahoo/yahoochat.c:1425
+#: ../libpurple/protocols/yahoo/yahoochat.c:1451
 msgid "Unable to connect"
 msgstr "惠惺悵�惘 悋�悋惠惶悋�"

@@ -7401,7 +7578,7 @@
 #: ../libpurple/protocols/msn/session.c:358
 #: ../libpurple/protocols/msnp9/session.c:310
 #: ../libpurple/protocols/oscar/flap_connection.c:387
-#: ../libpurple/protocols/yahoo/yahoo.c:207
+#: ../libpurple/protocols/yahoo/yahoo.c:155
 msgid "You have signed on from another location."
 msgstr "��惠 惡悋�惆悽�� �� ���惺 悛悽惘."

@@ -7527,18 +7704,18 @@
 #. only notify the user about problems adding to the friends list
 #. * maybe we should do something else for other lists, but it probably
 #. * won't cause too many problems if we just ignore it
-#: ../libpurple/protocols/msn/userlist.c:693
+#: ../libpurple/protocols/msn/userlist.c:714
 #: ../libpurple/protocols/msnp9/userlist.c:653
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "惠惺悵�惘惠 悒惷悋�悸 \"%s\"."

-#: ../libpurple/protocols/msn/userlist.c:696
+#: ../libpurple/protocols/msn/userlist.c:717
 #: ../libpurple/protocols/msnp9/userlist.c:655
 msgid "The screen name specified is invalid."
 msgstr "悋愕� 悋�愆悋愆悸 悋��忰惆惆 愃�惘 惶悋�忰."

-#: ../libpurple/protocols/msnp9/msn.c:549
+#: ../libpurple/protocols/msnp9/msn.c:546
 msgid "Has you"
 msgstr "悖�惠 �惆��"

@@ -7552,8 +7729,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msnp9/msn.c:2159
-#: ../libpurple/protocols/msnp9/msn.c:2161
+#: ../libpurple/protocols/msnp9/msn.c:2170
+#: ../libpurple/protocols/msnp9/msn.c:2172
 msgid "MSN Protocol Plugin"
 msgstr "��忰�悸 惡惘�惠���� MSN"

@@ -7571,266 +7748,300 @@
 "not be loaded."
 msgstr "惘��� 悒�� libpurple 惠惆惺� RC4 (>= 2.0.1). �� ��忰��� ��忰�  MySpaceIM."

-#: ../libpurple/protocols/myspace/myspace.c:286
-#, c-format
-msgid ""
-"Sorry, passwords over %d characters in length (yours is %d) are not "
-"supported by MySpace."
-msgstr "惺悵惘悋� �悋 �惆惺� MySpace ���悋惠 悋�愕惘 悋�悖愀�� �� %Id 悽悋�悸 (愀�� �悋 悖惆悽�惠 %Id)."
-
-#. Notify an error message also, because this is important!
-#: ../libpurple/protocols/myspace/myspace.c:292
-#: ../libpurple/protocols/myspace/myspace.c:1849
-msgid "MySpaceIM Error"
-msgstr "惺愀� �� MySpaceIM"
-
-#: ../libpurple/protocols/myspace/myspace.c:352
+#: ../libpurple/protocols/myspace/myspace.c:345
 msgid "Reading challenge"
 msgstr "惠悴惘� �惘悋悄悸 悋�惠忰惆�"

-#: ../libpurple/protocols/myspace/myspace.c:360
+#: ../libpurple/protocols/myspace/myspace.c:355
 msgid "Unexpected challenge length from server"
 msgstr "愀�� 惠忰惆� 愃�惘 �惠��惺 �� 悋�悽悋惆��"

-#: ../libpurple/protocols/myspace/myspace.c:364
+#: ../libpurple/protocols/myspace/myspace.c:359
 msgid "Logging in"
 msgstr "�悴惘� 悋����悴"

-#: ../libpurple/protocols/myspace/myspace.c:1318
+#: ../libpurple/protocols/myspace/myspace.c:1324
 #, c-format
 msgid "Connection to server lost (no data received within %d seconds)"
 msgstr "��愀惺 悋�悋惠惶悋� 惡悋�悽悋惆�� (�� 惠�愕惠�惡� 悖� 惡�悋�悋惠 悽�悋� %Id 惓悋��悸)"

 #. Can't write _()'d strings in array initializers. Workaround.
-#: ../libpurple/protocols/myspace/myspace.c:1361
+#: ../libpurple/protocols/myspace/myspace.c:1367
 msgid "New mail messages"
 msgstr "惘愕悋�悸 惡惘�惆 悴惆�惆悸"

-#: ../libpurple/protocols/myspace/myspace.c:1362
+#: ../libpurple/protocols/myspace/myspace.c:1368
 msgid "New blog comments"
 msgstr "惠惺��� �惆���悸 悴惆�惆"

-#: ../libpurple/protocols/myspace/myspace.c:1363
+#: ../libpurple/protocols/myspace/myspace.c:1369
 msgid "New profile comments"
 msgstr "惠惺���悋惠 �悋忰悸 悴惆�惆悸"

-#: ../libpurple/protocols/myspace/myspace.c:1364
+#: ../libpurple/protocols/myspace/myspace.c:1370
 msgid "New friend requests!"
 msgstr "!愀�惡悋惠 惶惆悋�悸 悴惆�惆悸"

-#: ../libpurple/protocols/myspace/myspace.c:1365
+#: ../libpurple/protocols/myspace/myspace.c:1371
 msgid "New picture comments"
 msgstr "惠惺���悋惠 惶�惘悸 悴惆�惆悸"

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

+#: ../libpurple/protocols/myspace/myspace.c:1587
+msgid "MySpaceIM - No Username Set"
+msgstr "��MySpaceIM - �� 惠忰惆惆 悋愕� �愕惠悽惆�"
+
+#: ../libpurple/protocols/myspace/myspace.c:1588
+msgid "You appear to have no MySpace username."
+msgstr "�惴�惘 悖�� �悋 惠��� 悋愕� �愕惠悽惆� MySpace."
+
+#: ../libpurple/protocols/myspace/myspace.c:1589
+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:1583
-#: ../libpurple/protocols/sametime/sametime.c:1546
+#: ../libpurple/protocols/myspace/myspace.c:1613
+#: ../libpurple/protocols/sametime/sametime.c:1547
 msgid "Connected"
 msgstr "�惠��惶�"

-#: ../libpurple/protocols/myspace/myspace.c:1594
-#: ../libpurple/protocols/myspace/myspace.c:1597
-msgid "No username set"
-msgstr "�� 惠忰惆惆 悋愕� �愕惠悽惆�"
-
-#: ../libpurple/protocols/myspace/myspace.c:1595
-msgid ""
-"Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
-"username and choose a username and try to login again."
-msgstr ""
-"悋悵�惡 悒�� http://editprofile.myspace.com/index.cfm?fuseaction=profile."
-"username � 悋悽惠惘 悋愕� �愕惠悽惆� � 忰悋�� 悋����悴 �悴惆惆悋."
-
-#: ../libpurple/protocols/myspace/myspace.c:1823
+#: ../libpurple/protocols/myspace/myspace.c:1848
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "惺愀� 惡惘�惠����� 惘�慍 %Id: %s"

-#: ../libpurple/protocols/myspace/myspace.c:2019
-#: ../libpurple/protocols/myspace/myspace.c:2053
+#: ../libpurple/protocols/myspace/myspace.c:1870
+#, c-format
+msgid ""
+"%s Your password is %d characters, greater than the expected maximum length "
+"of %d for MySpaceIM. Please shorten your password at http://profileedit."
+"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
+"again."
+msgstr "��%s ���悸 悋�愕惘 ����悸 �� %d 忰惘�� 悖愀�� �� %d ��� 悋�愀�� 悋���惠���惺 � MySpaceIM. �� �惷�� �惶�惘 ���悸 愕惘�� ��� http://profileedit.myspace.com/index.cfm?fuseaction=accountSettings.changePassword 惓� 悖惺�惆 悋��忰悋��悸."
+
+#: ../libpurple/protocols/myspace/myspace.c:1893
+msgid "MySpaceIM Error"
+msgstr "惺愀� �� MySpaceIM"
+
+#: ../libpurple/protocols/myspace/myspace.c:2071
+#: ../libpurple/protocols/myspace/myspace.c:2105
 msgid "Failed to add buddy"
 msgstr "�愆�惠 悒惷悋�悸 惶惆��"

-#: ../libpurple/protocols/myspace/myspace.c:2019
+#: ../libpurple/protocols/myspace/myspace.c:2071
 msgid "'addbuddy' command failed."
 msgstr "�愆� 悖�惘 'addbuddy'"

-#: ../libpurple/protocols/myspace/myspace.c:2053
-#: ../libpurple/protocols/myspace/myspace.c:2290
+#: ../libpurple/protocols/myspace/myspace.c:2105
+#: ../libpurple/protocols/myspace/myspace.c:2350
 msgid "persist command failed"
 msgstr "�愆� 悖�惘 persist"

-#: ../libpurple/protocols/myspace/myspace.c:2158
+#: ../libpurple/protocols/myspace/myspace.c:2210
 #, c-format
 msgid "No such user: %s"
 msgstr "�悋 �愕惠悽惆�� 惡悋愕�: %s"

-#: ../libpurple/protocols/myspace/myspace.c:2159
+#: ../libpurple/protocols/myspace/myspace.c:2212
 msgid "User lookup"
 msgstr "悋�惡忰惓 惺� �愕惠悽惆���"

-#: ../libpurple/protocols/myspace/myspace.c:2271
-#: ../libpurple/protocols/myspace/myspace.c:2290
-#: ../libpurple/protocols/myspace/myspace.c:2312
+#: ../libpurple/protocols/myspace/myspace.c:2331
+#: ../libpurple/protocols/myspace/myspace.c:2350
+#: ../libpurple/protocols/myspace/myspace.c:2372
 msgid "Failed to remove buddy"
 msgstr "�愆�惠 悒慍悋�悸 悋�惶惆��"

-#: ../libpurple/protocols/myspace/myspace.c:2271
+#: ../libpurple/protocols/myspace/myspace.c:2331
 msgid "'delbuddy' command failed"
 msgstr "�愆� 悖�惘 'delbuddy' "

-#: ../libpurple/protocols/myspace/myspace.c:2312
+#: ../libpurple/protocols/myspace/myspace.c:2372
 msgid "blocklist command failed"
 msgstr "�愆� 悖�惘 blocklist"

-#: ../libpurple/protocols/myspace/myspace.c:2360
+#: ../libpurple/protocols/myspace/myspace.c:2486
 msgid "Invalid input condition"
 msgstr "忰悋�悸 惆悽� 愃�惘 惶忰�忰悸"

-#: ../libpurple/protocols/myspace/myspace.c:2380
-#: ../libpurple/protocols/myspace/myspace.c:2417
-msgid "Read buffer full"
-msgstr "惡惘悋忰 悋��惘悋悄悸 ��惠��悄"
-
-#: ../libpurple/protocols/myspace/myspace.c:2459
+#: ../libpurple/protocols/myspace/myspace.c:2541
+msgid "Read buffer full (2)"
+msgstr "惡惘悋忰 悋��惘悋悄悸 ��惠��悄 (2)"
+
+#: ../libpurple/protocols/myspace/myspace.c:2584
 msgid "Unparseable message"
 msgstr "惘愕悋�悸 �惠惺悵�惘 惠忰����悋"

-#: ../libpurple/protocols/myspace/myspace.c:2528
+#: ../libpurple/protocols/myspace/myspace.c:2655
 #, c-format
 msgid "Couldn't connect to host: %s (%d)"
 msgstr "惠惺悵�惘 悋�悋惠惶悋� 惡悋�悽悋惆��: %s (%Id)"

-#: ../libpurple/protocols/myspace/myspace.c:2699
+#: ../libpurple/protocols/myspace/myspace.c:2833
 msgid "IM Friends"
 msgstr "悖惶惆�悋悄 悋�惠惘悋愕� 悋���惘�"

-#: ../libpurple/protocols/myspace/myspace.c:2798
+#: ../libpurple/protocols/myspace/myspace.c:2933
 #, c-format
 msgid ""
 "%d buddies were added or updated from the server (including buddies already "
 "on the server-side list)"
-msgstr "惠�惠 悒惷悋�悸 %Id 惶惆�� �� 悋�悽悋惆�� (惡�� ���� 悖惶惆�悋悄 �� �悋悧�悸 悋�悖惶惆�悋悄 惺�� 悋�悽悋惆��)."
-
-#: ../libpurple/protocols/myspace/myspace.c:2799
+msgstr ""
+"惠�惠 悒惷悋�悸 %Id 惶惆�� �� 悋�悽悋惆�� (惡�� ���� 悖惶惆�悋悄 �� �悋悧�悸 悋�悖惶惆�悋悄 惺�� "
+"悋�悽悋惆��)."
+
+#: ../libpurple/protocols/myspace/myspace.c:2934
 msgid "Add contacts from server"
 msgstr "悖惷� �惺悋惘� �� 悋�悽悋惆��"

-#: ../libpurple/protocols/myspace/myspace.c:2851
-#: ../libpurple/protocols/myspace/myspace.c:2915
+#: ../libpurple/protocols/myspace/myspace.c:2986
+#: ../libpurple/protocols/myspace/myspace.c:3050
 msgid "Add friends from MySpace.com"
 msgstr "悖惷� 悖惶惆�悋悄 �� MySpaces.com"

-#: ../libpurple/protocols/myspace/myspace.c:2852
+#: ../libpurple/protocols/myspace/myspace.c:2987
 msgid "Importing friends failed"
 msgstr "�愆� 悋愕惠�惘悋惆 悋�悖惶惆�悋悄"

 #. TODO: find out how
-#: ../libpurple/protocols/myspace/myspace.c:2908
+#: ../libpurple/protocols/myspace/myspace.c:3043
 msgid "Find people..."
 msgstr "悋惡忰惓 惺� 悋��悋愕..."

-#: ../libpurple/protocols/myspace/myspace.c:2911
+#: ../libpurple/protocols/myspace/myspace.c:3046
 msgid "Change IM name..."
 msgstr "愃��惘 悋愕� 悋�惠惘悋愕� 悋���惘�..."

-#: ../libpurple/protocols/myspace/myspace.c:3212
+#: ../libpurple/protocols/myspace/myspace.c:3347
 msgid "myim URL handler"
 msgstr "�惺悋�悴 �愕悋惘悋惠 myim"

-#: ../libpurple/protocols/myspace/myspace.c:3213
+#: ../libpurple/protocols/myspace/myspace.c:3348
 msgid "No suitable MySpaceIM account could be found to open this myim URL."
 msgstr "惠惺悵�惘 悒�悴悋惆 忰愕悋惡 MySpaceIM ��悋愕惡 ��惠忰 �愕悋惘 myim �悵悋."

-#: ../libpurple/protocols/myspace/myspace.c:3214
+#: ../libpurple/protocols/myspace/myspace.c:3349
 msgid "Enable the proper MySpaceIM account and try again."
 msgstr "�惺�� 忰愕悋惡 MySpaveIM 悋�惶忰�忰 � 忰悋�� �悴惆惆悋."

-#: ../libpurple/protocols/myspace/myspace.c:3337
+#: ../libpurple/protocols/myspace/myspace.c:3472
 msgid "Show display name in status text"
-msgstr "悋惴�惘 悋愕� 悋�惺惘惷 �� �惶� 悋�忰悋�悸"
-
-#: ../libpurple/protocols/myspace/myspace.c:3340
+msgstr "悖惴�惘 悋愕� 悋�惺惘惷 �� �惶� 悋�忰悋�悸"
+
+#: ../libpurple/protocols/myspace/myspace.c:3475
 msgid "Show headline in status text"
-msgstr "悋惴�惘 愕愀惘 悋�惠惘��愕悸 �� �惶� 悋�忰悋�悸"
-
-#: ../libpurple/protocols/myspace/myspace.c:3345
+msgstr "悖惴�惘 愕愀惘 悋�惠惘��愕悸 �� �惶� 悋�忰悋�悸"
+
+#: ../libpurple/protocols/myspace/myspace.c:3480
 msgid "Send emoticons"
 msgstr "悖惘愕� 悋�惠惺���悋惠"

-#: ../libpurple/protocols/myspace/myspace.c:3350
+#: ../libpurple/protocols/myspace/myspace.c:3485
 msgid "Screen resolution (dots per inch)"
 msgstr "����慍� 悋�愆悋愆悸� (��愀悸 �� 悋�惡�惶悸)"

-#: ../libpurple/protocols/myspace/myspace.c:3353
+#: ../libpurple/protocols/myspace/myspace.c:3488
 msgid "Base font size (points)"
 msgstr "忰悴� 悋�悽愀 悋�悖愕悋愕 (��悋愀)"

-#: ../libpurple/protocols/myspace/user.c:95
-#: ../libpurple/protocols/zephyr/zephyr.c:786
-#: ../libpurple/protocols/zephyr/zephyr.c:1204
-msgid "User"
-msgstr "�愕惠悽惆�"
-
 #: ../libpurple/protocols/myspace/user.c:105
-#: ../libpurple/protocols/oscar/oscar.c:2973
+#: ../libpurple/protocols/zephyr/zephyr.c:790
+#: ../libpurple/protocols/zephyr/zephyr.c:1164
+msgid "User"
+msgstr "�愕惠悽惆�"
+
+#: ../libpurple/protocols/myspace/user.c:115
+#: ../libpurple/protocols/oscar/oscar.c:3032
 msgid "Profile"
 msgstr "�悋忰悸"

-#: ../libpurple/protocols/myspace/user.c:128
+#: ../libpurple/protocols/myspace/user.c:138
 msgid "Headline"
 msgstr "惺��悋� 惘悧�愕�"

-#: ../libpurple/protocols/myspace/user.c:133
+#: ../libpurple/protocols/myspace/user.c:153
 msgid "Song"
 msgstr "悖愃��悸"

-#: ../libpurple/protocols/myspace/user.c:141
+#: ../libpurple/protocols/myspace/user.c:162
 msgid "Total Friends"
 msgstr "�悴��惺 悋�悖惶惆�悋悄"

-#: ../libpurple/protocols/myspace/user.c:159
+#: ../libpurple/protocols/myspace/user.c:180
 msgid "Client Version"
 msgstr "悒惶惆悋惘悸 悋�惺���"

+#. Protocol won't log in now without a username set.. Disconnect
+#: ../libpurple/protocols/myspace/user.c:570
+msgid "No username set"
+msgstr "�� 惠忰惆惆 悋愕� �愕惠悽惆�"
+
+#: ../libpurple/protocols/myspace/user.c:577
+#: ../libpurple/protocols/myspace/user.c:671
+msgid "MySpaceIM - Please Set a Username"
+msgstr "��MySpaceIM - �� �惷�� 惷惺 悋愕� ��愕惠悽惆�"
+
+#: ../libpurple/protocols/myspace/user.c:578
+msgid "Please enter a username to check its availability:"
+msgstr "�� �惷�� 悖惆悽�� 悋愕� ��愕惠悽惆� �惠忰�� �� �悴�惆�:"
+
+#: ../libpurple/protocols/myspace/user.c:658
+msgid "MySpaceIM - Username Available"
+msgstr "��MySpaceIM - 悋�悋愕� 愃�惘 ��惠悋忰"
+
+#: ../libpurple/protocols/myspace/user.c:659
+msgid "This username is available. Would you like to set it?"
+msgstr "悋愕� 悋��愕惠悽惆� �惠悋忰. 悖惠惘�惆 悋愕惠悽惆悋���"
+
+#: ../libpurple/protocols/myspace/user.c:660
+msgid "ONCE SET, THIS CANNOT BE CHANGED!"
+msgstr "惡�悴惘�惆 惠忰惆�惆�� �悋 ����� 惠愃��惘�!"
+
+#: ../libpurple/protocols/myspace/user.c:672
+msgid "This username is unavailable."
+msgstr "悋愕� 悋��愕惠悽惆� �悵悋 愃�惘 �惠悋忰."
+
+#: ../libpurple/protocols/myspace/user.c:673
+msgid "Please try another username:"
+msgstr "�� �惷�� 悴惘�惡 悋愕� �愕惠悽惆� 悛悽惘:"
+
 #. TODO: icons for each zap
 #. Lots of comments for translators:
 #. Zap means "to strike suddenly and forcefully as if with a
 #. * projectile or weapon."  This term often has an electrical
 #. * connotation, for example, "he was zapped by electricity when
 #. * he put a fork in the toaster."
-#: ../libpurple/protocols/myspace/zap.c:51
-#: ../libpurple/protocols/myspace/zap.c:214
+#: ../libpurple/protocols/myspace/zap.c:48
+#: ../libpurple/protocols/myspace/zap.c:221
 msgid "Zap"
 msgstr "惶惺�悸"

-#: ../libpurple/protocols/myspace/zap.c:51
+#: ../libpurple/protocols/myspace/zap.c:48
 #, c-format
 msgid "%s has zapped you!"
 msgstr "惶惺�� %s!"

-#: ../libpurple/protocols/myspace/zap.c:51
+#: ../libpurple/protocols/myspace/zap.c:49
 #, c-format
 msgid "Zapping %s..."
 msgstr "惠惶惺� %s..."

 #. Whack means "to hit or strike someone with a sharp blow"
-#: ../libpurple/protocols/myspace/zap.c:54
+#: ../libpurple/protocols/myspace/zap.c:52
 msgid "Whack"
 msgstr "愀悋悽"

-#: ../libpurple/protocols/myspace/zap.c:54
+#: ../libpurple/protocols/myspace/zap.c:53
 #, c-format
 msgid "%s has whacked you!"
 msgstr "�愀�� %s!"

-#: ../libpurple/protocols/myspace/zap.c:54
+#: ../libpurple/protocols/myspace/zap.c:53
 #, c-format
 msgid "Whacking %s..."
 msgstr "惠�愀� %s..."
@@ -7838,7 +8049,7 @@
 #. Torch means "to set on fire."  Don't worry, this doesn't
 #. * make a whole lot of sense in English, either.  Feel free
 #. * to translate it literally.
-#: ../libpurple/protocols/myspace/zap.c:59
+#: ../libpurple/protocols/myspace/zap.c:58
 msgid "Torch"
 msgstr "悋�愕惺"

@@ -7857,57 +8068,57 @@
 msgid "Smooch"
 msgstr "��悋悋�"

-#: ../libpurple/protocols/myspace/zap.c:62
+#: ../libpurple/protocols/myspace/zap.c:63
 #, c-format
 msgid "%s has smooched you!"
 msgstr "�惓�� %s!"

-#: ../libpurple/protocols/myspace/zap.c:62
+#: ../libpurple/protocols/myspace/zap.c:63
 #, c-format
 msgid "Smooching %s..."
 msgstr "惠�惓� %s..."

 #. A hug is a display of affection; wrapping your arms around someone
-#: ../libpurple/protocols/myspace/zap.c:65
+#: ../libpurple/protocols/myspace/zap.c:66
 msgid "Hug"
 msgstr "忰惷�"

-#: ../libpurple/protocols/myspace/zap.c:65
+#: ../libpurple/protocols/myspace/zap.c:66
 #, c-format
 msgid "%s has hugged you!"
 msgstr "忰惷�� %s!"

-#: ../libpurple/protocols/myspace/zap.c:65
+#: ../libpurple/protocols/myspace/zap.c:67
 #, c-format
 msgid "Hugging %s..."
 msgstr "惠忰惷� %s..."

 #. Slap means "to hit someone with an open/flat hand"
-#: ../libpurple/protocols/myspace/zap.c:68
+#: ../libpurple/protocols/myspace/zap.c:70
 msgid "Slap"
 msgstr "惶�惺悸"

-#: ../libpurple/protocols/myspace/zap.c:68
+#: ../libpurple/protocols/myspace/zap.c:71
 #, c-format
 msgid "%s has slapped you!"
 msgstr "惶�惺� %s!"

-#: ../libpurple/protocols/myspace/zap.c:68
+#: ../libpurple/protocols/myspace/zap.c:71
 #, c-format
 msgid "Slapping %s..."
 msgstr "惠惶�惺 %s..."

 #. Goose means "to pinch someone on their butt"
-#: ../libpurple/protocols/myspace/zap.c:71
+#: ../libpurple/protocols/myspace/zap.c:74
 msgid "Goose"
 msgstr "�惘惶 悋��悗悽惘悸"

-#: ../libpurple/protocols/myspace/zap.c:71
+#: ../libpurple/protocols/myspace/zap.c:75
 #, c-format
 msgid "%s has goosed you!"
 msgstr "��%s �惘惶 �悗悽惘惠�!"

-#: ../libpurple/protocols/myspace/zap.c:71
+#: ../libpurple/protocols/myspace/zap.c:75
 #, c-format
 msgid "Goosing %s..."
 msgstr "惠�惘惶 �悗悽惘悸 %s..."
@@ -7915,16 +8126,16 @@
 #. A high-five is when two people's hands slap each other
 #. * in the air above their heads.  It is done to celebrate
 #. * something, often a victory, or to congratulate someone.
-#: ../libpurple/protocols/myspace/zap.c:76
+#: ../libpurple/protocols/myspace/zap.c:80
 msgid "High-five"
 msgstr "愕�悋� 惺悋��"

-#: ../libpurple/protocols/myspace/zap.c:76
+#: ../libpurple/protocols/myspace/zap.c:81
 #, c-format
 msgid "%s has high-fived you!"
 msgstr "��%s 愕�� 惺��� 惺悋��悋"

-#: ../libpurple/protocols/myspace/zap.c:76
+#: ../libpurple/protocols/myspace/zap.c:81
 #, c-format
 msgid "High-fiving %s..."
 msgstr "惠�愕���� 惺悋��悋 惺�� %s..."
@@ -7932,16 +8143,16 @@
 #. We're not entirely sure what the MySpace people mean by
 #. * this... but we think it's the equivalent of "prank."  Or, for
 #. * someone to perform a mischievous trick or practical joke.
-#: ../libpurple/protocols/myspace/zap.c:81
+#: ../libpurple/protocols/myspace/zap.c:86
 msgid "Punk"
 msgstr "���惡"

-#: ../libpurple/protocols/myspace/zap.c:81
+#: ../libpurple/protocols/myspace/zap.c:87
 #, c-format
 msgid "%s has punk'd you!"
 msgstr "��%s 惺�� ���惡 ���!"

-#: ../libpurple/protocols/myspace/zap.c:81
+#: ../libpurple/protocols/myspace/zap.c:87
 #, c-format
 msgid "Punking %s..."
 msgstr "惠惺�� ���惡 �� %s..."
@@ -7953,16 +8164,16 @@
 #. * gesture, so it does not carry a harsh negative
 #. * connotation.  It is generally used in a playful tone
 #. * with friends.
-#: ../libpurple/protocols/myspace/zap.c:90
+#: ../libpurple/protocols/myspace/zap.c:96
 msgid "Raspberry"
 msgstr "悒悽惘悋悴 悋��愕悋�"

-#: ../libpurple/protocols/myspace/zap.c:90
+#: ../libpurple/protocols/myspace/zap.c:97
 #, c-format
 msgid "%s has raspberried you!"
 msgstr "��%s 悖悽惘悴 �� �愕悋��!"

-#: ../libpurple/protocols/myspace/zap.c:90
+#: ../libpurple/protocols/myspace/zap.c:97
 #, c-format
 msgid "Raspberrying %s..."
 msgstr "惠悽惘悴 �愕悋�� �� %s..."
@@ -8200,7 +8411,7 @@
 msgstr "惠��� 悋�惡惘�惆"

 #: ../libpurple/protocols/novell/novell.c:1511
-#: ../libpurple/protocols/sametime/sametime.c:4168
+#: ../libpurple/protocols/sametime/sametime.c:4177
 msgid "User ID"
 msgstr "����悸 悋��愕惠悽惆�"

@@ -8255,26 +8466,26 @@
 msgid "Would you like to join the conversation?"
 msgstr "�� 惠�惆 悋�悋�惷�悋� ���忰悋惆惓悸�"

-#: ../libpurple/protocols/novell/novell.c:2027
+#: ../libpurple/protocols/novell/novell.c:2028
 msgid "You have been logged out because you logged in at another workstation."
 msgstr "悖��悴惠 悽悋惘悴悋 �悖�� ��悴惠 �� 忰悋愕�惡 悛悽惘."

-#: ../libpurple/protocols/novell/novell.c:2084
+#: ../libpurple/protocols/novell/novell.c:2085
 #, c-format
 msgid "%s appears to be offline and did not receive the message that you just sent."
 msgstr "�惡惆� 悖� %s 愃�惘 �惠惶� � �� �惠愕�� 悋�惘愕悋�悸 悋�惠� 悖惘愕�惠�悋 惠�悋.."

-#: ../libpurple/protocols/novell/novell.c:2184
+#: ../libpurple/protocols/novell/novell.c:2185
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
 msgstr "惠惺悵�惘 悋�悋惠惶悋� 惡悋�悽悋惆��. �� �惷�� 悖惆悽� 惺��悋� 悋�悽悋惆�� 悋�悵� 惠�惆 悋�悋惠惶悋� 惡�."

-#: ../libpurple/protocols/novell/novell.c:2213
+#: ../libpurple/protocols/novell/novell.c:2214
 msgid "Error. SSL support is not installed."
 msgstr "惺愀�. 惆惺� SSL 愃�惘 �惓惡惠."

-#: ../libpurple/protocols/novell/novell.c:2521
+#: ../libpurple/protocols/novell/novell.c:2522
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "��惆 ��惷�� �悵悋 悋�悋悴惠�悋惺. �悋 ���� 悒惘愕悋� 悋��慍�惆 �� 悋�惘愕悋悧�."

@@ -8288,16 +8499,16 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/novell/novell.c:3535
-#: ../libpurple/protocols/novell/novell.c:3537
+#: ../libpurple/protocols/novell/novell.c:3536
+#: ../libpurple/protocols/novell/novell.c:3538
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "��忰�悸 惡惘�惠���� Novell GroupWise Messenger"

-#: ../libpurple/protocols/novell/novell.c:3562
+#: ../libpurple/protocols/novell/novell.c:3563
 msgid "Server address"
 msgstr "惺��悋� 悋�悽悋惆��"

-#: ../libpurple/protocols/novell/novell.c:3566
+#: ../libpurple/protocols/novell/novell.c:3567
 msgid "Server port"
 msgstr "���悵 悋�悽悋惆��"

@@ -8310,19 +8521,19 @@
 msgstr "悋愕� 愃惘�悸 惆惘惆愆悸 愃�惘 惶悋�忰"

 #: ../libpurple/protocols/oscar/flap_connection.c:391
-#: ../libpurple/protocols/yahoo/yahoo.c:2506
-#: ../libpurple/protocols/yahoo/yahoo.c:2674
-#: ../libpurple/protocols/yahoo/ycht.c:482 ../libpurple/proxy.c:584
-#: ../libpurple/proxy.c:1129 ../libpurple/proxy.c:1238
-#: ../libpurple/proxy.c:1338 ../libpurple/proxy.c:1466
+#: ../libpurple/protocols/yahoo/yahoo.c:2505
+#: ../libpurple/protocols/yahoo/yahoo.c:2673
+#: ../libpurple/protocols/yahoo/ycht.c:482 ../libpurple/proxy.c:609
+#: ../libpurple/proxy.c:1161 ../libpurple/proxy.c:1270
+#: ../libpurple/proxy.c:1376 ../libpurple/proxy.c:1529
 msgid "Server closed the connection."
 msgstr "悖�愃��� 悋�悽悋惆��� 悋�悋惠惶悋�"

 #: ../libpurple/protocols/oscar/flap_connection.c:393
-#: ../libpurple/protocols/yahoo/yahoo.c:2499
-#: ../libpurple/protocols/yahoo/yahoo.c:2667 ../libpurple/proxy.c:596
-#: ../libpurple/proxy.c:1141 ../libpurple/proxy.c:1250
-#: ../libpurple/proxy.c:1350 ../libpurple/proxy.c:1478
+#: ../libpurple/protocols/yahoo/yahoo.c:2498
+#: ../libpurple/protocols/yahoo/yahoo.c:2666 ../libpurple/proxy.c:621
+#: ../libpurple/proxy.c:1173 ../libpurple/proxy.c:1282
+#: ../libpurple/proxy.c:1388 ../libpurple/proxy.c:1541
 #, c-format
 msgid ""
 "Lost connection with server:\n"
@@ -8332,9 +8543,9 @@
 "%s"

 #: ../libpurple/protocols/oscar/flap_connection.c:396
-#: ../libpurple/proxy.c:1158 ../libpurple/proxy.c:1263
-#: ../libpurple/proxy.c:1362 ../libpurple/proxy.c:1434
-#: ../libpurple/proxy.c:1491
+#: ../libpurple/proxy.c:1190 ../libpurple/proxy.c:1295
+#: ../libpurple/proxy.c:1400 ../libpurple/proxy.c:1490
+#: ../libpurple/proxy.c:1554
 msgid "Received invalid data on connection with server."
 msgstr "悋愕惠�惡�惠 惡�悋�悋惠 愃�惘 惶悋�忰悸 惺�惆 悋�悋惠惶悋� 惡悋�悽悋惆��."

@@ -8369,8 +8580,8 @@
 msgstr "��忰�悸 惡惘�惠���� ICQ"

 #: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4466
-#: ../libpurple/protocols/zephyr/zephyr.c:2997
+#: ../libpurple/protocols/yahoo/yahoo.c:4452
+#: ../libpurple/protocols/zephyr/zephyr.c:2982
 msgid "Encoding"
 msgstr "悋�惠惘��慍"

@@ -8509,7 +8720,7 @@
 msgid "Not while on AOL"
 msgstr "愃�惘 ���� 悖惓�悋悄 悋�惠�悋悴惆 惺�� AOL"

-#: ../libpurple/protocols/oscar/oscar.c:348
+#: ../libpurple/protocols/oscar/oscar.c:349
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking with "
 "is probably using a different encoding than expected.  If you know what "
@@ -8520,7 +8731,7 @@
 "悒� ��惠 惠惺惘� 悋�惠惘��慍 悋�悵� �愕惠悽惆�� �惡�愕惺� 惠忰惆�惆� �� 悋�悽�悋惘悋惠 悋��惠�惆�悸 �忰愕悋惡 "
 "AIM/ICQ)"

-#: ../libpurple/protocols/oscar/oscar.c:457
+#: ../libpurple/protocols/oscar/oscar.c:458
 #, c-format
 msgid ""
 "(There was an error receiving this message.  Either you and %s have "
@@ -8530,147 +8741,135 @@
 "s �愕惠悽惆� 惺���悋 惡� 惺�悋惠.)"

 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:639 ../pidgin/gtkutils.c:2444
+#: ../libpurple/protocols/oscar/oscar.c:640 ../pidgin/gtkutils.c:2444
 #: ../pidgin/gtkutils.c:2474
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:332
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:336
 msgid "Buddy Icon"
 msgstr "悖����悸 悋�惶惆��"

-#: ../libpurple/protocols/oscar/oscar.c:642
+#: ../libpurple/protocols/oscar/oscar.c:643
 msgid "Voice"
 msgstr "惶�惠"

-#: ../libpurple/protocols/oscar/oscar.c:645
+#: ../libpurple/protocols/oscar/oscar.c:646
 msgid "AIM Direct IM"
 msgstr "惠惘悋愕� AIM ��惘� �惡悋愆惘"

-#: ../libpurple/protocols/oscar/oscar.c:648
-#: ../libpurple/protocols/silc/silc.c:911
-#: ../libpurple/protocols/silc/util.c:559
-#: ../libpurple/protocols/silc10/silc.c:679
-#: ../libpurple/protocols/silc10/util.c:549
-msgid "Chat"
-msgstr "惆惘惆愆悸"
-
-#: ../libpurple/protocols/oscar/oscar.c:651
-#: ../libpurple/protocols/oscar/oscar.c:6051
+#: ../libpurple/protocols/oscar/oscar.c:652
+#: ../libpurple/protocols/oscar/oscar.c:6139
 msgid "Get File"
 msgstr "悋悴�惡 ���悋"

-#: ../libpurple/protocols/oscar/oscar.c:658
+#: ../libpurple/protocols/oscar/oscar.c:659
 msgid "Games"
 msgstr "悖�惺悋惡"

-#: ../libpurple/protocols/oscar/oscar.c:661
+#: ../libpurple/protocols/oscar/oscar.c:662
 msgid "Add-Ins"
 msgstr "悒惷悋�悋惠"

-#: ../libpurple/protocols/oscar/oscar.c:664
+#: ../libpurple/protocols/oscar/oscar.c:665
 msgid "Send Buddy List"
 msgstr "悖惘愕� �悋悧�悸 悋�悖惶惆�悋悄"

-#: ../libpurple/protocols/oscar/oscar.c:667
+#: ../libpurple/protocols/oscar/oscar.c:668
 msgid "ICQ Direct Connect"
 msgstr "悋惠惶悋� ICQ �惡悋愆惘"

-#: ../libpurple/protocols/oscar/oscar.c:670
+#: ../libpurple/protocols/oscar/oscar.c:671
 msgid "AP User"
 msgstr "�愕惠悽惆� AP"

-#: ../libpurple/protocols/oscar/oscar.c:673
+#: ../libpurple/protocols/oscar/oscar.c:674
 msgid "ICQ RTF"
 msgstr "ICQ RTF"

-#: ../libpurple/protocols/oscar/oscar.c:676
+#: ../libpurple/protocols/oscar/oscar.c:677
 msgid "Nihilist"
 msgstr ""

-#: ../libpurple/protocols/oscar/oscar.c:679
+#: ../libpurple/protocols/oscar/oscar.c:680
 msgid "ICQ Server Relay"
 msgstr "��惘 悽悋惆�� ICQ"

-#: ../libpurple/protocols/oscar/oscar.c:682
+#: ../libpurple/protocols/oscar/oscar.c:683
 msgid "Old ICQ UTF8"
 msgstr "ICQ UTF8 悋��惆��"

-#: ../libpurple/protocols/oscar/oscar.c:685
+#: ../libpurple/protocols/oscar/oscar.c:686
 msgid "Trillian Encryption"
 msgstr "惠惺��悸 Trillian "

-#: ../libpurple/protocols/oscar/oscar.c:688
+#: ../libpurple/protocols/oscar/oscar.c:689
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"

-#: ../libpurple/protocols/oscar/oscar.c:691
+#: ../libpurple/protocols/oscar/oscar.c:692
 msgid "Hiptop"
 msgstr ""

-#: ../libpurple/protocols/oscar/oscar.c:694
+#: ../libpurple/protocols/oscar/oscar.c:695
 msgid "Security Enabled"
 msgstr "悋�悖�� ���惺��"

-#: ../libpurple/protocols/oscar/oscar.c:697
+#: ../libpurple/protocols/oscar/oscar.c:698
 msgid "Video Chat"
 msgstr "惆惘惆愆悸 惡悋���惆��"

-#: ../libpurple/protocols/oscar/oscar.c:701
+#: ../libpurple/protocols/oscar/oscar.c:702
 msgid "iChat AV"
 msgstr "iChat AV"

-#: ../libpurple/protocols/oscar/oscar.c:704
+#: ../libpurple/protocols/oscar/oscar.c:705
 msgid "Live Video"
 msgstr "��惆�� �惡悋愆惘"

-#: ../libpurple/protocols/oscar/oscar.c:707
+#: ../libpurple/protocols/oscar/oscar.c:708
 msgid "Camera"
 msgstr "�悋��惘悋"

-#: ../libpurple/protocols/oscar/oscar.c:725
-#: ../libpurple/protocols/oscar/oscar.c:5821
+#: ../libpurple/protocols/oscar/oscar.c:726
+#: ../libpurple/protocols/oscar/oscar.c:5909
 msgid "Free For Chat"
 msgstr "�惠悋忰 ��惆惘惆愆悸"

-#: ../libpurple/protocols/oscar/oscar.c:729
-#: ../libpurple/protocols/oscar/oscar.c:5856
+#: ../libpurple/protocols/oscar/oscar.c:730
+#: ../libpurple/protocols/oscar/oscar.c:5944
 msgid "Not Available"
 msgstr "愃�惘 ��悴�惆"

-#: ../libpurple/protocols/oscar/oscar.c:731
-#: ../libpurple/protocols/oscar/oscar.c:5842
+#: ../libpurple/protocols/oscar/oscar.c:732
+#: ../libpurple/protocols/oscar/oscar.c:5930
 msgid "Occupied"
 msgstr "�愆愃��"

-#: ../libpurple/protocols/oscar/oscar.c:735
+#: ../libpurple/protocols/oscar/oscar.c:736
 msgid "Web Aware"
 msgstr "�惆惘� ���惡"

-#: ../libpurple/protocols/oscar/oscar.c:737 ../libpurple/protocols/qq/qq.c:184
+#: ../libpurple/protocols/oscar/oscar.c:738 ../libpurple/protocols/qq/qq.c:184
 #: ../libpurple/protocols/qq/qq.c:289
-#: ../libpurple/protocols/yahoo/yahoo.c:3151 ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:557 ../pidgin/gtkstatusbox.c:1068
+#: ../libpurple/protocols/yahoo/yahoo.c:3152 ../libpurple/status.c:157
+#: ../pidgin/gtkdocklet.c:557 ../pidgin/gtkstatusbox.c:1084
 msgid "Invisible"
 msgstr "悽��"

-#: ../libpurple/protocols/oscar/oscar.c:739
-msgid "Online"
-msgstr "�惠惶�"
-
-#: ../libpurple/protocols/oscar/oscar.c:838
-#: ../libpurple/protocols/oscar/oscar.c:3688
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1089
+#: ../libpurple/protocols/oscar/oscar.c:839
+#: ../libpurple/protocols/oscar/oscar.c:3754
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1100
 msgid "IP Address"
 msgstr "惺��悋� IP"

-#: ../libpurple/protocols/oscar/oscar.c:845
-#: ../libpurple/protocols/oscar/oscar.c:2900
+#: ../libpurple/protocols/oscar/oscar.c:846
+#: ../libpurple/protocols/oscar/oscar.c:2959
 msgid "Warning Level"
 msgstr "�愕惠�� 悋�惠忰悵�惘"

-#: ../libpurple/protocols/oscar/oscar.c:855
+#: ../libpurple/protocols/oscar/oscar.c:856
 msgid "Buddy Comment"
 msgstr "惠惺��� 悋�惶惆��"

-#: ../libpurple/protocols/oscar/oscar.c:995
+#: ../libpurple/protocols/oscar/oscar.c:996
 #, c-format
 msgid ""
 "Could not connect to authentication server:\n"
@@ -8679,7 +8878,7 @@
 "惠惺悵�惘 悋�悋惠惶悋� 惡悽悋惆�� 悋�悋愕惠�惓悋�:\n"
 "%s"

-#: ../libpurple/protocols/oscar/oscar.c:1003
+#: ../libpurple/protocols/oscar/oscar.c:1004
 #, c-format
 msgid ""
 "Could not connect to BOS server:\n"
@@ -8688,57 +8887,56 @@
 "惠惺悵�惘 悋�悋惠惶悋� 惡悽悋惆�� BOS:\n"
 "%s"

-#: ../libpurple/protocols/oscar/oscar.c:1043
-msgid "Screen name sent"
-msgstr "悖�惘愕� 悋愕� 悋�愆悋愆悸"
-
-#: ../libpurple/protocols/oscar/oscar.c:1048
+#: ../libpurple/protocols/oscar/oscar.c:1044
+msgid "Username sent"
+msgstr "忰�惆��惆 悋愕� 悋���愕惠悽惆�"
+
+#: ../libpurple/protocols/oscar/oscar.c:1049
 msgid "Connection established, cookie sent"
 msgstr "悖��愆悧 悋�悋惠惶悋�� 悖惘愕�惠 悋�����"

 #. TODO: Don't call this with ssi
-#: ../libpurple/protocols/oscar/oscar.c:1077
+#: ../libpurple/protocols/oscar/oscar.c:1078
 msgid "Finalizing connection"
 msgstr "����� 悋�悋惠惶悋�"

-#: ../libpurple/protocols/oscar/oscar.c:1261
-#, c-format
-msgid ""
-"Unable to login: Could not sign on as %s because the screen name is "
-"invalid.  Screen names must be a valid email address, or start with a letter "
-"and contain only letters, numbers and spaces, or contain only numbers."
+#: ../libpurple/protocols/oscar/oscar.c:1306
+#, c-format
+msgid ""
+"Unable to login: Could not sign on as %s because the username is invalid.  "
+"Usernames must be a valid email address, or start with a letter and contain "
+"only letters, numbers and spaces, or contain only numbers."
 msgstr ""
 "惠惺悵�惘 悋����悴: �� ���� 悋����悴 惡悋愕� %s �悖�� 悋愕� 愃�惘 惶忰�忰. �悴惡 悖� ���� 悋�悋愕� "
 "惺��悋� 惡惘�惆 惶忰�忰� 悖� 悖� �惡惆悖 惡忰惘� � �忰�� ��愀 悖忰惘�悋 � 悖惘�悋�悋 � �愕悋�悋惠� 悖� "
 "悖惘�悋�悋 ��愀."

 #. Unregistered screen name
-#: ../libpurple/protocols/oscar/oscar.c:1346
-#: ../libpurple/protocols/yahoo/yahoo.c:2131
-msgid "Invalid screen name."
-msgstr "悋愕� 愆悋愆悸 愃�惘 惶悋�忰."
-
-#: ../libpurple/protocols/oscar/oscar.c:1352
+#: ../libpurple/protocols/oscar/oscar.c:1392
+msgid "Invalid username."
+msgstr "悋愕� �愕惠悽惆� 愃�惘 惶悋�忰"
+
+#: ../libpurple/protocols/oscar/oscar.c:1398
 #: ../libpurple/protocols/qq/login_logout.c:485
 #: ../libpurple/protocols/simple/simple.c:1112
-#: ../libpurple/protocols/yahoo/yahoo.c:2153
+#: ../libpurple/protocols/yahoo/yahoo.c:2149
 msgid "Incorrect password."
 msgstr "���悸 愕惘 悽愀悖."

 #. Suspended account
-#: ../libpurple/protocols/oscar/oscar.c:1356
+#: ../libpurple/protocols/oscar/oscar.c:1402
 msgid "Your account is currently suspended."
 msgstr "忰愕悋惡� ��惺���� 忰悋��悋."

 #. service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1360
+#: ../libpurple/protocols/oscar/oscar.c:1406
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "悽惆�悸 ��惘愕悋� AOL 悋���惘� 愃�惘 �惠悋忰悸 �悗�惠�悋."

 #. screen name connecting too frequently
 #. IP address connecting too frequently
-#: ../libpurple/protocols/oscar/oscar.c:1364
-#: ../libpurple/protocols/oscar/oscar.c:1373
+#: ../libpurple/protocols/oscar/oscar.c:1410
+#: ../libpurple/protocols/oscar/oscar.c:1419
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
@@ -8747,44 +8945,43 @@
 "�悴惆惆悋. 悒悵悋 悋愕惠�惘�惠 �� 悋��忰悋��悸 悋�悛� �愕��惡愃� �� 悋�悋�惠惴悋惘 �惆悸 悖愀��."

 #. client too old
-#: ../libpurple/protocols/oscar/oscar.c:1368
+#: ../libpurple/protocols/oscar/oscar.c:1414
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "悒惶惆悋惘悸 悋�惺��� 悋�惠� 惠愕惠悽惆��悋 �惆��悸 悴惆�悋. �� �惷�� 惘��悋 �� %s"

-#: ../libpurple/protocols/oscar/oscar.c:1406
+#: ../libpurple/protocols/oscar/oscar.c:1452
 msgid "Could Not Connect"
 msgstr "惠惺悵�惘 悋�悋惠惶悋�"

-#: ../libpurple/protocols/oscar/oscar.c:1410
+#: ../libpurple/protocols/oscar/oscar.c:1456
 msgid "Received authorization"
 msgstr "悋愕惠��惡�� 悋�悋愕惠�惓悋�"

-#: ../libpurple/protocols/oscar/oscar.c:1433
+#: ../libpurple/protocols/oscar/oscar.c:1479
 msgid "The SecurID key entered is invalid."
 msgstr "��惠悋忰 SecurID 悋��惆悽� 愃�惘 惶悋�忰."

-#: ../libpurple/protocols/oscar/oscar.c:1446
+#: ../libpurple/protocols/oscar/oscar.c:1492
 msgid "Enter SecurID"
 msgstr "悖惆悽� SecurID"

-#: ../libpurple/protocols/oscar/oscar.c:1447
+#: ../libpurple/protocols/oscar/oscar.c:1493
 msgid "Enter the 6 digit number from the digital display."
 msgstr "悖惆悽� 悋�惘�� 悋�悵� �惠悖�� �� 6 悖惘�悋� �� 悋�惺惘惷 悋�惘���."

 #. *
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
-#: ../libpurple/protocols/oscar/oscar.c:1449
-#: ../libpurple/protocols/oscar/oscar.c:2241
-#: ../libpurple/protocols/oscar/oscar.c:2290
-#: ../libpurple/protocols/oscar/oscar.c:5926
-#: ../libpurple/protocols/oscar/oscar.c:6207 ../libpurple/request.h:1454
+#: ../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
 msgid "_OK"
 msgstr "_��悋��"

-#: ../libpurple/protocols/oscar/oscar.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:1531
+#: ../libpurple/protocols/oscar/oscar.c:1534
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -8793,53 +8990,54 @@
 "�惆 ���愀惺 悋惠惶悋�� �惘�惡悋. �惆 惠惘愃惡 �� 悋愕惠悽惆悋� TOC 悒�� 悖� �惠� 悒惶�悋忰 �悵悋. 愀悋�惺 %s "
 "��惠忰惆�惓悋惠."

-#: ../libpurple/protocols/oscar/oscar.c:1491
-#: ../libpurple/protocols/oscar/oscar.c:1534
+#: ../libpurple/protocols/oscar/oscar.c:1537
+#: ../libpurple/protocols/oscar/oscar.c:1581
 msgid "Unable to get a valid AIM login hash."
 msgstr "惠惺悵�惘 悴�惡 惠�惡�惆悸 ���悴 惶忰�忰悸 悒�� AIM."

-#: ../libpurple/protocols/oscar/oscar.c:1619
+#: ../libpurple/protocols/oscar/oscar.c:1578
+#: ../libpurple/protocols/oscar/oscar.c:1677
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr "�惆 ���愀惺 悋惠惶悋�� �惘�惡悋. 愀悋�惺 %s ��惠忰惆�惓悋惠."

-#: ../libpurple/protocols/oscar/oscar.c:1622
+#: ../libpurple/protocols/oscar/oscar.c:1680
 msgid "Unable to get a valid login hash."
 msgstr "惠惺悵�惘 悴�惡 惠�惡�惆悸 ���悴 惶忰�忰悸."

-#: ../libpurple/protocols/oscar/oscar.c:1652
+#: ../libpurple/protocols/oscar/oscar.c:1710
 msgid "Password sent"
 msgstr "悖�惘愕��惠 ���悸 悋�愕惘"

-#: ../libpurple/protocols/oscar/oscar.c:1708
+#: ../libpurple/protocols/oscar/oscar.c:1766
 msgid "Unable to initialize connection"
 msgstr "惠惺悵�惘 悋愕惠惡惆悋悄 悋�悋惠惶悋�"

-#: ../libpurple/protocols/oscar/oscar.c:2199
+#: ../libpurple/protocols/oscar/oscar.c:2256
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "�� �惷�� 惶惘�忰 �� 惡悒惷悋�惠� 悒�� �悋悧�悸 悖惶惆�悋悧�."

-#: ../libpurple/protocols/oscar/oscar.c:2239
+#: ../libpurple/protocols/oscar/oscar.c:2298
 msgid "Authorization Request Message:"
 msgstr "惘愕悋�悸 愀�惡 悋�惠惶惘�忰:"

-#: ../libpurple/protocols/oscar/oscar.c:2240
+#: ../libpurple/protocols/oscar/oscar.c:2299
 msgid "Please authorize me!"
 msgstr "�� �惷�� 惶惘�忰 ��!"

-#: ../libpurple/protocols/oscar/oscar.c:2281
-#: ../libpurple/protocols/oscar/oscar.c:2289
-#: ../libpurple/protocols/oscar/oscar.c:2416
-#: ../libpurple/protocols/oscar/oscar.c:5298
-#: ../libpurple/protocols/yahoo/yahoo.c:1043
+#: ../libpurple/protocols/oscar/oscar.c:2340
+#: ../libpurple/protocols/oscar/oscar.c:2348
+#: ../libpurple/protocols/oscar/oscar.c:2475
+#: ../libpurple/protocols/oscar/oscar.c:5386
+#: ../libpurple/protocols/yahoo/yahoo.c:991
 msgid "No reason given."
 msgstr "�悋 愕惡惡 �惺愀�."

-#: ../libpurple/protocols/oscar/oscar.c:2288
+#: ../libpurple/protocols/oscar/oscar.c:2347
 msgid "Authorization Denied Message:"
 msgstr "惘愕悋�悸 ��惺 悋�惠惶惘�忰:"

-#: ../libpurple/protocols/oscar/oscar.c:2416
+#: ../libpurple/protocols/oscar/oscar.c:2475
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -8849,17 +9047,17 @@
 "惘�惷 %u 悋��愕惠悽惆� 愀�惡� 悒惷悋�惠� 悒�� �悋悧�悸 悖惶惆�悋悧� ��愕惡惡 悋�惠悋��:\n"
 "%s"

-#: ../libpurple/protocols/oscar/oscar.c:2417
+#: ../libpurple/protocols/oscar/oscar.c:2476
 msgid "ICQ authorization denied."
 msgstr "���惺 惠惶惘�忰 ICQ."

 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2424
+#: ../libpurple/protocols/oscar/oscar.c:2483
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "悋��愕惠悽惆� %u �惡� 愀�惡� 悒惷悋�惠� 悒�� �悋悧�悸 悖惶惆�悋悧�."

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

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

-#: ../libpurple/protocols/oscar/oscar.c:2448
+#: ../libpurple/protocols/oscar/oscar.c:2507
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -8898,24 +9096,24 @@
 "悋�惘愕悋�悸 ��:\n"
 "%s"

-#: ../libpurple/protocols/oscar/oscar.c:2469
+#: ../libpurple/protocols/oscar/oscar.c:2528
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "�愕惠悽惆� ICQ %u 悖惘愕� �� 惶惆���悋: %s (%s)"

-#: ../libpurple/protocols/oscar/oscar.c:2475
+#: ../libpurple/protocols/oscar/oscar.c:2534
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "悖惠惘�惆 悒惷悋�悸 �悵悋 悋�惶惆�� 悒�� �悋悧�悸 悖惶惆�悋悧��"

-#: ../libpurple/protocols/oscar/oscar.c:2480 ../pidgin/gtkroomlist.c:320
+#: ../libpurple/protocols/oscar/oscar.c:2539 ../pidgin/gtkroomlist.c:320
 msgid "_Add"
 msgstr "悖_惷�"

-#: ../libpurple/protocols/oscar/oscar.c:2481
+#: ../libpurple/protocols/oscar/oscar.c:2540
 msgid "_Decline"
 msgstr "悋惘_�惷"

-#: ../libpurple/protocols/oscar/oscar.c:2605
+#: ../libpurple/protocols/oscar/oscar.c:2664
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
@@ -8926,7 +9124,7 @@
 msgstr[4] "��惆惠 %hu 惘愕悋�悸 �� %s �����悋 愃�惘 惶悋�忰悸."
 msgstr[5] "��惆惠 %hu 惘愕悋�悸 �� %s �����悋 愃�惘 惶悋�忰悸."

-#: ../libpurple/protocols/oscar/oscar.c:2614
+#: ../libpurple/protocols/oscar/oscar.c:2673
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
@@ -8937,7 +9135,7 @@
 msgstr[4] "��惆惠 %hu 惘愕悋�悸 �� %s �����悋 悖�惡惘 �� 悋��悋慍�."
 msgstr[5] "��惆惠 %hu 惘愕悋�悸 �� %s �����悋 悖�惡惘 �� 悋��悋慍�."

-#: ../libpurple/protocols/oscar/oscar.c:2623
+#: ../libpurple/protocols/oscar/oscar.c:2682
 #, c-format
 msgid "You missed %hu message from %s because the rate limit has been exceeded."
 msgid_plural "You missed %hu messages from %s because the rate limit has been exceeded."
@@ -8948,7 +9146,7 @@
 msgstr[4] "��惆惠 %hu 惘愕悋�悸 �� %s �惠悴悋�慍 忰惆� 悋���愕�惡."
 msgstr[5] "��惆惠 %hu 惘愕悋�悸 �� %s �惠悴悋�慍 忰惆� 悋���愕�惡."

-#: ../libpurple/protocols/oscar/oscar.c:2632
+#: ../libpurple/protocols/oscar/oscar.c:2691
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
@@ -8959,7 +9157,7 @@
 msgstr[4] "��惆惠 %hu 惘愕悋�悸 �� %s �悖�� �悗悵 悴惆�悋."
 msgstr[5] "��惆惠 %hu 惘愕悋�悸 �� %s �悖�� �悗悵 悴惆�悋."

-#: ../libpurple/protocols/oscar/oscar.c:2641
+#: ../libpurple/protocols/oscar/oscar.c:2700
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
@@ -8970,7 +9168,7 @@
 msgstr[4] "��惆惠 %hu 惘愕悋�悸 �� %s �悖�� �悗悵 悴惆�悋."
 msgstr[5] "��惆惠 %hu 惘愕悋�悸 �� %s �悖�� �悗悵 悴惆�悋."

-#: ../libpurple/protocols/oscar/oscar.c:2650
+#: ../libpurple/protocols/oscar/oscar.c:2709
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
@@ -8982,53 +9180,53 @@
 msgstr[5] "��惆惠 %hu 惘愕悋�悸 �� %s �愕惡惡 �悴���."

 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2805
+#: ../libpurple/protocols/oscar/oscar.c:2864
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "惠惺悵�惘 悒惘愕悋� 惘愕悋�悸: %s"

-#: ../libpurple/protocols/oscar/oscar.c:2805
-#: ../libpurple/protocols/oscar/oscar.c:2810
-#: ../libpurple/protocols/oscar/oscar.c:2874
+#: ../libpurple/protocols/oscar/oscar.c:2864
+#: ../libpurple/protocols/oscar/oscar.c:2869
+#: ../libpurple/protocols/oscar/oscar.c:2933
 msgid "Unknown reason."
 msgstr "愕惡惡 �悴���"

-#: ../libpurple/protocols/oscar/oscar.c:2808
-#: ../libpurple/protocols/sametime/sametime.c:2451
+#: ../libpurple/protocols/oscar/oscar.c:2867
+#: ../libpurple/protocols/sametime/sametime.c:2460
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "惠惺悵�惘 悒惘愕悋� 惘愕悋�悸 悒�� %s:"

-#: ../libpurple/protocols/oscar/oscar.c:2874
+#: ../libpurple/protocols/oscar/oscar.c:2933
 #, c-format
 msgid "User information not available: %s"
 msgstr "�惺���悋惠 悋��愕惠悽惆� 愃�惘 �惠��惘悸: %s"

-#: ../libpurple/protocols/oscar/oscar.c:2905
+#: ../libpurple/protocols/oscar/oscar.c:2964
 msgid "Online Since"
 msgstr "�惠惶� ��悵"

-#: ../libpurple/protocols/oscar/oscar.c:2910
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1185
+#: ../libpurple/protocols/oscar/oscar.c:2969
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1192
 msgid "Member Since"
 msgstr "惺惷� ��悵"

-#: ../libpurple/protocols/oscar/oscar.c:2945
+#: ../libpurple/protocols/oscar/oscar.c:3004
 msgid "Available Message"
 msgstr "惘愕悋�悸 �惠悋忰悸"

-#: ../libpurple/protocols/oscar/oscar.c:3049
+#: ../libpurple/protocols/oscar/oscar.c:3108
 msgid "Your AIM connection may be lost."
 msgstr "�惆 ���愀惺 悋惠惶悋�� �惺 AIM."

 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3237
+#: ../libpurple/protocols/oscar/oscar.c:3296
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 msgstr "[惠惺悵�惘 惺惘惷 惘愕悋�悸 �� �悵悋 悋��愕惠悽惆� �悖��悋 惠忰�� 忰惘��悋 愃�惘 惶悋�忰悸.]"

-#: ../libpurple/protocols/oscar/oscar.c:3401
+#: ../libpurple/protocols/oscar/oscar.c:3460
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -9036,152 +9234,148 @@
 "�悋 ���� 悒悴惘悋悄 悋��惺� 悋�悖悽�惘 悋�悵� 忰悋��惠 悖惆悋悄� �惠悴悋�慍� 忰惆 悋���愕�惡. �� �惷�� "
 "悋�惠惴惘 惺愆惘 惓�悋� 惓� 忰悋�� �悴惆惆悋."

-#: ../libpurple/protocols/oscar/oscar.c:3486
+#: ../libpurple/protocols/oscar/oscar.c:3545
 #: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "惠�� �惶�� 惺� 愃惘�悸 悋�惆惘惆愆悸 %s."

-#: ../libpurple/protocols/oscar/oscar.c:3710
-#: ../libpurple/protocols/silc/util.c:591
-#: ../libpurple/protocols/silc10/util.c:581
+#: ../libpurple/protocols/oscar/oscar.c:3776
+#: ../libpurple/protocols/silc/util.c:596
+#: ../libpurple/protocols/silc10/util.c:586
 msgid "Mobile Phone"
 msgstr "悋��悋惠� 悋��忰���"

-#: ../libpurple/protocols/oscar/oscar.c:3740
+#: ../libpurple/protocols/oscar/oscar.c:3806
 msgid "Personal Web Page"
 msgstr "惶�忰悸 ��惡 悋�愆悽惶�悸"

-#: ../libpurple/protocols/oscar/oscar.c:3764
+#: ../libpurple/protocols/oscar/oscar.c:3830
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "�惺���悋惠 悒惷悋��悸"

-#: ../libpurple/protocols/oscar/oscar.c:3772
-#: ../libpurple/protocols/oscar/oscar.c:3785
+#: ../libpurple/protocols/oscar/oscar.c:3838
+#: ../libpurple/protocols/oscar/oscar.c:3851
 msgid "Zip Code"
 msgstr "悋�惘�慍 悋�惡惘�惆�"

-#: ../libpurple/protocols/oscar/oscar.c:3796
+#: ../libpurple/protocols/oscar/oscar.c:3862
 msgid "Division"
 msgstr "悋��愕�"

-#: ../libpurple/protocols/oscar/oscar.c:3797
+#: ../libpurple/protocols/oscar/oscar.c:3863
 msgid "Position"
 msgstr "悋���惷惺"

-#: ../libpurple/protocols/oscar/oscar.c:3799
+#: ../libpurple/protocols/oscar/oscar.c:3865
 msgid "Web Page"
 msgstr "惶�忰悸 悋���惡"

-#: ../libpurple/protocols/oscar/oscar.c:3802
+#: ../libpurple/protocols/oscar/oscar.c:3868
 msgid "Work Information"
 msgstr "�惺���悋惠 悋�惺��"

-#: ../libpurple/protocols/oscar/oscar.c:3858
+#: ../libpurple/protocols/oscar/oscar.c:3924
 msgid "Pop-Up Message"
 msgstr "惘愕悋�悸 ��惡惓�悸"

-#: ../libpurple/protocols/oscar/oscar.c:3898
-#, c-format
-msgid "The following screen name is associated with %s"
-msgid_plural "The following screen names are associated with %s"
-msgstr[0] "�悋 惠�悴惆 悖愕�悋悄 愆悋愆悸 �惘惠惡愀悸 惡  %s"
-msgstr[1] "悋愕� 悋�愆悋愆悸 悋�惠悋�� �惘惠惡愀 惡�� %s"
-msgstr[2] "悋愕�悋 悋�愆悋愆悸 悋�惠悋��悋� �惘惠惡愀悋� 惡�� %s"
-msgstr[3] "悖愕�悋悄 悋�愆悋愆悸 悋�惠悋��悸 �惘惠惡愀悸 惡�� %s"
-msgstr[4] "悖愕�悋悄 悋�愆悋愆悸 悋�惠悋��悸 �惘惠惡愀悸 惡�� %s"
-msgstr[5] "悖愕�悋悄 悋�愆悋愆悸 悋�惠悋��悸 �惘惠惡愀悸 惡�� %s"
-
-#: ../libpurple/protocols/oscar/oscar.c:3903
-msgid "Screen name"
-msgstr "悋愕� 悋�愆悋愆悸"
-
-#: ../libpurple/protocols/oscar/oscar.c:3929
+#: ../libpurple/protocols/oscar/oscar.c:3964
+#, c-format
+msgid "The following username is associated with %s"
+msgid_plural "The following usernames are associated with %s"
+msgstr[0] "�悋 惠�悴惆 悖愕�悋悄 �愕惠悽惆� �惘惠惡愀悸 惡�� %s"
+msgstr[1] "悋愕� 悋��愕惠悽惆� 悋�惠悋�� �惘惠惡愀 惡�� %s"
+msgstr[2] "悋愕�悋 悋��愕惠悽惆� 悋�惠悋��悋� �惘惠惡愀悋� 惡�� %s"
+msgstr[3] "悖愕�悋悄 悋��愕惠悽惆� 悋�惠悋��悸 �惘惠惡愀悸 惡�� %s"
+msgstr[4] "悖愕�悋悄 悋��愕惠悽惆� 悋�惠悋��悸 �惘惠惡愀悸 惡�� %s"
+msgstr[5] "悖愕�悋悄 悋��愕惠悽惆� 悋�惠悋��悸 �惘惠惡愀悸 惡�� %s"
+
+#: ../libpurple/protocols/oscar/oscar.c:3995
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "�悋 惠�悴惆 �惠悋悧悴 �惺��悋� 悋�惡惘�惆 悋�悒��惠惘��� %s"

-#: ../libpurple/protocols/oscar/oscar.c:3950
+#: ../libpurple/protocols/oscar/oscar.c:4016
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "愕惠惠愕�� 惡惘�惆悋 悒��惠惘���悋 �愕悖�� 惠���惆 %s."

-#: ../libpurple/protocols/oscar/oscar.c:3952
+#: ../libpurple/protocols/oscar/oscar.c:4018
 msgid "Account Confirmation Requested"
 msgstr "惠� 愀�惡 惠���惆 悋�忰愕悋惡"

-#: ../libpurple/protocols/oscar/oscar.c:3983
-msgid "Error Changing Account Info"
-msgstr "惺愀� �� 惠愃��惘 �惺���悋惠 忰愕悋惡"
-
-#: ../libpurple/protocols/oscar/oscar.c:3986
-#, c-format
-msgid ""
-"Error 0x%04x: Unable to format screen name because the requested screen name "
-"differs from the original."
-msgstr "悽愀悖 0x%04x: 惠惺悵�惘 惠�愕�� 悋愕� 悋�愆悋愆悸 �悖� 悋愕� 悋�愆悋愆悸 悋��愀��惡 �悽惠�� 惺� 悋�悖惶��."
-
-#: ../libpurple/protocols/oscar/oscar.c:3989
-#, c-format
-msgid "Error 0x%04x: Unable to format screen name because it is invalid."
-msgstr "悽愀悖 0x%04x: 惠惺悵�惘 惠�愕�� 悋愕� 悋�愆悋愆悸 �悖�� 愃�惘 惶悋�忰."
-
-#: ../libpurple/protocols/oscar/oscar.c:3992
-#, c-format
-msgid ""
-"Error 0x%04x: Unable to format screen name because the requested screen name "
-"is too long."
-msgstr "悽愀悖 0x%04x: 惠惺悵�惘 惠�愕�� 悋愕� 悋�愆悋愆悸 �悖� 悋愕� 悋�愆悋愆悸 悋��愀��惡 愀��� 悴惆�悋."
-
-#: ../libpurple/protocols/oscar/oscar.c:3995
+#: ../libpurple/protocols/oscar/oscar.c:4051
+#, 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
+#, c-format
+msgid "Error 0x%04x: Unable to format username because it is invalid."
+msgstr "悽愀悖 0x%04x: 惠惺悵�惘 惠�愕�� 悋愕� 悋��愕惠悽惆� �悖�� 愃�惘 惶悋�忰."
+
+#: ../libpurple/protocols/oscar/oscar.c:4055
+#, 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
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
-"request pending for this screen name."
+"request pending for this username."
 msgstr "悽愀悖 0x%04x: 惠惺悵�惘 惠愃��惘 惺��悋� 悋�惡惘�惆 悋�悒��惠惘��� ��悴�惆 愀�惡 愕悋惡� ��悵悋 悋�悋愕�."

-#: ../libpurple/protocols/oscar/oscar.c:3998
+#: ../libpurple/protocols/oscar/oscar.c:4059
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
-"too many screen names associated with it."
+"too many usernames associated with it."
 msgstr ""
 "悽愀悖 0x%04x: 惠惺悵�惘 惠愃��惘 惺��悋� 悋�惡惘�惆 悋�悒��惠惘��� �悖� 悋�惺��悋� 悋��惺愀� 惠�悴惆 悖愕�悋悄 "
-"愆悋愆悸 �惓�惘悸 悴惆悋 �惘惠惡愀悸 惡�."
-
-#: ../libpurple/protocols/oscar/oscar.c:4001
+"�愕惠悽惆� �惓�惘悸 悴惆悋 �惘惠惡愀悸 惡�."
+
+#: ../libpurple/protocols/oscar/oscar.c:4061
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 msgstr "悽愀悖 0x%04x: 惠惺悵�惘 惠愃��惘 惺��悋� 悋�惡惘�惆 悋�悒��惠惘��� �悖� 悋�惺��悋� 悋��惺愀� 愃�惘 惶悋�忰."

-#: ../libpurple/protocols/oscar/oscar.c:4004
+#: ../libpurple/protocols/oscar/oscar.c:4063
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "悽愀悖 0x%04x: 悽愀悖 �悴���."

-#: ../libpurple/protocols/oscar/oscar.c:4014
+#: ../libpurple/protocols/oscar/oscar.c:4065
+msgid "Error Changing Account Info"
+msgstr "惺愀� �� 惠愃��惘 �惺���悋惠 忰愕悋惡"
+
+#: ../libpurple/protocols/oscar/oscar.c:4071
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "惺��悋� 悋�惡惘�惆 悋�悒��惠惘��� �� %s �� %s"

-#: ../libpurple/protocols/oscar/oscar.c:4016
+#: ../libpurple/protocols/oscar/oscar.c:4073
 msgid "Account Info"
 msgstr "�惺���悋惠 悋�忰愕悋惡"

-#: ../libpurple/protocols/oscar/oscar.c:4199
+#: ../libpurple/protocols/oscar/oscar.c:4259
 msgid "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 "惶�惘悸 惘愕悋�惠� 悋���惘�悸 �� 惠惘愕�. �悴惡 悋� 惠��� �惠惶�悋 �惡悋愆惘悸 �悒惘愕悋� 惶�惘 悋�惘愕悋�悸 "
 "悋���惘�悸."

-#: ../libpurple/protocols/oscar/oscar.c:4470
+#: ../libpurple/protocols/oscar/oscar.c:4530
 msgid "Unable to set AIM profile."
 msgstr "惠惺悵�惘 惷惡愀 �悋忰悸 AIM. "

-#: ../libpurple/protocols/oscar/oscar.c:4471
+#: ../libpurple/protocols/oscar/oscar.c:4531
 msgid ""
 "You have probably requested to set your profile before the login procedure "
 "completed.  Your profile remains unset; try setting it again when you are "
@@ -9190,7 +9384,7 @@
 "�� 悋��忰惠�� 悖�� 愀�惡惠 惷惡愀 �悋忰惠� �惡� 惠�悋� 悋����悴. 愕惠惡�� �悋忰惠� 惺�� �惷惺�悋悋�悖惶��� "
 "忰悋�� 惷惡愀�悋 �惘悸 惓悋��悸 惺�惆 惠�悋� 悋�悋惠惶悋�."

-#: ../libpurple/protocols/oscar/oscar.c:4485
+#: ../libpurple/protocols/oscar/oscar.c:4545
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
@@ -9205,11 +9399,11 @@
 msgstr[4] "��惆 惠悴悋�慍 愀�� 悋��悋忰悸 悋�忰惆 悋�悖�惶� (%Id 惡悋�惠). ���惆 惡惠惘惠."
 msgstr[5] "��惆 惠悴悋�慍 愀�� 悋��悋忰悸 悋�忰惆 悋�悖�惶� (%Id 惡悋�惠). ���惆 惡惠惘惠."

-#: ../libpurple/protocols/oscar/oscar.c:4490
+#: ../libpurple/protocols/oscar/oscar.c:4550
 msgid "Profile too long."
 msgstr "悋��悋忰悸 愀���悸 悴惆�悋"

-#: ../libpurple/protocols/oscar/oscar.c:4534
+#: ../libpurple/protocols/oscar/oscar.c:4594
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -9224,32 +9418,32 @@
 msgstr[4] "��惆 惠悴悋�慍 愀�� 惘愕悋�悸 悋�愃�悋惡 悋�忰惆 悋�悖�惶� (%Id 惡悋�惠). ���惆 惡惠惘惠."
 msgstr[5] "��惆 惠悴悋�慍 愀�� 惘愕悋�悸 悋�愃�悋惡 悋�忰惆 悋�悖�惶� (%Id 惡悋�惠). ���惆 惡惠惘惠."

-#: ../libpurple/protocols/oscar/oscar.c:4539
+#: ../libpurple/protocols/oscar/oscar.c:4599
 msgid "Away message too long."
 msgstr "惘愕悋�悸 \"愃�悋惡\" 悖愀�� �� 悋��愕��忰."

-#: ../libpurple/protocols/oscar/oscar.c:4612
-#, c-format
-msgid ""
-"Could not add the buddy %s because the screen name is invalid.  Screen names "
-"must be a valid email address, or start with a letter and contain only "
-"letters, numbers and spaces, or contain only numbers."
-msgstr ""
-"惠惺悵�惘惠 悒惷悋�悸 悋�惶惆�� %s �悖� 悋愕� 悋�愆悋愆悸 愃�惘 惶悋�忰.  悖愕�悋悄 悋�愆悋愆悸 �悴惡 悖� 惠��� "
+#: ../libpurple/protocols/oscar/oscar.c:4672
+#, c-format
+msgid ""
+"Could not add the buddy %s because the username is invalid.  Usernames must "
+"be a valid email address, or start with a letter and contain only letters, "
+"numbers and spaces, or contain only numbers."
+msgstr ""
+"惠惺悵�惘惠 悒惷悋�悸 悋�惶惆�� %s �悖� 悋愕� 悋��愕惠悽惆� 愃�惘 惶悋�忰.  悖愕�悋悄 悋��愕惠悽惆��� �悴惡 悖� 惠��� "
 "惺�悋��� 惡惘�惆 愕���悸� 悖� 悖� 惠惡惆悖 惡忰惘� � 悖� 惠忰�� ��愀 悖忰惘�悋 � 悖惘�悋�悋 � �愕悋�悋惠� 悖� "
 "悖惘�悋�悋 ��愀."

-#: ../libpurple/protocols/oscar/oscar.c:4614
-#: ../libpurple/protocols/oscar/oscar.c:5067
-#: ../libpurple/protocols/oscar/oscar.c:5082
+#: ../libpurple/protocols/oscar/oscar.c:4674
+#: ../libpurple/protocols/oscar/oscar.c:5155
+#: ../libpurple/protocols/oscar/oscar.c:5170
 msgid "Unable To Add"
 msgstr "惠惺悵�惘惠 悋�悒惷悋�悸"

-#: ../libpurple/protocols/oscar/oscar.c:4733
+#: ../libpurple/protocols/oscar/oscar.c:4793
 msgid "Unable To Retrieve Buddy List"
 msgstr "惠惺悵�惘 悴�惡 �悋悧�悸 悋�悖惶惆�悋悄"

-#: ../libpurple/protocols/oscar/oscar.c:4734
+#: ../libpurple/protocols/oscar/oscar.c:4794
 msgid ""
 "The AIM servers were temporarily unable to send your buddy list.  Your buddy "
 "list is not lost, and will probably become available in a few minutes."
@@ -9257,15 +9451,15 @@
 "悽�悋惆�� AIM 愃�惘 �悋惆惘悸 �悗�惠�悋 惺�� 悒惘愕悋� �悋悧�悸 悖惶惆�悋悧�.  ��� �悋悧�悸 悖惶惆�悋悧� �� "
 "惠��惆 � �� 悋��惘悴忰 悖� 惠惶惡忰 �惠悋忰悸 �悴惆惆悋 �� 愃惷�� 惆�悋悧� ����悸."

-#: ../libpurple/protocols/oscar/oscar.c:4917
-#: ../libpurple/protocols/oscar/oscar.c:4919
-#: ../libpurple/protocols/oscar/oscar.c:5149
-#: ../libpurple/protocols/oscar/oscar.c:5150
-#: ../libpurple/protocols/oscar/oscar.c:5155
+#: ../libpurple/protocols/oscar/oscar.c:4996
+#: ../libpurple/protocols/oscar/oscar.c:4998
+#: ../libpurple/protocols/oscar/oscar.c:5237
+#: ../libpurple/protocols/oscar/oscar.c:5238
+#: ../libpurple/protocols/oscar/oscar.c:5243
 msgid "Orphans"
 msgstr "悖�惠悋�"

-#: ../libpurple/protocols/oscar/oscar.c:5065
+#: ../libpurple/protocols/oscar/oscar.c:5153
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -9274,39 +9468,39 @@
 "惠惺悵�惘惠 悒惷悋�悸 悋�惶惆�� %s �悖� �惆�� 悖惶惆�悋悄 悖�惓惘 �� 悋��愕��忰 惡� �� �悋悧�悸 悖惶惆�悋悧�. "
 "惡�愕惺� 悒慍悋�悸 惶惆�� 惓� 悋��忰悋��悸 �悴惆惆悋."

-#: ../libpurple/protocols/oscar/oscar.c:5065
-#: ../libpurple/protocols/oscar/oscar.c:5080
+#: ../libpurple/protocols/oscar/oscar.c:5153
+#: ../libpurple/protocols/oscar/oscar.c:5168
 msgid "(no name)"
 msgstr "(惡�悋 悋愕�)"

-#: ../libpurple/protocols/oscar/oscar.c:5079
+#: ../libpurple/protocols/oscar/oscar.c:5167
 #, c-format
 msgid "Could not add the buddy %s for an unknown reason."
 msgstr "惠惺悵�惘惠 悒惷悋�悸 悋�惶惆�� %s �愕惡惡 �悴���."

-#: ../libpurple/protocols/oscar/oscar.c:5213
+#: ../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?"
 msgstr "悋��愕惠悽惆� %s 愕�忰 �� 惡悒惷悋� ��愕� 悒�� �悋悧�悸 悖惶惆�悋悧�.  �� 惠惘�惆 悒惷悋�惠��"

-#: ../libpurple/protocols/oscar/oscar.c:5221
+#: ../libpurple/protocols/oscar/oscar.c:5309
 msgid "Authorization Given"
 msgstr "��忰 悋�惠惶惘�忰"

 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5294
+#: ../libpurple/protocols/oscar/oscar.c:5382
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "悋��愕惠悽惆� %s �悋�� 惺�� 愀�惡� 悒惷悋�惠� 悒�� �悋悧�悸 悖惶惆�悋悧�."

-#: ../libpurple/protocols/oscar/oscar.c:5295
+#: ../libpurple/protocols/oscar/oscar.c:5383
 msgid "Authorization Granted"
 msgstr "��忰 悋�惠惶惘�忰"

 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5298
+#: ../libpurple/protocols/oscar/oscar.c:5386
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -9316,110 +9510,110 @@
 "悋��愕惠悽惆� %s 惘�惷 愀�惡� 悒惷悋�惠� 悒�� �悋悧�悸 悖惶惆�悋悧� ��愕惡惡 悋�惠悋��:\n"
 "%s"

-#: ../libpurple/protocols/oscar/oscar.c:5299
+#: ../libpurple/protocols/oscar/oscar.c:5387
 msgid "Authorization Denied"
 msgstr "惘�惷 悋�惠惶惘�忰"

-#: ../libpurple/protocols/oscar/oscar.c:5335
+#: ../libpurple/protocols/oscar/oscar.c:5423
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "_惡悋惆�:"

-#: ../libpurple/protocols/oscar/oscar.c:5448
+#: ../libpurple/protocols/oscar/oscar.c:5536
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "惶�惘悸 惘愕悋�惠� 悋���惘�悸 �� 惠惘愕�. �悋 ����� 悒惘愕悋� 惶�惘 悋�惠惘悋愕� 悋���惘� �� 惆惘惆愆悋惠 AIM."

-#: ../libpurple/protocols/oscar/oscar.c:5610
-#: ../libpurple/protocols/oscar/oscar.c:5615
+#: ../libpurple/protocols/oscar/oscar.c:5698
+#: ../libpurple/protocols/oscar/oscar.c:5703
 msgid "Away Message"
 msgstr "惘愕悋�悸 \"悋�愃�悋惡\""

-#: ../libpurple/protocols/oscar/oscar.c:5615
+#: ../libpurple/protocols/oscar/oscar.c:5703
 msgid "<i>(retrieving)</i>"
 msgstr "<i>(���慍���)</i>"

-#: ../libpurple/protocols/oscar/oscar.c:5815
+#: ../libpurple/protocols/oscar/oscar.c:5903
 msgid "iTunes Music Store Link"
 msgstr "惘悋惡愀 悒�� �惠悴惘 ��愕��� iTunes"

-#: ../libpurple/protocols/oscar/oscar.c:5923
+#: ../libpurple/protocols/oscar/oscar.c:6011
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "惠惺��� 惶惆�� 悒�� %s"

-#: ../libpurple/protocols/oscar/oscar.c:5924
+#: ../libpurple/protocols/oscar/oscar.c:6012
 msgid "Buddy Comment:"
 msgstr "惠惺��� 悋�惶惆��:"

-#: ../libpurple/protocols/oscar/oscar.c:5971
+#: ../libpurple/protocols/oscar/oscar.c:6059
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "悋悽惠惘惠 �惠忰 悋惠惶悋� 惠惘悋愕� ��惘� �惡悋愆惘 �惺 %s."

-#: ../libpurple/protocols/oscar/oscar.c:5975
+#: ../libpurple/protocols/oscar/oscar.c:6063
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
 msgstr "�悖� �悵悋 ��愆� IP 悋�悽悋惶 惡�� ��惆 �惺惠惡惘 �悽悋愀惘悸 悖���悸.  �� 惠�惆 悋�悋愕惠�惘悋惘�"

-#: ../libpurple/protocols/oscar/oscar.c:5981
+#: ../libpurple/protocols/oscar/oscar.c:6069
 #: ../libpurple/protocols/oscar/peer.c:1047
 msgid "C_onnect"
 msgstr "悋_惠�惶�"

-#: ../libpurple/protocols/oscar/oscar.c:6016
+#: ../libpurple/protocols/oscar/oscar.c:6104
 msgid "Get AIM Info"
 msgstr "悋悴�惡 �惺���悋惠 AIM"

-#: ../libpurple/protocols/oscar/oscar.c:6022
+#: ../libpurple/protocols/oscar/oscar.c:6110
 msgid "Edit Buddy Comment"
 msgstr "忰惘��惘 惠惺��� 惶惆��"

-#: ../libpurple/protocols/oscar/oscar.c:6030
+#: ../libpurple/protocols/oscar/oscar.c:6118
 msgid "Get Status Msg"
 msgstr "悋悴�惡 惘愕悋�悸 悋�忰悋�悸"

-#: ../libpurple/protocols/oscar/oscar.c:6043
+#: ../libpurple/protocols/oscar/oscar.c:6131
 msgid "Direct IM"
 msgstr "惘愕悋�悸 ��惘�悸 �惡悋愆惘悸"

-#: ../libpurple/protocols/oscar/oscar.c:6065
+#: ../libpurple/protocols/oscar/oscar.c:6153
 msgid "Re-request Authorization"
 msgstr "悖惺�惆 愀�惡 悋�惠惶惘�忰"

-#: ../libpurple/protocols/oscar/oscar.c:6124
+#: ../libpurple/protocols/oscar/oscar.c:6212
 msgid "Require authorization"
 msgstr "悋愆惠惘愀 悋�惠惶惘�忰"

-#: ../libpurple/protocols/oscar/oscar.c:6127
+#: ../libpurple/protocols/oscar/oscar.c:6215
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "�惆惘�� ���惡 (惠�惺�� �悵悋 愕�悴惺�� 惠愕惠�惡� 惘愕悋悧� 悋�愕悽悋�)"

-#: ../libpurple/protocols/oscar/oscar.c:6132
+#: ../libpurple/protocols/oscar/oscar.c:6220
 msgid "ICQ Privacy Options"
 msgstr "悽�悋惘悋惠 悽惶�惶�悸 ICQ"

-#: ../libpurple/protocols/oscar/oscar.c:6151
+#: ../libpurple/protocols/oscar/oscar.c:6240
 msgid "The new formatting is invalid."
 msgstr "悋�惠�愕�� 悋�悴惆�惆 愃�惘 惶悋�忰."

-#: ../libpurple/protocols/oscar/oscar.c:6152
-msgid "Screen name formatting can change only capitalization and whitespace."
-msgstr "惠�愕�� 悋愕� 悋�愆悋愆悸 ����� ��愀 惠愃��惘 忰悋�悸 悋�忰惘� � 悋��愕悋�悸 悋�愆悋愃惘悸. "
-
-#: ../libpurple/protocols/oscar/oscar.c:6205
+#: ../libpurple/protocols/oscar/oscar.c:6241
+msgid "Username formatting can change only capitalization and whitespace."
+msgstr "惠�愕�� 悋愕� 悋��愕惠悽惆� ����� ��愀 惠愃��惘 忰悋�悸 悋�忰惘� � 悋��愕悋�悸 悋�愆悋愃惘悸. "
+
+#: ../libpurple/protocols/oscar/oscar.c:6294
 msgid "Change Address To:"
 msgstr "愃��惘 悋�惺��悋� 悒��:"

-#: ../libpurple/protocols/oscar/oscar.c:6251
+#: ../libpurple/protocols/oscar/oscar.c:6340
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>�愕惠 �� 悋�惠惴悋惘 惠惶惘�忰悋惠</i>"

-#: ../libpurple/protocols/oscar/oscar.c:6254
+#: ../libpurple/protocols/oscar/oscar.c:6343
 msgid "You are awaiting authorization from the following buddies"
 msgstr "悖�惠 �� 悋�惠惴悋惘 惠惶惘�忰 �� 悋�悖惶惆�悋悄 悋�惠悋���"

-#: ../libpurple/protocols/oscar/oscar.c:6255
+#: ../libpurple/protocols/oscar/oscar.c:6344
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -9427,73 +9621,65 @@
 "����� 悒惺悋惆悸 愀�惡 悋�惠惶惘�忰 �� �悗�悋悄 悋�悖惶惆�悋悄 惺� 愀惘�� 悋���惘 惡悋����� 惺���� � "
 "悋悽惠�悋惘 \"悖惺�惆 愀�惡 悋�惠惶惘�忰.\""

-#: ../libpurple/protocols/oscar/oscar.c:6272
+#: ../libpurple/protocols/oscar/oscar.c:6361
 msgid "Find Buddy by E-Mail"
 msgstr "悋惡忰惓 惺� 惶惆�� 惡悋�惡惘�惆"

-#: ../libpurple/protocols/oscar/oscar.c:6273
+#: ../libpurple/protocols/oscar/oscar.c:6362
 msgid "Search for a buddy by e-mail address"
 msgstr "悋惡忰惓 惺� 惶惆�� 惡�悋愕愀悸 惺��悋� 惡惘�惆� 悋�悒��惠惘���"

-#: ../libpurple/protocols/oscar/oscar.c:6274
+#: ../libpurple/protocols/oscar/oscar.c:6363
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "悖惆悽� 惺��悋� 悋�惡惘�惆 悋�悒��惠惘��� ��惶惆�� 悋�悵� 惠惡忰惓 惺��."

-#: ../libpurple/protocols/oscar/oscar.c:6277
+#: ../libpurple/protocols/oscar/oscar.c:6366
 msgid "_Search"
 msgstr "悋_惡忰惓"

-#: ../libpurple/protocols/oscar/oscar.c:6435
-msgid "Set User Info (URL)..."
-msgstr "惷惺 �惺���悋惠 悋��愕惠悽惆� (URL)..."
-
-#: ../libpurple/protocols/oscar/oscar.c:6446
-msgid "Change Password (URL)"
-msgstr "愃��惘 ���悸 悋�愕惘 (URL)"
-
-#: ../libpurple/protocols/oscar/oscar.c:6450
-msgid "Configure IM Forwarding (URL)"
-msgstr "悋惷惡愀 惠�惘�惘 悋�惠惘悋愕� 悋���惘�  (URL)"
+#: ../libpurple/protocols/oscar/oscar.c:6524
+msgid "Set User Info (web)..."
+msgstr "惷惺 �惺���悋惠 悋��愕惠悽惆� (��惡)..."
+
+#: ../libpurple/protocols/oscar/oscar.c:6535
+msgid "Change Password (web)"
+msgstr "愃��惘 ���悸 悋�愕惘 (��惡)"
+
+#: ../libpurple/protocols/oscar/oscar.c:6539
+msgid "Configure IM Forwarding (web)"
+msgstr "悋惷惡愀 惠�惘�惘 悋�惠惘悋愕� 悋���惘�  (��惡)"

 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6460
+#: ../libpurple/protocols/oscar/oscar.c:6549
 msgid "Set Privacy Options..."
 msgstr "忰惆惆 悽�悋惘悋惠 悋�悽惶�惶�悸..."

 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6467
+#: ../libpurple/protocols/oscar/oscar.c:6556
 msgid "Confirm Account"
 msgstr "悖��惆 悋�忰愕悋惡"

-#: ../libpurple/protocols/oscar/oscar.c:6471
+#: ../libpurple/protocols/oscar/oscar.c:6560
 msgid "Display Currently Registered E-Mail Address"
 msgstr "悋惺惘惷 惺�悋��� 悋�惡惘�惆 悋�悒��惠惘��� 悋��愕悴�悸 忰悋���悋"

-#: ../libpurple/protocols/oscar/oscar.c:6475
+#: ../libpurple/protocols/oscar/oscar.c:6564
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "愃��惘 惺�悋��� 悋�惡惘�惆 悋�悒��惠惘��� 悋��愕悴�悸 忰悋���悋..."

-#: ../libpurple/protocols/oscar/oscar.c:6482
+#: ../libpurple/protocols/oscar/oscar.c:6571
 msgid "Show Buddies Awaiting Authorization"
 msgstr "悋惺惘惷 悋�悖惶惆�悋悄 悋�悵�� ��惠惴惘�� 惠惶惘�忰悋惠"

-#: ../libpurple/protocols/oscar/oscar.c:6488
+#: ../libpurple/protocols/oscar/oscar.c:6577
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "悋惡忰惓 惺� 惶惆�� 惡�悋愕愀悸 惺��悋� 悋�惡惘�惆 悋�悒��惠惘���..."

-#: ../libpurple/protocols/oscar/oscar.c:6493
+#: ../libpurple/protocols/oscar/oscar.c:6582
 msgid "Search for Buddy by Information"
 msgstr "悋惡忰惓 惺� 惶惆�� 惡�悋愕愀悸 悋��惺���悋惠"

-#: ../libpurple/protocols/oscar/oscar.c:6561
-msgid "Use recent buddies group"
-msgstr "悋愕惠悽惆� �悴��惺悸 悋�悖惶惆�悋悄 悋�悖悽�惘悸"
-
-#: ../libpurple/protocols/oscar/oscar.c:6564
-msgid "Show how long you have been idle"
-msgstr "悋惺惘惷 悋��惆悸 悋�惠� ��惠 ���悋 愕悋��悋"
-
-#: ../libpurple/protocols/oscar/oscar.c:6719
+#: ../libpurple/protocols/oscar/oscar.c:6770
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -9709,7 +9895,7 @@
 msgstr "�悴� QQ 愃�惘 惶悋�忰"

 #: ../libpurple/protocols/qq/buddy_opt.c:208
-#: ../libpurple/protocols/qq/group_opt.c:111
+#: ../libpurple/protocols/qq/group_opt.c:112
 #, c-format
 msgid "You rejected %d's request"
 msgstr "惘�惷惠� 愀�惡 %Id"
@@ -9724,7 +9910,7 @@

 #. title
 #: ../libpurple/protocols/qq/buddy_opt.c:213
-#: ../libpurple/protocols/qq/group_opt.c:116
+#: ../libpurple/protocols/qq/group_opt.c:117
 msgid "Sorry, you are not my type..."
 msgstr "悛愕�� �愕惠 悋���惺 悋�悵� 悖�惷��..."

@@ -9763,7 +9949,7 @@
 #. hint
 #: ../libpurple/protocols/qq/buddy_opt.c:408
 #: ../libpurple/protocols/qq/group_join.c:138
-#: ../libpurple/protocols/qq/group_opt.c:118
+#: ../libpurple/protocols/qq/group_opt.c:119
 msgid "Send"
 msgstr "悖惘愕�"

@@ -9819,7 +10005,7 @@

 #: ../libpurple/protocols/qq/group_im.c:127
 #: ../libpurple/protocols/qq/group_im.c:181
-#: ../libpurple/protocols/qq/sys_msg.c:193
+#: ../libpurple/protocols/qq/sys_msg.c:196
 #, c-format
 msgid "Reason: %s"
 msgstr "悋�愕惡惡: %s"
@@ -9831,16 +10017,16 @@
 #: ../libpurple/protocols/qq/group_im.c:292
 #: ../libpurple/protocols/qq/group_join.c:233
 #: ../libpurple/protocols/qq/group_join.c:359
-#: ../libpurple/protocols/qq/group_opt.c:210
-#: ../libpurple/protocols/qq/group_opt.c:280
-#: ../libpurple/protocols/qq/group_opt.c:366
+#: ../libpurple/protocols/qq/group_opt.c:211
+#: ../libpurple/protocols/qq/group_opt.c:281
+#: ../libpurple/protocols/qq/group_opt.c:367
 msgid "QQ Qun Operation"
 msgstr "惺���悸 QQ Qun"

 #: ../libpurple/protocols/qq/group_im.c:141
-#: ../libpurple/protocols/qq/group_opt.c:103
-#: ../libpurple/protocols/qq/sys_msg.c:91
-#: ../libpurple/protocols/qq/sys_msg.c:248
+#: ../libpurple/protocols/qq/group_opt.c:104
+#: ../libpurple/protocols/qq/sys_msg.c:92
+#: ../libpurple/protocols/qq/sys_msg.c:251
 msgid "Approve"
 msgstr "�悋��"

@@ -9935,27 +10121,27 @@
 msgid "Do you want to approve the request?"
 msgstr "悖惠�悋�� 惺�� 悋�愀�惡�"

-#: ../libpurple/protocols/qq/group_opt.c:112
+#: ../libpurple/protocols/qq/group_opt.c:113
 msgid "Enter your reason:"
 msgstr "悖惆悽� 悋�愕惡惡:"

-#: ../libpurple/protocols/qq/group_opt.c:210
+#: ../libpurple/protocols/qq/group_opt.c:211
 msgid "You have successfully modified Qun member"
 msgstr "惺惆��惠� 惘�� Qun 惡�悴悋忰"

-#: ../libpurple/protocols/qq/group_opt.c:280
+#: ../libpurple/protocols/qq/group_opt.c:281
 msgid "You have successfully modified Qun information"
 msgstr "惺惆��惠� �惺���悋惠 Qun 惡�悴悋忰"

-#: ../libpurple/protocols/qq/group_opt.c:367
+#: ../libpurple/protocols/qq/group_opt.c:368
 msgid "You have successfully created a Qun"
 msgstr "悖�愆悖惠� Qun 惡�悴悋忰"

-#: ../libpurple/protocols/qq/group_opt.c:369
+#: ../libpurple/protocols/qq/group_opt.c:370
 msgid "Would you like to set up the Qun details now?"
 msgstr "�� 惠�惆 悒惆悽悋� 惡�悋�悋惠 Qun 悋�悛��"

-#: ../libpurple/protocols/qq/group_opt.c:373
+#: ../libpurple/protocols/qq/group_opt.c:374
 msgid "Setup"
 msgstr "悋�悒惺惆悋惆"

@@ -9975,15 +10161,19 @@
 msgid "Error requesting login token"
 msgstr "惺愀� �� 愀�惡 �惺悋�� 悋����悴"

-#: ../libpurple/protocols/qq/login_logout.c:489
-msgid "Unable to login, check debug log"
-msgstr "惠惺悵�惘 悋����悴� 悋�忰惶 愕悴� 悋�惺�悋惠"
+#: ../libpurple/protocols/qq/login_logout.c:490
+msgid "Unable to login. Check debug log."
+msgstr "惠惺悵�惘 悋����悴� 悋�忰惶 愕悴� 悋�惺�悋惠."
+
+#: ../libpurple/protocols/qq/login_logout.c:493
+msgid "Unable to login"
+msgstr "惠惺悵��惘 悋����悴"

 #. we didn't successfully connect. tdt->toc_fd is valid here
 #: ../libpurple/protocols/qq/qq.c: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:1193
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1194
 #: ../libpurple/protocols/yahoo/ycht.c:550
 msgid "Unable to connect."
 msgstr "惠惺悵�惘 悋�悋惠惶悋�."
@@ -10122,210 +10312,210 @@
 msgid "Login failed, no reply"
 msgstr "�愆� 悋����悴� �悋 惘惆"

-#: ../libpurple/protocols/qq/sys_msg.c:110
+#: ../libpurple/protocols/qq/sys_msg.c:111
 msgid "Do you want to add this buddy?"
 msgstr "悖惠惘�惆 悒惷悋�悸 �悵悋 悋�惶惆���"

 #. only need to get value
-#: ../libpurple/protocols/qq/sys_msg.c:166
+#: ../libpurple/protocols/qq/sys_msg.c:168
 #, c-format
 msgid "You have been added by %s"
 msgstr "悖惷悋���� %s"

-#: ../libpurple/protocols/qq/sys_msg.c:169
-#: ../libpurple/protocols/qq/sys_msg.c:263
+#: ../libpurple/protocols/qq/sys_msg.c:171
+#: ../libpurple/protocols/qq/sys_msg.c:266
 msgid "Would you like to add him?"
 msgstr "�� 惠�惆 悒惷悋�惠��"

-#: ../libpurple/protocols/qq/sys_msg.c:176
+#: ../libpurple/protocols/qq/sys_msg.c:179
 #, c-format
 msgid "%s has added you [%s] to his or her buddy list"
 msgstr "%s 悖惷悋�� [%s] 悒�� �悋悧�悸 悋�悖惶惆�悋悄."

-#: ../libpurple/protocols/qq/sys_msg.c:192
+#: ../libpurple/protocols/qq/sys_msg.c:195
 #, c-format
 msgid "User %s rejected your request"
 msgstr "惘�惷 悋��愕惠悽惆� %s 愀�惡�"

-#: ../libpurple/protocols/qq/sys_msg.c:212
+#: ../libpurple/protocols/qq/sys_msg.c:215
 #, c-format
 msgid "User %s approved your request"
 msgstr "�惡� 悋��愕惠悽惆� %s 愀�惡�"

 #. TODO: this should go through purple_account_request_authorization()
-#: ../libpurple/protocols/qq/sys_msg.c:238
+#: ../libpurple/protocols/qq/sys_msg.c:241
 #, c-format
 msgid "%s wants to add you [%s] as a friend"
 msgstr "%s �惘�惆 悒惷悋�惠� [%s] �惶惆��"

-#: ../libpurple/protocols/qq/sys_msg.c:239
+#: ../libpurple/protocols/qq/sys_msg.c:242
 #, c-format
 msgid "Message: %s"
 msgstr "惘愕悋�悸: %s"

-#: ../libpurple/protocols/qq/sys_msg.c:261
+#: ../libpurple/protocols/qq/sys_msg.c:264
 #, c-format
 msgid "%s is not in your buddy list"
 msgstr "%s ��愕 �� �悋悧�悸 悖惶惆�悋悧�"

-#: ../libpurple/protocols/sametime/sametime.c:419
+#: ../libpurple/protocols/sametime/sametime.c:420
 msgid "Connection closed (writing)"
 msgstr "悖�愃��� 悋�悋惠惶悋� (惠惆惘� 悋��惠悋惡悸)"

-#: ../libpurple/protocols/sametime/sametime.c:1292
+#: ../libpurple/protocols/sametime/sametime.c:1293
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>惺��悋� 悋��悴��惺悸:</b> %s<br>"

-#: ../libpurple/protocols/sametime/sametime.c:1293
+#: ../libpurple/protocols/sametime/sametime.c:1294
 #, c-format
 msgid "<b>Notes Group ID:</b> %s<br>"
 msgstr "<b>���悸 �悴��惺悸 悋���悋忰惴悋惠:</b> %s<br>"

-#: ../libpurple/protocols/sametime/sametime.c:1295
+#: ../libpurple/protocols/sametime/sametime.c:1296
 #, c-format
 msgid "Info for Group %s"
 msgstr "�惺���悋惠 ��悴��惺悸 %s"

-#: ../libpurple/protocols/sametime/sametime.c:1297
+#: ../libpurple/protocols/sametime/sametime.c:1298
 msgid "Notes Address Book Information"
 msgstr "�惺���悋惠 惆�惠惘 惺�悋��� 悋���悋忰惴悋惠"

-#: ../libpurple/protocols/sametime/sametime.c:1329
+#: ../libpurple/protocols/sametime/sametime.c:1330
 msgid "Invite Group to Conference..."
 msgstr "悋惆惺� �悴��惺悸 悒�� 悋悴惠�悋惺..."

-#: ../libpurple/protocols/sametime/sametime.c:1339
+#: ../libpurple/protocols/sametime/sametime.c:1340
 msgid "Get Notes Address Book Info"
 msgstr "悋忰惶� 惺�� �惺���悋惠 惆�惠惘 惺�悋��� 悋���悋忰惴悋惠"

-#: ../libpurple/protocols/sametime/sametime.c:1506
+#: ../libpurple/protocols/sametime/sametime.c:1507
 msgid "Sending Handshake"
 msgstr "�悴惘� 悒惘愕悋� 悋��惶悋�忰悸"

-#: ../libpurple/protocols/sametime/sametime.c:1511
+#: ../libpurple/protocols/sametime/sametime.c:1512
 msgid "Waiting for Handshake Acknowledgement"
 msgstr "�� 悋�惠惴悋惘 悒�惘悋惘 悋��惶悋�忰悸"

-#: ../libpurple/protocols/sametime/sametime.c:1516
+#: ../libpurple/protocols/sametime/sametime.c:1517
 msgid "Handshake Acknowledged, Sending Login"
 msgstr "悋��惶悋�忰悸 悖�惘惠� �悴惘� 悒惘愕悋� 悋����悴"

-#: ../libpurple/protocols/sametime/sametime.c:1521
+#: ../libpurple/protocols/sametime/sametime.c:1522
 msgid "Waiting for Login Acknowledgement"
 msgstr "�� 悋�惠惴悋惘 悒�惘悋惘 悋����悴"

-#: ../libpurple/protocols/sametime/sametime.c:1526
+#: ../libpurple/protocols/sametime/sametime.c:1527
 msgid "Login Redirected"
 msgstr "悖�惺��惆 惠�悴�� 悋����悴"

-#: ../libpurple/protocols/sametime/sametime.c:1532
+#: ../libpurple/protocols/sametime/sametime.c:1533
 msgid "Forcing Login"
 msgstr "�悴惘� 悒悴惡悋惘 悋����悴"

-#: ../libpurple/protocols/sametime/sametime.c:1536
+#: ../libpurple/protocols/sametime/sametime.c:1537
 msgid "Login Acknowledged"
 msgstr "悖��惘� 悋����悴"

-#: ../libpurple/protocols/sametime/sametime.c:1541
+#: ../libpurple/protocols/sametime/sametime.c:1542
 msgid "Starting Services"
 msgstr "�悴惘� 惡惆悄 悋�悽惆�悋惠"

-#: ../libpurple/protocols/sametime/sametime.c:1678
+#: ../libpurple/protocols/sametime/sametime.c:1679
 #, c-format
 msgid "A Sametime administrator has issued the following announcement on server %s"
 msgstr "�惷惺 �惆�惘 Sametime 悋�悒惺�悋� 悋�惠悋�� 惺�� 悋�悽悋惆�� %s"

-#: ../libpurple/protocols/sametime/sametime.c:1683
+#: ../libpurple/protocols/sametime/sametime.c:1684
 msgid "Sametime Administrator Announcement"
 msgstr "悒惺�悋� �� �惆�惘 Sametime"

-#: ../libpurple/protocols/sametime/sametime.c:1734
+#: ../libpurple/protocols/sametime/sametime.c:1737
 msgid "Connection reset"
 msgstr "惶����惘 悋�悋惠惶悋�"

-#: ../libpurple/protocols/sametime/sametime.c:1746
+#: ../libpurple/protocols/sametime/sametime.c:1749
 #, c-format
 msgid "Error reading from socket: %s"
 msgstr "惺愀� �� 悋��惘悋悄悸 �� 悋���惡愕: %s"

 #. this is a regular connect, error out
-#: ../libpurple/protocols/sametime/sametime.c:1771
-#: ../libpurple/protocols/sametime/sametime.c:3772
+#: ../libpurple/protocols/sametime/sametime.c:1774
+#: ../libpurple/protocols/sametime/sametime.c:3781
 msgid "Unable to connect to host"
 msgstr "惠惺悵�惘 悋�悋惠惶悋� 惡悋�悽悋惆��"

-#: ../libpurple/protocols/sametime/sametime.c:1812
+#: ../libpurple/protocols/sametime/sametime.c:1815
 #, c-format
 msgid "Announcement from %s"
 msgstr "悒惺�悋� �� %s"

-#: ../libpurple/protocols/sametime/sametime.c:1986
+#: ../libpurple/protocols/sametime/sametime.c:1989
 msgid "Conference Closed"
 msgstr "��惷�� 悋�悋悴惠�悋惺"

-#: ../libpurple/protocols/sametime/sametime.c:2445
+#: ../libpurple/protocols/sametime/sametime.c:2454
 msgid "Unable to send message: "
 msgstr "惠惺悵�惘 悒惘愕悋� 悋�惘愕悋�悸: "

-#: ../libpurple/protocols/sametime/sametime.c:3001
+#: ../libpurple/protocols/sametime/sametime.c:3010
 msgid "Place Closed"
 msgstr "悖�愃��� 悋���悋�"

-#: ../libpurple/protocols/sametime/sametime.c:3271
+#: ../libpurple/protocols/sametime/sametime.c:3280
 msgid "Microphone"
 msgstr "���惘����"

-#: ../libpurple/protocols/sametime/sametime.c:3272
+#: ../libpurple/protocols/sametime/sametime.c:3281
 msgid "Speakers"
 msgstr "愕�悋惺悋惠"

-#: ../libpurple/protocols/sametime/sametime.c:3273
+#: ../libpurple/protocols/sametime/sametime.c:3282
 msgid "Video Camera"
 msgstr "�悋��惘悋 ��惆��"

-#: ../libpurple/protocols/sametime/sametime.c:3311
-#: ../libpurple/protocols/sametime/sametime.c:4191
+#: ../libpurple/protocols/sametime/sametime.c:3320
+#: ../libpurple/protocols/sametime/sametime.c:4200
 msgid "Supports"
 msgstr "悋�惆惺�"

-#: ../libpurple/protocols/sametime/sametime.c:3316
-#: ../libpurple/protocols/sametime/sametime.c:4165
+#: ../libpurple/protocols/sametime/sametime.c:3325
+#: ../libpurple/protocols/sametime/sametime.c:4174
 msgid "External User"
 msgstr "�愕惠悽惆� 悽悋惘悴�"

-#: ../libpurple/protocols/sametime/sametime.c:3422
+#: ../libpurple/protocols/sametime/sametime.c:3431
 msgid "Create conference with user"
 msgstr "悖�� 悋悴惠�悋惺悋 �惺 悋��愕惠悽惆�"

-#: ../libpurple/protocols/sametime/sametime.c:3423
+#: ../libpurple/protocols/sametime/sametime.c:3432
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
 "sent to %s"
 msgstr "�� �惷�� 悖惆悽� ��惷�惺 悋�悋悴惠�悋惺 悋�悴惆�惆� � 惘愕悋�悸 惆惺�悸 �悒惘愕悋��悋 悒�� %s"

-#: ../libpurple/protocols/sametime/sametime.c:3427
+#: ../libpurple/protocols/sametime/sametime.c:3436
 msgid "New Conference"
 msgstr "悋悴惠�悋惺 悴惆�惆"

-#: ../libpurple/protocols/sametime/sametime.c:3429
+#: ../libpurple/protocols/sametime/sametime.c:3438
 msgid "Create"
 msgstr "悖�愆悧"

-#: ../libpurple/protocols/sametime/sametime.c:3494
+#: ../libpurple/protocols/sametime/sametime.c:3503
 msgid "Available Conferences"
 msgstr "悋�悋悴惠�悋惺悋惠 悋��惠悋忰悸"

-#: ../libpurple/protocols/sametime/sametime.c:3500
+#: ../libpurple/protocols/sametime/sametime.c:3509
 msgid "Create New Conference..."
 msgstr "悖�愆悧 悋悴惠�悋惺悋 悴惆�惆悋..."

-#: ../libpurple/protocols/sametime/sametime.c:3507
+#: ../libpurple/protocols/sametime/sametime.c:3516
 msgid "Invite user to a conference"
 msgstr "悋惆惺 悋��愕惠悽惆� 悒�� 悋悴惠�悋惺"

-#: ../libpurple/protocols/sametime/sametime.c:3508
+#: ../libpurple/protocols/sametime/sametime.c:3517
 #, c-format
 msgid ""
 "Select a conference from the list below to send an invite to user %s. Select "
@@ -10335,27 +10525,27 @@
 "悋悽惠惘 悋悴惠�悋惺悋 �� 悋��悋悧�悸 悖惆�悋� �悒惘愕悋� 惆惺�悸 悒��� 悒�� 悋��愕惠悽惆� %s. 悋悽惠惘 \"悖�愆悧 "
 "悋悴惠�悋惺悋 悴惆�惆悋\" 悒� ��惠 惠惘�惆 悒�愆悋悄 悋悴惠�悋惺 悴惆�惆 �惠惆惺� �悵悋 悋��愕惠悽惆� 悒���."

-#: ../libpurple/protocols/sametime/sametime.c:3513
+#: ../libpurple/protocols/sametime/sametime.c:3522
 msgid "Invite to Conference"
 msgstr "悋惆惺� 悒�� 悋�悋悴惠�悋惺"

-#: ../libpurple/protocols/sametime/sametime.c:3604
+#: ../libpurple/protocols/sametime/sametime.c:3613
 msgid "Invite to Conference..."
 msgstr "悋惆惺� 悒�� 悋悴惠�悋惺..."

-#: ../libpurple/protocols/sametime/sametime.c:3609
+#: ../libpurple/protocols/sametime/sametime.c:3618
 msgid "Send TEST Announcement"
 msgstr "悖惘愕� 悒惺�悋� TEST"

-#: ../libpurple/protocols/sametime/sametime.c:3628 ../pidgin/gtkconv.c:4411
+#: ../libpurple/protocols/sametime/sametime.c:3637 ../pidgin/gtkconv.c:4420
 msgid "Topic:"
 msgstr "悋���惷�惺:"

-#: ../libpurple/protocols/sametime/sametime.c:3656
+#: ../libpurple/protocols/sametime/sametime.c:3665
 msgid "No Sametime Community Server specified"
 msgstr "�� ��忰惆惆 悖� 悽悋惆�� �悴惠�惺 Sametime"

-#: ../libpurple/protocols/sametime/sametime.c:3681
+#: ../libpurple/protocols/sametime/sametime.c:3690
 #, c-format
 msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
@@ -10364,42 +10554,42 @@
 "�� ��惺惆 悖� ��惷�� 悖� 惺��悋� IP �忰愕悋惡 Meanwhile %s. �� �惷�� 悖惆悽� �悋忰惆悋 悖惆�悋� "
 "��惠悋惡惺悸 悋����悴."

-#: ../libpurple/protocols/sametime/sametime.c:3686
+#: ../libpurple/protocols/sametime/sametime.c:3695
 msgid "Meanwhile Connection Setup"
 msgstr "悒惺惆悋惆 悋惠惶悋� Meanwhile"

-#: ../libpurple/protocols/sametime/sametime.c:3687
+#: ../libpurple/protocols/sametime/sametime.c:3696
 msgid "No Sametime Community Server Specified"
 msgstr "�� ��忰惆惆 悖� 悽悋惆�� �悴惠�惺 Sametime"

-#: ../libpurple/protocols/sametime/sametime.c:3689
+#: ../libpurple/protocols/sametime/sametime.c:3698
 msgid "Connect"
 msgstr "悋惠惶�"

-#: ../libpurple/protocols/sametime/sametime.c:4181
+#: ../libpurple/protocols/sametime/sametime.c:4190
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "�悴��� (0x%04x)<br>"

-#: ../libpurple/protocols/sametime/sametime.c:4183
+#: ../libpurple/protocols/sametime/sametime.c:4192
 msgid "Last Known Client"
 msgstr "悛悽惘 惺��� �惺惘��"

-#: ../libpurple/protocols/sametime/sametime.c:4347
-#: ../libpurple/protocols/sametime/sametime.c:5552
+#: ../libpurple/protocols/sametime/sametime.c:4356
+#: ../libpurple/protocols/sametime/sametime.c:5561
 msgid "User Name"
 msgstr "悋愕� 悋��愕惠悽惆�"

-#: ../libpurple/protocols/sametime/sametime.c:4350
-#: ../libpurple/protocols/sametime/sametime.c:5555
+#: ../libpurple/protocols/sametime/sametime.c:4359
+#: ../libpurple/protocols/sametime/sametime.c:5564
 msgid "Sametime ID"
 msgstr "����悸 Sametime"

-#: ../libpurple/protocols/sametime/sametime.c:4374
+#: ../libpurple/protocols/sametime/sametime.c:4383
 msgid "An ambiguous user ID was entered"
 msgstr "悖�惆悽�惠 ���悸 �愕惠悽惆� 愃悋�惷悸"

-#: ../libpurple/protocols/sametime/sametime.c:4375
+#: ../libpurple/protocols/sametime/sametime.c:4384
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
@@ -10408,15 +10598,15 @@
 "悋��惺惘� '%s' �惆 �愆�惘 悒�� 悖� �� 悋��愕惠悽惆��� 悋�惠悋���. �� �惷�� 悋悽惠惘 悋��愕惠悽惆� "
 "悋�惶忰�忰 �� 悋��悋悧�悸 悖惆�悋� �悒惷悋�惠� 悒�� �悋悧�悸 悖惶惆�悋悧�."

-#: ../libpurple/protocols/sametime/sametime.c:4380
+#: ../libpurple/protocols/sametime/sametime.c:4389
 msgid "Select User"
 msgstr "悋悽惠惘 悋��愕惠悽惆�"

-#: ../libpurple/protocols/sametime/sametime.c:4464
+#: ../libpurple/protocols/sametime/sametime.c:4473
 msgid "Unable to add user: user not found"
 msgstr "惠惺悵�惘惠 悒惷悋�悸 �愕惠悽惆�: 悋��愕惠悽惆� 愃�惘 ��悴�惆"

-#: ../libpurple/protocols/sametime/sametime.c:4466
+#: ../libpurple/protocols/sametime/sametime.c:4475
 #, c-format
 msgid ""
 "The identifier '%s' did not match any users in your Sametime community. This "
@@ -10425,7 +10615,7 @@
 "�� �愀悋惡� 悋��惺惘� '%s' 悖� �愕惠悽惆� �� �悴惠�惺� �� Sametime. 忰悵�� �悵悋 悋�惺�惶惘 �� "
 "�悋悧�悸 悖惶惆�悋悧�."

-#: ../libpurple/protocols/sametime/sametime.c:5057
+#: ../libpurple/protocols/sametime/sametime.c:5066
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -10434,63 +10624,63 @@
 "惺愀� �� �惘悋悄悸 ��� %s: \n"
 "%s\n"

-#: ../libpurple/protocols/sametime/sametime.c:5192
+#: ../libpurple/protocols/sametime/sametime.c:5201
 msgid "Remotely Stored Buddy List"
 msgstr "�悋悧�悸 悖惶惆�悋悄 �忰��惴悸 惡惺�惆悋"

-#: ../libpurple/protocols/sametime/sametime.c:5197
+#: ../libpurple/protocols/sametime/sametime.c:5206
 msgid "Buddy List Storage Mode"
 msgstr "愀�惘 忰�惴 �悋悧�悸 悋�悖惶惆�悋悄"

-#: ../libpurple/protocols/sametime/sametime.c:5200
+#: ../libpurple/protocols/sametime/sametime.c:5209
 msgid "Local Buddy List Only"
 msgstr "�悋悧�悸 悖惶惆�悋悄 �忰��悸 ��愀"

-#: ../libpurple/protocols/sametime/sametime.c:5202
+#: ../libpurple/protocols/sametime/sametime.c:5211
 msgid "Merge List from Server"
 msgstr "悋惆�悴 悋��悋悧�悸 �� 悋�悽悋惆��"

-#: ../libpurple/protocols/sametime/sametime.c:5204
+#: ../libpurple/protocols/sametime/sametime.c:5213
 msgid "Merge and Save List to Server"
 msgstr "悋惆�悴 � 悋忰�惴 悋��悋悧�悸 悒�� 悋�悽悋惆��"

-#: ../libpurple/protocols/sametime/sametime.c:5206
+#: ../libpurple/protocols/sametime/sametime.c:5215
 msgid "Synchronize List with Server"
 msgstr "慍悋��� 悋��悋悧�悸 �惺 悋�悽悋惆��"

-#: ../libpurple/protocols/sametime/sametime.c:5261
+#: ../libpurple/protocols/sametime/sametime.c:5270
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "悋愕惠�惘惆 �悋悧�悸 Sametime ��忰愕悋惡 %s"

-#: ../libpurple/protocols/sametime/sametime.c:5301
+#: ../libpurple/protocols/sametime/sametime.c:5310
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "惶惆�惘 �悋悧�悸 Sametime ��忰愕悋惡 %s"

-#: ../libpurple/protocols/sametime/sametime.c:5355
+#: ../libpurple/protocols/sametime/sametime.c:5364
 msgid "Unable to add group: group exists"
 msgstr "惠惺悵�惘惠 悒惷悋�悸 �悴��惺悸: 悋��悴��惺悸 ��悴�惆悸 �愕惡��悋"

-#: ../libpurple/protocols/sametime/sametime.c:5356
+#: ../libpurple/protocols/sametime/sametime.c:5365
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "惠�悴惆 �悴��惺悸 惡悋愕� '%s' �愕惡��悋 �� �悋悧�悸 悖惶惆�悋悧�."

-#: ../libpurple/protocols/sametime/sametime.c:5359
-#: ../libpurple/protocols/sametime/sametime.c:5489
+#: ../libpurple/protocols/sametime/sametime.c:5368
+#: ../libpurple/protocols/sametime/sametime.c:5498
 msgid "Unable to add group"
 msgstr "惠惺悵�惘惠 悒惷悋�悸 �悴��惺悸"

-#: ../libpurple/protocols/sametime/sametime.c:5418
+#: ../libpurple/protocols/sametime/sametime.c:5427
 msgid "Possible Matches"
 msgstr "惠愀悋惡�悋惠 �忰惠��悸"

-#: ../libpurple/protocols/sametime/sametime.c:5434
+#: ../libpurple/protocols/sametime/sametime.c:5443
 msgid "Notes Address Book group results"
 msgstr "�惠悋悧悴 �悴��惺悸 惆�惠惘 惺�悋��� 悋���悋忰惴悋惠"

-#: ../libpurple/protocols/sametime/sametime.c:5435
+#: ../libpurple/protocols/sametime/sametime.c:5444
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -10500,26 +10690,26 @@
 "悋��惺惘� '%s' �惆 �愆�惘 悒�� 悖� �� �悴��惺悋惠 惆�惠惘 惺�悋��� 悋���悋忰惴悋惠 悋�惠悋��悸. �� �惷�� "
 "悋悽惠惘 悋��悴��惺悸 悋�惶忰�忰悸 �� 悋��悋悧�悸 悖惆�悋� �悒惷悋�惠�悋 悒�� �悋悧�悸 悖惶惆�悋悧�."

-#: ../libpurple/protocols/sametime/sametime.c:5440
+#: ../libpurple/protocols/sametime/sametime.c:5449
 msgid "Select Notes Address Book"
 msgstr "悋悽惠惘 惆�惠惘 惺�悋��� 悋���悋忰惴悋惠"

-#: ../libpurple/protocols/sametime/sametime.c:5483
+#: ../libpurple/protocols/sametime/sametime.c:5492
 msgid "Unable to add group: group not found"
 msgstr "惠惺悵�惘惠 悒惷悋�悸 �悴��惺悸: 悋��悴��惺悸 愃�惘 ��悴�惆悸"

-#: ../libpurple/protocols/sametime/sametime.c:5485
+#: ../libpurple/protocols/sametime/sametime.c:5494
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
 "Sametime community."
 msgstr "�� �愀悋惡� 悋��惺惘� '%s' 悖� �悴��惺悸 惆�惠惘 惺�悋��� ��悋忰惴悋惠 �� �悴惠�惺� �� Sametime."

-#: ../libpurple/protocols/sametime/sametime.c:5526
+#: ../libpurple/protocols/sametime/sametime.c:5535
 msgid "Notes Address Book Group"
 msgstr "�悴��惺悸 惆�惠惘 惺�悋��� 悋���悋忰惴悋惠"

-#: ../libpurple/protocols/sametime/sametime.c:5527
+#: ../libpurple/protocols/sametime/sametime.c:5536
 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."
@@ -10527,12 +10717,12 @@
 "悖惆悽� 悋愕� �悴��惺悸 惆�惠惘 惺�悋��� 悋���悋忰惴悋惠 �� 悋�忰�� 悖惆�悋� �悒惷悋�悸 悋��悴��惺悸 "
 "�悖惺惷悋悧�悋 悒�� �悋悧�悸 悖惶惆�悋悧�."

-#: ../libpurple/protocols/sametime/sametime.c:5576
+#: ../libpurple/protocols/sametime/sametime.c:5585
 #, c-format
 msgid "Search results for '%s'"
 msgstr "�惠悋悧悴 悋�惡忰惓 惺� '%s'"

-#: ../libpurple/protocols/sametime/sametime.c:5577
+#: ../libpurple/protocols/sametime/sametime.c:5586
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -10542,28 +10732,28 @@
 "悋��惺惘� '%s' �惆 �愆�惘 悒�� 悖� �� 悋�悖惶惆�悋悄 悋�惠悋���. ����� 悒惷悋�悸 �悗�悋悄 悋��愕惠悽惆��� "
 "悒�� �悋悧�悸 悖惶惆�悋悧� 悖� 悒惘愕悋� 惘愕悋悧� 悒���� 惡�悋愕愀悸 悖慍惘悋惘 悋�悒悴惘悋悄悋惠 悖惆�悋�."

-#: ../libpurple/protocols/sametime/sametime.c:5584 ../pidgin/gtknotify.c:769
+#: ../libpurple/protocols/sametime/sametime.c:5593 ../pidgin/gtknotify.c:770
 msgid "Search Results"
 msgstr "�惠悋悧悴 悋�惡忰惓"

-#: ../libpurple/protocols/sametime/sametime.c:5609
+#: ../libpurple/protocols/sametime/sametime.c:5618
 msgid "No matches"
 msgstr "�悋 惠愀悋惡�"

-#: ../libpurple/protocols/sametime/sametime.c:5610
+#: ../libpurple/protocols/sametime/sametime.c:5619
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr "�悋 �愀悋惡� 悋��惺惘� '%s' 悖� �愕惠悽惆� �� �悴惠�惺� �� Sametime."

-#: ../libpurple/protocols/sametime/sametime.c:5614
+#: ../libpurple/protocols/sametime/sametime.c:5623
 msgid "No Matches"
 msgstr "�悋 惠愀悋惡�"

-#: ../libpurple/protocols/sametime/sametime.c:5651
+#: ../libpurple/protocols/sametime/sametime.c:5660
 msgid "Search for a user"
 msgstr "悋惡忰惓 惺� �愕惠悽惆�"

-#: ../libpurple/protocols/sametime/sametime.c:5652
+#: ../libpurple/protocols/sametime/sametime.c:5661
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
@@ -10571,32 +10761,32 @@
 "悖惆悽� 悋愕�悋 悖� 悴慍悄悋 �� �惺惘�� �� 悋�忰�� 悖惆�悋� �惠惡忰惓 惺� �愕惠悽惆��� �愀悋惡��� �� �悴惠�惺� "
 "�� Sametime."

-#: ../libpurple/protocols/sametime/sametime.c:5655
+#: ../libpurple/protocols/sametime/sametime.c:5664
 msgid "User Search"
 msgstr "惡忰惓 悋��愕惠悽惆�"

-#: ../libpurple/protocols/sametime/sametime.c:5668
+#: ../libpurple/protocols/sametime/sametime.c:5677
 msgid "Import Sametime List..."
 msgstr "悋愕惠�惘惆 �悋悧�悸 Sametime..."

-#: ../libpurple/protocols/sametime/sametime.c:5672
+#: ../libpurple/protocols/sametime/sametime.c:5681
 msgid "Export Sametime List..."
 msgstr "惶惆�惘 �悋悧�悸 Sametime..."

-#: ../libpurple/protocols/sametime/sametime.c:5676
+#: ../libpurple/protocols/sametime/sametime.c:5685
 msgid "Add Notes Address Book Group..."
 msgstr "悖惷�� �悴��惺悸 惆�惠惘 惺�悋��� ��悋忰惴悋惠..."

-#: ../libpurple/protocols/sametime/sametime.c:5680
+#: ../libpurple/protocols/sametime/sametime.c:5689
 msgid "User Search..."
 msgstr "惡忰惓 悋��愕惠悽惆���..."

-#: ../libpurple/protocols/sametime/sametime.c:5786
+#: ../libpurple/protocols/sametime/sametime.c:5795
 msgid "Force login (ignore server redirects)"
 msgstr "悖悴惡惘 悋����悴 (惠悴悋�� 悒惺悋惆悸 悋�惠�悴�� �� 悋�悽悋惆��)"

 #. pretend to be Sametime Connect
-#: ../libpurple/protocols/sametime/sametime.c:5796
+#: ../libpurple/protocols/sametime/sametime.c:5805
 msgid "Hide client identity"
 msgstr "悋悽�� ���悸 悋�惺���"

@@ -10725,8 +10915,8 @@
 #: ../libpurple/protocols/silc/buddy.c:496
 #: ../libpurple/protocols/silc/buddy.c:507
 #: ../libpurple/protocols/silc/buddy.c:540
-#: ../libpurple/protocols/silc/ops.c:1503
-#: ../libpurple/protocols/silc/ops.c:1514
+#: ../libpurple/protocols/silc/ops.c:1518
+#: ../libpurple/protocols/silc/ops.c:1529
 #: ../libpurple/protocols/silc10/buddy.c:513
 #: ../libpurple/protocols/silc10/buddy.c:548
 #: ../libpurple/protocols/silc10/ops.c:1494
@@ -10735,8 +10925,8 @@
 msgstr "悋悴�惡 悋���惠悋忰 悋�惺���"

 #: ../libpurple/protocols/silc/buddy.c:541
-#: ../libpurple/protocols/silc/ops.c:1504
-#: ../libpurple/protocols/silc/ops.c:1515
+#: ../libpurple/protocols/silc/ops.c:1519
+#: ../libpurple/protocols/silc/ops.c:1530
 #: ../libpurple/protocols/silc10/buddy.c:549
 #: ../libpurple/protocols/silc10/ops.c:1495
 #: ../libpurple/protocols/silc10/ops.c:1506
@@ -10760,11 +10950,11 @@
 msgstr "惠惺悵�惘 惠忰��� 悋���惠悋忰 悋�惺���"

 #: ../libpurple/protocols/silc/buddy.c:701
-#: ../libpurple/protocols/silc/ops.c:1053
-#: ../libpurple/protocols/silc/ops.c:1168
-#: ../libpurple/protocols/silc/ops.c:1290
-#: ../libpurple/protocols/silc/ops.c:1291
-#: ../libpurple/protocols/silc/ops.c:1309
+#: ../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/silc10/buddy.c:713
 #: ../libpurple/protocols/silc10/ops.c:1087
 #: ../libpurple/protocols/silc10/ops.c:1159
@@ -10775,8 +10965,8 @@
 msgstr "�惺���悋惠 悋��愕惠悽惆�"

 #: ../libpurple/protocols/silc/buddy.c:702
-#: ../libpurple/protocols/silc/ops.c:1169
-#: ../libpurple/protocols/silc/ops.c:1310
+#: ../libpurple/protocols/silc/ops.c:1184
+#: ../libpurple/protocols/silc/ops.c:1325
 #: ../libpurple/protocols/silc10/buddy.c:714
 #: ../libpurple/protocols/silc10/ops.c:1160
 #: ../libpurple/protocols/silc10/ops.c:1314
@@ -10880,140 +11070,140 @@

 #: ../libpurple/protocols/silc/buddy.c:1496
 #: ../libpurple/protocols/silc/silc.c:886
-#: ../libpurple/protocols/silc/util.c:522
+#: ../libpurple/protocols/silc/util.c:525
 #: ../libpurple/protocols/silc10/buddy.c:1496
-#: ../libpurple/protocols/silc10/silc.c:654
-#: ../libpurple/protocols/silc10/util.c:512
+#: ../libpurple/protocols/silc10/silc.c:660
+#: ../libpurple/protocols/silc10/util.c:515
 msgid "Happy"
 msgstr "愕惺�惆"

 #: ../libpurple/protocols/silc/buddy.c:1498
 #: ../libpurple/protocols/silc/silc.c:888
-#: ../libpurple/protocols/silc/util.c:524
+#: ../libpurple/protocols/silc/util.c:527
 #: ../libpurple/protocols/silc10/buddy.c:1498
-#: ../libpurple/protocols/silc10/silc.c:656
-#: ../libpurple/protocols/silc10/util.c:514
+#: ../libpurple/protocols/silc10/silc.c:662
+#: ../libpurple/protocols/silc10/util.c:517
 msgid "Sad"
 msgstr "忰慍��"

 #: ../libpurple/protocols/silc/buddy.c:1500
 #: ../libpurple/protocols/silc/silc.c:890
-#: ../libpurple/protocols/silc/util.c:526
+#: ../libpurple/protocols/silc/util.c:529
 #: ../libpurple/protocols/silc10/buddy.c:1500
-#: ../libpurple/protocols/silc10/silc.c:658
-#: ../libpurple/protocols/silc10/util.c:516
+#: ../libpurple/protocols/silc10/silc.c:664
+#: ../libpurple/protocols/silc10/util.c:519
 msgid "Angry"
 msgstr "愃悋惷惡"

 #: ../libpurple/protocols/silc/buddy.c:1502
 #: ../libpurple/protocols/silc/silc.c:892
-#: ../libpurple/protocols/silc/util.c:528
+#: ../libpurple/protocols/silc/util.c:531
 #: ../libpurple/protocols/silc10/buddy.c:1502
-#: ../libpurple/protocols/silc10/silc.c:660
-#: ../libpurple/protocols/silc10/util.c:518
+#: ../libpurple/protocols/silc10/silc.c:666
+#: ../libpurple/protocols/silc10/util.c:521
 msgid "Jealous"
 msgstr "愃��惘"

 #: ../libpurple/protocols/silc/buddy.c:1504
 #: ../libpurple/protocols/silc/silc.c:894
-#: ../libpurple/protocols/silc/util.c:530
+#: ../libpurple/protocols/silc/util.c:533
 #: ../libpurple/protocols/silc10/buddy.c:1504
-#: ../libpurple/protocols/silc10/silc.c:662
-#: ../libpurple/protocols/silc10/util.c:520
+#: ../libpurple/protocols/silc10/silc.c:668
+#: ../libpurple/protocols/silc10/util.c:523
 msgid "Ashamed"
 msgstr "�悽慍�"

 #: ../libpurple/protocols/silc/buddy.c:1506
 #: ../libpurple/protocols/silc/silc.c:896
-#: ../libpurple/protocols/silc/util.c:532
+#: ../libpurple/protocols/silc/util.c:535
 #: ../libpurple/protocols/silc10/buddy.c:1506
-#: ../libpurple/protocols/silc10/silc.c:664
-#: ../libpurple/protocols/silc10/util.c:522
+#: ../libpurple/protocols/silc10/silc.c:670
+#: ../libpurple/protocols/silc10/util.c:525
 msgid "Invincible"
 msgstr "���惺"

 #: ../libpurple/protocols/silc/buddy.c:1508
-#: ../libpurple/protocols/silc/util.c:534
+#: ../libpurple/protocols/silc/util.c:537
 #: ../libpurple/protocols/silc10/buddy.c:1508
-#: ../libpurple/protocols/silc10/util.c:524
+#: ../libpurple/protocols/silc10/util.c:527
 msgid "In Love"
 msgstr "�悋�惺 �� 悋�忰惡"

 #: ../libpurple/protocols/silc/buddy.c:1510
 #: ../libpurple/protocols/silc/silc.c:900
-#: ../libpurple/protocols/silc/util.c:536
+#: ../libpurple/protocols/silc/util.c:539
 #: ../libpurple/protocols/silc10/buddy.c:1510
-#: ../libpurple/protocols/silc10/silc.c:668
-#: ../libpurple/protocols/silc10/util.c:526
+#: ../libpurple/protocols/silc10/silc.c:674
+#: ../libpurple/protocols/silc10/util.c:529
 msgid "Sleepy"
 msgstr "�惺愕悋�"

 #: ../libpurple/protocols/silc/buddy.c:1512
 #: ../libpurple/protocols/silc/silc.c:902
-#: ../libpurple/protocols/silc/util.c:538
+#: ../libpurple/protocols/silc/util.c:541
 #: ../libpurple/protocols/silc10/buddy.c:1512
-#: ../libpurple/protocols/silc10/silc.c:670
-#: ../libpurple/protocols/silc10/util.c:528
+#: ../libpurple/protocols/silc10/silc.c:676
+#: ../libpurple/protocols/silc10/util.c:531
 msgid "Bored"
 msgstr "���悋�"

 #: ../libpurple/protocols/silc/buddy.c:1514
 #: ../libpurple/protocols/silc/silc.c:904
-#: ../libpurple/protocols/silc/util.c:540
+#: ../libpurple/protocols/silc/util.c:543
 #: ../libpurple/protocols/silc10/buddy.c:1514
-#: ../libpurple/protocols/silc10/silc.c:672
-#: ../libpurple/protocols/silc10/util.c:530
+#: ../libpurple/protocols/silc10/silc.c:678
+#: ../libpurple/protocols/silc10/util.c:533
 msgid "Excited"
 msgstr "�惠忰��愕"

 #: ../libpurple/protocols/silc/buddy.c:1516
 #: ../libpurple/protocols/silc/silc.c:906
-#: ../libpurple/protocols/silc/util.c:542
+#: ../libpurple/protocols/silc/util.c:545
 #: ../libpurple/protocols/silc10/buddy.c:1516
-#: ../libpurple/protocols/silc10/silc.c:674
-#: ../libpurple/protocols/silc10/util.c:532
+#: ../libpurple/protocols/silc10/silc.c:680
+#: ../libpurple/protocols/silc10/util.c:535
 msgid "Anxious"
 msgstr "���"

 #: ../libpurple/protocols/silc/buddy.c:1548
-#: ../libpurple/protocols/silc/ops.c:1207
+#: ../libpurple/protocols/silc/ops.c:1222
 #: ../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:1224
+#: ../libpurple/protocols/silc/ops.c:1239
 #: ../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:1229
+#: ../libpurple/protocols/silc/ops.c:1244
 #: ../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:1234
+#: ../libpurple/protocols/silc/ops.c:1249
 #: ../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:1239
+#: ../libpurple/protocols/silc/ops.c:1254
 #: ../libpurple/protocols/silc10/buddy.c:1580
 #: ../libpurple/protocols/silc10/ops.c:1234
-#: ../libpurple/protocols/silc10/silc.c:722
-#: ../libpurple/protocols/silc10/silc.c:724
+#: ../libpurple/protocols/silc10/silc.c:728
+#: ../libpurple/protocols/silc10/silc.c:730
 msgid "Timezone"
 msgstr "悋��愀悋� 悋�慍����"

 #: ../libpurple/protocols/silc/buddy.c:1585
-#: ../libpurple/protocols/silc/ops.c:1244
+#: ../libpurple/protocols/silc/ops.c:1259
 #: ../libpurple/protocols/silc10/buddy.c:1585
 #: ../libpurple/protocols/silc10/ops.c:1239
 msgid "Geolocation"
@@ -11040,7 +11230,7 @@
 msgstr "悋悴�惡 悋���惠悋忰 悋�惺���..."

 #: ../libpurple/protocols/silc/buddy.c:1671
-#: ../libpurple/protocols/silc/ops.c:1612
+#: ../libpurple/protocols/silc/ops.c:1627
 #: ../libpurple/protocols/silc10/buddy.c:1670
 #: ../libpurple/protocols/silc10/ops.c:1624
 msgid "Kill User"
@@ -11191,11 +11381,11 @@
 msgstr "悋愕� 悋��悴��惺悸"

 #: ../libpurple/protocols/silc/chat.c:605
-#: ../libpurple/protocols/silc/ops.c:1817
+#: ../libpurple/protocols/silc/ops.c:1832
 #: ../libpurple/protocols/silc/silc.c:1163
 #: ../libpurple/protocols/silc10/chat.c:585
-#: ../libpurple/protocols/silc10/ops.c:1901
-#: ../libpurple/protocols/silc10/silc.c:931
+#: ../libpurple/protocols/silc10/ops.c:1907
+#: ../libpurple/protocols/silc10/silc.c:937
 msgid "Passphrase"
 msgstr "惺惡悋惘悸 悋�愕惘"

@@ -11299,21 +11489,21 @@
 #: ../libpurple/protocols/silc/chat.c:1245
 #: ../libpurple/protocols/silc/silc.c:1360
 #: ../libpurple/protocols/silc10/chat.c:1299
-#: ../libpurple/protocols/silc10/silc.c:1137
+#: ../libpurple/protocols/silc10/silc.c:1143
 msgid "Call Command"
 msgstr "悋愕惠惆惺� 悋�悖�惘"

 #: ../libpurple/protocols/silc/chat.c:1245
 #: ../libpurple/protocols/silc/silc.c:1361
 #: ../libpurple/protocols/silc10/chat.c:1299
-#: ../libpurple/protocols/silc10/silc.c:1137
+#: ../libpurple/protocols/silc10/silc.c:1143
 msgid "Cannot call command"
 msgstr "�悋 ���� 悋愕惠惆惺悋悄 悋�悖�惘"

 #: ../libpurple/protocols/silc/chat.c:1246
 #: ../libpurple/protocols/silc/silc.c:1362
 #: ../libpurple/protocols/silc10/chat.c:1300
-#: ../libpurple/protocols/silc10/silc.c:1138
+#: ../libpurple/protocols/silc10/silc.c:1144
 msgid "Unknown command"
 msgstr "悖�惘� �悴���"

@@ -11389,12 +11579,12 @@
 msgid "Cannot send file"
 msgstr "惠惺悵�惘 悒惘愕悋� 悋����"

-#: ../libpurple/protocols/silc/ops.c:57
+#: ../libpurple/protocols/silc/ops.c:76
 msgid "Error occurred"
 msgstr "忰惆惓 惺愀�"

-#: ../libpurple/protocols/silc/ops.c:533 ../libpurple/protocols/silc/ops.c:542
-#: ../libpurple/protocols/silc/ops.c:551
+#: ../libpurple/protocols/silc/ops.c:548 ../libpurple/protocols/silc/ops.c:557
+#: ../libpurple/protocols/silc/ops.c:566
 #: ../libpurple/protocols/silc10/ops.c:554
 #: ../libpurple/protocols/silc10/ops.c:563
 #: ../libpurple/protocols/silc10/ops.c:572
@@ -11402,38 +11592,38 @@
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr "%s 愃��惘 ��惷�惺 <I>%s</I> 悒��: %s"

-#: ../libpurple/protocols/silc/ops.c:617
+#: ../libpurple/protocols/silc/ops.c:632
 #: ../libpurple/protocols/silc10/ops.c:638
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr "<I>%s</I> 惷惡愀 悖愀�悋惘 悋���悋悸 <I>%s</I> 悒��: %s"

-#: ../libpurple/protocols/silc/ops.c:621
+#: ../libpurple/protocols/silc/ops.c:636
 #: ../libpurple/protocols/silc10/ops.c:642
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr "<I>%s</I>悖慍悋� 悴��惺 悖愀�悋惘 悋���悋悸 <I>%s</I>"

-#: ../libpurple/protocols/silc/ops.c:654
+#: ../libpurple/protocols/silc/ops.c:669
 #: ../libpurple/protocols/silc10/ops.c:675
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr "<I>%s</I> 惷惡愀 悖愀�悋惘 <I>%s</I> 悒��: %s"

-#: ../libpurple/protocols/silc/ops.c:662
+#: ../libpurple/protocols/silc/ops.c:677
 #: ../libpurple/protocols/silc10/ops.c:683
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr "<I>%s</I>悖慍悋� �� 悖愀�悋惘 <I>%s</I>"

-#: ../libpurple/protocols/silc/ops.c:691
+#: ../libpurple/protocols/silc/ops.c:706
 #: ../libpurple/protocols/silc10/ops.c:712
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "愀�惘惆惠� �� <I>%s</I> 惡�悋愕愀悸 <I>%s</I> (%s)"

-#: ../libpurple/protocols/silc/ops.c:718 ../libpurple/protocols/silc/ops.c:723
-#: ../libpurple/protocols/silc/ops.c:728
+#: ../libpurple/protocols/silc/ops.c:733 ../libpurple/protocols/silc/ops.c:738
+#: ../libpurple/protocols/silc/ops.c:743
 #: ../libpurple/protocols/silc10/ops.c:742
 #: ../libpurple/protocols/silc10/ops.c:747
 #: ../libpurple/protocols/silc10/ops.c:752
@@ -11441,8 +11631,8 @@
 msgid "You have been killed by %s (%s)"
 msgstr "�惠���� %s (%s)"

-#: ../libpurple/protocols/silc/ops.c:749 ../libpurple/protocols/silc/ops.c:754
-#: ../libpurple/protocols/silc/ops.c:759
+#: ../libpurple/protocols/silc/ops.c:764 ../libpurple/protocols/silc/ops.c:769
+#: ../libpurple/protocols/silc/ops.c:774
 #: ../libpurple/protocols/silc10/ops.c:773
 #: ../libpurple/protocols/silc10/ops.c:778
 #: ../libpurple/protocols/silc10/ops.c:783
@@ -11450,157 +11640,157 @@
 msgid "Killed by %s (%s)"
 msgstr "�惠���� %s (%s)"

-#: ../libpurple/protocols/silc/ops.c:796
+#: ../libpurple/protocols/silc/ops.c:811
 #: ../libpurple/protocols/silc10/ops.c:829
 msgid "Server signoff"
 msgstr "悋�悽悋惆�� �悽惘悴"

-#: ../libpurple/protocols/silc/ops.c:983
+#: ../libpurple/protocols/silc/ops.c:998
 #: ../libpurple/protocols/silc10/ops.c:1017
 msgid "Personal Information"
 msgstr "悋��惺���悋惠 悋�愆悽惶�悸"

-#: ../libpurple/protocols/silc/ops.c:1006
+#: ../libpurple/protocols/silc/ops.c:1021
 #: ../libpurple/protocols/silc10/ops.c:1040
 msgid "Birth Day"
 msgstr "��� 悋����悋惆"

-#: ../libpurple/protocols/silc/ops.c:1014
+#: ../libpurple/protocols/silc/ops.c:1029
 #: ../libpurple/protocols/silc10/ops.c:1048
 msgid "Job Role"
 msgstr "悋�惆�惘 悋��惴���"

-#: ../libpurple/protocols/silc/ops.c:1018
+#: ../libpurple/protocols/silc/ops.c:1033
 #: ../libpurple/protocols/silc/silc.c:1156
 #: ../libpurple/protocols/silc10/ops.c:1052
-#: ../libpurple/protocols/silc10/silc.c:924
+#: ../libpurple/protocols/silc10/silc.c:930
 msgid "Organization"
 msgstr "悋���惴��悸"

-#: ../libpurple/protocols/silc/ops.c:1022
+#: ../libpurple/protocols/silc/ops.c:1037
 #: ../libpurple/protocols/silc10/ops.c:1056
 msgid "Unit"
 msgstr "悋��忰惆悸"

-#: ../libpurple/protocols/silc/ops.c:1046
+#: ../libpurple/protocols/silc/ops.c:1061
 #: ../libpurple/protocols/silc10/ops.c:1080
 msgid "Note"
 msgstr "��悋忰惴悸"

-#: ../libpurple/protocols/silc/ops.c:1093
+#: ../libpurple/protocols/silc/ops.c:1108
 #: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Join Chat"
 msgstr "悋�惷� ��惆惘惆愆悸"

-#: ../libpurple/protocols/silc/ops.c:1127
+#: ../libpurple/protocols/silc/ops.c:1142
 #: ../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:1131
+#: ../libpurple/protocols/silc/ops.c:1146
 #: ../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:1190
-#: ../libpurple/protocols/silc/ops.c:1328
+#: ../libpurple/protocols/silc/ops.c:1205
+#: ../libpurple/protocols/silc/ops.c:1343
 #: ../libpurple/protocols/silc10/ops.c:1183
 #: ../libpurple/protocols/silc10/ops.c:1332
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1071
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1078
 msgid "Real Name"
 msgstr "悋�悋愕� 悋�忰����"

-#: ../libpurple/protocols/silc/ops.c:1218
+#: ../libpurple/protocols/silc/ops.c:1233
 #: ../libpurple/protocols/silc10/ops.c:1213
 msgid "Status Text"
 msgstr "�惶 悋�忰悋�悸"

-#: ../libpurple/protocols/silc/ops.c:1280
-#: ../libpurple/protocols/silc/ops.c:1354
+#: ../libpurple/protocols/silc/ops.c:1295
+#: ../libpurple/protocols/silc/ops.c:1369
 #: ../libpurple/protocols/silc10/ops.c:1285
 #: ../libpurple/protocols/silc10/ops.c:1357
 msgid "Public Key Fingerprint"
 msgstr "惡惶�悸 悋���惠悋忰 悋�惺���"

-#: ../libpurple/protocols/silc/ops.c:1281
-#: ../libpurple/protocols/silc/ops.c:1355
+#: ../libpurple/protocols/silc/ops.c:1296
+#: ../libpurple/protocols/silc/ops.c:1370
 #: ../libpurple/protocols/silc10/ops.c:1286
 #: ../libpurple/protocols/silc10/ops.c:1358
 msgid "Public Key Babbleprint"
 msgstr ""

-#: ../libpurple/protocols/silc/ops.c:1294
+#: ../libpurple/protocols/silc/ops.c:1309
 #: ../libpurple/protocols/silc10/ops.c:1298
 msgid "_More..."
 msgstr "悋�_�慍�惆..."

-#: ../libpurple/protocols/silc/ops.c:1373
+#: ../libpurple/protocols/silc/ops.c:1388
 #: ../libpurple/protocols/silc/silc.c:1220
 #: ../libpurple/protocols/silc10/ops.c:1371
-#: ../libpurple/protocols/silc10/silc.c:988
+#: ../libpurple/protocols/silc10/silc.c:994
 msgid "Detach From Server"
 msgstr "悋�惶� �� 悋�悽悋惆��"

-#: ../libpurple/protocols/silc/ops.c:1373
+#: ../libpurple/protocols/silc/ops.c:1388
 #: ../libpurple/protocols/silc10/ops.c:1371
 msgid "Cannot detach"
 msgstr "惠惺悵�惘 悋��惶�"

-#: ../libpurple/protocols/silc/ops.c:1393
+#: ../libpurple/protocols/silc/ops.c:1408
 #: ../libpurple/protocols/silc10/ops.c:1382
 msgid "Cannot set topic"
 msgstr "惠惺悵�惘 惷惡愀 悋���惷�惺"

-#: ../libpurple/protocols/silc/ops.c:1422
+#: ../libpurple/protocols/silc/ops.c:1437
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Failed to change nickname"
 msgstr "�愆�惠 �� 惠愃��惘 悋����悸"

-#: ../libpurple/protocols/silc/ops.c:1471
+#: ../libpurple/protocols/silc/ops.c:1486
 #: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Roomlist"
 msgstr "�悋悧�悸 悋�愃惘�"

-#: ../libpurple/protocols/silc/ops.c:1471
+#: ../libpurple/protocols/silc/ops.c:1486
 #: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Cannot get room list"
 msgstr "�悋���� 悴�惡 �悋悧�悸 悋�愃惘�"

-#: ../libpurple/protocols/silc/ops.c:1472
+#: ../libpurple/protocols/silc/ops.c:1487
 msgid "Network is empty"
 msgstr "悋�愆惡�悸 悽悋��悸"

-#: ../libpurple/protocols/silc/ops.c:1516
+#: ../libpurple/protocols/silc/ops.c:1531
 #: ../libpurple/protocols/silc10/ops.c:1507
 msgid "No public key was received"
 msgstr "�� ��愕惠�惡� 悖� ��惠悋忰 惺���"

-#: ../libpurple/protocols/silc/ops.c:1528
-#: ../libpurple/protocols/silc/ops.c:1541
+#: ../libpurple/protocols/silc/ops.c:1543
+#: ../libpurple/protocols/silc/ops.c:1556
 #: ../libpurple/protocols/silc10/ops.c:1519
 #: ../libpurple/protocols/silc10/ops.c:1532
 msgid "Server Information"
 msgstr "�惺���悋惠 悋�悽悋惆��"

-#: ../libpurple/protocols/silc/ops.c:1529
+#: ../libpurple/protocols/silc/ops.c:1544
 #: ../libpurple/protocols/silc10/ops.c:1520
 msgid "Cannot get server information"
 msgstr "惠惺悵�惘 悴�惡 �惺���悋惠 悋�悽悋惆��"

-#: ../libpurple/protocols/silc/ops.c:1552
+#: ../libpurple/protocols/silc/ops.c:1567
 #: ../libpurple/protocols/silc10/ops.c:1549
 #: ../libpurple/protocols/silc10/ops.c:1558
 msgid "Server Statistics"
 msgstr "悒忰惶悋悧�悋惠 悋�悽悋惆��"

-#: ../libpurple/protocols/silc/ops.c:1553
+#: ../libpurple/protocols/silc/ops.c:1568
 #: ../libpurple/protocols/silc10/ops.c:1550
 msgid "Cannot get server statistics"
 msgstr "惠惺悵�惘 悴�惡 悒忰惶悋悧�悋惠 悋�悽悋惆��"

-#: ../libpurple/protocols/silc/ops.c:1560
+#: ../libpurple/protocols/silc/ops.c:1575
 #: ../libpurple/protocols/silc10/ops.c:1581
 #, c-format
 msgid ""
@@ -11636,55 +11826,55 @@
 "�悴��惺 �惆惘悋悄 悋�悽�悋惆��: %Id\n"
 "�悴��惺 �惆惘悋悄 悋��愕��惘悋惠: %Id\n"

-#: ../libpurple/protocols/silc/ops.c:1592
+#: ../libpurple/protocols/silc/ops.c:1607
 #: ../libpurple/protocols/silc10/ops.c:1604
 msgid "Network Statistics"
 msgstr "悒忰惶悋悧�悋惠 悋�愆惡�悸"

-#: ../libpurple/protocols/silc/ops.c:1600
+#: ../libpurple/protocols/silc/ops.c:1615
 #: ../libpurple/protocols/silc10/ops.c:1612
 msgid "Ping failed"
 msgstr "�愆� 惡���悴"

-#: ../libpurple/protocols/silc/ops.c:1605
+#: ../libpurple/protocols/silc/ops.c:1620
 #: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping reply received from server"
 msgstr "悋愕惠��惡�� 惘惆 惡���悴 �� 悋�悽悋惆��"

-#: ../libpurple/protocols/silc/ops.c:1613
+#: ../libpurple/protocols/silc/ops.c:1628
 #: ../libpurple/protocols/silc10/ops.c:1625
 msgid "Could not kill user"
 msgstr "惠惺悵�惘 悋��愕惠悽惆�"

-#: ../libpurple/protocols/silc/ops.c:1652
+#: ../libpurple/protocols/silc/ops.c:1667
 msgid "WATCH"
 msgstr "惘悋�惡"

-#: ../libpurple/protocols/silc/ops.c:1652
+#: ../libpurple/protocols/silc/ops.c:1667
 msgid "Cannot watch user"
 msgstr "惠惺悵�惘惠 �惘悋�惡悸 悋��愕惠悽惆�"

-#: ../libpurple/protocols/silc/ops.c:1728
-#: ../libpurple/protocols/silc/ops.c:1779
+#: ../libpurple/protocols/silc/ops.c:1743
+#: ../libpurple/protocols/silc/ops.c:1794
 #: ../libpurple/protocols/silc/silc.c:385
-#: ../libpurple/protocols/silc10/ops.c:1811
-#: ../libpurple/protocols/silc10/ops.c:1858
-#: ../libpurple/protocols/silc10/silc.c:190
+#: ../libpurple/protocols/silc10/ops.c:1817
+#: ../libpurple/protocols/silc10/ops.c:1864
+#: ../libpurple/protocols/silc10/silc.c:193
 msgid "Resuming session"
 msgstr "�悴惘� 悋愕惠悧�悋� 悋�悴�愕悸"

-#: ../libpurple/protocols/silc/ops.c:1730
-#: ../libpurple/protocols/silc10/ops.c:1813
+#: ../libpurple/protocols/silc/ops.c:1745
+#: ../libpurple/protocols/silc10/ops.c:1819
 msgid "Authenticating connection"
 msgstr "�悴惘� 悋愕惠�惓悋� 悋�悋惠惶悋�"

-#: ../libpurple/protocols/silc/ops.c:1781
-#: ../libpurple/protocols/silc10/ops.c:1860
+#: ../libpurple/protocols/silc/ops.c:1796
+#: ../libpurple/protocols/silc10/ops.c:1866
 msgid "Verifying server public key"
 msgstr "�悴惘� 悋�惠忰�� �� 悋���惠悋忰 悋�惺��� ��悽悋惆��"

-#: ../libpurple/protocols/silc/ops.c:1818
-#: ../libpurple/protocols/silc10/ops.c:1902
+#: ../libpurple/protocols/silc/ops.c:1833
+#: ../libpurple/protocols/silc10/ops.c:1908
 msgid "Passphrase required"
 msgstr "惺惡悋惘悸 悋�愕惘 �愀��惡悸"

@@ -11726,82 +11916,84 @@
 msgstr "��惺 ��惠悋忰 惺��� 愃�惘 �惆惺��"

 #: ../libpurple/protocols/silc/silc.c:319
-#: ../libpurple/protocols/silc10/ops.c:1749
+#: ../libpurple/protocols/silc10/ops.c:1755
 msgid "Disconnected by server"
 msgstr "�愀惺 悋�悽悋惆�� 悋�悋惠惶悋�"

 #: ../libpurple/protocols/silc/silc.c:327
-#: ../libpurple/protocols/silc10/ops.c:1700
+#: ../libpurple/protocols/silc10/ops.c:1701
 msgid "Error during connecting to SILC Server"
 msgstr "悽愀悖 悖惓�悋悄 悋�悋惠惶悋� 惡悽悋惆�� SILC"

 #: ../libpurple/protocols/silc/silc.c:333
-#: ../libpurple/protocols/silc10/ops.c:1705
+#: ../libpurple/protocols/silc10/ops.c:1707
 msgid "Key Exchange failed"
 msgstr "�愆� 惠惡悋惆� 悋���惠悋忰"

 #: ../libpurple/protocols/silc/silc.c:343
-#: ../libpurple/protocols/silc10/ops.c:1714
+#: ../libpurple/protocols/silc10/ops.c:1718
 msgid "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr "�愆�惠 �惠悋惡惺悸 悋�悴�愕悸 悋���惶��悸. 悋惷愃愀 \"悖惺�惆 悋�悋惠惶悋�\" �惠��愆悧 悋惠惶悋�悋 悴惆�惆悋."

 #: ../libpurple/protocols/silc/silc.c:373
 #: ../libpurple/protocols/silc/silc.c:420
-#: ../libpurple/protocols/silc10/silc.c:161
+#: ../libpurple/protocols/silc10/silc.c:163
 msgid "Connection failed"
 msgstr "�愆� 悋�悋惠惶悋�"

 #: ../libpurple/protocols/silc/silc.c:388
-#: ../libpurple/protocols/silc10/silc.c:193
+#: ../libpurple/protocols/silc10/silc.c:196
 msgid "Performing key exchange"
 msgstr "�悴惘� 惠惡悋惆� 悋���悋惠�忰"

 #. Progress
 #: ../libpurple/protocols/silc/silc.c:445
-#: ../libpurple/protocols/silc10/silc.c:325
+#: ../libpurple/protocols/silc10/silc.c:329
 msgid "Connecting to SILC Server"
 msgstr "�悴惘� 悋�悋惠惶悋� 惡悽悋惆�� SILC"

 #: ../libpurple/protocols/silc/silc.c:455
+#: ../libpurple/protocols/silc10/silc.c:340
 msgid "Could not load SILC key pair"
 msgstr "惠惺悵�惘 惠忰��� 慍�悴 ��悋惠�忰 SILC"

 #: ../libpurple/protocols/silc/silc.c:469
-#: ../libpurple/protocols/silc10/silc.c:355
+#: ../libpurple/protocols/silc10/silc.c:361
 msgid "Unable to create connection"
 msgstr "惠惺悵�惘 悒�愆悋悄 悋惠惶悋�"

 #: ../libpurple/protocols/silc/silc.c:499
-#: ../libpurple/protocols/silc10/silc.c:267
+#: ../libpurple/protocols/silc10/silc.c:271
 msgid "Out of memory"
 msgstr "��惆惠 悋�悵�悋�惘悸"

 #: ../libpurple/protocols/silc/silc.c:550
-#: ../libpurple/protocols/silc10/silc.c:313
+#: ../libpurple/protocols/silc10/silc.c:317
 msgid "Cannot initialize SILC protocol"
 msgstr "�悋 ���� 悋愕惠惡惆悋悄 惡惘�惠���� SILC"

 #: ../libpurple/protocols/silc/silc.c:559
+#: ../libpurple/protocols/silc10/silc.c:324
 msgid "Error loading SILC key pair"
 msgstr "惺愀� 悖惓�悋悄 惠忰��� 慍�悴 ��悋惠�忰 SILC"

 #: ../libpurple/protocols/silc/silc.c:882
-#: ../libpurple/protocols/silc10/silc.c:650
+#: ../libpurple/protocols/silc10/silc.c:656
 msgid "Your Current Mood"
 msgstr "�慍悋悴� 悋�忰悋��"

 #: ../libpurple/protocols/silc/silc.c:884
-#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1665
+#: ../libpurple/protocols/silc10/silc.c:658 ../pidgin/gtkprefs.c:1685
 msgid "Normal"
 msgstr "惺悋惆�"

 #: ../libpurple/protocols/silc/silc.c:898
-#: ../libpurple/protocols/silc10/silc.c:666
+#: ../libpurple/protocols/silc10/silc.c:672
 msgid "In love"
 msgstr "�� 悋�忰惡"

 #: ../libpurple/protocols/silc/silc.c:909
-#: ../libpurple/protocols/silc10/silc.c:677
+#: ../libpurple/protocols/silc10/silc.c:683
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -11810,46 +12002,46 @@
 "愀惘� 悋�惠�悋惶�� 悋�惠� 惠�惷��悋 "

 #: ../libpurple/protocols/silc/silc.c:917
-#: ../libpurple/protocols/silc/util.c:567
-#: ../libpurple/protocols/silc10/silc.c:685
-#: ../libpurple/protocols/silc10/util.c:557
+#: ../libpurple/protocols/silc/util.c:571
+#: ../libpurple/protocols/silc10/silc.c:691
+#: ../libpurple/protocols/silc10/util.c:561
 msgid "SMS"
 msgstr "SMS"

 #: ../libpurple/protocols/silc/silc.c:919
-#: ../libpurple/protocols/silc/util.c:569
-#: ../libpurple/protocols/silc10/silc.c:687
-#: ../libpurple/protocols/silc10/util.c:559
+#: ../libpurple/protocols/silc/util.c:573
+#: ../libpurple/protocols/silc10/silc.c:693
+#: ../libpurple/protocols/silc10/util.c:563
 msgid "MMS"
 msgstr "MMS"

 #: ../libpurple/protocols/silc/silc.c:921
-#: ../libpurple/protocols/silc10/silc.c:689
+#: ../libpurple/protocols/silc10/silc.c:695
 msgid "Video conferencing"
 msgstr "悋悴惠�悋惺 ��惆��"

 #: ../libpurple/protocols/silc/silc.c:926
-#: ../libpurple/protocols/silc10/silc.c:694
+#: ../libpurple/protocols/silc10/silc.c:700
 msgid "Your Current Status"
 msgstr "忰悋�惠� 悋�忰悋��悸"

 #: ../libpurple/protocols/silc/silc.c:933
-#: ../libpurple/protocols/silc10/silc.c:701
+#: ../libpurple/protocols/silc10/silc.c:707
 msgid "Online Services"
 msgstr "悋�悽惆�悋惠 惺�� 悋�悽愀"

 #: ../libpurple/protocols/silc/silc.c:936
-#: ../libpurple/protocols/silc10/silc.c:704
+#: ../libpurple/protocols/silc10/silc.c:710
 msgid "Let others see what services you are using"
 msgstr "惆惺 悋�悛悽惘�� �惘�� 悋�悽惆�悋惠 悋�惠� 惠愕惠悽惆��悋"

 #: ../libpurple/protocols/silc/silc.c:942
-#: ../libpurple/protocols/silc10/silc.c:710
+#: ../libpurple/protocols/silc10/silc.c:716
 msgid "Let others see what computer you are using"
 msgstr "惆惺 悋�悛悽惘�� �惘�� ��惺 悋�忰悋愕�惡 悋�悵� 惠愕惠悽惆��"

 #: ../libpurple/protocols/silc/silc.c:949
-#: ../libpurple/protocols/silc10/silc.c:717
+#: ../libpurple/protocols/silc10/silc.c:723
 msgid "Your VCard File"
 msgstr "��� vCard 悋�悽悋惶 惡�"

@@ -11859,13 +12051,13 @@

 #: ../libpurple/protocols/silc/silc.c:959
 #: ../libpurple/protocols/silc/silc.c:960
-#: ../libpurple/protocols/silc10/silc.c:729
-#: ../libpurple/protocols/silc10/silc.c:730
+#: ../libpurple/protocols/silc10/silc.c:735
+#: ../libpurple/protocols/silc10/silc.c:736
 msgid "User Online Status Attributes"
 msgstr "悽�悋惶 忰悋�悸 悋��愕惠悽惆� 悋��惠惶�"

 #: ../libpurple/protocols/silc/silc.c:961
-#: ../libpurple/protocols/silc10/silc.c:731
+#: ../libpurple/protocols/silc10/silc.c:737
 msgid ""
 "You can let other users see your online status information and your personal "
 "information. Please fill the information you would like other users to see "
@@ -11877,21 +12069,21 @@
 #: ../libpurple/protocols/silc/silc.c:1002
 #: ../libpurple/protocols/silc/silc.c:1008
 #: ../libpurple/protocols/silc/silc.c:1629
-#: ../libpurple/protocols/silc10/silc.c:772
 #: ../libpurple/protocols/silc10/silc.c:778
-#: ../libpurple/protocols/silc10/silc.c:1415
+#: ../libpurple/protocols/silc10/silc.c:784
+#: ../libpurple/protocols/silc10/silc.c:1421
 msgid "Message of the Day"
 msgstr "惘愕悋�悸 悋����"

 #: ../libpurple/protocols/silc/silc.c:1002
-#: ../libpurple/protocols/silc10/silc.c:772
+#: ../libpurple/protocols/silc10/silc.c:778
 msgid "No Message of the Day available"
 msgstr "�悋惠�悴惆 惘愕悋�悸 �惠悋忰悸 悋����"

 #: ../libpurple/protocols/silc/silc.c:1003
 #: ../libpurple/protocols/silc/silc.c:1624
-#: ../libpurple/protocols/silc10/silc.c:773
-#: ../libpurple/protocols/silc10/silc.c:1410
+#: ../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 "�悋 惠�悴惆 惘愕悋�悸 悋���� ��悵悋 悋�悋惠惶悋�"

@@ -11899,217 +12091,217 @@
 #: ../libpurple/protocols/silc/silc.c:1100
 #: ../libpurple/protocols/silc/silc.c:1171
 #: ../libpurple/protocols/silc/silc.c:1172
-#: ../libpurple/protocols/silc10/silc.c:824
-#: ../libpurple/protocols/silc10/silc.c:868
-#: ../libpurple/protocols/silc10/silc.c:939
-#: ../libpurple/protocols/silc10/silc.c:940
+#: ../libpurple/protocols/silc10/silc.c:830
+#: ../libpurple/protocols/silc10/silc.c:874
+#: ../libpurple/protocols/silc10/silc.c:945
+#: ../libpurple/protocols/silc10/silc.c:946
 msgid "Create New SILC Key Pair"
 msgstr "���惆 慍�悴 ��悋惠�忰 SILC 悴惆�惆"

 #: ../libpurple/protocols/silc/silc.c:1054
-#: ../libpurple/protocols/silc10/silc.c:824
+#: ../libpurple/protocols/silc10/silc.c:830
 msgid "Passphrases do not match"
 msgstr "惺惡悋惘惠� 悋�愕�惘 �悋 惠惠愀悋惡�悋�."

 #: ../libpurple/protocols/silc/silc.c:1100
-#: ../libpurple/protocols/silc10/silc.c:868
+#: ../libpurple/protocols/silc10/silc.c:874
 msgid "Key Pair Generation failed"
 msgstr "�愆� 惠���惆 慍�悴 悋���悋惠�忰"

 #: ../libpurple/protocols/silc/silc.c:1139
-#: ../libpurple/protocols/silc10/silc.c:907
+#: ../libpurple/protocols/silc10/silc.c:913
 msgid "Key length"
 msgstr "愀�� 悋���惠悋忰"

 #: ../libpurple/protocols/silc/silc.c:1141
-#: ../libpurple/protocols/silc10/silc.c:909
+#: ../libpurple/protocols/silc10/silc.c:915
 msgid "Public key file"
 msgstr "��� 悋���惠悋忰 悋�惺���"

 #: ../libpurple/protocols/silc/silc.c:1143
-#: ../libpurple/protocols/silc10/silc.c:911
+#: ../libpurple/protocols/silc10/silc.c:917
 msgid "Private key file"
 msgstr "��� 悋���惠悋忰 悋�愕惘�"

 #: ../libpurple/protocols/silc/silc.c:1166
-#: ../libpurple/protocols/silc10/silc.c:934
+#: ../libpurple/protocols/silc10/silc.c:940
 msgid "Passphrase (retype)"
 msgstr "惺惡悋惘悸 悋�愕惘 (�惘�悸 悖悽惘�)"

 #: ../libpurple/protocols/silc/silc.c:1173
-#: ../libpurple/protocols/silc10/silc.c:941
+#: ../libpurple/protocols/silc10/silc.c:947
 msgid "Generate Key Pair"
 msgstr "���惆 慍�悴 ��悋惠�忰"

 #: ../libpurple/protocols/silc/silc.c:1216
-#: ../libpurple/protocols/silc10/silc.c:984
+#: ../libpurple/protocols/silc10/silc.c:990
 msgid "Online Status"
 msgstr "忰悋�悸 悋�悋惠惶悋�"

 #: ../libpurple/protocols/silc/silc.c:1224
-#: ../libpurple/protocols/silc10/silc.c:992
+#: ../libpurple/protocols/silc10/silc.c:998
 msgid "View Message of the Day"
 msgstr "悋愕惠惺惘惷 惘愕悋�悸 悋����"

 #: ../libpurple/protocols/silc/silc.c:1228
-#: ../libpurple/protocols/silc10/silc.c:996
+#: ../libpurple/protocols/silc10/silc.c:1002
 msgid "Create SILC Key Pair..."
 msgstr "���惆 慍�悴 ��悋惠�忰 SILC..."

 #: ../libpurple/protocols/silc/silc.c:1320
-#: ../libpurple/protocols/silc10/silc.c:1095
+#: ../libpurple/protocols/silc10/silc.c:1101
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "悋��愕惠悽惆� <I>%s</I> ��愕 ��悴�惆悋 惺�� 悋�愆惡�悸"

 #: ../libpurple/protocols/silc/silc.c:1500
-#: ../libpurple/protocols/silc10/silc.c:1286
+#: ../libpurple/protocols/silc10/silc.c:1292
 msgid "Topic too long"
 msgstr "悋���惷�惺 悖愀�� �� 悋��愕��忰"

 #: ../libpurple/protocols/silc/silc.c:1581
-#: ../libpurple/protocols/silc10/silc.c:1367
+#: ../libpurple/protocols/silc10/silc.c:1373
 msgid "You must specify a nick"
 msgstr "�悴惡 悖� 惠忰惆惆 ���悸"

 #: ../libpurple/protocols/silc/silc.c:1683
-#: ../libpurple/protocols/silc10/silc.c:1469
+#: ../libpurple/protocols/silc10/silc.c:1475
 #, c-format
 msgid "channel %s not found"
 msgstr "悋���悋悸 %s 愃�惘 ��悴�惆悸"

 #: ../libpurple/protocols/silc/silc.c:1688
-#: ../libpurple/protocols/silc10/silc.c:1474
+#: ../libpurple/protocols/silc10/silc.c:1480
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "悖愀�悋惘 悋���悋悸 � %s: %s"

 #: ../libpurple/protocols/silc/silc.c:1690
-#: ../libpurple/protocols/silc10/silc.c:1476
+#: ../libpurple/protocols/silc10/silc.c:1482
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "�� 惠惷惡愀 悖� 悖愀�悋惘 ����悋悸 %s"

 #: ../libpurple/protocols/silc/silc.c:1703
-#: ../libpurple/protocols/silc10/silc.c:1489
+#: ../libpurple/protocols/silc10/silc.c:1495
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "�愆� 惷惡愀 悖愀�悋惘 悋���悋悸 %s"

 #: ../libpurple/protocols/silc/silc.c:1733
-#: ../libpurple/protocols/silc10/silc.c:1519
+#: ../libpurple/protocols/silc10/silc.c:1525
 #, c-format
 msgid "Unknown command: %s, (may be a client bug)"
 msgstr "悖�惘 �悴���: %s� (�惆 ���� 惺�悸 �� 悋�惺���)"

 #: ../libpurple/protocols/silc/silc.c:1796
-#: ../libpurple/protocols/silc10/silc.c:1582
+#: ../libpurple/protocols/silc10/silc.c:1588
 msgid "part [channel]:  Leave the chat"
 msgstr ""
 "part [channel]: \n"
 "愃悋惆惘 悋�惆惘惆愆悸"

 #: ../libpurple/protocols/silc/silc.c:1800
-#: ../libpurple/protocols/silc10/silc.c:1586
+#: ../libpurple/protocols/silc10/silc.c:1592
 msgid "leave [channel]:  Leave the chat"
 msgstr ""
 "leave [channel]: \n"
 "愃悋惆惘 悋�惆惘惆愆悸"

 #: ../libpurple/protocols/silc/silc.c:1804
-#: ../libpurple/protocols/silc10/silc.c:1590
+#: ../libpurple/protocols/silc10/silc.c:1596
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr ""
 "topic [&lt;new topic&gt;]: \n"
 "悋愕惠惺惘惷 悖� 愃�惘 悋���惷�惺"

 #: ../libpurple/protocols/silc/silc.c:1809
-#: ../libpurple/protocols/silc10/silc.c:1595
+#: ../libpurple/protocols/silc10/silc.c:1601
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr ""
 "join &lt;channel&gt; [&lt;password&gt;]:\n"
 "悋�惷� �惆惘惆愆悸 惺�� �悵� 悋�愆惡�悸"

 #: ../libpurple/protocols/silc/silc.c:1813
-#: ../libpurple/protocols/silc10/silc.c:1599
+#: ../libpurple/protocols/silc10/silc.c:1605
 msgid "list:  List channels on this network"
 msgstr ""
 "list: \n"
 "�悋悧�悸 悋����悋惠 惺�� �悵� 悋�愆惡�悸"

 #: ../libpurple/protocols/silc/silc.c:1817
-#: ../libpurple/protocols/silc10/silc.c:1603
+#: ../libpurple/protocols/silc10/silc.c:1609
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr ""
 "whois &lt;nick&gt;: \n"
 "悋愕惠惺惘惷 �惺���悋惠 悋����悸"

 #: ../libpurple/protocols/silc/silc.c:1821
-#: ../libpurple/protocols/silc10/silc.c:1607
-#: ../libpurple/protocols/zephyr/zephyr.c:2685
+#: ../libpurple/protocols/silc10/silc.c:1613
+#: ../libpurple/protocols/zephyr/zephyr.c:2700
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr ""
 "msg &lt;nick&gt; &lt;message&gt;: \n"
 "悖惘愕� 惘愕悋�悸 悽悋惶悸 悒�� �愕惠悽惆�"

 #: ../libpurple/protocols/silc/silc.c:1825
-#: ../libpurple/protocols/silc10/silc.c:1611
+#: ../libpurple/protocols/silc10/silc.c:1617
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr ""
 "query &lt;nick&gt; [&lt;message&gt;]: \n"
 "悖惘愕� 惘愕悋�悸 悽悋惶悸 悒�� �愕惠悽惆�"

 #: ../libpurple/protocols/silc/silc.c:1829
-#: ../libpurple/protocols/silc10/silc.c:1615
+#: ../libpurple/protocols/silc10/silc.c:1621
 msgid "motd:  View the server's Message Of The Day"
 msgstr ""
 "motd: \n"
 "悋愕惠惺惘惷 惘愕悋�悸 悋���� ��悽悋惆��"

 #: ../libpurple/protocols/silc/silc.c:1833
-#: ../libpurple/protocols/silc10/silc.c:1619
+#: ../libpurple/protocols/silc10/silc.c:1625
 msgid "detach:  Detach this session"
 msgstr ""
 "detach: \n"
 "悋�惶� �悵� 悋�悴�愕悸"

 #: ../libpurple/protocols/silc/silc.c:1837
-#: ../libpurple/protocols/silc10/silc.c:1623
+#: ../libpurple/protocols/silc10/silc.c:1629
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr ""
 "quit [message]: \n"
 "悋��惶� 惺� 悋�悽悋惆��� �惺 惘愕悋�悸 悋悽惠�悋惘�悸"

 #: ../libpurple/protocols/silc/silc.c:1841
-#: ../libpurple/protocols/silc10/silc.c:1627
+#: ../libpurple/protocols/silc10/silc.c:1633
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr ""
 "call &lt;command&gt;: \n"
 "悋愕惠惆惺� 悖� 悖�惘 惺��� silc"

 #: ../libpurple/protocols/silc/silc.c:1847
-#: ../libpurple/protocols/silc10/silc.c:1633
+#: ../libpurple/protocols/silc10/silc.c:1639
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr ""
 "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]: \n"
 "悋�惠� 悋����悸"

 #: ../libpurple/protocols/silc/silc.c:1851
-#: ../libpurple/protocols/silc10/silc.c:1637
+#: ../libpurple/protocols/silc10/silc.c:1643
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr ""
 "nick &lt;newnick&gt;: \n"
 "愃��惘 ���惠�"

 #: ../libpurple/protocols/silc/silc.c:1855
-#: ../libpurple/protocols/silc10/silc.c:1641
+#: ../libpurple/protocols/silc10/silc.c:1647
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr ""
 "whowas &lt;nick&gt;: \n"
 "悋愕惠惺惘惷 �惺���悋惠 悋����悸"

 #: ../libpurple/protocols/silc/silc.c:1859
-#: ../libpurple/protocols/silc10/silc.c:1645
+#: ../libpurple/protocols/silc10/silc.c:1651
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
@@ -12118,7 +12310,7 @@
 "愃��惘 悖� 悋愕惠惺惘惷 悖愀�悋惘 悋���悋悸"

 #: ../libpurple/protocols/silc/silc.c:1863
-#: ../libpurple/protocols/silc10/silc.c:1649
+#: ../libpurple/protocols/silc10/silc.c:1655
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
@@ -12127,21 +12319,21 @@
 "愃��惘 悖�惷悋惺 悋����悸 惺�� 悋���悋悸"

 #: ../libpurple/protocols/silc/silc.c:1867
-#: ../libpurple/protocols/silc10/silc.c:1653
+#: ../libpurple/protocols/silc10/silc.c:1659
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr ""
 "umode &lt;usermodes&gt;: \n"
 "悋惷惡愀 悖愀�惘� �� 悋�愆惡�悸"

 #: ../libpurple/protocols/silc/silc.c:1871
-#: ../libpurple/protocols/silc10/silc.c:1657
+#: ../libpurple/protocols/silc10/silc.c:1663
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr ""
 "oper &lt;nick&gt; [-pubkey]: \n"
 "悋忰惶� 惺�� 惶�悋忰�悋惠 �惆�惘 悋�悽悋惆��"

 #: ../libpurple/protocols/silc/silc.c:1875
-#: ../libpurple/protocols/silc10/silc.c:1661
+#: ../libpurple/protocols/silc10/silc.c:1667
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
@@ -12150,56 +12342,56 @@
 "悋惆惺� ���悸 悖� 悖惷�/悖慍� �� �悋悧�悸 悋�惆惺�悋惠"

 #: ../libpurple/protocols/silc/silc.c:1879
-#: ../libpurple/protocols/silc10/silc.c:1665
+#: ../libpurple/protocols/silc10/silc.c:1671
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr ""
 "kick &lt;channel&gt; &lt;nick&gt; [comment]: \n"
 "悋惘�� 惺���悋 �� 悋���悋悸"

 #: ../libpurple/protocols/silc/silc.c:1883
-#: ../libpurple/protocols/silc10/silc.c:1669
+#: ../libpurple/protocols/silc10/silc.c:1675
 msgid "info [server]:  View server administrative details"
 msgstr ""
 "info [server]: \n"
 "悋愕惠惺惘惷 惠�悋惶�� 悒惆悋惘悸 悋�悽悋惆��"

 #: ../libpurple/protocols/silc/silc.c:1887
-#: ../libpurple/protocols/silc10/silc.c:1673
+#: ../libpurple/protocols/silc10/silc.c:1679
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr ""
 "ban [&lt;channel&gt; +|-&lt;nick&gt;]: \n"
 "悋愀惘惆 惺���悋 �� 悋���悋悸"

 #: ../libpurple/protocols/silc/silc.c:1891
-#: ../libpurple/protocols/silc10/silc.c:1677
+#: ../libpurple/protocols/silc10/silc.c:1683
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr ""
 "getkey &lt;nick|server&gt;: \n"
 "悋悴�惡 悋���惠悋忰 悋�惺��� �惺��� 悖� 悽悋惆��"

 #: ../libpurple/protocols/silc/silc.c:1895
-#: ../libpurple/protocols/silc10/silc.c:1681
+#: ../libpurple/protocols/silc10/silc.c:1687
 msgid "stats:  View server and network statistics"
 msgstr ""
 "stats: \n"
 "悋愕惠惺惘惷 悋忰惶悋悧�悋惠 悋�悽悋惆�� � 悋�愆惡�悸"

 #: ../libpurple/protocols/silc/silc.c:1899
-#: ../libpurple/protocols/silc10/silc.c:1685
+#: ../libpurple/protocols/silc10/silc.c:1691
 msgid "ping:  Send PING to the connected server"
 msgstr ""
 "ping: \n"
 "悖惘愕�� 惡���悴 ��悽悋惆�� 悋��惠惶�"

 #: ../libpurple/protocols/silc/silc.c:1904
-#: ../libpurple/protocols/silc10/silc.c:1690
+#: ../libpurple/protocols/silc10/silc.c:1696
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr ""
 "users &lt;channel&gt;: \n"
 "悋愕惘惆 悋��愕惠悽惆��� �� 悋���悋悸"

 #: ../libpurple/protocols/silc/silc.c:1908
-#: ../libpurple/protocols/silc10/silc.c:1694
+#: ../libpurple/protocols/silc10/silc.c:1700
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -12217,38 +12409,38 @@
 #. *< version
 #. *  summary
 #: ../libpurple/protocols/silc/silc.c:2019
-#: ../libpurple/protocols/silc10/silc.c:1819
+#: ../libpurple/protocols/silc10/silc.c:1825
 msgid "SILC Protocol Plugin"
 msgstr "��忰�悸 惡惘�惠���� SILC"

 #. *  description
 #: ../libpurple/protocols/silc/silc.c:2021
-#: ../libpurple/protocols/silc10/silc.c:1821
+#: ../libpurple/protocols/silc10/silc.c:1827
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "惡惘�惠���� 悋悴惠�悋惺悋惠 悋�悒�惠惘�惠 悋��惡悋愆惘悸 悋��悗��悸 (SILC)"

 #: ../libpurple/protocols/silc/silc.c:2053
-#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2023
+#: ../libpurple/protocols/silc10/silc.c:1859 ../pidgin/gtkprefs.c:2040
 msgid "Network"
 msgstr "悋�愆惡�悸"

 #: ../libpurple/protocols/silc/silc.c:2064
-#: ../libpurple/protocols/silc10/silc.c:1864
+#: ../libpurple/protocols/silc10/silc.c:1870
 msgid "Public Key file"
 msgstr "��� 悋���惠悋忰 悋�惺���"

 #: ../libpurple/protocols/silc/silc.c:2068
-#: ../libpurple/protocols/silc10/silc.c:1868
+#: ../libpurple/protocols/silc10/silc.c:1874
 msgid "Private Key file"
 msgstr "��� 悋���惠悋忰 悋�愕惘�"

 #: ../libpurple/protocols/silc/silc.c:2078
-#: ../libpurple/protocols/silc10/silc.c:1878
+#: ../libpurple/protocols/silc10/silc.c:1884
 msgid "Cipher"
 msgstr "愆�惘悸"

 #: ../libpurple/protocols/silc/silc.c:2088
-#: ../libpurple/protocols/silc10/silc.c:1888
+#: ../libpurple/protocols/silc10/silc.c:1894
 msgid "HMAC"
 msgstr "HMAC"

@@ -12257,27 +12449,27 @@
 msgstr "悋愕惠悽惆� 悋�愕惘�悸 悋��愕惠�惡��悸 悋�惠悋�悸"

 #: ../libpurple/protocols/silc/silc.c:2095
-#: ../libpurple/protocols/silc10/silc.c:1891
+#: ../libpurple/protocols/silc10/silc.c:1897
 msgid "Public key authentication"
 msgstr "悋愕惠�惓悋� 悋���惠悋忰 悋�惺���"

 #: ../libpurple/protocols/silc/silc.c:2098
-#: ../libpurple/protocols/silc10/silc.c:1894
+#: ../libpurple/protocols/silc10/silc.c:1900
 msgid "Block IMs without Key Exchange"
 msgstr "悋忰惴惘 悋�惘愕悋悧� 悋���惘�悸 惡�悋 惠惡悋惆� ��悋惠�忰"

 #: ../libpurple/protocols/silc/silc.c:2101
-#: ../libpurple/protocols/silc10/silc.c:1897
+#: ../libpurple/protocols/silc10/silc.c:1903
 msgid "Block messages to whiteboard"
 msgstr "悋忰惴惘 悋�惘愕悋悧� 悒�� 悋�愕惡�惘悸"

 #: ../libpurple/protocols/silc/silc.c:2104
-#: ../libpurple/protocols/silc10/silc.c:1900
+#: ../libpurple/protocols/silc10/silc.c:1906
 msgid "Automatically open whiteboard"
 msgstr "悋�惠忰 悋�愕惡�惘悸 惠��悋悧�悋"

 #: ../libpurple/protocols/silc/silc.c:2107
-#: ../libpurple/protocols/silc10/silc.c:1903
+#: ../libpurple/protocols/silc10/silc.c:1909
 msgid "Digitally sign and verify all messages"
 msgstr "��惺 � 惠忰�� �� �� 悋�惘愕悋悧�"

@@ -12376,28 +12568,28 @@
 msgid "Public Key Information"
 msgstr "�惺���悋惠 悋���惠悋忰 悋�惺���"

-#: ../libpurple/protocols/silc/util.c:565
-#: ../libpurple/protocols/silc10/util.c:555
+#: ../libpurple/protocols/silc/util.c:569
+#: ../libpurple/protocols/silc10/util.c:559
 msgid "Paging"
 msgstr ""

-#: ../libpurple/protocols/silc/util.c:571
-#: ../libpurple/protocols/silc10/util.c:561
+#: ../libpurple/protocols/silc/util.c:575
+#: ../libpurple/protocols/silc10/util.c:565
 msgid "Video Conferencing"
 msgstr "悋悴惠�悋惺 ��惆��"

-#: ../libpurple/protocols/silc/util.c:589
-#: ../libpurple/protocols/silc10/util.c:579
+#: ../libpurple/protocols/silc/util.c:594
+#: ../libpurple/protocols/silc10/util.c:584
 msgid "Computer"
 msgstr "悋�忰悋愕�惡"

-#: ../libpurple/protocols/silc/util.c:593
-#: ../libpurple/protocols/silc10/util.c:583
+#: ../libpurple/protocols/silc/util.c:598
+#: ../libpurple/protocols/silc10/util.c:588
 msgid "PDA"
 msgstr "PDA"

-#: ../libpurple/protocols/silc/util.c:595
-#: ../libpurple/protocols/silc10/util.c:585
+#: ../libpurple/protocols/silc/util.c:600
+#: ../libpurple/protocols/silc10/util.c:590
 msgid "Terminal"
 msgstr "愀惘��悸"

@@ -12421,59 +12613,55 @@
 msgid "No server statistics available"
 msgstr "�悋 惠惠��惘 悒忰惶悋悧�悋惠 ��悽悋惆��"

-#: ../libpurple/protocols/silc10/ops.c:1931
+#: ../libpurple/protocols/silc10/ops.c:1937
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "�愆�: 悒惶惆悋惘悸 �惆��悸. 惘�� 悋�惺���."

-#: ../libpurple/protocols/silc10/ops.c:1934
-msgid "Failure: Remote does not trust/support your public key"
-msgstr "�愆�: �悋 �惆惺� 悋�惡惺�惆 悖� �悋 �惓� �� ��惠悋忰� 悋�惺���"
-
-#: ../libpurple/protocols/silc10/ops.c:1937
-msgid "Failure: Remote does not support proposed KE group"
-msgstr "�愆�: �悋 �惆惺� 悋�惡惺�惆 �悴��惺悸 KE 悋���惠惘忰悸"
-
 #: ../libpurple/protocols/silc10/ops.c:1940
+msgid "Failure: Remote does not trust/support your public key"
+msgstr "�愆�: �悋 �惆惺� 悋�惡惺�惆 悖� �悋 �惓� �� ��惠悋忰� 悋�惺���"
+
+#: ../libpurple/protocols/silc10/ops.c:1943
+msgid "Failure: Remote does not support proposed KE group"
+msgstr "�愆�: �悋 �惆惺� 悋�惡惺�惆 �悴��惺悸 KE 悋���惠惘忰悸"
+
+#: ../libpurple/protocols/silc10/ops.c:1946
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "�愆�: �悋 �惆惺� 悋�惡惺�惆 悋�愆�惘悸 悋���惠惘忰悸"

-#: ../libpurple/protocols/silc10/ops.c:1943
+#: ../libpurple/protocols/silc10/ops.c:1949
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "�愆�: �悋 �惆惺� 悋�惡惺�惆 PKCS 悋���惠惘忰悸"

-#: ../libpurple/protocols/silc10/ops.c:1946
+#: ../libpurple/protocols/silc10/ops.c:1952
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "�愆�: �悋 �惆惺� 悋�惡惺�惆 惆悋�悸 悋�惠�惡�惆 悋���惠惘忰悸"

-#: ../libpurple/protocols/silc10/ops.c:1949
+#: ../libpurple/protocols/silc10/ops.c:1955
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "�愆�: �悋 �惆惺� 悋�惡惺�惆 HMAC 悋���惠惘忰悸"

-#: ../libpurple/protocols/silc10/ops.c:1951
+#: ../libpurple/protocols/silc10/ops.c:1957
 msgid "Failure: Incorrect signature"
 msgstr "�愆�: 惠���惺 愃�惘 惶忰�忰"

-#: ../libpurple/protocols/silc10/ops.c:1953
+#: ../libpurple/protocols/silc10/ops.c:1959
 msgid "Failure: Invalid cookie"
 msgstr "�愆�: ���� 愃�惘 惶悋�忰悸"

-#: ../libpurple/protocols/silc10/ops.c:1964
+#: ../libpurple/protocols/silc10/ops.c:1970
 msgid "Failure: Authentication failed"
 msgstr "�愆�: �愆� 悋�悋愕惠�惓悋�"

-#: ../libpurple/protocols/silc10/silc.c:182
+#: ../libpurple/protocols/silc10/silc.c:185
 msgid "Cannot initialize SILC Client connection"
 msgstr "惠惺悵�惘 悋愕惠惡惆悋悄 悋惠惶悋� 惺��� SILC"

-#: ../libpurple/protocols/silc10/silc.c:290
+#: ../libpurple/protocols/silc10/silc.c:294
 msgid "John Noname"
 msgstr "悋���� 悋�悽��"

-#: ../libpurple/protocols/silc10/silc.c:320
-msgid "Cannot find/access ~/.silc directory"
-msgstr "�愆� 悋�惺惓�惘 惺�� 悖� �惘悋悄悸 惆��� ~/.silc"
-
-#: ../libpurple/protocols/silc10/silc.c:334
+#: ../libpurple/protocols/silc10/silc.c:338
 #, c-format
 msgid "Could not load SILC key pair: %s"
 msgstr "惠惺悵�惘 惠忰��� 慍�悴 ��悋惠�忰 SILC: %s"
@@ -12518,36 +12706,36 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:2080
+#: ../libpurple/protocols/simple/simple.c:2073
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "��忰�悸 惡惘�惠���� SIP/SIMPLE"

 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:2081
+#: ../libpurple/protocols/simple/simple.c:2074
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "��忰�悸 惡惘�惠���� SIP/SIMPLE"

-#: ../libpurple/protocols/simple/simple.c:2109
+#: ../libpurple/protocols/simple/simple.c:2102
 msgid "Publish status (note: everyone may watch you)"
 msgstr "悋�愆惘 悋�忰悋�悸 (��忰�愀悸: ���� �悖� 愆悽惶 �愀悋�惺惠�悋)"

-#: ../libpurple/protocols/simple/simple.c:2115
+#: ../libpurple/protocols/simple/simple.c:2108
 msgid "Use UDP"
 msgstr "悋愕惠悽惆� UDP"

-#: ../libpurple/protocols/simple/simple.c:2117
+#: ../libpurple/protocols/simple/simple.c:2110
 msgid "Use proxy"
 msgstr "悋愕惠悽惆� �愕�愀悋"

-#: ../libpurple/protocols/simple/simple.c:2119
+#: ../libpurple/protocols/simple/simple.c:2112
 msgid "Proxy"
 msgstr "悋��愕�愀"

-#: ../libpurple/protocols/simple/simple.c:2121
+#: ../libpurple/protocols/simple/simple.c:2114
 msgid "Auth User"
 msgstr "悋愕惠�惓� �� 悋��愕惠悽惆�"

-#: ../libpurple/protocols/simple/simple.c:2123
+#: ../libpurple/protocols/simple/simple.c:2116
 msgid "Auth Domain"
 msgstr "悋愕惠�惓� �� 悋��愀悋�"

@@ -12706,8 +12894,7 @@
 msgid "Password Change Successful"
 msgstr "惠愃��惘惠 ���悸 悋�愕惘 惡�悴悋忰"

-#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:6336
-#: ../pidgin/gtkblist.c:6673
+#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:6764
 msgid "_Group:"
 msgstr "_�悴��惺悸:"

@@ -12771,41 +12958,41 @@
 msgid "TOC Protocol Plugin"
 msgstr "��忰�悸 惡惘�惠���� TOC"

-#: ../libpurple/protocols/yahoo/yahoo.c:793
+#: ../libpurple/protocols/yahoo/yahoo.c:745
 #, c-format
 msgid "%s has sent you a webcam invite, which is not yet supported."
 msgstr "悖惘愕� 悒��� %s 惆惺�悸 �悋��惘悋 �惡� ����悋 ��愕惠 �惆惺��悸 惡惺惆."

-#: ../libpurple/protocols/yahoo/yahoo.c:849
+#: ../libpurple/protocols/yahoo/yahoo.c:803
 msgid "Your Yahoo! message did not get sent."
 msgstr "�� 惠�惘愕� 惘愕悋�悸 �悋���!"

-#: ../libpurple/protocols/yahoo/yahoo.c:964
+#: ../libpurple/protocols/yahoo/yahoo.c:916
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "惘愕悋�悸 �惴悋� �悋��! �悖悴� %s:"

-#: ../libpurple/protocols/yahoo/yahoo.c:1042
+#: ../libpurple/protocols/yahoo/yahoo.c:990
 msgid "Authorization denied message:"
 msgstr "惘愕悋�悸 ��惺 悋�惠惶惘�忰:"

-#: ../libpurple/protocols/yahoo/yahoo.c:1060
+#: ../libpurple/protocols/yahoo/yahoo.c:1008
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
 "following reason: %s."
 msgstr "惘�惷 %s (惡悖惓惘 惘悴惺�) �惡�� 愀�惡� 悒惷悋�惠� 悒�� �悋悧�惠� ��愕惡惡 悋�惠悋��: %s."

-#: ../libpurple/protocols/yahoo/yahoo.c:1063
+#: ../libpurple/protocols/yahoo/yahoo.c:1011
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr "惘�惷 %s (惡悖惓惘 惘悴惺�) 愀�惡� 悒惷悋�惠� 悒�� �悋悧�惠�."

-#: ../libpurple/protocols/yahoo/yahoo.c:1065
+#: ../libpurple/protocols/yahoo/yahoo.c:1013
 msgid "Add buddy rejected"
 msgstr "惘�惷惠 悒惷悋�悸 惶惆��"

-#: ../libpurple/protocols/yahoo/yahoo.c:2019
+#: ../libpurple/protocols/yahoo/yahoo.c:1997
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -12815,11 +13002,11 @@
 "��惆 愀�惡 悽悋惆�� �悋�� 悋愕惠悽惆悋� 愀惘��悸 悋愕惠�惓悋� 愃�惘 �惺惘��悸 ��悋. �惆 �悋 惠惠��� �� "
 "悋����悴 悒�� �悋�� 惡�悴悋忰. 惘悋悴惺 %s 惡忰惓悋 惺� 惠忰惆�惓悋惠."

-#: ../libpurple/protocols/yahoo/yahoo.c:2022
+#: ../libpurple/protocols/yahoo/yahoo.c:2000
 msgid "Failed Yahoo! Authentication"
 msgstr "�愆� 悋愕惠�惓悋� �悋��!"

-#: ../libpurple/protocols/yahoo/yahoo.c:2088
+#: ../libpurple/protocols/yahoo/yahoo.c:2078
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -12828,48 +13015,52 @@
 "忰悋��惠� 惠悴悋�� %s� ���� ��悴�惆 �� �悋悧�悸 悋惶惆�悋悧�. 悋�惷愃愀 惺�� \"�惺�\" 愕�忰悵� � "
 "�惠悴悋�� 悋�惶惆��."

-#: ../libpurple/protocols/yahoo/yahoo.c:2091
+#: ../libpurple/protocols/yahoo/yahoo.c:2081
 msgid "Ignore buddy?"
 msgstr "悖悖惠悴悋�� 悋�惶惆���"

-#: ../libpurple/protocols/yahoo/yahoo.c:2156
+#: ../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 "忰愕悋惡� ����� �� �惷�� ��悴 �� ���惺 �悋���! 惺�� 悋��惡."

-#: ../libpurple/protocols/yahoo/yahoo.c:2159
+#: ../libpurple/protocols/yahoo/yahoo.c:2155
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "悽愀悖 �悴��� 惘�� %Id. 悋����悴 �� ���惺 �悋���! 惺�� 悋��惡 �惆 �惶忰忰 �悵� 悋��愆��悸."

-#: ../libpurple/protocols/yahoo/yahoo.c:2212
+#: ../libpurple/protocols/yahoo/yahoo.c:2208
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr "惠惺悵惘惠 悒惷悋�悸 悋�惶惆�� %s 悒�� 悋��悴��惺悸 %s 惺�� �悋悧�悸 悋�悽悋惆�� ��忰愕悋惡 %s."

-#: ../libpurple/protocols/yahoo/yahoo.c:2215
+#: ../libpurple/protocols/yahoo/yahoo.c:2211
 msgid "Could not add buddy to server list"
 msgstr "惠惺悵惘惠 悒惷悋�悸 悋�惶惆�� 悒�� �悋悧�悸 悋�悽悋惆��."

-#: ../libpurple/protocols/yahoo/yahoo.c:2334
+#: ../libpurple/protocols/yahoo/yahoo.c:2333
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ %s/%s/%s.swf �愕��惺] %s"

-#: ../libpurple/protocols/yahoo/yahoo.c:2690
+#: ../libpurple/protocols/yahoo/yahoo.c:2689
 msgid "Received unexpected HTTP response from server."
 msgstr "惠���惠 悋愕惠悴悋惡悸 愃�惘 �惠���惺悸 �� 悽悋惆�� HTTP."

-#: ../libpurple/protocols/yahoo/yahoo.c:2719
-#: ../libpurple/protocols/yahoo/yahoo.c:2907
-#: ../libpurple/protocols/yahoo/yahoo.c:3012
-#: ../libpurple/protocols/yahoo/yahoo.c:3023
-#: ../libpurple/protocols/yahoo/yahoochat.c:1514
-#: ../libpurple/protocols/yahoo/yahoochat.c:1584
+#: ../libpurple/protocols/yahoo/yahoo.c:2718
+#: ../libpurple/protocols/yahoo/yahoo.c:2906
+#: ../libpurple/protocols/yahoo/yahoo.c:3011
+#: ../libpurple/protocols/yahoo/yahoo.c:3022
+#: ../libpurple/protocols/yahoo/yahoochat.c:1525
+#: ../libpurple/protocols/yahoo/yahoochat.c:1595
 #: ../libpurple/protocols/yahoo/ycht.c:586
 msgid "Connection problem"
 msgstr "�愆��悸 �� 悋�悋惠惶悋�"

-#: ../libpurple/protocols/yahoo/yahoo.c:2745
+#: ../libpurple/protocols/yahoo/yahoo.c:2744
 #, c-format
 msgid ""
 "Lost connection with %s:\n"
@@ -12878,7 +13069,7 @@
 "悋��愀惺 悋�悋惠惶悋� �惺 %s:\n"
 "%s"

-#: ../libpurple/protocols/yahoo/yahoo.c:2770
+#: ../libpurple/protocols/yahoo/yahoo.c:2769
 #, c-format
 msgid ""
 "Could not establish a connection with %s:\n"
@@ -12887,107 +13078,107 @@
 "惠惺悵�惘 悒�悋�悸 悋惠惶悋� �惺 %s:\n"
 "%s"

-#: ../libpurple/protocols/yahoo/yahoo.c:3137
-#: ../libpurple/protocols/yahoo/yahoo.c:3823
+#: ../libpurple/protocols/yahoo/yahoo.c:3138
+#: ../libpurple/protocols/yahoo/yahoo.c:3829
 msgid "Not at Home"
 msgstr "��愕 惡悋���慍�"

-#: ../libpurple/protocols/yahoo/yahoo.c:3139
-#: ../libpurple/protocols/yahoo/yahoo.c:3826
+#: ../libpurple/protocols/yahoo/yahoo.c:3140
+#: ../libpurple/protocols/yahoo/yahoo.c:3832
 msgid "Not at Desk"
 msgstr "��愕 惺�� 悋���惠惡"

-#: ../libpurple/protocols/yahoo/yahoo.c:3141
-#: ../libpurple/protocols/yahoo/yahoo.c:3829
+#: ../libpurple/protocols/yahoo/yahoo.c:3142
+#: ../libpurple/protocols/yahoo/yahoo.c:3835
 msgid "Not in Office"
 msgstr "��愕 �� 悋���惠惡"

-#: ../libpurple/protocols/yahoo/yahoo.c:3145
-#: ../libpurple/protocols/yahoo/yahoo.c:3835
+#: ../libpurple/protocols/yahoo/yahoo.c:3146
+#: ../libpurple/protocols/yahoo/yahoo.c:3841
 msgid "On Vacation"
 msgstr "�� 悒悴悋慍悸"

-#: ../libpurple/protocols/yahoo/yahoo.c:3149
-#: ../libpurple/protocols/yahoo/yahoo.c:3841
+#: ../libpurple/protocols/yahoo/yahoo.c:3150
+#: ../libpurple/protocols/yahoo/yahoo.c:3847
 msgid "Stepped Out"
 msgstr "悽惘悴"

-#: ../libpurple/protocols/yahoo/yahoo.c:3242
-#: ../libpurple/protocols/yahoo/yahoo.c:3272
+#: ../libpurple/protocols/yahoo/yahoo.c:3243
+#: ../libpurple/protocols/yahoo/yahoo.c:3273
 msgid "Not on server list"
 msgstr "��愕 惺�� �悋悧�悸 悋�悽悋惆��"

-#: ../libpurple/protocols/yahoo/yahoo.c:3289
-#: ../libpurple/protocols/yahoo/yahoo.c:3347
+#: ../libpurple/protocols/yahoo/yahoo.c:3290
+#: ../libpurple/protocols/yahoo/yahoo.c:3348
 msgid "Appear Online"
 msgstr "悋惡惆 �惠惶�悋"

-#: ../libpurple/protocols/yahoo/yahoo.c:3292
-#: ../libpurple/protocols/yahoo/yahoo.c:3368
+#: ../libpurple/protocols/yahoo/yahoo.c:3293
+#: ../libpurple/protocols/yahoo/yahoo.c:3369
 msgid "Appear Permanently Offline"
 msgstr "悋惡惆 愃�惘 �惠惶� ��悖惡惆"

-#: ../libpurple/protocols/yahoo/yahoo.c:3310
+#: ../libpurple/protocols/yahoo/yahoo.c:3311
 msgid "Presence"
 msgstr "悋�惠�悋悴惆"

-#: ../libpurple/protocols/yahoo/yahoo.c:3353
+#: ../libpurple/protocols/yahoo/yahoo.c:3354
 msgid "Appear Offline"
-msgstr "悋惴�惘 愃�惘 �惠惶�"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3362
+msgstr "悖惴�惘 愃�惘 �惠惶�"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:3363
 msgid "Don't Appear Permanently Offline"
 msgstr "�悋 惠惴�惘 愃�惘 �惠惶� ��悖惡惆"

-#: ../libpurple/protocols/yahoo/yahoo.c:3410
+#: ../libpurple/protocols/yahoo/yahoo.c:3411
 msgid "Join in Chat"
 msgstr "悋�惷� 悒�� 惆惘惆愆悸"

-#: ../libpurple/protocols/yahoo/yahoo.c:3416
+#: ../libpurple/protocols/yahoo/yahoo.c:3417
 msgid "Initiate Conference"
 msgstr "悋惡惆悖 悋悴惠�悋惺悋"

-#: ../libpurple/protocols/yahoo/yahoo.c:3444
+#: ../libpurple/protocols/yahoo/yahoo.c:3445
 msgid "Presence Settings"
 msgstr "悽惶悋悧惶 悋�惠�悋悴惆"

-#: ../libpurple/protocols/yahoo/yahoo.c:3450
+#: ../libpurple/protocols/yahoo/yahoo.c:3451
 msgid "Start Doodling"
 msgstr "悒惡惆悖 Doodling"

-#: ../libpurple/protocols/yahoo/yahoo.c:3551
+#: ../libpurple/protocols/yahoo/yahoo.c:3557
 msgid "Activate which ID?"
 msgstr "悖� ���悸 悖��愆�愀�"

-#: ../libpurple/protocols/yahoo/yahoo.c:3562
+#: ../libpurple/protocols/yahoo/yahoo.c:3568
 msgid "Join whom in chat?"
 msgstr "�� 悖惷� 悒�� 悋�惆惘惆愆悸�"

-#: ../libpurple/protocols/yahoo/yahoo.c:3574
+#: ../libpurple/protocols/yahoo/yahoo.c:3580
 msgid "Activate ID..."
 msgstr "�愆�愀 ���悸..."

-#: ../libpurple/protocols/yahoo/yahoo.c:3578
+#: ../libpurple/protocols/yahoo/yahoo.c:3584
 msgid "Join User in Chat..."
 msgstr "惷�� �愕惠悽惆�悋 悒�� 悋�惆惘惆愆悸..."

-#: ../libpurple/protocols/yahoo/yahoo.c:3583
+#: ../libpurple/protocols/yahoo/yahoo.c:3589
 msgid "Open Inbox"
 msgstr "悋�惠忰 惶�惆�� 悋��悋惘惆"

-#: ../libpurple/protocols/yahoo/yahoo.c:4192
+#: ../libpurple/protocols/yahoo/yahoo.c:4178
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr ""
 "join &lt;room&gt;: \n"
 "悋�惷� 悒�� 愃惘�悸 惆惘惆愆悸 �� 愆惡�悸 �悋��"

-#: ../libpurple/protocols/yahoo/yahoo.c:4197
+#: ../libpurple/protocols/yahoo/yahoo.c:4183
 msgid "list: List rooms on the Yahoo network"
 msgstr ""
 "list: \n"
 "悋愕惘惆 悋�愃惘� �� 愆惡�悸 �悋��"

-#: ../libpurple/protocols/yahoo/yahoo.c:4205
+#: ../libpurple/protocols/yahoo/yahoo.c:4191
 msgid "doodle: Request user to start a Doodle session"
 msgstr ""
 "doodle: \n"
@@ -13003,56 +13194,56 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4414
-#: ../libpurple/protocols/yahoo/yahoo.c:4416
+#: ../libpurple/protocols/yahoo/yahoo.c:4400
+#: ../libpurple/protocols/yahoo/yahoo.c:4402
 msgid "Yahoo Protocol Plugin"
 msgstr "��忰�悸 惡惘�惠���� �悋��"

-#: ../libpurple/protocols/yahoo/yahoo.c:4439
+#: ../libpurple/protocols/yahoo/yahoo.c:4425
 msgid "Yahoo Japan"
 msgstr "�悋�� 悋��悋惡悋�"

-#: ../libpurple/protocols/yahoo/yahoo.c:4442
+#: ../libpurple/protocols/yahoo/yahoo.c:4428
 msgid "Pager server"
 msgstr "悽悋惆�� 悋�悋愕惠惆惺悋悄"

-#: ../libpurple/protocols/yahoo/yahoo.c:4445
+#: ../libpurple/protocols/yahoo/yahoo.c:4431
 msgid "Japan Pager server"
 msgstr "悽悋惆�� 悋愕惠惆惺悋悄 悋��悋惡悋�"

-#: ../libpurple/protocols/yahoo/yahoo.c:4448
+#: ../libpurple/protocols/yahoo/yahoo.c:4434
 msgid "Pager port"
 msgstr "���悵 悋�悋愕惠惆惺悋悄"

-#: ../libpurple/protocols/yahoo/yahoo.c:4451
+#: ../libpurple/protocols/yahoo/yahoo.c:4437
 msgid "File transfer server"
 msgstr "悽悋惆�� ��� 悋����悋惠"

-#: ../libpurple/protocols/yahoo/yahoo.c:4454
+#: ../libpurple/protocols/yahoo/yahoo.c:4440
 msgid "Japan file transfer server"
 msgstr "悽悋惆�� ��� ����悋惠 �悋惡悋��"

+#: ../libpurple/protocols/yahoo/yahoo.c:4443
+msgid "File transfer port"
+msgstr "���悵 ��� 悋����悋惠"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4446
+msgid "Chat room locale"
+msgstr "�忰���悸 愃惘�悸 悋�惆惘惆愆悸"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4449
+msgid "Ignore conference and chatroom invitations"
+msgstr "惠悴悋�� 惆惺�悋惠 悋�悋悴惠�悋惺悋惠 � 愃惘� 悋�惆惘惆愆悸"
+
 #: ../libpurple/protocols/yahoo/yahoo.c:4457
-msgid "File transfer port"
-msgstr "���悵 ��� 悋����悋惠"
+msgid "Chat room list URL"
+msgstr "�愕悋惘 �悋悧�悸 愃惘�悸 悋��忰悋惆惓悸."

 #: ../libpurple/protocols/yahoo/yahoo.c:4460
-msgid "Chat room locale"
-msgstr "�忰���悸 愃惘�悸 悋�惆惘惆愆悸"
+msgid "Yahoo Chat server"
+msgstr "悽悋惆�� 惆惘惆愆悸 �悋��"

 #: ../libpurple/protocols/yahoo/yahoo.c:4463
-msgid "Ignore conference and chatroom invitations"
-msgstr "惠悴悋�� 惆惺�悋惠 悋�悋悴惠�悋惺悋惠 � 愃惘� 悋�惆惘惆愆悸"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4471
-msgid "Chat room list URL"
-msgstr "�愕悋惘 �悋悧�悸 愃惘�悸 悋��忰悋惆惓悸."
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4474
-msgid "Yahoo Chat server"
-msgstr "悽悋惆�� 惆惘惆愆悸 �悋��"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4477
 msgid "Yahoo Chat port"
 msgstr "���悵 惆惘惆愆悸 �悋��"

@@ -13066,12 +13257,12 @@
 #: ../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:1109
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1509
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1110
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1514
 msgid "Unable to establish file descriptor."
 msgstr "惠惺悵�惘 悒�愆悋悄 ��惶�� ���."

-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1404
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1409
 #, c-format
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "��%s �忰悋�� 悖� �惘愕� �� �悴��惺悸 �� %Id ���悋惠.\n"
@@ -13100,53 +13291,53 @@
 "web browser:"
 msgstr "悒悵悋 ��惠 惠惘�惆 悋愕惠惺惘悋惷 �悵� 悋��悋忰悸 �惺��� �惠忰 悋�惘悋惡愀 悋�惠悋�� �� �惠惶�忰 悋��惡:"

-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1034
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1040
 msgid "Yahoo! ID"
 msgstr "����悸 �悋��!"

-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1109
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1113
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1117
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1116
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1120
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1124
 msgid "Hobbies"
 msgstr "悋���悋�悋惠"

-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1127
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1131
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1134
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1138
 msgid "Latest News"
 msgstr "悛悽惘 悋�悖悽惡悋惘"

-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1152
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1159
 msgid "Home Page"
 msgstr "悋�惶�忰悸 悋�惘悧�愕��悸"

-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1167
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1174
 msgid "Cool Link 1"
 msgstr "惘悋惡愀 惘悋悧惺 1"

-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1172
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1179
 msgid "Cool Link 2"
 msgstr "惘悋惡愀 惘悋悧惺 2"

-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1176
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1183
 msgid "Cool Link 3"
 msgstr "惘悋惡愀 惘悋悧惺 3"

-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1190
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1197
 msgid "Last Update"
 msgstr "悋�惠忰惆�惓 悋�悖悽�惘"

-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1199
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1206
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "�惺���悋惠 悋��愕惠悽惆� %s 愃�惘 �惠悋忰悸"

-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1205
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1212
 msgid ""
 "Sorry, this profile seems to be in a language or format that is not "
 "supported at this time."
 msgstr "惺悵惘悋� �惡惆� 悖� 悋��悋忰悸 ��惠�惡悸 惡�愃悸 悖� 惶�愃悸 愃�惘 �惆惺��悸 �� 悋���惠 悋�忰悋��."

-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1221
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1228
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
 "server-side problem. Please try again later."
@@ -13154,7 +13345,7 @@
 "惠惺悵惘 悴�惡 �悋忰悸 悋��愕惠悽惆�. �悵� 悋��愆��悸 愕惡惡�悋 惺�� 悋�悖惘悴忰 惺愀� �悗�惠 �� 悋�悽悋惆��.�� "
 "�惷�� 忰悋�� �惘悸 悖悽惘� �悋忰��悋."

-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1224
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1231
 msgid ""
 "Could not retrieve the user's profile. This most likely means that the user "
 "does not exist; however, Yahoo! sometimes does fail to find a user's "
@@ -13164,39 +13355,39 @@
 "悖� �悋�� ��愆� �� 悒�悴悋惆 悋��愕惠悽惆��� 悖忰�悋��悋. 悒悵悋 ��惠 �惠悖�惆悋 悖� �悵悋 悋��愕惠悽惆� "
 "��悴�惆 忰悋�� �惘悸 悖悽惘� �悋忰��悋."

-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1231
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1238
 msgid "The user's profile is empty."
 msgstr "�悋忰悸 悋��愕惠悽惆� 悽悋��悸."

-#: ../libpurple/protocols/yahoo/yahoochat.c:217
+#: ../libpurple/protocols/yahoo/yahoochat.c:222
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr "惘�惷 %s 惆惺�惠� �悋悴惠�悋惺 �� 愃惘�悸 \"%s\" 惡愕惡惡 \"%s\"."

-#: ../libpurple/protocols/yahoo/yahoochat.c:219
+#: ../libpurple/protocols/yahoo/yahoochat.c:224
 msgid "Invitation Rejected"
 msgstr "惘���惷惠 悋�惆惺�悸"

-#: ../libpurple/protocols/yahoo/yahoochat.c:438
+#: ../libpurple/protocols/yahoo/yahoochat.c:443
 msgid "Failed to join chat"
 msgstr "�愆� 悋�悋�惷�悋� 悒�� �惆惘惆愆悸"

 #. -6
-#: ../libpurple/protocols/yahoo/yahoochat.c:441
+#: ../libpurple/protocols/yahoo/yahoochat.c:446
 msgid "Unknown room"
 msgstr "愃惘�悸 �悴���悸"

 #. -15
-#: ../libpurple/protocols/yahoo/yahoochat.c:444
+#: ../libpurple/protocols/yahoo/yahoochat.c:449
 msgid "Maybe the room is full"
 msgstr "惘惡�悋 惠��� 悋�愃惘�悸 ��惠�悧悸"

 #. -35
-#: ../libpurple/protocols/yahoo/yahoochat.c:447
+#: ../libpurple/protocols/yahoo/yahoochat.c:452
 msgid "Not available"
 msgstr "愃�惘 �惠悋忰"

-#: ../libpurple/protocols/yahoo/yahoochat.c:451
+#: ../libpurple/protocols/yahoo/yahoochat.c:456
 msgid ""
 "Unknown error. You may need to logout and wait five minutes before being "
 "able to rejoin a chatroom"
@@ -13204,38 +13395,38 @@
 "悽愀悖 �悴���. �惆 惠忰惠悋悴 悒�� 悋�悽惘�悴 �� 悋�忰愕悋惡 � 悋�悋�惠惴悋惘 悽�愕 惆�悋悧� �惡� 悋����悴 "
 "�悴惆惆悋 � �忰悋��悸 惆悽�� 愃惘�悸 悋�惆惘惆愆悸 �惘悸 悖悽惘�"

-#: ../libpurple/protocols/yahoo/yahoochat.c:534
+#: ../libpurple/protocols/yahoo/yahoochat.c:539
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "惠�惆�惘惆�愆 悋�悛� �� %s."

-#: ../libpurple/protocols/yahoo/yahoochat.c:719
+#: ../libpurple/protocols/yahoo/yahoochat.c:728
 msgid "Failed to join buddy in chat"
 msgstr "�愆� 惷� 惶惆�� ��惆惘惆愆悸"

-#: ../libpurple/protocols/yahoo/yahoochat.c:720
+#: ../libpurple/protocols/yahoo/yahoochat.c:729
 msgid "Maybe they're not in a chat?"
 msgstr "惘惡�悋 ��愕�悋 �� 惆惘惆愆悸�"

-#: ../libpurple/protocols/yahoo/yahoochat.c:1416
-#: ../libpurple/protocols/yahoo/yahoochat.c:1442
+#: ../libpurple/protocols/yahoo/yahoochat.c:1425
+#: ../libpurple/protocols/yahoo/yahoochat.c:1451
 msgid "Fetching the room list failed."
 msgstr "�愆� 悋�忰惶�� 惺�� �悋悧�悸 悋�愃惘�."

-#: ../libpurple/protocols/yahoo/yahoochat.c:1500
+#: ../libpurple/protocols/yahoo/yahoochat.c:1511
 msgid "Voices"
 msgstr "悋�悖惶�悋惠"

-#: ../libpurple/protocols/yahoo/yahoochat.c:1503
+#: ../libpurple/protocols/yahoo/yahoochat.c:1514
 msgid "Webcams"
 msgstr "�悋��惘悋 ��惡"

-#: ../libpurple/protocols/yahoo/yahoochat.c:1514
-#: ../libpurple/protocols/yahoo/yahoochat.c:1584
+#: ../libpurple/protocols/yahoo/yahoochat.c:1525
+#: ../libpurple/protocols/yahoo/yahoochat.c:1595
 msgid "Unable to fetch room list."
 msgstr "惠惺悵�惘 悋忰惷悋惘 �悋悧�悸 悋�愃惘�."

-#: ../libpurple/protocols/yahoo/yahoochat.c:1577
+#: ../libpurple/protocols/yahoo/yahoochat.c:1588
 msgid "User Rooms"
 msgstr "愃惘� 悋��愕惠悽惆���"

@@ -13252,87 +13443,87 @@
 "悋��愀惺 悋�悋惠惶悋� 惡悋�悽悋惆��\n"
 "%s"

-#: ../libpurple/protocols/zephyr/zephyr.c:354
+#: ../libpurple/protocols/zephyr/zephyr.c:358
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
 msgstr "(忰惆惓 惺愀� 悖惓�悋悄 惠忰��� 悋�惘愕悋�悸. \t 悋�忰惶 悽�悋惘悋惠 '悋�惠惘��慍' �� �忰惘惘 悋�忰愕悋惡悋惠)"

-#: ../libpurple/protocols/zephyr/zephyr.c:752
+#: ../libpurple/protocols/zephyr/zephyr.c:756
 #, c-format
 msgid "Unable to send to chat %s,%s,%s"
 msgstr "惠惺悵�惘 悋�悒惘愕悋� ��惆惘惆愆悸 %s�%s�%s"

-#: ../libpurple/protocols/zephyr/zephyr.c:791
-#: ../libpurple/protocols/zephyr/zephyr.c:1210
+#: ../libpurple/protocols/zephyr/zephyr.c:795
+#: ../libpurple/protocols/zephyr/zephyr.c:1170
 msgid "Hidden or not logged-in"
 msgstr "�悽惠�� 悖� 愃�惘 �悋�悴"

-#: ../libpurple/protocols/zephyr/zephyr.c:797
-#: ../libpurple/protocols/zephyr/zephyr.c:1212
+#: ../libpurple/protocols/zephyr/zephyr.c:801
+#: ../libpurple/protocols/zephyr/zephyr.c:1172
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>惺�惆 %s ��悵 %s"

-#: ../libpurple/protocols/zephyr/zephyr.c:1546
-#: ../libpurple/protocols/zephyr/zephyr.c:1547
+#: ../libpurple/protocols/zephyr/zephyr.c:1510
+#: ../libpurple/protocols/zephyr/zephyr.c:1511
 msgid "Anyone"
 msgstr "悖� 愆悽惶"

-#: ../libpurple/protocols/zephyr/zephyr.c:2354
+#: ../libpurple/protocols/zephyr/zephyr.c:2369
 msgid "_Class:"
 msgstr "_�悧悸:"

-#: ../libpurple/protocols/zephyr/zephyr.c:2360
+#: ../libpurple/protocols/zephyr/zephyr.c:2375
 msgid "_Instance:"
 msgstr "_�惘悸:"

-#: ../libpurple/protocols/zephyr/zephyr.c:2366
+#: ../libpurple/protocols/zephyr/zephyr.c:2381
 msgid "_Recipient:"
 msgstr "悋�_�愕惠��:"

-#: ../libpurple/protocols/zephyr/zephyr.c:2377
+#: ../libpurple/protocols/zephyr/zephyr.c:2392
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "�愆�惠 �忰悋��悸 悋�悋愆惠惘悋� �� %s� %s� %s"

-#: ../libpurple/protocols/zephyr/zephyr.c:2690
+#: ../libpurple/protocols/zephyr/zephyr.c:2705
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr ""
 "zlocate &lt;nick&gt;: \n"
 "悋惡忰惓 惺� �愕惠悽惆�"

-#: ../libpurple/protocols/zephyr/zephyr.c:2695
+#: ../libpurple/protocols/zephyr/zephyr.c:2710
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr ""
 "zl &lt;nick&gt;:\n"
 "悋惡忰惓 惺� �愕惠悽惆�"

-#: ../libpurple/protocols/zephyr/zephyr.c:2700
+#: ../libpurple/protocols/zephyr/zephyr.c:2715
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
-msgstr ""
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2705
+msgstr "inst &lt;instance&gt;: 忰惆惆 悋�愕�惘�惘悸 悋�惠� 惠愕惠悽惆��悋 �悵� 悋��悧悸"
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2720
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
-msgstr ""
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2710
+msgstr "instance &lt;instance&gt;: 忰惆惆 悋�愕�惘�惘悸 悋�惠� 惠愕惠悽惆��悋 �悵� 悋��悧悸"
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2725
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
-msgstr ""
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2716
+msgstr "topic &lt;instance&gt;: 忰惆惆 悋�愕�惘�惘悸 悋�惠� 惠愕惠悽惆��悋 �悵� 悋��悧悸"
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2731
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr ""
 "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;:\n"
 "悋�惷� �惆惘惆愆悸 悴惆�惆悸"

-#: ../libpurple/protocols/zephyr/zephyr.c:2721
+#: ../libpurple/protocols/zephyr/zephyr.c:2736
 msgid "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr ""
 "zi &lt;instance&gt;: \n"
 "悖惘愕� 惘愕悋�悸 悒�� &lt;message,<i>instance</i>,*&gt;"

-#: ../libpurple/protocols/zephyr/zephyr.c:2727
+#: ../libpurple/protocols/zephyr/zephyr.c:2742
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
@@ -13340,7 +13531,7 @@
 "zci &lt;class&gt; &lt;instance&gt;: \n"
 "悖惘愕� 惘愕悋�悸 悒�� &lt;<i>class</i>,<i>instance</i>,*&gt;"

-#: ../libpurple/protocols/zephyr/zephyr.c:2733
+#: ../libpurple/protocols/zephyr/zephyr.c:2748
 msgid ""
 "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
 "<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
@@ -13348,7 +13539,7 @@
 "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: \n"
 "悖惘愕� 惘愕悋�悸 悒�� &lt;<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"

-#: ../libpurple/protocols/zephyr/zephyr.c:2739
+#: ../libpurple/protocols/zephyr/zephyr.c:2754
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
@@ -13356,17 +13547,17 @@
 "zir &lt;instance&gt; &lt;recipient&gt;:\n"
 "悖惘愕� 惘愕悋�悸 悒�� &lt;MESSAGE,<i>instance</i>,<i>recipient</i>&gt;"

-#: ../libpurple/protocols/zephyr/zephyr.c:2744
+#: ../libpurple/protocols/zephyr/zephyr.c:2759
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr ""
 "zc &lt;class&gt;:\n"
 "悖惘愕� 惘愕悋�悸 悒�� &lt;<i>class</i>,PERSONAL,*&gt;"

-#: ../libpurple/protocols/zephyr/zephyr.c:2850
+#: ../libpurple/protocols/zephyr/zephyr.c:2835
 msgid "Resubscribe"
 msgstr "悖惺惆 悋�悋愆惠惘悋�"

-#: ../libpurple/protocols/zephyr/zephyr.c:2853
+#: ../libpurple/protocols/zephyr/zephyr.c:2838
 msgid "Retrieve subscriptions from server"
 msgstr "悋忰惶� 惺�� 悋�悋愆惠惘悋�悋惠 �� 悋�悽悋惆��"

@@ -13380,45 +13571,45 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/zephyr/zephyr.c:2946
-#: ../libpurple/protocols/zephyr/zephyr.c:2948
+#: ../libpurple/protocols/zephyr/zephyr.c:2931
+#: ../libpurple/protocols/zephyr/zephyr.c:2933
 msgid "Zephyr Protocol Plugin"
 msgstr "��忰�悸 惡惘�惠���� Zephyr"

-#: ../libpurple/protocols/zephyr/zephyr.c:2973
+#: ../libpurple/protocols/zephyr/zephyr.c:2958
 msgid "Use tzc"
 msgstr "悋愕惠悽惆� tzc"

-#: ../libpurple/protocols/zephyr/zephyr.c:2976
+#: ../libpurple/protocols/zephyr/zephyr.c:2961
 msgid "tzc command"
 msgstr "悖�惘 tzc"

-#: ../libpurple/protocols/zephyr/zephyr.c:2979
+#: ../libpurple/protocols/zephyr/zephyr.c:2964
 msgid "Export to .anyone"
 msgstr "惶惆�惘 悒�� .anyone"

-#: ../libpurple/protocols/zephyr/zephyr.c:2982
+#: ../libpurple/protocols/zephyr/zephyr.c:2967
 msgid "Export to .zephyr.subs"
 msgstr "惶惆�惘 悒�� .zephyr.subs"

-#: ../libpurple/protocols/zephyr/zephyr.c:2985
+#: ../libpurple/protocols/zephyr/zephyr.c:2970
 msgid "Import from .anyone"
 msgstr "悋愕惠�惘惆 �� .anyone"

-#: ../libpurple/protocols/zephyr/zephyr.c:2988
+#: ../libpurple/protocols/zephyr/zephyr.c:2973
 msgid "Import from .zephyr.subs"
 msgstr "悋愕惠�惘惆 �� .zephyr.subs"

-#: ../libpurple/protocols/zephyr/zephyr.c:2991
+#: ../libpurple/protocols/zephyr/zephyr.c:2976
 msgid "Realm"
 msgstr "惺悋��"

-#: ../libpurple/protocols/zephyr/zephyr.c:2994
+#: ../libpurple/protocols/zephyr/zephyr.c:2979
 msgid "Exposure"
 msgstr "悋�惠惺惘�惷"

-#: ../libpurple/proxy.c:461 ../libpurple/proxy.c:902 ../libpurple/proxy.c:1061
-#: ../libpurple/proxy.c:1632
+#: ../libpurple/proxy.c:486 ../libpurple/proxy.c:933 ../libpurple/proxy.c:1092
+#: ../libpurple/proxy.c:1695
 #, c-format
 msgid ""
 "Unable to create socket:\n"
@@ -13427,46 +13618,46 @@
 "惠惺悵�惘 悒�愆悋悄 ��惡愕:\n"
 "%s"

-#: ../libpurple/proxy.c:662
+#: ../libpurple/proxy.c:687
 #, c-format
 msgid "Unable to parse response from HTTP proxy: %s\n"
 msgstr "惠惺悵�惘 惠忰��� 悋愕惠悴悋惡悸 �� 悽悋惆�� �愕�愀 HTTP: %s \n"

-#: ../libpurple/proxy.c:702 ../libpurple/proxy.c:750 ../libpurple/proxy.c:786
-#: ../libpurple/proxy.c:798
+#: ../libpurple/proxy.c:727 ../libpurple/proxy.c:776 ../libpurple/proxy.c:814
+#: ../libpurple/proxy.c:826
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "悽愀悖 �� 悋惠惶悋� �愕�愀 HTTP %Id"

-#: ../libpurple/proxy.c:794
+#: ../libpurple/proxy.c:822
 #, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling."
 msgstr "悋��惶�� ����惺: �悋 �愕�忰 悽悋惆�� �愕�愀 HTTP 惡悖���悸 悋����悵 %Id."

-#: ../libpurple/proxy.c:1022
+#: ../libpurple/proxy.c:1053
 #, c-format
 msgid "Error resolving %s"
 msgstr "悽愀悖 悖惓�悋悄 悋愕惠悴�悋悄 %s"

-#: ../libpurple/proxy.c:1730
+#: ../libpurple/proxy.c:1793
 msgid "Could not resolve host name"
 msgstr "�悋���� 悋愕惠悴�悋悄 悋愕� 悋��惷��"

 #. *
 #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
 #.
-#: ../libpurple/request.h:1444
+#: ../libpurple/request.h:1391 ../pidgin/gtkblist.c:552
 msgid "_Yes"
 msgstr "_�惺�"

-#: ../libpurple/request.h:1444
+#: ../libpurple/request.h:1391 ../pidgin/gtkblist.c:552
 msgid "_No"
 msgstr "_�悋"

 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
-#: ../libpurple/request.h:1464
+#: ../libpurple/request.h:1411
 msgid "_Accept"
 msgstr "悋_�惡�"

@@ -13481,22 +13672,22 @@
 msgid "saved statuses"
 msgstr "悋�忰悋�悋惠 悋��忰��惴悸"

-#: ../libpurple/server.c:234
+#: ../libpurple/server.c:265
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s �惺惘� 悋�悛� 惡� %s.\n"

-#: ../libpurple/server.c:302
+#: ../libpurple/server.c:356
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "�悴惘� 愀�惡 悋�惠惡悋� %s..."

-#: ../libpurple/server.c:347
+#: ../libpurple/server.c:401
 #, c-format
 msgid "%s has requested your attention!"
 msgstr "愀�惡 %s 悋�惠惡悋��"

-#: ../libpurple/server.c:793
+#: ../libpurple/server.c:898
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -13505,12 +13696,12 @@
 "%s 惆惺悋 %s 悒�� 愃惘�悸 悋�惆惘惆愆悸 %s:\n"
 "%s"

-#: ../libpurple/server.c:798
+#: ../libpurple/server.c:903
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s 惆惺悋 %s 悒�� 愃惘�悸 悋�惆惘惆愆悸 %s\n"

-#: ../libpurple/server.c:802
+#: ../libpurple/server.c:907
 msgid "Accept chat invitation?"
 msgstr "悖悖�惡� 惆惺�悸 悋�惆惘惆愆悸�"

@@ -13535,7 +13726,7 @@
 msgstr "惶��惘"

 #: ../libpurple/status.c:156 ../pidgin/gtkdocklet.c:553
-#: ../pidgin/gtkstatusbox.c:1067
+#: ../pidgin/gtkstatusbox.c:1083
 msgid "Do not disturb"
 msgstr "悋�惘悴悋悄 惺惆� 悋�悒慍惺悋悴"

@@ -13576,12 +13767,12 @@
 msgid "%s became unidle"
 msgstr "%s �� �惺惆 愕悋��悋"

-#: ../libpurple/status.c:1327
+#: ../libpurple/status.c:1328
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s �惶惡忰 愕悋��悋"

-#: ../libpurple/status.c:1329
+#: ../libpurple/status.c:1330
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s �惶惡忰 愃�惘 愕悋��"
@@ -13591,27 +13782,27 @@
 msgid "%x %X"
 msgstr "%x %X"

-#: ../libpurple/util.c:2800
+#: ../libpurple/util.c:2804
 #, c-format
 msgid "Error Reading %s"
 msgstr "惺愀� �� �惘悋悄悸 %s"

-#: ../libpurple/util.c:2801
+#: ../libpurple/util.c:2805
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
 "the old file has been renamed to %s~."
 msgstr "忰惆惓 惺愀� 悖惓�悋悄 �惘悋悄悸 %s. �� �惠� 惠忰����悋� �忰���惴 悋���� 悋��惆�� 惡悋愕� %s~"

-#: ../libpurple/util.c:3300
+#: ../libpurple/util.c:3304
 msgid "Calculating..."
 msgstr "�悴惘� 忰愕悋惡悋惠..."

-#: ../libpurple/util.c:3303
+#: ../libpurple/util.c:3307
 msgid "Unknown."
 msgstr "�悴���."

-#: ../libpurple/util.c:3329
+#: ../libpurple/util.c:3333
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -13622,7 +13813,7 @@
 msgstr[4] "%Id 惓悋��悸"
 msgstr[5] "%Id 惓悋��悸"

-#: ../libpurple/util.c:3341
+#: ../libpurple/util.c:3345
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -13633,7 +13824,7 @@
 msgstr[4] "%Id ���悋"
 msgstr[5] "%Id ���"

-#: ../libpurple/util.c:3349
+#: ../libpurple/util.c:3353
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
@@ -13644,7 +13835,7 @@
 msgstr[4] "��%s� %Id 愕悋惺悸"
 msgstr[5] "��%s� %Id 愕悋惺悸"

-#: ../libpurple/util.c:3355
+#: ../libpurple/util.c:3359
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -13655,7 +13846,7 @@
 msgstr[4] "%Id 愕悋惺悸"
 msgstr[5] "%Id 愕悋惺悸"

-#: ../libpurple/util.c:3363
+#: ../libpurple/util.c:3367
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
@@ -13666,7 +13857,7 @@
 msgstr[4] "%s� %Id 惆���悸"
 msgstr[5] "%s� %Id 惆���悸"

-#: ../libpurple/util.c:3369
+#: ../libpurple/util.c:3373
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -13677,17 +13868,17 @@
 msgstr[4] "%Id 惓悋��悸"
 msgstr[5] "%Id 惓悋��悸"

-#: ../libpurple/util.c:3629
+#: ../libpurple/util.c:3633
 #, c-format
 msgid "Could not open %s: Redirected too many times"
 msgstr "惠惺悵�惘 �惠忰 %s: 悖惺�惆 悋�惠�悴�� �惘悋惠 �惓�惘悸"

-#: ../libpurple/util.c:3666 ../libpurple/util.c:3962
+#: ../libpurple/util.c:3670 ../libpurple/util.c:3966
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "惠惺悵�惘 悋�悋惠惶悋� 惡%s"

-#: ../libpurple/util.c:3789
+#: ../libpurple/util.c:3793
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
@@ -13696,27 +13887,27 @@
 "惠惺悵�惘 忰悴慍 悵悋�惘悸 �悋��悸 �忰�惴 悋��忰惠�� �� %s. �惆 惠��� �悵� �忰悋��悸 惠悽惘�惡 �� �惡� "
 "悋�悽悋惆��."

-#: ../libpurple/util.c:3824
+#: ../libpurple/util.c:3828
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "惺愀� �� 悋��惘悋悄悸 �� %s: %s"

-#: ../libpurple/util.c:3855
+#: ../libpurple/util.c:3859
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "惺愀� �� 悋��惠悋惡悸 悒�� %s: %s"

-#: ../libpurple/util.c:3880
+#: ../libpurple/util.c:3884
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "惠惺悵�惘 悋�悋惠惶悋� 惡� %s: %s"

-#: ../libpurple/util.c:4672
+#: ../libpurple/util.c:4697
 #, c-format
 msgid " - %s"
 msgstr " - %s"

-#: ../libpurple/util.c:4678
+#: ../libpurple/util.c:4703
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
@@ -13728,19 +13919,19 @@
 msgstr "���愀惺 悋�悋惠惶悋� �� 惡惘�悴�悋惠 惺�� 忰悋愕�惡�."

 #. 10054
-#: ../libpurple/win32/libc_interface.c:324
+#: ../libpurple/win32/libc_interface.c:325
 #, c-format
 msgid "Remote host closed connection."
 msgstr "悋��愕惠惷�� 悋�惡惺�惆 悖愃�� 悋�悋惠惶悋�."

 #. 10060
-#: ../libpurple/win32/libc_interface.c:326
+#: ../libpurple/win32/libc_interface.c:328
 #, c-format
 msgid "Connection timed out."
 msgstr "悋�惠�惠 ���悸 悋�悋惠惶悋�."

 #. 10061
-#: ../libpurple/win32/libc_interface.c:328
+#: ../libpurple/win32/libc_interface.c:331
 #, c-format
 msgid "Connection refused."
 msgstr "惘���惷 悋�悋惠惶悋�."
@@ -13830,7 +14021,7 @@
 msgid "SOCKS 5"
 msgstr "SOCKS 5"

-#: ../pidgin/gtkaccount.c:939 ../pidgin/gtkprefs.c:1219
+#: ../pidgin/gtkaccount.c:939 ../pidgin/gtkprefs.c:1230
 msgid "Use Environmental Settings"
 msgstr "悋愕惠悽惆� 悒惺惆悋惆悋惠 悋�惡�悧悸"

@@ -13852,15 +14043,15 @@
 msgid "Proxy Options"
 msgstr "悽�悋惘悋惠 悋��愕�愀"

-#: ../pidgin/gtkaccount.c:1016 ../pidgin/gtkprefs.c:1213
+#: ../pidgin/gtkaccount.c:1016 ../pidgin/gtkprefs.c:1224
 msgid "Proxy _type:"
 msgstr "��惺 悋�_�愕�愀:"

-#: ../pidgin/gtkaccount.c:1025 ../pidgin/gtkprefs.c:1234
+#: ../pidgin/gtkaccount.c:1025 ../pidgin/gtkprefs.c:1245
 msgid "_Host:"
 msgstr "�_惷��:"

-#: ../pidgin/gtkaccount.c:1029 ../pidgin/gtkprefs.c:1252
+#: ../pidgin/gtkaccount.c:1029 ../pidgin/gtkprefs.c:1263
 msgid "_Port:"
 msgstr "_���悵:"

@@ -13868,7 +14059,7 @@
 msgid "_Username:"
 msgstr "悋愕� 悋�_愆悋愆悸:"

-#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1289
+#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1300
 msgid "Pa_ssword:"
 msgstr "��_�悸 悋�愕惘:"

@@ -13896,16 +14087,16 @@
 msgid "_Advanced"
 msgstr "�_惠�惆�"

-#: ../pidgin/gtkaccount.c:1905 ../pidgin/gtkplugin.c:639
+#: ../pidgin/gtkaccount.c:1906 ../pidgin/gtkplugin.c:643
 #: ../pidgin/plugins/convcolors.c:327
 msgid "Enabled"
 msgstr "���惺��"

-#: ../pidgin/gtkaccount.c:1933
+#: ../pidgin/gtkaccount.c:1934
 msgid "Protocol"
 msgstr "悋�惡惘�惠����"

-#: ../pidgin/gtkaccount.c:2134
+#: ../pidgin/gtkaccount.c:2137
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -13927,7 +14118,7 @@
 "����� 惆悋悧�悋 悋�惘悴�惺 悒�� �悵� 悋��悋�悵悸 �悒惷悋�悸 悖� 惠忰惘�惘 悖� 悒慍悋�悸 悋�忰愕悋惡悋惠 惺� 愀惘�� "
 "<b>忰愕悋惡悋惠->悖惷��/忰惘��惘</b> �� �悋�悵悸 �悋悧�悸 悋�悖惶惆�悋悄."

-#: ../pidgin/gtkblist.c:548
+#: ../pidgin/gtkblist.c:549
 #, c-format
 msgid "You have %d contact named %s. Would you like to merge them?"
 msgid_plural "You currently have %d contacts named %s. Would you like to merge them?"
@@ -13938,7 +14129,7 @@
 msgstr[4] "�惆�� %Id �惘悋愕�悋 惡悋愕� %s. 悖惠惘�惆 惆�悴���"
 msgstr[5] "�惆�� %Id �惘悋愕� 惡悋愕� %s. 悖惠惘�惆 惆�悴���"

-#: ../pidgin/gtkblist.c:549
+#: ../pidgin/gtkblist.c:550
 msgid ""
 "Merging these contacts will cause them to share a single entry on the buddy "
 "list and use a single conversation window. You can separate them again by "
@@ -13947,121 +14138,117 @@
 "惆�悴 �悗�悋悄 悋��惘悋愕��� 愕�悴惺��� �愆惠惘��� �� �惆悽�悸 �悋忰惆悸 惡�悋悧�悸 悋�悖惶惆�悋悄 ��愕惠悽惆��� "
 "�悋�悵悸 �忰悋惆惓悸 �悋忰惆悸. ����� �惶��� 惓悋��悋 惡悋悽惠�悋惘 '�惆�惆' �� �悋悧�悸 愕�悋� 悋��惘悋愕���"

-#: ../pidgin/gtkblist.c:551
-msgid "_Merge"
-msgstr "悋_惆�悴"
-
-#: ../pidgin/gtkblist.c:952 ../pidgin/gtkblist.c:6620
+#: ../pidgin/gtkblist.c:964 ../pidgin/gtkblist.c:6711
 msgid "Room _List"
 msgstr "�悋悧�悸 悋�_愃惘�"

-#: ../pidgin/gtkblist.c:972
+#: ../pidgin/gtkblist.c:984
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "�� �惷�� 悖惆悽� 悋��惺���悋惠 悋���悋愕惡悸 忰�� 悋�惆惘惆愆悸 悋�惠� 惠�惆 悋�悋�惷�悋� ��悋.\n"

-#: ../pidgin/gtkblist.c:984 ../pidgin/gtkblist.c:6655
+#: ../pidgin/gtkblist.c:996 ../pidgin/gtkblist.c:6746
 #: ../pidgin/gtkpounce.c:546 ../pidgin/gtkroomlist.c:547
 msgid "_Account:"
 msgstr "_忰愕悋惡:"

-#: ../pidgin/gtkblist.c:1262 ../pidgin/gtkprivacy.c:566
-#: ../pidgin/gtkprivacy.c:580
+#: ../pidgin/gtkblist.c:1274 ../pidgin/gtkprivacy.c:549
+#: ../pidgin/gtkprivacy.c:563
 msgid "_Block"
 msgstr "悋忰_惴惘"

-#: ../pidgin/gtkblist.c:1262
+#: ../pidgin/gtkblist.c:1274
 msgid "Un_block"
-msgstr "悋�愃� 悋�忰_惴惘"
-
-#: ../pidgin/gtkblist.c:1305
+msgstr "悖�愃� 悋�忰_惴惘"
+
+#: ../pidgin/gtkblist.c:1317
 msgid "Move to"
 msgstr "悋��� 悒��"

-#: ../pidgin/gtkblist.c:1345
+#: ../pidgin/gtkblist.c:1357
 msgid "Get _Info"
 msgstr "悋悴�惡 _�惺���悋惠"

-#: ../pidgin/gtkblist.c:1348 ../pidgin/pidginstock.c:90
+#: ../pidgin/gtkblist.c:1360 ../pidgin/pidginstock.c:90
 msgid "I_M"
 msgstr "_惠惘悋愕� ��惘�"

-#: ../pidgin/gtkblist.c:1354
+#: ../pidgin/gtkblist.c:1366
 msgid "_Send File..."
 msgstr "悖惘愕� _���悋..."

-#: ../pidgin/gtkblist.c:1361
+#: ../pidgin/gtkblist.c:1373
 msgid "Add Buddy _Pounce..."
 msgstr "悖惷� 悒_愆惺悋惘 惶惆��..."

-#: ../pidgin/gtkblist.c:1366 ../pidgin/gtkblist.c:1370
-#: ../pidgin/gtkblist.c:1485 ../pidgin/gtkblist.c:1508
+#: ../pidgin/gtkblist.c:1378 ../pidgin/gtkblist.c:1382
+#: ../pidgin/gtkblist.c:1502 ../pidgin/gtkblist.c:1525
 msgid "View _Log"
 msgstr "悋惺惘惷 悋�_愕悴�"

-#: ../pidgin/gtkblist.c:1376
+#: ../pidgin/gtkblist.c:1388 ../pidgin/gtkblist.c:1475
 msgid "Hide when offline"
 msgstr "悋悽�� 惺�惆�悋 �悋 惠��� �惠惶�悋"

-#: ../pidgin/gtkblist.c:1376
+#: ../pidgin/gtkblist.c:1388 ../pidgin/gtkblist.c:1475
 msgid "Show when offline"
-msgstr "悋惴�惘 惺�惆�悋 �悋 惠��� �惠惶�悋"
-
-#: ../pidgin/gtkblist.c:1390 ../pidgin/gtkblist.c:1399
-#: ../pidgin/gtkblist.c:1493 ../pidgin/gtkblist.c:1514
+msgstr "悖惴�惘 惺�惆�悋 �悋 惠��� �惠惶�悋"
+
+#: ../pidgin/gtkblist.c:1402 ../pidgin/gtkblist.c:1411
+#: ../pidgin/gtkblist.c:1510 ../pidgin/gtkblist.c:1531
 msgid "_Alias..."
 msgstr "_���悸..."

-#: ../pidgin/gtkblist.c:1393 ../pidgin/gtkblist.c:1401
-#: ../pidgin/gtkblist.c:1495 ../pidgin/gtkblist.c:1516
+#: ../pidgin/gtkblist.c:1405 ../pidgin/gtkblist.c:1413
+#: ../pidgin/gtkblist.c:1512 ../pidgin/gtkblist.c:1533
 msgid "_Remove"
 msgstr "悖_慍��"

-#: ../pidgin/gtkblist.c:1451
+#: ../pidgin/gtkblist.c:1463
 msgid "Add _Buddy..."
 msgstr "悖惷� _惶惆��悋..."

-#: ../pidgin/gtkblist.c:1454
+#: ../pidgin/gtkblist.c:1466
 msgid "Add C_hat..."
 msgstr "悖惷� 惆_惘惆愆悸..."

-#: ../pidgin/gtkblist.c:1457
+#: ../pidgin/gtkblist.c:1469
 msgid "_Delete Group"
 msgstr "悋_忰悵� 悋��悴��惺悸"

-#: ../pidgin/gtkblist.c:1459
+#: ../pidgin/gtkblist.c:1471
 msgid "_Rename"
 msgstr "_愃�惘 悋�悋愕�"

 #. join button
-#: ../pidgin/gtkblist.c:1479 ../pidgin/gtkroomlist.c:318
+#: ../pidgin/gtkblist.c:1496 ../pidgin/gtkroomlist.c:318
 #: ../pidgin/gtkroomlist.c:594 ../pidgin/pidginstock.c:88
 msgid "_Join"
 msgstr "悋_�惷��"

-#: ../pidgin/gtkblist.c:1481
+#: ../pidgin/gtkblist.c:1498
 msgid "Auto-Join"
 msgstr "悋�惷�� 惠��悋悧�悋"

-#: ../pidgin/gtkblist.c:1483
+#: ../pidgin/gtkblist.c:1500
 msgid "Persistent"
 msgstr "惆悋悧�悸"

-#: ../pidgin/gtkblist.c:1521 ../pidgin/gtkblist.c:1544
+#: ../pidgin/gtkblist.c:1538 ../pidgin/gtkblist.c:1561
 msgid "_Collapse"
 msgstr "���_惶"

-#: ../pidgin/gtkblist.c:1549
+#: ../pidgin/gtkblist.c:1566
 msgid "_Expand"
 msgstr "_�惆�惆"

-#: ../pidgin/gtkblist.c:1800 ../pidgin/gtkblist.c:1812
-#: ../pidgin/gtkblist.c:5302 ../pidgin/gtkblist.c:5315
+#: ../pidgin/gtkblist.c:1817 ../pidgin/gtkblist.c:1829
+#: ../pidgin/gtkblist.c:5410 ../pidgin/gtkblist.c:5423
 msgid "/Tools/Mute Sounds"
 msgstr "/悋�悖惆�悋惠/悖�惠� 悋�悖惶�悋惠"

-#: ../pidgin/gtkblist.c:2272 ../pidgin/gtkconv.c:4798
+#: ../pidgin/gtkblist.c:2289 ../pidgin/gtkconv.c:4807
 #: ../pidgin/gtkpounce.c:437
 msgid "You are not currently signed on with an account that can add that buddy."
 msgstr "�愕惠 �悋�悴悋 惡忰愕悋惡 ������ �� 悒惷悋�悸 �悵悋 悋�惶惆��."
@@ -14069,148 +14256,148 @@
 #. 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:2617
+#: ../pidgin/gtkblist.c:2640
 msgid "Unknown node type"
 msgstr "��惺 惺�惆悸 �悴���"

 #. Buddies menu
-#: ../pidgin/gtkblist.c:3052
+#: ../pidgin/gtkblist.c:3076
 msgid "/_Buddies"
 msgstr "/悋�悖_惶惆�悋悄"

-#: ../pidgin/gtkblist.c:3053
+#: ../pidgin/gtkblist.c:3077
 msgid "/Buddies/New Instant _Message..."
 msgstr "/悋�悖惶惆�悋悄/惘愕悋�悸 ��惘�悸 _悴惆�惆悸..."

-#: ../pidgin/gtkblist.c:3054
+#: ../pidgin/gtkblist.c:3078
 msgid "/Buddies/Join a _Chat..."
 msgstr "/悋�悖惶惆�悋悄/悋�惷� �_惆惘惆愆悸..."

-#: ../pidgin/gtkblist.c:3055
+#: ../pidgin/gtkblist.c:3079
 msgid "/Buddies/Get User _Info..."
 msgstr "/悋�悖惶惆�悋悄/悋悴�惡 _�惺���悋惠 悋��愕惠悽惆�..."

-#: ../pidgin/gtkblist.c:3056
+#: ../pidgin/gtkblist.c:3080
 msgid "/Buddies/View User _Log..."
 msgstr "/悋�悖惶惆�悋悄/悋愕惠惺惘惷 _愕悴� 悋��愕惠悽惆�..."

-#: ../pidgin/gtkblist.c:3058
+#: ../pidgin/gtkblist.c:3082
 msgid "/Buddies/Sh_ow"
-msgstr "/悋�悖惶惆�悋悄/悋惴�惘"
-
-#: ../pidgin/gtkblist.c:3059
+msgstr "/悋�悖惶惆�悋悄/悖惴�惘"
+
+#: ../pidgin/gtkblist.c:3083
 msgid "/Buddies/Show/_Offline Buddies"
-msgstr "/悋�悖惶惆�悋悄/悋惴�惘/悋�悖惶惆�悋悄 _愃�惘 悋��惠惶���"
-
-#: ../pidgin/gtkblist.c:3060
+msgstr "/悋�悖惶惆�悋悄/悖惴�惘/悋�悖惶惆�悋悄 _愃�惘 悋��惠惶���"
+
+#: ../pidgin/gtkblist.c:3084
 msgid "/Buddies/Show/_Empty Groups"
-msgstr "/悋�悖惶惆�悋悄/悋惴�惘/悋��悴��惺悋惠 悋�_悽悋��悸"
-
-#: ../pidgin/gtkblist.c:3061
+msgstr "/悋�悖惶惆�悋悄/悖惴�惘/悋��悴��惺悋惠 悋�_悽悋��悸"
+
+#: ../pidgin/gtkblist.c:3085
 msgid "/Buddies/Show/Buddy _Details"
-msgstr "/悋�悖惶惆�悋悄/悋惴�惘/_惡�悋�悋惠 悋�悖惶惆�悋悄"
-
-#: ../pidgin/gtkblist.c:3062
+msgstr "/悋�悖惶惆�悋悄/悖惴�惘/_惡�悋�悋惠 悋�悖惶惆�悋悄"
+
+#: ../pidgin/gtkblist.c:3086
 msgid "/Buddies/Show/Idle _Times"
-msgstr "/悋�悖惶惆�悋悄/悋惴�惘/悖��悋惠 悋�_愕���"
-
-#: ../pidgin/gtkblist.c:3063
+msgstr "/悋�悖惶惆�悋悄/悖惴�惘/悖��悋惠 悋�_愕���"
+
+#: ../pidgin/gtkblist.c:3087
 msgid "/Buddies/Show/_Protocol Icons"
-msgstr "/悋�悖惶惆�悋悄/悋惴�惘/悋��悴��惺悋惠 悋�_悽悋��悸"
-
-#: ../pidgin/gtkblist.c:3064
+msgstr "/悋�悖惶惆�悋悄/悖惴�惘/悋��悴��惺悋惠 悋�_悽悋��悸"
+
+#: ../pidgin/gtkblist.c:3088
 msgid "/Buddies/_Sort Buddies"
 msgstr "/悋�悖惶惆�悋悄/_惘惠�惡 悋�悖惶惆�悋悄"

-#: ../pidgin/gtkblist.c:3066
+#: ../pidgin/gtkblist.c:3090
 msgid "/Buddies/_Add Buddy..."
 msgstr "/悋�悖惶惆�悋悄/悖_惷� 惶惆��悋..."

-#: ../pidgin/gtkblist.c:3067
+#: ../pidgin/gtkblist.c:3091
 msgid "/Buddies/Add C_hat..."
 msgstr "/悋�悖惶惆�悋悄/悖惷� 惆_惘惆愆悸..."

-#: ../pidgin/gtkblist.c:3068
+#: ../pidgin/gtkblist.c:3092
 msgid "/Buddies/Add _Group..."
 msgstr "/悋�悖惶惆�悋悄/悖惷� �_悴��惺悸..."

-#: ../pidgin/gtkblist.c:3070
+#: ../pidgin/gtkblist.c:3094
 msgid "/Buddies/_Quit"
 msgstr "/悋�悖惶惆�悋悄/悋_悽惘悴"

 #. Accounts menu
-#: ../pidgin/gtkblist.c:3073
+#: ../pidgin/gtkblist.c:3097
 msgid "/_Accounts"
 msgstr "/悋�_忰愕悋惡悋惠"

-#: ../pidgin/gtkblist.c:3074 ../pidgin/gtkblist.c:7334
+#: ../pidgin/gtkblist.c:3098 ../pidgin/gtkblist.c:7431
 msgid "/Accounts/Manage"
 msgstr "/悋�忰愕悋惡悋惠/悖惆�惘"

 #. Tools
-#: ../pidgin/gtkblist.c:3077
+#: ../pidgin/gtkblist.c:3101
 msgid "/_Tools"
 msgstr "/悋�悖_惆�悋惠"

-#: ../pidgin/gtkblist.c:3078
+#: ../pidgin/gtkblist.c:3102
 msgid "/Tools/Buddy _Pounces"
 msgstr "/悋�悖惆�悋惠/悒愆惺悋惘悋惠 悋�悖_惶惆�悋悄"

-#: ../pidgin/gtkblist.c:3079
+#: ../pidgin/gtkblist.c:3103
 msgid "/Tools/_Certificates"
 msgstr "/悋�悖惆�悋惠/悋�_愆�悋惆悋惠"

-#: ../pidgin/gtkblist.c:3080
+#: ../pidgin/gtkblist.c:3104
 msgid "/Tools/Plu_gins"
 msgstr "/悋�悖惆�悋惠/悋�_��忰�悋惠"

-#: ../pidgin/gtkblist.c:3081
+#: ../pidgin/gtkblist.c:3105
 msgid "/Tools/Pr_eferences"
 msgstr "/悋�悖惆�悋惠/悋�_惠�惷��悋惠"

-#: ../pidgin/gtkblist.c:3082
+#: ../pidgin/gtkblist.c:3106
 msgid "/Tools/Pr_ivacy"
 msgstr "/悋�悖惆�悋惠/悋�_悽惶�惶��悸"

-#: ../pidgin/gtkblist.c:3084
+#: ../pidgin/gtkblist.c:3108
 msgid "/Tools/_File Transfers"
 msgstr "/悋�悖惆�悋惠/��� 悋_����悋惠"

-#: ../pidgin/gtkblist.c:3085
+#: ../pidgin/gtkblist.c:3109
 msgid "/Tools/R_oom List"
 msgstr "/悋�悖惆�悋惠/�悋悧�悸 悋�_愃惘�"

-#: ../pidgin/gtkblist.c:3086
+#: ../pidgin/gtkblist.c:3110
 msgid "/Tools/System _Log"
 msgstr "/悋�悖惆�悋惠/_愕悴� 悋��惴悋�"

-#: ../pidgin/gtkblist.c:3088
+#: ../pidgin/gtkblist.c:3112
 msgid "/Tools/Mute _Sounds"
 msgstr "/悋�悖惆�悋惠/悋�惠� 悋�悖_惶�悋惠"

 #. Help
-#: ../pidgin/gtkblist.c:3090
+#: ../pidgin/gtkblist.c:3114
 msgid "/_Help"
 msgstr "/_�愕悋惺惆悸"

-#: ../pidgin/gtkblist.c:3091
+#: ../pidgin/gtkblist.c:3115
 msgid "/Help/Online _Help"
 msgstr "/�愕悋惺惆悸/_�愕悋惺惆悸 惺�� 悋�悽愀"

-#: ../pidgin/gtkblist.c:3092
+#: ../pidgin/gtkblist.c:3116
 msgid "/Help/_Debug Window"
 msgstr "/�愕悋惺惆悸/_�悋�悵悸 悋�惠���忰"

-#: ../pidgin/gtkblist.c:3094 ../pidgin/gtkblist.c:3096
+#: ../pidgin/gtkblist.c:3118 ../pidgin/gtkblist.c:3120
 msgid "/Help/_About"
 msgstr "/�愕悋惺惆悸/_忰���"

-#: ../pidgin/gtkblist.c:3126
+#: ../pidgin/gtkblist.c:3151
 #, c-format
 msgid "<b>Account:</b> %s"
 msgstr "<b>悋�忰愕悋惡:</b> %s"

-#: ../pidgin/gtkblist.c:3134
+#: ../pidgin/gtkblist.c:3171
 #, c-format
 msgid ""
 "\n"
@@ -14219,90 +14406,86 @@
 "\n"
 "<b>悋���惷�惺:</b> %s"

-#: ../pidgin/gtkblist.c:3134
+#: ../pidgin/gtkblist.c:3171
 msgid "(no topic set)"
 msgstr "(�� ��忰惆惆 悖� ��惷�惺)"

-#: ../pidgin/gtkblist.c:3211
+#: ../pidgin/gtkblist.c:3249
 msgid "Buddy Alias"
 msgstr "悋�悋愕� 悋��愕惠惺悋惘 �惶惆��"

-#: ../pidgin/gtkblist.c:3240
+#: ../pidgin/gtkblist.c:3278
 msgid "Logged In"
 msgstr "�悋��悴 惡悋��惺�"

-#: ../pidgin/gtkblist.c:3286
+#: ../pidgin/gtkblist.c:3324
 msgid "Last Seen"
 msgstr "悛悽惘 惴��惘"

-#: ../pidgin/gtkblist.c:3307
+#: ../pidgin/gtkblist.c:3345
 msgid "Spooky"
 msgstr "�悽��"

-#: ../pidgin/gtkblist.c:3309
+#: ../pidgin/gtkblist.c:3347
 msgid "Awesome"
 msgstr "��悵���"

-#: ../pidgin/gtkblist.c:3311
+#: ../pidgin/gtkblist.c:3349
 msgid "Rockin'"
 msgstr "悴惡�悋惘"

-#: ../pidgin/gtkblist.c:3327
+#: ../pidgin/gtkblist.c:3380
 msgid "Total Buddies"
 msgstr "�悴��惺 悋�悖惶惆�悋悄"

-#: ../pidgin/gtkblist.c:3334
-msgid "Online Buddies"
-msgstr "悋�悖惶惆�悋悄 悋��惠��惶���"
-
-#: ../pidgin/gtkblist.c:3694
+#: ../pidgin/gtkblist.c:3742
 #, c-format
 msgid "Idle %dd %dh %02dm"
 msgstr "愕悋�� %Id� %Id愕 %I02d惆"

-#: ../pidgin/gtkblist.c:3696
+#: ../pidgin/gtkblist.c:3744
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "愕悋�� %Id愕 %I02d惆"

-#: ../pidgin/gtkblist.c:3698
+#: ../pidgin/gtkblist.c:3746
 #, c-format
 msgid "Idle %dm"
 msgstr "愕悋�� %Id惆"

-#: ../pidgin/gtkblist.c:3852
+#: ../pidgin/gtkblist.c:3900
 msgid "/Buddies/New Instant Message..."
 msgstr "/悋�悖惶惆�悋悄/惘愕悋�悸 ��惘�悸 悴惆�惆悸..."

-#: ../pidgin/gtkblist.c:3853 ../pidgin/gtkblist.c:3886
+#: ../pidgin/gtkblist.c:3901 ../pidgin/gtkblist.c:3934
 msgid "/Buddies/Join a Chat..."
 msgstr "/悋�悖惶惆�悋悄/悋�惷� �惆惘惆愆悸..."

-#: ../pidgin/gtkblist.c:3854
+#: ../pidgin/gtkblist.c:3902
 msgid "/Buddies/Get User Info..."
 msgstr "/悋�悖惶惆�悋悄/悋悴�惡 �惺���悋惠 悋��愕惠悽惆�..."

-#: ../pidgin/gtkblist.c:3855
+#: ../pidgin/gtkblist.c:3903
 msgid "/Buddies/Add Buddy..."
 msgstr "/悋�悖惶惆�悋悄/悖惷� 惶惆��悋..."

-#: ../pidgin/gtkblist.c:3856 ../pidgin/gtkblist.c:3889
+#: ../pidgin/gtkblist.c:3904 ../pidgin/gtkblist.c:3937
 msgid "/Buddies/Add Chat..."
 msgstr "/悋�悖惶惆�悋悄/悖惷� 惆惘惆愆悸..."

-#: ../pidgin/gtkblist.c:3857
+#: ../pidgin/gtkblist.c:3905
 msgid "/Buddies/Add Group..."
 msgstr "/悋�悖惶惆�悋悄/悖惷� �悴��惺悸..."

-#: ../pidgin/gtkblist.c:3892
+#: ../pidgin/gtkblist.c:3940
 msgid "/Tools/Privacy"
 msgstr "/悋�悖惆�悋惠/悋�悽惶�惶��悸"

-#: ../pidgin/gtkblist.c:3895
+#: ../pidgin/gtkblist.c:3943
 msgid "/Tools/Room List"
 msgstr "/悋�悖惆�悋惠/�悋悧�悸 悋�愃惘�"

-#: ../pidgin/gtkblist.c:4027 ../pidgin/gtkdocklet.c:155
+#: ../pidgin/gtkblist.c:4075 ../pidgin/gtkdocklet.c:155
 #: ../pidgin/gtkdocklet.c:160
 #, c-format
 msgid "%d unread message from %s\n"
@@ -14314,41 +14497,41 @@
 msgstr[4] "%Id 惘愕悋�悸 愃�惘 ��惘�悄悸 �� %s\n"
 msgstr[5] "%Id 惘愕悋�悸 愃�惘 ��惘�悄悸 �� %s\n"

-#: ../pidgin/gtkblist.c:4191
+#: ../pidgin/gtkblist.c:4238
 msgid "Manually"
 msgstr "�惆��悋"

-#: ../pidgin/gtkblist.c:4194
+#: ../pidgin/gtkblist.c:4241
 msgid "By status"
 msgstr "忰愕惡 悋�忰悋�悸"

-#: ../pidgin/gtkblist.c:4195
+#: ../pidgin/gtkblist.c:4242
 msgid "By log size"
 msgstr "忰愕惡 忰悴� 悋�愕悴�"

-#: ../pidgin/gtkblist.c:4522
+#: ../pidgin/gtkblist.c:4579
 #, c-format
 msgid "%s disconnected"
 msgstr "悋��愀惺 %s"

-#: ../pidgin/gtkblist.c:4524
+#: ../pidgin/gtkblist.c:4581
 #, c-format
 msgid "%s disabled"
 msgstr "惺�愀��� %s"

-#: ../pidgin/gtkblist.c:4528
+#: ../pidgin/gtkblist.c:4585
 msgid "Reconnect"
 msgstr "悖惺惆 悋�悋惠惶悋�"

-#: ../pidgin/gtkblist.c:4528 ../pidgin/gtkblist.c:4634
+#: ../pidgin/gtkblist.c:4585 ../pidgin/gtkblist.c:4704
 msgid "Re-enable"
 msgstr "悖惺�惆 悋�惠�惺��"

-#: ../pidgin/gtkblist.c:4632
+#: ../pidgin/gtkblist.c:4702
 msgid "Welcome back!"
 msgstr "�惘忰惡悋 惡惺�惆惠�"

-#: ../pidgin/gtkblist.c:4668
+#: ../pidgin/gtkblist.c:4738
 #, c-format
 msgid "%d account was disabled because you signed on from another location:"
 msgid_plural "%d accounts were disabled because you signed on from another location:"
@@ -14359,24 +14542,24 @@
 msgstr[4] "惺�愀�� %Id 忰愕悋惡悋 �悖�� 惆悽�惠 �� ���惺 悛悽惘."
 msgstr[5] "惺�愀�� %Id 忰愕悋惡 �悖�� 惆悽�惠 �� ���惺 悛悽惘."

-#: ../pidgin/gtkblist.c:4909
+#: ../pidgin/gtkblist.c:5017
 msgid "<b>Username:</b>"
 msgstr "<b>悋愕� 悋��愕惠悽惆�:</b>"

-#: ../pidgin/gtkblist.c:4916
+#: ../pidgin/gtkblist.c:5024
 msgid "<b>Password:</b>"
 msgstr "<b>���悸 悋�愕惘:</b>"

-#: ../pidgin/gtkblist.c:4927
+#: ../pidgin/gtkblist.c:5035
 msgid "_Login"
 msgstr "_��悴"

-#: ../pidgin/gtkblist.c:5011
+#: ../pidgin/gtkblist.c:5119
 msgid "/Accounts"
 msgstr "/悋�忰愕悋惡悋惠"

 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:5025
+#: ../pidgin/gtkblist.c:5133
 #, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
@@ -14393,61 +14576,53 @@
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:5296
+#: ../pidgin/gtkblist.c:5404
 msgid "/Buddies/Show/Offline Buddies"
-msgstr "/悋�悖惶惆�悋悄/悋惴�惘/悋�悖惶惆�悋悄 愃�惘 悋��惠惶���"
-
-#: ../pidgin/gtkblist.c:5299
+msgstr "/悋�悖惶惆�悋悄/悖惴�惘/悋�悖惶惆�悋悄 愃�惘 悋��惠惶���"
+
+#: ../pidgin/gtkblist.c:5407
 msgid "/Buddies/Show/Empty Groups"
-msgstr "/悋�悖惶惆�悋悄/悋惴�惘/悋��悴��惺悋惠 悋�悽悋��悸"
-
-#: ../pidgin/gtkblist.c:5305
+msgstr "/悋�悖惶惆�悋悄/悖惴�惘/悋��悴��惺悋惠 悋�悽悋��悸"
+
+#: ../pidgin/gtkblist.c:5413
 msgid "/Buddies/Show/Buddy Details"
-msgstr "/悋�悖惶惆�悋悄/悋惴�惘/惡�悋�悋惠 悋�悖惶惆�悋悄"
-
-#: ../pidgin/gtkblist.c:5308
+msgstr "/悋�悖惶惆�悋悄/悖惴�惘/惡�悋�悋惠 悋�悖惶惆�悋悄"
+
+#: ../pidgin/gtkblist.c:5416
 msgid "/Buddies/Show/Idle Times"
-msgstr "/悋�悖惶惆�悋悄/悋惴�惘/悖��悋惠 悋�愕���"
-
-#: ../pidgin/gtkblist.c:5311
+msgstr "/悋�悖惶惆�悋悄/悖惴�惘/悖��悋惠 悋�愕���"
+
+#: ../pidgin/gtkblist.c:5419
 msgid "/Buddies/Show/Protocol Icons"
-msgstr "/悋�悖惶惆�悋悄/悋惴�惘/悋��悴��惺悋惠 悋�悽悋��悸"
-
-#: ../pidgin/gtkblist.c:6261
-msgid ""
-"Please enter the screen name of the person you would like to add to your "
-"buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
-"The alias will be displayed in place of the screen name whenever possible.\n"
-msgstr ""
-"�� �惷�� 悖惆悽� 悋愕� 悋�愆悋愆悸 ��愆悽惶 悋�悵� 惠�惆 悒惷悋�惠� 悒�� �悋悧�悸 悖惶惆�悋悧�. 惡���� "
-"悋悽惠�悋惘��悋 悒惆悽悋� ���悸 悖� 悋�悋愕� 悋��愕惠惺悋惘 ��惶惆��. 悋����悸 愕惠惺惘惷 �� ��悋� 悋愕� "
-"悋�愆悋愆悸 惺�惆 悋�悒��悋�.\n"
-
-#. Set up stuff for the account box
-#: ../pidgin/gtkblist.c:6284
-msgid "A_ccount:"
-msgstr "_忰愕悋惡:"
-
-#. End of account box
-#: ../pidgin/gtkblist.c:6296
-msgid "_Screen name:"
-msgstr "悋_愕� 悋�愆悋愆悸:"
-
-#: ../pidgin/gtkblist.c:6318 ../pidgin/gtkblist.c:6668
-msgid "A_lias:"
-msgstr "悋��_��悸:"
-
-#: ../pidgin/gtkblist.c:6585
+msgstr "/悋�悖惶惆�悋悄/悖惴�惘/悋��悴��惺悋惠 悋�悽悋��悸"
+
+#: ../pidgin/gtkblist.c:6372
+msgid "Add a buddy.\n"
+msgstr "悖惷� 惶惆��悋.\n"
+
+#: ../pidgin/gtkblist.c:6387
+msgid "Buddy's _screen name:"
+msgstr "悋_愕� 愆悋愆悸 悋�惶惆��:"
+
+#: ../pidgin/gtkblist.c:6409
+msgid "(Optional) A_lias:"
+msgstr "����悸 (悋悽惠�悋惘�悸):"
+
+#: ../pidgin/gtkblist.c:6427
+msgid "Add buddy to _group:"
+msgstr "悖惷�� 悋�惶惆�� 悒�� 悋�_�悴��惺悸:"
+
+#: ../pidgin/gtkblist.c:6676
 msgid "This protocol does not support chat rooms."
 msgstr "�悵悋 悋�惡惘�惠���� �悋�惆惺� 愃惘� 悋�惆惘惆愆悸."

-#: ../pidgin/gtkblist.c:6601
+#: ../pidgin/gtkblist.c:6692
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "�愕惠 �悋�悴悋 忰悋���悋 惡悖� 惡惘�惠���� �惆惺� 悋�惆惘惆愆悸."

-#: ../pidgin/gtkblist.c:6645
+#: ../pidgin/gtkblist.c:6736
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -14455,255 +14630,259 @@
 "悖惆悽� 悋�悋愕� 悋��愕惠惺悋惘� �悋��惺���悋惠 悋���悋愕惡悸 忰�� 悋�惆惘惆愆悸 悋�惠� 惠�惆 悒惷悋�惠�悋 ��悋悧�悸 "
 "悋�悖惶惆�悋悄 �惆��.\n"

-#: ../pidgin/gtkblist.c:6675
+#: ../pidgin/gtkblist.c:6759
+msgid "A_lias:"
+msgstr "悋��_��悸:"
+
+#: ../pidgin/gtkblist.c:6766
 msgid "Auto_join when account becomes online."
 msgstr "悋�惷� 惠��悋悧�悋 惺�惆�悋 �惠惶� 悋�忰愕悋惡."

-#: ../pidgin/gtkblist.c:6676
+#: ../pidgin/gtkblist.c:6767
 msgid "_Hide chat when the window is closed."
 msgstr "悋_悽�� 悋�惆惘惆愆悸 惺�惆 愃�� 悋��悋�悵悸."

-#: ../pidgin/gtkblist.c:6702
+#: ../pidgin/gtkblist.c:6793
 msgid "Please enter the name of the group to be added."
 msgstr "悖惆悽� 悋愕� 悋��悴��惺悸 �悒惷悋�惠�悋."

-#: ../pidgin/gtkblist.c:7354
+#: ../pidgin/gtkblist.c:7451
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/悋�忰愕悋惡悋惠/"

-#: ../pidgin/gtkblist.c:7378
+#: ../pidgin/gtkblist.c:7475
 msgid "_Edit Account"
 msgstr "_忰惘��惘 悋�忰愕悋惡"

-#: ../pidgin/gtkblist.c:7391 ../pidgin/gtkconv.c:3126
+#: ../pidgin/gtkblist.c:7488 ../pidgin/gtkconv.c:3128
 msgid "No actions available"
 msgstr "�悋 悒悴惘悋悄悋惠 �惠悋忰悸"

-#: ../pidgin/gtkblist.c:7399
+#: ../pidgin/gtkblist.c:7496
 msgid "_Disable"
 msgstr "_惺愀��"

-#: ../pidgin/gtkblist.c:7411
+#: ../pidgin/gtkblist.c:7508
 msgid "Enable Account"
 msgstr "�惺�� 悋�忰愕悋惡"

-#: ../pidgin/gtkblist.c:7417
+#: ../pidgin/gtkblist.c:7514
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/悋�忰愕悋惡悋惠/�惺�� 悋�忰愕悋惡"

-#: ../pidgin/gtkblist.c:7466
+#: ../pidgin/gtkblist.c:7563
 msgid "/Tools"
 msgstr "/悖惆�悋惠"

-#: ../pidgin/gtkblist.c:7536
+#: ../pidgin/gtkblist.c:7633
 msgid "/Buddies/Sort Buddies"
 msgstr "/悋�悖惶惆�悋悄/惘惠�惡 悋�悖惶惆�悋悄"

 #. Widget creation function
-#: ../pidgin/gtkcertmgr.c:530
+#: ../pidgin/gtkcertmgr.c:541
 msgid "SSL Servers"
 msgstr "悽悋惆�� SSL"

-#: ../pidgin/gtkconv.c:474
+#: ../pidgin/gtkconv.c:485
 msgid "Unknown command."
 msgstr "悖�惘� �悴���."

-#: ../pidgin/gtkconv.c:744 ../pidgin/gtkconv.c:770
+#: ../pidgin/gtkconv.c:749 ../pidgin/gtkconv.c:775
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "�悵悋 悋�惶惆�� �悋 �愕惠悽惆� 悵悋惠 悋�惡惘�惠���� 悋�悵� 惠愕惠悽惆�� �悵� 悋�惆惘惆愆悸."

-#: ../pidgin/gtkconv.c:764
+#: ../pidgin/gtkconv.c:769
 msgid "You are not currently signed on with an account that can invite that buddy."
 msgstr "�愕惠 �悋�悴悋 忰悋���悋 惡忰愕悋惡 ����� �� 惆惺�悸 悵�� 悋�惶惆��."

-#: ../pidgin/gtkconv.c:817
+#: ../pidgin/gtkconv.c:822
 msgid "Invite Buddy Into Chat Room"
 msgstr "悋惆惺� 惶惆��悋 悒�� 愃惘�悸 悋�惆惘惆愆悸"

 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:847
+#: ../pidgin/gtkconv.c:852
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr "悖惆悽� 悋愕� 悋��愕惠悽惆� 悋�悵� 惠惘愃惡 �� 惆惺�惠�� �惺 惘愕悋�悸 惆惺�悸 悋悽惠�悋惘�悸."

-#: ../pidgin/gtkconv.c:868
+#: ../pidgin/gtkconv.c:873
 msgid "_Buddy:"
 msgstr "悋�_惶惆��:"

-#: ../pidgin/gtkconv.c:879 ../pidgin/gtksavedstatuses.c:1164
-#: ../pidgin/gtksavedstatuses.c:1482
+#: ../pidgin/gtkconv.c:884 ../pidgin/gtksavedstatuses.c:1166
+#: ../pidgin/gtksavedstatuses.c:1484
 msgid "_Message:"
 msgstr "悋�_惘愕悋�悸:"

-#: ../pidgin/gtkconv.c:943
+#: ../pidgin/gtkconv.c:948
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>�忰悋惆惓悸 �惺 %s</h1>\n"

-#: ../pidgin/gtkconv.c:981
+#: ../pidgin/gtkconv.c:986
 msgid "Save Conversation"
 msgstr "悋忰�惴 悋��忰悋惆惓悸"

-#: ../pidgin/gtkconv.c:1127 ../pidgin/gtkdebug.c:167 ../pidgin/gtkdebug.c:740
+#: ../pidgin/gtkconv.c:1132 ../pidgin/gtkdebug.c:167 ../pidgin/gtkdebug.c:740
 msgid "Find"
 msgstr "悋惡忰惓"

-#: ../pidgin/gtkconv.c:1153 ../pidgin/gtkdebug.c:195
+#: ../pidgin/gtkconv.c:1158 ../pidgin/gtkdebug.c:195
 msgid "_Search for:"
 msgstr "悋_惡忰惓 惺�:"

-#: ../pidgin/gtkconv.c:1654
+#: ../pidgin/gtkconv.c:1659
 msgid "Un-Ignore"
-msgstr "悋�愃� 悋�惠悴悋��"
-
-#: ../pidgin/gtkconv.c:1657
+msgstr "悖�愃� 悋�惠悴悋��"
+
+#: ../pidgin/gtkconv.c:1662
 msgid "Ignore"
 msgstr "惠悴悋��"

-#: ../pidgin/gtkconv.c:1677
+#: ../pidgin/gtkconv.c:1682
 msgid "Get Away Message"
 msgstr "悋悴�惡 惘愕悋�悸 \"悋�愃�悋惡\""

-#: ../pidgin/gtkconv.c:1700
+#: ../pidgin/gtkconv.c:1705
 msgid "Last said"
 msgstr "悛悽惘 �悋���"

-#: ../pidgin/gtkconv.c:2653
+#: ../pidgin/gtkconv.c:2660
 msgid "Unable to save icon file to disk."
 msgstr "惠惺悵�惘 忰�惴 ��� 悋�悖����悸 悒�� 悋��惘惶."

-#: ../pidgin/gtkconv.c:2704
+#: ../pidgin/gtkconv.c:2711
 msgid "Save Icon"
 msgstr "悋忰�惴 悋�悖����悸"

-#: ../pidgin/gtkconv.c:2756
+#: ../pidgin/gtkconv.c:2763
 msgid "Animate"
 msgstr "惘愕�� �惠忰惘�悸"

-#: ../pidgin/gtkconv.c:2761
+#: ../pidgin/gtkconv.c:2768
 msgid "Hide Icon"
 msgstr "悋悽�� 悋�悖����悸"

-#: ../pidgin/gtkconv.c:2764
+#: ../pidgin/gtkconv.c:2771
 msgid "Save Icon As..."
 msgstr "悋忰�惴 悋�悖����悸 惡悋愕�..."

-#: ../pidgin/gtkconv.c:2768
+#: ../pidgin/gtkconv.c:2775
 msgid "Set Custom Icon..."
 msgstr "忰惆惆 悖����悸 �悽惶惶悸..."

-#: ../pidgin/gtkconv.c:2781
+#: ../pidgin/gtkconv.c:2788
 msgid "Remove Custom Icon"
 msgstr "悖慍�� 悋�悖����悸 悋��悽惶惶悸"

-#: ../pidgin/gtkconv.c:2911
+#: ../pidgin/gtkconv.c:2913
 msgid "Show All"
 msgstr "悋惺惘惷 悋���"

 #. Conversation menu
-#: ../pidgin/gtkconv.c:2930
+#: ../pidgin/gtkconv.c:2932
 msgid "/_Conversation"
 msgstr "/_�忰悋惆惓悸"

-#: ../pidgin/gtkconv.c:2932
+#: ../pidgin/gtkconv.c:2934
 msgid "/Conversation/New Instant _Message..."
 msgstr "/�忰悋惆惓悸/惘愕悋�悸 ��惘�悸 _悴惆�惆悸..."

-#: ../pidgin/gtkconv.c:2937
+#: ../pidgin/gtkconv.c:2939
 msgid "/Conversation/_Find..."
 msgstr "/�忰悋惆惓悸/悋_惡忰惓..."

-#: ../pidgin/gtkconv.c:2939
+#: ../pidgin/gtkconv.c:2941
 msgid "/Conversation/View _Log"
 msgstr "/�忰悋惆惓悸/悋愕惠惺惘惷 悋�_愕悴�"

-#: ../pidgin/gtkconv.c:2940
+#: ../pidgin/gtkconv.c:2942
 msgid "/Conversation/_Save As..."
 msgstr "/�忰悋惆惓悸/悋_忰�惴 惡悋愕�..."

-#: ../pidgin/gtkconv.c:2942
+#: ../pidgin/gtkconv.c:2944
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/�忰悋惆惓悸/悋�_忰 �悋�悵悸 悋��忰悋惆惓悸"

-#: ../pidgin/gtkconv.c:2946
+#: ../pidgin/gtkconv.c:2948
 msgid "/Conversation/Se_nd File..."
 msgstr "/�忰悋惆惓悸/悖惘_愕� ���悋..."

-#: ../pidgin/gtkconv.c:2947
+#: ../pidgin/gtkconv.c:2949
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/�忰悋惆惓悸/悖惷� 悒愆惺悋惘 _惶惆��..."

-#: ../pidgin/gtkconv.c:2949
-msgid "/Conversation/_Get Info"
-msgstr "/�忰悋惆惓悸/悋_悴�惡 �惺���悋惠"
-
 #: ../pidgin/gtkconv.c:2951
+msgid "/Conversation/_Get Info"
+msgstr "/�忰悋惆惓悸/悋_悴�惡 �惺���悋惠"
+
+#: ../pidgin/gtkconv.c:2953
 msgid "/Conversation/In_vite..."
 msgstr "/�忰悋惆惓悸/悋惆_惺�..."

-#: ../pidgin/gtkconv.c:2953
+#: ../pidgin/gtkconv.c:2955
 msgid "/Conversation/M_ore"
 msgstr "/�忰悋惆惓悸/悋�_�慍�惆"

-#: ../pidgin/gtkconv.c:2957
+#: ../pidgin/gtkconv.c:2959
 msgid "/Conversation/Al_ias..."
 msgstr "/�忰悋惆惓悸/悋愕�_ �愕惠惺悋惘..."

-#: ../pidgin/gtkconv.c:2959
-msgid "/Conversation/_Block..."
-msgstr "/�忰悋惆惓悸/悋_忰惴惘..."
-
 #: ../pidgin/gtkconv.c:2961
-msgid "/Conversation/_Unblock..."
-msgstr "/�忰悋惆惓悸/悋�_愃 悋�忰惴惘..."
+msgid "/Conversation/_Block..."
+msgstr "/�忰悋惆惓悸/悋_忰惴惘..."

 #: ../pidgin/gtkconv.c:2963
+msgid "/Conversation/_Unblock..."
+msgstr "/�忰悋惆惓悸/悖�_愃 悋�忰惴惘..."
+
+#: ../pidgin/gtkconv.c:2965
 msgid "/Conversation/_Add..."
 msgstr "/�忰悋惆惓悸/悖_惷�..."

-#: ../pidgin/gtkconv.c:2965
+#: ../pidgin/gtkconv.c:2967
 msgid "/Conversation/_Remove..."
 msgstr "/�忰悋惆惓悸/悖_慍��..."

-#: ../pidgin/gtkconv.c:2970
+#: ../pidgin/gtkconv.c:2972
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/�忰悋惆惓悸/悖惆惘悴 _惘悋惡愀悋..."

-#: ../pidgin/gtkconv.c:2972
+#: ../pidgin/gtkconv.c:2974
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/�忰悋惆惓悸/悖惆惘悴 _惶�惘悸..."

-#: ../pidgin/gtkconv.c:2978
+#: ../pidgin/gtkconv.c:2980
 msgid "/Conversation/_Close"
 msgstr "/�忰悋惆惓悸/悖_愃���"

 #. Options
-#: ../pidgin/gtkconv.c:2982
+#: ../pidgin/gtkconv.c:2984
 msgid "/_Options"
 msgstr "/_悽�悋惘悋惠"

-#: ../pidgin/gtkconv.c:2983
+#: ../pidgin/gtkconv.c:2985
 msgid "/Options/Enable _Logging"
 msgstr "/悽�悋惘悋惠/�惺�� 悋�_惠愕悴��"

-#: ../pidgin/gtkconv.c:2984
-msgid "/Options/Enable _Sounds"
-msgstr "/悽�悋惘悋惠/�惺�� 悋�悖惶_�悋惠"
-
 #: ../pidgin/gtkconv.c:2986
+msgid "/Options/Enable _Sounds"
+msgstr "/悽�悋惘悋惠/�惺�� 悋�悖惶_�悋惠"
+
+#: ../pidgin/gtkconv.c:2988
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/悽�悋惘悋惠/悋惺惘惷 悖_愆惘愀悸 悖惆�悋惠 悋�惠�愕��"

-#: ../pidgin/gtkconv.c:2987
+#: ../pidgin/gtkconv.c:2989
 msgid "/Options/Show Ti_mestamps"
-msgstr "/悽�悋惘悋惠/悋惴�惘 悋�_悖悽惠悋� 悋�慍���悸"
-
-#: ../pidgin/gtkconv.c:3114
+msgstr "/悽�悋惘悋惠/悖惴�惘 悋�_悖悽惠悋� 悋�慍���悸"
+
+#: ../pidgin/gtkconv.c:3116
 msgid "/Conversation/More"
 msgstr "/�忰悋惆惓悸/悋��慍�惆"

-#: ../pidgin/gtkconv.c:3170
+#: ../pidgin/gtkconv.c:3172
 msgid "/Options"
 msgstr "/悽�悋惘悋惠"

@@ -14712,79 +14891,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:3205 ../pidgin/gtkconv.c:3237
+#: ../pidgin/gtkconv.c:3207 ../pidgin/gtkconv.c:3239
 msgid "/Conversation"
 msgstr "/�忰悋惆惓悸"

-#: ../pidgin/gtkconv.c:3245
+#: ../pidgin/gtkconv.c:3247
 msgid "/Conversation/View Log"
 msgstr "/�忰悋惆惓悸/悋愕惠惺惘惷 悋�愕悴�"

-#: ../pidgin/gtkconv.c:3251
+#: ../pidgin/gtkconv.c:3253
 msgid "/Conversation/Send File..."
 msgstr "/�忰悋惆惓悸/悖惘愕� ���悋..."

-#: ../pidgin/gtkconv.c:3255
+#: ../pidgin/gtkconv.c:3257
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/�忰悋惆惓悸/悖惷� 悒愆惺悋惘 惶惆��..."

-#: ../pidgin/gtkconv.c:3261
+#: ../pidgin/gtkconv.c:3263
 msgid "/Conversation/Get Info"
 msgstr "/�忰悋惆惓悸/悋悴�惡 �惺���悋惠"

-#: ../pidgin/gtkconv.c:3265
+#: ../pidgin/gtkconv.c:3267
 msgid "/Conversation/Invite..."
 msgstr "/�忰悋惆惓悸/悋惆惺�..."

-#: ../pidgin/gtkconv.c:3271
+#: ../pidgin/gtkconv.c:3273
 msgid "/Conversation/Alias..."
 msgstr "/�忰悋惆惓悸/���悸..."

-#: ../pidgin/gtkconv.c:3275
+#: ../pidgin/gtkconv.c:3277
 msgid "/Conversation/Block..."
 msgstr "/�忰悋惆惓悸/悋忰惴惘..."

-#: ../pidgin/gtkconv.c:3279
+#: ../pidgin/gtkconv.c:3281
 msgid "/Conversation/Unblock..."
-msgstr "/�忰悋惆惓悸/悋�愃� 悋�忰惴惘..."
-
-#: ../pidgin/gtkconv.c:3283
+msgstr "/�忰悋惆惓悸/悖�愃� 悋�忰惴惘..."
+
+#: ../pidgin/gtkconv.c:3285
 msgid "/Conversation/Add..."
 msgstr "/�忰悋惆惓悸/悖惷�..."

-#: ../pidgin/gtkconv.c:3287
+#: ../pidgin/gtkconv.c:3289
 msgid "/Conversation/Remove..."
 msgstr "/�忰悋惆惓悸/悖慍��..."

-#: ../pidgin/gtkconv.c:3293
+#: ../pidgin/gtkconv.c:3295
 msgid "/Conversation/Insert Link..."
 msgstr "/�忰悋惆惓悸/悖惆惘悴 惘悋惡愀悋..."

-#: ../pidgin/gtkconv.c:3297
+#: ../pidgin/gtkconv.c:3299
 msgid "/Conversation/Insert Image..."
 msgstr "/�忰悋惆惓悸/悖惆惘悴 惶�惘悸..."

-#: ../pidgin/gtkconv.c:3303
+#: ../pidgin/gtkconv.c:3305
 msgid "/Options/Enable Logging"
 msgstr "/悽�悋惘悋惠/�惺�� 悋�惠愕悴��"

-#: ../pidgin/gtkconv.c:3306
+#: ../pidgin/gtkconv.c:3308
 msgid "/Options/Enable Sounds"
 msgstr "/悽�悋惘悋惠/�惺�� 悋�悖惶�悋惠"

-#: ../pidgin/gtkconv.c:3319
+#: ../pidgin/gtkconv.c:3321
 msgid "/Options/Show Formatting Toolbars"
-msgstr "/悽�悋惘悋惠/悋惴�惘 悖愆惘愀悸 悖惆�悋惠 悋�惠�愕��"
-
-#: ../pidgin/gtkconv.c:3322
+msgstr "/悽�悋惘悋惠/悖惴�惘 悖愆惘愀悸 悖惆�悋惠 悋�惠�愕��"
+
+#: ../pidgin/gtkconv.c:3324
 msgid "/Options/Show Timestamps"
-msgstr "/悽�悋惘悋惠/悋惴�惘 悋�悖悽惠悋� 悋�慍���悸"
-
-#: ../pidgin/gtkconv.c:3400
+msgstr "/悽�悋惘悋惠/悖惴�惘 悋�悖悽惠悋� 悋�慍���悸"
+
+#: ../pidgin/gtkconv.c:3402
 msgid "User is typing..."
 msgstr "悋��愕惠悽惆� ��惠惡..."

-#: ../pidgin/gtkconv.c:3461
+#: ../pidgin/gtkconv.c:3472
 #, c-format
 msgid ""
 "\n"
@@ -14794,20 +14973,20 @@
 "��%s 惠��� 惺� 悋��惠悋惡悸 悒���"

 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3627 ../pidgin/gtkconv.c:8279
+#: ../pidgin/gtkconv.c:3638 ../pidgin/gtkconv.c:8309
 msgid "S_end To"
 msgstr "悖_惘愕� 悒��"

-#: ../pidgin/gtkconv.c:4339
+#: ../pidgin/gtkconv.c:4350
 msgid "_Send"
 msgstr "悖惘_愕�"

 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4477
+#: ../pidgin/gtkconv.c:4486
 msgid "0 people in room"
 msgstr "0 愆悽惶 �� 悋�愃惘�悸"

-#: ../pidgin/gtkconv.c:5776 ../pidgin/gtkconv.c:5897
+#: ../pidgin/gtkconv.c:5784 ../pidgin/gtkconv.c:5905
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
@@ -14818,77 +14997,77 @@
 msgstr[4] "%Id 愆悽惶悋"
 msgstr[5] "%Id 愆悽惶"

-#: ../pidgin/gtkconv.c:6524 ../pidgin/gtkstatusbox.c:663
+#: ../pidgin/gtkconv.c:6535 ../pidgin/gtkstatusbox.c:679
 msgid "Typing"
 msgstr "��惠惡"

-#: ../pidgin/gtkconv.c:6528
+#: ../pidgin/gtkconv.c:6539
 msgid "Stopped Typing"
 msgstr "悖����� 悋��惠悋惡悸"

-#: ../pidgin/gtkconv.c:6531
+#: ../pidgin/gtkconv.c:6542
 msgid "Nick Said"
 msgstr "���惠� 悵��惘惠"

-#: ../pidgin/gtkconv.c:6534 ../pidgin/gtkdocklet.c:686
+#: ../pidgin/gtkconv.c:6545 ../pidgin/gtkdocklet.c:686
 msgid "Unread Messages"
 msgstr "惘愕悋悧� 愃�惘 ��惘�悄悸"

-#: ../pidgin/gtkconv.c:6540
+#: ../pidgin/gtkconv.c:6551
 msgid "New Event"
 msgstr "忰惆惓 悴惆�惆"

-#: ../pidgin/gtkconv.c:7757
+#: ../pidgin/gtkconv.c:7781
 msgid "clear: Clears all conversation scrollbacks."
 msgstr ""
 "clear:\n"
 "��愕忰 愕悴� �悋�悵悸 悋��忰悋惆惓悸."

-#: ../pidgin/gtkconv.c:7961
+#: ../pidgin/gtkconv.c:7985
 msgid "Confirm close"
 msgstr "悖���惆 悋�悒愃�悋�"

-#: ../pidgin/gtkconv.c:7993
+#: ../pidgin/gtkconv.c:8017
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "�惆�� 惘愕悋悧� 愃�惘 ��惘�悄悸.�� 惠惘�惆 悒愃�悋� 悋��悋�悵悸�"

-#: ../pidgin/gtkconv.c:8612
+#: ../pidgin/gtkconv.c:8650
 msgid "Close other tabs"
 msgstr "悖愃��� 悋�悖�愕�悸 悋�悖悽惘�"

-#: ../pidgin/gtkconv.c:8618
+#: ../pidgin/gtkconv.c:8656
 msgid "Close all tabs"
 msgstr "悖愃��� 悴��惺 悋�悖�愕�悸"

-#: ../pidgin/gtkconv.c:8626
+#: ../pidgin/gtkconv.c:8664
 msgid "Detach this tab"
 msgstr "悋�惶� �悵悋 悋��愕悋�"

-#: ../pidgin/gtkconv.c:8632
+#: ../pidgin/gtkconv.c:8670
 msgid "Close this tab"
 msgstr "悖愃�� �悵悋 悋��愕悋�"

-#: ../pidgin/gtkconv.c:9146
+#: ../pidgin/gtkconv.c:9184
 msgid "Close conversation"
 msgstr "悖愃�� 悋��忰悋惆惓悸"

-#: ../pidgin/gtkconv.c:9750
+#: ../pidgin/gtkconv.c:9788
 msgid "Last created window"
 msgstr "悛悽惘 �悋�悵悸 ��愆悖悸"

-#: ../pidgin/gtkconv.c:9752
+#: ../pidgin/gtkconv.c:9790
 msgid "Separate IM and Chat windows"
 msgstr "悋�惶� ��悋�悵 悋�惠惘悋愕� 悋���惘� � 悋�惆惘惆愆悸"

-#: ../pidgin/gtkconv.c:9754 ../pidgin/gtkprefs.c:1446
+#: ../pidgin/gtkconv.c:9792 ../pidgin/gtkprefs.c:1466
 msgid "New window"
 msgstr "�悋�悵悸 悴惆�惆悸"

-#: ../pidgin/gtkconv.c:9756
+#: ../pidgin/gtkconv.c:9794
 msgid "By group"
 msgstr "忰愕惡 悋��悴��惺悸"

-#: ../pidgin/gtkconv.c:9758
+#: ../pidgin/gtkconv.c:9796
 msgid "By account"
 msgstr "忰愕惡 悋�忰愕悋惡"

@@ -14952,7 +15131,7 @@
 msgid "Fatal Error"
 msgstr "惺愀� �悋惠�"

-#: ../pidgin/gtkdialogs.c:72 ../pidgin/gtkdialogs.c:118
+#: ../pidgin/gtkdialogs.c:72 ../pidgin/gtkdialogs.c:119
 msgid "lead developer"
 msgstr "悋��愀��惘 悋�惘悧�愕�"

@@ -14977,36 +15156,36 @@
 msgid "support/QA"
 msgstr "惆惺�/悋�惠忰�� �� 悋�悴�惆悸"

-#: ../pidgin/gtkdialogs.c:91 ../pidgin/gtkdialogs.c:113
+#: ../pidgin/gtkdialogs.c:91 ../pidgin/gtkdialogs.c:114
 msgid "developer & webmaster"
 msgstr "�愀�惘 � �愆惘� 悋����惺"

-#: ../pidgin/gtkdialogs.c:100
+#: ../pidgin/gtkdialogs.c:101
 msgid "Senior Contributor/QA"
 msgstr "��愕悋�� �惠�惆�/悋�惠忰�� �� 悋�悴�惆悸"

-#: ../pidgin/gtkdialogs.c:109
+#: ../pidgin/gtkdialogs.c:110
 msgid "win32 port"
 msgstr "�愕悽悸 ���惆�慍"

-#: ../pidgin/gtkdialogs.c:110 ../pidgin/gtkdialogs.c:111
+#: ../pidgin/gtkdialogs.c:111 ../pidgin/gtkdialogs.c:112
 msgid "maintainer"
 msgstr "�惠惺�惆"

-#: ../pidgin/gtkdialogs.c:112
+#: ../pidgin/gtkdialogs.c:113
 msgid "libfaim maintainer"
 msgstr "�惠惺�惆 libfaim"

 #. If "lazy bum" translates literally into a serious insult, use something else or omit it.
-#: ../pidgin/gtkdialogs.c:115
+#: ../pidgin/gtkdialogs.c:116
 msgid "hacker and designated driver [lazy bum]"
 msgstr "�悋�惘 � 愕悋悧�"

-#: ../pidgin/gtkdialogs.c:116
+#: ../pidgin/gtkdialogs.c:117
 msgid "XMPP developer"
 msgstr "�愀�惘 XMPP"

-#: ../pidgin/gtkdialogs.c:117
+#: ../pidgin/gtkdialogs.c:118
 msgid "original author"
 msgstr "悋��悗�� 悋�悖惶��"

@@ -15014,7 +15193,7 @@
 msgid "Afrikaans"
 msgstr "悖�惘��悋��悸"

-#: ../pidgin/gtkdialogs.c:135 ../pidgin/gtkdialogs.c:229
+#: ../pidgin/gtkdialogs.c:135 ../pidgin/gtkdialogs.c:230
 msgid "Arabic"
 msgstr "惺惘惡�悸"

@@ -15023,7 +15202,7 @@
 msgstr "惡�悋惘�愕�悸 (�悋惠���悸)"

 #: ../pidgin/gtkdialogs.c:137 ../pidgin/gtkdialogs.c:138
-#: ../pidgin/gtkdialogs.c:230
+#: ../pidgin/gtkdialogs.c:231
 msgid "Bulgarian"
 msgstr "惡�愃悋惘�悸"

@@ -15036,8 +15215,8 @@
 msgid "Bosnian"
 msgstr "惡�愕��悸"

-#: ../pidgin/gtkdialogs.c:144 ../pidgin/gtkdialogs.c:231
-#: ../pidgin/gtkdialogs.c:232
+#: ../pidgin/gtkdialogs.c:144 ../pidgin/gtkdialogs.c:232
+#: ../pidgin/gtkdialogs.c:233
 msgid "Catalan"
 msgstr "�愀悋����悸"

@@ -15045,7 +15224,7 @@
 msgid "Valencian-Catalan"
 msgstr "擇悋��愕�悸-�愀悋����悸"

-#: ../pidgin/gtkdialogs.c:147 ../pidgin/gtkdialogs.c:233
+#: ../pidgin/gtkdialogs.c:147 ../pidgin/gtkdialogs.c:234
 msgid "Czech"
 msgstr "惠愆���悸"

@@ -15054,7 +15233,7 @@
 msgstr "惆悋��悋惘��悸"

 #: ../pidgin/gtkdialogs.c:150 ../pidgin/gtkdialogs.c:151
-#: ../pidgin/gtkdialogs.c:234
+#: ../pidgin/gtkdialogs.c:235
 msgid "German"
 msgstr "悖��悋��悸"

@@ -15083,9 +15262,9 @@
 msgid "Esperanto"
 msgstr "悒愕惡惘悋�惠�"

-#: ../pidgin/gtkdialogs.c:161 ../pidgin/gtkdialogs.c:235
-#: ../pidgin/gtkdialogs.c:236 ../pidgin/gtkdialogs.c:237
-#: ../pidgin/gtkdialogs.c:238
+#: ../pidgin/gtkdialogs.c:161 ../pidgin/gtkdialogs.c:236
+#: ../pidgin/gtkdialogs.c:237 ../pidgin/gtkdialogs.c:238
+#: ../pidgin/gtkdialogs.c:239
 msgid "Spanish"
 msgstr "�愆惠悋��悸"

@@ -15102,19 +15281,19 @@
 msgid "Persian"
 msgstr "�悋惘愕�悸"

-#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:239
-#: ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:241
 msgid "Finnish"
 msgstr "����惆�悸"

-#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:241
-#: ../pidgin/gtkdialogs.c:242 ../pidgin/gtkdialogs.c:243
-#: ../pidgin/gtkdialogs.c:244
+#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:242
+#: ../pidgin/gtkdialogs.c:243 ../pidgin/gtkdialogs.c:244
+#: ../pidgin/gtkdialogs.c:245
 msgid "French"
 msgstr "�惘�愕�悸"

 #: ../pidgin/gtkdialogs.c:170 ../pidgin/gtkdialogs.c:171
-#: ../pidgin/gtkdialogs.c:245
+#: ../pidgin/gtkdialogs.c:246
 msgid "Galician"
 msgstr "擯悋��愕�悸"

@@ -15126,7 +15305,7 @@
 msgid "Gujarati Language Team"
 msgstr "�惘�� 悋��愃悸 悋�擯�悴惘悋惠�悸"

-#: ../pidgin/gtkdialogs.c:174 ../pidgin/gtkdialogs.c:246
+#: ../pidgin/gtkdialogs.c:174 ../pidgin/gtkdialogs.c:247
 msgid "Hebrew"
 msgstr "惺惡惘�悸"

@@ -15134,7 +15313,7 @@
 msgid "Hindi"
 msgstr "��惆�悸"

-#: ../pidgin/gtkdialogs.c:176 ../pidgin/gtkdialogs.c:247
+#: ../pidgin/gtkdialogs.c:176 ../pidgin/gtkdialogs.c:248
 msgid "Hungarian"
 msgstr "�悴惘�悸"

@@ -15142,16 +15321,16 @@
 msgid "Indonesian"
 msgstr "悒�惆���愕�悸"

-#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:248
+#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:249
 msgid "Italian"
 msgstr "悒�愀悋��悸"

-#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:249
-#: ../pidgin/gtkdialogs.c:250 ../pidgin/gtkdialogs.c:251
+#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:250
+#: ../pidgin/gtkdialogs.c:251 ../pidgin/gtkdialogs.c:252
 msgid "Japanese"
 msgstr "�悋惡悋��悸"

-#: ../pidgin/gtkdialogs.c:180 ../pidgin/gtkdialogs.c:252
+#: ../pidgin/gtkdialogs.c:180 ../pidgin/gtkdialogs.c:253
 msgid "Georgian"
 msgstr "悴�惘悴�悸"

@@ -15167,8 +15346,8 @@
 msgid "Kannada Translation team"
 msgstr "�惘�� 惠惘悴�悸 悋��悋�悋惆悋"

-#: ../pidgin/gtkdialogs.c:182 ../pidgin/gtkdialogs.c:253
-#: ../pidgin/gtkdialogs.c:254
+#: ../pidgin/gtkdialogs.c:182 ../pidgin/gtkdialogs.c:254
+#: ../pidgin/gtkdialogs.c:255
 msgid "Korean"
 msgstr "��惘�悸"

@@ -15181,18 +15360,18 @@
 msgid "Lao"
 msgstr "�悋�"

-#: ../pidgin/gtkdialogs.c:187 ../pidgin/gtkdialogs.c:255
-#: ../pidgin/gtkdialogs.c:256
+#: ../pidgin/gtkdialogs.c:187 ../pidgin/gtkdialogs.c:256
+#: ../pidgin/gtkdialogs.c:257
 msgid "Lithuanian"
 msgstr "�惠�悋��悸"

 #: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:189
-#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:257
+#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:258
 msgid "Macedonian"
 msgstr "��惆���悸"

-#: ../pidgin/gtkdialogs.c:191 ../pidgin/gtkdialogs.c:258
-#: ../pidgin/gtkdialogs.c:259
+#: ../pidgin/gtkdialogs.c:191 ../pidgin/gtkdialogs.c:259
+#: ../pidgin/gtkdialogs.c:260
 msgid "Bokm奪l Norwegian"
 msgstr "�惘��悴�悸 惡���悋�"

@@ -15213,7 +15392,7 @@
 msgstr "惡�悴悋惡��悸"

 #: ../pidgin/gtkdialogs.c:196 ../pidgin/gtkdialogs.c:197
-#: ../pidgin/gtkdialogs.c:198 ../pidgin/gtkdialogs.c:260
+#: ../pidgin/gtkdialogs.c:198 ../pidgin/gtkdialogs.c:261
 msgid "Polish"
 msgstr "惡���惆�悸"

@@ -15233,18 +15412,18 @@
 msgid "Romanian"
 msgstr "惘��悋��悸"

-#: ../pidgin/gtkdialogs.c:203 ../pidgin/gtkdialogs.c:261
-#: ../pidgin/gtkdialogs.c:262
+#: ../pidgin/gtkdialogs.c:203 ../pidgin/gtkdialogs.c:262
+#: ../pidgin/gtkdialogs.c:263
 msgid "Russian"
 msgstr "惘�愕�悸"

 #: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:205
-#: ../pidgin/gtkdialogs.c:263 ../pidgin/gtkdialogs.c:264
-#: ../pidgin/gtkdialogs.c:265
+#: ../pidgin/gtkdialogs.c:264 ../pidgin/gtkdialogs.c:265
+#: ../pidgin/gtkdialogs.c:266
 msgid "Slovak"
 msgstr "愕���悋��悸"

-#: ../pidgin/gtkdialogs.c:206 ../pidgin/gtkdialogs.c:266
+#: ../pidgin/gtkdialogs.c:206 ../pidgin/gtkdialogs.c:267
 msgid "Slovenian"
 msgstr "愕������悸"

@@ -15253,67 +15432,71 @@
 msgstr "悖�惡悋��悸"

 #: ../pidgin/gtkdialogs.c:208 ../pidgin/gtkdialogs.c:209
-#: ../pidgin/gtkdialogs.c:267 ../pidgin/gtkdialogs.c:268
+#: ../pidgin/gtkdialogs.c:268 ../pidgin/gtkdialogs.c:269
 msgid "Serbian"
 msgstr "惶惘惡�悸"

-#: ../pidgin/gtkdialogs.c:210 ../pidgin/gtkdialogs.c:269
-#: ../pidgin/gtkdialogs.c:270
+#: ../pidgin/gtkdialogs.c:210
+msgid "Sinhala"
+msgstr "惶��悋�悋"
+
+#: ../pidgin/gtkdialogs.c:211 ../pidgin/gtkdialogs.c:270
+#: ../pidgin/gtkdialogs.c:271
 msgid "Swedish"
 msgstr "愕��惆�悸"

-#: ../pidgin/gtkdialogs.c:211
+#: ../pidgin/gtkdialogs.c:212
 msgid "Tamil"
 msgstr "惠悋����悸"

-#: ../pidgin/gtkdialogs.c:212
+#: ../pidgin/gtkdialogs.c:213
 msgid "Telugu"
 msgstr "惠��擯�"

-#: ../pidgin/gtkdialogs.c:213
+#: ../pidgin/gtkdialogs.c:214
 msgid "Thai"
 msgstr "惠悋���惆�悸"

-#: ../pidgin/gtkdialogs.c:214 ../pidgin/gtkdialogs.c:271
+#: ../pidgin/gtkdialogs.c:215 ../pidgin/gtkdialogs.c:272
 msgid "Turkish"
 msgstr "惠惘��悸"

-#: ../pidgin/gtkdialogs.c:215
+#: ../pidgin/gtkdialogs.c:216
 msgid "Urdu"
 msgstr "悖惘惆�悸"

-#: ../pidgin/gtkdialogs.c:216
+#: ../pidgin/gtkdialogs.c:217
 msgid "Vietnamese"
 msgstr "��惠�悋��悸"

-#: ../pidgin/gtkdialogs.c:216
+#: ../pidgin/gtkdialogs.c:217
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh � �惘�� Gnome-Vi"

-#: ../pidgin/gtkdialogs.c:217 ../pidgin/gtkdialogs.c:272
+#: ../pidgin/gtkdialogs.c:218 ../pidgin/gtkdialogs.c:273
 msgid "Simplified Chinese"
 msgstr "惶���悸 �惡愕�愀悸"

-#: ../pidgin/gtkdialogs.c:218 ../pidgin/gtkdialogs.c:219
-#: ../pidgin/gtkdialogs.c:220
+#: ../pidgin/gtkdialogs.c:219 ../pidgin/gtkdialogs.c:220
+#: ../pidgin/gtkdialogs.c:221
 msgid "Hong Kong Chinese"
 msgstr "惶���悸 ���悴 ���悴"

-#: ../pidgin/gtkdialogs.c:221 ../pidgin/gtkdialogs.c:222
-#: ../pidgin/gtkdialogs.c:273
+#: ../pidgin/gtkdialogs.c:222 ../pidgin/gtkdialogs.c:223
+#: ../pidgin/gtkdialogs.c:274
 msgid "Traditional Chinese"
 msgstr "惶���悸 惠���惆�悸"

-#: ../pidgin/gtkdialogs.c:228
+#: ../pidgin/gtkdialogs.c:229
 msgid "Amharic"
 msgstr "悖��惘�悸"

-#: ../pidgin/gtkdialogs.c:358
+#: ../pidgin/gtkdialogs.c:359
 #, c-format
 msgid "About %s"
 msgstr "惺� %s"

-#: ../pidgin/gtkdialogs.c:394
+#: ../pidgin/gtkdialogs.c:395
 #, c-format
 msgid ""
 "%s is a graphical modular messaging client based on libpurple which is "
@@ -15335,98 +15518,98 @@
 "'COPYRIGHT' �惠惘� 悋��悋悧�悸 悋��悋��悸 惡悋��愕悋����. �悋 ��惆� 悖� 惷�悋� 惺�� �悵� "
 "悋�惡惘�悴�悸.<BR><BR> "

-#: ../pidgin/gtkdialogs.c:412
+#: ../pidgin/gtkdialogs.c:413
 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:417
+#: ../pidgin/gtkdialogs.c:418
 msgid "Current Developers"
 msgstr "悋��愀�惘�� 悋�忰悋����"

-#: ../pidgin/gtkdialogs.c:432
+#: ../pidgin/gtkdialogs.c:433
 msgid "Crazy Patch Writers"
 msgstr "��惠��悋惡 悋�惘���惺 悋��悴悋���"

-#: ../pidgin/gtkdialogs.c:447
+#: ../pidgin/gtkdialogs.c:448
 msgid "Retired Developers"
 msgstr "悋��愀�惘�� 悋��惠�悋惺惆��"

-#: ../pidgin/gtkdialogs.c:462
+#: ../pidgin/gtkdialogs.c:463
 msgid "Retired Crazy Patch Writers"
 msgstr "��惠��悋惡 悋�惘�惺 悋��悴悋��� 悋��惠�悋惺惆��"

-#: ../pidgin/gtkdialogs.c:477
+#: ../pidgin/gtkdialogs.c:478
 msgid "Artists"
 msgstr "悋���悋���"

-#: ../pidgin/gtkdialogs.c:492
+#: ../pidgin/gtkdialogs.c:493
 msgid "Current Translators"
 msgstr "悋��惠惘悴��� 悋�忰悋����"

-#: ../pidgin/gtkdialogs.c:512
+#: ../pidgin/gtkdialogs.c:513
 msgid "Past Translators"
 msgstr "悋��惠惘悴��� 悋�愕悋惡���"

-#: ../pidgin/gtkdialogs.c:530
+#: ../pidgin/gtkdialogs.c:531
 msgid "Debugging Information"
 msgstr "�惺���悋惠 悋�惠���忰"

-#: ../pidgin/gtkdialogs.c:746 ../pidgin/gtkdialogs.c:885
-#: ../pidgin/gtkdialogs.c:966
+#: ../pidgin/gtkdialogs.c:747 ../pidgin/gtkdialogs.c:886
+#: ../pidgin/gtkdialogs.c:967
 msgid "_Name"
 msgstr "悋�悋_愕�"

-#: ../pidgin/gtkdialogs.c:751 ../pidgin/gtkdialogs.c:890
-#: ../pidgin/gtkdialogs.c:971
+#: ../pidgin/gtkdialogs.c:752 ../pidgin/gtkdialogs.c:891
+#: ../pidgin/gtkdialogs.c:972
 msgid "_Account"
 msgstr "悋�_忰愕悋惡"

-#: ../pidgin/gtkdialogs.c:898
+#: ../pidgin/gtkdialogs.c:899
 msgid "Get User Info"
 msgstr "悋忰惶� 惺�� �惺���悋惠 悋��愕惠悽惆�"

-#: ../pidgin/gtkdialogs.c:900
+#: ../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:990
+#: ../pidgin/gtkdialogs.c:991
 msgid "View User Log"
 msgstr "悋愕惠惺惘惷 愕悴� 悋��愕惠悽惆�"

-#: ../pidgin/gtkdialogs.c:992
+#: ../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:1012
+#: ../pidgin/gtkdialogs.c:1013
 msgid "Alias Contact"
 msgstr "悋愕� 悋��惘悋愕� 悋��愕惠惺悋惘"

-#: ../pidgin/gtkdialogs.c:1013
+#: ../pidgin/gtkdialogs.c:1014
 msgid "Enter an alias for this contact."
 msgstr "悖惆悽� 悋�悋愕� 悋��愕惠惺悋惘 ��悵悋 悋��惘悋愕�."

-#: ../pidgin/gtkdialogs.c:1035
+#: ../pidgin/gtkdialogs.c:1036
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "悖惆悽� 悋�悋愕� 悋��愕惠惺悋惘 ��%s."

-#: ../pidgin/gtkdialogs.c:1037
+#: ../pidgin/gtkdialogs.c:1038
 msgid "Alias Buddy"
 msgstr "悋�悋愕� 悋��愕惠惺悋惘 ��惶惆��"

-#: ../pidgin/gtkdialogs.c:1058
+#: ../pidgin/gtkdialogs.c:1059
 msgid "Alias Chat"
 msgstr "悋愕� 悋�惆惘惆愆悸 悋��愕惠惺悋惘"

-#: ../pidgin/gtkdialogs.c:1059
+#: ../pidgin/gtkdialogs.c:1060
 msgid "Enter an alias for this chat."
 msgstr "悖惆悽� 悋�悋愕� 悋��愕惠惺悋惘 ��悵� 悋�惆惘惆愆悸"

-#: ../pidgin/gtkdialogs.c:1098
+#: ../pidgin/gtkdialogs.c:1099
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -15453,30 +15636,30 @@
 "悖�惠 惡惶惆惆 悒慍悋�悸 �惘悋愕� �忰惠�� %s � %Id 惶惆�� 悛悽惘 �� �悋悧�悸 悖惶惆�悋悧�.  �� 惠惘�惆 "
 "悋�悋愕惠�惘悋惘�"

-#: ../pidgin/gtkdialogs.c:1106
+#: ../pidgin/gtkdialogs.c:1107
 msgid "Remove Contact"
 msgstr "悖慍�� 悋��惘悋愕�"

-#: ../pidgin/gtkdialogs.c:1109
+#: ../pidgin/gtkdialogs.c:1110
 msgid "_Remove Contact"
 msgstr "悖_慍�� 悋��惘悋愕�"

-#: ../pidgin/gtkdialogs.c:1140
+#: ../pidgin/gtkdialogs.c:1141
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
 "want to continue?"
 msgstr "悖�惠 惡惶惆惆 惆�悴 悋��悴��惺悸 %s �� 悋��悴��惺悸 %s. �� 惠惘�惆 悋�悋愕惠�惘悋惘�"

-#: ../pidgin/gtkdialogs.c:1147
+#: ../pidgin/gtkdialogs.c:1148
 msgid "Merge Groups"
 msgstr "悋惆�悴 悋��悴��惺惠��"

-#: ../pidgin/gtkdialogs.c:1150
+#: ../pidgin/gtkdialogs.c:1151
 msgid "_Merge Groups"
 msgstr "悋_惆�悴 �悴��惺惠��"

-#: ../pidgin/gtkdialogs.c:1200
+#: ../pidgin/gtkdialogs.c:1201
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -15485,39 +15668,39 @@
 "悖�惠 惡惶惆惆 悒慍悋�悸 悋��悴��惺悸 %s �悴��惺 悖惺惷悋悧�悋 �� �悋悧�悸 悖惶惆�悋悧�.  �� 惠惘�惆 "
 "悋�悋愕惠�惘悋惘�"

-#: ../pidgin/gtkdialogs.c:1203
+#: ../pidgin/gtkdialogs.c:1204
 msgid "Remove Group"
 msgstr "悖慍�� 悋��悴��惺悸"

-#: ../pidgin/gtkdialogs.c:1206
+#: ../pidgin/gtkdialogs.c:1207
 msgid "_Remove Group"
 msgstr "悖慍�� _�悴��惺悸"

-#: ../pidgin/gtkdialogs.c:1239
+#: ../pidgin/gtkdialogs.c:1240
 #, c-format
 msgid "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "悖�惠 惡惶惆惆 悒慍悋�悸 %s �� �悋悧�悸 悖惶惆�悋悧�.  �� 惠惘�惆 悋�悋愕惠�惘悋惘�"

-#: ../pidgin/gtkdialogs.c:1242
+#: ../pidgin/gtkdialogs.c:1243
 msgid "Remove Buddy"
 msgstr "悖慍�� 悋�惶惆��"

-#: ../pidgin/gtkdialogs.c:1245
+#: ../pidgin/gtkdialogs.c:1246
 msgid "_Remove Buddy"
 msgstr "悖慍�� _惶惆��悋"

-#: ../pidgin/gtkdialogs.c:1266
+#: ../pidgin/gtkdialogs.c:1267
 #, 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:1269
+#: ../pidgin/gtkdialogs.c:1270
 msgid "Remove Chat"
 msgstr "悖慍�� 悋�惆惘惆愆悸"

-#: ../pidgin/gtkdialogs.c:1272
+#: ../pidgin/gtkdialogs.c:1273
 msgid "_Remove Chat"
 msgstr "悖慍�� 悋�_惆惘惆愆悸"

@@ -15635,75 +15818,75 @@
 msgid "_Resume"
 msgstr "悋_愕惠悖��"

-#: ../pidgin/gtkimhtml.c:816
+#: ../pidgin/gtkimhtml.c:820
 msgid "Paste as Plain _Text"
 msgstr "悋�惶� ��惶 _惶�惘�"

-#: ../pidgin/gtkimhtml.c:833 ../pidgin/gtkimhtmltoolbar.c:1197
+#: ../pidgin/gtkimhtml.c:837 ../pidgin/gtkimhtmltoolbar.c:1197
 msgid "_Reset formatting"
 msgstr "惶��惘 悋�_惠�愕��"

-#: ../pidgin/gtkimhtml.c:1391
-msgid "Hyperlink color"
-msgstr "��� 悋�惘悋惡愀 悋��悋悧�"
-
-#: ../pidgin/gtkimhtml.c:1392
-msgid "Color to draw hyperlinks."
-msgstr "悋���� 悋��愕惠悽惆� �惘愕� 悋�惘�悋惡愀 悋��悋悧�悸"
-
 #: ../pidgin/gtkimhtml.c:1395
+msgid "Hyperlink color"
+msgstr "��� 悋�惘悋惡愀 悋��悋悧�"
+
+#: ../pidgin/gtkimhtml.c:1396
+msgid "Color to draw hyperlinks."
+msgstr "悋���� 悋��愕惠悽惆� �惘愕� 悋�惘�悋惡愀 悋��悋悧�悸"
+
+#: ../pidgin/gtkimhtml.c:1399
 msgid "Hyperlink prelight color"
 msgstr "��� 惠��悴 悋�惘悋惡愀"

-#: ../pidgin/gtkimhtml.c:1396
+#: ../pidgin/gtkimhtml.c:1400
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "��� �惘愕� 悋�惘�悋惡愀 悋��悋悧�悸 惺�惆�悋 惠��� 悋��悖惘悸 ����悋."

-#: ../pidgin/gtkimhtml.c:1399 ../pidgin/plugins/pidginrc.c:52
+#: ../pidgin/gtkimhtml.c:1403 ../pidgin/plugins/pidginrc.c:52
 msgid "Sent Message Name Color"
 msgstr "悖惘愕� ��� 悋愕� 悋�惘愕悋�悸"

-#: ../pidgin/gtkimhtml.c:1400
+#: ../pidgin/gtkimhtml.c:1404
 msgid "Color to draw the name of a message you sent."
 msgstr "��� 惘愕� 悋愕� 悋�惘愕悋�悸 悋�惠� 悖惘愕�惠�悋."

-#: ../pidgin/gtkimhtml.c:1403 ../pidgin/plugins/pidginrc.c:53
+#: ../pidgin/gtkimhtml.c:1407 ../pidgin/plugins/pidginrc.c:53
 msgid "Received Message Name Color"
 msgstr "��� 悋愕� 悋�惘愕悋悧� 悋��悋惘惆悸"

-#: ../pidgin/gtkimhtml.c:1404
+#: ../pidgin/gtkimhtml.c:1408
 msgid "Color to draw the name of a message you received."
 msgstr "��� 惘愕� 悋愕� 悋�惘愕悋�悸 悋�惠� 惠���惠�悋."

-#: ../pidgin/gtkimhtml.c:1407
+#: ../pidgin/gtkimhtml.c:1411
 msgid "\"Attention\" Name Color"
 msgstr "��� 悋愕� \"悋�悋�惠惡悋�\""

-#: ../pidgin/gtkimhtml.c:1408
-msgid "Color to draw the name of a message you received containing your name."
-msgstr "��� 惘愕� 悋愕� 悋�惘愕悋�悸 悋�惠� 惠���惠�悋 �惠忰惠�� 悋愕��."
-
-#: ../pidgin/gtkimhtml.c:1411 ../pidgin/plugins/pidginrc.c:55
-msgid "Action Message Name Color"
-msgstr "��� 悋愕� 惘愕悋�悸 悋�悒悴惘悋悄"
-
 #: ../pidgin/gtkimhtml.c:1412
+msgid "Color to draw the name of a message you received containing your name."
+msgstr "��� 惘愕� 悋愕� 悋�惘愕悋�悸 悋�惠� 惠���惠�悋 �惠忰惠�� 悋愕��."
+
+#: ../pidgin/gtkimhtml.c:1415 ../pidgin/plugins/pidginrc.c:55
+msgid "Action Message Name Color"
+msgstr "��� 悋愕� 惘愕悋�悸 悋�悒悴惘悋悄"
+
+#: ../pidgin/gtkimhtml.c:1416
 msgid "Color to draw the name of an action message."
 msgstr "��� 惘愕� 悋愕� 惘愕悋�悸 悒悴惘悋悄."

-#: ../pidgin/gtkimhtml.c:1632
+#: ../pidgin/gtkimhtml.c:1636
 msgid "_Copy E-Mail Address"
 msgstr "悋_�愕悽 惺��悋� 悋�惡惘�惆 悋�悒��惠惘���"

-#: ../pidgin/gtkimhtml.c:1644
+#: ../pidgin/gtkimhtml.c:1648
 msgid "_Open Link in Browser"
 msgstr "悋_�惠忰 悋�惘悋惡愀 �� 悋��惠惶�忰"

-#: ../pidgin/gtkimhtml.c:1654
+#: ../pidgin/gtkimhtml.c:1658
 msgid "_Copy Link Location"
 msgstr "悋_�愕悽 ���惺 悋�惘悋惡愀"

-#: ../pidgin/gtkimhtml.c:3421
+#: ../pidgin/gtkimhtml.c:3425
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -15713,7 +15896,7 @@
 "\n"
 "愕悖惺�惆 悒�� 悋��惡惆悧� PNG."

-#: ../pidgin/gtkimhtml.c:3424
+#: ../pidgin/gtkimhtml.c:3428
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -15723,7 +15906,7 @@
 "\n"
 "愕悖惺�惆 悒�� 悋��惡惆悧� PNG."

-#: ../pidgin/gtkimhtml.c:3453
+#: ../pidgin/gtkimhtml.c:3457
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -15734,7 +15917,7 @@
 "\n"
 "%s"

-#: ../pidgin/gtkimhtml.c:3456
+#: ../pidgin/gtkimhtml.c:3460
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -15745,11 +15928,11 @@
 "\n"
 "%s"

-#: ../pidgin/gtkimhtml.c:3537 ../pidgin/gtkimhtml.c:3549
+#: ../pidgin/gtkimhtml.c:3541 ../pidgin/gtkimhtml.c:3553
 msgid "Save Image"
 msgstr "悋忰�惴 悋�惶�惘悸"

-#: ../pidgin/gtkimhtml.c:3577
+#: ../pidgin/gtkimhtml.c:3581
 msgid "_Save Image..."
 msgstr "悋_忰�惴 悋�惶�惘悸..."

@@ -15927,27 +16110,43 @@
 msgid "_Smile!"
 msgstr "_惡愕�悸!"

-#: ../pidgin/gtklog.c:293
+#: ../pidgin/gtklog.c:245
+msgid "Log Deletion Failed"
+msgstr "�愆� 忰悵� 悋�愕��悴�"
+
+#: ../pidgin/gtklog.c:246
+msgid "Check permissions and try again."
+msgstr "惠忰�� �� 悋�惶�悋忰�悋惠 �悖惺�惆 悋��忰悋��悸."
+
+#: ../pidgin/gtklog.c:292
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation with "
 "%s which started at %s?"
 msgstr "悖�悋惓� 悖�� 惠惘�惆 忰悵� 愕悴� 悋��忰悋惆惓悸 �惺 %s 悋�惠� 惡惆悖惠 �� %s ��悋悧�悋�"

-#: ../pidgin/gtklog.c:304
+#: ../pidgin/gtklog.c:303
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation in %"
 "s which started at %s?"
 msgstr "悖�悋惓� 悖�� 惠惘�惆 忰悵� 愕悴� 悋��忰悋惆惓悸 �� %s 悋�惠� 惡惆悖惠 �� %s ��悋悧�悋�"

-#: ../pidgin/gtklog.c:309
+#: ../pidgin/gtklog.c:308
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the system log which started at %"
 "s?"
 msgstr "悖�悋惓� 悖�� 惠惘�惆 忰悵� 愕悴� 悋��惴悋� 悋�悵� 惡惆悖 �� %s ��悋悧�悋�"

+#: ../pidgin/gtklog.c:323
+msgid "Delete Log?"
+msgstr "悖悖忰悵� 悋�愕��悴��"
+
+#: ../pidgin/gtklog.c:334
+msgid "Delete Log..."
+msgstr "悋忰悵� 悋�愕��悴�..."
+
 #: ../pidgin/gtklog.c:453
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
@@ -15958,60 +16157,47 @@
 msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>�忰悋惆惓悸 �惺 %s 惺�� %s</span>"

-#: ../pidgin/gtklog.c:503
-msgid "%B %Y"
-msgstr "%B %Y"
-
-#: ../pidgin/gtklog.c:550
-msgid ""
-"System events will only be logged if the \"Log all status changes to system "
-"log\" preference is enabled."
-msgstr ""
-"悖忰惆悋惓 悋��惴悋� 愕惠愕悴� ��愀 悒悵悋 �悋� 悽�悋惘 \"愕悴� 悴��惺 惠愃��惘悋惠 悋�忰悋�悋惠 �� 愕悴� 悋��惴悋�"
-"\"  ��惺�悋."
-
-#: ../pidgin/gtklog.c:554
-msgid ""
-"Instant messages will only be logged if the \"Log all instant messages\" "
-"preference is enabled."
-msgstr "悋�惘愕悋悧� 悋���惘�悸 愕惠愕悴� ��愀 悒悵悋 �悋� 悽�悋惘 \"愕悴� 悴��惺 悋�惘愕悋悧� 悋���惘�悸\" ��惺�悋."
-
-#: ../pidgin/gtklog.c:557
-msgid "Chats will only be logged if the \"Log all chats\" preference is enabled."
-msgstr "悋�惆惘惆愆悋惠 愕惠愕悴� ��愀 悒悵悋 �悋� 悽�悋惘 \"愕悴� 悴��惺 悋�惆惘惆愆悋惠\" ��惺�悋.."
-
-#: ../pidgin/gtklog.c:561
-msgid "No logs were found"
-msgstr "�悋 惠�悴惆 愕悴�悋惠"
-
 #. Steal the "HELP" response and use it to trigger browsing to the logs folder
-#: ../pidgin/gtklog.c:576
+#: ../pidgin/gtklog.c:581
 msgid "_Browse logs folder"
 msgstr "_惠惶��忰 �悴�惆 悋�愕悴�悋惠"

-#: ../pidgin/gtklog.c:640
-msgid "Total log size:"
-msgstr "忰悴� 悋�愕悴� 悋�悒悴�悋��:"
-
-#: ../pidgin/gtklog.c:710
-#, c-format
-msgid "Conversations in %s"
-msgstr "�忰悋惆惓悋惠 �� %s"
-
-#: ../pidgin/gtklog.c:718 ../pidgin/gtklog.c:785
-#, c-format
-msgid "Conversations with %s"
-msgstr "�忰悋惆惓悋惠 �惺 %s"
-
-#: ../pidgin/gtklog.c:810
-msgid "System Log"
-msgstr "愕悴� 悋��惴悋�"
-
-#: ../pidgin/gtkmain.c:398
+#: ../pidgin/gtkmain.c:385
 #, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s. 悴惘惡 `%s -h' ��慍�惆 �� 悋��惺���悋惠.\n"

+#: ../pidgin/gtkmain.c:388
+#, c-format
+msgid ""
+"%s %s\n"
+"Usage: %s [OPTION]...\n"
+"\n"
+"  -c, --config=DIR    use DIR for config files\n"
+"  -d, --debug         print debugging messages to stdout\n"
+"  -h, --help          display this help and exit\n"
+"  -m, --multiple      do not ensure single instance\n"
+"  -n, --nologin       don't automatically login\n"
+"  -l, --login[=NAME]  enable specified account(s) (optional argument NAME\n"
+"                      specifies account(s) to use, separated by commas.\n"
+"                      Without this only the first account will be enabled).\n"
+"  --display=DISPLAY   X display to use\n"
+"  -v, --version       display the current version and exit\n"
+msgstr ""
+"%s %s\n"
+"悋�悋愕惠惺�悋�: %s [OPTION]...\n"
+"\n"
+"  -c, --config=DIR    悋�惴惘 DIR ����悋惠 悋�悒惺惆悋惆\n"
+"  -d, --debug         悋愀惡惺 惘愕悋悧� 悋�惠���忰 �� 悋�悽惘�忰\n"
+"  -h, --help           悋惺惘惷 惘愕悋�悸 悋��愕悋惺惆悸�悵� 惓� 悋悽惘悴\n"
+"  -m, --multiple     �悋 惠惠忰�� �� �悴�惆 惠愆愃�� �悋忰惆\n"
+"  -n, --nologin       �悋 惠�悴 悛��悋\n"
+"    -l, --login[=NAME] ��悴 悛��悋 (悋��惺悋�� 悋�悋悽惠�悋惘� NAME �忰惆惆\n"
+"                             悋�忰愕悋惡悋惠 悋�惠� 愕惠愕惠悽惆�� ��惶��悸 惡�悋惶�悸.\n"
+"                             惡惆�� �悵悋 �� ���惺�� 愕�� 悋�忰愕悋惡 悋�悖��).\n"
+"  --display=DISPLAY   悋愕� �惺惘悋惷 愕 ���愕惠悽惆�\n"
+"  -v, --version       悋惺惘惷 悋��愕悽悸 悋�忰悋��悸 �悋悽惘悴\n"
+
 #: ../pidgin/gtkmain.c:401
 #, c-format
 msgid ""
@@ -16023,9 +16209,9 @@
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
-"  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
-"                      account(s) to use, separated by commas)\n"
-"  --display=DISPLAY   X display to use\n"
+"  -l, --login[=NAME]  enable specified account(s) (optional argument NAME\n"
+"                      specifies account(s) to use, separated by commas.\n"
+"                      Without this only the first account will be enabled).\n"
 "  -v, --version       display the current version and exit\n"
 msgstr ""
 "%s %s\n"
@@ -16037,38 +16223,11 @@
 "  -m, --multiple     �悋 惠惠忰�� �� �悴�惆 惠愆愃�� �悋忰惆\n"
 "  -n, --nologin       �悋 惠�悴 悛��悋\n"
 "    -l, --login[=NAME] ��悴 悛��悋 (悋��惺悋�� 悋�悋悽惠�悋惘� NAME �忰惆惆\n"
-"                             悋�忰愕悋惡悋惠 悋�惠� 愕惠愕惠悽惆�� ��惶��悸 惡�悋惶�悸)\n"
-"  --display=DISPLAY   悋愕� �惺惘悋惷 愕 ���愕惠悽惆�\n"
+"                             悋�忰愕悋惡悋惠 悋�惠� 愕惠愕惠悽惆�� ��惶��悸 惡�悋惶�悸.\n"
+"                             惡惆�� �悵悋 �� ���惺�� 愕�� 悋�忰愕悋惡 悋�悖��).\n"
 "  -v, --version       悋惺惘惷 悋��愕悽悸 悋�忰悋��悸 �悋悽惘悴\n"

-#: ../pidgin/gtkmain.c:413
-#, c-format
-msgid ""
-"%s %s\n"
-"Usage: %s [OPTION]...\n"
-"\n"
-"  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
-"  -h, --help          display this help and exit\n"
-"  -m, --multiple      do not ensure single instance\n"
-"  -n, --nologin       don't automatically login\n"
-"  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
-"                      account(s) to use, separated by commas)\n"
-"  -v, --version       display the current version and exit\n"
-msgstr ""
-"%s %s\n"
-"悋�悋愕惠惺�悋�: %s [OPTION]...\n"
-"\n"
-"  -c, --config=DIR    悋�惴惘 DIR ����悋惠 悋�悒惺惆悋惆\n"
-"  -d, --debug         悋愀惡惺 惘愕悋悧� 悋�惠���忰 �� 悋�悽惘�忰\n"
-"  -h, --help           悋惺惘惷 惘愕悋�悸 悋��愕悋惺惆悸�悵� 惓� 悋悽惘悴\n"
-"  -m, --multiple     �悋 惠惠忰�� �� �悴�惆 惠愆愃�� �悋忰惆\n"
-"  -n, --nologin       �悋 惠�悴 悛��悋\n"
-"    -l, --login[=NAME] ��悴 悛��悋 (悋��惺悋�� 悋�悋悽惠�悋惘� NAME �忰惆惆\n"
-"                             悋�忰愕悋惡悋惠 悋�惠� 愕惠愕惠悽惆�� ��惶��悸 惡�悋惶�悸)\n"
-"  -v, --version       悋惺惘惷 悋��愕悽悸 悋�忰悋��悸 �悋悽惘悴\n"
-
-#: ../pidgin/gtkmain.c:539
+#: ../pidgin/gtkmain.c:531
 #, c-format
 msgid ""
 "%s %s has segfaulted and attempted to dump a core file.\n"
@@ -16108,7 +16267,7 @@

 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../pidgin/gtkmain.c:729 ../pidgin/pidgin.h:51
+#: ../pidgin/gtkmain.c:725 ../pidgin/pidgin.h:51
 msgid "Pidgin"
 msgstr "惡�惆�悴��"

@@ -16116,11 +16275,11 @@
 msgid "Open All Messages"
 msgstr "悋�惠忰 悴��惺 悋�惘愕悋悧�"

-#: ../pidgin/gtknotify.c:407
+#: ../pidgin/gtknotify.c:408
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">�惆�� 惘愕悋�悸!</span>"

-#: ../pidgin/gtknotify.c:550
+#: ../pidgin/gtknotify.c:551
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
@@ -16131,7 +16290,7 @@
 msgstr[4] "%2$Id 惘愕悋�悸 悴惆�惆悸 � %1$s."
 msgstr[5] "%2$Id 惘愕悋�悸 悴惆�惆悸 � %1$s."

-#: ../pidgin/gtknotify.c:574
+#: ../pidgin/gtknotify.c:575
 #, c-format
 msgid "<b>%d new e-mail.</b>"
 msgid_plural "<b>%d new e-mails.</b>"
@@ -16142,48 +16301,48 @@
 msgstr[4] "<b>�惆�� %Id 惘愕悋�悸 惡惘�惆 悴惆�惆悸.</b>"
 msgstr[5] "<b>�惆�� %Id 惘愕悋�悸 惡惘�惆 悴惆�惆悸.</b>"

-#: ../pidgin/gtknotify.c:1006
+#: ../pidgin/gtknotify.c:1008
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "悖�惘 悋��惠惶�忰 \"%s\" 愃�惘 惶悋�忰."

-#: ../pidgin/gtknotify.c:1008 ../pidgin/gtknotify.c:1020
-#: ../pidgin/gtknotify.c:1033 ../pidgin/gtknotify.c:1161
+#: ../pidgin/gtknotify.c:1010 ../pidgin/gtknotify.c:1022
+#: ../pidgin/gtknotify.c:1035 ../pidgin/gtknotify.c:1172
 msgid "Unable to open URL"
 msgstr "惠惺悵�惘 �惠忰 悋��愕悋惘"

-#: ../pidgin/gtknotify.c:1018 ../pidgin/gtknotify.c:1031
+#: ../pidgin/gtknotify.c:1020 ../pidgin/gtknotify.c:1033
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "悽愀悖 �� 悒愀�悋� \"%s\": %s"

-#: ../pidgin/gtknotify.c:1162
+#: ../pidgin/gtknotify.c:1173
 msgid "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "悖�惘 悋��惠惶�忰 \"悋��惆��\" 惠� 悋悽惠�悋惘�� ���� �� ��忰惆惆 悖� 悖�惘."

-#: ../pidgin/gtkplugin.c:266
+#: ../pidgin/gtkplugin.c:270
 msgid "The following plugins will be unloaded."
 msgstr "悋���忰�悋惠 悋�惠悋��悸 愕惠�惘愃."

-#: ../pidgin/gtkplugin.c:285
+#: ../pidgin/gtkplugin.c:289
 msgid "Multiple plugins will be unloaded."
 msgstr "��忰�悋惠 �惠惺惆惆悸 愕惠�惘愃."

-#: ../pidgin/gtkplugin.c:289
+#: ../pidgin/gtkplugin.c:293
 msgid "Unload Plugins"
 msgstr "悖�惘愃 悋���忰�悋惠"

-#: ../pidgin/gtkplugin.c:309
+#: ../pidgin/gtkplugin.c:313
 msgid "Could not unload plugin"
 msgstr "惠惺悵�惘 悒�惘悋愃 悋���忰�悸"

-#: ../pidgin/gtkplugin.c:310
+#: ../pidgin/gtkplugin.c:314
 msgid ""
 "The plugin could not be unloaded now, but will be disabled at the next "
 "startup."
 msgstr "惠惺悵�惘 悒�惘悋愃 悋���忰�悸 �� 悋���惠 悋�忰悋��� ��� 愕惠�惺愀�� �惺 惡惆悖 悋�惠愆愃�� 悋�惠悋��."

-#: ../pidgin/gtkplugin.c:418
+#: ../pidgin/gtkplugin.c:422
 #, c-format
 msgid ""
 "%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
@@ -16194,7 +16353,7 @@
 "<span weight=\"bold\">悋����惺:</span>\t\t%s\n"
 "<span weight=\"bold\">悋愕� 悋����:</span>\t\t%s"

-#: ../pidgin/gtkplugin.c:428
+#: ../pidgin/gtkplugin.c:432
 #, c-format
 msgid ""
 "%s\n"
@@ -16205,11 +16364,15 @@
 "<span foreground=\"#ff0000\" weight=\"bold\">悽愀悖: %s\n"
 "惘悋悴惺 ���惺 悋���忰� ��惠忰惆�惓.</span>"

-#: ../pidgin/gtkplugin.c:606
+#: ../pidgin/gtkplugin.c:569
+msgid "Author"
+msgstr "悋��悗��"
+
+#: ../pidgin/gtkplugin.c:610
 msgid "Configure Pl_ugin"
 msgstr "悋惷惡愀 悋���_忰�悸"

-#: ../pidgin/gtkplugin.c:673
+#: ../pidgin/gtkplugin.c:677
 msgid "<b>Plugin Details</b>"
 msgstr "<b>惡�悋�悋惠 悋���忰�悸</b>"

@@ -16306,24 +16469,19 @@
 msgid "_Recurring"
 msgstr "_�惠�惘惘"

-#: ../pidgin/gtkpounce.c:1258
+#: ../pidgin/gtkpounce.c:1259
 msgid "Pounce Target"
 msgstr "悖愆惺惘 悋��惆�"

-#: ../pidgin/gtkprefs.c:327
-#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:1
-msgid "Default"
-msgstr "悋��惡惆悧�"
-
 #: ../pidgin/gtkprefs.c:458
 msgid "Smiley theme failed to unpack."
 msgstr "�愆� �� 惷愃愀 惠��悸 悋�惡愕�悋惠."

-#: ../pidgin/gtkprefs.c:585
+#: ../pidgin/gtkprefs.c:593
 msgid "Install Theme"
 msgstr "惓惡�惠 悋�惠��悸"

-#: ../pidgin/gtkprefs.c:638
+#: ../pidgin/gtkprefs.c:646
 msgid ""
 "Select a smiley theme that you would like to use from the list below. New "
 "themes can be installed by dragging and dropping them onto the theme list."
@@ -16331,194 +16489,198 @@
 "悋悽惠惘 惠��悸 悋�惡愕�悋惠 悋�惠� 惠�惆 悋愕惠悽惆悋��悋 �� 悋��悋悧�悸 悖惆�悋�. 悋�惠��悋惠 悋�悴惆�惆悸 ���� "
 "惠惘��惡�悋 惡�悋愕愀悸 悋�悴惘 � 悋�悒��悋惠 惆悋悽� �悋悧�悸 悋�惠��悸. "

-#: ../pidgin/gtkprefs.c:673
+#: ../pidgin/gtkprefs.c:681
 msgid "Icon"
 msgstr "悖����悸"

-#: ../pidgin/gtkprefs.c:835
+#: ../pidgin/gtkprefs.c:843
 msgid "System Tray Icon"
 msgstr "悖����悸 ��忰悸 悋��惴悋�"

-#: ../pidgin/gtkprefs.c:836
+#: ../pidgin/gtkprefs.c:844
 msgid "_Show system tray icon:"
 msgstr "悋_惺惘惷 悖����悸 ��忰悸 悋��惴悋�:"

-#: ../pidgin/gtkprefs.c:839
+#: ../pidgin/gtkprefs.c:847
 msgid "On unread messages"
 msgstr "惺�惆 悋�惘愕悋悧� 愃�惘 悋���惘�悄悸"

-#: ../pidgin/gtkprefs.c:845
+#: ../pidgin/gtkprefs.c:853
 msgid "Conversation Window Hiding"
 msgstr "悒悽�悋悄 �悋�悵悸 悋��忰悋惆惓悸"

-#: ../pidgin/gtkprefs.c:846
+#: ../pidgin/gtkprefs.c:854
 msgid "_Hide new IM conversations:"
 msgstr "悋_悽�� �忰悋惆惓悋惠 悋�惠惘悋愕� 悋���惘� 悋�悴惆�惆悸"

-#: ../pidgin/gtkprefs.c:849 ../pidgin/gtkprefs.c:1948
+#: ../pidgin/gtkprefs.c:857 ../pidgin/gtkprefs.c:1965
 msgid "When away"
 msgstr "惺�惆 悋�愃�悋惡"

 #. All the tab options!
-#: ../pidgin/gtkprefs.c:857
+#: ../pidgin/gtkprefs.c:865
 msgid "Tabs"
 msgstr "悋�悖�愕�悸"

-#: ../pidgin/gtkprefs.c:859
+#: ../pidgin/gtkprefs.c:867
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "悋惺惘惷 悋�惘愕悋悧� 悋���惘�悸 � 悋�惆惘惆愆悋惠 �� 悖�愕�悸"

-#: ../pidgin/gtkprefs.c:873
+#: ../pidgin/gtkprefs.c:881
 msgid "Show close b_utton on tabs"
 msgstr "悋惺惘惷 慍惘 悋�悒_愃�悋� 惺�� 悋�悖�愕�悸"

-#: ../pidgin/gtkprefs.c:876
+#: ../pidgin/gtkprefs.c:884
 msgid "_Placement:"
 msgstr "悋�_��惷惺:"

-#: ../pidgin/gtkprefs.c:878
+#: ../pidgin/gtkprefs.c:886
 msgid "Top"
 msgstr "悖惺��"

-#: ../pidgin/gtkprefs.c:879
+#: ../pidgin/gtkprefs.c:887
 msgid "Bottom"
 msgstr "悖愕��"

-#: ../pidgin/gtkprefs.c:880
+#: ../pidgin/gtkprefs.c:888
 msgid "Left"
 msgstr "�愕悋惘悋"

-#: ../pidgin/gtkprefs.c:881
+#: ../pidgin/gtkprefs.c:889
 msgid "Right"
 msgstr "����悋"

-#: ../pidgin/gtkprefs.c:883
+#: ../pidgin/gtkprefs.c:891
 msgid "Left Vertical"
 msgstr "惺��惆� �愕悋惘悋"

-#: ../pidgin/gtkprefs.c:884
+#: ../pidgin/gtkprefs.c:892
 msgid "Right Vertical"
 msgstr "惺��惆� ����悋"

-#: ../pidgin/gtkprefs.c:891
+#: ../pidgin/gtkprefs.c:899
 msgid "N_ew conversations:"
 msgstr "�忰悋惆惓悋惠 悴惆_�惆悸:"

-#: ../pidgin/gtkprefs.c:936
+#: ../pidgin/gtkprefs.c:944
 msgid "Show _formatting on incoming messages"
 msgstr "悋惺惘惷 _惠�愕�� 悋�惘愕悋悧� 悋��悋惘惆悸"

-#: ../pidgin/gtkprefs.c:939
+#: ../pidgin/gtkprefs.c:946
+msgid "Close IMs immediately when the tab is closed"
+msgstr "悖愃�� 悋�惠惘悋愕� 悋���惘� 惡�悴惘惆 悒愃�悋� 悋��愕悋�"
+
+#: ../pidgin/gtkprefs.c:949
 msgid "Show _detailed information"
 msgstr "悋惺惘惷 �惺���悋惠 _惠�惶���悸"

-#: ../pidgin/gtkprefs.c:941
+#: ../pidgin/gtkprefs.c:951
 msgid "Enable buddy ic_on animation"
 msgstr "�惺�� 悖���_�悸 悋�惶惆�� 悋��惠忰惘�悸"

-#: ../pidgin/gtkprefs.c:948
+#: ../pidgin/gtkprefs.c:958
 msgid "_Notify buddies that you are typing to them"
 msgstr "_�惡�� 悋�悖惶惆�悋悄 悋�悵�� 悖�惠惡 ���"

-#: ../pidgin/gtkprefs.c:951
+#: ../pidgin/gtkprefs.c:961
 msgid "Highlight _misspelled words"
 msgstr "悖惡惘慍 悋�_���悋惠 悋���悴悖悸 悽愀悖"

-#: ../pidgin/gtkprefs.c:955
+#: ../pidgin/gtkprefs.c:965
 msgid "Use smooth-scrolling"
 msgstr "悋愕惠悽惆� 悋�惠惆忰惘悴 悋�愕�愕"

-#: ../pidgin/gtkprefs.c:958
+#: ../pidgin/gtkprefs.c:968
 msgid "F_lash window when IMs are received"
 msgstr "悖_��惷 悋��悋�悵悸 惺�惆 悋愕惠�惡悋� 悋�惘愕悋悧� 悋���惘�悸"

-#: ../pidgin/gtkprefs.c:960
+#: ../pidgin/gtkprefs.c:970
 msgid "Minimi_ze new conversation windows"
 msgstr "_惶愃�惘 ��悋�悵 悋��忰悋惆惓悋惠 悋�悴惆�惆悸"

-#: ../pidgin/gtkprefs.c:964
+#: ../pidgin/gtkprefs.c:974
 msgid "Font"
 msgstr "悋�悽愀"

-#: ../pidgin/gtkprefs.c:966
+#: ../pidgin/gtkprefs.c:976
 msgid "Use document font from _theme"
 msgstr "悋愕惠悽惆� 悽愀 悋��愕惠�惆 �� 悋�_惠��悸"

-#: ../pidgin/gtkprefs.c:968
+#: ../pidgin/gtkprefs.c:978
 msgid "Use font from _theme"
 msgstr "悋愕惠悽惆� 悽愀 悋�_惠��悸"

-#: ../pidgin/gtkprefs.c:973
+#: ../pidgin/gtkprefs.c:984
 msgid "Conversation _font:"
 msgstr "_悽愀 悋��忰悋惆惓悸:"

-#: ../pidgin/gtkprefs.c:980
+#: ../pidgin/gtkprefs.c:991
 msgid "Default Formatting"
 msgstr "悋�惠�愕�� 悋��惡惆悧�"

-#: ../pidgin/gtkprefs.c:999
+#: ../pidgin/gtkprefs.c:1010
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting."
 msgstr "��悵悋 愕�惴�惘 �惶 悋�惘愕悋�悸 悋�惶悋惆惘悸 惺�惆�悋 惠愕惠悽惆� 惡惘�惠����悋 �惆惺� 悋�惠�愕��."

-#: ../pidgin/gtkprefs.c:1059
+#: ../pidgin/gtkprefs.c:1070
 msgid "Cannot start proxy configuration program."
 msgstr "惠惺悵�惘 惡惆悖 惡惘�悋�悴 悒惺惆悋惆 悋��愕�愀."

-#: ../pidgin/gtkprefs.c:1071
+#: ../pidgin/gtkprefs.c:1082
 msgid "Cannot start browser configuration program."
 msgstr "惠惺悵�惘 惡惆悖 惡惘�悋�悴 悒惺惆悋惆 悋��惠惶�忰."

-#: ../pidgin/gtkprefs.c:1091
+#: ../pidgin/gtkprefs.c:1102
 msgid "ST_UN server:"
 msgstr "悽悋惆�� ST_UN:"

-#: ../pidgin/gtkprefs.c:1103
+#: ../pidgin/gtkprefs.c:1114
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">�惓悋�: stunserver.org</span>"

-#: ../pidgin/gtkprefs.c:1107
+#: ../pidgin/gtkprefs.c:1118
 msgid "_Autodetect IP address"
 msgstr "_惠忰惘�� 惺��悋� IP 惠��悋悧�悋"

-#: ../pidgin/gtkprefs.c:1116
+#: ../pidgin/gtkprefs.c:1127
 msgid "Public _IP:"
 msgstr "IP 惺����:"

-#: ../pidgin/gtkprefs.c:1147
+#: ../pidgin/gtkprefs.c:1158
 msgid "Ports"
 msgstr "��悋�悵"

-#: ../pidgin/gtkprefs.c:1150
+#: ../pidgin/gtkprefs.c:1161
 msgid "_Enable automatic router port forwarding"
 msgstr "�惺�� 悋�惠�悴�� 悋�惠��悋悧� ����悵 悋����悴���"

-#: ../pidgin/gtkprefs.c:1153
+#: ../pidgin/gtkprefs.c:1164
 msgid "_Manually specify range of ports to listen on"
 msgstr "忰惆惆 _�惆���悋 �愀悋� ��悋�悵 �悋愕惠�悋惺 ���悋"

-#: ../pidgin/gtkprefs.c:1156
+#: ../pidgin/gtkprefs.c:1167
 msgid "_Start port:"
 msgstr "_���悵 悋�惡惆悋�悸:"

-#: ../pidgin/gtkprefs.c:1163
+#: ../pidgin/gtkprefs.c:1174
 msgid "_End port:"
 msgstr "_���悵 悋���悋�悸:"

-#: ../pidgin/gtkprefs.c:1171
+#: ../pidgin/gtkprefs.c:1182
 msgid "Proxy Server &amp; Browser"
 msgstr "悋�悽悋惆�� 悋��愕�愀 �悋��惠惶�忰"

-#: ../pidgin/gtkprefs.c:1179
+#: ../pidgin/gtkprefs.c:1190
 msgid "<b>Proxy configuration program was not found.</b>"
 msgstr "<b>�� ��惺惓惘 惺�� 惡惘�悋�悴 悒惺惆悋惆 悋��愕�愀.</b>"

-#: ../pidgin/gtkprefs.c:1187
+#: ../pidgin/gtkprefs.c:1198
 msgid "<b>Browser configuration program was not found.</b>"
 msgstr "<b>�� ��惺惓惘 惺�� 惡惘�悋�悴 悒惺惆悋惆 悋��惠惶�忰.</b>"

-#: ../pidgin/gtkprefs.c:1192
+#: ../pidgin/gtkprefs.c:1203
 msgid ""
 "Proxy & Browser preferences are configured\n"
 "in GNOME Preferences"
@@ -16526,95 +16688,99 @@
 "惠�惷惡愀 惠�惷��悋惠 悋��愕�愀 �悋��惠惶�忰\n"
 "�� 惠�惷��悋惠 悴���"

-#: ../pidgin/gtkprefs.c:1199
+#: ../pidgin/gtkprefs.c:1210
 msgid "Configure _Proxy"
 msgstr "悋惷惡愀 悋�_�愕�愀"

-#: ../pidgin/gtkprefs.c:1204
+#: ../pidgin/gtkprefs.c:1215
 msgid "Configure _Browser"
 msgstr "悋惷惡愀 悋�_�惠惶�忰"

-#: ../pidgin/gtkprefs.c:1210
+#: ../pidgin/gtkprefs.c:1221
 msgid "Proxy Server"
 msgstr "悽悋惆�� �愕�愀"

-#: ../pidgin/gtkprefs.c:1215
+#: ../pidgin/gtkprefs.c:1226
 msgid "No proxy"
 msgstr "惡�悋 �愕�愀"

-#: ../pidgin/gtkprefs.c:1271
+#: ../pidgin/gtkprefs.c:1282
 msgid "_User:"
 msgstr "_�愕惠悽惆�:"

-#: ../pidgin/gtkprefs.c:1359
+#: ../pidgin/gtkprefs.c:1370
 msgid "Seamonkey"
 msgstr "愕�������"

-#: ../pidgin/gtkprefs.c:1360
+#: ../pidgin/gtkprefs.c:1371
 msgid "Opera"
 msgstr "悖�惡惘悋"

-#: ../pidgin/gtkprefs.c:1361
+#: ../pidgin/gtkprefs.c:1372
 msgid "Netscape"
 msgstr "�惠愕��惡"

-#: ../pidgin/gtkprefs.c:1362
+#: ../pidgin/gtkprefs.c:1373
 msgid "Mozilla"
 msgstr "��慍��悋"

-#: ../pidgin/gtkprefs.c:1363
+#: ../pidgin/gtkprefs.c:1374
 msgid "Konqueror"
 msgstr "����惘惘"

-#: ../pidgin/gtkprefs.c:1364
+#: ../pidgin/gtkprefs.c:1375
+msgid "Desktop Default"
+msgstr "�惡惆悧� 愕愀忰 悋���惠惡"
+
+#: ../pidgin/gtkprefs.c:1376
 msgid "GNOME Default"
 msgstr "�惡惆悧� 悴���"

-#: ../pidgin/gtkprefs.c:1365
+#: ../pidgin/gtkprefs.c:1377
 msgid "Galeon"
 msgstr "悴悋����"

-#: ../pidgin/gtkprefs.c:1366
+#: ../pidgin/gtkprefs.c:1378
 msgid "Firefox"
 msgstr "����惘���愕"

-#: ../pidgin/gtkprefs.c:1367
+#: ../pidgin/gtkprefs.c:1379
 msgid "Firebird"
 msgstr "����惘惡�惘惆"

-#: ../pidgin/gtkprefs.c:1368
+#: ../pidgin/gtkprefs.c:1380
 msgid "Epiphany"
 msgstr "悒惡�����"

-#: ../pidgin/gtkprefs.c:1377
+#: ../pidgin/gtkprefs.c:1389
 msgid "Manual"
 msgstr "�惆��"

-#: ../pidgin/gtkprefs.c:1430
+#: ../pidgin/gtkprefs.c:1450
 msgid "Browser Selection"
 msgstr "悋悽惠�悋惘 悋��惠惶�忰"

-#: ../pidgin/gtkprefs.c:1434
+#: ../pidgin/gtkprefs.c:1454
 msgid "_Browser:"
 msgstr "悋�_�惠惶�忰:"

-#: ../pidgin/gtkprefs.c:1442
+#: ../pidgin/gtkprefs.c:1462
 msgid "_Open link in:"
 msgstr "悋_�惠忰 悋�惘悋惡愀 ��:"

-#: ../pidgin/gtkprefs.c:1444
+#: ../pidgin/gtkprefs.c:1464
 msgid "Browser default"
 msgstr "悋��惠惶�忰 悋��惡惆悧�"

-#: ../pidgin/gtkprefs.c:1445
+#: ../pidgin/gtkprefs.c:1465
 msgid "Existing window"
 msgstr "�悋�悵悸 ��悴�惆悸"

-#: ../pidgin/gtkprefs.c:1447
+#: ../pidgin/gtkprefs.c:1467
 msgid "New tab"
 msgstr "�愕悋� 悴惆�惆"

-#: ../pidgin/gtkprefs.c:1464
+#: ../pidgin/gtkprefs.c:1484
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -16623,63 +16789,63 @@
 "_�惆���悋:\n"
 "(%s ���愕悋惘)"

-#: ../pidgin/gtkprefs.c:1490
+#: ../pidgin/gtkprefs.c:1510
 msgid "Log _format:"
 msgstr "惠�愕�� 悋�_愕悴�:"

-#: ../pidgin/gtkprefs.c:1495
+#: ../pidgin/gtkprefs.c:1515
 msgid "Log all _instant messages"
 msgstr "愕悴�� 悴��惺 悋�_惘愕悋悧� 悋���惘�悸"

-#: ../pidgin/gtkprefs.c:1497
+#: ../pidgin/gtkprefs.c:1517
 msgid "Log all c_hats"
 msgstr "愕悴�� 悴��惺 悋_�惆惘惆愆悋惠"

-#: ../pidgin/gtkprefs.c:1499
+#: ../pidgin/gtkprefs.c:1519
 msgid "Log all _status changes to system log"
 msgstr "愕悴�� 悴��惺 惠愃�惘悋惠 悋�_忰悋�悸 悒�� 愕悴� 悋��惴悋�"

-#: ../pidgin/gtkprefs.c:1649
+#: ../pidgin/gtkprefs.c:1669
 msgid "Sound Selection"
 msgstr "悋悽惠�悋惘 悋�惶��惠"

-#: ../pidgin/gtkprefs.c:1659
+#: ../pidgin/gtkprefs.c:1679
 msgid "Quietest"
 msgstr "�悋惆悧 悴惆�悋"

-#: ../pidgin/gtkprefs.c:1661
+#: ../pidgin/gtkprefs.c:1681
 msgid "Quieter"
 msgstr "悖�惆悖"

-#: ../pidgin/gtkprefs.c:1663
+#: ../pidgin/gtkprefs.c:1683
 msgid "Quiet"
 msgstr "�悋惆悧"

-#: ../pidgin/gtkprefs.c:1667
+#: ../pidgin/gtkprefs.c:1687
 msgid "Loud"
 msgstr "惺悋�"

-#: ../pidgin/gtkprefs.c:1669
+#: ../pidgin/gtkprefs.c:1689
 msgid "Louder"
 msgstr "悖惺��"

-#: ../pidgin/gtkprefs.c:1671
+#: ../pidgin/gtkprefs.c:1691
 msgid "Loudest"
 msgstr "惶悋悽惡"

-#: ../pidgin/gtkprefs.c:1737
+#: ../pidgin/gtkprefs.c:1754
 msgid "_Method:"
 msgstr "悋�_愀惘��悸:"

-#: ../pidgin/gtkprefs.c:1739
+#: ../pidgin/gtkprefs.c:1756
 msgid "Console beep"
 msgstr "惶悋�惘悸 悋��惺惘悋惷"

-#: ../pidgin/gtkprefs.c:1746
+#: ../pidgin/gtkprefs.c:1763
 msgid "No sounds"
 msgstr "惡�悋 惶�惠"

-#: ../pidgin/gtkprefs.c:1759
+#: ../pidgin/gtkprefs.c:1776
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -16688,81 +16854,81 @@
 "悖_�惘 悋�惶�惠:\n"
 "��(%s �悋愕� 悋����)"

-#: ../pidgin/gtkprefs.c:1768
+#: ../pidgin/gtkprefs.c:1785
 msgid "Sounds when conversation has _focus"
 msgstr "悖惶惆惘 惶�惠�悋 惺�惆�悋 惠��� 悋��忰悋惆惓悸 _�愆愀悸"

-#: ../pidgin/gtkprefs.c:1770
+#: ../pidgin/gtkprefs.c:1787
 msgid "Enable sounds:"
 msgstr "�惺�� 悋�悖_惶�悋惠:"

-#: ../pidgin/gtkprefs.c:1787
+#: ../pidgin/gtkprefs.c:1804
 msgid "Volume:"
 msgstr "悋�忰悴�:"

-#: ../pidgin/gtkprefs.c:1854
+#: ../pidgin/gtkprefs.c:1871
 msgid "Play"
 msgstr "愆愃��"

-#: ../pidgin/gtkprefs.c:1931
+#: ../pidgin/gtkprefs.c:1948
 msgid "_Report idle time:"
 msgstr "悖_惡�愃 惺� ��惠 悋�愕���:"

-#: ../pidgin/gtkprefs.c:1936
+#: ../pidgin/gtkprefs.c:1953
 msgid "Based on keyboard or mouse use"
 msgstr "惡�悋悄 惺�� 悋愕惠悽惆悋� ��忰悸 悋���悋惠�忰 悖� 悋��悖惘悸"

-#: ../pidgin/gtkprefs.c:1945
+#: ../pidgin/gtkprefs.c:1962
 msgid "_Auto-reply:"
 msgstr "_惘惆 惠��悋悧�:"

-#: ../pidgin/gtkprefs.c:1949
+#: ../pidgin/gtkprefs.c:1966
 msgid "When both away and idle"
 msgstr "惺�惆 悋�愃�悋惡 � 悋�愕��� �惺�悋"

 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1955
+#: ../pidgin/gtkprefs.c:1972
 msgid "Auto-away"
 msgstr "愃�悋惡 惠��悋悧�"

-#: ../pidgin/gtkprefs.c:1957
+#: ../pidgin/gtkprefs.c:1974
 msgid "Change status when _idle"
 msgstr "愃�惘 悋�忰悋�悸 惺�惆 悋�_愕���"

-#: ../pidgin/gtkprefs.c:1961
+#: ../pidgin/gtkprefs.c:1978
 msgid "_Minutes before becoming idle:"
 msgstr "惺惆惆 悋�_惆�悋悧� �惡� 惠愃��惘 悋�忰悋�悸:"

-#: ../pidgin/gtkprefs.c:1968
+#: ../pidgin/gtkprefs.c:1985
 msgid "Change _status to:"
 msgstr "愃��惘 悋�_忰悋�悸 悒��:"

 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1981
+#: ../pidgin/gtkprefs.c:1998
 msgid "Status at Startup"
 msgstr "悋�忰悋�悸 惺�惆 惡惆悄 悋�惠愆愃��"

-#: ../pidgin/gtkprefs.c:1983
+#: ../pidgin/gtkprefs.c:2000
 msgid "Use status from last _exit at startup"
 msgstr "惺�惆 惡惆悄 悋�惠愆愃�� 悋愕惠悽惆� 悛悽惘 忰悋�悸 惺�惆 悋�悽惘�悴 悋�_愕悋惡�"

-#: ../pidgin/gtkprefs.c:1990
+#: ../pidgin/gtkprefs.c:2007
 msgid "Status to a_pply at startup:"
 msgstr "悋�忰悋�悸 惺�惆 惡惆悄 悋�惠愆愃��:"

-#: ../pidgin/gtkprefs.c:2019
+#: ../pidgin/gtkprefs.c:2036
 msgid "Interface"
 msgstr "悋��悋悴�悸"

-#: ../pidgin/gtkprefs.c:2021
+#: ../pidgin/gtkprefs.c:2038
 msgid "Smiley Themes"
 msgstr "愕��悋惠 悋�悒惡惠愕悋�悋惠"

-#: ../pidgin/gtkprefs.c:2028
+#: ../pidgin/gtkprefs.c:2045
 msgid "Browser"
 msgstr "悋��惠惶�忰"

-#: ../pidgin/gtkprefs.c:2032
+#: ../pidgin/gtkprefs.c:2049
 msgid "Status / Idle"
 msgstr "悋�忰悋�悸 / 愕悋��"

@@ -16786,62 +16952,67 @@
 msgid "Block only the users below"
 msgstr "悋忰惴惘 ��愀 悋��愕惠悽惆��� 悖惆�悋�"

-#: ../pidgin/gtkprivacy.c:372
+#: ../pidgin/gtkprivacy.c:352
 msgid "Privacy"
 msgstr "悋�悽惶�惶�悸"

-#: ../pidgin/gtkprivacy.c:382
+#: ../pidgin/gtkprivacy.c:362
 msgid "Changes to privacy settings take effect immediately."
 msgstr "悋�惠愃��惘悋惠 �� 悽惶悋悧惶 悋�悽惶�惶�悸 惠惶惡忰 �悋�悵悸 ��惘�悋."

-#: ../pidgin/gtkprivacy.c:391
+#: ../pidgin/gtkprivacy.c:371
 msgid "Set privacy for:"
 msgstr "悋惷惡愀 悋�悽惶�惶�悸 �悖悴�"

-#: ../pidgin/gtkprivacy.c:520 ../pidgin/gtkprivacy.c:537
+#. Remove All button
+#: ../pidgin/gtkprivacy.c:417
+msgid "Remove Al_l"
+msgstr "悖慍�� 悋�_��"
+
+#: ../pidgin/gtkprivacy.c:503 ../pidgin/gtkprivacy.c:520
 msgid "Permit User"
 msgstr "悋愕�忰 ���愕惠悽惆�"

-#: ../pidgin/gtkprivacy.c:521
+#: ../pidgin/gtkprivacy.c:504
 msgid "Type a user you permit to contact you."
 msgstr "悖惆悽� �愕惠悽惆�悋 惠惶惘�忰 �� 惡悋�悋惠惶悋� 惡�."

-#: ../pidgin/gtkprivacy.c:522
+#: ../pidgin/gtkprivacy.c:505
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr "悖惆悽� 悋愕� 悋��愕惠悽惆� 悋�悵� 惠�惆 惠����� �� 悋�悋惠惶悋� 惡�."

-#: ../pidgin/gtkprivacy.c:525 ../pidgin/gtkprivacy.c:541
+#: ../pidgin/gtkprivacy.c:508 ../pidgin/gtkprivacy.c:524
 msgid "_Permit"
 msgstr "悋_愕�忰"

-#: ../pidgin/gtkprivacy.c:531
+#: ../pidgin/gtkprivacy.c:514
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "悖悖愕�忰 �� %s 悖� �惠惶� 惡��"

-#: ../pidgin/gtkprivacy.c:533
+#: ../pidgin/gtkprivacy.c:516
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "悖�惠悖�惆 悖�� 惠�惆 悋�愕�悋忰 �_%s 惡悋�悋惠惶悋� 惡��"

-#: ../pidgin/gtkprivacy.c:562 ../pidgin/gtkprivacy.c:576
+#: ../pidgin/gtkprivacy.c:545 ../pidgin/gtkprivacy.c:559
 msgid "Block User"
 msgstr "悋忰惴惘 悋��愕惠悽惆�"

-#: ../pidgin/gtkprivacy.c:563
+#: ../pidgin/gtkprivacy.c:546
 msgid "Type a user to block."
 msgstr "悖惆悽� �愕惠悽惆� �惠忰惴惘�."

-#: ../pidgin/gtkprivacy.c:564
+#: ../pidgin/gtkprivacy.c:547
 msgid "Please enter the name of the user you wish to block."
 msgstr "�� �惷�� 悖惆悽� 悋愕� 悋��愕惠悽惆� 悋�悵� 惠惘�惆 忰惴惘�."

-#: ../pidgin/gtkprivacy.c:572
+#: ../pidgin/gtkprivacy.c:555
 #, c-format
 msgid "Block %s?"
 msgstr "悖悖忰惴惘 %s�"

-#: ../pidgin/gtkprivacy.c:574
+#: ../pidgin/gtkprivacy.c:557
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "�� 悖�惠 �惠悖�惆 �� 悖�� 惠惘�惆 忰惴惘 %s�"
@@ -16850,23 +17021,23 @@
 msgid "Apply"
 msgstr "愀惡��"

-#: ../pidgin/gtkrequest.c:1498
+#: ../pidgin/gtkrequest.c:1503
 msgid "That file already exists"
 msgstr "�悵悋 悋���� ��悴�惆 �愕惡��悋"

-#: ../pidgin/gtkrequest.c:1499
+#: ../pidgin/gtkrequest.c:1504
 msgid "Would you like to overwrite it?"
 msgstr "�� 惠惘愃惡 �� 悋��惠悋惡悸 �����"

-#: ../pidgin/gtkrequest.c:1502
+#: ../pidgin/gtkrequest.c:1507
 msgid "Overwrite"
 msgstr "悋�惠惡 ����"

-#: ../pidgin/gtkrequest.c:1503
+#: ../pidgin/gtkrequest.c:1508
 msgid "Choose New Name"
 msgstr "悋悽惠惘 悋愕��悋 悴惆�惆�悋"

-#: ../pidgin/gtkrequest.c:1644 ../pidgin/gtkrequest.c:1658
+#: ../pidgin/gtkrequest.c:1649 ../pidgin/gtkrequest.c:1663
 msgid "Select Folder..."
 msgstr "悋悽惠惘 �悴�惆悋..."

@@ -16885,50 +17056,50 @@
 msgstr "�� 悖�惠 �惠悖�惆 �� 悖�� 惠惘�惆 忰悵� 悋�忰悋�悋惠 悋��忰��惴悸 悋��悽惠悋惘悸�"

 #. Use button
-#: ../pidgin/gtksavedstatuses.c:616 ../pidgin/gtksavedstatuses.c:1227
+#: ../pidgin/gtksavedstatuses.c:616 ../pidgin/gtksavedstatuses.c:1229
 msgid "_Use"
 msgstr "悋_愕惠悽惆�"

-#: ../pidgin/gtksavedstatuses.c:763
+#: ../pidgin/gtksavedstatuses.c:765
 msgid "Title already in use.  You must choose a unique title."
 msgstr "悋�惺��悋� �愕惠悽惆� 忰悋���悋.  �悴惡 悖� 惠忰惆惆 惺��悋�悋 �惘�惆悋."

-#: ../pidgin/gtksavedstatuses.c:959
+#: ../pidgin/gtksavedstatuses.c:961
 msgid "Different"
 msgstr "�悽惠��"

-#: ../pidgin/gtksavedstatuses.c:1151
+#: ../pidgin/gtksavedstatuses.c:1153
 msgid "_Title:"
 msgstr "悋�_惺��悋�:"

-#: ../pidgin/gtksavedstatuses.c:1159 ../pidgin/gtksavedstatuses.c:1451
+#: ../pidgin/gtksavedstatuses.c:1161 ../pidgin/gtksavedstatuses.c:1453
 msgid "_Status:"
 msgstr "悋�_忰悋�悸:"

 #. Different status message expander
-#: ../pidgin/gtksavedstatuses.c:1175
+#: ../pidgin/gtksavedstatuses.c:1177
 msgid "Use a _different status for some accounts"
 msgstr "悋愕惠悽惆� 忰悋�悋惠 _�悽惠��悸 �惡惺惷 悋�忰愕悋惡悋惠"

 #. Save & Use button
-#: ../pidgin/gtksavedstatuses.c:1234
+#: ../pidgin/gtksavedstatuses.c:1236
 msgid "Sa_ve & Use"
 msgstr "悋忰�_惴 � 悋愕惠悽惆�"

-#: ../pidgin/gtksavedstatuses.c:1435
+#: ../pidgin/gtksavedstatuses.c:1437
 #, c-format
 msgid "Status for %s"
 msgstr "忰悋�悸 %s"

-#: ../pidgin/gtkstatusbox.c:667
+#: ../pidgin/gtkstatusbox.c:683
 msgid "Waiting for network connection"
 msgstr "惡悋�惠惴悋惘 悋惠惶悋� 悋�愆惡�悸"

-#: ../pidgin/gtkstatusbox.c:1080
+#: ../pidgin/gtkstatusbox.c:1096
 msgid "New status..."
 msgstr "忰悋�悸 悴惆�惆悸..."

-#: ../pidgin/gtkstatusbox.c:1081
+#: ../pidgin/gtkstatusbox.c:1097
 msgid "Saved statuses..."
 msgstr "悋�忰悋�悋惠 悋��忰��惴悸..."

@@ -17081,6 +17252,10 @@
 msgid "_Open Mail"
 msgstr "悋_�惠忰 悋�惡惘�惆"

+#: ../pidgin/pidgintooltip.c:100
+msgid "Pidgin Tooltip"
+msgstr "惠���忰悸 惡�惆�悴��"
+
 #: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:2
 msgid "Pidgin smileys"
 msgstr "惡愕�悋惠 惡�惆�悴��"
@@ -17097,31 +17272,31 @@
 msgid "none"
 msgstr "惡惆��"

-#: ../pidgin/plugins/cap/cap.c:444 ../pidgin/plugins/cap/cap.c:447
+#: ../pidgin/plugins/cap/cap.c:441 ../pidgin/plugins/cap/cap.c:444
 msgid "Response Probability:"
 msgstr "悋忰惠�悋��悸 悋�惘惆:"

-#: ../pidgin/plugins/cap/cap.c:772
+#: ../pidgin/plugins/cap/cap.c:769
 msgid "Statistics Configuration"
 msgstr "悒惺惆悋惆悋惠 悋�悒忰惶悋悧�悋惠"

 #. msg_difference spinner
-#: ../pidgin/plugins/cap/cap.c:775
+#: ../pidgin/plugins/cap/cap.c:772
 msgid "Maximum response timeout:"
 msgstr "���悸 悋�惠�悋悄 悋�惘惆 悋��惶��:"

-#: ../pidgin/plugins/cap/cap.c:778 ../pidgin/plugins/cap/cap.c:785
-#: ../pidgin/plugins/cap/cap.c:792 ../pidgin/plugins/timestamp.c:148
+#: ../pidgin/plugins/cap/cap.c:775 ../pidgin/plugins/cap/cap.c:782
+#: ../pidgin/plugins/cap/cap.c:789 ../pidgin/plugins/timestamp.c:148
 msgid "minutes"
 msgstr "惆�悋悧�"

 #. last_seen spinner
-#: ../pidgin/plugins/cap/cap.c:782
+#: ../pidgin/plugins/cap/cap.c:779
 msgid "Maximum last-seen difference:"
 msgstr "悖�惶� �惘� 愆����惆 �悗悽惘悋:"

 #. threshold spinner
-#: ../pidgin/plugins/cap/cap.c:789
+#: ../pidgin/plugins/cap/cap.c:786
 msgid "Threshold:"
 msgstr "悋�惺惠惡悸:"

@@ -17131,18 +17306,18 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/cap/cap.c:897
+#: ../pidgin/plugins/cap/cap.c:894
 msgid "Contact Availability Prediction"
 msgstr "惠��惺 惠�悋悴惆 悋��惘悋愕�"

 #. *< name
 #. *< version
-#: ../pidgin/plugins/cap/cap.c:899
+#: ../pidgin/plugins/cap/cap.c:896
 msgid "Contact Availability Prediction plugin."
 msgstr "��忰�悸 惠��惺 惠�悋悴惆 悋��惘悋愕�."

 #. *  summary
-#: ../pidgin/plugins/cap/cap.c:900
+#: ../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."
@@ -17364,24 +17539,24 @@
 msgstr "惠惘悋愕� ��惘�"

 #. Add the label.
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:457
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:461
 msgid "Select a person from your address book below, or add a new person."
 msgstr "悋悽惠惘 愆悽惶悋 �� 惆�惠惘 悋�惺�悋��� 悖惆�悋�� 悖� 悖惷� 愆悽惶悋 悴惆�惆悋."

-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:551
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:301
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:555
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:305
 msgid "Group:"
 msgstr "悋��悴��惺悸:"

 #. "New Person" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:576
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:580
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:467
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:248
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:252
 msgid "New Person"
 msgstr "愆悽惶 悴惆�惆"

 #. "Select Buddy" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:593
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:597
 msgid "Select Buddy"
 msgstr "悋悽惠惘 惶惆��悋"

@@ -17402,34 +17577,34 @@
 msgid "_Associate Buddy"
 msgstr "悋_惘惡愀 悋�惶惆��"

-#: ../pidgin/plugins/gevolution/gevolution.c:240
-#: ../pidgin/plugins/gevolution/gevolution.c:246
+#: ../pidgin/plugins/gevolution/gevolution.c:242
+#: ../pidgin/plugins/gevolution/gevolution.c:248
 msgid "Unable to send e-mail"
 msgstr "惠惺悵�惘 悒惘愕悋� 惡惘�惆 悒��惠惘���"

-#: ../pidgin/plugins/gevolution/gevolution.c:241
+#: ../pidgin/plugins/gevolution/gevolution.c:243
 msgid "The evolution executable was not found in the PATH."
 msgstr "�� ��惺惓惘 惺�� ��� 悋�惠愆愃�� �惡惘�悴�悸 悒���愆� �� 悋��愕悋惘 (PATH)"

-#: ../pidgin/plugins/gevolution/gevolution.c:247
+#: ../pidgin/plugins/gevolution/gevolution.c:249
 msgid "An e-mail address was not found for this buddy."
 msgstr "�� ��惺惓惘 惺�� 惺��悋� 惡惘�惆 悒��惠惘��� ��悵悋 悋�惶惆��."

-#: ../pidgin/plugins/gevolution/gevolution.c:273
+#: ../pidgin/plugins/gevolution/gevolution.c:275
 msgid "Add to Address Book"
 msgstr "悖惷� 悒�� 惆�惠惘 悋�惺�悋���"

-#: ../pidgin/plugins/gevolution/gevolution.c:285
+#: ../pidgin/plugins/gevolution/gevolution.c:287
 msgid "Send E-Mail"
 msgstr "悖惘愕� 惡惘�惆悋 悒��惠惘���悋"

 #. Configuration frame
-#: ../pidgin/plugins/gevolution/gevolution.c:412
+#: ../pidgin/plugins/gevolution/gevolution.c:414
 msgid "Evolution Integration Configuration"
 msgstr "悒惺惆悋惆悋惠 悋�惠�悋�� �惺 悒�����愆��"

 #. Label
-#: ../pidgin/plugins/gevolution/gevolution.c:415
+#: ../pidgin/plugins/gevolution/gevolution.c:417
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr "悋悽惠惘 悴��惺 悋�忰愕悋惡悋惠 悋�惠� ��惡愃� 悒惷悋�悸 悋�悖惶惆�悋悄 ���悋 惠��悋悧��悋."

@@ -17439,7 +17614,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gevolution/gevolution.c:527
+#: ../pidgin/plugins/gevolution/gevolution.c:529
 msgid "Evolution Integration"
 msgstr "悋�惠�悋�� �惺 悒�����愆�� "

@@ -17447,37 +17622,37 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/gevolution/gevolution.c:530
 #: ../pidgin/plugins/gevolution/gevolution.c:532
+#: ../pidgin/plugins/gevolution/gevolution.c:534
 msgid "Provides integration with Evolution."
 msgstr "���惘 惆惺� 悋�惠�悋�� �惺 悒�����愆��."

-#: ../pidgin/plugins/gevolution/new_person_dialog.c:262
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:266
 msgid "Please enter the person's information below."
 msgstr "悖惆悽� �惺���悋惠 悋�愆悽惶 悖惆�悋�."

-#: ../pidgin/plugins/gevolution/new_person_dialog.c:266
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:270
 msgid "Please enter the buddy's screen name and account type below."
 msgstr "悖惆悽� 悋愕� 悋�愆悋愆悸 ��惶惆�� � ��惺 悋�忰愕悋惡 悖惆�悋�."

-#: ../pidgin/plugins/gevolution/new_person_dialog.c:286
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:290
 msgid "Account type:"
 msgstr "��惺 悋�忰愕悋惡:"

 #. Optional Information section
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:309
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:313
 msgid "Optional information:"
 msgstr "�惺���悋惠 悋悽惠�悋惘�悸:"

-#: ../pidgin/plugins/gevolution/new_person_dialog.c:344
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:348
 msgid "First name:"
 msgstr "悋�悋愕� 悋�悖��:"

-#: ../pidgin/plugins/gevolution/new_person_dialog.c:356
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:360
 msgid "Last name:"
 msgstr "悋�悋愕� 悋�悖悽�惘:"

-#: ../pidgin/plugins/gevolution/new_person_dialog.c:376
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:380
 msgid "E-mail:"
 msgstr "悋�惡惘�惆 悋�悒��惠惘���:"

@@ -17658,7 +17833,7 @@
 #. Urgent method button
 #: ../pidgin/plugins/notify.c:758
 msgid "Set window manager \"_URGENT\" hint"
-msgstr ""
+msgstr "悋惷惡愀 惠���忰悸  \"_URGENT\" ��惆�惘 悋���悋�悵"

 #. Raise window method button
 #: ../pidgin/plugins/notify.c:767
@@ -17701,7 +17876,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/notify.c:907
+#: ../pidgin/plugins/notify.c:905
 msgid "Message Notification"
 msgstr "悋�惠�惡�� 惡悋�惘愕悋悧�"

@@ -17709,7 +17884,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/notify.c:910 ../pidgin/plugins/notify.c:912
+#: ../pidgin/plugins/notify.c:908 ../pidgin/plugins/notify.c:910
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "�惠�忰 惺惆惆悋 �� 悋��愕悋悧� �悒惺�悋�� 惡悋�惘愕悋悧� 愃�惘 悋���惘�悄悸."

@@ -17907,68 +18082,68 @@
 "ChangeLog."
 msgstr "�惠忰�� 惆�惘�悋 �� 悋�悒惶惆悋惘悋惠 悋�悴惆�惆悸 ��惡�愃 悋��愕惠悽惆� 惡愕悴� 悋�惠愃�惘悋惠."

-#: ../pidgin/plugins/spellchk.c:1962
+#: ../pidgin/plugins/spellchk.c:1970
 msgid "Duplicate Correction"
 msgstr "惠惶���惡 ��惘惘"

-#: ../pidgin/plugins/spellchk.c:1963
+#: ../pidgin/plugins/spellchk.c:1971
 msgid "The specified word already exists in the correction list."
 msgstr "悋����悸 悋��忰惆惆悸 ��悴�惆悸 惡悋��惺� �� �悋悧�悸 悋�惠惶忰�忰."

-#: ../pidgin/plugins/spellchk.c:2176
+#: ../pidgin/plugins/spellchk.c:2184
 msgid "Text Replacements"
 msgstr "悋愕惠惡惆悋� 悋��惶"

-#: ../pidgin/plugins/spellchk.c:2199
+#: ../pidgin/plugins/spellchk.c:2207
 msgid "You type"
 msgstr "悖�惠 惠�惠惡"

-#: ../pidgin/plugins/spellchk.c:2213
+#: ../pidgin/plugins/spellchk.c:2221
 msgid "You send"
 msgstr "悖�惠 惠惘愕�"

-#: ../pidgin/plugins/spellchk.c:2227
+#: ../pidgin/plugins/spellchk.c:2235
 msgid "Whole words only"
 msgstr "悋����悋惠 悋��悋��悸 ��愀"

-#: ../pidgin/plugins/spellchk.c:2239
+#: ../pidgin/plugins/spellchk.c:2247
 msgid "Case sensitive"
 msgstr "忰愕�悋愕 �忰悋�悸 悋�忰惘�"

-#: ../pidgin/plugins/spellchk.c:2265
+#: ../pidgin/plugins/spellchk.c:2273
 msgid "Add a new text replacement"
 msgstr "悖惷� 悋愕惠惡惆悋� �惶 悴惆�惆"

-#: ../pidgin/plugins/spellchk.c:2281
+#: ../pidgin/plugins/spellchk.c:2289
 msgid "You _type:"
 msgstr "悖�惠 _惠�惠惡:"

-#: ../pidgin/plugins/spellchk.c:2285
+#: ../pidgin/plugins/spellchk.c:2293
 msgid "You _send:"
 msgstr "悖�惠 _惠惘愕�:"

 #. Created here so it can be passed to whole_words_button_toggled.
-#: ../pidgin/plugins/spellchk.c:2288
+#: ../pidgin/plugins/spellchk.c:2296
 msgid "_Exact case match (uncheck for automatic case handling)"
 msgstr "��_愀悋惡�悸 ��忰悋�悸 惡悋�惷惡愀 (�悋 惠悗愆惘� �� 忰悋� 悖惘惆惠 �惺悋�悴悸 悛��悸 �忰悋�悸 悋�悖忰惘�)"

-#: ../pidgin/plugins/spellchk.c:2290
+#: ../pidgin/plugins/spellchk.c:2298
 msgid "Only replace _whole words"
 msgstr "悋愕惠惡惆� ��愀 悋�_���悋惠 悋��悋��悸"

-#: ../pidgin/plugins/spellchk.c:2315
+#: ../pidgin/plugins/spellchk.c:2323
 msgid "General Text Replacement Options"
 msgstr "悽�悋惘悋惠 悋愕惠惡惆悋� 悋��惶 悋�惺悋�悸"

-#: ../pidgin/plugins/spellchk.c:2316
+#: ../pidgin/plugins/spellchk.c:2324
 msgid "Enable replacement of last word on send"
 msgstr "����� 悋愕惠惡惆悋� 悋����悸 悋�悖悽�惘悸 惺�惆 悋�悒惘愕悋�"

-#: ../pidgin/plugins/spellchk.c:2349
+#: ../pidgin/plugins/spellchk.c:2357
 msgid "Text replacement"
 msgstr "悋愕惠惡惆悋� �惶"

-#: ../pidgin/plugins/spellchk.c:2351 ../pidgin/plugins/spellchk.c:2352
+#: ../pidgin/plugins/spellchk.c:2359 ../pidgin/plugins/spellchk.c:2360
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "�愕惠惡惆� 悋��惶 �� 悋�惘愕悋悧� 悋�惶悋惆惘悸 惠惡惺悋 ���悋惺惆 悋��愕惠悽惆� 悋��忰惆惆悸."