diff po/en_GB.po @ 22873:31611d5d6a4a

merge of '8b98876f03b683ae6805d673e713f30f16b7f6e9' and 'c3fe9bf88d02997989374e7ecc80a3f2462ee462'
author Richard Laager <rlaager@wiktel.com>
date Sat, 15 Nov 2008 23:47:18 +0000
parents 1f27c4471ccf
children 09acad15403d 786bf5f84ce7
line wrap: on
line diff
--- a/po/en_GB.po	Mon Oct 29 02:12:15 2007 +0000
+++ b/po/en_GB.po	Sat Nov 15 23:47:18 2008 +0000
@@ -3,12 +3,11 @@
 #
 # This file is distributed under the same license as the Pidgin package.
 #
-#: ../libpurple/certificate.c:543
 msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin 2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-11 23:42+0100\n"
+"POT-Creation-Date: 2007-09-28 15:32-0500\n"
 "PO-Revision-Date: 2006-02-07 13:57+0000\n"
 "Last-Translator: Luke Ross <luke@lukeross.name>\n"
 "Language-Team:  <en_GB@li.org>\n"
@@ -17,10 +16,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n>1;\n"
 
-#. Translators may want to transliterate the name.
-#. It is not to be translated.
-#: ../finch/finch.c:64 ../finch/finch.c:300 ../finch/finch.c:329
-#: ../finch/finch.c:415
+#: ../finch/finch.c:64 ../finch/finch.c:301 ../finch/finch.c:330
+#: ../finch/finch.c:418
 msgid "Finch"
 msgstr "Finch"
 
@@ -50,7 +47,7 @@
 "  -n, --nologin       don't automatically login\n"
 "  -v, --version       display the current version and exit\n"
 
-#: ../finch/finch.c:327 ../pidgin/gtkmain.c:711
+#: ../finch/finch.c:328 ../pidgin/gtkmain.c:711
 #, c-format
 msgid ""
 "%s encountered errors migrating your settings from %s to %s. Please "
@@ -61,15 +58,15 @@
 "investigate and complete the migration by hand. Please report this error at "
 "http://developer.pidgin.im"
 
-#: ../finch/gntaccount.c:123 ../finch/gntaccount.c:483 ../finch/gntblist.c:299
-#: ../finch/gntblist.c:432 ../finch/gntblist.c:445 ../finch/gntplugin.c:185
-#: ../finch/gntplugin.c:233 ../finch/gntstatus.c:300 ../finch/gntstatus.c:309
+#: ../finch/gntaccount.c:124 ../finch/gntaccount.c:484 ../finch/gntblist.c:300
+#: ../finch/gntblist.c:433 ../finch/gntblist.c:446 ../finch/gntplugin.c:186
+#: ../finch/gntplugin.c:234 ../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:2027
+#: ../libpurple/protocols/jabber/buddy.c:2029
 #: ../libpurple/protocols/jabber/chat.c:677
 #: ../libpurple/protocols/jabber/chat.c:688
-#: ../libpurple/protocols/jabber/jabber.c:1511
+#: ../libpurple/protocols/jabber/jabber.c:1515
 #: ../libpurple/protocols/qq/group_join.c:328
 #: ../libpurple/protocols/qq/im.c:576 ../libpurple/protocols/silc/ops.c:57
 #: ../libpurple/protocols/silc/ops.c:1456
@@ -77,85 +74,85 @@
 msgid "Error"
 msgstr "Error"
 
-#: ../finch/gntaccount.c:123
+#: ../finch/gntaccount.c:124
 msgid "Account was not added"
 msgstr "Account was not added"
 
-#: ../finch/gntaccount.c:124
+#: ../finch/gntaccount.c:125
 msgid "Screenname of an account must be non-empty."
 msgstr "Screen name of an account must not be empty."
 
-#: ../finch/gntaccount.c:436
+#: ../finch/gntaccount.c:437
 msgid "New mail notifications"
 msgstr "New mail notifications"
 
-#: ../finch/gntaccount.c:446
+#: ../finch/gntaccount.c:447
 msgid "Remember password"
 msgstr "Remember password"
 
-#: ../finch/gntaccount.c:484
+#: ../finch/gntaccount.c:485
 msgid "There's no protocol plugins installed."
 msgstr "There are no protocol plugins installed."
 
-#: ../finch/gntaccount.c:485
+#: ../finch/gntaccount.c:486
 msgid "(You probably forgot to 'make install'.)"
 msgstr "(You probably forgot to 'make install'.)"
 
-#: ../finch/gntaccount.c:495 ../pidgin/gtkaccount.c:1473
-#: ../pidgin/gtkblist.c:4037
+#: ../finch/gntaccount.c:496 ../finch/gntconn.c:136
+#: ../pidgin/gtkaccount.c:1473 ../pidgin/gtkblist.c:4040
 msgid "Modify Account"
 msgstr "Modify Account"
 
-#: ../finch/gntaccount.c:495
+#: ../finch/gntaccount.c:496
 msgid "New Account"
 msgstr "New Account"
 
-#: ../finch/gntaccount.c:520 ../pidgin/gtkft.c:695
+#: ../finch/gntaccount.c:521 ../pidgin/gtkft.c:696
 msgid "Protocol:"
 msgstr "Protocol:"
 
-#: ../finch/gntaccount.c:528
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:291
+#: ../finch/gntaccount.c:529
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:290
 msgid "Screen name:"
 msgstr "Screen name:"
 
-#: ../finch/gntaccount.c:541
+#: ../finch/gntaccount.c:542
 msgid "Password:"
 msgstr "Password:"
 
-#: ../finch/gntaccount.c:551
+#: ../finch/gntaccount.c:552
 msgid "Alias:"
 msgstr "Alias:"
 
 #. Cancel button
 #. Cancel
-#: ../finch/gntaccount.c:574 ../finch/gntaccount.c:637
-#: ../finch/gntaccount.c:883 ../finch/gntblist.c:343 ../finch/gntblist.c:420
-#: ../finch/gntblist.c:455 ../finch/gntblist.c:802 ../finch/gntblist.c:1004
-#: ../finch/gntblist.c:1100 ../finch/gntblist.c:2221 ../finch/gntcertmgr.c:90
-#: ../finch/gntplugin.c:378 ../finch/gntpounce.c:458 ../finch/gntpounce.c:666
-#: ../finch/gntprefs.c:264 ../finch/gntsound.c:1057 ../finch/gntstatus.c:144
-#: ../finch/gntstatus.c:484 ../finch/gntstatus.c:609
-#: ../libpurple/account.c:1004 ../libpurple/account.c:1254
-#: ../libpurple/account.c:1289 ../libpurple/conversation.c:1215
+#: ../finch/gntaccount.c:575 ../finch/gntaccount.c:638
+#: ../finch/gntaccount.c:889 ../finch/gntblist.c:344 ../finch/gntblist.c:421
+#: ../finch/gntblist.c:456 ../finch/gntblist.c:803 ../finch/gntblist.c:1005
+#: ../finch/gntblist.c:1101 ../finch/gntblist.c:2222 ../finch/gntcertmgr.c:91
+#: ../finch/gntplugin.c:379 ../finch/gntpounce.c:459 ../finch/gntpounce.c:667
+#: ../finch/gntprefs.c:265 ../finch/gntsound.c:1058 ../finch/gntstatus.c:145
+#: ../finch/gntstatus.c:485 ../finch/gntstatus.c:610
+#: ../libpurple/account.c:1013 ../libpurple/account.c:1263
+#: ../libpurple/account.c:1298 ../libpurple/conversation.c:1215
 #: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:507
 #: ../libpurple/protocols/gg/gg.c:666 ../libpurple/protocols/gg/gg.c:803
 #: ../libpurple/protocols/gg/gg.c:884
 #: ../libpurple/protocols/jabber/buddy.c:728
-#: ../libpurple/protocols/jabber/buddy.c:2389
-#: ../libpurple/protocols/jabber/buddy.c:2425
+#: ../libpurple/protocols/jabber/buddy.c:2413
+#: ../libpurple/protocols/jabber/buddy.c:2449
 #: ../libpurple/protocols/jabber/chat.c:786
-#: ../libpurple/protocols/jabber/jabber.c:1009
-#: ../libpurple/protocols/jabber/jabber.c:1018
-#: ../libpurple/protocols/jabber/jabber.c:1733
+#: ../libpurple/protocols/jabber/jabber.c:1008
+#: ../libpurple/protocols/jabber/jabber.c:1017
+#: ../libpurple/protocols/jabber/jabber.c:1737
 #: ../libpurple/protocols/jabber/si.c:874
-#: ../libpurple/protocols/jabber/usermood.c:185
-#: ../libpurple/protocols/jabber/usernick.c:79
+#: ../libpurple/protocols/jabber/usermood.c:184
+#: ../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/oscar/oscar.c:6078
+#: ../libpurple/protocols/oscar/oscar.c:6094
 #: ../libpurple/protocols/oscar/peer.c:1046
 #: ../libpurple/protocols/qq/buddy_info.c:484
 #: ../libpurple/protocols/qq/buddy_opt.c:214
@@ -190,165 +187,165 @@
 #: ../libpurple/protocols/silc10/ops.c:1904
 #: ../libpurple/protocols/silc10/silc.c:736
 #: ../libpurple/protocols/silc10/silc.c:942
-#: ../libpurple/protocols/yahoo/yahoo.c:1029
-#: ../libpurple/protocols/yahoo/yahoo.c:3495
-#: ../libpurple/protocols/yahoo/yahoo.c:3506 ../pidgin/gtkaccount.c:1908
-#: ../pidgin/gtkaccount.c:2495 ../pidgin/gtkblist.c:5971
-#: ../pidgin/gtkcertmgr.c:196 ../pidgin/gtkdialogs.c:758
-#: ../pidgin/gtkdialogs.c:897 ../pidgin/gtkdialogs.c:989
-#: ../pidgin/gtkdialogs.c:1009 ../pidgin/gtkdialogs.c:1033
-#: ../pidgin/gtkdialogs.c:1055 ../pidgin/gtkdialogs.c:1103
-#: ../pidgin/gtkdialogs.c:1144 ../pidgin/gtkdialogs.c:1200
-#: ../pidgin/gtkdialogs.c:1239 ../pidgin/gtkdialogs.c:1266
-#: ../pidgin/gtkimhtmltoolbar.c:434 ../pidgin/gtklog.c:327
-#: ../pidgin/gtkplugin.c:288 ../pidgin/gtkpounce.c:1100
-#: ../pidgin/gtkprivacy.c:562 ../pidgin/gtkprivacy.c:578
-#: ../pidgin/gtkprivacy.c:603 ../pidgin/gtkprivacy.c:617
-#: ../pidgin/gtkrequest.c:270 ../pidgin/gtksavedstatuses.c:344
-#: ../pidgin/gtkstatusbox.c:1573
+#: ../libpurple/protocols/yahoo/yahoo.c:1032
+#: ../libpurple/protocols/yahoo/yahoo.c:3498
+#: ../libpurple/protocols/yahoo/yahoo.c:3509 ../pidgin/gtkaccount.c:1908
+#: ../pidgin/gtkaccount.c:2495 ../pidgin/gtkblist.c:5967
+#: ../pidgin/gtkcertmgr.c:197 ../pidgin/gtkdialogs.c:773
+#: ../pidgin/gtkdialogs.c:912 ../pidgin/gtkdialogs.c:1004
+#: ../pidgin/gtkdialogs.c:1024 ../pidgin/gtkdialogs.c:1048
+#: ../pidgin/gtkdialogs.c:1070 ../pidgin/gtkdialogs.c:1118
+#: ../pidgin/gtkdialogs.c:1159 ../pidgin/gtkdialogs.c:1215
+#: ../pidgin/gtkdialogs.c:1254 ../pidgin/gtkdialogs.c:1281
+#: ../pidgin/gtkimhtmltoolbar.c:435 ../pidgin/gtklog.c:328
+#: ../pidgin/gtkplugin.c:289 ../pidgin/gtkpounce.c:1101
+#: ../pidgin/gtkprivacy.c:563 ../pidgin/gtkprivacy.c:579
+#: ../pidgin/gtkprivacy.c:604 ../pidgin/gtkprivacy.c:618
+#: ../pidgin/gtkrequest.c:271 ../pidgin/gtksavedstatuses.c:345
+#: ../pidgin/gtkstatusbox.c:1574
 msgid "Cancel"
 msgstr "Cancel"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:578 ../finch/gntcertmgr.c:310
-#: ../finch/gntplugin.c:378 ../finch/gntpounce.c:464 ../finch/gntprefs.c:264
-#: ../finch/gntsound.c:1054 ../finch/gntstatus.c:487 ../finch/gntstatus.c:597
-#: ../libpurple/account.c:1288 ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:727 ../pidgin/gtkdebug.c:748
-#: ../pidgin/gtkrequest.c:276
+#: ../finch/gntaccount.c:579 ../finch/gntcertmgr.c:311
+#: ../finch/gntplugin.c:379 ../finch/gntpounce.c:465 ../finch/gntprefs.c:265
+#: ../finch/gntsound.c:1055 ../finch/gntstatus.c:488 ../finch/gntstatus.c:598
+#: ../libpurple/account.c:1297 ../libpurple/plugins/buddynote.c:50
+#: ../libpurple/protocols/jabber/buddy.c:727 ../pidgin/gtkdebug.c:749
+#: ../pidgin/gtkrequest.c:277
 msgid "Save"
 msgstr "Save"
 
-#: ../finch/gntaccount.c:631 ../pidgin/gtkaccount.c:1900
-#: ../pidgin/gtksavedstatuses.c:332 ../pidgin/gtkstatusbox.c:1567
+#: ../finch/gntaccount.c:632 ../pidgin/gtkaccount.c:1900
+#: ../pidgin/gtksavedstatuses.c:333 ../pidgin/gtkstatusbox.c:1568
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Are you sure you want to delete %s?"
 
-#: ../finch/gntaccount.c:634
+#: ../finch/gntaccount.c:635
 msgid "Delete Account"
 msgstr "Delete Account"
 
 #. Delete button
-#: ../finch/gntaccount.c:636 ../finch/gntaccount.c:706
-#: ../finch/gntcertmgr.c:318 ../finch/gntpounce.c:665 ../finch/gntpounce.c:728
-#: ../finch/gntstatus.c:143 ../finch/gntstatus.c:209
-#: ../pidgin/gtkaccount.c:1907 ../pidgin/gtklog.c:326
-#: ../pidgin/gtkpounce.c:1099 ../pidgin/gtkrequest.c:273
-#: ../pidgin/gtksavedstatuses.c:343 ../pidgin/gtkstatusbox.c:1572
+#: ../finch/gntaccount.c:637 ../finch/gntaccount.c:707
+#: ../finch/gntcertmgr.c:319 ../finch/gntpounce.c:666 ../finch/gntpounce.c:729
+#: ../finch/gntstatus.c:144 ../finch/gntstatus.c:210
+#: ../pidgin/gtkaccount.c:1907 ../pidgin/gtklog.c:327
+#: ../pidgin/gtkpounce.c:1100 ../pidgin/gtkrequest.c:274
+#: ../pidgin/gtksavedstatuses.c:344 ../pidgin/gtkstatusbox.c:1573
 msgid "Delete"
 msgstr "Delete"
 
-#: ../finch/gntaccount.c:668 ../finch/gntblist.c:2118 ../finch/gntui.c:82
+#: ../finch/gntaccount.c:669 ../finch/gntblist.c:2119 ../finch/gntui.c:82
 #: ../pidgin/gtkaccount.c:2325 ../pidgin/gtkdocklet.c:522
 msgid "Accounts"
 msgstr "Accounts"
 
-#: ../finch/gntaccount.c:674
+#: ../finch/gntaccount.c:675
 msgid "You can enable/disable accounts from the following list."
 msgstr "You can enable/disable accounts from the following list."
 
 #. Add button
-#: ../finch/gntaccount.c:697 ../finch/gntaccount.c:882 ../finch/gntblist.c:342
-#: ../finch/gntblist.c:420 ../finch/gntblist.c:455 ../finch/gntcertmgr.c:305
-#: ../finch/gntnotify.c:379 ../finch/gntpounce.c:712 ../finch/gntstatus.c:198
+#: ../finch/gntaccount.c:698 ../finch/gntaccount.c:888 ../finch/gntblist.c:343
+#: ../finch/gntblist.c:421 ../finch/gntblist.c:456 ../finch/gntcertmgr.c:306
+#: ../finch/gntnotify.c:380 ../finch/gntpounce.c:713 ../finch/gntstatus.c:199
 #: ../libpurple/protocols/gg/gg.c:883 ../libpurple/protocols/qq/sys_msg.c:114
 #: ../libpurple/protocols/qq/sys_msg.c:173
 #: ../libpurple/protocols/qq/sys_msg.c:267
 #: ../libpurple/protocols/sametime/sametime.c:5486
 #: ../libpurple/protocols/silc/chat.c:615
 #: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2494
-#: ../pidgin/gtkblist.c:5970 ../pidgin/gtkconv.c:1644
-#: ../pidgin/gtkrequest.c:274
+#: ../pidgin/gtkblist.c:5966 ../pidgin/gtkconv.c:1659
+#: ../pidgin/gtkrequest.c:275
 msgid "Add"
 msgstr "Add"
 
 #. Modify button
-#: ../finch/gntaccount.c:702 ../finch/gntpounce.c:720
+#: ../finch/gntaccount.c:703 ../finch/gntpounce.c:721
 msgid "Modify"
 msgstr "Modify"
 
-#: ../finch/gntaccount.c:805 ../pidgin/gtkaccount.c:2441
+#: ../finch/gntaccount.c:811 ../pidgin/gtkaccount.c:2441
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s has made %s his or her buddy%s%s"
 
-#: ../finch/gntaccount.c:878 ../pidgin/gtkaccount.c:2493
+#: ../finch/gntaccount.c:884 ../pidgin/gtkaccount.c:2493
 msgid "Add buddy to your list?"
 msgstr "Add buddy to your list?"
 
-#: ../finch/gntaccount.c:938 ../pidgin/gtkaccount.c:2551
+#: ../finch/gntaccount.c:944 ../pidgin/gtkaccount.c:2551
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 msgstr "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 
-#: ../finch/gntaccount.c:963 ../finch/gntaccount.c:966
-#: ../finch/gntaccount.c:993 ../pidgin/gtkaccount.c:2574
+#: ../finch/gntaccount.c:969 ../finch/gntaccount.c:972
+#: ../finch/gntaccount.c:999 ../pidgin/gtkaccount.c:2574
 #: ../pidgin/gtkaccount.c:2580
 msgid "Authorize buddy?"
 msgstr "Authorise buddy?"
 
-#: ../finch/gntaccount.c:970 ../finch/gntaccount.c:997
+#: ../finch/gntaccount.c:976 ../finch/gntaccount.c:1003
 #: ../pidgin/gtkaccount.c:2575 ../pidgin/gtkaccount.c:2581
 msgid "Authorize"
 msgstr "Authorise"
 
-#: ../finch/gntaccount.c:971 ../finch/gntaccount.c:998
+#: ../finch/gntaccount.c:977 ../finch/gntaccount.c:1004
 #: ../pidgin/gtkaccount.c:2576 ../pidgin/gtkaccount.c:2582
 msgid "Deny"
 msgstr "Deny"
 
-#: ../finch/gntblist.c:288
+#: ../finch/gntblist.c:289
 msgid "You must provide a screename for the buddy."
 msgstr "You must provide a screen name for the buddy."
 
-#: ../finch/gntblist.c:290
+#: ../finch/gntblist.c:291
 msgid "You must provide a group."
 msgstr "You must provide a group."
 
-#: ../finch/gntblist.c:292
+#: ../finch/gntblist.c:293
 msgid "You must select an account."
 msgstr "You must select an account."
 
-#: ../finch/gntblist.c:294
+#: ../finch/gntblist.c:295
 msgid "The selected account is not online."
 msgstr "The selected account is not online."
 
-#: ../finch/gntblist.c:299
+#: ../finch/gntblist.c:300
 msgid "Error adding buddy"
 msgstr "Error adding buddy"
 
-#: ../finch/gntblist.c:324 ../libpurple/protocols/oscar/oscar.c:2881
-#: ../pidgin/gtkaccount.c:1981 ../pidgin/gtksavedstatuses.c:979
+#: ../finch/gntblist.c:325 ../libpurple/protocols/oscar/oscar.c:2888
+#: ../pidgin/gtkaccount.c:1981 ../pidgin/gtksavedstatuses.c:980
 msgid "Screen Name"
 msgstr "Screen Name"
 
-#: ../finch/gntblist.c:327 ../finch/gntblist.c:409 ../finch/gntblist.c:1249
-#: ../libpurple/protocols/msn/msn.c:1392
+#: ../finch/gntblist.c:328 ../finch/gntblist.c:410 ../finch/gntblist.c:1250
+#: ../libpurple/protocols/msn/msn.c:1395
 #: ../libpurple/protocols/silc/chat.c:606
 #: ../libpurple/protocols/silc10/chat.c:590
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:704
 #: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:1008
-#: ../pidgin/gtkdialogs.c:1032 ../pidgin/gtkdialogs.c:1054
-#: ../pidgin/gtkrequest.c:277
+#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:1023
+#: ../pidgin/gtkdialogs.c:1047 ../pidgin/gtkdialogs.c:1069
+#: ../pidgin/gtkrequest.c:278
 msgid "Alias"
 msgstr "Alias"
 
-#: ../finch/gntblist.c:330 ../finch/gntblist.c:412
+#: ../finch/gntblist.c:331 ../finch/gntblist.c:413
 msgid "Group"
 msgstr "Group"
 
-#: ../finch/gntblist.c:334 ../finch/gntblist.c:400 ../finch/gntblist.c:1304
-#: ../finch/gntnotify.c:173 ../finch/gntstatus.c:575
+#: ../finch/gntblist.c:335 ../finch/gntblist.c:401 ../finch/gntblist.c:1305
+#: ../finch/gntnotify.c:174 ../finch/gntstatus.c:576
 #: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:3005 ../pidgin/gtknotify.c:488
-#: ../pidgin/gtkpounce.c:1267 ../pidgin/plugins/gevolution/gevolution.c:445
+#: ../pidgin/gtkblist.c:3008 ../pidgin/gtknotify.c:506
+#: ../pidgin/gtkpounce.c:1268 ../pidgin/plugins/gevolution/gevolution.c:445
 msgid "Account"
 msgstr "Account"
 
-#: ../finch/gntblist.c:340 ../finch/gntblist.c:851
+#: ../finch/gntblist.c:341 ../finch/gntblist.c:852
 #: ../libpurple/protocols/silc/buddy.c:725
 #: ../libpurple/protocols/silc/buddy.c:1027
 #: ../libpurple/protocols/silc/buddy.c:1072
@@ -357,182 +354,182 @@
 #: ../libpurple/protocols/silc10/buddy.c:1033
 #: ../libpurple/protocols/silc10/buddy.c:1080
 #: ../libpurple/protocols/silc10/buddy.c:1180
-#: ../libpurple/protocols/yahoo/yahoo.c:3340 ../pidgin/gtkblist.c:5477
+#: ../libpurple/protocols/yahoo/yahoo.c:3343 ../pidgin/gtkblist.c:5483
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
 msgid "Add Buddy"
 msgstr "Add Buddy"
 
-#: ../finch/gntblist.c:340
+#: ../finch/gntblist.c:341
 msgid "Please enter buddy information."
 msgstr "Please enter buddy information."
 
-#: ../finch/gntblist.c:369 ../libpurple/blist.c:1190
+#: ../finch/gntblist.c:370 ../libpurple/blist.c:1209
 msgid "Chats"
 msgstr "Chats"
 
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:406 ../libpurple/protocols/jabber/jabber.c:925
-#: ../libpurple/protocols/jabber/jabber.c:928
-#: ../libpurple/protocols/msn/msn.c:1581 ../libpurple/protocols/msn/msn.c:1646
-#: ../libpurple/protocols/msn/msn.c:1673
-#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:581
-#: ../pidgin/gtkroomlist.c:617
+#: ../finch/gntblist.c:407 ../libpurple/protocols/jabber/jabber.c:924
+#: ../libpurple/protocols/jabber/jabber.c:927
+#: ../libpurple/protocols/msn/msn.c:1584 ../libpurple/protocols/msn/msn.c:1649
+#: ../libpurple/protocols/msn/msn.c:1676
+#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:582
+#: ../pidgin/gtkroomlist.c:618
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:123
 msgid "Name"
 msgstr "Name"
 
-#: ../finch/gntblist.c:415 ../finch/gntblist.c:818
+#: ../finch/gntblist.c:416 ../finch/gntblist.c:819
 msgid "Auto-join"
 msgstr "Auto-join"
 
-#: ../finch/gntblist.c:418 ../finch/gntblist.c:853 ../pidgin/gtkblist.c:5856
+#: ../finch/gntblist.c:419 ../finch/gntblist.c:854 ../pidgin/gtkblist.c:5859
 msgid "Add Chat"
 msgstr "Add Chat"
 
-#: ../finch/gntblist.c:419
+#: ../finch/gntblist.c:420
 msgid "You can edit more information from the context menu later."
 msgstr "You can edit more information from the context menu later."
 
-#: ../finch/gntblist.c:432 ../finch/gntblist.c:445
+#: ../finch/gntblist.c:433 ../finch/gntblist.c:446
 msgid "Error adding group"
 msgstr "Error adding group"
 
-#: ../finch/gntblist.c:433
+#: ../finch/gntblist.c:434
 msgid "You must give a name for the group to add."
 msgstr "You must give a name for the group to add."
 
-#: ../finch/gntblist.c:446
+#: ../finch/gntblist.c:447
 msgid "A group with the name already exists."
 msgstr "A group with that name already exists."
 
-#: ../finch/gntblist.c:453 ../finch/gntblist.c:855
+#: ../finch/gntblist.c:454 ../finch/gntblist.c:856
 #: ../libpurple/protocols/sametime/sametime.c:5396
-#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5967
+#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5963
 msgid "Add Group"
 msgstr "Add Group"
 
-#: ../finch/gntblist.c:453
+#: ../finch/gntblist.c:454
 msgid "Enter the name of the group"
 msgstr "Enter the name of the group"
 
-#: ../finch/gntblist.c:801
+#: ../finch/gntblist.c:802
 msgid "Edit Chat"
 msgstr "Edit Chat"
 
-#: ../finch/gntblist.c:801
+#: ../finch/gntblist.c:802
 msgid "Please Update the necessary fields."
 msgstr "Please update the necessary fields."
 
-#: ../finch/gntblist.c:802 ../finch/gntstatus.c:204
+#: ../finch/gntblist.c:803 ../finch/gntstatus.c:205
 msgid "Edit"
 msgstr "Edit"
 
-#: ../finch/gntblist.c:827
+#: ../finch/gntblist.c:828
 msgid "Edit Settings"
 msgstr "Edit Settings"
 
-#: ../finch/gntblist.c:863 ../pidgin/gtkutils.c:930
+#: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:931
 msgid "Information"
 msgstr "Information"
 
-#: ../finch/gntblist.c:863 ../pidgin/gtkutils.c:930
+#: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:931
 msgid "Retrieving..."
 msgstr "Retrieving..."
 
-#: ../finch/gntblist.c:903 ../finch/gntconv.c:484
+#: ../finch/gntblist.c:904 ../finch/gntconv.c:507
 #: ../libpurple/protocols/silc/chat.c:899
 #: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
 msgstr "Get Info"
 
-#: ../finch/gntblist.c:907
+#: ../finch/gntblist.c:908
 msgid "Add Buddy Pounce"
 msgstr "Add Buddy Pounce"
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:914 ../finch/gntconv.c:496
+#: ../finch/gntblist.c:915 ../finch/gntconv.c:519
 #: ../libpurple/protocols/jabber/si.c:874
-#: ../libpurple/protocols/oscar/oscar.c:653 ../libpurple/protocols/qq/qq.c:587
-#: ../pidgin/gtkconv.c:1592
+#: ../libpurple/protocols/oscar/oscar.c:654 ../libpurple/protocols/qq/qq.c:587
+#: ../pidgin/gtkconv.c:1607
 msgid "Send File"
 msgstr "Send File"
 
-#: ../finch/gntblist.c:918
+#: ../finch/gntblist.c:919
 msgid "View Log"
 msgstr "View Log"
 
-#: ../finch/gntblist.c:999
+#: ../finch/gntblist.c:1000
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr "Please enter the new name for %s"
 
-#: ../finch/gntblist.c:1001 ../finch/gntblist.c:1249
+#: ../finch/gntblist.c:1002 ../finch/gntblist.c:1250
 msgid "Rename"
 msgstr "Rename"
 
-#: ../finch/gntblist.c:1001
+#: ../finch/gntblist.c:1002
 msgid "Set Alias"
 msgstr "Set Alias"
 
-#: ../finch/gntblist.c:1002
+#: ../finch/gntblist.c:1003
 msgid "Enter empty string to reset the name."
 msgstr "Enter empty string to reset the name."
 
-#: ../finch/gntblist.c:1078
+#: ../finch/gntblist.c:1079
 msgid "Removing this contact will also remove all the buddies in the contact"
 msgstr "Removing this contact will also remove all the buddies in the contact"
 
-#: ../finch/gntblist.c:1086
+#: ../finch/gntblist.c:1087
 msgid "Removing this group will also remove all the buddies in the group"
 msgstr "Removing this group will also remove all the buddies in the group"
 
-#: ../finch/gntblist.c:1091
+#: ../finch/gntblist.c:1092
 #, c-format
 msgid "Are you sure you want to remove %s?"
 msgstr "Are you sure you want to remove %s?"
 
 #. XXX: anything to do with the returned ui-handle?
-#: ../finch/gntblist.c:1094
+#: ../finch/gntblist.c:1095
 msgid "Confirm Remove"
 msgstr "Confirm Remove"
 
-#: ../finch/gntblist.c:1099 ../finch/gntblist.c:1251 ../finch/gntft.c:226
-#: ../pidgin/gtkconv.c:1641 ../pidgin/gtkrequest.c:275
-#: ../pidgin/gtkstatusbox.c:263
+#: ../finch/gntblist.c:1100 ../finch/gntblist.c:1252 ../finch/gntft.c:227
+#: ../pidgin/gtkconv.c:1656 ../pidgin/gtkrequest.c:276
+#: ../pidgin/gtkstatusbox.c:264
 msgid "Remove"
 msgstr "Remove"
 
 #. Buddy List
-#: ../finch/gntblist.c:1225 ../finch/gntblist.c:2306 ../finch/gntprefs.c:257
-#: ../finch/gntui.c:83 ../pidgin/gtkblist.c:2685 ../pidgin/gtkblist.c:4281
+#: ../finch/gntblist.c:1226 ../finch/gntblist.c:2307 ../finch/gntprefs.c:258
+#: ../finch/gntui.c:83 ../pidgin/gtkblist.c:2688 ../pidgin/gtkblist.c:4284
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:326
 msgid "Buddy List"
 msgstr "Buddy List"
 
-#: ../finch/gntblist.c:1256
+#: ../finch/gntblist.c:1257
 msgid "Place tagged"
 msgstr "Place tagged"
 
-#: ../finch/gntblist.c:1261
+#: ../finch/gntblist.c:1262
 msgid "Toggle Tag"
 msgstr "Toggle Tag"
 
 #. General
-#: ../finch/gntblist.c:1297 ../libpurple/protocols/gg/gg.c:637
+#: ../finch/gntblist.c:1298 ../libpurple/protocols/gg/gg.c:637
 #: ../libpurple/protocols/gg/gg.c:1050 ../libpurple/protocols/gg/gg.c:1123
 #: ../libpurple/protocols/gg/gg.c:2207
 #: ../libpurple/protocols/jabber/buddy.c:286
 #: ../libpurple/protocols/jabber/buddy.c:1247
-#: ../libpurple/protocols/jabber/buddy.c:2190
-#: ../libpurple/protocols/jabber/buddy.c:2372
-#: ../libpurple/protocols/jabber/jabber.c:938
-#: ../libpurple/protocols/jabber/jabber.c:1540
-#: ../libpurple/protocols/jabber/jabber.c:1563
-#: ../libpurple/protocols/jabber/jabber.c:1586
-#: ../libpurple/protocols/jabber/jabber.c:1609
-#: ../libpurple/protocols/jabber/jabber.c:1632
-#: ../libpurple/protocols/msn/msn.c:1400 ../libpurple/protocols/msn/msn.c:1584
+#: ../libpurple/protocols/jabber/buddy.c:2214
+#: ../libpurple/protocols/jabber/buddy.c:2396
+#: ../libpurple/protocols/jabber/jabber.c:937
+#: ../libpurple/protocols/jabber/jabber.c:1544
+#: ../libpurple/protocols/jabber/jabber.c:1567
+#: ../libpurple/protocols/jabber/jabber.c:1590
+#: ../libpurple/protocols/jabber/jabber.c:1613
+#: ../libpurple/protocols/jabber/jabber.c:1636
+#: ../libpurple/protocols/msn/msn.c:1403 ../libpurple/protocols/msn/msn.c:1587
 #: ../libpurple/protocols/qq/buddy_info.c:43
 #: ../libpurple/protocols/silc/buddy.c:1535
 #: ../libpurple/protocols/silc/ops.c:1002
@@ -542,29 +539,29 @@
 #: ../libpurple/protocols/silc10/ops.c:1036
 #: ../libpurple/protocols/silc10/ops.c:1179
 #: ../libpurple/protocols/silc10/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3029
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3032
 msgid "Nickname"
 msgstr "Nickname"
 
 #. Idle stuff
-#: ../finch/gntblist.c:1319 ../finch/gntprefs.c:260
+#: ../finch/gntblist.c:1320 ../finch/gntprefs.c:261
 #: ../libpurple/protocols/bonjour/bonjour.c:340
 #: ../libpurple/protocols/jabber/buddy.c:787
 #: ../libpurple/protocols/jabber/buddy.c:951
 #: ../libpurple/protocols/msn/msn.c:544 ../libpurple/protocols/msn/state.c:32
 #: ../libpurple/protocols/novell/novell.c:2825
-#: ../libpurple/protocols/oscar/oscar.c:2905
-#: ../libpurple/protocols/yahoo/yahoo.c:3094
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3057
-#: ../pidgin/gtkblist.c:3457 ../pidgin/gtkprefs.c:1924
+#: ../libpurple/protocols/oscar/oscar.c:2912
+#: ../libpurple/protocols/yahoo/yahoo.c:3097
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3060
+#: ../pidgin/gtkblist.c:3460 ../pidgin/gtkprefs.c:1925
 msgid "Idle"
 msgstr "Idle"
 
-#: ../finch/gntblist.c:1333
+#: ../finch/gntblist.c:1334
 msgid "On Mobile"
 msgstr "On Mobile"
 
-#: ../finch/gntblist.c:1414
+#: ../finch/gntblist.c:1415
 #, c-format
 msgid ""
 "Online: %d\n"
@@ -573,12 +570,12 @@
 "Online: %d\n"
 "Total: %d"
 
-#: ../finch/gntblist.c:1423
+#: ../finch/gntblist.c:1424
 #, c-format
 msgid "Account: %s (%s)"
 msgstr "Account: %s (%s)"
 
-#: ../finch/gntblist.c:1435
+#: ../finch/gntblist.c:1436
 #, c-format
 msgid ""
 "\n"
@@ -587,36 +584,36 @@
 "\n"
 "Last Seen: %s ago"
 
-#: ../finch/gntblist.c:1701 ../pidgin/gtkdocklet.c:470
-#: ../pidgin/gtkstatusbox.c:1071
+#: ../finch/gntblist.c:1702 ../pidgin/gtkdocklet.c:470
+#: ../pidgin/gtkstatusbox.c:1072
 msgid "New..."
 msgstr "New..."
 
-#: ../finch/gntblist.c:1708 ../pidgin/gtkdocklet.c:471
-#: ../pidgin/gtkstatusbox.c:1072
+#: ../finch/gntblist.c:1709 ../pidgin/gtkdocklet.c:471
+#: ../pidgin/gtkstatusbox.c:1073
 msgid "Saved..."
 msgstr "Saved..."
 
-#: ../finch/gntblist.c:2086 ../finch/gntplugin.c:254 ../finch/gntui.c:88
-#: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:530
+#: ../finch/gntblist.c:2087 ../finch/gntplugin.c:255 ../finch/gntui.c:88
+#: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:531
 msgid "Plugins"
 msgstr "Plug-ins"
 
-#: ../finch/gntblist.c:2202 ../pidgin/gtkdialogs.c:739
-#: ../pidgin/gtkdialogs.c:878 ../pidgin/gtkdialogs.c:959
+#: ../finch/gntblist.c:2203 ../pidgin/gtkdialogs.c:754
+#: ../pidgin/gtkdialogs.c:893 ../pidgin/gtkdialogs.c:974
 msgid "_Name"
 msgstr "_Name"
 
-#: ../finch/gntblist.c:2207 ../pidgin/gtkdialogs.c:744
-#: ../pidgin/gtkdialogs.c:883 ../pidgin/gtkdialogs.c:964
+#: ../finch/gntblist.c:2208 ../pidgin/gtkdialogs.c:759
+#: ../pidgin/gtkdialogs.c:898 ../pidgin/gtkdialogs.c:979
 msgid "_Account"
 msgstr "_Account"
 
-#: ../finch/gntblist.c:2215 ../pidgin/gtkdialogs.c:752
+#: ../finch/gntblist.c:2216 ../pidgin/gtkdialogs.c:767
 msgid "New Instant Message"
 msgstr "New Instant Message"
 
-#: ../finch/gntblist.c:2217 ../pidgin/gtkdialogs.c:754
+#: ../finch/gntblist.c:2218 ../pidgin/gtkdialogs.c:769
 msgid ""
 "Please enter the screen name or alias of the person you would like to IM."
 msgstr ""
@@ -625,15 +622,15 @@
 #. Not multiline
 #. Not masked?
 #. No hints?
-#: ../finch/gntblist.c:2220 ../finch/gntcertmgr.c:89 ../finch/gntnotify.c:79
-#: ../libpurple/account.c:1003 ../libpurple/account.c:1253
-#: ../libpurple/protocols/gg/gg.c:506 ../libpurple/protocols/gg/gg.c:665
-#: ../libpurple/protocols/gg/gg.c:802
-#: ../libpurple/protocols/jabber/jabber.c:1732
+#: ../finch/gntblist.c:2221 ../finch/gntcertmgr.c:90 ../finch/gntconn.c:135
+#: ../finch/gntnotify.c:80 ../libpurple/account.c:1012
+#: ../libpurple/account.c:1262 ../libpurple/protocols/gg/gg.c:506
+#: ../libpurple/protocols/gg/gg.c:665 ../libpurple/protocols/gg/gg.c:802
+#: ../libpurple/protocols/jabber/jabber.c:1736
 #: ../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/oscar/oscar.c:6077
+#: ../libpurple/protocols/oscar/oscar.c:6093
 #: ../libpurple/protocols/silc/buddy.c:454
 #: ../libpurple/protocols/silc/buddy.c:1190
 #: ../libpurple/protocols/silc/chat.c:447
@@ -650,57 +647,59 @@
 #: ../libpurple/protocols/silc10/ops.c:1297
 #: ../libpurple/protocols/silc10/ops.c:1903
 #: ../libpurple/protocols/silc10/silc.c:735
-#: ../libpurple/protocols/yahoo/yahoo.c:1028
-#: ../libpurple/protocols/yahoo/yahoo.c:3494
-#: ../libpurple/protocols/yahoo/yahoo.c:3505 ../pidgin/gtkblist.c:4036
-#: ../pidgin/gtkcertmgr.c:194 ../pidgin/gtkdialogs.c:757
-#: ../pidgin/gtkdialogs.c:896 ../pidgin/gtkdialogs.c:988
-#: ../pidgin/gtkrequest.c:269
+#: ../libpurple/protocols/yahoo/yahoo.c:1031
+#: ../libpurple/protocols/yahoo/yahoo.c:3497
+#: ../libpurple/protocols/yahoo/yahoo.c:3508 ../pidgin/gtkblist.c:4039
+#: ../pidgin/gtkcertmgr.c:195 ../pidgin/gtkdialogs.c:772
+#: ../pidgin/gtkdialogs.c:911 ../pidgin/gtkdialogs.c:1003
+#: ../pidgin/gtkrequest.c:270
 msgid "OK"
 msgstr "OK"
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2240 ../finch/gntpounce.c:446 ../pidgin/gtkpounce.c:789
+#: ../finch/gntblist.c:2241 ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:790
 msgid "Options"
 msgstr "Options"
 
-#: ../finch/gntblist.c:2246
+#: ../finch/gntblist.c:2247
 msgid "Send IM..."
 msgstr "Send IM..."
 
-#: ../finch/gntblist.c:2250
+#: ../finch/gntblist.c:2251
+#, fuzzy
 msgid "Show empty groups"
 msgstr "Show empty groups"
 
-#: ../finch/gntblist.c:2256
+#: ../finch/gntblist.c:2257
+#, fuzzy
 msgid "Show offline buddies"
-msgstr "Show offline buddies"
-
-#: ../finch/gntblist.c:2262
+msgstr "Show Offline Buddies"
+
+#: ../finch/gntblist.c:2263
 msgid "Sort by status"
 msgstr "Sort by status"
 
-#: ../finch/gntblist.c:2266
+#: ../finch/gntblist.c:2267
 msgid "Sort alphabetically"
 msgstr "Sort alphabetically"
 
-#: ../finch/gntblist.c:2270
+#: ../finch/gntblist.c:2271
 msgid "Sort by log size"
 msgstr "Sort by log size"
 
-#: ../finch/gntcertmgr.c:85 ../pidgin/gtkcertmgr.c:187
+#: ../finch/gntcertmgr.c:86 ../pidgin/gtkcertmgr.c:188
 msgid "Certificate Import"
 msgstr "Certificate Import"
 
-#: ../finch/gntcertmgr.c:86 ../pidgin/gtkcertmgr.c:188
+#: ../finch/gntcertmgr.c:87 ../pidgin/gtkcertmgr.c:189
 msgid "Specify a hostname"
 msgstr "Specify a hostname"
 
-#: ../finch/gntcertmgr.c:87 ../pidgin/gtkcertmgr.c:189
+#: ../finch/gntcertmgr.c:88 ../pidgin/gtkcertmgr.c:190
 msgid "Type the host name this certificate is for."
 msgstr "Type the host name this certificate is for."
 
-#: ../finch/gntcertmgr.c:96 ../pidgin/gtkcertmgr.c:209
+#: ../finch/gntcertmgr.c:97 ../pidgin/gtkcertmgr.c:210
 #, c-format
 msgid ""
 "File %s could not be imported.\n"
@@ -709,19 +708,19 @@
 "File %s could not be imported.\n"
 "Make sure that the file is readable and in PEM format.\n"
 
-#: ../finch/gntcertmgr.c:98 ../pidgin/gtkcertmgr.c:211
+#: ../finch/gntcertmgr.c:99 ../pidgin/gtkcertmgr.c:212
 msgid "Certificate Import Error"
 msgstr "Certificate Import Error"
 
-#: ../finch/gntcertmgr.c:99 ../pidgin/gtkcertmgr.c:212
+#: ../finch/gntcertmgr.c:100 ../pidgin/gtkcertmgr.c:213
 msgid "X.509 certificate import failed"
 msgstr "X.509 certificate import failed"
 
-#: ../finch/gntcertmgr.c:109 ../pidgin/gtkcertmgr.c:223
+#: ../finch/gntcertmgr.c:110 ../pidgin/gtkcertmgr.c:224
 msgid "Select a PEM certificate"
 msgstr "Select a PEM certificate"
 
-#: ../finch/gntcertmgr.c:126 ../pidgin/gtkcertmgr.c:244
+#: ../finch/gntcertmgr.c:127 ../pidgin/gtkcertmgr.c:245
 #, c-format
 msgid ""
 "Export to file %s failed.\n"
@@ -730,26 +729,24 @@
 "Export to file %s failed.\n"
 "Check that you have write permission to the target path\n"
 
-#: ../finch/gntcertmgr.c:128 ../pidgin/gtkcertmgr.c:246
+#: ../finch/gntcertmgr.c:129 ../pidgin/gtkcertmgr.c:247
 msgid "Certificate Export Error"
 msgstr "Certificate Export Error"
 
-#: ../finch/gntcertmgr.c:129 ../pidgin/gtkcertmgr.c:247
+#: ../finch/gntcertmgr.c:130 ../pidgin/gtkcertmgr.c:248
 msgid "X.509 certificate export failed"
 msgstr "X.509 certificate export failed"
 
-#: ../finch/gntcertmgr.c:158 ../pidgin/gtkcertmgr.c:298
+#: ../finch/gntcertmgr.c:159 ../pidgin/gtkcertmgr.c:299
 msgid "PEM X.509 Certificate Export"
 msgstr "PEM X.509 Certificate Export"
 
-#. Build a notification thing
-#. TODO: This needs a better GUI, but a notification will do for now
-#: ../finch/gntcertmgr.c:187 ../pidgin/gtkcertmgr.c:336
+#: ../finch/gntcertmgr.c:188
 #, c-format
 msgid "Certificate for %s"
 msgstr "Certificate for %s"
 
-#: ../finch/gntcertmgr.c:194 ../pidgin/gtkcertmgr.c:343
+#: ../finch/gntcertmgr.c:195
 #, c-format
 msgid ""
 "Common name: %s\n"
@@ -762,56 +759,56 @@
 "SHA1 fingerprint:\n"
 "%s"
 
-#: ../finch/gntcertmgr.c:197 ../pidgin/gtkcertmgr.c:346
+#: ../finch/gntcertmgr.c:198
 msgid "SSL Host Certificate"
 msgstr "SSL Host Certificate"
 
-#: ../finch/gntcertmgr.c:232 ../pidgin/gtkcertmgr.c:391
+#: ../finch/gntcertmgr.c:233 ../pidgin/gtkcertmgr.c:372
 #, c-format
 msgid "Really delete certificate for %s?"
 msgstr "Really delete certificate for %s?"
 
-#: ../finch/gntcertmgr.c:235 ../pidgin/gtkcertmgr.c:393
+#: ../finch/gntcertmgr.c:236 ../pidgin/gtkcertmgr.c:374
 msgid "Confirm certificate delete"
 msgstr "Confirm certificate delete"
 
-#: ../finch/gntcertmgr.c:292 ../pidgin/gtkcertmgr.c:621
+#: ../finch/gntcertmgr.c:293 ../pidgin/gtkcertmgr.c:602
 msgid "Certificate Manager"
 msgstr "Certificate Manager"
 
 #. Creating the user splits
-#: ../finch/gntcertmgr.c:297 ../libpurple/protocols/bonjour/bonjour.c:652
+#: ../finch/gntcertmgr.c:298 ../libpurple/protocols/bonjour/bonjour.c:652
 #: ../libpurple/protocols/silc/silc.c:1007
 #: ../libpurple/protocols/silc10/silc.c:918
 msgid "Hostname"
 msgstr "Hostname"
 
-#: ../finch/gntcertmgr.c:314 ../finch/gntnotify.c:382 ../pidgin/gtkconv.c:1620
-#: ../pidgin/gtkdebug.c:834
+#: ../finch/gntcertmgr.c:315 ../finch/gntnotify.c:383 ../pidgin/gtkconv.c:1635
+#: ../pidgin/gtkdebug.c:835
 msgid "Info"
 msgstr "Info"
 
 #. Close button
-#: ../finch/gntcertmgr.c:323 ../finch/gntft.c:236 ../finch/gntnotify.c:181
-#: ../finch/gntplugin.c:209 ../finch/gntplugin.c:309 ../finch/gntpounce.c:737
-#: ../finch/gntstatus.c:215 ../libpurple/protocols/msn/msn.c:403
+#: ../finch/gntcertmgr.c:324 ../finch/gntft.c:237 ../finch/gntnotify.c:182
+#: ../finch/gntplugin.c:210 ../finch/gntplugin.c:310 ../finch/gntpounce.c:738
+#: ../finch/gntstatus.c:216 ../libpurple/protocols/msn/msn.c:403
 #: ../libpurple/protocols/silc/util.c:382
 #: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2468
-#: ../pidgin/gtkrequest.c:272
+#: ../pidgin/gtkrequest.c:273
 msgid "Close"
 msgstr "Close"
 
-#: ../finch/gntconn.c:110
+#: ../finch/gntconn.c:124
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../finch/gntconn.c:113
+#: ../finch/gntconn.c:127
 #, c-format
 msgid "%s disconnected."
 msgstr "%s disconnected."
 
-#: ../finch/gntconn.c:114
+#: ../finch/gntconn.c:128
 #, c-format
 msgid ""
 "%s\n"
@@ -824,46 +821,50 @@
 "Finch will not attempt to reconnect the account until you correct the error "
 "and re-enable the account."
 
-#: ../finch/gntconv.c:119
+#: ../finch/gntconn.c:137 ../pidgin/gtkblist.c:4041
+msgid "Re-enable Account"
+msgstr "Re-enable Account"
+
+#: ../finch/gntconv.c:139
 msgid "No such command."
 msgstr "No such command."
 
-#: ../finch/gntconv.c:123 ../pidgin/gtkconv.c:469
+#: ../finch/gntconv.c:143 ../pidgin/gtkconv.c:489
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr ""
 "Syntax Error:  You typed the wrong number of arguments to that command."
 
-#: ../finch/gntconv.c:128 ../pidgin/gtkconv.c:475
+#: ../finch/gntconv.c:148 ../pidgin/gtkconv.c:495
 msgid "Your command failed for an unknown reason."
 msgstr "Your command failed for an unknown reason."
 
-#: ../finch/gntconv.c:133 ../pidgin/gtkconv.c:482
+#: ../finch/gntconv.c:153 ../pidgin/gtkconv.c:502
 msgid "That command only works in chats, not IMs."
 msgstr "That command only works in chats, not IMs."
 
-#: ../finch/gntconv.c:136 ../pidgin/gtkconv.c:485
+#: ../finch/gntconv.c:156 ../pidgin/gtkconv.c:505
 msgid "That command only works in IMs, not chats."
 msgstr "That command only works in IMs, not chats."
 
-#: ../finch/gntconv.c:140 ../pidgin/gtkconv.c:490
+#: ../finch/gntconv.c:160 ../pidgin/gtkconv.c:510
 msgid "That command doesn't work on this protocol."
 msgstr "That command doesn't work on this protocol."
 
-#: ../finch/gntconv.c:148
+#: ../finch/gntconv.c:168
 msgid "Message was not sent, because you are not signed on."
 msgstr "Message was not sent because you are not signed on."
 
-#: ../finch/gntconv.c:231
+#: ../finch/gntconv.c:251
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../finch/gntconv.c:254
+#: ../finch/gntconv.c:274
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:259 ../finch/gntconv.c:747
+#: ../finch/gntconv.c:279 ../finch/gntconv.c:773
 #, c-format
 msgid ""
 "\n"
@@ -872,66 +873,66 @@
 "\n"
 "%s is typing..."
 
-#: ../finch/gntconv.c:278
+#: ../finch/gntconv.c:298
 msgid "You have left this chat."
 msgstr "You have left this chat."
 
-#: ../finch/gntconv.c:367 ../pidgin/gtkconv.c:1351
+#: ../finch/gntconv.c:387 ../pidgin/gtkconv.c:1362
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr "Logging started. Future messages in this conversation will be logged."
 
-#: ../finch/gntconv.c:373 ../pidgin/gtkconv.c:1359
+#: ../finch/gntconv.c:393 ../pidgin/gtkconv.c:1370
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr ""
 "Logging stopped. Future messages in this conversation will not be logged."
 
-#: ../finch/gntconv.c:419
+#: ../finch/gntconv.c:442
 msgid "Send To"
 msgstr "Send To"
 
-#: ../finch/gntconv.c:463
+#: ../finch/gntconv.c:486
 msgid "Conversation"
 msgstr "Conversation"
 
-#: ../finch/gntconv.c:469
+#: ../finch/gntconv.c:492
 msgid "Clear Scrollback"
 msgstr "Clear Scrollback"
 
-#: ../finch/gntconv.c:473 ../finch/gntprefs.c:190
+#: ../finch/gntconv.c:496 ../finch/gntprefs.c:191
 msgid "Show Timestamps"
 msgstr "Show Timestamps"
 
-#: ../finch/gntconv.c:489
+#: ../finch/gntconv.c:512
 msgid "Add Buddy Pounce..."
 msgstr "Add Buddy Pounce..."
 
-#: ../finch/gntconv.c:504
+#: ../finch/gntconv.c:527
 msgid "Enable Logging"
 msgstr "Enable Logging"
 
-#: ../finch/gntconv.c:510
+#: ../finch/gntconv.c:533
 msgid "Enable Sounds"
 msgstr "Enable Sounds"
 
-#: ../finch/gntconv.c:713
+#: ../finch/gntconv.c:739
 msgid "<AUTO-REPLY> "
 msgstr "<AUTO-REPLY> "
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:835
+#: ../finch/gntconv.c:861
 msgid "List of users:\n"
 msgstr "List of users:\n"
 
-#: ../finch/gntconv.c:997 ../pidgin/gtkconv.c:311
+#: ../finch/gntconv.c:1023 ../pidgin/gtkconv.c:331
 msgid "Supported debug options are:  version"
 msgstr "Supported debug options are:  version"
 
-#: ../finch/gntconv.c:1033 ../pidgin/gtkconv.c:361
+#: ../finch/gntconv.c:1059 ../pidgin/gtkconv.c:381
 msgid "No such command (in this context)."
 msgstr "No such command (in this context)."
 
-#: ../finch/gntconv.c:1036 ../pidgin/gtkconv.c:364
+#: ../finch/gntconv.c:1062 ../pidgin/gtkconv.c:384
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -939,7 +940,7 @@
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
 
-#: ../finch/gntconv.c:1094 ../pidgin/gtkconv.c:7538
+#: ../finch/gntconv.c:1120 ../pidgin/gtkconv.c:7560
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -947,11 +948,11 @@
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
 
-#: ../finch/gntconv.c:1097 ../pidgin/gtkconv.c:7541
+#: ../finch/gntconv.c:1123 ../pidgin/gtkconv.c:7563
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 
-#: ../finch/gntconv.c:1100 ../pidgin/gtkconv.c:7544
+#: ../finch/gntconv.c:1126 ../pidgin/gtkconv.c:7566
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -959,43 +960,43 @@
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 
-#: ../finch/gntconv.c:1103 ../pidgin/gtkconv.c:7547
+#: ../finch/gntconv.c:1129 ../pidgin/gtkconv.c:7569
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Clears the conversation scrollback."
 
-#: ../finch/gntconv.c:1106 ../pidgin/gtkconv.c:7553
+#: ../finch/gntconv.c:1132 ../pidgin/gtkconv.c:7575
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;command&gt;:  Help on a specific command."
 
-#: ../finch/gntconv.c:1109
+#: ../finch/gntconv.c:1135
 msgid "users:  Show the list of users in the chat."
 msgstr "users: Show the list of users in the chat."
 
-#: ../finch/gntconv.c:1114
+#: ../finch/gntconv.c:1140
 msgid "plugins: Show the plugins window."
 msgstr "plugins: Show the plugins window"
 
-#: ../finch/gntconv.c:1117
+#: ../finch/gntconv.c:1143
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist: Show the buddy list."
 
-#: ../finch/gntconv.c:1120
+#: ../finch/gntconv.c:1146
 msgid "accounts: Show the accounts window."
 msgstr "accounts: Show the accounts window."
 
-#: ../finch/gntconv.c:1123
+#: ../finch/gntconv.c:1149
 msgid "debugwin: Show the debug window."
 msgstr "debugwin: Show the debug window."
 
-#: ../finch/gntconv.c:1126
+#: ../finch/gntconv.c:1152
 msgid "prefs: Show the preference window."
 msgstr "prefs: Show the preference window."
 
-#: ../finch/gntconv.c:1129
+#: ../finch/gntconv.c:1155
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: Show the saved-statuses window."
 
-#: ../finch/gntdebug.c:234 ../finch/gntui.c:86 ../pidgin/gtkdebug.c:694
+#: ../finch/gntdebug.c:235 ../finch/gntui.c:86 ../pidgin/gtkdebug.c:695
 msgid "Debug Window"
 msgstr "Debug Window"
 
@@ -1003,186 +1004,186 @@
 #. * it's necessary to make the width of the debug window resizable ... like I said,
 #. * it doesn't make sense. The bug is likely in the packing in gntbox.c.
 #.
-#: ../finch/gntdebug.c:255 ../pidgin/gtkdebug.c:753
+#: ../finch/gntdebug.c:256 ../pidgin/gtkdebug.c:754
 msgid "Clear"
 msgstr "Clear"
 
-#: ../finch/gntdebug.c:261
+#: ../finch/gntdebug.c:262
 msgid "Filter: "
 msgstr "Filter: "
 
-#: ../finch/gntdebug.c:265 ../pidgin/gtkdebug.c:762
+#: ../finch/gntdebug.c:266 ../pidgin/gtkdebug.c:763
 msgid "Pause"
 msgstr "Pause"
 
-#: ../finch/gntft.c:117 ../pidgin/gtkft.c:228
+#: ../finch/gntft.c:118 ../pidgin/gtkft.c:229
 #, c-format
 msgid "File Transfers - %d%% of %d files"
 msgstr "File Transfers - %d%% of %d files"
 
 #. Create the window.
-#: ../finch/gntft.c:122 ../finch/gntft.c:195 ../finch/gntui.c:87
-#: ../pidgin/gtkft.c:233 ../pidgin/gtkft.c:761
+#: ../finch/gntft.c:123 ../finch/gntft.c:196 ../finch/gntui.c:87
+#: ../pidgin/gtkft.c:234 ../pidgin/gtkft.c:762
 msgid "File Transfers"
 msgstr "File Transfers"
 
-#: ../finch/gntft.c:200 ../pidgin/gtkft.c:644
+#: ../finch/gntft.c:201 ../pidgin/gtkft.c:645
 msgid "Progress"
 msgstr "Progress"
 
-#: ../finch/gntft.c:200 ../pidgin/gtkft.c:651
+#: ../finch/gntft.c:201 ../pidgin/gtkft.c:652
 msgid "Filename"
 msgstr "Filename"
 
-#: ../finch/gntft.c:200 ../pidgin/gtkft.c:658
+#: ../finch/gntft.c:201 ../pidgin/gtkft.c:659
 msgid "Size"
 msgstr "Size"
 
-#: ../finch/gntft.c:200
+#: ../finch/gntft.c:201
 msgid "Speed"
 msgstr "Speed"
 
-#: ../finch/gntft.c:200 ../pidgin/gtkft.c:665
+#: ../finch/gntft.c:201 ../pidgin/gtkft.c:666
 msgid "Remaining"
 msgstr "Remaining"
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
-#: ../finch/gntft.c:200 ../finch/gntstatus.c:546 ../finch/gntstatus.c:575
+#: ../finch/gntft.c:201 ../finch/gntstatus.c:547 ../finch/gntstatus.c:576
 #: ../libpurple/protocols/bonjour/bonjour.c:344
 #: ../libpurple/protocols/gg/gg.c:1039 ../libpurple/protocols/gg/gg.c:1576
 #: ../libpurple/protocols/gg/gg.c:1584
 #: ../libpurple/protocols/jabber/buddy.c:778
 #: ../libpurple/protocols/jabber/buddy.c:782
 #: ../libpurple/protocols/jabber/buddy.c:941
-#: ../libpurple/protocols/jabber/jabber.c:1496
+#: ../libpurple/protocols/jabber/jabber.c:1500
 #: ../libpurple/protocols/msn/msn.c:543
 #: ../libpurple/protocols/novell/novell.c:2835
-#: ../libpurple/protocols/oscar/oscar.c:820
-#: ../libpurple/protocols/oscar/oscar.c:825
-#: ../libpurple/protocols/oscar/oscar.c:827
-#: ../libpurple/protocols/oscar/oscar.c:2693
-#: ../libpurple/protocols/oscar/oscar.c:3773
+#: ../libpurple/protocols/oscar/oscar.c:821
+#: ../libpurple/protocols/oscar/oscar.c:826
+#: ../libpurple/protocols/oscar/oscar.c:828
+#: ../libpurple/protocols/oscar/oscar.c:2700
+#: ../libpurple/protocols/oscar/oscar.c:3780
 #: ../libpurple/protocols/sametime/sametime.c:3263
 #: ../libpurple/protocols/sametime/sametime.c:4150
-#: ../libpurple/protocols/yahoo/yahoo.c:3245 ../pidgin/gtkblist.c:3101
-#: ../pidgin/gtkblist.c:3115 ../pidgin/gtkblist.c:3117
-#: ../pidgin/gtksavedstatuses.c:998 ../pidgin/gtksavedstatuses.c:1143
+#: ../libpurple/protocols/yahoo/yahoo.c:3248 ../pidgin/gtkblist.c:3104
+#: ../pidgin/gtkblist.c:3118 ../pidgin/gtkblist.c:3120
+#: ../pidgin/gtksavedstatuses.c:999 ../pidgin/gtksavedstatuses.c:1144
 msgid "Status"
 msgstr "Status"
 
-#: ../finch/gntft.c:210
+#: ../finch/gntft.c:211
 msgid "Close this window when all transfers finish"
 msgstr "Close this window when all transfers finish"
 
-#: ../finch/gntft.c:217
+#: ../finch/gntft.c:218
 msgid "Clear finished transfers"
 msgstr "Clear finished transfers"
 
-#: ../finch/gntft.c:231
+#: ../finch/gntft.c:232
 msgid "Stop"
 msgstr "Stop"
 
-#: ../finch/gntft.c:304 ../pidgin/gtkft.c:168 ../pidgin/gtkft.c:972
+#: ../finch/gntft.c:305 ../pidgin/gtkft.c:169 ../pidgin/gtkft.c:973
 msgid "Waiting for transfer to begin"
 msgstr "Waiting for transfer to begin"
 
-#: ../finch/gntft.c:371 ../pidgin/gtkft.c:165 ../pidgin/gtkft.c:1053
+#: ../finch/gntft.c:372 ../pidgin/gtkft.c:166 ../pidgin/gtkft.c:1054
 msgid "Canceled"
 msgstr "Cancelled"
 
-#: ../finch/gntft.c:373 ../pidgin/gtkft.c:1055
+#: ../finch/gntft.c:374 ../pidgin/gtkft.c:1056
 msgid "Failed"
 msgstr "Failed"
 
-#: ../finch/gntft.c:419 ../pidgin/gtkft.c:133
+#: ../finch/gntft.c:420 ../pidgin/gtkft.c:134
 #, c-format
 msgid "%.2f KiB/s"
 msgstr "%.2f KiB/s"
 
-#: ../finch/gntft.c:430
+#: ../finch/gntft.c:431
 #, c-format
 msgid "The file was saved as %s."
 msgstr "The file was saved as %s."
 
-#: ../finch/gntft.c:431 ../finch/gntft.c:432 ../pidgin/gtkft.c:162
-#: ../pidgin/gtkft.c:1115
+#: ../finch/gntft.c:432 ../finch/gntft.c:433 ../pidgin/gtkft.c:163
+#: ../pidgin/gtkft.c:1116
 msgid "Finished"
 msgstr "Finished"
 
-#: ../finch/gntft.c:436 ../libpurple/protocols/msn/session.c:347
+#: ../finch/gntft.c:437 ../libpurple/protocols/msn/session.c:347
 msgid "Transferring"
 msgstr "Transferring"
 
-#: ../finch/gntnotify.c:164
+#: ../finch/gntnotify.c:165
 msgid "Emails"
 msgstr "Emails"
 
-#: ../finch/gntnotify.c:170 ../finch/gntnotify.c:224
+#: ../finch/gntnotify.c:171 ../finch/gntnotify.c:225
 msgid "You have mail!"
 msgstr "You have e-mail!"
 
-#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:495
+#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:513
 msgid "Sender"
 msgstr "Sender"
 
-#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:502
+#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:520
 msgid "Subject"
 msgstr "Subject"
 
-#: ../finch/gntnotify.c:200
+#: ../finch/gntnotify.c:201
 #, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
 msgstr[0] "%s (%s) has %d new message."
 msgstr[1] "%s (%s) has %d new messages."
 
-#: ../finch/gntnotify.c:224 ../pidgin/gtknotify.c:340
+#: ../finch/gntnotify.c:225 ../pidgin/gtknotify.c:341
 msgid "New Mail"
 msgstr "New Mail"
 
-#: ../finch/gntnotify.c:289 ../pidgin/gtknotify.c:908
+#: ../finch/gntnotify.c:290 ../pidgin/gtknotify.c:940
 #, c-format
 msgid "Info for %s"
 msgstr "Info for %s"
 
-#: ../finch/gntnotify.c:290 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:909
+#: ../finch/gntnotify.c:291 ../libpurple/protocols/toc/toc.c:476
+#: ../pidgin/gtknotify.c:941
 msgid "Buddy Information"
 msgstr "Buddy Information"
 
-#: ../finch/gntnotify.c:376 ../libpurple/protocols/qq/group_join.c:367
+#: ../finch/gntnotify.c:377 ../libpurple/protocols/qq/group_join.c:367
 msgid "Continue"
 msgstr "Continue"
 
-#: ../finch/gntnotify.c:385 ../pidgin/gtkconv.c:1581
+#: ../finch/gntnotify.c:386 ../pidgin/gtkconv.c:1596
 msgid "IM"
 msgstr "IM"
 
-#: ../finch/gntnotify.c:388
+#: ../finch/gntnotify.c:389
 msgid "Join"
 msgstr "Join"
 
-#: ../finch/gntnotify.c:391 ../libpurple/protocols/sametime/sametime.c:3473
+#: ../finch/gntnotify.c:392 ../libpurple/protocols/sametime/sametime.c:3473
 msgid "Invite"
 msgstr "Invite"
 
-#: ../finch/gntnotify.c:394
+#: ../finch/gntnotify.c:395
 msgid "(none)"
 msgstr "(none)"
 
-#: ../finch/gntplugin.c:74 ../finch/gntplugin.c:83
+#: ../finch/gntplugin.c:75 ../finch/gntplugin.c:84
 msgid "ERROR"
 msgstr "ERROR"
 
-#: ../finch/gntplugin.c:74
+#: ../finch/gntplugin.c:75
 msgid "loading plugin failed"
 msgstr "loading plugin failed"
 
-#: ../finch/gntplugin.c:83
+#: ../finch/gntplugin.c:84
 msgid "unloading plugin failed"
 msgstr "unloading plugin failed"
 
-#: ../finch/gntplugin.c:128
+#: ../finch/gntplugin.c:129
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -1199,19 +1200,19 @@
 "Website: %s\n"
 "Filename: %s\n"
 
-#: ../finch/gntplugin.c:186
+#: ../finch/gntplugin.c:187
 msgid "Plugin need to be loaded before you can configure it."
 msgstr "Plugin needs to be loaded before you can configure it."
 
-#: ../finch/gntplugin.c:234
+#: ../finch/gntplugin.c:235
 msgid "No configuration options for this plugin."
 msgstr "No configuration options for this plugin."
 
-#: ../finch/gntplugin.c:259
+#: ../finch/gntplugin.c:260
 msgid "You can (un)load plugins from the following list."
 msgstr "You are (un)load plugins from the following list."
 
-#: ../finch/gntplugin.c:314
+#: ../finch/gntplugin.c:315
 msgid "Configure Plugin"
 msgstr "Configure Plugin"
 
@@ -1220,361 +1221,362 @@
 #. (that should have been "effect," right?)
 #. Back to instant-apply! I win!  BU-HAHAHA!
 #. Create the window
-#: ../finch/gntplugin.c:370 ../finch/gntplugin.c:377 ../finch/gntprefs.c:263
-#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2066
+#: ../finch/gntplugin.c:371 ../finch/gntplugin.c:378 ../finch/gntprefs.c:264
+#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2067
 msgid "Preferences"
 msgstr "Preferences"
 
-#: ../finch/gntpounce.c:182 ../pidgin/gtkpounce.c:255
+#: ../finch/gntpounce.c:183 ../pidgin/gtkpounce.c:256
 msgid "Please enter a buddy to pounce."
 msgstr "Please enter a buddy to pounce."
 
-#: ../finch/gntpounce.c:327 ../pidgin/gtkpounce.c:516
+#: ../finch/gntpounce.c:328 ../pidgin/gtkpounce.c:517
 msgid "New Buddy Pounce"
 msgstr "New Buddy Pounce"
 
-#: ../finch/gntpounce.c:327 ../pidgin/gtkpounce.c:516
+#: ../finch/gntpounce.c:328 ../pidgin/gtkpounce.c:517
 msgid "Edit Buddy Pounce"
 msgstr "Edit Buddy Pounce"
 
-#: ../finch/gntpounce.c:332
+#: ../finch/gntpounce.c:333
 msgid "Pounce Who"
 msgstr "Pounce on Whom"
 
 #. Account:
-#: ../finch/gntpounce.c:335 ../finch/gntstatus.c:455
+#: ../finch/gntpounce.c:336 ../finch/gntstatus.c:456
 msgid "Account:"
 msgstr "Account:"
 
-#: ../finch/gntpounce.c:357
+#: ../finch/gntpounce.c:358
 msgid "Buddy name:"
 msgstr "Buddy name:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:373 ../pidgin/gtkpounce.c:584
+#: ../finch/gntpounce.c:374 ../pidgin/gtkpounce.c:585
 msgid "Pounce When Buddy..."
 msgstr "Pounce When Buddy..."
 
-#: ../finch/gntpounce.c:375
-msgid "Signs on"
-msgstr "Signs on"
-
 #: ../finch/gntpounce.c:376
-msgid "Signs off"
-msgstr "Signs off"
+msgid "Signs on"
+msgstr "Signs on"
 
 #: ../finch/gntpounce.c:377
+msgid "Signs off"
+msgstr "Signs off"
+
+#: ../finch/gntpounce.c:378
 msgid "Goes away"
 msgstr "Goes away"
 
-#: ../finch/gntpounce.c:378
-msgid "Returns from away"
-msgstr "Returns from away"
-
 #: ../finch/gntpounce.c:379
-msgid "Becomes idle"
-msgstr "Becomes idle"
+msgid "Returns from away"
+msgstr "Returns from away"
 
 #: ../finch/gntpounce.c:380
+msgid "Becomes idle"
+msgstr "Becomes idle"
+
+#: ../finch/gntpounce.c:381
 msgid "Is no longer idle"
 msgstr "Is no longer idle"
 
-#: ../finch/gntpounce.c:381
+#: ../finch/gntpounce.c:382
 msgid "Starts typing"
 msgstr "Starts typing"
 
-#: ../finch/gntpounce.c:382
+#: ../finch/gntpounce.c:383
 msgid "Pauses while typing"
 msgstr "Pauses while typing"
 
-#: ../finch/gntpounce.c:383
+#: ../finch/gntpounce.c:384
 msgid "Stops typing"
 msgstr "Stops typing"
 
-#: ../finch/gntpounce.c:384
+#: ../finch/gntpounce.c:385
 msgid "Sends a message"
 msgstr "Sends a message"
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:413 ../pidgin/gtkpounce.c:645
+#: ../finch/gntpounce.c:414 ../pidgin/gtkpounce.c:646
 msgid "Action"
 msgstr "Action"
 
-#: ../finch/gntpounce.c:415
+#: ../finch/gntpounce.c:416
 msgid "Open an IM window"
 msgstr "Open a message window"
 
-#: ../finch/gntpounce.c:416
+#: ../finch/gntpounce.c:417
 msgid "Pop up a notification"
 msgstr "Pop up a notification"
 
-#: ../finch/gntpounce.c:417
+#: ../finch/gntpounce.c:418
 msgid "Send a message"
 msgstr "Send a message"
 
-#: ../finch/gntpounce.c:418
+#: ../finch/gntpounce.c:419
 msgid "Execute a command"
 msgstr "Execute a command"
 
-#: ../finch/gntpounce.c:419
+#: ../finch/gntpounce.c:420
 msgid "Play a sound"
 msgstr "Play a sound"
 
-#: ../finch/gntpounce.c:447
+#: ../finch/gntpounce.c:448
 msgid "Pounce only when my status is not available"
 msgstr "Pounce only when my status is not available"
 
-#: ../finch/gntpounce.c:449 ../pidgin/gtkpounce.c:1280
+#: ../finch/gntpounce.c:450 ../pidgin/gtkpounce.c:1281
 msgid "Recurring"
 msgstr "Recurring"
 
-#: ../finch/gntpounce.c:617
+#: ../finch/gntpounce.c:618
 msgid "Cannot create pounce"
 msgstr "Cannot create pounce"
 
-#: ../finch/gntpounce.c:618
+#: ../finch/gntpounce.c:619
 msgid "You do not have any accounts."
 msgstr "You do not have any accounts."
 
-#: ../finch/gntpounce.c:619
+#: ../finch/gntpounce.c:620
 msgid "You must create an account first before you can create a pounce."
 msgstr "You must create an account first before you can create a pounce."
 
-#: ../finch/gntpounce.c:661 ../pidgin/gtkpounce.c:1095
+#: ../finch/gntpounce.c:662 ../pidgin/gtkpounce.c:1096
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "Are you sure you want to delete the pounce on %s for %s?"
 
-#: ../finch/gntpounce.c:695 ../finch/gntui.c:84 ../pidgin/gtkpounce.c:1324
+#: ../finch/gntpounce.c:696 ../finch/gntui.c:84 ../pidgin/gtkpounce.c:1325
 msgid "Buddy Pounces"
 msgstr "Buddy Pounces"
 
-#: ../finch/gntpounce.c:809 ../pidgin/gtkpounce.c:1451
+#: ../finch/gntpounce.c:810 ../pidgin/gtkpounce.c:1452
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s has started typing to you (%s)"
 
-#: ../finch/gntpounce.c:811 ../pidgin/gtkpounce.c:1453
+#: ../finch/gntpounce.c:812 ../pidgin/gtkpounce.c:1454
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s has paused while typing to you (%s)"
 
-#: ../finch/gntpounce.c:813 ../pidgin/gtkpounce.c:1455
+#: ../finch/gntpounce.c:814 ../pidgin/gtkpounce.c:1456
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s has signed on (%s)"
 
-#: ../finch/gntpounce.c:815 ../pidgin/gtkpounce.c:1457
+#: ../finch/gntpounce.c:816 ../pidgin/gtkpounce.c:1458
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s has returned from being idle (%s)"
 
-#: ../finch/gntpounce.c:817 ../pidgin/gtkpounce.c:1459
+#: ../finch/gntpounce.c:818 ../pidgin/gtkpounce.c:1460
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s has returned from being away (%s)"
 
-#: ../finch/gntpounce.c:819 ../pidgin/gtkpounce.c:1461
+#: ../finch/gntpounce.c:820 ../pidgin/gtkpounce.c:1462
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s has stopped typing to you (%s)"
 
-#: ../finch/gntpounce.c:821 ../pidgin/gtkpounce.c:1463
+#: ../finch/gntpounce.c:822 ../pidgin/gtkpounce.c:1464
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s has signed off (%s)"
 
-#: ../finch/gntpounce.c:823 ../pidgin/gtkpounce.c:1465
+#: ../finch/gntpounce.c:824 ../pidgin/gtkpounce.c:1466
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s has become idle (%s)"
 
-#: ../finch/gntpounce.c:825 ../pidgin/gtkpounce.c:1467
+#: ../finch/gntpounce.c:826 ../pidgin/gtkpounce.c:1468
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s has gone away. (%s)"
 
-#: ../finch/gntpounce.c:827 ../pidgin/gtkpounce.c:1469
+#: ../finch/gntpounce.c:828 ../pidgin/gtkpounce.c:1470
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s has sent you a message. (%s)"
 
-#: ../finch/gntpounce.c:828 ../pidgin/gtkpounce.c:1470
+#: ../finch/gntpounce.c:829 ../pidgin/gtkpounce.c:1471
+#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "Unknown pounce event. Please report this!"
 
-#: ../finch/gntprefs.c:91
+#: ../finch/gntprefs.c:92
 msgid "Based on keyboard use"
 msgstr "Based on keyboard use"
 
-#: ../finch/gntprefs.c:93 ../pidgin/gtkprefs.c:1929
+#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:1930
 msgid "From last sent message"
 msgstr "From last sent message"
 
-#: ../finch/gntprefs.c:95 ../pidgin/gtkprefs.c:897 ../pidgin/gtkprefs.c:906
-#: ../pidgin/gtkprefs.c:1928 ../pidgin/gtkprefs.c:1942
+#: ../finch/gntprefs.c:96 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:907
+#: ../pidgin/gtkprefs.c:1929 ../pidgin/gtkprefs.c:1943
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:333
 msgid "Never"
 msgstr "Never"
 
-#: ../finch/gntprefs.c:183
+#: ../finch/gntprefs.c:184
 msgid "Show Idle Time"
 msgstr "Show Idle Time"
 
-#: ../finch/gntprefs.c:184
+#: ../finch/gntprefs.c:185
 msgid "Show Offline Buddies"
 msgstr "Show Offline Buddies"
 
-#: ../finch/gntprefs.c:191
+#: ../finch/gntprefs.c:192
 msgid "Notify buddies when you are typing"
 msgstr "Notify buddies when you are typing"
 
-#: ../finch/gntprefs.c:197
+#: ../finch/gntprefs.c:198
 msgid "Log format"
 msgstr "Log format"
 
-#: ../finch/gntprefs.c:198
-msgid "Log IMs"
-msgstr "Log IMs"
-
 #: ../finch/gntprefs.c:199
-msgid "Log chats"
-msgstr "Log chats"
+msgid "Log IMs"
+msgstr "Log IMs"
 
 #: ../finch/gntprefs.c:200
+msgid "Log chats"
+msgstr "Log chats"
+
+#: ../finch/gntprefs.c:201
 msgid "Log status change events"
 msgstr "Log status change events"
 
-#: ../finch/gntprefs.c:206
+#: ../finch/gntprefs.c:207
 msgid "Report Idle time"
 msgstr "Report Idle time"
 
-#: ../finch/gntprefs.c:207
+#: ../finch/gntprefs.c:208
 msgid "Change status when idle"
 msgstr "Change status when idle"
 
-#: ../finch/gntprefs.c:208
+#: ../finch/gntprefs.c:209
 msgid "Minutes before changing status"
 msgstr "Minutes before changing status"
 
-#: ../finch/gntprefs.c:209
+#: ../finch/gntprefs.c:210
 msgid "Change status to"
 msgstr "Change status to"
 
 #. Conversations
-#: ../finch/gntprefs.c:258 ../pidgin/gtkprefs.c:992 ../pidgin/gtkprefs.c:2032
+#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:993 ../pidgin/gtkprefs.c:2033
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:340
 msgid "Conversations"
 msgstr "Conversations"
 
-#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:1466 ../pidgin/gtkprefs.c:2043
+#: ../finch/gntprefs.c:260 ../pidgin/gtkprefs.c:1467 ../pidgin/gtkprefs.c:2044
 msgid "Logging"
 msgstr "Logging"
 
-#: ../finch/gntrequest.c:563
+#: ../finch/gntrequest.c:583
 msgid "Not implemented yet."
 msgstr "Not implemented yet."
 
-#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1555
+#: ../finch/gntrequest.c:659 ../pidgin/gtkrequest.c:1555
 #: ../pidgin/gtkrequest.c:1601
 msgid "Save File..."
 msgstr "Save File..."
 
-#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1556
+#: ../finch/gntrequest.c:659 ../pidgin/gtkrequest.c:1556
 #: ../pidgin/gtkrequest.c:1602
 msgid "Open File..."
 msgstr "Open File..."
 
-#: ../finch/gntsound.c:96 ../pidgin/gtksound.c:63
+#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:64
 msgid "Buddy logs in"
 msgstr "Buddy logs in"
 
-#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:64
-msgid "Buddy logs out"
-msgstr "Buddy logs out"
-
 #: ../finch/gntsound.c:98 ../pidgin/gtksound.c:65
-msgid "Message received"
-msgstr "Message received"
+msgid "Buddy logs out"
+msgstr "Buddy logs out"
 
 #: ../finch/gntsound.c:99 ../pidgin/gtksound.c:66
+msgid "Message received"
+msgstr "Message received"
+
+#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:67
 msgid "Message received begins conversation"
 msgstr "Message received begins conversation"
 
-#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:67
-msgid "Message sent"
-msgstr "Message sent"
-
 #: ../finch/gntsound.c:101 ../pidgin/gtksound.c:68
-msgid "Person enters chat"
-msgstr "Person enters chat"
+msgid "Message sent"
+msgstr "Message sent"
 
 #: ../finch/gntsound.c:102 ../pidgin/gtksound.c:69
+msgid "Person enters chat"
+msgstr "Person enters chat"
+
+#: ../finch/gntsound.c:103 ../pidgin/gtksound.c:70
 msgid "Person leaves chat"
 msgstr "Person leaves chat"
 
-#: ../finch/gntsound.c:103 ../pidgin/gtksound.c:70
+#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:71
 msgid "You talk in chat"
 msgstr "You talk in chat"
 
-#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:71
+#: ../finch/gntsound.c:105 ../pidgin/gtksound.c:72
 msgid "Others talk in chat"
 msgstr "Others talk in chat"
 
-#: ../finch/gntsound.c:106 ../pidgin/gtksound.c:74
+#: ../finch/gntsound.c:107 ../pidgin/gtksound.c:75
 msgid "Someone says your screen name in chat"
 msgstr "Someone says your screen name in chat"
 
-#: ../finch/gntsound.c:360 ../pidgin/gtksound.c:310
-msgid "GStreamer Failure"
-msgstr "GStreamer Failure"
-
 #: ../finch/gntsound.c:361 ../pidgin/gtksound.c:311
+msgid "GStreamer Failure"
+msgstr "GStreamer Failure"
+
+#: ../finch/gntsound.c:362 ../pidgin/gtksound.c:312
 msgid "GStreamer failed to initialize."
 msgstr "GStreamer failed to initialize."
 
-#: ../finch/gntsound.c:715 ../finch/gntsound.c:801 ../pidgin/gtkprefs.c:1586
-#: ../pidgin/gtkprefs.c:1675 ../pidgin/gtkprefs.c:1871
+#: ../finch/gntsound.c:716 ../finch/gntsound.c:802 ../pidgin/gtkprefs.c:1587
+#: ../pidgin/gtkprefs.c:1676 ../pidgin/gtkprefs.c:1872
 msgid "(default)"
 msgstr "(default)"
 
-#: ../finch/gntsound.c:728
+#: ../finch/gntsound.c:729
 msgid "Select Sound File ..."
 msgstr "Select Sound File ..."
 
-#: ../finch/gntsound.c:903
+#: ../finch/gntsound.c:904
 msgid "Sound Preferences"
 msgstr "Sound Preferences"
 
-#: ../finch/gntsound.c:914
+#: ../finch/gntsound.c:915
 msgid "Profiles"
 msgstr "Profiles"
 
-#: ../finch/gntsound.c:953 ../pidgin/gtkprefs.c:1716
+#: ../finch/gntsound.c:954 ../pidgin/gtkprefs.c:1717
 msgid "Automatic"
 msgstr "Automatic"
 
-#: ../finch/gntsound.c:956
+#: ../finch/gntsound.c:957
 msgid "Console Beep"
 msgstr "Console Beep"
 
-#: ../finch/gntsound.c:957 ../pidgin/gtkprefs.c:1720
+#: ../finch/gntsound.c:958 ../pidgin/gtkprefs.c:1721
 msgid "Command"
 msgstr "Command"
 
-#: ../finch/gntsound.c:958
+#: ../finch/gntsound.c:959
 msgid "No Sound"
 msgstr "No Sounds"
 
-#: ../finch/gntsound.c:960 ../pidgin/gtkprefs.c:1711
+#: ../finch/gntsound.c:961 ../pidgin/gtkprefs.c:1712
 msgid "Sound Method"
 msgstr "Sound Method"
 
-#: ../finch/gntsound.c:965
+#: ../finch/gntsound.c:966
 msgid "Method: "
 msgstr "Method: "
 
-#: ../finch/gntsound.c:972
+#: ../finch/gntsound.c:973
 #, c-format
 msgid ""
 "Sound Command\n"
@@ -1584,80 +1586,80 @@
 "(%s for filename)"
 
 #. Sound options
-#: ../finch/gntsound.c:980 ../pidgin/gtkprefs.c:1755
+#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:1756
 msgid "Sound Options"
 msgstr "Sound Options"
 
-#: ../finch/gntsound.c:981
+#: ../finch/gntsound.c:982
 msgid "Sounds when conversation has focus"
 msgstr "Sounds when conversation has focus"
 
-#: ../finch/gntsound.c:989 ../pidgin/gtkprefs.c:896 ../pidgin/gtkprefs.c:908
-#: ../pidgin/gtkprefs.c:1762 ../pidgin/plugins/timestamp_format.c:42
+#: ../finch/gntsound.c:990 ../pidgin/gtkprefs.c:897 ../pidgin/gtkprefs.c:909
+#: ../pidgin/gtkprefs.c:1763 ../pidgin/plugins/timestamp_format.c:42
 #: ../pidgin/plugins/timestamp_format.c:51
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:334
 msgid "Always"
 msgstr "Always"
 
-#: ../finch/gntsound.c:990 ../pidgin/gtkprefs.c:1760
+#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:1761
 msgid "Only when available"
 msgstr "Only when available"
 
-#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:1761
+#: ../finch/gntsound.c:992 ../pidgin/gtkprefs.c:1762
 msgid "Only when not available"
 msgstr "Only when not available"
 
-#: ../finch/gntsound.c:998
+#: ../finch/gntsound.c:999
 msgid "Volume(0-100):"
 msgstr "Volume(0-100):"
 
 #. Sound events
-#: ../finch/gntsound.c:1017 ../pidgin/gtkprefs.c:1797
+#: ../finch/gntsound.c:1018 ../pidgin/gtkprefs.c:1798
 msgid "Sound Events"
 msgstr "Sound Events"
 
-#: ../finch/gntsound.c:1019 ../pidgin/gtkprefs.c:1856
+#: ../finch/gntsound.c:1020 ../pidgin/gtkprefs.c:1857
 msgid "Event"
 msgstr "Event"
 
-#: ../finch/gntsound.c:1019
+#: ../finch/gntsound.c:1020
 msgid "File"
 msgstr "File"
 
-#: ../finch/gntsound.c:1038 ../pidgin/gtkprefs.c:1875
+#: ../finch/gntsound.c:1039 ../pidgin/gtkprefs.c:1876
 msgid "Test"
 msgstr "Test"
 
-#: ../finch/gntsound.c:1041 ../pidgin/gtkprefs.c:1879
+#: ../finch/gntsound.c:1042 ../pidgin/gtkprefs.c:1880
 msgid "Reset"
 msgstr "Reset"
 
-#: ../finch/gntsound.c:1044 ../pidgin/gtkprefs.c:1883
+#: ../finch/gntsound.c:1045 ../pidgin/gtkprefs.c:1884
 msgid "Choose..."
 msgstr "Choose..."
 
-#: ../finch/gntstatus.c:137
+#: ../finch/gntstatus.c:138
 #, c-format
 msgid "Are you sure you want to delete \"%s\""
 msgstr "Are you sure you want to delete \"%s\"?"
 
-#: ../finch/gntstatus.c:140
+#: ../finch/gntstatus.c:141
 msgid "Delete Status"
 msgstr "Delete Status"
 
-#: ../finch/gntstatus.c:175 ../pidgin/gtksavedstatuses.c:596
+#: ../finch/gntstatus.c:176 ../pidgin/gtksavedstatuses.c:597
 msgid "Saved Statuses"
 msgstr "Saved Statuses"
 
-#: ../finch/gntstatus.c:182 ../finch/gntstatus.c:538
+#: ../finch/gntstatus.c:183 ../finch/gntstatus.c:539
 #: ../libpurple/protocols/jabber/buddy.c:298
 #: ../libpurple/protocols/jabber/buddy.c:1359
 #: ../libpurple/protocols/novell/novell.c:1484
-#: ../pidgin/gtksavedstatuses.c:499
+#: ../pidgin/gtksavedstatuses.c:500
 msgid "Title"
 msgstr "Title"
 
-#: ../finch/gntstatus.c:182 ../pidgin/gtksavedstatuses.c:514
+#: ../finch/gntstatus.c:183 ../pidgin/gtksavedstatuses.c:515
 msgid "Type"
 msgstr "Type"
 
@@ -1669,7 +1671,7 @@
 #. user_settable
 #. not independent
 #. Attributes - each status can have a message.
-#: ../finch/gntstatus.c:182 ../finch/gntstatus.c:563 ../finch/gntstatus.c:575
+#: ../finch/gntstatus.c:183 ../finch/gntstatus.c:564 ../finch/gntstatus.c:576
 #: ../libpurple/protocols/bonjour/bonjour.c:256
 #: ../libpurple/protocols/bonjour/bonjour.c:263
 #: ../libpurple/protocols/bonjour/bonjour.c:346
@@ -1677,23 +1679,23 @@
 #: ../libpurple/protocols/gg/gg.c:1597 ../libpurple/protocols/gg/gg.c:1607
 #: ../libpurple/protocols/gg/gg.c:1613 ../libpurple/protocols/gg/gg.c:1622
 #: ../libpurple/protocols/gg/gg.c:1627 ../libpurple/protocols/irc/irc.c:234
-#: ../libpurple/protocols/jabber/jabber.c:1528
-#: ../libpurple/protocols/jabber/jabber.c:1551
-#: ../libpurple/protocols/jabber/jabber.c:1574
-#: ../libpurple/protocols/jabber/jabber.c:1597
-#: ../libpurple/protocols/jabber/jabber.c:1620
-#: ../libpurple/protocols/jabber/jabber.c:1645
+#: ../libpurple/protocols/jabber/jabber.c:1532
+#: ../libpurple/protocols/jabber/jabber.c:1555
+#: ../libpurple/protocols/jabber/jabber.c:1578
+#: ../libpurple/protocols/jabber/jabber.c:1601
+#: ../libpurple/protocols/jabber/jabber.c:1624
+#: ../libpurple/protocols/jabber/jabber.c:1649
 #: ../libpurple/protocols/myspace/myspace.c:148
 #: ../libpurple/protocols/novell/novell.c:2838
 #: ../libpurple/protocols/novell/novell.c:2941
 #: ../libpurple/protocols/novell/novell.c:2947
 #: ../libpurple/protocols/novell/novell.c:2953
-#: ../libpurple/protocols/oscar/oscar.c:5538
-#: ../libpurple/protocols/oscar/oscar.c:5756
-#: ../libpurple/protocols/oscar/oscar.c:5770
+#: ../libpurple/protocols/oscar/oscar.c:5554
+#: ../libpurple/protocols/oscar/oscar.c:5772
 #: ../libpurple/protocols/oscar/oscar.c:5786
-#: ../libpurple/protocols/oscar/oscar.c:5793
-#: ../libpurple/protocols/oscar/oscar.c:5800
+#: ../libpurple/protocols/oscar/oscar.c:5802
+#: ../libpurple/protocols/oscar/oscar.c:5809
+#: ../libpurple/protocols/oscar/oscar.c:5816
 #: ../libpurple/protocols/sametime/sametime.c:3286
 #: ../libpurple/protocols/sametime/sametime.c:3292
 #: ../libpurple/protocols/sametime/sametime.c:3298
@@ -1701,56 +1703,56 @@
 #: ../libpurple/protocols/silc/buddy.c:1551
 #: ../libpurple/protocols/silc10/buddy.c:1551
 #: ../libpurple/protocols/simple/simple.c:246
-#: ../libpurple/protocols/yahoo/yahoo.c:3748
-#: ../libpurple/protocols/yahoo/yahoo.c:3754
+#: ../libpurple/protocols/yahoo/yahoo.c:3751
+#: ../libpurple/protocols/yahoo/yahoo.c:3757
 #: ../libpurple/protocols/zephyr/zephyr.c:2337
-#: ../pidgin/gtksavedstatuses.c:525 ../pidgin/gtksavedstatuses.c:1009
+#: ../pidgin/gtksavedstatuses.c:526 ../pidgin/gtksavedstatuses.c:1010
 msgid "Message"
 msgstr "Message"
 
 #. Use
-#: ../finch/gntstatus.c:193 ../finch/gntstatus.c:592
+#: ../finch/gntstatus.c:194 ../finch/gntstatus.c:593
 msgid "Use"
 msgstr "Use"
 
-#: ../finch/gntstatus.c:300
-msgid "Invalid title"
-msgstr "Invalid title"
-
 #: ../finch/gntstatus.c:301
+msgid "Invalid title"
+msgstr "Invalid title"
+
+#: ../finch/gntstatus.c:302
 msgid "Please enter a non-empty title for the status."
 msgstr "Please enter a non-empty title for the status."
 
-#: ../finch/gntstatus.c:309
+#: ../finch/gntstatus.c:310
 msgid "Duplicate title"
 msgstr "Duplicate title"
 
-#: ../finch/gntstatus.c:310
+#: ../finch/gntstatus.c:311
 msgid "Please enter a different title for the status."
 msgstr "Please enter a different title for the status."
 
-#: ../finch/gntstatus.c:451
+#: ../finch/gntstatus.c:452
 msgid "Substatus"
 msgstr "Sub-status"
 
-#: ../finch/gntstatus.c:463 ../pidgin/gtkft.c:698
+#: ../finch/gntstatus.c:464 ../pidgin/gtkft.c:699
 msgid "Status:"
 msgstr "Status:"
 
-#: ../finch/gntstatus.c:478
+#: ../finch/gntstatus.c:479
 msgid "Message:"
 msgstr "Message:"
 
-#: ../finch/gntstatus.c:527
+#: ../finch/gntstatus.c:528
 msgid "Edit Status"
 msgstr "Edit Status"
 
-#: ../finch/gntstatus.c:569
+#: ../finch/gntstatus.c:570
 msgid "Use different status for following accounts"
 msgstr "Use different status for the following accounts"
 
 #. Save & Use
-#: ../finch/gntstatus.c:603
+#: ../finch/gntstatus.c:604
 msgid "Save & Use"
 msgstr "Save & Use"
 
@@ -1758,7 +1760,7 @@
 msgid "Certificates"
 msgstr "Certificates"
 
-#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2034
+#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2035
 msgid "Sounds"
 msgstr "Sounds"
 
@@ -1902,103 +1904,103 @@
 msgid "Lastlog"
 msgstr "Lastlog"
 
-#: ../finch/plugins/lastlog.c:99
+#. Translator Note: The "backlog" is the conversation buffer/history.
+#: ../finch/plugins/lastlog.c:100
 msgid "lastlog: Searches for a substring in the backlog."
 msgstr "lastlog: Searches for a substring in the backlog."
 
-#: ../finch/plugins/lastlog.c:121
+#: ../finch/plugins/lastlog.c:122
 msgid "GntLastlog"
 msgstr "GntLastlog"
 
-#: ../finch/plugins/lastlog.c:123 ../finch/plugins/lastlog.c:124
+#: ../finch/plugins/lastlog.c:124 ../finch/plugins/lastlog.c:125
 msgid "Lastlog plugin."
 msgstr "Lastlog plugin."
 
-#: ../libpurple/account.c:790
+#: ../libpurple/account.c:791
 msgid "accounts"
 msgstr "accounts"
 
-#: ../libpurple/account.c:957 ../libpurple/protocols/jabber/auth.c:194
-#: ../libpurple/protocols/jabber/auth.c:256
+#: ../libpurple/account.c:958 ../libpurple/protocols/jabber/auth.c:195
 msgid "Password is required to sign on."
 msgstr "Password is required to sign on."
 
-#: ../libpurple/account.c:983
+#: ../libpurple/account.c:992
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "Enter password for %s (%s)"
 
-#: ../libpurple/account.c:990
+#: ../libpurple/account.c:999
 msgid "Enter Password"
 msgstr "Enter Password"
 
-#: ../libpurple/account.c:995
+#: ../libpurple/account.c:1004
 msgid "Save password"
 msgstr "Save password"
 
-#: ../libpurple/account.c:1030 ../libpurple/connection.c:104
-#: ../libpurple/connection.c:177
+#: ../libpurple/account.c:1039 ../libpurple/connection.c:105
+#: ../libpurple/connection.c:178
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "Missing protocol plug-in for %s"
 
-#: ../libpurple/account.c:1032 ../libpurple/connection.c:107
-#: ../pidgin/gtkblist.c:4033
+#: ../libpurple/account.c:1041 ../libpurple/connection.c:108
+#: ../pidgin/gtkblist.c:4036
 msgid "Connection Error"
 msgstr "Connection Error"
 
-#: ../libpurple/account.c:1190 ../libpurple/protocols/gg/gg.c:707
-#: ../libpurple/protocols/jabber/jabber.c:1683
+#: ../libpurple/account.c:1199 ../libpurple/protocols/gg/gg.c:707
+#: ../libpurple/protocols/jabber/jabber.c:1687
 msgid "New passwords do not match."
 msgstr "New passwords do not match."
 
-#: ../libpurple/account.c:1199
+#: ../libpurple/account.c:1208
 msgid "Fill out all fields completely."
 msgstr "Fill out all fields completely."
 
-#: ../libpurple/account.c:1222
+#: ../libpurple/account.c:1231
 msgid "Original password"
 msgstr "Original password"
 
-#: ../libpurple/account.c:1229
+#: ../libpurple/account.c:1238
 msgid "New password"
 msgstr "New password"
 
-#: ../libpurple/account.c:1236
+#: ../libpurple/account.c:1245
 msgid "New password (again)"
 msgstr "New password (again)"
 
-#: ../libpurple/account.c:1242
+#: ../libpurple/account.c:1251
 #, c-format
 msgid "Change password for %s"
 msgstr "Change password for %s"
 
-#: ../libpurple/account.c:1250
+#: ../libpurple/account.c:1259
 msgid "Please enter your current password and your new password."
 msgstr "Please enter your current password and your new password."
 
-#: ../libpurple/account.c:1281
+#: ../libpurple/account.c:1290
 #, c-format
 msgid "Change user information for %s"
 msgstr "Change user information for %s"
 
-#: ../libpurple/account.c:1284 ../libpurple/protocols/toc/toc.c:1670
+#: ../libpurple/account.c:1293 ../libpurple/protocols/toc/toc.c:1670
 msgid "Set User Info"
 msgstr "Set User Info"
 
-#: ../libpurple/account.c:1755 ../libpurple/protocols/gg/gg.c:1017
+#: ../libpurple/account.c:1764 ../libpurple/protocols/gg/gg.c:1017
 #: ../libpurple/protocols/jabber/buddy.c:782
-#: ../libpurple/protocols/jabber/buddy.c:2025
-#: ../libpurple/protocols/jabber/buddy.c:2042
+#: ../libpurple/protocols/jabber/buddy.c:2027
+#: ../libpurple/protocols/jabber/buddy.c:2044
 #: ../libpurple/protocols/novell/novell.c:2831
-#: ../libpurple/protocols/qq/qq.c:232 ../pidgin/gtkft.c:159
+#: ../libpurple/protocols/qq/qq.c:232 ../pidgin/gtkft.c:160
 msgid "Unknown"
 msgstr "Unknown"
 
-#: ../libpurple/blist.c:521 ../libpurple/blist.c:1301
-#: ../libpurple/blist.c:1530 ../libpurple/protocols/jabber/roster.c:69
-#: ../libpurple/protocols/myspace/myspace.c:3238 ../pidgin/gtkblist.c:5367
-#: ../pidgin/plugins/gevolution/gevo-util.c:64
+#: ../libpurple/blist.c:521 ../libpurple/blist.c:1320
+#: ../libpurple/blist.c:1552 ../libpurple/protocols/jabber/roster.c:69
+#: ../libpurple/protocols/myspace/myspace.c:3244 ../pidgin/gtkblist.c:5373
+#: ../pidgin/plugins/gevolution/gevo-util.c:67
 #: ../pidgin/plugins/gevolution/gevolution.c:96
 msgid "Buddies"
 msgstr "Buddies"
@@ -2145,7 +2147,7 @@
 msgstr "Invalid certificate authority signature"
 
 #. Make messages
-#: ../libpurple/certificate.c:1882
+#: ../libpurple/certificate.c:1881
 #, c-format
 msgid ""
 "Common name: %s\n"
@@ -2163,31 +2165,31 @@
 "Expiration date: %s\n"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1891
+#: ../libpurple/certificate.c:1890
 msgid "Certificate Information"
 msgstr "Certificate Information"
 
-#: ../libpurple/connection.c:106
+#: ../libpurple/connection.c:107
 msgid "Registration Error"
 msgstr "Registration Error"
 
-#: ../libpurple/connection.c:179
+#: ../libpurple/connection.c:180
 msgid "Unregistration Error"
 msgstr "Unregistration Error"
 
-#: ../libpurple/connection.c:349
+#: ../libpurple/connection.c:350
 #, c-format
 msgid "+++ %s signed on"
 msgstr "+++ %s signed on"
 
-#: ../libpurple/connection.c:379
+#: ../libpurple/connection.c:380
 #, c-format
 msgid "+++ %s signed off"
 msgstr "+++ %s signed off"
 
-#: ../libpurple/connection.c:496 ../libpurple/plugin.c:282
-#: ../libpurple/protocols/jabber/buddy.c:2313
-#: ../libpurple/protocols/msn/servconn.c:139
+#: ../libpurple/connection.c:497 ../libpurple/plugin.c:282
+#: ../libpurple/protocols/jabber/buddy.c:2337
+#: ../libpurple/protocols/msn/servconn.c:141
 #: ../libpurple/protocols/msn/session.c:322
 msgid "Unknown error"
 msgstr "Unknown error"
@@ -2263,23 +2265,23 @@
 msgid "Failed to get serv name: %s"
 msgstr "Failed to get serv name: %s"
 
-#: ../libpurple/dbus-server.h:84
+#: ../libpurple/dbus-server.h:85
 msgid "Purple's D-BUS server is not running for the reason listed below"
 msgstr "Purple's D-BUS server is not running for the reason listed below"
 
-#: ../libpurple/desktopitem.c:286 ../libpurple/desktopitem.c:877
+#: ../libpurple/desktopitem.c:287 ../libpurple/desktopitem.c:878
 msgid "No name"
 msgstr "No name"
 
-#: ../libpurple/dnsquery.c:510
+#: ../libpurple/dnsquery.c:511
 msgid "Unable to create new resolver process\n"
 msgstr "Unable to create new resolver process\n"
 
-#: ../libpurple/dnsquery.c:515
+#: ../libpurple/dnsquery.c:516
 msgid "Unable to send request to resolver process\n"
 msgstr "Unable to send request to resolver process\n"
 
-#: ../libpurple/dnsquery.c:548 ../libpurple/dnsquery.c:696
+#: ../libpurple/dnsquery.c:549 ../libpurple/dnsquery.c:697
 #, c-format
 msgid ""
 "Error resolving %s:\n"
@@ -2288,13 +2290,13 @@
 "Error resolving %s:\n"
 "%s"
 
-#: ../libpurple/dnsquery.c:551 ../libpurple/dnsquery.c:710
-#: ../libpurple/dnsquery.c:830
+#: ../libpurple/dnsquery.c:552 ../libpurple/dnsquery.c:711
+#: ../libpurple/dnsquery.c:831
 #, c-format
 msgid "Error resolving %s: %d"
 msgstr "Error resolving %s: %d"
 
-#: ../libpurple/dnsquery.c:573
+#: ../libpurple/dnsquery.c:574
 #, c-format
 msgid ""
 "Error reading from resolver process:\n"
@@ -2303,20 +2305,21 @@
 "Error reading from resolver process:\n"
 "%s"
 
-#: ../libpurple/dnsquery.c:577
+#: ../libpurple/dnsquery.c:578
+#, c-format
 msgid "EOF while reading from resolver process"
 msgstr "EOF while reading from resolver process"
 
-#: ../libpurple/dnsquery.c:760
+#: ../libpurple/dnsquery.c:761
 #, c-format
 msgid "Thread creation failure: %s"
 msgstr "Thread creation failure: %s"
 
-#: ../libpurple/dnsquery.c:761
+#: ../libpurple/dnsquery.c:762
 msgid "Unknown reason"
 msgstr "Unknown reason"
 
-#: ../libpurple/ft.c:207
+#: ../libpurple/ft.c:209
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -2325,7 +2328,7 @@
 "Error reading %s: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:211
+#: ../libpurple/ft.c:213
 #, c-format
 msgid ""
 "Error writing %s: \n"
@@ -2334,7 +2337,7 @@
 "Error writing %s: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:215
+#: ../libpurple/ft.c:217
 #, c-format
 msgid ""
 "Error accessing %s: \n"
@@ -2343,39 +2346,39 @@
 "Error accessing %s: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:251
+#: ../libpurple/ft.c:253
 msgid "Directory is not writable."
 msgstr "Directory is not writable."
 
-#: ../libpurple/ft.c:266
+#: ../libpurple/ft.c:268
 msgid "Cannot send a file of 0 bytes."
 msgstr "Cannot send a file of 0 bytes."
 
-#: ../libpurple/ft.c:276
+#: ../libpurple/ft.c:278
 msgid "Cannot send a directory."
 msgstr "Cannot send a directory."
 
-#: ../libpurple/ft.c:285
+#: ../libpurple/ft.c:287
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 
-#: ../libpurple/ft.c:345
+#: ../libpurple/ft.c:347
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s wants to send you %s (%s)"
 
-#: ../libpurple/ft.c:352
+#: ../libpurple/ft.c:354
 #, c-format
 msgid "%s wants to send you a file"
 msgstr "%s wants to send you a file"
 
-#: ../libpurple/ft.c:395
+#: ../libpurple/ft.c:397
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "Accept file transfer request from %s?"
 
-#: ../libpurple/ft.c:399
+#: ../libpurple/ft.c:401
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -2386,60 +2389,62 @@
 "Remote host: %s\n"
 "Remote port: %d"
 
-#: ../libpurple/ft.c:434
+#: ../libpurple/ft.c:436
 #, c-format
 msgid "%s is offering to send file %s"
 msgstr "%s is offering to send file %s"
 
-#: ../libpurple/ft.c:486
+#: ../libpurple/ft.c:488
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s is not a valid filename.\n"
 
-#: ../libpurple/ft.c:507
+#: ../libpurple/ft.c:509
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "Offering to send %s to %s"
 
-#: ../libpurple/ft.c:519
+#: ../libpurple/ft.c:521
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr "Starting transfer of %s from %s"
 
-#: ../libpurple/ft.c:680
+#: ../libpurple/ft.c:682
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "Transfer of file %s complete"
 
-#: ../libpurple/ft.c:683
+#: ../libpurple/ft.c:685
+#, c-format
 msgid "File transfer complete"
 msgstr "File transfer complete"
 
-#: ../libpurple/ft.c:1101
+#: ../libpurple/ft.c:1103
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "You cancelled the transfer of %s"
 
-#: ../libpurple/ft.c:1106
+#: ../libpurple/ft.c:1108
+#, c-format
 msgid "File transfer cancelled"
 msgstr "File transfer cancelled"
 
-#: ../libpurple/ft.c:1164
+#: ../libpurple/ft.c:1166
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s cancelled the transfer of %s"
 
-#: ../libpurple/ft.c:1169
+#: ../libpurple/ft.c:1171
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s cancelled the file transfer"
 
-#: ../libpurple/ft.c:1226
+#: ../libpurple/ft.c:1228
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "File transfer to %s failed."
 
-#: ../libpurple/ft.c:1228
+#: ../libpurple/ft.c:1230
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "File transfer from %s failed."
@@ -2616,31 +2621,31 @@
 msgid "Whether the specified command should handle \"ymsgr\" URLs"
 msgstr "Whether the specified command should handle \"ymsgr\" URLs"
 
-#: ../libpurple/log.c:182
+#: ../libpurple/log.c:183
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color=\"red\">The logger has no read function</font></b>"
 
-#: ../libpurple/log.c:597
+#: ../libpurple/log.c:598
 msgid "HTML"
 msgstr "HTML"
 
-#: ../libpurple/log.c:611
+#: ../libpurple/log.c:612
 msgid "Plain text"
 msgstr "Plain text"
 
-#: ../libpurple/log.c:625
+#: ../libpurple/log.c:626
 msgid "Old flat format"
 msgstr "Old flat format"
 
-#: ../libpurple/log.c:838
+#: ../libpurple/log.c:839
 msgid "Logging of this conversation failed."
 msgstr "Logging of this conversation failed."
 
-#: ../libpurple/log.c:1281
+#: ../libpurple/log.c:1282
 msgid "XML"
 msgstr "XML"
 
-#: ../libpurple/log.c:1365
+#: ../libpurple/log.c:1366
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -2649,7 +2654,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1367
+#: ../libpurple/log.c:1368
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -2658,16 +2663,16 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1425 ../libpurple/log.c:1558
+#: ../libpurple/log.c:1426 ../libpurple/log.c:1559
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>Unable to find log path!</b></font>"
 
-#: ../libpurple/log.c:1437 ../libpurple/log.c:1567
+#: ../libpurple/log.c:1438 ../libpurple/log.c:1568
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>Could not read file: %s</b></font>"
 
-#: ../libpurple/log.c:1499
+#: ../libpurple/log.c:1500
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
@@ -2678,6 +2683,7 @@
 msgstr "You are using %s, but this plugin requires %s."
 
 #: ../libpurple/plugin.c:380
+#, c-format
 msgid "This plugin has not defined an ID."
 msgstr "This plugin has not defined an ID."
 
@@ -2758,14 +2764,14 @@
 
 #: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/idle.c:170
 #: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
-#: ../libpurple/protocols/oscar/oscar.c:1451
-#: ../libpurple/protocols/oscar/oscar.c:2226
-#: ../libpurple/protocols/oscar/oscar.c:2275
-#: ../libpurple/protocols/oscar/oscar.c:5870
-#: ../libpurple/protocols/oscar/oscar.c:5925
-#: ../libpurple/protocols/oscar/oscar.c:6151
-#: ../libpurple/protocols/oscar/oscar.c:6221 ../libpurple/request.h:1387
-#: ../libpurple/request.h:1397
+#: ../libpurple/protocols/oscar/oscar.c:1453
+#: ../libpurple/protocols/oscar/oscar.c:2233
+#: ../libpurple/protocols/oscar/oscar.c:2282
+#: ../libpurple/protocols/oscar/oscar.c:5886
+#: ../libpurple/protocols/oscar/oscar.c:5941
+#: ../libpurple/protocols/oscar/oscar.c:6167
+#: ../libpurple/protocols/oscar/oscar.c:6237 ../libpurple/request.h:1388
+#: ../libpurple/request.h:1398
 msgid "_Cancel"
 msgstr "_Cancel"
 
@@ -2806,8 +2812,8 @@
 "Notify with a popup when an autoaccepted file transfer is complete\n"
 "(only when there's no conversation with the sender)"
 
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1657
-#: ../libpurple/protocols/msn/msn.c:1687
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1660
+#: ../libpurple/protocols/msn/msn.c:1690
 msgid "Notes"
 msgstr "Notes"
 
@@ -2827,18 +2833,18 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/buddynote.c:90 ../pidgin/plugins/gtkbuddynote.c:71
+#: ../libpurple/plugins/buddynote.c:90 ../pidgin/plugins/gtkbuddynote.c:74
 msgid "Buddy Notes"
 msgstr "Buddy Notes"
 
 #. *< name
 #. *< version
-#: ../libpurple/plugins/buddynote.c:92 ../pidgin/plugins/gtkbuddynote.c:73
+#: ../libpurple/plugins/buddynote.c:92 ../pidgin/plugins/gtkbuddynote.c:76
 msgid "Store notes on particular buddies."
 msgstr "Store notes on particular buddies."
 
 #. *< summary
-#: ../libpurple/plugins/buddynote.c:93 ../pidgin/plugins/gtkbuddynote.c:74
+#: ../libpurple/plugins/buddynote.c:93 ../pidgin/plugins/gtkbuddynote.c:77
 msgid "Adds the option to store notes for buddies on your buddy list."
 msgstr "Adds the option to store notes for buddies on your buddy list."
 
@@ -3250,7 +3256,7 @@
 #: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:304
 #: ../libpurple/protocols/silc10/buddy.c:314
 #: ../libpurple/protocols/silc10/pk.c:119
-#: ../libpurple/protocols/silc10/wb.c:304 ../pidgin/gtkrequest.c:267
+#: ../libpurple/protocols/silc10/wb.c:304 ../pidgin/gtkrequest.c:268
 msgid "Yes"
 msgstr "Yes"
 
@@ -3262,7 +3268,7 @@
 #: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:305
 #: ../libpurple/protocols/silc10/buddy.c:315
 #: ../libpurple/protocols/silc10/pk.c:120
-#: ../libpurple/protocols/silc10/wb.c:305 ../pidgin/gtkrequest.c:268
+#: ../libpurple/protocols/silc10/wb.c:305 ../pidgin/gtkrequest.c:269
 msgid "No"
 msgstr "No"
 
@@ -3365,8 +3371,8 @@
 msgstr "Tests to see that most things are working."
 
 #. Scheme name
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:903
-#: ../libpurple/plugins/ssl/ssl-nss.c:657
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:902
+#: ../libpurple/plugins/ssl/ssl-nss.c:725
 msgid "X.509 Certificates"
 msgstr "X.509 Certificates"
 
@@ -3376,7 +3382,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:987
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:986
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -3384,8 +3390,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:990
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:992
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:989
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:991
 msgid "Provides SSL support through GNUTLS."
 msgstr "Provides SSL support through GNUTLS."
 
@@ -3395,7 +3401,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:742
+#: ../libpurple/plugins/ssl/ssl-nss.c:810
 msgid "NSS"
 msgstr "NSS"
 
@@ -3403,8 +3409,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-nss.c:745
-#: ../libpurple/plugins/ssl/ssl-nss.c:747
+#: ../libpurple/plugins/ssl/ssl-nss.c:813
+#: ../libpurple/plugins/ssl/ssl-nss.c:815
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "Provides SSL support through Mozilla NSS."
 
@@ -3521,14 +3527,14 @@
 #: ../libpurple/protocols/bonjour/bonjour.c:351
 #: ../libpurple/protocols/bonjour/bonjour.c:656
 #: ../libpurple/protocols/gg/gg.c:632
-#: ../libpurple/protocols/jabber/jabber.c:943
+#: ../libpurple/protocols/jabber/jabber.c:942
 msgid "First name"
 msgstr "Forename"
 
 #: ../libpurple/protocols/bonjour/bonjour.c:353
 #: ../libpurple/protocols/bonjour/bonjour.c:659
 #: ../libpurple/protocols/gg/gg.c:627
-#: ../libpurple/protocols/jabber/jabber.c:948
+#: ../libpurple/protocols/jabber/jabber.c:947
 msgid "Last name"
 msgstr "Surname"
 
@@ -3536,7 +3542,7 @@
 #: ../libpurple/protocols/jabber/buddy.c:295
 #: ../libpurple/protocols/jabber/buddy.c:1325
 #: ../libpurple/protocols/jabber/buddy.c:1335
-#: ../libpurple/protocols/jabber/buddy.c:2192
+#: ../libpurple/protocols/jabber/buddy.c:2216
 #: ../libpurple/protocols/silc/ops.c:1041
 #: ../libpurple/protocols/silc/util.c:555
 #: ../libpurple/protocols/silc10/ops.c:1075
@@ -3576,7 +3582,7 @@
 
 #: ../libpurple/protocols/bonjour/bonjour.c:662
 #: ../libpurple/protocols/gg/gg.c:477
-#: ../libpurple/protocols/jabber/jabber.c:933
+#: ../libpurple/protocols/jabber/jabber.c:932
 #: ../libpurple/protocols/silc/silc.c:770
 #: ../libpurple/protocols/silc/silc.c:1011
 #: ../libpurple/protocols/silc10/silc.c:681
@@ -3615,11 +3621,11 @@
 msgid "Could not listen on socket"
 msgstr "Could not listen on socket"
 
-#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1812
+#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1829
 msgid "Invalid proxy settings"
 msgstr "Invalid proxy settings"
 
-#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1812
+#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1829
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -3690,9 +3696,9 @@
 msgstr "Registration completed successfully!"
 
 #: ../libpurple/protocols/gg/gg.c:482 ../libpurple/protocols/gg/gg.c:775
-#: ../libpurple/protocols/jabber/jabber.c:914
-#: ../libpurple/protocols/jabber/jabber.c:917
-#: ../libpurple/protocols/jabber/jabber.c:1718
+#: ../libpurple/protocols/jabber/jabber.c:913
+#: ../libpurple/protocols/jabber/jabber.c:916
+#: ../libpurple/protocols/jabber/jabber.c:1722
 msgid "Password"
 msgstr "Password"
 
@@ -3718,9 +3724,9 @@
 
 #: ../libpurple/protocols/gg/gg.c:642 ../libpurple/protocols/gg/gg.c:1054
 #: ../libpurple/protocols/gg/gg.c:1126
-#: ../libpurple/protocols/jabber/jabber.c:958
-#: ../libpurple/protocols/oscar/oscar.c:3782
-#: ../libpurple/protocols/oscar/oscar.c:3795
+#: ../libpurple/protocols/jabber/jabber.c:957
+#: ../libpurple/protocols/oscar/oscar.c:3789
+#: ../libpurple/protocols/oscar/oscar.c:3802
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "City"
@@ -3729,9 +3735,9 @@
 msgid "Year of birth"
 msgstr "Year of birth"
 
-#: ../libpurple/protocols/gg/gg.c:650 ../libpurple/protocols/msn/msn.c:1586
+#: ../libpurple/protocols/gg/gg.c:650 ../libpurple/protocols/msn/msn.c:1589
 #: ../libpurple/protocols/myspace/user.c:115
-#: ../libpurple/protocols/oscar/oscar.c:3725
+#: ../libpurple/protocols/oscar/oscar.c:3732
 #: ../libpurple/protocols/qq/buddy_info.c:46
 #: ../libpurple/protocols/qq/qq.c:226 ../libpurple/protocols/qq/qq.c:229
 #: ../libpurple/protocols/qq/qq.c:232 ../libpurple/protocols/qq/qq.c:236
@@ -3744,14 +3750,14 @@
 msgstr "Male or female"
 
 #: ../libpurple/protocols/gg/gg.c:652
-#: ../libpurple/protocols/oscar/oscar.c:3725
+#: ../libpurple/protocols/oscar/oscar.c:3732
 #: ../libpurple/protocols/qq/buddy_info.c:83
 #: ../libpurple/protocols/qq/qq.c:226
 msgid "Male"
 msgstr "Male"
 
 #: ../libpurple/protocols/gg/gg.c:653
-#: ../libpurple/protocols/oscar/oscar.c:3725
+#: ../libpurple/protocols/oscar/oscar.c:3732
 #: ../libpurple/protocols/qq/buddy_info.c:84
 #: ../libpurple/protocols/qq/qq.c:229
 msgid "Female"
@@ -3811,26 +3817,26 @@
 msgstr "Add to chat..."
 
 #: ../libpurple/protocols/gg/gg.c:1008
-#: ../libpurple/protocols/jabber/buddy.c:2029
+#: ../libpurple/protocols/jabber/buddy.c:2031
 #: ../libpurple/protocols/novell/novell.c:2828
-#: ../libpurple/protocols/oscar/oscar.c:827
-#: ../libpurple/protocols/oscar/oscar.c:5588
+#: ../libpurple/protocols/oscar/oscar.c:828
+#: ../libpurple/protocols/oscar/oscar.c:5604
 #: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
 #: ../libpurple/protocols/qq/qq.c:292
-#: ../libpurple/protocols/yahoo/yahoo.c:3096 ../libpurple/status.c:153
-#: ../pidgin/gtkblist.c:3101 ../pidgin/gtkblist.c:3433
-#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1060
+#: ../libpurple/protocols/yahoo/yahoo.c:3099 ../libpurple/status.c:154
+#: ../pidgin/gtkblist.c:3104 ../pidgin/gtkblist.c:3436
+#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1061
 msgid "Offline"
 msgstr "Offline"
 
 #: ../libpurple/protocols/gg/gg.c:1011
-#: ../libpurple/protocols/jabber/buddy.c:2031
+#: ../libpurple/protocols/jabber/buddy.c:2033
 #: ../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/novell/novell.c:2816
 #: ../libpurple/protocols/qq/qq.c:280
-#: ../libpurple/protocols/yahoo/yahoo.c:3098 ../libpurple/status.c:154
-#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1056
+#: ../libpurple/protocols/yahoo/yahoo.c:3101 ../libpurple/status.c:155
+#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1057
 msgid "Available"
 msgstr "Available"
 
@@ -3839,31 +3845,32 @@
 #. Away stuff
 #: ../libpurple/protocols/gg/gg.c:1014 ../libpurple/protocols/irc/irc.c:528
 #: ../libpurple/protocols/irc/msgs.c:310
-#: ../libpurple/protocols/jabber/buddy.c:2035
+#: ../libpurple/protocols/jabber/buddy.c:2037
 #: ../libpurple/protocols/novell/novell.c:2819
-#: ../libpurple/protocols/oscar/oscar.c:732
-#: ../libpurple/protocols/oscar/oscar.c:4540
-#: ../libpurple/protocols/oscar/oscar.c:5616
+#: ../libpurple/protocols/oscar/oscar.c:733
+#: ../libpurple/protocols/oscar/oscar.c:4547
+#: ../libpurple/protocols/oscar/oscar.c:5632
 #: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/qq/qq.c:284
 #: ../libpurple/protocols/silc/buddy.c:1476
 #: ../libpurple/protocols/silc10/buddy.c:1476
-#: ../libpurple/protocols/yahoo/yahoo.c:3650
-#: ../libpurple/protocols/yahoo/yahoo.c:3724 ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1938
-#: ../pidgin/gtkstatusbox.c:1057
+#: ../libpurple/protocols/yahoo/yahoo.c:3653
+#: ../libpurple/protocols/yahoo/yahoo.c:3727 ../libpurple/status.c:158
+#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1939
+#: ../pidgin/gtkstatusbox.c:1058
+#, c-format
 msgid "Away"
 msgstr "Away"
 
 #: ../libpurple/protocols/gg/gg.c:1043 ../libpurple/protocols/gg/gg.c:1117
-#: ../libpurple/protocols/oscar/oscar.c:2692
-#: ../libpurple/protocols/oscar/oscar.c:3692
+#: ../libpurple/protocols/oscar/oscar.c:2699
+#: ../libpurple/protocols/oscar/oscar.c:3699
 msgid "UIN"
 msgstr "UIN"
 
 #: ../libpurple/protocols/gg/gg.c:1046 ../libpurple/protocols/gg/gg.c:1120
-#: ../libpurple/protocols/jabber/buddy.c:2186
-#: ../libpurple/protocols/jabber/buddy.c:2362
-#: ../libpurple/protocols/oscar/oscar.c:3703
+#: ../libpurple/protocols/jabber/buddy.c:2210
+#: ../libpurple/protocols/jabber/buddy.c:2386
+#: ../libpurple/protocols/oscar/oscar.c:3710
 #: ../libpurple/protocols/silc/ops.c:990
 #: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
@@ -3874,7 +3881,7 @@
 msgstr "Year of birth"
 
 #: ../libpurple/protocols/gg/gg.c:1111 ../libpurple/protocols/gg/gg.c:1180
-#: ../libpurple/protocols/oscar/oscar.c:3904
+#: ../libpurple/protocols/oscar/oscar.c:3911
 msgid "Unable to display the search results."
 msgstr "Unable to display the search results."
 
@@ -4028,7 +4035,7 @@
 #: ../libpurple/protocols/irc/dcc_send.c:337
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:269
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:278
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:291
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:287
 msgid "File Transfer Failed"
 msgstr "File Transfer Failed"
 
@@ -4056,7 +4063,7 @@
 
 #: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165
 #: ../libpurple/protocols/irc/irc.c:612 ../libpurple/protocols/irc/irc.c:637
-#: ../libpurple/protocols/myspace/myspace.c:2350
+#: ../libpurple/protocols/myspace/myspace.c:2356
 msgid "Server has disconnected"
 msgstr "Server has disconnected"
 
@@ -4081,22 +4088,22 @@
 #. 1. connect to server
 #. connect to the server
 #: ../libpurple/protocols/irc/irc.c:319
-#: ../libpurple/protocols/jabber/jabber.c:1276
+#: ../libpurple/protocols/jabber/jabber.c:1280
 #: ../libpurple/protocols/msn/session.c:345
 #: ../libpurple/protocols/myspace/myspace.c:301
 #: ../libpurple/protocols/novell/novell.c:2182
-#: ../libpurple/protocols/oscar/oscar.c:1285
+#: ../libpurple/protocols/oscar/oscar.c:1287
 #: ../libpurple/protocols/qq/qq.c:136
 #: ../libpurple/protocols/sametime/sametime.c:3723
-#: ../libpurple/protocols/simple/simple.c:1677
-#: ../libpurple/protocols/yahoo/yahoo.c:2936
-#: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:661
+#: ../libpurple/protocols/simple/simple.c:1716
+#: ../libpurple/protocols/yahoo/yahoo.c:2939
+#: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:662
 msgid "Connecting"
 msgstr "Connecting"
 
 #: ../libpurple/protocols/irc/irc.c:327
-#: ../libpurple/protocols/jabber/jabber.c:611
-#: ../libpurple/protocols/jabber/jabber.c:1096
+#: ../libpurple/protocols/jabber/jabber.c:610
+#: ../libpurple/protocols/jabber/jabber.c:1095
 msgid "SSL support unavailable"
 msgstr "SSL support unavailable"
 
@@ -4105,18 +4112,18 @@
 #: ../libpurple/protocols/irc/irc.c:338
 #: ../libpurple/protocols/myspace/myspace.c:317
 #: ../libpurple/protocols/simple/simple.c:464
-#: ../libpurple/protocols/simple/simple.c:1592
+#: ../libpurple/protocols/simple/simple.c:1631
 msgid "Couldn't create socket"
 msgstr "Couldn't create socket"
 
 #: ../libpurple/protocols/irc/irc.c:421
-#: ../libpurple/protocols/myspace/myspace.c:2463
-#: ../libpurple/protocols/oscar/oscar.c:1281
+#: ../libpurple/protocols/myspace/myspace.c:2469
+#: ../libpurple/protocols/oscar/oscar.c:1283
 msgid "Couldn't connect to host"
 msgstr "Couldn't connect to host"
 
 #: ../libpurple/protocols/irc/irc.c:609 ../libpurple/protocols/irc/irc.c:634
-#: ../libpurple/protocols/myspace/myspace.c:2346
+#: ../libpurple/protocols/myspace/myspace.c:2352
 msgid "Read error"
 msgstr "Read error"
 
@@ -4156,22 +4163,22 @@
 
 #. host to connect to
 #: ../libpurple/protocols/irc/irc.c:940 ../libpurple/protocols/irc/msgs.c:323
-#: ../libpurple/protocols/msn/msn.c:2182
-#: ../libpurple/protocols/oscar/oscar.c:6655
+#: ../libpurple/protocols/msn/msn.c:2185
+#: ../libpurple/protocols/oscar/oscar.c:6671
 #: ../libpurple/protocols/qq/qq.c:755
 #: ../libpurple/protocols/sametime/sametime.c:5727
 #: ../libpurple/protocols/silc/ops.c:1249
 #: ../libpurple/protocols/silc/ops.c:1341
 #: ../libpurple/protocols/silc10/ops.c:1244
 #: ../libpurple/protocols/silc10/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:1856
+#: ../libpurple/protocols/simple/simple.c:1896
 #: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "Server"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:943 ../libpurple/protocols/msn/msn.c:2187
-#: ../libpurple/protocols/oscar/oscar.c:6658
+#: ../libpurple/protocols/irc/irc.c:943 ../libpurple/protocols/msn/msn.c:2190
+#: ../libpurple/protocols/oscar/oscar.c:6674
 #: ../libpurple/protocols/qq/qq.c:758
 #: ../libpurple/protocols/sametime/sametime.c:5732
 #: ../libpurple/protocols/silc/silc.c:1918
@@ -4185,8 +4192,8 @@
 msgstr "Encodings"
 
 #: ../libpurple/protocols/irc/irc.c:949 ../libpurple/protocols/irc/msgs.c:316
-#: ../libpurple/protocols/jabber/jabber.c:905
-#: ../libpurple/protocols/jabber/jabber.c:908
+#: ../libpurple/protocols/jabber/jabber.c:904
+#: ../libpurple/protocols/jabber/jabber.c:907
 #: ../libpurple/protocols/silc/buddy.c:1539
 #: ../libpurple/protocols/silc/ops.c:1197
 #: ../libpurple/protocols/silc/ops.c:1200
@@ -4243,7 +4250,7 @@
 msgstr " <i>(identified)</i>"
 
 #: ../libpurple/protocols/irc/msgs.c:303
-#: ../libpurple/protocols/oscar/oscar.c:3693
+#: ../libpurple/protocols/oscar/oscar.c:3700
 #: ../libpurple/protocols/silc/ops.c:1418
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
@@ -4524,7 +4531,7 @@
 msgstr "names [channel]:  List the users currently in a channel."
 
 #: ../libpurple/protocols/irc/parse.c:137
-#: ../libpurple/protocols/jabber/jabber.c:2254
+#: ../libpurple/protocols/jabber/jabber.c:2261
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;new nickname&gt;:  Change your nickname."
 
@@ -4652,32 +4659,32 @@
 msgid "Disconnected."
 msgstr "Disconnected."
 
-#: ../libpurple/protocols/jabber/adhoccommands.c:138
-#: ../libpurple/protocols/jabber/jabber.c:672
-#: ../libpurple/protocols/jabber/jabber.c:702
-#: ../libpurple/protocols/jabber/jabber.c:1883
+#: ../libpurple/protocols/jabber/adhoccommands.c:137
+#: ../libpurple/protocols/jabber/jabber.c:671
+#: ../libpurple/protocols/jabber/jabber.c:701
+#: ../libpurple/protocols/jabber/jabber.c:1887
 msgid "Unknown Error"
 msgstr "Unknown Error"
 
+#: ../libpurple/protocols/jabber/adhoccommands.c:139
 #: ../libpurple/protocols/jabber/adhoccommands.c:140
-#: ../libpurple/protocols/jabber/adhoccommands.c:141
 msgid "Ad-Hoc Command Failed"
 msgstr "Ad-Hoc Command Failed"
 
-#: ../libpurple/protocols/jabber/adhoccommands.c:174
+#: ../libpurple/protocols/jabber/adhoccommands.c:173
 msgid "execute"
 msgstr "execute"
 
-#: ../libpurple/protocols/jabber/auth.c:52
+#: ../libpurple/protocols/jabber/auth.c:53
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
 msgstr "Server requires TLS/SSL for login.  No TLS/SSL support found."
 
-#: ../libpurple/protocols/jabber/auth.c:115
+#: ../libpurple/protocols/jabber/auth.c:116
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "Server requires plaintext authentication over an unencrypted stream"
 
-#: ../libpurple/protocols/jabber/auth.c:317
-#: ../libpurple/protocols/jabber/auth.c:506
+#: ../libpurple/protocols/jabber/auth.c:319
+#: ../libpurple/protocols/jabber/auth.c:508
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
@@ -4686,33 +4693,33 @@
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
 "this and continue authentication?"
 
-#: ../libpurple/protocols/jabber/auth.c:319
-#: ../libpurple/protocols/jabber/auth.c:320
-#: ../libpurple/protocols/jabber/auth.c:508
-#: ../libpurple/protocols/jabber/auth.c:509
-#: ../libpurple/protocols/jabber/auth.c:593
-#: ../libpurple/protocols/jabber/auth.c:594
+#: ../libpurple/protocols/jabber/auth.c:321
+#: ../libpurple/protocols/jabber/auth.c:322
+#: ../libpurple/protocols/jabber/auth.c:510
+#: ../libpurple/protocols/jabber/auth.c:511
+#: ../libpurple/protocols/jabber/auth.c:598
+#: ../libpurple/protocols/jabber/auth.c:599
 msgid "Plaintext Authentication"
 msgstr "Plaintext Authentication"
 
-#: ../libpurple/protocols/jabber/auth.c:332
-#: ../libpurple/protocols/jabber/auth.c:521
-#: ../libpurple/protocols/jabber/auth.c:605
+#: ../libpurple/protocols/jabber/auth.c:334
+#: ../libpurple/protocols/jabber/auth.c:523
+#: ../libpurple/protocols/jabber/auth.c:610
 msgid "Server does not use any supported authentication method"
 msgstr "Server does not use any supported authentication method"
 
 #. This should never happen!
-#: ../libpurple/protocols/jabber/auth.c:460
-#: ../libpurple/protocols/jabber/auth.c:556
-#: ../libpurple/protocols/jabber/auth.c:771
-#: ../libpurple/protocols/jabber/auth.c:912
-#: ../libpurple/protocols/jabber/auth.c:937
-#: ../libpurple/protocols/jabber/auth.c:956
-#: ../libpurple/protocols/jabber/jabber.c:125
+#: ../libpurple/protocols/jabber/auth.c:462
+#: ../libpurple/protocols/jabber/auth.c:561
+#: ../libpurple/protocols/jabber/auth.c:776
+#: ../libpurple/protocols/jabber/auth.c:917
+#: ../libpurple/protocols/jabber/auth.c:942
+#: ../libpurple/protocols/jabber/auth.c:961
+#: ../libpurple/protocols/jabber/jabber.c:123
 msgid "Invalid response from server."
 msgstr "Invalid response from server."
 
-#: ../libpurple/protocols/jabber/auth.c:595
+#: ../libpurple/protocols/jabber/auth.c:600
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
@@ -4720,12 +4727,12 @@
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
 
-#: ../libpurple/protocols/jabber/auth.c:792
-#: ../libpurple/protocols/jabber/auth.c:815
+#: ../libpurple/protocols/jabber/auth.c:797
+#: ../libpurple/protocols/jabber/auth.c:820
 msgid "Invalid challenge from server"
 msgstr "Invalid challenge from server"
 
-#: ../libpurple/protocols/jabber/auth.c:887
+#: ../libpurple/protocols/jabber/auth.c:892
 msgid "SASL error"
 msgstr "SASL error"
 
@@ -4750,7 +4757,7 @@
 msgstr "Given Name"
 
 #: ../libpurple/protocols/jabber/buddy.c:287
-#: ../libpurple/protocols/jabber/jabber.c:978
+#: ../libpurple/protocols/jabber/jabber.c:977
 msgid "URL"
 msgstr "URL"
 
@@ -4809,16 +4816,16 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:300
 #: ../libpurple/protocols/jabber/buddy.c:1250
-#: ../libpurple/protocols/msn/msn.c:1655
-#: ../libpurple/protocols/oscar/oscar.c:3742
+#: ../libpurple/protocols/msn/msn.c:1658
+#: ../libpurple/protocols/oscar/oscar.c:3749
 msgid "Birthday"
 msgstr "Birthday"
 
 #: ../libpurple/protocols/jabber/buddy.c:301
 #: ../libpurple/protocols/jabber/buddy.c:1365
 #: ../libpurple/protocols/jabber/chat.c:775
-#: ../libpurple/protocols/jabber/usermood.c:176 ../pidgin/gtkblist.c:3113
-#: ../pidgin/gtkprefs.c:738
+#: ../libpurple/protocols/jabber/usermood.c:175 ../pidgin/gtkblist.c:3116
+#: ../pidgin/gtkprefs.c:739
 msgid "Description"
 msgstr "Description"
 
@@ -5102,22 +5109,22 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:921
 #: ../libpurple/protocols/jabber/buddy.c:1081
-#: ../libpurple/protocols/oscar/oscar.c:2899
+#: ../libpurple/protocols/oscar/oscar.c:2906
 msgid "Capabilities"
 msgstr "Capabilities"
 
 #: ../libpurple/protocols/jabber/buddy.c:933
-#: ../libpurple/protocols/jabber/libxmpp.c:205
+#: ../libpurple/protocols/jabber/libxmpp.c:206
 #: ../libpurple/protocols/jabber/si.c:859
 msgid "Resource"
 msgstr "Resource"
 
 #: ../libpurple/protocols/jabber/buddy.c:935
-#: ../libpurple/protocols/jabber/jabber.c:1527
-#: ../libpurple/protocols/jabber/jabber.c:1550
-#: ../libpurple/protocols/jabber/jabber.c:1573
-#: ../libpurple/protocols/jabber/jabber.c:1596
-#: ../libpurple/protocols/jabber/jabber.c:1619
+#: ../libpurple/protocols/jabber/jabber.c:1531
+#: ../libpurple/protocols/jabber/jabber.c:1554
+#: ../libpurple/protocols/jabber/jabber.c:1577
+#: ../libpurple/protocols/jabber/jabber.c:1600
+#: ../libpurple/protocols/jabber/jabber.c:1623
 msgid "Priority"
 msgstr "Priority"
 
@@ -5128,9 +5135,9 @@
 msgstr "Middle Name"
 
 #: ../libpurple/protocols/jabber/buddy.c:1270
-#: ../libpurple/protocols/jabber/jabber.c:953
-#: ../libpurple/protocols/oscar/oscar.c:3781
-#: ../libpurple/protocols/oscar/oscar.c:3794
+#: ../libpurple/protocols/jabber/jabber.c:952
+#: ../libpurple/protocols/oscar/oscar.c:3788
+#: ../libpurple/protocols/oscar/oscar.c:3801
 #: ../libpurple/protocols/qq/buddy_info.c:56
 #: ../libpurple/protocols/silc/ops.c:1030
 #: ../libpurple/protocols/silc10/ops.c:1064
@@ -5149,71 +5156,72 @@
 msgid "Logo"
 msgstr "Logo"
 
-#: ../libpurple/protocols/jabber/buddy.c:1940
+#: ../libpurple/protocols/jabber/buddy.c:1942
 msgid "Un-hide From"
 msgstr "Un-hide From"
 
-#: ../libpurple/protocols/jabber/buddy.c:1944
+#: ../libpurple/protocols/jabber/buddy.c:1946
 msgid "Temporarily Hide From"
 msgstr "Temporarily Hide From"
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1952
+#: ../libpurple/protocols/jabber/buddy.c:1954
 msgid "Cancel Presence Notification"
 msgstr "Cancel Presence Notification"
 
-#: ../libpurple/protocols/jabber/buddy.c:1959
+#: ../libpurple/protocols/jabber/buddy.c:1961
 msgid "(Re-)Request authorization"
 msgstr "(Re-)Request authorisation"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:1968
+#: ../libpurple/protocols/jabber/buddy.c:1970
 msgid "Unsubscribe"
 msgstr "Unsubscribe"
 
-#: ../libpurple/protocols/jabber/buddy.c:1983
+#: ../libpurple/protocols/jabber/buddy.c:1985
 msgid "Log In"
 msgstr "Log In"
 
-#: ../libpurple/protocols/jabber/buddy.c:1987
+#: ../libpurple/protocols/jabber/buddy.c:1989
 msgid "Log Out"
 msgstr "Log Out"
 
-#: ../libpurple/protocols/jabber/buddy.c:2033
-#: ../libpurple/protocols/jabber/jabber.c:1549
+#: ../libpurple/protocols/jabber/buddy.c:2035
+#: ../libpurple/protocols/jabber/jabber.c:1553
 msgid "Chatty"
 msgstr "Chatty"
 
-#: ../libpurple/protocols/jabber/buddy.c:2037
+#: ../libpurple/protocols/jabber/buddy.c:2039
 msgid "Extended Away"
 msgstr "Extended Away"
 
-#: ../libpurple/protocols/jabber/buddy.c:2039
-#: ../libpurple/protocols/jabber/jabber.c:1618
-#: ../libpurple/protocols/oscar/oscar.c:726
-#: ../libpurple/protocols/oscar/oscar.c:5792
+#: ../libpurple/protocols/jabber/buddy.c:2041
+#: ../libpurple/protocols/jabber/jabber.c:1622
+#: ../libpurple/protocols/oscar/oscar.c:727
+#: ../libpurple/protocols/oscar/oscar.c:5808
 #: ../libpurple/protocols/sametime/sametime.c:3297
+#, c-format
 msgid "Do Not Disturb"
 msgstr "Do Not Disturb"
 
-#: ../libpurple/protocols/jabber/buddy.c:2184
+#: ../libpurple/protocols/jabber/buddy.c:2208
 msgid "JID"
 msgstr "JID"
 
-#: ../libpurple/protocols/jabber/buddy.c:2188
-#: ../libpurple/protocols/jabber/buddy.c:2367
-#: ../libpurple/protocols/oscar/oscar.c:3704
+#: ../libpurple/protocols/jabber/buddy.c:2212
+#: ../libpurple/protocols/jabber/buddy.c:2391
+#: ../libpurple/protocols/oscar/oscar.c:3711
 msgid "Last Name"
 msgstr "Surname"
 
-#: ../libpurple/protocols/jabber/buddy.c:2220
+#: ../libpurple/protocols/jabber/buddy.c:2244
 msgid "The following are the results of your search"
 msgstr "The following are the results of your search"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:2295
+#: ../libpurple/protocols/jabber/buddy.c:2319
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
@@ -5221,39 +5229,39 @@
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
 
-#: ../libpurple/protocols/jabber/buddy.c:2315
+#: ../libpurple/protocols/jabber/buddy.c:2339
 msgid "Directory Query Failed"
 msgstr "Directory Query Failed"
 
-#: ../libpurple/protocols/jabber/buddy.c:2316
+#: ../libpurple/protocols/jabber/buddy.c:2340
 msgid "Could not query the directory server."
 msgstr "Could not query the directory server."
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libpurple/protocols/jabber/buddy.c:2350
+#: ../libpurple/protocols/jabber/buddy.c:2374
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "Server Instructions: %s"
 
-#: ../libpurple/protocols/jabber/buddy.c:2357
+#: ../libpurple/protocols/jabber/buddy.c:2381
 msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr "Fill in one or more fields to search for any matching XMPP users."
 
-#: ../libpurple/protocols/jabber/buddy.c:2377
+#: ../libpurple/protocols/jabber/buddy.c:2401
 #: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3707
-#: ../libpurple/protocols/oscar/oscar.c:3716
+#: ../libpurple/protocols/oscar/oscar.c:3714
+#: ../libpurple/protocols/oscar/oscar.c:3723
 msgid "E-Mail Address"
 msgstr "E-Mail Address"
 
-#: ../libpurple/protocols/jabber/buddy.c:2386
-#: ../libpurple/protocols/jabber/buddy.c:2387
+#: ../libpurple/protocols/jabber/buddy.c:2410
+#: ../libpurple/protocols/jabber/buddy.c:2411
 msgid "Search for XMPP users"
 msgstr "Search for XMPP users"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:2388
+#: ../libpurple/protocols/jabber/buddy.c:2412
 #: ../libpurple/protocols/qq/group.c:123
 #: ../libpurple/protocols/qq/group_im.c:147
 #: ../libpurple/protocols/qq/sys_msg.c:174
@@ -5265,24 +5273,24 @@
 msgid "Search"
 msgstr "Search"
 
-#: ../libpurple/protocols/jabber/buddy.c:2403
+#: ../libpurple/protocols/jabber/buddy.c:2427
 msgid "Invalid Directory"
 msgstr "Invalid Directory"
 
-#: ../libpurple/protocols/jabber/buddy.c:2420
+#: ../libpurple/protocols/jabber/buddy.c:2444
 msgid "Enter a User Directory"
 msgstr "Enter a User Directory"
 
-#: ../libpurple/protocols/jabber/buddy.c:2421
+#: ../libpurple/protocols/jabber/buddy.c:2445
 msgid "Select a user directory to search"
 msgstr "Select a user directory to search"
 
-#: ../libpurple/protocols/jabber/buddy.c:2424
+#: ../libpurple/protocols/jabber/buddy.c:2448
 msgid "Search Directory"
 msgstr "Search Directory"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5278
+#: ../libpurple/protocols/oscar/oscar.c:5294
 #: ../libpurple/protocols/yahoo/yahoochat.c:1048
 msgid "_Room:"
 msgstr "_Room:"
@@ -5373,29 +5381,29 @@
 msgid "Find Rooms"
 msgstr "Find Rooms"
 
-#: ../libpurple/protocols/jabber/jabber.c:94
+#: ../libpurple/protocols/jabber/jabber.c:92
 msgid "Error initializing session"
 msgstr "Error initializing session"
 
-#: ../libpurple/protocols/jabber/jabber.c:146
+#: ../libpurple/protocols/jabber/jabber.c:145
 msgid "You require encryption, but it is not available on this server."
 msgstr "You require encryption, but it is not available on this server."
 
-#: ../libpurple/protocols/jabber/jabber.c:260
-#: ../libpurple/protocols/jabber/jabber.c:313
-#: ../libpurple/protocols/jabber/jabber.c:341
+#: ../libpurple/protocols/jabber/jabber.c:259
+#: ../libpurple/protocols/jabber/jabber.c:312
+#: ../libpurple/protocols/jabber/jabber.c:340
 msgid "Write error"
 msgstr "Write error"
 
-#: ../libpurple/protocols/jabber/jabber.c:409
-#: ../libpurple/protocols/jabber/jabber.c:446
+#: ../libpurple/protocols/jabber/jabber.c:408
+#: ../libpurple/protocols/jabber/jabber.c:445
 msgid "Read Error"
 msgstr "Read Error"
 
-#: ../libpurple/protocols/jabber/jabber.c:483
+#: ../libpurple/protocols/jabber/jabber.c:482
 #: ../libpurple/protocols/oscar/flap_connection.c:394
-#: ../libpurple/protocols/yahoo/yahoo.c:2555
-#: ../libpurple/protocols/yahoo/yahoo.c:2587
+#: ../libpurple/protocols/yahoo/yahoo.c:2558
+#: ../libpurple/protocols/yahoo/yahoo.c:2590
 #, c-format
 msgid ""
 "Could not establish a connection with the server:\n"
@@ -5404,70 +5412,70 @@
 "Could not establish a connection with the server:\n"
 "%s"
 
-#: ../libpurple/protocols/jabber/jabber.c:530
+#: ../libpurple/protocols/jabber/jabber.c:529
 msgid "Unable to create socket"
 msgstr "Unable to create socket"
 
-#: ../libpurple/protocols/jabber/jabber.c:576
-#: ../libpurple/protocols/jabber/jabber.c:1064
+#: ../libpurple/protocols/jabber/jabber.c:575
+#: ../libpurple/protocols/jabber/jabber.c:1063
 msgid "Invalid XMPP ID"
 msgstr "Invalid XMPP ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:581
+#: ../libpurple/protocols/jabber/jabber.c:580
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "Invalid XMPP ID. Domain must be set."
 
-#: ../libpurple/protocols/jabber/jabber.c:657
+#: ../libpurple/protocols/jabber/jabber.c:656
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registration of %s@%s successful"
 
-#: ../libpurple/protocols/jabber/jabber.c:663
+#: ../libpurple/protocols/jabber/jabber.c:662
 #, c-format
 msgid "Registration to %s successful"
 msgstr "Registration to %s successful"
 
+#: ../libpurple/protocols/jabber/jabber.c:664
 #: ../libpurple/protocols/jabber/jabber.c:665
-#: ../libpurple/protocols/jabber/jabber.c:666
 msgid "Registration Successful"
 msgstr "Registration Successful"
 
+#: ../libpurple/protocols/jabber/jabber.c:673
 #: ../libpurple/protocols/jabber/jabber.c:674
-#: ../libpurple/protocols/jabber/jabber.c:675
 msgid "Registration Failed"
 msgstr "Registration Failed"
 
-#: ../libpurple/protocols/jabber/jabber.c:693
+#: ../libpurple/protocols/jabber/jabber.c:692
 #, c-format
 msgid "Registration from %s successfully removed"
 msgstr "Registration from %s successfully removed"
 
+#: ../libpurple/protocols/jabber/jabber.c:694
 #: ../libpurple/protocols/jabber/jabber.c:695
-#: ../libpurple/protocols/jabber/jabber.c:696
 msgid "Unregistration Successful"
 msgstr "Unregistration Successful"
 
+#: ../libpurple/protocols/jabber/jabber.c:703
 #: ../libpurple/protocols/jabber/jabber.c:704
-#: ../libpurple/protocols/jabber/jabber.c:705
 msgid "Unregistration Failed"
 msgstr "Unregistration Failed"
 
+#: ../libpurple/protocols/jabber/jabber.c:864
 #: ../libpurple/protocols/jabber/jabber.c:865
-#: ../libpurple/protocols/jabber/jabber.c:866
 msgid "Already Registered"
 msgstr "Already Registered"
 
-#: ../libpurple/protocols/jabber/jabber.c:963
-#: ../libpurple/protocols/oscar/oscar.c:3783
-#: ../libpurple/protocols/oscar/oscar.c:3796
+#: ../libpurple/protocols/jabber/jabber.c:962
+#: ../libpurple/protocols/oscar/oscar.c:3790
+#: ../libpurple/protocols/oscar/oscar.c:3803
 msgid "State"
 msgstr "County/State"
 
-#: ../libpurple/protocols/jabber/jabber.c:968
+#: ../libpurple/protocols/jabber/jabber.c:967
 msgid "Postal code"
 msgstr "Postcode"
 
-#: ../libpurple/protocols/jabber/jabber.c:973
+#: ../libpurple/protocols/jabber/jabber.c:972
 #: ../libpurple/protocols/silc/ops.c:1035
 #: ../libpurple/protocols/silc/silc.c:772
 #: ../libpurple/protocols/silc/util.c:557
@@ -5477,122 +5485,122 @@
 msgid "Phone"
 msgstr "Telephone"
 
-#: ../libpurple/protocols/jabber/jabber.c:983
+#: ../libpurple/protocols/jabber/jabber.c:982
 msgid "Date"
 msgstr "Date"
 
-#: ../libpurple/protocols/jabber/jabber.c:988
+#: ../libpurple/protocols/jabber/jabber.c:987
 msgid "Unregister"
 msgstr "Unregister"
 
-#: ../libpurple/protocols/jabber/jabber.c:995
+#: ../libpurple/protocols/jabber/jabber.c:994
 msgid ""
 "Please fill out the information below to change your account registration."
 msgstr ""
 "Please fill out the information below to change your account registration."
 
-#: ../libpurple/protocols/jabber/jabber.c:998
+#: ../libpurple/protocols/jabber/jabber.c:997
 msgid "Please fill out the information below to register your new account."
 msgstr "Please fill out the information below to register your new account."
 
+#: ../libpurple/protocols/jabber/jabber.c:1005
 #: ../libpurple/protocols/jabber/jabber.c:1006
-#: ../libpurple/protocols/jabber/jabber.c:1007
 msgid "Register New XMPP Account"
 msgstr "Register New XMPP Account"
 
-#: ../libpurple/protocols/jabber/jabber.c:1008
-#: ../libpurple/protocols/jabber/jabber.c:1017
+#: ../libpurple/protocols/jabber/jabber.c:1007
+#: ../libpurple/protocols/jabber/jabber.c:1016
 msgid "Register"
 msgstr "Register"
 
-#: ../libpurple/protocols/jabber/jabber.c:1013
+#: ../libpurple/protocols/jabber/jabber.c:1012
 #, c-format
 msgid "Change Account Registration at %s"
 msgstr "Change Account Registration at %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1014
+#: ../libpurple/protocols/jabber/jabber.c:1013
 #, c-format
 msgid "Register New Account at %s"
 msgstr "Register New Account at %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1017
+#: ../libpurple/protocols/jabber/jabber.c:1016
 msgid "Change Registration"
 msgstr "Change Registration"
 
+#: ../libpurple/protocols/jabber/jabber.c:1120
 #: ../libpurple/protocols/jabber/jabber.c:1121
-#: ../libpurple/protocols/jabber/jabber.c:1122
 msgid "Error unregistering account"
 msgstr "Error unregistering account"
 
+#: ../libpurple/protocols/jabber/jabber.c:1126
 #: ../libpurple/protocols/jabber/jabber.c:1127
-#: ../libpurple/protocols/jabber/jabber.c:1128
 msgid "Account successfully unregistered"
 msgstr "Account successfully unregistered"
 
-#: ../libpurple/protocols/jabber/jabber.c:1280
+#: ../libpurple/protocols/jabber/jabber.c:1284
 msgid "Initializing Stream"
 msgstr "Initialising Stream"
 
-#: ../libpurple/protocols/jabber/jabber.c:1285
+#: ../libpurple/protocols/jabber/jabber.c:1289
 msgid "Initializing SSL/TLS"
 msgstr "Initialising SSL/TLS"
 
-#: ../libpurple/protocols/jabber/jabber.c:1289
+#: ../libpurple/protocols/jabber/jabber.c:1293
 #: ../libpurple/protocols/msn/session.c:351
 msgid "Authenticating"
 msgstr "Authenticating"
 
-#: ../libpurple/protocols/jabber/jabber.c:1298
+#: ../libpurple/protocols/jabber/jabber.c:1302
 msgid "Re-initializing Stream"
 msgstr "Re-initialising Stream"
 
-#: ../libpurple/protocols/jabber/jabber.c:1392
-#: ../libpurple/protocols/jabber/jabber.c:1861
-#: ../libpurple/protocols/jabber/jabber.c:1902
-#: ../libpurple/protocols/jabber/jabber.c:1938
-#: ../libpurple/protocols/oscar/oscar.c:825
-#: ../libpurple/protocols/oscar/oscar.c:5586
+#: ../libpurple/protocols/jabber/jabber.c:1396
+#: ../libpurple/protocols/jabber/jabber.c:1865
+#: ../libpurple/protocols/jabber/jabber.c:1909
+#: ../libpurple/protocols/jabber/jabber.c:1945
+#: ../libpurple/protocols/oscar/oscar.c:826
+#: ../libpurple/protocols/oscar/oscar.c:5602
 msgid "Not Authorized"
 msgstr "Not Authorised"
 
-#: ../libpurple/protocols/jabber/jabber.c:1438
+#: ../libpurple/protocols/jabber/jabber.c:1442
 msgid "Both"
 msgstr "Both"
 
-#: ../libpurple/protocols/jabber/jabber.c:1440
+#: ../libpurple/protocols/jabber/jabber.c:1444
 msgid "From (To pending)"
 msgstr "From (To pending)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1442
+#: ../libpurple/protocols/jabber/jabber.c:1446
 msgid "From"
 msgstr "From"
 
-#: ../libpurple/protocols/jabber/jabber.c:1445
+#: ../libpurple/protocols/jabber/jabber.c:1449
 msgid "To"
 msgstr "To"
 
-#: ../libpurple/protocols/jabber/jabber.c:1447
+#: ../libpurple/protocols/jabber/jabber.c:1451
 msgid "None (To pending)"
 msgstr "None (To pending)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1449
+#: ../libpurple/protocols/jabber/jabber.c:1453
 #: ../pidgin/plugins/gevolution/eds-utils.c:73
 #: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr "None"
 
-#: ../libpurple/protocols/jabber/jabber.c:1452
+#: ../libpurple/protocols/jabber/jabber.c:1456
 msgid "Subscription"
 msgstr "Subscription"
 
-#: ../libpurple/protocols/jabber/jabber.c:1462
-#: ../libpurple/protocols/jabber/jabber.c:1465
-#: ../libpurple/protocols/jabber/jabber.c:1529
-#: ../libpurple/protocols/jabber/jabber.c:1552
-#: ../libpurple/protocols/jabber/jabber.c:1575
-#: ../libpurple/protocols/jabber/jabber.c:1598
-#: ../libpurple/protocols/jabber/jabber.c:1621
-#: ../libpurple/protocols/jabber/usermood.c:167
+#: ../libpurple/protocols/jabber/jabber.c:1466
+#: ../libpurple/protocols/jabber/jabber.c:1469
+#: ../libpurple/protocols/jabber/jabber.c:1533
+#: ../libpurple/protocols/jabber/jabber.c:1556
+#: ../libpurple/protocols/jabber/jabber.c:1579
+#: ../libpurple/protocols/jabber/jabber.c:1602
+#: ../libpurple/protocols/jabber/jabber.c:1625
+#: ../libpurple/protocols/jabber/usermood.c:166
 #: ../libpurple/protocols/silc/buddy.c:1557
 #: ../libpurple/protocols/silc/ops.c:1212
 #: ../libpurple/protocols/silc10/buddy.c:1557
@@ -5600,415 +5608,415 @@
 msgid "Mood"
 msgstr "Mood"
 
-#: ../libpurple/protocols/jabber/jabber.c:1530
-#: ../libpurple/protocols/jabber/jabber.c:1553
-#: ../libpurple/protocols/jabber/jabber.c:1576
-#: ../libpurple/protocols/jabber/jabber.c:1599
-#: ../libpurple/protocols/jabber/jabber.c:1622
-msgid "Mood Text"
-msgstr "Mood Text"
-
-#: ../libpurple/protocols/jabber/jabber.c:1531
-#: ../libpurple/protocols/jabber/jabber.c:1554
-#: ../libpurple/protocols/jabber/jabber.c:1577
-#: ../libpurple/protocols/jabber/jabber.c:1600
-#: ../libpurple/protocols/jabber/jabber.c:1623
-msgid "Tune Artist"
-msgstr "Tune Artist"
-
-#: ../libpurple/protocols/jabber/jabber.c:1532
-#: ../libpurple/protocols/jabber/jabber.c:1555
-#: ../libpurple/protocols/jabber/jabber.c:1578
-#: ../libpurple/protocols/jabber/jabber.c:1601
-#: ../libpurple/protocols/jabber/jabber.c:1624
-msgid "Tune Title"
-msgstr "Tune Title"
-
-#: ../libpurple/protocols/jabber/jabber.c:1533
-#: ../libpurple/protocols/jabber/jabber.c:1556
-#: ../libpurple/protocols/jabber/jabber.c:1579
-#: ../libpurple/protocols/jabber/jabber.c:1602
-#: ../libpurple/protocols/jabber/jabber.c:1625
-msgid "Tune Album"
-msgstr "Tune Album"
-
 #: ../libpurple/protocols/jabber/jabber.c:1534
 #: ../libpurple/protocols/jabber/jabber.c:1557
 #: ../libpurple/protocols/jabber/jabber.c:1580
 #: ../libpurple/protocols/jabber/jabber.c:1603
 #: ../libpurple/protocols/jabber/jabber.c:1626
-msgid "Tune Genre"
-msgstr "Tune Genre"
+msgid "Mood Text"
+msgstr "Mood Text"
 
 #: ../libpurple/protocols/jabber/jabber.c:1535
 #: ../libpurple/protocols/jabber/jabber.c:1558
 #: ../libpurple/protocols/jabber/jabber.c:1581
 #: ../libpurple/protocols/jabber/jabber.c:1604
 #: ../libpurple/protocols/jabber/jabber.c:1627
-msgid "Tune Comment"
-msgstr "Tune Comment"
+msgid "Tune Artist"
+msgstr "Tune Artist"
 
 #: ../libpurple/protocols/jabber/jabber.c:1536
 #: ../libpurple/protocols/jabber/jabber.c:1559
 #: ../libpurple/protocols/jabber/jabber.c:1582
 #: ../libpurple/protocols/jabber/jabber.c:1605
 #: ../libpurple/protocols/jabber/jabber.c:1628
-msgid "Tune Track"
-msgstr "Tune Track"
+msgid "Tune Title"
+msgstr "Tune Title"
 
 #: ../libpurple/protocols/jabber/jabber.c:1537
 #: ../libpurple/protocols/jabber/jabber.c:1560
 #: ../libpurple/protocols/jabber/jabber.c:1583
 #: ../libpurple/protocols/jabber/jabber.c:1606
 #: ../libpurple/protocols/jabber/jabber.c:1629
-msgid "Tune Time"
-msgstr "Tune Time"
+msgid "Tune Album"
+msgstr "Tune Album"
 
 #: ../libpurple/protocols/jabber/jabber.c:1538
 #: ../libpurple/protocols/jabber/jabber.c:1561
 #: ../libpurple/protocols/jabber/jabber.c:1584
 #: ../libpurple/protocols/jabber/jabber.c:1607
 #: ../libpurple/protocols/jabber/jabber.c:1630
-msgid "Tune Year"
-msgstr "Tune Year"
+msgid "Tune Genre"
+msgstr "Tune Genre"
 
 #: ../libpurple/protocols/jabber/jabber.c:1539
 #: ../libpurple/protocols/jabber/jabber.c:1562
 #: ../libpurple/protocols/jabber/jabber.c:1585
 #: ../libpurple/protocols/jabber/jabber.c:1608
 #: ../libpurple/protocols/jabber/jabber.c:1631
-msgid "Tune URL"
-msgstr "Tune URL"
+msgid "Tune Comment"
+msgstr "Tune Comment"
+
+#: ../libpurple/protocols/jabber/jabber.c:1540
+#: ../libpurple/protocols/jabber/jabber.c:1563
+#: ../libpurple/protocols/jabber/jabber.c:1586
+#: ../libpurple/protocols/jabber/jabber.c:1609
+#: ../libpurple/protocols/jabber/jabber.c:1632
+msgid "Tune Track"
+msgstr "Tune Track"
 
 #: ../libpurple/protocols/jabber/jabber.c:1541
 #: ../libpurple/protocols/jabber/jabber.c:1564
 #: ../libpurple/protocols/jabber/jabber.c:1587
 #: ../libpurple/protocols/jabber/jabber.c:1610
 #: ../libpurple/protocols/jabber/jabber.c:1633
+msgid "Tune Time"
+msgstr "Tune Time"
+
+#: ../libpurple/protocols/jabber/jabber.c:1542
+#: ../libpurple/protocols/jabber/jabber.c:1565
+#: ../libpurple/protocols/jabber/jabber.c:1588
+#: ../libpurple/protocols/jabber/jabber.c:1611
+#: ../libpurple/protocols/jabber/jabber.c:1634
+msgid "Tune Year"
+msgstr "Tune Year"
+
+#: ../libpurple/protocols/jabber/jabber.c:1543
+#: ../libpurple/protocols/jabber/jabber.c:1566
+#: ../libpurple/protocols/jabber/jabber.c:1589
+#: ../libpurple/protocols/jabber/jabber.c:1612
+#: ../libpurple/protocols/jabber/jabber.c:1635
+msgid "Tune URL"
+msgstr "Tune URL"
+
+#: ../libpurple/protocols/jabber/jabber.c:1545
+#: ../libpurple/protocols/jabber/jabber.c:1568
+#: ../libpurple/protocols/jabber/jabber.c:1591
+#: ../libpurple/protocols/jabber/jabber.c:1614
+#: ../libpurple/protocols/jabber/jabber.c:1637
 msgid "Allow Buzz"
 msgstr "Allow Buzz"
 
-#: ../libpurple/protocols/jabber/jabber.c:1661
+#: ../libpurple/protocols/jabber/jabber.c:1665
 msgid "Password Changed"
 msgstr "Password Changed"
 
-#: ../libpurple/protocols/jabber/jabber.c:1662
+#: ../libpurple/protocols/jabber/jabber.c:1666
 msgid "Your password has been changed."
 msgstr "Your password has been changed."
 
-#: ../libpurple/protocols/jabber/jabber.c:1666
-#: ../libpurple/protocols/jabber/jabber.c:1667
+#: ../libpurple/protocols/jabber/jabber.c:1670
+#: ../libpurple/protocols/jabber/jabber.c:1671
 msgid "Error changing password"
 msgstr "Error changing password"
 
-#: ../libpurple/protocols/jabber/jabber.c:1724
+#: ../libpurple/protocols/jabber/jabber.c:1728
 msgid "Password (again)"
 msgstr "Password (again)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1730
-#: ../libpurple/protocols/jabber/jabber.c:1731
+#: ../libpurple/protocols/jabber/jabber.c:1734
+#: ../libpurple/protocols/jabber/jabber.c:1735
 msgid "Change XMPP Password"
 msgstr "Change XMPP Password"
 
-#: ../libpurple/protocols/jabber/jabber.c:1731
+#: ../libpurple/protocols/jabber/jabber.c:1735
 msgid "Please enter your new password"
 msgstr "Please enter your new password"
 
-#: ../libpurple/protocols/jabber/jabber.c:1745
-#: ../libpurple/protocols/oscar/oscar.c:6372
+#: ../libpurple/protocols/jabber/jabber.c:1749
+#: ../libpurple/protocols/oscar/oscar.c:6388
 #: ../libpurple/protocols/silc/silc.c:1093
 #: ../libpurple/protocols/silc10/silc.c:1004
 msgid "Set User Info..."
 msgstr "Set User Info..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1750
-#: ../libpurple/protocols/oscar/oscar.c:6383
+#: ../libpurple/protocols/jabber/jabber.c:1754
+#: ../libpurple/protocols/oscar/oscar.c:6399
 #: ../libpurple/protocols/silc/silc.c:1089
 #: ../libpurple/protocols/silc10/silc.c:1000
 msgid "Change Password..."
 msgstr "Change Password..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1755
+#: ../libpurple/protocols/jabber/jabber.c:1759
 msgid "Search for Users..."
 msgstr "Search for Users..."
 
-#: ../libpurple/protocols/jabber/jabber.c:1841
-msgid "Bad Request"
-msgstr "Bad Request"
-
-#: ../libpurple/protocols/jabber/jabber.c:1843
-msgid "Conflict"
-msgstr "Conflict"
-
 #: ../libpurple/protocols/jabber/jabber.c:1845
+msgid "Bad Request"
+msgstr "Bad Request"
+
+#: ../libpurple/protocols/jabber/jabber.c:1847
+msgid "Conflict"
+msgstr "Conflict"
+
+#: ../libpurple/protocols/jabber/jabber.c:1849
 msgid "Feature Not Implemented"
 msgstr "Feature Not Implemented"
 
-#: ../libpurple/protocols/jabber/jabber.c:1847
+#: ../libpurple/protocols/jabber/jabber.c:1851
 msgid "Forbidden"
 msgstr "Forbidden"
 
-#: ../libpurple/protocols/jabber/jabber.c:1849
+#: ../libpurple/protocols/jabber/jabber.c:1853
 msgid "Gone"
 msgstr "Gone"
 
-#: ../libpurple/protocols/jabber/jabber.c:1851
-#: ../libpurple/protocols/jabber/jabber.c:1928
+#: ../libpurple/protocols/jabber/jabber.c:1855
+#: ../libpurple/protocols/jabber/jabber.c:1935
 msgid "Internal Server Error"
 msgstr "Internal Server Error"
 
-#: ../libpurple/protocols/jabber/jabber.c:1853
+#: ../libpurple/protocols/jabber/jabber.c:1857
 msgid "Item Not Found"
 msgstr "Item Not Found"
 
-#: ../libpurple/protocols/jabber/jabber.c:1855
+#: ../libpurple/protocols/jabber/jabber.c:1859
 msgid "Malformed XMPP ID"
 msgstr "Malformed XMPP ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:1857
+#: ../libpurple/protocols/jabber/jabber.c:1861
 msgid "Not Acceptable"
 msgstr "Not Acceptable"
 
-#: ../libpurple/protocols/jabber/jabber.c:1859
+#: ../libpurple/protocols/jabber/jabber.c:1863
 msgid "Not Allowed"
 msgstr "Not Allowed"
 
-#: ../libpurple/protocols/jabber/jabber.c:1863
+#: ../libpurple/protocols/jabber/jabber.c:1867
 msgid "Payment Required"
 msgstr "Payment Required"
 
-#: ../libpurple/protocols/jabber/jabber.c:1865
+#: ../libpurple/protocols/jabber/jabber.c:1869
 msgid "Recipient Unavailable"
 msgstr "Recipient unavailable"
 
-#: ../libpurple/protocols/jabber/jabber.c:1869
+#: ../libpurple/protocols/jabber/jabber.c:1873
 msgid "Registration Required"
 msgstr "Registration Required"
 
-#: ../libpurple/protocols/jabber/jabber.c:1871
+#: ../libpurple/protocols/jabber/jabber.c:1875
 msgid "Remote Server Not Found"
 msgstr "Remote Server Not Found"
 
-#: ../libpurple/protocols/jabber/jabber.c:1873
+#: ../libpurple/protocols/jabber/jabber.c:1877
 msgid "Remote Server Timeout"
 msgstr "Remote Server Timeout"
 
-#: ../libpurple/protocols/jabber/jabber.c:1875
+#: ../libpurple/protocols/jabber/jabber.c:1879
 msgid "Server Overloaded"
 msgstr "Server Overloaded"
 
-#: ../libpurple/protocols/jabber/jabber.c:1877
+#: ../libpurple/protocols/jabber/jabber.c:1881
 msgid "Service Unavailable"
 msgstr "Service Unavailable"
 
-#: ../libpurple/protocols/jabber/jabber.c:1879
+#: ../libpurple/protocols/jabber/jabber.c:1883
 msgid "Subscription Required"
 msgstr "Subscription Required"
 
-#: ../libpurple/protocols/jabber/jabber.c:1881
+#: ../libpurple/protocols/jabber/jabber.c:1885
 msgid "Unexpected Request"
 msgstr "Unexpected Request"
 
-#: ../libpurple/protocols/jabber/jabber.c:1888
+#: ../libpurple/protocols/jabber/jabber.c:1892
 msgid "Authorization Aborted"
 msgstr "Authorisation Aborted"
 
-#: ../libpurple/protocols/jabber/jabber.c:1890
+#: ../libpurple/protocols/jabber/jabber.c:1894
 msgid "Incorrect encoding in authorization"
 msgstr "Incorrect encoding in authorisation"
 
-#: ../libpurple/protocols/jabber/jabber.c:1893
+#: ../libpurple/protocols/jabber/jabber.c:1897
 msgid "Invalid authzid"
 msgstr "Invalid authzid"
 
-#: ../libpurple/protocols/jabber/jabber.c:1896
+#: ../libpurple/protocols/jabber/jabber.c:1900
 msgid "Invalid Authorization Mechanism"
 msgstr "Invalid Authorisation Mechanism"
 
-#: ../libpurple/protocols/jabber/jabber.c:1899
+#: ../libpurple/protocols/jabber/jabber.c:1903
 msgid "Authorization mechanism too weak"
 msgstr "Authorisation mechanism too weak"
 
-#: ../libpurple/protocols/jabber/jabber.c:1904
+#: ../libpurple/protocols/jabber/jabber.c:1911
 msgid "Temporary Authentication Failure"
 msgstr "Temporary Authentication Failure"
 
-#: ../libpurple/protocols/jabber/jabber.c:1907
+#: ../libpurple/protocols/jabber/jabber.c:1914
 msgid "Authentication Failure"
 msgstr "Authentication Failure"
 
-#: ../libpurple/protocols/jabber/jabber.c:1913
+#: ../libpurple/protocols/jabber/jabber.c:1920
 msgid "Bad Format"
 msgstr "Bad Format"
 
-#: ../libpurple/protocols/jabber/jabber.c:1915
+#: ../libpurple/protocols/jabber/jabber.c:1922
 msgid "Bad Namespace Prefix"
 msgstr "Bad Namespace Prefix"
 
-#: ../libpurple/protocols/jabber/jabber.c:1918
+#: ../libpurple/protocols/jabber/jabber.c:1925
 msgid "Resource Conflict"
 msgstr "Resource Conflict"
 
-#: ../libpurple/protocols/jabber/jabber.c:1920
+#: ../libpurple/protocols/jabber/jabber.c:1927
 #: ../libpurple/protocols/silc/silc.c:244
 #: ../libpurple/protocols/silc10/ops.c:1720
 msgid "Connection Timeout"
 msgstr "Connection Timeout"
 
-#: ../libpurple/protocols/jabber/jabber.c:1922
+#: ../libpurple/protocols/jabber/jabber.c:1929
 msgid "Host Gone"
 msgstr "Host Gone"
 
-#: ../libpurple/protocols/jabber/jabber.c:1924
+#: ../libpurple/protocols/jabber/jabber.c:1931
 msgid "Host Unknown"
 msgstr "Host Unknown"
 
-#: ../libpurple/protocols/jabber/jabber.c:1926
+#: ../libpurple/protocols/jabber/jabber.c:1933
 msgid "Improper Addressing"
 msgstr "Improper Addressing"
 
-#: ../libpurple/protocols/jabber/jabber.c:1930
+#: ../libpurple/protocols/jabber/jabber.c:1937
 msgid "Invalid ID"
 msgstr "Invalid ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:1932
+#: ../libpurple/protocols/jabber/jabber.c:1939
 msgid "Invalid Namespace"
 msgstr "Invalid Namespace"
 
-#: ../libpurple/protocols/jabber/jabber.c:1934
+#: ../libpurple/protocols/jabber/jabber.c:1941
 msgid "Invalid XML"
 msgstr "Invalid XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1936
+#: ../libpurple/protocols/jabber/jabber.c:1943
 msgid "Non-matching Hosts"
 msgstr "Non-matching Hosts"
 
-#: ../libpurple/protocols/jabber/jabber.c:1940
+#: ../libpurple/protocols/jabber/jabber.c:1947
 msgid "Policy Violation"
 msgstr "Policy Violation"
 
-#: ../libpurple/protocols/jabber/jabber.c:1942
+#: ../libpurple/protocols/jabber/jabber.c:1949
 msgid "Remote Connection Failed"
 msgstr "Remote Connection Failed"
 
-#: ../libpurple/protocols/jabber/jabber.c:1944
+#: ../libpurple/protocols/jabber/jabber.c:1951
 msgid "Resource Constraint"
 msgstr "Resource Constraint"
 
-#: ../libpurple/protocols/jabber/jabber.c:1946
+#: ../libpurple/protocols/jabber/jabber.c:1953
 msgid "Restricted XML"
 msgstr "Restricted XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1948
+#: ../libpurple/protocols/jabber/jabber.c:1955
 msgid "See Other Host"
 msgstr "See Other Host"
 
-#: ../libpurple/protocols/jabber/jabber.c:1950
+#: ../libpurple/protocols/jabber/jabber.c:1957
 msgid "System Shutdown"
 msgstr "System Shutdown"
 
-#: ../libpurple/protocols/jabber/jabber.c:1952
+#: ../libpurple/protocols/jabber/jabber.c:1959
 msgid "Undefined Condition"
 msgstr "Undefined Condition"
 
-#: ../libpurple/protocols/jabber/jabber.c:1954
+#: ../libpurple/protocols/jabber/jabber.c:1961
 msgid "Unsupported Encoding"
 msgstr "Unsupported Encoding"
 
-#: ../libpurple/protocols/jabber/jabber.c:1956
+#: ../libpurple/protocols/jabber/jabber.c:1963
 msgid "Unsupported Stanza Type"
 msgstr "Unsupported Stanza Type"
 
-#: ../libpurple/protocols/jabber/jabber.c:1958
+#: ../libpurple/protocols/jabber/jabber.c:1965
 msgid "Unsupported Version"
 msgstr "Unsupported Version"
 
-#: ../libpurple/protocols/jabber/jabber.c:1960
+#: ../libpurple/protocols/jabber/jabber.c:1967
 msgid "XML Not Well Formed"
 msgstr "XML Not Well Formed"
 
-#: ../libpurple/protocols/jabber/jabber.c:1962
+#: ../libpurple/protocols/jabber/jabber.c:1969
 msgid "Stream Error"
 msgstr "Stream Error"
 
-#: ../libpurple/protocols/jabber/jabber.c:2045
+#: ../libpurple/protocols/jabber/jabber.c:2052
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Unable to ban user %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2065
+#: ../libpurple/protocols/jabber/jabber.c:2072
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "Unknown affiliation: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:2070
+#: ../libpurple/protocols/jabber/jabber.c:2077
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "Unable to affiliate user %s as \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:2089
+#: ../libpurple/protocols/jabber/jabber.c:2096
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "Unknown role: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:2094
+#: ../libpurple/protocols/jabber/jabber.c:2101
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "Unable to set role \"%s\" for user: %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2147
+#: ../libpurple/protocols/jabber/jabber.c:2154
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Unable to kick user %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2178
+#: ../libpurple/protocols/jabber/jabber.c:2185
 #, c-format
 msgid "Unable to ping user %s"
 msgstr "Unable to ping user %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2200
-#: ../libpurple/protocols/jabber/jabber.c:2210
+#: ../libpurple/protocols/jabber/jabber.c:2207
+#: ../libpurple/protocols/jabber/jabber.c:2217
 #, c-format
 msgid "Unable to buzz, because there is nothing known about user %s."
 msgstr "Unable to buzz, because there is nothing known about user %s."
 
-#: ../libpurple/protocols/jabber/jabber.c:2206
+#: ../libpurple/protocols/jabber/jabber.c:2213
 #, c-format
 msgid "Unable to buzz, because user %s might be offline."
 msgstr "Unable to buzz, because user %s might be offline."
 
-#: ../libpurple/protocols/jabber/jabber.c:2232
+#: ../libpurple/protocols/jabber/jabber.c:2239
 #, c-format
 msgid "Unable to buzz, because the user %s does not support it."
 msgstr "Unable to buzz, because the user %s does not support it."
 
-#: ../libpurple/protocols/jabber/jabber.c:2246
+#: ../libpurple/protocols/jabber/jabber.c:2253
 msgid "config:  Configure a chat room."
 msgstr "config:  Configure a chat room."
 
-#: ../libpurple/protocols/jabber/jabber.c:2250
+#: ../libpurple/protocols/jabber/jabber.c:2257
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Configure a chat room."
 
-#: ../libpurple/protocols/jabber/jabber.c:2259
+#: ../libpurple/protocols/jabber/jabber.c:2266
 msgid "part [room]:  Leave the room."
 msgstr "part [room]:  Leave the room."
 
-#: ../libpurple/protocols/jabber/jabber.c:2264
+#: ../libpurple/protocols/jabber/jabber.c:2271
 msgid "register:  Register with a chat room."
 msgstr "register:  Register with a chat room."
 
-#: ../libpurple/protocols/jabber/jabber.c:2270
+#: ../libpurple/protocols/jabber/jabber.c:2277
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [new topic]:  View or change the topic."
 
-#: ../libpurple/protocols/jabber/jabber.c:2276
+#: ../libpurple/protocols/jabber/jabber.c:2283
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;user&gt; [room]:  Ban a user from the room."
 
-#: ../libpurple/protocols/jabber/jabber.c:2282
+#: ../libpurple/protocols/jabber/jabber.c:2289
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -6016,7 +6024,7 @@
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
 
-#: ../libpurple/protocols/jabber/jabber.c:2288
+#: ../libpurple/protocols/jabber/jabber.c:2295
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -6024,30 +6032,30 @@
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
 
-#: ../libpurple/protocols/jabber/jabber.c:2294
+#: ../libpurple/protocols/jabber/jabber.c:2301
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;user&gt; [message]:  Invite a user to the room."
 
-#: ../libpurple/protocols/jabber/jabber.c:2300
+#: ../libpurple/protocols/jabber/jabber.c:2307
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt;room&gt; [server]:  Join a chat on this server."
 
-#: ../libpurple/protocols/jabber/jabber.c:2306
+#: ../libpurple/protocols/jabber/jabber.c:2313
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;user&gt; [room]:  Kick a user from the room."
 
-#: ../libpurple/protocols/jabber/jabber.c:2311
+#: ../libpurple/protocols/jabber/jabber.c:2318
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 
-#: ../libpurple/protocols/jabber/jabber.c:2317
+#: ../libpurple/protocols/jabber/jabber.c:2324
 msgid "ping &lt;jid&gt;:\tPing a user/component/server."
 msgstr "ping &lt;jid&gt;:\tPing a user/component/server."
 
-#: ../libpurple/protocols/jabber/jabber.c:2322
-#: ../libpurple/protocols/yahoo/yahoo.c:4142
+#: ../libpurple/protocols/jabber/jabber.c:2329
+#: ../libpurple/protocols/yahoo/yahoo.c:4145
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Buzz a user to get their attention"
 
@@ -6061,80 +6069,80 @@
 #. *< version
 #. *  summary
 #. *  description
+#: ../libpurple/protocols/jabber/libxmpp.c:170
 #: ../libpurple/protocols/jabber/libxmpp.c:172
-#: ../libpurple/protocols/jabber/libxmpp.c:174
 msgid "XMPP Protocol Plugin"
 msgstr "XMPP Protocol Plug-in"
 
 #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
-#: ../libpurple/protocols/jabber/libxmpp.c:201 ../pidgin/gtkaccount.c:506
+#: ../libpurple/protocols/jabber/libxmpp.c:202 ../pidgin/gtkaccount.c:506
 msgid "Domain"
 msgstr "Domain"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:209
+#: ../libpurple/protocols/jabber/libxmpp.c:210
 msgid "Require SSL/TLS"
 msgstr "Require SSL/TLS"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:213
+#: ../libpurple/protocols/jabber/libxmpp.c:214
 msgid "Force old (port 5223) SSL"
 msgstr "Force old (port 5223) SSL"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:218
+#: ../libpurple/protocols/jabber/libxmpp.c:219
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Allow plaintext auth over unencrypted streams"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:223
-#: ../libpurple/protocols/myspace/myspace.c:3271
-#: ../libpurple/protocols/simple/simple.c:1862
+#: ../libpurple/protocols/jabber/libxmpp.c:224
+#: ../libpurple/protocols/myspace/myspace.c:3277
+#: ../libpurple/protocols/simple/simple.c:1902
 msgid "Connect port"
 msgstr "Connect port"
 
 #. 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:227
-#: ../libpurple/protocols/myspace/myspace.c:3268
+#: ../libpurple/protocols/jabber/libxmpp.c:228
+#: ../libpurple/protocols/myspace/myspace.c:3274
 #: ../libpurple/protocols/silc/silc.c:1914
 #: ../libpurple/protocols/silc10/silc.c:1857 ../pidgin/gtkaccount.c:837
 msgid "Connect server"
 msgstr "Connect server"
 
-#: ../libpurple/protocols/jabber/message.c:103
+#: ../libpurple/protocols/jabber/message.c:106
 #, c-format
 msgid "%s has left the conversation."
 msgstr "%s has left the conversation."
 
-#: ../libpurple/protocols/jabber/message.c:158
+#: ../libpurple/protocols/jabber/message.c:161
 #, c-format
 msgid "Message from %s"
 msgstr "Message from %s"
 
-#: ../libpurple/protocols/jabber/message.c:222
+#: ../libpurple/protocols/jabber/message.c:225
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s has set the topic to: %s"
 
-#: ../libpurple/protocols/jabber/message.c:224
+#: ../libpurple/protocols/jabber/message.c:227
 #, c-format
 msgid "The topic is: %s"
 msgstr "The topic is: %s"
 
-#: ../libpurple/protocols/jabber/message.c:272
+#: ../libpurple/protocols/jabber/message.c:275
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "Message delivery to %s failed: %s"
 
-#: ../libpurple/protocols/jabber/message.c:275
+#: ../libpurple/protocols/jabber/message.c:278
 msgid "XMPP Message Error"
 msgstr "XMPP Message Error"
 
-#: ../libpurple/protocols/jabber/message.c:304
-#: ../libpurple/protocols/yahoo/yahoo.c:4117
+#: ../libpurple/protocols/jabber/message.c:307
+#: ../libpurple/protocols/yahoo/yahoo.c:4120
 #, c-format
 msgid "%s has buzzed you!"
 msgstr "%s has buzzed you!"
 
-#: ../libpurple/protocols/jabber/message.c:404
+#: ../libpurple/protocols/jabber/message.c:407
 #, c-format
 msgid " (Code %s)"
 msgstr " (Code %s)"
@@ -6213,33 +6221,33 @@
 msgid "Select a Resource"
 msgstr "Select a Resource"
 
+#: ../libpurple/protocols/jabber/usermood.c:179
 #: ../libpurple/protocols/jabber/usermood.c:180
-#: ../libpurple/protocols/jabber/usermood.c:181
 msgid "Edit User Mood"
 msgstr "Edit User Mood"
 
-#: ../libpurple/protocols/jabber/usermood.c:182
+#: ../libpurple/protocols/jabber/usermood.c:181
 msgid "Please select your mood from the list."
 msgstr "Please select your mood from the list."
 
-#: ../libpurple/protocols/jabber/usermood.c:184
-#: ../libpurple/protocols/jabber/usernick.c:79
+#: ../libpurple/protocols/jabber/usermood.c:183
+#: ../libpurple/protocols/jabber/usernick.c:78
 msgid "Set"
 msgstr "Set"
 
-#: ../libpurple/protocols/jabber/usermood.c:192
+#: ../libpurple/protocols/jabber/usermood.c:191
 msgid "Set Mood..."
 msgstr "Set Mood..."
 
-#: ../libpurple/protocols/jabber/usernick.c:77
+#: ../libpurple/protocols/jabber/usernick.c:76
 msgid "Set User Nickname"
 msgstr "Set User Nickname"
 
-#: ../libpurple/protocols/jabber/usernick.c:77
+#: ../libpurple/protocols/jabber/usernick.c:76
 msgid "Please specify a new nickname for you."
 msgstr "Please specify a new nickname for yourself."
 
-#: ../libpurple/protocols/jabber/usernick.c:78
+#: ../libpurple/protocols/jabber/usernick.c:77
 msgid ""
 "This information is visible to all contacts on your contact list, so choose "
 "something appropriate."
@@ -6247,7 +6255,7 @@
 "This information is visible to all contacts on your contact list, so choose "
 "something appropriate."
 
-#: ../libpurple/protocols/jabber/usernick.c:100
+#: ../libpurple/protocols/jabber/usernick.c:99
 msgid "Set Nickname..."
 msgstr "Set Nickname..."
 
@@ -6283,222 +6291,275 @@
 "to be added?"
 
 #: ../libpurple/protocols/msn/error.c:36
+#, c-format
 msgid "Unable to parse message"
 msgstr "Unable to parse message"
 
 #: ../libpurple/protocols/msn/error.c:41
+#, c-format
 msgid "Syntax Error (probably a client bug)"
 msgstr "Syntax Error (probably a client bug)"
 
 #: ../libpurple/protocols/msn/error.c:46
+#, c-format
 msgid "Invalid e-mail address"
 msgstr "Invalid e-mail address"
 
 #: ../libpurple/protocols/msn/error.c:49
+#, c-format
 msgid "User does not exist"
 msgstr "User does not exist"
 
 #: ../libpurple/protocols/msn/error.c:53
+#, c-format
 msgid "Fully qualified domain name missing"
 msgstr "Fully qualified domain name missing"
 
 #: ../libpurple/protocols/msn/error.c:56
+#, c-format
 msgid "Already logged in"
 msgstr "Already logged in"
 
 #: ../libpurple/protocols/msn/error.c:59
+#, c-format
 msgid "Invalid screen name"
 msgstr "Invalid screen name"
 
 #: ../libpurple/protocols/msn/error.c:62
+#, c-format
 msgid "Invalid friendly name"
 msgstr "Invalid friendly name"
 
 #: ../libpurple/protocols/msn/error.c:65
+#, c-format
 msgid "List full"
 msgstr "List full"
 
 #: ../libpurple/protocols/msn/error.c:68
+#, c-format
 msgid "Already there"
 msgstr "Already there"
 
 #: ../libpurple/protocols/msn/error.c:72
+#, c-format
 msgid "Not on list"
 msgstr "Not on list"
 
 #: ../libpurple/protocols/msn/error.c:75
 #: ../libpurple/protocols/zephyr/zephyr.c:756
+#, c-format
 msgid "User is offline"
 msgstr "User is offline"
 
 #: ../libpurple/protocols/msn/error.c:78
+#, c-format
 msgid "Already in the mode"
 msgstr "Already in the mode"
 
 #: ../libpurple/protocols/msn/error.c:82
+#, c-format
 msgid "Already in opposite list"
 msgstr "Already in opposite list"
 
 #: ../libpurple/protocols/msn/error.c:86
+#, c-format
 msgid "Too many groups"
 msgstr "Too many groups"
 
 #: ../libpurple/protocols/msn/error.c:89
+#, c-format
 msgid "Invalid group"
 msgstr "Invalid group"
 
 #: ../libpurple/protocols/msn/error.c:92
+#, c-format
 msgid "User not in group"
 msgstr "User not in group"
 
 #: ../libpurple/protocols/msn/error.c:95
+#, c-format
 msgid "Group name too long"
 msgstr "Group name too long"
 
 #: ../libpurple/protocols/msn/error.c:98
+#, c-format
 msgid "Cannot remove group zero"
 msgstr "Cannot remove group zero"
 
 #: ../libpurple/protocols/msn/error.c:103
+#, c-format
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "Tried to add a user to a group that doesn't exist"
 
 #: ../libpurple/protocols/msn/error.c:107
+#, c-format
 msgid "Switchboard failed"
 msgstr "Switchboard failed"
 
 #: ../libpurple/protocols/msn/error.c:111
+#, c-format
 msgid "Notify transfer failed"
 msgstr "Notify transfer failed"
 
 #: ../libpurple/protocols/msn/error.c:116
+#, c-format
 msgid "Required fields missing"
 msgstr "Required fields missing"
 
 #: ../libpurple/protocols/msn/error.c:120
+#, c-format
 msgid "Too many hits to a FND"
 msgstr "Too many hits to a FND"
 
 #: ../libpurple/protocols/msn/error.c:124
-#: ../libpurple/protocols/oscar/oscar.c:119
+#: ../libpurple/protocols/oscar/oscar.c:120
+#, c-format
 msgid "Not logged in"
 msgstr "Not logged in"
 
 #: ../libpurple/protocols/msn/error.c:128
+#, c-format
 msgid "Service temporarily unavailable"
 msgstr "Service temporarily unavailable"
 
 #: ../libpurple/protocols/msn/error.c:131
+#, c-format
 msgid "Database server error"
 msgstr "Database server error"
 
 #: ../libpurple/protocols/msn/error.c:135
+#, c-format
 msgid "Command disabled"
 msgstr "Command disabled"
 
 #: ../libpurple/protocols/msn/error.c:139
+#, c-format
 msgid "File operation error"
 msgstr "File operation error"
 
 #: ../libpurple/protocols/msn/error.c:143
+#, c-format
 msgid "Memory allocation error"
 msgstr "Memory allocation error"
 
 #: ../libpurple/protocols/msn/error.c:147
+#, c-format
 msgid "Wrong CHL value sent to server"
 msgstr "Wrong CHL value sent to server"
 
 #: ../libpurple/protocols/msn/error.c:152
+#, c-format
 msgid "Server busy"
 msgstr "Server busy"
 
 #: ../libpurple/protocols/msn/error.c:155
 #: ../libpurple/protocols/msn/error.c:170
 #: ../libpurple/protocols/msn/error.c:230
+#, c-format
 msgid "Server unavailable"
 msgstr "Server unavailable"
 
 #: ../libpurple/protocols/msn/error.c:158
+#, c-format
 msgid "Peer notification server down"
 msgstr "Peer notification server down"
 
 #: ../libpurple/protocols/msn/error.c:162
+#, c-format
 msgid "Database connect error"
 msgstr "Database connect error"
 
 #: ../libpurple/protocols/msn/error.c:167
+#, c-format
 msgid "Server is going down (abandon ship)"
 msgstr "Server is going down (abandon ship)"
 
 #: ../libpurple/protocols/msn/error.c:174
+#, c-format
 msgid "Error creating connection"
 msgstr "Error creating connection"
 
 #: ../libpurple/protocols/msn/error.c:179
+#, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR parameters are either unknown or not allowed"
 
 #: ../libpurple/protocols/msn/error.c:183
+#, c-format
 msgid "Unable to write"
 msgstr "Unable to write"
 
 #: ../libpurple/protocols/msn/error.c:186
+#, c-format
 msgid "Session overload"
 msgstr "Session overload"
 
 #: ../libpurple/protocols/msn/error.c:190
+#, c-format
 msgid "User is too active"
 msgstr "User is too active"
 
 #: ../libpurple/protocols/msn/error.c:193
+#, c-format
 msgid "Too many sessions"
 msgstr "Too many sessions"
 
 #: ../libpurple/protocols/msn/error.c:196
+#, c-format
 msgid "Passport not verified"
 msgstr "Passport not verified"
 
 #: ../libpurple/protocols/msn/error.c:199
+#, c-format
 msgid "Bad friend file"
 msgstr "Bad friend file"
 
 #: ../libpurple/protocols/msn/error.c:203
+#, c-format
 msgid "Not expected"
 msgstr "Not expected"
 
 #: ../libpurple/protocols/msn/error.c:209
+#, c-format
 msgid "Friendly name changes too rapidly"
 msgstr "Friendly name changes too rapidly"
 
 #: ../libpurple/protocols/msn/error.c:218
+#, c-format
 msgid "Server too busy"
 msgstr "Server too busy"
 
 #: ../libpurple/protocols/msn/error.c:222
-#: ../libpurple/protocols/oscar/oscar.c:1378
+#: ../libpurple/protocols/oscar/oscar.c:1380
 #: ../libpurple/protocols/silc/silc.c:233
 #: ../libpurple/protocols/silc10/ops.c:1709
-#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1363
+#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1380
+#, c-format
 msgid "Authentication failed"
 msgstr "Authentication failed"
 
 #: ../libpurple/protocols/msn/error.c:225
+#, c-format
 msgid "Not allowed when offline"
 msgstr "Not allowed when offline"
 
 #: ../libpurple/protocols/msn/error.c:233
+#, c-format
 msgid "Not accepting new users"
 msgstr "Not accepting new users"
 
 #: ../libpurple/protocols/msn/error.c:237
+#, c-format
 msgid "Kids Passport without parental consent"
 msgstr "Kids Passport without parental consent"
 
 #: ../libpurple/protocols/msn/error.c:241
+#, c-format
 msgid "Passport account not yet verified"
 msgstr "Passport account not yet verified"
 
 #: ../libpurple/protocols/msn/error.c:244
+#, c-format
 msgid "Bad ticket"
 msgstr "Bad ticket"
 
@@ -6587,8 +6648,8 @@
 msgstr "Has you"
 
 #: ../libpurple/protocols/msn/msn.c:579 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:3074
-#: ../libpurple/protocols/yahoo/yahoo.c:3758
+#: ../libpurple/protocols/yahoo/yahoo.c:3077
+#: ../libpurple/protocols/yahoo/yahoo.c:3761
 msgid "Be Right Back"
 msgstr "Be Right Back"
 
@@ -6599,20 +6660,20 @@
 #: ../libpurple/protocols/silc/silc.c:56
 #: ../libpurple/protocols/silc10/buddy.c:1480
 #: ../libpurple/protocols/silc10/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:3076
-#: ../libpurple/protocols/yahoo/yahoo.c:3761
+#: ../libpurple/protocols/yahoo/yahoo.c:3079
+#: ../libpurple/protocols/yahoo/yahoo.c:3764
 msgid "Busy"
 msgstr "Busy"
 
 #: ../libpurple/protocols/msn/msn.c:587
-#: ../libpurple/protocols/yahoo/yahoo.c:3084
-#: ../libpurple/protocols/yahoo/yahoo.c:3773
+#: ../libpurple/protocols/yahoo/yahoo.c:3087
+#: ../libpurple/protocols/yahoo/yahoo.c:3776
 msgid "On the Phone"
 msgstr "On the Phone"
 
 #: ../libpurple/protocols/msn/msn.c:591
-#: ../libpurple/protocols/yahoo/yahoo.c:3088
-#: ../libpurple/protocols/yahoo/yahoo.c:3779
+#: ../libpurple/protocols/yahoo/yahoo.c:3091
+#: ../libpurple/protocols/yahoo/yahoo.c:3782
 msgid "Out to Lunch"
 msgstr "Out to Lunch"
 
@@ -6657,36 +6718,36 @@
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "SSL support is needed for MSN. Please install a supported SSL library."
 
-#: ../libpurple/protocols/msn/msn.c:751
+#: ../libpurple/protocols/msn/msn.c:754
 msgid "Failed to connect to server."
 msgstr "Failed to connect to server."
 
-#: ../libpurple/protocols/msn/msn.c:1507 ../libpurple/protocols/msn/msn.c:1855
+#: ../libpurple/protocols/msn/msn.c:1510 ../libpurple/protocols/msn/msn.c:1858
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:808
 msgid "Error retrieving profile"
 msgstr "Error retreiving profile"
 
-#: ../libpurple/protocols/msn/msn.c:1578 ../pidgin/plugins/convcolors.c:309
+#: ../libpurple/protocols/msn/msn.c:1581 ../pidgin/plugins/convcolors.c:309
 #: ../pidgin/plugins/pidginrc.c:366
 msgid "General"
 msgstr "General"
 
-#: ../libpurple/protocols/msn/msn.c:1585
+#: ../libpurple/protocols/msn/msn.c:1588
 #: ../libpurple/protocols/myspace/user.c:110
-#: ../libpurple/protocols/oscar/oscar.c:3748
+#: ../libpurple/protocols/oscar/oscar.c:3755
 #: ../libpurple/protocols/qq/buddy_info.c:45
 #: ../libpurple/protocols/qq/qq.c:221
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1081
 msgid "Age"
 msgstr "Age"
 
-#: ../libpurple/protocols/msn/msn.c:1587
+#: ../libpurple/protocols/msn/msn.c:1590
 #: ../libpurple/protocols/qq/buddy_info.c:51
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1096
 msgid "Occupation"
 msgstr "Occupation"
 
-#: ../libpurple/protocols/msn/msn.c:1588
+#: ../libpurple/protocols/msn/msn.c:1591
 #: ../libpurple/protocols/myspace/user.c:119
 #: ../libpurple/protocols/novell/novell.c:1478
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1076
@@ -6695,188 +6756,188 @@
 msgid "Location"
 msgstr "Location"
 
-#: ../libpurple/protocols/msn/msn.c:1593 ../libpurple/protocols/msn/msn.c:1785
-#: ../libpurple/protocols/msn/msn.c:1791 ../libpurple/protocols/msn/msn.c:1798
+#: ../libpurple/protocols/msn/msn.c:1596 ../libpurple/protocols/msn/msn.c:1788
+#: ../libpurple/protocols/msn/msn.c:1794 ../libpurple/protocols/msn/msn.c:1801
 msgid "Hobbies and Interests"
 msgstr "Hobbies and Interests"
 
-#: ../libpurple/protocols/msn/msn.c:1599 ../libpurple/protocols/msn/msn.c:1719
-#: ../libpurple/protocols/msn/msn.c:1725 ../libpurple/protocols/msn/msn.c:1732
-#: ../libpurple/protocols/msn/msn.c:1740 ../libpurple/protocols/msn/msn.c:1747
+#: ../libpurple/protocols/msn/msn.c:1602 ../libpurple/protocols/msn/msn.c:1722
+#: ../libpurple/protocols/msn/msn.c:1728 ../libpurple/protocols/msn/msn.c:1735
+#: ../libpurple/protocols/msn/msn.c:1743 ../libpurple/protocols/msn/msn.c:1750
 msgid "A Little About Me"
 msgstr "A Little About Me"
 
-#: ../libpurple/protocols/msn/msn.c:1616
+#: ../libpurple/protocols/msn/msn.c:1619
 msgid "Social"
 msgstr "Social"
 
-#: ../libpurple/protocols/msn/msn.c:1618
+#: ../libpurple/protocols/msn/msn.c:1621
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1086
 msgid "Marital Status"
 msgstr "Marital Status"
 
-#: ../libpurple/protocols/msn/msn.c:1619
+#: ../libpurple/protocols/msn/msn.c:1622
 msgid "Interests"
 msgstr "Interests"
 
-#: ../libpurple/protocols/msn/msn.c:1620
+#: ../libpurple/protocols/msn/msn.c:1623
 msgid "Pets"
 msgstr "Pets"
 
-#: ../libpurple/protocols/msn/msn.c:1621
+#: ../libpurple/protocols/msn/msn.c:1624
 msgid "Hometown"
 msgstr "Home town"
 
-#: ../libpurple/protocols/msn/msn.c:1622
+#: ../libpurple/protocols/msn/msn.c:1625
 msgid "Places Lived"
 msgstr "Places Lived"
 
-#: ../libpurple/protocols/msn/msn.c:1623
+#: ../libpurple/protocols/msn/msn.c:1626
 msgid "Fashion"
 msgstr "Fashion"
 
-#: ../libpurple/protocols/msn/msn.c:1624
+#: ../libpurple/protocols/msn/msn.c:1627
 msgid "Humor"
 msgstr "Humour"
 
-#: ../libpurple/protocols/msn/msn.c:1625
+#: ../libpurple/protocols/msn/msn.c:1628
 msgid "Music"
 msgstr "Music"
 
-#: ../libpurple/protocols/msn/msn.c:1626 ../libpurple/protocols/msn/msn.c:1807
-#: ../libpurple/protocols/msn/msn.c:1813
+#: ../libpurple/protocols/msn/msn.c:1629 ../libpurple/protocols/msn/msn.c:1810
+#: ../libpurple/protocols/msn/msn.c:1816
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1138
 msgid "Favorite Quote"
 msgstr "Favourite Quote"
 
-#: ../libpurple/protocols/msn/msn.c:1643
+#: ../libpurple/protocols/msn/msn.c:1646
 msgid "Contact Info"
 msgstr "Contact Info"
 
-#: ../libpurple/protocols/msn/msn.c:1644
-msgid "Personal"
-msgstr "Personal"
-
 #: ../libpurple/protocols/msn/msn.c:1647
-msgid "Significant Other"
-msgstr "Partner"
-
-#: ../libpurple/protocols/msn/msn.c:1648
-msgid "Home Phone"
-msgstr "Home Telephone"
-
-#: ../libpurple/protocols/msn/msn.c:1649
-msgid "Home Phone 2"
-msgstr "Home Telephone 2"
+msgid "Personal"
+msgstr "Personal"
 
 #: ../libpurple/protocols/msn/msn.c:1650
-#: ../libpurple/protocols/oscar/oscar.c:3786
-msgid "Home Address"
-msgstr "Home Address"
+msgid "Significant Other"
+msgstr "Partner"
 
 #: ../libpurple/protocols/msn/msn.c:1651
+msgid "Home Phone"
+msgstr "Home Telephone"
+
+#: ../libpurple/protocols/msn/msn.c:1652
+msgid "Home Phone 2"
+msgstr "Home Telephone 2"
+
+#: ../libpurple/protocols/msn/msn.c:1653
+#: ../libpurple/protocols/oscar/oscar.c:3793
+msgid "Home Address"
+msgstr "Home Address"
+
+#: ../libpurple/protocols/msn/msn.c:1654
 msgid "Personal Mobile"
 msgstr "Personal Mobile"
 
-#: ../libpurple/protocols/msn/msn.c:1652
+#: ../libpurple/protocols/msn/msn.c:1655
 msgid "Home Fax"
 msgstr "Home Fax"
 
-#: ../libpurple/protocols/msn/msn.c:1653
+#: ../libpurple/protocols/msn/msn.c:1656
 msgid "Personal E-Mail"
 msgstr "Personal E-mail"
 
-#: ../libpurple/protocols/msn/msn.c:1654
+#: ../libpurple/protocols/msn/msn.c:1657
 msgid "Personal IM"
 msgstr "Personal IM"
 
-#: ../libpurple/protocols/msn/msn.c:1656
+#: ../libpurple/protocols/msn/msn.c:1659
 msgid "Anniversary"
 msgstr "Anniversary"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1672
+#: ../libpurple/protocols/msn/msn.c:1675
 msgid "Work"
 msgstr "Work"
 
-#: ../libpurple/protocols/msn/msn.c:1674
+#: ../libpurple/protocols/msn/msn.c:1677
 #: ../libpurple/protocols/silc/ops.c:1010
 #: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "Job Title"
 
-#: ../libpurple/protocols/msn/msn.c:1675
-#: ../libpurple/protocols/oscar/oscar.c:3807
+#: ../libpurple/protocols/msn/msn.c:1678
+#: ../libpurple/protocols/oscar/oscar.c:3814
 msgid "Company"
 msgstr "Company"
 
-#: ../libpurple/protocols/msn/msn.c:1676
+#: ../libpurple/protocols/msn/msn.c:1679
 #: ../libpurple/protocols/novell/novell.c:1480
 msgid "Department"
 msgstr "Department"
 
-#: ../libpurple/protocols/msn/msn.c:1677
+#: ../libpurple/protocols/msn/msn.c:1680
 msgid "Profession"
 msgstr "Profession"
 
-#: ../libpurple/protocols/msn/msn.c:1678
+#: ../libpurple/protocols/msn/msn.c:1681
 msgid "Work Phone"
 msgstr "Work Telephone"
 
-#: ../libpurple/protocols/msn/msn.c:1679
+#: ../libpurple/protocols/msn/msn.c:1682
 msgid "Work Phone 2"
 msgstr "Work Telephone 2"
 
-#: ../libpurple/protocols/msn/msn.c:1680
-#: ../libpurple/protocols/oscar/oscar.c:3799
-msgid "Work Address"
-msgstr "Work Address"
-
-#: ../libpurple/protocols/msn/msn.c:1681
-msgid "Work Mobile"
-msgstr "Work Mobile"
-
-#: ../libpurple/protocols/msn/msn.c:1682
-msgid "Work Pager"
-msgstr "Work Pager"
-
 #: ../libpurple/protocols/msn/msn.c:1683
-msgid "Work Fax"
-msgstr "Work Fax"
+#: ../libpurple/protocols/oscar/oscar.c:3806
+msgid "Work Address"
+msgstr "Work Address"
 
 #: ../libpurple/protocols/msn/msn.c:1684
-msgid "Work E-Mail"
-msgstr "Work E-mail"
+msgid "Work Mobile"
+msgstr "Work Mobile"
 
 #: ../libpurple/protocols/msn/msn.c:1685
-msgid "Work IM"
-msgstr "Work IM"
+msgid "Work Pager"
+msgstr "Work Pager"
 
 #: ../libpurple/protocols/msn/msn.c:1686
+msgid "Work Fax"
+msgstr "Work Fax"
+
+#: ../libpurple/protocols/msn/msn.c:1687
+msgid "Work E-Mail"
+msgstr "Work E-mail"
+
+#: ../libpurple/protocols/msn/msn.c:1688
+msgid "Work IM"
+msgstr "Work IM"
+
+#: ../libpurple/protocols/msn/msn.c:1689
 msgid "Start Date"
 msgstr "Start Date"
 
-#: ../libpurple/protocols/msn/msn.c:1756 ../libpurple/protocols/msn/msn.c:1762
-#: ../libpurple/protocols/msn/msn.c:1769 ../libpurple/protocols/msn/msn.c:1776
+#: ../libpurple/protocols/msn/msn.c:1759 ../libpurple/protocols/msn/msn.c:1765
+#: ../libpurple/protocols/msn/msn.c:1772 ../libpurple/protocols/msn/msn.c:1779
 msgid "Favorite Things"
 msgstr "Favourite Things"
 
-#: ../libpurple/protocols/msn/msn.c:1821
+#: ../libpurple/protocols/msn/msn.c:1824
 msgid "Last Updated"
 msgstr "Last Updated"
 
-#: ../libpurple/protocols/msn/msn.c:1832
+#: ../libpurple/protocols/msn/msn.c:1835
 #: ../libpurple/protocols/qq/buddy_info.c:60
 #: ../libpurple/protocols/silc/ops.c:1026
 #: ../libpurple/protocols/silc10/ops.c:1060
 msgid "Homepage"
 msgstr "Homepage"
 
-#: ../libpurple/protocols/msn/msn.c:1856
+#: ../libpurple/protocols/msn/msn.c:1859
 msgid "The user has not created a public profile."
 msgstr "The user has not created a public profile."
 
-#: ../libpurple/protocols/msn/msn.c:1857
+#: ../libpurple/protocols/msn/msn.c:1860
 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 "
@@ -6886,7 +6947,7 @@
 "that the user does not exist, or that the user exists but has not created a "
 "public profile."
 
-#: ../libpurple/protocols/msn/msn.c:1861
+#: ../libpurple/protocols/msn/msn.c:1864
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
@@ -6894,7 +6955,7 @@
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
 
-#: ../libpurple/protocols/msn/msn.c:1869
+#: ../libpurple/protocols/msn/msn.c:1872
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1240
 msgid "Profile URL"
 msgstr "Profile URL"
@@ -6909,24 +6970,29 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2155 ../libpurple/protocols/msn/msn.c:2157
+#: ../libpurple/protocols/msn/msn.c:2158 ../libpurple/protocols/msn/msn.c:2160
 msgid "MSN Protocol Plugin"
 msgstr "MSN Protocol Plug-in"
 
-#: ../libpurple/protocols/msn/msn.c:2191
+#: ../libpurple/protocols/msn/msn.c:2194
 msgid "Use HTTP Method"
 msgstr "Use HTTP Method"
 
-#: ../libpurple/protocols/msn/msn.c:2196
+#: ../libpurple/protocols/msn/msn.c:2199
+#, fuzzy
+msgid "HTTP Method Server"
+msgstr "IPC Test Server"
+
+#: ../libpurple/protocols/msn/msn.c:2204
 msgid "Show custom smileys"
 msgstr "Show custom smileys"
 
-#: ../libpurple/protocols/msn/msn.c:2204
+#: ../libpurple/protocols/msn/msn.c:2212
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: nudge a user to get their attention"
 
 #: ../libpurple/protocols/msn/nexus.c:146
-#: ../libpurple/protocols/msn/servconn.c:133
+#: ../libpurple/protocols/msn/servconn.c:135
 #: ../libpurple/protocols/qq/qq_proxy.c:242
 #: ../libpurple/protocols/qq/qq_proxy.c:321
 #: ../libpurple/protocols/qq/qq_proxy.c:366
@@ -7029,15 +7095,15 @@
 "After the maintenance has been completed, you will be able to successfully "
 "sign in."
 
-#: ../libpurple/protocols/msn/servconn.c:135
+#: ../libpurple/protocols/msn/servconn.c:137
 msgid "Writing error"
 msgstr "Writing error"
 
-#: ../libpurple/protocols/msn/servconn.c:137
+#: ../libpurple/protocols/msn/servconn.c:139
 msgid "Reading error"
 msgstr "Reading error"
 
-#: ../libpurple/protocols/msn/servconn.c:144
+#: ../libpurple/protocols/msn/servconn.c:146
 #, c-format
 msgid ""
 "Connection error from %s server:\n"
@@ -7197,66 +7263,66 @@
 
 #. Notify an error message also, because this is important!
 #: ../libpurple/protocols/myspace/myspace.c:292
-#: ../libpurple/protocols/myspace/myspace.c:1795
+#: ../libpurple/protocols/myspace/myspace.c:1801
 msgid "MySpaceIM Error"
 msgstr "MySpaceIM Error"
 
-#: ../libpurple/protocols/myspace/myspace.c:348
+#: ../libpurple/protocols/myspace/myspace.c:349
 msgid "Reading challenge"
 msgstr "Reading challenge"
 
-#: ../libpurple/protocols/myspace/myspace.c:354
+#: ../libpurple/protocols/myspace/myspace.c:355
 msgid "Unexpected challenge length from server"
 msgstr "Unexpected challenge length from server"
 
-#: ../libpurple/protocols/myspace/myspace.c:358
+#: ../libpurple/protocols/myspace/myspace.c:359
 msgid "Logging in"
 msgstr "Logging in"
 
-#: ../libpurple/protocols/myspace/myspace.c:1276
+#: ../libpurple/protocols/myspace/myspace.c:1286
 #, c-format
 msgid "Connection to server lost (no data received within %d seconds)"
 msgstr "Connection to server lost (no data received within %d seconds)"
 
 #. Can't write _()'d strings in array initializers. Workaround.
-#: ../libpurple/protocols/myspace/myspace.c:1319
+#: ../libpurple/protocols/myspace/myspace.c:1328
 msgid "New mail messages"
 msgstr "New mail messages"
 
-#: ../libpurple/protocols/myspace/myspace.c:1320
+#: ../libpurple/protocols/myspace/myspace.c:1329
 msgid "New blog comments"
 msgstr "New blog comments"
 
-#: ../libpurple/protocols/myspace/myspace.c:1321
+#: ../libpurple/protocols/myspace/myspace.c:1330
 msgid "New profile comments"
 msgstr "New profile comments"
 
-#: ../libpurple/protocols/myspace/myspace.c:1322
+#: ../libpurple/protocols/myspace/myspace.c:1331
 msgid "New friend requests!"
 msgstr "New friend requests!"
 
-#: ../libpurple/protocols/myspace/myspace.c:1323
+#: ../libpurple/protocols/myspace/myspace.c:1332
 msgid "New picture comments"
 msgstr "New picture comments"
 
-#: ../libpurple/protocols/myspace/myspace.c:1353
+#: ../libpurple/protocols/myspace/myspace.c:1360
 msgid "MySpace"
 msgstr "MySpace"
 
 #. 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:1537
+#: ../libpurple/protocols/myspace/myspace.c:1543
 #: ../libpurple/protocols/sametime/sametime.c:1544
 msgid "Connected"
 msgstr "Connected"
 
-#: ../libpurple/protocols/myspace/myspace.c:1548
-#: ../libpurple/protocols/myspace/myspace.c:1550
+#: ../libpurple/protocols/myspace/myspace.c:1554
+#: ../libpurple/protocols/myspace/myspace.c:1556
 msgid "No username set"
 msgstr "No username set"
 
-#: ../libpurple/protocols/myspace/myspace.c:1549
+#: ../libpurple/protocols/myspace/myspace.c:1555
 msgid ""
 "Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
 "username and choose a username and try to login again."
@@ -7264,72 +7330,72 @@
 "Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
 "username and choose a username and try to login again."
 
-#: ../libpurple/protocols/myspace/myspace.c:1776
+#: ../libpurple/protocols/myspace/myspace.c:1782
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Protocol error, code %d: %s"
 
-#: ../libpurple/protocols/myspace/myspace.c:1966
-#: ../libpurple/protocols/myspace/myspace.c:2000
+#: ../libpurple/protocols/myspace/myspace.c:1972
+#: ../libpurple/protocols/myspace/myspace.c:2006
 msgid "Failed to add buddy"
 msgstr "Failed to add buddy"
 
-#: ../libpurple/protocols/myspace/myspace.c:1966
+#: ../libpurple/protocols/myspace/myspace.c:1972
 msgid "'addbuddy' command failed."
 msgstr "'addbuddy' command failed."
 
-#: ../libpurple/protocols/myspace/myspace.c:2000
-#: ../libpurple/protocols/myspace/myspace.c:2241
+#: ../libpurple/protocols/myspace/myspace.c:2006
+#: ../libpurple/protocols/myspace/myspace.c:2247
 msgid "persist command failed"
 msgstr "persist command failed"
 
-#: ../libpurple/protocols/myspace/myspace.c:2109
+#: ../libpurple/protocols/myspace/myspace.c:2115
 #, c-format
 msgid "No such user: %s"
 msgstr "No such user: %s"
 
-#: ../libpurple/protocols/myspace/myspace.c:2110
+#: ../libpurple/protocols/myspace/myspace.c:2116
 msgid "User lookup"
 msgstr "User lookup"
 
-#: ../libpurple/protocols/myspace/myspace.c:2222
-#: ../libpurple/protocols/myspace/myspace.c:2241
-#: ../libpurple/protocols/myspace/myspace.c:2263
+#: ../libpurple/protocols/myspace/myspace.c:2228
+#: ../libpurple/protocols/myspace/myspace.c:2247
+#: ../libpurple/protocols/myspace/myspace.c:2269
 msgid "Failed to remove buddy"
 msgstr "Failed to remove buddy"
 
-#: ../libpurple/protocols/myspace/myspace.c:2222
+#: ../libpurple/protocols/myspace/myspace.c:2228
 msgid "'delbuddy' command failed"
 msgstr "'delbuddy' command failed"
 
-#: ../libpurple/protocols/myspace/myspace.c:2263
+#: ../libpurple/protocols/myspace/myspace.c:2269
 msgid "blocklist command failed"
 msgstr "blocklist command failed"
 
-#: ../libpurple/protocols/myspace/myspace.c:2309
+#: ../libpurple/protocols/myspace/myspace.c:2315
 msgid "Invalid input condition"
 msgstr "Invalid input condition"
 
 #. TODO: g_realloc like msn, yahoo, irc, jabber?
-#: ../libpurple/protocols/myspace/myspace.c:2327
-#: ../libpurple/protocols/myspace/myspace.c:2358
+#: ../libpurple/protocols/myspace/myspace.c:2333
+#: ../libpurple/protocols/myspace/myspace.c:2364
 msgid "Read buffer full"
 msgstr "Read buffer full"
 
-#: ../libpurple/protocols/myspace/myspace.c:2396
+#: ../libpurple/protocols/myspace/myspace.c:2402
 msgid "Unparseable message"
 msgstr "Unparseable message"
 
-#: ../libpurple/protocols/myspace/myspace.c:2465
+#: ../libpurple/protocols/myspace/myspace.c:2471
 #, c-format
 msgid "Couldn't connect to host: %s (%d)"
 msgstr "Couldn't connect to host: %s (%d)"
 
-#: ../libpurple/protocols/myspace/myspace.c:2636
+#: ../libpurple/protocols/myspace/myspace.c:2642
 msgid "IM Friends"
 msgstr "IM Friends"
 
-#: ../libpurple/protocols/myspace/myspace.c:2735
+#: ../libpurple/protocols/myspace/myspace.c:2741
 #, c-format
 msgid ""
 "%d buddies were added or updated from the server (including buddies already "
@@ -7338,57 +7404,57 @@
 "%d buddies were added or updated from the server (including buddies already "
 "on the server-side list)"
 
-#: ../libpurple/protocols/myspace/myspace.c:2736
+#: ../libpurple/protocols/myspace/myspace.c:2742
 msgid "Add contacts from server"
 msgstr "Add contacts from server"
 
-#: ../libpurple/protocols/myspace/myspace.c:2788
-#: ../libpurple/protocols/myspace/myspace.c:2853
+#: ../libpurple/protocols/myspace/myspace.c:2794
+#: ../libpurple/protocols/myspace/myspace.c:2859
 msgid "Add friends from MySpace.com"
 msgstr "Add friends from MySpace.com"
 
-#: ../libpurple/protocols/myspace/myspace.c:2789
+#: ../libpurple/protocols/myspace/myspace.c:2795
 msgid "Importing friends failed"
 msgstr "Importing friends failed"
 
 #. TODO: find out how
-#: ../libpurple/protocols/myspace/myspace.c:2845
+#: ../libpurple/protocols/myspace/myspace.c:2851
 msgid "Find people..."
 msgstr "Find people..."
 
-#: ../libpurple/protocols/myspace/myspace.c:2848
+#: ../libpurple/protocols/myspace/myspace.c:2854
 msgid "Change IM name..."
 msgstr "Change IM name..."
 
-#: ../libpurple/protocols/myspace/myspace.c:3150
+#: ../libpurple/protocols/myspace/myspace.c:3156
 msgid "myim URL handler"
 msgstr "myim URL handler"
 
-#: ../libpurple/protocols/myspace/myspace.c:3151
+#: ../libpurple/protocols/myspace/myspace.c:3157
 msgid "No suitable MySpaceIM account could be found to open this myim URL."
 msgstr "No suitable MySpaceIM account could be found to open this myim URL."
 
-#: ../libpurple/protocols/myspace/myspace.c:3152
+#: ../libpurple/protocols/myspace/myspace.c:3158
 msgid "Enable the proper MySpaceIM account and try again."
 msgstr "Enable the proper MySpaceIM account and try again."
 
-#: ../libpurple/protocols/myspace/myspace.c:3275
+#: ../libpurple/protocols/myspace/myspace.c:3281
 msgid "Show display name in status text"
 msgstr "Show display name in status text"
 
-#: ../libpurple/protocols/myspace/myspace.c:3278
+#: ../libpurple/protocols/myspace/myspace.c:3284
 msgid "Show headline in status text"
 msgstr "Show headline in status text"
 
-#: ../libpurple/protocols/myspace/myspace.c:3283
+#: ../libpurple/protocols/myspace/myspace.c:3289
 msgid "Send emoticons"
 msgstr "Send emoticons"
 
-#: ../libpurple/protocols/myspace/myspace.c:3288
+#: ../libpurple/protocols/myspace/myspace.c:3294
 msgid "Screen resolution (dots per inch)"
 msgstr "Screen resolution (dots per inch)"
 
-#: ../libpurple/protocols/myspace/myspace.c:3291
+#: ../libpurple/protocols/myspace/myspace.c:3297
 msgid "Base font size (points)"
 msgstr "Base font size (points)"
 
@@ -7400,7 +7466,7 @@
 
 #. TODO: link to username, if available
 #: ../libpurple/protocols/myspace/user.c:102
-#: ../libpurple/protocols/oscar/oscar.c:2957
+#: ../libpurple/protocols/oscar/oscar.c:2964
 msgid "Profile"
 msgstr "Profile"
 
@@ -7892,6 +7958,7 @@
 msgstr "Error: SSL support is not installed."
 
 #: ../libpurple/protocols/novell/novell.c:2504
+#, c-format
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "This conference has been closed. No more messages can be sent."
 
@@ -7919,19 +7986,19 @@
 msgstr "Server port"
 
 #: ../libpurple/protocols/oscar/flap_connection.c:387
-#: ../libpurple/protocols/yahoo/yahoo.c:2466
-#: ../libpurple/protocols/yahoo/yahoo.c:2633
-#: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:580
-#: ../libpurple/proxy.c:1099 ../libpurple/proxy.c:1208
-#: ../libpurple/proxy.c:1308 ../libpurple/proxy.c:1436
+#: ../libpurple/protocols/yahoo/yahoo.c:2469
+#: ../libpurple/protocols/yahoo/yahoo.c:2636
+#: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:581
+#: ../libpurple/proxy.c:1116 ../libpurple/proxy.c:1225
+#: ../libpurple/proxy.c:1325 ../libpurple/proxy.c:1453
 msgid "Server closed the connection."
 msgstr "Server closed the connection."
 
 #: ../libpurple/protocols/oscar/flap_connection.c:389
-#: ../libpurple/protocols/yahoo/yahoo.c:2460
-#: ../libpurple/protocols/yahoo/yahoo.c:2627 ../libpurple/proxy.c:592
-#: ../libpurple/proxy.c:1111 ../libpurple/proxy.c:1220
-#: ../libpurple/proxy.c:1320 ../libpurple/proxy.c:1448
+#: ../libpurple/protocols/yahoo/yahoo.c:2463
+#: ../libpurple/protocols/yahoo/yahoo.c:2630 ../libpurple/proxy.c:593
+#: ../libpurple/proxy.c:1128 ../libpurple/proxy.c:1237
+#: ../libpurple/proxy.c:1337 ../libpurple/proxy.c:1465
 #, c-format
 msgid ""
 "Lost connection with server:\n"
@@ -7941,9 +8008,9 @@
 "%s"
 
 #: ../libpurple/protocols/oscar/flap_connection.c:392
-#: ../libpurple/proxy.c:1128 ../libpurple/proxy.c:1233
-#: ../libpurple/proxy.c:1332 ../libpurple/proxy.c:1404
-#: ../libpurple/proxy.c:1461
+#: ../libpurple/proxy.c:1145 ../libpurple/proxy.c:1250
+#: ../libpurple/proxy.c:1349 ../libpurple/proxy.c:1421
+#: ../libpurple/proxy.c:1478
 msgid "Received invalid data on connection with server."
 msgstr "Received invalid data on connection with server."
 
@@ -7978,7 +8045,7 @@
 msgstr "ICQ Protocol Plugin"
 
 #: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4407
+#: ../libpurple/protocols/yahoo/yahoo.c:4410
 #: ../libpurple/protocols/zephyr/zephyr.c:2997
 msgid "Encoding"
 msgstr "Encoding"
@@ -8013,103 +8080,103 @@
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "File %s is %s, which is larger than the maximum size of %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:115
+#: ../libpurple/protocols/oscar/oscar.c:116
 msgid "Invalid error"
 msgstr "Invalid error"
 
-#: ../libpurple/protocols/oscar/oscar.c:116
+#: ../libpurple/protocols/oscar/oscar.c:117
 msgid "Invalid SNAC"
 msgstr "Invalid SNAC"
 
-#: ../libpurple/protocols/oscar/oscar.c:117
+#: ../libpurple/protocols/oscar/oscar.c:118
 msgid "Rate to host"
 msgstr "Rate to host"
 
-#: ../libpurple/protocols/oscar/oscar.c:118
+#: ../libpurple/protocols/oscar/oscar.c:119
 msgid "Rate to client"
 msgstr "Rate to client"
 
-#: ../libpurple/protocols/oscar/oscar.c:120
+#: ../libpurple/protocols/oscar/oscar.c:121
 msgid "Service unavailable"
 msgstr "Service unavailable"
 
-#: ../libpurple/protocols/oscar/oscar.c:121
+#: ../libpurple/protocols/oscar/oscar.c:122
 msgid "Service not defined"
 msgstr "Service not defined"
 
-#: ../libpurple/protocols/oscar/oscar.c:122
+#: ../libpurple/protocols/oscar/oscar.c:123
 msgid "Obsolete SNAC"
 msgstr "Obsolete SNAC"
 
-#: ../libpurple/protocols/oscar/oscar.c:123
+#: ../libpurple/protocols/oscar/oscar.c:124
 msgid "Not supported by host"
 msgstr "Not supported by host"
 
-#: ../libpurple/protocols/oscar/oscar.c:124
+#: ../libpurple/protocols/oscar/oscar.c:125
 msgid "Not supported by client"
 msgstr "Not supported by client"
 
-#: ../libpurple/protocols/oscar/oscar.c:125
+#: ../libpurple/protocols/oscar/oscar.c:126
 msgid "Refused by client"
 msgstr "Refused by client"
 
-#: ../libpurple/protocols/oscar/oscar.c:126
+#: ../libpurple/protocols/oscar/oscar.c:127
 msgid "Reply too big"
 msgstr "Reply too big"
 
-#: ../libpurple/protocols/oscar/oscar.c:127
-msgid "Responses lost"
-msgstr "Responses lost"
-
 #: ../libpurple/protocols/oscar/oscar.c:128
-msgid "Request denied"
-msgstr "Request denied"
+msgid "Responses lost"
+msgstr "Responses lost"
 
 #: ../libpurple/protocols/oscar/oscar.c:129
+msgid "Request denied"
+msgstr "Request denied"
+
+#: ../libpurple/protocols/oscar/oscar.c:130
 msgid "Busted SNAC payload"
 msgstr "Busted SNAC payload"
 
-#: ../libpurple/protocols/oscar/oscar.c:130
+#: ../libpurple/protocols/oscar/oscar.c:131
 msgid "Insufficient rights"
 msgstr "Insufficient rights"
 
-#: ../libpurple/protocols/oscar/oscar.c:131
+#: ../libpurple/protocols/oscar/oscar.c:132
 msgid "In local permit/deny"
 msgstr "In local permit/deny"
 
-#: ../libpurple/protocols/oscar/oscar.c:132
+#: ../libpurple/protocols/oscar/oscar.c:133
 msgid "Too evil (sender)"
 msgstr "Too evil (sender)"
 
-#: ../libpurple/protocols/oscar/oscar.c:133
-msgid "Too evil (receiver)"
-msgstr "Too evil (receiver)"
-
 #: ../libpurple/protocols/oscar/oscar.c:134
-msgid "User temporarily unavailable"
-msgstr "User temporarily unavailable"
+msgid "Too evil (receiver)"
+msgstr "Too evil (receiver)"
 
 #: ../libpurple/protocols/oscar/oscar.c:135
+msgid "User temporarily unavailable"
+msgstr "User temporarily unavailable"
+
+#: ../libpurple/protocols/oscar/oscar.c:136
 msgid "No match"
 msgstr "No match"
 
-#: ../libpurple/protocols/oscar/oscar.c:136
-msgid "List overflow"
-msgstr "List overflow"
-
 #: ../libpurple/protocols/oscar/oscar.c:137
+msgid "List overflow"
+msgstr "List overflow"
+
+#: ../libpurple/protocols/oscar/oscar.c:138
 msgid "Request ambiguous"
 msgstr "Request ambiguous"
 
-#: ../libpurple/protocols/oscar/oscar.c:138
+#: ../libpurple/protocols/oscar/oscar.c:139
 msgid "Queue full"
 msgstr "Queue full"
 
-#: ../libpurple/protocols/oscar/oscar.c:139
+#: ../libpurple/protocols/oscar/oscar.c:140
 msgid "Not while on AOL"
 msgstr "Not while on AOL"
 
-#: ../libpurple/protocols/oscar/oscar.c:347
+#: ../libpurple/protocols/oscar/oscar.c:348
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking with "
 "is probably using a different encoding than expected.  If you know what "
@@ -8121,7 +8188,7 @@
 "encoding he is using, you can specify it in the advanced account options for "
 "your AIM/ICQ account.)"
 
-#: ../libpurple/protocols/oscar/oscar.c:456
+#: ../libpurple/protocols/oscar/oscar.c:457
 #, c-format
 msgid ""
 "(There was an error receiving this message.  Either you and %s have "
@@ -8131,21 +8198,21 @@
 "different encodings selected, or %s has a buggy client.)"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:638 ../pidgin/gtkutils.c:2386
-#: ../pidgin/gtkutils.c:2416
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:334
+#: ../libpurple/protocols/oscar/oscar.c:639 ../pidgin/gtkutils.c:2387
+#: ../pidgin/gtkutils.c:2417
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:332
 msgid "Buddy Icon"
 msgstr "Buddy Icon"
 
-#: ../libpurple/protocols/oscar/oscar.c:641
+#: ../libpurple/protocols/oscar/oscar.c:642
 msgid "Voice"
 msgstr "Voice"
 
-#: ../libpurple/protocols/oscar/oscar.c:644
+#: ../libpurple/protocols/oscar/oscar.c:645
 msgid "AIM Direct IM"
 msgstr "AIM Direct IM"
 
-#: ../libpurple/protocols/oscar/oscar.c:647
+#: ../libpurple/protocols/oscar/oscar.c:648
 #: ../libpurple/protocols/silc/silc.c:768
 #: ../libpurple/protocols/silc/util.c:553
 #: ../libpurple/protocols/silc10/silc.c:679
@@ -8153,125 +8220,131 @@
 msgid "Chat"
 msgstr "Chat"
 
-#: ../libpurple/protocols/oscar/oscar.c:650
-#: ../libpurple/protocols/oscar/oscar.c:5994
+#: ../libpurple/protocols/oscar/oscar.c:651
+#: ../libpurple/protocols/oscar/oscar.c:6010
 msgid "Get File"
 msgstr "Get File"
 
-#: ../libpurple/protocols/oscar/oscar.c:657
+#: ../libpurple/protocols/oscar/oscar.c:658
 msgid "Games"
 msgstr "Games"
 
-#: ../libpurple/protocols/oscar/oscar.c:660
+#: ../libpurple/protocols/oscar/oscar.c:661
 msgid "Add-Ins"
 msgstr "Add-Ins"
 
-#: ../libpurple/protocols/oscar/oscar.c:663
+#: ../libpurple/protocols/oscar/oscar.c:664
 msgid "Send Buddy List"
 msgstr "Send Buddy List"
 
-#: ../libpurple/protocols/oscar/oscar.c:666
+#: ../libpurple/protocols/oscar/oscar.c:667
 msgid "ICQ Direct Connect"
 msgstr "ICQ Direct Connect"
 
-#: ../libpurple/protocols/oscar/oscar.c:669
+#: ../libpurple/protocols/oscar/oscar.c:670
 msgid "AP User"
 msgstr "AP User"
 
-#: ../libpurple/protocols/oscar/oscar.c:672
+#: ../libpurple/protocols/oscar/oscar.c:673
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: ../libpurple/protocols/oscar/oscar.c:675
+#: ../libpurple/protocols/oscar/oscar.c:676
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: ../libpurple/protocols/oscar/oscar.c:678
+#: ../libpurple/protocols/oscar/oscar.c:679
 msgid "ICQ Server Relay"
 msgstr "ICQ Server Relay"
 
-#: ../libpurple/protocols/oscar/oscar.c:681
+#: ../libpurple/protocols/oscar/oscar.c:682
 msgid "Old ICQ UTF8"
 msgstr "Old ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:684
+#: ../libpurple/protocols/oscar/oscar.c:685
 msgid "Trillian Encryption"
 msgstr "Trillian Encryption"
 
-#: ../libpurple/protocols/oscar/oscar.c:687
+#: ../libpurple/protocols/oscar/oscar.c:688
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:690
+#: ../libpurple/protocols/oscar/oscar.c:691
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: ../libpurple/protocols/oscar/oscar.c:693
+#: ../libpurple/protocols/oscar/oscar.c:694
 msgid "Security Enabled"
 msgstr "Security Enabled"
 
-#: ../libpurple/protocols/oscar/oscar.c:696
+#: ../libpurple/protocols/oscar/oscar.c:697
 msgid "Video Chat"
 msgstr "Video Chat"
 
-#: ../libpurple/protocols/oscar/oscar.c:700
+#: ../libpurple/protocols/oscar/oscar.c:701
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: ../libpurple/protocols/oscar/oscar.c:703
+#: ../libpurple/protocols/oscar/oscar.c:704
 msgid "Live Video"
 msgstr "Live Video"
 
-#: ../libpurple/protocols/oscar/oscar.c:706
+#: ../libpurple/protocols/oscar/oscar.c:707
 msgid "Camera"
 msgstr "Camera"
 
-#: ../libpurple/protocols/oscar/oscar.c:724
-#: ../libpurple/protocols/oscar/oscar.c:5764
+#: ../libpurple/protocols/oscar/oscar.c:725
+#: ../libpurple/protocols/oscar/oscar.c:5780
+#, c-format
 msgid "Free For Chat"
 msgstr "Free For Chat"
 
-#: ../libpurple/protocols/oscar/oscar.c:728
-#: ../libpurple/protocols/oscar/oscar.c:5799
+#: ../libpurple/protocols/oscar/oscar.c:729
+#: ../libpurple/protocols/oscar/oscar.c:5815
+#, c-format
 msgid "Not Available"
 msgstr "Not Available"
 
-#: ../libpurple/protocols/oscar/oscar.c:730
-#: ../libpurple/protocols/oscar/oscar.c:5785
+#: ../libpurple/protocols/oscar/oscar.c:731
+#: ../libpurple/protocols/oscar/oscar.c:5801
+#, c-format
 msgid "Occupied"
 msgstr "Occupied"
 
-#: ../libpurple/protocols/oscar/oscar.c:734
+#: ../libpurple/protocols/oscar/oscar.c:735
+#, c-format
 msgid "Web Aware"
 msgstr "Web Aware"
 
-#: ../libpurple/protocols/oscar/oscar.c:736 ../libpurple/protocols/qq/qq.c:183
+#: ../libpurple/protocols/oscar/oscar.c:737 ../libpurple/protocols/qq/qq.c:183
 #: ../libpurple/protocols/qq/qq.c:288
-#: ../libpurple/protocols/yahoo/yahoo.c:3092 ../libpurple/status.c:156
-#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1059
+#: ../libpurple/protocols/yahoo/yahoo.c:3095 ../libpurple/status.c:157
+#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1060
+#, c-format
 msgid "Invisible"
 msgstr "Invisible"
 
-#: ../libpurple/protocols/oscar/oscar.c:738
+#: ../libpurple/protocols/oscar/oscar.c:739
+#, c-format
 msgid "Online"
 msgstr "Online"
 
-#: ../libpurple/protocols/oscar/oscar.c:837
-#: ../libpurple/protocols/oscar/oscar.c:3700
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1125
+#: ../libpurple/protocols/oscar/oscar.c:838
+#: ../libpurple/protocols/oscar/oscar.c:3707
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1126
 msgid "IP Address"
 msgstr "IP Address"
 
-#: ../libpurple/protocols/oscar/oscar.c:844
-#: ../libpurple/protocols/oscar/oscar.c:2884
+#: ../libpurple/protocols/oscar/oscar.c:845
+#: ../libpurple/protocols/oscar/oscar.c:2891
 msgid "Warning Level"
 msgstr "Warning Level"
 
-#: ../libpurple/protocols/oscar/oscar.c:854
+#: ../libpurple/protocols/oscar/oscar.c:855
 msgid "Buddy Comment"
 msgstr "Buddy Comment"
 
-#: ../libpurple/protocols/oscar/oscar.c:994
+#: ../libpurple/protocols/oscar/oscar.c:995
 #, c-format
 msgid ""
 "Could not connect to authentication server:\n"
@@ -8280,7 +8353,7 @@
 "Could not connect to authentication server:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1002
+#: ../libpurple/protocols/oscar/oscar.c:1003
 #, c-format
 msgid ""
 "Could not connect to BOS server:\n"
@@ -8289,20 +8362,20 @@
 "Could not connect to BOS server:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1042
+#: ../libpurple/protocols/oscar/oscar.c:1043
 msgid "Screen name sent"
 msgstr "Screen name sent"
 
-#: ../libpurple/protocols/oscar/oscar.c:1047
+#: ../libpurple/protocols/oscar/oscar.c:1048
 msgid "Connection established, cookie sent"
 msgstr "Connection established, cookie sent"
 
 #. TODO: Don't call this with ssi
-#: ../libpurple/protocols/oscar/oscar.c:1076
+#: ../libpurple/protocols/oscar/oscar.c:1077
 msgid "Finalizing connection"
 msgstr "Finalising connection"
 
-#: ../libpurple/protocols/oscar/oscar.c:1258
+#: ../libpurple/protocols/oscar/oscar.c:1260
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -8313,29 +8386,29 @@
 "invalid.  Screen names must be a valid email address, or start with a letter "
 "and contain only letters, numbers and spaces, or contain only numbers."
 
-#: ../libpurple/protocols/oscar/oscar.c:1343
-#: ../libpurple/protocols/yahoo/yahoo.c:2102
+#: ../libpurple/protocols/oscar/oscar.c:1345
+#: ../libpurple/protocols/yahoo/yahoo.c:2105
 msgid "Invalid screen name."
 msgstr "Invalid screen name."
 
-#: ../libpurple/protocols/oscar/oscar.c:1350
+#: ../libpurple/protocols/oscar/oscar.c:1352
 #: ../libpurple/protocols/qq/login_logout.c:483
-#: ../libpurple/protocols/simple/simple.c:1039
-#: ../libpurple/protocols/yahoo/yahoo.c:2123
+#: ../libpurple/protocols/simple/simple.c:1045
+#: ../libpurple/protocols/yahoo/yahoo.c:2126
 msgid "Incorrect password."
 msgstr "Incorrect password."
 
-#: ../libpurple/protocols/oscar/oscar.c:1355
+#: ../libpurple/protocols/oscar/oscar.c:1357
 msgid "Your account is currently suspended."
 msgstr "Your account is currently suspended."
 
 #. service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1359
+#: ../libpurple/protocols/oscar/oscar.c:1361
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "The AOL Instant Messenger service is temporarily unavailable."
 
-#: ../libpurple/protocols/oscar/oscar.c:1364
-#: ../libpurple/protocols/oscar/oscar.c:1375
+#: ../libpurple/protocols/oscar/oscar.c:1366
+#: ../libpurple/protocols/oscar/oscar.c:1377
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
@@ -8343,44 +8416,44 @@
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
 
-#: ../libpurple/protocols/oscar/oscar.c:1369
+#: ../libpurple/protocols/oscar/oscar.c:1371
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "The client version you are using is too old. Please upgrade at %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1408
+#: ../libpurple/protocols/oscar/oscar.c:1410
 msgid "Could Not Connect"
 msgstr "Could Not Connect"
 
-#: ../libpurple/protocols/oscar/oscar.c:1412
+#: ../libpurple/protocols/oscar/oscar.c:1414
 msgid "Received authorization"
 msgstr "Received authorisation"
 
-#: ../libpurple/protocols/oscar/oscar.c:1434
+#: ../libpurple/protocols/oscar/oscar.c:1436
 msgid "The SecurID key entered is invalid."
 msgstr "The SecurID key entered is invalid."
 
-#: ../libpurple/protocols/oscar/oscar.c:1447
+#: ../libpurple/protocols/oscar/oscar.c:1449
 msgid "Enter SecurID"
 msgstr "Enter SecurID"
 
-#: ../libpurple/protocols/oscar/oscar.c:1448
+#: ../libpurple/protocols/oscar/oscar.c:1450
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Enter the 6 digit number from the digital display."
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
-#: ../libpurple/protocols/oscar/oscar.c:1450
-#: ../libpurple/protocols/oscar/oscar.c:2225
-#: ../libpurple/protocols/oscar/oscar.c:2274
-#: ../libpurple/protocols/oscar/oscar.c:5869
-#: ../libpurple/protocols/oscar/oscar.c:6150 ../libpurple/request.h:1387
+#: ../libpurple/protocols/oscar/oscar.c:1452
+#: ../libpurple/protocols/oscar/oscar.c:2232
+#: ../libpurple/protocols/oscar/oscar.c:2281
+#: ../libpurple/protocols/oscar/oscar.c:5885
+#: ../libpurple/protocols/oscar/oscar.c:6166 ../libpurple/request.h:1388
 msgid "_OK"
 msgstr "_OK"
 
-#: ../libpurple/protocols/oscar/oscar.c:1489
-#: ../libpurple/protocols/oscar/oscar.c:1532
+#: ../libpurple/protocols/oscar/oscar.c:1491
+#: ../libpurple/protocols/oscar/oscar.c:1534
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -8389,53 +8462,53 @@
 "You may be disconnected shortly.  You may want to use TOC until this is "
 "fixed.  Check %s for updates."
 
-#: ../libpurple/protocols/oscar/oscar.c:1492
-#: ../libpurple/protocols/oscar/oscar.c:1535
+#: ../libpurple/protocols/oscar/oscar.c:1494
+#: ../libpurple/protocols/oscar/oscar.c:1537
 msgid "Unable to get a valid AIM login hash."
 msgstr "Unable to get a valid AIM login hash."
 
-#: ../libpurple/protocols/oscar/oscar.c:1620
+#: ../libpurple/protocols/oscar/oscar.c:1622
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr "You may be disconnected shortly.  Check %s for updates."
 
-#: ../libpurple/protocols/oscar/oscar.c:1623
+#: ../libpurple/protocols/oscar/oscar.c:1625
 msgid "Unable to get a valid login hash."
 msgstr "Unable to get a valid login hash."
 
-#: ../libpurple/protocols/oscar/oscar.c:1652
+#: ../libpurple/protocols/oscar/oscar.c:1655
 msgid "Password sent"
 msgstr "Password sent"
 
-#: ../libpurple/protocols/oscar/oscar.c:1708
+#: ../libpurple/protocols/oscar/oscar.c:1711
 msgid "Unable to initialize connection"
 msgstr "Unable to initialise connection"
 
-#: ../libpurple/protocols/oscar/oscar.c:2195
+#: ../libpurple/protocols/oscar/oscar.c:2202
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Please authorise me so I can add you to my buddy list."
 
-#: ../libpurple/protocols/oscar/oscar.c:2223
+#: ../libpurple/protocols/oscar/oscar.c:2230
 msgid "Authorization Request Message:"
 msgstr "Authorisation Request Message:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2224
+#: ../libpurple/protocols/oscar/oscar.c:2231
 msgid "Please authorize me!"
 msgstr "Please authorise me!"
 
-#: ../libpurple/protocols/oscar/oscar.c:2265
-#: ../libpurple/protocols/oscar/oscar.c:2273
-#: ../libpurple/protocols/oscar/oscar.c:2400
-#: ../libpurple/protocols/oscar/oscar.c:5247
-#: ../libpurple/protocols/yahoo/yahoo.c:1027
+#: ../libpurple/protocols/oscar/oscar.c:2272
+#: ../libpurple/protocols/oscar/oscar.c:2280
+#: ../libpurple/protocols/oscar/oscar.c:2407
+#: ../libpurple/protocols/oscar/oscar.c:5263
+#: ../libpurple/protocols/yahoo/yahoo.c:1030
 msgid "No reason given."
 msgstr "No reason given."
 
-#: ../libpurple/protocols/oscar/oscar.c:2272
+#: ../libpurple/protocols/oscar/oscar.c:2279
 msgid "Authorization Denied Message:"
 msgstr "Authorisation Denied Message:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2400
+#: ../libpurple/protocols/oscar/oscar.c:2407
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -8446,17 +8519,17 @@
 "following reason:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2401
+#: ../libpurple/protocols/oscar/oscar.c:2408
 msgid "ICQ authorization denied."
 msgstr "ICQ authorisation denied."
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2408
+#: ../libpurple/protocols/oscar/oscar.c:2415
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "The user %u has granted your request to add them to your buddy list."
 
-#: ../libpurple/protocols/oscar/oscar.c:2416
+#: ../libpurple/protocols/oscar/oscar.c:2423
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -8469,7 +8542,7 @@
 "From: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2424
+#: ../libpurple/protocols/oscar/oscar.c:2431
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -8482,7 +8555,7 @@
 "From: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2432
+#: ../libpurple/protocols/oscar/oscar.c:2439
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -8495,38 +8568,38 @@
 "Message is:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2453
+#: ../libpurple/protocols/oscar/oscar.c:2460
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ user %u has sent you a buddy: %s (%s)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2459
+#: ../libpurple/protocols/oscar/oscar.c:2466
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Do you want to add this buddy to your buddy list?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2464 ../pidgin/gtkroomlist.c:308
+#: ../libpurple/protocols/oscar/oscar.c:2471 ../pidgin/gtkroomlist.c:309
 msgid "_Add"
 msgstr "_Add"
 
-#: ../libpurple/protocols/oscar/oscar.c:2465
+#: ../libpurple/protocols/oscar/oscar.c:2472
 msgid "_Decline"
 msgstr "_Decline"
 
-#: ../libpurple/protocols/oscar/oscar.c:2589
+#: ../libpurple/protocols/oscar/oscar.c:2596
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] "You missed %hu message from %s because it was invalid."
 msgstr[1] "You missed %hu messages from %s because they were invalid."
 
-#: ../libpurple/protocols/oscar/oscar.c:2598
+#: ../libpurple/protocols/oscar/oscar.c:2605
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
 msgstr[0] "You missed %hu message from %s because it was too large."
 msgstr[1] "You missed %hu messages from %s because they were too large."
 
-#: ../libpurple/protocols/oscar/oscar.c:2607
+#: ../libpurple/protocols/oscar/oscar.c:2614
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -8537,21 +8610,21 @@
 msgstr[1] ""
 "You missed %hu messages from %s because the rate limit has been exceeded."
 
-#: ../libpurple/protocols/oscar/oscar.c:2616
+#: ../libpurple/protocols/oscar/oscar.c:2623
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
 msgstr[0] "You missed %hu message from %s because he/she was too evil."
 msgstr[1] "You missed %hu messages from %s because he/she was too evil."
 
-#: ../libpurple/protocols/oscar/oscar.c:2625
+#: ../libpurple/protocols/oscar/oscar.c:2632
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
 msgstr[0] "You missed %hu message from %s because you are too evil."
 msgstr[1] "You missed %hu messages from %s because you are too evil."
 
-#: ../libpurple/protocols/oscar/oscar.c:2634
+#: ../libpurple/protocols/oscar/oscar.c:2641
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
@@ -8559,47 +8632,47 @@
 msgstr[1] "You missed %hu messages from %s for an unknown reason."
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2789
+#: ../libpurple/protocols/oscar/oscar.c:2796
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Unable to send message: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2789
-#: ../libpurple/protocols/oscar/oscar.c:2794
-#: ../libpurple/protocols/oscar/oscar.c:2858
+#: ../libpurple/protocols/oscar/oscar.c:2796
+#: ../libpurple/protocols/oscar/oscar.c:2801
+#: ../libpurple/protocols/oscar/oscar.c:2865
 msgid "Unknown reason."
 msgstr "Unknown reason."
 
-#: ../libpurple/protocols/oscar/oscar.c:2792
+#: ../libpurple/protocols/oscar/oscar.c:2799
 #: ../libpurple/protocols/sametime/sametime.c:2409
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Unable to send message to %s:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2858
+#: ../libpurple/protocols/oscar/oscar.c:2865
 #, c-format
 msgid "User information not available: %s"
 msgstr "User information not available: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2889
+#: ../libpurple/protocols/oscar/oscar.c:2896
 msgid "Online Since"
 msgstr "Online Since"
 
-#: ../libpurple/protocols/oscar/oscar.c:2894
+#: ../libpurple/protocols/oscar/oscar.c:2901
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1185
 msgid "Member Since"
 msgstr "Member Since"
 
-#: ../libpurple/protocols/oscar/oscar.c:2929
+#: ../libpurple/protocols/oscar/oscar.c:2936
 msgid "Available Message"
 msgstr "Available Message"
 
-#: ../libpurple/protocols/oscar/oscar.c:3037
+#: ../libpurple/protocols/oscar/oscar.c:3044
 msgid "Your AIM connection may be lost."
 msgstr "Your AIM connection may be lost."
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3225
+#: ../libpurple/protocols/oscar/oscar.c:3232
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -8607,7 +8680,7 @@
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 
-#: ../libpurple/protocols/oscar/oscar.c:3389
+#: ../libpurple/protocols/oscar/oscar.c:3396
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -8615,82 +8688,83 @@
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
 
-#: ../libpurple/protocols/oscar/oscar.c:3472
+#: ../libpurple/protocols/oscar/oscar.c:3479
 #: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "You have been disconnected from chat room %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:3722
+#: ../libpurple/protocols/oscar/oscar.c:3729
 #: ../libpurple/protocols/silc/util.c:585
 #: ../libpurple/protocols/silc10/util.c:581
 msgid "Mobile Phone"
 msgstr "Mobile Phone"
 
-#: ../libpurple/protocols/oscar/oscar.c:3752
+#: ../libpurple/protocols/oscar/oscar.c:3759
 msgid "Personal Web Page"
 msgstr "Personal Web Page"
 
-#: ../libpurple/protocols/oscar/oscar.c:3776
+#: ../libpurple/protocols/oscar/oscar.c:3783
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "Additional Information"
 
-#: ../libpurple/protocols/oscar/oscar.c:3784
-#: ../libpurple/protocols/oscar/oscar.c:3797
+#: ../libpurple/protocols/oscar/oscar.c:3791
+#: ../libpurple/protocols/oscar/oscar.c:3804
 msgid "Zip Code"
 msgstr "Postcode"
 
-#: ../libpurple/protocols/oscar/oscar.c:3808
+#: ../libpurple/protocols/oscar/oscar.c:3815
 msgid "Division"
 msgstr "Division"
 
-#: ../libpurple/protocols/oscar/oscar.c:3809
+#: ../libpurple/protocols/oscar/oscar.c:3816
 msgid "Position"
 msgstr "Position"
 
-#: ../libpurple/protocols/oscar/oscar.c:3811
+#: ../libpurple/protocols/oscar/oscar.c:3818
 msgid "Web Page"
 msgstr "Web Page"
 
-#: ../libpurple/protocols/oscar/oscar.c:3814
+#: ../libpurple/protocols/oscar/oscar.c:3821
 msgid "Work Information"
 msgstr "Work Information"
 
-#: ../libpurple/protocols/oscar/oscar.c:3870
+#: ../libpurple/protocols/oscar/oscar.c:3877
 msgid "Pop-Up Message"
 msgstr "Pop-Up Message"
 
-#: ../libpurple/protocols/oscar/oscar.c:3910
+#: ../libpurple/protocols/oscar/oscar.c:3917
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] "The following screen name is associated with %s"
 msgstr[1] "The following screen names are associated with %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3915
+#: ../libpurple/protocols/oscar/oscar.c:3922
 msgid "Screen name"
 msgstr "Screen name"
 
-#: ../libpurple/protocols/oscar/oscar.c:3941
+#: ../libpurple/protocols/oscar/oscar.c:3948
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "No results found for e-mail address %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3962
+#: ../libpurple/protocols/oscar/oscar.c:3969
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "You should receive an e-mail asking to confirm %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:3964
+#: ../libpurple/protocols/oscar/oscar.c:3971
 msgid "Account Confirmation Requested"
 msgstr "Account Confirmation Requested"
 
-#: ../libpurple/protocols/oscar/oscar.c:3995
+#: ../libpurple/protocols/oscar/oscar.c:4002
+#, c-format
 msgid "Error Changing Account Info"
 msgstr "Error Changing Account Info"
 
-#: ../libpurple/protocols/oscar/oscar.c:3998
+#: ../libpurple/protocols/oscar/oscar.c:4005
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8699,12 +8773,12 @@
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "differs from the original."
 
-#: ../libpurple/protocols/oscar/oscar.c:4001
+#: ../libpurple/protocols/oscar/oscar.c:4008
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr "Error 0x%04x: Unable to format screen name because it is invalid."
 
-#: ../libpurple/protocols/oscar/oscar.c:4004
+#: ../libpurple/protocols/oscar/oscar.c:4011
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8713,7 +8787,7 @@
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "is too long."
 
-#: ../libpurple/protocols/oscar/oscar.c:4007
+#: ../libpurple/protocols/oscar/oscar.c:4014
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
@@ -8722,7 +8796,7 @@
 "Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 
-#: ../libpurple/protocols/oscar/oscar.c:4010
+#: ../libpurple/protocols/oscar/oscar.c:4017
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -8731,7 +8805,7 @@
 "Error 0x%04x: Unable to change e-mail address because the given address has "
 "too many screen names associated with it."
 
-#: ../libpurple/protocols/oscar/oscar.c:4013
+#: ../libpurple/protocols/oscar/oscar.c:4020
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
@@ -8740,31 +8814,31 @@
 "Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 
-#: ../libpurple/protocols/oscar/oscar.c:4016
+#: ../libpurple/protocols/oscar/oscar.c:4023
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Error 0x%04x: Unknown error."
 
-#: ../libpurple/protocols/oscar/oscar.c:4026
+#: ../libpurple/protocols/oscar/oscar.c:4033
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "The e-mail address for %s is %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4028
+#: ../libpurple/protocols/oscar/oscar.c:4035
 msgid "Account Info"
 msgstr "Account Info"
 
-#: ../libpurple/protocols/oscar/oscar.c:4211
+#: ../libpurple/protocols/oscar/oscar.c:4218
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 
-#: ../libpurple/protocols/oscar/oscar.c:4482
+#: ../libpurple/protocols/oscar/oscar.c:4489
 msgid "Unable to set AIM profile."
 msgstr "Unable to set AIM profile."
 
-#: ../libpurple/protocols/oscar/oscar.c:4483
+#: ../libpurple/protocols/oscar/oscar.c:4490
 msgid ""
 "You have probably requested to set your profile before the login procedure "
 "completed.  Your profile remains unset; try setting it again when you are "
@@ -8774,7 +8848,7 @@
 "completed.  Your profile remains unset; try setting it again when you are "
 "fully connected."
 
-#: ../libpurple/protocols/oscar/oscar.c:4497
+#: ../libpurple/protocols/oscar/oscar.c:4504
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
@@ -8789,11 +8863,11 @@
 "The maximum profile length of %d bytes has been exceeded.  It has been "
 "truncated it for you."
 
-#: ../libpurple/protocols/oscar/oscar.c:4502
+#: ../libpurple/protocols/oscar/oscar.c:4509
 msgid "Profile too long."
 msgstr "Profile too long."
 
-#: ../libpurple/protocols/oscar/oscar.c:4547
+#: ../libpurple/protocols/oscar/oscar.c:4554
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -8808,11 +8882,11 @@
 "The maximum away message length of %d bytes has been exceeded.  It has been "
 "truncated for you."
 
-#: ../libpurple/protocols/oscar/oscar.c:4552
+#: ../libpurple/protocols/oscar/oscar.c:4559
 msgid "Away message too long."
 msgstr "Away message too long."
 
-#: ../libpurple/protocols/oscar/oscar.c:4621
+#: ../libpurple/protocols/oscar/oscar.c:4628
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -8823,17 +8897,17 @@
 "must be a valid email address, or start with a letter and contain only "
 "letters, numbers and spaces, or contain only numbers."
 
-#: ../libpurple/protocols/oscar/oscar.c:4623
-#: ../libpurple/protocols/oscar/oscar.c:5056
-#: ../libpurple/protocols/oscar/oscar.c:5071
+#: ../libpurple/protocols/oscar/oscar.c:4630
+#: ../libpurple/protocols/oscar/oscar.c:5060
+#: ../libpurple/protocols/oscar/oscar.c:5075
 msgid "Unable To Add"
 msgstr "Unable To Add"
 
-#: ../libpurple/protocols/oscar/oscar.c:4732
+#: ../libpurple/protocols/oscar/oscar.c:4739
 msgid "Unable To Retrieve Buddy List"
 msgstr "Unable To Retrieve Buddy List"
 
-#: ../libpurple/protocols/oscar/oscar.c:4733
+#: ../libpurple/protocols/oscar/oscar.c:4740
 msgid ""
 "The AIM servers were temporarily unable to send your buddy list.  Your buddy "
 "list is not lost, and will probably become available in a few hours."
@@ -8841,15 +8915,15 @@
 "The AIM servers were temporarily unable to send your buddy list.  Your buddy "
 "list is not lost, and will probably become available in a few hours."
 
-#: ../libpurple/protocols/oscar/oscar.c:4915
-#: ../libpurple/protocols/oscar/oscar.c:4917
-#: ../libpurple/protocols/oscar/oscar.c:5125
-#: ../libpurple/protocols/oscar/oscar.c:5126
-#: ../libpurple/protocols/oscar/oscar.c:5131
+#: ../libpurple/protocols/oscar/oscar.c:4922
+#: ../libpurple/protocols/oscar/oscar.c:4924
+#: ../libpurple/protocols/oscar/oscar.c:5140
+#: ../libpurple/protocols/oscar/oscar.c:5141
+#: ../libpurple/protocols/oscar/oscar.c:5146
 msgid "Orphans"
 msgstr "Orphans"
 
-#: ../libpurple/protocols/oscar/oscar.c:5054
+#: ../libpurple/protocols/oscar/oscar.c:5058
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -8858,17 +8932,17 @@
 "Could not add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 
-#: ../libpurple/protocols/oscar/oscar.c:5054
-#: ../libpurple/protocols/oscar/oscar.c:5069
+#: ../libpurple/protocols/oscar/oscar.c:5058
+#: ../libpurple/protocols/oscar/oscar.c:5073
 msgid "(no name)"
 msgstr "(no name)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5068
+#: ../libpurple/protocols/oscar/oscar.c:5072
 #, c-format
 msgid "Could not add the buddy %s for an unknown reason."
 msgstr "Could not add the buddy %s for an unknown reason."
 
-#: ../libpurple/protocols/oscar/oscar.c:5162
+#: ../libpurple/protocols/oscar/oscar.c:5178
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -8877,22 +8951,22 @@
 "The user %s has given you permission to add you to their buddy list.  Do you "
 "want to add them?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5170
+#: ../libpurple/protocols/oscar/oscar.c:5186
 msgid "Authorization Given"
 msgstr "Authorisation Given"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5243
+#: ../libpurple/protocols/oscar/oscar.c:5259
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "The user %s has granted your request to add them to your buddy list."
 
-#: ../libpurple/protocols/oscar/oscar.c:5244
+#: ../libpurple/protocols/oscar/oscar.c:5260
 msgid "Authorization Granted"
 msgstr "Authorisation Granted"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5247
+#: ../libpurple/protocols/oscar/oscar.c:5263
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -8903,51 +8977,51 @@
 "following reason:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5248
+#: ../libpurple/protocols/oscar/oscar.c:5264
 msgid "Authorization Denied"
 msgstr "Authorisation Denied"
 
-#: ../libpurple/protocols/oscar/oscar.c:5284
+#: ../libpurple/protocols/oscar/oscar.c:5300
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "_Exchange:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5324
+#: ../libpurple/protocols/oscar/oscar.c:5340
 msgid "Invalid chat name specified."
 msgstr "Invalid chat name specified."
 
-#: ../libpurple/protocols/oscar/oscar.c:5393
+#: ../libpurple/protocols/oscar/oscar.c:5409
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 
-#: ../libpurple/protocols/oscar/oscar.c:5553
-#: ../libpurple/protocols/oscar/oscar.c:5558
+#: ../libpurple/protocols/oscar/oscar.c:5569
+#: ../libpurple/protocols/oscar/oscar.c:5574
 msgid "Away Message"
 msgstr "Away Message"
 
-#: ../libpurple/protocols/oscar/oscar.c:5558
+#: ../libpurple/protocols/oscar/oscar.c:5574
 msgid "<i>(retrieving)</i>"
 msgstr " <i>(retrieving)</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:5758
+#: ../libpurple/protocols/oscar/oscar.c:5774
 msgid "iTunes Music Store Link"
 msgstr "iTunes Music Store Link"
 
-#: ../libpurple/protocols/oscar/oscar.c:5866
+#: ../libpurple/protocols/oscar/oscar.c:5882
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Buddy Comment for %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5867
+#: ../libpurple/protocols/oscar/oscar.c:5883
 msgid "Buddy Comment:"
 msgstr "Buddy Comment:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5914
+#: ../libpurple/protocols/oscar/oscar.c:5930
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "You have selected to open a Direct IM connection with %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:5918
+#: ../libpurple/protocols/oscar/oscar.c:5934
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
@@ -8955,64 +9029,64 @@
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5924
+#: ../libpurple/protocols/oscar/oscar.c:5940
 #: ../libpurple/protocols/oscar/peer.c:1045
 msgid "C_onnect"
 msgstr "C_onnect"
 
-#: ../libpurple/protocols/oscar/oscar.c:5959
+#: ../libpurple/protocols/oscar/oscar.c:5975
 msgid "Get AIM Info"
 msgstr "Get AIM Info"
 
-#: ../libpurple/protocols/oscar/oscar.c:5965
+#: ../libpurple/protocols/oscar/oscar.c:5981
 msgid "Edit Buddy Comment"
 msgstr "Edit Buddy Comment"
 
-#: ../libpurple/protocols/oscar/oscar.c:5973
+#: ../libpurple/protocols/oscar/oscar.c:5989
 msgid "Get Status Msg"
 msgstr "Get Status Msg"
 
-#: ../libpurple/protocols/oscar/oscar.c:5986
+#: ../libpurple/protocols/oscar/oscar.c:6002
 msgid "Direct IM"
 msgstr "Direct IM"
 
-#: ../libpurple/protocols/oscar/oscar.c:6008
+#: ../libpurple/protocols/oscar/oscar.c:6024
 msgid "Re-request Authorization"
 msgstr "Re-request Authorisation"
 
-#: ../libpurple/protocols/oscar/oscar.c:6067
+#: ../libpurple/protocols/oscar/oscar.c:6083
 msgid "Require authorization"
 msgstr "Require authorisation"
 
-#: ../libpurple/protocols/oscar/oscar.c:6070
+#: ../libpurple/protocols/oscar/oscar.c:6086
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "Web aware (enabling this will cause you to receive spam!)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6075
+#: ../libpurple/protocols/oscar/oscar.c:6091
 msgid "ICQ Privacy Options"
 msgstr "ICQ Privacy Options"
 
-#: ../libpurple/protocols/oscar/oscar.c:6094
+#: ../libpurple/protocols/oscar/oscar.c:6110
 msgid "The new formatting is invalid."
 msgstr "The new formatting is invalid."
 
-#: ../libpurple/protocols/oscar/oscar.c:6095
+#: ../libpurple/protocols/oscar/oscar.c:6111
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "Screen name formatting can change only capitalisation and whitespace."
 
-#: ../libpurple/protocols/oscar/oscar.c:6148
+#: ../libpurple/protocols/oscar/oscar.c:6164
 msgid "Change Address To:"
 msgstr "Change Address To:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6194
+#: ../libpurple/protocols/oscar/oscar.c:6210
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>you are not waiting for authorisation</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6197
+#: ../libpurple/protocols/oscar/oscar.c:6213
 msgid "You are awaiting authorization from the following buddies"
 msgstr "You are awaiting authorisation from the following buddies"
 
-#: ../libpurple/protocols/oscar/oscar.c:6198
+#: ../libpurple/protocols/oscar/oscar.c:6214
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -9020,73 +9094,73 @@
 "You can re-request authorisation from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorisation.\""
 
-#: ../libpurple/protocols/oscar/oscar.c:6215
+#: ../libpurple/protocols/oscar/oscar.c:6231
 msgid "Find Buddy by E-Mail"
 msgstr "Find Buddy by E-Mail"
 
-#: ../libpurple/protocols/oscar/oscar.c:6216
+#: ../libpurple/protocols/oscar/oscar.c:6232
 msgid "Search for a buddy by e-mail address"
 msgstr "Search for a buddy by e-mail address"
 
-#: ../libpurple/protocols/oscar/oscar.c:6217
+#: ../libpurple/protocols/oscar/oscar.c:6233
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Type the e-mail address of the buddy you are searching for."
 
-#: ../libpurple/protocols/oscar/oscar.c:6220
+#: ../libpurple/protocols/oscar/oscar.c:6236
 msgid "_Search"
 msgstr "_Search"
 
-#: ../libpurple/protocols/oscar/oscar.c:6378
+#: ../libpurple/protocols/oscar/oscar.c:6394
 msgid "Set User Info (URL)..."
 msgstr "Set User Info (URL)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6389
+#: ../libpurple/protocols/oscar/oscar.c:6405
 msgid "Change Password (URL)"
 msgstr "Change Password (URL)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6393
+#: ../libpurple/protocols/oscar/oscar.c:6409
 msgid "Configure IM Forwarding (URL)"
 msgstr "Configure IM Forwarding (URL)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6403
+#: ../libpurple/protocols/oscar/oscar.c:6419
 msgid "Set Privacy Options..."
 msgstr "Show Privacy Options..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6410
+#: ../libpurple/protocols/oscar/oscar.c:6426
 msgid "Confirm Account"
 msgstr "Confirm Account"
 
-#: ../libpurple/protocols/oscar/oscar.c:6414
+#: ../libpurple/protocols/oscar/oscar.c:6430
 msgid "Display Currently Registered E-Mail Address"
 msgstr "Display Currently Registered E-mail Address"
 
-#: ../libpurple/protocols/oscar/oscar.c:6418
+#: ../libpurple/protocols/oscar/oscar.c:6434
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "Change Currently Registered E-mail Address"
 
-#: ../libpurple/protocols/oscar/oscar.c:6425
+#: ../libpurple/protocols/oscar/oscar.c:6441
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Show Buddies Awaiting Authorisation"
 
-#: ../libpurple/protocols/oscar/oscar.c:6431
+#: ../libpurple/protocols/oscar/oscar.c:6447
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "Search for Buddy by E-mail Address..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6436
+#: ../libpurple/protocols/oscar/oscar.c:6452
 msgid "Search for Buddy by Information"
 msgstr "Search for Buddy by Information"
 
-#: ../libpurple/protocols/oscar/oscar.c:6504
+#: ../libpurple/protocols/oscar/oscar.c:6520
 msgid "Use recent buddies group"
 msgstr "Use recent buddies group"
 
-#: ../libpurple/protocols/oscar/oscar.c:6507
+#: ../libpurple/protocols/oscar/oscar.c:6523
 msgid "Show how long you have been idle"
 msgstr "Show how long you have been idle"
 
-#: ../libpurple/protocols/oscar/oscar.c:6662
+#: ../libpurple/protocols/oscar/oscar.c:6678
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -9105,6 +9179,7 @@
 msgstr "Attempting to connect to %s:%hu."
 
 #: ../libpurple/protocols/oscar/peer.c:856
+#, c-format
 msgid "Attempting to connect via proxy server."
 msgstr "Attempting to connect via proxy server."
 
@@ -9946,7 +10021,7 @@
 msgid "Send TEST Announcement"
 msgstr "Send TEST Announcement"
 
-#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4338
+#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4354
 msgid "Topic:"
 msgstr "Topic:"
 
@@ -9971,7 +10046,7 @@
 msgid "No Sametime Community Server Specified"
 msgstr "No Sametime Community Server Specified"
 
-#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4038
+#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4041
 msgid "Connect"
 msgstr "Connect"
 
@@ -10149,7 +10224,7 @@
 "may add these users to your buddy list or send them messages with the action "
 "buttons below."
 
-#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:724
+#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:756
 msgid "Search Results"
 msgstr "Search Results"
 
@@ -10725,6 +10800,7 @@
 
 #: ../libpurple/protocols/silc/chat.c:153
 #: ../libpurple/protocols/silc10/chat.c:152
+#, c-format
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>Channel Modes:</b> "
 
@@ -10763,6 +10839,7 @@
 
 #: ../libpurple/protocols/silc/chat.c:435
 #: ../libpurple/protocols/silc10/chat.c:413
+#, c-format
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -11382,6 +11459,7 @@
 msgstr "Connecting to SILC Server"
 
 #: ../libpurple/protocols/silc/silc.c:352
+#, c-format
 msgid "Could not load SILC key pair"
 msgstr "Could not load SILC key pair"
 
@@ -11410,7 +11488,8 @@
 msgstr "Your Current Mood"
 
 #: ../libpurple/protocols/silc/silc.c:741
-#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1640
+#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1641
+#, c-format
 msgid "Normal"
 msgstr "Normal"
 
@@ -11801,7 +11880,7 @@
 msgstr "Secure Internet Live Conferencing (SILC) Protocol"
 
 #: ../libpurple/protocols/silc/silc.c:1910
-#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2035
+#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2036
 msgid "Network"
 msgstr "Network"
 
@@ -11999,42 +12078,52 @@
 msgstr "No server statistics available"
 
 #: ../libpurple/protocols/silc10/ops.c:1931
+#, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Failure: Version mismatch, upgrade your client"
 
 #: ../libpurple/protocols/silc10/ops.c:1934
+#, c-format
 msgid "Failure: Remote does not trust/support your public key"
 msgstr "Failure: Remote does not trust/support your public key"
 
 #: ../libpurple/protocols/silc10/ops.c:1937
+#, c-format
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "Failure: Remote does not support proposed KE group"
 
 #: ../libpurple/protocols/silc10/ops.c:1940
+#, c-format
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "Failure: Remote does not support proposed cipher"
 
 #: ../libpurple/protocols/silc10/ops.c:1943
+#, c-format
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "Failure: Remote does not support proposed PKCS"
 
 #: ../libpurple/protocols/silc10/ops.c:1946
+#, c-format
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "Failure: Remote does not support proposed hash function"
 
 #: ../libpurple/protocols/silc10/ops.c:1949
+#, c-format
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "Failure: Remote does not support proposed HMAC"
 
 #: ../libpurple/protocols/silc10/ops.c:1951
+#, c-format
 msgid "Failure: Incorrect signature"
 msgstr "Failure: Incorrect signature"
 
 #: ../libpurple/protocols/silc10/ops.c:1953
+#, c-format
 msgid "Failure: Invalid cookie"
 msgstr "Failure: Invalid cookie"
 
 #: ../libpurple/protocols/silc10/ops.c:1964
+#, c-format
 msgid "Failure: Authentication failed"
 msgstr "Failure: Authentication failed"
 
@@ -12061,26 +12150,31 @@
 msgstr "Could not write"
 
 #: ../libpurple/protocols/simple/simple.c:438
-#: ../libpurple/protocols/simple/simple.c:1490
+#: ../libpurple/protocols/simple/simple.c:1529
 msgid "Could not connect"
 msgstr "Could not connect"
 
-#: ../libpurple/protocols/simple/simple.c:1524
-#: ../libpurple/protocols/simple/simple.c:1566
-#: ../libpurple/protocols/simple/simple.c:1579
-#: ../libpurple/protocols/simple/simple.c:1630
+#: ../libpurple/protocols/simple/simple.c:1059
+#, fuzzy
+msgid "Unknown server response."
+msgstr "Unknown reason."
+
+#: ../libpurple/protocols/simple/simple.c:1563
+#: ../libpurple/protocols/simple/simple.c:1605
+#: ../libpurple/protocols/simple/simple.c:1618
+#: ../libpurple/protocols/simple/simple.c:1669
 msgid "Could not create listen socket"
 msgstr "Could not create listen socket"
 
-#: ../libpurple/protocols/simple/simple.c:1547
+#: ../libpurple/protocols/simple/simple.c:1586
 msgid "Couldn't resolve host"
 msgstr "Couldn't resolve host"
 
-#: ../libpurple/protocols/simple/simple.c:1638
+#: ../libpurple/protocols/simple/simple.c:1677
 msgid "Could not resolve hostname"
 msgstr "Could not resolve hostname"
 
-#: ../libpurple/protocols/simple/simple.c:1655
+#: ../libpurple/protocols/simple/simple.c:1694
 msgid "SIP screen names may not contain whitespaces or @ symbols"
 msgstr "SIP screen names may not contain whitespaces or @ symbols"
 
@@ -12092,36 +12186,36 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:1830
+#: ../libpurple/protocols/simple/simple.c:1870
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE Protocol Plug-in"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:1831
+#: ../libpurple/protocols/simple/simple.c:1871
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "The SIP/SIMPLE Protocol Plug-in"
 
-#: ../libpurple/protocols/simple/simple.c:1859
+#: ../libpurple/protocols/simple/simple.c:1899
 msgid "Publish status (note: everyone may watch you)"
 msgstr "Publish status (note: anyone can watch you)"
 
-#: ../libpurple/protocols/simple/simple.c:1865
+#: ../libpurple/protocols/simple/simple.c:1905
 msgid "Use UDP"
 msgstr "Use UDP"
 
-#: ../libpurple/protocols/simple/simple.c:1867
+#: ../libpurple/protocols/simple/simple.c:1907
 msgid "Use proxy"
 msgstr "Use proxy"
 
-#: ../libpurple/protocols/simple/simple.c:1869
+#: ../libpurple/protocols/simple/simple.c:1909
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../libpurple/protocols/simple/simple.c:1871
+#: ../libpurple/protocols/simple/simple.c:1911
 msgid "Auth User"
 msgstr "Auth User"
 
-#: ../libpurple/protocols/simple/simple.c:1873
+#: ../libpurple/protocols/simple/simple.c:1913
 msgid "Auth Domain"
 msgstr "Auth Domain"
 
@@ -12166,6 +12260,7 @@
 msgstr "Warning of %s not allowed."
 
 #: ../libpurple/protocols/toc/toc.c:503
+#, c-format
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "A message has been dropped, you are exceeding the server speed limit."
 
@@ -12190,38 +12285,47 @@
 msgstr "You missed an IM from %s because it was sent too fast."
 
 #: ../libpurple/protocols/toc/toc.c:518
+#, c-format
 msgid "Failure."
 msgstr "Failure."
 
 #: ../libpurple/protocols/toc/toc.c:521
+#, c-format
 msgid "Too many matches."
 msgstr "Too many matches."
 
 #: ../libpurple/protocols/toc/toc.c:524
+#, c-format
 msgid "Need more qualifiers."
 msgstr "Need more qualifiers."
 
 #: ../libpurple/protocols/toc/toc.c:527
+#, c-format
 msgid "Dir service temporarily unavailable."
 msgstr "Dir service temporarily unavailable."
 
 #: ../libpurple/protocols/toc/toc.c:530
+#, c-format
 msgid "E-mail lookup restricted."
 msgstr "E-mail lookup restricted."
 
 #: ../libpurple/protocols/toc/toc.c:533
+#, c-format
 msgid "Keyword ignored."
 msgstr "Keyword ignored."
 
 #: ../libpurple/protocols/toc/toc.c:536
+#, c-format
 msgid "No keywords."
 msgstr "No keywords."
 
 #: ../libpurple/protocols/toc/toc.c:539
+#, c-format
 msgid "User has no directory information."
 msgstr "User has no directory information."
 
 #: ../libpurple/protocols/toc/toc.c:543
+#, c-format
 msgid "Country not supported."
 msgstr "Country not supported."
 
@@ -12231,18 +12335,22 @@
 msgstr "Failure unknown: %s."
 
 #: ../libpurple/protocols/toc/toc.c:549
+#, c-format
 msgid "Incorrect screen name or password."
 msgstr "Incorrect screen name or password."
 
 #: ../libpurple/protocols/toc/toc.c:552
+#, c-format
 msgid "The service is temporarily unavailable."
 msgstr "The service is temporarily unavailable."
 
 #: ../libpurple/protocols/toc/toc.c:555
+#, c-format
 msgid "Your warning level is currently too high to log in."
 msgstr "Your warning level is currently too high to log in."
 
 #: ../libpurple/protocols/toc/toc.c:558
+#, c-format
 msgid ""
 "You have been connecting and disconnecting too frequently.  Wait ten minutes "
 "and try again.  If you continue to try, you will need to wait even longer."
@@ -12280,8 +12388,8 @@
 msgid "Password Change Successful"
 msgstr "Password Change Successful"
 
-#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5576
-#: ../pidgin/gtkblist.c:5929
+#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5582
+#: ../pidgin/gtkblist.c:5932
 msgid "_Group:"
 msgstr "_Group:"
 
@@ -12350,16 +12458,16 @@
 msgid "Your Yahoo! message did not get sent."
 msgstr "Your Yahoo! message did not get sent."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:957
+#: ../libpurple/protocols/yahoo/yahoo.c:960
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Yahoo! system message for %s:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1026
+#: ../libpurple/protocols/yahoo/yahoo.c:1029
 msgid "Authorization denied message:"
 msgstr "Authorisation denied message:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1044
+#: ../libpurple/protocols/yahoo/yahoo.c:1047
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -12368,16 +12476,16 @@
 "%s has (retroactively) denied your request to add them to your list for the "
 "following reason: %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1047
+#: ../libpurple/protocols/yahoo/yahoo.c:1050
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr "%s has (retroactively) denied your request to add them to your list."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1049
+#: ../libpurple/protocols/yahoo/yahoo.c:1052
 msgid "Add buddy rejected"
 msgstr "Add buddy rejected"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1991
+#: ../libpurple/protocols/yahoo/yahoo.c:1994
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -12388,11 +12496,11 @@
 "method.  You will probably not be able to successfully sign on to Yahoo.  "
 "Check %s for updates."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1994
+#: ../libpurple/protocols/yahoo/yahoo.c:1997
 msgid "Failed Yahoo! Authentication"
 msgstr "Failed Yahoo! Authentication"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2060
+#: ../libpurple/protocols/yahoo/yahoo.c:2063
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -12401,48 +12509,48 @@
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
 "\"Yes\" will remove and ignore the buddy."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2063
+#: ../libpurple/protocols/yahoo/yahoo.c:2066
 msgid "Ignore buddy?"
 msgstr "Ignore buddy?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2126
+#: ../libpurple/protocols/yahoo/yahoo.c:2129
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "Your account is locked, please log in to the Yahoo! website."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2129
+#: ../libpurple/protocols/yahoo/yahoo.c:2132
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "Unknown error number %d. Logging into the Yahoo! website may fix this."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2183
+#: ../libpurple/protocols/yahoo/yahoo.c:2186
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr "Could not add buddy %s to group %s to the server list on account %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2186
+#: ../libpurple/protocols/yahoo/yahoo.c:2189
 msgid "Could not add buddy to server list"
 msgstr "Could not add buddy to server list"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2305
+#: ../libpurple/protocols/yahoo/yahoo.c:2308
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Audible %s/%s/%s.swf ] %s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2648
+#: ../libpurple/protocols/yahoo/yahoo.c:2651
 msgid "Received unexpected HTTP response from server."
 msgstr "Received unexpected HTTP response from server."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2672
-#: ../libpurple/protocols/yahoo/yahoo.c:2858
-#: ../libpurple/protocols/yahoo/yahoo.c:2961
-#: ../libpurple/protocols/yahoo/yahoo.c:2971
+#: ../libpurple/protocols/yahoo/yahoo.c:2675
+#: ../libpurple/protocols/yahoo/yahoo.c:2861
+#: ../libpurple/protocols/yahoo/yahoo.c:2964
+#: ../libpurple/protocols/yahoo/yahoo.c:2974
 #: ../libpurple/protocols/yahoo/yahoochat.c:1514
 #: ../libpurple/protocols/yahoo/yahoochat.c:1584
 #: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "Connection problem"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2698
+#: ../libpurple/protocols/yahoo/yahoo.c:2701
 #, c-format
 msgid ""
 "Lost connection with %s:\n"
@@ -12451,7 +12559,7 @@
 "Lost connection with %s:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2723
+#: ../libpurple/protocols/yahoo/yahoo.c:2726
 #, c-format
 msgid ""
 "Could not establish a connection with %s:\n"
@@ -12460,112 +12568,112 @@
 "Could not establish a connection with %s:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3078
-#: ../libpurple/protocols/yahoo/yahoo.c:3764
+#: ../libpurple/protocols/yahoo/yahoo.c:3081
+#: ../libpurple/protocols/yahoo/yahoo.c:3767
 msgid "Not at Home"
 msgstr "Not at Home"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3080
-#: ../libpurple/protocols/yahoo/yahoo.c:3767
+#: ../libpurple/protocols/yahoo/yahoo.c:3083
+#: ../libpurple/protocols/yahoo/yahoo.c:3770
 msgid "Not at Desk"
 msgstr "Not at Desk"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3082
-#: ../libpurple/protocols/yahoo/yahoo.c:3770
+#: ../libpurple/protocols/yahoo/yahoo.c:3085
+#: ../libpurple/protocols/yahoo/yahoo.c:3773
 msgid "Not in Office"
 msgstr "Not in Office"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3086
-#: ../libpurple/protocols/yahoo/yahoo.c:3776
+#: ../libpurple/protocols/yahoo/yahoo.c:3089
+#: ../libpurple/protocols/yahoo/yahoo.c:3779
 msgid "On Vacation"
 msgstr "On Vacation"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3090
-#: ../libpurple/protocols/yahoo/yahoo.c:3782
+#: ../libpurple/protocols/yahoo/yahoo.c:3093
+#: ../libpurple/protocols/yahoo/yahoo.c:3785
 msgid "Stepped Out"
 msgstr "Stepped Out"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3183
-#: ../libpurple/protocols/yahoo/yahoo.c:3213
+#: ../libpurple/protocols/yahoo/yahoo.c:3186
+#: ../libpurple/protocols/yahoo/yahoo.c:3216
 msgid "Not on server list"
 msgstr "Not on server list"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3230
-#: ../libpurple/protocols/yahoo/yahoo.c:3288
+#: ../libpurple/protocols/yahoo/yahoo.c:3233
+#: ../libpurple/protocols/yahoo/yahoo.c:3291
 msgid "Appear Online"
 msgstr "Appear Online"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3233
-#: ../libpurple/protocols/yahoo/yahoo.c:3309
+#: ../libpurple/protocols/yahoo/yahoo.c:3236
+#: ../libpurple/protocols/yahoo/yahoo.c:3312
 msgid "Appear Permanently Offline"
 msgstr "Appear Permanently Offline"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3251
+#: ../libpurple/protocols/yahoo/yahoo.c:3254
 msgid "Presence"
 msgstr "Presence"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3294
+#: ../libpurple/protocols/yahoo/yahoo.c:3297
 msgid "Appear Offline"
 msgstr "Appear Offline"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3303
+#: ../libpurple/protocols/yahoo/yahoo.c:3306
 msgid "Don't Appear Permanently Offline"
 msgstr "Don't Appear Permanently Offline"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3351
+#: ../libpurple/protocols/yahoo/yahoo.c:3354
 msgid "Join in Chat"
 msgstr "Join in Chat"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3357
+#: ../libpurple/protocols/yahoo/yahoo.c:3360
 msgid "Initiate Conference"
 msgstr "Initiate Conference"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3385
+#: ../libpurple/protocols/yahoo/yahoo.c:3388
 msgid "Presence Settings"
 msgstr "Presence Settings"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3391
+#: ../libpurple/protocols/yahoo/yahoo.c:3394
 msgid "Start Doodling"
 msgstr "Start Doodling"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3492
+#: ../libpurple/protocols/yahoo/yahoo.c:3495
 msgid "Activate which ID?"
 msgstr "Activate which ID?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3503
+#: ../libpurple/protocols/yahoo/yahoo.c:3506
 msgid "Join whom in chat?"
 msgstr "Join whom in chat?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3515
+#: ../libpurple/protocols/yahoo/yahoo.c:3518
 msgid "Activate ID..."
 msgstr "Activate ID..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3519
+#: ../libpurple/protocols/yahoo/yahoo.c:3522
 msgid "Join User in Chat..."
 msgstr "Join User in Chat..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3524
+#: ../libpurple/protocols/yahoo/yahoo.c:3527
 msgid "Open Inbox"
 msgstr "Open Inbox"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4116
+#: ../libpurple/protocols/yahoo/yahoo.c:4119
 msgid "Buzz"
 msgstr "Buzz"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4118
+#: ../libpurple/protocols/yahoo/yahoo.c:4121
 #, c-format
 msgid "Buzzing %s..."
 msgstr "Buzzing %s..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4133
+#: ../libpurple/protocols/yahoo/yahoo.c:4136
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4138
+#: ../libpurple/protocols/yahoo/yahoo.c:4141
 msgid "list: List rooms on the Yahoo network"
 msgstr "list:  List rooms on the Yahoo network"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4146
+#: ../libpurple/protocols/yahoo/yahoo.c:4149
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: Request user to start a Doodle session"
 
@@ -12579,56 +12687,56 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4355
-#: ../libpurple/protocols/yahoo/yahoo.c:4357
+#: ../libpurple/protocols/yahoo/yahoo.c:4358
+#: ../libpurple/protocols/yahoo/yahoo.c:4360
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo Protocol Plug-in"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4380
-msgid "Yahoo Japan"
-msgstr "Yahoo Japan"
-
 #: ../libpurple/protocols/yahoo/yahoo.c:4383
+msgid "Yahoo Japan"
+msgstr "Yahoo Japan"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4386
 msgid "Pager server"
 msgstr "Pager server"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4386
+#: ../libpurple/protocols/yahoo/yahoo.c:4389
 msgid "Japan Pager server"
 msgstr "Japan Pager server"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4389
+#: ../libpurple/protocols/yahoo/yahoo.c:4392
 msgid "Pager port"
 msgstr "Pager port"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4392
+#: ../libpurple/protocols/yahoo/yahoo.c:4395
 msgid "File transfer server"
 msgstr "File transfer server"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4395
+#: ../libpurple/protocols/yahoo/yahoo.c:4398
 msgid "Japan file transfer server"
 msgstr "Japan file transfer server"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4398
+#: ../libpurple/protocols/yahoo/yahoo.c:4401
 msgid "File transfer port"
 msgstr "File transfer port"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4401
-msgid "Chat room locale"
-msgstr "Chat room locale"
-
 #: ../libpurple/protocols/yahoo/yahoo.c:4404
+msgid "Chat room locale"
+msgstr "Chat room locale"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4407
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignore conference and chatroom invitations"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4412
+#: ../libpurple/protocols/yahoo/yahoo.c:4415
 msgid "Chat room list URL"
 msgstr "Chat room list URL"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4415
+#: ../libpurple/protocols/yahoo/yahoo.c:4418
 msgid "Yahoo Chat server"
 msgstr "Yahoo Chat server"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4418
+#: ../libpurple/protocols/yahoo/yahoo.c:4421
 msgid "Yahoo Chat port"
 msgstr "Yahoo Chat port"
 
@@ -12641,7 +12749,7 @@
 
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:270
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:279
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:292
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:288
 msgid "Unable to establish file descriptor."
 msgstr "Unable to establish file descriptor."
 
@@ -12987,8 +13095,8 @@
 msgid "Exposure"
 msgstr "Exposure"
 
-#: ../libpurple/proxy.c:458 ../libpurple/proxy.c:877 ../libpurple/proxy.c:1032
-#: ../libpurple/proxy.c:1600
+#: ../libpurple/proxy.c:459 ../libpurple/proxy.c:894 ../libpurple/proxy.c:1049
+#: ../libpurple/proxy.c:1617
 #, c-format
 msgid ""
 "Unable to create socket:\n"
@@ -12997,76 +13105,76 @@
 "Unable to create socket:\n"
 "%s"
 
-#: ../libpurple/proxy.c:658
+#: ../libpurple/proxy.c:659
 #, c-format
 msgid "Unable to parse response from HTTP proxy: %s\n"
 msgstr "Unable to parse response from HTTP proxy: %s\n"
 
-#: ../libpurple/proxy.c:686 ../libpurple/proxy.c:732 ../libpurple/proxy.c:770
-#: ../libpurple/proxy.c:782
+#: ../libpurple/proxy.c:698 ../libpurple/proxy.c:744 ../libpurple/proxy.c:780
+#: ../libpurple/proxy.c:792
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "HTTP proxy connection error %d"
 
-#: ../libpurple/proxy.c:778
+#: ../libpurple/proxy.c:788
 #, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling."
 msgstr "Access denied: HTTP proxy server forbids port %d tunnelling."
 
-#: ../libpurple/proxy.c:995
+#: ../libpurple/proxy.c:1012
 #, c-format
 msgid "Error resolving %s"
 msgstr "Error resolving %s"
 
-#: ../libpurple/proxy.c:1697
+#: ../libpurple/proxy.c:1714
 msgid "Could not resolve host name"
 msgstr "Could not resolve host name"
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
 #.
-#: ../libpurple/request.h:1377
+#: ../libpurple/request.h:1378
 msgid "_Yes"
 msgstr "_Yes"
 
-#: ../libpurple/request.h:1377
+#: ../libpurple/request.h:1378
 msgid "_No"
 msgstr "_No"
 
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
-#: ../libpurple/request.h:1397
+#: ../libpurple/request.h:1398
 msgid "_Accept"
 msgstr "_Accept"
 
 #. *
 #. * The default message to use when the user becomes auto-away.
 #.
-#: ../libpurple/savedstatuses.c:47
+#: ../libpurple/savedstatuses.c:48
 msgid "I'm not here right now"
 msgstr "I'm not here right now"
 
-#: ../libpurple/savedstatuses.c:534
+#: ../libpurple/savedstatuses.c:535
 msgid "saved statuses"
 msgstr "saved statuses"
 
-#: ../libpurple/server.c:233
+#: ../libpurple/server.c:234
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s is now known as %s.\n"
 
-#: ../libpurple/server.c:301
+#: ../libpurple/server.c:302
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "Requesting %s's attention..."
 
-#: ../libpurple/server.c:346
+#: ../libpurple/server.c:347
 #, c-format
 msgid "%s has requested your attention!"
 msgstr "%s has requested your attention!"
 
-#: ../libpurple/server.c:795
+#: ../libpurple/server.c:796
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -13075,93 +13183,93 @@
 "%s has invited %s to the chat room %s:\n"
 "%s"
 
-#: ../libpurple/server.c:800
+#: ../libpurple/server.c:801
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s has invited %s to the chat room %s\n"
 
-#: ../libpurple/server.c:804
+#: ../libpurple/server.c:805
 msgid "Accept chat invitation?"
 msgstr "Accept chat invitation?"
 
-#: ../libpurple/sslconn.c:163
+#: ../libpurple/sslconn.c:164
 msgid "SSL Connection Failed"
 msgstr "SSL Connection Failed"
 
-#: ../libpurple/sslconn.c:165
+#: ../libpurple/sslconn.c:166
 msgid "SSL Handshake Failed"
 msgstr "SSL Handshake Failed"
 
-#: ../libpurple/sslconn.c:167
+#: ../libpurple/sslconn.c:168
 msgid "SSL peer presented an invalid certificate"
 msgstr "SSL peer presented an invalid certificate"
 
-#: ../libpurple/sslconn.c:170
+#: ../libpurple/sslconn.c:171
 msgid "Unknown SSL error"
 msgstr "Unknown SSL error"
 
-#: ../libpurple/status.c:152
+#: ../libpurple/status.c:153
 msgid "Unset"
 msgstr "Unset"
 
-#: ../libpurple/status.c:155 ../pidgin/gtkstatusbox.c:1058
+#: ../libpurple/status.c:156 ../pidgin/gtkstatusbox.c:1059
 msgid "Do not disturb"
 msgstr "Do not disturb"
 
-#: ../libpurple/status.c:158
+#: ../libpurple/status.c:159
 msgid "Extended away"
 msgstr "Extended away"
 
-#: ../libpurple/status.c:159
+#: ../libpurple/status.c:160
 msgid "Mobile"
 msgstr "Mobile"
 
-#: ../libpurple/status.c:608
+#: ../libpurple/status.c:609
 #, c-format
 msgid "%s changed status from %s to %s"
 msgstr "%s changed status from %s to %s"
 
-#: ../libpurple/status.c:618
+#: ../libpurple/status.c:619
 #, c-format
 msgid "%s is now %s"
 msgstr "%s is now %s"
 
-#: ../libpurple/status.c:623
+#: ../libpurple/status.c:624
 #, c-format
 msgid "%s is no longer %s"
 msgstr "%s is no longer %s"
 
-#: ../libpurple/status.c:1233
+#: ../libpurple/status.c:1234
 #, c-format
 msgid "%s became idle"
 msgstr "%s became idle"
 
-#: ../libpurple/status.c:1250
+#: ../libpurple/status.c:1251
 #, c-format
 msgid "%s became unidle"
 msgstr "%s is no longer idle"
 
-#: ../libpurple/status.c:1313
+#: ../libpurple/status.c:1314
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s became idle"
 
-#: ../libpurple/status.c:1315
+#: ../libpurple/status.c:1316
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s is no longer idle"
 
-#: ../libpurple/util.c:717
+#: ../libpurple/util.c:718
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2720
+#: ../libpurple/util.c:2722
 #, c-format
 msgid "Error Reading %s"
 msgstr "Error reading %s"
 
-#: ../libpurple/util.c:2721
+#: ../libpurple/util.c:2723
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -13170,67 +13278,67 @@
 "An error was encountered reading your %s.  They have not been loaded, and "
 "the old file has been renamed to %s~."
 
-#: ../libpurple/util.c:3221
+#: ../libpurple/util.c:3223
 msgid "Calculating..."
 msgstr "Calculating..."
 
-#: ../libpurple/util.c:3224
+#: ../libpurple/util.c:3226
 msgid "Unknown."
 msgstr "Unknown."
 
-#: ../libpurple/util.c:3250
+#: ../libpurple/util.c:3252
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d second"
 msgstr[1] "%d seconds"
 
-#: ../libpurple/util.c:3262
+#: ../libpurple/util.c:3264
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d day"
 msgstr[1] "%d days"
 
-#: ../libpurple/util.c:3270
+#: ../libpurple/util.c:3272
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d hour"
 msgstr[1] "%s, %d hours"
 
-#: ../libpurple/util.c:3276
+#: ../libpurple/util.c:3278
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hour"
 msgstr[1] "%d hours"
 
-#: ../libpurple/util.c:3284
+#: ../libpurple/util.c:3286
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d minute"
 msgstr[1] "%s, %d minutes"
 
-#: ../libpurple/util.c:3290
+#: ../libpurple/util.c:3292
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minute"
 msgstr[1] "%d minutes"
 
-#: ../libpurple/util.c:3550
+#: ../libpurple/util.c:3552
 #, c-format
 msgid "Could not open %s: Redirected too many times"
 msgstr "Could not open %s: Redirected too many times"
 
-#: ../libpurple/util.c:3587 ../libpurple/util.c:3882
+#: ../libpurple/util.c:3589 ../libpurple/util.c:3885
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "Unable to connect to %s"
 
-#: ../libpurple/util.c:3710
+#: ../libpurple/util.c:3712
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
@@ -13239,17 +13347,17 @@
 "Unable to allocate enough memory to hold the contents from %s.  The web "
 "server may be trying something malicious."
 
-#: ../libpurple/util.c:3745
+#: ../libpurple/util.c:3747
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "Error reading from %s: %s"
 
-#: ../libpurple/util.c:3776
+#: ../libpurple/util.c:3778
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "Error writing to %s: %s"
 
-#: ../libpurple/util.c:3801
+#: ../libpurple/util.c:3803
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "Unable to connect to %s: %s"
@@ -13339,7 +13447,7 @@
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1210
+#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1211
 msgid "Use Environmental Settings"
 msgstr "Use Environmental Settings"
 
@@ -13361,15 +13469,15 @@
 msgid "Proxy Options"
 msgstr "Proxy Options"
 
-#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1204
+#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1205
 msgid "Proxy _type:"
 msgstr "Proxy _type:"
 
-#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1225
+#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1226
 msgid "_Host:"
 msgstr "_Host:"
 
-#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1243
+#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1244
 msgid "_Port:"
 msgstr "_Port:"
 
@@ -13377,7 +13485,7 @@
 msgid "_Username:"
 msgstr "_Username:"
 
-#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1280
+#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1281
 msgid "Pa_ssword:"
 msgstr "Pa_ssword:"
 
@@ -13405,7 +13513,7 @@
 msgid "_Advanced"
 msgstr "_Advanced"
 
-#: ../pidgin/gtkaccount.c:1973 ../pidgin/gtkplugin.c:568
+#: ../pidgin/gtkaccount.c:1973 ../pidgin/gtkplugin.c:569
 msgid "Enabled"
 msgstr "Enabled"
 
@@ -13436,11 +13544,11 @@
 "You can come back to this window to add, edit, or remove accounts from "
 "<b>Accounts->Add/Edit</b> in the Buddy List window"
 
-#: ../pidgin/gtkblist.c:765
+#: ../pidgin/gtkblist.c:767
 msgid "Join a Chat"
 msgstr "Join a Chat"
 
-#: ../pidgin/gtkblist.c:786
+#: ../pidgin/gtkblist.c:788
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
@@ -13449,231 +13557,232 @@
 "join.\n"
 
 #. Set up stuff for the account box
-#: ../pidgin/gtkblist.c:797 ../pidgin/gtkblist.c:5524
-#: ../pidgin/gtkblist.c:5890 ../pidgin/gtkpounce.c:538
-#: ../pidgin/gtkroomlist.c:395
+#: ../pidgin/gtkblist.c:799 ../pidgin/gtkblist.c:5530
+#: ../pidgin/gtkblist.c:5893 ../pidgin/gtkpounce.c:539
+#: ../pidgin/gtkroomlist.c:396
 msgid "_Account:"
 msgstr "_Account:"
 
-#: ../pidgin/gtkblist.c:1086 ../pidgin/gtkprivacy.c:602
-#: ../pidgin/gtkprivacy.c:616
+#: ../pidgin/gtkblist.c:1088 ../pidgin/gtkprivacy.c:603
+#: ../pidgin/gtkprivacy.c:617
 msgid "_Block"
 msgstr "_Block"
 
-#: ../pidgin/gtkblist.c:1086
+#: ../pidgin/gtkblist.c:1088
 msgid "Un_block"
 msgstr "Un_block"
 
-#: ../pidgin/gtkblist.c:1137
+#: ../pidgin/gtkblist.c:1139
 msgid "Get _Info"
 msgstr "Get _Info"
 
-#: ../pidgin/gtkblist.c:1140 ../pidgin/pidginstock.c:89
+#: ../pidgin/gtkblist.c:1142 ../pidgin/pidginstock.c:90
 msgid "I_M"
 msgstr "I_M"
 
-#: ../pidgin/gtkblist.c:1146
+#: ../pidgin/gtkblist.c:1148
+#, fuzzy
 msgid "_Send File"
-msgstr "_Send File"
-
-#: ../pidgin/gtkblist.c:1153
+msgstr "Send File"
+
+#: ../pidgin/gtkblist.c:1155
 msgid "Add Buddy _Pounce"
 msgstr "Add Buddy _Pounce"
 
-#: ../pidgin/gtkblist.c:1158 ../pidgin/gtkblist.c:1162
-#: ../pidgin/gtkblist.c:1267 ../pidgin/gtkblist.c:1290
+#: ../pidgin/gtkblist.c:1160 ../pidgin/gtkblist.c:1164
+#: ../pidgin/gtkblist.c:1269 ../pidgin/gtkblist.c:1292
 msgid "View _Log"
 msgstr "View _Log"
 
-#: ../pidgin/gtkblist.c:1175 ../pidgin/gtkblist.c:1184
-#: ../pidgin/gtkblist.c:1275 ../pidgin/gtkblist.c:1296
+#: ../pidgin/gtkblist.c:1177 ../pidgin/gtkblist.c:1186
+#: ../pidgin/gtkblist.c:1277 ../pidgin/gtkblist.c:1298
 msgid "_Alias..."
 msgstr "_Alias..."
 
-#: ../pidgin/gtkblist.c:1178 ../pidgin/gtkblist.c:1186
-#: ../pidgin/gtkblist.c:1277 ../pidgin/gtkblist.c:1298
+#: ../pidgin/gtkblist.c:1180 ../pidgin/gtkblist.c:1188
+#: ../pidgin/gtkblist.c:1279 ../pidgin/gtkblist.c:1300
 msgid "_Remove"
 msgstr "_Remove"
 
-#: ../pidgin/gtkblist.c:1236
+#: ../pidgin/gtkblist.c:1238
 msgid "Add a _Buddy"
 msgstr "Add a _Buddy"
 
-#: ../pidgin/gtkblist.c:1239
+#: ../pidgin/gtkblist.c:1241
 msgid "Add a C_hat"
 msgstr "Add a C_hat"
 
-#: ../pidgin/gtkblist.c:1242
+#: ../pidgin/gtkblist.c:1244
 msgid "_Delete Group"
 msgstr "_Delete Group"
 
-#: ../pidgin/gtkblist.c:1244
+#: ../pidgin/gtkblist.c:1246
 msgid "_Rename"
 msgstr "_Rename"
 
 #. join button
-#: ../pidgin/gtkblist.c:1263 ../pidgin/gtkroomlist.c:306
-#: ../pidgin/gtkroomlist.c:459 ../pidgin/pidginstock.c:87
+#: ../pidgin/gtkblist.c:1265 ../pidgin/gtkroomlist.c:307
+#: ../pidgin/gtkroomlist.c:460 ../pidgin/pidginstock.c:88
 msgid "_Join"
 msgstr "_Join"
 
-#: ../pidgin/gtkblist.c:1265
+#: ../pidgin/gtkblist.c:1267
 msgid "Auto-Join"
 msgstr "Auto-Join"
 
-#: ../pidgin/gtkblist.c:1303 ../pidgin/gtkblist.c:1327
+#: ../pidgin/gtkblist.c:1305 ../pidgin/gtkblist.c:1329
 msgid "_Collapse"
 msgstr "_Collapse"
 
-#: ../pidgin/gtkblist.c:1332
+#: ../pidgin/gtkblist.c:1334
 msgid "_Expand"
 msgstr "_Expand"
 
-#: ../pidgin/gtkblist.c:1583 ../pidgin/gtkblist.c:1595
-#: ../pidgin/gtkblist.c:4600 ../pidgin/gtkblist.c:4613
+#: ../pidgin/gtkblist.c:1585 ../pidgin/gtkblist.c:1597
+#: ../pidgin/gtkblist.c:4603 ../pidgin/gtkblist.c:4616
 msgid "/Tools/Mute Sounds"
 msgstr "/Tools/Mute Sounds"
 
-#: ../pidgin/gtkblist.c:2055 ../pidgin/gtkconv.c:4826
-#: ../pidgin/gtkpounce.c:429
+#: ../pidgin/gtkblist.c:2057 ../pidgin/gtkconv.c:4840
+#: ../pidgin/gtkpounce.c:430
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr ""
 "You are not currently signed on with an account that can add that buddy."
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:2866
+#: ../pidgin/gtkblist.c:2869
 msgid "/_Buddies"
 msgstr "/_Buddies"
 
-#: ../pidgin/gtkblist.c:2867
+#: ../pidgin/gtkblist.c:2870
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Buddies/New Instant _Message..."
 
-#: ../pidgin/gtkblist.c:2868
+#: ../pidgin/gtkblist.c:2871
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Buddies/Join a _Chat..."
 
-#: ../pidgin/gtkblist.c:2869
+#: ../pidgin/gtkblist.c:2872
 msgid "/Buddies/Get User _Info..."
 msgstr "/Buddies/Get User _Info..."
 
-#: ../pidgin/gtkblist.c:2870
+#: ../pidgin/gtkblist.c:2873
 msgid "/Buddies/View User _Log..."
 msgstr "/Buddies/View User _Log..."
 
-#: ../pidgin/gtkblist.c:2872
+#: ../pidgin/gtkblist.c:2875
 msgid "/Buddies/Show"
 msgstr "/Buddies/Show"
 
-#: ../pidgin/gtkblist.c:2873
+#: ../pidgin/gtkblist.c:2876
 msgid "/Buddies/Show/_Offline Buddies"
 msgstr "/Buddies/Show/_Offline Buddies"
 
-#: ../pidgin/gtkblist.c:2874
+#: ../pidgin/gtkblist.c:2877
 msgid "/Buddies/Show/_Empty Groups"
 msgstr "/Buddies/Show/_Empty Groups"
 
-#: ../pidgin/gtkblist.c:2875
+#: ../pidgin/gtkblist.c:2878
 msgid "/Buddies/Show/Buddy _Details"
 msgstr "/Buddies/Show/Buddy _Details"
 
-#: ../pidgin/gtkblist.c:2876
+#: ../pidgin/gtkblist.c:2879
 msgid "/Buddies/Show/Idle _Times"
 msgstr "/Buddies/Show/Idle _Times"
 
-#: ../pidgin/gtkblist.c:2877
+#: ../pidgin/gtkblist.c:2880
 msgid "/Buddies/Show/_Protocol Icons"
 msgstr "/Buddies/Show/_Protocol Icons"
 
-#: ../pidgin/gtkblist.c:2878
+#: ../pidgin/gtkblist.c:2881
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Buddies/_Sort Buddies"
 
-#: ../pidgin/gtkblist.c:2880
+#: ../pidgin/gtkblist.c:2883
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Buddies/_Add Buddy..."
 
-#: ../pidgin/gtkblist.c:2881
+#: ../pidgin/gtkblist.c:2884
 msgid "/Buddies/Add C_hat..."
 msgstr "/Buddies/Add C_hat..."
 
-#: ../pidgin/gtkblist.c:2882
+#: ../pidgin/gtkblist.c:2885
 msgid "/Buddies/Add _Group..."
 msgstr "/Buddies/Add _Group..."
 
-#: ../pidgin/gtkblist.c:2884
+#: ../pidgin/gtkblist.c:2887
 msgid "/Buddies/_Quit"
 msgstr "/Buddies/_Quit"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:2887
+#: ../pidgin/gtkblist.c:2890
 msgid "/_Accounts"
 msgstr "/_Accounts"
 
-#: ../pidgin/gtkblist.c:2888 ../pidgin/gtkblist.c:6589
+#: ../pidgin/gtkblist.c:2891 ../pidgin/gtkblist.c:6589
 msgid "/Accounts/Add\\/Edit"
 msgstr "/Accounts/Add\\/Edit"
 
 #. Tools
-#: ../pidgin/gtkblist.c:2891
+#: ../pidgin/gtkblist.c:2894
 msgid "/_Tools"
 msgstr "/_Tools"
 
-#: ../pidgin/gtkblist.c:2892
+#: ../pidgin/gtkblist.c:2895
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Tools/Buddy _Pounces"
 
-#: ../pidgin/gtkblist.c:2893
+#: ../pidgin/gtkblist.c:2896
 msgid "/Tools/_Certificates"
 msgstr "/Tools/_Certificates"
 
-#: ../pidgin/gtkblist.c:2894
+#: ../pidgin/gtkblist.c:2897
 msgid "/Tools/Plu_gins"
 msgstr "/Tools/Plu_g-ins"
 
-#: ../pidgin/gtkblist.c:2895
+#: ../pidgin/gtkblist.c:2898
 msgid "/Tools/Pr_eferences"
 msgstr "/Tools/Pr_eferences"
 
-#: ../pidgin/gtkblist.c:2896
+#: ../pidgin/gtkblist.c:2899
 msgid "/Tools/Pr_ivacy"
 msgstr "/Tools/Pr_ivacy"
 
-#: ../pidgin/gtkblist.c:2898
+#: ../pidgin/gtkblist.c:2901
 msgid "/Tools/_File Transfers"
 msgstr "/Tools/_File Transfers"
 
-#: ../pidgin/gtkblist.c:2899
+#: ../pidgin/gtkblist.c:2902
 msgid "/Tools/R_oom List"
 msgstr "/Tools/R_oom List"
 
-#: ../pidgin/gtkblist.c:2900
+#: ../pidgin/gtkblist.c:2903
 msgid "/Tools/System _Log"
 msgstr "/Tools/System _Log"
 
-#: ../pidgin/gtkblist.c:2902
+#: ../pidgin/gtkblist.c:2905
 msgid "/Tools/Mute _Sounds"
 msgstr "/Tools/Mute _Sounds"
 
 #. Help
-#: ../pidgin/gtkblist.c:2904
+#: ../pidgin/gtkblist.c:2907
 msgid "/_Help"
 msgstr "/_Help"
 
-#: ../pidgin/gtkblist.c:2905
+#: ../pidgin/gtkblist.c:2908
 msgid "/Help/Online _Help"
 msgstr "/Help/Online _Help"
 
-#: ../pidgin/gtkblist.c:2906
+#: ../pidgin/gtkblist.c:2909
 msgid "/Help/_Debug Window"
 msgstr "/Help/_Debug Window"
 
-#: ../pidgin/gtkblist.c:2908 ../pidgin/gtkblist.c:2910
+#: ../pidgin/gtkblist.c:2911 ../pidgin/gtkblist.c:2913
 msgid "/Help/_About"
 msgstr "/Help/_About"
 
-#: ../pidgin/gtkblist.c:2939
+#: ../pidgin/gtkblist.c:2942
 #, c-format
 msgid ""
 "\n"
@@ -13682,133 +13791,129 @@
 "\n"
 "<b>Account:</b> %s"
 
-#: ../pidgin/gtkblist.c:3017
+#: ../pidgin/gtkblist.c:3020
 msgid "Buddy Alias"
 msgstr "Buddy Alias"
 
-#: ../pidgin/gtkblist.c:3046
+#: ../pidgin/gtkblist.c:3049
 msgid "Logged In"
 msgstr "Logged In"
 
-#: ../pidgin/gtkblist.c:3092
+#: ../pidgin/gtkblist.c:3095
 msgid "Last Seen"
 msgstr "Last Seen"
 
-#: ../pidgin/gtkblist.c:3113
+#: ../pidgin/gtkblist.c:3116
 msgid "Spooky"
 msgstr "Spooky"
 
-#: ../pidgin/gtkblist.c:3115
+#: ../pidgin/gtkblist.c:3118
 msgid "Awesome"
 msgstr "Awesome"
 
-#: ../pidgin/gtkblist.c:3117
+#: ../pidgin/gtkblist.c:3120
 msgid "Rockin'"
 msgstr "Rockin'"
 
-#: ../pidgin/gtkblist.c:3450
+#: ../pidgin/gtkblist.c:3453
 #, c-format
 msgid "Idle %dd %dh %02dm"
 msgstr "Idle %dd %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3452
+#: ../pidgin/gtkblist.c:3455
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Idle %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3454
+#: ../pidgin/gtkblist.c:3457
 #, c-format
 msgid "Idle %dm"
 msgstr "Idle %dm"
 
-#: ../pidgin/gtkblist.c:3599
+#: ../pidgin/gtkblist.c:3602
 msgid "/Buddies/New Instant Message..."
 msgstr "/Buddies/New Instant Message..."
 
-#: ../pidgin/gtkblist.c:3600 ../pidgin/gtkblist.c:3633
-msgid "/Buddies/Join a Chat..."
-msgstr "/Buddies/Join a Chat..."
-
-#: ../pidgin/gtkblist.c:3601
-msgid "/Buddies/Get User Info..."
-msgstr "/Buddies/Get User Info..."
-
-#: ../pidgin/gtkblist.c:3602
-msgid "/Buddies/Add Buddy..."
-msgstr "/Buddies/Add Buddy..."
-
 #: ../pidgin/gtkblist.c:3603 ../pidgin/gtkblist.c:3636
+msgid "/Buddies/Join a Chat..."
+msgstr "/Buddies/Join a Chat..."
+
+#: ../pidgin/gtkblist.c:3604
+msgid "/Buddies/Get User Info..."
+msgstr "/Buddies/Get User Info..."
+
+#: ../pidgin/gtkblist.c:3605
+msgid "/Buddies/Add Buddy..."
+msgstr "/Buddies/Add Buddy..."
+
+#: ../pidgin/gtkblist.c:3606 ../pidgin/gtkblist.c:3639
 msgid "/Buddies/Add Chat..."
 msgstr "/Buddies/Add Chat..."
 
-#: ../pidgin/gtkblist.c:3604
+#: ../pidgin/gtkblist.c:3607
 msgid "/Buddies/Add Group..."
 msgstr "/Buddies/Add Group..."
 
-#: ../pidgin/gtkblist.c:3639
+#: ../pidgin/gtkblist.c:3642
 msgid "/Tools/Privacy"
 msgstr "/Tools/Privacy"
 
-#: ../pidgin/gtkblist.c:3642
+#: ../pidgin/gtkblist.c:3645
 msgid "/Tools/Room List"
 msgstr "/Tools/Room List"
 
-#: ../pidgin/gtkblist.c:3739 ../pidgin/gtkdocklet.c:153
+#: ../pidgin/gtkblist.c:3742 ../pidgin/gtkdocklet.c:153
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
 msgstr[0] "%d unread message from %s\n"
 msgstr[1] "%d unread messages from %s\n"
 
-#: ../pidgin/gtkblist.c:3819
+#: ../pidgin/gtkblist.c:3822
 msgid "Manually"
 msgstr "Manually"
 
-#: ../pidgin/gtkblist.c:3821
+#: ../pidgin/gtkblist.c:3824
 msgid "Alphabetically"
 msgstr "Alphabetically"
 
-#: ../pidgin/gtkblist.c:3822
+#: ../pidgin/gtkblist.c:3825
 msgid "By status"
 msgstr "By status"
 
-#: ../pidgin/gtkblist.c:3823
+#: ../pidgin/gtkblist.c:3826
 msgid "By log size"
 msgstr "By log size"
 
-#: ../pidgin/gtkblist.c:4028 ../pidgin/gtkconn.c:178
+#: ../pidgin/gtkblist.c:4031 ../pidgin/gtkconn.c:179
 #, c-format
 msgid "%s disconnected"
 msgstr "%s disconnected"
 
-#: ../pidgin/gtkblist.c:4038
-msgid "Re-enable Account"
-msgstr "Re-enable Account"
-
-#: ../pidgin/gtkblist.c:4064
+#: ../pidgin/gtkblist.c:4067
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s disconnected: %s</span>"
 
-#: ../pidgin/gtkblist.c:4216
+#: ../pidgin/gtkblist.c:4219
 msgid "<b>Username:</b>"
 msgstr "<b>Username:</b>"
 
-#: ../pidgin/gtkblist.c:4223
+#: ../pidgin/gtkblist.c:4226
 msgid "<b>Password:</b>"
 msgstr "<b>Password:</b>"
 
-#: ../pidgin/gtkblist.c:4234
+#: ../pidgin/gtkblist.c:4237
 msgid "_Login"
 msgstr "_Login"
 
-#: ../pidgin/gtkblist.c:4317
+#: ../pidgin/gtkblist.c:4320
 msgid "/Accounts"
 msgstr "/Accounts"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4331
-#, c-format
+#: ../pidgin/gtkblist.c:4334
+#, fuzzy, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
 "\n"
@@ -13825,27 +13930,27 @@
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4594
+#: ../pidgin/gtkblist.c:4597
 msgid "/Buddies/Show/Offline Buddies"
 msgstr "/Buddies/Show/Offline Buddies"
 
-#: ../pidgin/gtkblist.c:4597
+#: ../pidgin/gtkblist.c:4600
 msgid "/Buddies/Show/Empty Groups"
 msgstr "/Buddies/Show/ Empty Groups"
 
-#: ../pidgin/gtkblist.c:4603
+#: ../pidgin/gtkblist.c:4606
 msgid "/Buddies/Show/Buddy Details"
 msgstr "/Buddies/Show/Buddy Details"
 
-#: ../pidgin/gtkblist.c:4606
+#: ../pidgin/gtkblist.c:4609
 msgid "/Buddies/Show/Idle Times"
 msgstr "/Buddies/Show/Idle Times"
 
-#: ../pidgin/gtkblist.c:4609
+#: ../pidgin/gtkblist.c:4612
 msgid "/Buddies/Show/Protocol Icons"
 msgstr "/Buddies/Show/Protocol Icons"
 
-#: ../pidgin/gtkblist.c:5501
+#: ../pidgin/gtkblist.c:5507
 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. "
@@ -13856,19 +13961,19 @@
 "The alias will be displayed in place of the screen name whenever possible.\n"
 
 #. End of account box
-#: ../pidgin/gtkblist.c:5536
+#: ../pidgin/gtkblist.c:5542
 msgid "_Screen name:"
 msgstr "_Screen name:"
 
-#: ../pidgin/gtkblist.c:5558 ../pidgin/gtkblist.c:5911
+#: ../pidgin/gtkblist.c:5564 ../pidgin/gtkblist.c:5914
 msgid "A_lias:"
 msgstr "A_lias:"
 
-#: ../pidgin/gtkblist.c:5823
+#: ../pidgin/gtkblist.c:5826
 msgid "This protocol does not support chat rooms."
 msgstr "This protocol does not support chat rooms."
 
-#: ../pidgin/gtkblist.c:5839
+#: ../pidgin/gtkblist.c:5842
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -13876,7 +13981,7 @@
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 
-#: ../pidgin/gtkblist.c:5880
+#: ../pidgin/gtkblist.c:5883
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -13884,7 +13989,7 @@
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
 
-#: ../pidgin/gtkblist.c:5968
+#: ../pidgin/gtkblist.c:5964
 msgid "Please enter the name of the group to be added."
 msgstr "Please enter the name of the group to be added."
 
@@ -13896,7 +14001,7 @@
 msgid "_Edit Account"
 msgstr "_Edit Account"
 
-#: ../pidgin/gtkblist.c:6646 ../pidgin/gtkconv.c:3056
+#: ../pidgin/gtkblist.c:6646 ../pidgin/gtkconv.c:3073
 msgid "No actions available"
 msgstr "No actions available"
 
@@ -13921,11 +14026,11 @@
 msgstr "/Buddies/Sort Buddies"
 
 #. Widget creation function
-#: ../pidgin/gtkcertmgr.c:549
+#: ../pidgin/gtkcertmgr.c:530
 msgid "SSL Servers"
 msgstr "SSL Servers"
 
-#: ../pidgin/gtkconn.c:179
+#: ../pidgin/gtkconn.c:180
 #, c-format
 msgid ""
 "%s\n"
@@ -13938,26 +14043,26 @@
 "%s will not attempt to reconnect the account until you correct the error and "
 "re-enable the account."
 
-#: ../pidgin/gtkconv.c:462
+#: ../pidgin/gtkconv.c:482
 msgid "Unknown command."
 msgstr "Unknown command."
 
-#: ../pidgin/gtkconv.c:734 ../pidgin/gtkconv.c:760
+#: ../pidgin/gtkconv.c:754 ../pidgin/gtkconv.c:780
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "That buddy is not on the same protocol as this chat."
 
-#: ../pidgin/gtkconv.c:754
+#: ../pidgin/gtkconv.c:774
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr ""
 "You are not currently signed on with an account that can invite that buddy."
 
-#: ../pidgin/gtkconv.c:807
+#: ../pidgin/gtkconv.c:827
 msgid "Invite Buddy Into Chat Room"
 msgstr "Invite Buddy Into Chat Room"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:837
+#: ../pidgin/gtkconv.c:857
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -13965,188 +14070,188 @@
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 
-#: ../pidgin/gtkconv.c:858
+#: ../pidgin/gtkconv.c:878
 msgid "_Buddy:"
 msgstr "_Buddy:"
 
-#: ../pidgin/gtkconv.c:878 ../pidgin/gtksavedstatuses.c:1193
-#: ../pidgin/gtksavedstatuses.c:1527
+#: ../pidgin/gtkconv.c:889 ../pidgin/gtksavedstatuses.c:1194
+#: ../pidgin/gtksavedstatuses.c:1528
 msgid "_Message:"
 msgstr "_Message:"
 
-#: ../pidgin/gtkconv.c:936 ../pidgin/gtkconv.c:2581 ../pidgin/gtkdebug.c:218
-#: ../pidgin/gtkft.c:542
+#: ../pidgin/gtkconv.c:947 ../pidgin/gtkconv.c:2598 ../pidgin/gtkdebug.c:219
+#: ../pidgin/gtkft.c:543
 msgid "Unable to open file."
 msgstr "Unable to open file."
 
-#: ../pidgin/gtkconv.c:942
+#: ../pidgin/gtkconv.c:953
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Conversation with %s</h1>\n"
 
-#: ../pidgin/gtkconv.c:980
+#: ../pidgin/gtkconv.c:991
 msgid "Save Conversation"
 msgstr "Save Conversation"
 
-#: ../pidgin/gtkconv.c:1129 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:742
+#: ../pidgin/gtkconv.c:1140 ../pidgin/gtkdebug.c:167 ../pidgin/gtkdebug.c:743
 msgid "Find"
 msgstr "Find"
 
-#: ../pidgin/gtkconv.c:1155 ../pidgin/gtkdebug.c:194
+#: ../pidgin/gtkconv.c:1166 ../pidgin/gtkdebug.c:195
 msgid "_Search for:"
 msgstr "_Search for:"
 
-#: ../pidgin/gtkconv.c:1607
+#: ../pidgin/gtkconv.c:1622
 msgid "Un-Ignore"
 msgstr "Un-Ignore"
 
-#: ../pidgin/gtkconv.c:1610
+#: ../pidgin/gtkconv.c:1625
 msgid "Ignore"
 msgstr "Ignore"
 
-#: ../pidgin/gtkconv.c:1630
+#: ../pidgin/gtkconv.c:1645
 msgid "Get Away Message"
 msgstr "Get Away Message"
 
-#: ../pidgin/gtkconv.c:1653
+#: ../pidgin/gtkconv.c:1668
 msgid "Last said"
 msgstr "Last said"
 
-#: ../pidgin/gtkconv.c:2589
+#: ../pidgin/gtkconv.c:2606
 msgid "Unable to save icon file to disk."
 msgstr "Unable to save icon file to disk."
 
-#: ../pidgin/gtkconv.c:2640
+#: ../pidgin/gtkconv.c:2657
 msgid "Save Icon"
 msgstr "Save Icon"
 
-#: ../pidgin/gtkconv.c:2692
+#: ../pidgin/gtkconv.c:2709
 msgid "Animate"
 msgstr "Animate"
 
-#: ../pidgin/gtkconv.c:2697
+#: ../pidgin/gtkconv.c:2714
 msgid "Hide Icon"
 msgstr "Hide Icon"
 
-#: ../pidgin/gtkconv.c:2700
+#: ../pidgin/gtkconv.c:2717
 msgid "Save Icon As..."
 msgstr "Save Icon As..."
 
-#: ../pidgin/gtkconv.c:2704
+#: ../pidgin/gtkconv.c:2721
 msgid "Set Custom Icon..."
 msgstr "Set Custom Icon..."
 
-#: ../pidgin/gtkconv.c:2717
+#: ../pidgin/gtkconv.c:2734
 msgid "Remove Custom Icon"
 msgstr "Remove Custom Icon"
 
-#: ../pidgin/gtkconv.c:2844
+#: ../pidgin/gtkconv.c:2861
 msgid "Show All"
 msgstr "Show All"
 
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2863
+#: ../pidgin/gtkconv.c:2880
 msgid "/_Conversation"
 msgstr "/_Conversation"
 
-#: ../pidgin/gtkconv.c:2865
+#: ../pidgin/gtkconv.c:2882
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Conversation/New Instant _Message..."
 
-#: ../pidgin/gtkconv.c:2870
+#: ../pidgin/gtkconv.c:2887
 msgid "/Conversation/_Find..."
 msgstr "/Conversation/_Find..."
 
-#: ../pidgin/gtkconv.c:2872
+#: ../pidgin/gtkconv.c:2889
 msgid "/Conversation/View _Log"
 msgstr "/Conversation/View _Log"
 
-#: ../pidgin/gtkconv.c:2873
+#: ../pidgin/gtkconv.c:2890
 msgid "/Conversation/_Save As..."
 msgstr "/Conversation/_Save As..."
 
-#: ../pidgin/gtkconv.c:2875
+#: ../pidgin/gtkconv.c:2892
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Conversation/Clea_r Scrollback"
 
-#: ../pidgin/gtkconv.c:2879
+#: ../pidgin/gtkconv.c:2896
 msgid "/Conversation/Se_nd File..."
 msgstr "/Conversation/Se_nd File..."
 
-#: ../pidgin/gtkconv.c:2880
+#: ../pidgin/gtkconv.c:2897
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Conversation/Add Buddy _Pounce..."
 
-#: ../pidgin/gtkconv.c:2882
+#: ../pidgin/gtkconv.c:2899
 msgid "/Conversation/_Get Info"
 msgstr "/Conversation/_Get Info"
 
-#: ../pidgin/gtkconv.c:2884
+#: ../pidgin/gtkconv.c:2901
 msgid "/Conversation/In_vite..."
 msgstr "/Conversation/In_vite..."
 
-#: ../pidgin/gtkconv.c:2886
+#: ../pidgin/gtkconv.c:2903
 msgid "/Conversation/M_ore"
 msgstr "/Conversation/M_ore"
 
-#: ../pidgin/gtkconv.c:2890
+#: ../pidgin/gtkconv.c:2907
 msgid "/Conversation/Al_ias..."
 msgstr "/Conversation/Al_ias..."
 
-#: ../pidgin/gtkconv.c:2892
+#: ../pidgin/gtkconv.c:2909
 msgid "/Conversation/_Block..."
 msgstr "/Conversation/_Block..."
 
-#: ../pidgin/gtkconv.c:2894
+#: ../pidgin/gtkconv.c:2911
 msgid "/Conversation/_Unblock..."
 msgstr "/Conversation/_Unblock..."
 
-#: ../pidgin/gtkconv.c:2896
+#: ../pidgin/gtkconv.c:2913
 msgid "/Conversation/_Add..."
 msgstr "/Conversation/_Add..."
 
-#: ../pidgin/gtkconv.c:2898
+#: ../pidgin/gtkconv.c:2915
 msgid "/Conversation/_Remove..."
 msgstr "/Conversation/_Remove..."
 
-#: ../pidgin/gtkconv.c:2903
+#: ../pidgin/gtkconv.c:2920
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Conversation/Insert Lin_k..."
 
-#: ../pidgin/gtkconv.c:2905
+#: ../pidgin/gtkconv.c:2922
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Conversation/Insert Imag_e..."
 
-#: ../pidgin/gtkconv.c:2911
+#: ../pidgin/gtkconv.c:2928
 msgid "/Conversation/_Close"
 msgstr "/Conversation/_Close"
 
 #. Options
-#: ../pidgin/gtkconv.c:2915
+#: ../pidgin/gtkconv.c:2932
 msgid "/_Options"
 msgstr "/_Options"
 
-#: ../pidgin/gtkconv.c:2916
+#: ../pidgin/gtkconv.c:2933
 msgid "/Options/Enable _Logging"
 msgstr "/Options/Enable _Logging"
 
-#: ../pidgin/gtkconv.c:2917
+#: ../pidgin/gtkconv.c:2934
 msgid "/Options/Enable _Sounds"
 msgstr "/Options/Enable _Sounds"
 
-#: ../pidgin/gtkconv.c:2919
+#: ../pidgin/gtkconv.c:2936
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Options/Show Formatting _Toolbars"
 
-#: ../pidgin/gtkconv.c:2920
+#: ../pidgin/gtkconv.c:2937
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Options/Show Ti_mestamps"
 
-#: ../pidgin/gtkconv.c:3044
+#: ../pidgin/gtkconv.c:3061
 msgid "/Conversation/More"
 msgstr "/Conversation/More"
 
-#: ../pidgin/gtkconv.c:3100
+#: ../pidgin/gtkconv.c:3117
 msgid "/Options"
 msgstr "/Options"
 
@@ -14155,578 +14260,589 @@
 #. 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:3135 ../pidgin/gtkconv.c:3167
+#: ../pidgin/gtkconv.c:3152 ../pidgin/gtkconv.c:3184
 msgid "/Conversation"
 msgstr "/Conversation"
 
-#: ../pidgin/gtkconv.c:3175
+#: ../pidgin/gtkconv.c:3192
 msgid "/Conversation/View Log"
 msgstr "/Conversation/View Log"
 
-#: ../pidgin/gtkconv.c:3181
+#: ../pidgin/gtkconv.c:3198
 msgid "/Conversation/Send File..."
 msgstr "/Conversation/Send File..."
 
-#: ../pidgin/gtkconv.c:3185
+#: ../pidgin/gtkconv.c:3202
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversation/Add Buddy Pounce..."
 
-#: ../pidgin/gtkconv.c:3191
+#: ../pidgin/gtkconv.c:3208
 msgid "/Conversation/Get Info"
 msgstr "/Conversation/Get Info"
 
-#: ../pidgin/gtkconv.c:3195
+#: ../pidgin/gtkconv.c:3212
 msgid "/Conversation/Invite..."
 msgstr "/Conversation/Invite..."
 
-#: ../pidgin/gtkconv.c:3201
+#: ../pidgin/gtkconv.c:3218
 msgid "/Conversation/Alias..."
 msgstr "/Conversation/Alias..."
 
-#: ../pidgin/gtkconv.c:3205
+#: ../pidgin/gtkconv.c:3222
 msgid "/Conversation/Block..."
 msgstr "/Conversation/Block..."
 
-#: ../pidgin/gtkconv.c:3209
+#: ../pidgin/gtkconv.c:3226
 msgid "/Conversation/Unblock..."
 msgstr "/Conversation/Unblock..."
 
-#: ../pidgin/gtkconv.c:3213
+#: ../pidgin/gtkconv.c:3230
 msgid "/Conversation/Add..."
 msgstr "/Conversation/Add..."
 
-#: ../pidgin/gtkconv.c:3217
+#: ../pidgin/gtkconv.c:3234
 msgid "/Conversation/Remove..."
 msgstr "/Conversation/Remove..."
 
-#: ../pidgin/gtkconv.c:3223
+#: ../pidgin/gtkconv.c:3240
 msgid "/Conversation/Insert Link..."
 msgstr "/Conversation/Insert Link..."
 
-#: ../pidgin/gtkconv.c:3227
+#: ../pidgin/gtkconv.c:3244
 msgid "/Conversation/Insert Image..."
 msgstr "/Conversation/Insert Image..."
 
-#: ../pidgin/gtkconv.c:3233
+#: ../pidgin/gtkconv.c:3250
 msgid "/Options/Enable Logging"
 msgstr "/Options/Enable Logging"
 
-#: ../pidgin/gtkconv.c:3236
+#: ../pidgin/gtkconv.c:3253
 msgid "/Options/Enable Sounds"
 msgstr "/Options/Enable Sounds"
 
-#: ../pidgin/gtkconv.c:3249
+#: ../pidgin/gtkconv.c:3266
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Options/Show Formatting Toolbars"
 
-#: ../pidgin/gtkconv.c:3252
+#: ../pidgin/gtkconv.c:3269
 msgid "/Options/Show Timestamps"
 msgstr "/Options/Show Timestamps"
 
-#: ../pidgin/gtkconv.c:3329 ../pidgin/gtkconv.c:3371
+#: ../pidgin/gtkconv.c:3346 ../pidgin/gtkconv.c:3388
 msgid "User is typing..."
 msgstr "User is typing..."
 
-#: ../pidgin/gtkconv.c:3374
+#: ../pidgin/gtkconv.c:3391
 msgid "User has typed something and stopped"
 msgstr "User has typed something and stopped"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3557 ../pidgin/gtkconv.c:8000
+#: ../pidgin/gtkconv.c:3574 ../pidgin/gtkconv.c:8022
 msgid "_Send To"
 msgstr "_Send To"
 
-#: ../pidgin/gtkconv.c:4270
+#: ../pidgin/gtkconv.c:4286
 msgid "_Send"
 msgstr "_Send"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4374
+#: ../pidgin/gtkconv.c:4390
 msgid "0 people in room"
 msgstr "0 people in room"
 
-#: ../pidgin/gtkconv.c:5742 ../pidgin/gtkconv.c:5863
+#: ../pidgin/gtkconv.c:5759 ../pidgin/gtkconv.c:5880
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d person in room"
 msgstr[1] "%d people in room"
 
-#: ../pidgin/gtkconv.c:6464 ../pidgin/gtkstatusbox.c:659
+#: ../pidgin/gtkconv.c:6486 ../pidgin/gtkstatusbox.c:660
 msgid "Typing"
 msgstr "Typing"
 
-#: ../pidgin/gtkconv.c:6468
+#: ../pidgin/gtkconv.c:6490
 msgid "Stopped Typing"
 msgstr "Stopped Typing"
 
-#: ../pidgin/gtkconv.c:6471
+#: ../pidgin/gtkconv.c:6493
 msgid "Nick Said"
 msgstr "Nick Said"
 
-#: ../pidgin/gtkconv.c:6474 ../pidgin/gtkdocklet.c:492
+#: ../pidgin/gtkconv.c:6496 ../pidgin/gtkdocklet.c:492
 msgid "Unread Messages"
 msgstr "Unread Messages"
 
-#: ../pidgin/gtkconv.c:6477
+#: ../pidgin/gtkconv.c:6499
 msgid "New Event"
 msgstr "New Event"
 
-#: ../pidgin/gtkconv.c:7550
+#: ../pidgin/gtkconv.c:7572
 msgid "clear: Clears all conversation scrollbacks."
 msgstr "clear: Clears all conversation scrollbacks."
 
-#: ../pidgin/gtkconv.c:7714
+#: ../pidgin/gtkconv.c:7736
 msgid "Confirm close"
 msgstr "Confirm close"
 
-#: ../pidgin/gtkconv.c:7746
+#: ../pidgin/gtkconv.c:7768
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "You have unread messages. Are you sure you want to close the window?"
 
-#: ../pidgin/gtkconv.c:8333
+#: ../pidgin/gtkconv.c:8355
 msgid "Close other tabs"
 msgstr "Close other tabs"
 
-#: ../pidgin/gtkconv.c:8339
+#: ../pidgin/gtkconv.c:8361
 msgid "Close all tabs"
 msgstr "Close all tabs"
 
-#: ../pidgin/gtkconv.c:8347
+#: ../pidgin/gtkconv.c:8369
 msgid "Detach this tab"
 msgstr "Detach this tab"
 
-#: ../pidgin/gtkconv.c:8353
+#: ../pidgin/gtkconv.c:8375
 msgid "Close this tab"
 msgstr "Close this tab"
 
-#: ../pidgin/gtkconv.c:8853
+#: ../pidgin/gtkconv.c:8875
 msgid "Close conversation"
 msgstr "Close conversation"
 
-#: ../pidgin/gtkconv.c:9455
+#: ../pidgin/gtkconv.c:9477
 msgid "Last created window"
 msgstr "Last created window"
 
-#: ../pidgin/gtkconv.c:9457
+#: ../pidgin/gtkconv.c:9479
 msgid "Separate IM and Chat windows"
 msgstr "Separate IM and Chat windows"
 
-#: ../pidgin/gtkconv.c:9459 ../pidgin/gtkprefs.c:1414
+#: ../pidgin/gtkconv.c:9481 ../pidgin/gtkprefs.c:1415
 msgid "New window"
 msgstr "New window"
 
-#: ../pidgin/gtkconv.c:9461
+#: ../pidgin/gtkconv.c:9483
 msgid "By group"
 msgstr "By group"
 
-#: ../pidgin/gtkconv.c:9463
+#: ../pidgin/gtkconv.c:9485
 msgid "By account"
 msgstr "By account"
 
-#: ../pidgin/gtkdebug.c:233
+#: ../pidgin/gtkdebug.c:234
 msgid "Save Debug Log"
 msgstr "Save Debug Log"
 
-#: ../pidgin/gtkdebug.c:581
+#: ../pidgin/gtkdebug.c:582
 msgid "Invert"
 msgstr "Invert"
 
-#: ../pidgin/gtkdebug.c:584
+#: ../pidgin/gtkdebug.c:585
 msgid "Highlight matches"
 msgstr "Highlight matches"
 
-#: ../pidgin/gtkdebug.c:651
+#: ../pidgin/gtkdebug.c:652
 msgid "_Icon Only"
 msgstr "_Icon Only"
 
-#: ../pidgin/gtkdebug.c:652
+#: ../pidgin/gtkdebug.c:653
 msgid "_Text Only"
 msgstr "_Text Only"
 
-#: ../pidgin/gtkdebug.c:653
+#: ../pidgin/gtkdebug.c:654
 msgid "_Both Icon & Text"
 msgstr "_Both Icon & Text"
 
-#: ../pidgin/gtkdebug.c:774
+#: ../pidgin/gtkdebug.c:775
 msgid "Filter"
 msgstr "Filter"
 
-#: ../pidgin/gtkdebug.c:793
+#: ../pidgin/gtkdebug.c:794
 msgid "Right click for more options."
 msgstr "Right click for more options."
 
-#: ../pidgin/gtkdebug.c:823
+#: ../pidgin/gtkdebug.c:824
 msgid "Level "
 msgstr "Level "
 
-#: ../pidgin/gtkdebug.c:824 ../pidgin/gtkdebug.c:830
+#: ../pidgin/gtkdebug.c:825 ../pidgin/gtkdebug.c:831
 msgid "Select the debug filter level."
 msgstr "Select the debug filter level."
 
-#: ../pidgin/gtkdebug.c:832
+#: ../pidgin/gtkdebug.c:833
 msgid "All"
 msgstr "All"
 
-#: ../pidgin/gtkdebug.c:833
+#: ../pidgin/gtkdebug.c:834
 msgid "Misc"
 msgstr "Misc"
 
-#: ../pidgin/gtkdebug.c:835
+#: ../pidgin/gtkdebug.c:836
 msgid "Warning"
 msgstr "Warning"
 
-#: ../pidgin/gtkdebug.c:836
+#: ../pidgin/gtkdebug.c:837
 msgid "Error "
 msgstr "Error "
 
-#: ../pidgin/gtkdebug.c:837
+#: ../pidgin/gtkdebug.c:838
 msgid "Fatal Error"
 msgstr "Fatal Error"
 
-#: ../pidgin/gtkdialogs.c:71 ../pidgin/gtkdialogs.c:116
+#: ../pidgin/gtkdialogs.c:72 ../pidgin/gtkdialogs.c:117
 msgid "lead developer"
 msgstr "lead developer"
 
-#: ../pidgin/gtkdialogs.c:72 ../pidgin/gtkdialogs.c:73
-#: ../pidgin/gtkdialogs.c:74 ../pidgin/gtkdialogs.c:75
-#: ../pidgin/gtkdialogs.c:76 ../pidgin/gtkdialogs.c:77
-#: ../pidgin/gtkdialogs.c:78 ../pidgin/gtkdialogs.c:79
-#: ../pidgin/gtkdialogs.c:80 ../pidgin/gtkdialogs.c:81
-#: ../pidgin/gtkdialogs.c:82 ../pidgin/gtkdialogs.c:83
-#: ../pidgin/gtkdialogs.c:84 ../pidgin/gtkdialogs.c:85
-#: ../pidgin/gtkdialogs.c:88 ../pidgin/gtkdialogs.c:90
-#: ../pidgin/gtkdialogs.c:91
+#: ../pidgin/gtkdialogs.c:73 ../pidgin/gtkdialogs.c:74
+#: ../pidgin/gtkdialogs.c:75 ../pidgin/gtkdialogs.c:76
+#: ../pidgin/gtkdialogs.c:77 ../pidgin/gtkdialogs.c:78
+#: ../pidgin/gtkdialogs.c:79 ../pidgin/gtkdialogs.c:80
+#: ../pidgin/gtkdialogs.c:81 ../pidgin/gtkdialogs.c:82
+#: ../pidgin/gtkdialogs.c:83 ../pidgin/gtkdialogs.c:84
+#: ../pidgin/gtkdialogs.c:85 ../pidgin/gtkdialogs.c:86
+#: ../pidgin/gtkdialogs.c:89 ../pidgin/gtkdialogs.c:91
+#: ../pidgin/gtkdialogs.c:92
 msgid "developer"
 msgstr "developer"
 
-#: ../pidgin/gtkdialogs.c:86
-msgid "support"
-msgstr "support"
-
 #: ../pidgin/gtkdialogs.c:87
+msgid "support"
+msgstr "support"
+
+#: ../pidgin/gtkdialogs.c:88
 msgid "support/QA"
 msgstr "support/QA"
 
-#: ../pidgin/gtkdialogs.c:89 ../pidgin/gtkdialogs.c:111
+#: ../pidgin/gtkdialogs.c:90 ../pidgin/gtkdialogs.c:112
 msgid "developer & webmaster"
 msgstr "developer & webmaster"
 
-#: ../pidgin/gtkdialogs.c:98
+#: ../pidgin/gtkdialogs.c:99
 msgid "Senior Contributor/QA"
 msgstr "Senior Contributor/QA"
 
-#: ../pidgin/gtkdialogs.c:107
+#: ../pidgin/gtkdialogs.c:108
 msgid "win32 port"
 msgstr "win32 port"
 
-#: ../pidgin/gtkdialogs.c:108 ../pidgin/gtkdialogs.c:109
+#: ../pidgin/gtkdialogs.c:109 ../pidgin/gtkdialogs.c:110
 msgid "maintainer"
 msgstr "maintainer"
 
-#: ../pidgin/gtkdialogs.c:110
+#: ../pidgin/gtkdialogs.c:111
 msgid "libfaim maintainer"
 msgstr "libfaim maintainer"
 
 #. If "lazy bum" translates literally into a serious insult, use something else or omit it.
-#: ../pidgin/gtkdialogs.c:113
+#: ../pidgin/gtkdialogs.c:114
 msgid "hacker and designated driver [lazy bum]"
 msgstr "hacker and designated driver [lazy bum]"
 
-#: ../pidgin/gtkdialogs.c:114
+#: ../pidgin/gtkdialogs.c:115
 msgid "XMPP developer"
 msgstr "XMPP developer"
 
-#: ../pidgin/gtkdialogs.c:115
+#: ../pidgin/gtkdialogs.c:116
 msgid "original author"
 msgstr "original author"
 
-#: ../pidgin/gtkdialogs.c:132
+#: ../pidgin/gtkdialogs.c:133
 msgid "Afrikaans"
 msgstr "Afrikaans"
 
-#: ../pidgin/gtkdialogs.c:133
+#: ../pidgin/gtkdialogs.c:134 ../pidgin/gtkdialogs.c:226
 msgid "Arabic"
 msgstr "Arabic"
 
-#: ../pidgin/gtkdialogs.c:134 ../pidgin/gtkdialogs.c:135
-#: ../pidgin/gtkdialogs.c:222
+#: ../pidgin/gtkdialogs.c:135
+msgid "Belarusian Latin"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
+#: ../pidgin/gtkdialogs.c:227
 msgid "Bulgarian"
 msgstr "Bulgarian"
 
-#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
 #: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
+#: ../pidgin/gtkdialogs.c:140 ../pidgin/gtkdialogs.c:141
 msgid "Bengali"
 msgstr "Bengali"
 
-#: ../pidgin/gtkdialogs.c:140
+#: ../pidgin/gtkdialogs.c:142
 msgid "Bosnian"
 msgstr "Bosnian"
 
-#: ../pidgin/gtkdialogs.c:141 ../pidgin/gtkdialogs.c:223
-#: ../pidgin/gtkdialogs.c:224
+#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:228
+#: ../pidgin/gtkdialogs.c:229
 msgid "Catalan"
 msgstr "Catalan"
 
-#: ../pidgin/gtkdialogs.c:142 ../pidgin/gtkdialogs.c:143
+#: ../pidgin/gtkdialogs.c:144 ../pidgin/gtkdialogs.c:145
 msgid "Valencian-Catalan"
 msgstr "Valencian Catalan"
 
-#: ../pidgin/gtkdialogs.c:144 ../pidgin/gtkdialogs.c:225
+#: ../pidgin/gtkdialogs.c:146 ../pidgin/gtkdialogs.c:230
 msgid "Czech"
 msgstr "Czech"
 
-#: ../pidgin/gtkdialogs.c:145 ../pidgin/gtkdialogs.c:146
+#: ../pidgin/gtkdialogs.c:147 ../pidgin/gtkdialogs.c:148
 msgid "Danish"
 msgstr "Danish"
 
-#: ../pidgin/gtkdialogs.c:147 ../pidgin/gtkdialogs.c:148
-#: ../pidgin/gtkdialogs.c:226
+#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:150
+#: ../pidgin/gtkdialogs.c:231
 msgid "German"
 msgstr "German"
 
-#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:150
-#: ../pidgin/gtkdialogs.c:151
+#: ../pidgin/gtkdialogs.c:151 ../pidgin/gtkdialogs.c:152
+#: ../pidgin/gtkdialogs.c:153
 msgid "Dzongkha"
 msgstr "Dzongkha"
 
-#: ../pidgin/gtkdialogs.c:152 ../pidgin/gtkdialogs.c:153
+#: ../pidgin/gtkdialogs.c:154 ../pidgin/gtkdialogs.c:155
 msgid "Greek"
 msgstr "Greek"
 
-#: ../pidgin/gtkdialogs.c:154
+#: ../pidgin/gtkdialogs.c:156
 msgid "Australian English"
 msgstr "Australian English"
 
-#: ../pidgin/gtkdialogs.c:155
+#: ../pidgin/gtkdialogs.c:157
 msgid "Canadian English"
 msgstr "Canadian English"
 
-#: ../pidgin/gtkdialogs.c:156
+#: ../pidgin/gtkdialogs.c:158
 msgid "British English"
 msgstr "British English"
 
-#: ../pidgin/gtkdialogs.c:157
+#: ../pidgin/gtkdialogs.c:159
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../pidgin/gtkdialogs.c:158 ../pidgin/gtkdialogs.c:227
-#: ../pidgin/gtkdialogs.c:228 ../pidgin/gtkdialogs.c:229
-#: ../pidgin/gtkdialogs.c:230
+#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:232
+#: ../pidgin/gtkdialogs.c:233 ../pidgin/gtkdialogs.c:234
+#: ../pidgin/gtkdialogs.c:235
 msgid "Spanish"
 msgstr "Spanish"
 
-#: ../pidgin/gtkdialogs.c:159
+#: ../pidgin/gtkdialogs.c:161
 msgid "Estonian"
 msgstr "Estonian"
 
-#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:161
+#: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:163
 msgid "Euskera(Basque)"
 msgstr "Euskera (Basque)"
 
-#: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:163
-#: ../pidgin/gtkdialogs.c:164
+#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:165
+#: ../pidgin/gtkdialogs.c:166
 msgid "Persian"
 msgstr "Persian"
 
-#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:231
-#: ../pidgin/gtkdialogs.c:232
+#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:236
+#: ../pidgin/gtkdialogs.c:237
 msgid "Finnish"
 msgstr "Finnish"
 
-#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:233
-#: ../pidgin/gtkdialogs.c:234 ../pidgin/gtkdialogs.c:235
-#: ../pidgin/gtkdialogs.c:236
+#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:238
+#: ../pidgin/gtkdialogs.c:239 ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:241
 msgid "French"
 msgstr "French"
 
-#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:168
-#: ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:170
+#: ../pidgin/gtkdialogs.c:242
 msgid "Galician"
 msgstr "Galician"
 
-#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:170
+#: ../pidgin/gtkdialogs.c:171 ../pidgin/gtkdialogs.c:172
 msgid "Gujarati"
 msgstr "Gujarati"
 
-#: ../pidgin/gtkdialogs.c:170
+#: ../pidgin/gtkdialogs.c:172
 msgid "Gujarati Language Team"
 msgstr "Gujarati Language Team"
 
-#: ../pidgin/gtkdialogs.c:171 ../pidgin/gtkdialogs.c:238
+#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:243
 msgid "Hebrew"
 msgstr "Hebrew"
 
-#: ../pidgin/gtkdialogs.c:172
+#: ../pidgin/gtkdialogs.c:174
 msgid "Hindi"
 msgstr "Hindi"
 
-#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:239
+#: ../pidgin/gtkdialogs.c:175 ../pidgin/gtkdialogs.c:244
 msgid "Hungarian"
 msgstr "Hungarian"
 
-#: ../pidgin/gtkdialogs.c:174
+#: ../pidgin/gtkdialogs.c:176
 msgid "Indonesian"
 msgstr "Indonesian"
 
-#: ../pidgin/gtkdialogs.c:175 ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:177 ../pidgin/gtkdialogs.c:245
 msgid "Italian"
 msgstr "Italian"
 
-#: ../pidgin/gtkdialogs.c:176 ../pidgin/gtkdialogs.c:241
-#: ../pidgin/gtkdialogs.c:242 ../pidgin/gtkdialogs.c:243
+#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:246
+#: ../pidgin/gtkdialogs.c:247 ../pidgin/gtkdialogs.c:248
 msgid "Japanese"
 msgstr "Japanese"
 
-#: ../pidgin/gtkdialogs.c:177 ../pidgin/gtkdialogs.c:244
+#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:249
 msgid "Georgian"
 msgstr "Georgian"
 
-#: ../pidgin/gtkdialogs.c:177
+#: ../pidgin/gtkdialogs.c:179
 msgid "Ubuntu Georgian Translators"
 msgstr "Ubuntu Georgian Translators"
 
-#: ../pidgin/gtkdialogs.c:178
+#: ../pidgin/gtkdialogs.c:180
 msgid "Kannada"
 msgstr "Kannada"
 
-#: ../pidgin/gtkdialogs.c:178
+#: ../pidgin/gtkdialogs.c:180
 msgid "Kannada Translation team"
 msgstr "Kannada Translation team"
 
-#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:245
-#: ../pidgin/gtkdialogs.c:246
+#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:250
+#: ../pidgin/gtkdialogs.c:251
 msgid "Korean"
 msgstr "Korean"
 
-#: ../pidgin/gtkdialogs.c:180 ../pidgin/gtkdialogs.c:181
-#: ../pidgin/gtkdialogs.c:182
+#: ../pidgin/gtkdialogs.c:182 ../pidgin/gtkdialogs.c:183
+#: ../pidgin/gtkdialogs.c:184
 msgid "Kurdish"
 msgstr "Kurdish"
 
-#: ../pidgin/gtkdialogs.c:183 ../pidgin/gtkdialogs.c:247
-#: ../pidgin/gtkdialogs.c:248
+#: ../pidgin/gtkdialogs.c:185
+#, fuzzy
+msgid "Lao"
+msgstr "Leo"
+
+#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:252
+#: ../pidgin/gtkdialogs.c:253
 msgid "Lithuanian"
 msgstr "Lithuanian"
 
-#: ../pidgin/gtkdialogs.c:184 ../pidgin/gtkdialogs.c:185
-#: ../pidgin/gtkdialogs.c:249
+#: ../pidgin/gtkdialogs.c:187 ../pidgin/gtkdialogs.c:188
+#: ../pidgin/gtkdialogs.c:189 ../pidgin/gtkdialogs.c:254
 msgid "Macedonian"
 msgstr "Macedonian"
 
-#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:250
+#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:255
+#: ../pidgin/gtkdialogs.c:256
 msgid "Bokmål Norwegian"
 msgstr "Bokmål Norwegian"
 
-#: ../pidgin/gtkdialogs.c:187
+#: ../pidgin/gtkdialogs.c:191
 msgid "Nepali"
 msgstr "Nepali"
 
-#: ../pidgin/gtkdialogs.c:188
+#: ../pidgin/gtkdialogs.c:192
 msgid "Dutch, Flemish"
 msgstr "Dutch, Flemish"
 
-#: ../pidgin/gtkdialogs.c:189
+#: ../pidgin/gtkdialogs.c:193
 msgid "Norwegian Nynorsk"
 msgstr "Norwegian Nynorsk"
 
-#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:191
-#: ../pidgin/gtkdialogs.c:192 ../pidgin/gtkdialogs.c:251
+#: ../pidgin/gtkdialogs.c:194 ../pidgin/gtkdialogs.c:195
+#: ../pidgin/gtkdialogs.c:196 ../pidgin/gtkdialogs.c:257
 msgid "Polish"
 msgstr "Polish"
 
-#: ../pidgin/gtkdialogs.c:193
+#: ../pidgin/gtkdialogs.c:197
 msgid "Portuguese"
 msgstr "Portuguese"
 
-#: ../pidgin/gtkdialogs.c:194
+#: ../pidgin/gtkdialogs.c:198
 msgid "Portuguese-Brazil"
 msgstr "Portuguese-Brazil"
 
-#: ../pidgin/gtkdialogs.c:195
+#: ../pidgin/gtkdialogs.c:199
 msgid "Pashto"
 msgstr "Pashto"
 
-#: ../pidgin/gtkdialogs.c:196
+#: ../pidgin/gtkdialogs.c:200
 msgid "Romanian"
 msgstr "Romanian"
 
-#: ../pidgin/gtkdialogs.c:197 ../pidgin/gtkdialogs.c:252
-#: ../pidgin/gtkdialogs.c:253
+#: ../pidgin/gtkdialogs.c:201 ../pidgin/gtkdialogs.c:258
+#: ../pidgin/gtkdialogs.c:259
 msgid "Russian"
 msgstr "Russian"
 
-#: ../pidgin/gtkdialogs.c:198 ../pidgin/gtkdialogs.c:199
-#: ../pidgin/gtkdialogs.c:254 ../pidgin/gtkdialogs.c:255
-#: ../pidgin/gtkdialogs.c:256
+#: ../pidgin/gtkdialogs.c:202 ../pidgin/gtkdialogs.c:203
+#: ../pidgin/gtkdialogs.c:260 ../pidgin/gtkdialogs.c:261
+#: ../pidgin/gtkdialogs.c:262
 msgid "Slovak"
 msgstr "Slovak"
 
-#: ../pidgin/gtkdialogs.c:200 ../pidgin/gtkdialogs.c:257
+#: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:263
 msgid "Slovenian"
 msgstr "Slovenian"
 
-#: ../pidgin/gtkdialogs.c:201
+#: ../pidgin/gtkdialogs.c:205
 msgid "Albanian"
 msgstr "Albanian"
 
-#: ../pidgin/gtkdialogs.c:202 ../pidgin/gtkdialogs.c:203
+#: ../pidgin/gtkdialogs.c:206 ../pidgin/gtkdialogs.c:207
+#: ../pidgin/gtkdialogs.c:264 ../pidgin/gtkdialogs.c:265
 msgid "Serbian"
 msgstr "Serbian"
 
-#: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:258
-#: ../pidgin/gtkdialogs.c:259
+#: ../pidgin/gtkdialogs.c:208 ../pidgin/gtkdialogs.c:266
+#: ../pidgin/gtkdialogs.c:267
 msgid "Swedish"
 msgstr "Swedish"
 
-#: ../pidgin/gtkdialogs.c:205
+#: ../pidgin/gtkdialogs.c:209
 msgid "Tamil"
 msgstr "Tamil"
 
-#: ../pidgin/gtkdialogs.c:206
+#: ../pidgin/gtkdialogs.c:210
 msgid "Telugu"
 msgstr "Telugu"
 
-#: ../pidgin/gtkdialogs.c:207
+#: ../pidgin/gtkdialogs.c:211
 msgid "Thai"
 msgstr "Thai"
 
-#: ../pidgin/gtkdialogs.c:208 ../pidgin/gtkdialogs.c:260
+#: ../pidgin/gtkdialogs.c:212 ../pidgin/gtkdialogs.c:268
 msgid "Turkish"
 msgstr "Turkish"
 
-#: ../pidgin/gtkdialogs.c:209
+#: ../pidgin/gtkdialogs.c:213
 msgid "Vietnamese"
 msgstr "Vietnamese"
 
-#: ../pidgin/gtkdialogs.c:209
+#: ../pidgin/gtkdialogs.c:213
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh and the Gnome-Vi Team"
 
-#: ../pidgin/gtkdialogs.c:210 ../pidgin/gtkdialogs.c:261
+#: ../pidgin/gtkdialogs.c:214 ../pidgin/gtkdialogs.c:269
 msgid "Simplified Chinese"
 msgstr "Simplified Chinese"
 
-#: ../pidgin/gtkdialogs.c:211 ../pidgin/gtkdialogs.c:212
-#: ../pidgin/gtkdialogs.c:213
+#: ../pidgin/gtkdialogs.c:215 ../pidgin/gtkdialogs.c:216
+#: ../pidgin/gtkdialogs.c:217
 msgid "Hong Kong Chinese"
 msgstr "Hong Kong Chinese"
 
-#: ../pidgin/gtkdialogs.c:214 ../pidgin/gtkdialogs.c:215
-#: ../pidgin/gtkdialogs.c:262
+#: ../pidgin/gtkdialogs.c:218 ../pidgin/gtkdialogs.c:219
+#: ../pidgin/gtkdialogs.c:270
 msgid "Traditional Chinese"
 msgstr "Traditional Chinese"
 
-#: ../pidgin/gtkdialogs.c:221
+#: ../pidgin/gtkdialogs.c:225
 msgid "Amharic"
 msgstr "Amharic"
 
-#: ../pidgin/gtkdialogs.c:347
+#: ../pidgin/gtkdialogs.c:357
 #, c-format
 msgid "About %s"
 msgstr "About %s"
 
-#: ../pidgin/gtkdialogs.c:385
+#: ../pidgin/gtkdialogs.c:400
 #, c-format
 msgid ""
 "%s is a graphical modular messaging client based on libpurple which is "
@@ -14749,47 +14865,48 @@
 "complete list of contributors.  We provide no warranty for this program."
 "<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:403
+#: ../pidgin/gtkdialogs.c:418
+#, c-format
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:408
-msgid "Current Developers"
-msgstr "Current Developers"
-
 #: ../pidgin/gtkdialogs.c:423
-msgid "Crazy Patch Writers"
-msgstr "Crazy Patch Writers"
+msgid "Current Developers"
+msgstr "Current Developers"
 
 #: ../pidgin/gtkdialogs.c:438
+msgid "Crazy Patch Writers"
+msgstr "Crazy Patch Writers"
+
+#: ../pidgin/gtkdialogs.c:453
 msgid "Retired Developers"
 msgstr "Retired Developers"
 
-#: ../pidgin/gtkdialogs.c:453
-msgid "Retired Crazy Patch Writers"
-msgstr "Retired Crazy Patch Writers"
-
 #: ../pidgin/gtkdialogs.c:468
-msgid "Artists"
-msgstr "Artists"
+msgid "Retired Crazy Patch Writers"
+msgstr "Retired Crazy Patch Writers"
 
 #: ../pidgin/gtkdialogs.c:483
+msgid "Artists"
+msgstr "Artists"
+
+#: ../pidgin/gtkdialogs.c:498
 msgid "Current Translators"
 msgstr "Current Translators"
 
-#: ../pidgin/gtkdialogs.c:503
+#: ../pidgin/gtkdialogs.c:518
 msgid "Past Translators"
 msgstr "Past Translators"
 
-#: ../pidgin/gtkdialogs.c:521
+#: ../pidgin/gtkdialogs.c:536
 msgid "Debugging Information"
 msgstr "Debugging Information"
 
-#: ../pidgin/gtkdialogs.c:891
+#: ../pidgin/gtkdialogs.c:906
 msgid "Get User Info"
 msgstr "Get User Info"
 
-#: ../pidgin/gtkdialogs.c:893
+#: ../pidgin/gtkdialogs.c:908
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
@@ -14797,11 +14914,11 @@
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
 
-#: ../pidgin/gtkdialogs.c:983
+#: ../pidgin/gtkdialogs.c:998
 msgid "View User Log"
 msgstr "View User Log"
 
-#: ../pidgin/gtkdialogs.c:985
+#: ../pidgin/gtkdialogs.c:1000
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
@@ -14809,32 +14926,32 @@
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
 
-#: ../pidgin/gtkdialogs.c:1005
+#: ../pidgin/gtkdialogs.c:1020
 msgid "Alias Contact"
 msgstr "Alias Contact"
 
-#: ../pidgin/gtkdialogs.c:1006
+#: ../pidgin/gtkdialogs.c:1021
 msgid "Enter an alias for this contact."
 msgstr "Enter an alias for this contact."
 
-#: ../pidgin/gtkdialogs.c:1028
+#: ../pidgin/gtkdialogs.c:1043
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Enter an alias for %s."
 
-#: ../pidgin/gtkdialogs.c:1030
+#: ../pidgin/gtkdialogs.c:1045
 msgid "Alias Buddy"
 msgstr "Alias Buddy"
 
-#: ../pidgin/gtkdialogs.c:1051
+#: ../pidgin/gtkdialogs.c:1066
 msgid "Alias Chat"
 msgstr "Alias Chat"
 
-#: ../pidgin/gtkdialogs.c:1052
+#: ../pidgin/gtkdialogs.c:1067
 msgid "Enter an alias for this chat."
 msgstr "Enter an alias for this chat."
 
-#: ../pidgin/gtkdialogs.c:1091
+#: ../pidgin/gtkdialogs.c:1106
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -14849,15 +14966,15 @@
 "You are about to remove the contact containing %s and %d other buddies from "
 "your buddy list.  Do you want to continue?"
 
-#: ../pidgin/gtkdialogs.c:1099
+#: ../pidgin/gtkdialogs.c:1114
 msgid "Remove Contact"
 msgstr "Remove Contact"
 
-#: ../pidgin/gtkdialogs.c:1102
+#: ../pidgin/gtkdialogs.c:1117
 msgid "_Remove Contact"
 msgstr "_Remove Contact"
 
-#: ../pidgin/gtkdialogs.c:1133
+#: ../pidgin/gtkdialogs.c:1148
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
@@ -14866,15 +14983,15 @@
 "You are about to merge the group called %s into the group called %s. Do you "
 "want to continue?"
 
-#: ../pidgin/gtkdialogs.c:1140
+#: ../pidgin/gtkdialogs.c:1155
 msgid "Merge Groups"
 msgstr "Merge Groups"
 
-#: ../pidgin/gtkdialogs.c:1143
+#: ../pidgin/gtkdialogs.c:1158
 msgid "_Merge Groups"
 msgstr "_Merge Groups"
 
-#: ../pidgin/gtkdialogs.c:1193
+#: ../pidgin/gtkdialogs.c:1208
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -14883,30 +15000,30 @@
 "You are about to remove the group %s and all its members from your buddy "
 "list.  Do you want to continue?"
 
-#: ../pidgin/gtkdialogs.c:1196
+#: ../pidgin/gtkdialogs.c:1211
 msgid "Remove Group"
 msgstr "Remove Group"
 
-#: ../pidgin/gtkdialogs.c:1199
+#: ../pidgin/gtkdialogs.c:1214
 msgid "_Remove Group"
 msgstr "_Remove Group"
 
-#: ../pidgin/gtkdialogs.c:1232
+#: ../pidgin/gtkdialogs.c:1247
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 
-#: ../pidgin/gtkdialogs.c:1235
+#: ../pidgin/gtkdialogs.c:1250
 msgid "Remove Buddy"
 msgstr "Remove Buddy"
 
-#: ../pidgin/gtkdialogs.c:1238
+#: ../pidgin/gtkdialogs.c:1253
 msgid "_Remove Buddy"
 msgstr "_Remove Buddy"
 
-#: ../pidgin/gtkdialogs.c:1259
+#: ../pidgin/gtkdialogs.c:1274
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -14915,11 +15032,11 @@
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 
-#: ../pidgin/gtkdialogs.c:1262
+#: ../pidgin/gtkdialogs.c:1277
 msgid "Remove Chat"
 msgstr "Remove Chat"
 
-#: ../pidgin/gtkdialogs.c:1265
+#: ../pidgin/gtkdialogs.c:1280
 msgid "_Remove Chat"
 msgstr "_Remove Chat"
 
@@ -14944,6 +15061,7 @@
 msgstr "Mute Sounds"
 
 #: ../pidgin/gtkdocklet.c:535
+#, fuzzy
 msgid "Blink on new message"
 msgstr "Blink on new message"
 
@@ -14951,129 +15069,129 @@
 msgid "Quit"
 msgstr "Quit"
 
-#: ../pidgin/gtkft.c:153
+#: ../pidgin/gtkft.c:154
 msgid "Not started"
 msgstr "Not started"
 
-#: ../pidgin/gtkft.c:273
+#: ../pidgin/gtkft.c:274
 msgid "<b>Receiving As:</b>"
 msgstr "<b>Receiving As:</b>"
 
-#: ../pidgin/gtkft.c:275
+#: ../pidgin/gtkft.c:276
 msgid "<b>Receiving From:</b>"
 msgstr "<b>Receiving From:</b>"
 
-#: ../pidgin/gtkft.c:279
+#: ../pidgin/gtkft.c:280
 msgid "<b>Sending To:</b>"
 msgstr "<b>Sending To:</b>"
 
-#: ../pidgin/gtkft.c:281
+#: ../pidgin/gtkft.c:282
 msgid "<b>Sending As:</b>"
 msgstr "<b>Sending As:</b>"
 
-#: ../pidgin/gtkft.c:497
+#: ../pidgin/gtkft.c:498
 msgid "There is no application configured to open this type of file."
 msgstr "There is no application configured to open this type of file."
 
-#: ../pidgin/gtkft.c:502
+#: ../pidgin/gtkft.c:503
 msgid "An error occurred while opening the file."
 msgstr "An error occurred while opening the file."
 
-#: ../pidgin/gtkft.c:539
+#: ../pidgin/gtkft.c:540
 #, c-format
 msgid "Error launching %s: %s"
 msgstr "Error launching %s: %s"
 
-#: ../pidgin/gtkft.c:548
+#: ../pidgin/gtkft.c:549
 #, c-format
 msgid "Error running %s"
 msgstr "Error running %s"
 
-#: ../pidgin/gtkft.c:549
+#: ../pidgin/gtkft.c:550
 #, c-format
 msgid "Process returned error code %d"
 msgstr "Process returned error code %d"
 
-#: ../pidgin/gtkft.c:696
+#: ../pidgin/gtkft.c:697
 msgid "Filename:"
 msgstr "Filename:"
 
-#: ../pidgin/gtkft.c:697
+#: ../pidgin/gtkft.c:698
 msgid "Local File:"
 msgstr "Local File:"
 
-#: ../pidgin/gtkft.c:699
-msgid "Speed:"
-msgstr "Speed:"
-
 #: ../pidgin/gtkft.c:700
+msgid "Speed:"
+msgstr "Speed:"
+
+#: ../pidgin/gtkft.c:701
 msgid "Time Elapsed:"
 msgstr "Time Elapsed:"
 
-#: ../pidgin/gtkft.c:701
+#: ../pidgin/gtkft.c:702
 msgid "Time Remaining:"
 msgstr "Time Remaining:"
 
-#: ../pidgin/gtkft.c:783
+#: ../pidgin/gtkft.c:784
 msgid "Close this window when all transfers _finish"
 msgstr "Close this window when all transfers _finish"
 
-#: ../pidgin/gtkft.c:793
+#: ../pidgin/gtkft.c:794
 msgid "C_lear finished transfers"
 msgstr "C_lear finished transfers"
 
 #. "Download Details" arrow
-#: ../pidgin/gtkft.c:802
+#: ../pidgin/gtkft.c:803
 msgid "File transfer _details"
 msgstr "File transfer _details"
 
 #. Pause button
-#: ../pidgin/gtkft.c:832 ../pidgin/pidginstock.c:94
+#: ../pidgin/gtkft.c:833 ../pidgin/pidginstock.c:95
 msgid "_Pause"
 msgstr "_Pause"
 
 #. Resume button
-#: ../pidgin/gtkft.c:842
+#: ../pidgin/gtkft.c:843
 msgid "_Resume"
 msgstr "_Resume"
 
-#: ../pidgin/gtkimhtml.c:815
+#: ../pidgin/gtkimhtml.c:816
 msgid "Paste as Plain _Text"
 msgstr "Paste as Plain _Text"
 
-#: ../pidgin/gtkimhtml.c:832 ../pidgin/gtkimhtmltoolbar.c:1190
+#: ../pidgin/gtkimhtml.c:833 ../pidgin/gtkimhtmltoolbar.c:1194
 msgid "_Reset formatting"
 msgstr "_Reset formatting"
 
-#: ../pidgin/gtkimhtml.c:1372
+#: ../pidgin/gtkimhtml.c:1373
 msgid "Hyperlink color"
 msgstr "Hyperlink colour"
 
-#: ../pidgin/gtkimhtml.c:1373
+#: ../pidgin/gtkimhtml.c:1374
 msgid "Color to draw hyperlinks."
 msgstr "Colour to draw hyperlinks."
 
-#: ../pidgin/gtkimhtml.c:1376
+#: ../pidgin/gtkimhtml.c:1377
 msgid "Hyperlink prelight color"
 msgstr "Hyperlink prelight colour"
 
-#: ../pidgin/gtkimhtml.c:1377
+#: ../pidgin/gtkimhtml.c:1378
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "Colour to draw hyperlinks when mouse is over them."
 
-#: ../pidgin/gtkimhtml.c:1597
+#: ../pidgin/gtkimhtml.c:1598
 msgid "_Copy E-Mail Address"
 msgstr "_Copy E-Mail Address"
 
-#: ../pidgin/gtkimhtml.c:1609
+#: ../pidgin/gtkimhtml.c:1610
 msgid "_Open Link in Browser"
 msgstr "_Open Link in Browser"
 
-#: ../pidgin/gtkimhtml.c:1619
+#: ../pidgin/gtkimhtml.c:1620
 msgid "_Copy Link Location"
 msgstr "_Copy Link Location"
 
-#: ../pidgin/gtkimhtml.c:3365
+#: ../pidgin/gtkimhtml.c:3369
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -15083,7 +15201,7 @@
 "\n"
 "Defaulting to PNG."
 
-#: ../pidgin/gtkimhtml.c:3368
+#: ../pidgin/gtkimhtml.c:3372
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -15093,7 +15211,7 @@
 "\n"
 "Defaulting to PNG."
 
-#: ../pidgin/gtkimhtml.c:3397
+#: ../pidgin/gtkimhtml.c:3401
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -15104,7 +15222,7 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3400
+#: ../pidgin/gtkimhtml.c:3404
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -15115,35 +15233,36 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3478 ../pidgin/gtkimhtml.c:3490
+#: ../pidgin/gtkimhtml.c:3482 ../pidgin/gtkimhtml.c:3494
 msgid "Save Image"
 msgstr "Save Image"
 
-#: ../pidgin/gtkimhtml.c:3518
+#: ../pidgin/gtkimhtml.c:3522
+#, c-format
 msgid "_Save Image..."
 msgstr "_Save Image..."
 
-#: ../pidgin/gtkimhtmltoolbar.c:162
+#: ../pidgin/gtkimhtmltoolbar.c:163
 msgid "Select Font"
 msgstr "Select Font"
 
-#: ../pidgin/gtkimhtmltoolbar.c:241
+#: ../pidgin/gtkimhtmltoolbar.c:242
 msgid "Select Text Color"
 msgstr "Select Text Colour"
 
-#: ../pidgin/gtkimhtmltoolbar.c:320
+#: ../pidgin/gtkimhtmltoolbar.c:321
 msgid "Select Background Color"
 msgstr "Select Background Colour"
 
-#: ../pidgin/gtkimhtmltoolbar.c:409
+#: ../pidgin/gtkimhtmltoolbar.c:410
 msgid "_URL"
 msgstr "_URL"
 
-#: ../pidgin/gtkimhtmltoolbar.c:417
+#: ../pidgin/gtkimhtmltoolbar.c:418
 msgid "_Description"
 msgstr "_Description"
 
-#: ../pidgin/gtkimhtmltoolbar.c:420
+#: ../pidgin/gtkimhtmltoolbar.c:421
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
@@ -15151,156 +15270,156 @@
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
 
-#: ../pidgin/gtkimhtmltoolbar.c:424
+#: ../pidgin/gtkimhtmltoolbar.c:425
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "Please enter the URL of the link that you want to insert."
 
-#: ../pidgin/gtkimhtmltoolbar.c:429 ../pidgin/gtkimhtmltoolbar.c:1098
+#: ../pidgin/gtkimhtmltoolbar.c:430 ../pidgin/gtkimhtmltoolbar.c:1102
 msgid "Insert Link"
 msgstr "Insert Link"
 
-#: ../pidgin/gtkimhtmltoolbar.c:433 ../pidgin/gtkimhtmltoolbar.c:1258
+#: ../pidgin/gtkimhtmltoolbar.c:434 ../pidgin/gtkimhtmltoolbar.c:1262
 msgid "_Insert"
 msgstr "_Insert"
 
-#: ../pidgin/gtkimhtmltoolbar.c:513
+#: ../pidgin/gtkimhtmltoolbar.c:514
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Failed to store image: %s\n"
 
-#: ../pidgin/gtkimhtmltoolbar.c:539 ../pidgin/gtkimhtmltoolbar.c:549
+#: ../pidgin/gtkimhtmltoolbar.c:540 ../pidgin/gtkimhtmltoolbar.c:550
 msgid "Insert Image"
 msgstr "Insert Image"
 
-#: ../pidgin/gtkimhtmltoolbar.c:760
+#: ../pidgin/gtkimhtmltoolbar.c:761
 msgid "This theme has no available smileys."
 msgstr "This theme has no available smileys."
 
 #. show everything
-#: ../pidgin/gtkimhtmltoolbar.c:777
+#: ../pidgin/gtkimhtmltoolbar.c:778
 msgid "Smile!"
 msgstr "Smile!"
 
-#: ../pidgin/gtkimhtmltoolbar.c:842 ../pidgin/gtkimhtmltoolbar.c:1215
+#: ../pidgin/gtkimhtmltoolbar.c:846 ../pidgin/gtkimhtmltoolbar.c:1219
 msgid "_Font"
 msgstr "_Font"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1050
+#: ../pidgin/gtkimhtmltoolbar.c:1054
 msgid "Group Items"
 msgstr "Group Items"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1050
+#: ../pidgin/gtkimhtmltoolbar.c:1054
 msgid "Ungroup Items"
 msgstr "Ungroup Items"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1084 ../pidgin/plugins/convcolors.c:287
+#: ../pidgin/gtkimhtmltoolbar.c:1088 ../pidgin/plugins/convcolors.c:287
 msgid "Bold"
 msgstr "Bold"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1085 ../pidgin/plugins/convcolors.c:294
+#: ../pidgin/gtkimhtmltoolbar.c:1089 ../pidgin/plugins/convcolors.c:294
 msgid "Italic"
 msgstr "Italic"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1086 ../pidgin/plugins/convcolors.c:301
+#: ../pidgin/gtkimhtmltoolbar.c:1090 ../pidgin/plugins/convcolors.c:301
 msgid "Underline"
 msgstr "Underline"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1087
+#: ../pidgin/gtkimhtmltoolbar.c:1091
 msgid "Strikethrough"
 msgstr "Strikethrough"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1089
-msgid "Increase Font Size"
-msgstr "Increase Font Size"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1090
-msgid "Decrease Font Size"
-msgstr "Decrease Font Size"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1092
-msgid "Font Face"
-msgstr "Font Face"
-
 #: ../pidgin/gtkimhtmltoolbar.c:1093
-msgid "Background Color"
-msgstr "Background Colour"
+msgid "Increase Font Size"
+msgstr "Increase Font Size"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1094
+msgid "Decrease Font Size"
+msgstr "Decrease Font Size"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1096
+msgid "Font Face"
+msgstr "Font Face"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1097
+msgid "Background Color"
+msgstr "Background Colour"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1098
 msgid "Foreground Color"
 msgstr "Foreground Colour"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1096
+#: ../pidgin/gtkimhtmltoolbar.c:1100
 msgid "Reset Formatting"
 msgstr "Reset Formatting"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1099
+#: ../pidgin/gtkimhtmltoolbar.c:1103
 msgid "Insert IM Image"
 msgstr "Insert IM Image"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1100
+#: ../pidgin/gtkimhtmltoolbar.c:1104
 msgid "Insert Smiley"
 msgstr "Insert Smiley"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1175
+#: ../pidgin/gtkimhtmltoolbar.c:1179
 msgid "<b>_Bold</b>"
 msgstr "<b>_Bold</b>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1176
+#: ../pidgin/gtkimhtmltoolbar.c:1180
 msgid "<i>_Italic</i>"
 msgstr "<i>_Italic</i>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1177
+#: ../pidgin/gtkimhtmltoolbar.c:1181
 msgid "<u>_Underline</u>"
 msgstr "<u>_Underline</u>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1178
+#: ../pidgin/gtkimhtmltoolbar.c:1182
 msgid "<span strikethrough='true'>Strikethrough</span>"
 msgstr "<span strikethrough='true'>Strikethrough</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1179
+#: ../pidgin/gtkimhtmltoolbar.c:1183
 msgid "<span size='larger'>_Larger</span>"
 msgstr "<span size='larger'>_Larger</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1181
+#: ../pidgin/gtkimhtmltoolbar.c:1185
 msgid "_Normal"
 msgstr "_Normal"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1183
+#: ../pidgin/gtkimhtmltoolbar.c:1187
 msgid "<span size='smaller'>_Smaller</span>"
 msgstr "<span size='smaller'>_Smaller</span>"
 
 #. If we want to show the formatting for the following items, we would
 #. * need to update them when formatting changes. The above items don't need
 #. * no updating nor nothin'
-#: ../pidgin/gtkimhtmltoolbar.c:1187
+#: ../pidgin/gtkimhtmltoolbar.c:1191
 msgid "_Font face"
 msgstr "_Font face"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1188
+#: ../pidgin/gtkimhtmltoolbar.c:1192
 msgid "Foreground _color"
 msgstr "Foreground _colour"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1189
+#: ../pidgin/gtkimhtmltoolbar.c:1193
 msgid "Bac_kground color"
 msgstr "Bac_kground colour"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1266
+#: ../pidgin/gtkimhtmltoolbar.c:1270
 msgid "_Smiley"
 msgstr "_Smiley"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1272
+#: ../pidgin/gtkimhtmltoolbar.c:1276
 msgid "_Image"
 msgstr "_Image"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1278
+#: ../pidgin/gtkimhtmltoolbar.c:1282
 msgid "_Link"
 msgstr "_Link"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1284
+#: ../pidgin/gtkimhtmltoolbar.c:1288
 msgid "_Horizontal rule"
 msgstr "_Horizontal rule"
 
-#: ../pidgin/gtklog.c:292
+#: ../pidgin/gtklog.c:293
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation with "
@@ -15309,7 +15428,7 @@
 "Are you sure you want to permanently delete the log of the conversation with "
 "%s which started at %s?"
 
-#: ../pidgin/gtklog.c:303
+#: ../pidgin/gtklog.c:304
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation in %"
@@ -15318,7 +15437,7 @@
 "Are you sure you want to permanently delete the log of the conversation in %"
 "s which started at %s?"
 
-#: ../pidgin/gtklog.c:308
+#: ../pidgin/gtklog.c:309
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the system log which started at %"
@@ -15327,21 +15446,21 @@
 "Are you sure you want to permanently delete the system log which started at %"
 "s?"
 
-#: ../pidgin/gtklog.c:452
+#: ../pidgin/gtklog.c:453
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
 
-#: ../pidgin/gtklog.c:455
+#: ../pidgin/gtklog.c:456
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
 
-#: ../pidgin/gtklog.c:502
+#: ../pidgin/gtklog.c:503
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../pidgin/gtklog.c:549
+#: ../pidgin/gtklog.c:550
 msgid ""
 "System events will only be logged if the \"Log all status changes to system "
 "log\" preference is enabled."
@@ -15349,7 +15468,7 @@
 "System events will only be logged if the \"Log all status changes to system "
 "log\" preference is enabled."
 
-#: ../pidgin/gtklog.c:553
+#: ../pidgin/gtklog.c:554
 msgid ""
 "Instant messages will only be logged if the \"Log all instant messages\" "
 "preference is enabled."
@@ -15357,36 +15476,36 @@
 "Instant messages will only be logged if the \"Log all instant messages\" "
 "preference is enabled."
 
-#: ../pidgin/gtklog.c:556
+#: ../pidgin/gtklog.c:557
 msgid ""
 "Chats will only be logged if the \"Log all chats\" preference is enabled."
 msgstr ""
 "Chats will only be logged if the \"Log all chats\" preference is enabled."
 
-#: ../pidgin/gtklog.c:560
+#: ../pidgin/gtklog.c:561
 msgid "No logs were found"
 msgstr "No logs were found"
 
 #. Steal the "HELP" response and use it to trigger browsing to the logs folder
-#: ../pidgin/gtklog.c:575
+#: ../pidgin/gtklog.c:576
 msgid "_Browse logs folder"
 msgstr "_Browse logs folder"
 
-#: ../pidgin/gtklog.c:639
+#: ../pidgin/gtklog.c:640
 msgid "Total log size:"
 msgstr "Total log size:"
 
-#: ../pidgin/gtklog.c:708
+#: ../pidgin/gtklog.c:709
 #, c-format
 msgid "Conversations in %s"
 msgstr "Conversations in %s"
 
-#: ../pidgin/gtklog.c:716 ../pidgin/gtklog.c:778
+#: ../pidgin/gtklog.c:717 ../pidgin/gtklog.c:779
 #, c-format
 msgid "Conversations with %s"
 msgstr "Conversations with %s"
 
-#: ../pidgin/gtklog.c:803
+#: ../pidgin/gtklog.c:804
 msgid "System Log"
 msgstr "System Log"
 
@@ -15396,7 +15515,7 @@
 msgstr "%s %s. Try `%s -h' for more information.\n"
 
 #: ../pidgin/gtkmain.c:388
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
@@ -15423,7 +15542,7 @@
 "  -v, --version       display the current version and exit\n"
 
 #: ../pidgin/gtkmain.c:512
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s has segfaulted and attempted to dump a core file.\n"
 "This is a bug in the software and has happened through\n"
@@ -15463,66 +15582,66 @@
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../pidgin/gtkmain.c:699 ../pidgin/pidgin.h:50
+#: ../pidgin/gtkmain.c:699 ../pidgin/pidgin.h:51
 msgid "Pidgin"
 msgstr "Pidgin"
 
-#: ../pidgin/gtknotify.c:348
+#: ../pidgin/gtknotify.c:349
 msgid "Open All Messages"
 msgstr "Open All Messages"
 
-#: ../pidgin/gtknotify.c:401
+#: ../pidgin/gtknotify.c:402
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 
-#: ../pidgin/gtknotify.c:521
+#: ../pidgin/gtknotify.c:540
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s has %d new message."
 msgstr[1] "%s has %d new messages."
 
-#: ../pidgin/gtknotify.c:532
-#, c-format
+#: ../pidgin/gtknotify.c:564
+#, fuzzy, c-format
 msgid "<b>You have %d new e-mail.</b>"
 msgid_plural "<b>You have %d new e-mails.</b>"
 msgstr[0] "<b>You have %d new e-mail.</b>"
 msgstr[1] "<b>You have %d new e-mails.</b>"
 
-#: ../pidgin/gtknotify.c:957
+#: ../pidgin/gtknotify.c:989
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "The browser command \"%s\" is invalid."
 
-#: ../pidgin/gtknotify.c:959 ../pidgin/gtknotify.c:971
-#: ../pidgin/gtknotify.c:984 ../pidgin/gtknotify.c:1112
+#: ../pidgin/gtknotify.c:991 ../pidgin/gtknotify.c:1003
+#: ../pidgin/gtknotify.c:1016 ../pidgin/gtknotify.c:1144
 msgid "Unable to open URL"
 msgstr "Unable to open URL"
 
-#: ../pidgin/gtknotify.c:969 ../pidgin/gtknotify.c:982
+#: ../pidgin/gtknotify.c:1001 ../pidgin/gtknotify.c:1014
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "Error launching \"%s\": %s"
 
-#: ../pidgin/gtknotify.c:1113
+#: ../pidgin/gtknotify.c:1145
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 
-#: ../pidgin/gtkplugin.c:264
+#: ../pidgin/gtkplugin.c:265
 msgid "The following plugins will be unloaded."
 msgstr "The following plug-ins will be unloaded."
 
-#: ../pidgin/gtkplugin.c:283
+#: ../pidgin/gtkplugin.c:284
 msgid "Multiple plugins will be unloaded."
 msgstr "Multiple plug-ins will be unloaded."
 
-#: ../pidgin/gtkplugin.c:287
+#: ../pidgin/gtkplugin.c:288
 msgid "Unload Plugins"
 msgstr "Unload Plug-ins"
 
-#: ../pidgin/gtkplugin.c:399
+#: ../pidgin/gtkplugin.c:400
 #, c-format
 msgid ""
 "%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
@@ -15533,7 +15652,7 @@
 "<span weight=\"bold\">Web site:</span>\t\t%s\n"
 "<span weight=\"bold\">Filename:</span>\t%s"
 
-#: ../pidgin/gtkplugin.c:409
+#: ../pidgin/gtkplugin.c:410
 #, c-format
 msgid ""
 "%s\n"
@@ -15544,125 +15663,125 @@
 "<span foreground=\"#ff0000\" weight=\"bold\">Error: %s\n"
 "Check the plug-in website for an update.</span>"
 
-#: ../pidgin/gtkplugin.c:535
+#: ../pidgin/gtkplugin.c:536
 msgid "Configure Pl_ugin"
 msgstr "Configure Pl_ug-in"
 
-#: ../pidgin/gtkplugin.c:598
+#: ../pidgin/gtkplugin.c:599
 msgid "<b>Plugin Details</b>"
 msgstr "<b>Plug-in Details</b>"
 
-#: ../pidgin/gtkpounce.c:156
+#: ../pidgin/gtkpounce.c:157
 msgid "Select a file"
 msgstr "Select a file"
 
 #. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:531
+#: ../pidgin/gtkpounce.c:532
 msgid "Pounce on Whom"
 msgstr "Pounce on Whom"
 
-#: ../pidgin/gtkpounce.c:558
+#: ../pidgin/gtkpounce.c:559
 msgid "_Buddy name:"
 msgstr "_Buddy name:"
 
-#: ../pidgin/gtkpounce.c:592
+#: ../pidgin/gtkpounce.c:593
 msgid "Si_gns on"
 msgstr "Si_gns on"
 
-#: ../pidgin/gtkpounce.c:594
+#: ../pidgin/gtkpounce.c:595
 msgid "Signs o_ff"
 msgstr "Signs o_ff"
 
-#: ../pidgin/gtkpounce.c:596
+#: ../pidgin/gtkpounce.c:597
 msgid "Goes a_way"
 msgstr "Goes a_way"
 
-#: ../pidgin/gtkpounce.c:598
+#: ../pidgin/gtkpounce.c:599
 msgid "Ret_urns from away"
 msgstr "Ret_urn from away"
 
-#: ../pidgin/gtkpounce.c:600
+#: ../pidgin/gtkpounce.c:601
 msgid "Becomes _idle"
 msgstr "Becomes _idle"
 
-#: ../pidgin/gtkpounce.c:602
+#: ../pidgin/gtkpounce.c:603
 msgid "Is no longer i_dle"
 msgstr "Is no longer i_dle"
 
-#: ../pidgin/gtkpounce.c:604
+#: ../pidgin/gtkpounce.c:605
 msgid "Starts _typing"
 msgstr "Starts _typing"
 
-#: ../pidgin/gtkpounce.c:606
+#: ../pidgin/gtkpounce.c:607
 msgid "P_auses while typing"
 msgstr "P_auses while typing"
 
-#: ../pidgin/gtkpounce.c:608
+#: ../pidgin/gtkpounce.c:609
 msgid "Stops t_yping"
 msgstr "Stops t_yping"
 
-#: ../pidgin/gtkpounce.c:610
+#: ../pidgin/gtkpounce.c:611
 msgid "Sends a _message"
 msgstr "Sends a _message"
 
-#: ../pidgin/gtkpounce.c:653
+#: ../pidgin/gtkpounce.c:654
 msgid "Ope_n an IM window"
 msgstr "Ope_n a message window"
 
-#: ../pidgin/gtkpounce.c:655
+#: ../pidgin/gtkpounce.c:656
 msgid "_Pop up a notification"
 msgstr "_Pop up a notification"
 
-#: ../pidgin/gtkpounce.c:657
+#: ../pidgin/gtkpounce.c:658
 msgid "Send a _message"
 msgstr "Send a _message"
 
-#: ../pidgin/gtkpounce.c:659
+#: ../pidgin/gtkpounce.c:660
 msgid "E_xecute a command"
 msgstr "E_xecute a command"
 
-#: ../pidgin/gtkpounce.c:661
+#: ../pidgin/gtkpounce.c:662
 msgid "P_lay a sound"
 msgstr "P_lay a sound"
 
-#: ../pidgin/gtkpounce.c:667
+#: ../pidgin/gtkpounce.c:668
 msgid "Brows_e..."
 msgstr "Brows_e..."
 
-#: ../pidgin/gtkpounce.c:669
+#: ../pidgin/gtkpounce.c:670
 msgid "Br_owse..."
 msgstr "Br_owse..."
 
-#: ../pidgin/gtkpounce.c:670
+#: ../pidgin/gtkpounce.c:671
 msgid "Pre_view"
 msgstr "Pre_view"
 
-#: ../pidgin/gtkpounce.c:797
+#: ../pidgin/gtkpounce.c:798
 msgid "P_ounce only when my status is not Available"
 msgstr "P_ounce only when my status is not Available"
 
-#: ../pidgin/gtkpounce.c:802
+#: ../pidgin/gtkpounce.c:803
 msgid "_Recurring"
 msgstr "_Recurring"
 
-#: ../pidgin/gtkpounce.c:1245
+#: ../pidgin/gtkpounce.c:1246
 msgid "Pounce Target"
 msgstr "Pounce Target"
 
-#: ../pidgin/gtkprefs.c:385
+#: ../pidgin/gtkprefs.c:386
 #: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:1
 msgid "Default"
 msgstr "Default"
 
-#: ../pidgin/gtkprefs.c:516
+#: ../pidgin/gtkprefs.c:517
 msgid "Smiley theme failed to unpack."
 msgstr "Smiley theme failed to unpack."
 
-#: ../pidgin/gtkprefs.c:643
+#: ../pidgin/gtkprefs.c:644
 msgid "Install Theme"
 msgstr "Install Theme"
 
-#: ../pidgin/gtkprefs.c:696
+#: ../pidgin/gtkprefs.c:697
 msgid ""
 "Select a smiley theme that you would like to use from the list below. New "
 "themes can be installed by dragging and dropping them onto the theme list."
@@ -15670,132 +15789,132 @@
 "Select a smiley theme that you would like to use from the list below. New "
 "themes can be installed by dragging and dropping them onto the theme list."
 
-#: ../pidgin/gtkprefs.c:731
+#: ../pidgin/gtkprefs.c:732
 msgid "Icon"
 msgstr "Icon"
 
-#: ../pidgin/gtkprefs.c:893
+#: ../pidgin/gtkprefs.c:894
 msgid "System Tray Icon"
 msgstr "System Tray Icon"
 
-#: ../pidgin/gtkprefs.c:894
+#: ../pidgin/gtkprefs.c:895
 msgid "_Show system tray icon:"
 msgstr "_Show system tray icon:"
 
-#: ../pidgin/gtkprefs.c:898
+#: ../pidgin/gtkprefs.c:899
 msgid "On unread messages"
 msgstr "On unread messages"
 
-#: ../pidgin/gtkprefs.c:903
+#: ../pidgin/gtkprefs.c:904
 msgid "Conversation Window Hiding"
 msgstr "Conversation Window Hiding"
 
-#: ../pidgin/gtkprefs.c:904
+#: ../pidgin/gtkprefs.c:905
 msgid "_Hide new IM conversations:"
 msgstr "_Hide new IM conversations:"
 
-#: ../pidgin/gtkprefs.c:907 ../pidgin/gtkprefs.c:1943
+#: ../pidgin/gtkprefs.c:908 ../pidgin/gtkprefs.c:1944
 msgid "When away"
 msgstr "When away"
 
 #. All the tab options!
-#: ../pidgin/gtkprefs.c:915
+#: ../pidgin/gtkprefs.c:916
 msgid "Tabs"
 msgstr "Tabs"
 
-#: ../pidgin/gtkprefs.c:917
+#: ../pidgin/gtkprefs.c:918
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Show IMs and chats in _tabbed windows"
 
-#: ../pidgin/gtkprefs.c:931
+#: ../pidgin/gtkprefs.c:932
 msgid "Show close b_utton on tabs"
 msgstr "Show close b_utton on tabs"
 
-#: ../pidgin/gtkprefs.c:934
+#: ../pidgin/gtkprefs.c:935
 msgid "_Placement:"
 msgstr "_Placement"
 
-#: ../pidgin/gtkprefs.c:936
+#: ../pidgin/gtkprefs.c:937
 msgid "Top"
 msgstr "Top"
 
-#: ../pidgin/gtkprefs.c:937
+#: ../pidgin/gtkprefs.c:938
 msgid "Bottom"
 msgstr "Bottom"
 
-#: ../pidgin/gtkprefs.c:938
+#: ../pidgin/gtkprefs.c:939
 msgid "Left"
 msgstr "Left"
 
-#: ../pidgin/gtkprefs.c:939
+#: ../pidgin/gtkprefs.c:940
 msgid "Right"
 msgstr "Right"
 
-#: ../pidgin/gtkprefs.c:941
+#: ../pidgin/gtkprefs.c:942
 msgid "Left Vertical"
 msgstr "Left Vertical"
 
-#: ../pidgin/gtkprefs.c:942
+#: ../pidgin/gtkprefs.c:943
 msgid "Right Vertical"
 msgstr "Right Vertical"
 
-#: ../pidgin/gtkprefs.c:949
+#: ../pidgin/gtkprefs.c:950
 msgid "N_ew conversations:"
 msgstr "N_ew conversations:"
 
-#: ../pidgin/gtkprefs.c:994
+#: ../pidgin/gtkprefs.c:995
 msgid "Show _formatting on incoming messages"
 msgstr "Show _formatting on incoming messages"
 
-#: ../pidgin/gtkprefs.c:997
+#: ../pidgin/gtkprefs.c:998
 msgid "Show _detailed information"
 msgstr "Show _detailed information"
 
-#: ../pidgin/gtkprefs.c:999
+#: ../pidgin/gtkprefs.c:1000
 msgid "Enable buddy ic_on animation"
 msgstr "Enable buddy ic_on animation"
 
-#: ../pidgin/gtkprefs.c:1006
+#: ../pidgin/gtkprefs.c:1007
 msgid "_Notify buddies that you are typing to them"
 msgstr "_Notify buddies that you are typing to them"
 
-#: ../pidgin/gtkprefs.c:1009
+#: ../pidgin/gtkprefs.c:1010
 msgid "Highlight _misspelled words"
 msgstr "Highlight _misspelled words"
 
-#: ../pidgin/gtkprefs.c:1013
+#: ../pidgin/gtkprefs.c:1014
 msgid "Use smooth-scrolling"
 msgstr "Use smooth-scrolling"
 
-#: ../pidgin/gtkprefs.c:1016
+#: ../pidgin/gtkprefs.c:1017
 msgid "F_lash window when IMs are received"
 msgstr "F_lash window when IMs are received"
 
-#: ../pidgin/gtkprefs.c:1018
+#: ../pidgin/gtkprefs.c:1019
 msgid "Minimi_ze new conversation windows"
 msgstr "Minimi_ze new conversation windows"
 
-#: ../pidgin/gtkprefs.c:1022
+#: ../pidgin/gtkprefs.c:1023
 msgid "Font"
 msgstr "Font"
 
-#: ../pidgin/gtkprefs.c:1024
+#: ../pidgin/gtkprefs.c:1025
 msgid "Use document font from _theme"
 msgstr "Use document font from _theme"
 
-#: ../pidgin/gtkprefs.c:1026
+#: ../pidgin/gtkprefs.c:1027
 msgid "Use font from _theme"
 msgstr "Use font from _theme"
 
-#: ../pidgin/gtkprefs.c:1028
+#: ../pidgin/gtkprefs.c:1029
 msgid "Conversation _font:"
 msgstr "Conversation _font:"
 
-#: ../pidgin/gtkprefs.c:1042
+#: ../pidgin/gtkprefs.c:1043
 msgid "Default Formatting"
 msgstr "Default Formatting"
 
-#: ../pidgin/gtkprefs.c:1061
+#: ../pidgin/gtkprefs.c:1062
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting."
@@ -15803,119 +15922,119 @@
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting."
 
-#: ../pidgin/gtkprefs.c:1127
+#: ../pidgin/gtkprefs.c:1128
 msgid "ST_UN server:"
 msgstr "ST_UN Server:"
 
-#: ../pidgin/gtkprefs.c:1139
+#: ../pidgin/gtkprefs.c:1140
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Example: stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1143
+#: ../pidgin/gtkprefs.c:1144
 msgid "_Autodetect IP address"
 msgstr "_Autodetect IP address"
 
-#: ../pidgin/gtkprefs.c:1152
+#: ../pidgin/gtkprefs.c:1153
 msgid "Public _IP:"
 msgstr "Public _IP:"
 
-#: ../pidgin/gtkprefs.c:1181
+#: ../pidgin/gtkprefs.c:1182
 msgid "Ports"
 msgstr "Ports"
 
-#: ../pidgin/gtkprefs.c:1184
+#: ../pidgin/gtkprefs.c:1185
 msgid "_Manually specify range of ports to listen on"
 msgstr "_Manually specify range of ports to listen on"
 
-#: ../pidgin/gtkprefs.c:1187
+#: ../pidgin/gtkprefs.c:1188
 msgid "_Start port:"
 msgstr "_Start port:"
 
-#: ../pidgin/gtkprefs.c:1194
+#: ../pidgin/gtkprefs.c:1195
 msgid "_End port:"
 msgstr "_End port:"
 
-#: ../pidgin/gtkprefs.c:1202
+#: ../pidgin/gtkprefs.c:1203
 msgid "Proxy Server"
 msgstr "Proxy Server"
 
-#: ../pidgin/gtkprefs.c:1206
+#: ../pidgin/gtkprefs.c:1207
 msgid "No proxy"
 msgstr "No proxy"
 
-#: ../pidgin/gtkprefs.c:1262
+#: ../pidgin/gtkprefs.c:1263
 msgid "_User:"
 msgstr "_User:"
 
-#: ../pidgin/gtkprefs.c:1327
+#: ../pidgin/gtkprefs.c:1328
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
-#: ../pidgin/gtkprefs.c:1328
+#: ../pidgin/gtkprefs.c:1329
 msgid "Opera"
 msgstr "Opera"
 
-#: ../pidgin/gtkprefs.c:1329
-msgid "Netscape"
-msgstr "Netscape"
-
 #: ../pidgin/gtkprefs.c:1330
-msgid "Mozilla"
-msgstr "Mozilla"
+msgid "Netscape"
+msgstr "Netscape"
 
 #: ../pidgin/gtkprefs.c:1331
+msgid "Mozilla"
+msgstr "Mozilla"
+
+#: ../pidgin/gtkprefs.c:1332
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../pidgin/gtkprefs.c:1332
-msgid "GNOME Default"
-msgstr "GNOME Default"
-
 #: ../pidgin/gtkprefs.c:1333
+msgid "GNOME Default"
+msgstr "GNOME Default"
+
+#: ../pidgin/gtkprefs.c:1334
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../pidgin/gtkprefs.c:1334
+#: ../pidgin/gtkprefs.c:1335
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../pidgin/gtkprefs.c:1335
+#: ../pidgin/gtkprefs.c:1336
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../pidgin/gtkprefs.c:1336
+#: ../pidgin/gtkprefs.c:1337
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1345
+#: ../pidgin/gtkprefs.c:1346
 msgid "Manual"
 msgstr "Manual"
 
-#: ../pidgin/gtkprefs.c:1398
+#: ../pidgin/gtkprefs.c:1399
 msgid "Browser Selection"
 msgstr "Browser Selection"
 
-#: ../pidgin/gtkprefs.c:1402
+#: ../pidgin/gtkprefs.c:1403
 msgid "_Browser:"
 msgstr "_Browser:"
 
-#: ../pidgin/gtkprefs.c:1410
+#: ../pidgin/gtkprefs.c:1411
 msgid "_Open link in:"
 msgstr "_Open Link in:"
 
-#: ../pidgin/gtkprefs.c:1412
+#: ../pidgin/gtkprefs.c:1413
 msgid "Browser default"
 msgstr "Browser default"
 
-#: ../pidgin/gtkprefs.c:1413
+#: ../pidgin/gtkprefs.c:1414
 msgid "Existing window"
 msgstr "Existing window"
 
-#: ../pidgin/gtkprefs.c:1415
+#: ../pidgin/gtkprefs.c:1416
 msgid "New tab"
 msgstr "New tab"
 
-#: ../pidgin/gtkprefs.c:1429
+#: ../pidgin/gtkprefs.c:1430
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -15924,63 +16043,69 @@
 "_Manual:\n"
 "(%s for URL)"
 
-#: ../pidgin/gtkprefs.c:1469
+#: ../pidgin/gtkprefs.c:1470
 msgid "Log _format:"
 msgstr "Log _format:"
 
-#: ../pidgin/gtkprefs.c:1474
+#: ../pidgin/gtkprefs.c:1475
 msgid "Log all _instant messages"
 msgstr "Log all _instant messages"
 
-#: ../pidgin/gtkprefs.c:1476
+#: ../pidgin/gtkprefs.c:1477
 msgid "Log all c_hats"
 msgstr "Log all c_hats"
 
-#: ../pidgin/gtkprefs.c:1478
+#: ../pidgin/gtkprefs.c:1479
 msgid "Log all _status changes to system log"
 msgstr "Log all _status changes to system log"
 
-#: ../pidgin/gtkprefs.c:1624
+#: ../pidgin/gtkprefs.c:1625
 msgid "Sound Selection"
 msgstr "Sound Selection"
 
-#: ../pidgin/gtkprefs.c:1634
+#: ../pidgin/gtkprefs.c:1635
+#, c-format
 msgid "Quietest"
 msgstr "Quietest"
 
-#: ../pidgin/gtkprefs.c:1636
+#: ../pidgin/gtkprefs.c:1637
+#, c-format
 msgid "Quieter"
 msgstr "Quieter"
 
-#: ../pidgin/gtkprefs.c:1638
+#: ../pidgin/gtkprefs.c:1639
+#, c-format
 msgid "Quiet"
 msgstr "Quiet"
 
-#: ../pidgin/gtkprefs.c:1642
+#: ../pidgin/gtkprefs.c:1643
+#, c-format
 msgid "Loud"
 msgstr "Loud"
 
-#: ../pidgin/gtkprefs.c:1644
+#: ../pidgin/gtkprefs.c:1645
+#, c-format
 msgid "Louder"
 msgstr "Louder"
 
-#: ../pidgin/gtkprefs.c:1646
+#: ../pidgin/gtkprefs.c:1647
+#, c-format
 msgid "Loudest"
 msgstr "Loudest"
 
-#: ../pidgin/gtkprefs.c:1712
+#: ../pidgin/gtkprefs.c:1713
 msgid "_Method:"
 msgstr "_Method:"
 
-#: ../pidgin/gtkprefs.c:1714
+#: ../pidgin/gtkprefs.c:1715
 msgid "Console beep"
 msgstr "Console beep"
 
-#: ../pidgin/gtkprefs.c:1721
+#: ../pidgin/gtkprefs.c:1722
 msgid "No sounds"
 msgstr "No sounds"
 
-#: ../pidgin/gtkprefs.c:1729
+#: ../pidgin/gtkprefs.c:1730
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -15989,166 +16114,166 @@
 "Sound c_ommand:\n"
 "(%s for filename)"
 
-#: ../pidgin/gtkprefs.c:1756
+#: ../pidgin/gtkprefs.c:1757
 msgid "Sounds when conversation has _focus"
 msgstr "Sounds when conversation has _focus"
 
-#: ../pidgin/gtkprefs.c:1758
+#: ../pidgin/gtkprefs.c:1759
 msgid "Enable sounds:"
 msgstr "Enable sounds:"
 
-#: ../pidgin/gtkprefs.c:1769
+#: ../pidgin/gtkprefs.c:1770
 msgid "Volume:"
 msgstr "Volume:"
 
-#: ../pidgin/gtkprefs.c:1849
+#: ../pidgin/gtkprefs.c:1850
 msgid "Play"
 msgstr "Play"
 
-#: ../pidgin/gtkprefs.c:1926
+#: ../pidgin/gtkprefs.c:1927
 msgid "_Report idle time:"
 msgstr "_Report idle time:"
 
-#: ../pidgin/gtkprefs.c:1931
+#: ../pidgin/gtkprefs.c:1932
 msgid "Based on keyboard or mouse use"
 msgstr "Based on keyboard or mouse use"
 
-#: ../pidgin/gtkprefs.c:1940
+#: ../pidgin/gtkprefs.c:1941
 msgid "_Auto-reply:"
 msgstr "_Auto-reply:"
 
-#: ../pidgin/gtkprefs.c:1944
+#: ../pidgin/gtkprefs.c:1945
 msgid "When both away and idle"
 msgstr "When both away and idle"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1950
+#: ../pidgin/gtkprefs.c:1951
 msgid "Auto-away"
 msgstr "Auto-away"
 
-#: ../pidgin/gtkprefs.c:1952
+#: ../pidgin/gtkprefs.c:1953
 msgid "Change status when _idle"
 msgstr "Change status when _idle"
 
-#: ../pidgin/gtkprefs.c:1956
+#: ../pidgin/gtkprefs.c:1957
 msgid "_Minutes before becoming idle:"
 msgstr "_Minutes before becoming idle:"
 
-#: ../pidgin/gtkprefs.c:1964
+#: ../pidgin/gtkprefs.c:1965
 msgid "Change _status to:"
 msgstr "Change _status to:"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1985
+#: ../pidgin/gtkprefs.c:1986
 msgid "Status at Startup"
 msgstr "Status at Startup"
 
-#: ../pidgin/gtkprefs.c:1987
+#: ../pidgin/gtkprefs.c:1988
 msgid "Use status from last _exit at startup"
 msgstr "Use status from last _exit at startup"
 
-#: ../pidgin/gtkprefs.c:1993
+#: ../pidgin/gtkprefs.c:1994
 msgid "Status to a_pply at startup:"
 msgstr "Status to a_pply at startup:"
 
-#: ../pidgin/gtkprefs.c:2031
+#: ../pidgin/gtkprefs.c:2032
 msgid "Interface"
 msgstr "Interface"
 
-#: ../pidgin/gtkprefs.c:2033
+#: ../pidgin/gtkprefs.c:2034
 msgid "Smiley Themes"
 msgstr "Smiley Themes"
 
-#: ../pidgin/gtkprefs.c:2040
+#: ../pidgin/gtkprefs.c:2041
 msgid "Browser"
 msgstr "Browser"
 
-#: ../pidgin/gtkprefs.c:2044
+#: ../pidgin/gtkprefs.c:2045
 msgid "Status / Idle"
 msgstr "Status / Idle"
 
-#: ../pidgin/gtkprivacy.c:79
+#: ../pidgin/gtkprivacy.c:80
 msgid "Allow all users to contact me"
 msgstr "Allow all users to contact me"
 
-#: ../pidgin/gtkprivacy.c:80
+#: ../pidgin/gtkprivacy.c:81
 msgid "Allow only the users on my buddy list"
 msgstr "Allow only the users on my buddy list"
 
-#: ../pidgin/gtkprivacy.c:81
-msgid "Allow only the users below"
-msgstr "Allow only the users below"
-
 #: ../pidgin/gtkprivacy.c:82
+msgid "Allow only the users below"
+msgstr "Allow only the users below"
+
+#: ../pidgin/gtkprivacy.c:83
 msgid "Block all users"
 msgstr "Block all users"
 
-#: ../pidgin/gtkprivacy.c:83
+#: ../pidgin/gtkprivacy.c:84
 msgid "Block only the users below"
 msgstr "Block only the users below"
 
-#: ../pidgin/gtkprivacy.c:369
+#: ../pidgin/gtkprivacy.c:370
 msgid "Privacy"
 msgstr "Privacy"
 
-#: ../pidgin/gtkprivacy.c:381
+#: ../pidgin/gtkprivacy.c:382
 msgid "Changes to privacy settings take effect immediately."
 msgstr "Changes to privacy settings take effect immediately."
 
 #. "Set privacy for:" label
-#: ../pidgin/gtkprivacy.c:393
+#: ../pidgin/gtkprivacy.c:394
 msgid "Set privacy for:"
 msgstr "Set privacy for:"
 
-#: ../pidgin/gtkprivacy.c:556 ../pidgin/gtkprivacy.c:573
+#: ../pidgin/gtkprivacy.c:557 ../pidgin/gtkprivacy.c:574
 msgid "Permit User"
 msgstr "Permit User"
 
-#: ../pidgin/gtkprivacy.c:557
+#: ../pidgin/gtkprivacy.c:558
 msgid "Type a user you permit to contact you."
 msgstr "Type a user you permit to contact you."
 
-#: ../pidgin/gtkprivacy.c:558
+#: ../pidgin/gtkprivacy.c:559
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr "Please enter the name of the user you wish to be able to contact you."
 
-#: ../pidgin/gtkprivacy.c:561 ../pidgin/gtkprivacy.c:577
+#: ../pidgin/gtkprivacy.c:562 ../pidgin/gtkprivacy.c:578
 msgid "_Permit"
 msgstr "_Permit"
 
-#: ../pidgin/gtkprivacy.c:567
+#: ../pidgin/gtkprivacy.c:568
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "Allow %s to contact you?"
 
-#: ../pidgin/gtkprivacy.c:569
+#: ../pidgin/gtkprivacy.c:570
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "Are you sure you wish to allow %s to contact you?"
 
-#: ../pidgin/gtkprivacy.c:598 ../pidgin/gtkprivacy.c:612
+#: ../pidgin/gtkprivacy.c:599 ../pidgin/gtkprivacy.c:613
 msgid "Block User"
 msgstr "Block User"
 
-#: ../pidgin/gtkprivacy.c:599
+#: ../pidgin/gtkprivacy.c:600
 msgid "Type a user to block."
 msgstr "Type a user to block."
 
-#: ../pidgin/gtkprivacy.c:600
+#: ../pidgin/gtkprivacy.c:601
 msgid "Please enter the name of the user you wish to block."
 msgstr "Please enter the name of the user you wish to block."
 
-#: ../pidgin/gtkprivacy.c:608
+#: ../pidgin/gtkprivacy.c:609
 #, c-format
 msgid "Block %s?"
 msgstr "Block %s?"
 
-#: ../pidgin/gtkprivacy.c:610
+#: ../pidgin/gtkprivacy.c:611
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "Are you sure you want to block %s?"
 
-#: ../pidgin/gtkrequest.c:271
+#: ../pidgin/gtkrequest.c:272
 msgid "Apply"
 msgstr "Apply"
 
@@ -16173,83 +16298,83 @@
 msgstr "Select Folder..."
 
 #. Create the window.
-#: ../pidgin/gtkroomlist.c:374
+#: ../pidgin/gtkroomlist.c:375
 msgid "Room List"
 msgstr "Room List"
 
 #. list button
-#: ../pidgin/gtkroomlist.c:442
+#: ../pidgin/gtkroomlist.c:443
 msgid "_Get List"
 msgstr "_Get List"
 
 #. add button
-#: ../pidgin/gtkroomlist.c:450
+#: ../pidgin/gtkroomlist.c:451
 msgid "_Add Chat"
 msgstr "_Add Chat"
 
-#: ../pidgin/gtksavedstatuses.c:336
+#: ../pidgin/gtksavedstatuses.c:337
 msgid "Are you sure you want to delete the selected saved statuses?"
 msgstr "Are you sure you want to delete the selected saved statuses?"
 
 #. Use button
-#: ../pidgin/gtksavedstatuses.c:619 ../pidgin/gtksavedstatuses.c:1265
+#: ../pidgin/gtksavedstatuses.c:620 ../pidgin/gtksavedstatuses.c:1266
 msgid "_Use"
 msgstr "_Use"
 
-#: ../pidgin/gtksavedstatuses.c:779
+#: ../pidgin/gtksavedstatuses.c:780
 msgid "Title already in use.  You must choose a unique title."
 msgstr "Title already in use.  You must choose a unique title."
 
-#: ../pidgin/gtksavedstatuses.c:969
+#: ../pidgin/gtksavedstatuses.c:970
 msgid "Different"
 msgstr "Different"
 
-#: ../pidgin/gtksavedstatuses.c:1158
+#: ../pidgin/gtksavedstatuses.c:1159
 msgid "_Title:"
 msgstr "_Title:"
 
-#: ../pidgin/gtksavedstatuses.c:1177 ../pidgin/gtksavedstatuses.c:1496
+#: ../pidgin/gtksavedstatuses.c:1178 ../pidgin/gtksavedstatuses.c:1497
 msgid "_Status:"
 msgstr "_Status:"
 
 #. Different status message expander
-#: ../pidgin/gtksavedstatuses.c:1209
+#: ../pidgin/gtksavedstatuses.c:1210
 msgid "Use a _different status for some accounts"
 msgstr "Use a _different status for some accounts"
 
 #. Save & Use button
-#: ../pidgin/gtksavedstatuses.c:1273
+#: ../pidgin/gtksavedstatuses.c:1274
 msgid "Sa_ve & Use"
 msgstr "Sa_ve & Use"
 
-#: ../pidgin/gtksavedstatuses.c:1479
+#: ../pidgin/gtksavedstatuses.c:1480
 #, c-format
 msgid "Status for %s"
 msgstr "Status for %s"
 
-#: ../pidgin/gtkstatusbox.c:663
+#: ../pidgin/gtkstatusbox.c:664
 msgid "Waiting for network connection"
 msgstr "Waiting for network connection"
 
-#: ../pidgin/gtkutils.c:631
+#: ../pidgin/gtkutils.c:632
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../pidgin/gtkutils.c:1398 ../pidgin/gtkutils.c:1421
+#: ../pidgin/gtkutils.c:1399 ../pidgin/gtkutils.c:1422
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "The following error has occurred loading %s: %s"
 
-#: ../pidgin/gtkutils.c:1401 ../pidgin/gtkutils.c:1423
+#: ../pidgin/gtkutils.c:1402 ../pidgin/gtkutils.c:1424
 msgid "Failed to load image"
 msgstr "Failed to load image"
 
-#: ../pidgin/gtkutils.c:1497
+#: ../pidgin/gtkutils.c:1498
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "Cannot send folder %s."
 
-#: ../pidgin/gtkutils.c:1498
+#: ../pidgin/gtkutils.c:1499
 #, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
@@ -16258,12 +16383,12 @@
 "%s cannot transfer a folder. You will need to send the files within "
 "individually."
 
-#: ../pidgin/gtkutils.c:1530 ../pidgin/gtkutils.c:1542
-#: ../pidgin/gtkutils.c:1549
+#: ../pidgin/gtkutils.c:1531 ../pidgin/gtkutils.c:1543
+#: ../pidgin/gtkutils.c:1550
 msgid "You have dragged an image"
 msgstr "You have dragged an image"
 
-#: ../pidgin/gtkutils.c:1531
+#: ../pidgin/gtkutils.c:1532
 msgid ""
 "You can send this image as a file transfer, embed it into this message, or "
 "use it as the buddy icon for this user."
@@ -16271,23 +16396,23 @@
 "You can send this image as a file transfer, embed it into this message, or "
 "use it as the buddy icon for this user."
 
-#: ../pidgin/gtkutils.c:1537 ../pidgin/gtkutils.c:1557
+#: ../pidgin/gtkutils.c:1538 ../pidgin/gtkutils.c:1558
 msgid "Set as buddy icon"
 msgstr "Set as buddy icon"
 
-#: ../pidgin/gtkutils.c:1538 ../pidgin/gtkutils.c:1558
+#: ../pidgin/gtkutils.c:1539 ../pidgin/gtkutils.c:1559
 msgid "Send image file"
 msgstr "Send image file"
 
-#: ../pidgin/gtkutils.c:1539 ../pidgin/gtkutils.c:1558
+#: ../pidgin/gtkutils.c:1540 ../pidgin/gtkutils.c:1559
 msgid "Insert in message"
 msgstr "Insert in message"
 
-#: ../pidgin/gtkutils.c:1543
+#: ../pidgin/gtkutils.c:1544
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "Would you like to set it as the buddy icon for this user?"
 
-#: ../pidgin/gtkutils.c:1550
+#: ../pidgin/gtkutils.c:1551
 msgid ""
 "You can send this image as a file transfer, or use it as the buddy icon for "
 "this user."
@@ -16295,7 +16420,7 @@
 "You can send this image as a file transfer, or use it as the buddy icon for "
 "this user."
 
-#: ../pidgin/gtkutils.c:1551
+#: ../pidgin/gtkutils.c:1552
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -16308,11 +16433,11 @@
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: ../pidgin/gtkutils.c:1609
+#: ../pidgin/gtkutils.c:1610
 msgid "Cannot send launcher"
 msgstr "Cannot send launcher"
 
-#: ../pidgin/gtkutils.c:1609
+#: ../pidgin/gtkutils.c:1610
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
@@ -16320,7 +16445,7 @@
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
 
-#: ../pidgin/gtkutils.c:2344
+#: ../pidgin/gtkutils.c:2345
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -16331,25 +16456,25 @@
 "<b>File size:</b> %s\n"
 "<b>Image size:</b> %dx%d"
 
-#: ../pidgin/gtkutils.c:2640
+#: ../pidgin/gtkutils.c:2641
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr "The file '%s' is too large for %s.  Please try a smaller image.\n"
 
-#: ../pidgin/gtkutils.c:2642
+#: ../pidgin/gtkutils.c:2643
 msgid "Icon Error"
 msgstr "Icon Error"
 
-#: ../pidgin/gtkutils.c:2643
+#: ../pidgin/gtkutils.c:2644
 msgid "Could not set icon"
 msgstr "Could not set icon"
 
-#: ../pidgin/gtkutils.c:2743
+#: ../pidgin/gtkutils.c:2744
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Failed to open file \"%s\": %s"
 
-#: ../pidgin/gtkutils.c:2792
+#: ../pidgin/gtkutils.c:2793
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -16364,27 +16489,27 @@
 msgid "Select color"
 msgstr "Select colour"
 
-#: ../pidgin/pidginstock.c:86
+#: ../pidgin/pidginstock.c:87
 msgid "_Alias"
 msgstr "_Alias"
 
-#: ../pidgin/pidginstock.c:88
+#: ../pidgin/pidginstock.c:89
 msgid "Close _tabs"
 msgstr "Close _tabs"
 
-#: ../pidgin/pidginstock.c:90
+#: ../pidgin/pidginstock.c:91
 msgid "_Get Info"
 msgstr "_Get Info"
 
-#: ../pidgin/pidginstock.c:91
+#: ../pidgin/pidginstock.c:92
 msgid "_Invite"
 msgstr "_Invite"
 
-#: ../pidgin/pidginstock.c:92
+#: ../pidgin/pidginstock.c:93
 msgid "_Modify"
 msgstr "_Modify"
 
-#: ../pidgin/pidginstock.c:93
+#: ../pidgin/pidginstock.c:94
 msgid "_Open Mail"
 msgstr "_Open Mail"
 
@@ -16688,19 +16813,19 @@
 msgstr "Select a person from your address book below, or add a new person."
 
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:551
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:303
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:301
 msgid "Group:"
 msgstr "Group:"
 
 #. "New Person" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:577
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:576
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:467
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:249
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:248
 msgid "New Person"
 msgstr "New Person"
 
 #. "Select Buddy" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:594
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:593
 msgid "Select Buddy"
 msgstr "Select Buddy"
 
@@ -16773,32 +16898,32 @@
 msgid "Provides integration with Evolution."
 msgstr "Provides integration with Evolution."
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:263
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:262
 msgid "Please enter the person's information below."
 msgstr "Please enter the person's information below."
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:267
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:266
 msgid "Please enter the buddy's screen name and account type below."
 msgstr "Please enter the buddy's screen name and account type below."
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:287
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:286
 msgid "Account type:"
 msgstr "Account type:"
 
 #. Optional Information section
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:311
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:309
 msgid "Optional information:"
 msgstr "Optional information:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:346
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:344
 msgid "First name:"
 msgstr "Forename"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:358
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:356
 msgid "Last name:"
 msgstr "Surname"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:378
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:376
 msgid "E-mail:"
 msgstr "E-mail:"
 
@@ -16821,7 +16946,7 @@
 msgid "Test to see that all ui signals are working properly."
 msgstr "Test to see that all UI signals are working properly."
 
-#: ../pidgin/plugins/gtkbuddynote.c:34
+#: ../pidgin/plugins/gtkbuddynote.c:36
 #, c-format
 msgid ""
 "\n"
@@ -16896,32 +17021,32 @@
 msgid "Music messaging session confirmed."
 msgstr "Music messaging session confirmed."
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:428
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:430
 msgid "Music Messaging"
 msgstr "Music Messaging"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:429
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:431
 msgid "There was a conflict in running the command:"
 msgstr "There was a conflict in running the command:"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:537
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:539
 msgid "Error Running Editor"
 msgstr "Error Running Editor"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:538
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:540
 msgid "The following error has occurred:"
 msgstr "The following error has occurred:"
 
 #. Configuration frame
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:637
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:639
 msgid "Music Messaging Configuration"
 msgstr "Music Messaging Configuration"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:641
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:643
 msgid "Score Editor Path"
 msgstr "Score Editor Path"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:642
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:644
 msgid "_Apply"
 msgstr "_Apply"
 
@@ -16933,12 +17058,12 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:683
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:685
 msgid "Music Messaging Plugin for collaborative composition."
 msgstr "Music Messaging Plugin for collaborative composition."
 
 #. *  summary
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:685
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:687
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
 "on a piece of music by editting a common score in real-time."
@@ -17107,6 +17232,7 @@
 msgstr "Select Colour"
 
 #: ../pidgin/plugins/pidginrc.c:300
+#, c-format
 msgid "Select Interface Font"
 msgstr "Select Interface Font"
 
@@ -17350,6 +17476,7 @@
 msgstr "Timestamp Format Options"
 
 #: ../pidgin/plugins/timestamp_format.c:26
+#, c-format
 msgid "_Force 24-hour time format"
 msgstr "_Force 24-hour time format"
 
@@ -17564,3 +17691,115 @@
 #: ../pidgin/plugins/xmppconsole.c:865
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "This plugin is useful for debugging XMPP servers or clients."
+
+#, fuzzy
+#~ msgid "Show"
+#~ msgstr "Show All"
+
+#, fuzzy
+#~ msgid "Offline buddies"
+#~ msgstr "Show offline buddies"
+
+#, fuzzy
+#~ msgid "Sort"
+#~ msgstr "Port"
+
+#, fuzzy
+#~ msgid "By Status"
+#~ msgstr "By status"
+
+#, fuzzy
+#~ msgid "By Log Size"
+#~ msgstr "By log size"
+
+#, fuzzy
+#~ msgid "Unable to connect to contact server"
+#~ msgstr "Unable to connect to server."
+
+#, fuzzy
+#~ msgid "Unable to retrieve MSN Address Book"
+#~ msgstr "Select Notes Address Book"
+
+#, fuzzy
+#~ msgid "Current media"
+#~ msgstr "Current token"
+
+#, fuzzy
+#~ msgid "Windows Live Messenger Protocol Plugin"
+#~ msgstr "Novell GroupWise Messenger Protocol Plug-in"
+
+#, fuzzy
+#~ msgid "Windows Live ID authentication Failed"
+#~ msgstr "Failure: Authentication failed"
+
+#, fuzzy
+#~ msgid "%s just sent you a Nudge!"
+#~ msgstr "%s sent you a message"
+
+#, fuzzy
+#~ msgid "Unknown error (%d)"
+#~ msgstr "Unknown error"
+
+#, fuzzy
+#~ msgid "Unable to connect to OIM server"
+#~ msgstr "Unable to connect to server."
+
+#, fuzzy
+#~ msgid "%s (%s) changed status from %s to %s"
+#~ msgstr "%s changed status from %s to %s"
+
+#, fuzzy
+#~ msgid "%s (%s) is now %s"
+#~ msgstr "%s is now %s"
+
+#, fuzzy
+#~ msgid "%s (%s) is no longer %s"
+#~ msgstr "%s is no longer %s"
+
+#, fuzzy
+#~ msgid "_Merge"
+#~ msgstr "_Message:"
+
+#, fuzzy
+#~ msgid "_Send File..."
+#~ msgstr "_Send File"
+
+#, fuzzy
+#~ msgid "Add Buddy _Pounce..."
+#~ msgstr "Add Buddy Pounce..."
+
+#, fuzzy
+#~ msgid "Hide when offline"
+#~ msgstr "Not allowed when offline"
+
+#, fuzzy
+#~ msgid "Show when offline"
+#~ msgstr "Not allowed when offline"
+
+#, fuzzy
+#~ msgid "Add _Buddy..."
+#~ msgstr "Add Buddy"
+
+#, fuzzy
+#~ msgid "Add C_hat..."
+#~ msgstr "Add Chat"
+
+#, fuzzy
+#~ msgid "Persistent"
+#~ msgstr "Persian"
+
+#, fuzzy
+#~ msgid "/Accounts/Manage"
+#~ msgstr "/Accounts"
+
+#, fuzzy
+#~ msgid "A_ccount:"
+#~ msgstr "Account:"
+
+#, fuzzy
+#~ msgid "S_end To"
+#~ msgstr "Send To"
+
+#, fuzzy
+#~ msgid "_Smile!"
+#~ msgstr "Smile!"