changeset 22573:dcb1d8df170f

Russian translation updated again (Dmitry Beloglazov) Closes #5344
author Stu Tomlinson <stu@nosnilmot.com>
date Sat, 29 Mar 2008 19:02:48 +0000 (2008-03-29)
parents 23be4e39e128
children 25d34ee59435
files po/ru.po
diffstat 1 files changed, 1457 insertions(+), 1486 deletions(-) [+]
line wrap: on
line diff
--- a/po/ru.po	Sat Mar 29 19:02:13 2008 +0000
+++ b/po/ru.po	Sat Mar 29 19:02:48 2008 +0000
@@ -1,5 +1,5 @@
 # translation of ru.po to Russian
-# Copyright (C) 2001, 2003-2007 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003-2008 Free Software Foundation, Inc.
 # Sergey Volozhanin <svo@asplinux.ru>, 2001.
 # Alexandre Prokoudine <avp@altlinux.ru>, 2003, 2004.
 # Dmitry Beloglazov <dmaa@users.sf.net>, 2004-2008.
@@ -9,8 +9,8 @@
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-06 11:20+0300\n"
-"PO-Revision-Date: 2008-03-06 12:00+0300\n"
+"POT-Creation-Date: 2008-03-28 12:08+0300\n"
+"PO-Revision-Date: 2008-03-29 19:00+0300\n"
 "Last-Translator: Dmitry Beloglazov <dmaa@users.sf.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -52,7 +52,7 @@
 "  -n, --nologin       仆亠 于�仂亟亳�� 舒于�仂仄舒�亳�亠�从亳\n"
 "  -v, --version       仗仂从舒亰舒�� �亠从���� 于亠��亳� 亳 于�亶�亳\n"
 
-#: ../finch/finch.c:327 ../pidgin/gtkmain.c:751
+#: ../finch/finch.c:327 ../pidgin/gtkmain.c:737
 #, c-format
 msgid ""
 "%s encountered errors migrating your settings from %s to %s. Please "
@@ -65,13 +65,13 @@
 #: ../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:2064
+#: ../libpurple/protocols/jabber/buddy.c:2079
 #: ../libpurple/protocols/jabber/chat.c:677
 #: ../libpurple/protocols/jabber/chat.c:688
-#: ../libpurple/protocols/jabber/jabber.c:1591
+#: ../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 "��亳弍从舒"
@@ -101,7 +101,7 @@
 msgstr ""
 
 #: ../finch/gntaccount.c:496 ../finch/gntconn.c:138
-#: ../pidgin/gtkaccount.c:1447 ../pidgin/gtkblist.c:4542
+#: ../pidgin/gtkaccount.c:1447 ../pidgin/gtkblist.c:4588
 msgid "Modify Account"
 msgstr "�亰仄亠仆亳�� ����仆�� 亰舒仗亳��"
 
@@ -114,7 +114,7 @@
 msgstr "��仂�仂从仂仍:"
 
 #: ../finch/gntaccount.c:529
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:290
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:294
 msgid "Screen name:"
 msgstr "�亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍�:"
 
@@ -131,30 +131,30 @@
 #: ../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/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:1059 ../finch/gntstatus.c:145 ../finch/gntstatus.c:485
+#: ../finch/gntsound.c:1064 ../finch/gntstatus.c:145 ../finch/gntstatus.c:485
 #: ../finch/gntstatus.c:610 ../finch/plugins/gnthistory.c:178
-#: ../libpurple/account.c:1116 ../libpurple/account.c:1419
-#: ../libpurple/account.c:1454 ../libpurple/conversation.c:1222
+#: ../libpurple/account.c:1118 ../libpurple/account.c:1421
+#: ../libpurple/account.c:1456 ../libpurple/conversation.c:1222
 #: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:508
 #: ../libpurple/protocols/gg/gg.c:667 ../libpurple/protocols/gg/gg.c:804
 #: ../libpurple/protocols/gg/gg.c:886
 #: ../libpurple/protocols/jabber/buddy.c:758
-#: ../libpurple/protocols/jabber/buddy.c:2458
-#: ../libpurple/protocols/jabber/buddy.c:2494
+#: ../libpurple/protocols/jabber/buddy.c:2473
+#: ../libpurple/protocols/jabber/buddy.c:2509
 #: ../libpurple/protocols/jabber/chat.c:786
-#: ../libpurple/protocols/jabber/jabber.c:1060
-#: ../libpurple/protocols/jabber/jabber.c:1069
-#: ../libpurple/protocols/jabber/jabber.c:1784
+#: ../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
@@ -174,18 +174,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
@@ -199,7 +199,7 @@
 #: ../libpurple/protocols/yahoo/yahoo.c:993
 #: ../libpurple/protocols/yahoo/yahoo.c:3560
 #: ../libpurple/protocols/yahoo/yahoo.c:3571 ../pidgin/gtkaccount.c:1841
-#: ../pidgin/gtkaccount.c:2402 ../pidgin/gtkblist.c:6768
+#: ../pidgin/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
@@ -207,7 +207,7 @@
 #: ../pidgin/gtkdialogs.c:1152 ../pidgin/gtkdialogs.c:1208
 #: ../pidgin/gtkdialogs.c:1247 ../pidgin/gtkdialogs.c:1274
 #: ../pidgin/gtkimhtmltoolbar.c:438 ../pidgin/gtklog.c:327
-#: ../pidgin/gtkplugin.c:290 ../pidgin/gtkpounce.c:1113
+#: ../pidgin/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
@@ -219,8 +219,8 @@
 #. 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
+#: ../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"
@@ -246,7 +246,7 @@
 msgid "Delete"
 msgstr "丕亟舒仍亳��"
 
-#: ../finch/gntaccount.c:670 ../finch/gntblist.c:2469 ../finch/gntui.c:94
+#: ../finch/gntaccount.c:670 ../finch/gntblist.c:2471 ../finch/gntui.c:94
 #: ../pidgin/gtkaccount.c:2261 ../pidgin/gtkdocklet.c:716
 msgid "Accounts"
 msgstr "丕���仆�亠 亰舒仗亳�亳"
@@ -257,16 +257,16 @@
 
 #. 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/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
+#: ../pidgin/gtkblist.c:6795 ../pidgin/gtkconv.c:1696
 #: ../pidgin/gtkrequest.c:277
 msgid "Add"
 msgstr "�仂弍舒于亳��"
@@ -360,9 +360,8 @@
 msgstr "�亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍�"
 
 #: ../finch/gntblist.c:604
-#, fuzzy
 msgid "Alias (optional)"
-msgstr "��亠于亟仂仆亳仄 从仂仆�舒从�舒"
+msgstr "��亠于亟仂仆亳仄 (仆亠 仂弍�亰舒�亠仍亠仆)"
 
 #: ../finch/gntblist.c:607
 #, fuzzy
@@ -370,11 +369,11 @@
 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/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:3201 ../pidgin/gtknotify.c:517
-#: ../pidgin/gtkpounce.c:1281 ../pidgin/plugins/gevolution/gevolution.c:445
+#: ../pidgin/gtkblist.c:3237 ../pidgin/gtknotify.c:517
+#: ../pidgin/gtkpounce.c:1281 ../pidgin/plugins/gevolution/gevolution.c:447
 msgid "Account"
 msgstr "丕���仆舒� 亰舒仗亳��"
 
@@ -387,8 +386,8 @@
 #: ../libpurple/protocols/silc10/buddy.c:1036
 #: ../libpurple/protocols/silc10/buddy.c:1083
 #: ../libpurple/protocols/silc10/buddy.c:1183
-#: ../libpurple/protocols/yahoo/yahoo.c:3400 ../pidgin/gtkblist.c: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 "�仂弍舒于亳�� �仂弍亠�亠亟仆亳从舒"
 
@@ -401,15 +400,15 @@
 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:988
-#: ../libpurple/protocols/jabber/jabber.c:991
-#: ../libpurple/protocols/msn/msn.c:1740 ../libpurple/protocols/msn/msn.c:1805
-#: ../libpurple/protocols/msn/msn.c:1832
-#: ../libpurple/protocols/msnp9/msn.c:1596
-#: ../libpurple/protocols/msnp9/msn.c:1661
-#: ../libpurple/protocols/msnp9/msn.c:1688
-#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:652
+#: ../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
@@ -417,7 +416,7 @@
 msgstr "�仄�"
 
 #: ../finch/gntblist.c:687 ../finch/gntblist.c:1589
-#: ../libpurple/protocols/msn/msn.c:1559
+#: ../libpurple/protocols/msn/msn.c:1573
 #: ../libpurple/protocols/msnp9/msn.c:1413
 #: ../libpurple/protocols/silc/chat.c:610
 #: ../libpurple/protocols/silc10/chat.c:590
@@ -429,7 +428,7 @@
 msgid "Alias"
 msgstr "��亠于亟仂仆亳仄"
 
-#: ../finch/gntblist.c:690 ../finch/gntblist.c:2835
+#: ../finch/gntblist.c:690 ../finch/gntblist.c:2839
 msgid "Group"
 msgstr "���仗仗舒"
 
@@ -437,7 +436,7 @@
 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 "�仂弍舒于亳�� �舒�"
 
@@ -458,8 +457,8 @@
 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
+#: ../libpurple/protocols/sametime/sametime.c:5451
+#: ../libpurple/protocols/sametime/sametime.c:5539 ../pidgin/gtkblist.c:6792
 msgid "Add Group"
 msgstr "�仂弍舒于亳�� 亞��仗仗�"
 
@@ -505,12 +504,12 @@
 #: ../finch/gntblist.c:1203 ../finch/gntconv.c:603
 #: ../libpurple/protocols/jabber/si.c:1109
 #: ../libpurple/protocols/oscar/oscar.c:655 ../libpurple/protocols/qq/qq.c:588
-#: ../pidgin/gtkconv.c:1650
+#: ../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
+#: ../libpurple/protocols/msn/msn.c:674 ../libpurple/protocols/msnp9/msn.c:562
 msgid "Blocked"
 msgstr "�舒弍仍仂从亳�仂于舒仆"
 
@@ -556,14 +555,14 @@
 msgstr "�仂亟�于亠�亟亳�� �亟舒仍亠仆亳亠"
 
 #: ../finch/gntblist.c:1436 ../finch/gntblist.c:1591 ../finch/gntft.c:243
-#: ../pidgin/gtkconv.c:1699 ../pidgin/gtkrequest.c:278
+#: ../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 "弌仗亳�仂从 �仂弍亠�亠亟仆亳从仂于"
@@ -581,28 +580,28 @@
 #: ../libpurple/protocols/gg/gg.c:1052 ../libpurple/protocols/gg/gg.c:1125
 #: ../libpurple/protocols/gg/gg.c:2228
 #: ../libpurple/protocols/jabber/buddy.c:314
-#: ../libpurple/protocols/jabber/buddy.c:1279
-#: ../libpurple/protocols/jabber/buddy.c:2249
-#: ../libpurple/protocols/jabber/buddy.c:2441
-#: ../libpurple/protocols/jabber/jabber.c:999
-#: ../libpurple/protocols/jabber/jabber.c:1611
-#: ../libpurple/protocols/jabber/jabber.c:1625
-#: ../libpurple/protocols/jabber/jabber.c:1639
-#: ../libpurple/protocols/jabber/jabber.c:1653
-#: ../libpurple/protocols/jabber/jabber.c:1667
-#: ../libpurple/protocols/msn/msn.c:1567 ../libpurple/protocols/msn/msn.c:1743
+#: ../libpurple/protocols/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:1072 ../pidgin/gtkblist.c:3225
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1073 ../pidgin/gtkblist.c:3261
 msgid "Nickname"
 msgstr "��亠于亟仂仆亳仄"
 
@@ -611,15 +610,15 @@
 #: ../libpurple/protocols/bonjour/bonjour.c:376
 #: ../libpurple/protocols/jabber/buddy.c:817
 #: ../libpurple/protocols/jabber/buddy.c:981
-#: ../libpurple/protocols/msn/msn.c:607 ../libpurple/protocols/msn/msn.c:625
-#: ../libpurple/protocols/msn/msn.c:633 ../libpurple/protocols/msn/state.c:32
+#: ../libpurple/protocols/msn/msn.c:621 ../libpurple/protocols/msn/msn.c:639
+#: ../libpurple/protocols/msn/msn.c:647 ../libpurple/protocols/msn/state.c:32
 #: ../libpurple/protocols/msnp9/msn.c:541
 #: ../libpurple/protocols/msnp9/state.c:32
 #: ../libpurple/protocols/novell/novell.c:2843
 #: ../libpurple/protocols/oscar/oscar.c:2980
 #: ../libpurple/protocols/yahoo/yahoo.c:3154
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3253
-#: ../pidgin/gtkblist.c:3703 ../pidgin/gtkprefs.c:1946
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3289
+#: ../pidgin/gtkblist.c:3749 ../pidgin/gtkprefs.c:1946
 msgid "Idle"
 msgstr "�亠亰亟亠亶��于亳亠"
 
@@ -627,32 +626,32 @@
 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
+#: ../finch/gntblist.c:2600
 #, fuzzy
 msgid ""
 "Please enter the screen name or alias of the person you would like to Block/"
@@ -664,15 +663,15 @@
 #. Not multiline
 #. Not masked?
 #. No hints?
-#: ../finch/gntblist.c:2601 ../finch/gntblist.c:2650 ../finch/gntcertmgr.c:89
+#: ../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:1115
-#: ../libpurple/account.c:1418 ../libpurple/protocols/gg/gg.c:507
+#: ../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:1783
-#: ../libpurple/protocols/jabber/xdata.c:399
-#: ../libpurple/protocols/msn/msn.c:286 ../libpurple/protocols/msn/msn.c:303
-#: ../libpurple/protocols/msn/msn.c:320 ../libpurple/protocols/msn/msn.c:337
+#: ../libpurple/protocols/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
@@ -685,8 +684,8 @@
 #: ../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
@@ -704,83 +703,83 @@
 msgid "OK"
 msgstr "OK"
 
-#: ../finch/gntblist.c:2645 ../pidgin/gtkdialogs.c:760
+#: ../finch/gntblist.c:2649 ../pidgin/gtkdialogs.c:760
 msgid "New Instant Message"
 msgstr "�仂于仂亠 仄亞仆仂于亠仆仆仂亠 �仂仂弍�亠仆亳亠"
 
-#: ../finch/gntblist.c:2647 ../pidgin/gtkdialogs.c:762
+#: ../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:649
+#: ../finch/gntblist.c:2834 ../libpurple/protocols/oscar/oscar.c:649
 #: ../libpurple/protocols/silc/silc.c:911
 #: ../libpurple/protocols/silc/util.c:563
 #: ../libpurple/protocols/silc10/silc.c:685
@@ -788,10 +787,9 @@
 msgid "Chat"
 msgstr "丼舒�"
 
-#: ../finch/gntblist.c:2840 ../finch/plugins/grouping.c:255
-#, fuzzy
+#: ../finch/gntblist.c:2844 ../finch/plugins/grouping.c:255
 msgid "Grouping"
-msgstr "���仗仗舒"
+msgstr "���仗仗亳�仂于舒仆亳亠"
 
 #: ../finch/gntcertmgr.c:85 ../pidgin/gtkcertmgr.c:188
 msgid "Certificate Import"
@@ -887,7 +885,7 @@
 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 "�仆�仂�仄舒�亳�"
@@ -896,7 +894,7 @@
 #: ../finch/gntcertmgr.c:323 ../finch/gntft.c:253 ../finch/gntnotify.c:182
 #: ../finch/gntplugin.c:220 ../finch/gntplugin.c:413 ../finch/gntpounce.c:750
 #: ../finch/gntroomlist.c:275 ../finch/gntstatus.c:216
-#: ../libpurple/protocols/msn/msn.c:403 ../libpurple/protocols/msnp9/msn.c:400
+#: ../libpurple/protocols/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
 #: ../pidgin/gtkrequest.c:275
@@ -975,7 +973,7 @@
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:296 ../finch/gntconv.c:880 ../pidgin/gtkconv.c:3474
+#: ../finch/gntconv.c:296 ../finch/gntconv.c:882 ../pidgin/gtkconv.c:3470
 #, c-format
 msgid ""
 "\n"
@@ -988,12 +986,12 @@
 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
+#: ../finch/gntconv.c:437 ../pidgin/gtkconv.c:1386
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr ""
@@ -1032,24 +1030,24 @@
 msgid "Enable Sounds"
 msgstr "�仂�仗�仂亳亰于仂亟亳�� 亰于�从亳"
 
-#: ../finch/gntconv.c:833
+#: ../finch/gntconv.c:835
 msgid "<AUTO-REPLY> "
 msgstr "<AUTO-REPLY> "
 
 #. 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"
@@ -1057,7 +1055,7 @@
 "��仗仂仍�亰�亶�亠 \"/help &lt;从仂仄舒仆亟舒&gt;\" 亟仍� 仗仂仄仂�亳 仗仂 从仂仆从�亠�仆仂亶 从仂仄舒仆亟亠.\n"
 "弌仍亠亟���亳亠 从仂仄舒仆亟� 亟仂���仗仆� 于 ��仂仄 从仂仆�亠从��亠:\n"
 
-#: ../finch/gntconv.c:1242 ../pidgin/gtkconv.c:7773
+#: ../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."
@@ -1065,12 +1063,12 @@
 "say &lt;�仂仂弍�亠仆亳亠&gt;:  ��仗�舒于亳�� 仂弍��仆仂亠 �仂仂弍�亠仆亳亠, 从舒从 亠�仍亳 弍� 于� 仆亠 "
 "亳�仗仂仍�亰仂于舒仍亳 从仂仄舒仆亟�."
 
-#: ../finch/gntconv.c:1245 ../pidgin/gtkconv.c:7776
+#: ../finch/gntconv.c:1247 ../pidgin/gtkconv.c:7772
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
 "me &lt;亟亠亶��于亳亠&gt;:  ��仗�舒于亳�� 亟亠亶��于亳亠 于 ��亳仍亠 IRC �仂弍亠�亠亟仆亳从� 亳仍亳 于 �舒�."
 
-#: ../finch/gntconv.c:1248 ../pidgin/gtkconv.c:7779
+#: ../finch/gntconv.c:1250 ../pidgin/gtkconv.c:7775
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -1078,43 +1076,43 @@
 "debug &lt;仗舒�舒仄亠��&gt;:  ��仗�舒于亳�� �舒亰仍亳�仆�� 仂�仍舒亟仂�仆�� 亳仆�仂�仄舒�亳� 于 �亠从���� "
 "弍亠�亠亟�."
 
-#: ../finch/gntconv.c:1251 ../pidgin/gtkconv.c:7782
+#: ../finch/gntconv.c:1253 ../pidgin/gtkconv.c:7778
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: ��亳��亳�� 仂从仆仂 弍亠�亠亟�."
 
-#: ../finch/gntconv.c:1254 ../pidgin/gtkconv.c:7788
+#: ../finch/gntconv.c:1256 ../pidgin/gtkconv.c:7784
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;从仂仄舒仆亟舒&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
+#: ../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 "�亠 �亟舒���� 仂�从���� �舒亶仍."
@@ -1178,9 +1176,9 @@
 #: ../libpurple/protocols/jabber/buddy.c:808
 #: ../libpurple/protocols/jabber/buddy.c:812
 #: ../libpurple/protocols/jabber/buddy.c:971
-#: ../libpurple/protocols/jabber/jabber.c:1576
-#: ../libpurple/protocols/msn/msn.c:617 ../libpurple/protocols/msn/msn.c:627
-#: ../libpurple/protocols/msn/msn.c:632 ../libpurple/protocols/msn/msn.c:635
+#: ../libpurple/protocols/jabber/jabber.c:1579
+#: ../libpurple/protocols/msn/msn.c:631 ../libpurple/protocols/msn/msn.c:641
+#: ../libpurple/protocols/msn/msn.c:646 ../libpurple/protocols/msn/msn.c:649
 #: ../libpurple/protocols/msnp9/msn.c:540
 #: ../libpurple/protocols/novell/novell.c:2853
 #: ../libpurple/protocols/oscar/oscar.c:822
@@ -1188,10 +1186,10 @@
 #: ../libpurple/protocols/oscar/oscar.c:829
 #: ../libpurple/protocols/oscar/oscar.c:2768
 #: ../libpurple/protocols/oscar/oscar.c:3827
-#: ../libpurple/protocols/sametime/sametime.c:3313
-#: ../libpurple/protocols/sametime/sametime.c:4204
-#: ../libpurple/protocols/yahoo/yahoo.c:3305 ../pidgin/gtkblist.c:3297
-#: ../pidgin/gtkblist.c:3311 ../pidgin/gtkblist.c:3313
+#: ../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 "弌�舒���"
@@ -1231,7 +1229,7 @@
 msgstr ""
 
 #: ../finch/gntft.c:446 ../finch/gntft.c:447 ../pidgin/gtkft.c:160
-#: ../pidgin/gtkft.c:1077
+#: ../pidgin/gtkft.c:1080
 msgid "Finished"
 msgstr "�舒于亠��亠仆仂"
 
@@ -1241,14 +1239,14 @@
 msgstr "�亠�亠亟舒�舒"
 
 #: ../finch/gntlog.c:183
-#, fuzzy, c-format
+#, c-format
 msgid "Conversation in %s on %s"
-msgstr "�亠�亠亟� 于 %s"
+msgstr "�亠�亠亟舒 于 %s 仆舒 %s"
 
 #: ../finch/gntlog.c:186
-#, fuzzy, c-format
+#, c-format
 msgid "Conversation with %s on %s"
-msgstr "�亠�亠亟� � %s"
+msgstr "�亠�亠亟舒 � %s 仆舒 %s"
 
 #: ../finch/gntlog.c:231 ../pidgin/gtklog.c:503
 msgid "%B %Y"
@@ -1341,11 +1339,11 @@
 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 "��亳亞仍舒�亳��"
 
@@ -1751,56 +1749,56 @@
 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
+#: ../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"
@@ -1810,55 +1808,55 @@
 "(%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
+#: ../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 "��弍�舒��..."
 
@@ -1877,8 +1875,8 @@
 
 #: ../finch/gntstatus.c:183 ../finch/gntstatus.c:539
 #: ../libpurple/protocols/jabber/buddy.c:326
-#: ../libpurple/protocols/jabber/buddy.c:1391
-#: ../libpurple/protocols/msn/msn.c:733
+#: ../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
@@ -1905,15 +1903,15 @@
 #: ../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:1608
-#: ../libpurple/protocols/jabber/jabber.c:1622
-#: ../libpurple/protocols/jabber/jabber.c:1636
-#: ../libpurple/protocols/jabber/jabber.c:1650
-#: ../libpurple/protocols/jabber/jabber.c:1664
-#: ../libpurple/protocols/jabber/jabber.c:1680
-#: ../libpurple/protocols/msn/msn.c:685 ../libpurple/protocols/msn/msn.c:691
-#: ../libpurple/protocols/msn/msn.c:697 ../libpurple/protocols/msn/msn.c:703
-#: ../libpurple/protocols/msn/msn.c:708 ../libpurple/protocols/msn/msn.c:713
+#: ../libpurple/protocols/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
@@ -1925,10 +1923,10 @@
 #: ../libpurple/protocols/oscar/oscar.c:5931
 #: ../libpurple/protocols/oscar/oscar.c:5938
 #: ../libpurple/protocols/oscar/oscar.c:5945
-#: ../libpurple/protocols/sametime/sametime.c:3336
-#: ../libpurple/protocols/sametime/sametime.c:3342
-#: ../libpurple/protocols/sametime/sametime.c:3348
-#: ../libpurple/protocols/sametime/sametime.c:3427
+#: ../libpurple/protocols/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
@@ -2003,9 +2001,8 @@
 msgstr "��亳弍从舒 亰舒亞��亰从亳 仄仂亟�仍�."
 
 #: ../finch/plugins/gntclipboard.c:116
-#, fuzzy
 msgid "Couldn't find X display"
-msgstr "�亠 �亟舒仍仂�� 仆舒亶�亳 "
+msgstr "�亠 �亟舒仍仂�� 仆舒亶�亳 X-亟亳�仗仍亠亶"
 
 #: ../finch/plugins/gntclipboard.c:122
 msgid "Couldn't find window"
@@ -2133,25 +2130,23 @@
 
 #: ../finch/plugins/grouping.c:44 ../finch/plugins/grouping.c:145
 #: ../libpurple/protocols/gg/gg.c:1010
-#: ../libpurple/protocols/jabber/buddy.c:2066
+#: ../libpurple/protocols/jabber/buddy.c:2081
 #: ../libpurple/protocols/novell/novell.c:2846
 #: ../libpurple/protocols/oscar/oscar.c:829
 #: ../libpurple/protocols/oscar/oscar.c:5733
 #: ../libpurple/protocols/qq/qq.c:171 ../libpurple/protocols/qq/qq.c:178
 #: ../libpurple/protocols/qq/qq.c:293
 #: ../libpurple/protocols/yahoo/yahoo.c:3156 ../libpurple/status.c:154
-#: ../pidgin/gtkblist.c:3297 ../pidgin/gtkblist.c:3679
+#: ../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
-#, fuzzy
+#: ../finch/plugins/grouping.c:117 ../pidgin/gtkblist.c:3369
 msgid "Online Buddies"
-msgstr "弌仂弍亠�亠亟仆亳从仂于 仆亠 于 �亠�亳"
+msgstr "弌仂弍亠�亠亟仆亳从仂于 于 �亠�亳"
 
 #: ../finch/plugins/grouping.c:117
-#, fuzzy
 msgid "Offline Buddies"
 msgstr "弌仂弍亠�亠亟仆亳从仂于 仆亠 于 �亠�亳"
 
@@ -2190,80 +2185,80 @@
 msgid "Lastlog plugin."
 msgstr ""
 
-#: ../libpurple/account.c:886
+#: ../libpurple/account.c:887
 msgid "accounts"
 msgstr "����仆�亠 亰舒仗亳�亳"
 
-#: ../libpurple/account.c:1061 ../libpurple/protocols/jabber/auth.c:199
+#: ../libpurple/account.c:1063 ../libpurple/protocols/jabber/auth.c:199
 msgid "Password is required to sign on."
 msgstr "�仍� 仗仂亟从仍��亠仆亳� ��亠弍�亠��� 仗舒�仂仍�."
 
-#: ../libpurple/account.c:1095
+#: ../libpurple/account.c:1097
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "�于亠亟亳�亠 仗舒�仂仍� 亟仍� %s (%s)"
 
-#: ../libpurple/account.c:1102
+#: ../libpurple/account.c:1104
 msgid "Enter Password"
 msgstr "�于亠亟亳�亠 仗舒�仂仍�"
 
-#: ../libpurple/account.c:1107
+#: ../libpurple/account.c:1109
 msgid "Save password"
 msgstr "弌仂��舒仆亳�� 仗舒�仂仍�"
 
-#: ../libpurple/account.c:1142 ../libpurple/connection.c: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:1736
+#: ../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/account.c:1922 ../libpurple/protocols/gg/gg.c:1019
 #: ../libpurple/protocols/jabber/buddy.c:812
-#: ../libpurple/protocols/jabber/buddy.c:2062
-#: ../libpurple/protocols/jabber/buddy.c:2079
+#: ../libpurple/protocols/jabber/buddy.c:2077
+#: ../libpurple/protocols/jabber/buddy.c:2094
 #: ../libpurple/protocols/novell/novell.c:2849
 #: ../libpurple/protocols/qq/qq.c:233 ../pidgin/gtkft.c:166
 msgid "Unknown"
@@ -2271,7 +2266,7 @@
 
 #: ../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/protocols/myspace/myspace.c:3435 ../pidgin/gtkblist.c:6234
 #: ../pidgin/plugins/gevolution/gevo-util.c:67
 #: ../pidgin/plugins/gevolution/gevolution.c:96
 msgid "Buddies"
@@ -2450,7 +2445,7 @@
 msgstr "+++ %s 于��亠仍"
 
 #: ../libpurple/connection.c:530 ../libpurple/plugin.c:277
-#: ../libpurple/protocols/jabber/buddy.c:2382
+#: ../libpurple/protocols/jabber/buddy.c:2397
 #: ../libpurple/protocols/msn/servconn.c:141
 #: ../libpurple/protocols/msn/session.c:377
 #: ../libpurple/protocols/msnp9/servconn.c:139
@@ -2515,17 +2510,17 @@
 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"
@@ -3016,9 +3011,9 @@
 #: ../libpurple/protocols/oscar/oscar.c:2350
 #: ../libpurple/protocols/oscar/oscar.c:6015
 #: ../libpurple/protocols/oscar/oscar.c:6070
-#: ../libpurple/protocols/oscar/oscar.c:6296
-#: ../libpurple/protocols/oscar/oscar.c:6366 ../libpurple/request.h:1458
-#: ../libpurple/request.h:1468 ../pidgin/gtkblist.c:552
+#: ../libpurple/protocols/oscar/oscar.c:6297
+#: ../libpurple/protocols/oscar/oscar.c:6367 ../libpurple/request.h:1401
+#: ../libpurple/request.h:1411
 msgid "_Cancel"
 msgstr "�_�仄亠仆亳��"
 
@@ -3060,10 +3055,10 @@
 "�舒亶仍仂于\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 "�舒仄亠�从亳"
 
@@ -3247,15 +3242,15 @@
 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 ""
 
@@ -3265,19 +3260,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/joinpart.c:270
+#: ../libpurple/plugins/joinpart.c:269
 msgid "Join/Part Hiding"
 msgstr ""
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/plugins/joinpart.c:273
+#: ../libpurple/plugins/joinpart.c:272
 msgid "Hides extraneous join/part messages."
 msgstr ""
 
 #. *  description
-#: ../libpurple/plugins/joinpart.c:275
+#: ../libpurple/plugins/joinpart.c:274
 msgid ""
 "This plugin hides join/part messages in large rooms, except for those users "
 "actively taking part in a conversation."
@@ -3359,7 +3354,7 @@
 #: ../libpurple/plugins/log_reader.c:2738
 #: ../libpurple/plugins/log_reader.c:2849
 msgid "QIP"
-msgstr ""
+msgstr "QIP"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
@@ -3383,7 +3378,7 @@
 #: ../libpurple/plugins/log_reader.c:2774
 #: ../libpurple/plugins/log_reader.c:2861
 msgid "aMSN"
-msgstr ""
+msgstr "aMSN"
 
 #. Add general preferences.
 #: ../libpurple/plugins/log_reader.c:2817
@@ -3508,7 +3503,7 @@
 
 #: ../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
@@ -3523,7 +3518,7 @@
 
 #: ../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
@@ -3563,11 +3558,11 @@
 
 #: ../libpurple/plugins/psychic.c:20
 msgid "Psychic Mode"
-msgstr ""
+msgstr "亅从���舒�亠仆�仂�仆�亶 �亠亢亳仄"
 
 #: ../libpurple/plugins/psychic.c:21
 msgid "Psychic mode for incoming conversation"
-msgstr ""
+msgstr "亅从���舒�亠仆�仂�仆�亶 �亠亢亳仄 亟仍� 弍亠�亠亟, 亳仆亳�亳亳��亠仄�� 亟��亞仂亶 ��仂�仂仆仂亶"
 
 #: ../libpurple/plugins/psychic.c:22
 msgid ""
@@ -3793,27 +3788,27 @@
 #: ../libpurple/protocols/bonjour/bonjour.c:392
 #: ../libpurple/protocols/bonjour/bonjour.c:698
 #: ../libpurple/protocols/gg/gg.c:633
-#: ../libpurple/protocols/jabber/jabber.c:1003
+#: ../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:1007
+#: ../libpurple/protocols/jabber/jabber.c:1010
 msgid "Last name"
 msgstr "个舒仄亳仍亳�"
 
 #: ../libpurple/protocols/bonjour/bonjour.c:398
 #: ../libpurple/protocols/jabber/buddy.c:323
-#: ../libpurple/protocols/jabber/buddy.c:1357
-#: ../libpurple/protocols/jabber/buddy.c:1367
-#: ../libpurple/protocols/jabber/buddy.c:2251
-#: ../libpurple/protocols/silc/ops.c:1041
+#: ../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:555
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1067
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1068
 msgid "E-Mail"
 msgstr "E-mail"
 
@@ -3848,7 +3843,7 @@
 
 #: ../libpurple/protocols/bonjour/bonjour.c:704
 #: ../libpurple/protocols/gg/gg.c:478
-#: ../libpurple/protocols/jabber/jabber.c:995
+#: ../libpurple/protocols/jabber/jabber.c:998
 #: ../libpurple/protocols/silc/silc.c:913
 #: ../libpurple/protocols/silc/silc.c:1154
 #: ../libpurple/protocols/silc10/silc.c:687
@@ -3894,11 +3889,11 @@
 msgid "Error communicating with local mDNSResponder."
 msgstr "��亳弍从舒 �于�亰亳 � �亠�于亠�仂仄"
 
-#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1876
+#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1908
 msgid "Invalid proxy settings"
 msgstr "�亠于亠�仆�亠 仆舒���仂亶从亳 仗�仂从�亳"
 
-#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1876
+#: ../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."
@@ -3969,9 +3964,9 @@
 msgstr "�亠亞亳���舒�亳� 亰舒于亠��亠仆舒 ��仗亠�仆仂!"
 
 #: ../libpurple/protocols/gg/gg.c:483 ../libpurple/protocols/gg/gg.c:776
-#: ../libpurple/protocols/jabber/jabber.c:978
 #: ../libpurple/protocols/jabber/jabber.c:981
-#: ../libpurple/protocols/jabber/jabber.c:1769
+#: ../libpurple/protocols/jabber/jabber.c:984
+#: ../libpurple/protocols/jabber/jabber.c:1772
 msgid "Password"
 msgstr "�舒�仂仍�"
 
@@ -3997,7 +3992,7 @@
 
 #: ../libpurple/protocols/gg/gg.c:643 ../libpurple/protocols/gg/gg.c:1056
 #: ../libpurple/protocols/gg/gg.c:1128
-#: ../libpurple/protocols/jabber/jabber.c:1015
+#: ../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
@@ -4008,14 +4003,14 @@
 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: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:1097
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1098
 msgid "Gender"
 msgstr "�仂仍"
 
@@ -4091,7 +4086,7 @@
 msgstr "�仂弍舒于亳�� 从 �舒��..."
 
 #: ../libpurple/protocols/gg/gg.c:1013
-#: ../libpurple/protocols/jabber/buddy.c:2068
+#: ../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
@@ -4110,7 +4105,7 @@
 #. Away stuff
 #: ../libpurple/protocols/gg/gg.c:1016 ../libpurple/protocols/irc/irc.c:544
 #: ../libpurple/protocols/irc/msgs.c:312
-#: ../libpurple/protocols/jabber/buddy.c:2072
+#: ../libpurple/protocols/jabber/buddy.c:2087
 #: ../libpurple/protocols/novell/novell.c:2837
 #: ../libpurple/protocols/oscar/oscar.c:734
 #: ../libpurple/protocols/oscar/oscar.c:5761
@@ -4132,10 +4127,10 @@
 msgstr "UIN"
 
 #: ../libpurple/protocols/gg/gg.c:1048 ../libpurple/protocols/gg/gg.c:1122
-#: ../libpurple/protocols/jabber/buddy.c:2245
-#: ../libpurple/protocols/jabber/buddy.c:2431
+#: ../libpurple/protocols/jabber/buddy.c:2260
+#: ../libpurple/protocols/jabber/buddy.c:2446
 #: ../libpurple/protocols/oscar/oscar.c:3757
-#: ../libpurple/protocols/silc/ops.c:990
+#: ../libpurple/protocols/silc/ops.c:1005
 #: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
 msgstr "�仄�"
@@ -4318,7 +4313,7 @@
 
 #: ../libpurple/protocols/irc/irc.c:129 ../libpurple/protocols/irc/irc.c:169
 #: ../libpurple/protocols/irc/irc.c:633 ../libpurple/protocols/irc/irc.c:662
-#: ../libpurple/protocols/myspace/myspace.c:2530
+#: ../libpurple/protocols/myspace/myspace.c:2532
 msgid "Server has disconnected"
 msgstr "弌亠�于亠� �舒亰仂�于舒仍 �仂亠亟亳仆亠仆亳亠"
 
@@ -4343,14 +4338,14 @@
 #. 1. connect to server
 #. connect to the server
 #: ../libpurple/protocols/irc/irc.c:332
-#: ../libpurple/protocols/jabber/jabber.c:1343
+#: ../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: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:2984
 #: ../libpurple/protocols/zephyr/zephyr.c:1585 ../pidgin/gtkstatusbox.c:681
@@ -4358,8 +4353,8 @@
 msgstr "弌仂亠亟亳仆亠仆亳亠"
 
 #: ../libpurple/protocols/irc/irc.c:342
-#: ../libpurple/protocols/jabber/jabber.c:671
-#: ../libpurple/protocols/jabber/jabber.c:1152
+#: ../libpurple/protocols/jabber/jabber.c:674
+#: ../libpurple/protocols/jabber/jabber.c:1155
 msgid "SSL support unavailable"
 msgstr "�仂亟亟亠�亢从舒 SSL 仆亠亟仂���仗仆舒"
 
@@ -4376,7 +4371,7 @@
 msgstr "�亠 �亟舒仍仂�� �仂亠亟亳仆亳���� � �亰仍仂仄"
 
 #: ../libpurple/protocols/irc/irc.c:628 ../libpurple/protocols/irc/irc.c:657
-#: ../libpurple/protocols/myspace/myspace.c:2524
+#: ../libpurple/protocols/myspace/myspace.c:2526
 msgid "Read error"
 msgstr "��亳弍从舒 ��亠仆亳�"
 
@@ -4388,9 +4383,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
@@ -4416,13 +4411,13 @@
 
 #. host to connect to
 #: ../libpurple/protocols/irc/irc.c:965 ../libpurple/protocols/irc/msgs.c:325
-#: ../libpurple/protocols/msn/msn.c:2343
+#: ../libpurple/protocols/msn/msn.c:2357
 #: ../libpurple/protocols/msnp9/msn.c:2197
-#: ../libpurple/protocols/oscar/oscar.c:6762
+#: ../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
@@ -4431,11 +4426,11 @@
 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:6765
+#: ../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
@@ -4447,15 +4442,15 @@
 msgstr "�仂亟亳�仂于从亳"
 
 #: ../libpurple/protocols/irc/irc.c:974 ../libpurple/protocols/irc/msgs.c:318
-#: ../libpurple/protocols/jabber/jabber.c:971
-#: ../libpurple/protocols/jabber/jabber.c:973
+#: ../libpurple/protocols/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
@@ -4508,13 +4503,13 @@
 
 #: ../libpurple/protocols/irc/msgs.c:305
 #: ../libpurple/protocols/oscar/oscar.c:3747
-#: ../libpurple/protocols/silc/ops.c:1422
+#: ../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 "弌亠亶�舒� 仆舒"
@@ -4612,7 +4607,7 @@
 msgstr "�� 弍�仍亳 �亟舒仍亠仆� 仂仗亠�舒�仂�仂仄 %s: (%s)"
 
 #. Remove user from channel
-#: ../libpurple/protocols/irc/msgs.c:808 ../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)"
@@ -4671,7 +4666,7 @@
 msgstr "�亠 �亟舒���� 仗�亳�仂亠亟亳仆亳���� 从 %s: 丐�亠弍�亠��� �亠亞亳���舒�亳�."
 
 #: ../libpurple/protocols/irc/msgs.c:1122
-#: ../libpurple/protocols/silc/ops.c:1093
+#: ../libpurple/protocols/silc/ops.c:1108
 #: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Cannot join channel"
 msgstr "�亠 �亟舒���� 仗�亳�仂亠亟亳仆亳���� 从 从舒仆舒仍�"
@@ -4784,7 +4779,7 @@
 "从舒仆舒仍亠."
 
 #: ../libpurple/protocols/irc/parse.c:137
-#: ../libpurple/protocols/jabber/jabber.c:2355
+#: ../libpurple/protocols/jabber/jabber.c:2358
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;仆仂于�亶 仗�亠于亟仂仆亳仄&gt;:  �亰仄亠仆亳�� �于仂亶 仗�亠于亟仂仆亳仄."
 
@@ -4822,7 +4817,7 @@
 "with an optional message."
 msgstr ""
 "part [从仂仄仆舒�舒] [�仂仂弍�亠仆亳亠]:  �仂从亳仆��� �从舒亰舒仆仆�亶 亳仍亳 �亠从��亳亶 从舒仆舒仍. 弌仂仂弍�亠仆亳亠 "
-"仆亠仂弍�亰舒�亠仍�仆仂."
+"仆亠 仂弍�亰舒�亠仍�仆仂."
 
 #: ../libpurple/protocols/irc/parse.c:144
 msgid ""
@@ -4841,7 +4836,7 @@
 #: ../libpurple/protocols/irc/parse.c:146
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr ""
-"quit [�仂仂弍�亠仆亳亠]:  �舒亰仂�于舒�� �仂亠亟亳仆亠仆亳亠 � �亠�于亠�仂仄. 弌仂仂弍�亠仆亳亠 仆亠仂弍�亰舒�亠仍�仆仂."
+"quit [�仂仂弍�亠仆亳亠]:  �舒亰仂�于舒�� �仂亠亟亳仆亠仆亳亠 � �亠�于亠�仂仄. 弌仂仂弍�亠仆亳亠 仆亠 仂弍�亰舒�亠仍�仆仂."
 
 #: ../libpurple/protocols/irc/parse.c:147
 msgid "quote [...]:  Send a raw command to the server."
@@ -4917,9 +4912,9 @@
 msgstr "弌仂亠亟亳仆亠仆亳亠 �舒亰仂�于舒仆仂."
 
 #: ../libpurple/protocols/jabber/adhoccommands.c:143
-#: ../libpurple/protocols/jabber/jabber.c:732
-#: ../libpurple/protocols/jabber/jabber.c:762
-#: ../libpurple/protocols/jabber/jabber.c:1939
+#: ../libpurple/protocols/jabber/jabber.c:735
+#: ../libpurple/protocols/jabber/jabber.c:765
+#: ../libpurple/protocols/jabber/jabber.c:1942
 msgid "Unknown Error"
 msgstr "�亠亳亰于亠��仆舒� 仂�亳弍从舒"
 
@@ -4942,7 +4937,7 @@
 "弌亠�于亠� ��亠弍�亠� 舒��亠仆�亳�亳从舒�亳� 仗�仂���仄 �亠从��仂仄 �亠�亠亰 仆亠�亳��仂于舒仆仆�亶 仗仂�仂从"
 
 #: ../libpurple/protocols/jabber/auth.c:323
-#: ../libpurple/protocols/jabber/auth.c:526
+#: ../libpurple/protocols/jabber/auth.c:532
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
@@ -4953,29 +4948,29 @@
 
 #: ../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
+#: ../libpurple/protocols/jabber/auth.c:728
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
@@ -4983,106 +4978,106 @@
 "亅�仂� �亠�于亠� ��亠弍�亠� 舒��亠仆�亳�亳从舒�亳� 仗�仂���仄 �亠从��仂仄 �亠�亠亰 仆亠�亳��仂于舒仆仆仂亠 "
 "�仂亠亟亳仆亠仆亳亠. �仂亰于仂仍亳�� ��仂 亳 仗�仂亟仂仍亢亳�� 舒��亠仆�亳�亳从舒�亳�?"
 
-#: ../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:311
-#: ../libpurple/protocols/jabber/buddy.c:1251
-#: ../libpurple/protocols/sametime/sametime.c:4182
-#: ../libpurple/protocols/silc/ops.c:986
+#: ../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:312
-#: ../libpurple/protocols/jabber/buddy.c:1263
-#: ../libpurple/protocols/silc/ops.c:998
+#: ../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:313
-#: ../libpurple/protocols/jabber/buddy.c:1266
+#: ../libpurple/protocols/jabber/buddy.c:1271
 msgid "Given Name"
 msgstr "�仄�"
 
 #: ../libpurple/protocols/jabber/buddy.c:315
-#: ../libpurple/protocols/jabber/jabber.c:1031
+#: ../libpurple/protocols/jabber/jabber.c:1034
 msgid "URL"
 msgstr "URL"
 
 #: ../libpurple/protocols/jabber/buddy.c:316
-#: ../libpurple/protocols/jabber/buddy.c:1314
+#: ../libpurple/protocols/jabber/buddy.c:1319
 msgid "Street Address"
 msgstr "�亟�亠�"
 
 #: ../libpurple/protocols/jabber/buddy.c:317
-#: ../libpurple/protocols/jabber/buddy.c:1311
+#: ../libpurple/protocols/jabber/buddy.c:1316
 msgid "Extended Address"
 msgstr "�仂仗仂仍仆亳�亠仍�仆�亶 舒亟�亠�"
 
 #: ../libpurple/protocols/jabber/buddy.c:318
-#: ../libpurple/protocols/jabber/buddy.c:1317
+#: ../libpurple/protocols/jabber/buddy.c:1322
 msgid "Locality"
 msgstr "�舒�亠仍�仆仆�亶 仗�仆从�"
 
 #: ../libpurple/protocols/jabber/buddy.c:319
-#: ../libpurple/protocols/jabber/buddy.c:1320
+#: ../libpurple/protocols/jabber/buddy.c:1325
 msgid "Region"
 msgstr "�亠亞亳仂仆"
 
 #: ../libpurple/protocols/jabber/buddy.c:320
-#: ../libpurple/protocols/jabber/buddy.c:1323
+#: ../libpurple/protocols/jabber/buddy.c:1328
 msgid "Postal Code"
 msgstr "�仂��仂于�亶 从仂亟"
 
 #: ../libpurple/protocols/jabber/buddy.c:321
-#: ../libpurple/protocols/jabber/buddy.c:1327
+#: ../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:322
-#: ../libpurple/protocols/jabber/buddy.c:1338
-#: ../libpurple/protocols/jabber/buddy.c:1345
+#: ../libpurple/protocols/jabber/buddy.c:1343
+#: ../libpurple/protocols/jabber/buddy.c:1350
 msgid "Telephone"
 msgstr "丐亠仍亠�仂仆"
 
 #: ../libpurple/protocols/jabber/buddy.c:324
-#: ../libpurple/protocols/jabber/buddy.c:1382
+#: ../libpurple/protocols/jabber/buddy.c:1387
 msgid "Organization Name"
 msgstr "�舒亰于舒仆亳亠 仂�亞舒仆亳亰舒�亳亳"
 
 #: ../libpurple/protocols/jabber/buddy.c:325
-#: ../libpurple/protocols/jabber/buddy.c:1385
+#: ../libpurple/protocols/jabber/buddy.c:1390
 msgid "Organization Unit"
 msgstr "��亟亠仍"
 
 #: ../libpurple/protocols/jabber/buddy.c:327
-#: ../libpurple/protocols/jabber/buddy.c:1394
+#: ../libpurple/protocols/jabber/buddy.c:1399
 msgid "Role"
 msgstr "�仂仍亢仆仂���"
 
 #: ../libpurple/protocols/jabber/buddy.c:328
-#: ../libpurple/protocols/jabber/buddy.c:1282
-#: ../libpurple/protocols/msn/msn.c:1814
-#: ../libpurple/protocols/msnp9/msn.c:1670
+#: ../libpurple/protocols/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:329
-#: ../libpurple/protocols/jabber/buddy.c:1397
+#: ../libpurple/protocols/jabber/buddy.c:1402
 #: ../libpurple/protocols/jabber/chat.c:775
-#: ../libpurple/protocols/jabber/usermood.c:193 ../pidgin/gtkblist.c:3309
-#: ../pidgin/gtkplugin.c:564 ../pidgin/gtkprefs.c:688
+#: ../libpurple/protocols/jabber/usermood.c:193 ../pidgin/gtkblist.c:3345
+#: ../pidgin/gtkplugin.c:568 ../pidgin/gtkprefs.c:688
 msgid "Description"
 msgstr "�仗亳�舒仆亳亠"
 
@@ -5096,7 +5091,7 @@
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
 msgstr ""
-"��亠 仆亳亢亠�仍亠亟���亳亠 仗�仆从�� 仆亠仂弍�亰舒�亠仍�仆�. �舒仗仂仍仆�亶�亠 仗仂 �于仂亠仄� ��仄仂��亠仆亳�."
+"��亠 仆亳亢亠�仍亠亟���亳亠 仗�仆从�� 仆亠 仂弍�亰舒�亠仍�仆�. �舒仗仂仍仆�亶�亠 仗仂 �于仂亠仄� ��仄仂��亠仆亳�."
 
 #: ../libpurple/protocols/jabber/buddy.c:825
 #: ../libpurple/protocols/jabber/buddy.c:990
@@ -5111,7 +5106,7 @@
 #: ../libpurple/protocols/jabber/buddy.c:845
 #: ../libpurple/protocols/jabber/buddy.c:1005
 msgid "Last Activity"
-msgstr ""
+msgstr "�仂�仍亠亟仆�� 舒从�亳于仆仂���"
 
 #: ../libpurple/protocols/jabber/buddy.c:847
 #: ../libpurple/protocols/jabber/buddy.c:1007
@@ -5202,7 +5197,7 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:881
 #: ../libpurple/protocols/jabber/buddy.c:1041
-#: ../libpurple/protocols/sametime/sametime.c:3285
+#: ../libpurple/protocols/sametime/sametime.c:3286
 msgid "File Transfer"
 msgstr "�亠�亠亟舒�舒 �舒亶仍仂于"
 
@@ -5215,7 +5210,7 @@
 #: ../libpurple/protocols/jabber/buddy.c:885
 #: ../libpurple/protocols/jabber/buddy.c:1045
 msgid "User Activity"
-msgstr ""
+msgstr "�从�亳于仆仂��� 仗仂仍�亰仂于舒�亠仍�"
 
 #: ../libpurple/protocols/jabber/buddy.c:887
 #: ../libpurple/protocols/jabber/buddy.c:1047
@@ -5321,8 +5316,8 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:927
 #: ../libpurple/protocols/jabber/buddy.c:1087
-#: ../libpurple/protocols/silc/ops.c:1600
-#: ../libpurple/protocols/silc/ops.c:1605
+#: ../libpurple/protocols/silc/ops.c:1615
+#: ../libpurple/protocols/silc/ops.c:1620
 #: ../libpurple/protocols/silc10/ops.c:1612
 #: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping"
@@ -5382,170 +5377,170 @@
 msgstr "�亠����"
 
 #: ../libpurple/protocols/jabber/buddy.c:965
-#: ../libpurple/protocols/jabber/jabber.c:1607
-#: ../libpurple/protocols/jabber/jabber.c:1621
-#: ../libpurple/protocols/jabber/jabber.c:1635
-#: ../libpurple/protocols/jabber/jabber.c:1649
-#: ../libpurple/protocols/jabber/jabber.c:1663
+#: ../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:1269
-#: ../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:1302
-#: ../libpurple/protocols/jabber/jabber.c:1011
+#: ../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:1308
+#: ../libpurple/protocols/jabber/buddy.c:1313
 msgid "P.O. Box"
 msgstr "�仆亟亠从�"
 
-#: ../libpurple/protocols/jabber/buddy.c:1418
+#: ../libpurple/protocols/jabber/buddy.c:1423
 msgid "Photo"
 msgstr "个仂�仂亞�舒�亳�"
 
-#: ../libpurple/protocols/jabber/buddy.c:1418
+#: ../libpurple/protocols/jabber/buddy.c:1423
 msgid "Logo"
 msgstr "�仂亞仂�亳仗"
 
-#: ../libpurple/protocols/jabber/buddy.c:1977
+#: ../libpurple/protocols/jabber/buddy.c:1992
 msgid "Un-hide From"
 msgstr "�仂从舒亰舒���� 亟仍�"
 
-#: ../libpurple/protocols/jabber/buddy.c:1981
+#: ../libpurple/protocols/jabber/buddy.c:1996
 msgid "Temporarily Hide From"
 msgstr "��亠仄亠仆仆仂 �从������ 仂�"
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1989
+#: ../libpurple/protocols/jabber/buddy.c:2004
 msgid "Cancel Presence Notification"
 msgstr "��仄亠仆亳�� �于亠亟仂仄仍亠仆亳亠 仂 仗�亳�����于亳亳"
 
-#: ../libpurple/protocols/jabber/buddy.c:1996
+#: ../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:2005
+#: ../libpurple/protocols/jabber/buddy.c:2020
 msgid "Unsubscribe"
 msgstr "��仗亳�舒����"
 
-#: ../libpurple/protocols/jabber/buddy.c:2020
+#: ../libpurple/protocols/jabber/buddy.c:2035
 msgid "Log In"
 msgstr "�仂亶�亳"
 
-#: ../libpurple/protocols/jabber/buddy.c:2024
+#: ../libpurple/protocols/jabber/buddy.c:2039
 msgid "Log Out"
 msgstr "��亶�亳"
 
-#: ../libpurple/protocols/jabber/buddy.c:2070
-#: ../libpurple/protocols/jabber/jabber.c:1620
+#: ../libpurple/protocols/jabber/buddy.c:2085
+#: ../libpurple/protocols/jabber/jabber.c:1623
 msgid "Chatty"
 msgstr "�仂�仂于 仗仂仂弍�舒����"
 
-#: ../libpurple/protocols/jabber/buddy.c:2074
+#: ../libpurple/protocols/jabber/buddy.c:2089
 msgid "Extended Away"
 msgstr "�舒��亳�亠仆仆�亶 \"��仂��仍\""
 
-#: ../libpurple/protocols/jabber/buddy.c:2076
-#: ../libpurple/protocols/jabber/jabber.c:1662
+#: ../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:3347
+#: ../libpurple/protocols/sametime/sametime.c:3348
 #, c-format
 msgid "Do Not Disturb"
 msgstr "�亠 弍亠�仗仂从仂亳��"
 
-#: ../libpurple/protocols/jabber/buddy.c:2243
+#: ../libpurple/protocols/jabber/buddy.c:2258
 msgid "JID"
 msgstr "JID"
 
-#: ../libpurple/protocols/jabber/buddy.c:2247
-#: ../libpurple/protocols/jabber/buddy.c:2436
+#: ../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:2279
+#: ../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:2364
+#: ../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:2384
+#: ../libpurple/protocols/jabber/buddy.c:2399
 msgid "Directory Query Failed"
 msgstr "�亠 �亟舒仍仂�� 仂仗�仂�亳�� 从舒�舒仍仂亞"
 
-#: ../libpurple/protocols/jabber/buddy.c:2385
+#: ../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:2419
+#: ../libpurple/protocols/jabber/buddy.c:2434
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "�仆����从�亳亳 �亠�于亠�舒: %s"
 
-#: ../libpurple/protocols/jabber/buddy.c:2426
+#: ../libpurple/protocols/jabber/buddy.c:2441
 msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:2446
+#: ../libpurple/protocols/jabber/buddy.c:2461
 #: ../libpurple/protocols/novell/novell.c:1497
 #: ../libpurple/protocols/oscar/oscar.c:3761
 #: ../libpurple/protocols/oscar/oscar.c:3770
 msgid "E-Mail Address"
 msgstr "�亟�亠� e-mail"
 
-#: ../libpurple/protocols/jabber/buddy.c:2455
-#: ../libpurple/protocols/jabber/buddy.c:2456
+#: ../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:2457
+#: ../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:2472
+#: ../libpurple/protocols/jabber/buddy.c:2487
 msgid "Invalid Directory"
 msgstr "�亠于亠�仆�亶 从舒�舒仍仂亞"
 
-#: ../libpurple/protocols/jabber/buddy.c:2489
+#: ../libpurple/protocols/jabber/buddy.c:2504
 msgid "Enter a User Directory"
 msgstr "�于亠亟亳�亠 从舒�舒仍仂亞 仗仂仍�亰仂于舒�亠仍亠亶"
 
-#: ../libpurple/protocols/jabber/buddy.c:2490
+#: ../libpurple/protocols/jabber/buddy.c:2505
 msgid "Select a user directory to search"
 msgstr "��弍亠�亳�亠 从舒�舒仍仂亞 仗仂仍�亰仂于舒�亠仍亠亶 亟仍� 仗仂亳�从舒"
 
-#: ../libpurple/protocols/jabber/buddy.c:2493
+#: ../libpurple/protocols/jabber/buddy.c:2508
 msgid "Search Directory"
 msgstr "�仂亳�从 于 从舒�舒仍仂亞亠"
 
@@ -5620,7 +5615,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 "��亳弍从舒 亰舒亞��亰从亳 �仗亳�从舒 从仂仄仆舒�"
@@ -5656,12 +5651,12 @@
 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:2594
 #: ../libpurple/protocols/yahoo/yahoo.c:2626
@@ -5673,71 +5668,71 @@
 "�亠 �亟舒仍仂�� ���舒仆仂于亳�� �仂亠亟亳仆亠仆亳亠 � �亠�于亠�仂仄:\n"
 "%s"
 
-#: ../libpurple/protocols/jabber/jabber.c:582
+#: ../libpurple/protocols/jabber/jabber.c:585
 msgid "Unable to create socket"
 msgstr "�亠 �亟舒���� �仂亰亟舒�� �仂从亠�"
 
-#: ../libpurple/protocols/jabber/jabber.c:632
-#: ../libpurple/protocols/jabber/jabber.c:1117
+#: ../libpurple/protocols/jabber/jabber.c:635
+#: ../libpurple/protocols/jabber/jabber.c:1120
 msgid "Invalid XMPP ID"
 msgstr "�亠于亠�仆�亶 XMPP ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:639
+#: ../libpurple/protocols/jabber/jabber.c:642
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "�亠于亠�仆�亶 XMPP ID. �仂仍亢亠仆 弍��� 亰舒亟舒仆 亟仂仄亠仆."
 
-#: ../libpurple/protocols/jabber/jabber.c:717
+#: ../libpurple/protocols/jabber/jabber.c:720
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "�亠亞亳���舒�亳� %s@%s 亰舒于亠��亠仆舒 ��仗亠�仆仂"
 
-#: ../libpurple/protocols/jabber/jabber.c:723
+#: ../libpurple/protocols/jabber/jabber.c:726
 #, fuzzy, c-format
 msgid "Registration to %s successful"
 msgstr "�亠亞亳���舒�亳� %s@%s 亰舒于亠��亠仆舒 ��仗亠�仆仂"
 
-#: ../libpurple/protocols/jabber/jabber.c:725
-#: ../libpurple/protocols/jabber/jabber.c:726
+#: ../libpurple/protocols/jabber/jabber.c:728
+#: ../libpurple/protocols/jabber/jabber.c:729
 msgid "Registration Successful"
 msgstr "�亠亞亳���舒�亳� 亰舒于亠��亠仆舒 ��仗亠�仆仂"
 
-#: ../libpurple/protocols/jabber/jabber.c:734
-#: ../libpurple/protocols/jabber/jabber.c:735
+#: ../libpurple/protocols/jabber/jabber.c:737
+#: ../libpurple/protocols/jabber/jabber.c:738
 msgid "Registration Failed"
 msgstr "�亠 �亟舒仍仂�� 于�仗仂仍仆亳�� �亠亞亳���舒�亳�"
 
-#: ../libpurple/protocols/jabber/jabber.c:753
+#: ../libpurple/protocols/jabber/jabber.c:756
 #, fuzzy, c-format
 msgid "Registration from %s successfully removed"
 msgstr "�亠亞亳���舒�亳� %s@%s 亰舒于亠��亠仆舒 ��仗亠�仆仂"
 
-#: ../libpurple/protocols/jabber/jabber.c:755
-#: ../libpurple/protocols/jabber/jabber.c:756
+#: ../libpurple/protocols/jabber/jabber.c:758
+#: ../libpurple/protocols/jabber/jabber.c:759
 msgid "Unregistration Successful"
 msgstr "��仄亠仆舒 �亠亞亳���舒�亳亳 亰舒于亠��亠仆舒 ��仗亠�仆仂"
 
-#: ../libpurple/protocols/jabber/jabber.c:764
-#: ../libpurple/protocols/jabber/jabber.c:765
+#: ../libpurple/protocols/jabber/jabber.c:767
+#: ../libpurple/protocols/jabber/jabber.c:768
 msgid "Unregistration Failed"
 msgstr "�亠 �亟舒仍仂�� 于�仗仂仍仆亳�� 仂�仄亠仆� �亠亞亳���舒�亳亳"
 
-#: ../libpurple/protocols/jabber/jabber.c:931
-#: ../libpurple/protocols/jabber/jabber.c:932
+#: ../libpurple/protocols/jabber/jabber.c:934
+#: ../libpurple/protocols/jabber/jabber.c:935
 msgid "Already Registered"
 msgstr "丕亢亠 亰舒�亠亞亳���亳�仂于舒仆仂"
 
-#: ../libpurple/protocols/jabber/jabber.c:1019
+#: ../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:1023
+#: ../libpurple/protocols/jabber/jabber.c:1026
 msgid "Postal code"
 msgstr "�仂��仂于�亶 从仂亟"
 
-#: ../libpurple/protocols/jabber/jabber.c:1027
-#: ../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:567
 #: ../libpurple/protocols/silc10/ops.c:1069
@@ -5746,483 +5741,483 @@
 msgid "Phone"
 msgstr "丐亠仍亠�仂仆"
 
-#: ../libpurple/protocols/jabber/jabber.c:1035
+#: ../libpurple/protocols/jabber/jabber.c:1038
 msgid "Date"
 msgstr "�舒�舒"
 
-#: ../libpurple/protocols/jabber/jabber.c:1039
+#: ../libpurple/protocols/jabber/jabber.c:1042
 msgid "Unregister"
 msgstr "��仄亠仆亳�� �亠亞亳���舒�亳�"
 
-#: ../libpurple/protocols/jabber/jabber.c:1046
+#: ../libpurple/protocols/jabber/jabber.c:1049
 msgid ""
 "Please fill out the information below to change your account registration."
 msgstr ""
 "�舒仗仂仍仆亳�亠 仆亳亢亠�仍亠亟���亳亠 仗仂仍� 亟仍� 亳亰仄亠仆亠仆亳� �亠亞亳���舒�亳亳 于舒�亠亶 ����仆仂亶 亰舒仗亳�亳."
 
-#: ../libpurple/protocols/jabber/jabber.c:1049
+#: ../libpurple/protocols/jabber/jabber.c:1052
 msgid "Please fill out the information below to register your new account."
 msgstr "�舒仗仂仍仆亳�亠 仆亳亢亠�仍亠亟���亳亠 仗仂仍� 亟仍� �亠亞亳���舒�亳亳 仆仂于仂亶 ����仆仂亶 亰舒仗亳�亳."
 
-#: ../libpurple/protocols/jabber/jabber.c:1057
-#: ../libpurple/protocols/jabber/jabber.c:1058
+#: ../libpurple/protocols/jabber/jabber.c:1060
+#: ../libpurple/protocols/jabber/jabber.c:1061
 msgid "Register New XMPP Account"
 msgstr "�舒�亠亞亳���亳�仂于舒�� 仆仂于�� ����仆�� 亰舒仗亳�� XMPP"
 
-#: ../libpurple/protocols/jabber/jabber.c:1059
-#: ../libpurple/protocols/jabber/jabber.c:1068
+#: ../libpurple/protocols/jabber/jabber.c:1062
+#: ../libpurple/protocols/jabber/jabber.c:1071
 msgid "Register"
 msgstr "�舒�亠亞亳���亳�仂于舒��"
 
-#: ../libpurple/protocols/jabber/jabber.c:1064
+#: ../libpurple/protocols/jabber/jabber.c:1067
 #, c-format
 msgid "Change Account Registration at %s"
 msgstr "�亰仄亠仆亳�� �亠亞亳���舒�亳� ����仆仂亶 亰舒仗亳�亳 仆舒 %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1065
+#: ../libpurple/protocols/jabber/jabber.c:1068
 #, c-format
 msgid "Register New Account at %s"
 msgstr "�舒�亠亞亳���亳�仂于舒�� 仆仂于�� ����仆�� 亰舒仗亳�� 仆舒 %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1068
+#: ../libpurple/protocols/jabber/jabber.c:1071
 msgid "Change Registration"
 msgstr "�亰仄亠仆亳�� �亠亞亳���舒�亳�"
 
-#: ../libpurple/protocols/jabber/jabber.c:1177
-#: ../libpurple/protocols/jabber/jabber.c:1178
+#: ../libpurple/protocols/jabber/jabber.c:1180
+#: ../libpurple/protocols/jabber/jabber.c:1181
 msgid "Error unregistering account"
 msgstr "��亳弍从舒 仂�仄亠仆� �亠亞亳���舒�亳亳 ����仆仂亶 亰舒仗亳�亳"
 
-#: ../libpurple/protocols/jabber/jabber.c:1183
-#: ../libpurple/protocols/jabber/jabber.c:1184
+#: ../libpurple/protocols/jabber/jabber.c:1186
+#: ../libpurple/protocols/jabber/jabber.c:1187
 msgid "Account successfully unregistered"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1347
+#: ../libpurple/protocols/jabber/jabber.c:1350
 msgid "Initializing Stream"
 msgstr "�仆亳�亳舒仍亳亰舒�亳� 仗仂�仂从舒"
 
-#: ../libpurple/protocols/jabber/jabber.c:1352
+#: ../libpurple/protocols/jabber/jabber.c:1355
 msgid "Initializing SSL/TLS"
 msgstr "�仆亳�亳舒仍亳亰舒�亳� SSL/TLS"
 
-#: ../libpurple/protocols/jabber/jabber.c:1356
+#: ../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:1365
+#: ../libpurple/protocols/jabber/jabber.c:1368
 msgid "Re-initializing Stream"
 msgstr "�仂于�仂�仆舒� 亳仆亳�亳舒仍亳亰舒�亳� 仗仂�仂从舒"
 
-#: ../libpurple/protocols/jabber/jabber.c:1459
-#: ../libpurple/protocols/jabber/jabber.c:1917
-#: ../libpurple/protocols/jabber/jabber.c:1960
-#: ../libpurple/protocols/jabber/jabber.c:1998
+#: ../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:1507
+#: ../libpurple/protocols/jabber/jabber.c:1510
 msgid "Both"
 msgstr "�弍亠"
 
-#: ../libpurple/protocols/jabber/jabber.c:1509
+#: ../libpurple/protocols/jabber/jabber.c:1512
 msgid "From (To pending)"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1511
+#: ../libpurple/protocols/jabber/jabber.c:1514
 msgid "From"
 msgstr "��"
 
-#: ../libpurple/protocols/jabber/jabber.c:1514
+#: ../libpurple/protocols/jabber/jabber.c:1517
 msgid "To"
 msgstr "�仍�"
 
-#: ../libpurple/protocols/jabber/jabber.c:1516
+#: ../libpurple/protocols/jabber/jabber.c:1519
 msgid "None (To pending)"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1518
+#: ../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:1521
+#: ../libpurple/protocols/jabber/jabber.c:1524
 msgid "Subscription"
 msgstr "�仂亟仗亳�从舒"
 
-#: ../libpurple/protocols/jabber/jabber.c:1531
 #: ../libpurple/protocols/jabber/jabber.c:1534
-#: ../libpurple/protocols/jabber/jabber.c:1609
-#: ../libpurple/protocols/jabber/jabber.c:1623
-#: ../libpurple/protocols/jabber/jabber.c:1637
-#: ../libpurple/protocols/jabber/jabber.c:1651
-#: ../libpurple/protocols/jabber/jabber.c:1665
-#: ../libpurple/protocols/jabber/usermood.c:184
-#: ../libpurple/protocols/silc/buddy.c:1560
-#: ../libpurple/protocols/silc/ops.c:1212
-#: ../libpurple/protocols/silc10/buddy.c:1560
-#: ../libpurple/protocols/silc10/ops.c:1207
-msgid "Mood"
-msgstr "�舒���仂亠仆亳亠"
-
-#: ../libpurple/protocols/jabber/jabber.c:1543
-#: ../libpurple/protocols/msn/msn.c:642
-msgid "Now Listening"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1610
-#: ../libpurple/protocols/jabber/jabber.c:1624
-#: ../libpurple/protocols/jabber/jabber.c:1638
-#: ../libpurple/protocols/jabber/jabber.c:1652
-#: ../libpurple/protocols/jabber/jabber.c:1666
-msgid "Mood Text"
-msgstr ""
-
+#: ../libpurple/protocols/jabber/jabber.c: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:1227
+#: ../libpurple/protocols/silc10/buddy.c:1560
+#: ../libpurple/protocols/silc10/ops.c:1207
+msgid "Mood"
+msgstr "�舒���仂亠仆亳亠"
+
+#: ../libpurple/protocols/jabber/jabber.c:1546
+#: ../libpurple/protocols/msn/msn.c:656
+msgid "Now Listening"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1613
+#: ../libpurple/protocols/jabber/jabber.c:1627
+#: ../libpurple/protocols/jabber/jabber.c:1641
+#: ../libpurple/protocols/jabber/jabber.c:1655
+#: ../libpurple/protocols/jabber/jabber.c:1669
+msgid "Mood Text"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1615
+#: ../libpurple/protocols/jabber/jabber.c:1629
+#: ../libpurple/protocols/jabber/jabber.c:1643
+#: ../libpurple/protocols/jabber/jabber.c:1657
+#: ../libpurple/protocols/jabber/jabber.c:1671
 #, fuzzy
 msgid "Allow Buzz"
 msgstr "�舒亰�亠�亳��"
 
-#: ../libpurple/protocols/jabber/jabber.c:1686
+#: ../libpurple/protocols/jabber/jabber.c:1689
 #, fuzzy
 msgid "Tune Artist"
 msgstr "丱�亟仂亢仆亳从亳"
 
-#: ../libpurple/protocols/jabber/jabber.c:1687
+#: ../libpurple/protocols/jabber/jabber.c:1690
 #, fuzzy
 msgid "Tune Title"
 msgstr "�舒亰于舒仆亳亠"
 
-#: ../libpurple/protocols/jabber/jabber.c:1688
+#: ../libpurple/protocols/jabber/jabber.c:1691
 msgid "Tune Album"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1689
-msgid "Tune Genre"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1690
-#, fuzzy
-msgid "Tune Comment"
-msgstr "�仂仄仄亠仆�舒�亳亶 �仂弍亠�亠亟仆亳从舒"
-
-#: ../libpurple/protocols/jabber/jabber.c:1691
-msgid "Tune Track"
-msgstr ""
-
 #: ../libpurple/protocols/jabber/jabber.c:1692
-msgid "Tune Time"
+msgid "Tune Genre"
 msgstr ""
 
 #: ../libpurple/protocols/jabber/jabber.c:1693
-msgid "Tune Year"
-msgstr ""
+#, fuzzy
+msgid "Tune Comment"
+msgstr "�仂仄仄亠仆�舒�亳亶 �仂弍亠�亠亟仆亳从舒"
 
 #: ../libpurple/protocols/jabber/jabber.c:1694
+msgid "Tune Track"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1695
+msgid "Tune Time"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1696
+msgid "Tune Year"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1697
 msgid "Tune URL"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1710
+#: ../libpurple/protocols/jabber/jabber.c:1713
 msgid "Password Changed"
 msgstr "�舒�仂仍� 亳亰仄亠仆�仆"
 
-#: ../libpurple/protocols/jabber/jabber.c:1711
+#: ../libpurple/protocols/jabber/jabber.c:1714
 msgid "Your password has been changed."
 msgstr "�舒�仂仍� 弍�仍 亳亰仄亠仆�仆."
 
-#: ../libpurple/protocols/jabber/jabber.c:1717
-#: ../libpurple/protocols/jabber/jabber.c:1718
+#: ../libpurple/protocols/jabber/jabber.c:1720
+#: ../libpurple/protocols/jabber/jabber.c:1721
 msgid "Error changing password"
 msgstr "��亳弍从舒 亳亰仄亠仆亠仆亳� 仗舒�仂仍�"
 
-#: ../libpurple/protocols/jabber/jabber.c:1775
+#: ../libpurple/protocols/jabber/jabber.c:1778
 msgid "Password (again)"
 msgstr "�舒�仂仍� (亠�� �舒亰)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1781
-#: ../libpurple/protocols/jabber/jabber.c:1782
+#: ../libpurple/protocols/jabber/jabber.c:1784
+#: ../libpurple/protocols/jabber/jabber.c:1785
 msgid "Change XMPP Password"
 msgstr "�亰仄亠仆亳�� 仗舒�仂仍� XMPP"
 
-#: ../libpurple/protocols/jabber/jabber.c:1782
+#: ../libpurple/protocols/jabber/jabber.c:1785
 msgid "Please enter your new password"
 msgstr "�于亠亟亳�亠 仆仂于�亶 仗舒�仂仍�"
 
-#: ../libpurple/protocols/jabber/jabber.c:1796
-#: ../libpurple/protocols/oscar/oscar.c:6517
+#: ../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:1801
-#: ../libpurple/protocols/oscar/oscar.c:6528
+#: ../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:1806
+#: ../libpurple/protocols/jabber/jabber.c:1809
 msgid "Search for Users..."
 msgstr "��从舒�� 仗仂仍�亰仂于舒�亠仍亠亶..."
 
-#: ../libpurple/protocols/jabber/jabber.c:1897
+#: ../libpurple/protocols/jabber/jabber.c:1900
 msgid "Bad Request"
 msgstr "�亠于亠�仆�亶 亰舒仗�仂�"
 
-#: ../libpurple/protocols/jabber/jabber.c:1899
+#: ../libpurple/protocols/jabber/jabber.c:1902
 msgid "Conflict"
 msgstr "�仂仆�仍亳从�"
 
-#: ../libpurple/protocols/jabber/jabber.c:1901
+#: ../libpurple/protocols/jabber/jabber.c:1904
 msgid "Feature Not Implemented"
 msgstr "个�仆从�亳� 仆亠 �亠舒仍亳亰仂于舒仆舒"
 
-#: ../libpurple/protocols/jabber/jabber.c:1903
+#: ../libpurple/protocols/jabber/jabber.c:1906
 msgid "Forbidden"
 msgstr "�舒仗�亠�亠仆仂"
 
-#: ../libpurple/protocols/jabber/jabber.c:1905
+#: ../libpurple/protocols/jabber/jabber.c:1908
 msgid "Gone"
 msgstr "丕��仍"
 
-#: ../libpurple/protocols/jabber/jabber.c:1907
-#: ../libpurple/protocols/jabber/jabber.c:1988
+#: ../libpurple/protocols/jabber/jabber.c:1910
+#: ../libpurple/protocols/jabber/jabber.c:1991
 msgid "Internal Server Error"
 msgstr "�仆���亠仆仆�� 仂�亳弍从舒 �亠�于亠�舒"
 
-#: ../libpurple/protocols/jabber/jabber.c:1909
+#: ../libpurple/protocols/jabber/jabber.c:1912
 msgid "Item Not Found"
 msgstr "亅仍亠仄亠仆� 仆亠 仆舒亶亟亠仆"
 
-#: ../libpurple/protocols/jabber/jabber.c:1911
+#: ../libpurple/protocols/jabber/jabber.c:1914
 msgid "Malformed XMPP ID"
 msgstr "�亠于亠�仆仂 ��仂�仄亳�仂于舒仆仆�亶 XMPP ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:1913
+#: ../libpurple/protocols/jabber/jabber.c:1916
 msgid "Not Acceptable"
 msgstr "�亠亟仂仗���亳仄仂"
 
-#: ../libpurple/protocols/jabber/jabber.c:1915
+#: ../libpurple/protocols/jabber/jabber.c:1918
 msgid "Not Allowed"
 msgstr "�亠 �舒亰�亠�亠仆仂"
 
-#: ../libpurple/protocols/jabber/jabber.c:1919
+#: ../libpurple/protocols/jabber/jabber.c:1922
 msgid "Payment Required"
 msgstr "丐�亠弍�亠��� 仗仍舒�舒"
 
-#: ../libpurple/protocols/jabber/jabber.c:1921
+#: ../libpurple/protocols/jabber/jabber.c:1924
 msgid "Recipient Unavailable"
 msgstr "�仂仍��舒�亠仍� 仆亠亟仂���仗亠仆"
 
-#: ../libpurple/protocols/jabber/jabber.c:1925
+#: ../libpurple/protocols/jabber/jabber.c:1928
 msgid "Registration Required"
 msgstr "丐�亠弍�亠��� �亠亞亳���舒�亳�"
 
-#: ../libpurple/protocols/jabber/jabber.c:1927
+#: ../libpurple/protocols/jabber/jabber.c:1930
 msgid "Remote Server Not Found"
 msgstr "丕亟舒仍�仆仆�亶 �亠�于亠� 仆亠 仆舒亶亟亠仆"
 
-#: ../libpurple/protocols/jabber/jabber.c:1929
+#: ../libpurple/protocols/jabber/jabber.c:1932
 msgid "Remote Server Timeout"
 msgstr "���亠从仍仂 于�亠仄� 仂亢亳亟舒仆亳� �亟舒仍�仆仆仂亞仂 �亠�于亠�舒"
 
-#: ../libpurple/protocols/jabber/jabber.c:1931
+#: ../libpurple/protocols/jabber/jabber.c:1934
 msgid "Server Overloaded"
 msgstr "弌亠�于亠� 仗亠�亠亞��亢亠仆"
 
-#: ../libpurple/protocols/jabber/jabber.c:1933
+#: ../libpurple/protocols/jabber/jabber.c:1936
 msgid "Service Unavailable"
 msgstr "弌仍�亢弍舒 仆亠亟仂���仗仆舒"
 
-#: ../libpurple/protocols/jabber/jabber.c:1935
+#: ../libpurple/protocols/jabber/jabber.c:1938
 msgid "Subscription Required"
 msgstr "丐�亠弍�亠��� 仗仂亟仗亳�从舒"
 
-#: ../libpurple/protocols/jabber/jabber.c:1937
+#: ../libpurple/protocols/jabber/jabber.c:1940
 msgid "Unexpected Request"
 msgstr "�亠仗�亠亟于亳亟亠仆仆�亶 亰舒仗�仂�"
 
-#: ../libpurple/protocols/jabber/jabber.c:1945
+#: ../libpurple/protocols/jabber/jabber.c:1948
 msgid "Authorization Aborted"
 msgstr "�于�仂�亳亰舒�亳� 仗�亠�于舒仆舒"
 
-#: ../libpurple/protocols/jabber/jabber.c:1947
+#: ../libpurple/protocols/jabber/jabber.c:1950
 msgid "Incorrect encoding in authorization"
 msgstr "�亠仗�舒于亳仍�仆舒� 从仂亟亳�仂于从舒 于 舒于�仂�亳亰舒�亳亳"
 
-#: ../libpurple/protocols/jabber/jabber.c:1949
+#: ../libpurple/protocols/jabber/jabber.c:1952
 msgid "Invalid authzid"
 msgstr "�亠于亠�仆�亶 亳亟亠仆�亳�亳从舒�仂� 舒于�仂�亳亰舒�亳亳"
 
-#: ../libpurple/protocols/jabber/jabber.c:1951
+#: ../libpurple/protocols/jabber/jabber.c:1954
 msgid "Invalid Authorization Mechanism"
 msgstr "�亠于亠�仆�亶 仄亠�舒仆亳亰仄 舒于�仂�亳亰舒�亳亳"
 
-#: ../libpurple/protocols/jabber/jabber.c:1954
+#: ../libpurple/protocols/jabber/jabber.c:1957
 msgid "Authorization mechanism too weak"
 msgstr "�亠�舒仆亳亰仄 舒于�仂�亳亰舒�亳亳 �仍亳�从仂仄 �仍舒弍"
 
-#: ../libpurple/protocols/jabber/jabber.c:1962
+#: ../libpurple/protocols/jabber/jabber.c:1965
 msgid "Temporary Authentication Failure"
 msgstr "��亠仄亠仆仆舒� 仂�亳弍从舒 舒��亠仆�亳�亳从舒�亳亳"
 
-#: ../libpurple/protocols/jabber/jabber.c:1965
+#: ../libpurple/protocols/jabber/jabber.c:1968
 msgid "Authentication Failure"
 msgstr "��亳弍从舒 舒��亠仆�亳�亳从舒�亳亳"
 
-#: ../libpurple/protocols/jabber/jabber.c:1973
+#: ../libpurple/protocols/jabber/jabber.c:1976
 msgid "Bad Format"
 msgstr "�亠于亠�仆�亶 �仂�仄舒�"
 
-#: ../libpurple/protocols/jabber/jabber.c:1975
+#: ../libpurple/protocols/jabber/jabber.c:1978
 msgid "Bad Namespace Prefix"
 msgstr "�亠于亠�仆�亶 仗�亠�亳从� 仗�仂���舒仆��于舒 亳仄�仆"
 
-#: ../libpurple/protocols/jabber/jabber.c:1978
+#: ../libpurple/protocols/jabber/jabber.c:1981
 msgid "Resource Conflict"
 msgstr "�仂仆�仍亳从� �亠����仂于"
 
-#: ../libpurple/protocols/jabber/jabber.c:1980
+#: ../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:1982
+#: ../libpurple/protocols/jabber/jabber.c:1985
 msgid "Host Gone"
 msgstr "丕亰亠仍 ���仍"
 
-#: ../libpurple/protocols/jabber/jabber.c:1984
+#: ../libpurple/protocols/jabber/jabber.c:1987
 msgid "Host Unknown"
 msgstr "丕亰亠仍 仆亠亳亰于亠��亠仆"
 
-#: ../libpurple/protocols/jabber/jabber.c:1986
+#: ../libpurple/protocols/jabber/jabber.c:1989
 msgid "Improper Addressing"
 msgstr "�亠仗�舒于亳仍�仆舒� 舒亟�亠�舒�亳�"
 
-#: ../libpurple/protocols/jabber/jabber.c:1990
+#: ../libpurple/protocols/jabber/jabber.c:1993
 msgid "Invalid ID"
 msgstr "�亠于亠�仆�亶 ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:1992
+#: ../libpurple/protocols/jabber/jabber.c:1995
 msgid "Invalid Namespace"
 msgstr "�亠于亠�仆仂亠 仗�仂���舒仆��于仂 亳仄�仆"
 
-#: ../libpurple/protocols/jabber/jabber.c:1994
+#: ../libpurple/protocols/jabber/jabber.c:1997
 msgid "Invalid XML"
 msgstr "�亠于亠�仆�亶 XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1996
+#: ../libpurple/protocols/jabber/jabber.c:1999
 msgid "Non-matching Hosts"
 msgstr "�亠�仂�亠�舒亠仄�亠 �亰仍�"
 
-#: ../libpurple/protocols/jabber/jabber.c:2000
+#: ../libpurple/protocols/jabber/jabber.c:2003
 msgid "Policy Violation"
 msgstr "�舒���亠仆亳亠 仗�舒于亳仍"
 
-#: ../libpurple/protocols/jabber/jabber.c:2002
+#: ../libpurple/protocols/jabber/jabber.c:2005
 msgid "Remote Connection Failed"
 msgstr "�亠 �亟舒仍仂�� ���舒仆仂于亳�� �亟舒仍�仆仆仂亠 �仂亠亟亳仆亠仆亳亠"
 
-#: ../libpurple/protocols/jabber/jabber.c:2004
+#: ../libpurple/protocols/jabber/jabber.c:2007
 msgid "Resource Constraint"
 msgstr "�亠亟仂��舒�仂从 �亠����仂于"
 
-#: ../libpurple/protocols/jabber/jabber.c:2006
+#: ../libpurple/protocols/jabber/jabber.c:2009
 msgid "Restricted XML"
 msgstr "�亞�舒仆亳�亠仆仆�亶 XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:2008
+#: ../libpurple/protocols/jabber/jabber.c:2011
 msgid "See Other Host"
 msgstr "�弍�舒�亳�亠�� 从 亟��亞仂仄� �亰仍�"
 
-#: ../libpurple/protocols/jabber/jabber.c:2010
+#: ../libpurple/protocols/jabber/jabber.c:2013
 msgid "System Shutdown"
 msgstr "��从仍��亠仆亳亠 �亳��亠仄�"
 
-#: ../libpurple/protocols/jabber/jabber.c:2012
+#: ../libpurple/protocols/jabber/jabber.c:2015
 msgid "Undefined Condition"
 msgstr "�亠仂仗�亠亟亠仍�仆仆仂亠 �仂��仂�仆亳亠"
 
-#: ../libpurple/protocols/jabber/jabber.c:2014
+#: ../libpurple/protocols/jabber/jabber.c:2017
 msgid "Unsupported Encoding"
 msgstr "�亠仗仂亟亟亠�亢亳于舒亠仄舒� 从仂亟亳�仂于从舒"
 
-#: ../libpurple/protocols/jabber/jabber.c:2016
+#: ../libpurple/protocols/jabber/jabber.c:2019
 msgid "Unsupported Stanza Type"
 msgstr "�亠仗仂亟亟亠�亢亳于舒亠仄�亶 �亳仗 ���仂��"
 
-#: ../libpurple/protocols/jabber/jabber.c:2018
+#: ../libpurple/protocols/jabber/jabber.c:2021
 msgid "Unsupported Version"
 msgstr "�亠仗仂亟亟亠�亢亳于舒亠仄舒� 于亠��亳�"
 
-#: ../libpurple/protocols/jabber/jabber.c:2020
+#: ../libpurple/protocols/jabber/jabber.c:2023
 msgid "XML Not Well Formed"
 msgstr "XML 仆亠 ��仂�仄亳�仂于舒仆 亟仂仍亢仆�仄 仂弍�舒亰仂仄"
 
-#: ../libpurple/protocols/jabber/jabber.c:2022
+#: ../libpurple/protocols/jabber/jabber.c:2025
 msgid "Stream Error"
 msgstr "��亳弍从舒 仗仂�仂从舒"
 
-#: ../libpurple/protocols/jabber/jabber.c:2107
+#: ../libpurple/protocols/jabber/jabber.c:2110
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "�亠 �亟舒���� 于�亞仆舒�� 仗仂仍�亰仂于舒�亠仍� %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2127
+#: ../libpurple/protocols/jabber/jabber.c:2130
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2132
+#: ../libpurple/protocols/jabber/jabber.c:2135
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2151
+#: ../libpurple/protocols/jabber/jabber.c:2154
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2156
+#: ../libpurple/protocols/jabber/jabber.c:2159
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2209
+#: ../libpurple/protocols/jabber/jabber.c:2212
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "�亠 �亟舒���� �亟舒仍亳�� 仗仂仍�亰仂于舒�亠仍� %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2240
+#: ../libpurple/protocols/jabber/jabber.c:2243
 #, fuzzy, c-format
 msgid "Unable to ping user %s"
 msgstr "�亠 �亟舒���� 于�亞仆舒�� 仗仂仍�亰仂于舒�亠仍� %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2258
-#: ../libpurple/protocols/jabber/jabber.c:2269
+#: ../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 ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2264
+#: ../libpurple/protocols/jabber/jabber.c:2267
 #, c-format
 msgid "Unable to buzz, because user %s might be offline."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2295
+#: ../libpurple/protocols/jabber/jabber.c:2298
 #, fuzzy, c-format
 msgid "Unable to buzz, because the user %s does not support it."
 msgstr ""
@@ -6230,86 +6225,86 @@
 
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
-#: ../libpurple/protocols/jabber/jabber.c:2315
+#: ../libpurple/protocols/jabber/jabber.c:2318
 #: ../libpurple/protocols/yahoo/yahoo.c:4163
 msgid "Buzz"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2316
+#: ../libpurple/protocols/jabber/jabber.c:2319
 #: ../libpurple/protocols/jabber/message.c:308
 #: ../libpurple/protocols/yahoo/yahoo.c:4164
 #, c-format
 msgid "%s has buzzed you!"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2316
+#: ../libpurple/protocols/jabber/jabber.c:2319
 #: ../libpurple/protocols/yahoo/yahoo.c:4164
 #, c-format
 msgid "Buzzing %s..."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2347
+#: ../libpurple/protocols/jabber/jabber.c:2350
 msgid "config:  Configure a chat room."
 msgstr "config:  �舒���仂亳�� 从仂仄仆舒��."
 
-#: ../libpurple/protocols/jabber/jabber.c:2351
+#: ../libpurple/protocols/jabber/jabber.c:2354
 msgid "configure:  Configure a chat room."
 msgstr "configure:  �舒���仂亳�� 从仂仄仆舒��."
 
-#: ../libpurple/protocols/jabber/jabber.c:2360
+#: ../libpurple/protocols/jabber/jabber.c:2363
 msgid "part [room]:  Leave the room."
 msgstr "part [从仂仄仆舒�舒]:  �仂从亳仆��� 从仂仄仆舒��."
 
-#: ../libpurple/protocols/jabber/jabber.c:2365
+#: ../libpurple/protocols/jabber/jabber.c:2368
 msgid "register:  Register with a chat room."
 msgstr "register:  �舒�亠亞亳���亳�仂于舒�� 从仂仄仆舒��."
 
-#: ../libpurple/protocols/jabber/jabber.c:2371
+#: ../libpurple/protocols/jabber/jabber.c:2374
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [仆仂于舒� �亠仄舒]:  ��仂�仄仂��亠�� 亳仍亳 亳亰仄亠仆亳�� �亠仄�."
 
-#: ../libpurple/protocols/jabber/jabber.c:2377
+#: ../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:2383
+#: ../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 ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2389
+#: ../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 ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2395
+#: ../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:2401
+#: ../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:2407
+#: ../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:2412
+#: ../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:2418
+#: ../libpurple/protocols/jabber/jabber.c:2421
 msgid "ping &lt;jid&gt;:\tPing a user/component/server."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2423
+#: ../libpurple/protocols/jabber/jabber.c:2426
 #: ../libpurple/protocols/yahoo/yahoo.c:4187
 msgid "buzz: Buzz a user to get their attention"
 msgstr ""
@@ -6346,8 +6341,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 ""
+
+#: ../libpurple/protocols/jabber/libxmpp.c:235
+#: ../libpurple/protocols/myspace/myspace.c:3468
 #: ../libpurple/protocols/simple/simple.c:2105
 msgid "Connect port"
 msgstr "弌仂亠亟亳仆����� 仆舒 仗仂��"
@@ -6355,17 +6354,16 @@
 #. 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
 msgid "Connect server"
 msgstr "弌仂亠亟亳仆����� � �亠�于亠�仂仄"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:236
-#, fuzzy
+#: ../libpurple/protocols/jabber/libxmpp.c:244
 msgid "File transfer proxies"
-msgstr "�仂�� 仗亠�亠亟舒�亳 �舒亶仍仂于"
+msgstr "��仂从�亳 仗亠�亠亟舒�亳 �舒亶仍仂于"
 
 #: ../libpurple/protocols/jabber/message.c:106
 #, c-format
@@ -6517,15 +6515,15 @@
 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 "��弍�舒�� 亟亠亶��于亳亠"
 
-#: ../libpurple/protocols/msn/contact.c:712
+#: ../libpurple/protocols/msn/contact.c:776
 msgid "Unable to retrieve MSN Address Book"
 msgstr "�亠 �亟舒���� 亰舒亞��亰亳�� 舒亟�亠�仆�� 从仆亳亞� MSN"
 
@@ -6848,7 +6846,7 @@
 #: ../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:1424
+#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1448
 #, c-format
 msgid "Authentication failed"
 msgstr "���亠仆�亳�亳从舒�亳� 亰舒于亠��亳仍舒�� 仆亠�亟舒�仆仂"
@@ -6913,69 +6911,69 @@
 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 ""
 
-#: ../libpurple/protocols/msn/msn.c:351 ../libpurple/protocols/msnp9/msn.c:348
+#: ../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:357 ../libpurple/protocols/msnp9/msn.c:354
+#: ../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 ""
 
-#: ../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:3134
@@ -6983,7 +6981,7 @@
 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
@@ -6997,13 +6995,13 @@
 msgid "Busy"
 msgstr "�舒仆��"
 
-#: ../libpurple/protocols/msn/msn.c:707 ../libpurple/protocols/msnp9/msn.c:602
+#: ../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/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"
@@ -7015,354 +7013,354 @@
 #. 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 ""
 
-#: ../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:3802
 #: ../libpurple/protocols/qq/buddy_info.c:45
 #: ../libpurple/protocols/qq/qq.c:222
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1087
+#: ../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:1102
+#: ../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:1082
+#: ../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:1092
+#: ../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:1144
+#: ../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/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 "�亠��仂仆舒仍�仆�亶 e-mail"
 
-#: ../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 ""
 
-#: ../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/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/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 "�舒弍仂�亳亶 e-mail"
 
-#: ../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 ""
 
-#: ../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
+#: ../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 ""
 
-#: ../libpurple/protocols/msn/msn.c:2020
-#: ../libpurple/protocols/msnp9/msn.c:1876
+#: ../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:1246
+#: ../libpurple/protocols/msn/msn.c:2042
+#: ../libpurple/protocols/msnp9/msn.c:1883
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1247
 msgid "Profile URL"
 msgstr "URL 仗�仂�亳仍�"
 
@@ -7376,27 +7374,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
 #, fuzzy
 msgid "HTTP Method Server"
 msgstr "丐亠��仂于�亶 �亠�于亠� IPC"
 
-#: ../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 ""
@@ -7449,7 +7447,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 "�亠 �亟舒���� 亟仂弍舒于亳�� 仗仂仍�亰仂于舒�亠仍�"
 
@@ -7488,17 +7486,17 @@
 msgid "Service Temporarily Unavailable."
 msgstr "弌仍�亢弍舒 于�亠仄亠仆仆仂 仆亠亟仂���仗仆舒."
 
-#: ../libpurple/protocols/msn/notification.c:1276
+#: ../libpurple/protocols/msn/notification.c:1332
 #: ../libpurple/protocols/msnp9/notification.c:898
 msgid "Unable to rename group"
 msgstr "�亠 �亟舒���� 仗亠�亠亳仄亠仆仂于舒�� 亞��仗仗�"
 
-#: ../libpurple/protocols/msn/notification.c:1331
+#: ../libpurple/protocols/msn/notification.c:1387
 #: ../libpurple/protocols/msnp9/notification.c:953
 msgid "Unable to delete group"
 msgstr "�亠 �亟舒���� �亟舒仍亳�� 亞��仗仗�"
 
-#: ../libpurple/protocols/msn/notification.c:1945
+#: ../libpurple/protocols/msn/notification.c:2001
 #: ../libpurple/protocols/msnp9/notification.c:1372
 #, c-format
 msgid ""
@@ -7708,13 +7706,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 "丕从舒亰舒仆仆�亶 亳亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍� 仆亠亟仂仗���亳仄."
@@ -7758,74 +7756,74 @@
 msgid "Reading challenge"
 msgstr "��亳弍从舒 ��亠仆亳�"
 
-#: ../libpurple/protocols/myspace/myspace.c:353
+#: ../libpurple/protocols/myspace/myspace.c:355
 #, fuzzy
 msgid "Unexpected challenge length from server"
 msgstr "�亠于亠�仆�亶 亰舒仗�仂� � �亠�于亠�舒"
 
-#: ../libpurple/protocols/myspace/myspace.c:357
+#: ../libpurple/protocols/myspace/myspace.c:359
 #, fuzzy
 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 ""
 
 #. Can't write _()'d strings in array initializers. Workaround.
-#: ../libpurple/protocols/myspace/myspace.c:1365
+#: ../libpurple/protocols/myspace/myspace.c:1367
 #, fuzzy
 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
 #, fuzzy
 msgid "MySpaceIM - No Username Set"
 msgstr "�亠� 亳仄亠仆亳"
 
-#: ../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
+#: ../libpurple/protocols/myspace/myspace.c:1870
 #, c-format
 msgid ""
 "%s Your password is %d characters, greater than the expected maximum length "
@@ -7834,137 +7832,137 @@
 "again."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:1891
+#: ../libpurple/protocols/myspace/myspace.c:1893
 msgid "MySpaceIM Error"
 msgstr ""
 
-#: ../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
 #, fuzzy
 msgid "'addbuddy' command failed."
 msgstr "�舒亞��亰亳�� �仗亳�仂从 �仂弍亠�亠亟仆亳从仂于 亳亰 �舒亶仍舒..."
 
-#: ../libpurple/protocols/myspace/myspace.c:2103
-#: ../libpurple/protocols/myspace/myspace.c:2348
+#: ../libpurple/protocols/myspace/myspace.c:2105
+#: ../libpurple/protocols/myspace/myspace.c:2350
 #, fuzzy
 msgid "persist command failed"
 msgstr "��亳弍从舒 从仂仄仄��舒�亳仂仆仆仂亶 仗舒仆亠仍亳"
 
-#: ../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
 #, fuzzy
 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 ""
 
-#: ../libpurple/protocols/myspace/myspace.c:2370
+#: ../libpurple/protocols/myspace/myspace.c:2372
 #, fuzzy
 msgid "blocklist command failed"
 msgstr "��亳弍从舒 从仂仄仄��舒�亳仂仆仆仂亶 仗舒仆亠仍亳"
 
-#: ../libpurple/protocols/myspace/myspace.c:2484
+#: ../libpurple/protocols/myspace/myspace.c:2486
 #, fuzzy
 msgid "Invalid input condition"
 msgstr "�舒于亠��亠仆亳亠 ���舒仆仂于仍亠仆亳� �仂亠亟亳仆亠仆亳�"
 
-#: ../libpurple/protocols/myspace/myspace.c:2539
+#: ../libpurple/protocols/myspace/myspace.c:2541
 #, fuzzy
 msgid "Read buffer full (2)"
 msgstr "��亠�亠亟� 仗仂仍仆舒"
 
-#: ../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
 #, fuzzy
 msgid "IM Friends"
 msgstr "�从仆舒 _仄亞仆仂于亠仆仆�� �仂仂弍�亠仆亳亶"
 
-#: ../libpurple/protocols/myspace/myspace.c:2931
+#: ../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 ""
 
-#: ../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
 #, fuzzy
 msgid "Importing friends failed"
 msgstr "�亠 �亟舒仍仂�� 仗亠�亠亟舒�� �于亠亟仂仄仍亠仆亳亠"
 
 #. TODO: find out how
-#: ../libpurple/protocols/myspace/myspace.c:3041
+#: ../libpurple/protocols/myspace/myspace.c:3043
 #, fuzzy
 msgid "Find people..."
 msgstr "�舒亶�亳 �仂弍亠�亠亟仆亳从仂于..."
 
-#: ../libpurple/protocols/myspace/myspace.c:3044
+#: ../libpurple/protocols/myspace/myspace.c:3046
 #, fuzzy
 msgid "Change IM name..."
 msgstr "�亰仄亠仆亳�� 仗舒�仂仍�..."
 
-#: ../libpurple/protocols/myspace/myspace.c:3345
+#: ../libpurple/protocols/myspace/myspace.c:3347
 msgid "myim URL handler"
 msgstr ""
 
-#: ../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 ""
 
-#: ../libpurple/protocols/myspace/myspace.c:3347
+#: ../libpurple/protocols/myspace/myspace.c:3349
 msgid "Enable the proper MySpaceIM account and try again."
 msgstr ""
 
-#: ../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
 #, fuzzy
 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 ""
 
@@ -7985,9 +7983,8 @@
 msgstr "_�仄�:"
 
 #: ../libpurple/protocols/myspace/user.c:153
-#, fuzzy
 msgid "Song"
-msgstr "�于�从亳"
+msgstr "�亠�仆�"
 
 #: ../libpurple/protocols/myspace/user.c:162
 msgid "Total Friends"
@@ -7999,9 +7996,8 @@
 
 #. Protocol won't log in now without a username set.. Disconnect
 #: ../libpurple/protocols/myspace/user.c:570
-#, fuzzy
 msgid "No username set"
-msgstr "�亠� 亳仄亠仆亳"
+msgstr "�亠 亰舒亟舒仆仂 亳仄� 仗仂仍�亰仂于舒�亠仍�"
 
 #: ../libpurple/protocols/myspace/user.c:577
 #: ../libpurple/protocols/myspace/user.c:671
@@ -8026,14 +8022,12 @@
 msgstr ""
 
 #: ../libpurple/protocols/myspace/user.c:672
-#, fuzzy
 msgid "This username is unavailable."
-msgstr "亅�舒 �亠仄舒 仆亠 亳仄亠亠� 亟仂���仗仆�� �仄舒亶仍亳从仂于."
+msgstr "亅�仂 亳仄� 仗仂仍�亰仂于舒�亠仍� 仆亠亟仂���仗仆仂."
 
 #: ../libpurple/protocols/myspace/user.c:673
-#, fuzzy
 msgid "Please try another username:"
-msgstr "�于亠亟亳�亠 仆仂于仂亠 亳仄� 亟仍� %s"
+msgstr "�仂仗�仂弍�亶�亠 亟��亞仂亠 亳仄� 仗仂仍�亰仂于舒�亠仍�:"
 
 #. TODO: icons for each zap
 #. Lots of comments for translators:
@@ -8446,7 +8440,7 @@
 msgstr ""
 
 #: ../libpurple/protocols/novell/novell.c:1511
-#: ../libpurple/protocols/sametime/sametime.c:4176
+#: ../libpurple/protocols/sametime/sametime.c:4177
 msgid "User ID"
 msgstr "�仂仍�亰仂于舒�亠仍��从亳亶 ID"
 
@@ -8556,29 +8550,27 @@
 msgstr "�仂�� �亠�于亠�舒"
 
 #: ../libpurple/protocols/oscar/family_chatnav.c:62
-#, fuzzy
 msgid "Could not join chat room"
-msgstr "�亠 �亟舒仍仂�� ���舒仆仂于亳�� �仂亠亟亳仆亠仆亳亠"
+msgstr "�亠 �亟舒仍仂�� 仗�亳�仂亠亟亳仆亳���� 从 �舒��"
 
 #: ../libpurple/protocols/oscar/family_chatnav.c:63
-#, fuzzy
 msgid "Invalid chat room name"
-msgstr "�亠于亠�仆仂亠 亳仄� 从仂仄仆舒��"
+msgstr "�亠于亠�仆仂亠 亳仄� �舒�舒"
 
 #: ../libpurple/protocols/oscar/flap_connection.c:391
 #: ../libpurple/protocols/yahoo/yahoo.c:2505
 #: ../libpurple/protocols/yahoo/yahoo.c:2673
 #: ../libpurple/protocols/yahoo/ycht.c:482 ../libpurple/proxy.c:609
-#: ../libpurple/proxy.c:1160 ../libpurple/proxy.c:1269
-#: ../libpurple/proxy.c:1369 ../libpurple/proxy.c:1497
+#: ../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:2498
 #: ../libpurple/protocols/yahoo/yahoo.c:2666 ../libpurple/proxy.c:621
-#: ../libpurple/proxy.c:1172 ../libpurple/proxy.c:1281
-#: ../libpurple/proxy.c:1381 ../libpurple/proxy.c:1509
+#: ../libpurple/proxy.c:1173 ../libpurple/proxy.c:1282
+#: ../libpurple/proxy.c:1388 ../libpurple/proxy.c:1541
 #, c-format
 msgid ""
 "Lost connection with server:\n"
@@ -8588,9 +8580,9 @@
 "%s"
 
 #: ../libpurple/protocols/oscar/flap_connection.c:396
-#: ../libpurple/proxy.c:1189 ../libpurple/proxy.c:1294
-#: ../libpurple/proxy.c:1393 ../libpurple/proxy.c:1465
-#: ../libpurple/proxy.c:1522
+#: ../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 "��亳 �仂亠亟亳仆亠仆亳亳 � �亠�于亠�仂仄 仗仂仍��亠仆� 仆亠亟仂仗���亳仄�亠 亟舒仆仆�亠."
 
@@ -8783,7 +8775,7 @@
 #. Label
 #: ../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 "�仆舒�仂从 �仂弍亠�亠亟仆亳从舒"
 
@@ -8889,7 +8881,7 @@
 #: ../libpurple/protocols/oscar/oscar.c:736
 #, c-format
 msgid "Web Aware"
-msgstr "弌�舒��� 仆舒 于亠弍-���舒仆亳�舒�"
+msgstr "弌�舒��� 仆舒 web-���舒仆亳�舒�"
 
 #: ../libpurple/protocols/oscar/oscar.c:738 ../libpurple/protocols/qq/qq.c:184
 #: ../libpurple/protocols/qq/qq.c:289
@@ -8933,9 +8925,8 @@
 "%s"
 
 #: ../libpurple/protocols/oscar/oscar.c:1044
-#, fuzzy
 msgid "Username sent"
-msgstr "�亠� 亳仄亠仆亳"
+msgstr "�仄� 仗仂仍�亰仂于舒�亠仍� 仂�仗�舒于仍亠仆仂"
 
 #: ../libpurple/protocols/oscar/oscar.c:1049
 msgid "Connection established, cookie sent"
@@ -8956,9 +8947,8 @@
 
 #. Unregistered screen name
 #: ../libpurple/protocols/oscar/oscar.c:1392
-#, fuzzy
 msgid "Invalid username."
-msgstr "�亠于亠�仆仂亠 亳仄�"
+msgstr "�亠于亠�仆仂亠 亳仄� 仗仂仍�亰仂于舒�亠仍�."
 
 #: ../libpurple/protocols/oscar/oscar.c:1398
 #: ../libpurple/protocols/qq/login_logout.c:485
@@ -9021,7 +9011,7 @@
 #: ../libpurple/protocols/oscar/oscar.c:2300
 #: ../libpurple/protocols/oscar/oscar.c:2349
 #: ../libpurple/protocols/oscar/oscar.c:6014
-#: ../libpurple/protocols/oscar/oscar.c:6295 ../libpurple/request.h:1458
+#: ../libpurple/protocols/oscar/oscar.c:6296 ../libpurple/request.h:1401
 msgid "_OK"
 msgstr "_OK"
 
@@ -9235,7 +9225,7 @@
 msgstr "��亳�亳仆舒 仆亠亳亰于亠��仆舒."
 
 #: ../libpurple/protocols/oscar/oscar.c:2867
-#: ../libpurple/protocols/sametime/sametime.c:2459
+#: ../libpurple/protocols/sametime/sametime.c:2460
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "�亠 �亟舒���� 仂�仗�舒于亳�� �仂仂弍�亠仆亳亠 亟仍� %s:"
@@ -9250,7 +9240,7 @@
 msgstr "� �亠�亳 �"
 
 #: ../libpurple/protocols/oscar/oscar.c:2969
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1191
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1192
 msgid "Member Since"
 msgstr "丼仍亠仆 �"
 
@@ -9293,7 +9283,7 @@
 
 #: ../libpurple/protocols/oscar/oscar.c:3806
 msgid "Personal Web Page"
-msgstr "�亠��仂仆舒仍�仆舒� Web-���舒仆亳�舒"
+msgstr "�亠��仂仆舒仍�仆舒� web-���舒仆亳�舒"
 
 #: ../libpurple/protocols/oscar/oscar.c:3830
 #: ../libpurple/protocols/qq/buddy_info.c:40
@@ -9326,12 +9316,12 @@
 msgstr "��仗仍�于舒��亠亠 �仂仂弍�亠仆亳亠"
 
 #: ../libpurple/protocols/oscar/oscar.c:3964
-#, fuzzy, c-format
+#, c-format
 msgid "The following username is associated with %s"
 msgid_plural "The following usernames are associated with %s"
-msgstr[0] "弌仍亠亟���亳亶 亳亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍� �仂仂�仆亠��仆 � %s"
-msgstr[1] "弌仍亠亟���亳亠 亳亟亠仆�亳�亳从舒�仂�� 仗仂仍�亰仂于舒�亠仍亠亶 �仂仂�仆亠�亠仆� � %s"
-msgstr[2] "弌仍亠亟���亳亠 亳亟亠仆�亳�亳从舒�仂�� 仗仂仍�亰仂于舒�亠仍亠亶 �仂仂�仆亠�亠仆� � %s"
+msgstr[0] "弌仍亠亟���亠亠 亳仄� 仗仂仍�亰仂于舒�亠仍� �仂仂�仆亠�亠仆仂 � %s"
+msgstr[1] "弌仍亠亟���亳亠 亳仄亠仆舒 仗仂仍�亰仂于舒�亠仍亠亶 �仂仂�仆亠�亠仆� � %s"
+msgstr[2] "弌仍亠亟���亳亠 亳仄亠仆舒 仗仂仍�亰仂于舒�亠仍亠亶 �仂仂�仆亠�亠仆� � %s"
 
 #: ../libpurple/protocols/oscar/oscar.c:3995
 #, c-format
@@ -9521,7 +9511,7 @@
 "list.  Please remove one and try again."
 msgstr ""
 "�亠 �亟舒仍仂�� 亟仂弍舒于亳�� �仂弍亠�亠亟仆亳从舒 %s, �舒从 从舒从 于 �仗亳�从亠 �仂弍亠�亠亟仆亳从仂于 �仍亳�从仂仄 "
-"仄仆仂亞仂 �仂弍亠�亠亟仆亳从仂于. 丕亟舒仍亳�亠 仂亟亳仆 亳 仗仂仗��舒亶�亠�� �仆仂于舒."
+"仄仆仂亞仂 �仂弍亠�亠亟仆亳从仂于. 丕亟舒仍亳�亠 仂亟仆仂亞仂 亳 仗仂仗��舒亶�亠�� �仆仂于舒."
 
 #: ../libpurple/protocols/oscar/oscar.c:5153
 #: ../libpurple/protocols/oscar/oscar.c:5168
@@ -9649,36 +9639,36 @@
 
 #: ../libpurple/protocols/oscar/oscar.c:6215
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
-msgstr "弌�舒��� 仆舒 于亠弍-���舒仆亳�舒� (于�亰�于舒亠� 仗仂�于仍亠仆亳亠 弌����!)"
+msgstr "弌�舒��� 仆舒 web-���舒仆亳�舒� (于�亰�于舒亠� 仗仂�于仍亠仆亳亠 弌����!)"
 
 #: ../libpurple/protocols/oscar/oscar.c:6220
 msgid "ICQ Privacy Options"
 msgstr "�舒�舒仄亠��� 从仂仆�亳亟亠仆�亳舒仍�仆仂��亳 ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:6239
+#: ../libpurple/protocols/oscar/oscar.c:6240
 msgid "The new formatting is invalid."
 msgstr "�仂于仂亠 �仂�仄舒�亳�仂于舒仆亳亠 仆亠亟仂仗���亳仄仂."
 
-#: ../libpurple/protocols/oscar/oscar.c:6240
+#: ../libpurple/protocols/oscar/oscar.c:6241
 #, fuzzy
 msgid "Username formatting can change only capitalization and whitespace."
 msgstr ""
 "个仂�仄舒�亳�仂于舒仆亳亠 亳亟亠仆�亳�亳从舒�仂�舒 仗仂仍�亰仂于舒�亠仍� 仄仂亢亠� 于仍亳��� �仂仍�从仂 仆舒 �亠亞亳��� "
 "弍�从于 亳 仗�仂弍亠仍�."
 
-#: ../libpurple/protocols/oscar/oscar.c:6293
+#: ../libpurple/protocols/oscar/oscar.c:6294
 msgid "Change Address To:"
 msgstr "�亰仄亠仆亳�� 舒亟�亠� 仆舒:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6339
+#: ../libpurple/protocols/oscar/oscar.c:6340
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>于� 仆亠 仂亢亳亟舒亠�亠 舒于�仂�亳亰舒�亳�</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6342
+#: ../libpurple/protocols/oscar/oscar.c:6343
 msgid "You are awaiting authorization from the following buddies"
 msgstr "�� 仂亢亳亟舒亠�亠 舒于�仂�亳亰舒�亳� 仂� �仍亠亟���亳� �仂弍亠�亠亟仆亳从仂于"
 
-#: ../libpurple/protocols/oscar/oscar.c:6343
+#: ../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.\""
@@ -9686,65 +9676,65 @@
 "�� 仄仂亢亠�亠 亰舒仗�仂�亳�� 舒于�仂�亳亰舒�亳� 仂� ��亳� �仂弍亠�亠亟仆亳从仂于 仗仂于�仂�仆仂, ��仍从仆�于 仆舒 "
 "仆亳� 仗�舒于仂亶 从仆仂仗从仂亶 仄��亳 亳 于�弍�舒于 \"�仂于�仂�仆�亶 亰舒仗�仂� 舒于�仂�亳亰舒�亳亳\"."
 
-#: ../libpurple/protocols/oscar/oscar.c:6360
+#: ../libpurple/protocols/oscar/oscar.c:6361
 msgid "Find Buddy by E-Mail"
 msgstr "�舒亶�亳 �仂弍亠�亠亟仆亳从舒 仗仂 e-mail"
 
-#: ../libpurple/protocols/oscar/oscar.c:6361
+#: ../libpurple/protocols/oscar/oscar.c:6362
 msgid "Search for a buddy by e-mail address"
 msgstr "��从舒�� �仂弍亠�亠亟仆亳从舒 仗仂 舒亟�亠�� e-mail"
 
-#: ../libpurple/protocols/oscar/oscar.c:6362
+#: ../libpurple/protocols/oscar/oscar.c:6363
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "�于亠亟亳�亠 舒亟�亠� e-mail �仂弍亠�亠亟仆亳从舒, 从仂�仂�仂亞仂 于� 亳�亠�亠."
 
-#: ../libpurple/protocols/oscar/oscar.c:6365
+#: ../libpurple/protocols/oscar/oscar.c:6366
 msgid "_Search"
 msgstr "_��从舒��"
 
-#: ../libpurple/protocols/oscar/oscar.c:6523
-msgid "Set User Info (URL)..."
-msgstr "丕��舒仆仂于亳�� 仗仂仍�亰仂于舒�亠仍��从�� 亳仆�仂�仄舒�亳� (URL)..."
-
-#: ../libpurple/protocols/oscar/oscar.c:6534
-msgid "Change Password (URL)"
-msgstr "�亰仄亠仆亳�� 仗舒�仂仍� (URL)"
-
-#: ../libpurple/protocols/oscar/oscar.c:6538
-msgid "Configure IM Forwarding (URL)"
-msgstr "�舒���仂亳�� 仗亠�亠仆舒仗�舒于仍亠仆亳亠 �仂仂弍�亠仆亳亶 (URL)"
+#: ../libpurple/protocols/oscar/oscar.c:6524
+msgid "Set User Info (web)..."
+msgstr "丕��舒仆仂于亳�� 仗仂仍�亰仂于舒�亠仍��从�� 亳仆�仂�仄舒�亳� (web)..."
+
+#: ../libpurple/protocols/oscar/oscar.c:6535
+msgid "Change Password (web)"
+msgstr "�亰仄亠仆亳�� 仗舒�仂仍� (web)"
+
+#: ../libpurple/protocols/oscar/oscar.c:6539
+msgid "Configure IM Forwarding (web)"
+msgstr "�舒���仂亳�� 仗亠�亠舒亟�亠�舒�亳� 仄亞仆仂于亠仆仆�� �仂仂弍�亠仆亳亶 (web)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6548
+#: ../libpurple/protocols/oscar/oscar.c:6549
 msgid "Set Privacy Options..."
 msgstr "丕��舒仆仂于亳�� 仗舒�舒仄亠��� 从仂仆�亳亟亠仆�亳舒仍�仆仂��亳..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6555
+#: ../libpurple/protocols/oscar/oscar.c:6556
 msgid "Confirm Account"
 msgstr "�仂亟�于亠�亟亳�� ����仆�� 亰舒仗亳��"
 
-#: ../libpurple/protocols/oscar/oscar.c:6559
+#: ../libpurple/protocols/oscar/oscar.c:6560
 msgid "Display Currently Registered E-Mail Address"
 msgstr "�仂从舒亰舒�� �亠从��亳亶 亰舒�亠亞亳���亳�仂于舒仆仆�亶 舒亟�亠� e-mail"
 
-#: ../libpurple/protocols/oscar/oscar.c:6563
+#: ../libpurple/protocols/oscar/oscar.c:6564
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "�亰仄亠仆亳�� �亠从��亳亶 亰舒�亠亞亳���亳�仂于舒仆仆�亶 舒亟�亠� e-mail..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6570
+#: ../libpurple/protocols/oscar/oscar.c:6571
 msgid "Show Buddies Awaiting Authorization"
 msgstr "�仂从舒亰舒�� �仂弍亠�亠亟仆亳从仂于 弍亠亰 舒于�仂�亳亰舒�亳亳"
 
-#: ../libpurple/protocols/oscar/oscar.c:6576
+#: ../libpurple/protocols/oscar/oscar.c:6577
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "��从舒�� �仂弍亠�亠亟仆亳从舒 仗仂 舒亟�亠�� e-mail..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6581
+#: ../libpurple/protocols/oscar/oscar.c:6582
 msgid "Search for Buddy by Information"
 msgstr "��从舒�� �仂弍亠�亠亟仆亳从舒 仗仂 亳仆�仂�仄舒�亳亳"
 
-#: ../libpurple/protocols/oscar/oscar.c:6769
+#: ../libpurple/protocols/oscar/oscar.c:6770
 #, fuzzy
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
@@ -10422,165 +10412,165 @@
 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 ""
 
-#: ../libpurple/protocols/sametime/sametime.c:1295
+#: ../libpurple/protocols/sametime/sametime.c:1296
 #, c-format
 msgid "Info for Group %s"
 msgstr "�仆�仂�仄舒�亳� 亟仍� 亞��仗仗� %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:1297
+#: ../libpurple/protocols/sametime/sametime.c:1298
 msgid "Notes Address Book Information"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:1329
+#: ../libpurple/protocols/sametime/sametime.c:1330
 msgid "Invite Group to Conference..."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:1339
+#: ../libpurple/protocols/sametime/sametime.c:1340
 msgid "Get Notes Address Book Info"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:1506
+#: ../libpurple/protocols/sametime/sametime.c:1507
 msgid "Sending Handshake"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:1511
+#: ../libpurple/protocols/sametime/sametime.c:1512
 msgid "Waiting for Handshake Acknowledgement"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:1516
+#: ../libpurple/protocols/sametime/sametime.c:1517
 msgid "Handshake Acknowledged, Sending Login"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:1521
+#: ../libpurple/protocols/sametime/sametime.c:1522
 msgid "Waiting for Login Acknowledgement"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:1526
+#: ../libpurple/protocols/sametime/sametime.c:1527
 msgid "Login Redirected"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:1532
+#: ../libpurple/protocols/sametime/sametime.c:1533
 msgid "Forcing Login"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:1536
+#: ../libpurple/protocols/sametime/sametime.c:1537
 msgid "Login Acknowledged"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:1541
+#: ../libpurple/protocols/sametime/sametime.c:1542
 msgid "Starting Services"
 msgstr "�舒仗��从 �仍�亢弍"
 
-#: ../libpurple/protocols/sametime/sametime.c:1678
+#: ../libpurple/protocols/sametime/sametime.c:1679
 #, c-format
 msgid ""
 "A Sametime administrator has issued the following announcement on server %s"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:1683
+#: ../libpurple/protocols/sametime/sametime.c:1684
 msgid "Sametime Administrator Announcement"
 msgstr ""
 
-#: ../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
+#: ../libpurple/protocols/sametime/sametime.c:3431
 msgid "Create conference with user"
 msgstr "弌仂亰亟舒�� 从仂仆�亠�亠仆�亳� � 仗仂仍�亰仂于舒�亠仍亠仄"
 
-#: ../libpurple/protocols/sametime/sametime.c:3431
+#: ../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 ""
 
-#: ../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
+#: ../libpurple/protocols/sametime/sametime.c:3516
 msgid "Invite user to a conference"
 msgstr "��亳亞仍舒�亳�� 仗仂仍�亰仂于舒�亠仍� 于 从仂仆�亠�亠仆�亳�"
 
-#: ../libpurple/protocols/sametime/sametime.c:3516
+#: ../libpurple/protocols/sametime/sametime.c:3517
 #, c-format
 msgid ""
 "Select a conference from the list below to send an invite to user %s. Select "
@@ -10588,69 +10578,69 @@
 "this user to."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3521
+#: ../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:4426
+#: ../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 ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3689
+#: ../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 ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3694
+#: ../libpurple/protocols/sametime/sametime.c:3695
 msgid "Meanwhile Connection Setup"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3695
+#: ../libpurple/protocols/sametime/sametime.c:3696
 msgid "No Sametime Community Server Specified"
 msgstr ""
 
-#: ../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 ID"
 
-#: ../libpurple/protocols/sametime/sametime.c:4382
+#: ../libpurple/protocols/sametime/sametime.c:4383
 msgid "An ambiguous user ID was entered"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:4383
+#: ../libpurple/protocols/sametime/sametime.c:4384
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
@@ -10660,22 +10650,22 @@
 "��弍亠�亳�亠 亳亰 �仗亳�从舒 仆亳亢亠 仂亟仆仂亞仂 亳亰 仆亳� 亟仍� 亟仂弍舒于仍亠仆亳� 亠亞仂 于 �仗亳�仂从 "
 "�仂弍亠�亠亟仆亳从仂于."
 
-#: ../libpurple/protocols/sametime/sametime.c:4388
+#: ../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
+#: ../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 ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5065
+#: ../libpurple/protocols/sametime/sametime.c:5066
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -10684,63 +10674,63 @@
 "��亳弍从舒 ��亠仆亳� �舒亶仍舒 %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 ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5443
+#: ../libpurple/protocols/sametime/sametime.c:5444
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -10748,37 +10738,37 @@
 "to your buddy list."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5448
+#: ../libpurple/protocols/sametime/sametime.c:5449
 msgid "Select Notes Address Book"
 msgstr ""
 
-#: ../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
+#: ../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 ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5534
+#: ../libpurple/protocols/sametime/sametime.c:5535
 msgid "Notes Address Book Group"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5535
+#: ../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 ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5584
+#: ../libpurple/protocols/sametime/sametime.c:5585
 #, c-format
 msgid "Search results for '%s'"
 msgstr "�亠亰�仍��舒�� 仗仂亳�从舒 亟仍� '%s'"
 
-#: ../libpurple/protocols/sametime/sametime.c:5585
+#: ../libpurple/protocols/sametime/sametime.c:5586
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -10789,59 +10779,59 @@
 "仄仂亢亠�亠 亟仂弍舒于亳�� ��亳� 仗仂仍�亰仂于舒�亠仍亠亶 于 �仗亳�仂从 �仂弍亠�亠亟仆亳从仂于 亳仍亳 仂�仗�舒于亳�� 亳仄 "
 "�仂仂弍�亠仆亳� � 仗仂仄仂��� 从仆仂仗仂从 亟亠亶��于亳� 仆亳亢亠."
 
-#: ../libpurple/protocols/sametime/sametime.c:5592 ../pidgin/gtknotify.c:770
+#: ../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 ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5622
+#: ../libpurple/protocols/sametime/sametime.c:5623
 msgid "No Matches"
 msgstr "�亠� �仂于仗舒亟亠仆亳亶"
 
-#: ../libpurple/protocols/sametime/sametime.c:5659
+#: ../libpurple/protocols/sametime/sametime.c:5660
 msgid "Search for a user"
 msgstr "��从舒�� 仗仂仍�亰仂于舒�亠仍�"
 
-#: ../libpurple/protocols/sametime/sametime.c:5660
+#: ../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 ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5663
+#: ../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 ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5680
+#: ../libpurple/protocols/sametime/sametime.c:5681
 msgid "Export Sametime List..."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5684
+#: ../libpurple/protocols/sametime/sametime.c:5685
 msgid "Add Notes Address Book Group..."
 msgstr ""
 
-#: ../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 ""
 
@@ -10972,8 +10962,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
@@ -10982,8 +10972,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
@@ -11007,11 +10997,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
@@ -11022,8 +11012,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
@@ -11224,35 +11214,35 @@
 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
@@ -11261,7 +11251,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"
@@ -11288,7 +11278,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"
@@ -11437,7 +11427,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
@@ -11638,12 +11628,12 @@
 msgid "Cannot send file"
 msgstr "�亠 �亟舒���� 仂�仗�舒于亳�� �舒亶仍"
 
-#: ../libpurple/protocols/silc/ops.c:57
+#: ../libpurple/protocols/silc/ops.c:76
 msgid "Error occurred"
 msgstr "��仂亳亰仂�仍舒 仂�亳弍从舒"
 
-#: ../libpurple/protocols/silc/ops.c:533 ../libpurple/protocols/silc/ops.c:542
-#: ../libpurple/protocols/silc/ops.c:551
+#: ../libpurple/protocols/silc/ops.c:548 ../libpurple/protocols/silc/ops.c:557
+#: ../libpurple/protocols/silc/ops.c:566
 #: ../libpurple/protocols/silc10/ops.c:554
 #: ../libpurple/protocols/silc10/ops.c:563
 #: ../libpurple/protocols/silc10/ops.c:572
@@ -11651,38 +11641,38 @@
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr "%s 亳亰仄亠仆亳仍 �亠仄� <I>%s</I> 仆舒: %s"
 
-#: ../libpurple/protocols/silc/ops.c:617
+#: ../libpurple/protocols/silc/ops.c:632
 #: ../libpurple/protocols/silc10/ops.c:638
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr "<I>%s</I> ���舒仆仂于亳仍 �亠亢亳仄 从舒仆舒仍舒 <I>%s</I> 于: %s"
 
-#: ../libpurple/protocols/silc/ops.c:621
+#: ../libpurple/protocols/silc/ops.c:636
 #: ../libpurple/protocols/silc10/ops.c:642
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr "<I>%s</I> �仆�仍 于�亠 �亠亢亳仄� 从舒仆舒仍舒 <I>%s</I>"
 
-#: ../libpurple/protocols/silc/ops.c:654
+#: ../libpurple/protocols/silc/ops.c:669
 #: ../libpurple/protocols/silc10/ops.c:675
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr "<I>%s</I> ���舒仆仂于亳仍 �亠亢亳仄� <I>%s</I> 于: %s"
 
-#: ../libpurple/protocols/silc/ops.c:662
+#: ../libpurple/protocols/silc/ops.c:677
 #: ../libpurple/protocols/silc10/ops.c:683
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr "<I>%s</I> �仆�仍 于�亠 �亠亢亳仄� <I>%s</I>"
 
-#: ../libpurple/protocols/silc/ops.c:691
+#: ../libpurple/protocols/silc/ops.c:706
 #: ../libpurple/protocols/silc10/ops.c:712
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "�� 弍�仍亳 �亟舒仍亠仆� 亳亰 <I>%s</I> 仂仗亠�舒�仂�仂仄 <I>%s</I> (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:718 ../libpurple/protocols/silc/ops.c:723
-#: ../libpurple/protocols/silc/ops.c:728
+#: ../libpurple/protocols/silc/ops.c:733 ../libpurple/protocols/silc/ops.c:738
+#: ../libpurple/protocols/silc/ops.c:743
 #: ../libpurple/protocols/silc10/ops.c:742
 #: ../libpurple/protocols/silc10/ops.c:747
 #: ../libpurple/protocols/silc10/ops.c:752
@@ -11690,8 +11680,8 @@
 msgid "You have been killed by %s (%s)"
 msgstr "�� 弍�仍亳 �弍亳�� 仂仗亠�舒�仂�仂仄 %s (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:749 ../libpurple/protocols/silc/ops.c:754
-#: ../libpurple/protocols/silc/ops.c:759
+#: ../libpurple/protocols/silc/ops.c:764 ../libpurple/protocols/silc/ops.c:769
+#: ../libpurple/protocols/silc/ops.c:774
 #: ../libpurple/protocols/silc10/ops.c:773
 #: ../libpurple/protocols/silc10/ops.c:778
 #: ../libpurple/protocols/silc10/ops.c:783
@@ -11699,157 +11689,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:1077
+#: ../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 ""
@@ -11870,36 +11860,36 @@
 "Total router operators: %d\n"
 msgstr ""
 
-#: ../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
@@ -11907,17 +11897,17 @@
 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 "丐�亠弍�亠��� 仗舒�仂仍�仆舒� ��舒亰舒"
@@ -11979,8 +11969,8 @@
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
-"�亠 �亟舒仍仂�� 于仂亰仂弍仆仂于亳�� 仗�亠�于舒仆仆�� �亠��亳�. �舒亢仄亳�亠 \"�亠�亠�仂亠亟亳仆亠仆亳亠\" 亟仍� "
-"�仂亰亟舒仆亳� 仆仂于仂亞仂 �仂亠亟亳仆亠仆亳�."
+"�亠 �亟舒仍仂�� 于仂亰仂弍仆仂于亳�� 仗�亠�于舒仆仆�� �亠��亳�. �舒亢仄亳�亠 \"�亠�亠���舒仆仂于亳�� �仂亠亟亳仆亠仆亳亠"
+"\" 亟仍� �仂亰亟舒仆亳� 仆仂于仂亞仂 �仂亠亟亳仆亠仆亳�."
 
 #: ../libpurple/protocols/silc/silc.c:373
 #: ../libpurple/protocols/silc/silc.c:420
@@ -12303,7 +12293,7 @@
 #: ../libpurple/protocols/silc10/silc.c:1629
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr ""
-"quit [�仂仂弍�亠仆亳亠]:  �舒亰仂�于舒�� �仂亠亟亳仆亠仆亳亠 � �亠�于亠�仂仄, �仂仂弍�亠仆亳亠 仆亠仂弍�亰舒�亠仍�仆仂"
+"quit [�仂仂弍�亠仆亳亠]:  �舒亰仂�于舒�� �仂亠亟亳仆亠仆亳亠 � �亠�于亠�仂仄, �仂仂弍�亠仆亳亠 仆亠 仂弍�亰舒�亠仍�仆仂"
 
 #: ../libpurple/protocols/silc/silc.c:1841
 #: ../libpurple/protocols/silc10/silc.c:1633
@@ -12927,8 +12917,7 @@
 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 "_���仗仗舒:"
 
@@ -13054,13 +13043,13 @@
 
 #: ../libpurple/protocols/yahoo/yahoo.c:2152
 msgid "Your account is locked, please log in to the Yahoo! website."
-msgstr "�舒�舒 ����仆舒� 亰舒仗亳�� 亰舒弍仍仂从亳�仂于舒仆舒, 于仂亶亟亳�亠 � 于亠弍-�舒亶�舒 Yahoo!."
+msgstr "�舒�舒 ����仆舒� 亰舒仗亳�� 亰舒弍仍仂从亳�仂于舒仆舒, 于仂亶亟亳�亠 � web-�舒亶�舒 Yahoo!."
 
 #: ../libpurple/protocols/yahoo/yahoo.c:2155
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
-"�亠亳亰于亠��仆舒� 仂�亳弍从舒 仆仂仄亠� %d. ��仂亟 � 于亠弍-�舒亶�舒 Yahoo! 仄仂亢亠� 亳�仗�舒于亳�� ��仂."
+"�亠亳亰于亠��仆舒� 仂�亳弍从舒 仆仂仄亠� %d. ��仂亟 � web-�舒亶�舒 Yahoo! 仄仂亢亠� 亳�仗�舒于亳�� ��仂."
 
 #: ../libpurple/protocols/yahoo/yahoo.c:2208
 #, c-format
@@ -13183,7 +13172,6 @@
 msgstr "�舒从仂亶 ID 舒从�亳于亳�仂于舒��?"
 
 #: ../libpurple/protocols/yahoo/yahoo.c:3568
-#, fuzzy
 msgid "Join whom in chat?"
 msgstr "� 从仂仄� 仗�亳�仂亠亟亳仆亳���� 于 �舒�亠?"
 
@@ -13324,62 +13312,62 @@
 msgid "Yahoo! ID"
 msgstr "Yahoo! ID"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1115
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1119
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1123
+#: ../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:1133
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1137
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1134
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1138
 msgid "Latest News"
 msgstr "�仂�仍亠亟仆亳亠 仆仂于仂��亳"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1158
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1159
 msgid "Home Page"
 msgstr "�仂仄舒�仆�� ���舒仆亳�舒"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1173
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1174
 msgid "Cool Link 1"
 msgstr "弌��仍从舒 1"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1178
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1179
 msgid "Cool Link 2"
 msgstr "弌��仍从舒 2"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1182
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1183
 msgid "Cool Link 3"
 msgstr "弌��仍从舒 3"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1196
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1197
 msgid "Last Update"
 msgstr "�仂�仍亠亟仆亠亠 仂弍仆仂于仍亠仆亳亠"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1205
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1206
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "�仂仍�亰仂于舒�亠仍��从舒� 亳仆�仂�仄舒�亳� 亟仍� %s 仆亠亟仂���仗仆舒"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1211
+#: ../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:1227
+#: ../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:1230
+#: ../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 ""
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1237
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1238
 msgid "The user's profile is empty."
 msgstr "��仂�亳仍� 仗仂仍�亰仂于舒�亠仍� 仗���."
 
@@ -13618,7 +13606,7 @@
 msgstr ""
 
 #: ../libpurple/proxy.c:486 ../libpurple/proxy.c:933 ../libpurple/proxy.c:1092
-#: ../libpurple/proxy.c:1663
+#: ../libpurple/proxy.c:1695
 #, c-format
 msgid ""
 "Unable to create socket:\n"
@@ -13648,25 +13636,25 @@
 msgid "Error resolving %s"
 msgstr "��亳弍从舒 �舒亰�亠�亠仆亳� 亳仄亠仆亳 %s"
 
-#: ../libpurple/proxy.c:1761
+#: ../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 "_��亳仆���"
 
@@ -13896,12 +13884,12 @@
 #: ../libpurple/util.c:4697
 #, c-format
 msgid " - %s"
-msgstr ""
+msgstr " - %s"
 
 #: ../libpurple/util.c:4703
-#, fuzzy, c-format
+#, c-format
 msgid " (%s)"
-msgstr "%s (%s)"
+msgstr " (%s)"
 
 #. 10053
 #: ../libpurple/win32/libc_interface.c:322
@@ -13910,22 +13898,22 @@
 msgstr ""
 
 #. 10054
-#: ../libpurple/win32/libc_interface.c:324
-#, fuzzy, c-format
+#: ../libpurple/win32/libc_interface.c:325
+#, c-format
 msgid "Remote host closed connection."
-msgstr "丕亟舒仍�仆仆�亶 仗仂仍�亰仂于舒�亠仍� �舒亰仂�于舒仍 �仂亠亟亳仆亠仆亳亠."
+msgstr "丕亟舒仍�仆仆�亶 �亰亠仍 �舒亰仂�于舒仍 �仂亠亟亳仆亠仆亳亠."
 
 #. 10060
-#: ../libpurple/win32/libc_interface.c:326
-#, fuzzy, c-format
+#: ../libpurple/win32/libc_interface.c:328
+#, c-format
 msgid "Connection timed out."
-msgstr "���亠从仍仂 于�亠仄� 仂亢亳亟舒仆亳� �仂亠亟亳仆亠仆亳�"
+msgstr "���亠从仍仂 于�亠仄� 仂亢亳亟舒仆亳� �仂亠亟亳仆亠仆亳�."
 
 #. 10061
-#: ../libpurple/win32/libc_interface.c:328
-#, fuzzy, c-format
+#: ../libpurple/win32/libc_interface.c:331
+#, c-format
 msgid "Connection refused."
-msgstr "弌弍�仂� �仂亠亟亳仆亠仆亳�"
+msgstr "弌仂亠亟亳仆亠仆亳亠 仂�于亠�亞仆��仂."
 
 #: ../pidgin.desktop.in.h:1
 msgid "Internet Messenger"
@@ -14078,7 +14066,7 @@
 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 "�从仍��亠仆仂"
@@ -14127,16 +14115,11 @@
 "choosing 'Expand' from the contact's context menu"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:552
-msgid "_Merge"
-msgstr "_�弍�亠亟亳仆亳��"
-
-#: ../pidgin/gtkblist.c:953 ../pidgin/gtkblist.c:6683
-#, fuzzy
+#: ../pidgin/gtkblist.c:964 ../pidgin/gtkblist.c:6711
 msgid "Room _List"
-msgstr "弌仗亳�仂从 从仂仄仆舒�"
-
-#: ../pidgin/gtkblist.c:973
+msgstr "_弌仗亳�仂从 从仂仄仆舒�"
+
+#: ../pidgin/gtkblist.c:984
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
@@ -14144,107 +14127,107 @@
 "�于亠亟亳�亠 �仂仂�于亠���于����� 亳仆�仂�仄舒�亳� 仂 �舒�亠, 从 从仂�仂�仂仄� 于� �仂�亠仍亳 弍� "
 "仗�亳�仂亠亟亳仆亳����.\n"
 
-#: ../pidgin/gtkblist.c:985 ../pidgin/gtkblist.c:6718
+#: ../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/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:4813
+#: ../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."
@@ -14254,241 +14237,237 @@
 #. 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
 #, fuzzy
 msgid "Unknown node type"
 msgstr "�亠亳亰于亠��仆�亶 从仂亟 仂�亳弍从亳 %d"
 
 #. 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
-#, fuzzy, c-format
+#: ../pidgin/gtkblist.c:3151
+#, c-format
 msgid "<b>Account:</b> %s"
-msgstr ""
-"\n"
-"<b>丕���仆舒� 亰舒仗亳��:</b> %s"
-
-#: ../pidgin/gtkblist.c:3136
-#, fuzzy, c-format
+msgstr "<b>丕���仆舒� 亰舒仗亳��:</b> %s"
+
+#: ../pidgin/gtkblist.c:3171
+#, c-format
 msgid ""
 "\n"
 "<b>Topic:</b> %s"
 msgstr ""
 "\n"
-"<b>丕���仆舒� 亰舒仗亳��:</b> %s"
-
-#: ../pidgin/gtkblist.c:3136
-#, fuzzy
+"<b>丐亠仄舒:</b> %s"
+
+#: ../pidgin/gtkblist.c:3171
 msgid "(no topic set)"
-msgstr "丐亠仄舒 仆亠 ���舒仆仂于仍亠仆舒"
-
-#: ../pidgin/gtkblist.c:3213
+msgstr "(�亠仄舒 仆亠 ���舒仆仂于仍亠仆舒)"
+
+#: ../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
-#, fuzzy
+#: ../pidgin/gtkblist.c:3380
 msgid "Total Buddies"
-msgstr "弌仂弍亠�亠亟仆亳从亳"
-
-#: ../pidgin/gtkblist.c:3696
+msgstr "��亠亞仂 �仂弍亠�亠亟仆亳从仂于"
+
+#: ../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"
@@ -14497,43 +14476,41 @@
 msgstr[1] "%d 仆亠仗�仂�亳�舒仆仆�� �仂仂弍�亠仆亳� 仂� %s\n"
 msgstr[2] "%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
-#, fuzzy, c-format
+#: ../pidgin/gtkblist.c:4581
+#, c-format
 msgid "%s disabled"
-msgstr "�仂仄舒仆亟舒 仂�从仍��亠仆舒"
-
-#: ../pidgin/gtkblist.c:4539
-#, fuzzy
+msgstr "%s 于�从仍��亠仆仂"
+
+#: ../pidgin/gtkblist.c:4585
 msgid "Reconnect"
-msgstr "丕��舒仆仂于亳�� �仂亠亟亳仆亠仆亳亠"
-
-#: ../pidgin/gtkblist.c:4539 ../pidgin/gtkblist.c:4658
-#, fuzzy
+msgstr "�亠�亠���舒仆仂于亳�� �仂亠亟亳仆亠仆亳亠"
+
+#: ../pidgin/gtkblist.c:4585 ../pidgin/gtkblist.c:4704
 msgid "Re-enable"
-msgstr "�仂于�仂�仆仂 于从仍��亳�� ����仆�� 亰舒仗亳��"
-
-#: ../pidgin/gtkblist.c:4656
+msgstr "�从仍��亳�� 仗仂于�仂�仆仂"
+
+#: ../pidgin/gtkblist.c:4702
 msgid "Welcome back!"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:4692
+#: ../pidgin/gtkblist.c:4738
 #, fuzzy, c-format
 msgid "%d account was disabled because you signed on from another location:"
 msgid_plural ""
@@ -14542,24 +14519,24 @@
 msgstr[1] "�� 仗仂亟从仍��亠仆� 亳亰 亟��亞仂亞仂 仄亠��舒."
 msgstr[2] "�� 仗仂亟从仍��亠仆� 亳亰 亟��亞仂亞仂 仄亠��舒."
 
-#: ../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"
@@ -14578,62 +14555,56 @@
 #. 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:"
+#: ../pidgin/gtkblist.c:6372
+msgid "Add a buddy.\n"
+msgstr "�仂弍舒于亳�� �仂弍亠�亠亟仆亳从舒.\n"
+
+#: ../pidgin/gtkblist.c:6387
+#, fuzzy
+msgid "Buddy's _screen name:"
 msgstr "_�亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍�:"
 
-#: ../pidgin/gtkblist.c:6381 ../pidgin/gtkblist.c:6731
-msgid "A_lias:"
-msgstr "_��亠于亟仂仆亳仄:"
-
-#: ../pidgin/gtkblist.c:6648
+#: ../pidgin/gtkblist.c:6409
+#, fuzzy
+msgid "(Optional) A_lias:"
+msgstr "�亠仂弍�亰舒�亠仍�仆舒� 亳仆�仂�仄舒�亳�:"
+
+#: ../pidgin/gtkblist.c:6427
+#, fuzzy
+msgid "Add buddy to _group:"
+msgstr "�仂弍舒于亳�� �仂弍亠�亠亟仆亳从舒 于 �仗亳�仂从?"
+
+#: ../pidgin/gtkblist.c:6676
 msgid "This protocol does not support chat rooms."
 msgstr "亅�仂� 仗�仂�仂从仂仍 仆亠 仗仂亟亟亠�亢亳于舒亠� �舒��."
 
-#: ../pidgin/gtkblist.c:6664
+#: ../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
+#: ../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"
@@ -14641,47 +14612,51 @@
 "�于亠亟亳�亠 仗�亠于亟仂仆亳仄 亳 �仂仂�于亠���于����� 亳仆�仂�仄舒�亳� 仂 �舒�亠, 从仂�仂��亶 于� �仂�亠仍亳 弍� "
 "亟仂弍舒于亳�� 于 �仗亳�仂从 �仂弍亠�亠亟仆亳从仂于.\n"
 
-#: ../pidgin/gtkblist.c:6738
+#: ../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 ""
 
-#: ../pidgin/gtkblist.c:7447
+#: ../pidgin/gtkblist.c:7475
 msgid "_Edit Account"
 msgstr "_�亰仄亠仆亳�� ����仆�� 亰舒仗亳��"
 
-#: ../pidgin/gtkblist.c:7460 ../pidgin/gtkconv.c:3132
+#: ../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 ""
 
-#: ../pidgin/gtkblist.c:7535
+#: ../pidgin/gtkblist.c:7563
 msgid "/Tools"
 msgstr "/�仆����仄亠仆��"
 
-#: ../pidgin/gtkblist.c:7605
+#: ../pidgin/gtkblist.c:7633
 msgid "/Buddies/Sort Buddies"
 msgstr "/弌仂弍亠�亠亟仆亳从亳/弌仂��亳�仂于舒�� �仂弍亠�亠亟仆亳从仂于"
 
@@ -14694,22 +14669,22 @@
 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
+#: ../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
+#: ../pidgin/gtkconv.c:852
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -14717,183 +14692,183 @@
 "�于亠亟亳�亠 亳仄� 仗仂仍�亰仂于舒�亠仍�, 从仂�仂�仂亞仂 于� �仂�亳�亠 仗�亳亞仍舒�亳��, 于仄亠��亠 � "
 "仆亠仂弍�亰舒�亠仍�仆�仄 �亠从��仂仄 仗�亳亞仍舒�亠仆亳�."
 
-#: ../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:2917
+#: ../pidgin/gtkconv.c:2913
 msgid "Show All"
 msgstr ""
 
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2936
+#: ../pidgin/gtkconv.c:2932
 msgid "/_Conversation"
 msgstr "/_�亠�亠亟舒"
 
-#: ../pidgin/gtkconv.c:2938
+#: ../pidgin/gtkconv.c:2934
 msgid "/Conversation/New Instant _Message..."
 msgstr "/�亠�亠亟舒/�仂于仂亠 仄亞仆仂于亠仆仆仂亠 �仂仂弍_�亠仆亳亠..."
 
-#: ../pidgin/gtkconv.c:2943
+#: ../pidgin/gtkconv.c:2939
 msgid "/Conversation/_Find..."
 msgstr "/�亠�亠亟舒/_�舒亶�亳..."
 
-#: ../pidgin/gtkconv.c:2945
+#: ../pidgin/gtkconv.c:2941
 msgid "/Conversation/View _Log"
 msgstr "/�亠�亠亟舒/��仂�仄仂��亠�� _亢��仆舒仍"
 
-#: ../pidgin/gtkconv.c:2946
+#: ../pidgin/gtkconv.c:2942
 msgid "/Conversation/_Save As..."
 msgstr "/�亠�亠亟舒/弌仂_��舒仆亳�� 从舒从..."
 
-#: ../pidgin/gtkconv.c:2948
+#: ../pidgin/gtkconv.c:2944
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/�亠�亠亟舒/�_�亳��亳��"
 
-#: ../pidgin/gtkconv.c:2952
+#: ../pidgin/gtkconv.c:2948
 msgid "/Conversation/Se_nd File..."
 msgstr "/�亠�亠亟舒/��仗�舒于亳�� _�舒亶仍..."
 
-#: ../pidgin/gtkconv.c:2953
+#: ../pidgin/gtkconv.c:2949
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/�亠�亠亟舒/�仂弍舒于亳�� 仗_�舒于亳仍仂..."
 
-#: ../pidgin/gtkconv.c:2955
+#: ../pidgin/gtkconv.c:2951
 msgid "/Conversation/_Get Info"
 msgstr "/�亠�亠亟舒/�仂仍��亳�� _亳仆�仂�仄舒�亳�"
 
-#: ../pidgin/gtkconv.c:2957
+#: ../pidgin/gtkconv.c:2953
 msgid "/Conversation/In_vite..."
 msgstr "/�亠�亠亟舒/��亳亞_仍舒�亳��..."
 
-#: ../pidgin/gtkconv.c:2959
+#: ../pidgin/gtkconv.c:2955
 msgid "/Conversation/M_ore"
 msgstr "/�亠�亠亟舒/_���"
 
+#: ../pidgin/gtkconv.c:2959
+msgid "/Conversation/Al_ias..."
+msgstr "/�亠�亠亟舒/_��亠于亟仂仆亳仄..."
+
+#: ../pidgin/gtkconv.c:2961
+msgid "/Conversation/_Block..."
+msgstr "/�亠�亠亟舒/_�仍仂从亳�仂于舒��..."
+
 #: ../pidgin/gtkconv.c:2963
-msgid "/Conversation/Al_ias..."
-msgstr "/�亠�亠亟舒/_��亠于亟仂仆亳仄..."
-
-#: ../pidgin/gtkconv.c:2965
-msgid "/Conversation/_Block..."
-msgstr "/�亠�亠亟舒/_�仍仂从亳�仂于舒��..."
-
-#: ../pidgin/gtkconv.c:2967
 msgid "/Conversation/_Unblock..."
 msgstr "/�亠�亠亟舒/�舒亰_弍仍仂从亳�仂于舒��..."
 
-#: ../pidgin/gtkconv.c:2969
+#: ../pidgin/gtkconv.c:2965
 msgid "/Conversation/_Add..."
 msgstr "/�亠�亠亟舒/_�仂弍舒于亳��..."
 
-#: ../pidgin/gtkconv.c:2971
+#: ../pidgin/gtkconv.c:2967
 msgid "/Conversation/_Remove..."
 msgstr "/�亠�亠亟舒/_丕亟舒仍亳��..."
 
-#: ../pidgin/gtkconv.c:2976
+#: ../pidgin/gtkconv.c:2972
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/�亠�亠亟舒/���舒于亳�� _���仍从�..."
 
-#: ../pidgin/gtkconv.c:2978
+#: ../pidgin/gtkconv.c:2974
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/�亠�亠亟舒/���舒于亳�� 亳亰_仂弍�舒亢亠仆亳亠..."
 
-#: ../pidgin/gtkconv.c:2984
+#: ../pidgin/gtkconv.c:2980
 msgid "/Conversation/_Close"
 msgstr "/�亠�亠亟舒/_�舒从����"
 
 #. Options
-#: ../pidgin/gtkconv.c:2988
+#: ../pidgin/gtkconv.c:2984
 msgid "/_Options"
 msgstr "/_�舒�舒仄亠���"
 
-#: ../pidgin/gtkconv.c:2989
+#: ../pidgin/gtkconv.c:2985
 msgid "/Options/Enable _Logging"
 msgstr "/�舒�舒仄亠���/�亠��亳 _亢��仆舒仍"
 
-#: ../pidgin/gtkconv.c:2990
+#: ../pidgin/gtkconv.c:2986
 msgid "/Options/Enable _Sounds"
 msgstr "/�舒�舒仄亠���/�仂�仗�仂亳亰于仂亟亳�� _亰于�从亳"
 
-#: ../pidgin/gtkconv.c:2992
+#: ../pidgin/gtkconv.c:2988
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/�舒�舒仄亠���/�仂从舒亰�于舒�� _仗舒仆亠仍亳 �仂�仄舒�亳�仂于舒仆亳�"
 
-#: ../pidgin/gtkconv.c:2993
+#: ../pidgin/gtkconv.c:2989
 msgid "/Options/Show Ti_mestamps"
 msgstr "/�舒�舒仄亠���/�仂从舒亰�于舒�� _于�亠仄� �仂仂弍�亠仆亳亶"
 
-#: ../pidgin/gtkconv.c:3120
+#: ../pidgin/gtkconv.c:3116
 msgid "/Conversation/More"
 msgstr "/�亠�亠亟舒/���"
 
-#: ../pidgin/gtkconv.c:3176
+#: ../pidgin/gtkconv.c:3172
 msgid "/Options"
 msgstr "/�舒�舒仄亠���"
 
@@ -14902,100 +14877,102 @@
 #. 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:3211 ../pidgin/gtkconv.c:3243
+#: ../pidgin/gtkconv.c:3207 ../pidgin/gtkconv.c:3239
 msgid "/Conversation"
 msgstr "/�亠�亠亟舒"
 
-#: ../pidgin/gtkconv.c:3251
+#: ../pidgin/gtkconv.c:3247
 msgid "/Conversation/View Log"
 msgstr "/�亠�亠亟舒/��仂�仄仂��亠�� 亢��仆舒仍"
 
-#: ../pidgin/gtkconv.c:3257
+#: ../pidgin/gtkconv.c:3253
 msgid "/Conversation/Send File..."
 msgstr "/�亠�亠亟舒/��仗�舒于亳�� �舒亶仍..."
 
-#: ../pidgin/gtkconv.c:3261
+#: ../pidgin/gtkconv.c:3257
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/�亠�亠亟舒/�仂弍舒于亳�� 仗�舒于亳仍仂..."
 
+#: ../pidgin/gtkconv.c:3263
+msgid "/Conversation/Get Info"
+msgstr "/�亠�亠亟舒/�仂仍��亳�� 亳仆�仂�仄舒�亳�"
+
 #: ../pidgin/gtkconv.c:3267
-msgid "/Conversation/Get Info"
-msgstr "/�亠�亠亟舒/�仂仍��亳�� 亳仆�仂�仄舒�亳�"
-
-#: ../pidgin/gtkconv.c:3271
 msgid "/Conversation/Invite..."
 msgstr "/�亠�亠亟舒/��亳亞仍舒�亳��..."
 
+#: ../pidgin/gtkconv.c:3273
+msgid "/Conversation/Alias..."
+msgstr "/�亠�亠亟舒/��亠于亟仂仆亳仄..."
+
 #: ../pidgin/gtkconv.c:3277
-msgid "/Conversation/Alias..."
-msgstr "/�亠�亠亟舒/��亠于亟仂仆亳仄..."
+msgid "/Conversation/Block..."
+msgstr "/�亠�亠亟舒/�仍仂从亳�仂于舒��..."
 
 #: ../pidgin/gtkconv.c:3281
-msgid "/Conversation/Block..."
-msgstr "/�亠�亠亟舒/�仍仂从亳�仂于舒��..."
+msgid "/Conversation/Unblock..."
+msgstr "/�亠�亠亟舒/�舒亰弍仍仂从亳�仂于舒��..."
 
 #: ../pidgin/gtkconv.c:3285
-msgid "/Conversation/Unblock..."
-msgstr "/�亠�亠亟舒/�舒亰弍仍仂从亳�仂于舒��..."
+msgid "/Conversation/Add..."
+msgstr "/�亠�亠亟舒/�仂弍舒于亳��..."
 
 #: ../pidgin/gtkconv.c:3289
-msgid "/Conversation/Add..."
-msgstr "/�亠�亠亟舒/�仂弍舒于亳��..."
-
-#: ../pidgin/gtkconv.c:3293
 msgid "/Conversation/Remove..."
 msgstr "/�亠�亠亟舒/丕亟舒仍亳��..."
 
+#: ../pidgin/gtkconv.c:3295
+msgid "/Conversation/Insert Link..."
+msgstr "/�亠�亠亟舒/���舒于亳�� ���仍从�..."
+
 #: ../pidgin/gtkconv.c:3299
-msgid "/Conversation/Insert Link..."
-msgstr "/�亠�亠亟舒/���舒于亳�� ���仍从�..."
-
-#: ../pidgin/gtkconv.c:3303
 msgid "/Conversation/Insert Image..."
 msgstr "/�亠�亠亟舒/���舒于亳�� 亳亰仂弍�舒亢亠仆亳亠..."
 
-#: ../pidgin/gtkconv.c:3309
+#: ../pidgin/gtkconv.c:3305
 msgid "/Options/Enable Logging"
 msgstr "/�舒�舒仄亠���/�亠��亳 亢��仆舒仍"
 
-#: ../pidgin/gtkconv.c:3312
+#: ../pidgin/gtkconv.c:3308
 msgid "/Options/Enable Sounds"
 msgstr "/�舒�舒仄亠���/�仂�仗�仂亳亰于仂亟亳�� 亰于�从亳"
 
-#: ../pidgin/gtkconv.c:3325
+#: ../pidgin/gtkconv.c:3321
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/�舒�舒仄亠���/�仂从舒亰�于舒�� 仗舒仆亠仍亳 �仂�仄舒�亳�仂于舒仆亳�"
 
-#: ../pidgin/gtkconv.c:3328
+#: ../pidgin/gtkconv.c:3324
 msgid "/Options/Show Timestamps"
 msgstr "/�舒�舒仄亠���/�仂从舒亰�于舒�� 于�亠仄� �仂仂弍�亠仆亳亶"
 
-#: ../pidgin/gtkconv.c:3406
+#: ../pidgin/gtkconv.c:3402
 msgid "User is typing..."
 msgstr "�仂仍�亰仂于舒�亠仍� 仆舒弍亳�舒亠� �仂仂弍�亠仆亳亠..."
 
-#: ../pidgin/gtkconv.c:3476
-#, fuzzy, c-format
+#: ../pidgin/gtkconv.c:3472
+#, c-format
 msgid ""
 "\n"
 "%s has stopped typing"
-msgstr "%s 仗�亠从�舒�亳仍 仆舒弍仂� �仂仂弍�亠仆亳� 亟仍� 于舒� (%s)"
+msgstr ""
+"\n"
+"%s 仗�亠从�舒�亳仍 仆舒弍仂� �仂仂弍�亠仆亳�"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3642 ../pidgin/gtkconv.c:8313
+#: ../pidgin/gtkconv.c:3638 ../pidgin/gtkconv.c:8309
 msgid "S_end To"
 msgstr "_�亟�亠�舒�"
 
-#: ../pidgin/gtkconv.c:4354
+#: ../pidgin/gtkconv.c:4350
 msgid "_Send"
 msgstr "_��仗�舒于亳��"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4492
+#: ../pidgin/gtkconv.c:4486
 msgid "0 people in room"
 msgstr "0 仗仂仍�亰仂于舒�亠仍亠亶 于 从仂仄仆舒�亠"
 
-#: ../pidgin/gtkconv.c:5791 ../pidgin/gtkconv.c:5912
+#: ../pidgin/gtkconv.c:5784 ../pidgin/gtkconv.c:5905
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
@@ -15003,75 +14980,75 @@
 msgstr[1] "%d 仗仂仍�亰仂于舒�亠仍� 于 从仂仄仆舒�亠"
 msgstr[2] "%d 仗仂仍�亰仂于舒�亠仍亠亶 于 从仂仄仆舒�亠"
 
-#: ../pidgin/gtkconv.c:6539 ../pidgin/gtkstatusbox.c:679
+#: ../pidgin/gtkconv.c:6535 ../pidgin/gtkstatusbox.c:679
 msgid "Typing"
 msgstr "�舒弍亳�舒亠� �仂仂弍�亠仆亳亠"
 
-#: ../pidgin/gtkconv.c:6543
+#: ../pidgin/gtkconv.c:6539
 msgid "Stopped Typing"
 msgstr "��亠从�舒�亳仍 仆舒弍仂� �仂仂弍�亠仆亳�"
 
-#: ../pidgin/gtkconv.c:6546
+#: ../pidgin/gtkconv.c:6542
 msgid "Nick Said"
 msgstr "��仂亳亰仆亠�亠仆仂 亳仄�"
 
-#: ../pidgin/gtkconv.c:6549 ../pidgin/gtkdocklet.c:686
+#: ../pidgin/gtkconv.c:6545 ../pidgin/gtkdocklet.c:686
 msgid "Unread Messages"
 msgstr "�亠仗�仂�亳�舒仆仆�亠 �仂仂弍�亠仆亳�"
 
-#: ../pidgin/gtkconv.c:6555
+#: ../pidgin/gtkconv.c:6551
 msgid "New Event"
 msgstr "�仂于仂亠 �仂弍��亳亠"
 
-#: ../pidgin/gtkconv.c:7785
+#: ../pidgin/gtkconv.c:7781
 msgid "clear: Clears all conversation scrollbacks."
 msgstr "clear: ��亳��亳�� 于�亠 仂从仆舒 弍亠�亠亟."
 
-#: ../pidgin/gtkconv.c:7989
+#: ../pidgin/gtkconv.c:7985
 msgid "Confirm close"
 msgstr "�仂亟�于亠�亟亳�� 亰舒从���亳亠"
 
-#: ../pidgin/gtkconv.c:8021
+#: ../pidgin/gtkconv.c:8017
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "���� 仆亠仗�仂�亳�舒仆仆�亠 �仂仂弍�亠仆亳�. �� 亟亠亶��于亳�亠仍�仆仂 �仂�亳�亠 亰舒从���� 仂从仆仂?"
 
-#: ../pidgin/gtkconv.c:8654
+#: ../pidgin/gtkconv.c:8650
 msgid "Close other tabs"
 msgstr "�舒从���� 亟��亞亳亠 于从仍舒亟从亳"
 
-#: ../pidgin/gtkconv.c:8660
+#: ../pidgin/gtkconv.c:8656
 msgid "Close all tabs"
 msgstr "�舒从���� 于�亠 于从仍舒亟从亳"
 
-#: ../pidgin/gtkconv.c:8668
+#: ../pidgin/gtkconv.c:8664
 msgid "Detach this tab"
 msgstr "��亟亠仍亳�� ��� 于从仍舒亟从�"
 
-#: ../pidgin/gtkconv.c:8674
+#: ../pidgin/gtkconv.c:8670
 msgid "Close this tab"
 msgstr "�舒从���� ��� 于从仍舒亟从�"
 
-#: ../pidgin/gtkconv.c:9188
+#: ../pidgin/gtkconv.c:9184
 msgid "Close conversation"
 msgstr "�舒从���� 弍亠�亠亟�"
 
-#: ../pidgin/gtkconv.c:9792
+#: ../pidgin/gtkconv.c:9788
 msgid "Last created window"
 msgstr "�仂�仍亠亟仆亠亠 �仂亰亟舒仆仆仂亠 仂从仆仂"
 
-#: ../pidgin/gtkconv.c:9794
+#: ../pidgin/gtkconv.c:9790
 msgid "Separate IM and Chat windows"
 msgstr "��亟亠仍�仆�亠 仂从仆舒 仄亞仆仂于亠仆仆�� �仂仂弍�亠仆亳亶 亳 �舒�仂于"
 
-#: ../pidgin/gtkconv.c:9796 ../pidgin/gtkprefs.c:1466
+#: ../pidgin/gtkconv.c:9792 ../pidgin/gtkprefs.c:1466
 msgid "New window"
 msgstr "�仂于仂亠 仂从仆仂"
 
-#: ../pidgin/gtkconv.c:9798
+#: ../pidgin/gtkconv.c:9794
 msgid "By group"
 msgstr "�仂 亞��仗仗亠"
 
-#: ../pidgin/gtkconv.c:9800
+#: ../pidgin/gtkconv.c:9796
 msgid "By account"
 msgstr "�仂 ����仆仂亶 亰舒仗亳�亳"
 
@@ -15162,7 +15139,7 @@
 
 #: ../pidgin/gtkdialogs.c:91 ../pidgin/gtkdialogs.c:114
 msgid "developer & webmaster"
-msgstr "�舒亰�舒弍仂��亳从 亳 于亠弍-仄舒��亠�"
+msgstr "�舒亰�舒弍仂��亳从 亳 web-仄舒��亠�"
 
 #: ../pidgin/gtkdialogs.c:101
 msgid "Senior Contributor/QA"
@@ -15203,7 +15180,7 @@
 
 #: ../pidgin/gtkdialogs.c:136
 msgid "Belarusian Latin"
-msgstr ""
+msgstr "�亠仍仂����从舒� 仍舒�亳仆亳�舒"
 
 #: ../pidgin/gtkdialogs.c:137 ../pidgin/gtkdialogs.c:138
 #: ../pidgin/gtkdialogs.c:231
@@ -15393,7 +15370,7 @@
 
 #: ../pidgin/gtkdialogs.c:195
 msgid "Punjabi"
-msgstr ""
+msgstr "�舒仆亟亢舒弍亳"
 
 #: ../pidgin/gtkdialogs.c:196 ../pidgin/gtkdialogs.c:197
 #: ../pidgin/gtkdialogs.c:198 ../pidgin/gtkdialogs.c:261
@@ -15442,7 +15419,7 @@
 
 #: ../pidgin/gtkdialogs.c:210
 msgid "Sinhala"
-msgstr ""
+msgstr "弌亳仆亞舒仍��从亳亶"
 
 #: ../pidgin/gtkdialogs.c:211 ../pidgin/gtkdialogs.c:270
 #: ../pidgin/gtkdialogs.c:271
@@ -15467,7 +15444,7 @@
 
 #: ../pidgin/gtkdialogs.c:216
 msgid "Urdu"
-msgstr ""
+msgstr "丕�亟�"
 
 #: ../pidgin/gtkdialogs.c:217
 msgid "Vietnamese"
@@ -15822,73 +15799,73 @@
 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
+#: ../pidgin/gtkimhtml.c:1395
 msgid "Hyperlink color"
 msgstr "丶于亠� 亞亳仗亠����仍从亳"
 
-#: ../pidgin/gtkimhtml.c:1392
+#: ../pidgin/gtkimhtml.c:1396
 msgid "Color to draw hyperlinks."
 msgstr "丶于亠� 亟仍� 仂�仂弍�舒亢亠仆亳� 亞亳仗亠����仍仂从."
 
-#: ../pidgin/gtkimhtml.c:1395
+#: ../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
 #, fuzzy
 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
 #, fuzzy
 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 "_弌从仂仗亳�仂于舒�� 舒亟�亠� e-mail"
 
-#: ../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 "_弌从仂仗亳�仂于舒�� ���仍从�"
 
@@ -15968,8 +15945,8 @@
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
 msgstr ""
-"�于亠亟亳�亠 URL 亳 仂仗亳�舒仆亳亠 ���仍从亳, 从仂�仂��� 于� �仂�亳�亠 于��舒于亳��. �仗亳�舒仆亳亠 "
-"仆亠仂弍�亰舒�亠仍�仆仂."
+"�于亠亟亳�亠 URL 亳 仂仗亳�舒仆亳亠 ���仍从亳, 从仂�仂��� 于� �仂�亳�亠 于��舒于亳��. �仗亳�舒仆亳亠 仆亠 "
+"仂弍�亰舒�亠仍�仆仂."
 
 #: ../pidgin/gtkimhtmltoolbar.c:428
 msgid "Please enter the URL of the link that you want to insert."
@@ -16156,14 +16133,12 @@
 "�� 亟亠亶��于亳�亠仍�仆仂 �仂�亳�亠 弍亠亰于仂亰于�舒�仆仂 �亟舒仍亳�� �亳��亠仄仆�亶 亢��仆舒仍, 仆舒�舒��亶 于 %s?"
 
 #: ../pidgin/gtklog.c:323
-#, fuzzy
 msgid "Delete Log?"
-msgstr "丕亟舒仍亳��"
+msgstr "丕亟舒仍亳�� 亢��仆舒仍?"
 
 #: ../pidgin/gtklog.c:334
-#, fuzzy
 msgid "Delete Log..."
-msgstr "丕亟舒仍亳��"
+msgstr "丕亟舒仍亳�� 亢��仆舒仍..."
 
 #: ../pidgin/gtklog.c:453
 #, c-format
@@ -16180,12 +16155,12 @@
 msgid "_Browse logs folder"
 msgstr ""
 
-#: ../pidgin/gtkmain.c:399
+#: ../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:402
+#: ../pidgin/gtkmain.c:388
 #, fuzzy, c-format
 msgid ""
 "%s %s\n"
@@ -16216,7 +16191,7 @@
 "  --display=DISPLAY   X display to use\n"
 "  -v, --version       仗仂从舒亰舒�� �亠从���� 于亠��亳� 亳 于�亶�亳\n"
 
-#: ../pidgin/gtkmain.c:415
+#: ../pidgin/gtkmain.c:401
 #, fuzzy, c-format
 msgid ""
 "%s %s\n"
@@ -16246,7 +16221,7 @@
 "  --display=DISPLAY   X display to use\n"
 "  -v, --version       仗仂从舒亰舒�� �亠从���� 于亠��亳� 亳 于�亶�亳\n"
 
-#: ../pidgin/gtkmain.c:545
+#: ../pidgin/gtkmain.c:531
 #, c-format
 msgid ""
 "%s %s has segfaulted and attempted to dump a core file.\n"
@@ -16270,7 +16245,7 @@
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../pidgin/gtkmain.c:739 ../pidgin/pidgin.h:51
+#: ../pidgin/gtkmain.c:725 ../pidgin/pidgin.h:51
 msgid "Pidgin"
 msgstr "Pidgin"
 
@@ -16318,29 +16293,29 @@
 "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
+#: ../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"
@@ -16348,10 +16323,10 @@
 "<span weight=\"bold\">Filename:</span>\t\t%s"
 msgstr ""
 "%s%s<span weight=\"bold\">�于�仂�:</span>\t\t%s\n"
-"<span weight=\"bold\">�亠弍-�舒亶�:</span>\t%s\n"
+"<span weight=\"bold\">Web-�舒亶�:</span>\t%s\n"
 "<span weight=\"bold\">�仄� �舒亶仍舒:</span>\t%s"
 
-#: ../pidgin/gtkplugin.c:428
+#: ../pidgin/gtkplugin.c:432
 #, c-format
 msgid ""
 "%s\n"
@@ -16359,16 +16334,15 @@
 "Check the plugin website for an update.</span>"
 msgstr ""
 
-#: ../pidgin/gtkplugin.c:565
-#, fuzzy
+#: ../pidgin/gtkplugin.c:569
 msgid "Author"
-msgstr "�于�仂�亳亰仂于舒��"
-
-#: ../pidgin/gtkplugin.c:606
+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>"
 
@@ -16564,7 +16538,7 @@
 
 #: ../pidgin/gtkprefs.c:946
 msgid "Close IMs immediately when the tab is closed"
-msgstr ""
+msgstr "�舒从��于舒�� 仄亞仆仂于亠仆仆�亠 �仂仂弍�亠仆亳� 仆亠仄亠亟仍亠仆仆仂 仗�亳 亰舒从���亳亳 于从仍舒亟从亳"
 
 #: ../pidgin/gtkprefs.c:949
 msgid "Show _detailed information"
@@ -16653,7 +16627,7 @@
 
 #: ../pidgin/gtkprefs.c:1161
 msgid "_Enable automatic router port forwarding"
-msgstr ""
+msgstr "_�舒亰�亠�亳�� 舒于�仂仄舒�亳�亠�从�� 仗亠�亠舒亟�亠�舒�亳� 仗仂��仂于 仄舒�����亳亰舒�仂�舒"
 
 #: ../pidgin/gtkprefs.c:1164
 msgid "_Manually specify range of ports to listen on"
@@ -16668,9 +16642,8 @@
 msgstr "_�仂仆亠�仆�亶 仗仂��:"
 
 #: ../pidgin/gtkprefs.c:1182
-#, fuzzy
 msgid "Proxy Server &amp; Browser"
-msgstr "��仂从�亳-�亠�于亠�"
+msgstr "��仂从�亳-�亠�于亠� &amp; 弍�舒�亰亠�"
 
 #: ../pidgin/gtkprefs.c:1190
 msgid "<b>Proxy configuration program was not found.</b>"
@@ -16727,13 +16700,12 @@
 msgstr "Konqueror"
 
 #: ../pidgin/gtkprefs.c:1375
-#, fuzzy
 msgid "Desktop Default"
-msgstr "_��亳仆��� ���舒仆仂于从亳 仗仂 �仄仂仍�舒仆亳�"
+msgstr "��仗仂仍�亰�亠仄�亶 仗仂 �仄仂仍�舒仆亳�"
 
 #: ../pidgin/gtkprefs.c:1376
 msgid "GNOME Default"
-msgstr "��舒�亰亠� GNOME 仗仂 �仄仂仍�舒仆亳�"
+msgstr "��仗仂仍�亰�亠仄�亶 于 GNOME 仗仂 �仄仂仍�舒仆亳�"
 
 #: ../pidgin/gtkprefs.c:1377
 msgid "Galeon"
@@ -16971,9 +16943,8 @@
 
 #. Remove All button
 #: ../pidgin/gtkprivacy.c:417
-#, fuzzy
 msgid "Remove Al_l"
-msgstr "丕亟舒仍亳��"
+msgstr "丕亟舒仍亳�� _于�亠"
 
 #: ../pidgin/gtkprivacy.c:503 ../pidgin/gtkprivacy.c:520
 msgid "Permit User"
@@ -17279,31 +17250,31 @@
 msgid "none"
 msgstr "仆亠�"
 
-#: ../pidgin/plugins/cap/cap.c:444 ../pidgin/plugins/cap/cap.c:447
+#: ../pidgin/plugins/cap/cap.c:441 ../pidgin/plugins/cap/cap.c:444
 msgid "Response Probability:"
 msgstr "�亠�仂��仆仂��� 仂�从仍亳从舒:"
 
-#: ../pidgin/plugins/cap/cap.c:772
+#: ../pidgin/plugins/cap/cap.c:769
 msgid "Statistics Configuration"
 msgstr "�舒���仂亶从舒 ��舒�亳��亳从亳"
 
 #. msg_difference spinner
-#: ../pidgin/plugins/cap/cap.c:775
+#: ../pidgin/plugins/cap/cap.c:772
 msgid "Maximum response timeout:"
 msgstr "�舒从�亳仄舒仍�仆仂亠 于�亠仄� 仂亢亳亟舒仆亳� 仂�从仍亳从舒:"
 
-#: ../pidgin/plugins/cap/cap.c:778 ../pidgin/plugins/cap/cap.c:785
-#: ../pidgin/plugins/cap/cap.c:792 ../pidgin/plugins/timestamp.c:148
+#: ../pidgin/plugins/cap/cap.c:775 ../pidgin/plugins/cap/cap.c:782
+#: ../pidgin/plugins/cap/cap.c:789 ../pidgin/plugins/timestamp.c:148
 msgid "minutes"
 msgstr "仄亳仆��"
 
 #. last_seen spinner
-#: ../pidgin/plugins/cap/cap.c:782
+#: ../pidgin/plugins/cap/cap.c:779
 msgid "Maximum last-seen difference:"
 msgstr ""
 
 #. threshold spinner
-#: ../pidgin/plugins/cap/cap.c:789
+#: ../pidgin/plugins/cap/cap.c:786
 msgid "Threshold:"
 msgstr "�仂�仂亞仂于舒� 于亠仍亳�亳仆舒:"
 
@@ -17313,18 +17284,18 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/cap/cap.c:897
+#: ../pidgin/plugins/cap/cap.c:894
 msgid "Contact Availability Prediction"
 msgstr ""
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/cap/cap.c:899
+#: ../pidgin/plugins/cap/cap.c:896
 msgid "Contact Availability Prediction plugin."
 msgstr ""
 
 #. *  summary
-#: ../pidgin/plugins/cap/cap.c:900
+#: ../pidgin/plugins/cap/cap.c:897
 msgid ""
 "The contact availability plugin (cap) is used to display statistical "
 "information about buddies in a users contact list."
@@ -17547,24 +17518,24 @@
 msgstr "�弍仄亠仆 仄亞仆仂于亠仆仆�仄亳 �仂仂弍�亠仆亳�仄亳"
 
 #. Add the label.
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:457
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:461
 msgid "Select a person from your address book below, or add a new person."
 msgstr "�亳亢亠 于�弍亠�亳�亠 仗亠��仂仆� 亳亰 舒亟�亠�仆仂亶 从仆亳亞亳 亳仍亳 亟仂弍舒于��亠 仆仂于�� 仗亠��仂仆�."
 
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:551
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:301
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:555
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:305
 msgid "Group:"
 msgstr "���仗仗舒:"
 
 #. "New Person" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:576
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:580
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:467
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:248
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:252
 msgid "New Person"
 msgstr "�仂于舒� 仗亠��仂仆舒"
 
 #. "Select Buddy" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:593
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:597
 msgid "Select Buddy"
 msgstr "��弍�舒�� �仂弍亠�亠亟仆亳从舒"
 
@@ -17587,34 +17558,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 "�亠 �亟舒���� 仂�仗�舒于亳�� e-mail"
 
-#: ../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 "��仗�舒于亳�� e-mail"
 
 #. 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 ""
 "��弍亠�亳�亠 于�亠 ����仆�亠 亰舒仗亳�亳, �仂弍亠�亠亟仆亳从亳 从仂�仂��� 亟仂仍亢仆� 弍��� 亟仂弍舒于仍亠仆� "
@@ -17626,7 +17597,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gevolution/gevolution.c:527
+#: ../pidgin/plugins/gevolution/gevolution.c:529
 msgid "Evolution Integration"
 msgstr "�仆�亠亞�舒�亳� � Evolution"
 
@@ -17634,38 +17605,38 @@
 #. *< 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 "E-mail:"
 
@@ -18105,68 +18076,68 @@
 "�亠�亳仂亟亳�亠�从亳 仗�仂于亠��亠� 仆舒仍亳�亳亠 仆仂于�� 于亠��亳亶 亳 �于亠亟仂仄仍�亠� 仂 仆亳� 仗仂仍�亰仂于舒�亠仍�, "
 "仗�亳于仂亟� �仗亳�仂从 亳亰仄亠仆亠仆亳亶."
 
-#: ../pidgin/plugins/spellchk.c:1962
+#: ../pidgin/plugins/spellchk.c:1970
 msgid "Duplicate Correction"
 msgstr "丕亟舒仍亠仆亳亠 仗仂于�仂�仂于"
 
-#: ../pidgin/plugins/spellchk.c:1963
+#: ../pidgin/plugins/spellchk.c:1971
 msgid "The specified word already exists in the correction list."
 msgstr "丕从舒亰舒仆仆仂亠 �仍仂于仂 �亢亠 仗�亳�����于�亠� 于 �仗亳�从亠 亳�仗�舒于仍亠仆亳亶."
 
-#: ../pidgin/plugins/spellchk.c:2176
+#: ../pidgin/plugins/spellchk.c:2184
 msgid "Text Replacements"
 msgstr "�舒仄亠�亠仆亳亠 �亠从��舒"
 
-#: ../pidgin/plugins/spellchk.c:2199
+#: ../pidgin/plugins/spellchk.c:2207
 msgid "You type"
 msgstr "�� 仆舒弍亳�舒亠�亠"
 
-#: ../pidgin/plugins/spellchk.c:2213
+#: ../pidgin/plugins/spellchk.c:2221
 msgid "You send"
 msgstr "�� 仂�仗�舒于仍�亠�亠"
 
-#: ../pidgin/plugins/spellchk.c:2227
+#: ../pidgin/plugins/spellchk.c:2235
 msgid "Whole words only"
 msgstr "丐仂仍�从仂 �亠仍�亠 �仍仂于舒"
 
-#: ../pidgin/plugins/spellchk.c:2239
+#: ../pidgin/plugins/spellchk.c:2247
 msgid "Case sensitive"
 msgstr "丕�亳��于舒�� �亠亞亳���"
 
-#: ../pidgin/plugins/spellchk.c:2265
+#: ../pidgin/plugins/spellchk.c:2273
 msgid "Add a new text replacement"
 msgstr "�仂弍舒于亳�� 仆仂于仂亠 亰舒仄亠�亠仆亳亠 �亠从��舒"
 
-#: ../pidgin/plugins/spellchk.c:2281
+#: ../pidgin/plugins/spellchk.c:2289
 msgid "You _type:"
 msgstr "�� _仆舒弍亳�舒亠�亠:"
 
-#: ../pidgin/plugins/spellchk.c:2285
+#: ../pidgin/plugins/spellchk.c:2293
 msgid "You _send:"
 msgstr "�� _仂�仗�舒于仍�亠�亠:"
 
 #. Created here so it can be passed to whole_words_button_toggled.
-#: ../pidgin/plugins/spellchk.c:2288
+#: ../pidgin/plugins/spellchk.c:2296
 msgid "_Exact case match (uncheck for automatic case handling)"
 msgstr "_丐仂�仆仂亠 �仂于仗舒亟亠仆亳亠 �亠亞亳���舒"
 
-#: ../pidgin/plugins/spellchk.c:2290
+#: ../pidgin/plugins/spellchk.c:2298
 msgid "Only replace _whole words"
 msgstr "�舒仄亠�舒�� �仂仍�从仂 _�亠仍�亠 �仍仂于舒"
 
-#: ../pidgin/plugins/spellchk.c:2315
+#: ../pidgin/plugins/spellchk.c:2323
 msgid "General Text Replacement Options"
 msgstr "��仆仂于仆�亠 仗舒�舒仄亠��� 亰舒仄亠�亠仆亳� �亠从��舒"
 
-#: ../pidgin/plugins/spellchk.c:2316
+#: ../pidgin/plugins/spellchk.c:2324
 msgid "Enable replacement of last word on send"
 msgstr "�舒亰�亠�亳�� 亰舒仄亠�亠仆亳亠 仗仂�仍亠亟仆亠亞仂 �仍仂于舒 仗�亳 仂�仗�舒于从亠"
 
-#: ../pidgin/plugins/spellchk.c:2349
+#: ../pidgin/plugins/spellchk.c:2357
 msgid "Text replacement"
 msgstr "�舒仄亠�亠仆亳亠 �亠从��舒"
 
-#: ../pidgin/plugins/spellchk.c:2351 ../pidgin/plugins/spellchk.c:2352
+#: ../pidgin/plugins/spellchk.c:2359 ../pidgin/plugins/spellchk.c:2360
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr ""
 "�舒仄亠�舒亠� �亠从�� 于 亳��仂亟��亳� �仂仂弍�亠仆亳�� 于 �仂仂�于亠���于亳亳 � 仗�舒于亳仍舒仄亳, "