changeset 22542:832c1da0287d

Hebrew translation updated (Shalom Craimer) Closes #5309
author Stu Tomlinson <stu@nosnilmot.com>
date Tue, 25 Mar 2008 14:45:10 +0000 (2008-03-25)
parents 16a4b1fc98ea
children d56ec4910b6d
files po/ChangeLog po/he.po
diffstat 2 files changed, 3693 insertions(+), 3637 deletions(-) [+]
line wrap: on
line diff
--- a/po/ChangeLog	Tue Mar 25 14:38:39 2008 +0000
+++ b/po/ChangeLog	Tue Mar 25 14:45:10 2008 +0000
@@ -9,6 +9,7 @@
 	* Finnish translation updated (Timo Jyrinki)
 	* French translation updated (�ric Boumaour)
 	* German translation updated (Jochen Kemnade, Bj旦rn Voigt)
+	* Hebrew translation updated (Shalom Craimer)
 	* Russian translation updated (Dmitry Beloglazov)
 
 version 2.4.0
--- a/po/he.po	Tue Mar 25 14:38:39 2008 +0000
+++ b/po/he.po	Tue Mar 25 14:45:10 2008 +0000
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: he\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-24 03:21-0500\n"
-"PO-Revision-Date: 2008-02-25 09:10+0200\n"
+"POT-Creation-Date: 2008-03-22 03:22-0400\n"
+"PO-Revision-Date: 2008-03-25 10:17+0200\n"
 "Last-Translator: Shalom Craimer <scraimer at g mail dot com>\n"
 "Language-Team: Hebrew <he@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -19,7 +19,9 @@
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../finch/finch.c:64 ../finch/finch.c:300 ../finch/finch.c:329
+#: ../finch/finch.c:64
+#: ../finch/finch.c:300
+#: ../finch/finch.c:329
 #: ../finch/finch.c:417
 msgid "Finch"
 msgstr "廚��廛'"
@@ -50,28 +52,32 @@
 "  -n, --nologin       �� 廬廬��廨 �������廬\n"
 "  -v, --version       �廢� �廬 ���廨廖� 廩� �廬���� �廢�\n"
 
-#: ../finch/finch.c:327 ../pidgin/gtkmain.c:743
-#, c-format
-msgid ""
-"%s encountered errors migrating your settings from %s to %s. Please "
-"investigate and complete the migration by hand. Please report this error at "
-"http://developer.pidgin.im"
-msgstr ""
-"%s �廬廡� �廩����廬 �廣廬 ��廨廬 ���廨�廬�� �- %s �- %s. �廩 ��廡�廨 �廬 �廣����, ��廖��� �廬 "
-"��廣�廨� ����廬. �廩�� �� ��廚廩�廨廬� ����� 廣� 廬廡�� �� �- http://developer.pidgin.im"
-
-#: ../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/finch.c:327
+#: ../pidgin/gtkmain.c:737
+#, c-format
+msgid "%s encountered errors migrating your settings from %s to %s. Please investigate and complete the migration by hand. Please report this error at http://developer.pidgin.im"
+msgstr "%s �廬廡� �廩����廬 �廣廬 ��廨廬 ���廨�廬�� �- %s �- %s. �廩 ��廡�廨 �廬 �廣����, ��廖��� �廬 ��廣�廨� ����廬. �廩�� �� ��廚廩�廨廬� ����� 廣� 廬廡�� �� �- http://developer.pidgin.im"
+
+#: ../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:2036
+#: ../libpurple/protocols/jabber/buddy.c:2079
 #: ../libpurple/protocols/jabber/chat.c:677
 #: ../libpurple/protocols/jabber/chat.c:688
-#: ../libpurple/protocols/jabber/jabber.c:1584
+#: ../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 "廩����"
@@ -100,8 +106,10 @@
 msgid "(You probably forgot to 'make install'.)"
 msgstr "(��廨�� 廩��廬 �廣廩�廬 'make install'.)"
 
-#: ../finch/gntaccount.c:496 ../finch/gntconn.c:138
-#: ../pidgin/gtkaccount.c:1447 ../pidgin/gtkblist.c:4542
+#: ../finch/gntaccount.c:496
+#: ../finch/gntconn.c:138
+#: ../pidgin/gtkaccount.c:1447
+#: ../pidgin/gtkblist.c:4588
 msgid "Modify Account"
 msgstr "廣廨��廬 ��廩���"
 
@@ -109,12 +117,13 @@
 msgid "New Account"
 msgstr "�廩��� ��廩"
 
-#: ../finch/gntaccount.c:521 ../pidgin/gtkft.c:696
+#: ../finch/gntaccount.c:521
+#: ../pidgin/gtkft.c:696
 msgid "Protocol:"
 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 "廩� �廬廢���:"
 
@@ -128,40 +137,61 @@
 
 #. Cancel button
 #. Cancel
-#: ../finch/gntaccount.c:575 ../finch/gntaccount.c:639
-#: ../finch/gntaccount.c:890 ../finch/gntblist.c:620 ../finch/gntblist.c:698
-#: ../finch/gntblist.c:733 ../finch/gntblist.c:1077 ../finch/gntblist.c:1303
-#: ../finch/gntblist.c:1437 ../finch/gntblist.c:2602 ../finch/gntblist.c:2651
-#: ../finch/gntblist.c:2715 ../finch/gntcertmgr.c:90 ../finch/gntplugin.c:532
-#: ../finch/gntpounce.c:471 ../finch/gntpounce.c:679 ../finch/gntprefs.c:265
-#: ../finch/gntsound.c:1059 ../finch/gntstatus.c:145 ../finch/gntstatus.c:485
-#: ../finch/gntstatus.c:610 ../finch/plugins/gnthistory.c:178
-#: ../libpurple/account.c:1116 ../libpurple/account.c:1419
-#: ../libpurple/account.c:1454 ../libpurple/conversation.c:1219
-#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:508
-#: ../libpurple/protocols/gg/gg.c:667 ../libpurple/protocols/gg/gg.c:804
+#: ../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:730
-#: ../libpurple/protocols/jabber/buddy.c:2430
-#: ../libpurple/protocols/jabber/buddy.c:2466
+#: ../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:1053
-#: ../libpurple/protocols/jabber/jabber.c:1062
-#: ../libpurple/protocols/jabber/jabber.c:1777
+#: ../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:287 ../libpurple/protocols/msn/msn.c:304
-#: ../libpurple/protocols/msn/msn.c:321 ../libpurple/protocols/msn/msn.c:338
-#: ../libpurple/protocols/msn/msn.c:359 ../libpurple/protocols/msnp9/msn.c:284
+#: ../libpurple/protocols/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:6197
+#: ../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
@@ -174,18 +204,18 @@
 #: ../libpurple/protocols/qq/sys_msg.c:115
 #: ../libpurple/protocols/qq/sys_msg.c:175
 #: ../libpurple/protocols/qq/sys_msg.c:269
-#: ../libpurple/protocols/sametime/sametime.c:3438
-#: ../libpurple/protocols/sametime/sametime.c:3524
-#: ../libpurple/protocols/sametime/sametime.c:3698
-#: ../libpurple/protocols/sametime/sametime.c:5451
-#: ../libpurple/protocols/sametime/sametime.c:5541
-#: ../libpurple/protocols/sametime/sametime.c:5666
+#: ../libpurple/protocols/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
@@ -197,37 +227,60 @@
 #: ../libpurple/protocols/silc10/silc.c:742
 #: ../libpurple/protocols/silc10/silc.c:948
 #: ../libpurple/protocols/yahoo/yahoo.c:993
-#: ../libpurple/protocols/yahoo/yahoo.c:3535
-#: ../libpurple/protocols/yahoo/yahoo.c:3546 ../pidgin/gtkaccount.c:1841
-#: ../pidgin/gtkaccount.c:2402 ../pidgin/gtkblist.c:6768
-#: ../pidgin/gtkcertmgr.c:197 ../pidgin/gtkdialogs.c:765
-#: ../pidgin/gtkdialogs.c:904 ../pidgin/gtkdialogs.c:996
-#: ../pidgin/gtkdialogs.c:1016 ../pidgin/gtkdialogs.c:1040
-#: ../pidgin/gtkdialogs.c:1062 ../pidgin/gtkdialogs.c:1110
-#: ../pidgin/gtkdialogs.c:1151 ../pidgin/gtkdialogs.c:1207
-#: ../pidgin/gtkdialogs.c:1246 ../pidgin/gtkdialogs.c:1273
-#: ../pidgin/gtkimhtmltoolbar.c:438 ../pidgin/gtklog.c:327
-#: ../pidgin/gtkplugin.c:290 ../pidgin/gtkpounce.c:1113
-#: ../pidgin/gtkprivacy.c:509 ../pidgin/gtkprivacy.c:525
-#: ../pidgin/gtkprivacy.c:550 ../pidgin/gtkprivacy.c:564
-#: ../pidgin/gtkrequest.c:273 ../pidgin/gtksavedstatuses.c:345
+#: ../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:1610
 msgid "Cancel"
 msgstr "�����"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:579 ../finch/gntcertmgr.c:310 ../finch/gntdebug.c:297
-#: ../finch/gntplugin.c:532 ../finch/gntpounce.c:477 ../finch/gntprefs.c:265
-#: ../finch/gntsound.c:1056 ../finch/gntstatus.c:488 ../finch/gntstatus.c:598
-#: ../libpurple/account.c:1453 ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:729 ../pidgin/gtkdebug.c:746
+#: ../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:1604
+#: ../finch/gntaccount.c:632
+#: ../pidgin/gtkaccount.c:1832
+#: ../pidgin/gtksavedstatuses.c:333
+#: ../pidgin/gtkstatusbox.c:1604
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "��� �廬� ���� 廩�廨廢��� ����廡 �廬 %s?"
@@ -237,17 +290,27 @@
 msgstr "��廡 �廩���"
 
 #. Delete button
-#: ../finch/gntaccount.c:638 ../finch/gntaccount.c:708
-#: ../finch/gntcertmgr.c:318 ../finch/gntpounce.c:678 ../finch/gntpounce.c:741
-#: ../finch/gntstatus.c:144 ../finch/gntstatus.c:210
-#: ../pidgin/gtkaccount.c:1840 ../pidgin/gtklog.c:326
-#: ../pidgin/gtkpounce.c:1112 ../pidgin/gtkrequest.c:276
-#: ../pidgin/gtksavedstatuses.c:344 ../pidgin/gtkstatusbox.c:1609
+#: ../finch/gntaccount.c:638
+#: ../finch/gntaccount.c:708
+#: ../finch/gntcertmgr.c:318
+#: ../finch/gntpounce.c:678
+#: ../finch/gntpounce.c:741
+#: ../finch/gntstatus.c:144
+#: ../finch/gntstatus.c:210
+#: ../pidgin/gtkaccount.c:1840
+#: ../pidgin/gtklog.c:326
+#: ../pidgin/gtkpounce.c:1112
+#: ../pidgin/gtkrequest.c:276
+#: ../pidgin/gtksavedstatuses.c:344
+#: ../pidgin/gtkstatusbox.c:1609
 msgid "Delete"
 msgstr "��廡"
 
-#: ../finch/gntaccount.c:670 ../finch/gntblist.c:2469 ../finch/gntui.c:94
-#: ../pidgin/gtkaccount.c:2261 ../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 "�廩����廬"
 
@@ -256,53 +319,73 @@
 msgstr "�廚廩廨 ��廚廣�� ���廩廣�廬 �廩����廬 �� �廨廩��� ����."
 
 #. Add button
-#: ../finch/gntaccount.c:699 ../finch/gntaccount.c:889 ../finch/gntblist.c:619
-#: ../finch/gntblist.c:698 ../finch/gntblist.c:733 ../finch/gntblist.c:2819
-#: ../finch/gntcertmgr.c:305 ../finch/gntnotify.c:385 ../finch/gntpounce.c:725
-#: ../finch/gntroomlist.c:274 ../finch/gntstatus.c:199
-#: ../libpurple/protocols/gg/gg.c:885 ../libpurple/protocols/qq/sys_msg.c:116
+#: ../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:116
 #: ../libpurple/protocols/qq/sys_msg.c:176
 #: ../libpurple/protocols/qq/sys_msg.c:270
-#: ../libpurple/protocols/sametime/sametime.c:5540
+#: ../libpurple/protocols/sametime/sametime.c:5541
 #: ../libpurple/protocols/silc/chat.c:619
-#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2401
-#: ../pidgin/gtkblist.c:6767 ../pidgin/gtkconv.c:1702
+#: ../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:704 ../finch/gntpounce.c:733
+#: ../finch/gntaccount.c:704
+#: ../finch/gntpounce.c:733
 msgid "Modify"
 msgstr "廣廨��"
 
-#: ../finch/gntaccount.c:812 ../pidgin/gtkaccount.c:2348
+#: ../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:885 ../pidgin/gtkaccount.c:2400
+#: ../finch/gntaccount.c:885
+#: ../pidgin/gtkaccount.c:2400
 msgid "Add buddy to your list?"
 msgstr "���廖�廝 �廬 ��廩 �廡廩廨 �廨廩��� 廩��?"
 
-#: ../finch/gntaccount.c:945 ../pidgin/gtkaccount.c:2458
+#: ../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:970 ../finch/gntaccount.c:973
-#: ../finch/gntaccount.c:1000 ../pidgin/gtkaccount.c:2481
+#: ../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:977 ../finch/gntaccount.c:1004
-#: ../pidgin/gtkaccount.c:2482 ../pidgin/gtkaccount.c:2489
+#: ../finch/gntaccount.c:977
+#: ../finch/gntaccount.c:1004
+#: ../pidgin/gtkaccount.c:2482
+#: ../pidgin/gtkaccount.c:2489
 msgid "Authorize"
 msgstr "�廩廨"
 
-#: ../finch/gntaccount.c:978 ../finch/gntaccount.c:1005
-#: ../pidgin/gtkaccount.c:2483 ../pidgin/gtkaccount.c:2490
+#: ../finch/gntaccount.c:978
+#: ../finch/gntaccount.c:1005
+#: ../pidgin/gtkaccount.c:2483
+#: ../pidgin/gtkaccount.c:2490
 msgid "Deny"
 msgstr "���"
 
@@ -329,7 +412,8 @@
 "\n"
 "�廨�� ���廨���: �廚�� %s"
 
-#: ../finch/gntblist.c:306 ../pidgin/gtkprefs.c:327
+#: ../finch/gntblist.c:306
+#: ../pidgin/gtkprefs.c:327
 #: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:1
 msgid "Default"
 msgstr "�廨�廨廬 �����"
@@ -354,8 +438,9 @@
 msgid "Error adding buddy"
 msgstr "廩���� ���廖廚廬 ��廩 廡廩廨"
 
-#: ../finch/gntblist.c:601 ../libpurple/protocols/oscar/oscar.c:2949
-#: ../pidgin/gtkaccount.c:1914 ../pidgin/gtksavedstatuses.c:971
+#: ../finch/gntblist.c:601
+#: ../pidgin/gtkaccount.c:1914
+#: ../pidgin/gtksavedstatuses.c:971
 msgid "Screen Name"
 msgstr "廩� �廬廢���"
 
@@ -367,16 +452,25 @@
 msgid "Add in group"
 msgstr "��廖廝 �廡��廢�"
 
-#: ../finch/gntblist.c:611 ../finch/gntblist.c:678 ../finch/gntblist.c:1648
-#: ../finch/gntblist.c:2583 ../finch/gntblist.c:2637 ../finch/gntblist.c:2702
-#: ../finch/gntnotify.c:174 ../finch/gntstatus.c:576
-#: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:3201 ../pidgin/gtknotify.c:517
-#: ../pidgin/gtkpounce.c:1281 ../pidgin/plugins/gevolution/gevolution.c:445
+#: ../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:617 ../finch/gntblist.c:1126
+#: ../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
@@ -385,8 +479,9 @@
 #: ../libpurple/protocols/silc10/buddy.c:1036
 #: ../libpurple/protocols/silc10/buddy.c:1083
 #: ../libpurple/protocols/silc10/buddy.c:1183
-#: ../libpurple/protocols/yahoo/yahoo.c:3380 ../pidgin/gtkblist.c:6298
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
+#: ../libpurple/protocols/yahoo/yahoo.c:3400
+#: ../pidgin/gtkblist.c:6344
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:449
 msgid "Add Buddy"
 msgstr "��廖廝 ��廩 廡廩廨"
 
@@ -394,48 +489,61 @@
 msgid "Please enter buddy information."
 msgstr "�廩 ����� ���廣 廣� ��廩 �廡廩廨."
 
-#: ../finch/gntblist.c:647 ../libpurple/blist.c:1237
+#: ../finch/gntblist.c:647
+#: ../libpurple/blist.c:1237
 msgid "Chats"
 msgstr "廩���廬"
 
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:684 ../finch/gntblist.c:2578 ../finch/gntblist.c:2632
-#: ../finch/gntroomlist.c:298 ../libpurple/protocols/jabber/jabber.c:981
-#: ../libpurple/protocols/jabber/jabber.c:984
-#: ../libpurple/protocols/msn/msn.c:1740 ../libpurple/protocols/msn/msn.c:1805
-#: ../libpurple/protocols/msn/msn.c:1832
-#: ../libpurple/protocols/msnp9/msn.c:1596
-#: ../libpurple/protocols/msnp9/msn.c:1661
-#: ../libpurple/protocols/msnp9/msn.c:1688
-#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:652
+#: ../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:687 ../finch/gntblist.c:1589
-#: ../libpurple/protocols/msn/msn.c:1559
+#: ../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:1015
-#: ../pidgin/gtkdialogs.c:1039 ../pidgin/gtkdialogs.c:1061
+#: ../libpurple/protocols/zephyr/zephyr.c:1167
+#: ../pidgin/gtkdialogs.c:1016
+#: ../pidgin/gtkdialogs.c:1040
+#: ../pidgin/gtkdialogs.c:1062
 #: ../pidgin/gtkrequest.c:280
 msgid "Alias"
 msgstr "廩� ��廖廝"
 
-#: ../finch/gntblist.c:690 ../finch/gntblist.c:2835
+#: ../finch/gntblist.c:690
+#: ../finch/gntblist.c:2839
 msgid "Group"
 msgstr "廡��廢�"
 
-#: ../finch/gntblist.c:693 ../finch/gntblist.c:1093
+#: ../finch/gntblist.c:693
+#: ../finch/gntblist.c:1093
 msgid "Auto-join"
 msgstr "�廢�廨廝 �������廬"
 
-#: ../finch/gntblist.c:696 ../finch/gntblist.c:1128 ../pidgin/gtkblist.c:6681
+#: ../finch/gntblist.c:696
+#: ../finch/gntblist.c:1128
+#: ../pidgin/gtkblist.c:6709
 msgid "Add Chat"
 msgstr "��廖廝 廩���"
 
@@ -443,7 +551,8 @@
 msgid "You can edit more information from the context menu later."
 msgstr "��廬� �廣廨�� 廣�� ���廣 �廬廚廨��-��廡廩廨 ��廨-��."
 
-#: ../finch/gntblist.c:710 ../finch/gntblist.c:723
+#: ../finch/gntblist.c:710
+#: ../finch/gntblist.c:723
 msgid "Error adding group"
 msgstr "廩���� ���廖廚廬 廡��廢�"
 
@@ -455,9 +564,11 @@
 msgid "A group with the name already exists."
 msgstr "廡��廢� �廩� �� ��廨 廡���廬."
 
-#: ../finch/gntblist.c:731 ../finch/gntblist.c:1130
-#: ../libpurple/protocols/sametime/sametime.c:5450
-#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtkblist.c:6764
+#: ../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 "��廖廝 廡��廢�"
 
@@ -473,7 +584,8 @@
 msgid "Please Update the necessary fields."
 msgstr "�廩 �廣��� �廬 �廩��廬 ����廢��."
 
-#: ../finch/gntblist.c:1077 ../finch/gntstatus.c:205
+#: ../finch/gntblist.c:1077
+#: ../finch/gntstatus.c:205
 msgid "Edit"
 msgstr "廣廨��"
 
@@ -481,15 +593,18 @@
 msgid "Edit Settings"
 msgstr "廣廨�� ���廨�廬"
 
-#: ../finch/gntblist.c:1138 ../pidgin/gtkutils.c:980
+#: ../finch/gntblist.c:1138
+#: ../pidgin/gtkutils.c:980
 msgid "Information"
 msgstr "���廣"
 
-#: ../finch/gntblist.c:1138 ../pidgin/gtkutils.c:980
+#: ../finch/gntblist.c:1138
+#: ../pidgin/gtkutils.c:980
 msgid "Retrieving..."
 msgstr "廩��廝..."
 
-#: ../finch/gntblist.c:1192 ../finch/gntconv.c:591
+#: ../finch/gntblist.c:1192
+#: ../finch/gntconv.c:591
 #: ../libpurple/protocols/silc/chat.c:903
 #: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
@@ -500,19 +615,24 @@
 msgstr "��廖廝 廬���� �廚廣��廬 ��廩 廡廩廨"
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:1203 ../finch/gntconv.c:603
+#: ../finch/gntblist.c:1203
+#: ../finch/gntconv.c:603
 #: ../libpurple/protocols/jabber/si.c:1109
-#: ../libpurple/protocols/oscar/oscar.c:653 ../libpurple/protocols/qq/qq.c:588
-#: ../pidgin/gtkconv.c:1650
+#: ../libpurple/protocols/oscar/oscar.c:655
+#: ../libpurple/protocols/qq/qq.c:588
+#: ../pidgin/gtkconv.c:1644
 msgid "Send File"
 msgstr "廩�� 廡��廛"
 
-#: ../finch/gntblist.c:1210 ../libpurple/protocols/gg/gg.c:1629
-#: ../libpurple/protocols/msn/msn.c:660 ../libpurple/protocols/msnp9/msn.c:562
+#: ../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
+#: ../finch/gntblist.c:1216
+#: ../finch/gntblist.c:1605
 msgid "View Log"
 msgstr "�廢� 廨�廩��"
 
@@ -521,7 +641,8 @@
 msgid "Please enter the new name for %s"
 msgstr "��� ��� �廬 �廩� ��廩 廣��廨 %s"
 
-#: ../finch/gntblist.c:1300 ../finch/gntblist.c:1589
+#: ../finch/gntblist.c:1300
+#: ../finch/gntblist.c:1589
 msgid "Rename"
 msgstr "廩�� 廩�"
 
@@ -551,15 +672,21 @@
 msgid "Confirm Remove"
 msgstr "�廩廨 �廖廨�"
 
-#: ../finch/gntblist.c:1436 ../finch/gntblist.c:1591 ../finch/gntft.c:243
-#: ../pidgin/gtkconv.c:1699 ../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:1565 ../finch/gntblist.c:2876 ../finch/gntprefs.c:258
-#: ../finch/gntui.c:95 ../pidgin/gtkblist.c:5037
+#: ../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 "廨廩��廬 ��廩� 廡廩廨"
@@ -573,49 +700,58 @@
 msgstr "���廝 廖����"
 
 #. General
-#: ../finch/gntblist.c:1641 ../libpurple/protocols/gg/gg.c:638
-#: ../libpurple/protocols/gg/gg.c:1052 ../libpurple/protocols/gg/gg.c:1125
+#: ../finch/gntblist.c:1641
+#: ../libpurple/protocols/gg/gg.c:638
+#: ../libpurple/protocols/gg/gg.c:1052
+#: ../libpurple/protocols/gg/gg.c:1125
 #: ../libpurple/protocols/gg/gg.c:2228
-#: ../libpurple/protocols/jabber/buddy.c:286
-#: ../libpurple/protocols/jabber/buddy.c:1251
-#: ../libpurple/protocols/jabber/buddy.c:2221
-#: ../libpurple/protocols/jabber/buddy.c:2413
-#: ../libpurple/protocols/jabber/jabber.c:992
-#: ../libpurple/protocols/jabber/jabber.c:1604
-#: ../libpurple/protocols/jabber/jabber.c:1618
-#: ../libpurple/protocols/jabber/jabber.c:1632
-#: ../libpurple/protocols/jabber/jabber.c:1646
-#: ../libpurple/protocols/jabber/jabber.c:1660
-#: ../libpurple/protocols/msn/msn.c:1567 ../libpurple/protocols/msn/msn.c:1743
+#: ../libpurple/protocols/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:1599
+#: ../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:3225
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1073
+#: ../pidgin/gtkblist.c:3261
 msgid "Nickname"
 msgstr "�����"
 
 #. Idle stuff
-#: ../finch/gntblist.c:1663 ../finch/gntprefs.c:261
+#: ../finch/gntblist.c:1663
+#: ../finch/gntprefs.c:261
 #: ../libpurple/protocols/bonjour/bonjour.c:376
-#: ../libpurple/protocols/jabber/buddy.c:789
-#: ../libpurple/protocols/jabber/buddy.c:953
-#: ../libpurple/protocols/msn/msn.c:607 ../libpurple/protocols/msn/msn.c:625
-#: ../libpurple/protocols/msn/msn.c:633 ../libpurple/protocols/msn/state.c:32
+#: ../libpurple/protocols/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:2843
-#: ../libpurple/protocols/oscar/oscar.c:2973
-#: ../libpurple/protocols/yahoo/yahoo.c:3134
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3253
-#: ../pidgin/gtkblist.c:3703 ../pidgin/gtkprefs.c:1946
+#: ../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 "��廖廨 廚廣���廬"
 
@@ -623,63 +759,77 @@
 msgid "On Mobile"
 msgstr "�����"
 
-#: ../finch/gntblist.c:1976 ../pidgin/gtkdocklet.c:582
+#: ../finch/gntblist.c:1978
+#: ../pidgin/gtkdocklet.c:582
 msgid "New..."
 msgstr "��廩..."
 
-#: ../finch/gntblist.c:1983 ../pidgin/gtkdocklet.c:583
+#: ../finch/gntblist.c:1985
+#: ../pidgin/gtkdocklet.c:583
 msgid "Saved..."
 msgstr "廩��廨..."
 
-#: ../finch/gntblist.c:2437 ../finch/gntplugin.c:352 ../finch/gntui.c:100
-#: ../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:2591 ../finch/gntblist.c:2596
+#: ../finch/gntblist.c:2593
+#: ../finch/gntblist.c:2598
 msgid "Block/Unblock"
 msgstr "��廖廝/�廖廨 �廖���"
 
-#: ../finch/gntblist.c:2592 ../libpurple/protocols/gg/gg.c:1665
+#: ../finch/gntblist.c:2594
+#: ../libpurple/protocols/gg/gg.c:1665
 msgid "Block"
 msgstr "�廖��"
 
-#: ../finch/gntblist.c:2593 ../libpurple/protocols/gg/gg.c:1661
+#: ../finch/gntblist.c:2595
+#: ../libpurple/protocols/gg/gg.c:1661
 msgid "Unblock"
 msgstr "�廖廨 �廖���"
 
-#: ../finch/gntblist.c:2598
-msgid ""
-"Please enter the screen name or alias of the person you would like to Block/"
-"Unblock."
+#: ../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:2601 ../finch/gntblist.c:2650 ../finch/gntcertmgr.c:89
-#: ../finch/gntconn.c:137 ../finch/gntnotify.c:80
-#: ../finch/plugins/gnthistory.c:177 ../libpurple/account.c:1115
-#: ../libpurple/account.c:1418 ../libpurple/protocols/gg/gg.c:507
-#: ../libpurple/protocols/gg/gg.c:666 ../libpurple/protocols/gg/gg.c:803
-#: ../libpurple/protocols/jabber/jabber.c:1776
-#: ../libpurple/protocols/jabber/xdata.c:399
-#: ../libpurple/protocols/msn/msn.c:286 ../libpurple/protocols/msn/msn.c:303
-#: ../libpurple/protocols/msn/msn.c:320 ../libpurple/protocols/msn/msn.c:337
+#: ../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:6196
+#: ../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
@@ -690,112 +840,127 @@
 #: ../libpurple/protocols/silc10/ops.c:1909
 #: ../libpurple/protocols/silc10/silc.c:741
 #: ../libpurple/protocols/yahoo/yahoo.c:992
-#: ../libpurple/protocols/yahoo/yahoo.c:3534
-#: ../libpurple/protocols/yahoo/yahoo.c:3545 ../pidgin/gtkcertmgr.c:195
-#: ../pidgin/gtkdialogs.c:764 ../pidgin/gtkdialogs.c:903
-#: ../pidgin/gtkdialogs.c:995 ../pidgin/gtkrequest.c:272
+#: ../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:2645 ../pidgin/gtkdialogs.c:759
+#: ../finch/gntblist.c:2649
+#: ../pidgin/gtkdialogs.c:760
 msgid "New Instant Message"
 msgstr "���廣� ����廬 ��廩�"
 
-#: ../finch/gntblist.c:2647 ../pidgin/gtkdialogs.c:761
-msgid ""
-"Please enter the screen name or alias of the person you would like to IM."
+#: ../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:2698
+#: ../finch/gntblist.c:2702
 msgid "Channel"
 msgstr "廣廨�廛"
 
-#: ../finch/gntblist.c:2710 ../pidgin/gtkblist.c:951
+#: ../finch/gntblist.c:2714
+#: ../pidgin/gtkblist.c:962
 msgid "Join a Chat"
 msgstr "�廢�廨廝 �廩���"
 
-#: ../finch/gntblist.c:2712
+#: ../finch/gntblist.c:2716
 msgid "Please enter the name of the chat you want to join."
 msgstr "�廩 ����� �廬 廩� �廢'�� ���� �廨廢��� ��廢�廨廝."
 
-#: ../finch/gntblist.c:2714 ../finch/gntnotify.c:394
+#: ../finch/gntblist.c:2718
+#: ../finch/gntnotify.c:394
 msgid "Join"
 msgstr "�廢�廨廝"
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2759 ../finch/gntpounce.c:459 ../pidgin/gtkpounce.c:802
+#: ../finch/gntblist.c:2763
+#: ../finch/gntpounce.c:459
+#: ../pidgin/gtkpounce.c:802
 msgid "Options"
 msgstr "�廚廩廨���廬"
 
-#: ../finch/gntblist.c:2765
+#: ../finch/gntblist.c:2769
 msgid "Send IM..."
 msgstr "廩��廨..."
 
-#: ../finch/gntblist.c:2770
+#: ../finch/gntblist.c:2774
 msgid "Block/Unblock..."
 msgstr "��廖廝/�廖廨 �廖���..."
 
-#: ../finch/gntblist.c:2775
+#: ../finch/gntblist.c:2779
 msgid "Join Chat..."
 msgstr "�廢�廨廝 �廢'��..."
 
-#: ../finch/gntblist.c:2780
+#: ../finch/gntblist.c:2784
 msgid "Show"
 msgstr "�廢�"
 
-#: ../finch/gntblist.c:2785
+#: ../finch/gntblist.c:2789
 msgid "Empty groups"
 msgstr "廡��廢�廬 廨�廡�廬"
 
-#: ../finch/gntblist.c:2792
+#: ../finch/gntblist.c:2796
 msgid "Offline buddies"
 msgstr "��廨�� ���廬廡��"
 
-#: ../finch/gntblist.c:2799
+#: ../finch/gntblist.c:2803
 msgid "Sort"
 msgstr "����"
 
-#: ../finch/gntblist.c:2804
+#: ../finch/gntblist.c:2808
 msgid "By Status"
 msgstr "�廚� �廢�"
 
-#: ../finch/gntblist.c:2809 ../pidgin/gtkblist.c:4194
+#: ../finch/gntblist.c:2813
+#: ../pidgin/gtkblist.c:4240
 msgid "Alphabetically"
 msgstr "��廚�廬�廬"
 
-#: ../finch/gntblist.c:2814
+#: ../finch/gntblist.c:2818
 msgid "By Log Size"
 msgstr "�廚� ���� ���� �廩���廬"
 
-#: ../finch/gntblist.c:2825
+#: ../finch/gntblist.c:2829
 msgid "Buddy"
 msgstr "��廩 �廡廩廨"
 
-#: ../finch/gntblist.c:2830 ../libpurple/protocols/oscar/oscar.c:647
+#: ../finch/gntblist.c:2834
+#: ../libpurple/protocols/oscar/oscar.c:649
 #: ../libpurple/protocols/silc/silc.c:911
-#: ../libpurple/protocols/silc/util.c:559
+#: ../libpurple/protocols/silc/util.c:563
 #: ../libpurple/protocols/silc10/silc.c:685
-#: ../libpurple/protocols/silc10/util.c:549
+#: ../libpurple/protocols/silc10/util.c:553
 msgid "Chat"
 msgstr "廩���"
 
-#: ../finch/gntblist.c:2840 ../finch/plugins/grouping.c:255
+#: ../finch/gntblist.c:2844
+#: ../finch/plugins/grouping.c:255
 msgid "Grouping"
 msgstr "廡���廛"
 
-#: ../finch/gntcertmgr.c:85 ../pidgin/gtkcertmgr.c:188
+#: ../finch/gntcertmgr.c:85
+#: ../pidgin/gtkcertmgr.c:188
 msgid "Certificate Import"
 msgstr "����� 廬廣���"
 
-#: ../finch/gntcertmgr.c:86 ../pidgin/gtkcertmgr.c:189
+#: ../finch/gntcertmgr.c:86
+#: ../pidgin/gtkcertmgr.c:189
 msgid "Specify a hostname"
 msgstr "廚�廨�� 廩� 廩廨�"
 
-#: ../finch/gntcertmgr.c:87 ../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:96 ../pidgin/gtkcertmgr.c:210
+#: ../finch/gntcertmgr.c:96
+#: ../pidgin/gtkcertmgr.c:210
 #, c-format
 msgid ""
 "File %s could not be imported.\n"
@@ -804,19 +969,23 @@
 "�� ��廬� ��� ����� �廬 �廡��廛 %s.\n"
 "�廩 ����� �� �廡��廛 廡廨�� ��廚�廨�� PEM.\n"
 
-#: ../finch/gntcertmgr.c:98 ../pidgin/gtkcertmgr.c:212
+#: ../finch/gntcertmgr.c:98
+#: ../pidgin/gtkcertmgr.c:212
 msgid "Certificate Import Error"
 msgstr "廩���� ������ 廬廣���"
 
-#: ../finch/gntcertmgr.c:99 ../pidgin/gtkcertmgr.c:213
+#: ../finch/gntcertmgr.c:99
+#: ../pidgin/gtkcertmgr.c:213
 msgid "X.509 certificate import failed"
 msgstr "��廩��� �廣廬 ����� 廬廣��廬 X.509"
 
-#: ../finch/gntcertmgr.c:109 ../pidgin/gtkcertmgr.c:224
+#: ../finch/gntcertmgr.c:109
+#: ../pidgin/gtkcertmgr.c:224
 msgid "Select a PEM certificate"
 msgstr "���廨廬 廬廣��廬 PEM"
 
-#: ../finch/gntcertmgr.c:126 ../pidgin/gtkcertmgr.c:245
+#: ../finch/gntcertmgr.c:126
+#: ../pidgin/gtkcertmgr.c:245
 #, c-format
 msgid ""
 "Export to file %s failed.\n"
@@ -825,15 +994,18 @@
 "��廩� ���廢�� �廡��廛 %s.\n"
 "�廩 ����� 廩�廩 �� �廨廩��廬 �廬��� �廖廚廨��廬 ��廣�\n"
 
-#: ../finch/gntcertmgr.c:128 ../pidgin/gtkcertmgr.c:247
+#: ../finch/gntcertmgr.c:128
+#: ../pidgin/gtkcertmgr.c:247
 msgid "Certificate Export Error"
 msgstr "�廩� ���廢�� 廬廣���"
 
-#: ../finch/gntcertmgr.c:129 ../pidgin/gtkcertmgr.c:248
+#: ../finch/gntcertmgr.c:129
+#: ../pidgin/gtkcertmgr.c:248
 msgid "X.509 certificate export failed"
 msgstr "��廢�� 廩� 廬廣��廬 X.509 ��廩��"
 
-#: ../finch/gntcertmgr.c:158 ../pidgin/gtkcertmgr.c:298
+#: ../finch/gntcertmgr.c:158
+#: ../pidgin/gtkcertmgr.c:298
 msgid "PEM X.509 Certificate Export"
 msgstr "��廢�� 廬廣��廬 PEM X.509"
 
@@ -859,38 +1031,52 @@
 msgid "SSL Host Certificate"
 msgstr "廬廣��廬 廩廨廬 SSL"
 
-#: ../finch/gntcertmgr.c:232 ../pidgin/gtkcertmgr.c:371
+#: ../finch/gntcertmgr.c:232
+#: ../pidgin/gtkcertmgr.c:371
 #, c-format
 msgid "Really delete certificate for %s?"
 msgstr "���廬 ����廡 �廬 �廬廣��� 廣��廨 %s?"
 
-#: ../finch/gntcertmgr.c:235 ../pidgin/gtkcertmgr.c:373
+#: ../finch/gntcertmgr.c:235
+#: ../pidgin/gtkcertmgr.c:373
 msgid "Confirm certificate delete"
 msgstr "��廩�廨 ���廡廬 廬廣���"
 
-#: ../finch/gntcertmgr.c:292 ../pidgin/gtkcertmgr.c:613
+#: ../finch/gntcertmgr.c:292
+#: ../pidgin/gtkcertmgr.c:613
 msgid "Certificate Manager"
 msgstr "���� �廬廣���廬"
 
 #. Creating the user splits
-#: ../finch/gntcertmgr.c:297 ../libpurple/protocols/bonjour/bonjour.c:694
+#: ../finch/gntcertmgr.c:297
+#: ../libpurple/protocols/bonjour/bonjour.c:694
 #: ../libpurple/protocols/silc/silc.c:1150
-#: ../libpurple/protocols/silc10/silc.c:924 ../pidgin/gtkcertmgr.c:446
+#: ../libpurple/protocols/silc10/silc.c:924
+#: ../pidgin/gtkcertmgr.c:446
 msgid "Hostname"
 msgstr "廩� 廩廨廬"
 
-#: ../finch/gntcertmgr.c:314 ../finch/gntnotify.c:388 ../pidgin/gtkconv.c:1678
+#: ../finch/gntcertmgr.c:314
+#: ../finch/gntnotify.c:388
+#: ../pidgin/gtkconv.c:1672
 #: ../pidgin/gtkdebug.c:832
 msgid "Info"
 msgstr "���廣"
 
 #. Close button
-#: ../finch/gntcertmgr.c:323 ../finch/gntft.c:253 ../finch/gntnotify.c:182
-#: ../finch/gntplugin.c:220 ../finch/gntplugin.c:413 ../finch/gntpounce.c:750
-#: ../finch/gntroomlist.c:275 ../finch/gntstatus.c:216
-#: ../libpurple/protocols/msn/msn.c:403 ../libpurple/protocols/msnp9/msn.c:400
+#: ../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:417
+#: ../libpurple/protocols/msnp9/msn.c:400
 #: ../libpurple/protocols/silc/util.c:388
-#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2375
+#: ../libpurple/protocols/silc10/util.c:377
+#: ../pidgin/gtkaccount.c:2375
 #: ../pidgin/gtkrequest.c:275
 msgid "Close"
 msgstr "廖��廨"
@@ -910,8 +1096,7 @@
 msgid ""
 "%s\n"
 "\n"
-"Finch will not attempt to reconnect the account until you correct the error "
-"and re-enable the account."
+"Finch will not attempt to reconnect the account until you correct the error and re-enable the account."
 msgstr ""
 "%s\n"
 "\n"
@@ -922,34 +1107,35 @@
 msgstr "�廚廣� ���廩 �廩���"
 
 #: ../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 ""
-"��廩��� ��廬廡 ���廨 ���� �廢�'� ��. ���廨� �廢'�� 廬�廣廩� ���廚� ������� �廨�廣 廩��廩��� "
-"�廬��廨 ���廩."
+msgid "The account has disconnected and you are no longer in this chat. You will be automatically rejoined in the chat when the account reconnects."
+msgstr "��廩��� ��廬廡 ���廨 ���� �廢�'� ��. ���廨� �廢'�� 廬�廣廩� ���廚� ������� �廨�廣 廩��廩��� �廬��廨 ���廩."
 
 #: ../finch/gntconv.c:159
 msgid "No such command."
 msgstr "��� 廚廡��� ���."
 
-#: ../finch/gntconv.c:163 ../pidgin/gtkconv.c:492
+#: ../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:168 ../pidgin/gtkconv.c:498
+#: ../finch/gntconv.c:168
+#: ../pidgin/gtkconv.c:498
 msgid "Your command failed for an unknown reason."
 msgstr "�廚廡��� 廩�� ��廩�� �廖��� �� ���廣�."
 
-#: ../finch/gntconv.c:173 ../pidgin/gtkconv.c:505
+#: ../finch/gntconv.c:173
+#: ../pidgin/gtkconv.c:505
 msgid "That command only works in chats, not IMs."
 msgstr "廚廡��� �� 廚�廣�廬 廨廡 �廬�� 廢'����, �� ����廣�廬."
 
-#: ../finch/gntconv.c:176 ../pidgin/gtkconv.c:508
+#: ../finch/gntconv.c:176
+#: ../pidgin/gtkconv.c:508
 msgid "That command only works in IMs, not chats."
 msgstr "廚廡��� �� 廚�廣�廬 廨廡 ����廣�廬, �� �廬�� 廢'����."
 
-#: ../finch/gntconv.c:180 ../pidgin/gtkconv.c:513
+#: ../finch/gntconv.c:180
+#: ../pidgin/gtkconv.c:513
 msgid "That command doesn't work on this protocol."
 msgstr "廚廡��� �� �� 廚�廣�廬 �廚廡���廡�� ��."
 
@@ -967,7 +1153,9 @@
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:296 ../finch/gntconv.c:880 ../pidgin/gtkconv.c:3479
+#: ../finch/gntconv.c:296
+#: ../finch/gntconv.c:882
+#: ../pidgin/gtkconv.c:3470
 #, c-format
 msgid ""
 "\n"
@@ -980,13 +1168,14 @@
 msgid "You have left this chat."
 msgstr "廣��廬 �廬 �廢'�� ���."
 
-#: ../finch/gntconv.c:433 ../pidgin/gtkconv.c:1384
+#: ../finch/gntconv.c:433
+#: ../pidgin/gtkconv.c:1378
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr "廨�廩�� ����. ���廣�廬 �廩��� �� ��廨廩�� �廣廬�."
 
-#: ../finch/gntconv.c:437 ../pidgin/gtkconv.c:1392
-msgid ""
-"Logging stopped. Future messages in this conversation will not be logged."
+#: ../finch/gntconv.c:437
+#: ../pidgin/gtkconv.c:1386
+msgid "Logging stopped. Future messages in this conversation will not be logged."
 msgstr "廨�廩�� ��廚廖廡. ���廣�廬 �廩��� �� �� ��廨廩�� �廣廬�."
 
 #: ../finch/gntconv.c:523
@@ -1001,7 +1190,8 @@
 msgid "Clear Scrollback"
 msgstr "�廡� ����� ����廨"
 
-#: ../finch/gntconv.c:578 ../finch/gntprefs.c:191
+#: ../finch/gntconv.c:578
+#: ../finch/gntprefs.c:191
 msgid "Show Timestamps"
 msgstr "�廢� �廬���廬-���"
 
@@ -1021,24 +1211,27 @@
 msgid "Enable Sounds"
 msgstr "�廚廩廨 廢�����"
 
-#: ../finch/gntconv.c:833
+#: ../finch/gntconv.c:835
 msgid "<AUTO-REPLY> "
 msgstr "<�廣��-�������> "
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:968
+#: ../finch/gntconv.c:970
 msgid "List of users:\n"
 msgstr "廨廩��廬 �廩廬�廩��:\n"
 
-#: ../finch/gntconv.c:1130 ../pidgin/gtkconv.c:337
+#: ../finch/gntconv.c:1132
+#: ../pidgin/gtkconv.c:337
 msgid "Supported debug options are:  version"
 msgstr "�廚廩廨���廬 ��廚�� ������ ��廬���廬 ��:  version"
 
-#: ../finch/gntconv.c:1166 ../pidgin/gtkconv.c:389
+#: ../finch/gntconv.c:1168
+#: ../pidgin/gtkconv.c:389
 msgid "No such command (in this context)."
 msgstr "��� 廚廡��� ��� (��廡廩廨 ���)."
 
-#: ../finch/gntconv.c:1169 ../pidgin/gtkconv.c:392
+#: ../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"
@@ -1046,64 +1239,70 @@
 "�廬廩�廩 �-\"help &lt;廚廡���&gt;\" �廡��廬 廣�廨� 廣� 廚廡��� 廖廚廢�廚�廬.\n"
 "���� �廚廡���廬 廩�廚廩廨��� ��廡廩廨 ������:\n"
 
-#: ../finch/gntconv.c:1242 ../pidgin/gtkconv.c:7778
-msgid ""
-"say &lt;message&gt;:  Send a message normally as if you weren't using a "
-"command."
+#: ../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;message&gt;:  廩�� ���廣� �廨���, ����� �� �廨� 廚廡���."
 
-#: ../finch/gntconv.c:1245 ../pidgin/gtkconv.c:7781
+#: ../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;action&gt;:  廩�� ��廩廬�廩 �� 廢'�� 廚廣��� ��廖� IRC."
 
-#: ../finch/gntconv.c:1248 ../pidgin/gtkconv.c:7784
-msgid ""
-"debug &lt;option&gt;:  Send various debug information to the current "
-"conversation."
+#: ../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:1251 ../pidgin/gtkconv.c:7787
+#: ../finch/gntconv.c:1253
+#: ../pidgin/gtkconv.c:7778
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: �廡� �廬 廬��� ���� �廩���."
 
-#: ../finch/gntconv.c:1254 ../pidgin/gtkconv.c:7793
+#: ../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:1257
+#: ../finch/gntconv.c:1259
 msgid "users:  Show the list of users in the chat."
 msgstr "users:  �廢� �廬 廨廩��廬 ��廩廬�廩�� �廢'��."
 
-#: ../finch/gntconv.c:1262
+#: ../finch/gntconv.c:1264
 msgid "plugins: Show the plugins window."
 msgstr "plugins: : �廢� �廬 ���� �廬�廖廚��."
 
-#: ../finch/gntconv.c:1265
+#: ../finch/gntconv.c:1267
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist: �廢� �廬 廨廩��廬 ���廨��."
 
-#: ../finch/gntconv.c:1268
+#: ../finch/gntconv.c:1270
 msgid "accounts: Show the accounts window."
 msgstr "accounts: �廢� �廬 ���� ��廩����廬."
 
-#: ../finch/gntconv.c:1271
+#: ../finch/gntconv.c:1273
 msgid "debugwin: Show the debug window."
 msgstr "debugwin: �廢� �廬 ���� ��廚�� ������."
 
-#: ../finch/gntconv.c:1274
+#: ../finch/gntconv.c:1276
 msgid "prefs: Show the preference window."
 msgstr "prefs: �廢� �廬 ���� ��廣�廚�廬."
 
-#: ../finch/gntconv.c:1277
+#: ../finch/gntconv.c:1279
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: �廢� �廬 ���� ��廢���-�廩��廨��."
 
-#: ../finch/gntdebug.c:231 ../pidgin/gtkconv.c:948 ../pidgin/gtkconv.c:2656
-#: ../pidgin/gtkdebug.c:219 ../pidgin/gtkft.c:543
+#: ../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:98 ../pidgin/gtkdebug.c:689
+#: ../finch/gntdebug.c:271
+#: ../finch/gntui.c:98
+#: ../pidgin/gtkdebug.c:689
 msgid "Debug Window"
 msgstr "���� ��廚�� �����"
 
@@ -1111,7 +1310,8 @@
 #. * it's necessary to make the width of the debug window resizable ... like I said,
 #. * it doesn't make sense. The bug is likely in the packing in gntbox.c.
 #.
-#: ../finch/gntdebug.c:292 ../pidgin/gtkdebug.c:751
+#: ../finch/gntdebug.c:292
+#: ../pidgin/gtkdebug.c:751
 msgid "Clear"
 msgstr "�廡�"
 
@@ -1119,30 +1319,38 @@
 msgid "Filter:"
 msgstr "�廚�: "
 
-#: ../finch/gntdebug.c:309 ../pidgin/gtkdebug.c:760
+#: ../finch/gntdebug.c:309
+#: ../pidgin/gtkdebug.c:760
 msgid "Pause"
 msgstr "�廩����"
 
-#: ../finch/gntft.c:120 ../pidgin/gtkft.c:229
+#: ../finch/gntft.c:120
+#: ../pidgin/gtkft.c:229
 #, c-format
 msgid "File Transfers - %d%% of %d files"
 msgstr "�廣�廨�廬 廡�廢�� - %d%% �廬�� %d 廡�廢��"
 
 #. Create the window.
-#: ../finch/gntft.c:125 ../finch/gntft.c:212 ../finch/gntui.c:99
-#: ../pidgin/gtkft.c:234 ../pidgin/gtkft.c:761
+#: ../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:217 ../pidgin/gtkft.c:645
+#: ../finch/gntft.c:217
+#: ../pidgin/gtkft.c:645
 msgid "Progress"
 msgstr "�廬廡���廬"
 
-#: ../finch/gntft.c:217 ../pidgin/gtkft.c:652
+#: ../finch/gntft.c:217
+#: ../pidgin/gtkft.c:652
 msgid "Filename"
 msgstr "廩� �廡��廛"
 
-#: ../finch/gntft.c:217 ../pidgin/gtkft.c:659
+#: ../finch/gntft.c:217
+#: ../pidgin/gtkft.c:659
 msgid "Size"
 msgstr "����"
 
@@ -1150,33 +1358,42 @@
 msgid "Speed"
 msgstr "���廨�廬"
 
-#: ../finch/gntft.c:217 ../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:217 ../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:1041
+#: ../libpurple/protocols/gg/gg.c:1584
 #: ../libpurple/protocols/gg/gg.c:1592
-#: ../libpurple/protocols/jabber/buddy.c:780
-#: ../libpurple/protocols/jabber/buddy.c:784
-#: ../libpurple/protocols/jabber/buddy.c:943
-#: ../libpurple/protocols/jabber/jabber.c:1569
-#: ../libpurple/protocols/msn/msn.c:617 ../libpurple/protocols/msn/msn.c:627
-#: ../libpurple/protocols/msn/msn.c:632 ../libpurple/protocols/msn/msn.c:635
+#: ../libpurple/protocols/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:820
-#: ../libpurple/protocols/oscar/oscar.c:825
+#: ../libpurple/protocols/oscar/oscar.c:822
 #: ../libpurple/protocols/oscar/oscar.c:827
-#: ../libpurple/protocols/oscar/oscar.c:2761
-#: ../libpurple/protocols/oscar/oscar.c:3813
-#: ../libpurple/protocols/sametime/sametime.c:3313
-#: ../libpurple/protocols/sametime/sametime.c:4204
-#: ../libpurple/protocols/yahoo/yahoo.c:3285 ../pidgin/gtkblist.c:3297
-#: ../pidgin/gtkblist.c:3311 ../pidgin/gtkblist.c:3313
-#: ../pidgin/gtksavedstatuses.c:990 ../pidgin/gtksavedstatuses.c:1134
+#: ../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 "�廢�"
 
@@ -1188,23 +1405,30 @@
 msgid "Clear finished transfers"
 msgstr "�廖廨� �廣�廨�廬 廩�廖廬����"
 
-#: ../finch/gntft.c:248 ../finch/gntroomlist.c:272
+#: ../finch/gntft.c:248
+#: ../finch/gntroomlist.c:272
 msgid "Stop"
 msgstr "廣廢�廨"
 
-#: ../finch/gntft.c:321 ../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:388 ../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:390 ../pidgin/gtkft.c:1017
+#: ../finch/gntft.c:390
+#: ../pidgin/gtkft.c:1017
 msgid "Failed"
 msgstr "��廩�"
 
-#: ../finch/gntft.c:434 ../pidgin/gtkft.c:134
+#: ../finch/gntft.c:434
+#: ../pidgin/gtkft.c:134
 #, c-format
 msgid "%.2f KiB/s"
 msgstr "%.2f 廡\"�廩"
@@ -1214,12 +1438,15 @@
 msgid "The file was saved as %s."
 msgstr "�廡��廛 �廩�廣 �廬�廨 %s."
 
-#: ../finch/gntft.c:446 ../finch/gntft.c:447 ../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:452 ../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 "�廣��廨"
@@ -1234,32 +1461,33 @@
 msgid "Conversation with %s on %s"
 msgstr "廩���廬 廣� %s �廬�廨�� %s"
 
-#: ../finch/gntlog.c:231 ../pidgin/gtklog.c:503
+#: ../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."
+#: ../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."
+#: ../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."
+#: ../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
+#: ../finch/gntlog.c:284
+#: ../pidgin/gtklog.c:566
 msgid "No logs were found"
 msgstr "�� ��廢�� ����� 廨�廩��"
 
-#: ../finch/gntlog.c:330 ../pidgin/gtklog.c:646
+#: ../finch/gntlog.c:330
+#: ../pidgin/gtklog.c:646
 msgid "Total log size:"
 msgstr "���� ���� 廖�\"�:"
 
@@ -1268,18 +1496,22 @@
 msgid "Scroll/Search: "
 msgstr "����/�廚廩:"
 
-#: ../finch/gntlog.c:382 ../pidgin/gtklog.c:716
+#: ../finch/gntlog.c:382
+#: ../pidgin/gtklog.c:716
 #, c-format
 msgid "Conversations in %s"
 msgstr "廩���廬 �廬�� %s"
 
-#: ../finch/gntlog.c:390 ../finch/gntlog.c:447 ../pidgin/gtklog.c:724
+#: ../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:472 ../pidgin/gtklog.c:824
+#: ../finch/gntlog.c:473
+#: ../pidgin/gtklog.c:824
 msgid "System Log"
 msgstr "��\"� �廣廨�廬"
 
@@ -1287,15 +1519,18 @@
 msgid "Emails"
 msgstr "���\"�"
 
-#: ../finch/gntnotify.c:171 ../finch/gntnotify.c:226
+#: ../finch/gntnotify.c:171
+#: ../finch/gntnotify.c:226
 msgid "You have mail!"
 msgstr "�廩 �� ���廨!"
 
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:524
+#: ../finch/gntnotify.c:174
+#: ../pidgin/gtknotify.c:524
 msgid "Sender"
 msgstr "廩���"
 
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:531
+#: ../finch/gntnotify.c:174
+#: ../pidgin/gtknotify.c:531
 msgid "Subject"
 msgstr "�����"
 
@@ -1306,29 +1541,35 @@
 msgstr[0] "%s (%s) �廩 ���廣� ��廩� %d."
 msgstr[1] "%s (%s) �廩 %d ���廣�廬 ��廩�廬."
 
-#: ../finch/gntnotify.c:226 ../pidgin/gtknotify.c:346
+#: ../finch/gntnotify.c:226
+#: ../pidgin/gtknotify.c:346
 msgid "New Mail"
 msgstr "���\"� ��廩"
 
-#: ../finch/gntnotify.c:291 ../pidgin/gtknotify.c:959
+#: ../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
+#: ../finch/gntnotify.c:292
+#: ../libpurple/protocols/toc/toc.c:476
 #: ../pidgin/gtknotify.c:960
 msgid "Buddy Information"
 msgstr "���廣 廣��廨 ��廩 �廡廩廨"
 
-#: ../finch/gntnotify.c:382 ../libpurple/protocols/qq/group_join.c:367
+#: ../finch/gntnotify.c:382
+#: ../libpurple/protocols/qq/group_join.c:367
 msgid "Continue"
 msgstr "��廩�"
 
-#: ../finch/gntnotify.c:391 ../pidgin/gtkconv.c:1639
+#: ../finch/gntnotify.c:391
+#: ../pidgin/gtkconv.c:1633
 msgid "IM"
 msgstr "���廣�"
 
-#: ../finch/gntnotify.c:397 ../libpurple/protocols/sametime/sametime.c:3523
+#: ../finch/gntnotify.c:397
+#: ../libpurple/protocols/sametime/sametime.c:3524
 msgid "Invite"
 msgstr "����"
 
@@ -1336,7 +1577,8 @@
 msgid "(none)"
 msgstr "(���)"
 
-#: ../finch/gntplugin.c:84 ../finch/gntplugin.c:93
+#: ../finch/gntplugin.c:84
+#: ../finch/gntplugin.c:93
 msgid "ERROR"
 msgstr "廩����"
 
@@ -1382,11 +1624,8 @@
 msgstr "�廡��廛 廩���廨 ���� 廬�廖廝."
 
 #: ../finch/gntplugin.c:268
-msgid ""
-"Please open the debug window and try again to see the exact error message."
-msgstr ""
-"�廩 �廚廬�� �廬 ���� ��廚�� ������ ���廖�廬 廩�� 廣� ��廬 �廨��廬 �廬 ���廣廬 �廩���� "
-"������廡廬."
+msgid "Please open the debug window and try again to see the exact error message."
+msgstr "�廩 �廚廬�� �廬 ���� ��廚�� ������ ���廖�廬 廩�� 廣� ��廬 �廨��廬 �廬 ���廣廬 �廩���� ������廡廬."
 
 #: ../finch/gntplugin.c:331
 msgid "Select plugin to install"
@@ -1409,20 +1648,27 @@
 #. (that should have been "effect," right?)
 #. Back to instant-apply! I win!  BU-HAHAHA!
 #. Create the window
-#: ../finch/gntplugin.c:524 ../finch/gntplugin.c:531 ../finch/gntprefs.c:264
-#: ../finch/gntui.c:103 ../pidgin/gtkdocklet.c:718 ../pidgin/gtkprefs.c:2070
+#: ../finch/gntplugin.c:524
+#: ../finch/gntplugin.c:531
+#: ../finch/gntprefs.c:264
+#: ../finch/gntui.c:103
+#: ../pidgin/gtkdocklet.c:718
+#: ../pidgin/gtkprefs.c:2070
 msgid "Preferences"
 msgstr "�廣�廚�廬"
 
-#: ../finch/gntpounce.c:193 ../pidgin/gtkpounce.c:256
+#: ../finch/gntpounce.c:193
+#: ../pidgin/gtkpounce.c:256
 msgid "Please enter a buddy to pounce."
 msgstr "��� ��廩 廡廩廨 廩�廩 ����� �廚廣���廬 廩��."
 
-#: ../finch/gntpounce.c:338 ../pidgin/gtkpounce.c:524
+#: ../finch/gntpounce.c:338
+#: ../pidgin/gtkpounce.c:524
 msgid "New Buddy Pounce"
 msgstr "廢�廨 廬���廬 廚廣���廬 ��廩�"
 
-#: ../finch/gntpounce.c:338 ../pidgin/gtkpounce.c:524
+#: ../finch/gntpounce.c:338
+#: ../pidgin/gtkpounce.c:524
 msgid "Edit Buddy Pounce"
 msgstr "廣廨�� 廩������ �廬���廬 廚廣���廬"
 
@@ -1431,7 +1677,8 @@
 msgstr "��� �����"
 
 #. Account:
-#: ../finch/gntpounce.c:346 ../finch/gntstatus.c:456
+#: ../finch/gntpounce.c:346
+#: ../finch/gntstatus.c:456
 msgid "Account:"
 msgstr "�廩���:"
 
@@ -1440,7 +1687,8 @@
 msgstr "廩� ��廩 �廡廩廨:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:386 ../pidgin/gtkpounce.c:592
+#: ../finch/gntpounce.c:386
+#: ../pidgin/gtkpounce.c:592
 msgid "Pounce When Buddy..."
 msgstr "�廚廣� ��廩廨 ��廩-廡廩廨..."
 
@@ -1485,7 +1733,8 @@
 msgstr "廩��� ���廣�"
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:426 ../pidgin/gtkpounce.c:653
+#: ../finch/gntpounce.c:426
+#: ../pidgin/gtkpounce.c:653
 msgid "Action"
 msgstr "廚廣���"
 
@@ -1513,7 +1762,8 @@
 msgid "Pounce only when my status is not Available"
 msgstr "��� 廨廡 ��廩廨 ��� �� �廖��� �����"
 
-#: ../finch/gntpounce.c:462 ../pidgin/gtkpounce.c:1294
+#: ../finch/gntpounce.c:462
+#: ../pidgin/gtkpounce.c:1294
 msgid "Recurring"
 msgstr "���廨"
 
@@ -1529,66 +1779,80 @@
 msgid "You must create an account first before you can create a pounce."
 msgstr "廣��� ��廢�廨 �廩��� �廚�� �廢�廨廬 廬���廬-廚廣���."
 
-#: ../finch/gntpounce.c:674 ../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:708 ../finch/gntui.c:96 ../pidgin/gtkpounce.c:1337
+#: ../finch/gntpounce.c:708
+#: ../finch/gntui.c:96
+#: ../pidgin/gtkpounce.c:1337
 msgid "Buddy Pounces"
 msgstr "廬����廬 廚廣���廬"
 
-#: ../finch/gntpounce.c:817 ../pidgin/gtkpounce.c:1436
+#: ../finch/gntpounce.c:817
+#: ../pidgin/gtkpounce.c:1436
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s �廬��� ��廬�� �� ���廣� (%s)"
 
-#: ../finch/gntpounce.c:818 ../pidgin/gtkpounce.c:1438
+#: ../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:819 ../pidgin/gtkpounce.c:1440
+#: ../finch/gntpounce.c:819
+#: ../pidgin/gtkpounce.c:1440
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s �廬��廨 (%s)"
 
-#: ../finch/gntpounce.c:820 ../pidgin/gtkpounce.c:1442
+#: ../finch/gntpounce.c:820
+#: ../pidgin/gtkpounce.c:1442
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s ��廨 �廚廣���廬 (%s)"
 
-#: ../finch/gntpounce.c:821 ../pidgin/gtkpounce.c:1444
+#: ../finch/gntpounce.c:821
+#: ../pidgin/gtkpounce.c:1444
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s ��廨 ���廩� (%s)"
 
-#: ../finch/gntpounce.c:822 ../pidgin/gtkpounce.c:1446
+#: ../finch/gntpounce.c:822
+#: ../pidgin/gtkpounce.c:1446
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s �廚廖�廡 ��廡��� �� ���廣� (%s)"
 
-#: ../finch/gntpounce.c:823 ../pidgin/gtkpounce.c:1448
+#: ../finch/gntpounce.c:823
+#: ../pidgin/gtkpounce.c:1448
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s �廬�廬廡 (%s)"
 
-#: ../finch/gntpounce.c:824 ../pidgin/gtkpounce.c:1450
+#: ../finch/gntpounce.c:824
+#: ../pidgin/gtkpounce.c:1450
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s �廖廨 廚廣���廬 (%s)"
 
-#: ../finch/gntpounce.c:825 ../pidgin/gtkpounce.c:1452
+#: ../finch/gntpounce.c:825
+#: ../pidgin/gtkpounce.c:1452
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s �廬廨�廡/� ����廩�. (%s)"
 
-#: ../finch/gntpounce.c:826 ../pidgin/gtkpounce.c:1454
+#: ../finch/gntpounce.c:826
+#: ../pidgin/gtkpounce.c:1454
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s 廩�� �� ���廣�. (%s)"
 
-#: ../finch/gntpounce.c:845 ../pidgin/gtkpounce.c:1455
+#: ../finch/gntpounce.c:845
+#: ../pidgin/gtkpounce.c:1455
 msgid "Unknown pounce event. Please report this!"
 msgstr "��廨廣� 廚廣���廬 �� ���廨廬. ��� ���� 廣� ��!"
 
@@ -1596,12 +1860,16 @@
 msgid "Based on keyboard use"
 msgstr "廣�-廚� 廚廣���廬 �廡��廬"
 
-#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:1951
+#: ../finch/gntprefs.c:94
+#: ../pidgin/gtkprefs.c:1951
 msgid "From last sent message"
 msgstr "���� 廩���廬 ����廣� ���廨���"
 
-#: ../finch/gntprefs.c:96 ../pidgin/gtkprefs.c:848 ../pidgin/gtkprefs.c:856
-#: ../pidgin/gtkprefs.c:1950 ../pidgin/gtkprefs.c:1964
+#: ../finch/gntprefs.c:96
+#: ../pidgin/gtkprefs.c:848
+#: ../pidgin/gtkprefs.c:856
+#: ../pidgin/gtkprefs.c:1950
+#: ../pidgin/gtkprefs.c:1964
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:333
 msgid "Never"
 msgstr "�廣��� ��"
@@ -1618,15 +1886,18 @@
 msgid "Notify buddies when you are typing"
 msgstr "���廣 ���廩� 廡廩廨 �廣廬 廩�廬/� �廡���"
 
-#: ../finch/gntprefs.c:198 ../finch/plugins/gnthistory.c:153
+#: ../finch/gntprefs.c:198
+#: ../finch/plugins/gnthistory.c:153
 msgid "Log format"
 msgstr "���� �廨�廩��"
 
-#: ../finch/gntprefs.c:199 ../finch/plugins/gnthistory.c:143
+#: ../finch/gntprefs.c:199
+#: ../finch/plugins/gnthistory.c:143
 msgid "Log IMs"
 msgstr "廨廩�� ���廣�廬 ������廬"
 
-#: ../finch/gntprefs.c:200 ../finch/plugins/gnthistory.c:144
+#: ../finch/gntprefs.c:200
+#: ../finch/plugins/gnthistory.c:144
 msgid "Log chats"
 msgstr "廨廩�� 廩���廬"
 
@@ -1651,13 +1922,17 @@
 msgstr "廩�� �廢� ����廬"
 
 #. Conversations
-#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:942 ../pidgin/gtkprefs.c:2037
+#: ../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:151
-#: ../pidgin/gtkprefs.c:1507 ../pidgin/gtkprefs.c:2048
+#: ../finch/gntprefs.c:260
+#: ../finch/plugins/gnthistory.c:151
+#: ../pidgin/gtkprefs.c:1507
+#: ../pidgin/gtkprefs.c:2048
 msgid "Logging"
 msgstr "廨�廩��"
 
@@ -1665,12 +1940,14 @@
 msgid "Not implemented yet."
 msgstr "�廨� ��廩�."
 
-#: ../finch/gntrequest.c:726 ../pidgin/gtkrequest.c:1552
+#: ../finch/gntrequest.c:726
+#: ../pidgin/gtkrequest.c:1552
 #: ../pidgin/gtkrequest.c:1598
 msgid "Save File..."
 msgstr "廩��廨� �廩�..."
 
-#: ../finch/gntrequest.c:726 ../pidgin/gtkrequest.c:1553
+#: ../finch/gntrequest.c:726
+#: ../pidgin/gtkrequest.c:1553
 #: ../pidgin/gtkrequest.c:1599
 msgid "Open File..."
 msgstr "廚廬�..."
@@ -1688,100 +1965,120 @@
 msgstr "廩��廚�"
 
 #. Create the window.
-#: ../finch/gntroomlist.c:285 ../finch/gntui.c:101 ../pidgin/gtkroomlist.c:530
+#: ../finch/gntroomlist.c:285
+#: ../finch/gntui.c:101
+#: ../pidgin/gtkroomlist.c:530
 msgid "Room List"
 msgstr "廨廩��廬 ��廨��"
 
-#: ../finch/gntsound.c:96 ../pidgin/gtksound.c:62
+#: ../finch/gntsound.c:96
+#: ../pidgin/gtksound.c:62
 msgid "Buddy logs in"
 msgstr "��廩 廡廩廨 ���廖"
 
-#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:63
+#: ../finch/gntsound.c:97
+#: ../pidgin/gtksound.c:63
 msgid "Buddy logs out"
 msgstr "��廩 廡廩廨 �廬�廬廡"
 
-#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:64
+#: ../finch/gntsound.c:98
+#: ../pidgin/gtksound.c:64
 msgid "Message received"
 msgstr "���廣� �廬廡���"
 
-#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:65
+#: ../finch/gntsound.c:99
+#: ../pidgin/gtksound.c:65
 msgid "Message received begins conversation"
 msgstr "���廣� �廬廡���, �廬��� ���-廩��"
 
-#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:66
+#: ../finch/gntsound.c:100
+#: ../pidgin/gtksound.c:66
 msgid "Message sent"
 msgstr "���廣� �廩���"
 
-#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:67
+#: ../finch/gntsound.c:101
+#: ../pidgin/gtksound.c:67
 msgid "Person enters chat"
 msgstr "��廩�� ���廖 �廩���"
 
-#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:68
+#: ../finch/gntsound.c:102
+#: ../pidgin/gtksound.c:68
 msgid "Person leaves chat"
 msgstr "��廩�� 廣�� �廬 �廩���"
 
-#: ../finch/gntsound.c:103 ../pidgin/gtksound.c:69
+#: ../finch/gntsound.c:103
+#: ../pidgin/gtksound.c:69
 msgid "You talk in chat"
 msgstr "�廬� ���廨 �廩���"
 
-#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:70
+#: ../finch/gntsound.c:104
+#: ../pidgin/gtksound.c:70
 msgid "Others talk in chat"
 msgstr "��廨�� ���廨�� �廩���"
 
-#: ../finch/gntsound.c:106 ../pidgin/gtksound.c:73
+#: ../finch/gntsound.c:106
+#: ../pidgin/gtksound.c:73
 msgid "Someone says your screen name in chat"
 msgstr "��廩�� ����廨 �廬 廩�� �廢'��"
 
-#: ../finch/gntsound.c:362 ../pidgin/gtksound.c:306
+#: ../finch/gntsound.c:367
+#: ../pidgin/gtksound.c:309
 msgid "GStreamer Failure"
 msgstr "廬廡�廬 GStreamer"
 
-#: ../finch/gntsound.c:363 ../pidgin/gtksound.c:307
+#: ../finch/gntsound.c:368
+#: ../pidgin/gtksound.c:310
 msgid "GStreamer failed to initialize."
 msgstr "��廩��� �廣廬 ��廬��� GStreamer"
 
-#: ../finch/gntsound.c:717 ../finch/gntsound.c:803 ../pidgin/gtkprefs.c:1631
-#: ../pidgin/gtkprefs.c:1720 ../pidgin/gtkprefs.c:1893
+#: ../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:730
+#: ../finch/gntsound.c:735
 msgid "Select Sound File ..."
 msgstr "���廨廬 廡��廛 廢���..."
 
-#: ../finch/gntsound.c:905
+#: ../finch/gntsound.c:910
 msgid "Sound Preferences"
 msgstr "�廣�廚�廬 廢���"
 
-#: ../finch/gntsound.c:916
+#: ../finch/gntsound.c:921
 msgid "Profiles"
 msgstr "廚廨�廚����"
 
-#: ../finch/gntsound.c:955 ../pidgin/gtkprefs.c:1758
+#: ../finch/gntsound.c:960
+#: ../pidgin/gtkprefs.c:1758
 msgid "Automatic"
 msgstr "�������"
 
-#: ../finch/gntsound.c:958
+#: ../finch/gntsound.c:963
 msgid "Console Beep"
 msgstr "廢�廚廢�廝 廡��廖���"
 
-#: ../finch/gntsound.c:959 ../pidgin/gtkprefs.c:1762
+#: ../finch/gntsound.c:964
+#: ../pidgin/gtkprefs.c:1762
 msgid "Command"
 msgstr "廚廡���"
 
-#: ../finch/gntsound.c:960
+#: ../finch/gntsound.c:965
 msgid "No Sound"
 msgstr "��� 廢���"
 
-#: ../finch/gntsound.c:962 ../pidgin/gtkprefs.c:1753
+#: ../finch/gntsound.c:967
+#: ../pidgin/gtkprefs.c:1753
 msgid "Sound Method"
 msgstr "廩��廬 �廢���"
 
-#: ../finch/gntsound.c:967
+#: ../finch/gntsound.c:972
 msgid "Method: "
 msgstr "廩���: "
 
-#: ../finch/gntsound.c:974
+#: ../finch/gntsound.c:979
 #, c-format
 msgid ""
 "Sound Command\n"
@@ -1791,55 +2088,66 @@
 "(%s 廣��廨 廩�-廡��廛)"
 
 #. Sound options
-#: ../finch/gntsound.c:982 ../pidgin/gtkprefs.c:1784
+#: ../finch/gntsound.c:987
+#: ../pidgin/gtkprefs.c:1784
 msgid "Sound Options"
 msgstr "���廨�廬 �廢���"
 
-#: ../finch/gntsound.c:983
+#: ../finch/gntsound.c:988
 msgid "Sounds when conversation has focus"
 msgstr "廢����� ��廩廨 ���� �廩��� ����� �廚廣��"
 
-#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:846 ../pidgin/gtkprefs.c:858
-#: ../pidgin/gtkprefs.c:1791 ../pidgin/plugins/timestamp_format.c:42
+#: ../finch/gntsound.c:996
+#: ../pidgin/gtkprefs.c: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:992 ../pidgin/gtkprefs.c:1789
+#: ../finch/gntsound.c:997
+#: ../pidgin/gtkprefs.c:1789
 msgid "Only when available"
 msgstr "廨廡 ��廩廨 ����"
 
-#: ../finch/gntsound.c:993 ../pidgin/gtkprefs.c:1790
+#: ../finch/gntsound.c:998
+#: ../pidgin/gtkprefs.c:1790
 msgid "Only when not available"
 msgstr "廨廡 ��廩廨 ��-����"
 
-#: ../finch/gntsound.c:1000
+#: ../finch/gntsound.c:1005
 msgid "Volume(0-100):"
 msgstr "廣�廢�廬-廩�廣(0-100):"
 
 #. Sound events
-#: ../finch/gntsound.c:1019 ../pidgin/gtkprefs.c:1819
+#: ../finch/gntsound.c:1024
+#: ../pidgin/gtkprefs.c:1819
 msgid "Sound Events"
 msgstr "�廨�廣� 廢���"
 
-#: ../finch/gntsound.c:1021 ../pidgin/gtkprefs.c:1878
+#: ../finch/gntsound.c:1026
+#: ../pidgin/gtkprefs.c:1878
 msgid "Event"
 msgstr "��廨�廣"
 
-#: ../finch/gntsound.c:1021
+#: ../finch/gntsound.c:1026
 msgid "File"
 msgstr "廡��廛"
 
-#: ../finch/gntsound.c:1040 ../pidgin/gtkprefs.c:1897
+#: ../finch/gntsound.c:1045
+#: ../pidgin/gtkprefs.c:1897
 msgid "Test"
 msgstr "���廡�"
 
-#: ../finch/gntsound.c:1043 ../pidgin/gtkprefs.c:1901
+#: ../finch/gntsound.c:1048
+#: ../pidgin/gtkprefs.c:1901
 msgid "Reset"
 msgstr "�廚廖"
 
-#: ../finch/gntsound.c:1046 ../pidgin/gtkprefs.c:1905
+#: ../finch/gntsound.c:1051
+#: ../pidgin/gtkprefs.c:1905
 msgid "Choose..."
 msgstr "��廨..."
 
@@ -1852,21 +2160,24 @@
 msgid "Delete Status"
 msgstr "��廡 �廢�"
 
-#: ../finch/gntstatus.c:176 ../pidgin/gtksavedstatuses.c:597
+#: ../finch/gntstatus.c:176
+#: ../pidgin/gtksavedstatuses.c:597
 msgid "Saved Statuses"
 msgstr "廖���廖�� �廩�廨�"
 
-#: ../finch/gntstatus.c:183 ../finch/gntstatus.c:539
-#: ../libpurple/protocols/jabber/buddy.c:298
-#: ../libpurple/protocols/jabber/buddy.c:1363
-#: ../libpurple/protocols/msn/msn.c:733
+#: ../finch/gntstatus.c:183
+#: ../finch/gntstatus.c:539
+#: ../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"
 msgstr "廬��廨"
 
-#: ../finch/gntstatus.c:183 ../pidgin/gtksavedstatuses.c:515
+#: ../finch/gntstatus.c:183
+#: ../pidgin/gtksavedstatuses.c:515
 msgid "Type"
 msgstr "廖��"
 
@@ -1878,50 +2189,61 @@
 #. user_settable
 #. not independent
 #. Attributes - each status can have a message.
-#: ../finch/gntstatus.c:183 ../finch/gntstatus.c:564 ../finch/gntstatus.c:576
+#: ../finch/gntstatus.c:183
+#: ../finch/gntstatus.c:564
+#: ../finch/gntstatus.c:576
 #: ../libpurple/protocols/bonjour/bonjour.c:292
 #: ../libpurple/protocols/bonjour/bonjour.c:299
 #: ../libpurple/protocols/bonjour/bonjour.c:382
-#: ../libpurple/protocols/gg/gg.c:1079 ../libpurple/protocols/gg/gg.c:1587
-#: ../libpurple/protocols/gg/gg.c:1605 ../libpurple/protocols/gg/gg.c:1615
-#: ../libpurple/protocols/gg/gg.c:1621 ../libpurple/protocols/gg/gg.c:1630
-#: ../libpurple/protocols/gg/gg.c:1635 ../libpurple/protocols/irc/irc.c:245
-#: ../libpurple/protocols/jabber/jabber.c:1601
-#: ../libpurple/protocols/jabber/jabber.c:1615
-#: ../libpurple/protocols/jabber/jabber.c:1629
-#: ../libpurple/protocols/jabber/jabber.c:1643
-#: ../libpurple/protocols/jabber/jabber.c:1657
-#: ../libpurple/protocols/jabber/jabber.c:1673
-#: ../libpurple/protocols/msn/msn.c:685 ../libpurple/protocols/msn/msn.c:691
-#: ../libpurple/protocols/msn/msn.c:697 ../libpurple/protocols/msn/msn.c:703
-#: ../libpurple/protocols/msn/msn.c:708 ../libpurple/protocols/msn/msn.c:713
+#: ../libpurple/protocols/gg/gg.c:1079
+#: ../libpurple/protocols/gg/gg.c:1587
+#: ../libpurple/protocols/gg/gg.c:1605
+#: ../libpurple/protocols/gg/gg.c:1615
+#: ../libpurple/protocols/gg/gg.c:1621
+#: ../libpurple/protocols/gg/gg.c:1630
+#: ../libpurple/protocols/gg/gg.c:1635
+#: ../libpurple/protocols/irc/irc.c:245
+#: ../libpurple/protocols/jabber/jabber.c: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:2856
 #: ../libpurple/protocols/novell/novell.c:2959
 #: ../libpurple/protocols/novell/novell.c:2965
 #: ../libpurple/protocols/novell/novell.c:2971
-#: ../libpurple/protocols/oscar/oscar.c:5657
-#: ../libpurple/protocols/oscar/oscar.c:5875
-#: ../libpurple/protocols/oscar/oscar.c:5889
-#: ../libpurple/protocols/oscar/oscar.c:5905
-#: ../libpurple/protocols/oscar/oscar.c:5912
-#: ../libpurple/protocols/oscar/oscar.c:5919
-#: ../libpurple/protocols/sametime/sametime.c:3336
-#: ../libpurple/protocols/sametime/sametime.c:3342
-#: ../libpurple/protocols/sametime/sametime.c:3348
-#: ../libpurple/protocols/sametime/sametime.c:3427
+#: ../libpurple/protocols/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:3788
-#: ../libpurple/protocols/yahoo/yahoo.c:3794
-#: ../libpurple/protocols/zephyr/zephyr.c:2349
-#: ../pidgin/gtksavedstatuses.c:526 ../pidgin/gtksavedstatuses.c:1001
+#: ../libpurple/protocols/yahoo/yahoo.c:3813
+#: ../libpurple/protocols/yahoo/yahoo.c:3819
+#: ../libpurple/protocols/zephyr/zephyr.c:2352
+#: ../pidgin/gtksavedstatuses.c:526
+#: ../pidgin/gtksavedstatuses.c:1001
 msgid "Message"
 msgstr "���廣�"
 
 #. Use
-#: ../finch/gntstatus.c:194 ../finch/gntstatus.c:593
+#: ../finch/gntstatus.c:194
+#: ../finch/gntstatus.c:593
 msgid "Use"
 msgstr "�廩廬�廩"
 
@@ -1945,7 +2267,8 @@
 msgid "Substatus"
 msgstr "廬廬-�廢�"
 
-#: ../finch/gntstatus.c:464 ../pidgin/gtkft.c:699
+#: ../finch/gntstatus.c:464
+#: ../pidgin/gtkft.c:699
 msgid "Status:"
 msgstr "�廢�:"
 
@@ -1970,7 +2293,8 @@
 msgid "Certificates"
 msgstr "廬廣���廬"
 
-#: ../finch/gntui.c:102 ../pidgin/gtkprefs.c:2039
+#: ../finch/gntui.c:102
+#: ../pidgin/gtkprefs.c:2039
 msgid "Sounds"
 msgstr "廢�����"
 
@@ -1978,7 +2302,8 @@
 msgid "Statuses"
 msgstr "�廢���"
 
-#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
+#: ../finch/plugins/gntclipboard.c:115
+#: ../finch/plugins/gntclipboard.c:121
 #: ../finch/plugins/gntclipboard.c:128
 msgid "Error loading the plugin."
 msgstr "廩���� ��廣��廬 �廬�廖廝."
@@ -2004,9 +2329,7 @@
 msgstr "廬�廖廝 ��� ��廣廬廡�"
 
 #: ../finch/plugins/gntclipboard.c:161
-msgid ""
-"When the gnt clipboard contents change, the contents are made available to "
-"X, if possible."
+msgid "When the gnt clipboard contents change, the contents are made available to X, if possible."
 msgstr "��廩廨 廬��� ��� ��廣廬廡� 廩� gnt �廩廬��, �廬��� �� �廣廩� ���� 廣��廨 X, �� ��廬�."
 
 #: ../finch/plugins/gntgf.c:231
@@ -2066,25 +2389,28 @@
 msgid "GntGf"
 msgstr "GntGf"
 
-#: ../finch/plugins/gntgf.c:379 ../finch/plugins/gntgf.c:380
+#: ../finch/plugins/gntgf.c:379
+#: ../finch/plugins/gntgf.c:380
 msgid "Toaster plugin"
 msgstr "廬�廖廝 ��廖�廨"
 
-#: ../finch/plugins/gnthistory.c:114 ../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:172 ../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:173 ../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"
-"Enabling logs for instant messages and/or chats will activate history for "
-"the same conversation type(s)."
+"Enabling logs for instant messages and/or chats will activate history for the same conversation type(s)."
 msgstr ""
 "��廬� ��廚廩廨 廨�廩�� �廬�� ���� -> �廣�廚�廬 -> 廨�廩��.\n"
 "\n"
@@ -2094,35 +2420,42 @@
 msgid "GntHistory"
 msgstr "GntHistory"
 
-#: ../finch/plugins/gnthistory.c:219 ../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:220 ../pidgin/plugins/history.c:198
-msgid ""
-"When a new conversation is opened this plugin will insert the last "
-"conversation into the current conversation."
+#: ../finch/plugins/gnthistory.c:220
+#: ../pidgin/plugins/history.c:198
+msgid "When a new conversation is opened this plugin will insert the last conversation into the current conversation."
 msgstr "��廩廨 ���� 廩��� ��廩 �廚廬�, 廬�廖廝 �� ����廖 �廬 �廩��� ���廨��� �廨�廩 �����."
 
-#: ../finch/plugins/grouping.c:42 ../libpurple/protocols/oscar/oscar.c:738
+#: ../finch/plugins/grouping.c:42
+#: ../libpurple/protocols/oscar/oscar.c:740
 msgid "Online"
 msgstr "����廨"
 
-#: ../finch/plugins/grouping.c:44 ../finch/plugins/grouping.c:145
+#: ../finch/plugins/grouping.c:44
+#: ../finch/plugins/grouping.c:145
 #: ../libpurple/protocols/gg/gg.c:1010
-#: ../libpurple/protocols/jabber/buddy.c:2038
+#: ../libpurple/protocols/jabber/buddy.c:2081
 #: ../libpurple/protocols/novell/novell.c:2846
-#: ../libpurple/protocols/oscar/oscar.c:827
-#: ../libpurple/protocols/oscar/oscar.c:5707
-#: ../libpurple/protocols/qq/qq.c:171 ../libpurple/protocols/qq/qq.c:178
+#: ../libpurple/protocols/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:3136 ../libpurple/status.c:154
-#: ../pidgin/gtkblist.c:3297 ../pidgin/gtkblist.c:3679
-#: ../pidgin/gtkdocklet.c:561 ../pidgin/gtkstatusbox.c:1085
+#: ../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:3336
+#: ../finch/plugins/grouping.c:117
+#: ../pidgin/gtkblist.c:3369
 msgid "Online Buddies"
 msgstr "��廨�� ����廨��"
 
@@ -2142,7 +2475,8 @@
 msgid "No Grouping"
 msgstr "��� 廡���廛"
 
-#: ../finch/plugins/grouping.c:257 ../finch/plugins/grouping.c:258
+#: ../finch/plugins/grouping.c:257
+#: ../finch/plugins/grouping.c:258
 msgid "Provides alternate buddylist grouping options."
 msgstr "��廚廩廨 �廚廩廨���廬 ��廖廚�廬 ����廡廬 廨廩��廬 ��廩� �廡廩廨 �廡��廢�廬."
 
@@ -2159,92 +2493,103 @@
 msgid "GntLastlog"
 msgstr "GntLastlog"
 
-#: ../finch/plugins/lastlog.c:124 ../finch/plugins/lastlog.c:125
+#: ../finch/plugins/lastlog.c:124
+#: ../finch/plugins/lastlog.c:125
 msgid "Lastlog plugin."
 msgstr "廬�廖廝 Lastlog."
 
-#: ../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:118
+#: ../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:121
+#: ../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:1729
+#: ../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:784
-#: ../libpurple/protocols/jabber/buddy.c:2034
-#: ../libpurple/protocols/jabber/buddy.c:2051
+#: ../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
+#: ../libpurple/protocols/qq/qq.c:233
+#: ../pidgin/gtkft.c:166
 msgid "Unknown"
 msgstr "�� ���廣"
 
-#: ../libpurple/blist.c:521 ../libpurple/blist.c:1348
-#: ../libpurple/blist.c:1558 ../libpurple/protocols/jabber/roster.c:69
-#: ../libpurple/protocols/myspace/myspace.c:3433 ../pidgin/gtkblist.c:6188
+#: ../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"
@@ -2306,7 +2651,8 @@
 msgid "Accept"
 msgstr "�廩廨"
 
-#: ../libpurple/certificate.c:1209 ../libpurple/protocols/qq/buddy_opt.c:214
+#: ../libpurple/certificate.c:1209
+#: ../libpurple/protocols/qq/buddy_opt.c:214
 #: ../libpurple/protocols/qq/group_im.c:144
 #: ../libpurple/protocols/qq/group_opt.c:103
 #: ../libpurple/protocols/qq/sys_msg.c:91
@@ -2322,11 +2668,8 @@
 #. vrq will be completed by user_auth
 #: ../libpurple/certificate.c:1311
 #, c-format
-msgid ""
-"The certificate presented by \"%s\" is self-signed. It cannot be "
-"automatically checked."
-msgstr ""
-"�廬廣��� 廩��廢�� 廣� ��� \"%s\" ��廬�� 廣� ��� 廣廢��. �� ��廬� ��廢廣 ���廡� �������廬."
+msgid "The certificate presented by \"%s\" is self-signed. It cannot be automatically checked."
+msgstr "�廬廣��� 廩��廢�� 廣� ��� \"%s\" ��廬�� 廣� ��� 廣廢��. �� ��廬� ��廢廣 ���廡� �������廬."
 
 #: ../libpurple/certificate.c:1329
 #, c-format
@@ -2338,7 +2681,8 @@
 #. stifle it.
 #. TODO: Probably wrong.
 #. TODO: Probably wrong
-#: ../libpurple/certificate.c:1337 ../libpurple/certificate.c:1407
+#: ../libpurple/certificate.c:1337
+#: ../libpurple/certificate.c:1407
 msgid "SSL Certificate Error"
 msgstr "廩���廬 廬廣��廬 SSL"
 
@@ -2348,26 +2692,18 @@
 
 #. vrq will be completed by user_auth
 #: ../libpurple/certificate.c:1359
-msgid ""
-"You have no database of root certificates, so this certificate cannot be "
-"validated."
+msgid "You have no database of root certificates, so this certificate cannot be validated."
 msgstr "��� �� �廖�-�廬���� 廩� 廬廣���廬 廩�廨廩, �� �� ��廬� ��廩廨廨 廬廣��� ��."
 
 #. vrq will be completed by user_auth
 #: ../libpurple/certificate.c:1382
-msgid ""
-"The root certificate this one claims to be issued by is unknown to Pidgin."
+msgid "The root certificate this one claims to be issued by is unknown to Pidgin."
 msgstr "廬廣��廬-�廩�廨廩 廩����廨� ��廚�廡� �廬 �廬廣��� ���� ���廨廬 �廚���'��."
 
 #: ../libpurple/certificate.c:1399
 #, c-format
-msgid ""
-"The certificate chain presented by %s does not have a valid digital "
-"signature from the Certificate Authority from which it claims to have a "
-"signature."
-msgstr ""
-"廩廨廩廨廬 �廬廣���廬 廩��廢�� 廣� ��� %s �� ����� �廬��� 廬廡廚� �廨廩���廬 ���廚廡� 廩��� ��� "
-"��廣�廬 廩�廩 �� �廬���."
+msgid "The certificate chain presented by %s does not have a valid digital signature from the Certificate Authority from which it claims to have a signature."
+msgstr "廩廨廩廨廬 �廬廣���廬 廩��廢�� 廣� ��� %s �� ����� �廬��� 廬廡廚� �廨廩���廬 ���廚廡� 廩��� ��� ��廣�廬 廩�廩 �� �廬���."
 
 #: ../libpurple/certificate.c:1408
 msgid "Invalid certificate authority signature"
@@ -2379,12 +2715,8 @@
 #. vrq will be completed by user_auth
 #: ../libpurple/certificate.c:1434
 #, c-format
-msgid ""
-"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
-"could mean that you are not connecting to the service you believe you are."
-msgstr ""
-"廬廣��� 廩��廢�� 廣� ��� \"%s\" ��廣�廬 廩��� ��� �廣廢� �廬�� \"%s\". ��廬�� ��� ���廨 "
-"廩�廩�廨�廬 ���� �廬��廨廬 ���� �廩�廨�廬 廩�廩�廬."
+msgid "The certificate presented by \"%s\" claims to be from \"%s\" instead.  This could mean that you are not connecting to the service you believe you are."
+msgstr "廬廣��� 廩��廢�� 廣� ��� \"%s\" ��廣�廬 廩��� ��� �廣廢� �廬�� \"%s\". ��廬�� ��� ���廨 廩�廩�廨�廬 ���� �廬��廨廬 ���� �廩�廨�廬 廩�廩�廬."
 
 #. Make messages
 #: ../libpurple/certificate.c:1896
@@ -2427,8 +2759,9 @@
 msgid "+++ %s signed off"
 msgstr "+++ %s �廬�廬廡"
 
-#: ../libpurple/connection.c:530 ../libpurple/plugin.c:277
-#: ../libpurple/protocols/jabber/buddy.c:2354
+#: ../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
@@ -2441,7 +2774,8 @@
 msgid "Unable to send message: The message is too large."
 msgstr "�� ��廬� �廩��� �廬 ����廣�: ����廣� �廨��� ���."
 
-#: ../libpurple/conversation.c:173 ../libpurple/conversation.c:186
+#: ../libpurple/conversation.c:173
+#: ../libpurple/conversation.c:186
 #, c-format
 msgid "Unable to send message to %s."
 msgstr "�� ��廬� �廩��� ���廣� � %s."
@@ -2450,60 +2784,61 @@
 msgid "The message is too large."
 msgstr "����廣� �廨��� ���."
 
-#: ../libpurple/conversation.c:183 ../libpurple/protocols/bonjour/jabber.c:272
+#: ../libpurple/conversation.c:183
+#: ../libpurple/protocols/bonjour/jabber.c:272
 #: ../libpurple/protocols/bonjour/jabber.c:315
 msgid "Unable to send message."
 msgstr "�� ��廬� �廩��� ���廣�"
 
-#: ../libpurple/conversation.c: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"
@@ -2512,7 +2847,8 @@
 msgid "Purple's D-BUS server is not running for the reason listed below"
 msgstr "廩廨廬 �- D-BUS 廩� Purple ���� 廚�廣�廬 廣廡� �廖���廬 廩����"
 
-#: ../libpurple/desktopitem.c:287 ../libpurple/desktopitem.c:878
+#: ../libpurple/desktopitem.c:287
+#: ../libpurple/desktopitem.c:878
 msgid "No name"
 msgstr "��� 廩�"
 
@@ -2524,7 +2860,8 @@
 msgid "Unable to send request to resolver process\n"
 msgstr "�� ��廬� �廩��� �廡廩� �廬���� �-resolver\n"
 
-#: ../libpurple/dnsquery.c:570 ../libpurple/dnsquery.c:719
+#: ../libpurple/dnsquery.c:570
+#: ../libpurple/dnsquery.c:719
 #, c-format
 msgid ""
 "Error resolving %s:\n"
@@ -2533,7 +2870,8 @@
 "廩���� �-resolving %s:\n"
 "%s"
 
-#: ../libpurple/dnsquery.c:573 ../libpurple/dnsquery.c:733
+#: ../libpurple/dnsquery.c:573
+#: ../libpurple/dnsquery.c:733
 #: ../libpurple/dnsquery.c:851
 #, c-format
 msgid "Error resolving %s: %d"
@@ -2758,57 +3096,39 @@
 msgstr "���廚� ��廬���廬 \"ymsgr\""
 
 #: ../libpurple/gconf/purple.schemas.in.h:18
-msgid ""
-"True if the command specified in the \"command\" key should handle \"aim\" "
-"URLs."
+msgid "True if the command specified in the \"command\" key should handle \"aim\" URLs."
 msgstr "��廬 �� �廚廡��� 廩����廨廬 ��廚廬�廨 \"廚廡���\" 廢廨�� ��廚� ��廬���廬 \"aim\"."
 
 #: ../libpurple/gconf/purple.schemas.in.h:19
-msgid ""
-"True if the command specified in the \"command\" key should handle \"gg\" "
-"URLs."
+msgid "True if the command specified in the \"command\" key should handle \"gg\" URLs."
 msgstr "��廬 �� �廚廡��� 廩����廨廬 ��廚廬�廨 \"廚廡���\" 廢廨�� ��廚� ��廬���廬 \"gg\"."
 
 #: ../libpurple/gconf/purple.schemas.in.h:20
-msgid ""
-"True if the command specified in the \"command\" key should handle \"icq\" "
-"URLs."
+msgid "True if the command specified in the \"command\" key should handle \"icq\" URLs."
 msgstr "��廬 �� �廚廡��� 廩����廨廬 ��廚廬�廨 \"廚廡���\" 廢廨�� ��廚� ��廬���廬 \"icq\"."
 
 #: ../libpurple/gconf/purple.schemas.in.h:21
-msgid ""
-"True if the command specified in the \"command\" key should handle \"irc\" "
-"URLs."
+msgid "True if the command specified in the \"command\" key should handle \"irc\" URLs."
 msgstr "��廬 �� �廚廡��� 廩����廨廬 ��廚廬�廨 \"廚廡���\" 廢廨�� ��廚� ��廬���廬 \"irc\"."
 
 #: ../libpurple/gconf/purple.schemas.in.h:22
-msgid ""
-"True if the command specified in the \"command\" key should handle \"msnim\" "
-"URLs."
+msgid "True if the command specified in the \"command\" key should handle \"msnim\" URLs."
 msgstr "��廬 �� �廚廡��� 廩����廨廬 ��廚廬�廨 \"廚廡���\" 廢廨�� ��廚� ��廬���廬 \"msnim\"."
 
 #: ../libpurple/gconf/purple.schemas.in.h:23
-msgid ""
-"True if the command specified in the \"command\" key should handle \"sip\" "
-"URLs."
+msgid "True if the command specified in the \"command\" key should handle \"sip\" URLs."
 msgstr "��廬 �� �廚廡��� 廩����廨廬 ��廚廬�廨 \"廚廡���\" 廢廨�� ��廚� ��廬���廬 \"aim\"."
 
 #: ../libpurple/gconf/purple.schemas.in.h:24
-msgid ""
-"True if the command specified in the \"command\" key should handle \"xmpp\" "
-"URLs."
+msgid "True if the command specified in the \"command\" key should handle \"xmpp\" URLs."
 msgstr "��廬 �� �廚廡��� 廩����廨廬 ��廚廬�廨 \"廚廡���\" 廢廨�� ��廚� ��廬���廬 \"xmpp\"."
 
 #: ../libpurple/gconf/purple.schemas.in.h:25
-msgid ""
-"True if the command specified in the \"command\" key should handle \"ymsgr\" "
-"URLs."
+msgid "True if the command specified in the \"command\" key should handle \"ymsgr\" URLs."
 msgstr "��廬 �� �廚廡��� 廩����廨廬 ��廚廬�廨 \"廚廡���\" 廢廨�� ��廚� ��廬���廬 \"ymsgr\"."
 
 #: ../libpurple/gconf/purple.schemas.in.h:26
-msgid ""
-"True if the command used to handle this type of URL should be run in a "
-"terminal."
+msgid "True if the command used to handle this type of URL should be run in a terminal."
 msgstr "��廬 �� �廚廡��� ���廚�� �廖�� �� 廩� �廬��廬 廢廨��� �廨�廛 ��廨����."
 
 #: ../libpurple/gconf/purple.schemas.in.h:27
@@ -2869,27 +3189,21 @@
 
 #: ../libpurple/log.c:1365
 #, c-format
-msgid ""
-"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
-"REPLY&gt;:</b></font> %s<br/>\n"
-msgstr ""
-"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;�廣�� "
-"�������&gt;:</b></font> %s<br/>\n"
+msgid "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
+msgstr "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;�廣�� �������&gt;:</b></font> %s<br/>\n"
 
 #: ../libpurple/log.c:1367
 #, c-format
-msgid ""
-"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
-"REPLY&gt;:</b></font> %s<br/>\n"
-msgstr ""
-"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;�廣�� "
-"�������&gt;:</b></font> %s<br/>\n"
-
-#: ../libpurple/log.c:1425 ../libpurple/log.c:1558
+msgid "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
+msgstr "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;�廣�� �������&gt;:</b></font> %s<br/>\n"
+
+#: ../libpurple/log.c:1425
+#: ../libpurple/log.c:1558
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>�� ��廬� ��廢�� �廬 �廬�� �廨�廩��!</b></font>"
 
-#: ../libpurple/log.c:1437 ../libpurple/log.c:1567
+#: ../libpurple/log.c:1437
+#: ../libpurple/log.c:1567
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>�� ��廬� �廡廨�� 廡��廛: %s</b></font>"
@@ -2924,9 +3238,7 @@
 
 #: ../libpurple/plugin.c:542
 #, c-format
-msgid ""
-"The required plugin %s was not found. Please install this plugin and try "
-"again."
+msgid "The required plugin %s was not found. Please install this plugin and try again."
 msgstr "�廖廨 廬�廖廝 %s. ����廛 ��廬廡�� �廬 �廬�廖廝 ���廩 ���廖�廬 廩��廬."
 
 #: ../libpurple/plugin.c:547
@@ -2951,7 +3263,8 @@
 msgid "Autoaccept"
 msgstr "�廩廨 �������廬"
 
-#: ../libpurple/plugins/autoaccept.c:25 ../libpurple/plugins/autoaccept.c:26
+#: ../libpurple/plugins/autoaccept.c:25
+#: ../libpurple/plugins/autoaccept.c:26
 msgid "Auto-accept file transfer requests from selected users."
 msgstr "�廩廨 �������廬 廡��廬 廡�廢�� ��廩廬�廩�� �廖�����."
 
@@ -2977,16 +3290,19 @@
 msgid "_Save"
 msgstr "廩��廨"
 
-#: ../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:1492
-#: ../libpurple/protocols/oscar/oscar.c:2294
-#: ../libpurple/protocols/oscar/oscar.c:2343
-#: ../libpurple/protocols/oscar/oscar.c:5989
-#: ../libpurple/protocols/oscar/oscar.c:6044
-#: ../libpurple/protocols/oscar/oscar.c:6270
-#: ../libpurple/protocols/oscar/oscar.c:6340 ../libpurple/request.h:1458
-#: ../libpurple/request.h:1468 ../pidgin/gtkblist.c:552
+#: ../libpurple/plugins/autoaccept.c:176
+#: ../libpurple/plugins/idle.c:170
+#: ../libpurple/plugins/idle.c:204
+#: ../libpurple/plugins/idle.c:230
+#: ../libpurple/protocols/oscar/oscar.c:1496
+#: ../libpurple/protocols/oscar/oscar.c:2301
+#: ../libpurple/protocols/oscar/oscar.c:2350
+#: ../libpurple/protocols/oscar/oscar.c:6015
+#: ../libpurple/protocols/oscar/oscar.c:6070
+#: ../libpurple/protocols/oscar/oscar.c:6297
+#: ../libpurple/protocols/oscar/oscar.c:6367
+#: ../libpurple/request.h:1401
+#: ../libpurple/request.h:1411
 msgid "_Cancel"
 msgstr "�����"
 
@@ -3027,10 +3343,11 @@
 "�廢� �廬廨廣� ���廨 廩�廣�廨廬 廡��廛 廩��廩廨 �������廬 �廖廬����\n"
 "(廨廡 ��廩廨 ��� 廩��� 廣� �廩���)"
 
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1816
-#: ../libpurple/protocols/msn/msn.c:1846
-#: ../libpurple/protocols/msnp9/msn.c:1672
-#: ../libpurple/protocols/msnp9/msn.c:1702
+#: ../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 "�廣廨�廬"
 
@@ -3050,18 +3367,21 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/buddynote.c:90 ../pidgin/plugins/gtkbuddynote.c:74
+#: ../libpurple/plugins/buddynote.c:90
+#: ../pidgin/plugins/gtkbuddynote.c:74
 msgid "Buddy Notes"
 msgstr "�廣廨�廬 ��廩-廡廩廨"
 
 #. *< name
 #. *< version
-#: ../libpurple/plugins/buddynote.c:92 ../pidgin/plugins/gtkbuddynote.c:76
+#: ../libpurple/plugins/buddynote.c:92
+#: ../pidgin/plugins/gtkbuddynote.c:76
 msgid "Store notes on particular buddies."
 msgstr "��廖� �廣廨�廬 廣� ��廩�-廡廩廨 �廖������"
 
 #. *< summary
-#: ../libpurple/plugins/buddynote.c:93 ../pidgin/plugins/gtkbuddynote.c:77
+#: ../libpurple/plugins/buddynote.c:93
+#: ../pidgin/plugins/gtkbuddynote.c:77
 msgid "Adds the option to store notes for buddies on your buddy list."
 msgstr "��廖�廝 �廬 ��廚廩廨�廬 �廨廩�� �廣廨�廬 廣� ��廩� �廡廩廨 �廨廩��廬�."
 
@@ -3079,7 +3399,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ciphertest.c:267 ../libpurple/plugins/ciphertest.c:269
+#: ../libpurple/plugins/ciphertest.c:267
+#: ../libpurple/plugins/ciphertest.c:269
 msgid "Tests the ciphers that ship with libpurple."
 msgstr "���廡 �廬 ��廢廚���� 廩�廩���� 廣� libpurple."
 
@@ -3116,26 +3437,32 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/filectl.c:251 ../libpurple/plugins/filectl.c:253
+#: ../libpurple/plugins/filectl.c:251
+#: ../libpurple/plugins/filectl.c:253
 msgid "Allows control by entering commands in a file."
 msgstr "��廚廩廨 廩���� 廣\"� ���廖廬 廚廡���廬 �廡��廛."
 
-#: ../libpurple/plugins/idle.c:158 ../libpurple/plugins/idle.c:218
+#: ../libpurple/plugins/idle.c:158
+#: ../libpurple/plugins/idle.c:218
 msgid "Minutes"
 msgstr "�廡�廬"
 
 #. This is a cultural reference.  Dy'er Mak'er is a song by Led Zeppelin.
 #. If that doesn't translate well into your language, drop the 's before translating.
-#: ../libpurple/plugins/idle.c:165 ../libpurple/plugins/idle.c:199
-#: ../libpurple/plugins/idle.c:225 ../libpurple/plugins/idle.c:318
+#: ../libpurple/plugins/idle.c:165
+#: ../libpurple/plugins/idle.c:199
+#: ../libpurple/plugins/idle.c:225
+#: ../libpurple/plugins/idle.c:318
 msgid "I'dle Mak'er"
 msgstr "��� 廨�廢� ����"
 
-#: ../libpurple/plugins/idle.c:166 ../libpurple/plugins/idle.c:258
+#: ../libpurple/plugins/idle.c:166
+#: ../libpurple/plugins/idle.c:258
 msgid "Set Account Idle Time"
 msgstr "廡�廣 �廬 ��� ��廖廨 廚廣���廬 廩� ��廩���"
 
-#: ../libpurple/plugins/idle.c:169 ../libpurple/plugins/idle.c:229
+#: ../libpurple/plugins/idle.c:169
+#: ../libpurple/plugins/idle.c:229
 msgid "_Set"
 msgstr "_廡�廣"
 
@@ -3143,7 +3470,8 @@
 msgid "None of your accounts are idle."
 msgstr "�廝 ��� �� ��廩����廬 廩�� �廖廨-廚廣���廬."
 
-#: ../libpurple/plugins/idle.c:200 ../libpurple/plugins/idle.c:262
+#: ../libpurple/plugins/idle.c:200
+#: ../libpurple/plugins/idle.c:262
 msgid "Unset Account Idle Time"
 msgstr "��� �廬 ��� ��廖廨 廚廣���廬 廩� ��廩���"
 
@@ -3151,7 +3479,8 @@
 msgid "_Unset"
 msgstr "�_��"
 
-#: ../libpurple/plugins/idle.c:226 ../libpurple/plugins/idle.c:266
+#: ../libpurple/plugins/idle.c:226
+#: ../libpurple/plugins/idle.c:266
 msgid "Set Idle Time for All Accounts"
 msgstr "廡�廣 �廬 ��� ��廖廨 �廚廣���廬 廣��廨 �� ��廩����廬"
 
@@ -3159,7 +3488,8 @@
 msgid "Unset Idle Time for All Idled Accounts"
 msgstr "��� �廬 ��� ��廖廨 �廚廣���廬 廣��廨 �� ��廩����廬"
 
-#: ../libpurple/plugins/idle.c:320 ../libpurple/plugins/idle.c:321
+#: ../libpurple/plugins/idle.c:320
+#: ../libpurple/plugins/idle.c:321
 msgid "Allows you to hand-configure how long you've been idle"
 msgstr "��廚廩廨 �����廨 ����廬 ��� ��� ��廩��� ���廖廨 廚廣���廬"
 
@@ -3182,12 +3512,8 @@
 
 #. *  description
 #: ../libpurple/plugins/ipc-test-client.c:92
-msgid ""
-"Test plugin IPC support, as a client. This locates the server plugin and "
-"calls the commands registered."
-msgstr ""
-"���廡 �廬 廬�廖廝 �廬���� �-IPC, ��廡��. �� ��廬廨 �廬 �廩廨廬 廩� �廬�廖廝 �廡�廨� �廚廡���廬 "
-"�廨廩���廬."
+msgid "Test plugin IPC support, as a client. This locates the server plugin and calls the commands registered."
+msgstr "���廡 �廬 廬�廖廝 �廬���� �-IPC, ��廡��. �� ��廬廨 �廬 �廩廨廬 廩� �廬�廖廝 �廡�廨� �廚廡���廬 �廨廩���廬."
 
 #. *< type
 #. *< ui_requirement
@@ -3211,15 +3537,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 "��廖廨 廚廣���廬 �廩廬�廩 (��廡�廬)"
 
@@ -3229,25 +3555,21 @@
 #. *< 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
-msgid ""
-"This plugin hides join/part messages in large rooms, except for those users "
-"actively taking part in a conversation."
-msgstr ""
-"廬�廖廝 �� �廖廬�廨 ���廣�廬 �廢�廨廚�廬/廣���� ���廨�-廢'�� ������, ���� 廣��廨 ��廬� �廩廬�廩�� "
-"廩��廡��� ��廡 廚廣�� �廩���."
+#: ../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."
+msgstr "廬�廖廝 �� �廖廬�廨 ���廣�廬 �廢�廨廚�廬/廣���� ���廨�-廢'�� ������, ���� 廣��廨 ��廬� �廩廬�廩�� 廩��廡��� ��廡 廚廣�� �廩���."
 
 #. This is used in the place of a timezone abbreviation if the
 #. * offset is way off.  The user should never really see it, but
@@ -3281,9 +3603,7 @@
 msgstr "��廬廡廬 ��廩廨廬."
 
 #: ../libpurple/plugins/log_reader.c:1605
-msgid ""
-"You are currently disconnected. Messages will not be received unless you are "
-"logged in."
+msgid "You are currently disconnected. Messages will not be received unless you are logged in."
 msgstr "�廬/� �廨�廣 ���廬廡/廬. ���廣�廬 �� �廬廡��� ��� 廨廡 ���� 廩�廬/� ����廨/廬."
 
 #: ../libpurple/plugins/log_reader.c:1620
@@ -3388,17 +3708,13 @@
 #. * description
 #: ../libpurple/plugins/log_reader.c:2898
 msgid ""
-"When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
-"\n"
-"WARNING: This plugin is still alpha code and may crash frequently.  Use it "
-"at your own risk!"
-msgstr ""
-"�廣廬 廢廚��� ������-廩���, 廬�廖廝 �� ����� ������ �廬����廬 廢'�� ��廨�廬. �廨�廣, �� "
-"���� Adium, MSN Messenger, Trillian.\n"
-"\n"
-"���廨�: 廬�廖廝 �� 廣���� �廩��� 廚�廬�� ��廡���� ���廬�� ��廡廨�廖 �廣�廬�� 廡廨���廬.  �廩 "
-"��廩廬�廩 �� 廣� �廩��� 廖����� ���廩� ����!"
+"When viewing logs, this plugin will include logs from other IM clients. Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"\n"
+"WARNING: This plugin is still alpha code and may crash frequently.  Use it at your own risk!"
+msgstr ""
+"�廣廬 廢廚��� ������-廩���, 廬�廖廝 �� ����� ������ �廬����廬 廢'�� ��廨�廬. �廨�廣, �� ���� Adium, MSN Messenger, Trillian.\n"
+"\n"
+"���廨�: 廬�廖廝 �� 廣���� �廩��� 廚�廬�� ��廡���� ���廬�� ��廡廨�廖 �廣�廬�� 廡廨���廬.  �廩 ��廩廬�廩 �� 廣� �廩��� 廖����� ���廩� ����!"
 
 #: ../libpurple/plugins/mono/loader/mono.c:217
 msgid "Mono Plugin Loader"
@@ -3438,37 +3754,26 @@
 
 #. *< summary
 #: ../libpurple/plugins/newline.c:107
-msgid ""
-"Prepends a newline to messages so that the rest of the message appears below "
-"the screen name in the conversation window."
-msgstr ""
-"��廖�廝 廬���廬 廩�廨� ��廩� ����廣�廬 ��� 廩廩�廨 ����廣� ��廚�廣 �廬�廬 �廩� 廩� ���廬� ����� "
-"�廩���."
+msgid "Prepends a newline to messages so that the rest of the message appears below the screen name in the conversation window."
+msgstr "��廖�廝 廬���廬 廩�廨� ��廩� ����廣�廬 ��� 廩廩�廨 ����廣� ��廚�廣 �廬�廬 �廩� 廩� ���廬� ����� �廩���."
 
 #: ../libpurple/plugins/offlinemsg.c:23
 msgid "Offline Message Emulation"
 msgstr "����廢�� 廩� ���廣�廬 ��-�廡����廬"
 
-#: ../libpurple/plugins/offlinemsg.c:25 ../libpurple/plugins/offlinemsg.c:26
+#: ../libpurple/plugins/offlinemsg.c:25
+#: ../libpurple/plugins/offlinemsg.c:26
 msgid "Save messages sent to an offline user as pounce."
 msgstr "廩��廨 ���廣�廬 廩�廩��� ��廩廬�廩 ��-����廨 �廬�廨 廬���廬-廚廣���廬."
 
 #: ../libpurple/plugins/offlinemsg.c:95
-msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
-"pounce from the `Buddy Pounce' dialog."
-msgstr ""
-"廩�廨 ����廣廬 ��廩�廨� �廬�廨 廬���廬-廚廣���廬. ��廬� �廣廨��/����廡 �廬 �廬���� �廬�� ���� "
-"廬����廬-�廚廣���廬."
+msgid "The rest of the messages will be saved as pounce. You can edit/delete the pounce from the `Buddy Pounce' dialog."
+msgstr "廩�廨 ����廣廬 ��廩�廨� �廬�廨 廬���廬-廚廣���廬. ��廬� �廣廨��/����廡 �廬 �廬���� �廬�� ���� 廬����廬-�廚廣���廬."
 
 #: ../libpurple/plugins/offlinemsg.c:156
 #, c-format
-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\" �廬��廨 ���廩?"
+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\" �廬��廨 ���廩?"
 
 #: ../libpurple/plugins/offlinemsg.c:160
 msgid "Offline Message"
@@ -3480,31 +3785,35 @@
 
 #: ../libpurple/plugins/offlinemsg.c:165
 #: ../libpurple/protocols/msn/dialog.c:141
-#: ../libpurple/protocols/msn/msn.c:661
+#: ../libpurple/protocols/msn/msn.c:675
 #: ../libpurple/protocols/msnp9/dialog.c:133
 #: ../libpurple/protocols/msnp9/msn.c:547
 #: ../libpurple/protocols/msnp9/msn.c:563
 #: ../libpurple/protocols/novell/novell.c:1929
 #: ../libpurple/protocols/silc/buddy.c:317
-#: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:308
+#: ../libpurple/protocols/silc/pk.c:113
+#: ../libpurple/protocols/silc/wb.c:308
 #: ../libpurple/protocols/silc10/buddy.c:314
 #: ../libpurple/protocols/silc10/pk.c:119
-#: ../libpurple/protocols/silc10/wb.c:307 ../pidgin/gtkrequest.c:270
+#: ../libpurple/protocols/silc10/wb.c:307
+#: ../pidgin/gtkrequest.c:270
 msgid "Yes"
 msgstr "��"
 
 #: ../libpurple/plugins/offlinemsg.c:166
 #: ../libpurple/protocols/msn/dialog.c:142
-#: ../libpurple/protocols/msn/msn.c:661
+#: ../libpurple/protocols/msn/msn.c:675
 #: ../libpurple/protocols/msnp9/dialog.c:134
 #: ../libpurple/protocols/msnp9/msn.c:547
 #: ../libpurple/protocols/msnp9/msn.c:563
 #: ../libpurple/protocols/novell/novell.c:1930
 #: ../libpurple/protocols/silc/buddy.c:318
-#: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:309
+#: ../libpurple/protocols/silc/pk.c:114
+#: ../libpurple/protocols/silc/wb.c:309
 #: ../libpurple/protocols/silc10/buddy.c:315
 #: ../libpurple/protocols/silc10/pk.c:120
-#: ../libpurple/protocols/silc10/wb.c:308 ../pidgin/gtkrequest.c:271
+#: ../libpurple/protocols/silc10/wb.c:308
+#: ../pidgin/gtkrequest.c:271
 msgid "No"
 msgstr "��"
 
@@ -3529,7 +3838,8 @@
 #. *< name
 #. *< version
 #. *< summary
-#: ../libpurple/plugins/perl/perl.c:603 ../libpurple/plugins/perl/perl.c:604
+#: ../libpurple/plugins/perl/perl.c:603
+#: ../libpurple/plugins/perl/perl.c:604
 msgid "Provides support for loading perl plugins."
 msgstr "��廚廩廨 �廣��� 廩� 廬�廖廚� Perl."
 
@@ -3542,12 +3852,8 @@
 msgstr "�廢� ����-廣廬���廬 �廩���廬 ���廖�廬"
 
 #: ../libpurple/plugins/psychic.c:22
-msgid ""
-"Causes conversation windows to appear as other users begin to message you.  "
-"This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
-msgstr ""
-"��廨� ������廬-廩��� ���廚�廣 ��廨 ��廩廨 ��廩� 廡廩廨 �廬����� ��廬�� ���廣�.  �� 廣��� "
-"廣��廨 AIM, ICQ, XMPP, Sametime, Yahoo!"
+msgid "Causes conversation windows to appear as other users begin to message you.  This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
+msgstr "��廨� ������廬-廩��� ���廚�廣 ��廨 ��廩廨 ��廩� 廡廩廨 �廬����� ��廬�� ���廣�.  �� 廣��� 廣��廨 AIM, ICQ, XMPP, Sametime, Yahoo!"
 
 #: ../libpurple/plugins/psychic.c:72
 msgid "You feel a disturbance in the force..."
@@ -3602,7 +3908,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/simple.c:40 ../libpurple/plugins/simple.c:42
+#: ../libpurple/plugins/simple.c:40
+#: ../libpurple/plugins/simple.c:42
 msgid "Tests to see that most things are working."
 msgstr "���廡 �� 廨�� ���廨�� 廣�����"
 
@@ -3664,7 +3971,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl.c:97 ../libpurple/plugins/ssl/ssl.c:99
+#: ../libpurple/plugins/ssl/ssl.c:97
+#: ../libpurple/plugins/ssl/ssl.c:99
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "�廖廚廡 廩���廬 �廣�廚廬 廖��� 廖廚廨��廬 �廬���� �-SSL."
 
@@ -3725,73 +4033,59 @@
 #. *  description
 #: ../libpurple/plugins/statenotify.c:151
 #: ../libpurple/plugins/statenotify.c:154
-msgid ""
-"Notifies in a conversation window when a buddy goes or returns from away or "
-"idle."
-msgstr ""
-"����廣 ����� �廩��� ��廩廨 ��廩 �廡廩廨 �廬廨�廡 ���廬�廩�, 廣��廨 ��廢� 廩� ���廨 廚廣���廬, �� "
-"���廨."
+msgid "Notifies in a conversation window when a buddy goes or returns from away or idle."
+msgstr "����廣 ����� �廩��� ��廩廨 ��廩 �廡廩廨 �廬廨�廡 ���廬�廩�, 廣��廨 ��廢� 廩� ���廨 廚廣���廬, �� ���廨."
 
 #: ../libpurple/plugins/tcl/tcl.c:423
 msgid "Tcl Plugin Loader"
 msgstr "��廣�� �廬�廖廚� Tcl"
 
-#: ../libpurple/plugins/tcl/tcl.c:425 ../libpurple/plugins/tcl/tcl.c:426
+#: ../libpurple/plugins/tcl/tcl.c:425
+#: ../libpurple/plugins/tcl/tcl.c:426
 msgid "Provides support for loading Tcl plugins"
 msgstr "�廖廚廡 廬���� ��廣��廬 廬�廖廚� Tcl"
 
 #: ../libpurple/plugins/tcl/tcl.c:509
-msgid ""
-"Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
-"install ActiveTCL from http://www.activestate.com\n"
-msgstr ""
-"�� ��� ��廬� ����廬 ActiveTCL �廬�廡�. �� �廨廢��� ��廩廬�廩 �廬�廖廚� TCL, �廩 ��廬廡�� "
-"ActiveTCL �廬�� http://www.activestate.com\n"
+msgid "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, install ActiveTCL from http://www.activestate.com\n"
+msgstr "�� ��� ��廬� ����廬 ActiveTCL �廬�廡�. �� �廨廢��� ��廩廬�廩 �廬�廖廚� TCL, �廩 ��廬廡�� ActiveTCL �廬�� http://www.activestate.com\n"
 
 #: ../libpurple/protocols/bonjour/bonjour.c:101
-msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://"
-"developer.pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-"
-"LocalMessaging for more information."
-msgstr ""
-"����廬 ����'�廨 廩� �廚� 廣��廨 �����廬 �� ��廢��, 廨�� �廬 �廩�\"廬 ��廬廨: http://"
-"developer.pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-"
-"LocalMessaging ����廣 ��廖廝."
+msgid "The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://developer.pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-LocalMessaging for more information."
+msgstr "����廬 ����'�廨 廩� �廚� 廣��廨 �����廬 �� ��廢��, 廨�� �廬 �廩�\"廬 ��廬廨: http://developer.pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-LocalMessaging ����廣 ��廖廝."
 
 #: ../libpurple/protocols/bonjour/bonjour.c:120
 msgid "Unable to listen for incoming IM connections\n"
 msgstr "�� ��廬� ��廡廩�� �廬廡廩�廨廬-���廣�廬 ���廖廬.\n"
 
 #: ../libpurple/protocols/bonjour/bonjour.c:147
-msgid ""
-"Unable to establish connection with the local mDNS server.  Is it running?"
+msgid "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr "�� �廢��� �廬廡廩廨 廣� 廩廨廬 �-mDNS ��廡���. ��� ��� ��廨 廨廛?"
 
 #. Creating the options for the protocol
 #: ../libpurple/protocols/bonjour/bonjour.c:392
 #: ../libpurple/protocols/bonjour/bonjour.c:698
 #: ../libpurple/protocols/gg/gg.c:633
-#: ../libpurple/protocols/jabber/jabber.c:996
+#: ../libpurple/protocols/jabber/jabber.c:1006
 msgid "First name"
 msgstr "廩� 廚廨��"
 
 #: ../libpurple/protocols/bonjour/bonjour.c:394
 #: ../libpurple/protocols/bonjour/bonjour.c:701
 #: ../libpurple/protocols/gg/gg.c:628
-#: ../libpurple/protocols/jabber/jabber.c:1000
+#: ../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:1329
-#: ../libpurple/protocols/jabber/buddy.c:1339
-#: ../libpurple/protocols/jabber/buddy.c:2223
-#: ../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 "���廨"
 
@@ -3826,7 +4120,7 @@
 
 #: ../libpurple/protocols/bonjour/bonjour.c:704
 #: ../libpurple/protocols/gg/gg.c:478
-#: ../libpurple/protocols/jabber/jabber.c:988
+#: ../libpurple/protocols/jabber/jabber.c:998
 #: ../libpurple/protocols/silc/silc.c:913
 #: ../libpurple/protocols/silc/silc.c:1154
 #: ../libpurple/protocols/silc10/silc.c:687
@@ -3871,27 +4165,30 @@
 msgid "Error communicating with local mDNSResponder."
 msgstr "廩���� �廬廡廩�廨廬 廣� mDNSResponder �廡���."
 
-#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1851
+#: ../libpurple/protocols/gg/gg.c:76
+#: ../libpurple/proxy.c:1908
 msgid "Invalid proxy settings"
 msgstr "���廨�廬 �� 廬廡廚�廬 廩� �廬�����"
 
-#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1851
-msgid ""
-"Either the host name or port number specified for your given proxy type is "
-"invalid."
+#: ../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."
 msgstr "�� �廬��廬 �廩廨廬 �� �廢��廬 �廩廨廬 廩��廬�� 廣��廨 廖�� ��廬��� 廩����廨�� 廬廡廚��."
 
-#: ../libpurple/protocols/gg/gg.c:115 ../libpurple/protocols/gg/gg.c:137
+#: ../libpurple/protocols/gg/gg.c:115
+#: ../libpurple/protocols/gg/gg.c:137
 #: ../libpurple/protocols/gg/gg.c:180
 msgid "Token Error"
 msgstr "廩���廬 廣廨�"
 
-#: ../libpurple/protocols/gg/gg.c:116 ../libpurple/protocols/gg/gg.c:138
+#: ../libpurple/protocols/gg/gg.c:116
+#: ../libpurple/protocols/gg/gg.c:138
 #: ../libpurple/protocols/gg/gg.c:181
 msgid "Unable to fetch the token.\n"
 msgstr "�� ��廬� ��廩�� �廬 �廣廨�.\n"
 
-#: ../libpurple/protocols/gg/gg.c:267 ../libpurple/protocols/gg/gg.c:274
+#: ../libpurple/protocols/gg/gg.c:267
+#: ../libpurple/protocols/gg/gg.c:274
 #: ../libpurple/protocols/gg/gg.c:280
 msgid "Save Buddylist..."
 msgstr "廩��廨 �廬 廨廩��廬 ��廩� �廡廩廨..."
@@ -3909,7 +4206,8 @@
 msgid "Couldn't write buddy list for %s to %s"
 msgstr "�� ��廬� ��� ��廬�� �廬 廨廩��廬 ��廩� �廡廩廨 廣��廨 %s �� %s"
 
-#: ../libpurple/protocols/gg/gg.c:303 ../libpurple/protocols/gg/gg.c:304
+#: ../libpurple/protocols/gg/gg.c:303
+#: ../libpurple/protocols/gg/gg.c:304
 msgid "Couldn't load buddylist"
 msgstr "�� ��廬� ��廣�� �廬 廨廩��廬 ��廩� �廡廩廨"
 
@@ -3945,26 +4243,31 @@
 msgid "Registration completed successfully!"
 msgstr "�廨�廩�� ��廢廣 ��廢���"
 
-#: ../libpurple/protocols/gg/gg.c:483 ../libpurple/protocols/gg/gg.c:776
-#: ../libpurple/protocols/jabber/jabber.c:971
-#: ../libpurple/protocols/jabber/jabber.c:974
-#: ../libpurple/protocols/jabber/jabber.c:1762
+#: ../libpurple/protocols/gg/gg.c:483
+#: ../libpurple/protocols/gg/gg.c:776
+#: ../libpurple/protocols/jabber/jabber.c:981
+#: ../libpurple/protocols/jabber/jabber.c:984
+#: ../libpurple/protocols/jabber/jabber.c:1772
 msgid "Password"
 msgstr "廖�廖��"
 
-#: ../libpurple/protocols/gg/gg.c:488 ../libpurple/protocols/gg/gg.c:781
+#: ../libpurple/protocols/gg/gg.c:488
+#: ../libpurple/protocols/gg/gg.c:781
 msgid "Password (retype)"
 msgstr "廖�廖�� )廩��("
 
-#: ../libpurple/protocols/gg/gg.c:493 ../libpurple/protocols/gg/gg.c:786
+#: ../libpurple/protocols/gg/gg.c:493
+#: ../libpurple/protocols/gg/gg.c:786
 msgid "Enter current token"
 msgstr "��� 廣廨� �����"
 
-#: ../libpurple/protocols/gg/gg.c:499 ../libpurple/protocols/gg/gg.c:792
+#: ../libpurple/protocols/gg/gg.c:499
+#: ../libpurple/protocols/gg/gg.c:792
 msgid "Current token"
 msgstr "廣廨� �����"
 
-#: ../libpurple/protocols/gg/gg.c:503 ../libpurple/protocols/gg/gg.c:504
+#: ../libpurple/protocols/gg/gg.c:503
+#: ../libpurple/protocols/gg/gg.c:504
 msgid "Register New Gadu-Gadu Account"
 msgstr "�廢廣 廨�廩�� ��廩��� ��廩 廩� Gadu-Gadu"
 
@@ -3972,11 +4275,12 @@
 msgid "Please, fill in the following fields"
 msgstr "�廩 ���� �廬 �廩��廬 �����"
 
-#: ../libpurple/protocols/gg/gg.c:643 ../libpurple/protocols/gg/gg.c:1056
+#: ../libpurple/protocols/gg/gg.c:643
+#: ../libpurple/protocols/gg/gg.c:1056
 #: ../libpurple/protocols/gg/gg.c:1128
-#: ../libpurple/protocols/jabber/jabber.c:1008
-#: ../libpurple/protocols/oscar/oscar.c:3822
-#: ../libpurple/protocols/oscar/oscar.c:3835
+#: ../libpurple/protocols/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 "廣�廨"
@@ -3985,14 +4289,17 @@
 msgid "Year of birth"
 msgstr "廩�廬 ����"
 
-#: ../libpurple/protocols/gg/gg.c:651 ../libpurple/protocols/msn/msn.c:1745
-#: ../libpurple/protocols/msnp9/msn.c:1601
+#: ../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:3765
+#: ../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/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:1098
 msgid "Gender"
 msgstr "���"
 
@@ -4001,14 +4308,14 @@
 msgstr "��廨 �� �廡��"
 
 #: ../libpurple/protocols/gg/gg.c:653
-#: ../libpurple/protocols/oscar/oscar.c:3765
+#: ../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:3765
+#: ../libpurple/protocols/oscar/oscar.c:3779
 #: ../libpurple/protocols/qq/buddy_info.c:84
 #: ../libpurple/protocols/qq/qq.c:230
 msgid "Female"
@@ -4018,7 +4325,8 @@
 msgid "Only online"
 msgstr "廨廡 �廩����廨"
 
-#: ../libpurple/protocols/gg/gg.c:662 ../libpurple/protocols/gg/gg.c:663
+#: ../libpurple/protocols/gg/gg.c:662
+#: ../libpurple/protocols/gg/gg.c:663
 msgid "Find buddies"
 msgstr "�廚廩 ��廩� 廡廩廨"
 
@@ -4054,7 +4362,8 @@
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "�廩 ����� �廬 廖�廖�廬� ������廬 �廖�廖�廬� ���廩� 廣��廨 �廩廬�廩 �廖廚廨: "
 
-#: ../libpurple/protocols/gg/gg.c:800 ../libpurple/protocols/gg/gg.c:801
+#: ../libpurple/protocols/gg/gg.c:800
+#: ../libpurple/protocols/gg/gg.c:801
 msgid "Change Gadu-Gadu Password"
 msgstr "廩���� 廖�廖�廬 Gadu-Gadu"
 
@@ -4063,65 +4372,78 @@
 msgid "Select a chat for buddy: %s"
 msgstr "��廨 廢'�� 廣��廨 ��廩 �廡廩廨: %s"
 
-#: ../libpurple/protocols/gg/gg.c:881 ../libpurple/protocols/gg/gg.c:882
+#: ../libpurple/protocols/gg/gg.c:881
+#: ../libpurple/protocols/gg/gg.c:882
 msgid "Add to chat..."
 msgstr "��廖廝 �廩���..."
 
 #: ../libpurple/protocols/gg/gg.c:1013
-#: ../libpurple/protocols/jabber/buddy.c:2040
-#: ../libpurple/protocols/msn/state.c:29 ../libpurple/protocols/msn/state.c:30
-#: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38
+#: ../libpurple/protocols/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:2834
 #: ../libpurple/protocols/qq/qq.c:281
-#: ../libpurple/protocols/yahoo/yahoo.c:3138 ../libpurple/status.c:155
-#: ../pidgin/gtkdocklet.c:545 ../pidgin/gtkstatusbox.c:1081
+#: ../libpurple/protocols/yahoo/yahoo.c:3158
+#: ../libpurple/status.c:155
+#: ../pidgin/gtkdocklet.c:545
+#: ../pidgin/gtkstatusbox.c:1081
 msgid "Available"
 msgstr "����"
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#: ../libpurple/protocols/gg/gg.c:1016 ../libpurple/protocols/irc/irc.c:544
+#: ../libpurple/protocols/gg/gg.c:1016
+#: ../libpurple/protocols/irc/irc.c:544
 #: ../libpurple/protocols/irc/msgs.c:312
-#: ../libpurple/protocols/jabber/buddy.c:2044
+#: ../libpurple/protocols/jabber/buddy.c:2087
 #: ../libpurple/protocols/novell/novell.c:2837
-#: ../libpurple/protocols/oscar/oscar.c:732
-#: ../libpurple/protocols/oscar/oscar.c:5735
-#: ../libpurple/protocols/qq/qq.c:181 ../libpurple/protocols/qq/qq.c:285
+#: ../libpurple/protocols/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:3690
-#: ../libpurple/protocols/yahoo/yahoo.c:3764 ../libpurple/status.c:158
-#: ../pidgin/gtkdocklet.c:549 ../pidgin/gtkprefs.c:1960
+#: ../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:2760
-#: ../libpurple/protocols/oscar/oscar.c:3732
+#: ../libpurple/protocols/gg/gg.c:1045
+#: ../libpurple/protocols/gg/gg.c:1119
+#: ../libpurple/protocols/oscar/oscar.c:2767
+#: ../libpurple/protocols/oscar/oscar.c:3746
 msgid "UIN"
 msgstr "�廖廚廨 �����"
 
-#: ../libpurple/protocols/gg/gg.c:1048 ../libpurple/protocols/gg/gg.c:1122
-#: ../libpurple/protocols/jabber/buddy.c:2217
-#: ../libpurple/protocols/jabber/buddy.c:2403
-#: ../libpurple/protocols/oscar/oscar.c:3743
-#: ../libpurple/protocols/silc/ops.c:990
+#: ../libpurple/protocols/gg/gg.c:1048
+#: ../libpurple/protocols/gg/gg.c:1122
+#: ../libpurple/protocols/jabber/buddy.c:2260
+#: ../libpurple/protocols/jabber/buddy.c:2446
+#: ../libpurple/protocols/oscar/oscar.c:3757
+#: ../libpurple/protocols/silc/ops.c:1005
 #: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
 msgstr "廩� 廚廨��"
 
-#: ../libpurple/protocols/gg/gg.c:1061 ../libpurple/protocols/gg/gg.c:1131
+#: ../libpurple/protocols/gg/gg.c:1061
+#: ../libpurple/protocols/gg/gg.c:1131
 msgid "Birth Year"
 msgstr "廩�廬 ����"
 
-#: ../libpurple/protocols/gg/gg.c:1113 ../libpurple/protocols/gg/gg.c:1182
-#: ../libpurple/protocols/oscar/oscar.c:3944
+#: ../libpurple/protocols/gg/gg.c:1113
+#: ../libpurple/protocols/gg/gg.c:1182
+#: ../libpurple/protocols/oscar/oscar.c:3958
 msgid "Unable to display the search results."
 msgstr "�� ��廬� ��廢�� �廬 廬�廢��廬 ���廚�廩."
 
@@ -4141,7 +4463,8 @@
 msgid "There are no users matching your search criteria."
 msgstr "�� ��廢�� �廩廬�廩�� �廬����� �廡廨��廨���� ���廚�廩 廩��."
 
-#: ../libpurple/protocols/gg/gg.c:1314 ../libpurple/protocols/gg/gg.c:1469
+#: ../libpurple/protocols/gg/gg.c:1314
+#: ../libpurple/protocols/gg/gg.c:1469
 msgid "Unable to read socket"
 msgstr "��� �廚廩廨�廬 �廡廨�� �廬 �廩廡廣"
 
@@ -4161,7 +4484,8 @@
 msgid "Your buddy list was stored on the server."
 msgstr "廨廩��廬 ��廩� �廡廩廨 廩�� ���廖�� 廣� �廩廨廬"
 
-#: ../libpurple/protocols/gg/gg.c:1517 ../libpurple/protocols/gg/gg.c:1725
+#: ../libpurple/protocols/gg/gg.c:1517
+#: ../libpurple/protocols/gg/gg.c:1725
 msgid "Connection failed."
 msgstr "��廬��廨�廬 ��廩��."
 
@@ -4244,7 +4568,7 @@
 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:1280
@@ -4252,7 +4576,7 @@
 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:1284
@@ -4292,9 +4616,11 @@
 msgid "MOTD for %s"
 msgstr "���廣廬 ���� 廣��廨 %s"
 
-#: ../libpurple/protocols/irc/irc.c:129 ../libpurple/protocols/irc/irc.c:169
-#: ../libpurple/protocols/irc/irc.c:633 ../libpurple/protocols/irc/irc.c:662
-#: ../libpurple/protocols/myspace/myspace.c:2530
+#: ../libpurple/protocols/irc/irc.c:129
+#: ../libpurple/protocols/irc/irc.c:169
+#: ../libpurple/protocols/irc/irc.c:633
+#: ../libpurple/protocols/irc/irc.c:662
+#: ../libpurple/protocols/myspace/myspace.c:2532
 msgid "Server has disconnected"
 msgstr "�廩廨廬 �廬�廬廡"
 
@@ -4302,13 +4628,15 @@
 msgid "View MOTD"
 msgstr "�廢� �廬 ���廣廬 ����"
 
-#: ../libpurple/protocols/irc/irc.c:272 ../libpurple/protocols/silc/chat.c:33
+#: ../libpurple/protocols/irc/irc.c:272
+#: ../libpurple/protocols/silc/chat.c:33
 #: ../libpurple/protocols/silc10/chat.c:33
 msgid "_Channel:"
 msgstr "_廣廨�廛:"
 
 #: ../libpurple/protocols/irc/irc.c:278
-#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:496
+#: ../libpurple/protocols/jabber/chat.c:59
+#: ../pidgin/gtkaccount.c:496
 msgid "_Password:"
 msgstr "_廖�廖��:"
 
@@ -4319,23 +4647,24 @@
 #. 1. connect to server
 #. connect to the server
 #: ../libpurple/protocols/irc/irc.c:332
-#: ../libpurple/protocols/jabber/jabber.c:1336
+#: ../libpurple/protocols/jabber/jabber.c:1346
 #: ../libpurple/protocols/msn/session.c:402
 #: ../libpurple/protocols/msnp9/session.c:354
 #: ../libpurple/protocols/myspace/myspace.c:295
 #: ../libpurple/protocols/novell/novell.c:2199
-#: ../libpurple/protocols/oscar/oscar.c:1331
+#: ../libpurple/protocols/oscar/oscar.c:1335
 #: ../libpurple/protocols/qq/qq.c:136
-#: ../libpurple/protocols/sametime/sametime.c:3776
+#: ../libpurple/protocols/sametime/sametime.c:3777
 #: ../libpurple/protocols/simple/simple.c:1915
-#: ../libpurple/protocols/yahoo/yahoo.c:2966
-#: ../libpurple/protocols/zephyr/zephyr.c:1585 ../pidgin/gtkstatusbox.c:681
+#: ../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:664
-#: ../libpurple/protocols/jabber/jabber.c:1145
+#: ../libpurple/protocols/jabber/jabber.c:674
+#: ../libpurple/protocols/jabber/jabber.c:1155
 msgid "SSL support unavailable"
 msgstr "��� 廬���� �-SSL."
 
@@ -4347,12 +4676,13 @@
 msgstr "��� �廚廩廨�廬 ��廢�廨 廩廡廣"
 
 #: ../libpurple/protocols/irc/irc.c:437
-#: ../libpurple/protocols/oscar/oscar.c:1327
+#: ../libpurple/protocols/oscar/oscar.c:1331
 msgid "Couldn't connect to host"
 msgstr "�� ��廬� ��廬��廨 �廩廨廬"
 
-#: ../libpurple/protocols/irc/irc.c:628 ../libpurple/protocols/irc/irc.c:657
-#: ../libpurple/protocols/myspace/myspace.c:2524
+#: ../libpurple/protocols/irc/irc.c:628
+#: ../libpurple/protocols/irc/irc.c:657
+#: ../libpurple/protocols/myspace/myspace.c:2526
 msgid "Read error"
 msgstr "廩���� �廡廨���"
 
@@ -4364,9 +4694,9 @@
 msgstr "�廩廬�廩��"
 
 #: ../libpurple/protocols/irc/irc.c:801
-#: ../libpurple/protocols/sametime/sametime.c:3424
+#: ../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:1517
@@ -4391,14 +4721,15 @@
 msgstr "廬�廖廝 廚廨���廡�� IRC 廩廚��廬 ���廖"
 
 #. host to connect to
-#: ../libpurple/protocols/irc/irc.c:965 ../libpurple/protocols/irc/msgs.c:325
-#: ../libpurple/protocols/msn/msn.c:2343
+#: ../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:6747
+#: ../libpurple/protocols/oscar/oscar.c:6763
 #: ../libpurple/protocols/qq/qq.c:756
-#: ../libpurple/protocols/sametime/sametime.c:5781
-#: ../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:2099
@@ -4407,11 +4738,12 @@
 msgstr "廩廨廬"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:968 ../libpurple/protocols/msn/msn.c:2348
+#: ../libpurple/protocols/irc/irc.c:968
+#: ../libpurple/protocols/msn/msn.c:2362
 #: ../libpurple/protocols/msnp9/msn.c:2202
-#: ../libpurple/protocols/oscar/oscar.c:6750
+#: ../libpurple/protocols/oscar/oscar.c:6766
 #: ../libpurple/protocols/qq/qq.c:759
-#: ../libpurple/protocols/sametime/sametime.c:5786
+#: ../libpurple/protocols/sametime/sametime.c:5787
 #: ../libpurple/protocols/silc/silc.c:2061
 #: ../libpurple/protocols/silc10/silc.c:1867
 #: ../libpurple/protocols/toc/toc.c:2331
@@ -4422,14 +4754,17 @@
 msgid "Encodings"
 msgstr "廡����"
 
-#: ../libpurple/protocols/irc/irc.c:974 ../libpurple/protocols/irc/msgs.c:318
-#: ../libpurple/protocols/jabber/jabber.c:964
-#: ../libpurple/protocols/jabber/jabber.c:966
+#: ../libpurple/protocols/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
@@ -4440,7 +4775,8 @@
 msgid "Username"
 msgstr "廩� �廩廬�廩"
 
-#: ../libpurple/protocols/irc/irc.c:977 ../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:926
 msgid "Real name"
@@ -4481,14 +4817,14 @@
 msgstr " <i>(�����)</i>"
 
 #: ../libpurple/protocols/irc/msgs.c:305
-#: ../libpurple/protocols/oscar/oscar.c:3733
-#: ../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 "�廨�廣 �-"
@@ -4542,115 +4878,113 @@
 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
-msgid ""
-"Your selected nickname was rejected by the server.  It probably contains "
-"invalid characters."
-msgstr "������ 廩��廨廬 ���� 廣\"� �廩廨廬. ��廨�� ��� ���� ��廬��廬 �� ��廡��廬."
-
 #: ../libpurple/protocols/irc/msgs.c:921
-msgid ""
-"Your selected account name was rejected by the server.  It probably contains "
-"invalid characters."
+msgid "Your selected nickname was rejected by the server.  It probably contains invalid characters."
+msgstr "������ 廩��廨廬 ���� 廣\"� �廩廨廬. ��廨�� ��� ���� ��廬��廬 �� ��廡��廬."
+
+#: ../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 "廩����: �廬廡�� PONG �� 廬廡廝 ��廩廨廬"
 
-#: ../libpurple/protocols/irc/msgs.c:1025
+#: ../libpurple/protocols/irc/msgs.c:1030
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "�廣�� PING �� ��廩���� 廩�: %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"
@@ -4660,73 +4994,40 @@
 msgstr "action &lt;廚廣��� ���廢�廣&gt;: 廚廣� 廚廣��� ."
 
 #: ../libpurple/protocols/irc/parse.c:123
-msgid ""
-"away [message]:  Set an away message, or use no message to return from being "
-"away."
-msgstr ""
-"away [���廣�]:  廡�廣 ���廣廬 廨���廡 ����廩�, �� �廩廬�廩 ��� ���廣� ����廨 ������廬."
+msgid "away [message]:  Set an away message, or use no message to return from being away."
+msgstr "away [���廣�]:  廡�廣 ���廣廬 廨���廡 ����廩�, �� �廩廬�廩 ��� ���廣� ����廨 ������廬."
 
 #: ../libpurple/protocols/irc/parse.c:124
 msgid "chanserv: Send a command to chanserv"
 msgstr "chanserv: 廩�� 廚廡��� �� chanserv"
 
 #: ../libpurple/protocols/irc/parse.c:125
-msgid ""
-"deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
-"someone. You must be a channel operator to do this."
-msgstr ""
-"deop &lt;廩�1&gt1; [廩�2] ...:  �廖廨 廖���廖 廩� �廚廣�� �廣廨�廛 ���廩��. ���� ����廬 "
-"�廚廣�� 廣廨�廛 ��� ��廢廣 廚廣��� ��."
+msgid "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from someone. You must be a channel operator to do this."
+msgstr "deop &lt;廩�1&gt1; [廩�2] ...:  �廖廨 廖���廖 廩� �廚廣�� �廣廨�廛 ���廩��. ���� ����廬 �廚廣�� 廣廨�廛 ��� ��廢廣 廚廣��� ��."
 
 #: ../libpurple/protocols/irc/parse.c:126
-msgid ""
-"devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
-"someone, preventing them from speaking if the channel is moderated (+m). You "
-"must be a channel operator to do this."
-msgstr ""
-"devoice &lt;廩�1&gt; [廩�2] ...:  �廖廨 ����廬 ����廨 �廣廨�廛 ���廩��, �廩廨 廨廡 ���廣 "
-"��� ���廨 �� �廣廨�廛 ��廢� 廩� 廬���� (+m). ���� ����廬 �廚廣�� 廣廨�廛 ��� ��廢廣 廚廣��� "
-"��."
+msgid "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from someone, preventing them from speaking if the channel is moderated (+m). You must be a channel operator to do this."
+msgstr "devoice &lt;廩�1&gt; [廩�2] ...:  �廖廨 ����廬 ����廨 �廣廨�廛 ���廩��, �廩廨 廨廡 ���廣 ��� ���廨 �� �廣廨�廛 ��廢� 廩� 廬���� (+m). ���� ����廬 �廚廣�� 廣廨�廛 ��� ��廢廣 廚廣��� ��."
 
 #: ../libpurple/protocols/irc/parse.c:127
-msgid ""
-"invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
-"channel, or the current channel."
-msgstr ""
-"invite &lt;廩�&gt; [��廨]:  ���� ��廩�� ��廢�廨廝 ���� �廣廨�廛 ��廬��, �� �廣廨�廛 "
-"������."
+msgid "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified channel, or the current channel."
+msgstr "invite &lt;廩�&gt; [��廨]:  ���� ��廩�� ��廢�廨廝 ���� �廣廨�廛 ��廬��, �� �廣廨�廛 ������."
 
 #: ../libpurple/protocols/irc/parse.c:128
-msgid ""
-"j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
-"channels, optionally providing a channel key for each if needed."
-msgstr ""
-"j &lt;��廨1&gt;[,��廨2][...] [�廚廬�1[,�廚廬�2][,...]]: ��� 廣廨�廛 ��� �� ��廬廨, 廣� "
-"�廚廩廨�廬 ����� �廚廬� ��� ��� �� ���廨��, �廩廣廬 �廢�廨�."
+msgid "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more channels, optionally providing a channel key for each if needed."
+msgstr "j &lt;��廨1&gt;[,��廨2][...] [�廚廬�1[,�廚廬�2][,...]]: ��� 廣廨�廛 ��� �� ��廬廨, 廣� �廚廩廨�廬 ����� �廚廬� ��� ��� �� ���廨��, �廩廣廬 �廢�廨�."
 
 #: ../libpurple/protocols/irc/parse.c:129
-msgid ""
-"join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
-"channels, optionally providing a channel key for each if needed."
-msgstr ""
-"join &lt;��廨1&gt;[,��廨2][...] [�廚廬�1[,�廚廬�2][,...]]: ��� 廣廨�廛 ��� �� ��廬廨, "
-"廣� �廚廩廨�廬 ����� �廚廬� ��� ��� �� ���廨��, �廩廣廬 �廢�廨�."
+msgid "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more channels, optionally providing a channel key for each if needed."
+msgstr "join &lt;��廨1&gt;[,��廨2][...] [�廚廬�1[,�廚廬�2][,...]]: ��� 廣廨�廛 ��� �� ��廬廨, 廣� �廚廩廨�廬 ����� �廚廬� ��� ��� �� ���廨��, �廩廣廬 �廢�廨�."
 
 #: ../libpurple/protocols/irc/parse.c:130
-msgid ""
-"kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
-"channel operator to do this."
-msgstr ""
-"kick &lt;廩� �����&gt; [���廣�]:  �廖廨 ��廩�� ��廣廨�廛. 廢廨�� ����廬 �廚廣�� �廣廨�廛 ��� "
-"�廣廩�廬 ��廬."
+msgid "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a channel operator to do this."
+msgstr "kick &lt;廩� �����&gt; [���廣�]:  �廖廨 ��廩�� ��廣廨�廛. 廢廨�� ����廬 �廚廣�� �廣廨�廛 ��� �廣廩�廬 ��廬."
 
 #: ../libpurple/protocols/irc/parse.c:131
-msgid ""
-"list:  Display a list of chat rooms on the network. <i>Warning, some servers "
-"may disconnect you upon doing this.</i>"
-msgstr ""
-"list: �廢� 廨廩��� 廩� ��廨� 廢'�� �廨廩廬. <i>���廨�, �廩 廩廨廬�� 廩��廬廡� ��廬� �廨�廣 ��廢�廣 "
-"廚廣��� ��.</i>"
+msgid "list:  Display a list of chat rooms on the network. <i>Warning, some servers may disconnect you upon doing this.</i>"
+msgstr "list: �廢� 廨廩��� 廩� ��廨� 廢'�� �廨廩廬. <i>���廨�, �廩 廩廨廬�� 廩��廬廡� ��廬� �廨�廣 ��廢�廣 廚廣��� ��.</i>"
 
 #: ../libpurple/protocols/irc/parse.c:132
 msgid "me &lt;action to perform&gt;:  Perform an action."
@@ -4737,26 +5038,19 @@
 msgstr "memoserv: 廩�� 廚廡��� �� memoserv"
 
 #: ../libpurple/protocols/irc/parse.c:134
-msgid ""
-"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
-"or user mode."
-msgstr ""
-"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;廩� �����|廣廨�廛&gt;:  廡�廣 �� �廖廨 �廢�� 廣廨�廛 "
-"�� �廩廬�廩."
+msgid "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel or user mode."
+msgstr "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;廩� �����|廣廨�廛&gt;:  廡�廣 �� �廖廨 �廢�� 廣廨�廛 �� �廩廬�廩."
 
 #: ../libpurple/protocols/irc/parse.c:135
-msgid ""
-"msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
-"opposed to a channel)."
-msgstr ""
-"msg &lt;廩� �����&gt; &lt;���廣�&gt;:  廩�� ���廣� 廚廨��廬 ��廩廬�廩 (������ �廣廨�廛)."
+msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as opposed to a channel)."
+msgstr "msg &lt;廩� �����&gt; &lt;���廣�&gt;:  廩�� ���廣� 廚廨��廬 ��廩廬�廩 (������ �廣廨�廛)."
 
 #: ../libpurple/protocols/irc/parse.c:136
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [廣廨�廛]:  �廢� �廬 廨廩��廬 ��廩廬�廩�� 廩�廨�廣 �廣廨�廛."
 
 #: ../libpurple/protocols/irc/parse.c:137
-#: ../libpurple/protocols/jabber/jabber.c:2348
+#: ../libpurple/protocols/jabber/jabber.c:2358
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;����� ��廩&gt;:  廩���� 廩� ������ 廩��."
 
@@ -4769,46 +5063,28 @@
 msgstr "me &lt;action&gt;:  廩�� ��廩廬�廩 �� 廢'�� �廬廨��."
 
 #: ../libpurple/protocols/irc/parse.c:140
-msgid ""
-"op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
-"must be a channel operator to do this."
-msgstr ""
-"op &lt;廩� �����1&gt; [廩� �����2] ...:  ��廬� 廖���廖 廩� �廚廣�� 廣廨�廛 ���廩��. 廣��� "
-"����廬 �廚廣�� 廣廨�廛 ��廢廣 廚廣��� ��."
+msgid "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You must be a channel operator to do this."
+msgstr "op &lt;廩� �����1&gt; [廩� �����2] ...:  ��廬� 廖���廖 廩� �廚廣�� 廣廨�廛 ���廩��. 廣��� ����廬 �廚廣�� 廣廨�廛 ��廢廣 廚廣��� ��."
 
 #: ../libpurple/protocols/irc/parse.c:141
-msgid ""
-"operwall &lt;message&gt;:  If you don't know what this is, you probably "
-"can't use it."
-msgstr ""
-"operwall &lt;���廣�&gt;:  �� ���� ���廣/廬 �� �� 廣�廩�, ��廨�� �廬/� �� ����/� "
-"��廩廬�廩 ���."
+msgid "operwall &lt;message&gt;:  If you don't know what this is, you probably can't use it."
+msgstr "operwall &lt;���廣�&gt;:  �� ���� ���廣/廬 �� �� 廣�廩�, ��廨�� �廬/� �� ����/� ��廩廬�廩 ���."
 
 #: ../libpurple/protocols/irc/parse.c:142
 msgid "operserv: Send a command to operserv"
 msgstr " operserv: 廩�� 廚廡��� �� operserv"
 
 #: ../libpurple/protocols/irc/parse.c:143
-msgid ""
-"part [room] [message]:  Leave the current channel, or a specified channel, "
-"with an optional message."
-msgstr ""
-"part [��廨] [���廣�]:  廣��� �廬 ���廨 ������, �� ��廨 �廖����, 廣� �廚廩廨�廬 ����廣�."
+msgid "part [room] [message]:  Leave the current channel, or a specified channel, with an optional message."
+msgstr "part [��廨] [���廣�]:  廣��� �廬 ���廨 ������, �� ��廨 �廖����, 廣� �廚廩廨�廬 ����廣�."
 
 #: ../libpurple/protocols/irc/parse.c:144
-msgid ""
-"ping [nick]:  Asks how much lag a user (or the server if no user specified) "
-"has."
-msgstr ""
-"ping [廩� �����]:  廩��� ��� ����廬 �廬���� 廩� �廩廬�廩 (�� 廩� �廩廨廬 �� �� 廢���� "
-"�廩廬�廩."
+msgid "ping [nick]:  Asks how much lag a user (or the server if no user specified) has."
+msgstr "ping [廩� �����]:  廩��� ��� ����廬 �廬���� 廩� �廩廬�廩 (�� 廩� �廩廨廬 �� �� 廢���� �廩廬�廩."
 
 #: ../libpurple/protocols/irc/parse.c:145
-msgid ""
-"query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
-"opposed to a channel)."
-msgstr ""
-"query &lt;廩� �廩廬�廩&gt; &lt;���廣�&gt;:  廩�� ���廣� 廚廨��廬 ��廩廬�廩 (������ �廣廨�廛)."
+msgid "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as opposed to a channel)."
+msgstr "query &lt;廩� �廩廬�廩&gt; &lt;���廣�&gt;:  廩�� ���廣� 廚廨��廬 ��廩廬�廩 (������ �廣廨�廛)."
 
 #: ../libpurple/protocols/irc/parse.c:146
 msgid "quit [message]:  Disconnect from the server, with an optional message."
@@ -4819,12 +5095,8 @@
 msgstr "quote [...]:  廩�� 廚廡��� �廩�廨�廬 �廩廨廬."
 
 #: ../libpurple/protocols/irc/parse.c:148
-msgid ""
-"remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
-"channel operator to do this."
-msgstr ""
-"remove &lt;廩� �����&gt; [���廣�]:  �廖廨 ��廩�� ���廨. 廢廨�� ����廬 �廚廣�� �廣廨�廛 "
-"��廢廣 廚廣��� ��."
+msgid "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a channel operator to do this."
+msgstr "remove &lt;廩� �����&gt; [���廣�]:  �廖廨 ��廩�� ���廨. 廢廨�� ����廬 �廚廣�� �廣廨�廛 ��廢廣 廚廣��� ��."
 
 #: ../libpurple/protocols/irc/parse.c:149
 msgid "time: Displays the current local time at the IRC server."
@@ -4843,19 +5115,12 @@
 msgstr "version [廩� �����]: 廩�� �廡廩� CTCP VERSION ��廩廬�廩"
 
 #: ../libpurple/protocols/irc/parse.c:153
-msgid ""
-"voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
-"must be a channel operator to do this."
-msgstr ""
-"voice &lt;廩� �����1&gt; [廩� �����2] ...:  廬� 廖���廖 ����廨 ���廩��. ���� ����廬 "
-"�廚廣�� �廣廨�廛 ��廢廣 廚廣��� ��."
+msgid "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You must be a channel operator to do this."
+msgstr "voice &lt;廩� �����1&gt; [廩� �����2] ...:  廬� 廖���廖 ����廨 ���廩��. ���� ����廬 �廚廣�� �廣廨�廛 ��廢廣 廚廣��� ��."
 
 #: ../libpurple/protocols/irc/parse.c:154
-msgid ""
-"wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
-"use it."
-msgstr ""
-"wallops &lt;���廣�&gt;:  �� ���� ���廣/廬 �� ��, �廬/� ��廨�� �� ���� ��廩廬�廩 ���."
+msgid "wallops &lt;message&gt;:  If you don't know what this is, you probably can't use it."
+msgstr "wallops &lt;���廣�&gt;:  �� ���� ���廣/廬 �� ��, �廬/� ��廨�� �� ���� ��廩廬�廩 ���."
 
 #: ../libpurple/protocols/irc/parse.c:155
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
@@ -4879,16 +5144,18 @@
 msgstr "�廣�� CTCP PING"
 
 #: ../libpurple/protocols/irc/parse.c:634
-#: ../libpurple/protocols/irc/parse.c:641 ../libpurple/protocols/toc/toc.c:191
-#: ../libpurple/protocols/toc/toc.c:694 ../libpurple/protocols/toc/toc.c:710
+#: ../libpurple/protocols/irc/parse.c:641
+#: ../libpurple/protocols/toc/toc.c:191
+#: ../libpurple/protocols/toc/toc.c:694
+#: ../libpurple/protocols/toc/toc.c:710
 #: ../libpurple/protocols/toc/toc.c:786
 msgid "Disconnected."
 msgstr "���廬廡."
 
 #: ../libpurple/protocols/jabber/adhoccommands.c:143
-#: ../libpurple/protocols/jabber/jabber.c:725
-#: ../libpurple/protocols/jabber/jabber.c:755
-#: ../libpurple/protocols/jabber/jabber.c:1932
+#: ../libpurple/protocols/jabber/jabber.c:735
+#: ../libpurple/protocols/jabber/jabber.c:765
+#: ../libpurple/protocols/jabber/jabber.c:1942
 msgid "Unknown Error"
 msgstr "廩���� �� ���廣�"
 
@@ -4910,605 +5177,597 @@
 msgstr "�廩廨廬 ��廨廩 ����廬 �� ��廢廚� �廣� 廬廡廩�廨廬 �� ��廢廚�廬"
 
 #: ../libpurple/protocols/jabber/auth.c:323
-#: ../libpurple/protocols/jabber/auth.c:526
-#, c-format
-msgid ""
-"%s requires plaintext authentication over an unencrypted connection.  Allow "
-"this and continue authentication?"
+#: ../libpurple/protocols/jabber/auth.c:532
+#, c-format
+msgid "%s requires plaintext authentication over an unencrypted connection.  Allow this and continue authentication?"
 msgstr "%s ��廨廩 ����廬 �� ��廢廚� �廣� 廬廡廩�廨廬 �� ��廢廚�廬. ��廚廩廨 ����廩�� ��� ��廬?"
 
 #: ../libpurple/protocols/jabber/auth.c:325
 #: ../libpurple/protocols/jabber/auth.c:326
-#: ../libpurple/protocols/jabber/auth.c:528
-#: ../libpurple/protocols/jabber/auth.c:529
-#: ../libpurple/protocols/jabber/auth.c:720
-#: ../libpurple/protocols/jabber/auth.c:721
+#: ../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:480
-#: ../libpurple/protocols/jabber/auth.c:653
-#: ../libpurple/protocols/jabber/auth.c:901
-#: ../libpurple/protocols/jabber/auth.c:1050
-#: ../libpurple/protocols/jabber/auth.c:1077
-#: ../libpurple/protocols/jabber/auth.c:1101
+#: ../libpurple/protocols/jabber/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:542
-#: ../libpurple/protocols/jabber/auth.c:733
+#: ../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:722
-msgid ""
-"This server requires plaintext authentication over an unencrypted "
-"connection.  Allow this and continue authentication?"
+#: ../libpurple/protocols/jabber/auth.c:728
+msgid "This server requires plaintext authentication over an unencrypted connection.  Allow this and continue authentication?"
 msgstr "�廩廨廬 ��廨廩 ����廬 �� ��廢廚� �廣� 廬廡廩�廨廬 �� ��廢廚�廬.���廩�� ��� ��廬?"
 
-#: ../libpurple/protocols/jabber/auth.c:924
-#: ../libpurple/protocols/jabber/auth.c:949
+#: ../libpurple/protocols/jabber/auth.c:930
+#: ../libpurple/protocols/jabber/auth.c:955
 msgid "Invalid challenge from server"
 msgstr "廬廩��廬 ����廬 �� 廬廡廚� ��廩廨廬"
 
-#: ../libpurple/protocols/jabber/auth.c:1023
+#: ../libpurple/protocols/jabber/auth.c:1031
 msgid "SASL error"
 msgstr "廩���廬 SASL"
 
-#: ../libpurple/protocols/jabber/buddy.c:283
-#: ../libpurple/protocols/jabber/buddy.c:1223
-#: ../libpurple/protocols/sametime/sametime.c:4182
-#: ../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:1235
-#: ../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:1238
+#: ../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:1024
+#: ../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:1286
+#: ../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:1283
+#: ../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:1289
+#: ../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:1292
+#: ../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:1295
+#: ../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:1299
+#: ../libpurple/protocols/jabber/buddy.c:321
+#: ../libpurple/protocols/jabber/buddy.c:1332
 #: ../libpurple/protocols/silc/silc.c:1158
 #: ../libpurple/protocols/silc10/silc.c:932
 msgid "Country"
 msgstr "�����"
 
-#: ../libpurple/protocols/jabber/buddy.c:294
-#: ../libpurple/protocols/jabber/buddy.c:1310
-#: ../libpurple/protocols/jabber/buddy.c:1317
+#: ../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:1354
+#: ../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:1357
+#: ../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:1366
+#: ../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:1254
-#: ../libpurple/protocols/msn/msn.c:1814
-#: ../libpurple/protocols/msnp9/msn.c:1670
-#: ../libpurple/protocols/oscar/oscar.c:3782
+#: ../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:1369
+#: ../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:3309
+#: ../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:724
-#: ../libpurple/protocols/jabber/buddy.c:725
+#: ../libpurple/protocols/jabber/buddy.c:752
+#: ../libpurple/protocols/jabber/buddy.c:753
 msgid "Edit XMPP vCard"
 msgstr "廣廨�� �廬 �- XMPP vCard"
 
-#: ../libpurple/protocols/jabber/buddy.c:726
-msgid ""
-"All items below are optional. Enter only the information with which you feel "
-"comfortable."
+#: ../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:797
-#: ../libpurple/protocols/jabber/buddy.c:962
-msgid "Client"
-msgstr "�廡��"
-
-#: ../libpurple/protocols/jabber/buddy.c:801
-#: ../libpurple/protocols/jabber/buddy.c:966
-msgid "Operating System"
-msgstr "�廣廨�廬 �廚廣��"
-
-#: ../libpurple/protocols/jabber/buddy.c:817
-#: ../libpurple/protocols/jabber/buddy.c:977
-msgid "Last Activity"
-msgstr "廚廣���廬 ��廨���"
-
-#: ../libpurple/protocols/jabber/buddy.c:819
-#: ../libpurple/protocols/jabber/buddy.c:979
-msgid "Service Discovery Info"
-msgstr "���廣 廩� 廩�廨�廬 廬���廬"
-
-#: ../libpurple/protocols/jabber/buddy.c:821
-#: ../libpurple/protocols/jabber/buddy.c:981
-msgid "Service Discovery Items"
-msgstr "廚廨��� 廩�廨�廬 廬���廬"
-
-#: ../libpurple/protocols/jabber/buddy.c:823
-#: ../libpurple/protocols/jabber/buddy.c:983
-msgid "Extended Stanza Addressing"
-msgstr "�廬���廬 ��廨���廬 �廖�����廬"
-
 #: ../libpurple/protocols/jabber/buddy.c:825
-#: ../libpurple/protocols/jabber/buddy.c:985
-msgid "Multi-User Chat"
-msgstr "廢'�� �廨��� �廩廬�廩��"
-
-#: ../libpurple/protocols/jabber/buddy.c:827
-#: ../libpurple/protocols/jabber/buddy.c:987
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "���廣 �����廬� �廢'�� �廨��� �廩廬�廩��"
+#: ../libpurple/protocols/jabber/buddy.c:990
+msgid "Client"
+msgstr "�廡��"
 
 #: ../libpurple/protocols/jabber/buddy.c:829
-#: ../libpurple/protocols/jabber/buddy.c:989
-msgid "In-Band Bytestreams"
-msgstr "�廨��-�廬���� �廚� �廖�廨"
-
-#: ../libpurple/protocols/jabber/buddy.c:831
-#: ../libpurple/protocols/jabber/buddy.c:991
-msgid "Ad-Hoc Commands"
-msgstr "廚廡���廬 �����廬"
-
-#: ../libpurple/protocols/jabber/buddy.c:833
-#: ../libpurple/protocols/jabber/buddy.c:993
-msgid "PubSub Service"
-msgstr "廩�廨�廬 PubSub"
-
-#: ../libpurple/protocols/jabber/buddy.c:835
-#: ../libpurple/protocols/jabber/buddy.c:995
-msgid "SOCKS5 Bytestreams"
-msgstr "�廨��-�廬���� 廩� SOCKS5"
-
-#: ../libpurple/protocols/jabber/buddy.c:837
-#: ../libpurple/protocols/jabber/buddy.c:997
-msgid "Out of Band Data"
-msgstr "���廣 廩�� �廚� 廖�廨"
-
-#: ../libpurple/protocols/jabber/buddy.c:839
-#: ../libpurple/protocols/jabber/buddy.c:999
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-#: ../libpurple/protocols/jabber/buddy.c:841
-#: ../libpurple/protocols/jabber/buddy.c:1001
-msgid "In-Band Registration"
-msgstr "廨�廩�� �廨� �廬�廨"
-
-#: ../libpurple/protocols/jabber/buddy.c:843
-#: ../libpurple/protocols/jabber/buddy.c:1003
-msgid "User Location"
-msgstr "��廡�� �廩廬�廩"
+#: ../libpurple/protocols/jabber/buddy.c:994
+msgid "Operating System"
+msgstr "�廣廨�廬 �廚廣��"
 
 #: ../libpurple/protocols/jabber/buddy.c:845
 #: ../libpurple/protocols/jabber/buddy.c:1005
-msgid "User Avatar"
-msgstr "廬���廬 �廩廬�廩"
+msgid "Last Activity"
+msgstr "廚廣���廬 ��廨���"
 
 #: ../libpurple/protocols/jabber/buddy.c:847
 #: ../libpurple/protocols/jabber/buddy.c:1007
-msgid "Chat State Notifications"
-msgstr "�廬廨廣�廬 廣� �廢�� 廢'��"
+msgid "Service Discovery Info"
+msgstr "���廣 廩� 廩�廨�廬 廬���廬"
 
 #: ../libpurple/protocols/jabber/buddy.c:849
 #: ../libpurple/protocols/jabber/buddy.c:1009
-msgid "Software Version"
-msgstr "��廨廖廬 廬����"
+msgid "Service Discovery Items"
+msgstr "廚廨��� 廩�廨�廬 廬���廬"
 
 #: ../libpurple/protocols/jabber/buddy.c:851
 #: ../libpurple/protocols/jabber/buddy.c:1011
-msgid "Stream Initiation"
-msgstr "��廬��� �廨�"
+msgid "Extended Stanza Addressing"
+msgstr "�廬���廬 ��廨���廬 �廖�����廬"
 
 #: ../libpurple/protocols/jabber/buddy.c:853
 #: ../libpurple/protocols/jabber/buddy.c:1013
-#: ../libpurple/protocols/sametime/sametime.c:3285
-msgid "File Transfer"
-msgstr "�廩��� 廡�廢��"
+msgid "Multi-User Chat"
+msgstr "廢'�� �廨��� �廩廬�廩��"
 
 #: ../libpurple/protocols/jabber/buddy.c:855
 #: ../libpurple/protocols/jabber/buddy.c:1015
-msgid "User Mood"
-msgstr "�廢�-廨�� ��廩廬�廩"
+msgid "Multi-User Chat Extended Presence Information"
+msgstr "���廣 �����廬� �廢'�� �廨��� �廩廬�廩��"
 
 #: ../libpurple/protocols/jabber/buddy.c:857
 #: ../libpurple/protocols/jabber/buddy.c:1017
-msgid "User Activity"
-msgstr "廚廣���廬 �廩廬�廩"
+msgid "In-Band Bytestreams"
+msgstr "�廨��-�廬���� �廚� �廖�廨"
 
 #: ../libpurple/protocols/jabber/buddy.c:859
 #: ../libpurple/protocols/jabber/buddy.c:1019
-msgid "Entity Capabilities"
-msgstr "�����廬 �廩�廬"
+msgid "Ad-Hoc Commands"
+msgstr "廚廡���廬 �����廬"
 
 #: ../libpurple/protocols/jabber/buddy.c:861
 #: ../libpurple/protocols/jabber/buddy.c:1021
-msgid "Encrypted Session Negotiations"
-msgstr "��廡���� �����廨 ��廢廚�"
+msgid "PubSub Service"
+msgstr "廩�廨�廬 PubSub"
 
 #: ../libpurple/protocols/jabber/buddy.c:863
 #: ../libpurple/protocols/jabber/buddy.c:1023
-msgid "User Tune"
-msgstr "廩�廨 �廩廬�廩"
+msgid "SOCKS5 Bytestreams"
+msgstr "�廨��-�廬���� 廩� SOCKS5"
 
 #: ../libpurple/protocols/jabber/buddy.c:865
 #: ../libpurple/protocols/jabber/buddy.c:1025
-msgid "Roster Item Exchange"
-msgstr "���廚廬 廚廨��� 廨廩���"
+msgid "Out of Band Data"
+msgstr "���廣 廩�� �廚� 廖�廨"
 
 #: ../libpurple/protocols/jabber/buddy.c:867
 #: ../libpurple/protocols/jabber/buddy.c:1027
-msgid "Reachability Address"
-msgstr "�廬��廬 �����廬"
+msgid "XHTML-IM"
+msgstr "XHTML-IM"
 
 #: ../libpurple/protocols/jabber/buddy.c:869
 #: ../libpurple/protocols/jabber/buddy.c:1029
-msgid "User Profile"
-msgstr "廚廨�廚�� �廩廬�廩"
+msgid "In-Band Registration"
+msgstr "廨�廩�� �廨� �廬�廨"
 
 #: ../libpurple/protocols/jabber/buddy.c:871
 #: ../libpurple/protocols/jabber/buddy.c:1031
-msgid "Jingle"
-msgstr "�'����"
+msgid "User Location"
+msgstr "��廡�� �廩廬�廩"
 
 #: ../libpurple/protocols/jabber/buddy.c:873
 #: ../libpurple/protocols/jabber/buddy.c:1033
-msgid "Jingle Audio"
-msgstr "廢��� �'����"
+msgid "User Avatar"
+msgstr "廬���廬 �廩廬�廩"
 
 #: ../libpurple/protocols/jabber/buddy.c:875
 #: ../libpurple/protocols/jabber/buddy.c:1035
-msgid "User Nickname"
-msgstr "����� �廩廬�廩"
+msgid "Chat State Notifications"
+msgstr "�廬廨廣�廬 廣� �廢�� 廢'��"
 
 #: ../libpurple/protocols/jabber/buddy.c:877
 #: ../libpurple/protocols/jabber/buddy.c:1037
-msgid "Jingle ICE UDP"
-msgstr "�'���� ICE UDP"
+msgid "Software Version"
+msgstr "��廨廖廬 廬����"
 
 #: ../libpurple/protocols/jabber/buddy.c:879
 #: ../libpurple/protocols/jabber/buddy.c:1039
-msgid "Jingle ICE TCP"
-msgstr "�'���� ICE TCP"
+msgid "Stream Initiation"
+msgstr "��廬��� �廨�"
 
 #: ../libpurple/protocols/jabber/buddy.c:881
 #: ../libpurple/protocols/jabber/buddy.c:1041
-msgid "Jingle Raw UDP"
-msgstr "�'���� UDP ��-�廣���"
+#: ../libpurple/protocols/sametime/sametime.c:3286
+msgid "File Transfer"
+msgstr "�廩��� 廡�廢��"
 
 #: ../libpurple/protocols/jabber/buddy.c:883
 #: ../libpurple/protocols/jabber/buddy.c:1043
-msgid "Jingle Video"
-msgstr "�'���� �����"
+msgid "User Mood"
+msgstr "�廢�-廨�� ��廩廬�廩"
 
 #: ../libpurple/protocols/jabber/buddy.c:885
 #: ../libpurple/protocols/jabber/buddy.c:1045
-msgid "Jingle DTMF"
-msgstr "�'���� DTMF"
+msgid "User Activity"
+msgstr "廚廣���廬 �廩廬�廩"
 
 #: ../libpurple/protocols/jabber/buddy.c:887
 #: ../libpurple/protocols/jabber/buddy.c:1047
-msgid "Message Receipts"
-msgstr "廡���廬 ���廣�廬"
+msgid "Entity Capabilities"
+msgstr "�����廬 �廩�廬"
 
 #: ../libpurple/protocols/jabber/buddy.c:889
 #: ../libpurple/protocols/jabber/buddy.c:1049
-msgid "Public Key Publishing"
-msgstr "廚�廨廖�� �廚廬� 廢���廨�"
+msgid "Encrypted Session Negotiations"
+msgstr "��廡���� �����廨 ��廢廚�"
 
 #: ../libpurple/protocols/jabber/buddy.c:891
 #: ../libpurple/protocols/jabber/buddy.c:1051
-msgid "User Chatting"
-msgstr "�廩廬�廩 �廢'���"
+msgid "User Tune"
+msgstr "廩�廨 �廩廬�廩"
 
 #: ../libpurple/protocols/jabber/buddy.c:893
 #: ../libpurple/protocols/jabber/buddy.c:1053
-msgid "User Browsing"
-msgstr "�廩廬�廩 ���廩"
+msgid "Roster Item Exchange"
+msgstr "���廚廬 廚廨��� 廨廩���"
 
 #: ../libpurple/protocols/jabber/buddy.c:895
 #: ../libpurple/protocols/jabber/buddy.c:1055
-msgid "User Gaming"
-msgstr "�廩廬�廩 �廩�廡"
+msgid "Reachability Address"
+msgstr "�廬��廬 �����廬"
 
 #: ../libpurple/protocols/jabber/buddy.c:897
 #: ../libpurple/protocols/jabber/buddy.c:1057
-msgid "User Viewing"
-msgstr "�廩廬�廩 廢�廚�"
+msgid "User Profile"
+msgstr "廚廨�廚�� �廩廬�廩"
 
 #: ../libpurple/protocols/jabber/buddy.c:899
 #: ../libpurple/protocols/jabber/buddy.c:1059
-#: ../libpurple/protocols/silc/ops.c:1600
-#: ../libpurple/protocols/silc/ops.c:1605
+msgid "Jingle"
+msgstr "�'����"
+
+#: ../libpurple/protocols/jabber/buddy.c:901
+#: ../libpurple/protocols/jabber/buddy.c:1061
+msgid "Jingle Audio"
+msgstr "廢��� �'����"
+
+#: ../libpurple/protocols/jabber/buddy.c:903
+#: ../libpurple/protocols/jabber/buddy.c:1063
+msgid "User Nickname"
+msgstr "����� �廩廬�廩"
+
+#: ../libpurple/protocols/jabber/buddy.c:905
+#: ../libpurple/protocols/jabber/buddy.c:1065
+msgid "Jingle ICE UDP"
+msgstr "�'���� ICE UDP"
+
+#: ../libpurple/protocols/jabber/buddy.c:907
+#: ../libpurple/protocols/jabber/buddy.c:1067
+msgid "Jingle ICE TCP"
+msgstr "�'���� ICE TCP"
+
+#: ../libpurple/protocols/jabber/buddy.c:909
+#: ../libpurple/protocols/jabber/buddy.c:1069
+msgid "Jingle Raw UDP"
+msgstr "�'���� UDP ��-�廣���"
+
+#: ../libpurple/protocols/jabber/buddy.c:911
+#: ../libpurple/protocols/jabber/buddy.c:1071
+msgid "Jingle Video"
+msgstr "�'���� �����"
+
+#: ../libpurple/protocols/jabber/buddy.c:913
+#: ../libpurple/protocols/jabber/buddy.c:1073
+msgid "Jingle DTMF"
+msgstr "�'���� 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:901
-#: ../libpurple/protocols/jabber/buddy.c:1061
+#: ../libpurple/protocols/jabber/buddy.c:929
+#: ../libpurple/protocols/jabber/buddy.c:1089
 msgid "Stanza Encryption"
 msgstr "�廢廚�廬 廖����"
 
-#: ../libpurple/protocols/jabber/buddy.c:903
-#: ../libpurple/protocols/jabber/buddy.c:1063
+#: ../libpurple/protocols/jabber/buddy.c:931
+#: ../libpurple/protocols/jabber/buddy.c:1091
 msgid "Entity Time"
 msgstr "��� �廩�廬"
 
-#: ../libpurple/protocols/jabber/buddy.c:905
-#: ../libpurple/protocols/jabber/buddy.c:1065
+#: ../libpurple/protocols/jabber/buddy.c:933
+#: ../libpurple/protocols/jabber/buddy.c:1093
 msgid "Delayed Delivery"
 msgstr "�廩��� �廣���"
 
-#: ../libpurple/protocols/jabber/buddy.c:907
-#: ../libpurple/protocols/jabber/buddy.c:1067
+#: ../libpurple/protocols/jabber/buddy.c:935
+#: ../libpurple/protocols/jabber/buddy.c:1095
 msgid "Collaborative Data Objects"
 msgstr "�����廡�� ���廣 廩�廬�廚���"
 
-#: ../libpurple/protocols/jabber/buddy.c:909
-#: ../libpurple/protocols/jabber/buddy.c:1069
+#: ../libpurple/protocols/jabber/buddy.c:937
+#: ../libpurple/protocols/jabber/buddy.c:1097
 msgid "File Repository and Sharing"
 msgstr "廖廚廨��廬 廡�廢�� �廩�廬�廝"
 
-#: ../libpurple/protocols/jabber/buddy.c:911
-#: ../libpurple/protocols/jabber/buddy.c:1071
+#: ../libpurple/protocols/jabber/buddy.c:939
+#: ../libpurple/protocols/jabber/buddy.c:1099
 msgid "STUN Service Discovery for Jingle"
 msgstr "廩�廨�廬 廬���廬 STUN 廣��廨 �'����"
 
-#: ../libpurple/protocols/jabber/buddy.c:913
-#: ../libpurple/protocols/jabber/buddy.c:1073
+#: ../libpurple/protocols/jabber/buddy.c:941
+#: ../libpurple/protocols/jabber/buddy.c:1101
 msgid "Simplified Encrypted Session Negotiation"
 msgstr "��廡�� 廚廩�� �����廨 ���廢廚�"
 
-#: ../libpurple/protocols/jabber/buddy.c:915
-#: ../libpurple/protocols/jabber/buddy.c:1075
+#: ../libpurple/protocols/jabber/buddy.c:943
+#: ../libpurple/protocols/jabber/buddy.c:1103
 msgid "Hop Check"
 msgstr "���廡廬 廡廚�廢�廬"
 
-#: ../libpurple/protocols/jabber/buddy.c:923
-#: ../libpurple/protocols/jabber/buddy.c:1083
-#: ../libpurple/protocols/oscar/oscar.c:2967
+#: ../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:935
+#: ../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:937
-#: ../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/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:1241
-#: ../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:1274
-#: ../libpurple/protocols/jabber/jabber.c:1004
-#: ../libpurple/protocols/oscar/oscar.c:3821
-#: ../libpurple/protocols/oscar/oscar.c:3834
+#: ../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:1280
+#: ../libpurple/protocols/jabber/buddy.c:1313
 msgid "P.O. Box"
 msgstr "廬��廬 ���廨"
 
-#: ../libpurple/protocols/jabber/buddy.c:1390
+#: ../libpurple/protocols/jabber/buddy.c:1423
 msgid "Photo"
 msgstr "廬廢���"
 
-#: ../libpurple/protocols/jabber/buddy.c:1390
+#: ../libpurple/protocols/jabber/buddy.c:1423
 msgid "Logo"
 msgstr "廖��"
 
-#: ../libpurple/protocols/jabber/buddy.c:1949
+#: ../libpurple/protocols/jabber/buddy.c:1992
 msgid "Un-hide From"
 msgstr "�廢� 廬���廬"
 
-#: ../libpurple/protocols/jabber/buddy.c:1953
+#: ../libpurple/protocols/jabber/buddy.c:1996
 msgid "Temporarily Hide From"
 msgstr "�廖廬廨 �廬 �廬���廬 ����廬"
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1961
+#: ../libpurple/protocols/jabber/buddy.c:2004
 msgid "Cancel Presence Notification"
 msgstr "��� �廬廨廣廬 �����廬"
 
-#: ../libpurple/protocols/jabber/buddy.c:1968
+#: ../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:1977
+#: ../libpurple/protocols/jabber/buddy.c:2020
 msgid "Unsubscribe"
 msgstr "��� �廬 �����"
 
-#: ../libpurple/protocols/jabber/buddy.c:1992
+#: ../libpurple/protocols/jabber/buddy.c:2035
 msgid "Log In"
 msgstr "�廬��廨"
 
-#: ../libpurple/protocols/jabber/buddy.c:1996
+#: ../libpurple/protocols/jabber/buddy.c:2039
 msgid "Log Out"
 msgstr "�廬�廬廡"
 
-#: ../libpurple/protocols/jabber/buddy.c:2042
-#: ../libpurple/protocols/jabber/jabber.c:1613
+#: ../libpurple/protocols/jabber/buddy.c:2085
+#: ../libpurple/protocols/jabber/jabber.c:1623
 msgid "Chatty"
 msgstr "廚�廚��"
 
-#: ../libpurple/protocols/jabber/buddy.c:2046
+#: ../libpurple/protocols/jabber/buddy.c:2089
 msgid "Extended Away"
 msgstr "�廣�廨�廬 ���廩�廬"
 
-#: ../libpurple/protocols/jabber/buddy.c:2048
-#: ../libpurple/protocols/jabber/jabber.c:1655
-#: ../libpurple/protocols/oscar/oscar.c:726
-#: ../libpurple/protocols/oscar/oscar.c:5911
-#: ../libpurple/protocols/sametime/sametime.c:3347
+#: ../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:2215
+#: ../libpurple/protocols/jabber/buddy.c:2258
 msgid "JID"
 msgstr "JID"
 
-#: ../libpurple/protocols/jabber/buddy.c:2219
-#: ../libpurple/protocols/jabber/buddy.c:2408
-#: ../libpurple/protocols/oscar/oscar.c:3744
+#: ../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:2251
+#: ../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:2336
-msgid ""
-"Find a contact by entering the search criteria in the given fields. Note: "
-"Each field supports wild card searches (%)"
-msgstr ""
-"�廢� ��廩 廡廩廨 廣� ��� ���� 廡廨��廨����� ���廚�廩 �廩��廬 ��廬����. �廣廨�: �� 廩�� 廬��� "
-"���廚�廩�� 廣� ��廬��廬 ���廚��廬 (%)"
-
-#: ../libpurple/protocols/jabber/buddy.c:2356
+#: ../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 (%)"
+msgstr "�廢� ��廩 廡廩廨 廣� ��� ���� 廡廨��廨����� ���廚�廩 �廩��廬 ��廬����. �廣廨�: �� 廩�� 廬��� ���廚�廩�� 廣� ��廬��廬 ���廚��廬 (%)"
+
+#: ../libpurple/protocols/jabber/buddy.c:2399
 msgid "Directory Query Failed"
 msgstr "廩���� �廩���廬廬 �廖廚廨���"
 
-#: ../libpurple/protocols/jabber/buddy.c:2357
+#: ../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:2391
+#: ../libpurple/protocols/jabber/buddy.c:2434
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "�����廬 廩廨廬: %s"
 
-#: ../libpurple/protocols/jabber/buddy.c:2398
+#: ../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:2418
+#: ../libpurple/protocols/jabber/buddy.c:2461
 #: ../libpurple/protocols/novell/novell.c:1497
-#: ../libpurple/protocols/oscar/oscar.c:3747
-#: ../libpurple/protocols/oscar/oscar.c:3756
+#: ../libpurple/protocols/oscar/oscar.c:3761
+#: ../libpurple/protocols/oscar/oscar.c:3770
 msgid "E-Mail Address"
 msgstr "�廬��廬 ���\"�"
 
-#: ../libpurple/protocols/jabber/buddy.c:2427
-#: ../libpurple/protocols/jabber/buddy.c:2428
+#: ../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:2429
+#: ../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:177
 #: ../libpurple/protocols/qq/sys_msg.c:253
 #: ../libpurple/protocols/qq/sys_msg.c:271
-#: ../libpurple/protocols/sametime/sametime.c:5665
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:470
+#: ../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:2444
+#: ../libpurple/protocols/jabber/buddy.c:2487
 msgid "Invalid Directory"
 msgstr "廖廚廨��� �� ��廡�廬"
 
-#: ../libpurple/protocols/jabber/buddy.c:2461
+#: ../libpurple/protocols/jabber/buddy.c:2504
 msgid "Enter a User Directory"
 msgstr "��廖 �廖廚廨��廬 �廩廬�廩"
 
-#: ../libpurple/protocols/jabber/buddy.c:2462
+#: ../libpurple/protocols/jabber/buddy.c:2505
 msgid "Select a user directory to search"
 msgstr "��廨 廖廚廨��廬 �廩廬�廩 ���廚�廩"
 
-#: ../libpurple/protocols/jabber/buddy.c:2465
+#: ../libpurple/protocols/jabber/buddy.c:2508
 msgid "Search Directory"
 msgstr "�廚廩 �廖廚廨���"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5391
+#: ../libpurple/protocols/oscar/oscar.c:5417
 #: ../libpurple/protocols/yahoo/yahoochat.c:1057
 msgid "_Room:"
 msgstr "_��廨:"
@@ -5578,7 +5837,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 "廩���� �廣廬 ��廨�廬 廨廩��廬 ���廨��"
@@ -5613,15 +5872,15 @@
 msgid "Ping timeout"
 msgstr "廚��� �� ��廨 ����"
 
-#: ../libpurple/protocols/jabber/jabber.c:448
-#: ../libpurple/protocols/jabber/jabber.c:488
+#: ../libpurple/protocols/jabber/jabber.c:451
+#: ../libpurple/protocols/jabber/jabber.c:491
 msgid "Read Error"
 msgstr "廩���� �廡廨���"
 
-#: ../libpurple/protocols/jabber/jabber.c:525
+#: ../libpurple/protocols/jabber/jabber.c:528
 #: ../libpurple/protocols/oscar/flap_connection.c:398
-#: ../libpurple/protocols/yahoo/yahoo.c:2576
-#: ../libpurple/protocols/yahoo/yahoo.c:2608
+#: ../libpurple/protocols/yahoo/yahoo.c:2594
+#: ../libpurple/protocols/yahoo/yahoo.c:2626
 #, c-format
 msgid ""
 "Could not establish a connection with the server:\n"
@@ -5630,638 +5889,628 @@
 "�� ��廬� ��廢�廨 ����廨 廣� �廩廨廬:\n"
 "%s"
 
-#: ../libpurple/protocols/jabber/jabber.c:575
+#: ../libpurple/protocols/jabber/jabber.c:585
 msgid "Unable to create socket"
 msgstr "��� �廚廩廨�廬 ��廢�廨 廩廡廣"
 
-#: ../libpurple/protocols/jabber/jabber.c:625
-#: ../libpurple/protocols/jabber/jabber.c:1110
+#: ../libpurple/protocols/jabber/jabber.c:635
+#: ../libpurple/protocols/jabber/jabber.c:1120
 msgid "Invalid XMPP ID"
 msgstr "���� XMPP �� 廬廡��"
 
-#: ../libpurple/protocols/jabber/jabber.c:632
+#: ../libpurple/protocols/jabber/jabber.c:642
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "���� XMPP 廩���. �廩 �����廨 �廬 �������."
 
-#: ../libpurple/protocols/jabber/jabber.c:710
+#: ../libpurple/protocols/jabber/jabber.c:720
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "�廨�廩�� 廩� %s@%s ��廢廣 ��廢���"
 
-#: ../libpurple/protocols/jabber/jabber.c:716
+#: ../libpurple/protocols/jabber/jabber.c:726
 #, c-format
 msgid "Registration to %s successful"
 msgstr "�廨�廩�� �� %s ��廢廣 ��廢���"
 
-#: ../libpurple/protocols/jabber/jabber.c:718
-#: ../libpurple/protocols/jabber/jabber.c:719
+#: ../libpurple/protocols/jabber/jabber.c:728
+#: ../libpurple/protocols/jabber/jabber.c:729
 msgid "Registration Successful"
 msgstr "廨�廩�� ��廢廣 ��廢���"
 
-#: ../libpurple/protocols/jabber/jabber.c:727
-#: ../libpurple/protocols/jabber/jabber.c:728
+#: ../libpurple/protocols/jabber/jabber.c:737
+#: ../libpurple/protocols/jabber/jabber.c:738
 msgid "Registration Failed"
 msgstr "�廨�廩�� ��廩�"
 
-#: ../libpurple/protocols/jabber/jabber.c:746
+#: ../libpurple/protocols/jabber/jabber.c:756
 #, c-format
 msgid "Registration from %s successfully removed"
 msgstr "�廖廨廬 �廨�廩�� �� %s ��廢廣� ��廢���"
 
-#: ../libpurple/protocols/jabber/jabber.c:748
-#: ../libpurple/protocols/jabber/jabber.c:749
+#: ../libpurple/protocols/jabber/jabber.c:758
+#: ../libpurple/protocols/jabber/jabber.c:759
 msgid "Unregistration Successful"
 msgstr "�廖廨廬 �廨�廩�� �廢����"
 
-#: ../libpurple/protocols/jabber/jabber.c:757
-#: ../libpurple/protocols/jabber/jabber.c:758
+#: ../libpurple/protocols/jabber/jabber.c:767
+#: ../libpurple/protocols/jabber/jabber.c:768
 msgid "Unregistration Failed"
 msgstr "�廖廨廬 �廨�廩�� ��廩��"
 
-#: ../libpurple/protocols/jabber/jabber.c:924
-#: ../libpurple/protocols/jabber/jabber.c:925
+#: ../libpurple/protocols/jabber/jabber.c:934
+#: ../libpurple/protocols/jabber/jabber.c:935
 msgid "Already Registered"
 msgstr "������ ��廨 廨廩��."
 
-#: ../libpurple/protocols/jabber/jabber.c:1012
-#: ../libpurple/protocols/oscar/oscar.c:3823
-#: ../libpurple/protocols/oscar/oscar.c:3836
+#: ../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:1016
+#: ../libpurple/protocols/jabber/jabber.c:1026
 msgid "Postal code"
 msgstr "��廡��"
 
-#: ../libpurple/protocols/jabber/jabber.c:1020
-#: ../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:689
-#: ../libpurple/protocols/silc10/util.c:553
+#: ../libpurple/protocols/silc10/util.c:557
 msgid "Phone"
 msgstr "��廚��"
 
-#: ../libpurple/protocols/jabber/jabber.c:1028
+#: ../libpurple/protocols/jabber/jabber.c:1038
 msgid "Date"
 msgstr "廬�廨��"
 
-#: ../libpurple/protocols/jabber/jabber.c:1032
+#: ../libpurple/protocols/jabber/jabber.c:1042
 msgid "Unregister"
 msgstr "�廖廨 廨�廩��"
 
-#: ../libpurple/protocols/jabber/jabber.c:1039
-msgid ""
-"Please fill out the information below to change your account registration."
+#: ../libpurple/protocols/jabber/jabber.c:1049
+msgid "Please fill out the information below to change your account registration."
 msgstr ".�廩 ����� �廬 ����廣 ���� ��� �廩��廬 �廬 廨�廩�� ��廩��� 廩��"
 
-#: ../libpurple/protocols/jabber/jabber.c:1042
+#: ../libpurple/protocols/jabber/jabber.c:1052
 msgid "Please fill out the information below to register your new account."
 msgstr ".�廩 ����� �廬 ����廣 ���� ��� �廨廩�� �廬 ��廩��� ���廩 廩��"
 
-#: ../libpurple/protocols/jabber/jabber.c:1050
-#: ../libpurple/protocols/jabber/jabber.c:1051
+#: ../libpurple/protocols/jabber/jabber.c:1060
+#: ../libpurple/protocols/jabber/jabber.c:1061
 msgid "Register New XMPP Account"
 msgstr "廨廩�� �廩��� XMPP ��廩"
 
-#: ../libpurple/protocols/jabber/jabber.c:1052
-#: ../libpurple/protocols/jabber/jabber.c:1061
+#: ../libpurple/protocols/jabber/jabber.c:1062
+#: ../libpurple/protocols/jabber/jabber.c:1071
 msgid "Register"
 msgstr "�廨廩�"
 
-#: ../libpurple/protocols/jabber/jabber.c:1057
+#: ../libpurple/protocols/jabber/jabber.c:1067
 #, c-format
 msgid "Change Account Registration at %s"
 msgstr "廩�� 廨�廩�� �廩��� �廢� %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1058
+#: ../libpurple/protocols/jabber/jabber.c:1068
 #, c-format
 msgid "Register New Account at %s"
 msgstr "廨廩�� �廩��� ��廩 �廢� %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1061
+#: ../libpurple/protocols/jabber/jabber.c:1071
 msgid "Change Registration"
 msgstr "廩�� 廨�廩��"
 
-#: ../libpurple/protocols/jabber/jabber.c:1170
-#: ../libpurple/protocols/jabber/jabber.c:1171
+#: ../libpurple/protocols/jabber/jabber.c:1180
+#: ../libpurple/protocols/jabber/jabber.c:1181
 msgid "Error unregistering account"
 msgstr "廩���� �廨�廩�� �廩���"
 
-#: ../libpurple/protocols/jabber/jabber.c:1176
-#: ../libpurple/protocols/jabber/jabber.c:1177
+#: ../libpurple/protocols/jabber/jabber.c:1186
+#: ../libpurple/protocols/jabber/jabber.c:1187
 msgid "Account successfully unregistered"
 msgstr "��廩��� �廨廩� ��廢���"
 
-#: ../libpurple/protocols/jabber/jabber.c:1340
+#: ../libpurple/protocols/jabber/jabber.c:1350
 msgid "Initializing Stream"
 msgstr "��廬�� �廨�"
 
-#: ../libpurple/protocols/jabber/jabber.c:1345
+#: ../libpurple/protocols/jabber/jabber.c:1355
 msgid "Initializing SSL/TLS"
 msgstr "��廬��� SSL/TLS"
 
-#: ../libpurple/protocols/jabber/jabber.c:1349
+#: ../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:1358
+#: ../libpurple/protocols/jabber/jabber.c:1368
 msgid "Re-initializing Stream"
 msgstr "��廬�� �廬 ��廨� ���廩"
 
-#: ../libpurple/protocols/jabber/jabber.c:1452
-#: ../libpurple/protocols/jabber/jabber.c:1910
-#: ../libpurple/protocols/jabber/jabber.c:1953
-#: ../libpurple/protocols/jabber/jabber.c:1991
-#: ../libpurple/protocols/oscar/oscar.c:825
-#: ../libpurple/protocols/oscar/oscar.c:5705
+#: ../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:1500
+#: ../libpurple/protocols/jabber/jabber.c:1510
 msgid "Both"
 msgstr "廩����"
 
-#: ../libpurple/protocols/jabber/jabber.c:1502
+#: ../libpurple/protocols/jabber/jabber.c:1512
 msgid "From (To pending)"
 msgstr "��廬 (�� ��廩��)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1504
+#: ../libpurple/protocols/jabber/jabber.c:1514
 msgid "From"
 msgstr "��廬"
 
-#: ../libpurple/protocols/jabber/jabber.c:1507
+#: ../libpurple/protocols/jabber/jabber.c:1517
 msgid "To"
 msgstr "��"
 
-#: ../libpurple/protocols/jabber/jabber.c:1509
+#: ../libpurple/protocols/jabber/jabber.c:1519
 msgid "None (To pending)"
 msgstr "��� (�� ��廩��)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1511
+#: ../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:1514
+#: ../libpurple/protocols/jabber/jabber.c:1524
 msgid "Subscription"
 msgstr "����"
 
-#: ../libpurple/protocols/jabber/jabber.c:1524
-#: ../libpurple/protocols/jabber/jabber.c:1527
-#: ../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/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:1536
-#: ../libpurple/protocols/msn/msn.c:642
+#: ../libpurple/protocols/jabber/jabber.c:1546
+#: ../libpurple/protocols/msn/msn.c:656
 msgid "Now Listening"
 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: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:1605
-#: ../libpurple/protocols/jabber/jabber.c:1619
-#: ../libpurple/protocols/jabber/jabber.c:1633
-#: ../libpurple/protocols/jabber/jabber.c:1647
-#: ../libpurple/protocols/jabber/jabber.c:1661
+#: ../libpurple/protocols/jabber/jabber.c:1615
+#: ../libpurple/protocols/jabber/jabber.c:1629
+#: ../libpurple/protocols/jabber/jabber.c:1643
+#: ../libpurple/protocols/jabber/jabber.c:1657
+#: ../libpurple/protocols/jabber/jabber.c:1671
 msgid "Allow Buzz"
 msgstr "�廚廩廨 ������"
 
-#: ../libpurple/protocols/jabber/jabber.c:1679
+#: ../libpurple/protocols/jabber/jabber.c:1689
 msgid "Tune Artist"
 msgstr "��� �廩�廨"
 
-#: ../libpurple/protocols/jabber/jabber.c:1680
+#: ../libpurple/protocols/jabber/jabber.c:1690
 msgid "Tune Title"
 msgstr "廩� �廩�廨"
 
-#: ../libpurple/protocols/jabber/jabber.c:1681
+#: ../libpurple/protocols/jabber/jabber.c:1691
 msgid "Tune Album"
 msgstr "����� �廩�廨"
 
-#: ../libpurple/protocols/jabber/jabber.c:1682
+#: ../libpurple/protocols/jabber/jabber.c:1692
 msgid "Tune Genre"
 msgstr "�'��廨 �廩�廨"
 
-#: ../libpurple/protocols/jabber/jabber.c:1683
+#: ../libpurple/protocols/jabber/jabber.c:1693
 msgid "Tune Comment"
 msgstr "�廣廨廬 �廩�廨"
 
-#: ../libpurple/protocols/jabber/jabber.c:1684
+#: ../libpurple/protocols/jabber/jabber.c:1694
 msgid "Tune Track"
 msgstr "�廖廚廨 �廩�廨 ���廖廡"
 
-#: ../libpurple/protocols/jabber/jabber.c:1685
+#: ../libpurple/protocols/jabber/jabber.c:1695
 msgid "Tune Time"
 msgstr "��� �廩�廨"
 
-#: ../libpurple/protocols/jabber/jabber.c:1686
+#: ../libpurple/protocols/jabber/jabber.c:1696
 msgid "Tune Year"
 msgstr "廩�廬 �廩�廨"
 
-#: ../libpurple/protocols/jabber/jabber.c:1687
+#: ../libpurple/protocols/jabber/jabber.c:1697
 msgid "Tune URL"
 msgstr "�廬��廬 �廩�廨"
 
-#: ../libpurple/protocols/jabber/jabber.c:1703
+#: ../libpurple/protocols/jabber/jabber.c:1713
 msgid "Password Changed"
 msgstr "廖�廖�� 廩��廬�"
 
-#: ../libpurple/protocols/jabber/jabber.c:1704
+#: ../libpurple/protocols/jabber/jabber.c:1714
 msgid "Your password has been changed."
 msgstr "�廖�廖�� 廩�� 廩��廬�."
 
-#: ../libpurple/protocols/jabber/jabber.c:1710
-#: ../libpurple/protocols/jabber/jabber.c:1711
+#: ../libpurple/protocols/jabber/jabber.c:1720
+#: ../libpurple/protocols/jabber/jabber.c:1721
 msgid "Error changing password"
 msgstr "廩���� ����� 廩���� �廖�廖��"
 
-#: ../libpurple/protocols/jabber/jabber.c:1768
+#: ../libpurple/protocols/jabber/jabber.c:1778
 msgid "Password (again)"
 msgstr "廖�廖�� (廩��廬)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1774
-#: ../libpurple/protocols/jabber/jabber.c:1775
+#: ../libpurple/protocols/jabber/jabber.c:1784
+#: ../libpurple/protocols/jabber/jabber.c:1785
 msgid "Change XMPP Password"
 msgstr "廩�� 廖�廖�廬 XMPP"
 
-#: ../libpurple/protocols/jabber/jabber.c:1775
+#: ../libpurple/protocols/jabber/jabber.c:1785
 msgid "Please enter your new password"
 msgstr "��� �廬 �廖�廖�� ���廩� 廩��."
 
-#: ../libpurple/protocols/jabber/jabber.c:1789
-#: ../libpurple/protocols/oscar/oscar.c:6491
+#: ../libpurple/protocols/jabber/jabber.c:1799
+#: ../libpurple/protocols/oscar/oscar.c:6518
 #: ../libpurple/protocols/silc/silc.c:1236
 #: ../libpurple/protocols/silc10/silc.c:1010
 msgid "Set User Info..."
 msgstr "廡�廣 �廬 ����廣 廣� ��廩廬�廩..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1794
-#: ../libpurple/protocols/oscar/oscar.c:6502
+#: ../libpurple/protocols/jabber/jabber.c:1804
+#: ../libpurple/protocols/oscar/oscar.c:6529
 #: ../libpurple/protocols/silc/silc.c:1232
 #: ../libpurple/protocols/silc10/silc.c:1006
 msgid "Change Password..."
 msgstr "廩�� 廖�廖��..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1799
+#: ../libpurple/protocols/jabber/jabber.c:1809
 msgid "Search for Users..."
 msgstr "_�廚廩 �廩廬�廩��..."
 
-#: ../libpurple/protocols/jabber/jabber.c:1890
+#: ../libpurple/protocols/jabber/jabber.c:1900
 msgid "Bad Request"
 msgstr "�廡廩� 廩����"
 
-#: ../libpurple/protocols/jabber/jabber.c:1892
+#: ../libpurple/protocols/jabber/jabber.c:1902
 msgid "Conflict"
 msgstr "�廬��廩�廬"
 
-#: ../libpurple/protocols/jabber/jabber.c:1894
+#: ../libpurple/protocols/jabber/jabber.c:1904
 msgid "Feature Not Implemented"
 msgstr "�廨� ��廩�."
 
-#: ../libpurple/protocols/jabber/jabber.c:1896
+#: ../libpurple/protocols/jabber/jabber.c:1906
 msgid "Forbidden"
 msgstr "�廖�廨"
 
-#: ../libpurple/protocols/jabber/jabber.c:1898
+#: ../libpurple/protocols/jabber/jabber.c:1908
 msgid "Gone"
 msgstr "��-��廢�"
 
-#: ../libpurple/protocols/jabber/jabber.c:1900
-#: ../libpurple/protocols/jabber/jabber.c:1981
+#: ../libpurple/protocols/jabber/jabber.c:1910
+#: ../libpurple/protocols/jabber/jabber.c:1991
 msgid "Internal Server Error"
 msgstr "廩���� 廚����廬 �廩廨廬"
 
-#: ../libpurple/protocols/jabber/jabber.c:1902
+#: ../libpurple/protocols/jabber/jabber.c:1912
 msgid "Item Not Found"
 msgstr "廚廨�� �� ��廢�"
 
-#: ../libpurple/protocols/jabber/jabber.c:1904
+#: ../libpurple/protocols/jabber/jabber.c:1914
 msgid "Malformed XMPP ID"
 msgstr "����� �廩廬�廩 XMPP �� 廬廡��"
 
-#: ../libpurple/protocols/jabber/jabber.c:1906
+#: ../libpurple/protocols/jabber/jabber.c:1916
 msgid "Not Acceptable"
 msgstr "�� 廡���"
 
-#: ../libpurple/protocols/jabber/jabber.c:1908
+#: ../libpurple/protocols/jabber/jabber.c:1918
 msgid "Not Allowed"
 msgstr "�� ��廨廩�"
 
-#: ../libpurple/protocols/jabber/jabber.c:1912
+#: ../libpurple/protocols/jabber/jabber.c:1922
 msgid "Payment Required"
 msgstr "��廨廩 廬廩���"
 
-#: ../libpurple/protocols/jabber/jabber.c:1914
+#: ../libpurple/protocols/jabber/jabber.c:1924
 msgid "Recipient Unavailable"
 msgstr "��廣� �� ����"
 
-#: ../libpurple/protocols/jabber/jabber.c:1918
+#: ../libpurple/protocols/jabber/jabber.c:1928
 msgid "Registration Required"
 msgstr "��廨廩廬 �廨廩��"
 
-#: ../libpurple/protocols/jabber/jabber.c:1920
+#: ../libpurple/protocols/jabber/jabber.c:1930
 msgid "Remote Server Not Found"
 msgstr "廩廨廬 �� ��廢�"
 
-#: ../libpurple/protocols/jabber/jabber.c:1922
+#: ../libpurple/protocols/jabber/jabber.c:1932
 msgid "Remote Server Timeout"
 msgstr "廬� ���� ���廡廢� �廬廡廩�廨廬 廩廨廬"
 
-#: ../libpurple/protocols/jabber/jabber.c:1924
+#: ../libpurple/protocols/jabber/jabber.c:1934
 msgid "Server Overloaded"
 msgstr "廣��廖 �廬廨 廣� �廩廨廬"
 
-#: ../libpurple/protocols/jabber/jabber.c:1926
+#: ../libpurple/protocols/jabber/jabber.c:1936
 msgid "Service Unavailable"
 msgstr "�廩�廨�廬 ���� ����"
 
-#: ../libpurple/protocols/jabber/jabber.c:1928
+#: ../libpurple/protocols/jabber/jabber.c:1938
 msgid "Subscription Required"
 msgstr "��廨廩 ����"
 
-#: ../libpurple/protocols/jabber/jabber.c:1930
+#: ../libpurple/protocols/jabber/jabber.c:1940
 msgid "Unexpected Request"
 msgstr "�廡廩� �� 廢廚����"
 
-#: ../libpurple/protocols/jabber/jabber.c:1938
+#: ../libpurple/protocols/jabber/jabber.c:1948
 msgid "Authorization Aborted"
 msgstr "����廬 ����"
 
-#: ../libpurple/protocols/jabber/jabber.c:1940
+#: ../libpurple/protocols/jabber/jabber.c:1950
 msgid "Incorrect encoding in authorization"
 msgstr "廡���� 廩��� �����廬"
 
-#: ../libpurple/protocols/jabber/jabber.c:1942
+#: ../libpurple/protocols/jabber/jabber.c:1952
 msgid "Invalid authzid"
 msgstr "authzid �� 廬廡廝"
 
-#: ../libpurple/protocols/jabber/jabber.c:1944
+#: ../libpurple/protocols/jabber/jabber.c:1954
 msgid "Invalid Authorization Mechanism"
 msgstr "������ �����廬 �� 廬廡廝"
 
-#: ../libpurple/protocols/jabber/jabber.c:1947
+#: ../libpurple/protocols/jabber/jabber.c:1957
 msgid "Authorization mechanism too weak"
 msgstr "������ �����廬 ��廩 ���"
 
-#: ../libpurple/protocols/jabber/jabber.c:1955
+#: ../libpurple/protocols/jabber/jabber.c:1965
 msgid "Temporary Authentication Failure"
 msgstr "�廩� ���� �����廬"
 
-#: ../libpurple/protocols/jabber/jabber.c:1958
+#: ../libpurple/protocols/jabber/jabber.c:1968
 msgid "Authentication Failure"
 msgstr "�廩� �����廬"
 
-#: ../libpurple/protocols/jabber/jabber.c:1966
+#: ../libpurple/protocols/jabber/jabber.c:1976
 msgid "Bad Format"
 msgstr "���� �� 廬廡��"
 
-#: ../libpurple/protocols/jabber/jabber.c:1968
+#: ../libpurple/protocols/jabber/jabber.c:1978
 msgid "Bad Namespace Prefix"
 msgstr "�廬�� �廡廩廨-廩� 廩���"
 
-#: ../libpurple/protocols/jabber/jabber.c:1971
+#: ../libpurple/protocols/jabber/jabber.c:1981
 msgid "Resource Conflict"
 msgstr "�廬��廩���廬 �廩����"
 
-#: ../libpurple/protocols/jabber/jabber.c:1973
+#: ../libpurple/protocols/jabber/jabber.c:1983
 #: ../libpurple/protocols/silc/silc.c:350
 #: ../libpurple/protocols/silc10/ops.c:1725
 msgid "Connection Timeout"
 msgstr "��� ���� ���廡廢� �����廨"
 
-#: ../libpurple/protocols/jabber/jabber.c:1975
+#: ../libpurple/protocols/jabber/jabber.c:1985
 msgid "Host Gone"
 msgstr "���廨� �廣��"
 
-#: ../libpurple/protocols/jabber/jabber.c:1977
+#: ../libpurple/protocols/jabber/jabber.c:1987
 msgid "Host Unknown"
 msgstr "��廨� �� ���廨"
 
-#: ../libpurple/protocols/jabber/jabber.c:1979
+#: ../libpurple/protocols/jabber/jabber.c:1989
 msgid "Improper Addressing"
 msgstr "��廬��廬 �� �����"
 
-#: ../libpurple/protocols/jabber/jabber.c:1983
+#: ../libpurple/protocols/jabber/jabber.c:1993
 msgid "Invalid ID"
 msgstr "����� �� 廬廡��"
 
-#: ../libpurple/protocols/jabber/jabber.c:1985
+#: ../libpurple/protocols/jabber/jabber.c:1995
 msgid "Invalid Namespace"
 msgstr "�廡廩廨-廩� �� 廬廡廝"
 
-#: ../libpurple/protocols/jabber/jabber.c:1987
+#: ../libpurple/protocols/jabber/jabber.c:1997
 msgid "Invalid XML"
 msgstr "XML 廩���"
 
-#: ../libpurple/protocols/jabber/jabber.c:1989
+#: ../libpurple/protocols/jabber/jabber.c:1999
 msgid "Non-matching Hosts"
 msgstr "��廨��� �� 廬�����"
 
-#: ../libpurple/protocols/jabber/jabber.c:1993
+#: ../libpurple/protocols/jabber/jabber.c:2003
 msgid "Policy Violation"
 msgstr "����� ��廖��"
 
-#: ../libpurple/protocols/jabber/jabber.c:1995
+#: ../libpurple/protocols/jabber/jabber.c:2005
 msgid "Remote Connection Failed"
 msgstr "廩���廬 廬廡廩�廨廬 �廢� ��廨��廡"
 
-#: ../libpurple/protocols/jabber/jabber.c:1997
+#: ../libpurple/protocols/jabber/jabber.c:2007
 msgid "Resource Constraint"
 msgstr "����廬 �廩����"
 
-#: ../libpurple/protocols/jabber/jabber.c:1999
+#: ../libpurple/protocols/jabber/jabber.c:2009
 msgid "Restricted XML"
 msgstr "XML �����"
 
-#: ../libpurple/protocols/jabber/jabber.c:2001
+#: ../libpurple/protocols/jabber/jabber.c:2011
 msgid "See Other Host"
 msgstr "廢廚� ���廨� ��廨"
 
-#: ../libpurple/protocols/jabber/jabber.c:2003
+#: ../libpurple/protocols/jabber/jabber.c:2013
 msgid "System Shutdown"
 msgstr "����� ��廣廨�廬"
 
-#: ../libpurple/protocols/jabber/jabber.c:2005
+#: ../libpurple/protocols/jabber/jabber.c:2015
 msgid "Undefined Condition"
 msgstr "�廡廨� �� ����廨 �廨�廩"
 
-#: ../libpurple/protocols/jabber/jabber.c:2007
+#: ../libpurple/protocols/jabber/jabber.c:2017
 msgid "Unsupported Encoding"
 msgstr "廡���� 廩�� �廬��"
 
-#: ../libpurple/protocols/jabber/jabber.c:2009
+#: ../libpurple/protocols/jabber/jabber.c:2019
 msgid "Unsupported Stanza Type"
 msgstr "廖�� 廖���� 廩�� �廬��廬"
 
-#: ../libpurple/protocols/jabber/jabber.c:2011
+#: ../libpurple/protocols/jabber/jabber.c:2021
 msgid "Unsupported Version"
 msgstr "��廨廖� ��� 廬����"
 
-#: ../libpurple/protocols/jabber/jabber.c:2013
+#: ../libpurple/protocols/jabber/jabber.c:2023
 msgid "XML Not Well Formed"
 msgstr "XML �� ����� ����"
 
-#: ../libpurple/protocols/jabber/jabber.c:2015
+#: ../libpurple/protocols/jabber/jabber.c:2025
 msgid "Stream Error"
 msgstr "廩���� ��廨�"
 
-#: ../libpurple/protocols/jabber/jabber.c:2100
+#: ../libpurple/protocols/jabber/jabber.c:2110
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "�� ��廬� ��廖�� �廩廬�廩 %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2120
+#: ../libpurple/protocols/jabber/jabber.c:2130
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "����廖 �� ���廨: %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2125
+#: ../libpurple/protocols/jabber/jabber.c:2135
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "�� ��廬� ����廖 �廬 �廩廬�廩 %s �廬�廨 \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:2144
+#: ../libpurple/protocols/jabber/jabber.c:2154
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "廬廚廡�� �� ���廨: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:2149
+#: ../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:2202
+#: ../libpurple/protocols/jabber/jabber.c:2212
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "�� ��廬� ��廣�� ��廩廬�廩 %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2233
+#: ../libpurple/protocols/jabber/jabber.c:2243
 #, c-format
 msgid "Unable to ping user %s"
 msgstr "�� ��廬� �廣廩�廬 廚��� ��廩廬�廩 %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2251
-#: ../libpurple/protocols/jabber/jabber.c:2262
+#: ../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:2257
+#: ../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:2288
+#: ../libpurple/protocols/jabber/jabber.c:2298
 #, c-format
 msgid "Unable to buzz, because the user %s does not support it."
 msgstr "�� ��廬� �����, �� ��廩廬�廩 %s  �� 廬��� ���."
 
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
-#: ../libpurple/protocols/jabber/jabber.c:2308
-#: ../libpurple/protocols/yahoo/yahoo.c:4138
+#: ../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:4139
+#: ../libpurple/protocols/yahoo/yahoo.c:4164
 #, c-format
 msgid "%s has buzzed you!"
 msgstr "%s ����� ��廬�!"
 
-#: ../libpurple/protocols/jabber/jabber.c:2309
-#: ../libpurple/protocols/yahoo/yahoo.c:4139
+#: ../libpurple/protocols/jabber/jabber.c:2319
+#: ../libpurple/protocols/yahoo/yahoo.c:4164
 #, c-format
 msgid "Buzzing %s..."
 msgstr "���� �-%s..."
 
-#: ../libpurple/protocols/jabber/jabber.c:2340
+#: ../libpurple/protocols/jabber/jabber.c:2350
 msgid "config:  Configure a chat room."
 msgstr "config:  廡�廣 ���廨�廬 ��廨 廢'��."
 
-#: ../libpurple/protocols/jabber/jabber.c:2344
+#: ../libpurple/protocols/jabber/jabber.c:2354
 msgid "configure:  Configure a chat room."
 msgstr "configure:  廡�廣 ���廨�廬 ��廨 廢'��."
 
-#: ../libpurple/protocols/jabber/jabber.c:2353
+#: ../libpurple/protocols/jabber/jabber.c:2363
 msgid "part [room]:  Leave the room."
 msgstr "part [��廨]:  廣��� �廬 ���廨."
 
-#: ../libpurple/protocols/jabber/jabber.c:2358
+#: ../libpurple/protocols/jabber/jabber.c:2368
 msgid "register:  Register with a chat room."
 msgstr "register:  �廨廩� ���廨 廢'��."
 
-#: ../libpurple/protocols/jabber/jabber.c:2364
+#: ../libpurple/protocols/jabber/jabber.c:2374
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [��廩� ��廩]:  �廢� �� 廩�� �廬 ���廩�."
 
-#: ../libpurple/protocols/jabber/jabber.c:2370
+#: ../libpurple/protocols/jabber/jabber.c:2380
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;�廩廬�廩&gt; [��廨]:  �廖�� �廩廬�廩 �� ���廨."
 
-#: ../libpurple/protocols/jabber/jabber.c:2376
-msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
-msgstr ""
-"affiliate &lt;�廩廬�廩&gt; &lt;�廣���|�廚廣��|��廨|����廬|���&gt;: 廡��廣廬 ����廖 �廩廬�廩 "
-"廣� ���廨."
-
-#: ../libpurple/protocols/jabber/jabber.c:2382
-msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
-msgstr ""
-"role &lt;�廩廬�廩&gt; &lt;�廣���|�廚廣��|��廨|����廬|���&gt;: 廡��廣廬 ����廖 �廩廬�廩 廣� "
-"���廨."
-
-#: ../libpurple/protocols/jabber/jabber.c:2388
+#: ../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."
+msgstr "affiliate &lt;�廩廬�廩&gt; &lt;�廣���|�廚廣��|��廨|����廬|���&gt;: 廡��廣廬 ����廖 �廩廬�廩 廣� ���廨."
+
+#: ../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."
+msgstr "role &lt;�廩廬�廩&gt; &lt;�廣���|�廚廣��|��廨|����廬|���&gt;: 廡��廣廬 ����廖 �廩廬�廩 廣� ���廨."
+
+#: ../libpurple/protocols/jabber/jabber.c:2398
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;�廩廬�廩&gt; [��廨]:  ���� �廩廬�廩 ���廨."
 
-#: ../libpurple/protocols/jabber/jabber.c:2394
+#: ../libpurple/protocols/jabber/jabber.c:2404
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt;��廨&gt; [廩廨廬]:  �廢�廨廝 �廢'�� �廩廨廬 ��."
 
-#: ../libpurple/protocols/jabber/jabber.c:2400
+#: ../libpurple/protocols/jabber/jabber.c:2410
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;�廩廬�廩&gt; [��廨]:  �廣� �廩廬�廩 ����廨."
 
-#: ../libpurple/protocols/jabber/jabber.c:2405
-msgid ""
-"msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
+#: ../libpurple/protocols/jabber/jabber.c:2415
+msgid "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr "msg &lt;�廩廬�廩&gt; &lt;���廣�&gt;:  廩�� ���廣� 廚廨��廬 ��廩廬�廩 ��廨."
 
-#: ../libpurple/protocols/jabber/jabber.c:2411
+#: ../libpurple/protocols/jabber/jabber.c:2421
 msgid "ping &lt;jid&gt;:\tPing a user/component/server."
 msgstr "ping &lt;jid&gt;:\t廩�� 廚��� �� �廩廬�廩/廨���/廩廨廬."
 
-#: ../libpurple/protocols/jabber/jabber.c:2416
-#: ../libpurple/protocols/yahoo/yahoo.c:4162
+#: ../libpurple/protocols/jabber/jabber.c:2426
+#: ../libpurple/protocols/yahoo/yahoo.c:4187
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: 廩�� ������ ��廩廬�廩 ��� ��廩�� �廬 廬廩��廬 ����"
 
@@ -6281,7 +6530,8 @@
 msgstr "廬�廖廝 廚廨���廡�� XMPP"
 
 #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
-#: ../libpurple/protocols/jabber/libxmpp.c:205 ../pidgin/gtkaccount.c:478
+#: ../libpurple/protocols/jabber/libxmpp.c:205
+#: ../pidgin/gtkaccount.c:478
 msgid "Domain"
 msgstr "������"
 
@@ -6297,8 +6547,12 @@
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "�廚廩廨 ��廩廨�廨 �� ��廢廚� �廬廡廩�廨廬 �� ��廢廚�廬"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:227
-#: ../libpurple/protocols/myspace/myspace.c:3466
+#: ../libpurple/protocols/jabber/libxmpp.c:229
+msgid "Use GSSAPI (Kerberos v5) for authentication"
+msgstr "�廩廬�廩 �GSSAPI (廡廨�廨�廖 ��廨廖� 5) �廢�廨� ����廬"
+
+#: ../libpurple/protocols/jabber/libxmpp.c:235
+#: ../libpurple/protocols/myspace/myspace.c:3468
 #: ../libpurple/protocols/simple/simple.c:2105
 msgid "Connect port"
 msgstr "�廢��廬 ��廬��廨�廬"
@@ -6306,14 +6560,15 @@
 #. 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:3463
+#: ../libpurple/protocols/jabber/libxmpp.c:239
+#: ../libpurple/protocols/myspace/myspace.c:3465
 #: ../libpurple/protocols/silc/silc.c:2057
-#: ../libpurple/protocols/silc10/silc.c:1863 ../pidgin/gtkaccount.c:809
+#: ../libpurple/protocols/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 "廩廨廬� 廬���� ��廣�廨廬 廡�廢��"
 
@@ -6365,11 +6620,8 @@
 msgstr "廢�廨 ��廨 ��廩"
 
 #: ../libpurple/protocols/jabber/presence.c:524
-msgid ""
-"You are creating a new room.  Would you like to configure it, or accept the "
-"default settings?"
-msgstr ""
-"���廨 ���廩 廩�廢廨廬. ��� �廨廢��� �廩��廬 �廬 ����廨�廬 廩��, �� �廡�� �廬 �廨�廨�廬 �����?"
+msgid "You are creating a new room.  Would you like to configure it, or accept the default settings?"
+msgstr "���廨 ���廩 廩�廢廨廬. ��� �廨廢��� �廩��廬 �廬 ����廨�廬 廩��, �� �廡�� �廬 �廨�廨�廬 �����?"
 
 #: ../libpurple/protocols/jabber/presence.c:530
 msgid "_Configure Room"
@@ -6451,21 +6703,18 @@
 msgstr "��� ��� ����� ��廩 廣��廨�."
 
 #: ../libpurple/protocols/jabber/usernick.c:77
-msgid ""
-"This information is visible to all contacts on your contact list, so choose "
-"something appropriate."
-msgstr ""
-"����廣 ��� ���廩 ��� ��廩�-�廡廩廨 �廨廩��廬 ��廩� �廡廩廨 廩��, �� �廩 ����廨 �廩�� �廬���."
+msgid "This information is visible to all contacts on your contact list, so choose something appropriate."
+msgstr "����廣 ��� ���廩 ��� ��廩�-�廡廩廨 �廨廩��廬 ��廩� �廡廩廨 廩��, �� �廩 ����廨 �廩�� �廬���."
 
 #: ../libpurple/protocols/jabber/usernick.c:100
 msgid "Set Nickname..."
 msgstr "廡�廣 �����..."
 
-#: ../libpurple/protocols/jabber/xdata.c:378
+#: ../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 "��廨 廚廣���"
 
@@ -6482,19 +6731,13 @@
 #: ../libpurple/protocols/msn/dialog.c:124
 #: ../libpurple/protocols/msnp9/dialog.c:116
 #, c-format
-msgid ""
-"%s on the local list is inside the group \"%s\" but not on the server list. "
-"Do you want this buddy to be added?"
-msgstr ""
-"%s �廨廩��� ��廡���廬 ��� �廬�� �廡��廢� \"%s\" �� �� �廨廩��� 廩廣� �廩廨廬. ��� �廨廢��� "
-"���廖�廝 ��廩 廡廩廨 ��?"
+msgid "%s on the local list is inside the group \"%s\" but not on the server list. Do you want this buddy to be added?"
+msgstr "%s �廨廩��� ��廡���廬 ��� �廬�� �廡��廢� \"%s\" �� �� �廨廩��� 廩廣� �廩廨廬. ��� �廨廢��� ���廖�廝 ��廩 廡廩廨 ��?"
 
 #: ../libpurple/protocols/msn/dialog.c:132
 #: ../libpurple/protocols/msnp9/dialog.c:124
 #, c-format
-msgid ""
-"%s is on the local list but not on the server list. Do you want this buddy "
-"to be added?"
+msgid "%s is on the local list but not on the server list. Do you want this buddy to be added?"
 msgstr "%s �廨廩��� ��廡���廬 �� �� �廨廩��� 廩廣� �廩廨廬. ��� �廨廢��� ���廖�廝 ��廩 廡廩廨 ��?"
 
 #: ../libpurple/protocols/msn/error.c:36
@@ -6740,10 +6983,11 @@
 
 #: ../libpurple/protocols/msn/error.c:222
 #: ../libpurple/protocols/msnp9/error.c:222
-#: ../libpurple/protocols/oscar/oscar.c:1418
+#: ../libpurple/protocols/oscar/oscar.c:1422
 #: ../libpurple/protocols/silc/silc.c:338
 #: ../libpurple/protocols/silc10/ops.c:1713
-#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1399
+#: ../libpurple/protocols/toc/toc.c:728
+#: ../libpurple/proxy.c:1448
 msgid "Authentication failed"
 msgstr "�����廬 ��廩�"
 
@@ -6784,97 +7028,114 @@
 msgid "MSN Error: %s\n"
 msgstr "廩���廬 MSN: %s\n"
 
-#: ../libpurple/protocols/msn/msn.c:128 ../libpurple/protocols/msnp9/msn.c:129
+#: ../libpurple/protocols/msn/msn.c:128
+#: ../libpurple/protocols/msnp9/msn.c:129
 msgid "Nudge"
 msgstr "�� ��廨!"
 
-#: ../libpurple/protocols/msn/msn.c:129 ../libpurple/protocols/msnp9/msn.c:130
+#: ../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:129 ../libpurple/protocols/msnp9/msn.c:130
+#: ../libpurple/protocols/msn/msn.c:129
+#: ../libpurple/protocols/msnp9/msn.c:130
 #, c-format
 msgid "Nudging %s..."
 msgstr "�� ��廨, %s..."
 
-#: ../libpurple/protocols/msn/msn.c:170 ../libpurple/protocols/msnp9/msn.c:171
+#: ../libpurple/protocols/msn/msn.c:170
+#: ../libpurple/protocols/msnp9/msn.c:171
 msgid "Your new MSN friendly name is too long."
 msgstr "�廩� ������廬� ���廩 廩�� �-MSN �廨�� ���."
 
-#: ../libpurple/protocols/msn/msn.c:282 ../libpurple/protocols/msnp9/msn.c:279
+#: ../libpurple/protocols/msn/msn.c:296
+#: ../libpurple/protocols/msnp9/msn.c:279
 msgid "Set your friendly name."
 msgstr "廡�廣/� �廬 廩�� ������廬�."
 
-#: ../libpurple/protocols/msn/msn.c:283 ../libpurple/protocols/msnp9/msn.c:280
+#: ../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:301 ../libpurple/protocols/msnp9/msn.c:298
+#: ../libpurple/protocols/msn/msn.c:315
+#: ../libpurple/protocols/msnp9/msn.c:298
 msgid "Set your home phone number."
 msgstr "廡�廣/� �廬 �廖廚廨 ���廚�� ���廬."
 
-#: ../libpurple/protocols/msn/msn.c:318 ../libpurple/protocols/msnp9/msn.c:315
+#: ../libpurple/protocols/msn/msn.c:332
+#: ../libpurple/protocols/msnp9/msn.c:315
 msgid "Set your work phone number."
 msgstr ". 廡�廣/� �廬 �廖廚廨 ���廚�� �廣����"
 
-#: ../libpurple/protocols/msn/msn.c:335 ../libpurple/protocols/msnp9/msn.c:332
+#: ../libpurple/protocols/msn/msn.c:349
+#: ../libpurple/protocols/msnp9/msn.c:332
 msgid "Set your mobile phone number."
 msgstr "廡�廣/� �廬 �廖廚廨 ���廚�� �����."
 
-#: ../libpurple/protocols/msn/msn.c:350 ../libpurple/protocols/msnp9/msn.c:347
+#: ../libpurple/protocols/msn/msn.c:364
+#: ../libpurple/protocols/msnp9/msn.c:347
 msgid "Allow MSN Mobile pages?"
 msgstr "�廚廩廨 ���廣�廬 ����� �-MSN?"
 
-#: ../libpurple/protocols/msn/msn.c:351 ../libpurple/protocols/msnp9/msn.c:348
-msgid ""
-"Do you want to allow or disallow people on your buddy list to send you MSN "
-"Mobile pages to your cell phone or other mobile device?"
-msgstr ""
-"��� �廨廢��� ��廚廩廨 �� �� ��廚廩廨 ���廩�� �廨廩��廬 ��廩� �廡廩廨 廩�� �廩��� �� ���廣�廬 "
-"���廚�� ����� �� 廩�廨 ��廩�廨�� ������?"
-
-#: ../libpurple/protocols/msn/msn.c:357 ../libpurple/protocols/msnp9/msn.c:354
+#: ../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?"
+msgstr "��� �廨廢��� ��廚廩廨 �� �� ��廚廩廨 ���廩�� �廨廩��廬 ��廩� �廡廩廨 廩�� �廩��� �� ���廣�廬 ���廚�� ����� �� 廩�廨 ��廩�廨�� ������?"
+
+#: ../libpurple/protocols/msn/msn.c:371
+#: ../libpurple/protocols/msnp9/msn.c:354
 msgid "Allow"
 msgstr "�廚廩廨"
 
-#: ../libpurple/protocols/msn/msn.c:358 ../libpurple/protocols/msnp9/msn.c:355
+#: ../libpurple/protocols/msn/msn.c:372
+#: ../libpurple/protocols/msnp9/msn.c:355
 msgid "Disallow"
 msgstr "�� 廬�廚廩廨"
 
-#: ../libpurple/protocols/msn/msn.c:374 ../libpurple/protocols/msnp9/msn.c:371
+#: ../libpurple/protocols/msn/msn.c:388
+#: ../libpurple/protocols/msnp9/msn.c:371
 msgid "This Hotmail account may not be active."
 msgstr "��廬�� ��廩��� �-Hotmail ��� ���� 廚廣��."
 
-#: ../libpurple/protocols/msn/msn.c:400 ../libpurple/protocols/msnp9/msn.c:397
+#: ../libpurple/protocols/msn/msn.c:414
+#: ../libpurple/protocols/msnp9/msn.c:397
 msgid "Send a mobile message."
 msgstr "廩�� �廬�廨 ���廣� �����."
 
-#: ../libpurple/protocols/msn/msn.c:402 ../libpurple/protocols/msnp9/msn.c:399
+#: ../libpurple/protocols/msn/msn.c:416
+#: ../libpurple/protocols/msnp9/msn.c:399
 msgid "Page"
 msgstr "�廝"
 
-#: ../libpurple/protocols/msn/msn.c:665 ../libpurple/protocols/msnp9/msn.c:567
+#: ../libpurple/protocols/msn/msn.c:679
+#: ../libpurple/protocols/msnp9/msn.c:567
 msgid "Home Phone Number"
 msgstr "�廖廚廨 ��廚�� ���廬"
 
-#: ../libpurple/protocols/msn/msn.c:669 ../libpurple/protocols/msnp9/msn.c:571
+#: ../libpurple/protocols/msn/msn.c:683
+#: ../libpurple/protocols/msnp9/msn.c:571
 msgid "Work Phone Number"
 msgstr "�廖廚廨 ��廚�� �廣����"
 
-#: ../libpurple/protocols/msn/msn.c:673 ../libpurple/protocols/msnp9/msn.c:575
+#: ../libpurple/protocols/msn/msn.c:687
+#: ../libpurple/protocols/msnp9/msn.c:575
 msgid "Mobile Phone Number"
 msgstr "�廖廚廨 ��廚�� ����"
 
-#: ../libpurple/protocols/msn/msn.c:696 ../libpurple/protocols/msn/state.c:33
+#: ../libpurple/protocols/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:3114
-#: ../libpurple/protocols/yahoo/yahoo.c:3798
+#: ../libpurple/protocols/yahoo/yahoo.c:3134
+#: ../libpurple/protocols/yahoo/yahoo.c:3823
 msgid "Be Right Back"
 msgstr "��� �廩��"
 
-#: ../libpurple/protocols/msn/msn.c:702 ../libpurple/protocols/msn/state.c:31
+#: ../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:2840
@@ -6883,20 +7144,22 @@
 #: ../libpurple/protocols/silc/silc.c:56
 #: ../libpurple/protocols/silc10/buddy.c:1483
 #: ../libpurple/protocols/silc10/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:3116
-#: ../libpurple/protocols/yahoo/yahoo.c:3801
+#: ../libpurple/protocols/yahoo/yahoo.c:3136
+#: ../libpurple/protocols/yahoo/yahoo.c:3826
 msgid "Busy"
 msgstr "廣廖�廡"
 
-#: ../libpurple/protocols/msn/msn.c:707 ../libpurple/protocols/msnp9/msn.c:602
-#: ../libpurple/protocols/yahoo/yahoo.c:3124
-#: ../libpurple/protocols/yahoo/yahoo.c:3813
+#: ../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:712 ../libpurple/protocols/msnp9/msn.c:606
-#: ../libpurple/protocols/yahoo/yahoo.c:3128
-#: ../libpurple/protocols/yahoo/yahoo.c:3819
+#: ../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 "�廢� �����"
 
@@ -6906,355 +7169,369 @@
 #. savable
 #. should be user_settable some day
 #. independent
-#: ../libpurple/protocols/msn/msn.c:731
+#: ../libpurple/protocols/msn/msn.c:745
 #: ../libpurple/protocols/myspace/myspace.c:170
 msgid "Artist"
 msgstr "���"
 
-#: ../libpurple/protocols/msn/msn.c:732
+#: ../libpurple/protocols/msn/msn.c:746
 msgid "Album"
 msgstr "�����"
 
-#: ../libpurple/protocols/msn/msn.c:750 ../libpurple/protocols/msnp9/msn.c:634
+#: ../libpurple/protocols/msn/msn.c:764
+#: ../libpurple/protocols/msnp9/msn.c:634
 msgid "Set Friendly Name..."
 msgstr "廡�廣/� 廩� �����廬�..."
 
-#: ../libpurple/protocols/msn/msn.c:755 ../libpurple/protocols/msnp9/msn.c:639
+#: ../libpurple/protocols/msn/msn.c:769
+#: ../libpurple/protocols/msnp9/msn.c:639
 msgid "Set Home Phone Number..."
 msgstr "廡�廣/� �廖廚廨 ��廚�� ���廬..."
 
-#: ../libpurple/protocols/msn/msn.c:759 ../libpurple/protocols/msnp9/msn.c:643
+#: ../libpurple/protocols/msn/msn.c:773
+#: ../libpurple/protocols/msnp9/msn.c:643
 msgid "Set Work Phone Number..."
 msgstr "廡�廣/� �廖廚廨 ��廚�� �廣����..."
 
-#: ../libpurple/protocols/msn/msn.c:763 ../libpurple/protocols/msnp9/msn.c:647
+#: ../libpurple/protocols/msn/msn.c:777
+#: ../libpurple/protocols/msnp9/msn.c:647
 msgid "Set Mobile Phone Number..."
 msgstr "廡�廣/� �廖廚廨 ��廚�� ����..."
 
-#: ../libpurple/protocols/msn/msn.c:769 ../libpurple/protocols/msnp9/msn.c:653
+#: ../libpurple/protocols/msn/msn.c:783
+#: ../libpurple/protocols/msnp9/msn.c:653
 msgid "Enable/Disable Mobile Devices..."
 msgstr "�廚廩廨/��� ��廩�廨�� ������..."
 
-#: ../libpurple/protocols/msn/msn.c:774 ../libpurple/protocols/msnp9/msn.c:658
+#: ../libpurple/protocols/msn/msn.c:788
+#: ../libpurple/protocols/msnp9/msn.c:658
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "�廚廩廨/��� ���廣�廬 ���廩�廨�� ������..."
 
-#: ../libpurple/protocols/msn/msn.c:785 ../libpurple/protocols/msnp9/msn.c:669
+#: ../libpurple/protocols/msn/msn.c:799
+#: ../libpurple/protocols/msnp9/msn.c:669
 msgid "Open Hotmail Inbox"
 msgstr "廚廬� �廬 廬��廬 ����廨 廩� Hotmail"
 
-#: ../libpurple/protocols/msn/msn.c:809 ../libpurple/protocols/msnp9/msn.c:693
+#: ../libpurple/protocols/msn/msn.c:823
+#: ../libpurple/protocols/msnp9/msn.c:693
 msgid "Send to Mobile"
 msgstr "廩�� ���廩�廨 ����"
 
-#: ../libpurple/protocols/msn/msn.c:819 ../libpurple/protocols/msnp9/msn.c:703
+#: ../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:857 ../libpurple/protocols/msnp9/msn.c:742
+#: ../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 "��廨廩廬 廬���� �-SSL 廣��廨 MSN. �� ��廬廡�� 廖廚廨��廬 SSL �廬��廬."
 
-#: ../libpurple/protocols/msn/msn.c:887 ../libpurple/protocols/msnp9/msn.c:772
+#: ../libpurple/protocols/msn/msn.c:901
+#: ../libpurple/protocols/msnp9/msn.c:772
 msgid "Failed to connect to server."
 msgstr "�廩� ��廬��廨�廬 �廩廨廬"
 
-#: ../libpurple/protocols/msn/msn.c:1671 ../libpurple/protocols/msn/msn.c:2014
-#: ../libpurple/protocols/msnp9/msn.c:1527
-#: ../libpurple/protocols/msnp9/msn.c:1870
+#: ../libpurple/protocols/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:1737
-#: ../libpurple/protocols/msnp9/msn.c:1593 ../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:1744
-#: ../libpurple/protocols/msnp9/msn.c:1600
+#: ../libpurple/protocols/msn/msn.c:1758
+#: ../libpurple/protocols/msnp9/msn.c:1599
 #: ../libpurple/protocols/myspace/user.c:125
-#: ../libpurple/protocols/oscar/oscar.c:3788
+#: ../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:1746
-#: ../libpurple/protocols/msnp9/msn.c:1602
+#: ../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:1747
-#: ../libpurple/protocols/msnp9/msn.c:1603
+#: ../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/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:1752 ../libpurple/protocols/msn/msn.c:1944
-#: ../libpurple/protocols/msn/msn.c:1950 ../libpurple/protocols/msn/msn.c:1957
-#: ../libpurple/protocols/msnp9/msn.c:1608
-#: ../libpurple/protocols/msnp9/msn.c:1800
-#: ../libpurple/protocols/msnp9/msn.c:1806
-#: ../libpurple/protocols/msnp9/msn.c:1813
+#: ../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:1758 ../libpurple/protocols/msn/msn.c:1878
-#: ../libpurple/protocols/msn/msn.c:1884 ../libpurple/protocols/msn/msn.c:1891
-#: ../libpurple/protocols/msn/msn.c:1899 ../libpurple/protocols/msn/msn.c:1906
-#: ../libpurple/protocols/msnp9/msn.c:1614
-#: ../libpurple/protocols/msnp9/msn.c:1734
-#: ../libpurple/protocols/msnp9/msn.c:1740
-#: ../libpurple/protocols/msnp9/msn.c:1747
-#: ../libpurple/protocols/msnp9/msn.c:1755
-#: ../libpurple/protocols/msnp9/msn.c:1762
+#: ../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:1775
-#: ../libpurple/protocols/msnp9/msn.c:1631
+#: ../libpurple/protocols/msn/msn.c:1789
+#: ../libpurple/protocols/msnp9/msn.c:1630
 msgid "Social"
 msgstr "��廨廬�"
 
-#: ../libpurple/protocols/msn/msn.c:1777
-#: ../libpurple/protocols/msnp9/msn.c:1633
-#: ../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:1778
-#: ../libpurple/protocols/msnp9/msn.c:1634
+#: ../libpurple/protocols/msn/msn.c:1792
+#: ../libpurple/protocols/msnp9/msn.c:1633
 msgid "Interests"
 msgstr "廬���� 廣����"
 
-#: ../libpurple/protocols/msn/msn.c:1779
-#: ../libpurple/protocols/msnp9/msn.c:1635
+#: ../libpurple/protocols/msn/msn.c:1793
+#: ../libpurple/protocols/msnp9/msn.c:1634
 msgid "Pets"
 msgstr "���廬 ����"
 
-#: ../libpurple/protocols/msn/msn.c:1780
-#: ../libpurple/protocols/msnp9/msn.c:1636
+#: ../libpurple/protocols/msn/msn.c:1794
+#: ../libpurple/protocols/msnp9/msn.c:1635
 msgid "Hometown"
 msgstr "廣�廨 �����廬"
 
-#: ../libpurple/protocols/msn/msn.c:1781
-#: ../libpurple/protocols/msnp9/msn.c:1637
+#: ../libpurple/protocols/msn/msn.c:1795
+#: ../libpurple/protocols/msnp9/msn.c:1636
 msgid "Places Lived"
 msgstr "廣廨� ���廨��"
 
-#: ../libpurple/protocols/msn/msn.c:1782
-#: ../libpurple/protocols/msnp9/msn.c:1638
+#: ../libpurple/protocols/msn/msn.c:1796
+#: ../libpurple/protocols/msnp9/msn.c:1637
 msgid "Fashion"
 msgstr "��廚��"
 
-#: ../libpurple/protocols/msn/msn.c:1783
-#: ../libpurple/protocols/msnp9/msn.c:1639
+#: ../libpurple/protocols/msn/msn.c:1797
+#: ../libpurple/protocols/msnp9/msn.c:1638
 msgid "Humor"
 msgstr "����廨"
 
-#: ../libpurple/protocols/msn/msn.c:1784
-#: ../libpurple/protocols/msnp9/msn.c:1640
+#: ../libpurple/protocols/msn/msn.c:1798
+#: ../libpurple/protocols/msnp9/msn.c:1639
 msgid "Music"
 msgstr "��廖�廡�"
 
-#: ../libpurple/protocols/msn/msn.c:1785 ../libpurple/protocols/msn/msn.c:1966
-#: ../libpurple/protocols/msn/msn.c:1972
-#: ../libpurple/protocols/msnp9/msn.c:1641
-#: ../libpurple/protocols/msnp9/msn.c:1822
-#: ../libpurple/protocols/msnp9/msn.c:1828
-#: ../libpurple/protocols/yahoo/yahoo_profile.c: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:1802
-#: ../libpurple/protocols/msnp9/msn.c:1658
+#: ../libpurple/protocols/msn/msn.c:1816
+#: ../libpurple/protocols/msnp9/msn.c:1657
 msgid "Contact Info"
 msgstr "���廣 廣� ��廩 �廡廩廨"
 
-#: ../libpurple/protocols/msn/msn.c:1803
-#: ../libpurple/protocols/msnp9/msn.c:1659
+#: ../libpurple/protocols/msn/msn.c:1817
+#: ../libpurple/protocols/msnp9/msn.c:1658
 msgid "Personal"
 msgstr "��廩�"
 
-#: ../libpurple/protocols/msn/msn.c:1806
-#: ../libpurple/protocols/msnp9/msn.c:1662
+#: ../libpurple/protocols/msn/msn.c:1820
+#: ../libpurple/protocols/msnp9/msn.c:1661
 msgid "Significant Other"
 msgstr "��/�廬-���"
 
-#: ../libpurple/protocols/msn/msn.c:1807
-#: ../libpurple/protocols/msnp9/msn.c:1663
+#: ../libpurple/protocols/msn/msn.c:1821
+#: ../libpurple/protocols/msnp9/msn.c:1662
 msgid "Home Phone"
 msgstr "��廚�� ���廬"
 
-#: ../libpurple/protocols/msn/msn.c:1808
-#: ../libpurple/protocols/msnp9/msn.c:1664
+#: ../libpurple/protocols/msn/msn.c:1822
+#: ../libpurple/protocols/msnp9/msn.c:1663
 msgid "Home Phone 2"
 msgstr "��廚�� ���廬 2"
 
-#: ../libpurple/protocols/msn/msn.c:1809
-#: ../libpurple/protocols/msnp9/msn.c:1665
-#: ../libpurple/protocols/oscar/oscar.c:3826
+#: ../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:1810
-#: ../libpurple/protocols/msnp9/msn.c:1666
+#: ../libpurple/protocols/msn/msn.c:1824
+#: ../libpurple/protocols/msnp9/msn.c:1665
 msgid "Personal Mobile"
 msgstr "��廚�� ����"
 
-#: ../libpurple/protocols/msn/msn.c:1811
-#: ../libpurple/protocols/msnp9/msn.c:1667
+#: ../libpurple/protocols/msn/msn.c:1825
+#: ../libpurple/protocols/msnp9/msn.c:1666
 msgid "Home Fax"
 msgstr "廚廡廖 ���廬"
 
-#: ../libpurple/protocols/msn/msn.c:1812
-#: ../libpurple/protocols/msnp9/msn.c:1668
+#: ../libpurple/protocols/msn/msn.c:1826
+#: ../libpurple/protocols/msnp9/msn.c:1667
 msgid "Personal E-Mail"
 msgstr "���\"� ��廩�"
 
-#: ../libpurple/protocols/msn/msn.c:1813
-#: ../libpurple/protocols/msnp9/msn.c:1669
+#: ../libpurple/protocols/msn/msn.c:1827
+#: ../libpurple/protocols/msnp9/msn.c:1668
 msgid "Personal IM"
 msgstr "IM ��廩�"
 
-#: ../libpurple/protocols/msn/msn.c:1815
-#: ../libpurple/protocols/msnp9/msn.c:1671
+#: ../libpurple/protocols/msn/msn.c:1829
+#: ../libpurple/protocols/msnp9/msn.c:1670
 msgid "Anniversary"
 msgstr "��� ��廩����"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1831
-#: ../libpurple/protocols/msnp9/msn.c:1687
+#: ../libpurple/protocols/msn/msn.c:1845
+#: ../libpurple/protocols/msnp9/msn.c:1686
 msgid "Work"
 msgstr "�廣����"
 
-#: ../libpurple/protocols/msn/msn.c:1833
-#: ../libpurple/protocols/msnp9/msn.c:1689
-#: ../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:1834
-#: ../libpurple/protocols/msnp9/msn.c:1690
-#: ../libpurple/protocols/oscar/oscar.c:3847
+#: ../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:1835
-#: ../libpurple/protocols/msnp9/msn.c:1691
+#: ../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:1836
-#: ../libpurple/protocols/msnp9/msn.c:1692
+#: ../libpurple/protocols/msn/msn.c:1850
+#: ../libpurple/protocols/msnp9/msn.c:1691
 msgid "Profession"
 msgstr "�廡廢�廣"
 
-#: ../libpurple/protocols/msn/msn.c:1837
-#: ../libpurple/protocols/msnp9/msn.c:1693
+#: ../libpurple/protocols/msn/msn.c:1851
+#: ../libpurple/protocols/msnp9/msn.c:1692
 msgid "Work Phone"
 msgstr "��廚�� �廣����"
 
-#: ../libpurple/protocols/msn/msn.c:1838
-#: ../libpurple/protocols/msnp9/msn.c:1694
+#: ../libpurple/protocols/msn/msn.c:1852
+#: ../libpurple/protocols/msnp9/msn.c:1693
 msgid "Work Phone 2"
 msgstr "��廚�� �廣���� 2"
 
-#: ../libpurple/protocols/msn/msn.c:1839
-#: ../libpurple/protocols/msnp9/msn.c:1695
-#: ../libpurple/protocols/oscar/oscar.c:3839
+#: ../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:1840
-#: ../libpurple/protocols/msnp9/msn.c:1696
+#: ../libpurple/protocols/msn/msn.c:1854
+#: ../libpurple/protocols/msnp9/msn.c:1695
 msgid "Work Mobile"
 msgstr "��廚�� ���� �廣����"
 
-#: ../libpurple/protocols/msn/msn.c:1841
-#: ../libpurple/protocols/msnp9/msn.c:1697
+#: ../libpurple/protocols/msn/msn.c:1855
+#: ../libpurple/protocols/msnp9/msn.c:1696
 msgid "Work Pager"
 msgstr "��廚廨 �廣����"
 
-#: ../libpurple/protocols/msn/msn.c:1842
-#: ../libpurple/protocols/msnp9/msn.c:1698
+#: ../libpurple/protocols/msn/msn.c:1856
+#: ../libpurple/protocols/msnp9/msn.c:1697
 msgid "Work Fax"
 msgstr "廚廡廖 �廣����"
 
-#: ../libpurple/protocols/msn/msn.c:1843
-#: ../libpurple/protocols/msnp9/msn.c:1699
+#: ../libpurple/protocols/msn/msn.c:1857
+#: ../libpurple/protocols/msnp9/msn.c:1698
 msgid "Work E-Mail"
 msgstr "���\"� �廣����"
 
-#: ../libpurple/protocols/msn/msn.c:1844
-#: ../libpurple/protocols/msnp9/msn.c:1700
+#: ../libpurple/protocols/msn/msn.c:1858
+#: ../libpurple/protocols/msnp9/msn.c:1699
 msgid "Work IM"
 msgstr "IM �廣����"
 
-#: ../libpurple/protocols/msn/msn.c:1845
-#: ../libpurple/protocols/msnp9/msn.c:1701
+#: ../libpurple/protocols/msn/msn.c:1859
+#: ../libpurple/protocols/msnp9/msn.c:1700
 msgid "Start Date"
 msgstr "廬�廨�� 廬����"
 
-#: ../libpurple/protocols/msn/msn.c:1915 ../libpurple/protocols/msn/msn.c:1921
-#: ../libpurple/protocols/msn/msn.c:1928 ../libpurple/protocols/msn/msn.c:1935
-#: ../libpurple/protocols/msnp9/msn.c:1771
-#: ../libpurple/protocols/msnp9/msn.c:1777
-#: ../libpurple/protocols/msnp9/msn.c:1784
-#: ../libpurple/protocols/msnp9/msn.c:1791
+#: ../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:1980
-#: ../libpurple/protocols/msnp9/msn.c:1836
+#: ../libpurple/protocols/msn/msn.c:1994
+#: ../libpurple/protocols/msnp9/msn.c:1835
 msgid "Last Updated"
 msgstr "廣���� ���廨���"
 
-#: ../libpurple/protocols/msn/msn.c:1991
-#: ../libpurple/protocols/msnp9/msn.c:1847
+#: ../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:2015
-#: ../libpurple/protocols/msnp9/msn.c:1871
+#: ../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:2016
-#: ../libpurple/protocols/msnp9/msn.c:1872
-msgid ""
-"MSN reported not being able to find the user's profile. This either means "
-"that the user does not exist, or that the user exists but has not created a "
-"public profile."
-msgstr ""
-"MSN ������ 廩�� ���� ��廢�� �廬 廚廨�廚�� ��廩廬�廩. ��廬 ���廨廬 廩��廩廬�廩 �� 廡���, �� "
-"廩��廩廬�廩 廡��� �� �� �廢廨 廚廨�廚�� 廢���廨�."
-
-#: ../libpurple/protocols/msn/msn.c:2020
-#: ../libpurple/protocols/msnp9/msn.c:1876
-msgid ""
-"Could not find any information in the user's profile. The user most likely "
-"does not exist."
+#: ../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 public profile."
+msgstr "MSN ������ 廩�� ���� ��廢�� �廬 廚廨�廚�� ��廩廬�廩. ��廬 ���廨廬 廩��廩廬�廩 �� 廡���, �� 廩��廩廬�廩 廡��� �� �� �廢廨 廚廨�廚�� 廢���廨�."
+
+#: ../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:2028
-#: ../libpurple/protocols/msnp9/msn.c:1884
-#: ../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 "URL �廚廨�廚��"
 
@@ -7268,26 +7545,27 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2315 ../libpurple/protocols/msn/msn.c:2317
+#: ../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:2352
+#: ../libpurple/protocols/msn/msn.c:2366
 #: ../libpurple/protocols/msnp9/msn.c:2206
 msgid "Use HTTP Method"
 msgstr "�廩廬�廩 �廩��廬 HTTP"
 
-#: ../libpurple/protocols/msn/msn.c:2357
+#: ../libpurple/protocols/msn/msn.c:2371
 #: ../libpurple/protocols/msnp9/msn.c:2211
 msgid "HTTP Method Server"
 msgstr "廚廣��廬 廩廨廬-HTTP"
 
-#: ../libpurple/protocols/msn/msn.c:2362
+#: ../libpurple/protocols/msn/msn.c:2376
 #: ../libpurple/protocols/msnp9/msn.c:2216
 msgid "Show custom smileys"
 msgstr "�廢� 廖������� 廩��"
 
-#: ../libpurple/protocols/msn/msn.c:2370
+#: ../libpurple/protocols/msn/msn.c:2384
 #: ../libpurple/protocols/msnp9/msn.c:2224
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: 廩�� ���廚� ���廩 廡廩廨 ��� ��廩�� �廬 廬廩��廬 ����"
@@ -7298,9 +7576,7 @@
 
 #. we must have failed!
 #: ../libpurple/protocols/msn/nexus.c:126
-msgid ""
-"Windows Live ID authentication: cannot find authenticate token in server "
-"response"
+msgid "Windows Live ID authentication: cannot find authenticate token in server response"
 msgstr "����廬 ���� Windows Live: �� ��廬� ��廢�� 廖�� ����廬 �廬���廬 �廩廨廬"
 
 #: ../libpurple/protocols/msn/nexus.c:172
@@ -7339,7 +7615,7 @@
 msgstr "廩���� �� ���廨廬 (%d)"
 
 #: ../libpurple/protocols/msn/notification.c:837
-#: ../libpurple/protocols/sametime/sametime.c:4479
+#: ../libpurple/protocols/sametime/sametime.c:4480
 msgid "Unable to add user"
 msgstr "�� ��廬� ���廖�廝 �廩廬�廩"
 
@@ -7378,41 +7654,33 @@
 msgid "Service Temporarily Unavailable."
 msgstr "�廩�廨�廬 ���� ���� �廨�廣."
 
-#: ../libpurple/protocols/msn/notification.c:1276
+#: ../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/msn/notification.c:1383
 #: ../libpurple/protocols/msnp9/notification.c:953
 msgid "Unable to delete group"
 msgstr "��� �廚廩廨�廬 ����廡 �廬 �廡��廢�"
 
-#: ../libpurple/protocols/msn/notification.c:1945
+#: ../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 "
-"automatically be signed out at that time.  Please finish any conversations "
-"in progress.\n"
-"\n"
-"After the maintenance has been completed, you will be able to successfully "
-"sign in."
+"The MSN server will shut down for maintenance in %d minute. You will automatically be signed out at that time.  Please finish any conversations in progress.\n"
+"\n"
+"After the maintenance has been completed, you will be able to successfully sign in."
 msgid_plural ""
-"The MSN server will shut down for maintenance in %d minutes. You will "
-"automatically be signed out at that time.  Please finish any conversations "
-"in progress.\n"
-"\n"
-"After the maintenance has been completed, you will be able to successfully "
-"sign in."
+"The MSN server will shut down for maintenance in %d minutes. You will automatically be signed out at that time.  Please finish any conversations in progress.\n"
+"\n"
+"After the maintenance has been completed, you will be able to successfully sign in."
 msgstr[0] ""
-"廩廨廬 �-MSN ���� �廬���廡� �廣�� %d �廡�. �廬/� 廬��廬廡/� �������廬.��� 廖���/� �廬 "
-"�廩���廬 廩�� ��廡��.\n"
+"廩廨廬 �-MSN ���� �廬���廡� �廣�� %d �廡�. �廬/� 廬��廬廡/� �������廬.��� 廖���/� �廬 �廩���廬 廩�� ��廡��.\n"
 "\n"
 "���廨 廩�廬���廡� ��廩���, 廬���/� ��廬��廨 ���廩."
 msgstr[1] ""
-"廩廨廬 �-MSN ���� �廬���廡� �廣�� %d �廡�廬. �廬/� 廬��廬廡/� �������廬.��� 廖���/� �廬 "
-"�廩���廬 廩�� ��廡��.\n"
+"廩廨廬 �-MSN ���� �廬���廡� �廣�� %d �廡�廬. �廬/� 廬��廬廡/� �������廬.��� 廖���/� �廬 �廩���廬 廩�� ��廡��.\n"
 "\n"
 "���廨 廩�廬���廡� ��廩���, 廬���/� ��廬��廨 ���廩."
 
@@ -7493,8 +7761,7 @@
 
 #: ../libpurple/protocols/msn/session.c:381
 #: ../libpurple/protocols/msnp9/session.c:333
-msgid ""
-"Your MSN buddy list is temporarily unavailable. Please wait and try again."
+msgid "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr "廨廩��廬 ��廩� �廡廩廨 廩�� �-MSN ���� ����� �廨�廣. �廩 ��廖�廬 廩��廬 ����廨 ��廬廨."
 
 #: ../libpurple/protocols/msn/session.c:403
@@ -7566,17 +7833,12 @@
 
 #: ../libpurple/protocols/msn/switchboard.c:430
 #: ../libpurple/protocols/msnp9/switchboard.c:432
-msgid ""
-"Message could not be sent because we were unable to establish a session with "
-"the server. This is likely a server problem, try again in a few minutes:"
-msgstr ""
-"�� ��� ��廬� �廩��� �廬 ����廣�, ������ 廩�� ������ ��廢廣 �廬廡廩廨�廬 廣� �廩廨廬. ��� "
-"��廨�� �� �廣��� 廣� �廩廨廬, �廩 ��廖�廬 廩�� �廣�� �廖廚廨 �廡�廬:"
+msgid "Message could not be sent because we were unable to establish a session with the server. This is likely a server problem, try again in a few minutes:"
+msgstr "�� ��� ��廬� �廩��� �廬 ����廣�, ������ 廩�� ������ ��廢廣 �廬廡廩廨�廬 廣� �廩廨廬. ��� ��廨�� �� �廣��� 廣� �廩廨廬, �廩 ��廖�廬 廩�� �廣�� �廖廚廨 �廡�廬:"
 
 #: ../libpurple/protocols/msn/switchboard.c:437
 #: ../libpurple/protocols/msnp9/switchboard.c:439
-msgid ""
-"Message could not be sent because an error with the switchboard occurred:"
+msgid "Message could not be sent because an error with the switchboard occurred:"
 msgstr "�� ��廬� �廩��� �廬 ����廣� ����� 廩��廨廣� 廩���� 廣� ��廨�����:"
 
 #: ../libpurple/protocols/msn/switchboard.c:445
@@ -7599,13 +7861,13 @@
 #. 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 "�廩� 廩��廬� �廬廢��� ���� ��廡�."
@@ -7638,211 +7900,199 @@
 msgstr "廢�廚� �- RC4 �� ��廢�"
 
 #: ../libpurple/protocols/myspace/myspace.c:113
-msgid ""
-"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
-"not be loaded."
-msgstr ""
-"�廩 �廩�廨� ���廨廖� 廩� libpurple 廣� 廬���廬 RC4 (>= 2.0.1). 廬�廖廝 MySpaceIM �� ��廣�."
+msgid "Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will not be loaded."
+msgstr "�廩 �廩�廨� ���廨廖� 廩� libpurple 廣� 廬���廬 RC4 (>= 2.0.1). 廬�廖廝 MySpaceIM �� ��廣�."
 
 #: ../libpurple/protocols/myspace/myspace.c:345
 msgid "Reading challenge"
 msgstr "廡�廨� 廬���廬-廬��廨"
 
-#: ../libpurple/protocols/myspace/myspace.c:353
+#: ../libpurple/protocols/myspace/myspace.c:355
 msgid "Unexpected challenge length from server"
 msgstr "��廨� 廬���廬-廬��廨 �� 廢廚���� ��廩廨廬"
 
-#: ../libpurple/protocols/myspace/myspace.c:357
+#: ../libpurple/protocols/myspace/myspace.c:359
 msgid "Logging in"
 msgstr "�廬��廨"
 
-#: ../libpurple/protocols/myspace/myspace.c:1322
+#: ../libpurple/protocols/myspace/myspace.c:1324
 #, c-format
 msgid "Connection to server lost (no data received within %d seconds)"
 msgstr "��� �����廨 �� �廩廨廬 (�� �廩�� ���廣 廬�� %d 廩���廬)"
 
 #. Can't write _()'d strings in array initializers. Workaround.
-#: ../libpurple/protocols/myspace/myspace.c:1365
+#: ../libpurple/protocols/myspace/myspace.c:1367
 msgid "New mail messages"
 msgstr "���廣�廬 ���\"� ��廩�廬"
 
-#: ../libpurple/protocols/myspace/myspace.c:1366
+#: ../libpurple/protocols/myspace/myspace.c:1368
 msgid "New blog comments"
 msgstr "�廣廨�廬-���� ��廩�廬"
 
-#: ../libpurple/protocols/myspace/myspace.c:1367
-msgid "New profile comments"
-msgstr "�廣廨�廬-廚廨�廚�� ��廩�廬"
-
-#: ../libpurple/protocols/myspace/myspace.c:1368
-msgid "New friend requests!"
-msgstr "�廡廩�廬-��廨�廬  ��廩�廬!"
-
 #: ../libpurple/protocols/myspace/myspace.c:1369
+msgid "New profile comments"
+msgstr "�廣廨�廬-廚廨�廚�� ��廩�廬"
+
+#: ../libpurple/protocols/myspace/myspace.c:1370
+msgid "New friend requests!"
+msgstr "�廡廩�廬-��廨�廬  ��廩�廬!"
+
+#: ../libpurple/protocols/myspace/myspace.c:1371
 msgid "New picture comments"
 msgstr "�廣廨�廬-廬���� ��廩�廬"
 
-#: ../libpurple/protocols/myspace/myspace.c:1399
+#: ../libpurple/protocols/myspace/myspace.c:1401
 msgid "MySpace"
 msgstr "���廖廚廖"
 
-#: ../libpurple/protocols/myspace/myspace.c:1585
+#: ../libpurple/protocols/myspace/myspace.c:1587
 msgid "MySpaceIM - No Username Set"
 msgstr "�� �廡�廣 廩� �廩廬�廩 廣��廨 MySpaceIM"
 
-#: ../libpurple/protocols/myspace/myspace.c:1586
+#: ../libpurple/protocols/myspace/myspace.c:1588
 msgid "You appear to have no MySpace username."
 msgstr "��� ��廨�� ��� �� �廩廬�廩 廩� ���廖廚��廖."
 
-#: ../libpurple/protocols/myspace/myspace.c:1587
+#: ../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:1611
-#: ../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:1846
+#: ../libpurple/protocols/myspace/myspace.c:1848
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "廩���廬 廚廨���廡��, 廡�� %d: %s"
 
-#: ../libpurple/protocols/myspace/myspace.c:1868
-#, c-format
-msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
-msgstr ""
-"%s 廖�廖�廬� ���� ���廨� %d 廬���, ��廬廨 ����廨� ��廢�廚� 廩� %d 廣��廨 MySpaceIM (�廣廨�廬 "
-"���廣�廬 ������廬 ����廖廚��廖).�廩 �廡廢廨 �廬 �廖�廖�� ��廝http://profileedit.myspace."
-"com/index.cfm?fuseaction=accountSettings.changePassword ���廖�廬 廩��廬."
-
-#: ../libpurple/protocols/myspace/myspace.c:1891
+#: ../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:2069
-#: ../libpurple/protocols/myspace/myspace.c:2103
+#: ../libpurple/protocols/myspace/myspace.c:2071
+#: ../libpurple/protocols/myspace/myspace.c:2105
 msgid "Failed to add buddy"
 msgstr "�廩� ���廖廚廬 ��廩-廡廩廨"
 
-#: ../libpurple/protocols/myspace/myspace.c:2069
+#: ../libpurple/protocols/myspace/myspace.c:2071
 msgid "'addbuddy' command failed."
 msgstr "�廩� �廚廡��廬 'addbuddy'."
 
-#: ../libpurple/protocols/myspace/myspace.c:2103
-#: ../libpurple/protocols/myspace/myspace.c:2348
+#: ../libpurple/protocols/myspace/myspace.c:2105
+#: ../libpurple/protocols/myspace/myspace.c:2350
 msgid "persist command failed"
 msgstr "��廩��� �廚廡��廬 persist"
 
-#: ../libpurple/protocols/myspace/myspace.c:2208
+#: ../libpurple/protocols/myspace/myspace.c:2210
 #, c-format
 msgid "No such user: %s"
 msgstr "��� �廩廬�廩 ���: %s"
 
-#: ../libpurple/protocols/myspace/myspace.c:2210
+#: ../libpurple/protocols/myspace/myspace.c:2212
 msgid "User lookup"
 msgstr "��廚�廩 �廩廬�廩"
 
-#: ../libpurple/protocols/myspace/myspace.c:2329
-#: ../libpurple/protocols/myspace/myspace.c:2348
-#: ../libpurple/protocols/myspace/myspace.c:2370
+#: ../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:2329
+#: ../libpurple/protocols/myspace/myspace.c:2331
 msgid "'delbuddy' command failed"
 msgstr "廚廡��廬 'delbuddy' ��廩��"
 
-#: ../libpurple/protocols/myspace/myspace.c:2370
+#: ../libpurple/protocols/myspace/myspace.c:2372
 msgid "blocklist command failed"
 msgstr "廚廡��廬 blocklist ��廩��"
 
-#: ../libpurple/protocols/myspace/myspace.c:2484
+#: ../libpurple/protocols/myspace/myspace.c:2486
 msgid "Invalid input condition"
 msgstr "廬��� 廡���� 廩���"
 
-#: ../libpurple/protocols/myspace/myspace.c:2539
+#: ../libpurple/protocols/myspace/myspace.c:2541
 msgid "Read buffer full (2)"
 msgstr "廬�廨-�廡廨��� ��� (2)"
 
-#: ../libpurple/protocols/myspace/myspace.c:2582
+#: ../libpurple/protocols/myspace/myspace.c:2584
 msgid "Unparseable message"
 msgstr "���廣廬 廩�� ��廬�廬 �廚�廣���"
 
-#: ../libpurple/protocols/myspace/myspace.c:2653
+#: ../libpurple/protocols/myspace/myspace.c:2655
 #, c-format
 msgid "Couldn't connect to host: %s (%d)"
 msgstr "�� ��廬� ��廬��廨 �廩廨廬: %s (%d)"
 
-#: ../libpurple/protocols/myspace/myspace.c:2831
+#: ../libpurple/protocols/myspace/myspace.c:2833
 msgid "IM Friends"
 msgstr "��廨� ����廣�廬 �����廬"
 
-#: ../libpurple/protocols/myspace/myspace.c:2931
-#, c-format
-msgid ""
-"%d buddies were added or updated from the server (including buddies already "
-"on the server-side list)"
+#: ../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 "%d ��廩�-廡廩廨 ��廖廚� �� 廣����� ��廩廨廬 (���� ��廩�-廡廩廨 ��廨 �廨廩��� 廣� �廩廨廬)"
 
-#: ../libpurple/protocols/myspace/myspace.c:2932
+#: ../libpurple/protocols/myspace/myspace.c:2934
 msgid "Add contacts from server"
 msgstr "��廖廝 ��廩�-廡廩廨 ��廩廨廬"
 
-#: ../libpurple/protocols/myspace/myspace.c:2984
-#: ../libpurple/protocols/myspace/myspace.c:3048
+#: ../libpurple/protocols/myspace/myspace.c:2986
+#: ../libpurple/protocols/myspace/myspace.c:3050
 msgid "Add friends from MySpace.com"
 msgstr "��廖廝 ��廨�� �廬�� MySpace.com"
 
-#: ../libpurple/protocols/myspace/myspace.c:2985
+#: ../libpurple/protocols/myspace/myspace.c:2987
 msgid "Importing friends failed"
 msgstr "����� ���廨�� ��廩��"
 
 #. TODO: find out how
-#: ../libpurple/protocols/myspace/myspace.c:3041
+#: ../libpurple/protocols/myspace/myspace.c:3043
 msgid "Find people..."
 msgstr "�廢��廬 ��廩��..."
 
-#: ../libpurple/protocols/myspace/myspace.c:3044
+#: ../libpurple/protocols/myspace/myspace.c:3046
 msgid "Change IM name..."
 msgstr "廩���� 廩� ����廣�廬 �����廬..."
 
-#: ../libpurple/protocols/myspace/myspace.c:3345
+#: ../libpurple/protocols/myspace/myspace.c:3347
 msgid "myim URL handler"
 msgstr "��廚� ��廬���廬 myim"
 
-#: ../libpurple/protocols/myspace/myspace.c:3346
+#: ../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:3347
+#: ../libpurple/protocols/myspace/myspace.c:3349
 msgid "Enable the proper MySpaceIM account and try again."
 msgstr "�廩 ��廚廣�� �廬 ��廩��� MySpaceIM ��廬��� ���廖�廬 廩��."
 
-#: ../libpurple/protocols/myspace/myspace.c:3470
+#: ../libpurple/protocols/myspace/myspace.c:3472
 msgid "Show display name in status text"
 msgstr "�廢� 廩�-廬廢��� ��廡廖� �廖����廖"
 
-#: ../libpurple/protocols/myspace/myspace.c:3473
+#: ../libpurple/protocols/myspace/myspace.c:3475
 msgid "Show headline in status text"
 msgstr "�廢� ��廬廨廬 ��廡廖� �廖����廖"
 
-#: ../libpurple/protocols/myspace/myspace.c:3478
+#: ../libpurple/protocols/myspace/myspace.c:3480
 msgid "Send emoticons"
 msgstr "廩�� 廨��廩����"
 
-#: ../libpurple/protocols/myspace/myspace.c:3483
+#: ../libpurple/protocols/myspace/myspace.c:3485
 msgid "Screen resolution (dots per inch)"
 msgstr "('廨����廢�廬 �廖� (�廡���廬 ����廛"
 
-#: ../libpurple/protocols/myspace/myspace.c:3486
+#: ../libpurple/protocols/myspace/myspace.c:3488
 msgid "Base font size (points)"
 msgstr "(���� ��廚� �廖�廖� (��廡���廬"
 
@@ -7853,7 +8103,7 @@
 msgstr "�廩廬�廩"
 
 #: ../libpurple/protocols/myspace/user.c:115
-#: ../libpurple/protocols/oscar/oscar.c:3025
+#: ../libpurple/protocols/oscar/oscar.c:3032
 msgid "Profile"
 msgstr "廚廨�廚��"
 
@@ -8156,9 +8406,7 @@
 msgstr "�� ���� �廬 �廩廨廬 廣��廨 ��廩廬�廩 廩����"
 
 #: ../libpurple/protocols/novell/nmuser.c:1928
-msgid ""
-"Your account has been disabled because too many incorrect passwords were "
-"entered"
+msgid "Your account has been disabled because too many incorrect passwords were entered"
 msgstr "�廩���� ��廩廣�  廣廡� 廨���� ���廬 廖�廖���廬 廩����廬"
 
 #: ../libpurple/protocols/novell/nmuser.c:1931
@@ -8186,9 +8434,7 @@
 msgstr "�廩廬�廩 �� �廖� ��廬�"
 
 #: ../libpurple/protocols/novell/nmuser.c:1950
-msgid ""
-"This evaluation version does not allow more than ten users to log in at one "
-"time"
+msgid "This evaluation version does not allow more than ten users to log in at one time"
 msgstr "��廨廖廬 ���廖�� ��� ���� ��廚廩廨廬 ���廬廨 �-10 �廩廬�廩�� ��廬��廨 �� ����廬"
 
 #: ../libpurple/protocols/novell/nmuser.c:1953
@@ -8239,21 +8485,13 @@
 
 #: ../libpurple/protocols/novell/novell.c:592
 #, c-format
-msgid ""
-"Unable to move user %s to folder %s in the server side list. Error while "
-"creating folder (%s)."
-msgstr ""
-"�� ��廬� ��廣��廨 �廬 ��廩廬�廩 %s �廬�廡��� %s �廨廩��� �廢� �廩廨廬.廩���� �廣廬 �廢�廨廬 "
-"�廬�廡��� (%s)."
+msgid "Unable to move user %s to folder %s in the server side list. Error while creating folder (%s)."
+msgstr "�� ��廬� ��廣��廨 �廬 ��廩廬�廩 %s �廬�廡��� %s �廨廩��� �廢� �廩廨廬.廩���� �廣廬 �廢�廨廬 �廬�廡��� (%s)."
 
 #: ../libpurple/protocols/novell/novell.c:640
 #, c-format
-msgid ""
-"Unable to add %s to your buddy list. Error creating folder in server side "
-"list (%s)."
-msgstr ""
-"�� ��廬� ���廖�廝 �廬 %s �廨廩��廬 ��廩� �廡廩廨 廩��.廩���� ��廢�廨廬 廬�廡��� �廨廩��廬 廩� �廩廨廬 "
-"(%s)."
+msgid "Unable to add %s to your buddy list. Error creating folder in server side list (%s)."
+msgstr "�� ��廬� ���廖�廝 �廬 %s �廨廩��廬 ��廩� �廡廩廨 廩��.廩���� ��廢�廨廬 廬�廡��� �廨廩��廬 廩� �廩廨廬 (%s)."
 
 #: ../libpurple/protocols/novell/novell.c:713
 #, c-format
@@ -8310,7 +8548,7 @@
 msgstr "廬��廬 ���廨"
 
 #: ../libpurple/protocols/novell/novell.c:1511
-#: ../libpurple/protocols/sametime/sametime.c:4176
+#: ../libpurple/protocols/sametime/sametime.c:4177
 msgid "User ID"
 msgstr "廩� �廩廬�廩"
 
@@ -8371,14 +8609,11 @@
 
 #: ../libpurple/protocols/novell/novell.c:2085
 #, c-format
-msgid ""
-"%s appears to be offline and did not receive the message that you just sent."
+msgid "%s appears to be offline and did not receive the message that you just sent."
 msgstr "��� ��廨��, %s ���� ����廨 ��� 廡��� �廬 ����廣� 廩廩��廬 �廨�廣."
 
 #: ../libpurple/protocols/novell/novell.c:2185
-msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+msgid "Unable to connect to server. Please enter the address of the server you wish to connect to."
 msgstr "�� ��廬� ��廬��廨 �廩廨廬. �廩 ����� �廬 �廬��廬 �廩廨廬 廩�廨廢��� ��廬��廨 ����."
 
 #: ../libpurple/protocols/novell/novell.c:2214
@@ -8421,19 +8656,25 @@
 msgstr "廩� ���廨 ���� 廬廡廝"
 
 #: ../libpurple/protocols/oscar/flap_connection.c:391
-#: ../libpurple/protocols/yahoo/yahoo.c:2487
-#: ../libpurple/protocols/yahoo/yahoo.c:2655
-#: ../libpurple/protocols/yahoo/ycht.c:482 ../libpurple/proxy.c:584
-#: ../libpurple/proxy.c:1135 ../libpurple/proxy.c:1244
-#: ../libpurple/proxy.c:1344 ../libpurple/proxy.c:1472
+#: ../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:2480
-#: ../libpurple/protocols/yahoo/yahoo.c:2648 ../libpurple/proxy.c:596
-#: ../libpurple/proxy.c:1147 ../libpurple/proxy.c:1256
-#: ../libpurple/proxy.c:1356 ../libpurple/proxy.c:1484
+#: ../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"
@@ -8443,9 +8684,11 @@
 "%s"
 
 #: ../libpurple/protocols/oscar/flap_connection.c:396
-#: ../libpurple/proxy.c:1164 ../libpurple/proxy.c:1269
-#: ../libpurple/proxy.c:1368 ../libpurple/proxy.c:1440
-#: ../libpurple/proxy.c:1497
+#: ../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 "�廬廡�� ���廣 廩��� �����廨 廣� �廩廨廬."
 
@@ -8480,8 +8723,8 @@
 msgstr "廬�廖廝 廚廨���廡�� ICQ"
 
 #: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4427
-#: ../libpurple/protocols/zephyr/zephyr.c:2979
+#: ../libpurple/protocols/yahoo/yahoo.c:4452
+#: ../libpurple/protocols/zephyr/zephyr.c:2982
 msgid "Encoding"
 msgstr "廡����"
 
@@ -8512,12 +8755,8 @@
 
 #: ../libpurple/protocols/oscar/odc.c:600
 #, c-format
-msgid ""
-"%s tried to send you a %s file, but we only allow files up to %s over Direct "
-"IM.  Try using file transfer instead.\n"
-msgstr ""
-"%s ��廖� �廩��� 廡��廛 %s ����, ��� ��� ��廚廩廨�� 廨廡 廡�廢�� 廣� %s �廣� Direct IM.  "
-"��廡�� ��廬, �廩 ��廖�廬 ��廣��廨 �廬 �廡��廛 �廣�廨廬 ������ �廣�廨廬 �廡�廢��.\n"
+msgid "%s tried to send you a %s file, but we only allow files up to %s over Direct IM.  Try using file transfer instead.\n"
+msgstr "%s ��廖� �廩��� 廡��廛 %s ����, ��� ��� ��廚廩廨�� 廨廡 廡�廢�� 廣� %s �廣� Direct IM.  ��廡�� ��廬, �廩 ��廖�廬 ��廣��廨 �廬 �廡��廛 �廣�廨廬 ������ �廣�廨廬 �廡�廢��.\n"
 
 #: ../libpurple/protocols/oscar/oft.c:656
 #, c-format
@@ -8620,156 +8859,150 @@
 msgid "Not while on AOL"
 msgstr "�� ���� 廩��廬 �-AOL"
 
-#: ../libpurple/protocols/oscar/oscar.c:347
-msgid ""
-"(There was an error receiving this message.  The buddy you are speaking with "
-"is probably using a different encoding than expected.  If you know what "
-"encoding he is using, you can specify it in the advanced account options for "
-"your AIM/ICQ account.)"
-msgstr ""
-"(���廬� 廩���� �廣廬 廡��廬 ���廣� ��.  ��廩-�廡廩廨 ��廬� �廩��� ��廨�� �廩廬�廩 �廡���� 廩��� "
-"�� ��廢�廚�. �� ���� ���廣/廬 ����� 廡���� ��� �廩廬�廩, ��廬� �����廨 ��廬 ����廨�廬 "
-"��廬廡���廬 廩� ��廩��� 廣��廨 ��廩��� ��� 廩� AIM/ICQ.)"
-
-#: ../libpurple/protocols/oscar/oscar.c:456
-#, c-format
-msgid ""
-"(There was an error receiving this message.  Either you and %s have "
-"different encodings selected, or %s has a buggy client.)"
-msgstr ""
-"(���廬� 廬廡�� �廡��廬 ���廣� ��. �� 廩�� ���廩廬�廩 %s �廩 廡������ 廩����,�� 廩��廩廬�廩 %s "
-"�廩 廬���� 廣� �����.)"
+#: ../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 encoding he is using, you can specify it in the advanced account options for your AIM/ICQ account.)"
+msgstr "(���廬� 廩���� �廣廬 廡��廬 ���廣� ��.  ��廩-�廡廩廨 ��廬� �廩��� ��廨�� �廩廬�廩 �廡���� 廩��� �� ��廢�廚�. �� ���� ���廣/廬 ����� 廡���� ��� �廩廬�廩, ��廬� �����廨 ��廬 ����廨�廬 ��廬廡���廬 廩� ��廩��� 廣��廨 ��廩��� ��� 廩� AIM/ICQ.)"
+
+#: ../libpurple/protocols/oscar/oscar.c:458
+#, c-format
+msgid "(There was an error receiving this message.  Either you and %s have different encodings selected, or %s has a buggy client.)"
+msgstr "(���廬� 廬廡�� �廡��廬 ���廣� ��. �� 廩�� ���廩廬�廩 %s �廩 廡������ 廩����,�� 廩��廩廬�廩 %s �廩 廬���� 廣� �����.)"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:638 ../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:641
+#: ../libpurple/protocols/oscar/oscar.c:643
 msgid "Voice"
 msgstr "廡��"
 
-#: ../libpurple/protocols/oscar/oscar.c:644
+#: ../libpurple/protocols/oscar/oscar.c:646
 msgid "AIM Direct IM"
 msgstr "���廣�廬 �廩�廨�廬 廩� AIM"
 
-#: ../libpurple/protocols/oscar/oscar.c:650
-#: ../libpurple/protocols/oscar/oscar.c:6113
+#: ../libpurple/protocols/oscar/oscar.c:652
+#: ../libpurple/protocols/oscar/oscar.c:6139
 msgid "Get File"
 msgstr "廡�� 廡��廛"
 
-#: ../libpurple/protocols/oscar/oscar.c:657
+#: ../libpurple/protocols/oscar/oscar.c:659
 msgid "Games"
 msgstr "�廩�廡��"
 
-#: ../libpurple/protocols/oscar/oscar.c:660
+#: ../libpurple/protocols/oscar/oscar.c:662
 msgid "Add-Ins"
 msgstr "廬�廖廚�廬"
 
-#: ../libpurple/protocols/oscar/oscar.c:663
+#: ../libpurple/protocols/oscar/oscar.c:665
 msgid "Send Buddy List"
 msgstr "廩�� 廨廩��廬 ��廩� �廡廩廨"
 
-#: ../libpurple/protocols/oscar/oscar.c:666
+#: ../libpurple/protocols/oscar/oscar.c:668
 msgid "ICQ Direct Connect"
 msgstr "����廨 �廩�廨 廩� ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:669
+#: ../libpurple/protocols/oscar/oscar.c:671
 msgid "AP User"
 msgstr "AP �廩廬�廩"
 
-#: ../libpurple/protocols/oscar/oscar.c:672
+#: ../libpurple/protocols/oscar/oscar.c:674
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: ../libpurple/protocols/oscar/oscar.c:675
+#: ../libpurple/protocols/oscar/oscar.c:677
 msgid "Nihilist"
 msgstr "��廚廨 ���廖���廬"
 
-#: ../libpurple/protocols/oscar/oscar.c:678
+#: ../libpurple/protocols/oscar/oscar.c:680
 msgid "ICQ Server Relay"
 msgstr "��廬�� 廩廨廬 ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:681
+#: ../libpurple/protocols/oscar/oscar.c:683
 msgid "Old ICQ UTF8"
 msgstr "ICQ UTF8 �廩�"
 
-#: ../libpurple/protocols/oscar/oscar.c:684
+#: ../libpurple/protocols/oscar/oscar.c:686
 msgid "Trillian Encryption"
 msgstr "�廢廚�廬 �廨�����"
 
-#: ../libpurple/protocols/oscar/oscar.c:687
+#: ../libpurple/protocols/oscar/oscar.c:689
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:690
+#: ../libpurple/protocols/oscar/oscar.c:692
 msgid "Hiptop"
 msgstr "���廚 廩�廚�廚"
 
-#: ../libpurple/protocols/oscar/oscar.c:693
+#: ../libpurple/protocols/oscar/oscar.c:695
 msgid "Security Enabled"
 msgstr "����� ��廚廣�廬"
 
-#: ../libpurple/protocols/oscar/oscar.c:696
+#: ../libpurple/protocols/oscar/oscar.c:698
 msgid "Video Chat"
 msgstr "廩��廬 �����"
 
-#: ../libpurple/protocols/oscar/oscar.c:700
+#: ../libpurple/protocols/oscar/oscar.c:702
 msgid "iChat AV"
 msgstr "iChat ��廨-廡���"
 
-#: ../libpurple/protocols/oscar/oscar.c:703
+#: ../libpurple/protocols/oscar/oscar.c:705
 msgid "Live Video"
 msgstr "廩���廨 ��"
 
-#: ../libpurple/protocols/oscar/oscar.c:706
+#: ../libpurple/protocols/oscar/oscar.c:708
 msgid "Camera"
 msgstr "�廢���"
 
-#: ../libpurple/protocols/oscar/oscar.c:724
-#: ../libpurple/protocols/oscar/oscar.c:5883
+#: ../libpurple/protocols/oscar/oscar.c:726
+#: ../libpurple/protocols/oscar/oscar.c:5909
 msgid "Free For Chat"
 msgstr "廚��� �廩���"
 
-#: ../libpurple/protocols/oscar/oscar.c:728
-#: ../libpurple/protocols/oscar/oscar.c:5918
+#: ../libpurple/protocols/oscar/oscar.c:730
+#: ../libpurple/protocols/oscar/oscar.c:5944
 msgid "Not Available"
 msgstr "�� ����"
 
-#: ../libpurple/protocols/oscar/oscar.c:730
-#: ../libpurple/protocols/oscar/oscar.c:5904
+#: ../libpurple/protocols/oscar/oscar.c:732
+#: ../libpurple/protocols/oscar/oscar.c:5930
 msgid "Occupied"
 msgstr "廣廖�廡"
 
-#: ../libpurple/protocols/oscar/oscar.c:734
+#: ../libpurple/protocols/oscar/oscar.c:736
 msgid "Web Aware"
 msgstr "���廣 廨廩廬"
 
-#: ../libpurple/protocols/oscar/oscar.c:736 ../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:3132 ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:557 ../pidgin/gtkstatusbox.c:1084
+#: ../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:837
-#: ../libpurple/protocols/oscar/oscar.c:3740
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1100
+#: ../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:844
-#: ../libpurple/protocols/oscar/oscar.c:2952
+#: ../libpurple/protocols/oscar/oscar.c:846
+#: ../libpurple/protocols/oscar/oscar.c:2959
 msgid "Warning Level"
 msgstr "廨�廬 ���廨�"
 
-#: ../libpurple/protocols/oscar/oscar.c:854
+#: ../libpurple/protocols/oscar/oscar.c:856
 msgid "Buddy Comment"
 msgstr "�廣廨廬 ��廩 廡廩廨"
 
-#: ../libpurple/protocols/oscar/oscar.c:994
+#: ../libpurple/protocols/oscar/oscar.c:996
 #, c-format
 msgid ""
 "Could not connect to authentication server:\n"
@@ -8778,7 +9011,7 @@
 "�� ��廬� ��廬��廨 �廩廨廬 �����廬:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1002
+#: ../libpurple/protocols/oscar/oscar.c:1004
 #, c-format
 msgid ""
 "Could not connect to BOS server:\n"
@@ -8787,178 +9020,163 @@
 "�� ��廬� ��廬��廨 �廩廨廬 �-BOS:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1042
-msgid "Screen name sent"
-msgstr "�廩�� 廩� ��廩廬�廩"
-
-#: ../libpurple/protocols/oscar/oscar.c:1047
+#: ../libpurple/protocols/oscar/oscar.c:1044
+msgid "Username sent"
+msgstr "廩� �廩廬�廩 �廩��"
+
+#: ../libpurple/protocols/oscar/oscar.c:1049
 msgid "Connection established, cookie sent"
 msgstr "����廨 ��廩��, �廩�� cookie."
 
 #. TODO: Don't call this with ssi
-#: ../libpurple/protocols/oscar/oscar.c:1076
+#: ../libpurple/protocols/oscar/oscar.c:1078
 msgid "Finalizing connection"
 msgstr "��廢廣 ����廨 �����廨"
 
-#: ../libpurple/protocols/oscar/oscar.c:1302
-#, c-format
-msgid ""
-"Unable to login: Could not sign on as %s because the screen name is "
-"invalid.  Screen names must be a valid email address, or start with a letter "
-"and contain only letters, numbers and spaces, or contain only numbers."
-msgstr ""
-"�� ��廬� ��廬��廨: �� ��� ��廬� ��廬��廨 �廬�廨 %s ����� 廩廩�-廬廢��� �� ���� 廬廡廝. 廩��廬-"
-"廬廢��� ������ ����廬 �廬���廬 ������ ��廡��廬, �� ��廬��� ���廬 ������ 廨廡 ��廬��廬 "
-"�廖廚廨�� �廨�����, �� ����廚�� ����� �� �廨廡 �廖廚廨��."
+#: ../libpurple/protocols/oscar/oscar.c: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:1388
-#: ../libpurple/protocols/yahoo/yahoo.c:2109
-msgid "Invalid screen name."
-msgstr "廩�-廬廢��� �� 廬廡��."
-
-#: ../libpurple/protocols/oscar/oscar.c:1394
+#: ../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:2131
+#: ../libpurple/protocols/yahoo/yahoo.c:2149
 msgid "Incorrect password."
 msgstr "廖�廖�� �� �����."
 
 #. Suspended account
-#: ../libpurple/protocols/oscar/oscar.c:1398
+#: ../libpurple/protocols/oscar/oscar.c:1402
 msgid "Your account is currently suspended."
 msgstr "�廩���� ��廩廣� �廨�廣."
 
 #. service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1402
+#: ../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:1406
-#: ../libpurple/protocols/oscar/oscar.c:1415
-msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
-msgstr ""
-"�廬��廨廬 ��廬�廬廡廬 �廬��廨�廬 ����� ����. ��廬� 10 �廡�廬 ��廖� 廩��廬. �� 廬�廩�� ��廖�廬, "
-"廬���廛 ���廬�� �廚��� ��廬廨."
+#: ../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."
+msgstr "�廬��廨廬 ��廬�廬廡廬 �廬��廨�廬 ����� ����. ��廬� 10 �廡�廬 ��廖� 廩��廬. �� 廬�廩�� ��廖�廬, 廬���廛 ���廬�� �廚��� ��廬廨."
 
 #. client too old
-#: ../libpurple/protocols/oscar/oscar.c:1410
+#: ../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:1448
+#: ../libpurple/protocols/oscar/oscar.c:1452
 msgid "Could Not Connect"
 msgstr "�� ��廬� ��廬��廨"
 
-#: ../libpurple/protocols/oscar/oscar.c:1452
+#: ../libpurple/protocols/oscar/oscar.c:1456
 msgid "Received authorization"
 msgstr "�廬廡��� �廨廩��"
 
-#: ../libpurple/protocols/oscar/oscar.c:1475
+#: ../libpurple/protocols/oscar/oscar.c:1479
 msgid "The SecurID key entered is invalid."
 msgstr "��廚廬� 廣��廨 SecurID ���� 廬廡廝."
 
-#: ../libpurple/protocols/oscar/oscar.c:1488
+#: ../libpurple/protocols/oscar/oscar.c:1492
 msgid "Enter SecurID"
 msgstr "�廩 ����� SecurID"
 
-#: ../libpurple/protocols/oscar/oscar.c:1489
+#: ../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:1491
-#: ../libpurple/protocols/oscar/oscar.c:2293
-#: ../libpurple/protocols/oscar/oscar.c:2342
-#: ../libpurple/protocols/oscar/oscar.c:5988
-#: ../libpurple/protocols/oscar/oscar.c:6269 ../libpurple/request.h:1458
+#: ../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:1530
-#, c-format
-msgid ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check %s for updates."
-msgstr ""
-"��廬�� �廬��廬廡/� �廡廨��. ���� 廬廨廢/� ���廣�廨 �-TOC 廣� �廩廨 �� �廬�廡�. �廚廩廨 ����廡 �%"
-"s �廣�������."
-
-#: ../libpurple/protocols/oscar/oscar.c:1533
-#: ../libpurple/protocols/oscar/oscar.c:1577
+#: ../libpurple/protocols/oscar/oscar.c:1534
+#, c-format
+msgid "You may be disconnected shortly.  You may want to use TOC until this is fixed.  Check %s for updates."
+msgstr "��廬�� �廬��廬廡/� �廡廨��. ���� 廬廨廢/� ���廣�廨 �-TOC 廣� �廩廨 �� �廬�廡�. �廚廩廨 ����廡 �%s �廣�������."
+
+#: ../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:1574
-#: ../libpurple/protocols/oscar/oscar.c:1673
+#: ../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:1676
+#: ../libpurple/protocols/oscar/oscar.c:1680
 msgid "Unable to get a valid login hash."
 msgstr "�� �廢��� ��廩�� 廡�� �廬��廨�廬 廬廡廝."
 
-#: ../libpurple/protocols/oscar/oscar.c:1706
+#: ../libpurple/protocols/oscar/oscar.c:1710
 msgid "Password sent"
 msgstr "�廖�廖�� �廩���"
 
-#: ../libpurple/protocols/oscar/oscar.c:1762
+#: ../libpurple/protocols/oscar/oscar.c:1766
 msgid "Unable to initialize connection"
 msgstr "�� ��廬� ��廬�� ����廨"
 
-#: ../libpurple/protocols/oscar/oscar.c:2251
+#: ../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:2291
+#: ../libpurple/protocols/oscar/oscar.c:2298
 msgid "Authorization Request Message:"
 msgstr "���廣廬 �廡廩� ��廨廩��:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2292
+#: ../libpurple/protocols/oscar/oscar.c:2299
 msgid "Please authorize me!"
 msgstr "��廡廩�, ��� 廨�廢� �廨廩��!"
 
-#: ../libpurple/protocols/oscar/oscar.c:2333
-#: ../libpurple/protocols/oscar/oscar.c:2341
-#: ../libpurple/protocols/oscar/oscar.c:2468
-#: ../libpurple/protocols/oscar/oscar.c:5360
+#: ../libpurple/protocols/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:2340
+#: ../libpurple/protocols/oscar/oscar.c:2347
 msgid "Authorization Denied Message:"
 msgstr "���廣廬 廖�廨�� �廨廩��"
 
-#: ../libpurple/protocols/oscar/oscar.c:2468
-#, c-format
-msgid ""
-"The user %u has denied your request to add them to your buddy list for the "
-"following reason:\n"
+#: ../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 following reason:\n"
 "%s"
 msgstr ""
 "��廩廬�廩 %u ��� �廬 �廡廩廬� ���廖�廝 ��廬� �廨廩��廬 ��廩� �廡廩廨 廩��� ��廖��� ����:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2469
+#: ../libpurple/protocols/oscar/oscar.c:2476
 msgid "ICQ authorization denied."
 msgstr "����廬 �廨廩�廬 ICQ."
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2476
+#: ../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:2484
+#: ../libpurple/protocols/oscar/oscar.c:2491
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -8971,7 +9189,7 @@
 "��廬: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2492
+#: ../libpurple/protocols/oscar/oscar.c:2499
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -8984,7 +9202,7 @@
 "��廬: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2500
+#: ../libpurple/protocols/oscar/oscar.c:2507
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -8997,61 +9215,60 @@
 "����廣� ���:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2521
+#: ../libpurple/protocols/oscar/oscar.c:2528
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "�廩廬�廩 %u �廚�� ��廬� ���廩 廡廩廨 %s - 廚廨���: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2527
+#: ../libpurple/protocols/oscar/oscar.c:2534
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "��� �廨廢��� ���廖�廝 �廬 ��廩廬�廩 ��� �廨廩��廬 ��廩� �廡廩廨 廩��?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2532 ../pidgin/gtkroomlist.c:320
+#: ../libpurple/protocols/oscar/oscar.c:2539
+#: ../pidgin/gtkroomlist.c:320
 msgid "_Add"
 msgstr "��廖廝"
 
-#: ../libpurple/protocols/oscar/oscar.c:2533
+#: ../libpurple/protocols/oscar/oscar.c:2540
 msgid "_Decline"
 msgstr "���"
 
-#: ../libpurple/protocols/oscar/oscar.c:2657
+#: ../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."
 msgstr[0] "廚廖廚廖廬 %hu ���廣� ��廬 %s ������ 廩��� ��廬� �� 廬廡��廬."
 msgstr[1] "廚廖廚廖廬 %hu ���廣�廬 ��廬 %s ������ 廩�� ��� �� 廬廡���廬."
 
-#: ../libpurple/protocols/oscar/oscar.c:2666
+#: ../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."
 msgstr[0] "廚廖廚廖廬 %hu ���廣� ��廬 %s ������ 廩��� ��廬� ����� ���."
 msgstr[1] "廚廖廚廖廬 %hu ���廣�廬 ��廬 %s ������ 廩�� ��� �����廬 ���."
 
-#: ../libpurple/protocols/oscar/oscar.c:2675
-#, c-format
-msgid ""
-"You missed %hu message from %s because the rate limit has been exceeded."
-msgid_plural ""
-"You missed %hu messages from %s because the rate limit has been exceeded."
+#: ../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."
 msgstr[0] "廚廖廚廖廬 %hu ���廣� ��廬 %s ������ 廩���廨�廬 �廩���� ��廚廨�廬."
 msgstr[1] "廚廖廚廖廬 %hu ���廣�廬 ��廬 %s ������ 廩���廨�廬 �廩���� ��廚廨�廬."
 
-#: ../libpurple/protocols/oscar/oscar.c:2684
+#: ../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."
 msgstr[0] "廚廖廚廖廬 %hu ���廣� ��廬 %s ������ 廩��� 廨廣 ���."
 msgstr[1] "廚廖廚廖廬 %hu ���廣�廬 ��廬 %s ������ 廩��� 廨廣 ���."
 
-#: ../libpurple/protocols/oscar/oscar.c:2693
+#: ../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."
 msgstr[0] "廚廖廚廖廬 %hu ���廣� ��廬 %s ������ 廩�廬/� 廨廣 ���."
 msgstr[1] "廚廖廚廖廬 %hu ���廣�廬 ��廬 %s ������ 廩�廬/� 廨廣 ���."
 
-#: ../libpurple/protocols/oscar/oscar.c:2702
+#: ../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."
@@ -9059,503 +9276,438 @@
 msgstr[1] "廚廖廚廖廬 %hu ���廣�廬 ��廬 %s �廖��� �� ���廣�."
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2857
+#: ../libpurple/protocols/oscar/oscar.c:2864
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "�� ��廬� �廩��� ���廣�: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2857
-#: ../libpurple/protocols/oscar/oscar.c:2862
-#: ../libpurple/protocols/oscar/oscar.c:2926
+#: ../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:2860
-#: ../libpurple/protocols/sametime/sametime.c:2459
+#: ../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:2926
+#: ../libpurple/protocols/oscar/oscar.c:2933
 #, c-format
 msgid "User information not available: %s"
 msgstr "���廣 廣� ��廩廬�廩 ���� ����: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2957
+#: ../libpurple/protocols/oscar/oscar.c:2964
 msgid "Online Since"
 msgstr "����廨 ���"
 
-#: ../libpurple/protocols/oscar/oscar.c:2962
-#: ../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:2997
+#: ../libpurple/protocols/oscar/oscar.c:3004
 msgid "Available Message"
 msgstr "���廣廬 �����廬"
 
-#: ../libpurple/protocols/oscar/oscar.c:3101
+#: ../libpurple/protocols/oscar/oscar.c:3108
 msgid "Your AIM connection may be lost."
 msgstr "�����廨 AIM 廩�� ���� �廬�廬廡."
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3289
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
+#: ../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:3453
-msgid ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again."
-msgstr ""
-"�廚廣��� ���廨��� 廩��廖�廬 ��廢廣 �� �廬�廢廣� ����� 廩�廬� �廚廨�廬 ����廨�廬 廩���廬 ����廣廬 "
-"�廩 ����廬 10 廩���廬 ���廖�廬 廩��廬."
-
-#: ../libpurple/protocols/oscar/oscar.c:3538
+#: ../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."
+msgstr "�廚廣��� ���廨��� 廩��廖�廬 ��廢廣 �� �廬�廢廣� ����� 廩�廬� �廚廨�廬 ����廨�廬 廩���廬 ����廣廬 �廩 ����廬 10 廩���廬 ���廖�廬 廩��廬."
+
+#: ../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:3762
-#: ../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:3792
+#: ../libpurple/protocols/oscar/oscar.c:3806
 msgid "Personal Web Page"
 msgstr "�廝 ����廨�� ��廩�"
 
-#: ../libpurple/protocols/oscar/oscar.c:3816
+#: ../libpurple/protocols/oscar/oscar.c:3830
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "���廣 ��廖廝"
 
-#: ../libpurple/protocols/oscar/oscar.c:3824
-#: ../libpurple/protocols/oscar/oscar.c:3837
+#: ../libpurple/protocols/oscar/oscar.c:3838
+#: ../libpurple/protocols/oscar/oscar.c:3851
 msgid "Zip Code"
 msgstr "��廡��"
 
-#: ../libpurple/protocols/oscar/oscar.c:3848
+#: ../libpurple/protocols/oscar/oscar.c:3862
 msgid "Division"
 msgstr "���廡�"
 
-#: ../libpurple/protocols/oscar/oscar.c:3849
+#: ../libpurple/protocols/oscar/oscar.c:3863
 msgid "Position"
 msgstr "�廩廨�"
 
-#: ../libpurple/protocols/oscar/oscar.c:3851
+#: ../libpurple/protocols/oscar/oscar.c:3865
 msgid "Web Page"
 msgstr "�廝 ����廨��"
 
-#: ../libpurple/protocols/oscar/oscar.c:3854
+#: ../libpurple/protocols/oscar/oscar.c:3868
 msgid "Work Information"
 msgstr "廚廨�� 廣����"
 
-#: ../libpurple/protocols/oscar/oscar.c:3910
+#: ../libpurple/protocols/oscar/oscar.c:3924
 msgid "Pop-Up Message"
 msgstr "���廣� 廡�廚廢廬"
 
-#: ../libpurple/protocols/oscar/oscar.c:3950
-#, c-format
-msgid "The following screen name is associated with %s"
-msgid_plural "The following screen names are associated with %s"
+#: ../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"
 
-#: ../libpurple/protocols/oscar/oscar.c:3955
-msgid "Screen name"
-msgstr "廩� �廬廢���"
-
-#: ../libpurple/protocols/oscar/oscar.c:3981
+#: ../libpurple/protocols/oscar/oscar.c:3995
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "�� ��廢�� 廬�廢��廬 廣��廨 �廬��廬 ����\"� %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4002
+#: ../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:4004
+#: ../libpurple/protocols/oscar/oscar.c:4018
 msgid "Account Confirmation Requested"
 msgstr "�廬廡��� �廡廩� ���廩�廨 ��廩���"
 
-#: ../libpurple/protocols/oscar/oscar.c:4035
-msgid "Error Changing Account Info"
-msgstr "廩���� �廩���� ����廣 廩� ��廩���"
-
-#: ../libpurple/protocols/oscar/oscar.c:4038
-#, 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:4041
-#, c-format
-msgid "Error 0x%04x: Unable to format screen name because it is invalid."
-msgstr "廩���� 0x%04x: �� ��廬� �廚廨�� �廬 廩� ��廩廬�廩, ���� 廩廩� ��廩廬�廩 �� 廬廡��."
-
-#: ../libpurple/protocols/oscar/oscar.c:4044
-#, 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:4047
-#, c-format
-msgid ""
-"Error 0x%04x: Unable to change e-mail address because there is already a "
-"request pending for this screen name."
-msgstr ""
-"廩���� 0x%04x: �� ��廬� �廩��廬 �廬 �廬��廬 ����\"� ����� 廩�廩 ��廨 �廡廩� ���� 廣��廨 "
-"�廩廬�廩 ��."
-
-#: ../libpurple/protocols/oscar/oscar.c:4050
-#, c-format
-msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address has "
-"too many screen names associated with it."
-msgstr ""
-"廩���� 0x%04x: �� ��廬� �廩��廬 �廬 �廬��廬 ����\"� ����� 廩��廬��廬 ��廬��� ����廖廬 "
-"���廬廨 ��� 廩��廬 �廩廬�廩��."
+#: ../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 change e-mail address because the given address is "
-"invalid."
-msgstr ""
-"廩���� 0x%04x: �� ��廬� �廩��廬 �廬 �廬��廬 ����\"� ����� 廩��廬��廬 廩��廬�� �� ��廡�廬."
-
-#: ../libpurple/protocols/oscar/oscar.c:4056
+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 username."
+msgstr "廩���� 0x%04x: �� ��廬� �廩��廬 �廬 �廬��廬 ����\"� ����� 廩�廩 ��廨 �廡廩� ���� 廣��廨 �廩廬�廩 ��."
+
+#: ../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 usernames associated with it."
+msgstr "廩���� 0x%04x: �� ��廬� �廩��廬 �廬 �廬��廬 ����\"� ����� 廩��廬��廬 ��廬��� ����廖廬 ���廬廨 ��� 廩��廬 �廩廬�廩��."
+
+#: ../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:4063
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "廩���� 0x%04x: 廩���� �� ���廨廬."
 
-#: ../libpurple/protocols/oscar/oscar.c:4066
+#: ../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:4068
+#: ../libpurple/protocols/oscar/oscar.c:4073
 msgid "Account Info"
 msgstr "���廣 廣� ��廩���"
 
-#: ../libpurple/protocols/oscar/oscar.c:4251
-msgid ""
-"Your IM Image was not sent. You must be Direct Connected to send IM Images."
+#: ../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:4520
+#: ../libpurple/protocols/oscar/oscar.c:4530
 msgid "Unable to set AIM profile."
 msgstr "��� �廚廩廨�廬 �廡��廣 �廬 廚廨�廚�� �-AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:4521
-msgid ""
-"You have probably requested to set your profile before the login procedure "
-"completed.  Your profile remains unset; try setting it again when you are "
-"fully connected."
-msgstr ""
-"��� ��廨�� ��廖�廬 �廡��廣 �廬 廚廨�廚�� ��廩廬�廩 廩�� �廚�� 廖��� 廬���� �����廬. �廚廨�廚�� "
-"�� �廩廬��; �廩 ��廖�廬 廩��廬 ���廨 廖��� 廬���� �����廬."
-
-#: ../libpurple/protocols/oscar/oscar.c:4535
-#, c-format
-msgid ""
-"The maximum profile length of %d byte has been exceeded.  It has been "
-"truncated for you."
-msgid_plural ""
-"The maximum profile length of %d bytes has been exceeded.  It has been "
-"truncated for you."
+#: ../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 fully connected."
+msgstr "��� ��廨�� ��廖�廬 �廡��廣 �廬 廚廨�廚�� ��廩廬�廩 廩�� �廚�� 廖��� 廬���� �����廬. �廚廨�廚�� �� �廩廬��; �廩 ��廖�廬 廩��廬 ���廨 廖��� 廬���� �����廬."
+
+#: ../libpurple/protocols/oscar/oscar.c:4545
+#, c-format
+msgid "The maximum profile length of %d byte has been exceeded.  It has been truncated for you."
+msgid_plural "The maximum profile length of %d bytes has been exceeded.  It has been truncated for you."
 msgstr[0] "廣�廨廬 �廬 ��廨� �廚廨�廚�� ��廡廖���� 廩� %d ����. �廚廨�廚�� 廡�廢廨 廣��廨�."
 msgstr[1] "廣�廨廬 �廬 ��廨� �廚廨�廚�� ��廡廖���� 廩� %d ������. �廚廨�廚�� 廡�廢廨 廣��廨�."
 
-#: ../libpurple/protocols/oscar/oscar.c:4540
+#: ../libpurple/protocols/oscar/oscar.c:4550
 msgid "Profile too long."
 msgstr "�廚廨�廚�� �廨�� ���."
 
-#: ../libpurple/protocols/oscar/oscar.c:4584
-#, c-format
-msgid ""
-"The maximum away message length of %d byte has been exceeded.  It has been "
-"truncated for you."
-msgid_plural ""
-"The maximum away message length of %d bytes has been exceeded.  It has been "
-"truncated for you."
+#: ../libpurple/protocols/oscar/oscar.c:4594
+#, c-format
+msgid "The maximum away message length of %d byte has been exceeded.  It has been truncated for you."
+msgid_plural "The maximum away message length of %d bytes has been exceeded.  It has been truncated for you."
 msgstr[0] "廣�廨廬 �廬 ��廨� ���廣廬 �廨���廡 ��廡廖���� 廩� %d ����. ��� 廡�廢廨 廣��廨�."
 msgstr[1] "廣�廨廬 �廬 ��廨� ���廣廬 �廨���廡 ��廡廖���� 廩� %d ������. ��� 廡�廢廨 廣��廨�."
 
-#: ../libpurple/protocols/oscar/oscar.c:4589
+#: ../libpurple/protocols/oscar/oscar.c:4599
 msgid "Away message too long."
 msgstr "���廣廬 �廨���廡 ����廩� �廨��� ���."
 
-#: ../libpurple/protocols/oscar/oscar.c:4662
-#, c-format
-msgid ""
-"Could not add the buddy %s because the screen name is invalid.  Screen names "
-"must be a valid email address, or start with a letter and contain only "
-"letters, numbers and spaces, or contain only numbers."
-msgstr ""
-"�� ��廬� ���廖�廝 �廬 ��廩 �廡廩廨 %s ������ 廩廩�-�廬廢��� 廩�� �� ��廡�. 廩��廬-廬廢��� "
-"������ ��廬��� ���廬 ������ 廨廡 ��廬��廬, �廖廚廨�� �廨�����, �� 廨廡 ����� �廖廚廨��."
-
-#: ../libpurple/protocols/oscar/oscar.c:4664
-#: ../libpurple/protocols/oscar/oscar.c:5129
-#: ../libpurple/protocols/oscar/oscar.c:5144
+#: ../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:4674
+#: ../libpurple/protocols/oscar/oscar.c:5155
+#: ../libpurple/protocols/oscar/oscar.c:5170
 msgid "Unable To Add"
 msgstr "�� ��廬� ���廖�廝"
 
-#: ../libpurple/protocols/oscar/oscar.c:4783
+#: ../libpurple/protocols/oscar/oscar.c:4793
 msgid "Unable To Retrieve Buddy List"
 msgstr "�廩��� �廩��廚廬 廨廩��廬 ��廩� �廡廩廨"
 
-#: ../libpurple/protocols/oscar/oscar.c:4784
-msgid ""
-"The AIM servers were temporarily unable to send your buddy list.  Your buddy "
-"list is not lost, and will probably become available in a few minutes."
-msgstr ""
-"廩廨廬� �-AIM ����廬 �� ���� �廩��� �廬 廨廩��廬 ��廩� �廡廩廨 廩��. �廨廩��� �� ����, ���� "
-"��廨�� 廬���� ����� ��廡�廬 �廡廨���廬."
-
-#: ../libpurple/protocols/oscar/oscar.c:4979
-#: ../libpurple/protocols/oscar/oscar.c:4981
-#: ../libpurple/protocols/oscar/oscar.c:5211
-#: ../libpurple/protocols/oscar/oscar.c:5212
-#: ../libpurple/protocols/oscar/oscar.c:5217
+#: ../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."
+msgstr "廩廨廬� �-AIM ����廬 �� ���� �廩��� �廬 廨廩��廬 ��廩� �廡廩廨 廩��. �廨廩��� �� ����, ���� ��廨�� 廬���� ����� ��廡�廬 �廡廨���廬."
+
+#: ../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:5127
-#, c-format
-msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
-"list.  Please remove one and try again."
-msgstr ""
-"�� ��廬� ���廖�廝 �廬 %s �廨廩��廬 ��廩� �廡廩廨 廩��, ����� 廩�廩 ��廬廨 ��� ��廩� 廡廩廨 "
-"�廨廩���. �廩 ��廖�廨 ��� ���廖�廬 廩��廬."
-
-#: ../libpurple/protocols/oscar/oscar.c:5127
-#: ../libpurple/protocols/oscar/oscar.c:5142
+#: ../libpurple/protocols/oscar/oscar.c:5153
+#, c-format
+msgid "Could not add the buddy %s because you have too many buddies in your buddy list.  Please remove one and try again."
+msgstr "�� ��廬� ���廖�廝 �廬 %s �廨廩��廬 ��廩� �廡廩廨 廩��, ����� 廩�廩 ��廬廨 ��� ��廩� 廡廩廨 �廨廩���. �廩 ��廖�廨 ��� ���廖�廬 廩��廬."
+
+#: ../libpurple/protocols/oscar/oscar.c:5153
+#: ../libpurple/protocols/oscar/oscar.c:5168
 msgid "(no name)"
 msgstr "(��� 廩�)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5141
+#: ../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:5275
-#, 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:5283
+#: ../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:5309
 msgid "Authorization Given"
 msgstr "��廨廩�� ��廬��"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5356
+#: ../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:5357
+#: ../libpurple/protocols/oscar/oscar.c:5383
 msgid "Authorization Granted"
 msgstr "��廨廩�� ��廬��"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5360
-#, c-format
-msgid ""
-"The user %s has denied your request to add them to your buddy list for the "
-"following reason:\n"
+#: ../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 following reason:\n"
 "%s"
 msgstr ""
 "��廩廬�廩 %s ��� �廬 �廡廩廬� ���廖�廝 ��廬� �廨廩��廬 ��廩� �廡廩廨 廩�� ��廖��� ����:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5361
+#: ../libpurple/protocols/oscar/oscar.c:5387
 msgid "Authorization Denied"
 msgstr "��廨廩�� ����廬"
 
-#: ../libpurple/protocols/oscar/oscar.c:5397
+#: ../libpurple/protocols/oscar/oscar.c:5423
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "���廚�:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5510
+#: ../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:5672
-#: ../libpurple/protocols/oscar/oscar.c:5677
+#: ../libpurple/protocols/oscar/oscar.c:5698
+#: ../libpurple/protocols/oscar/oscar.c:5703
 msgid "Away Message"
 msgstr "���廣廬 廨���廡 ����廩�"
 
-#: ../libpurple/protocols/oscar/oscar.c:5677
+#: ../libpurple/protocols/oscar/oscar.c:5703
 msgid "<i>(retrieving)</i>"
 msgstr " <i>(廩��廝)</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:5877
+#: ../libpurple/protocols/oscar/oscar.c:5903
 msgid "iTunes Music Store Link"
 msgstr "���廡 ����廬 �����廡� iTunes"
 
-#: ../libpurple/protocols/oscar/oscar.c:5985
+#: ../libpurple/protocols/oscar/oscar.c:6011
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "�廣廨廬 ��廩 廡廩廨 廣��廨 %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5986
+#: ../libpurple/protocols/oscar/oscar.c:6012
 msgid "Buddy Comment:"
 msgstr "�廣廨廬 ��廩 廡廩廨:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6033
+#: ../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:6037
-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:6043
+#: ../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:6069
 #: ../libpurple/protocols/oscar/peer.c:1047
 msgid "C_onnect"
 msgstr "�廬��廨"
 
-#: ../libpurple/protocols/oscar/oscar.c:6078
+#: ../libpurple/protocols/oscar/oscar.c:6104
 msgid "Get AIM Info"
 msgstr "�廢� 廚廨�� AIM"
 
-#: ../libpurple/protocols/oscar/oscar.c:6084
+#: ../libpurple/protocols/oscar/oscar.c:6110
 msgid "Edit Buddy Comment"
 msgstr "廣廨�� �廣廨廬 ��廩 廡廩廨"
 
-#: ../libpurple/protocols/oscar/oscar.c:6092
+#: ../libpurple/protocols/oscar/oscar.c:6118
 msgid "Get Status Msg"
 msgstr "��廨� ���廣廬 �廢�"
 
-#: ../libpurple/protocols/oscar/oscar.c:6105
+#: ../libpurple/protocols/oscar/oscar.c:6131
 msgid "Direct IM"
 msgstr "廬廡廩�廨廬 �廩�廨� ����廣�廬"
 
-#: ../libpurple/protocols/oscar/oscar.c:6127
+#: ../libpurple/protocols/oscar/oscar.c:6153
 msgid "Re-request Authorization"
 msgstr "�廡廩 �廨廩�� 廩��"
 
-#: ../libpurple/protocols/oscar/oscar.c:6186
+#: ../libpurple/protocols/oscar/oscar.c:6212
 msgid "Require authorization"
 msgstr "�廨�廩 �廨廩��"
 
-#: ../libpurple/protocols/oscar/oscar.c:6189
+#: ../libpurple/protocols/oscar/oscar.c:6215
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "���廨-����廨�� (�廚廣�� 廩� �� 廬��� ����廨 廩�� SPAM!)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6194
+#: ../libpurple/protocols/oscar/oscar.c:6220
 msgid "ICQ Privacy Options"
 msgstr "�廚廩廨���廬 廚廨���廬 廩� ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:6213
+#: ../libpurple/protocols/oscar/oscar.c:6240
 msgid "The new formatting is invalid."
 msgstr "�廚�廨�� ���廩 ���� 廬廡��."
 
-#: ../libpurple/protocols/oscar/oscar.c:6214
-msgid "Screen name formatting can change only capitalization and whitespace."
+#: ../libpurple/protocols/oscar/oscar.c:6241
+msgid "Username formatting can change only capitalization and whitespace."
 msgstr "廚�廨��� 廩� 廩� �廩廬�廩 廨廡 ����� �廩��廬 ��廬��廬 �����廬/廡���廬 �廨�����."
 
-#: ../libpurple/protocols/oscar/oscar.c:6267
+#: ../libpurple/protocols/oscar/oscar.c:6294
 msgid "Change Address To:"
 msgstr "廩�� �廬��廬 �:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6313
+#: ../libpurple/protocols/oscar/oscar.c:6340
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>���� ���� ��廨廩��</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6316
+#: ../libpurple/protocols/oscar/oscar.c:6343
 msgid "You are awaiting authorization from the following buddies"
 msgstr "�廬� ���� ��廨廩�� ���廩� �廡廩廨 ����"
 
-#: ../libpurple/protocols/oscar/oscar.c:6317
-msgid ""
-"You can re-request authorization from these buddies by right-clicking on "
-"them and selecting \"Re-request Authorization.\""
-msgstr ""
-"�廩 ��廚廩廨�廬� ��廡廩 廩�� �廨廩�� ���廩� 廡廩廨 ��� 廣\"� ���廢� ����廬 廣� �廣��廨 廣���� "
-"�����廨 \"�廡廩 �廨廩�� 廩��\"."
-
-#: ../libpurple/protocols/oscar/oscar.c:6334
+#: ../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.\""
+msgstr "�廩 ��廚廩廨�廬� ��廡廩 廩�� �廨廩�� ���廩� 廡廩廨 ��� 廣\"� ���廢� ����廬 廣� �廣��廨 廣���� �����廨 \"�廡廩 �廨廩�� 廩��\"."
+
+#: ../libpurple/protocols/oscar/oscar.c:6361
 msgid "Find Buddy by E-Mail"
 msgstr "�廢� ��廩 廡廩廨 �廚� ���\"�"
 
-#: ../libpurple/protocols/oscar/oscar.c:6335
+#: ../libpurple/protocols/oscar/oscar.c:6362
 msgid "Search for a buddy by e-mail address"
 msgstr "�廚廩 ��廩 廡廩廨 �廚� �廬��廬 ����廨 ���廨廡�廨��� 廩��"
 
-#: ../libpurple/protocols/oscar/oscar.c:6336
+#: ../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:6339
+#: ../libpurple/protocols/oscar/oscar.c:6366
 msgid "_Search"
 msgstr "��廚�廩"
 
-#: ../libpurple/protocols/oscar/oscar.c:6497
-msgid "Set User Info (URL)..."
-msgstr "廡�廣 �廬 ����廣 廣� ��廩廬�廩 (URL)..."
-
-#: ../libpurple/protocols/oscar/oscar.c:6508
-msgid "Change Password (URL)"
-msgstr "廩�� 廖�廖�� (URL)"
-
-#: ../libpurple/protocols/oscar/oscar.c:6512
-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:6522
+#: ../libpurple/protocols/oscar/oscar.c:6549
 msgid "Set Privacy Options..."
 msgstr "廡�廣 �廚廩廨���廬 廚廨���廬..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6529
+#: ../libpurple/protocols/oscar/oscar.c:6556
 msgid "Confirm Account"
 msgstr "�廩廨 �廩���"
 
-#: ../libpurple/protocols/oscar/oscar.c:6533
+#: ../libpurple/protocols/oscar/oscar.c:6560
 msgid "Display Currently Registered E-Mail Address"
 msgstr "�廢� �廬 ��廬��廬 �廨廩��� �廨�廣"
 
-#: ../libpurple/protocols/oscar/oscar.c:6537
+#: ../libpurple/protocols/oscar/oscar.c:6564
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "廩�� �廬 ��廬��廬 �廨廩��� �廨�廣..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6544
+#: ../libpurple/protocols/oscar/oscar.c:6571
 msgid "Show Buddies Awaiting Authorization"
 msgstr "�廢� �廬 ��廩� �廡廩廨 廩����� ���廩�廨"
 
-#: ../libpurple/protocols/oscar/oscar.c:6550
+#: ../libpurple/protocols/oscar/oscar.c:6577
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "�廚廩 ��廩-廡廩廨 廣廚\"� �廬��廬 ���\"�..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6555
+#: ../libpurple/protocols/oscar/oscar.c:6582
 msgid "Search for Buddy by Information"
 msgstr "�廚廩 ��廩-廡廩廨 廣廚\"� ���廣"
 
-#: ../libpurple/protocols/oscar/oscar.c:6754
+#: ../libpurple/protocols/oscar/oscar.c:6770
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -9586,13 +9738,8 @@
 msgstr "%s ��廡廩 �廣廬 ��廬��廨 �廩�廨�廬 �� %s"
 
 #: ../libpurple/protocols/oscar/peer.c:1039
-msgid ""
-"This requires a direct connection between the two computers and is necessary "
-"for IM Images.  Because your IP address will be revealed, this may be "
-"considered a privacy risk."
-msgstr ""
-"�� ��廨廩 ����廨 �廩�廨 ��� 廩�� ���廩���, ����廛 廣��廨 廬����廬 ����廣�廬. ������ 廩�廬��廬 "
-"�-IP 廩�� 廬��廩廝, ��廬�� ��� ���廩� �廖���� �廚廨���廬�."
+msgid "This requires a direct connection between the two computers and is necessary for IM Images.  Because your IP address will be revealed, this may be considered a privacy risk."
+msgstr "�� ��廨廩 ����廨 �廩�廨 ��� 廩�� ���廩���, ����廛 廣��廨 廬����廬 ����廣�廬. ������ 廩�廬��廬 �-IP 廩�� 廬��廩廝, ��廬�� ��� ���廩� �廖���� �廚廨���廬�."
 
 #: ../libpurple/protocols/qq/buddy_info.c:39
 msgid "Primary Information"
@@ -9761,9 +9908,7 @@
 
 #: ../libpurple/protocols/qq/buddy_info.c:601
 #, c-format
-msgid ""
-"Setting custom faces is not currently supported. Please choose an image from "
-"%s."
+msgid "Setting custom faces is not currently supported. Please choose an image from %s."
 msgstr "��� �廨�廣 廬���� ��廬��� ��廩�廬 廩� 廚廨廢�廚��. �廩 ����廨 �廬���� �廬�� %s."
 
 #: ../libpurple/protocols/qq/buddy_info.c:618
@@ -10047,7 +10192,8 @@
 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/qq/qq.c:140
+#: ../libpurple/protocols/toc/toc.c:173
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:158
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:238
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1194
@@ -10124,7 +10270,8 @@
 msgid "Set My Information"
 msgstr "廡�廣 �廬 ����廣 廩��"
 
-#: ../libpurple/protocols/qq/qq.c:537 ../libpurple/protocols/toc/toc.c:1680
+#: ../libpurple/protocols/qq/qq.c:537
+#: ../libpurple/protocols/toc/toc.c:1680
 msgid "Change Password"
 msgstr "廩�� 廖�廖��"
 
@@ -10150,7 +10297,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/qq/qq.c:726 ../libpurple/protocols/qq/qq.c:728
+#: ../libpurple/protocols/qq/qq.c:726
+#: ../libpurple/protocols/qq/qq.c:728
 msgid "QQ Protocol\tPlugin"
 msgstr "廚廨���廡�� QQ\t廬�廖廝"
 
@@ -10235,265 +10383,246 @@
 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>�廖\"� 廡��廢廬 Notes:</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 "���廣 廣� �廬���廬 廩� Notes"
 
-#: ../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 "廩��廝 ���廣 廣� �廬���廬 廩� Notes"
 
-#: ../libpurple/protocols/sametime/sametime.c:1506
+#: ../libpurple/protocols/sametime/sametime.c:1507
 msgid "Sending Handshake"
 msgstr "廩��� Cookie"
 
-#: ../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
-#, c-format
-msgid ""
-"A Sametime administrator has issued the following announcement on server %s"
+#: ../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:1736
+#: ../libpurple/protocols/sametime/sametime.c:1737
 msgid "Connection reset"
 msgstr "�����廨 ��廬��"
 
-#: ../libpurple/protocols/sametime/sametime.c:1748
+#: ../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:1773
-#: ../libpurple/protocols/sametime/sametime.c:3780
+#: ../libpurple/protocols/sametime/sametime.c:1774
+#: ../libpurple/protocols/sametime/sametime.c:3781
 msgid "Unable to connect to host"
 msgstr "�� ��廬� ��廬��廨 �廩廨廬"
 
-#: ../libpurple/protocols/sametime/sametime.c:1814
+#: ../libpurple/protocols/sametime/sametime.c:1815
 #, c-format
 msgid "Announcement from %s"
 msgstr "���廣� ��廬 %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:1988
+#: ../libpurple/protocols/sametime/sametime.c:1989
 msgid "Conference Closed"
 msgstr "��廣��� �廖�廨�."
 
-#: ../libpurple/protocols/sametime/sametime.c:2453
+#: ../libpurple/protocols/sametime/sametime.c:2454
 msgid "Unable to send message: "
 msgstr "�� ��廬� �廩��� ���廣�: "
 
-#: ../libpurple/protocols/sametime/sametime.c:3009
+#: ../libpurple/protocols/sametime/sametime.c:3010
 msgid "Place Closed"
 msgstr "��廡�� �廖�廨"
 
-#: ../libpurple/protocols/sametime/sametime.c:3279
+#: ../libpurple/protocols/sametime/sametime.c:3280
 msgid "Microphone"
 msgstr "��廡廨�廚��"
 
-#: ../libpurple/protocols/sametime/sametime.c:3280
+#: ../libpurple/protocols/sametime/sametime.c:3281
 msgid "Speakers"
 msgstr "廨�廡����"
 
-#: ../libpurple/protocols/sametime/sametime.c:3281
+#: ../libpurple/protocols/sametime/sametime.c:3282
 msgid "Video Camera"
 msgstr "�廢��廬 �����"
 
-#: ../libpurple/protocols/sametime/sametime.c:3319
-#: ../libpurple/protocols/sametime/sametime.c:4199
+#: ../libpurple/protocols/sametime/sametime.c:3320
+#: ../libpurple/protocols/sametime/sametime.c:4200
 msgid "Supports"
 msgstr "廬�����"
 
-#: ../libpurple/protocols/sametime/sametime.c:3324
-#: ../libpurple/protocols/sametime/sametime.c:4173
+#: ../libpurple/protocols/sametime/sametime.c:3325
+#: ../libpurple/protocols/sametime/sametime.c:4174
 msgid "External User"
 msgstr "�廩廬�廩 ��廢���"
 
-#: ../libpurple/protocols/sametime/sametime.c:3430
-msgid "Create conference with user"
-msgstr "廢�廨 廩��廬 �廣��� 廣� ��廩廬�廩"
-
 #: ../libpurple/protocols/sametime/sametime.c:3431
-#, c-format
-msgid ""
-"Please enter a topic for the new conference, and an invitation message to be "
-"sent to %s"
+msgid "Create conference with user"
+msgstr "廢�廨 廩��廬 �廣��� 廣� ��廩廬�廩"
+
+#: ../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:3435
+#: ../libpurple/protocols/sametime/sametime.c:3436
 msgid "New Conference"
 msgstr "�廣��� ��廩�"
 
-#: ../libpurple/protocols/sametime/sametime.c:3437
+#: ../libpurple/protocols/sametime/sametime.c:3438
 msgid "Create"
 msgstr "廢�廨"
 
-#: ../libpurple/protocols/sametime/sametime.c:3502
+#: ../libpurple/protocols/sametime/sametime.c:3503
 msgid "Available Conferences"
 msgstr "�廣���廬 �����廬"
 
-#: ../libpurple/protocols/sametime/sametime.c:3508
+#: ../libpurple/protocols/sametime/sametime.c:3509
 msgid "Create New Conference..."
 msgstr "廢�廨 �廣��� ��廩�..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3515
-msgid "Invite user to a conference"
-msgstr "���� �廩廬�廩 �� �廣���"
-
 #: ../libpurple/protocols/sametime/sametime.c:3516
-#, c-format
-msgid ""
-"Select a conference from the list below to send an invite to user %s. Select "
-"\"Create New Conference\" if you'd like to create a new conference to invite "
-"this user to."
-msgstr ""
-"��廨 廩��廬 �廣��� ��廨廩��� ���� �廩��� ����� ��廩廬�廩 %s.��廨 \"廢�廨 �廣��� ��廩�\" �� "
-"�廨廢��� ��廢�廨 �廣��� ��廩� ������ ���� �廩廬�廩 ��."
-
-#: ../libpurple/protocols/sametime/sametime.c:3521
+msgid "Invite user to a conference"
+msgstr "���� �廩廬�廩 �� �廣���"
+
+#: ../libpurple/protocols/sametime/sametime.c:3517
+#, c-format
+msgid "Select a conference from the list below to send an invite to user %s. Select \"Create New Conference\" if you'd like to create a new conference to invite this user to."
+msgstr "��廨 廩��廬 �廣��� ��廨廩��� ���� �廩��� ����� ��廩廬�廩 %s.��廨 \"廢�廨 �廣��� ��廩�\" �� �廨廢��� ��廢�廨 �廣��� ��廩� ������ ���� �廩廬�廩 ��."
+
+#: ../libpurple/protocols/sametime/sametime.c:3522
 msgid "Invite to Conference"
 msgstr "���� ��廣���"
 
-#: ../libpurple/protocols/sametime/sametime.c:3612
+#: ../libpurple/protocols/sametime/sametime.c:3613
 msgid "Invite to Conference..."
 msgstr "���� ��廣���..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3617
+#: ../libpurple/protocols/sametime/sametime.c:3618
 msgid "Send TEST Announcement"
 msgstr "廩�� ���廣廬 ��廖���"
 
-#: ../libpurple/protocols/sametime/sametime.c:3636 ../pidgin/gtkconv.c:4431
+#: ../libpurple/protocols/sametime/sametime.c:3637
+#: ../pidgin/gtkconv.c:4420
 msgid "Topic:"
 msgstr "��廬廨廬:"
 
-#: ../libpurple/protocols/sametime/sametime.c:3664
+#: ../libpurple/protocols/sametime/sametime.c:3665
 msgid "No Sametime Community Server specified"
 msgstr "�� ��廬� 廩廨廬 廡���� 廩� Sametime"
 
-#: ../libpurple/protocols/sametime/sametime.c:3689
-#, c-format
-msgid ""
-"No host or IP address has been configured for the Meanwhile account %s. "
-"Please enter one below to continue logging in."
-msgstr ""
-"�� ����廨 廩� �� �廬��廬 IP 廣��廨 �廩��� �-Meanwhile %s. �廩 ����� ��廬 ���� ��� "
-"���廩�� ����廖� ��廣廨�廬."
-
-#: ../libpurple/protocols/sametime/sametime.c:3694
+#: ../libpurple/protocols/sametime/sametime.c:3690
+#, c-format
+msgid "No host or IP address has been configured for the Meanwhile account %s. Please enter one below to continue logging in."
+msgstr "�� ����廨 廩� �� �廬��廬 IP 廣��廨 �廩��� �-Meanwhile %s. �廩 ����� ��廬 ���� ��� ���廩�� ����廖� ��廣廨�廬."
+
+#: ../libpurple/protocols/sametime/sametime.c:3695
 msgid "Meanwhile Connection Setup"
 msgstr "���廨�廬 廬廡廩�廨廬 Meanwhile"
 
-#: ../libpurple/protocols/sametime/sametime.c:3695
+#: ../libpurple/protocols/sametime/sametime.c:3696
 msgid "No Sametime Community Server Specified"
 msgstr "�� ����廨 廩廨廬 廡���廬 Sametime"
 
-#: ../libpurple/protocols/sametime/sametime.c:3697
+#: ../libpurple/protocols/sametime/sametime.c:3698
 msgid "Connect"
 msgstr "�廬��廨"
 
-#: ../libpurple/protocols/sametime/sametime.c:4189
+#: ../libpurple/protocols/sametime/sametime.c:4190
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "�� ���廣 (0x%04x)<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:4191
+#: ../libpurple/protocols/sametime/sametime.c:4192
 msgid "Last Known Client"
 msgstr "廬���廬-�廡�� ��廨���"
 
-#: ../libpurple/protocols/sametime/sametime.c:4355
-#: ../libpurple/protocols/sametime/sametime.c:5560
+#: ../libpurple/protocols/sametime/sametime.c:4356
+#: ../libpurple/protocols/sametime/sametime.c:5561
 msgid "User Name"
 msgstr "廩� �廩廬�廩"
 
-#: ../libpurple/protocols/sametime/sametime.c:4358
-#: ../libpurple/protocols/sametime/sametime.c:5563
+#: ../libpurple/protocols/sametime/sametime.c:4359
+#: ../libpurple/protocols/sametime/sametime.c:5564
 msgid "Sametime ID"
 msgstr "���� Sametime"
 
-#: ../libpurple/protocols/sametime/sametime.c:4382
-msgid "An ambiguous user ID was entered"
-msgstr "廩� �廩廬�廩 ��-�廩�廣� ����"
-
 #: ../libpurple/protocols/sametime/sametime.c:4383
-#, c-format
-msgid ""
-"The identifier '%s' may possibly refer to any of the following users. Please "
-"select the correct user from the list below to add them to your buddy list."
-msgstr ""
-"����� '%s' ���� ��廬���� �� �� ��� �� ��廩廬�廩�� ����. ��� ��廨/� �廬 ��廩廬�廩����� "
-"�� �廨廩��� ��� ���廖�廝 ��廬� �廨廩��廬 ��廩� �廡廩廨 廩��."
-
-#: ../libpurple/protocols/sametime/sametime.c:4388
+msgid "An ambiguous user ID was entered"
+msgstr "廩� �廩廬�廩 ��-�廩�廣� ����"
+
+#: ../libpurple/protocols/sametime/sametime.c:4384
+#, c-format
+msgid "The identifier '%s' may possibly refer to any of the following users. Please select the correct user from the list below to add them to your buddy list."
+msgstr "����� '%s' ���� ��廬���� �� �� ��� �� ��廩廬�廩�� ����. ��� ��廨/� �廬 ��廩廬�廩����� �� �廨廩��� ��� ���廖�廝 ��廬� �廨廩��廬 ��廩� �廡廩廨 廩��."
+
+#: ../libpurple/protocols/sametime/sametime.c:4389
 msgid "Select User"
 msgstr "��廨 �廩廬�廩"
 
-#: ../libpurple/protocols/sametime/sametime.c:4472
+#: ../libpurple/protocols/sametime/sametime.c:4473
 msgid "Unable to add user: user not found"
 msgstr "��� �廚廩廨�廬 ���廖�廝 �廩廬�廩: ��廩廬�廩 �� ��廢�"
 
-#: ../libpurple/protocols/sametime/sametime.c:4474
-#, c-format
-msgid ""
-"The identifier '%s' did not match any users in your Sametime community. This "
-"entry has been removed from your buddy list."
-msgstr ""
-"����� '%s' �� 廬��� ��廝 �廩廬�廩 �廡���� �-Sametime 廩��.���� ��廖廨 �廨廩��廬 ��廩� "
-"�廡廩廨 廩��."
-
-#: ../libpurple/protocols/sametime/sametime.c:5065
+#: ../libpurple/protocols/sametime/sametime.c:4475
+#, c-format
+msgid "The identifier '%s' did not match any users in your Sametime community. This entry has been removed from your buddy list."
+msgstr "����� '%s' �� 廬��� ��廝 �廩廬�廩 �廡���� �-Sametime 廩��.���� ��廖廨 �廨廩��廬 ��廩� �廡廩廨 廩��."
+
+#: ../libpurple/protocols/sametime/sametime.c:5066
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -10502,169 +10631,150 @@
 "廩���� �廡廨��廬 �廡��廛 %s: \n"
 "%s\n"
 
-#: ../libpurple/protocols/sametime/sametime.c:5200
+#: ../libpurple/protocols/sametime/sametime.c:5201
 msgid "Remotely Stored Buddy List"
 msgstr "廨廩��廬 ��廩� �廡廩廨 �����廖�廬 �廨���廡"
 
-#: ../libpurple/protocols/sametime/sametime.c:5205
+#: ../libpurple/protocols/sametime/sametime.c:5206
 msgid "Buddy List Storage Mode"
 msgstr "廢�廨廬 ���廖�� 廨廩��廬 ��廩� �廡廩廨"
 
-#: ../libpurple/protocols/sametime/sametime.c:5208
+#: ../libpurple/protocols/sametime/sametime.c:5209
 msgid "Local Buddy List Only"
 msgstr "廨廩��廬 ��廩� 廡廩廨 �廡���廬 ����"
 
-#: ../libpurple/protocols/sametime/sametime.c:5210
+#: ../libpurple/protocols/sametime/sametime.c:5211
 msgid "Merge List from Server"
 msgstr "��� 廨廩��� �� �廩廨廬"
 
-#: ../libpurple/protocols/sametime/sametime.c:5212
+#: ../libpurple/protocols/sametime/sametime.c:5213
 msgid "Merge and Save List to Server"
 msgstr "��� �廩��廨 廨廩��� �廬�� �廩廨廬"
 
-#: ../libpurple/protocols/sametime/sametime.c:5214
+#: ../libpurple/protocols/sametime/sametime.c:5215
 msgid "Synchronize List with Server"
 msgstr "�廖��廨� 廨廩��� 廣� �廩廨廬"
 
-#: ../libpurple/protocols/sametime/sametime.c:5269
+#: ../libpurple/protocols/sametime/sametime.c:5270
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "���� 廨廩��廬 Sametime 廣��廨 �廩��� %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5309
+#: ../libpurple/protocols/sametime/sametime.c:5310
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "��廢� 廨廩��廬 Sametime 廣��廨 �廩��� %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5363
+#: ../libpurple/protocols/sametime/sametime.c:5364
 msgid "Unable to add group: group exists"
 msgstr "�� ��廬� ���廖�廝 廡��廢�: �廡��廢� 廡���廬"
 
-#: ../libpurple/protocols/sametime/sametime.c:5364
+#: ../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:5367
-#: ../libpurple/protocols/sametime/sametime.c:5497
+#: ../libpurple/protocols/sametime/sametime.c:5368
+#: ../libpurple/protocols/sametime/sametime.c:5498
 msgid "Unable to add group"
 msgstr "��� �廚廩廨�廬 ���廖�廝 �廬 �廡��廢�"
 
-#: ../libpurple/protocols/sametime/sametime.c:5426
+#: ../libpurple/protocols/sametime/sametime.c:5427
 msgid "Possible Matches"
 msgstr "�廬���廬 �廚廩廨��廬"
 
-#: ../libpurple/protocols/sametime/sametime.c:5442
+#: ../libpurple/protocols/sametime/sametime.c:5443
 msgid "Notes Address Book group results"
 msgstr "廬�廢��廬 �廬�� 廨廩��廬 ��廬���廬 廩� Notes"
 
-#: ../libpurple/protocols/sametime/sametime.c:5443
-#, c-format
-msgid ""
-"The identifier '%s' may possibly refer to any of the following Notes Address "
-"Book groups. Please select the correct group from the list below to add it "
-"to your buddy list."
-msgstr ""
-"����� '%s' ���� ��廬���� ��� ��� �廡��廢�廬 廖廚廨� ��廬���廬 廩� Notes 廩����.��� ��廨 "
-"� �廬 �廡��廢� ������ �廬�� �廨廩��� ��� ���廖�廝 ��廬� �廨廩��廬 ��廩� �廡廩廨 廩��."
-
-#: ../libpurple/protocols/sametime/sametime.c:5448
+#: ../libpurple/protocols/sametime/sametime.c:5444
+#, c-format
+msgid "The identifier '%s' may possibly refer to any of the following Notes Address Book groups. Please select the correct group from the list below to add it to your buddy list."
+msgstr "����� '%s' ���� ��廬���� ��� ��� �廡��廢�廬 廖廚廨� ��廬���廬 廩� Notes 廩����.��� ��廨 � �廬 �廡��廢� ������ �廬�� �廨廩��� ��� ���廖�廝 ��廬� �廨廩��廬 ��廩� �廡廩廨 廩��."
+
+#: ../libpurple/protocols/sametime/sametime.c:5449
 msgid "Select Notes Address Book"
 msgstr "��廨 廖廚廨 �廬���廬 廩� Notes"
 
-#: ../libpurple/protocols/sametime/sametime.c:5491
+#: ../libpurple/protocols/sametime/sametime.c:5492
 msgid "Unable to add group: group not found"
 msgstr "�� ��廬� ���廖�廝 廡��廢�: �廡��廢� �� ��廢��"
 
-#: ../libpurple/protocols/sametime/sametime.c:5493
-#, c-format
-msgid ""
-"The identifier '%s' did not match any Notes Address Book groups in your "
-"Sametime community."
+#: ../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' �� 廬��� ��廝 廡��廢廬 廖廚廨� ��廬���廬 廩� Notes �廡���� 廩��."
 
-#: ../libpurple/protocols/sametime/sametime.c:5534
+#: ../libpurple/protocols/sametime/sametime.c:5535
 msgid "Notes Address Book Group"
 msgstr "廡��廢� �廖廚廨 �廬���廬 廩� Notes"
 
-#: ../libpurple/protocols/sametime/sametime.c:5535
-msgid ""
-"Enter the name of a Notes Address Book group in the field below to add the "
-"group and its members to your buddy list."
-msgstr ""
-"�廩 ����� 廩� 廩�廡��廢� �廖廚廨 �廬���廬 廩� Notes �廩�� ���� 廣�-��廬 ���廖�廝 �廬 �廡��廢� "
-"���廨�� �廨廩��廬 ��廩� �廡廩廨 廩��."
-
-#: ../libpurple/protocols/sametime/sametime.c:5584
+#: ../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."
+msgstr "�廩 ����� 廩� 廩�廡��廢� �廖廚廨 �廬���廬 廩� Notes �廩�� ���� 廣�-��廬 ���廖�廝 �廬 �廡��廢� ���廨�� �廨廩��廬 ��廩� �廡廩廨 廩��."
+
+#: ../libpurple/protocols/sametime/sametime.c:5585
 #, c-format
 msgid "Search results for '%s'"
 msgstr "廬�廢��廬 ��廚�廩 廣��廨 %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5585
-#, c-format
-msgid ""
-"The identifier '%s' may possibly refer to any of the following users. You "
-"may add these users to your buddy list or send them messages with the action "
-"buttons below."
-msgstr ""
-"����� '%s' ���� ��廬���� ��� ��廨 �� ��廩廬�廩�� 廩����. �廩 ��廚廩廨�廬� ���廖�廝 ��廬� "
-"�� 廨廩��廬 ��廩� �廡廩廨 廩�� �� �廩��� ��� ���廣�廬 �廣�廨廬 �廚廬�廨� �廚廣��� 廩����."
-
-#: ../libpurple/protocols/sametime/sametime.c:5592 ../pidgin/gtknotify.c:770
+#: ../libpurple/protocols/sametime/sametime.c:5586
+#, c-format
+msgid "The identifier '%s' may possibly refer to any of the following users. You may add these users to your buddy list or send them messages with the action buttons below."
+msgstr "����� '%s' ���� ��廬���� ��� ��廨 �� ��廩廬�廩�� 廩����. �廩 ��廚廩廨�廬� ���廖�廝 ��廬� �� 廨廩��廬 ��廩� �廡廩廨 廩�� �� �廩��� ��� ���廣�廬 �廣�廨廬 �廚廬�廨� �廚廣��� 廩����."
+
+#: ../libpurple/protocols/sametime/sametime.c:5593
+#: ../pidgin/gtknotify.c:770
 msgid "Search Results"
 msgstr "廬�廢��廬 ��廚�廩"
 
-#: ../libpurple/protocols/sametime/sametime.c:5617
+#: ../libpurple/protocols/sametime/sametime.c:5618
 msgid "No matches"
 msgstr "�� ��廢�� �廬�����"
 
-#: ../libpurple/protocols/sametime/sametime.c:5618
+#: ../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:5622
+#: ../libpurple/protocols/sametime/sametime.c:5623
 msgid "No Matches"
 msgstr "�� ��廢�� �廬�����"
 
-#: ../libpurple/protocols/sametime/sametime.c:5659
-msgid "Search for a user"
-msgstr "��廚�廩 �廩廬�廩"
-
 #: ../libpurple/protocols/sametime/sametime.c:5660
-msgid ""
-"Enter a name or partial ID in the field below to search for matching users "
-"in your Sametime community."
-msgstr ""
-"�廩 ����� 廩� �� ���� ��廡� �廩�� ���� ��� ��廚廩 �廩廬�廩�� 廬����� �廡���廬 � Sametime "
-"廩��."
-
-#: ../libpurple/protocols/sametime/sametime.c:5663
+msgid "Search for a user"
+msgstr "��廚�廩 �廩廬�廩"
+
+#: ../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."
+msgstr "�廩 ����� 廩� �� ���� ��廡� �廩�� ���� ��� ��廚廩 �廩廬�廩�� 廬����� �廡���廬 � Sametime 廩��."
+
+#: ../libpurple/protocols/sametime/sametime.c:5664
 msgid "User Search"
 msgstr "��廚�廩 �廩廬�廩"
 
-#: ../libpurple/protocols/sametime/sametime.c:5676
+#: ../libpurple/protocols/sametime/sametime.c:5677
 msgid "Import Sametime List..."
 msgstr "���� 廨廩��廬 Sametime..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5680
+#: ../libpurple/protocols/sametime/sametime.c:5681
 msgid "Export Sametime List..."
 msgstr "��廢� 廨廩��廬 Sametime..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5684
+#: ../libpurple/protocols/sametime/sametime.c:5685
 msgid "Add Notes Address Book Group..."
 msgstr "��廖廝 廡��廢� �廬�� 廖廚廨 �廬���廬 廩� Notes..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5688
+#: ../libpurple/protocols/sametime/sametime.c:5689
 msgid "User Search..."
 msgstr "��廚�廩 �廩廬�廩..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5794
+#: ../libpurple/protocols/sametime/sametime.c:5795
 msgid "Force login (ignore server redirects)"
 msgstr "��廛 ���廖� (�廬廣�� ��廚���廬-廩廨廬)"
 
 #. pretend to be Sametime Connect
-#: ../libpurple/protocols/sametime/sametime.c:5804
+#: ../libpurple/protocols/sametime/sametime.c:5805
 msgid "Hide client identity"
 msgstr "�廖廬廨 ���廬 �廡��"
 
@@ -10749,11 +10859,8 @@
 #: ../libpurple/protocols/silc/buddy.c:298
 #: ../libpurple/protocols/silc10/buddy.c:295
 #, c-format
-msgid ""
-"Key agreement request received from %s. Would you like to perform the key "
-"agreement?"
-msgstr ""
-"�廡廩� ��廖��� 廣� �廚廬��廬 �廬廡��� ��廬 %s. ��� �廨廢��� ��廢廣 �廬 ��廖��� 廣� �廚廬��廬?"
+msgid "Key agreement request received from %s. Would you like to perform the key agreement?"
+msgstr "�廡廩� ��廖��� 廣� �廚廬��廬 �廬廡��� ��廬 %s. ��� �廨廢��� ��廢廣 �廬 ��廖��� 廣� �廚廬��廬?"
 
 #: ../libpurple/protocols/silc/buddy.c:302
 #: ../libpurple/protocols/silc10/buddy.c:299
@@ -10794,8 +10901,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
@@ -10804,8 +10911,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
@@ -10829,11 +10936,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
@@ -10844,8 +10951,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
@@ -10860,12 +10967,8 @@
 
 #: ../libpurple/protocols/silc/buddy.c:726
 #: ../libpurple/protocols/silc10/buddy.c:738
-msgid ""
-"You cannot receive buddy notifications until you import his/her public key.  "
-"You can use the Get Public Key command to get the public key."
-msgstr ""
-"���� ����/� �廡�� �廬廨廣�廬 廣� ��廩 廡廩廨 廣� �廩廨 廬����/� �廬 ��廚廬� �廢���廨� 廩��.  "
-"��廬� ��廩廬�廩 �廚廡��廬 �廩� �廚廬� 廢���廨� 廣�-��廬 ��廩�� �廬 ��廚廬� �廢���廨�."
+msgid "You cannot receive buddy notifications until you import his/her public key.  You can use the Get Public Key command to get the public key."
+msgstr "���� ����/� �廡�� �廬廨廣�廬 廣� ��廩 廡廩廨 廣� �廩廨 廬����/� �廬 ��廚廬� �廢���廨� 廩��.  ��廬� ��廩廬�廩 �廚廡��廬 �廩� �廚廬� 廢���廨� 廣�-��廬 ��廩�� �廬 ��廚廬� �廢���廨�."
 
 #. Open file selector to select the public key.
 #: ../libpurple/protocols/silc/buddy.c:1062
@@ -10881,12 +10984,8 @@
 
 #: ../libpurple/protocols/silc/buddy.c:1076
 #: ../libpurple/protocols/silc10/buddy.c:1084
-msgid ""
-"To add the buddy you must import his/her public key. Press Import to import "
-"a public key."
-msgstr ""
-"���廖�廝 �廬 ��廩 �廡廩廨, 廣��� ����� �廬 ��廚廬� �廢���廨� 廩��.��廬� ����廛 廣� \"����\" "
-"����� �廚廬� 廢���廨�."
+msgid "To add the buddy you must import his/her public key. Press Import to import a public key."
+msgstr "���廖�廝 �廬 ��廩 �廡廩廨, 廣��� ����� �廬 ��廚廬� �廢���廨� 廩��.��廬� ����廛 廣� \"����\" ����� �廚廬� 廢���廨�."
 
 #: ../libpurple/protocols/silc/buddy.c:1080
 #: ../libpurple/protocols/silc10/buddy.c:1088
@@ -10900,21 +10999,13 @@
 
 #: ../libpurple/protocols/silc/buddy.c:1188
 #: ../libpurple/protocols/silc10/buddy.c:1186
-msgid ""
-"More than one user was found with the same public key. Select the correct "
-"user from the list to add to the buddy list."
-msgstr ""
-"��廬廨 ��廩廬�廩 ��� ��廢� 廣� ��廬� �廚廬� 廢���廨�. �廩 ����廨 ��廨廩��� �廬 ��廩廬�廩 ����� "
-"���廖�廝 �廨廩��廬 ��廩� �廡廩廨."
+msgid "More than one user was found with the same public key. Select the correct user from the list to add to the buddy list."
+msgstr "��廬廨 ��廩廬�廩 ��� ��廢� 廣� ��廬� �廚廬� 廢���廨�. �廩 ����廨 ��廨廩��� �廬 ��廩廬�廩 ����� ���廖�廝 �廨廩��廬 ��廩� �廡廩廨."
 
 #: ../libpurple/protocols/silc/buddy.c:1190
 #: ../libpurple/protocols/silc10/buddy.c:1188
-msgid ""
-"More than one user was found with the same name. Select the correct user "
-"from the list to add to the buddy list."
-msgstr ""
-"��廬廨 ��廩廬�廩 ��� ��廢� 廣� ��廬� 廩�. �廩 ����廨 ��廨廩��� �廬 ��廩廬�廩 ����� ���廖�廝 "
-"�廨廩��廬 ��廩� �廡廩廨."
+msgid "More than one user was found with the same name. Select the correct user from the list to add to the buddy list."
+msgstr "��廬廨 ��廩廬�廩 ��� ��廢� 廣� ��廬� 廩�. �廩 ����廨 ��廨廩��� �廬 ��廩廬�廩 ����� ���廖�廝 �廨廩��廬 ��廩� �廡廩廨."
 
 #: ../libpurple/protocols/silc/buddy.c:1477
 #: ../libpurple/protocols/silc10/buddy.c:1477
@@ -10949,131 +11040,131 @@
 
 #: ../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:660
-#: ../libpurple/protocols/silc10/util.c:512
+#: ../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:662
-#: ../libpurple/protocols/silc10/util.c:514
+#: ../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:664
-#: ../libpurple/protocols/silc10/util.c:516
+#: ../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:666
-#: ../libpurple/protocols/silc10/util.c:518
+#: ../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:668
-#: ../libpurple/protocols/silc10/util.c:520
+#: ../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:670
-#: ../libpurple/protocols/silc10/util.c:522
+#: ../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:674
-#: ../libpurple/protocols/silc10/util.c:526
+#: ../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:676
-#: ../libpurple/protocols/silc10/util.c:528
+#: ../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:678
-#: ../libpurple/protocols/silc10/util.c:530
+#: ../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:680
-#: ../libpurple/protocols/silc10/util.c:532
+#: ../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:728
@@ -11082,7 +11173,7 @@
 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"
@@ -11109,7 +11200,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"
@@ -11222,17 +11313,8 @@
 
 #: ../libpurple/protocols/silc/chat.c:437
 #: ../libpurple/protocols/silc10/chat.c:413
-msgid ""
-"Channel authentication is used to secure the channel from unauthorized "
-"access. The authentication may be based on passphrase and digital "
-"signatures. If passphrase is set, it is required to be able to join. If "
-"channel public keys are set then only users whose public keys are listed are "
-"able to join."
-msgstr ""
-"����廬 �廣廨�廛 ��� �廢�廨� ������ �廣廨�廛 ���廩� �� ��廨廩�廬. ��廬�� ������廬 ���� 廣� "
-"�廖�廖 廖�廖�� ��廬��� �������廬. �� �廖�廖�� �廡�廣�, ���� �廬廬 ��廬� ��� ��廢�廨廝. �� "
-"�廡�廣� �廚廬��廬 廢���廨��� �廣廨�廛, �� 廨廡 �廩廬�廩�� 廩��廚廬� �廢���廨� 廩��� �廨廩��� ����� "
-"��廢�廨廝."
+msgid "Channel authentication is used to secure the channel from unauthorized access. The authentication may be based on passphrase and digital signatures. If passphrase is set, it is required to be able to join. If channel public keys are set then only users whose public keys are listed are able to join."
+msgstr "����廬 �廣廨�廛 ��� �廢�廨� ������ �廣廨�廛 ���廩� �� ��廨廩�廬. ��廬�� ������廬 ���� 廣� �廖�廖 廖�廖�� ��廬��� �������廬. �� �廖�廖�� �廡�廣�, ���� �廬廬 ��廬� ��� ��廢�廨廝. �� �廡�廣� �廚廬��廬 廢���廨��� �廣廨�廛, �� 廨廡 �廩廬�廩�� 廩��廚廬� �廢���廨� 廩��� �廨廩��� ����� ��廢�廨廝."
 
 #: ../libpurple/protocols/silc/chat.c:446
 #: ../libpurple/protocols/silc/chat.c:447
@@ -11260,7 +11342,7 @@
 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:1907
@@ -11352,8 +11434,7 @@
 #: ../libpurple/protocols/silc/chat.c:1046
 #: ../libpurple/protocols/silc10/chat.c:1102
 #, c-format
-msgid ""
-"You have to join the %s channel before you are able to join the private group"
+msgid "You have to join the %s channel before you are able to join the private group"
 msgstr "���� ��廢�廨廝 �廣廨�廛 %s �廚�� �廢�廨廚�廬 �廡��廢� �廚廨��廬"
 
 #: ../libpurple/protocols/silc/chat.c:1048
@@ -11387,13 +11468,20 @@
 msgid "Unknown command"
 msgstr "廚廡��� �� ���廨廬"
 
-#: ../libpurple/protocols/silc/ft.c:85 ../libpurple/protocols/silc/ft.c:101
-#: ../libpurple/protocols/silc/ft.c:104 ../libpurple/protocols/silc/ft.c:108
-#: ../libpurple/protocols/silc/ft.c:112 ../libpurple/protocols/silc/ft.c:116
-#: ../libpurple/protocols/silc/ft.c:120 ../libpurple/protocols/silc/ft.c:272
-#: ../libpurple/protocols/silc/ft.c:277 ../libpurple/protocols/silc/ft.c:282
-#: ../libpurple/protocols/silc/ft.c:288 ../libpurple/protocols/silc/ft.c:425
-#: ../libpurple/protocols/silc10/ft.c:89 ../libpurple/protocols/silc10/ft.c:92
+#: ../libpurple/protocols/silc/ft.c:85
+#: ../libpurple/protocols/silc/ft.c:101
+#: ../libpurple/protocols/silc/ft.c:104
+#: ../libpurple/protocols/silc/ft.c:108
+#: ../libpurple/protocols/silc/ft.c:112
+#: ../libpurple/protocols/silc/ft.c:116
+#: ../libpurple/protocols/silc/ft.c:120
+#: ../libpurple/protocols/silc/ft.c:272
+#: ../libpurple/protocols/silc/ft.c:277
+#: ../libpurple/protocols/silc/ft.c:282
+#: ../libpurple/protocols/silc/ft.c:288
+#: ../libpurple/protocols/silc/ft.c:425
+#: ../libpurple/protocols/silc10/ft.c:89
+#: ../libpurple/protocols/silc10/ft.c:92
 #: ../libpurple/protocols/silc10/ft.c:96
 #: ../libpurple/protocols/silc10/ft.c:100
 #: ../libpurple/protocols/silc10/ft.c:104
@@ -11405,11 +11493,16 @@
 msgid "Secure File Transfer"
 msgstr "�廩��� 廡�廢�� ������"
 
-#: ../libpurple/protocols/silc/ft.c:86 ../libpurple/protocols/silc/ft.c:102
-#: ../libpurple/protocols/silc/ft.c:105 ../libpurple/protocols/silc/ft.c:109
-#: ../libpurple/protocols/silc/ft.c:113 ../libpurple/protocols/silc/ft.c:117
-#: ../libpurple/protocols/silc/ft.c:121 ../libpurple/protocols/silc10/ft.c:90
-#: ../libpurple/protocols/silc10/ft.c:93 ../libpurple/protocols/silc10/ft.c:97
+#: ../libpurple/protocols/silc/ft.c:86
+#: ../libpurple/protocols/silc/ft.c:102
+#: ../libpurple/protocols/silc/ft.c:105
+#: ../libpurple/protocols/silc/ft.c:109
+#: ../libpurple/protocols/silc/ft.c:113
+#: ../libpurple/protocols/silc/ft.c:117
+#: ../libpurple/protocols/silc/ft.c:121
+#: ../libpurple/protocols/silc10/ft.c:90
+#: ../libpurple/protocols/silc10/ft.c:93
+#: ../libpurple/protocols/silc10/ft.c:97
 #: ../libpurple/protocols/silc10/ft.c:101
 #: ../libpurple/protocols/silc10/ft.c:105
 msgid "Error during file transfer"
@@ -11419,11 +11512,13 @@
 msgid "Remote disconnected"
 msgstr "�廢� ��廨��廡 ���廬廡"
 
-#: ../libpurple/protocols/silc/ft.c:106 ../libpurple/protocols/silc10/ft.c:94
+#: ../libpurple/protocols/silc/ft.c:106
+#: ../libpurple/protocols/silc10/ft.c:94
 msgid "Permission denied"
 msgstr "��� �廨廩��"
 
-#: ../libpurple/protocols/silc/ft.c:110 ../libpurple/protocols/silc10/ft.c:98
+#: ../libpurple/protocols/silc/ft.c:110
+#: ../libpurple/protocols/silc10/ft.c:98
 msgid "Key agreement failed"
 msgstr "�廩� �廣廬 �廖��� 廣� �廚廬��廬"
 
@@ -11435,36 +11530,43 @@
 msgid "Creating connection failed"
 msgstr "�廢�廨廬 ��廬��廨�廬 ��廩��"
 
-#: ../libpurple/protocols/silc/ft.c:122 ../libpurple/protocols/silc10/ft.c:102
+#: ../libpurple/protocols/silc/ft.c:122
+#: ../libpurple/protocols/silc10/ft.c:102
 msgid "File transfer session does not exist"
 msgstr "廬���� �廣�廨廬 �廡�廢�� �� 廡���"
 
-#: ../libpurple/protocols/silc/ft.c:273 ../libpurple/protocols/silc10/ft.c:206
+#: ../libpurple/protocols/silc/ft.c:273
+#: ../libpurple/protocols/silc10/ft.c:206
 msgid "No file transfer session active"
 msgstr "��� 廬���� �廣�廨廬 廡�廢�� 廚廣��"
 
-#: ../libpurple/protocols/silc/ft.c:278 ../libpurple/protocols/silc10/ft.c:211
+#: ../libpurple/protocols/silc/ft.c:278
+#: ../libpurple/protocols/silc10/ft.c:211
 msgid "File transfer already started"
 msgstr "�廣�廨廬 廡��廛 ��廨 ����"
 
-#: ../libpurple/protocols/silc/ft.c:283 ../libpurple/protocols/silc10/ft.c:216
+#: ../libpurple/protocols/silc/ft.c:283
+#: ../libpurple/protocols/silc10/ft.c:216
 msgid "Could not perform key agreement for file transfer"
 msgstr "�� ��廬� ��廢廣 �廖��� 廣� �廚廬��廬 �廩��� �廣�廨廬 廡�廢��"
 
-#: ../libpurple/protocols/silc/ft.c:289 ../libpurple/protocols/silc10/ft.c:222
+#: ../libpurple/protocols/silc/ft.c:289
+#: ../libpurple/protocols/silc10/ft.c:222
 msgid "Could not start the file transfer"
 msgstr "�� ��廬� ��廬��� �廬 �廣�廨廬 �廡��廛"
 
-#: ../libpurple/protocols/silc/ft.c:426 ../libpurple/protocols/silc10/ft.c:341
+#: ../libpurple/protocols/silc/ft.c:426
+#: ../libpurple/protocols/silc10/ft.c:341
 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
@@ -11472,38 +11574,39 @@
 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
@@ -11511,8 +11614,9 @@
 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
@@ -11520,157 +11624,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: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: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 ""
@@ -11706,36 +11810,36 @@
 "廖�\"� �廚廣��� 廩廨廬��: %d\n"
 "廖�\"� �廚廣��� �廬���: %d\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:1817
 #: ../libpurple/protocols/silc10/ops.c:1864
@@ -11743,36 +11847,35 @@
 msgid "Resuming session"
 msgstr "��廩�� 廬���� 廚廣���"
 
-#: ../libpurple/protocols/silc/ops.c:1730
+#: ../libpurple/protocols/silc/ops.c:1745
 #: ../libpurple/protocols/silc10/ops.c:1819
 msgid "Authenticating connection"
 msgstr "���廬 ����廨"
 
-#: ../libpurple/protocols/silc/ops.c:1781
+#: ../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/silc/ops.c:1833
 #: ../libpurple/protocols/silc10/ops.c:1908
 msgid "Passphrase required"
 msgstr "��廨廩廬 廖�廖��"
 
-#: ../libpurple/protocols/silc/pk.c:98 ../libpurple/protocols/silc10/pk.c:104
-#, c-format
-msgid ""
-"Received %s's public key. Your local copy does not match this key. Would you "
-"still like to accept this public key?"
-msgstr ""
-"��廚廬� �廢���廨� 廩� %s �廬廡��. ��廣廬廡 ��廡��� ���� 廬��� ��廚廬� ��. ��� �廨廢��� "
-"���廩�� ��廡�� �廬 ��廚廬� �廢���廨�?"
-
-#: ../libpurple/protocols/silc/pk.c:103 ../libpurple/protocols/silc10/pk.c:109
+#: ../libpurple/protocols/silc/pk.c:98
+#: ../libpurple/protocols/silc10/pk.c:104
+#, c-format
+msgid "Received %s's public key. Your local copy does not match this key. Would you still like to accept this public key?"
+msgstr "��廚廬� �廢���廨� 廩� %s �廬廡��. ��廣廬廡 ��廡��� ���� 廬��� ��廚廬� ��. ��� �廨廢��� ���廩�� ��廡�� �廬 ��廚廬� �廢���廨�?"
+
+#: ../libpurple/protocols/silc/pk.c:103
+#: ../libpurple/protocols/silc10/pk.c:109
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
 msgstr "��廚廬� �廢���廨� 廩� %s �廬廡��. ��� �廨廢��� �廡�� �廚廬� ��?"
 
-#: ../libpurple/protocols/silc/pk.c:107 ../libpurple/protocols/silc10/pk.c:113
+#: ../libpurple/protocols/silc/pk.c:107
+#: ../libpurple/protocols/silc10/pk.c:113
 #, c-format
 msgid ""
 "Fingerprint and babbleprint for the %s key are:\n"
@@ -11785,17 +11888,20 @@
 "%s\n"
 "%s\n"
 
-#: ../libpurple/protocols/silc/pk.c:110 ../libpurple/protocols/silc/pk.c:139
+#: ../libpurple/protocols/silc/pk.c:110
+#: ../libpurple/protocols/silc/pk.c:139
 #: ../libpurple/protocols/silc10/pk.c:116
 #: ../libpurple/protocols/silc10/pk.c:142
 msgid "Verify Public Key"
 msgstr "���� �廚廬� 廢���廨�"
 
-#: ../libpurple/protocols/silc/pk.c:115 ../libpurple/protocols/silc10/pk.c:121
+#: ../libpurple/protocols/silc/pk.c:115
+#: ../libpurple/protocols/silc10/pk.c:121
 msgid "_View..."
 msgstr "廢廚���..."
 
-#: ../libpurple/protocols/silc/pk.c:140 ../libpurple/protocols/silc10/pk.c:143
+#: ../libpurple/protocols/silc/pk.c:140
+#: ../libpurple/protocols/silc10/pk.c:143
 msgid "Unsupported public key type"
 msgstr "廖�� �廚廬� 廢���廨� 廩���� �廬��"
 
@@ -11816,8 +11922,7 @@
 
 #: ../libpurple/protocols/silc/silc.c:343
 #: ../libpurple/protocols/silc10/ops.c:1718
-msgid ""
-"Resuming detached session failed. Press Reconnect to create new connection."
+msgid "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr "��廩� 廬���� 廚廣��� 廩��廬廡, ��廩�. ��廢/� 廣� ����廨 ���廩 ��廢�廨 ����廨 ��廩."
 
 #: ../libpurple/protocols/silc/silc.c:373
@@ -11868,7 +11973,8 @@
 msgstr "�廢� �廨�� ������ 廩��"
 
 #: ../libpurple/protocols/silc/silc.c:884
-#: ../libpurple/protocols/silc10/silc.c:658 ../pidgin/gtkprefs.c:1685
+#: ../libpurple/protocols/silc10/silc.c:658
+#: ../pidgin/gtkprefs.c:1685
 msgid "Normal"
 msgstr "廨���"
 
@@ -11887,16 +11993,16 @@
 "廢�廨廬 �廡廩廨 ���廣�廚廬 廣���"
 
 #: ../libpurple/protocols/silc/silc.c:917
-#: ../libpurple/protocols/silc/util.c:567
+#: ../libpurple/protocols/silc/util.c:571
 #: ../libpurple/protocols/silc10/silc.c:691
-#: ../libpurple/protocols/silc10/util.c:557
+#: ../libpurple/protocols/silc10/util.c:561
 msgid "SMS"
 msgstr "SMS"
 
 #: ../libpurple/protocols/silc/silc.c:919
-#: ../libpurple/protocols/silc/util.c:569
+#: ../libpurple/protocols/silc/util.c:573
 #: ../libpurple/protocols/silc10/silc.c:693
-#: ../libpurple/protocols/silc10/util.c:559
+#: ../libpurple/protocols/silc10/util.c:563
 msgid "MMS"
 msgstr "MMS"
 
@@ -11943,13 +12049,8 @@
 
 #: ../libpurple/protocols/silc/silc.c:961
 #: ../libpurple/protocols/silc10/silc.c:737
-msgid ""
-"You can let other users see your online status information and your personal "
-"information. Please fill the information you would like other users to see "
-"about yourself."
-msgstr ""
-"��廬� ��廚廩廨 ��廩廬�廩�� ��廨�� �廨��廬 �廬 �廢� �����廨 廩�� ����廣 ��廩�. �廩 ���� �廬 "
-"����廣 廩�廨廢��� ��廚廩廨 ��廩廬�廩�� ��廨�� �廨��廬 廣���."
+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 about yourself."
+msgstr "��廬� ��廚廩廨 ��廩廬�廩�� ��廨�� �廨��廬 �廬 �廢� �����廨 廩�� ����廣 ��廩�. �廩 ���� �廬 ����廣 廩�廨廢��� ��廚廩廨 ��廩廬�廩�� ��廨�� �廨��廬 廣���."
 
 #: ../libpurple/protocols/silc/silc.c:1002
 #: ../libpurple/protocols/silc/silc.c:1008
@@ -12111,7 +12212,7 @@
 
 #: ../libpurple/protocols/silc/silc.c:1821
 #: ../libpurple/protocols/silc10/silc.c:1613
-#: ../libpurple/protocols/zephyr/zephyr.c:2697
+#: ../libpurple/protocols/zephyr/zephyr.c:2700
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr "msg &lt;����� �廩廬�廩&gt; &lt;���廣�&gt;:  廩�� ���廣� 廚廨��廬 ��廩廬�廩"
 
@@ -12157,19 +12258,13 @@
 
 #: ../libpurple/protocols/silc/silc.c:1859
 #: ../libpurple/protocols/silc10/silc.c:1651
-msgid ""
-"cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
-"channel modes"
-msgstr ""
-"cmode &lt;廣廨�廛&gt; [+|-&lt;�廢���&gt;] [廚廨��廨��]: 廩�� �� �廢� �廬 �廢�� �廣廨�廛"
+msgid "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display channel modes"
+msgstr "cmode &lt;廣廨�廛&gt; [+|-&lt;�廢���&gt;] [廚廨��廨��]: 廩�� �� �廢� �廬 �廢�� �廣廨�廛"
 
 #: ../libpurple/protocols/silc/silc.c:1863
 #: ../libpurple/protocols/silc10/silc.c:1655
-msgid ""
-"cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
-"on channel"
-msgstr ""
-"cumode &lt;廣廨�廛&gt; +|-&lt;�廢���&gt; &lt;廩� �����&gt;:  廩�� �廢�� �廩廬�廩 �廣廨�廛"
+msgid "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes on channel"
+msgstr "cumode &lt;廣廨�廛&gt; +|-&lt;�廢���&gt; &lt;廩� �����&gt;:  廩�� �廢�� �廩廬�廩 �廣廨�廛"
 
 #: ../libpurple/protocols/silc/silc.c:1867
 #: ../libpurple/protocols/silc10/silc.c:1659
@@ -12183,12 +12278,8 @@
 
 #: ../libpurple/protocols/silc/silc.c:1875
 #: ../libpurple/protocols/silc10/silc.c:1667
-msgid ""
-"invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
-"channel invite list"
-msgstr ""
-"invite &lt;廣廨�廛&gt; [-|+]&lt;廩� �����&gt;:  ���� �廩廬�廩 �� ��廖廝/�廖廨 �廨廩��廬 "
-"������廬 廩� �廣廨�廛"
+msgid "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from channel invite list"
+msgstr "invite &lt;廣廨�廛&gt; [-|+]&lt;廩� �����&gt;:  ���� �廩廬�廩 �� ��廖廝/�廖廨 �廨廩��廬 ������廬 廩� �廣廨�廛"
 
 #: ../libpurple/protocols/silc/silc.c:1879
 #: ../libpurple/protocols/silc10/silc.c:1671
@@ -12227,12 +12318,8 @@
 
 #: ../libpurple/protocols/silc/silc.c:1908
 #: ../libpurple/protocols/silc10/silc.c:1700
-msgid ""
-"names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
-"specific users in channel(s)"
-msgstr ""
-"names [-count|-ops|-halfops|-voices|-normal] &lt;廣廨�廢(��)&gt;:  �廢� 廨廩��廬 "
-"��廩�� �廖�� �廖���� �廣廨�廢(��)"
+msgid "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List specific users in channel(s)"
+msgstr "names [-count|-ops|-halfops|-voices|-normal] &lt;廣廨�廢(��)&gt;:  �廢� 廨廩��廬 ��廩�� �廖�� �廖���� �廣廨�廢(��)"
 
 #. *< type
 #. *< ui_requirement
@@ -12255,7 +12342,8 @@
 msgstr "廚廨���廡�� 廬廡廩�廨廬 ����-��廬 ������廬(SILC)"
 
 #: ../libpurple/protocols/silc/silc.c:2053
-#: ../libpurple/protocols/silc10/silc.c:1859 ../pidgin/gtkprefs.c:2040
+#: ../libpurple/protocols/silc10/silc.c:1859
+#: ../pidgin/gtkprefs.c:2040
 msgid "Network"
 msgstr "廨廩廬"
 
@@ -12405,44 +12493,45 @@
 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 "��廩� �廝-��"
 
-#: ../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 "�廖�廝"
 
-#: ../libpurple/protocols/silc/wb.c:288 ../libpurple/protocols/silc10/wb.c:287
+#: ../libpurple/protocols/silc/wb.c:288
+#: ../libpurple/protocols/silc10/wb.c:287
 #, c-format
 msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
 msgstr "%s 廩�� ���廣� �� ���� ����. ��� �廨廢��� �廚廬�� �廬 ���� ����?"
 
-#: ../libpurple/protocols/silc/wb.c:292 ../libpurple/protocols/silc10/wb.c:291
-#, c-format
-msgid ""
-"%s sent message to whiteboard on %s channel. Would you like to open the "
-"whiteboard?"
+#: ../libpurple/protocols/silc/wb.c:292
+#: ../libpurple/protocols/silc10/wb.c:291
+#, c-format
+msgid "%s sent message to whiteboard on %s channel. Would you like to open the whiteboard?"
 msgstr "%s 廩�� ���廣� �� ���� ���� �廣廨�廛 %s.��� �廨廢��� �廚廬�� �廬 ���� ����?"
 
-#: ../libpurple/protocols/silc/wb.c:306 ../libpurple/protocols/silc10/wb.c:305
+#: ../libpurple/protocols/silc/wb.c:306
+#: ../libpurple/protocols/silc10/wb.c:305
 msgid "Whiteboard"
 msgstr "���-���"
 
@@ -12694,12 +12783,8 @@
 msgstr "廨�廬 ����廨� 廩�� ����� ���� �廨�廣 ���� �����廖 ��廣廨�廬."
 
 #: ../libpurple/protocols/toc/toc.c:558
-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."
-msgstr ""
-"�廬��廨廬 ��廬�廬廡廬 �廬��廨�廬 ����� ����. ��廬� 10 �廡�廬 ��廖� 廩��廬. �� 廬�廩�� ��廖�廬, "
-"廬���廛 ���廬�� �廚��� ��廬廨."
+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."
+msgstr "�廬��廨廬 ��廬�廬廡廬 �廬��廨�廬 ����� ����. ��廬� 10 �廡�廬 ��廖� 廩��廬. �� 廬�廩�� ��廖�廬, 廬���廛 ���廬�� �廚��� ��廬廨."
 
 #: ../libpurple/protocols/toc/toc.c:560
 #, c-format
@@ -12731,8 +12816,8 @@
 msgid "Password Change Successful"
 msgstr "�廖�廖�� 廩�� 廩��廬� ��廢���."
 
-#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:6399
-#: ../pidgin/gtkblist.c:6736
+#: ../libpurple/protocols/toc/toc.c:1366
+#: ../pidgin/gtkblist.c:6764
 msgid "_Group:"
 msgstr "_廡��廢�:"
 
@@ -12753,8 +12838,10 @@
 msgid "File transfer failed; other side probably canceled."
 msgstr "�廩� ��廣�廨廬 �廡��廛, ��廨�� 廢� 廩�� ����"
 
-#: ../libpurple/protocols/toc/toc.c:1878 ../libpurple/protocols/toc/toc.c:1918
-#: ../libpurple/protocols/toc/toc.c:2042 ../libpurple/protocols/toc/toc.c:2130
+#: ../libpurple/protocols/toc/toc.c:1878
+#: ../libpurple/protocols/toc/toc.c:1918
+#: ../libpurple/protocols/toc/toc.c:2042
+#: ../libpurple/protocols/toc/toc.c:2130
 msgid "Could not connect for transfer."
 msgstr "�� ��廬� ���廨 �廬 ��廣�廨�."
 
@@ -12788,7 +12875,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/toc/toc.c:2306 ../libpurple/protocols/toc/toc.c:2308
+#: ../libpurple/protocols/toc/toc.c:2306
+#: ../libpurple/protocols/toc/toc.c:2308
 msgid "TOC Protocol Plugin"
 msgstr "廬�廖廝 廚廨���廡�� TOC"
 
@@ -12812,12 +12900,8 @@
 
 #: ../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."
+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:1011
 #, c-format
@@ -12830,69 +12914,64 @@
 
 #: ../libpurple/protocols/yahoo/yahoo.c:1997
 #, c-format
-msgid ""
-"The Yahoo server has requested the use of an unrecognized authentication "
-"method.  You will probably not be able to successfully sign on to Yahoo.  "
-"Check %s for updates."
-msgstr ""
-"��廡廩 廬廢�廨廬 ����廬 �� ���廨廬. 廡廨�� ������ 廩�� 廬��� ��廬��廨 ��廢��� �廩廨廬 �-Yahoo. "
-"���廡 �-%s �廣�������."
+msgid "The Yahoo server has requested the use of an unrecognized authentication method.  You will probably not be able to successfully sign on to Yahoo.  Check %s for updates."
+msgstr "��廡廩 廬廢�廨廬 ����廬 �� ���廨廬. 廡廨�� ������ 廩�� 廬��� ��廬��廨 ��廢��� �廩廨廬 �-Yahoo. ���廡 �-%s �廣�������."
 
 #: ../libpurple/protocols/yahoo/yahoo.c:2000
 msgid "Failed Yahoo! Authentication"
 msgstr "��廩��� �����廬 ��� Yahoo!"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2066
-#, c-format
-msgid ""
-"You have tried to ignore %s, but the user is on your buddy list.  Clicking "
-"\"Yes\" will remove and ignore the buddy."
-msgstr ""
-"��廖�廬 ��廬廣�� �-%s, �� �廩廬�廩 �� ��廢� �廨廩��廬 ��廩� �廡廩廨 廩��. ���廢� 廣� \"��\" "
-"廬廖�廨 �廬廬廣�� �� ��廩廬�廩."
-
-#: ../libpurple/protocols/yahoo/yahoo.c:2069
+#: ../libpurple/protocols/yahoo/yahoo.c:2078
+#, c-format
+msgid "You have tried to ignore %s, but the user is on your buddy list.  Clicking \"Yes\" will remove and ignore the buddy."
+msgstr "��廖�廬 ��廬廣�� �-%s, �� �廩廬�廩 �� ��廢� �廨廩��廬 ��廩� �廡廩廨 廩��. ���廢� 廣� \"��\" 廬廖�廨 �廬廬廣�� �� ��廩廬�廩."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:2081
 msgid "Ignore buddy?"
 msgstr "�廬廣�� ��廩廬�廩?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2134
+#: ../libpurple/protocols/yahoo/yahoo.c:2127
+msgid "Invalid screen name."
+msgstr "廩�-廬廢��� �� 廬廡��."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:2152
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "�廩���� �廣��, �廩 ��廩廬 ��廬廨 廩� Yahoo."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2137
+#: ../libpurple/protocols/yahoo/yahoo.c:2155
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "廩���� �� ���廨廬 �廖廚廨 %d. �廬��廨�廬 ��廬廨 Yahoo! ���� �廬廡� �廬 ��."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2190
+#: ../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:2193
+#: ../libpurple/protocols/yahoo/yahoo.c:2211
 msgid "Could not add buddy to server list"
 msgstr "�� ��廬� ���廖�廝 �廬 ��廩 �廡廩廨 �廨廩��� �廩廨廬"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2315
+#: ../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:2671
+#: ../libpurple/protocols/yahoo/yahoo.c:2689
 msgid "Received unexpected HTTP response from server."
 msgstr "�廬廡��� 廬���廬 HTTP ��-廢廚��� �� �廩廨廬."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2700
-#: ../libpurple/protocols/yahoo/yahoo.c:2888
-#: ../libpurple/protocols/yahoo/yahoo.c:2993
-#: ../libpurple/protocols/yahoo/yahoo.c:3004
+#: ../libpurple/protocols/yahoo/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:2726
+#: ../libpurple/protocols/yahoo/yahoo.c:2744
 #, c-format
 msgid ""
 "Lost connection with %s:\n"
@@ -12901,7 +12980,7 @@
 "��� �����廨 廣� %s:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2751
+#: ../libpurple/protocols/yahoo/yahoo.c:2769
 #, c-format
 msgid ""
 "Could not establish a connection with %s:\n"
@@ -12910,103 +12989,103 @@
 "�� ��� ��廬� ��廢�廨 ����廨 廣� %s:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3118
-#: ../libpurple/protocols/yahoo/yahoo.c:3804
+#: ../libpurple/protocols/yahoo/yahoo.c:3138
+#: ../libpurple/protocols/yahoo/yahoo.c:3829
 msgid "Not at Home"
 msgstr "�� ��廢� ���廬"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3120
-#: ../libpurple/protocols/yahoo/yahoo.c:3807
+#: ../libpurple/protocols/yahoo/yahoo.c:3140
+#: ../libpurple/protocols/yahoo/yahoo.c:3832
 msgid "Not at Desk"
 msgstr "�� ��� �廩����"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3122
-#: ../libpurple/protocols/yahoo/yahoo.c:3810
+#: ../libpurple/protocols/yahoo/yahoo.c:3142
+#: ../libpurple/protocols/yahoo/yahoo.c:3835
 msgid "Not in Office"
 msgstr "�� ��廢� ��廩廨�"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3126
-#: ../libpurple/protocols/yahoo/yahoo.c:3816
+#: ../libpurple/protocols/yahoo/yahoo.c:3146
+#: ../libpurple/protocols/yahoo/yahoo.c:3841
 msgid "On Vacation"
 msgstr "���廚廩�"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3130
-#: ../libpurple/protocols/yahoo/yahoo.c:3822
+#: ../libpurple/protocols/yahoo/yahoo.c:3150
+#: ../libpurple/protocols/yahoo/yahoo.c:3847
 msgid "Stepped Out"
 msgstr "�廢� �廨�廣"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3223
-#: ../libpurple/protocols/yahoo/yahoo.c:3253
+#: ../libpurple/protocols/yahoo/yahoo.c:3243
+#: ../libpurple/protocols/yahoo/yahoo.c:3273
 msgid "Not on server list"
 msgstr "�� �廨廩��廬 �廩廨廬��"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3270
-#: ../libpurple/protocols/yahoo/yahoo.c:3328
+#: ../libpurple/protocols/yahoo/yahoo.c:3290
+#: ../libpurple/protocols/yahoo/yahoo.c:3348
 msgid "Appear Online"
 msgstr "�廨�� ����廨"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3273
-#: ../libpurple/protocols/yahoo/yahoo.c:3349
+#: ../libpurple/protocols/yahoo/yahoo.c:3293
+#: ../libpurple/protocols/yahoo/yahoo.c:3369
 msgid "Appear Permanently Offline"
 msgstr "�廨�� ���廬廡 �廣�"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3291
+#: ../libpurple/protocols/yahoo/yahoo.c:3311
 msgid "Presence"
 msgstr "�����廬"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3334
+#: ../libpurple/protocols/yahoo/yahoo.c:3354
 msgid "Appear Offline"
 msgstr "��� ��廨�� ���廬廡"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3343
+#: ../libpurple/protocols/yahoo/yahoo.c:3363
 msgid "Don't Appear Permanently Offline"
 msgstr "�� 廬�廨�� ���廬廡 �廣�"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3391
+#: ../libpurple/protocols/yahoo/yahoo.c:3411
 msgid "Join in Chat"
 msgstr "�廢�廨廝 �廩���"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3397
+#: ../libpurple/protocols/yahoo/yahoo.c:3417
 msgid "Initiate Conference"
 msgstr "���� �廣���"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3425
+#: ../libpurple/protocols/yahoo/yahoo.c:3445
 msgid "Presence Settings"
 msgstr "�廚廩廨���廬 �����廬"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3431
+#: ../libpurple/protocols/yahoo/yahoo.c:3451
 msgid "Start Doodling"
 msgstr "�廬�� �廡廩廡廩"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3532
+#: ../libpurple/protocols/yahoo/yahoo.c:3557
 msgid "Activate which ID?"
 msgstr "���� ID ��廚廣��?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3543
+#: ../libpurple/protocols/yahoo/yahoo.c:3568
 msgid "Join whom in chat?"
 msgstr "��廢�廨廝 ��� �廢'��?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3555
+#: ../libpurple/protocols/yahoo/yahoo.c:3580
 msgid "Activate ID..."
 msgstr "�廚廣� ID..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3559
+#: ../libpurple/protocols/yahoo/yahoo.c:3584
 msgid "Join User in Chat..."
 msgstr "�廢�廨廝 ��廩廬�廩 �廢'��..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3564
+#: ../libpurple/protocols/yahoo/yahoo.c:3589
 msgid "Open Inbox"
 msgstr "廚廬� �廬 廬��廬 ����廨 廩��"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4153
+#: ../libpurple/protocols/yahoo/yahoo.c:4178
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join &lt;��廨&gt;:  �廢�廨廝 ���廨 廢'�� �廨廩廬 Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4158
+#: ../libpurple/protocols/yahoo/yahoo.c:4183
 msgid "list: List rooms on the Yahoo network"
 msgstr "list: �廢� �廬 廨廩��廬 ���廨�� �廨廩廬 Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4166
+#: ../libpurple/protocols/yahoo/yahoo.c:4191
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: ��廡廩 ���廩廬�廩 ��廬��� �- Doodle"
 
@@ -13020,56 +13099,56 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4375
-#: ../libpurple/protocols/yahoo/yahoo.c:4377
+#: ../libpurple/protocols/yahoo/yahoo.c:4400
+#: ../libpurple/protocols/yahoo/yahoo.c:4402
 msgid "Yahoo Protocol Plugin"
 msgstr "廬�廖廝 廚廨���廡�� Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4400
+#: ../libpurple/protocols/yahoo/yahoo.c:4425
 msgid "Yahoo Japan"
 msgstr "Yahoo �廚�"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4403
+#: ../libpurple/protocols/yahoo/yahoo.c:4428
 msgid "Pager server"
 msgstr "廩廨廬 �-Pager"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4406
+#: ../libpurple/protocols/yahoo/yahoo.c:4431
 msgid "Japan Pager server"
 msgstr "廩廨廬 �-Pager ��廚�"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4409
+#: ../libpurple/protocols/yahoo/yahoo.c:4434
 msgid "Pager port"
 msgstr "�廢��廬 Pager"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4412
+#: ../libpurple/protocols/yahoo/yahoo.c:4437
 msgid "File transfer server"
 msgstr "廩廨廬 �廣�廨廬 廡�廢��"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4415
+#: ../libpurple/protocols/yahoo/yahoo.c:4440
 msgid "Japan file transfer server"
 msgstr "廩廨廬 �廚�� ��廣�廨廬 廡�廢��"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4418
+#: ../libpurple/protocols/yahoo/yahoo.c:4443
 msgid "File transfer port"
 msgstr "�廢��� ��廣�廨廬 廡�廢��"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4421
+#: ../libpurple/protocols/yahoo/yahoo.c:4446
 msgid "Chat room locale"
 msgstr "���廨� ����廨�廬 ���廨 廢'��"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4424
+#: ../libpurple/protocols/yahoo/yahoo.c:4449
 msgid "Ignore conference and chatroom invitations"
 msgstr "�廬廣�� ������廬 �廩���廬-�廣��� ����廨�-廢'��"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4432
+#: ../libpurple/protocols/yahoo/yahoo.c:4457
 msgid "Chat room list URL"
 msgstr "��廡�� 廩� 廨廩��廬 ��廨� �廢'��"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4435
+#: ../libpurple/protocols/yahoo/yahoo.c:4460
 msgid "Yahoo Chat server"
 msgstr "廩廨廬 廢'�� 廩� Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4438
+#: ../libpurple/protocols/yahoo/yahoo.c:4463
 msgid "Yahoo Chat port"
 msgstr "���廖廬 廩廨廬 Yahoo"
 
@@ -13106,82 +13185,66 @@
 msgstr "廚廨�廚�� Yahoo!"
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:838
-msgid ""
-"Sorry, profiles marked as containing adult content are not supported at this "
-"time."
+msgid "Sorry, profiles marked as containing adult content are not supported at this time."
 msgstr "廖����, �� 廚廨�廚���� ��廖����� ������� ���廣 �����廨�� ���� �� �廬���� �廨�廣."
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:840
-msgid ""
-"If you wish to view this profile, you will need to visit this link in your "
-"web browser:"
+msgid "If you wish to view this profile, you will need to visit this link in your web browser:"
 msgstr "�� �廨廢��� �廨��廬 廚廨�廚�� ��, �廩 ��廩廬�廩 �廡�廩�廨 ��� ��廚�廚� �����廨�� 廩��:"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1034
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1040
 msgid "Yahoo! ID"
 msgstr "Yahoo! ID"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1109
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1113
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1117
+#: ../libpurple/protocols/yahoo/yahoo_profile.c: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
-msgid ""
-"Sorry, this profile seems to be in a language or format that is not "
-"supported at this time."
+#: ../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
-msgid ""
-"Could not retrieve the user's profile. This most likely is a temporary "
-"server-side problem. Please try again later."
-msgstr ""
-"�� ��廬� �廩��廝 �廬 廚廨�廚�� ��廩廬�廩. ��� ��廨�� ���� 廬廡�� ����廬 �廩廨廬. �廩 ��廖�廬 "
-"廩��廬 ����廨 ��廬廨."
-
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1224
-msgid ""
-"Could not retrieve the user's profile. This most likely means that the user "
-"does not exist; however, Yahoo! sometimes does fail to find a user's "
-"profile. If you know that the user exists, please try again later."
-msgstr ""
-"�� ��廬� �廩��廝 �廬 廚廨�廚�� ��廩廬�廩. ��� ��廨�� �� ���廨 廩��廩廬�廩 �� 廡���; �廨�, "
-"�廣�廬�� Yahoo! �� �廢��� ��廢�� 廚廨�廚�� �廩廬�廩. �� �廬/� ����/� 廩��廩廬�廩 廡���, �廖/� "
-"廩��廬 ����廨 ��廬廨."
+#: ../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."
+msgstr "�� ��廬� �廩��廝 �廬 廚廨�廚�� ��廩廬�廩. ��� ��廨�� ���� 廬廡�� ����廬 �廩廨廬. �廩 ��廖�廬 廩��廬 ����廨 ��廬廨."
 
 #: ../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 profile. If you know that the user exists, please try again later."
+msgstr "�� ��廬� �廩��廝 �廬 廚廨�廚�� ��廩廬�廩. ��� ��廨�� �� ���廨 廩��廩廬�廩 �� 廡���; �廨�, �廣�廬�� Yahoo! �� �廢��� ��廢�� 廚廨�廚�� �廩廬�廩. �� �廬/� ����/� 廩��廩廬�廩 廡���, �廖/� 廩��廬 ����廨 ��廬廨."
+
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1238
 msgid "The user's profile is empty."
 msgstr "廚廨�廚�� ��廩廬�廩 廨�廡."
 
@@ -13214,12 +13277,8 @@
 msgstr "�� ����"
 
 #: ../libpurple/protocols/yahoo/yahoochat.c:456
-msgid ""
-"Unknown error. You may need to logout and wait five minutes before being "
-"able to rejoin a chatroom"
-msgstr ""
-"廩���� �� ���廨廬. 廣��� ��廬�廬廡 �����廬 ���廩 �廡�廬 �廚�� 廩���� �廚廩廨 ��廢�廨廝 廩�� ���廨 "
-"廢'��"
+msgid "Unknown error. You may need to logout and wait five minutes before being able to rejoin a chatroom"
+msgstr "廩���� �� ���廨廬. 廣��� ��廬�廬廡 �����廬 ���廩 �廡�廬 �廚�� 廩���� �廚廩廨 ��廢�廨廝 廩�� ���廨 廢'��"
 
 #: ../libpurple/protocols/yahoo/yahoochat.c:539
 #, c-format
@@ -13270,9 +13329,7 @@
 "%s"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:358
-msgid ""
-"(There was an error converting this message.\t Check the 'Encoding' option "
-"in the Account Editor)"
+msgid "(There was an error converting this message.\t Check the 'Encoding' option in the Account Editor)"
 msgstr "(���廬� 廩���� ���廨廬 ����廣�.\t ���廡 �廬 ���廨�廬 �'廡����' �廣�廨� ��廩����廬)"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:756
@@ -13296,84 +13353,72 @@
 msgid "Anyone"
 msgstr "�� ���"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2366
+#: ../libpurple/protocols/zephyr/zephyr.c:2369
 msgid "_Class:"
 msgstr "_���廡�:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2372
+#: ../libpurple/protocols/zephyr/zephyr.c:2375
 msgid "_Instance:"
 msgstr "_�廩�廬:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2378
+#: ../libpurple/protocols/zephyr/zephyr.c:2381
 msgid "_Recipient:"
 msgstr "_��廣�:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2389
+#: ../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:2702
+#: ../libpurple/protocols/zephyr/zephyr.c:2705
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;廩� �����&gt;: ��廬�廨 �廩廬�廩"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2707
+#: ../libpurple/protocols/zephyr/zephyr.c:2710
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;廩� �����&gt;: ��廬�廨 �廩廬�廩"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2712
+#: ../libpurple/protocols/zephyr/zephyr.c:2715
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "instance &lt;�廩�廬&gt;: 廡�廣 �廬 ��廩�廬 �廩���廩 ����廡� ��"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2717
+#: ../libpurple/protocols/zephyr/zephyr.c:2720
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "inst &lt;�廩�廬&gt;: 廡�廣 �廬 ��廩�廬 �廩���廩 ����廡� ��"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2722
+#: ../libpurple/protocols/zephyr/zephyr.c:2725
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "topic &lt;�廩�廬&gt;: 廡�廣 �廬 ��廩�廬 �廩���廩 ����廡� ��"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2728
+#: ../libpurple/protocols/zephyr/zephyr.c:2731
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr "sub &lt;���廡�&gt; &lt;�廩�廬&gt; &lt;��廣�&gt;: �廢�廨廝 �廢'�� ��廩"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2733
-msgid ""
-"zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
+#: ../libpurple/protocols/zephyr/zephyr.c:2736
+msgid "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr "zi &lt;�廩�廬&gt;: 廩�� ���廣� �-&lt;���廣�, <i>�廩�廬</i>,*&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2739
-msgid ""
-"zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
-"<i>instance</i>,*&gt;"
-msgstr ""
-"zci &lt;���廡�&gt; &lt;�廩�廬&gt;: 廩�� ���廣� �-&lt;<i>���廡�</i>,<i>�廩�廬</i>*&gt;"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2745
-msgid ""
-"zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
-"<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
-msgstr ""
-"zcir &lt;���廡�&gt; &lt;�廩�廬&gt; &lt;��廣�&gt;: 廩�� ���廣� �� &lt;<i>���廡�</i>,"
-"<i>�廩�廬</i>,<i>��廣�</i>&gt;"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2751
-msgid ""
-"zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
-"<i>instance</i>,<i>recipient</i>&gt;"
-msgstr ""
-"zir &lt;�廩�廬&gt; &lt;��廣�&gt;: 廩�� ���廣� �� &lt;���廣�,<i>�廩�廬</i>,<i>��廣�</"
-"i>&gt;"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2756
+#: ../libpurple/protocols/zephyr/zephyr.c:2742
+msgid "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,<i>instance</i>,*&gt;"
+msgstr "zci &lt;���廡�&gt; &lt;�廩�廬&gt;: 廩�� ���廣� �-&lt;<i>���廡�</i>,<i>�廩�廬</i>*&gt;"
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2748
+msgid "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
+msgstr "zcir &lt;���廡�&gt; &lt;�廩�廬&gt; &lt;��廣�&gt;: 廩�� ���廣� �� &lt;<i>���廡�</i>,<i>�廩�廬</i>,<i>��廣�</i>&gt;"
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2754
+msgid "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,<i>instance</i>,<i>recipient</i>&gt;"
+msgstr "zir &lt;�廩�廬&gt; &lt;��廣�&gt;: 廩�� ���廣� �� &lt;���廣�,<i>�廩�廬</i>,<i>��廣�</i>&gt;"
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2759
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr "zc &lt;���廡�&gt;: 廩�� ���廣� �� &lt;<i>���廡�</i>,��廩�,*&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2832
+#: ../libpurple/protocols/zephyr/zephyr.c:2835
 msgid "Resubscribe"
 msgstr "�廨廩� ���廩 �����"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2835
+#: ../libpurple/protocols/zephyr/zephyr.c:2838
 msgid "Retrieve subscriptions from server"
 msgstr "廩��廝 �廬 ������� ��廩廨廬"
 
@@ -13387,45 +13432,47 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/zephyr/zephyr.c:2928
-#: ../libpurple/protocols/zephyr/zephyr.c:2930
+#: ../libpurple/protocols/zephyr/zephyr.c:2931
+#: ../libpurple/protocols/zephyr/zephyr.c:2933
 msgid "Zephyr Protocol Plugin"
 msgstr "廬�廖廝 廚廨���廡�� Zephyr"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2955
+#: ../libpurple/protocols/zephyr/zephyr.c:2958
 msgid "Use tzc"
 msgstr "�廩廬�廩 �-tzc"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2958
+#: ../libpurple/protocols/zephyr/zephyr.c:2961
 msgid "tzc command"
 msgstr "廚廡��廬 tzc"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2961
+#: ../libpurple/protocols/zephyr/zephyr.c:2964
 msgid "Export to .anyone"
 msgstr "��廢� �-.anyone"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2964
+#: ../libpurple/protocols/zephyr/zephyr.c:2967
 msgid "Export to .zephyr.subs"
 msgstr "��廢� �-.zephyr.subs"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2967
+#: ../libpurple/protocols/zephyr/zephyr.c:2970
 msgid "Import from .anyone"
 msgstr "���� �-.anyone"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2970
-msgid "Import from .zephyr.subs"
-msgstr "���� �-.zephyr.subs"
-
 #: ../libpurple/protocols/zephyr/zephyr.c:2973
-msgid "Realm"
-msgstr "����廨"
+msgid "Import from .zephyr.subs"
+msgstr "���� �-.zephyr.subs"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2976
+msgid "Realm"
+msgstr "����廨"
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2979
 msgid "Exposure"
 msgstr "�廩�廚�"
 
-#: ../libpurple/proxy.c:461 ../libpurple/proxy.c:908 ../libpurple/proxy.c:1067
-#: ../libpurple/proxy.c:1638
+#: ../libpurple/proxy.c:486
+#: ../libpurple/proxy.c:933
+#: ../libpurple/proxy.c:1092
+#: ../libpurple/proxy.c:1695
 #, c-format
 msgid ""
 "Unable to create socket:\n"
@@ -13434,46 +13481,50 @@
 "��� �廚廩廨�廬 ��廢�廨 廩廡廣:\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:751 ../libpurple/proxy.c:789
-#: ../libpurple/proxy.c:801
+#: ../libpurple/proxy.c:727
+#: ../libpurple/proxy.c:776
+#: ../libpurple/proxy.c:814
+#: ../libpurple/proxy.c:826
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "廩���� �廩廨廬 �廬���� 廩� HTTP %d"
 
-#: ../libpurple/proxy.c:797
+#: ../libpurple/proxy.c:822
 #, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling."
 msgstr "��� �廨廩��: 廩廨廬 �廬���� ��廖廨 廣� 廬�廣�� ��廢��� %d."
 
-#: ../libpurple/proxy.c:1028
+#: ../libpurple/proxy.c:1053
 #, c-format
 msgid "Error resolving %s"
 msgstr "廩���� ��廢��廬 ��廬��廬 廩� %s"
 
-#: ../libpurple/proxy.c:1736
+#: ../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:1448
+#: ../libpurple/request.h:1391
+#: ../pidgin/gtkblist.c:552
 msgid "_Yes"
 msgstr "�_�"
 
-#: ../libpurple/request.h:1448
+#: ../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:1468
+#: ../libpurple/request.h:1411
 msgid "_Accept"
 msgstr "�_廩廨"
 
@@ -13493,17 +13544,17 @@
 msgid "%s is now known as %s.\n"
 msgstr "%s ���廣 �廣廬 �廩� %s.\n"
 
-#: ../libpurple/server.c:333
+#: ../libpurple/server.c:356
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "��廡廩/廬 �廬 廬廩��廬-��� 廩� %s..."
 
-#: ../libpurple/server.c:378
+#: ../libpurple/server.c:401
 #, c-format
 msgid "%s has requested your attention!"
 msgstr "%s ��廡廩 �廬 廬廩��廬 ���!"
 
-#: ../libpurple/server.c:875
+#: ../libpurple/server.c:898
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -13512,12 +13563,12 @@
 "%s ����� �廬 %s ���廨 �廢'�� %s:\n"
 "%s"
 
-#: ../libpurple/server.c:880
+#: ../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:884
+#: ../libpurple/server.c:907
 msgid "Accept chat invitation?"
 msgstr "�廡�� ����� �廢'��?"
 
@@ -13541,7 +13592,8 @@
 msgid "Unset"
 msgstr "���"
 
-#: ../libpurple/status.c:156 ../pidgin/gtkdocklet.c:553
+#: ../libpurple/status.c:156
+#: ../pidgin/gtkdocklet.c:553
 #: ../pidgin/gtkstatusbox.c:1083
 msgid "Do not disturb"
 msgstr "�� �� ��廚廨�廣"
@@ -13605,11 +13657,8 @@
 
 #: ../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~."
+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:3304
 msgid "Calculating..."
@@ -13666,19 +13715,16 @@
 msgid "Could not open %s: Redirected too many times"
 msgstr "�� ���� �廚廬�� %s: ��廬廨 ��� �廣�廨�廬"
 
-#: ../libpurple/util.c:3670 ../libpurple/util.c:3966
+#: ../libpurple/util.c:3670
+#: ../libpurple/util.c:3966
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "�� ��廬� ��廬��廨 �� %s"
 
 #: ../libpurple/util.c:3793
 #, c-format
-msgid ""
-"Unable to allocate enough memory to hold the contents from %s.  The web "
-"server may be trying something malicious."
-msgstr ""
-"�� ��廬� ��廡廢�廬 �廖廚�廡 ���廨�� �����廡 �廬 �廬��� �-%s.  廩廨廬 ��廬廨 ���� ��廖� �廣廩�廬 "
-"�廩�� ���廡."
+msgid "Unable to allocate enough memory to hold the contents from %s.  The web server may be trying something malicious."
+msgstr "�� ��廬� ��廡廢�廬 �廖廚�廡 ���廨�� �����廡 �廬 �廬��� �-%s.  廩廨廬 ��廬廨 ���� ��廖� �廣廩�廬 �廩�� ���廡."
 
 #: ../libpurple/util.c:3828
 #, c-format
@@ -13695,12 +13741,12 @@
 msgid "Unable to connect to %s: %s"
 msgstr "�� ��廬� ��廬��廨 �� %s: %s"
 
-#: ../libpurple/util.c:4686
+#: ../libpurple/util.c:4697
 #, c-format
 msgid " - %s"
 msgstr " - %s"
 
-#: ../libpurple/util.c:4692
+#: ../libpurple/util.c:4703
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
@@ -13712,19 +13758,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 "�����廨 廖�廨�."
@@ -13814,7 +13860,8 @@
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:939 ../pidgin/gtkprefs.c:1230
+#: ../pidgin/gtkaccount.c:939
+#: ../pidgin/gtkprefs.c:1230
 msgid "Use Environmental Settings"
 msgstr "�廩廬�廩 ����廨�廬 �廖����"
 
@@ -13836,15 +13883,18 @@
 msgid "Proxy Options"
 msgstr "�廚廩廨���廬 廚廨�廡廖�"
 
-#: ../pidgin/gtkaccount.c:1016 ../pidgin/gtkprefs.c:1224
+#: ../pidgin/gtkaccount.c:1016
+#: ../pidgin/gtkprefs.c:1224
 msgid "Proxy _type:"
 msgstr "廖�� �_廚廨�廡廖�"
 
-#: ../pidgin/gtkaccount.c:1025 ../pidgin/gtkprefs.c:1245
+#: ../pidgin/gtkaccount.c:1025
+#: ../pidgin/gtkprefs.c:1245
 msgid "_Host:"
 msgstr "_廩廨廬:"
 
-#: ../pidgin/gtkaccount.c:1029 ../pidgin/gtkprefs.c:1263
+#: ../pidgin/gtkaccount.c:1029
+#: ../pidgin/gtkprefs.c:1263
 msgid "_Port:"
 msgstr "_�廢���:"
 
@@ -13852,7 +13902,8 @@
 msgid "_Username:"
 msgstr "_廩� �廩廬�廩:"
 
-#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1300
+#: ../pidgin/gtkaccount.c:1044
+#: ../pidgin/gtkprefs.c:1300
 msgid "Pa_ssword:"
 msgstr "廖�_廖��"
 
@@ -13880,7 +13931,8 @@
 msgid "_Advanced"
 msgstr "_�廬廡��"
 
-#: ../pidgin/gtkaccount.c:1906 ../pidgin/gtkplugin.c:639
+#: ../pidgin/gtkaccount.c:1906
+#: ../pidgin/gtkplugin.c:643
 #: ../pidgin/plugins/convcolors.c:327
 msgid "Enabled"
 msgstr "廚廣��"
@@ -13894,306 +13946,306 @@
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
 "\n"
-"You have no IM accounts configured. To start connecting with %s press the "
-"<b>Add</b> button below and configure your first account. If you want %s to "
-"connect to multiple IM accounts, press <b>Add</b> again to configure them "
-"all.\n"
-"\n"
-"You can come back to this window to add, edit, or remove accounts from "
-"<b>Accounts->Add/Edit</b> in the Buddy List window"
+"You have no IM accounts configured. To start connecting with %s press the <b>Add</b> button below and configure your first account. If you want %s to connect to multiple IM accounts, press <b>Add</b> again to configure them all.\n"
+"\n"
+"You can come back to this window to add, edit, or remove accounts from <b>Accounts->Add/Edit</b> in the Buddy List window"
 msgstr ""
 "<span size='larger' weight='bold'>�廨���� ����� �-%s!</span>\n"
 "\n"
-"��� �廨廩�廬� 廩� �廩����廬 ����廨��. ��廬��� �廬��廨�廬 廣� %s �廩 ����廛 廣� ��廚廬�廨 "
-"<b>��廖廝</b> 廩���� ������廨 �廬 ��廩��� �廨�廩�� 廩��. �� �廨廢��� 廩-%s �廬��廨 ���� "
-"�廩����廬, �廩 ����廛 廣� <b>��廖廝</b> 廩�� 廣�-��廬 �����廨 �廬 ����.\n"
-"\n"
-"��廬� �� ����廨 ����� �� 廣� ��廬 ���廖�廝, �廣廨��, �� ��廖�廨 �廩����廬 廣�-��� "
-"<b>�廩����廬->��廖廝/廣廨��</b> 廩����� 廨廩��廬 ��廩�-�廡廩廨"
+"��� �廨廩�廬� 廩� �廩����廬 ����廨��. ��廬��� �廬��廨�廬 廣� %s �廩 ����廛 廣� ��廚廬�廨 <b>��廖廝</b> 廩���� ������廨 �廬 ��廩��� �廨�廩�� 廩��. �� �廨廢��� 廩-%s �廬��廨 ���� �廩����廬, �廩 ����廛 廣� <b>��廖廝</b> 廩�� 廣�-��廬 �����廨 �廬 ����.\n"
+"\n"
+"��廬� �� ����廨 ����� �� 廣� ��廬 ���廖�廝, �廣廨��, �� ��廖�廨 �廩����廬 廣�-��� <b>�廩����廬->��廖廝/廣廨��</b> 廩����� 廨廩��廬 ��廩�-�廡廩廨"
 
 #: ../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?"
+msgid_plural "You currently have %d contacts named %s. Would you like to merge them?"
 msgstr[0] "�廩 �� %d ��廩-廡廩廨 �廩� %s. ��� �廨廢��� ���� ��廬�?"
 msgstr[1] "�廩 �� �廣廬 %d ��廩�-廡廩廨 �廩� %s. ��� �廨廢��� ���� ��廬�?"
 
 #: ../pidgin/gtkblist.c:550
-msgid ""
-"Merging these contacts will cause them to share a single entry on the buddy "
-"list and use a single conversation window. You can separate them again by "
-"choosing 'Expand' from the contact's context menu"
-msgstr ""
-"����� ��廩�-廡廩廨 ��� ��廨�� ��� ����廬 廬�廬 廚廨�� ���� �廨廩��廬 ��廩� �廡廩廨, ���廩廬�廩 "
-"����� 廩��� ����. ��廬� ��廚廨�� ��廬� ��\"� 廣� ��� ���廨廬 '�廨��' ��廬廚廨�� 廣��廨 ��廩 "
-"�廡廩廨"
-
-#: ../pidgin/gtkblist.c:552
-msgid "_Merge"
-msgstr "�����"
-
-#: ../pidgin/gtkblist.c:953 ../pidgin/gtkblist.c:6683
+msgid "Merging these contacts will cause them to share a single entry on the buddy list and use a single conversation window. You can separate them again by choosing 'Expand' from the contact's context menu"
+msgstr "����� ��廩�-廡廩廨 ��� ��廨�� ��� ����廬 廬�廬 廚廨�� ���� �廨廩��廬 ��廩� �廡廩廨, ���廩廬�廩 ����� 廩��� ����. ��廬� ��廚廨�� ��廬� ��\"� 廣� ��� ���廨廬 '�廨��' ��廬廚廨�� 廣��廨 ��廩 �廡廩廨"
+
+#: ../pidgin/gtkblist.c:964
+#: ../pidgin/gtkblist.c:6711
 msgid "Room _List"
 msgstr "廨廩��廬 _��廨��"
 
-#: ../pidgin/gtkblist.c:973
-msgid ""
-"Please enter the appropriate information about the chat you would like to "
-"join.\n"
+#: ../pidgin/gtkblist.c:984
+msgid "Please enter the appropriate information about the chat you would like to join.\n"
 msgstr "�廩 ����� �廬 ����廣 ��廬��� 廣� �廢'�� 廩�廨廢��� ��廢�廨廝 ����.\n"
 
-#: ../pidgin/gtkblist.c:985 ../pidgin/gtkblist.c:6718
-#: ../pidgin/gtkpounce.c:546 ../pidgin/gtkroomlist.c:547
+#: ../pidgin/gtkblist.c:996
+#: ../pidgin/gtkblist.c:6746
+#: ../pidgin/gtkpounce.c:546
+#: ../pidgin/gtkroomlist.c:547
 msgid "_Account:"
 msgstr "�廩_���:"
 
-#: ../pidgin/gtkblist.c:1263 ../pidgin/gtkprivacy.c:549
+#: ../pidgin/gtkblist.c:1274
+#: ../pidgin/gtkprivacy.c:549
 #: ../pidgin/gtkprivacy.c:563
 msgid "_Block"
 msgstr "�廖��"
 
-#: ../pidgin/gtkblist.c:1263
+#: ../pidgin/gtkblist.c:1274
 msgid "Un_block"
 msgstr "�廖廨 �廖���"
 
-#: ../pidgin/gtkblist.c:1306
+#: ../pidgin/gtkblist.c:1317
 msgid "Move to"
 msgstr "�廣�廨 ��"
 
-#: ../pidgin/gtkblist.c:1346
+#: ../pidgin/gtkblist.c:1357
 msgid "Get _Info"
 msgstr "�廢� _廚廨���"
 
-#: ../pidgin/gtkblist.c:1349 ../pidgin/pidginstock.c:90
+#: ../pidgin/gtkblist.c:1360
+#: ../pidgin/pidginstock.c:90
 msgid "I_M"
 msgstr "���廣�"
 
-#: ../pidgin/gtkblist.c:1355
+#: ../pidgin/gtkblist.c:1366
 msgid "_Send File..."
 msgstr "廩�� 廡��廛..."
 
-#: ../pidgin/gtkblist.c:1362
+#: ../pidgin/gtkblist.c:1373
 msgid "Add Buddy _Pounce..."
 msgstr "��廖廝 廬���� �廚廣��廬 ��廩 廡廩廨..."
 
-#: ../pidgin/gtkblist.c:1367 ../pidgin/gtkblist.c:1371
-#: ../pidgin/gtkblist.c:1486 ../pidgin/gtkblist.c:1509
+#: ../pidgin/gtkblist.c:1378
+#: ../pidgin/gtkblist.c:1382
+#: ../pidgin/gtkblist.c:1502
+#: ../pidgin/gtkblist.c:1525
 msgid "View _Log"
 msgstr "�廢_� 廨�廩��"
 
-#: ../pidgin/gtkblist.c:1377
+#: ../pidgin/gtkblist.c:1388
+#: ../pidgin/gtkblist.c:1475
 msgid "Hide when offline"
 msgstr "���� ��廩廨 ��-�廡���"
 
-#: ../pidgin/gtkblist.c:1377
+#: ../pidgin/gtkblist.c:1388
+#: ../pidgin/gtkblist.c:1475
 msgid "Show when offline"
 msgstr "�廢� ��廩廨 ��-�廡���"
 
-#: ../pidgin/gtkblist.c:1391 ../pidgin/gtkblist.c:1400
-#: ../pidgin/gtkblist.c:1494 ../pidgin/gtkblist.c:1515
+#: ../pidgin/gtkblist.c:1402
+#: ../pidgin/gtkblist.c:1411
+#: ../pidgin/gtkblist.c:1510
+#: ../pidgin/gtkblist.c:1531
 msgid "_Alias..."
 msgstr "_廩� ��廖廝..."
 
-#: ../pidgin/gtkblist.c:1394 ../pidgin/gtkblist.c:1402
-#: ../pidgin/gtkblist.c:1496 ../pidgin/gtkblist.c:1517
+#: ../pidgin/gtkblist.c:1405
+#: ../pidgin/gtkblist.c:1413
+#: ../pidgin/gtkblist.c:1512
+#: ../pidgin/gtkblist.c:1533
 msgid "_Remove"
 msgstr "_�廖廨"
 
-#: ../pidgin/gtkblist.c:1452
+#: ../pidgin/gtkblist.c:1463
 msgid "Add _Buddy..."
 msgstr "��廖廝 ��廩 廡廩廨..."
 
-#: ../pidgin/gtkblist.c:1455
+#: ../pidgin/gtkblist.c:1466
 msgid "Add C_hat..."
 msgstr "��廖廝 廩���..."
 
-#: ../pidgin/gtkblist.c:1458
+#: ../pidgin/gtkblist.c:1469
 msgid "_Delete Group"
 msgstr "�廖廨 _廡��廢�"
 
-#: ../pidgin/gtkblist.c:1460
+#: ../pidgin/gtkblist.c:1471
 msgid "_Rename"
 msgstr "_廩�� 廩�"
 
 #. join button
-#: ../pidgin/gtkblist.c:1480 ../pidgin/gtkroomlist.c:318
-#: ../pidgin/gtkroomlist.c:594 ../pidgin/pidginstock.c:88
+#: ../pidgin/gtkblist.c:1496
+#: ../pidgin/gtkroomlist.c:318
+#: ../pidgin/gtkroomlist.c:594
+#: ../pidgin/pidginstock.c:88
 msgid "_Join"
 msgstr "�廢_�廨廝"
 
-#: ../pidgin/gtkblist.c:1482
+#: ../pidgin/gtkblist.c:1498
 msgid "Auto-Join"
 msgstr "�廢�廨廝 �������廬"
 
-#: ../pidgin/gtkblist.c:1484
+#: ../pidgin/gtkblist.c:1500
 msgid "Persistent"
 msgstr "��-����"
 
-#: ../pidgin/gtkblist.c:1522 ../pidgin/gtkblist.c:1545
+#: ../pidgin/gtkblist.c:1538
+#: ../pidgin/gtkblist.c:1561
 msgid "_Collapse"
 msgstr "_廡廚�"
 
-#: ../pidgin/gtkblist.c:1550
+#: ../pidgin/gtkblist.c:1566
 msgid "_Expand"
 msgstr "�_廨��"
 
-#: ../pidgin/gtkblist.c:1801 ../pidgin/gtkblist.c:1813
-#: ../pidgin/gtkblist.c:5364 ../pidgin/gtkblist.c:5377
+#: ../pidgin/gtkblist.c:1817
+#: ../pidgin/gtkblist.c:1829
+#: ../pidgin/gtkblist.c:5410
+#: ../pidgin/gtkblist.c:5423
 msgid "/Tools/Mute Sounds"
 msgstr "/����/�廩廬廡 廢�����"
 
-#: ../pidgin/gtkblist.c:2273 ../pidgin/gtkconv.c:4818
+#: ../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."
+msgid "You are not currently signed on with an account that can add that buddy."
 msgstr "���� ����廨/廬 �廨�廣 廣� ��廩��� 廩�廖��� ���廖�廝 ��廩 廡廩廨 ��."
 
 #. I don't believe this can happen currently, I think
 #. * everything that calls this function checks for one of the
 #. * above node types first.
-#: ../pidgin/gtkblist.c:2618
+#: ../pidgin/gtkblist.c:2640
 msgid "Unknown node type"
 msgstr "�廡���-�廨廩廬 �廖�� �� ���廨"
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:3054
+#: ../pidgin/gtkblist.c:3076
 msgid "/_Buddies"
 msgstr "/_��廩� 廡廩廨"
 
-#: ../pidgin/gtkblist.c:3055
+#: ../pidgin/gtkblist.c:3077
 msgid "/Buddies/New Instant _Message..."
 msgstr "/��廩� 廡廩廨/��_�廣� ��廩�..."
 
-#: ../pidgin/gtkblist.c:3056
+#: ../pidgin/gtkblist.c:3078
 msgid "/Buddies/Join a _Chat..."
 msgstr "/��廩� 廡廩廨/�廢�廨廝 �_廩���..."
 
-#: ../pidgin/gtkblist.c:3057
+#: ../pidgin/gtkblist.c:3079
 msgid "/Buddies/Get User _Info..."
 msgstr "/��廩� 廡廩廨/�廢� _廚廨�� �廩廬�廩..."
 
-#: ../pidgin/gtkblist.c:3058
+#: ../pidgin/gtkblist.c:3080
 msgid "/Buddies/View User _Log..."
 msgstr "/��廩� 廡廩廨/�廢� ���_� 廩���廬 廣� �廩廬�廩..."
 
-#: ../pidgin/gtkblist.c:3060
+#: ../pidgin/gtkblist.c:3082
 msgid "/Buddies/Sh_ow"
 msgstr "/��廩� 廡廩廨/�廢�"
 
-#: ../pidgin/gtkblist.c:3061
+#: ../pidgin/gtkblist.c:3083
 msgid "/Buddies/Show/_Offline Buddies"
 msgstr "/��廩� 廡廩廨/�廢�/�� �廡�����"
 
-#: ../pidgin/gtkblist.c:3062
+#: ../pidgin/gtkblist.c:3084
 msgid "/Buddies/Show/_Empty Groups"
 msgstr "/��廩� 廡廩廨/�廢�/廡��廢�廬 廨�廡�廬"
 
-#: ../pidgin/gtkblist.c:3063
+#: ../pidgin/gtkblist.c:3085
 msgid "/Buddies/Show/Buddy _Details"
 msgstr "/��廩� 廡廩廨/�廢�/廚廨�� ��廨"
 
-#: ../pidgin/gtkblist.c:3064
+#: ../pidgin/gtkblist.c:3086
 msgid "/Buddies/Show/Idle _Times"
 msgstr "/��廩� 廡廩廨/�廢�/���� ��廖廨-廚廣���廬"
 
-#: ../pidgin/gtkblist.c:3065
+#: ../pidgin/gtkblist.c:3087
 msgid "/Buddies/Show/_Protocol Icons"
 msgstr "/��廩� 廡廩廨/�廢�/廖��� 廚廨���廡����"
 
-#: ../pidgin/gtkblist.c:3066
+#: ../pidgin/gtkblist.c:3088
 msgid "/Buddies/_Sort Buddies"
 msgstr "/��廩� 廡廩廨/_���� ��廩�-廡廩廨"
 
-#: ../pidgin/gtkblist.c:3068
+#: ../pidgin/gtkblist.c:3090
 msgid "/Buddies/_Add Buddy..."
 msgstr "/��廩� 廡廩廨/_��廖廝 ��廩 廡廩廨..."
 
-#: ../pidgin/gtkblist.c:3069
+#: ../pidgin/gtkblist.c:3091
 msgid "/Buddies/Add C_hat..."
 msgstr "/��廩� 廡廩廨/��廖廝 廢'��..."
 
-#: ../pidgin/gtkblist.c:3070
+#: ../pidgin/gtkblist.c:3092
 msgid "/Buddies/Add _Group..."
 msgstr "/��廩� 廡廩廨/ ��廖廝 廡��廢� ��廩�..."
 
-#: ../pidgin/gtkblist.c:3072
+#: ../pidgin/gtkblist.c:3094
 msgid "/Buddies/_Quit"
 msgstr "/��廩� 廡廩廨/_�廢���"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:3075
+#: ../pidgin/gtkblist.c:3097
 msgid "/_Accounts"
 msgstr "/_�廩����廬"
 
-#: ../pidgin/gtkblist.c:3076 ../pidgin/gtkblist.c:7403
+#: ../pidgin/gtkblist.c:3098
+#: ../pidgin/gtkblist.c:7431
 msgid "/Accounts/Manage"
 msgstr "/�廩����廬/���"
 
 #. Tools
-#: ../pidgin/gtkblist.c:3079
+#: ../pidgin/gtkblist.c:3101
 msgid "/_Tools"
 msgstr "/_����"
 
-#: ../pidgin/gtkblist.c:3080
+#: ../pidgin/gtkblist.c:3102
 msgid "/Tools/Buddy _Pounces"
 msgstr "/����/廬_����廬 廚廣���廬 ��廩� 廡廩廨"
 
-#: ../pidgin/gtkblist.c:3081
+#: ../pidgin/gtkblist.c:3103
 msgid "/Tools/_Certificates"
 msgstr "/����/廬廣���廬"
 
-#: ../pidgin/gtkblist.c:3082
+#: ../pidgin/gtkblist.c:3104
 msgid "/Tools/Plu_gins"
 msgstr "/����/廬�_廖廚��"
 
-#: ../pidgin/gtkblist.c:3083
+#: ../pidgin/gtkblist.c:3105
 msgid "/Tools/Pr_eferences"
 msgstr "/����/_�廣�廚�廬"
 
-#: ../pidgin/gtkblist.c:3084
+#: ../pidgin/gtkblist.c:3106
 msgid "/Tools/Pr_ivacy"
 msgstr "/����/_廚廨���廬"
 
-#: ../pidgin/gtkblist.c:3086
+#: ../pidgin/gtkblist.c:3108
 msgid "/Tools/_File Transfers"
 msgstr "/����/�廣�廨廬 _廡�廢��..."
 
-#: ../pidgin/gtkblist.c:3087
+#: ../pidgin/gtkblist.c:3109
 msgid "/Tools/R_oom List"
 msgstr "/����/_廨廩��廬 ������廬"
 
-#: ../pidgin/gtkblist.c:3088
+#: ../pidgin/gtkblist.c:3110
 msgid "/Tools/System _Log"
 msgstr "/����/��\"� ��廣廨�廬"
 
-#: ../pidgin/gtkblist.c:3090
+#: ../pidgin/gtkblist.c:3112
 msgid "/Tools/Mute _Sounds"
 msgstr "/����/�_廩廬廡 廢�����"
 
 #. Help
-#: ../pidgin/gtkblist.c:3092
+#: ../pidgin/gtkblist.c:3114
 msgid "/_Help"
 msgstr "/_廣�廨�"
 
-#: ../pidgin/gtkblist.c:3093
+#: ../pidgin/gtkblist.c:3115
 msgid "/Help/Online _Help"
 msgstr "/廣�廨�/廣�廨� �廡���廬"
 
-#: ../pidgin/gtkblist.c:3094
+#: ../pidgin/gtkblist.c:3116
 msgid "/Help/_Debug Window"
 msgstr "/廣�廨�/_���� ��廚�� �����"
 
-#: ../pidgin/gtkblist.c:3096 ../pidgin/gtkblist.c:3098
+#: ../pidgin/gtkblist.c:3118
+#: ../pidgin/gtkblist.c:3120
 msgid "/Help/_About"
 msgstr "/廣�廨�/_����廬"
 
-#: ../pidgin/gtkblist.c:3128
+#: ../pidgin/gtkblist.c:3151
 #, c-format
 msgid "<b>Account:</b> %s"
 msgstr "<b>�廩���:</b> %s"
 
-#: ../pidgin/gtkblist.c:3136
+#: ../pidgin/gtkblist.c:3171
 #, c-format
 msgid ""
 "\n"
@@ -14202,86 +14254,89 @@
 "\n"
 "<b>��廩�:</b> %s"
 
-#: ../pidgin/gtkblist.c:3136
+#: ../pidgin/gtkblist.c:3171
 msgid "(no topic set)"
 msgstr "(��� ��廬廨廬)"
 
-#: ../pidgin/gtkblist.c:3213
+#: ../pidgin/gtkblist.c:3249
 msgid "Buddy Alias"
 msgstr "����� ���廩-�廡廩廨"
 
-#: ../pidgin/gtkblist.c:3242
+#: ../pidgin/gtkblist.c:3278
 msgid "Logged In"
 msgstr "����廨"
 
-#: ../pidgin/gtkblist.c:3288
+#: ../pidgin/gtkblist.c:3324
 msgid "Last Seen"
 msgstr "�廨�� ���廨���"
 
-#: ../pidgin/gtkblist.c:3309
+#: ../pidgin/gtkblist.c:3345
 msgid "Spooky"
 msgstr "�廚���"
 
-#: ../pidgin/gtkblist.c:3311
+#: ../pidgin/gtkblist.c:3347
 msgid "Awesome"
 msgstr "�����"
 
-#: ../pidgin/gtkblist.c:3313
+#: ../pidgin/gtkblist.c:3349
 msgid "Rockin'"
 msgstr "�����"
 
-#: ../pidgin/gtkblist.c:3329
+#: ../pidgin/gtkblist.c:3380
 msgid "Total Buddies"
 msgstr "廖�\"� ��廩� 廡廩廨"
 
-#: ../pidgin/gtkblist.c:3696
+#: ../pidgin/gtkblist.c:3742
 #, c-format
 msgid "Idle %dd %dh %02dm"
 msgstr "�� 廚廣�� %d��� %d廩 %02d�"
 
-#: ../pidgin/gtkblist.c:3698
+#: ../pidgin/gtkblist.c:3744
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "�� 廚廣�� %d廩 %02d�"
 
-#: ../pidgin/gtkblist.c:3700
+#: ../pidgin/gtkblist.c:3746
 #, c-format
 msgid "Idle %dm"
 msgstr "�� 廚廣�� %d�"
 
-#: ../pidgin/gtkblist.c:3854
+#: ../pidgin/gtkblist.c:3900
 msgid "/Buddies/New Instant Message..."
 msgstr "/��廩� 廡廩廨/��_�廣� ��廩�..."
 
-#: ../pidgin/gtkblist.c:3855 ../pidgin/gtkblist.c:3888
+#: ../pidgin/gtkblist.c:3901
+#: ../pidgin/gtkblist.c:3934
 msgid "/Buddies/Join a Chat..."
 msgstr "/��廩� 廡廩廨/�廢�廨廝 �_廩���..."
 
-#: ../pidgin/gtkblist.c:3856
+#: ../pidgin/gtkblist.c:3902
 msgid "/Buddies/Get User Info..."
 msgstr "/��廩� 廡廩廨/�廢� _廚廨�� �廩廬�廩..."
 
-#: ../pidgin/gtkblist.c:3857
+#: ../pidgin/gtkblist.c:3903
 msgid "/Buddies/Add Buddy..."
 msgstr "/��廩� 廡廩廨/_��廖廝 ��廩 廡廩廨..."
 
-#: ../pidgin/gtkblist.c:3858 ../pidgin/gtkblist.c:3891
+#: ../pidgin/gtkblist.c:3904
+#: ../pidgin/gtkblist.c:3937
 msgid "/Buddies/Add Chat..."
 msgstr "/��廩� 廡廩廨/��廖廝 廢'��..."
 
-#: ../pidgin/gtkblist.c:3859
+#: ../pidgin/gtkblist.c:3905
 msgid "/Buddies/Add Group..."
 msgstr "/��廩� 廡廩廨/ ��廖廝 廡��廢� ��廩�..."
 
-#: ../pidgin/gtkblist.c:3894
+#: ../pidgin/gtkblist.c:3940
 msgid "/Tools/Privacy"
 msgstr "/����/_廚廨���廬"
 
-#: ../pidgin/gtkblist.c:3897
+#: ../pidgin/gtkblist.c:3943
 msgid "/Tools/Room List"
 msgstr "/����/_廨廩��廬 ��廨� �廢'��"
 
-#: ../pidgin/gtkblist.c:4029 ../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"
@@ -14289,184 +14344,173 @@
 msgstr[0] "���廣� %d 廩�� �廡廨�� ��廬 %s\n"
 msgstr[1] "%d ���廣�廬 廩�� �廡廨�� ��廬 %s\n"
 
-#: ../pidgin/gtkblist.c:4192
+#: ../pidgin/gtkblist.c:4238
 msgid "Manually"
 msgstr "����廬"
 
-#: ../pidgin/gtkblist.c:4195
+#: ../pidgin/gtkblist.c:4241
 msgid "By status"
 msgstr "�廚� �廢�"
 
-#: ../pidgin/gtkblist.c:4196
+#: ../pidgin/gtkblist.c:4242
 msgid "By log size"
 msgstr "�廚� ���� ���� �廩���廬"
 
-#: ../pidgin/gtkblist.c:4533
+#: ../pidgin/gtkblist.c:4579
 #, c-format
 msgid "%s disconnected"
 msgstr "%s ���廬廡"
 
-#: ../pidgin/gtkblist.c:4535
+#: ../pidgin/gtkblist.c:4581
 #, c-format
 msgid "%s disabled"
 msgstr "%s ��-廚廣��"
 
-#: ../pidgin/gtkblist.c:4539
+#: ../pidgin/gtkblist.c:4585
 msgid "Reconnect"
 msgstr "�廬��廨 ���廩"
 
-#: ../pidgin/gtkblist.c:4539 ../pidgin/gtkblist.c:4658
+#: ../pidgin/gtkblist.c:4585
+#: ../pidgin/gtkblist.c:4704
 msgid "Re-enable"
 msgstr "�廚廣� ���廩"
 
-#: ../pidgin/gtkblist.c:4656
+#: ../pidgin/gtkblist.c:4702
 msgid "Welcome back!"
 msgstr "�廨�� 廩���!"
 
-#: ../pidgin/gtkblist.c:4692
+#: ../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:"
+msgid_plural "%d accounts were disabled because you signed on from another location:"
 msgstr[0] "�廩��� %d 廖��� ���-廚廣�� �� �廬��廨廬 ���廡�� ��廖廝:"
 msgstr[1] "%d �廩����廬 廖���� ���-廚廣���� �� �廬��廨廬 ���廡�� ��廖廝:"
 
-#: ../pidgin/gtkblist.c:4971
+#: ../pidgin/gtkblist.c:5017
 msgid "<b>Username:</b>"
 msgstr "<b>廩� �廩廬�廩:</b>"
 
-#: ../pidgin/gtkblist.c:4978
+#: ../pidgin/gtkblist.c:5024
 msgid "<b>Password:</b>"
 msgstr "<b>廖�廖��:</b>"
 
-#: ../pidgin/gtkblist.c:4989
+#: ../pidgin/gtkblist.c:5035
 msgid "_Login"
 msgstr "�廬��廨�廬"
 
-#: ../pidgin/gtkblist.c:5073
+#: ../pidgin/gtkblist.c:5119
 msgid "/Accounts"
 msgstr "/�廩����廬"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:5087
+#: ../pidgin/gtkblist.c:5133
 #, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
 "\n"
-"You have no accounts enabled. Enable your IM accounts from the <b>Accounts</"
-"b> window at <b>Accounts->Manage</b>. Once you enable accounts, you'll be "
-"able to sign on, set your status, and talk to your friends."
+"You have no accounts enabled. Enable your IM accounts from the <b>Accounts</b> window at <b>Accounts->Manage</b>. Once you enable accounts, you'll be able to sign on, set your status, and talk to your friends."
 msgstr ""
 "<span weight='bold' size='larger'>�廨���� ����� �-%s!</span>\n"
 "\n"
-"��� �廨廩�廬� �廩����廬 ��廚廣���. ��廬� ��廚廣�� �廬 ��廩����廬 廩�� �廬�� ���� "
-"<b>�廩����廬</b> �廨� <b>�廩����廬->���</b>. �廨�廣 廩���� �廩����廬 廚廣����, 廬��� "
-"�廚廩廨�廬 ��廬��廨, �廡��廣 �廬 ��廢� 廩��, ����廨 廣� ��廨��."
+"��� �廨廩�廬� �廩����廬 ��廚廣���. ��廬� ��廚廣�� �廬 ��廩����廬 廩�� �廬�� ���� <b>�廩����廬</b> �廨� <b>�廩����廬->���</b>. �廨�廣 廩���� �廩����廬 廚廣����, 廬��� �廚廩廨�廬 ��廬��廨, �廡��廣 �廬 ��廢� 廩��, ����廨 廣� ��廨��."
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:5358
+#: ../pidgin/gtkblist.c:5404
 msgid "/Buddies/Show/Offline Buddies"
 msgstr "/��廩� 廡廩廨/�廢�/�� �廡�����"
 
-#: ../pidgin/gtkblist.c:5361
+#: ../pidgin/gtkblist.c:5407
 msgid "/Buddies/Show/Empty Groups"
 msgstr "/��廩� 廡廩廨/�廢�/廡��廢�廬 廨�廡�廬"
 
-#: ../pidgin/gtkblist.c:5367
+#: ../pidgin/gtkblist.c:5413
 msgid "/Buddies/Show/Buddy Details"
 msgstr "/��廩� 廡廩廨/�廢�/廚廨�� ��廨"
 
-#: ../pidgin/gtkblist.c:5370
+#: ../pidgin/gtkblist.c:5416
 msgid "/Buddies/Show/Idle Times"
 msgstr "/��廩� 廡廩廨/�廢�/廚廨�� ��廨"
 
-#: ../pidgin/gtkblist.c:5373
+#: ../pidgin/gtkblist.c:5419
 msgid "/Buddies/Show/Protocol Icons"
 msgstr "/��廩� 廡廩廨/�廢�/廖��� 廚廨���廡����"
 
-#: ../pidgin/gtkblist.c:6324
-msgid ""
-"Please enter the screen name of the person you would like to add to your "
-"buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
-"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:6347
-msgid "A_ccount:"
-msgstr "�廩���:"
-
-#. End of account box
-#: ../pidgin/gtkblist.c:6359
-msgid "_Screen name:"
-msgstr "廩� �廬廢���:"
-
-#: ../pidgin/gtkblist.c:6381 ../pidgin/gtkblist.c:6731
-msgid "A_lias:"
-msgstr "廩�:"
-
-#: ../pidgin/gtkblist.c:6648
+#: ../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:6664
-msgid ""
-"You are not currently signed on with any protocols that have the ability to "
-"chat."
+#: ../pidgin/gtkblist.c:6692
+msgid "You are not currently signed on with any protocols that have the ability to chat."
 msgstr "���� ����廨/廬 �廚廨���廡�� ��廩�� ���廚廩廨 廩���廩 �廢'��."
 
-#: ../pidgin/gtkblist.c:6708
-msgid ""
-"Please enter an alias, and the appropriate information about the chat you "
-"would like to add to your buddy list.\n"
-msgstr ""
-"�廩 ����� 廩� ��廖廝, ����廣 �廬��� 廣� �廢'�� 廩�廨廢��� ���廖�廝 �廨廩��廬 ��廩� �廡廩廨 廩��.\n"
-
-#: ../pidgin/gtkblist.c:6738
+#: ../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"
+msgstr "�廩 ����� 廩� ��廖廝, ����廣 �廬��� 廣� �廢'�� 廩�廨廢��� ���廖�廝 �廨廩��廬 ��廩� �廡廩廨 廩��.\n"
+
+#: ../pidgin/gtkblist.c:6759
+msgid "A_lias:"
+msgstr "廩�:"
+
+#: ../pidgin/gtkblist.c:6766
 msgid "Auto_join when account becomes online."
 msgstr "�廢�廨廚�廬 �������廬 ��廩廨 ��廩��� �廣廩� �廡���."
 
-#: ../pidgin/gtkblist.c:6739
+#: ../pidgin/gtkblist.c:6767
 msgid "_Hide chat when the window is closed."
 msgstr "�_廖廬廨 廢'�� ��廩廨 ����� �廖�廨."
 
-#: ../pidgin/gtkblist.c:6765
+#: ../pidgin/gtkblist.c:6793
 msgid "Please enter the name of the group to be added."
 msgstr "�廩 ����� �廬 廩� �廡��廢� ���廩�."
 
-#: ../pidgin/gtkblist.c:7423
+#: ../pidgin/gtkblist.c:7451
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/�廩����廬/"
 
-#: ../pidgin/gtkblist.c:7447
+#: ../pidgin/gtkblist.c:7475
 msgid "_Edit Account"
 msgstr "_廣廨�� �廩���"
 
-#: ../pidgin/gtkblist.c:7460 ../pidgin/gtkconv.c:3137
+#: ../pidgin/gtkblist.c:7488
+#: ../pidgin/gtkconv.c:3128
 msgid "No actions available"
 msgstr "�� ��廬� ��廢廣 廚廣���廬"
 
-#: ../pidgin/gtkblist.c:7468
+#: ../pidgin/gtkblist.c:7496
 msgid "_Disable"
 msgstr "_���"
 
-#: ../pidgin/gtkblist.c:7480
+#: ../pidgin/gtkblist.c:7508
 msgid "Enable Account"
 msgstr "�廚廣� �廩���"
 
-#: ../pidgin/gtkblist.c:7486
+#: ../pidgin/gtkblist.c:7514
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/�廩����廬/�廚廣� �廩���"
 
-#: ../pidgin/gtkblist.c:7535
+#: ../pidgin/gtkblist.c:7563
 msgid "/Tools"
 msgstr "/_����"
 
-#: ../pidgin/gtkblist.c:7605
+#: ../pidgin/gtkblist.c:7633
 msgid "/Buddies/Sort Buddies"
 msgstr "/��廩� 廡廩廨/���� ��廩�-廡廩廨"
 
@@ -14479,203 +14523,205 @@
 msgid "Unknown command."
 msgstr "廚廡��� �� ���廨廬."
 
-#: ../pidgin/gtkconv.c:755 ../pidgin/gtkconv.c:781
+#: ../pidgin/gtkconv.c:749
+#: ../pidgin/gtkconv.c:775
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "��廩 廡廩廨 �� ���� ���廬� 廚廨���廡�� 廩� 廢'�� ��"
 
-#: ../pidgin/gtkconv.c:775
-msgid ""
-"You are not currently signed on with an account that can invite that buddy."
+#: ../pidgin/gtkconv.c:769
+msgid "You are not currently signed on with an account that can invite that buddy."
 msgstr "���� ����廨/廬 ��廩��� 廩���� ������ �廬 ��廩 �廡廩廨 ���."
 
-#: ../pidgin/gtkconv.c:828
+#: ../pidgin/gtkconv.c:822
 msgid "Invite Buddy Into Chat Room"
 msgstr "���� ��廩 廡廩廨 �廬�� ��廨 廢'��"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:858
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
+#: ../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:879
+#: ../pidgin/gtkconv.c:873
 msgid "_Buddy:"
 msgstr "_��廩 �廡廩廨:"
 
-#: ../pidgin/gtkconv.c:890 ../pidgin/gtksavedstatuses.c:1166
+#: ../pidgin/gtkconv.c:884
+#: ../pidgin/gtksavedstatuses.c:1166
 #: ../pidgin/gtksavedstatuses.c:1484
 msgid "_Message:"
 msgstr "�_��廣�:"
 
-#: ../pidgin/gtkconv.c:954
+#: ../pidgin/gtkconv.c:948
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>廩��� 廣� %s>/h1>\n"
 
-#: ../pidgin/gtkconv.c:992
+#: ../pidgin/gtkconv.c:986
 msgid "Save Conversation"
 msgstr "廩��廨 廩���"
 
-#: ../pidgin/gtkconv.c:1138 ../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:1164 ../pidgin/gtkdebug.c:195
+#: ../pidgin/gtkconv.c:1158
+#: ../pidgin/gtkdebug.c:195
 msgid "_Search for:"
 msgstr "_��廚�廩 廣��廨:"
 
-#: ../pidgin/gtkconv.c:1665
+#: ../pidgin/gtkconv.c:1659
 msgid "Un-Ignore"
 msgstr "��� �� �廬廣���廬"
 
-#: ../pidgin/gtkconv.c:1668
+#: ../pidgin/gtkconv.c:1662
 msgid "Ignore"
 msgstr "�廬廣��"
 
-#: ../pidgin/gtkconv.c:1688
+#: ../pidgin/gtkconv.c:1682
 msgid "Get Away Message"
 msgstr "�廩� �廬 ���廣廬 ��廬廨�廡�廬"
 
-#: ../pidgin/gtkconv.c:1711
+#: ../pidgin/gtkconv.c:1705
 msgid "Last said"
 msgstr "���廨 ���廨���"
 
-#: ../pidgin/gtkconv.c:2664
+#: ../pidgin/gtkconv.c:2660
 msgid "Unable to save icon file to disk."
 msgstr "�� ��廬� �廩��廨 �廬 �廖�� ���廖廡."
 
-#: ../pidgin/gtkconv.c:2715
+#: ../pidgin/gtkconv.c:2711
 msgid "Save Icon"
 msgstr "廩��廨廬 廖��"
 
-#: ../pidgin/gtkconv.c:2767
+#: ../pidgin/gtkconv.c:2763
 msgid "Animate"
 msgstr "��廚廩"
 
-#: ../pidgin/gtkconv.c:2772
+#: ../pidgin/gtkconv.c:2768
 msgid "Hide Icon"
 msgstr "�廖廬廨 廖��"
 
-#: ../pidgin/gtkconv.c:2775
+#: ../pidgin/gtkconv.c:2771
 msgid "Save Icon As..."
 msgstr "廩��廨廬 廖�� �廩�..."
 
-#: ../pidgin/gtkconv.c:2779
+#: ../pidgin/gtkconv.c:2775
 msgid "Set Custom Icon..."
 msgstr "廡�廣 廬����..."
 
-#: ../pidgin/gtkconv.c:2792
+#: ../pidgin/gtkconv.c:2788
 msgid "Remove Custom Icon"
 msgstr "�廖廨 廬���� 廩�廡�廣�"
 
-#: ../pidgin/gtkconv.c:2922
+#: ../pidgin/gtkconv.c:2913
 msgid "Show All"
 msgstr "�廢� ���"
 
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2941
+#: ../pidgin/gtkconv.c:2932
 msgid "/_Conversation"
 msgstr "/_廩���"
 
-#: ../pidgin/gtkconv.c:2943
+#: ../pidgin/gtkconv.c:2934
 msgid "/Conversation/New Instant _Message..."
 msgstr "/廩���/���_廣� ��廩�..."
 
-#: ../pidgin/gtkconv.c:2948
+#: ../pidgin/gtkconv.c:2939
 msgid "/Conversation/_Find..."
 msgstr "/廩���/_�廚廩..."
 
-#: ../pidgin/gtkconv.c:2950
+#: ../pidgin/gtkconv.c:2941
 msgid "/Conversation/View _Log"
 msgstr "/廩���/�_廢� ���� 廩���廬"
 
+#: ../pidgin/gtkconv.c:2942
+msgid "/Conversation/_Save As..."
+msgstr "/廩���/_廩��廨 �廩�..."
+
+#: ../pidgin/gtkconv.c:2944
+msgid "/Conversation/Clea_r Scrollback"
+msgstr "/廩���/�_廡� ����� ����廨"
+
+#: ../pidgin/gtkconv.c:2948
+msgid "/Conversation/Se_nd File..."
+msgstr "/廩���/廩_�� 廡��廛..."
+
+#: ../pidgin/gtkconv.c:2949
+msgid "/Conversation/Add Buddy _Pounce..."
+msgstr "/廩���/��廖廝 廚_廣��廬 廬����..."
+
 #: ../pidgin/gtkconv.c:2951
-msgid "/Conversation/_Save As..."
-msgstr "/廩���/_廩��廨 �廩�..."
-
-#: ../pidgin/gtkconv.c:2953
-msgid "/Conversation/Clea_r Scrollback"
-msgstr "/廩���/�_廡� ����� ����廨"
-
-#: ../pidgin/gtkconv.c:2957
-msgid "/Conversation/Se_nd File..."
-msgstr "/廩���/廩_�� 廡��廛..."
-
-#: ../pidgin/gtkconv.c:2958
-msgid "/Conversation/Add Buddy _Pounce..."
-msgstr "/廩���/��廖廝 廚_廣��廬 廬����..."
-
-#: ../pidgin/gtkconv.c:2960
 msgid "/Conversation/_Get Info"
 msgstr "/廩���/�廢� ���廣"
 
-#: ../pidgin/gtkconv.c:2962
+#: ../pidgin/gtkconv.c:2953
 msgid "/Conversation/In_vite..."
 msgstr "/廩���/��_��..."
 
-#: ../pidgin/gtkconv.c:2964
+#: ../pidgin/gtkconv.c:2955
 msgid "/Conversation/M_ore"
 msgstr "/廩���/_廣��"
 
-#: ../pidgin/gtkconv.c:2968
+#: ../pidgin/gtkconv.c:2959
 msgid "/Conversation/Al_ias..."
 msgstr "/廩���/�_����..."
 
-#: ../pidgin/gtkconv.c:2970
+#: ../pidgin/gtkconv.c:2961
 msgid "/Conversation/_Block..."
 msgstr "/廩���/�廖�_�..."
 
-#: ../pidgin/gtkconv.c:2972
+#: ../pidgin/gtkconv.c:2963
 msgid "/Conversation/_Unblock..."
 msgstr "/廩���/�廖廨 �廖�_��..."
 
-#: ../pidgin/gtkconv.c:2974
+#: ../pidgin/gtkconv.c:2965
 msgid "/Conversation/_Add..."
 msgstr "/廩���/��廖_廝"
 
-#: ../pidgin/gtkconv.c:2976
+#: ../pidgin/gtkconv.c:2967
 msgid "/Conversation/_Remove..."
 msgstr "/廩���/�廖_廨..."
 
-#: ../pidgin/gtkconv.c:2981
+#: ../pidgin/gtkconv.c:2972
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/廩���/���廖 ���廡..."
 
-#: ../pidgin/gtkconv.c:2983
+#: ../pidgin/gtkconv.c:2974
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/廩���/���廖 廬����..."
 
-#: ../pidgin/gtkconv.c:2989
+#: ../pidgin/gtkconv.c:2980
 msgid "/Conversation/_Close"
 msgstr "/廩���/_廖��廨"
 
 #. Options
-#: ../pidgin/gtkconv.c:2993
+#: ../pidgin/gtkconv.c:2984
 msgid "/_Options"
 msgstr "/_�廚廩廨���廬"
 
-#: ../pidgin/gtkconv.c:2994
+#: ../pidgin/gtkconv.c:2985
 msgid "/Options/Enable _Logging"
 msgstr "/�廚廩廨���廬/�廚廩廨 廨�廩��"
 
-#: ../pidgin/gtkconv.c:2995
+#: ../pidgin/gtkconv.c:2986
 msgid "/Options/Enable _Sounds"
 msgstr "/�廚廩廨���廬/�廚廩廨 _廢�����"
 
-#: ../pidgin/gtkconv.c:2997
+#: ../pidgin/gtkconv.c:2988
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/�廚廩廨���廬/_�廢� 廖廨���� 廩� ��� �廚�廨���"
 
-#: ../pidgin/gtkconv.c:2998
+#: ../pidgin/gtkconv.c:2989
 msgid "/Options/Show Ti_mestamps"
 msgstr "/�廚廩廨���廬/���廣 _��廬�廬 ��� 廣� 廩���廬"
 
-#: ../pidgin/gtkconv.c:3125
+#: ../pidgin/gtkconv.c:3116
 msgid "/Conversation/More"
 msgstr "/廩���/廣��"
 
-#: ../pidgin/gtkconv.c:3181
+#: ../pidgin/gtkconv.c:3172
 msgid "/Options"
 msgstr "/_�廚廩廨���廬"
 
@@ -14684,79 +14730,80 @@
 #. 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:3216 ../pidgin/gtkconv.c:3248
+#: ../pidgin/gtkconv.c:3207
+#: ../pidgin/gtkconv.c:3239
 msgid "/Conversation"
 msgstr "/廩���"
 
-#: ../pidgin/gtkconv.c:3256
+#: ../pidgin/gtkconv.c:3247
 msgid "/Conversation/View Log"
 msgstr "/廩���/�廢� ���� 廩���廬"
 
-#: ../pidgin/gtkconv.c:3262
+#: ../pidgin/gtkconv.c:3253
 msgid "/Conversation/Send File..."
 msgstr "/廩���/廩�� 廡��廛..."
 
-#: ../pidgin/gtkconv.c:3266
+#: ../pidgin/gtkconv.c:3257
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/廩���/��廖廝 廚廣��廬 廬���� ���廨�廣� ��廩 廡廩廨..."
 
-#: ../pidgin/gtkconv.c:3272
+#: ../pidgin/gtkconv.c:3263
 msgid "/Conversation/Get Info"
 msgstr "/廩���/�廢� ���廣"
 
-#: ../pidgin/gtkconv.c:3276
+#: ../pidgin/gtkconv.c:3267
 msgid "/Conversation/Invite..."
 msgstr "/廩���/����..."
 
-#: ../pidgin/gtkconv.c:3282
+#: ../pidgin/gtkconv.c:3273
 msgid "/Conversation/Alias..."
 msgstr "/廩���/�����..."
 
-#: ../pidgin/gtkconv.c:3286
+#: ../pidgin/gtkconv.c:3277
 msgid "/Conversation/Block..."
 msgstr "/廩���/�廖��..."
 
-#: ../pidgin/gtkconv.c:3290
+#: ../pidgin/gtkconv.c:3281
 msgid "/Conversation/Unblock..."
 msgstr "/廩���/�廖廨 �廖���..."
 
-#: ../pidgin/gtkconv.c:3294
+#: ../pidgin/gtkconv.c:3285
 msgid "/Conversation/Add..."
 msgstr "/廩���/��廖廝..."
 
-#: ../pidgin/gtkconv.c:3298
+#: ../pidgin/gtkconv.c:3289
 msgid "/Conversation/Remove..."
 msgstr "/廩���/�廖廨..."
 
-#: ../pidgin/gtkconv.c:3304
+#: ../pidgin/gtkconv.c:3295
 msgid "/Conversation/Insert Link..."
 msgstr "/廩���/���廖 ���廡..."
 
-#: ../pidgin/gtkconv.c:3308
+#: ../pidgin/gtkconv.c:3299
 msgid "/Conversation/Insert Image..."
 msgstr "/廩���/���廖 廬����..."
 
-#: ../pidgin/gtkconv.c:3314
+#: ../pidgin/gtkconv.c:3305
 msgid "/Options/Enable Logging"
 msgstr "/�廚廩廨���廬/�廚廩廨 廨�廩��"
 
-#: ../pidgin/gtkconv.c:3317
+#: ../pidgin/gtkconv.c:3308
 msgid "/Options/Enable Sounds"
 msgstr "/�廚廩廨���廬/�廚廩廨 廢�����"
 
-#: ../pidgin/gtkconv.c:3330
+#: ../pidgin/gtkconv.c:3321
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/�廚廩廨���廬/_�廢� 廖廨���� 廩� ��� �廚�廨���"
 
-#: ../pidgin/gtkconv.c:3333
+#: ../pidgin/gtkconv.c:3324
 msgid "/Options/Show Timestamps"
 msgstr "/�廚廩廨���廬/���廣 _��廬�廬 ��� 廣� 廩���廬"
 
-#: ../pidgin/gtkconv.c:3411
+#: ../pidgin/gtkconv.c:3402
 msgid "User is typing..."
 msgstr "��廩廬�廩 ��廬� �廨�廣..."
 
-#: ../pidgin/gtkconv.c:3481
+#: ../pidgin/gtkconv.c:3472
 #, c-format
 msgid ""
 "\n"
@@ -14766,95 +14813,100 @@
 "%s �廚廖�廡/� ��廡���"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3647 ../pidgin/gtkconv.c:8318
+#: ../pidgin/gtkconv.c:3638
+#: ../pidgin/gtkconv.c:8309
 msgid "S_end To"
 msgstr "廩�� ��"
 
-#: ../pidgin/gtkconv.c:4359
+#: ../pidgin/gtkconv.c:4350
 msgid "_Send"
 msgstr "廩_��"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4497
+#: ../pidgin/gtkconv.c:4486
 msgid "0 people in room"
 msgstr "0 ��廩�� ���廨 ��"
 
-#: ../pidgin/gtkconv.c:5796 ../pidgin/gtkconv.c:5917
+#: ../pidgin/gtkconv.c:5784
+#: ../pidgin/gtkconv.c:5905
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "��廩 %d ���廨 ��"
 msgstr[1] "%d ��廩�� ���廨 ��"
 
-#: ../pidgin/gtkconv.c:6544 ../pidgin/gtkstatusbox.c:679
+#: ../pidgin/gtkconv.c:6535
+#: ../pidgin/gtkstatusbox.c:679
 msgid "Typing"
 msgstr "�廡���/�"
 
-#: ../pidgin/gtkconv.c:6548
+#: ../pidgin/gtkconv.c:6539
 msgid "Stopped Typing"
 msgstr "�廚廖�廡/� ��廡���"
 
-#: ../pidgin/gtkconv.c:6551
+#: ../pidgin/gtkconv.c:6542
 msgid "Nick Said"
 msgstr "廩� ���廨"
 
-#: ../pidgin/gtkconv.c:6554 ../pidgin/gtkdocklet.c:686
+#: ../pidgin/gtkconv.c:6545
+#: ../pidgin/gtkdocklet.c:686
 msgid "Unread Messages"
 msgstr "���廣�廬 廩�� �廡廨��"
 
-#: ../pidgin/gtkconv.c:6560
+#: ../pidgin/gtkconv.c:6551
 msgid "New Event"
 msgstr "��廨�廣 ��廩"
 
-#: ../pidgin/gtkconv.c:7790
+#: ../pidgin/gtkconv.c:7781
 msgid "clear: Clears all conversation scrollbacks."
 msgstr "clear: �廡� �廬 廬��� ������-����廨 廩� �� �廩���廬."
 
-#: ../pidgin/gtkconv.c:7994
+#: ../pidgin/gtkconv.c:7985
 msgid "Confirm close"
 msgstr "�廩廨 廖��廨�"
 
-#: ../pidgin/gtkconv.c:8026
+#: ../pidgin/gtkconv.c:8017
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "�廩 �� ���廣�廬 廩�� �廡廨��. ��� �廨廢��� �廖��廨 �廬 �����?"
 
-#: ../pidgin/gtkconv.c:8659
+#: ../pidgin/gtkconv.c:8650
 msgid "Close other tabs"
 msgstr "廖��廨 �廬 廩�廨 ������"
 
-#: ../pidgin/gtkconv.c:8665
+#: ../pidgin/gtkconv.c:8656
 msgid "Close all tabs"
 msgstr "廖��廨 �廬 �� ������"
 
-#: ../pidgin/gtkconv.c:8673
+#: ../pidgin/gtkconv.c:8664
 msgid "Detach this tab"
 msgstr "�廬廡 ��� ��"
 
-#: ../pidgin/gtkconv.c:8679
+#: ../pidgin/gtkconv.c:8670
 msgid "Close this tab"
 msgstr "廖��廨 ��� ��"
 
-#: ../pidgin/gtkconv.c:9193
+#: ../pidgin/gtkconv.c:9184
 msgid "Close conversation"
 msgstr "廖��廨 ����"
 
-#: ../pidgin/gtkconv.c:9797
+#: ../pidgin/gtkconv.c:9788
 msgid "Last created window"
 msgstr "���� ��廨�� 廩��廢廨"
 
-#: ../pidgin/gtkconv.c:9799
+#: ../pidgin/gtkconv.c:9790
 msgid "Separate IM and Chat windows"
 msgstr "�廚廨� ��� �����廬 廩� ���廣�廬 �廢'����"
 
-#: ../pidgin/gtkconv.c:9801 ../pidgin/gtkprefs.c:1466
+#: ../pidgin/gtkconv.c:9792
+#: ../pidgin/gtkprefs.c:1466
 msgid "New window"
 msgstr "���� ��廩"
 
-#: ../pidgin/gtkconv.c:9803
+#: ../pidgin/gtkconv.c:9794
 msgid "By group"
 msgstr "�廚� 廡��廢�廬"
 
-#: ../pidgin/gtkconv.c:9805
+#: ../pidgin/gtkconv.c:9796
 msgid "By account"
 msgstr "�廚� �廩���"
 
@@ -14894,7 +14946,8 @@
 msgid "Level "
 msgstr "廨�� "
 
-#: ../pidgin/gtkdebug.c:822 ../pidgin/gtkdebug.c:828
+#: ../pidgin/gtkdebug.c:822
+#: ../pidgin/gtkdebug.c:828
 msgid "Select the debug filter level."
 msgstr "�廩 ����廨 �廬 廨�廬 ��廚�� ������."
 
@@ -14918,19 +14971,29 @@
 msgid "Fatal Error"
 msgstr "廩���� 廡����廬"
 
-#: ../pidgin/gtkdialogs.c:72 ../pidgin/gtkdialogs.c:118
+#: ../pidgin/gtkdialogs.c:72
+#: ../pidgin/gtkdialogs.c:119
 msgid "lead developer"
 msgstr "�廚廬� 廨�廩�"
 
-#: ../pidgin/gtkdialogs.c:73 ../pidgin/gtkdialogs.c:74
-#: ../pidgin/gtkdialogs.c:75 ../pidgin/gtkdialogs.c:76
-#: ../pidgin/gtkdialogs.c:77 ../pidgin/gtkdialogs.c:78
-#: ../pidgin/gtkdialogs.c:79 ../pidgin/gtkdialogs.c:80
-#: ../pidgin/gtkdialogs.c:81 ../pidgin/gtkdialogs.c:82
-#: ../pidgin/gtkdialogs.c:83 ../pidgin/gtkdialogs.c:84
-#: ../pidgin/gtkdialogs.c:85 ../pidgin/gtkdialogs.c:86
-#: ../pidgin/gtkdialogs.c:87 ../pidgin/gtkdialogs.c:90
-#: ../pidgin/gtkdialogs.c:92 ../pidgin/gtkdialogs.c:93
+#: ../pidgin/gtkdialogs.c:73
+#: ../pidgin/gtkdialogs.c:74
+#: ../pidgin/gtkdialogs.c:75
+#: ../pidgin/gtkdialogs.c:76
+#: ../pidgin/gtkdialogs.c:77
+#: ../pidgin/gtkdialogs.c:78
+#: ../pidgin/gtkdialogs.c:79
+#: ../pidgin/gtkdialogs.c:80
+#: ../pidgin/gtkdialogs.c:81
+#: ../pidgin/gtkdialogs.c:82
+#: ../pidgin/gtkdialogs.c:83
+#: ../pidgin/gtkdialogs.c:84
+#: ../pidgin/gtkdialogs.c:85
+#: ../pidgin/gtkdialogs.c:86
+#: ../pidgin/gtkdialogs.c:87
+#: ../pidgin/gtkdialogs.c:90
+#: ../pidgin/gtkdialogs.c:92
+#: ../pidgin/gtkdialogs.c:93
 #: ../pidgin/gtkdialogs.c:94
 msgid "developer"
 msgstr "�廚廬�"
@@ -14943,36 +15006,38 @@
 msgid "support/QA"
 msgstr "廬����/QA"
 
-#: ../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 "廬�廨� ���廨/QA"
 
-#: ../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 "�廬��廬 �廡�廨�"
 
@@ -14980,7 +15045,8 @@
 msgid "Afrikaans"
 msgstr "�廚廨�廡��廖"
 
-#: ../pidgin/gtkdialogs.c:135 ../pidgin/gtkdialogs.c:229
+#: ../pidgin/gtkdialogs.c:135
+#: ../pidgin/gtkdialogs.c:230
 msgid "Arabic"
 msgstr "廣廨��廬"
 
@@ -14988,13 +15054,16 @@
 msgid "Belarusian Latin"
 msgstr "�����廬 ���廨�廖�廬"
 
-#: ../pidgin/gtkdialogs.c:137 ../pidgin/gtkdialogs.c:138
-#: ../pidgin/gtkdialogs.c:230
+#: ../pidgin/gtkdialogs.c:137
+#: ../pidgin/gtkdialogs.c:138
+#: ../pidgin/gtkdialogs.c:231
 msgid "Bulgarian"
 msgstr "����廨�廬"
 
-#: ../pidgin/gtkdialogs.c:139 ../pidgin/gtkdialogs.c:140
-#: ../pidgin/gtkdialogs.c:141 ../pidgin/gtkdialogs.c:142
+#: ../pidgin/gtkdialogs.c:139
+#: ../pidgin/gtkdialogs.c:140
+#: ../pidgin/gtkdialogs.c:141
+#: ../pidgin/gtkdialogs.c:142
 msgid "Bengali"
 msgstr "������廬"
 
@@ -15002,34 +15071,41 @@
 msgid "Bosnian"
 msgstr "��廖��廬"
 
-#: ../pidgin/gtkdialogs.c:144 ../pidgin/gtkdialogs.c:231
+#: ../pidgin/gtkdialogs.c:144
 #: ../pidgin/gtkdialogs.c:232
+#: ../pidgin/gtkdialogs.c:233
 msgid "Catalan"
 msgstr "廡����廬"
 
-#: ../pidgin/gtkdialogs.c:145 ../pidgin/gtkdialogs.c:146
+#: ../pidgin/gtkdialogs.c:145
+#: ../pidgin/gtkdialogs.c:146
 msgid "Valencian-Catalan"
 msgstr "廡����廬-����廖�廬"
 
-#: ../pidgin/gtkdialogs.c:147 ../pidgin/gtkdialogs.c:233
+#: ../pidgin/gtkdialogs.c:147
+#: ../pidgin/gtkdialogs.c:234
 msgid "Czech"
 msgstr "廢'��廬"
 
-#: ../pidgin/gtkdialogs.c:148 ../pidgin/gtkdialogs.c:149
+#: ../pidgin/gtkdialogs.c:148
+#: ../pidgin/gtkdialogs.c:149
 msgid "Danish"
 msgstr "���廬"
 
-#: ../pidgin/gtkdialogs.c:150 ../pidgin/gtkdialogs.c:151
-#: ../pidgin/gtkdialogs.c:234
+#: ../pidgin/gtkdialogs.c:150
+#: ../pidgin/gtkdialogs.c:151
+#: ../pidgin/gtkdialogs.c:235
 msgid "German"
 msgstr "�廨���廬"
 
-#: ../pidgin/gtkdialogs.c:152 ../pidgin/gtkdialogs.c:153
+#: ../pidgin/gtkdialogs.c:152
+#: ../pidgin/gtkdialogs.c:153
 #: ../pidgin/gtkdialogs.c:154
 msgid "Dzongkha"
 msgstr "廢���廡�"
 
-#: ../pidgin/gtkdialogs.c:155 ../pidgin/gtkdialogs.c:156
+#: ../pidgin/gtkdialogs.c:155
+#: ../pidgin/gtkdialogs.c:156
 msgid "Greek"
 msgstr "�����廬"
 
@@ -15049,9 +15125,11 @@
 msgid "Esperanto"
 msgstr "�廖廚廨��"
 
-#: ../pidgin/gtkdialogs.c:161 ../pidgin/gtkdialogs.c:235
-#: ../pidgin/gtkdialogs.c:236 ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:161
+#: ../pidgin/gtkdialogs.c:236
+#: ../pidgin/gtkdialogs.c:237
 #: ../pidgin/gtkdialogs.c:238
+#: ../pidgin/gtkdialogs.c:239
 msgid "Spanish"
 msgstr "廖廚廨��廬"
 
@@ -15059,32 +15137,39 @@
 msgid "Estonian"
 msgstr "�廖����廬"
 
-#: ../pidgin/gtkdialogs.c:163 ../pidgin/gtkdialogs.c:164
+#: ../pidgin/gtkdialogs.c:163
+#: ../pidgin/gtkdialogs.c:164
 msgid "Euskera(Basque)"
 msgstr "���廖廡廨�(�廖廡�廬)"
 
-#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:166
+#: ../pidgin/gtkdialogs.c:165
+#: ../pidgin/gtkdialogs.c:166
 #: ../pidgin/gtkdialogs.c:167
 msgid "Persian"
 msgstr "廚廨廖�廬"
 
-#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:239
+#: ../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: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:170
+#: ../pidgin/gtkdialogs.c:171
+#: ../pidgin/gtkdialogs.c:246
 msgid "Galician"
 msgstr "���廖����廬"
 
-#: ../pidgin/gtkdialogs.c:172 ../pidgin/gtkdialogs.c:173
+#: ../pidgin/gtkdialogs.c:172
+#: ../pidgin/gtkdialogs.c:173
 msgid "Gujarati"
 msgstr "���'廨���廬"
 
@@ -15092,7 +15177,8 @@
 msgid "Gujarati Language Team"
 msgstr "廡��廢廬 �廩廚� ���'廨���廬"
 
-#: ../pidgin/gtkdialogs.c:174 ../pidgin/gtkdialogs.c:246
+#: ../pidgin/gtkdialogs.c:174
+#: ../pidgin/gtkdialogs.c:247
 msgid "Hebrew"
 msgstr "廣�廨�廬"
 
@@ -15100,7 +15186,8 @@
 msgid "Hindi"
 msgstr "�����廬"
 
-#: ../pidgin/gtkdialogs.c:176 ../pidgin/gtkdialogs.c:247
+#: ../pidgin/gtkdialogs.c:176
+#: ../pidgin/gtkdialogs.c:248
 msgid "Hungarian"
 msgstr "����廨�廬"
 
@@ -15108,16 +15195,20 @@
 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 "���廨���廬 (�廨�����廬)"
 
@@ -15133,12 +15224,14 @@
 msgid "Kannada Translation team"
 msgstr "廡��廢廬 �廬廨��� �廡�����廬"
 
-#: ../pidgin/gtkdialogs.c:182 ../pidgin/gtkdialogs.c:253
+#: ../pidgin/gtkdialogs.c:182
 #: ../pidgin/gtkdialogs.c:254
+#: ../pidgin/gtkdialogs.c:255
 msgid "Korean"
 msgstr "廡�廨����廬"
 
-#: ../pidgin/gtkdialogs.c:183 ../pidgin/gtkdialogs.c:184
+#: ../pidgin/gtkdialogs.c:183
+#: ../pidgin/gtkdialogs.c:184
 #: ../pidgin/gtkdialogs.c:185
 msgid "Kurdish"
 msgstr "��廨��廬"
@@ -15147,18 +15240,22 @@
 msgid "Lao"
 msgstr "���廬"
 
-#: ../pidgin/gtkdialogs.c:187 ../pidgin/gtkdialogs.c:255
+#: ../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:188
+#: ../pidgin/gtkdialogs.c:189
+#: ../pidgin/gtkdialogs.c:190
+#: ../pidgin/gtkdialogs.c:258
 msgid "Macedonian"
 msgstr "�廡����廬"
 
-#: ../pidgin/gtkdialogs.c:191 ../pidgin/gtkdialogs.c:258
+#: ../pidgin/gtkdialogs.c:191
 #: ../pidgin/gtkdialogs.c:259
+#: ../pidgin/gtkdialogs.c:260
 msgid "Bokm奪l Norwegian"
 msgstr "��廨���廬 廖廚廨�廬�廬"
 
@@ -15178,8 +15275,10 @@
 msgid "Punjabi"
 msgstr "廚���'���"
 
-#: ../pidgin/gtkdialogs.c:196 ../pidgin/gtkdialogs.c:197
-#: ../pidgin/gtkdialogs.c:198 ../pidgin/gtkdialogs.c:260
+#: ../pidgin/gtkdialogs.c:196
+#: ../pidgin/gtkdialogs.c:197
+#: ../pidgin/gtkdialogs.c:198
+#: ../pidgin/gtkdialogs.c:261
 msgid "Polish"
 msgstr "廚����廬"
 
@@ -15199,18 +15298,22 @@
 msgid "Romanian"
 msgstr "廨����廬"
 
-#: ../pidgin/gtkdialogs.c:203 ../pidgin/gtkdialogs.c:261
+#: ../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:204
+#: ../pidgin/gtkdialogs.c:205
+#: ../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 "廖�����廬"
 
@@ -15218,260 +15321,236 @@
 msgid "Albanian"
 msgstr "�����廬"
 
-#: ../pidgin/gtkdialogs.c:208 ../pidgin/gtkdialogs.c:209
-#: ../pidgin/gtkdialogs.c:267 ../pidgin/gtkdialogs.c:268
+#: ../pidgin/gtkdialogs.c:208
+#: ../pidgin/gtkdialogs.c:209
+#: ../pidgin/gtkdialogs.c:268
+#: ../pidgin/gtkdialogs.c:269
 msgid "Serbian"
 msgstr "廖廨��廬"
 
-#: ../pidgin/gtkdialogs.c:210 ../pidgin/gtkdialogs.c:269
+#: ../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 "廢��廬 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: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
-#, c-format
-msgid ""
-"%s is a graphical modular messaging client based on libpurple which is "
-"capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "
-"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, and "
-"QQ all at once.  It is written using GTK+.<BR><BR>You may modify and "
-"redistribute the program under the terms of the GPL (version 2 or later).  A "
-"copy of the GPL is contained in the 'COPYING' file distributed with %s.  %s "
-"is copyrighted by its contributors.  See the 'COPYRIGHT' file for the "
-"complete list of contributors.  We provide no warranty for this program."
-"<BR><BR>"
-msgstr ""
-"%s ���� 廬���廬 廩���廬 ���廣�廬 ������廬 �廨廚�廬 �����廨�廬 ���廖廖廬 libpurple �廩廨 ��廢廣 "
-"����廨�� �� AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novel "
-"GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, QQ ������ "
-"��- ����廬. �廬���� ��廬�� �廣�廨廬 GTK+.<BR><BR>��廬廨 �廣廨�� 廩������ ���廚�廛 �廬 "
-"�廬���� 廬�廬 �����廬 廨�廩��� �GPL (�廨廖� 2 �����). ��廬廨). �廣廬廡 廩� �-GPL ���� �廬�� "
-"�廡��廛 'COPYING' ���廚廛 廣� %s. %s ��� 廬�廬 �����廬 ��廚廬��� ��廬�廨��� �廚�廬��. 廨�� "
-"�廬 �廡��廛 'COPYRIGHT' �廨廩��� ���� 廩� �廬�廨���. ����� �廖廚廡�� 廩�� ��廨��廬 �廬���� "
-"��.<BR><BR>"
-
-#: ../pidgin/gtkdialogs.c:412
+#: ../pidgin/gtkdialogs.c:395
+#, c-format
+msgid "%s is a graphical modular messaging client based on libpurple which is capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, and QQ all at once.  It is written using GTK+.<BR><BR>You may modify and redistribute the program under the terms of the GPL (version 2 or later).  A copy of the GPL is contained in the 'COPYING' file distributed with %s.  %s is copyrighted by its contributors.  See the 'COPYRIGHT' file for the complete list of contributors.  We provide no warranty for this program.<BR><BR>"
+msgstr "%s ���� 廬���廬 廩���廬 ���廣�廬 ������廬 �廨廚�廬 �����廨�廬 ���廖廖廬 libpurple �廩廨 ��廢廣 ����廨�� �� AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novel GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, QQ ������ ��- ����廬. �廬���� ��廬�� �廣�廨廬 GTK+.<BR><BR>��廬廨 �廣廨�� 廩������ ���廚�廛 �廬 �廬���� 廬�廬 �����廬 廨�廩��� �GPL (�廨廖� 2 �����). ��廬廨). �廣廬廡 廩� �-GPL ���� �廬�� �廡��廛 'COPYING' ���廚廛 廣� %s. %s ��� 廬�廬 �����廬 ��廚廬��� ��廬�廨��� �廚�廬��. 廨�� �廬 �廡��廛 'COPYRIGHT' �廨廩��� ���� 廩� �廬�廨���. ����� �廖廚廡�� 廩�� ��廨��廬 �廬���� ��.<BR><BR>"
+
+#: ../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
-msgid ""
-"Please enter the screen name or alias of the person whose info you would "
-"like to view."
+#: ../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
-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:993
+msgid "Please enter the screen name or alias of the person whose log you would like to view."
+msgstr "�廩 ����� �廬 廩� ��廩廬�廩 �� ������ 廩� ���� 廩�廨廢���� �廡廨�� ���� �廩���廬 ��廬�."
+
+#: ../pidgin/gtkdialogs.c:1013
 msgid "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
-#, c-format
-msgid ""
-"You are about to remove the contact containing %s and %d other buddy from "
-"your buddy list.  Do you want to continue?"
-msgid_plural ""
-"You are about to remove the contact containing %s and %d other buddies from "
-"your buddy list.  Do you want to continue?"
-msgstr[0] ""
-"��� �廨廢��� ���廩�� ���廖�廨 �廬 ��廩 �廡廩廨 ����� �廬 %s �廣�� %d ��廩 廡廩廨 ��廨 �廬��� "
-"�廬�� 廨廩��廬 ��廩� �廡廩廨 廩��?"
-msgstr[1] ""
-"��� �廨廢��� ���廩�� ���廖�廨 �廬 ��廩 �廡廩廨 ����� �廬 %s �廣�� %d ��廩� 廡廩廨 ��廨�� "
-"�廬��� �廬�� 廨廩��廬 ��廩� �廡廩廨 廩��?"
-
-#: ../pidgin/gtkdialogs.c:1106
+#: ../pidgin/gtkdialogs.c:1099
+#, c-format
+msgid "You are about to remove the contact containing %s and %d other buddy from your buddy list.  Do you want to continue?"
+msgid_plural "You are about to remove the contact containing %s and %d other buddies from your buddy list.  Do you want to continue?"
+msgstr[0] "��� �廨廢��� ���廩�� ���廖�廨 �廬 ��廩 �廡廩廨 ����� �廬 %s �廣�� %d ��廩 廡廩廨 ��廨 �廬��� �廬�� 廨廩��廬 ��廩� �廡廩廨 廩��?"
+msgstr[1] "��� �廨廢��� ���廩�� ���廖�廨 �廬 ��廩 �廡廩廨 ����� �廬 %s �廣�� %d ��廩� 廡廩廨 ��廨�� �廬��� �廬�� 廨廩��廬 ��廩� �廡廩廨 廩��?"
+
+#: ../pidgin/gtkdialogs.c:1107
 msgid "Remove Contact"
 msgstr "�廖廨 ��廩 廡廩廨"
 
-#: ../pidgin/gtkdialogs.c:1109
+#: ../pidgin/gtkdialogs.c:1110
 msgid "_Remove Contact"
 msgstr "�_廖廨 ��廩 廡廩廨"
 
-#: ../pidgin/gtkdialogs.c:1140
-#, c-format
-msgid ""
-"You are about to merge the group called %s into the group called %s. Do you "
-"want to continue?"
+#: ../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
-#, c-format
-msgid ""
-"You are about to remove the group %s and all its members from your buddy "
-"list.  Do you want to continue?"
+#: ../pidgin/gtkdialogs.c:1201
+#, c-format
+msgid "You are about to remove the group %s and all its members from your buddy list.  Do you want to continue?"
 msgstr "��� �廨廢��� ���廩�� ���廖�廨 �廬 �廡��廢� %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
-#, c-format
-msgid ""
-"You are about to remove %s from your buddy list.  Do you want to continue?"
+#: ../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
-#, c-format
-msgid ""
-"You are about to remove the chat %s from your buddy list.  Do you want to "
-"continue?"
+#: ../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 "�廖_廨 廩���"
 
@@ -15580,7 +15659,8 @@
 msgstr "廚廨�� �廣�廨�廬 廡�廢��"
 
 #. Pause button
-#: ../pidgin/gtkft.c:818 ../pidgin/pidginstock.c:95
+#: ../pidgin/gtkft.c:818
+#: ../pidgin/pidginstock.c:95
 msgid "_Pause"
 msgstr "�廩����"
 
@@ -15589,75 +15669,79 @@
 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"
@@ -15667,7 +15751,7 @@
 "\n"
 "���� 廩�� �廖�� PNG."
 
-#: ../pidgin/gtkimhtml.c:3424
+#: ../pidgin/gtkimhtml.c:3428
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -15677,7 +15761,7 @@
 "\n"
 "���� 廩�� �廖�� PNG."
 
-#: ../pidgin/gtkimhtml.c:3453
+#: ../pidgin/gtkimhtml.c:3457
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -15688,7 +15772,7 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3456
+#: ../pidgin/gtkimhtml.c:3460
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -15699,11 +15783,12 @@
 "\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 "廩��廨 _廬����..."
 
@@ -15728,20 +15813,20 @@
 msgstr "_廬���廨"
 
 #: ../pidgin/gtkimhtmltoolbar.c:424
-msgid ""
-"Please enter the URL and description of the link that you want to insert. "
-"The description is optional."
+msgid "Please enter the URL and description of the link that you want to insert. The description is optional."
 msgstr "�廩 ����� �廬��廬 �廬���廨 廣��廨 �廡�廩�廨 �廨廢��� �����廖. �� ���� ����� 廬���廨."
 
 #: ../pidgin/gtkimhtmltoolbar.c:428
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "�廩 ����� �廬 �廬��廬 �廡�廩�廨 廩�廨廢��� �����廖."
 
-#: ../pidgin/gtkimhtmltoolbar.c:433 ../pidgin/gtkimhtmltoolbar.c:1104
+#: ../pidgin/gtkimhtmltoolbar.c:433
+#: ../pidgin/gtkimhtmltoolbar.c:1104
 msgid "Insert Link"
 msgstr "��廖廚廬 廡�廩�廨"
 
-#: ../pidgin/gtkimhtmltoolbar.c:437 ../pidgin/gtkimhtmltoolbar.c:1265
+#: ../pidgin/gtkimhtmltoolbar.c:437
+#: ../pidgin/gtkimhtmltoolbar.c:1265
 msgid "_Insert"
 msgstr "�_��廖"
 
@@ -15750,7 +15835,8 @@
 msgid "Failed to store image: %s\n"
 msgstr "��廩��� �廣廬 廩��廨廬 �廬����: %s\n"
 
-#: ../pidgin/gtkimhtmltoolbar.c:544 ../pidgin/gtkimhtmltoolbar.c:554
+#: ../pidgin/gtkimhtmltoolbar.c:544
+#: ../pidgin/gtkimhtmltoolbar.c:554
 msgid "Insert Image"
 msgstr "���廖 廬����"
 
@@ -15762,7 +15848,8 @@
 msgid "This theme has no available smileys."
 msgstr "�廖� ������� �� ��� �������."
 
-#: ../pidgin/gtkimhtmltoolbar.c:848 ../pidgin/gtkimhtmltoolbar.c:1222
+#: ../pidgin/gtkimhtmltoolbar.c:848
+#: ../pidgin/gtkimhtmltoolbar.c:1222
 msgid "_Font"
 msgstr "��廚�"
 
@@ -15774,15 +15861,18 @@
 msgid "Ungroup Items"
 msgstr "�廚廨� 廚廨��� 廡��廢�"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1090 ../pidgin/plugins/convcolors.c:342
+#: ../pidgin/gtkimhtmltoolbar.c:1090
+#: ../pidgin/plugins/convcolors.c:342
 msgid "Bold"
 msgstr "����廩"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1091 ../pidgin/plugins/convcolors.c:351
+#: ../pidgin/gtkimhtmltoolbar.c:1091
+#: ../pidgin/plugins/convcolors.c:351
 msgid "Italic"
 msgstr "����"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1092 ../pidgin/plugins/convcolors.c:360
+#: ../pidgin/gtkimhtmltoolbar.c:1092
+#: ../pidgin/plugins/convcolors.c:360
 msgid "Underline"
 msgstr "廡� 廬�廬��"
 
@@ -15891,23 +15981,17 @@
 
 #: ../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?"
+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:303
 #, c-format
-msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+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:308
 #, c-format
-msgid ""
-"Are you sure you want to permanently delete the system log which started at %"
-"s?"
+msgid "Are you sure you want to permanently delete the system log which started at %s?"
 msgstr "��� �廨廢��� ����廡 �廬 廨�廩�� ���� ��廣廨�廬 廩��� �- %s?"
 
 #: ../pidgin/gtklog.c:323
@@ -15933,12 +16017,12 @@
 msgid "_Browse logs folder"
 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:401
+#: ../pidgin/gtkmain.c:388
 #, c-format
 msgid ""
 "%s %s\n"
@@ -15949,8 +16033,9 @@
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
-"  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
-"                      account(s) to use, separated by commas)\n"
+"  -l, --login[=NAME]  enable specified account(s) (optional argument NAME\n"
+"                      specifies account(s) to use, separated by commas.\n"
+"                      Without this only the first account will be enabled).\n"
 "  --display=DISPLAY   X display to use\n"
 "  -v, --version       display the current version and exit\n"
 msgstr ""
@@ -15964,10 +16049,10 @@
 "  -n, --nologin       �� 廬廬��廨 �������廬\n"
 "  -l, --login[=廩��廬]  ����廖 �������廬 )�廚廩廨�廬 �廬廬 廩��廬 �廩����廬 ���廨,\n"
 "                      ���� �� 廩� 廢廨�� ����廬 廚廖�廡)\n"
-"  --display=DISPLAY   �廖廚廨 �廬廢��� ��廩廬�廩 �� ������廬 X  -v, --version       "
-"�廢� �廬 ���廨廖�廩� �廬���� �廢�\n"
-
-#: ../pidgin/gtkmain.c:413
+"  --display=DISPLAY   �廖廚廨 �廬廢��� ��廩廬�廩 �� ������廬 X\n"
+"  -v, --version       �廢� �廬 ���廨廖�廩� �廬���� �廢�\n"
+
+#: ../pidgin/gtkmain.c:401
 #, c-format
 msgid ""
 "%s %s\n"
@@ -15978,8 +16063,9 @@
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
-"  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
-"                      account(s) to use, separated by commas)\n"
+"  -l, --login[=NAME]  enable specified account(s) (optional argument NAME\n"
+"                      specifies account(s) to use, separated by commas.\n"
+"                      Without this only the first account will be enabled).\n"
 "  -v, --version       display the current version and exit\n"
 msgstr ""
 "%s %s\n"
@@ -15992,11 +16078,10 @@
 "  -n, --nologin       �� 廬廬��廨 �������廬\n"
 "  -l, --login[=廩��廬]  ����廖 �������廬 )�廚廩廨�廬 �廬廬 廩��廬 �廩����廬 ���廨,\n"
 "                      ���� �� 廩� 廢廨�� ����廬 廚廖�廡)\n"
-"  --display=DISPLAY   �廖廚廨 �廬廢��� ��廩廬�廩 �� ������廬 X  -v, --version       "
-"�廢� �廬 ���廨廖�廩� �廬���� �廢�\n"
+"  --display=DISPLAY   �廖廚廨 �廬廢��� ��廩廬�廩 �� ������廬 X\n"
 "  -v, --version       �廢� �廬 ��廨廖� 廩� �廬���� �廢�\n"
 
-#: ../pidgin/gtkmain.c:540
+#: ../pidgin/gtkmain.c:531
 #, c-format
 msgid ""
 "%s %s has segfaulted and attempted to dump a core file.\n"
@@ -16023,8 +16108,7 @@
 "�� ��廚廩廨�廬� ��廨�� ��廚��� �廡廨�廬 廩��, ��� ���廣 廣� �� ��廚廬��� �廨�:\n"
 "%ssimpleticket/\n"
 "\n"
-"�廩 �廚廨� ����廡 �� 廣廩�廬 ���� ��廚���, ��廩��� �廬 ���廣�廬 �-backtrace ��廡��廛 "
-"core.\n"
+"�廩 �廚廨� ����廡 �� 廣廩�廬 ���� ��廚���, ��廩��� �廬 ���廣�廬 �-backtrace ��廡��廛 core.\n"
 "�� ���� ���廣/廬 ���廢�� �廬 �-backtrace, ��� 廡廨� �廬 ���廨��廬 �:\n"
 "%swiki/GetABacktrace\n"
 "\n"
@@ -16034,7 +16118,8 @@
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../pidgin/gtkmain.c:731 ../pidgin/pidgin.h:51
+#: ../pidgin/gtkmain.c:725
+#: ../pidgin/pidgin.h:51
 msgid "Pidgin"
 msgstr "廚���'��"
 
@@ -16065,44 +16150,44 @@
 msgid "The browser command \"%s\" is invalid."
 msgstr "�廚廡��� \"%s\" ��廚�廚�, ���� 廬廡廚�."
 
-#: ../pidgin/gtknotify.c:1010 ../pidgin/gtknotify.c:1022
-#: ../pidgin/gtknotify.c:1035 ../pidgin/gtknotify.c:1172
+#: ../pidgin/gtknotify.c:1010
+#: ../pidgin/gtknotify.c:1022
+#: ../pidgin/gtknotify.c:1035
+#: ../pidgin/gtknotify.c:1172
 msgid "Unable to open URL"
 msgstr "URL�� ��廬� �廚廬�� �廬 �-"
 
-#: ../pidgin/gtknotify.c:1020 ../pidgin/gtknotify.c:1033
+#: ../pidgin/gtknotify.c:1020
+#: ../pidgin/gtknotify.c:1033
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "廩���� ��廚廣�廬 �廚廡��� \"%s\": %s"
 
 #: ../pidgin/gtknotify.c:1173
-msgid ""
-"The 'Manual' browser command has been chosen, but no command has been set."
+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
-msgid "Multiple plugins will be unloaded."
-msgstr "廬�廖廚�� �廨���� ��廚廨廡� �� ����廨��."
-
 #: ../pidgin/gtkplugin.c:289
+msgid "Multiple plugins will be unloaded."
+msgstr "廬�廖廚�� �廨���� ��廚廨廡� �� ����廨��."
+
+#: ../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
-msgid ""
-"The plugin could not be unloaded now, but will be disabled at the next "
-"startup."
+#: ../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"
@@ -16113,7 +16198,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"
@@ -16124,11 +16209,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>"
 
@@ -16238,12 +16327,8 @@
 msgstr "�廬廡� 廣�廢��"
 
 #: ../pidgin/gtkprefs.c:646
-msgid ""
-"Select a smiley theme that you would like to use from the list below. New "
-"themes can be installed by dragging and dropping them onto the theme list."
-msgstr ""
-"��廨 廣廨�廬 ������� �廨廩��� ����. 廣廨��廬 ��廩�廬 ��廬� ��廬廡�� 廣\"� �廨�廨廬� 廣� 廨廩��廬 "
-"�廣廨��廬."
+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."
+msgstr "��廨 廣廨�廬 ������� �廨廩��� ����. 廣廨��廬 ��廩�廬 ��廬� ��廬廡�� 廣\"� �廨�廨廬� 廣� 廨廩��廬 �廣廨��廬."
 
 #: ../pidgin/gtkprefs.c:681
 msgid "Icon"
@@ -16269,7 +16354,8 @@
 msgid "_Hide new IM conversations:"
 msgstr "�_廖廬廨 廩���廬 ��廩�廬"
 
-#: ../pidgin/gtkprefs.c:857 ../pidgin/gtkprefs.c:1965
+#: ../pidgin/gtkprefs.c:857
+#: ../pidgin/gtkprefs.c:1965
 msgid "When away"
 msgstr "��廩廨 �廨��廡"
 
@@ -16375,12 +16461,8 @@
 msgstr "廚�廨�� �廨�廨廬 �����"
 
 #: ../pidgin/gtkprefs.c:1010
-msgid ""
-"This is how your outgoing message text will appear when you use protocols "
-"that support formatting."
-msgstr ""
-"��� ��廨�� ��廡廖� 廩� ���廣�廬 ��廢��廬 ��廩廨 廬廩廬�廩/� �廚廨���廡���� 廩廬����� �廚�廨��� "
-"�廡廖�."
+msgid "This is how your outgoing message text will appear when you use protocols that support formatting."
+msgstr "��� ��廨�� ��廡廖� 廩� ���廣�廬 ��廢��廬 ��廩廨 廬廩廬�廩/� �廚廨���廡���� 廩廬����� �廚�廨��� �廡廖�."
 
 #: ../pidgin/gtkprefs.c:1070
 msgid "Cannot start proxy configuration program."
@@ -16727,7 +16809,8 @@
 msgid "Remove Al_l"
 msgstr "�廖廨 �_��"
 
-#: ../pidgin/gtkprivacy.c:503 ../pidgin/gtkprivacy.c:520
+#: ../pidgin/gtkprivacy.c:503
+#: ../pidgin/gtkprivacy.c:520
 msgid "Permit User"
 msgstr "�廚廩廨 ��廩廬�廩"
 
@@ -16739,7 +16822,8 @@
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr "�廩 ����� �廬 廩� ��廩廬�廩 廩�廨廢��� ��廚廩廨 ��廢�廨 廡廩廨 ��廬�."
 
-#: ../pidgin/gtkprivacy.c:508 ../pidgin/gtkprivacy.c:524
+#: ../pidgin/gtkprivacy.c:508
+#: ../pidgin/gtkprivacy.c:524
 msgid "_Permit"
 msgstr "�廨廩�"
 
@@ -16753,7 +16837,8 @@
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "��� �廬/� ����/� 廩�廨廢��� ��廚廩廨 �-%s ��廢�廨 ��廬� 廡廩廨?"
 
-#: ../pidgin/gtkprivacy.c:545 ../pidgin/gtkprivacy.c:559
+#: ../pidgin/gtkprivacy.c:545
+#: ../pidgin/gtkprivacy.c:559
 msgid "Block User"
 msgstr "�廖�� �廩廬�廩"
 
@@ -16795,7 +16880,8 @@
 msgid "Choose New Name"
 msgstr "��廨 廩� ��廩"
 
-#: ../pidgin/gtkrequest.c:1649 ../pidgin/gtkrequest.c:1663
+#: ../pidgin/gtkrequest.c:1649
+#: ../pidgin/gtkrequest.c:1663
 msgid "Select Folder..."
 msgstr "���廨廬 廬�廡��..."
 
@@ -16814,7 +16900,8 @@
 msgstr "��� �廬� ���� 廩�廨廢��� ����廡 �廬 ��廢��� �廩��廨�� 廩廖����?"
 
 #. Use button
-#: ../pidgin/gtksavedstatuses.c:616 ../pidgin/gtksavedstatuses.c:1229
+#: ../pidgin/gtksavedstatuses.c:616
+#: ../pidgin/gtksavedstatuses.c:1229
 msgid "_Use"
 msgstr "�廩_廬�廩"
 
@@ -16830,7 +16917,8 @@
 msgid "_Title:"
 msgstr "_廬��廨:"
 
-#: ../pidgin/gtksavedstatuses.c:1161 ../pidgin/gtksavedstatuses.c:1453
+#: ../pidgin/gtksavedstatuses.c:1161
+#: ../pidgin/gtksavedstatuses.c:1453
 msgid "_Status:"
 msgstr "_�廢�:"
 
@@ -16865,12 +16953,14 @@
 msgid "Google Talk"
 msgstr "廢'�� 廩� ����"
 
-#: ../pidgin/gtkutils.c:1450 ../pidgin/gtkutils.c:1473
+#: ../pidgin/gtkutils.c:1450
+#: ../pidgin/gtkutils.c:1473
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "�廨廣� �廩���� ���� �廣廬 ��廖��� �廣��廬 %s: %s"
 
-#: ../pidgin/gtkutils.c:1453 ../pidgin/gtkutils.c:1475
+#: ../pidgin/gtkutils.c:1453
+#: ../pidgin/gtkutils.c:1475
 msgid "Failed to load image"
 msgstr "��廩��� �廣廬 �廣��廬 廬����"
 
@@ -16881,33 +16971,31 @@
 
 #: ../pidgin/gtkutils.c:1550
 #, c-format
-msgid ""
-"%s cannot transfer a folder. You will need to send the files within "
-"individually."
+msgid "%s cannot transfer a folder. You will need to send the files within individually."
 msgstr "%s �� ���� ��廣��廨 廖廚廨��. 廬���廢/� �廩��� �廬 �廡�廢�� �廬�� �廖廚廨�� ���-���."
 
-#: ../pidgin/gtkutils.c:1584 ../pidgin/gtkutils.c:1596
+#: ../pidgin/gtkutils.c:1584
+#: ../pidgin/gtkutils.c:1596
 #: ../pidgin/gtkutils.c:1603
 msgid "You have dragged an image"
 msgstr "�廨廨廬 廬����"
 
 #: ../pidgin/gtkutils.c:1585
-msgid ""
-"You can send this image as a file transfer, embed it into this message, or "
-"use it as the buddy icon for this user."
-msgstr ""
-"��廬� �廩��� 廬���� �� �廡��廛 ��廣�廨, �廩�� ��廬� ����廣� ��, �� ��廩廬�廩 �� �廬�廨 廖�� "
-"廣��廨 ��廩 �廡廩廨 ���."
-
-#: ../pidgin/gtkutils.c:1591 ../pidgin/gtkutils.c:1611
+msgid "You can send this image as a file transfer, embed it into this message, or use it as the buddy icon for this user."
+msgstr "��廬� �廩��� 廬���� �� �廡��廛 ��廣�廨, �廩�� ��廬� ����廣� ��, �� ��廩廬�廩 �� �廬�廨 廖�� 廣��廨 ��廩 �廡廩廨 ���."
+
+#: ../pidgin/gtkutils.c:1591
+#: ../pidgin/gtkutils.c:1611
 msgid "Set as buddy icon"
 msgstr "廡�廣 ����廬 廖�� ��廩 �廡廩廨"
 
-#: ../pidgin/gtkutils.c:1592 ../pidgin/gtkutils.c:1612
+#: ../pidgin/gtkutils.c:1592
+#: ../pidgin/gtkutils.c:1612
 msgid "Send image file"
 msgstr "廩�� 廡��廛 廬����"
 
-#: ../pidgin/gtkutils.c:1593 ../pidgin/gtkutils.c:1612
+#: ../pidgin/gtkutils.c:1593
+#: ../pidgin/gtkutils.c:1612
 msgid "Insert in message"
 msgstr "���廖 �廬�� ����廣�"
 
@@ -16916,15 +17004,11 @@
 msgstr "��� �廨廢��� �廡��廣 �廬 �� ����廬 �廖�� 廩� ��廩 廡廩廨 ��?"
 
 #: ../pidgin/gtkutils.c:1604
-msgid ""
-"You can send this image as a file transfer, or use it as the buddy icon for "
-"this user."
+msgid "You can send this image as a file transfer, or use it as the buddy icon for this user."
 msgstr "��廬� �廩��� 廬���� �� �廡��廛 ��廣�廨, �� ��廩廬�廩 �� �廬�廨 廖�� 廣��廨 �廩廬�廩 ��."
 
 #: ../pidgin/gtkutils.c:1605
-msgid ""
-"You can insert this image into this message, or use it as the buddy icon for "
-"this user"
+msgid "You can insert this image into this message, or use it as the buddy icon for this user"
 msgstr "��廬� �����廖 廬���� �� �廬�� ����廣�, �� ��廩廬�廩 �� �廖�� ��廩 �廡廩廨 ���."
 
 #. I don't know if we really want to do anything here.  Most of the desktop item types are crap like
@@ -16937,12 +17021,8 @@
 msgstr "�� ��廬� �廩��� �廬 廡��廛 ��廚廣��"
 
 #: ../pidgin/gtkutils.c:1664
-msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
-msgstr ""
-"�廨廨廬 廡��廛 �廚廣�� 廩� 廩���� �廣����. 廡廨�� ����� 廩廨廢�廬 �廩��� �廬 �� 廩��廚廣�� "
-"�廢��廣廣���, ��� �廬 ��廚廣�� 廣廢��."
+msgid "You dragged a desktop launcher. Most likely you wanted to send whatever this launcher points to instead of this launcher itself."
+msgstr "�廨廨廬 廡��廛 �廚廣�� 廩� 廩���� �廣����. 廡廨�� ����� 廩廨廢�廬 �廩��� �廬 �� 廩��廚廣�� �廢��廣廣���, ��� �廬 ��廚廣�� 廣廢��."
 
 #: ../pidgin/gtkutils.c:2402
 #, c-format
@@ -16975,11 +17055,11 @@
 
 #: ../pidgin/gtkutils.c:2856
 #, c-format
-msgid ""
-"Failed to load image '%s': reason not known, probably a corrupt image file"
+msgid "Failed to load image '%s': reason not known, probably a corrupt image file"
 msgstr "��廩��� �廣廬 �廣��廬 �廬���� '%s': 廖��� �� ���廣�, ��廨�� 廡��廛 廬���� 廚���"
 
-#: ../pidgin/gtkwhiteboard.c:754 ../pidgin/gtkwhiteboard.c:773
+#: ../pidgin/gtkwhiteboard.c:754
+#: ../pidgin/gtkwhiteboard.c:773
 msgid "Save File"
 msgstr "廩��廨 廡��廛"
 
@@ -17031,31 +17111,34 @@
 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 "廖廝:"
 
@@ -17065,24 +17148,20 @@
 #. *< 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
-msgid ""
-"The contact availability plugin (cap) is used to display statistical "
-"information about buddies in a users contact list."
-msgstr ""
-"�廬�廖廝 ������ �����廬 ��廩�-廡廩廨 �廢�� ���廣 廖���廖�� 廣� ���廨�� �廨廩��廬 ��廩� �廡廩廨 廩� "
-"��廩廬�廩."
+#: ../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."
+msgstr "�廬�廖廝 ������ �����廬 ��廩�-廡廩廨 �廢�� ���廣 廖���廖�� 廣� ���廨�� �廨廩��廬 ��廩� �廡廩廨 廩� ��廩廬�廩."
 
 #: ../pidgin/plugins/contact_priority.c:61
 msgid "Buddy is idle"
@@ -17110,9 +17189,7 @@
 msgstr "廣廨�� ��廡�� 廩�廩 ��廩廬�廩 ��� ��廩廨..."
 
 #: ../pidgin/plugins/contact_priority.c:118
-msgid ""
-"The buddy with the <i>largest score</i> is the buddy who will have priority "
-"in the contact.\n"
+msgid "The buddy with the <i>largest score</i> is the buddy who will have priority in the contact.\n"
 msgstr "��廩 �廡廩廨 廣� ���廡�� <i>�����</i> ���� ��廩 �廡廩廨 廣� �廣��廚�廬.\n"
 
 #: ../pidgin/plugins/contact_priority.c:125
@@ -17137,24 +17214,20 @@
 #. *< version
 #. *< summary
 #: ../pidgin/plugins/contact_priority.c:191
-msgid ""
-"Allows for controlling the values associated with different buddy states."
+msgid "Allows for controlling the values associated with different buddy states."
 msgstr "��廚廩廨 廩���� 廣� �廣廨��� �����廖�� ��廢��� �廩���� 廩� ��廩� �廡廩廨."
 
 #. *< description
 #: ../pidgin/plugins/contact_priority.c:193
-msgid ""
-"Allows for changing the point values of idle/away/offline states for buddies "
-"in contact priority computations."
-msgstr ""
-"��廚廩廨 �廩��廬 �廬 廣廨�� ���廡�� ���廖廨 廚廣���廬/廨���廡/��廬�廡 �廩廨 �廣廩� �� 廩���廩 "
-"���廩��� ���廨�� 廩� ��廩� �廡廩廨."
+msgid "Allows for changing the point values of idle/away/offline states for buddies in contact priority computations."
+msgstr "��廚廩廨 �廩��廬 �廬 廣廨�� ���廡�� ���廖廨 廚廣���廬/廨���廡/��廬�廡 �廩廨 �廣廩� �� 廩���廩 ���廩��� ���廨�� 廩� ��廩� �廡廩廨."
 
 #: ../pidgin/plugins/convcolors.c:23
 msgid "Conversation Colors"
 msgstr "廢�廣� 廩���"
 
-#: ../pidgin/plugins/convcolors.c:25 ../pidgin/plugins/convcolors.c:26
+#: ../pidgin/plugins/convcolors.c:25
+#: ../pidgin/plugins/convcolors.c:26
 msgid "Customize colors in the conversation window"
 msgstr "�廬�� ��廩�廬 �廬 �廢�廣�� ����� �廩���"
 
@@ -17179,7 +17252,8 @@
 msgid "Received Messages"
 msgstr "���廣�廬 廩�廬廡���"
 
-#: ../pidgin/plugins/convcolors.c:223 ../pidgin/plugins/pidginrc.c:257
+#: ../pidgin/plugins/convcolors.c:223
+#: ../pidgin/plugins/pidginrc.c:257
 #, c-format
 msgid "Select Color for %s"
 msgstr "���廨廬 廢�廣 廣��廨 %s"
@@ -17206,11 +17280,8 @@
 
 #. Translators: "New conversations" should match the text in the preferences dialog and "By conversation count" should be the same text used above
 #: ../pidgin/plugins/extplacement.c:105
-msgid ""
-"Note: The preference for \"New conversations\" must be set to \"By "
-"conversation count\"."
-msgstr ""
-"�廣廨�: ��廣�廚� 廣��廨 \"廩���廬 ��廩�廬\" ����廬 ��廡�廣 ����廬 \"廣� 廚� �廖廚廨 �廩���廬\"."
+msgid "Note: The preference for \"New conversations\" must be set to \"By conversation count\"."
+msgstr "�廣廨�: ��廣�廚� 廣��廨 \"廩���廬 ��廩�廬\" ����廬 ��廡�廣 ����廬 \"廣� 廚� �廖廚廨 �廩���廬\"."
 
 #: ../pidgin/plugins/extplacement.c:111
 msgid "Number of conversations per window"
@@ -17239,9 +17310,7 @@
 #. *< summary
 #. *  description
 #: ../pidgin/plugins/extplacement.c:150
-msgid ""
-"Restrict the number of conversations per windows, optionally separating IMs "
-"and Chats"
+msgid "Restrict the number of conversations per windows, optionally separating IMs and Chats"
 msgstr "���� �廬 �廖廚廨 �廩���廬 ��� ����-廩���, 廣� �廚廩廨�廬 ��廚廨�� ��� ���廣�廬 �廢'����"
 
 #. Configuration frame
@@ -17300,35 +17369,31 @@
 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 "��廨 ��廩 廡廩廨"
 
 #. Add the label.
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:343
-msgid ""
-"Select a person from your address book to add this buddy to, or create a new "
-"person."
-msgstr ""
-"�廩 ����廨 �廩廬�廩 �廨廩��廬 ��廬���廬 廩�� ��� ���廖�廝 ���� �廬 ��廩 �廡廩廨 ���, �� ��廢�廨 "
-"��廩"
+msgid "Select a person from your address book to add this buddy to, or create a new person."
+msgstr "�廩 ����廨 �廩廬�廩 �廨廩��廬 ��廬���廬 廩�� ��� ���廖�廝 ���� �廬 ��廩 �廡廩廨 ���, �� ��廢�廨 ��廩"
 
 #. Add the expander
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:431
@@ -17340,34 +17405,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 "廬���廬 ��廨廢� 廩� evolution �� ��廢�� ��廬��� �-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 "���廨�廬 廩���� 廣� Evolution"
 
 #. 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 "��廨 �廬 �� ��廩����廬 廩����� ��廩�-廡廩廨 �廬��廖廚� �������廬."
 
@@ -17377,7 +17442,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gevolution/gevolution.c:527
+#: ../pidgin/plugins/gevolution/gevolution.c:529
 msgid "Evolution Integration"
 msgstr "廩���� 廣� Evolution"
 
@@ -17385,37 +17450,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 "��廚廩廨 廩���� 廣� Evolution."
 
-#: ../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 "���\"�:"
 
@@ -17465,7 +17530,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/iconaway.c:85 ../pidgin/plugins/iconaway.c:87
+#: ../pidgin/plugins/iconaway.c:85
+#: ../pidgin/plugins/iconaway.c:87
 msgid "Iconifies the buddy list and your conversations when you go away."
 msgstr "���廣廨 �廬 廨廩��廬 ��廩� �廡廩廨 ������廬 �廩��� �廣廬 �廬廨�廡�廬 ����廩�."
 
@@ -17485,7 +17551,8 @@
 msgid "Markerline"
 msgstr "廡�-廖����"
 
-#: ../pidgin/plugins/markerline.c:25 ../pidgin/plugins/markerline.c:26
+#: ../pidgin/plugins/markerline.c:25
+#: ../pidgin/plugins/markerline.c:26
 msgid "Draw a line to indicate new messages in a conversation."
 msgstr "廢��廨 廡� ��廣�� 廣� ���廣�廬 ��廩�廬 �廩���."
 
@@ -17493,18 +17560,18 @@
 msgid "Draw Markerline in "
 msgstr "廢��廨 廡�-廖���� � "
 
-#: ../pidgin/plugins/markerline.c:250 ../pidgin/plugins/notify.c:682
+#: ../pidgin/plugins/markerline.c:250
+#: ../pidgin/plugins/notify.c:682
 msgid "_IM windows"
 msgstr "�����廬 ���廣�"
 
-#: ../pidgin/plugins/markerline.c:254 ../pidgin/plugins/notify.c:689
+#: ../pidgin/plugins/markerline.c:254
+#: ../pidgin/plugins/notify.c:689
 msgid "C_hat windows"
 msgstr "�����廬 _廩���"
 
 #: ../pidgin/plugins/musicmessaging/musicmessaging.c:44
-msgid ""
-"A music messaging session has been requested. Please click the MM icon to "
-"accept."
+msgid "A music messaging session has been requested. Please click the MM icon to accept."
 msgstr "�廬廡��� �廡廩� �廩��廬 ����廡�. �� ����廛 廣� �廚廬�廨 �-MM ��廖���."
 
 #: ../pidgin/plugins/musicmessaging/musicmessaging.c:45
@@ -17554,11 +17621,8 @@
 
 #. *  summary
 #: ../pidgin/plugins/musicmessaging/musicmessaging.c:687
-msgid ""
-"The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
-msgstr ""
-"�廬�廖廝 ����廣�廬 ����廡� ��廚廩廨 ��廖廚廨 �廩廬�廩�� �廣��� ��� 廣� ����廬 �廢�廨� ���� ��廬."
+msgid "The Music Messaging Plugin allows a number of users to simultaneously work on a piece of music by editting a common score in real-time."
+msgstr "�廬�廖廝 ����廣�廬 ����廡� ��廚廩廨 ��廖廚廨 �廩廬�廩�� �廣��� ��� 廣� ����廬 �廢�廨� ���� ��廬."
 
 #. ---------- "Notify For" ----------
 #: ../pidgin/plugins/notify.c:678
@@ -17638,7 +17702,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/notify.c:907
+#: ../pidgin/plugins/notify.c:905
 msgid "Message Notification"
 msgstr "�廬廨廣� 廣� ���廣�"
 
@@ -17646,7 +17710,8 @@
 #. *< 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 "��廚廩廨 ���廨 �廨��� �����廣 �� 廣� ���廣�廬 ��廩�廬."
 
@@ -17782,7 +17847,8 @@
 msgid "Pidgin GTK+ Theme Control"
 msgstr "�廡廨廬 ������� 廩� GTK+ �廚���'��"
 
-#: ../pidgin/plugins/pidginrc.c:557 ../pidgin/plugins/pidginrc.c:558
+#: ../pidgin/plugins/pidginrc.c:557
+#: ../pidgin/plugins/pidginrc.c:558
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "�廩 ��廚廩廨 ��廩� ����廨�廬 �廚�廢�廬 廩� gtkrc"
 
@@ -17795,28 +17861,21 @@
 msgstr "��廚廩廨 �� �廩��� ���廣 ����� �廚廨���廡���� 廣� �廖�廖 �廡廖�."
 
 #: ../pidgin/plugins/raw.c:178
-msgid ""
-"Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
-"'Enter' in the entry box to send. Watch the debug window."
-msgstr ""
-"��廚廩廨 �� �廩��� ���廣 ����� �廚廨���廡���� 廣� �廖�廖 �廡廖� (XMPP, MSN, IRC, TOC).��廛 "
-"'Enter' �廬��廬 ����� �廩���. 廢廚� ����� ��廚�� ������."
+msgid "Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit 'Enter' in the entry box to send. Watch the debug window."
+msgstr "��廚廩廨 �� �廩��� ���廣 ����� �廚廨���廡���� 廣� �廖�廖 �廡廖� (XMPP, MSN, IRC, TOC).��廛 'Enter' �廬��廬 ����� �廩���. 廢廚� ����� ��廚�� ������."
 
 #: ../pidgin/plugins/relnot.c:71
 #, c-format
-msgid ""
-"You are using %s version %s.  The current version is %s.  You can get it "
-"from <a href=\"%s\">%s</a><hr>"
-msgstr ""
-"%s 廩�廩���廩 ��� ��廨廖� %s. ���廨廖� ������廬 ��� %s.  ��廬� ��廩�� ��廬� �-<a href="
-"\"%s\">%s</a><hr>"
+msgid "You are using %s version %s.  The current version is %s.  You can get it from <a href=\"%s\">%s</a><hr>"
+msgstr "%s 廩�廩���廩 ��� ��廨廖� %s. ���廨廖� ������廬 ��� %s.  ��廬� ��廩�� ��廬� �-<a href=\"%s\">%s</a><hr>"
 
 #: ../pidgin/plugins/relnot.c:79
 #, c-format
 msgid "<b>ChangeLog:</b><br>%s"
 msgstr "<b>廨廩��廬 廩������:</b><br>%s"
 
-#: ../pidgin/plugins/relnot.c:84 ../pidgin/plugins/relnot.c:85
+#: ../pidgin/plugins/relnot.c:84
+#: ../pidgin/plugins/relnot.c:85
 msgid "New Version Available"
 msgstr "廡���廬 ��廨廖� ��廩�"
 
@@ -17839,74 +17898,72 @@
 
 #. *  description
 #: ../pidgin/plugins/relnot.c:148
-msgid ""
-"Checks periodically for new releases and notifies the user with the "
-"ChangeLog."
-msgstr ""
-"���廡 ��� 廚廣� �� �廢�� �廨廖��廬 ��廩�廬 �����廣 ��廩廬�廩, �廢�廨�廝 廨廩��廬 �廩������."
-
-#: ../pidgin/plugins/spellchk.c:1962
+msgid "Checks periodically for new releases and notifies the user with the ChangeLog."
+msgstr "���廡 ��� 廚廣� �� �廢�� �廨廖��廬 ��廩�廬 �����廣 ��廩廬�廩, �廢�廨�廝 廨廩��廬 �廩������."
+
+#: ../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 "����廝 �廡廖� ����廣�廬 ��廢��廬 廣廚\"� ��廡�� 廩�廡�廣�� 廣\"� ��廩廬�廩."
 
@@ -17916,7 +17973,8 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/ticker/ticker.c:74 ../pidgin/plugins/ticker/ticker.c:356
+#: ../pidgin/plugins/ticker/ticker.c:74
+#: ../pidgin/plugins/ticker/ticker.c:356
 msgid "Buddy Ticker"
 msgstr "��廡廨 ��廩� 廡廩廨"
 
@@ -17924,7 +17982,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/ticker/ticker.c:359 ../pidgin/plugins/ticker/ticker.c:361
+#: ../pidgin/plugins/ticker/ticker.c:359
+#: ../pidgin/plugins/ticker/ticker.c:361
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "��廨廖� �����廬 (��廡�� �����廬) 廩� ��廩� �廡廩廨, 廩�廣��廨� �廬 ���� �廖�."
 
@@ -18003,9 +18062,7 @@
 
 #. *  description
 #: ../pidgin/plugins/timestamp_format.c:156
-msgid ""
-"This plugin allows the user to customize conversation and logging message "
-"timestamp formats."
+msgid "This plugin allows the user to customize conversation and logging message timestamp formats."
 msgstr "廬�廖廝 �� ��廚廩廨 ��廩廬�廩 �廡��廣 �廚廩廨���廬 廩��� ���廬��廬-��� ������ 廩���."
 
 #: ../pidgin/plugins/win32/transparency/win2ktrans.c:175
@@ -18069,8 +18126,7 @@
 #. *  description
 #: ../pidgin/plugins/win32/transparency/win2ktrans.c:698
 msgid ""
-"This plugin enables variable alpha transparency on conversation windows and "
-"the buddy list.\n"
+"This plugin enables variable alpha transparency on conversation windows and the buddy list.\n"
 "\n"
 "* Note: This plugin requires Win2000 or greater."
 msgstr ""
@@ -18119,11 +18175,8 @@
 msgstr "�廚廩廨���廬 �廚���'�� �������廬 ������廬."
 
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:374
-msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
-msgstr ""
-"��廚廩廨 ��廩� ��廚廩廨���廬 ��������廬 �廚���'�� ������廬, ���� 廣���� 廩� 廨廩��廬 ��廩� "
-"�廡廩廨."
+msgid "Provides options specific to Pidgin for Windows , such as buddy list docking."
+msgstr "��廚廩廨 ��廩� ��廚廩廨���廬 ��������廬 �廚���'�� ������廬, ���� 廣���� 廩� 廨廩��廬 ��廩� �廡廩廨."
 
 #: ../pidgin/plugins/xmppconsole.c:670
 msgid "<font color='#777777'>Logged out.</font>"
@@ -18135,7 +18188,8 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/xmppconsole.c:749 ../pidgin/plugins/xmppconsole.c:844
+#: ../pidgin/plugins/xmppconsole.c:749
+#: ../pidgin/plugins/xmppconsole.c:844
 #: ../pidgin/plugins/xmppconsole.c:863
 msgid "XMPP Console"
 msgstr "廡���廖���廬 XMPP"
@@ -18171,3 +18225,4 @@
 #: ../pidgin/plugins/xmppconsole.c:868
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "廬�廖廝 �� 廩���廩� ���廚�� ����� �廩廨廬�� ��廡���廬 廩� XMPP."
+