changeset 17398:21f8cf85ff51

fixes #1319 committer: Luke Schierer <[e-mail]>

--- a/po/ChangeLog	Wed May 30 21:00:37 2007 +0000
+++ b/po/ChangeLog	Wed May 30 21:02:15 2007 +0000
@@ -1,6 +1,7 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
 version 2.0.2
+	* English (British) translation updated (Luke Ross)
 	* Slovenian translation updated (Martin Srebotnjak)
 
 version 2.0.1

--- a/po/en_GB.po	Wed May 30 21:00:37 2007 +0000
+++ b/po/en_GB.po	Wed May 30 21:02:15 2007 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: Pidgin 2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-04-14 18:44+0100\n"
+"POT-Creation-Date: 2007-05-27 13:59+0100\n"
 "PO-Revision-Date: 2006-02-07 13:57+0000\n"
 "Last-Translator: Luke Ross <[e-mail]>\n"
 "Language-Team:  <[e-mail]>\n"
@@ -16,12 +16,12 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n>1;\n"
 
-#: ../finch/finch.c:168
+#: ../finch/finch.c:180
 #, c-format
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s. Try `%s -h' for more information.\n"
 
-#: ../finch/finch.c:170
+#: ../finch/finch.c:182
 #, c-format
 msgid ""
 "%s\n"
@@ -42,14 +42,31 @@
 "  -n, --nologin       don't automatically login\n"
 "  -v, --version       display the current version and exit\n"
 
-#: ../finch/gntaccount.c:119 ../finch/gntblist.c:274 ../finch/gntblist.c:393
-#: ../finch/gntblist.c:406 ../finch/gntplugin.c:154 ../finch/gntplugin.c:199
-#: ../finch/gntstatus.c:291 ../finch/gntstatus.c:299
-#: ../libpurple/protocols/jabber/buddy.c:1406
-#: ../libpurple/protocols/jabber/chat.c:679
-#: ../libpurple/protocols/jabber/chat.c:690
-#: ../libpurple/protocols/jabber/jabber.c:1216
-#: ../libpurple/protocols/qq/group_join.c:324
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+#: ../finch/finch.c:274 ../finch/finch.c:303
+msgid "Finch"
+msgstr "Finch"
+
+#: ../finch/finch.c:301 ../pidgin/gtkmain.c:685
+#, c-format
+msgid ""
+"%s encountered errors migrating your settings from %s to %s. Please "
+"investigate and complete the migration by hand. Please report this error at "
+"http://developer.pidgin.im"
+msgstr ""
+"%s encountered errors migrating your settings from %s to %s. Please "
+"investigate and complete the migration by hand. Please report this error at "
+"http://developer.pidgin.im"
+
+#: ../finch/gntaccount.c:119 ../finch/gntblist.c:290 ../finch/gntblist.c:415
+#: ../finch/gntblist.c:428 ../finch/gntplugin.c:181 ../finch/gntplugin.c:225
+#: ../finch/gntstatus.c:294 ../finch/gntstatus.c:302
+#: ../libpurple/protocols/jabber/buddy.c:1426
+#: ../libpurple/protocols/jabber/chat.c:677
+#: ../libpurple/protocols/jabber/chat.c:688
+#: ../libpurple/protocols/jabber/jabber.c:1229
+#: ../libpurple/protocols/qq/group_join.c:326
 #: ../libpurple/protocols/silc/ops.c:1451
 msgid "Error"
 msgstr "Error"
@@ -62,16 +79,16 @@
 msgid "Screenname of an account must be non-empty."
 msgstr "Screen name of an account must not be empty."
 
-#: ../finch/gntaccount.c:423 ../pidgin/gtkaccount.c:567
+#: ../finch/gntaccount.c:423 ../pidgin/gtkaccount.c:599
 msgid "New mail notifications"
 msgstr "New mail notifications"
 
-#: ../finch/gntaccount.c:433 ../pidgin/gtkaccount.c:496
+#: ../finch/gntaccount.c:433 ../pidgin/gtkaccount.c:528
 msgid "Remember password"
 msgstr "Remember password"
 
-#: ../finch/gntaccount.c:474 ../pidgin/gtkaccount.c:1430
-#: ../pidgin/gtkblist.c:3939
+#: ../finch/gntaccount.c:474 ../pidgin/gtkaccount.c:1473
+#: ../pidgin/gtkblist.c:3965
 msgid "Modify Account"
 msgstr "Modify Account"
 
@@ -79,103 +96,103 @@
 msgid "New Account"
 msgstr "New Account"
 
-#: ../finch/gntaccount.c:500 ../pidgin/gtkaccount.c:407 ../pidgin/gtkft.c:695
+#: ../finch/gntaccount.c:500 ../pidgin/gtkaccount.c:429 ../pidgin/gtkft.c:695
 msgid "Protocol:"
 msgstr "Protocol:"
 
-#: ../finch/gntaccount.c:508 ../pidgin/gtkaccount.c:412
-#: ../pidgin/gtkblist.c:5341
+#: ../finch/gntaccount.c:508 ../pidgin/gtkaccount.c:437
+#: ../pidgin/gtkblist.c:5389
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:295
 msgid "Screen name:"
 msgstr "Screen name:"
 
-#: ../finch/gntaccount.c:521 ../pidgin/gtkaccount.c:487
+#: ../finch/gntaccount.c:521 ../pidgin/gtkaccount.c:519
 msgid "Password:"
 msgstr "Password:"
 
-#: ../finch/gntaccount.c:531 ../pidgin/gtkblist.c:5362
-#: ../pidgin/gtkblist.c:5725
+#: ../finch/gntaccount.c:531 ../pidgin/gtkblist.c:5410
+#: ../pidgin/gtkblist.c:5773
 msgid "Alias:"
 msgstr "Alias:"
 
 #. Cancel button
 #. Cancel
-#: ../finch/gntaccount.c:554 ../finch/gntaccount.c:615
-#: ../finch/gntaccount.c:834 ../finch/gntblist.c:316 ../finch/gntblist.c:383
-#: ../finch/gntblist.c:416 ../finch/gntblist.c:742 ../finch/gntblist.c:928
-#: ../finch/gntblist.c:1019 ../finch/gntblist.c:2051 ../finch/gntpounce.c:456
-#: ../finch/gntpounce.c:652 ../finch/gntprefs.c:284 ../finch/gntstatus.c:139
-#: ../finch/gntstatus.c:472 ../finch/gntstatus.c:597
-#: ../libpurple/account.c:969 ../libpurple/account.c:1218
-#: ../libpurple/account.c:1252 ../libpurple/conversation.c:1164
-#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:498
-#: ../libpurple/protocols/gg/gg.c:656 ../libpurple/protocols/gg/gg.c:792
-#: ../libpurple/protocols/gg/gg.c:871
-#: ../libpurple/protocols/jabber/buddy.c:588
-#: ../libpurple/protocols/jabber/buddy.c:1768
-#: ../libpurple/protocols/jabber/buddy.c:1802
-#: ../libpurple/protocols/jabber/chat.c:788
-#: ../libpurple/protocols/jabber/jabber.c:876
-#: ../libpurple/protocols/jabber/jabber.c:1371
-#: ../libpurple/protocols/jabber/xdata.c:333
-#: ../libpurple/protocols/msn/msn.c:250 ../libpurple/protocols/msn/msn.c:265
-#: ../libpurple/protocols/msn/msn.c:280 ../libpurple/protocols/msn/msn.c:295
-#: ../libpurple/protocols/msn/msn.c:312
-#: ../libpurple/protocols/oscar/oscar.c:6041
-#: ../libpurple/protocols/oscar/peer.c:1021
+#: ../finch/gntaccount.c:554 ../finch/gntaccount.c:617
+#: ../finch/gntaccount.c:853 ../finch/gntblist.c:334 ../finch/gntblist.c:403
+#: ../finch/gntblist.c:438 ../finch/gntblist.c:770 ../finch/gntblist.c:967
+#: ../finch/gntblist.c:1063 ../finch/gntblist.c:2160 ../finch/gntplugin.c:360
+#: ../finch/gntpounce.c:456 ../finch/gntpounce.c:654 ../finch/gntprefs.c:246
+#: ../finch/gntstatus.c:142 ../finch/gntstatus.c:475 ../finch/gntstatus.c:600
+#: ../libpurple/account.c:984 ../libpurple/account.c:1234
+#: ../libpurple/account.c:1269 ../libpurple/conversation.c:1168
+#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:502
+#: ../libpurple/protocols/gg/gg.c:661 ../libpurple/protocols/gg/gg.c:798
+#: ../libpurple/protocols/gg/gg.c:879
+#: ../libpurple/protocols/jabber/buddy.c:584
+#: ../libpurple/protocols/jabber/buddy.c:1788
+#: ../libpurple/protocols/jabber/buddy.c:1824
+#: ../libpurple/protocols/jabber/chat.c:786
+#: ../libpurple/protocols/jabber/jabber.c:878
+#: ../libpurple/protocols/jabber/jabber.c:1384
+#: ../libpurple/protocols/jabber/xdata.c:337
+#: ../libpurple/protocols/msn/msn.c:259 ../libpurple/protocols/msn/msn.c:276
+#: ../libpurple/protocols/msn/msn.c:293 ../libpurple/protocols/msn/msn.c:310
+#: ../libpurple/protocols/msn/msn.c:331
+#: ../libpurple/protocols/oscar/oscar.c:6007
+#: ../libpurple/protocols/oscar/peer.c:1023
 #: ../libpurple/protocols/qq/buddy_info.c:484
-#: ../libpurple/protocols/qq/buddy_opt.c:212
-#: ../libpurple/protocols/qq/buddy_opt.c:402
+#: ../libpurple/protocols/qq/buddy_opt.c:214
+#: ../libpurple/protocols/qq/buddy_opt.c:409
 #: ../libpurple/protocols/qq/group.c:124
 #: ../libpurple/protocols/qq/group_join.c:138
-#: ../libpurple/protocols/qq/group_join.c:359
-#: ../libpurple/protocols/qq/group_opt.c:142
-#: ../libpurple/protocols/qq/group_opt.c:392
-#: ../libpurple/protocols/qq/sys_msg.c:104
-#: ../libpurple/protocols/qq/sys_msg.c:159
-#: ../libpurple/protocols/qq/sys_msg.c:247
-#: ../libpurple/protocols/sametime/sametime.c:3389
+#: ../libpurple/protocols/qq/group_join.c:363
+#: ../libpurple/protocols/qq/group_opt.c:143
+#: ../libpurple/protocols/qq/group_opt.c:398
+#: ../libpurple/protocols/qq/sys_msg.c:115
+#: ../libpurple/protocols/qq/sys_msg.c:174
+#: ../libpurple/protocols/qq/sys_msg.c:269
+#: ../libpurple/protocols/sametime/sametime.c:3388
 #: ../libpurple/protocols/sametime/sametime.c:3474
-#: ../libpurple/protocols/sametime/sametime.c:3644
-#: ../libpurple/protocols/sametime/sametime.c:5388
-#: ../libpurple/protocols/sametime/sametime.c:5477
-#: ../libpurple/protocols/sametime/sametime.c:5601
-#: ../libpurple/protocols/silc/buddy.c:467
-#: ../libpurple/protocols/silc/buddy.c:1078
-#: ../libpurple/protocols/silc/buddy.c:1183
-#: ../libpurple/protocols/silc/chat.c:597
-#: ../libpurple/protocols/silc/chat.c:726
-#: ../libpurple/protocols/silc/ops.c:1912
+#: ../libpurple/protocols/sametime/sametime.c:3645
+#: ../libpurple/protocols/sametime/sametime.c:5397
+#: ../libpurple/protocols/sametime/sametime.c:5487
+#: ../libpurple/protocols/sametime/sametime.c:5612
+#: ../libpurple/protocols/silc/buddy.c:468
+#: ../libpurple/protocols/silc/buddy.c:1084
+#: ../libpurple/protocols/silc/buddy.c:1189
+#: ../libpurple/protocols/silc/chat.c:600
+#: ../libpurple/protocols/silc/chat.c:730
+#: ../libpurple/protocols/silc/ops.c:1913
 #: ../libpurple/protocols/silc/silc.c:744
-#: ../libpurple/protocols/silc/silc.c:949
-#: ../libpurple/protocols/yahoo/yahoo.c:988
-#: ../libpurple/protocols/yahoo/yahoo.c:3228
-#: ../libpurple/protocols/yahoo/yahoo.c:3237 ../pidgin/gtkaccount.c:1866
-#: ../pidgin/gtkaccount.c:2446 ../pidgin/gtkblist.c:5781
-#: ../pidgin/gtkdialogs.c:719 ../pidgin/gtkdialogs.c:856
-#: ../pidgin/gtkdialogs.c:947 ../pidgin/gtkdialogs.c:966
-#: ../pidgin/gtkdialogs.c:988 ../pidgin/gtkdialogs.c:1008
-#: ../pidgin/gtkdialogs.c:1052 ../pidgin/gtkdialogs.c:1090
-#: ../pidgin/gtkdialogs.c:1144 ../pidgin/gtkdialogs.c:1181
-#: ../pidgin/gtkdialogs.c:1206 ../pidgin/gtkimhtmltoolbar.c:419
-#: ../pidgin/gtklog.c:294 ../pidgin/gtkplugin.c:286 ../pidgin/gtkpounce.c:1098
-#: ../pidgin/gtkprivacy.c:566 ../pidgin/gtkprivacy.c:579
-#: ../pidgin/gtkprivacy.c:604 ../pidgin/gtkprivacy.c:615
-#: ../pidgin/gtkrequest.c:270 ../pidgin/gtksavedstatuses.c:336
+#: ../libpurple/protocols/silc/silc.c:950
+#: ../libpurple/protocols/yahoo/yahoo.c:989
+#: ../libpurple/protocols/yahoo/yahoo.c:3233
+#: ../libpurple/protocols/yahoo/yahoo.c:3244 ../pidgin/gtkaccount.c:1911
+#: ../pidgin/gtkaccount.c:2502 ../pidgin/gtkblist.c:5831
+#: ../pidgin/gtkdialogs.c:724 ../pidgin/gtkdialogs.c:862
+#: ../pidgin/gtkdialogs.c:954 ../pidgin/gtkdialogs.c:974
+#: ../pidgin/gtkdialogs.c:998 ../pidgin/gtkdialogs.c:1020
+#: ../pidgin/gtkdialogs.c:1068 ../pidgin/gtkdialogs.c:1109
+#: ../pidgin/gtkdialogs.c:1165 ../pidgin/gtkdialogs.c:1204
+#: ../pidgin/gtkdialogs.c:1231 ../pidgin/gtkimhtmltoolbar.c:423
+#: ../pidgin/gtklog.c:302 ../pidgin/gtkplugin.c:288 ../pidgin/gtkpounce.c:1102
+#: ../pidgin/gtkprivacy.c:566 ../pidgin/gtkprivacy.c:582
+#: ../pidgin/gtkprivacy.c:607 ../pidgin/gtkprivacy.c:621
+#: ../pidgin/gtkrequest.c:270 ../pidgin/gtksavedstatuses.c:337
 msgid "Cancel"
 msgstr "Cancel"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:558 ../finch/gntpounce.c:462 ../finch/gntprefs.c:284
-#: ../finch/gntstatus.c:475 ../finch/gntstatus.c:585
-#: ../libpurple/account.c:1251 ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:587 ../pidgin/gtkdebug.c:762
+#: ../finch/gntaccount.c:558 ../finch/gntplugin.c:360 ../finch/gntpounce.c:462
+#: ../finch/gntprefs.c:246 ../finch/gntstatus.c:478 ../finch/gntstatus.c:588
+#: ../libpurple/account.c:1268 ../libpurple/plugins/buddynote.c:50
+#: ../libpurple/protocols/jabber/buddy.c:583 ../pidgin/gtkdebug.c:748
 #: ../pidgin/gtkrequest.c:276
 msgid "Save"
 msgstr "Save"
 
-#: ../finch/gntaccount.c:611 ../pidgin/gtkaccount.c:1860
+#: ../finch/gntaccount.c:611 ../pidgin/gtkaccount.c:1903
 #: ../pidgin/gtksavedstatuses.c:328
 #, c-format
 msgid "Are you sure you want to delete %s?"
@@ -186,297 +203,318 @@
 msgstr "Delete Account"
 
 #. Delete button
-#: ../finch/gntaccount.c:615 ../finch/gntaccount.c:681
-#: ../finch/gntpounce.c:651 ../finch/gntpounce.c:712 ../finch/gntstatus.c:139
-#: ../finch/gntstatus.c:201 ../pidgin/gtkaccount.c:1865 ../pidgin/gtklog.c:294
-#: ../pidgin/gtkpounce.c:1097 ../pidgin/gtkrequest.c:273
-#: ../pidgin/gtksavedstatuses.c:335
+#: ../finch/gntaccount.c:616 ../finch/gntaccount.c:683
+#: ../finch/gntpounce.c:653 ../finch/gntpounce.c:714 ../finch/gntstatus.c:141
+#: ../finch/gntstatus.c:204 ../pidgin/gtkaccount.c:1910 ../pidgin/gtklog.c:301
+#: ../pidgin/gtkpounce.c:1101 ../pidgin/gtkrequest.c:273
+#: ../pidgin/gtksavedstatuses.c:336
 msgid "Delete"
 msgstr "Delete"
 
-#: ../finch/gntaccount.c:644 ../finch/gntblist.c:1957 ../finch/gntui.c:76
-#: ../pidgin/gtkaccount.c:2272 ../pidgin/gtkdocklet.c:530
+#: ../finch/gntaccount.c:646 ../finch/gntblist.c:2065 ../finch/gntui.c:76
+#: ../pidgin/gtkaccount.c:2328 ../pidgin/gtkdocklet.c:522
 msgid "Accounts"
 msgstr "Accounts"
 
-#: ../finch/gntaccount.c:650
+#: ../finch/gntaccount.c:652
 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:673 ../finch/gntaccount.c:833 ../finch/gntblist.c:316
-#: ../finch/gntblist.c:383 ../finch/gntblist.c:416 ../finch/gntnotify.c:309
-#: ../finch/gntpounce.c:697 ../finch/gntstatus.c:191
-#: ../libpurple/protocols/gg/gg.c:870 ../libpurple/protocols/qq/sys_msg.c:104
-#: ../libpurple/protocols/qq/sys_msg.c:159
-#: ../libpurple/protocols/qq/sys_msg.c:247
-#: ../libpurple/protocols/sametime/sametime.c:5476
-#: ../libpurple/protocols/silc/chat.c:596 ../pidgin/gtkaccount.c:2445
-#: ../pidgin/gtkblist.c:5780 ../pidgin/gtkconv.c:1651
+#: ../finch/gntaccount.c:675 ../finch/gntaccount.c:852 ../finch/gntblist.c:333
+#: ../finch/gntblist.c:403 ../finch/gntblist.c:438 ../finch/gntnotify.c:369
+#: ../finch/gntpounce.c:699 ../finch/gntstatus.c:194
+#: ../libpurple/protocols/gg/gg.c:878 ../libpurple/protocols/qq/sys_msg.c:116
+#: ../libpurple/protocols/qq/sys_msg.c:175
+#: ../libpurple/protocols/qq/sys_msg.c:270
+#: ../libpurple/protocols/sametime/sametime.c:5486
+#: ../libpurple/protocols/silc/chat.c:599 ../pidgin/gtkaccount.c:2501
+#: ../pidgin/gtkblist.c:5830 ../pidgin/gtkconv.c:1651
 #: ../pidgin/gtkrequest.c:274
 msgid "Add"
 msgstr "Add"
 
 #. Modify button
-#: ../finch/gntaccount.c:677 ../finch/gntpounce.c:704
+#: ../finch/gntaccount.c:679 ../finch/gntpounce.c:706
 msgid "Modify"
 msgstr "Modify"
 
-#: ../finch/gntaccount.c:758 ../pidgin/gtkaccount.c:2392
+#: ../finch/gntaccount.c:775 ../pidgin/gtkaccount.c:2448
 #, 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:831 ../pidgin/gtkaccount.c:2444
+#: ../finch/gntaccount.c:848 ../pidgin/gtkaccount.c:2500
 msgid "Add buddy to your list?"
 msgstr "Add buddy to your list?"
 
-#: ../finch/gntaccount.c:883 ../pidgin/gtkaccount.c:2496
+#: ../finch/gntaccount.c:902 ../pidgin/gtkaccount.c:2552
 #, 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:903 ../finch/gntaccount.c:908
-#: ../pidgin/gtkaccount.c:2519 ../pidgin/gtkaccount.c:2525
+#: ../finch/gntaccount.c:922 ../finch/gntaccount.c:929
+#: ../pidgin/gtkaccount.c:2575 ../pidgin/gtkaccount.c:2581
 msgid "Authorize buddy?"
 msgstr "Authorise buddy?"
 
-#: ../finch/gntaccount.c:905 ../finch/gntaccount.c:910
-#: ../pidgin/gtkaccount.c:2520 ../pidgin/gtkaccount.c:2526
+#: ../finch/gntaccount.c:926 ../finch/gntaccount.c:933
+#: ../pidgin/gtkaccount.c:2576 ../pidgin/gtkaccount.c:2582
 msgid "Authorize"
 msgstr "Authorise"
 
-#: ../finch/gntaccount.c:906 ../finch/gntaccount.c:911
-#: ../pidgin/gtkaccount.c:2521 ../pidgin/gtkaccount.c:2527
+#: ../finch/gntaccount.c:927 ../finch/gntaccount.c:934
+#: ../pidgin/gtkaccount.c:2577 ../pidgin/gtkaccount.c:2583
 msgid "Deny"
 msgstr "Deny"
 
-#: ../finch/gntblist.c:266
+#: ../finch/gntblist.c:279
 msgid "You must provide a screename for the buddy."
 msgstr "You must provide a screen name for the buddy."
 
-#: ../finch/gntblist.c:268
+#: ../finch/gntblist.c:281
 msgid "You must provide a group."
 msgstr "You must provide a group."
 
-#: ../finch/gntblist.c:270
+#: ../finch/gntblist.c:283
 msgid "You must select an account."
 msgstr "You must select an account."
 
-#: ../finch/gntblist.c:274
+#: ../finch/gntblist.c:285
+msgid "The selected account is not online."
+msgstr "The selected account is not online."
+
+#: ../finch/gntblist.c:290
 msgid "Error adding buddy"
 msgstr "Error adding buddy"
 
-#: ../finch/gntblist.c:299 ../libpurple/protocols/oscar/oscar.c:2853
-#: ../pidgin/gtkaccount.c:1941 ../pidgin/gtksavedstatuses.c:923
+#: ../finch/gntblist.c:315 ../libpurple/protocols/oscar/oscar.c:2846
+#: ../pidgin/gtkaccount.c:1986 ../pidgin/gtksavedstatuses.c:924
 msgid "Screen Name"
 msgstr "Screen Name"
 
-#: ../finch/gntblist.c:302 ../finch/gntblist.c:375
-#: ../libpurple/protocols/msn/msn.c:1340
-#: ../libpurple/protocols/silc/chat.c:587
+#: ../finch/gntblist.c:318 ../finch/gntblist.c:395 ../finch/gntblist.c:1211
+#: ../libpurple/protocols/msn/msn.c:1364
+#: ../libpurple/protocols/silc/chat.c:590
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:680
 #: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1206 ../pidgin/gtkdialogs.c:965
-#: ../pidgin/gtkdialogs.c:987 ../pidgin/gtkdialogs.c:1007
+#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:973
+#: ../pidgin/gtkdialogs.c:997 ../pidgin/gtkdialogs.c:1019
 #: ../pidgin/gtkrequest.c:277
 msgid "Alias"
 msgstr "Alias"
 
-#: ../finch/gntblist.c:305 ../finch/gntblist.c:378
+#: ../finch/gntblist.c:321 ../finch/gntblist.c:398
 msgid "Group"
 msgstr "Group"
 
-#: ../finch/gntblist.c:309 ../finch/gntblist.c:366 ../finch/gntblist.c:1188
-#: ../finch/gntnotify.c:155 ../finch/gntstatus.c:563
-#: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:189
-#: ../pidgin/gtkblist.c:2938 ../pidgin/gtknotify.c:476
-#: ../pidgin/gtkpounce.c:1265 ../pidgin/plugins/gevolution/gevolution.c:444
+#: ../finch/gntblist.c:325 ../finch/gntblist.c:386 ../finch/gntblist.c:1261
+#: ../finch/gntnotify.c:171 ../finch/gntstatus.c:566
+#: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
+#: ../pidgin/gtkblist.c:2965 ../pidgin/gtknotify.c:476
+#: ../pidgin/gtkpounce.c:1269 ../pidgin/plugins/gevolution/gevolution.c:444
 msgid "Account"
 msgstr "Account"
 
-#: ../finch/gntblist.c:315 ../finch/gntblist.c:789
-#: ../libpurple/protocols/silc/buddy.c:736
-#: ../libpurple/protocols/silc/buddy.c:1030
-#: ../libpurple/protocols/silc/buddy.c:1075
-#: ../libpurple/protocols/silc/buddy.c:1174
-#: ../libpurple/protocols/yahoo/yahoo.c:3142 ../pidgin/gtkblist.c:5295
+#: ../finch/gntblist.c:331 ../finch/gntblist.c:819
+#: ../libpurple/protocols/silc/buddy.c:737
+#: ../libpurple/protocols/silc/buddy.c:1033
+#: ../libpurple/protocols/silc/buddy.c:1080
+#: ../libpurple/protocols/silc/buddy.c:1180
+#: ../libpurple/protocols/yahoo/yahoo.c:3146 ../pidgin/gtkblist.c:5343
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:447
 msgid "Add Buddy"
 msgstr "Add Buddy"
 
-#: ../finch/gntblist.c:315
+#: ../finch/gntblist.c:331
 msgid "Please enter buddy information."
 msgstr "Please enter buddy information."
 
-#: ../finch/gntblist.c:338 ../libpurple/blist.c:1197
+#: ../finch/gntblist.c:358 ../libpurple/blist.c:1192
 msgid "Chats"
 msgstr "Chats"
 
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:372 ../libpurple/protocols/jabber/jabber.c:807
-#: ../libpurple/protocols/msn/msn.c:1513 ../libpurple/protocols/msn/msn.c:1578
-#: ../libpurple/protocols/msn/msn.c:1605
-#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:579
+#: ../finch/gntblist.c:392 ../libpurple/protocols/jabber/jabber.c:809
+#: ../libpurple/protocols/msn/msn.c:1537 ../libpurple/protocols/msn/msn.c:1602
+#: ../libpurple/protocols/msn/msn.c:1629
+#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:581
 #: ../pidgin/gtkroomlist.c:621
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:123
 msgid "Name"
 msgstr "Name"
 
-#: ../finch/gntblist.c:381 ../finch/gntblist.c:791 ../pidgin/gtkblist.c:5671
+#: ../finch/gntblist.c:401 ../finch/gntblist.c:821 ../pidgin/gtkblist.c:5719
 msgid "Add Chat"
 msgstr "Add Chat"
 
-#: ../finch/gntblist.c:382
+#: ../finch/gntblist.c:402
 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:393 ../finch/gntblist.c:406
+#: ../finch/gntblist.c:415 ../finch/gntblist.c:428
 msgid "Error adding group"
 msgstr "Error adding group"
 
-#: ../finch/gntblist.c:394
+#: ../finch/gntblist.c:416
 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:407
+#: ../finch/gntblist.c:429
 msgid "A group with the name already exists."
 msgstr "A group with that name already exists."
 
-#: ../finch/gntblist.c:414 ../finch/gntblist.c:793
-#: ../libpurple/protocols/sametime/sametime.c:5387
-#: ../libpurple/protocols/sametime/sametime.c:5474 ../pidgin/gtkblist.c:5777
+#: ../finch/gntblist.c:436 ../finch/gntblist.c:823
+#: ../libpurple/protocols/sametime/sametime.c:5396
+#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5827
 msgid "Add Group"
 msgstr "Add Group"
 
-#: ../finch/gntblist.c:414
+#: ../finch/gntblist.c:436
 msgid "Enter the name of the group"
 msgstr "Enter the name of the group"
 
-#: ../finch/gntblist.c:741
+#: ../finch/gntblist.c:769
 msgid "Edit Chat"
 msgstr "Edit Chat"
 
-#: ../finch/gntblist.c:741
+#: ../finch/gntblist.c:769
 msgid "Please Update the necessary fields."
 msgstr "Please update the necessary fields."
 
-#: ../finch/gntblist.c:742 ../finch/gntstatus.c:196
+#: ../finch/gntblist.c:770 ../finch/gntstatus.c:199
 msgid "Edit"
 msgstr "Edit"
 
-#: ../finch/gntblist.c:756
+#: ../finch/gntblist.c:786
 msgid "Auto-join"
 msgstr "Auto-join"
 
-#: ../finch/gntblist.c:765
+#: ../finch/gntblist.c:795
 msgid "Edit Settings"
 msgstr "Edit Settings"
 
-#: ../finch/gntblist.c:829 ../libpurple/protocols/silc/chat.c:878
+#: ../finch/gntblist.c:833 ../finch/gntconv.c:317 ../pidgin/gtkblist.c:278
+#: ../pidgin/gtkconv.c:677
+msgid "Information"
+msgstr "Information"
+
+#: ../finch/gntblist.c:833 ../finch/gntconv.c:317 ../pidgin/gtkblist.c:278
+#: ../pidgin/gtkconv.c:677
+msgid "Retrieving..."
+msgstr "Retrieving..."
+
+#: ../finch/gntblist.c:866 ../finch/gntconv.c:418
+#: ../libpurple/protocols/silc/chat.c:883
 msgid "Get Info"
 msgstr "Get Info"
 
-#: ../finch/gntblist.c:833
+#: ../finch/gntblist.c:870
 msgid "Add Buddy Pounce"
 msgstr "Add Buddy Pounce"
 
-#: ../finch/gntblist.c:840 ../libpurple/protocols/oscar/oscar.c:635
+#. if (q_bud && is_online(q_bud->status)) {
+#: ../finch/gntblist.c:877 ../finch/gntconv.c:430
+#: ../libpurple/protocols/oscar/oscar.c:636 ../libpurple/protocols/qq/qq.c:585
 #: ../pidgin/gtkconv.c:1599
 msgid "Send File"
 msgstr "Send File"
 
-#: ../finch/gntblist.c:844
+#: ../finch/gntblist.c:881
 msgid "View Log"
 msgstr "View Log"
 
-#: ../finch/gntblist.c:924
+#: ../finch/gntblist.c:962
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr "Please enter the new name for %s"
 
-#: ../finch/gntblist.c:926 ../finch/gntblist.c:927 ../finch/gntblist.c:1138
+#: ../finch/gntblist.c:964 ../finch/gntblist.c:1211
 msgid "Rename"
 msgstr "Rename"
 
-#: ../finch/gntblist.c:926
+#: ../finch/gntblist.c:964
+msgid "Set Alias"
+msgstr "Set Alias"
+
+#: ../finch/gntblist.c:965
 msgid "Enter empty string to reset the name."
 msgstr "Enter empty string to reset the name."
 
-#: ../finch/gntblist.c:999
+#: ../finch/gntblist.c:1041
 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:1007
+#: ../finch/gntblist.c:1049
 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:1012
+#: ../finch/gntblist.c:1054
 #, 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:1015
+#: ../finch/gntblist.c:1057
 msgid "Confirm Remove"
 msgstr "Confirm Remove"
 
-#: ../finch/gntblist.c:1018 ../finch/gntblist.c:1140 ../finch/gntft.c:223
-#: ../pidgin/gtkblist.c:1100 ../pidgin/gtkconv.c:1648
-#: ../pidgin/gtkrequest.c:275 ../pidgin/gtkstatusbox.c:249
+#: ../finch/gntblist.c:1062 ../finch/gntblist.c:1213 ../finch/gntft.c:223
+#: ../pidgin/gtkblist.c:1135 ../pidgin/gtkconv.c:1648
+#: ../pidgin/gtkrequest.c:275 ../pidgin/gtkstatusbox.c:261
 msgid "Remove"
 msgstr "Remove"
 
 #. Buddy List
-#: ../finch/gntblist.c:1115 ../finch/gntblist.c:2127 ../finch/gntprefs.c:278
-#: ../finch/gntui.c:77 ../pidgin/gtkblist.c:4181
+#: ../finch/gntblist.c:1187 ../finch/gntblist.c:2237 ../finch/gntprefs.c:240
+#: ../finch/gntui.c:77 ../pidgin/gtkblist.c:4209
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:330
 msgid "Buddy List"
 msgstr "Buddy List"
 
-#: ../finch/gntblist.c:1145
+#: ../finch/gntblist.c:1218
 msgid "Place tagged"
 msgstr "Place tagged"
 
-#: ../finch/gntblist.c:1150
+#: ../finch/gntblist.c:1223
 msgid "Toggle Tag"
 msgstr "Toggle Tag"
 
 #. General
-#: ../finch/gntblist.c:1183 ../libpurple/protocols/gg/gg.c:627
-#: ../libpurple/protocols/gg/gg.c:1035 ../libpurple/protocols/gg/gg.c:1110
-#: ../libpurple/protocols/gg/gg.c:2182
+#: ../finch/gntblist.c:1256 ../libpurple/protocols/gg/gg.c:632
+#: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1120
+#: ../libpurple/protocols/gg/gg.c:2204
 #: ../libpurple/protocols/jabber/buddy.c:274
-#: ../libpurple/protocols/jabber/buddy.c:821
-#: ../libpurple/protocols/jabber/buddy.c:1569
-#: ../libpurple/protocols/jabber/buddy.c:1751
-#: ../libpurple/protocols/jabber/jabber.c:817
-#: ../libpurple/protocols/msn/msn.c:1348 ../libpurple/protocols/msn/msn.c:1516
+#: ../libpurple/protocols/jabber/buddy.c:818
+#: ../libpurple/protocols/jabber/buddy.c:1589
+#: ../libpurple/protocols/jabber/buddy.c:1771
+#: ../libpurple/protocols/jabber/jabber.c:819
+#: ../libpurple/protocols/msn/msn.c:1372 ../libpurple/protocols/msn/msn.c:1540
 #: ../libpurple/protocols/qq/buddy_info.c:43
-#: ../libpurple/protocols/silc/buddy.c:1528
+#: ../libpurple/protocols/silc/buddy.c:1535
 #: ../libpurple/protocols/silc/ops.c:1036
 #: ../libpurple/protocols/silc/ops.c:1179
 #: ../libpurple/protocols/silc/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1042 ../pidgin/gtkblist.c:2962
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1042 ../pidgin/gtkblist.c:2989
 msgid "Nickname"
 msgstr "Nickname"
 
 #. Idle stuff
-#: ../finch/gntblist.c:1203 ../finch/gntprefs.c:281
+#: ../finch/gntblist.c:1276 ../finch/gntprefs.c:243
 #: ../libpurple/protocols/bonjour/bonjour.c:322
-#: ../libpurple/protocols/jabber/buddy.c:646
-#: ../libpurple/protocols/jabber/buddy.c:686
-#: ../libpurple/protocols/msn/msn.c:513 ../libpurple/protocols/msn/state.c:32
-#: ../libpurple/protocols/novell/novell.c:2823
-#: ../libpurple/protocols/oscar/oscar.c:2877
-#: ../libpurple/protocols/yahoo/yahoo.c:2896
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:686 ../pidgin/gtkblist.c:2982
-#: ../pidgin/gtkblist.c:3371 ../pidgin/gtkprefs.c:1807
+#: ../libpurple/protocols/jabber/buddy.c:643
+#: ../libpurple/protocols/jabber/buddy.c:683
+#: ../libpurple/protocols/msn/msn.c:516 ../libpurple/protocols/msn/state.c:32
+#: ../libpurple/protocols/novell/novell.c:2825
+#: ../libpurple/protocols/oscar/oscar.c:2870
+#: ../libpurple/protocols/yahoo/yahoo.c:2900
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:686 ../pidgin/gtkblist.c:3009
+#: ../pidgin/gtkblist.c:3399 ../pidgin/gtkprefs.c:1810
 msgid "Idle"
 msgstr "Idle"
 
-#: ../finch/gntblist.c:1292
+#: ../finch/gntblist.c:1365
 #, c-format
 msgid ""
 "Online: %d\n"
@@ -485,12 +523,12 @@
 "Online: %d\n"
 "Total: %d"
 
-#: ../finch/gntblist.c:1301
+#: ../finch/gntblist.c:1374
 #, c-format
 msgid "Account: %s (%s)"
 msgstr "Account: %s (%s)"
 
-#: ../finch/gntblist.c:1313
+#: ../finch/gntblist.c:1386
 #, c-format
 msgid ""
 "\n"
@@ -499,160 +537,153 @@
 "\n"
 "Last Seen: %s ago"
 
-#: ../finch/gntblist.c:1562 ../pidgin/gtkdocklet.c:478
-#: ../pidgin/gtkstatusbox.c:1102
+#: ../finch/gntblist.c:1651 ../pidgin/gtkdocklet.c:470
+#: ../pidgin/gtkstatusbox.c:1064
 msgid "New..."
 msgstr "New..."
 
-#: ../finch/gntblist.c:1569 ../pidgin/gtkdocklet.c:479
-#: ../pidgin/gtkstatusbox.c:1103
+#: ../finch/gntblist.c:1658 ../pidgin/gtkdocklet.c:471
+#: ../pidgin/gtkstatusbox.c:1065
 msgid "Saved..."
 msgstr "Saved..."
 
-#: ../finch/gntblist.c:1925 ../finch/gntplugin.c:216 ../finch/gntui.c:81
-#: ../pidgin/gtkdocklet.c:531 ../pidgin/gtkplugin.c:528
+#: ../finch/gntblist.c:2033 ../finch/gntplugin.c:244 ../finch/gntui.c:81
+#: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:530
 msgid "Plugins"
 msgstr "Plug-ins"
 
-#: ../finch/gntblist.c:2032 ../pidgin/gtkdialogs.c:700
-#: ../pidgin/gtkdialogs.c:837 ../pidgin/gtkdialogs.c:917
+#: ../finch/gntblist.c:2141 ../pidgin/gtkdialogs.c:705
+#: ../pidgin/gtkdialogs.c:843 ../pidgin/gtkdialogs.c:924
 msgid "_Name"
 msgstr "_Name"
 
-#: ../finch/gntblist.c:2037 ../pidgin/gtkdialogs.c:705
-#: ../pidgin/gtkdialogs.c:842 ../pidgin/gtkdialogs.c:922
+#: ../finch/gntblist.c:2146 ../pidgin/gtkdialogs.c:710
+#: ../pidgin/gtkdialogs.c:848 ../pidgin/gtkdialogs.c:929
 msgid "_Account"
 msgstr "_Account"
 
-#: ../finch/gntblist.c:2045 ../pidgin/gtkdialogs.c:713
+#: ../finch/gntblist.c:2154 ../pidgin/gtkdialogs.c:718
 msgid "New Instant Message"
 msgstr "New Instant Message"
 
-#: ../finch/gntblist.c:2047 ../pidgin/gtkdialogs.c:715
+#: ../finch/gntblist.c:2156 ../pidgin/gtkdialogs.c:720
 msgid ""
 "Please enter the screen name or alias of the person you would like to IM."
 msgstr ""
 "Please enter the screen name or alias of the person you would like to IM."
 
-#: ../finch/gntblist.c:2050 ../finch/gntconn.c:47 ../finch/gntnotify.c:79
-#: ../libpurple/account.c:968 ../libpurple/account.c:1217
-#: ../libpurple/protocols/gg/gg.c:497 ../libpurple/protocols/gg/gg.c:655
-#: ../libpurple/protocols/gg/gg.c:791
-#: ../libpurple/protocols/jabber/jabber.c:1370
-#: ../libpurple/protocols/jabber/xdata.c:332
-#: ../libpurple/protocols/msn/msn.c:249 ../libpurple/protocols/msn/msn.c:264
-#: ../libpurple/protocols/msn/msn.c:279 ../libpurple/protocols/msn/msn.c:294
-#: ../libpurple/protocols/oscar/oscar.c:6040
-#: ../libpurple/protocols/silc/buddy.c:466
-#: ../libpurple/protocols/silc/buddy.c:1182
-#: ../libpurple/protocols/silc/chat.c:424
-#: ../libpurple/protocols/silc/chat.c:462
-#: ../libpurple/protocols/silc/chat.c:725
+#: ../finch/gntblist.c:2159 ../finch/gntnotify.c:77 ../libpurple/account.c:983
+#: ../libpurple/account.c:1233 ../libpurple/protocols/gg/gg.c:501
+#: ../libpurple/protocols/gg/gg.c:660 ../libpurple/protocols/gg/gg.c:797
+#: ../libpurple/protocols/jabber/jabber.c:1383
+#: ../libpurple/protocols/jabber/xdata.c:336
+#: ../libpurple/protocols/msn/msn.c:258 ../libpurple/protocols/msn/msn.c:275
+#: ../libpurple/protocols/msn/msn.c:292 ../libpurple/protocols/msn/msn.c:309
+#: ../libpurple/protocols/oscar/oscar.c:6006
+#: ../libpurple/protocols/silc/buddy.c:467
+#: ../libpurple/protocols/silc/buddy.c:1188
+#: ../libpurple/protocols/silc/chat.c:425
+#: ../libpurple/protocols/silc/chat.c:464
+#: ../libpurple/protocols/silc/chat.c:729
 #: ../libpurple/protocols/silc/ops.c:1297
-#: ../libpurple/protocols/silc/ops.c:1911
+#: ../libpurple/protocols/silc/ops.c:1912
 #: ../libpurple/protocols/silc/silc.c:743
-#: ../libpurple/protocols/yahoo/yahoo.c:987
-#: ../libpurple/protocols/yahoo/yahoo.c:3227
-#: ../libpurple/protocols/yahoo/yahoo.c:3236 ../pidgin/gtkblist.c:3938
-#: ../pidgin/gtkdialogs.c:718 ../pidgin/gtkdialogs.c:855
-#: ../pidgin/gtkdialogs.c:946 ../pidgin/gtkrequest.c:269
+#: ../libpurple/protocols/yahoo/yahoo.c:988
+#: ../libpurple/protocols/yahoo/yahoo.c:3232
+#: ../libpurple/protocols/yahoo/yahoo.c:3243 ../pidgin/gtkblist.c:3964
+#: ../pidgin/gtkdialogs.c:723 ../pidgin/gtkdialogs.c:861
+#: ../pidgin/gtkdialogs.c:953 ../pidgin/gtkrequest.c:269
 msgid "OK"
 msgstr "OK"
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2069 ../finch/gntpounce.c:444 ../pidgin/gtkpounce.c:776
+#: ../finch/gntblist.c:2179 ../finch/gntpounce.c:444 ../pidgin/gtkpounce.c:778
 msgid "Options"
 msgstr "Options"
 
-#: ../finch/gntblist.c:2075
+#: ../finch/gntblist.c:2185
 msgid "Send IM..."
 msgstr "Send IM..."
 
-#: ../finch/gntblist.c:2079
-msgid "Toggle offline buddies"
-msgstr "Toggle offline buddies"
-
-#: ../finch/gntblist.c:2085
+#: ../finch/gntblist.c:2189
+msgid "Show offline buddies"
+msgstr "Show offline buddies"
+
+#: ../finch/gntblist.c:2195
 msgid "Sort by status"
 msgstr "Sort by status"
 
-#: ../finch/gntblist.c:2089
+#: ../finch/gntblist.c:2199
 msgid "Sort alphabetically"
 msgstr "Sort alphabetically"
 
-#: ../finch/gntblist.c:2093
+#: ../finch/gntblist.c:2203
 msgid "Sort by log size"
 msgstr "Sort by log size"
 
-#: ../finch/gntconn.c:38
+#: ../finch/gntconn.c:109
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../finch/gntconn.c:41
+#: ../finch/gntconn.c:112
 #, c-format
 msgid "%s disconnected."
 msgstr "%s disconnected."
 
-#: ../finch/gntconn.c:42
-#, c-format
-msgid ""
-"%s was disconnected due to the following error:\n"
-"%s"
-msgstr ""
-"%s was disconnected because of the following error:\n"
-"%s"
-
-#: ../finch/gntconn.c:45 ../libpurple/account.c:996
-#: ../libpurple/connection.c:107 ../pidgin/gtkblist.c:3936
-msgid "Connection Error"
-msgstr "Connection Error"
-
-#: ../finch/gntconn.c:48 ../libpurple/protocols/sametime/sametime.c:3643
-#: ../pidgin/gtkblist.c:3940
-msgid "Connect"
-msgstr "Connect"
-
-#: ../finch/gntconv.c:103
+#: ../finch/gntconn.c:113
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Finch will not attempt to reconnect the account until you correct the error "
+"and re-enable the account."
+msgstr ""
+"%s\n"
+"\n"
+"Finch will not attempt to reconnect the account until you correct the error "
+"and re-enable the account."
+
+#: ../finch/gntconv.c:116
 msgid "No such command."
 msgstr "No such command."
 
-#: ../finch/gntconv.c:107 ../pidgin/gtkconv.c:507
+#: ../finch/gntconv.c:120 ../pidgin/gtkconv.c:508
 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:112 ../pidgin/gtkconv.c:512
+#: ../finch/gntconv.c:125 ../pidgin/gtkconv.c:513
 msgid "Your command failed for an unknown reason."
 msgstr "Your command failed for an unknown reason."
 
-#: ../finch/gntconv.c:117 ../pidgin/gtkconv.c:518
+#: ../finch/gntconv.c:130 ../pidgin/gtkconv.c:519
 msgid "That command only works in chats, not IMs."
 msgstr "That command only works in chats, not IMs."
 
-#: ../finch/gntconv.c:120 ../pidgin/gtkconv.c:521
+#: ../finch/gntconv.c:133 ../pidgin/gtkconv.c:522
 msgid "That command only works in IMs, not chats."
 msgstr "That command only works in IMs, not chats."
 
-#: ../finch/gntconv.c:124 ../pidgin/gtkconv.c:525
+#: ../finch/gntconv.c:137 ../pidgin/gtkconv.c:526
 msgid "That command doesn't work on this protocol."
 msgstr "That command doesn't work on this protocol."
 
-#: ../finch/gntconv.c:131
+#: ../finch/gntconv.c:144
 msgid "Commands are not supported yet. Message was NOT sent."
 msgstr "Commands are not supported yet. Message was NOT sent."
 
-#: ../finch/gntconv.c:234
+#: ../finch/gntconv.c:230
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../finch/gntconv.c:257
+#: ../finch/gntconv.c:253
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:262 ../finch/gntconv.c:436
+#: ../finch/gntconv.c:258 ../finch/gntconv.c:619
 #, c-format
 msgid ""
 "\n"
@@ -661,24 +692,48 @@
 "\n"
 "%s is typing..."
 
+#: ../finch/gntconv.c:277
+msgid "You have left this chat."
+msgstr "You have left this chat."
+
+#: ../finch/gntconv.c:353
+msgid "Send To"
+msgstr "Send To"
+
+#: ../finch/gntconv.c:397
+msgid "Conversation"
+msgstr "Conversation"
+
 #: ../finch/gntconv.c:403
+msgid "Clear Scrollback"
+msgstr "Clear Scrollback"
+
+#: ../finch/gntconv.c:407 ../finch/gntprefs.c:178
+msgid "Show Timestamps"
+msgstr "Show Timestamps"
+
+#: ../finch/gntconv.c:423
+msgid "Add Buddy Pounce..."
+msgstr "Add Buddy Pounce..."
+
+#: ../finch/gntconv.c:586
 msgid "<AUTO-REPLY> "
 msgstr "<AUTO-REPLY> "
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:505
+#: ../finch/gntconv.c:702
 msgid "List of users:\n"
 msgstr "List of users:\n"
 
-#: ../finch/gntconv.c:629 ../pidgin/gtkconv.c:388
+#: ../finch/gntconv.c:847 ../pidgin/gtkconv.c:389
 msgid "Supported debug options are:  version"
 msgstr "Supported debug options are:  version"
 
-#: ../finch/gntconv.c:664 ../pidgin/gtkconv.c:424
+#: ../finch/gntconv.c:882 ../pidgin/gtkconv.c:425
 msgid "No such command (in this context)."
 msgstr "No such command (in this context)."
 
-#: ../finch/gntconv.c:667 ../pidgin/gtkconv.c:427
+#: ../finch/gntconv.c:885 ../pidgin/gtkconv.c:428
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -686,7 +741,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:706 ../pidgin/gtkconv.c:7028
+#: ../finch/gntconv.c:943 ../pidgin/gtkconv.c:7085
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -694,11 +749,11 @@
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
 
-#: ../finch/gntconv.c:709 ../pidgin/gtkconv.c:7031
+#: ../finch/gntconv.c:946 ../pidgin/gtkconv.c:7088
 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:712 ../pidgin/gtkconv.c:7034
+#: ../finch/gntconv.c:949 ../pidgin/gtkconv.c:7091
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -706,39 +761,43 @@
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 
-#: ../finch/gntconv.c:715 ../pidgin/gtkconv.c:7037
+#: ../finch/gntconv.c:952 ../pidgin/gtkconv.c:7094
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Clears the conversation scrollback."
 
-#: ../finch/gntconv.c:718 ../pidgin/gtkconv.c:7040
+#: ../finch/gntconv.c:955 ../pidgin/gtkconv.c:7097
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;command&gt;:  Help on a specific command."
 
-#: ../finch/gntconv.c:723
+#: ../finch/gntconv.c:958
+msgid "users:  Show the list of users in the chat."
+msgstr "users: Show the list of users in the chat."
+
+#: ../finch/gntconv.c:963
 msgid "plugins: Show the plugins window."
 msgstr "plugins: Show the plugins window"
 
-#: ../finch/gntconv.c:726
+#: ../finch/gntconv.c:966
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist: Show the buddy list."
 
-#: ../finch/gntconv.c:729
+#: ../finch/gntconv.c:969
 msgid "accounts: Show the accounts window."
 msgstr "accounts: Show the accounts window."
 
-#: ../finch/gntconv.c:732
+#: ../finch/gntconv.c:972
 msgid "debugwin: Show the debug window."
 msgstr "debugwin: Show the debug window."
 
-#: ../finch/gntconv.c:735
+#: ../finch/gntconv.c:975
 msgid "prefs: Show the preference window."
 msgstr "prefs: Show the preference window."
 
-#: ../finch/gntconv.c:738
+#: ../finch/gntconv.c:978
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: Show the saved-statuses window."
 
-#: ../finch/gntdebug.c:225 ../finch/gntui.c:79 ../pidgin/gtkdebug.c:708
+#: ../finch/gntdebug.c:230 ../finch/gntui.c:79 ../pidgin/gtkdebug.c:694
 msgid "Debug Window"
 msgstr "Debug Window"
 
@@ -746,18 +805,18 @@
 #. * 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:246 ../pidgin/gtkdebug.c:767
+#: ../finch/gntdebug.c:251 ../pidgin/gtkdebug.c:753
 msgid "Clear"
 msgstr "Clear"
 
-#: ../finch/gntdebug.c:251 ../pidgin/gtkdebug.c:776
+#: ../finch/gntdebug.c:257
+msgid "Filter: "
+msgstr "Filter: "
+
+#: ../finch/gntdebug.c:261 ../pidgin/gtkdebug.c:762
 msgid "Pause"
 msgstr "Pause"
 
-#: ../finch/gntdebug.c:256 ../pidgin/gtkdebug.c:783 ../pidgin/gtkdebug.c:784
-msgid "Timestamps"
-msgstr "Timestamps"
-
 #: ../finch/gntft.c:117 ../pidgin/gtkft.c:228
 #, c-format
 msgid "File Transfers - %d%% of %d files"
@@ -789,26 +848,26 @@
 msgstr "Remaining"
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
-#: ../finch/gntft.c:197 ../finch/gntstatus.c:534 ../finch/gntstatus.c:563
+#: ../finch/gntft.c:197 ../finch/gntstatus.c:537 ../finch/gntstatus.c:566
 #: ../libpurple/protocols/bonjour/bonjour.c:326
-#: ../libpurple/protocols/gg/gg.c:1024 ../libpurple/protocols/gg/gg.c:1563
-#: ../libpurple/protocols/gg/gg.c:1571
-#: ../libpurple/protocols/jabber/buddy.c:637
-#: ../libpurple/protocols/jabber/buddy.c:641
-#: ../libpurple/protocols/jabber/buddy.c:676
-#: ../libpurple/protocols/jabber/jabber.c:1201
-#: ../libpurple/protocols/msn/msn.c:512
-#: ../libpurple/protocols/novell/novell.c:2833
-#: ../libpurple/protocols/oscar/oscar.c:802
-#: ../libpurple/protocols/oscar/oscar.c:807
-#: ../libpurple/protocols/oscar/oscar.c:809
-#: ../libpurple/protocols/oscar/oscar.c:2666
-#: ../libpurple/protocols/oscar/oscar.c:3784
-#: ../libpurple/protocols/sametime/sametime.c:3264
-#: ../libpurple/protocols/sametime/sametime.c:4149
-#: ../libpurple/protocols/yahoo/yahoo.c:3047 ../pidgin/gtkblist.c:3026
-#: ../pidgin/gtkblist.c:3039 ../pidgin/gtkblist.c:3041
-#: ../pidgin/gtksavedstatuses.c:942 ../pidgin/gtksavedstatuses.c:1089
+#: ../libpurple/protocols/gg/gg.c:1034 ../libpurple/protocols/gg/gg.c:1573
+#: ../libpurple/protocols/gg/gg.c:1581
+#: ../libpurple/protocols/jabber/buddy.c:634
+#: ../libpurple/protocols/jabber/buddy.c:638
+#: ../libpurple/protocols/jabber/buddy.c:673
+#: ../libpurple/protocols/jabber/jabber.c:1214
+#: ../libpurple/protocols/msn/msn.c:515
+#: ../libpurple/protocols/novell/novell.c:2835
+#: ../libpurple/protocols/oscar/oscar.c:803
+#: ../libpurple/protocols/oscar/oscar.c:808
+#: ../libpurple/protocols/oscar/oscar.c:810
+#: ../libpurple/protocols/oscar/oscar.c:2659
+#: ../libpurple/protocols/oscar/oscar.c:3770
+#: ../libpurple/protocols/sametime/sametime.c:3263
+#: ../libpurple/protocols/sametime/sametime.c:4150
+#: ../libpurple/protocols/yahoo/yahoo.c:3051 ../pidgin/gtkblist.c:3053
+#: ../pidgin/gtkblist.c:3066 ../pidgin/gtkblist.c:3068
+#: ../pidgin/gtksavedstatuses.c:943 ../pidgin/gtksavedstatuses.c:1090
 msgid "Status"
 msgstr "Status"
 
@@ -825,10 +884,10 @@
 msgstr "Stop"
 
 #. Close button
-#: ../finch/gntft.c:233 ../finch/gntnotify.c:163 ../finch/gntplugin.c:178
-#: ../finch/gntplugin.c:259 ../finch/gntpounce.c:720 ../finch/gntstatus.c:206
-#: ../libpurple/protocols/msn/msn.c:356 ../libpurple/protocols/silc/util.c:377
-#: ../pidgin/gtkaccount.c:2419 ../pidgin/gtkrequest.c:272
+#: ../finch/gntft.c:233 ../finch/gntnotify.c:179 ../finch/gntplugin.c:205
+#: ../finch/gntplugin.c:291 ../finch/gntpounce.c:722 ../finch/gntstatus.c:209
+#: ../libpurple/protocols/msn/msn.c:375 ../libpurple/protocols/silc/util.c:377
+#: ../pidgin/gtkaccount.c:2475 ../pidgin/gtkrequest.c:272
 msgid "Close"
 msgstr "Close"
 
@@ -858,68 +917,80 @@
 msgid "Transferring"
 msgstr "Transferring"
 
-#: ../finch/gntnotify.c:146
+#: ../finch/gntnotify.c:162
 msgid "Emails"
 msgstr "Emails"
 
-#: ../finch/gntnotify.c:152 ../finch/gntnotify.c:206
+#: ../finch/gntnotify.c:168 ../finch/gntnotify.c:222
 msgid "You have mail!"
 msgstr "You have e-mail!"
 
-#: ../finch/gntnotify.c:155 ../libpurple/protocols/jabber/jabber.c:1161
+#: ../finch/gntnotify.c:171 ../libpurple/protocols/jabber/jabber.c:1174
 msgid "From"
 msgstr "From"
 
-#: ../finch/gntnotify.c:155 ../pidgin/gtknotify.c:490
+#: ../finch/gntnotify.c:171 ../pidgin/gtknotify.c:490
 msgid "Subject"
 msgstr "Subject"
 
-#: ../finch/gntnotify.c:182
+#: ../finch/gntnotify.c:198
 #, 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:206 ../pidgin/gtknotify.c:329
+#: ../finch/gntnotify.c:222 ../pidgin/gtknotify.c:329
 msgid "New Mail"
 msgstr "New Mail"
 
-#: ../finch/gntnotify.c:230 ../pidgin/gtknotify.c:866
+#: ../finch/gntnotify.c:287 ../pidgin/gtknotify.c:906
 #, c-format
 msgid "Info for %s"
 msgstr "Info for %s"
 
-#: ../finch/gntnotify.c:232 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:868
+#: ../finch/gntnotify.c:288 ../libpurple/protocols/toc/toc.c:476
+#: ../pidgin/gtknotify.c:907
 msgid "Buddy Information"
 msgstr "Buddy Information"
 
-#: ../finch/gntnotify.c:306
+#: ../finch/gntnotify.c:366
 msgid "Continue"
 msgstr "Continue"
 
-#: ../finch/gntnotify.c:312 ../pidgin/gtkconv.c:1627 ../pidgin/gtkdebug.c:862
+#: ../finch/gntnotify.c:372 ../pidgin/gtkconv.c:1627 ../pidgin/gtkdebug.c:834
 msgid "Info"
 msgstr "Info"
 
-#: ../finch/gntnotify.c:315 ../pidgin/gtkconv.c:1588
+#: ../finch/gntnotify.c:375 ../pidgin/gtkconv.c:1588
 msgid "IM"
 msgstr "IM"
 
-#: ../finch/gntnotify.c:318
+#: ../finch/gntnotify.c:378
 msgid "Join"
 msgstr "Join"
 
-#: ../finch/gntnotify.c:321 ../libpurple/protocols/sametime/sametime.c:3473
+#: ../finch/gntnotify.c:381 ../libpurple/protocols/sametime/sametime.c:3473
 msgid "Invite"
 msgstr "Invite"
 
-#: ../finch/gntnotify.c:324
+#: ../finch/gntnotify.c:384
 msgid "(none)"
 msgstr "(none)"
 
-#: ../finch/gntplugin.c:102
+#: ../finch/gntplugin.c:73 ../finch/gntplugin.c:82
+msgid "ERROR"
+msgstr "ERROR"
+
+#: ../finch/gntplugin.c:73
+msgid "loading plugin failed"
+msgstr "loading plugin failed"
+
+#: ../finch/gntplugin.c:82
+msgid "unloading plugin failed"
+msgstr "unloading plugin failed"
+
+#: ../finch/gntplugin.c:124
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -936,39 +1007,36 @@
 "Website: %s\n"
 "Filename: %s\n"
 
-#: ../finch/gntplugin.c:155
+#: ../finch/gntplugin.c:182
 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:193
-msgid "..."
-msgstr "..."
-
-#: ../finch/gntplugin.c:194
-msgid "Still need to do something about this."
-msgstr "Still need to do something about this."
-
-#: ../finch/gntplugin.c:200
+#: ../finch/gntplugin.c:226
 msgid "No configuration options for this plugin."
 msgstr "No configuration options for this plugin."
 
-#: ../finch/gntplugin.c:221
+#: ../finch/gntplugin.c:249
 msgid "You can (un)load plugins from the following list."
 msgstr "You are (un)load plugins from the following list."
 
-#: ../finch/gntplugin.c:264
+#: ../finch/gntplugin.c:296
 msgid "Configure Plugin"
 msgstr "Configure Plugin"
 
-#: ../finch/gntpounce.c:180 ../pidgin/gtkpounce.c:251
+#: ../finch/gntplugin.c:352 ../finch/gntplugin.c:359 ../finch/gntprefs.c:245
+#: ../finch/gntui.c:82 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:1954
+msgid "Preferences"
+msgstr "Preferences"
+
+#: ../finch/gntpounce.c:180 ../pidgin/gtkpounce.c:253
 msgid "Please enter a buddy to pounce."
 msgstr "Please enter a buddy to pounce."
 
-#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:505
+#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:507
 msgid "New Buddy Pounce"
 msgstr "New Buddy Pounce"
 
-#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:505
+#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:507
 msgid "Edit Buddy Pounce"
 msgstr "Edit Buddy Pounce"
 
@@ -978,8 +1046,8 @@
 
 #. Account:
 #. Set up stuff for the account box
-#: ../finch/gntpounce.c:333 ../finch/gntstatus.c:443 ../pidgin/gtkblist.c:5389
-#: ../pidgin/gtkblist.c:5705
+#: ../finch/gntpounce.c:333 ../finch/gntstatus.c:446 ../pidgin/gtkblist.c:5437
+#: ../pidgin/gtkblist.c:5753
 msgid "Account:"
 msgstr "Account:"
 
@@ -988,52 +1056,52 @@
 msgstr "Buddy name:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:370 ../pidgin/gtkpounce.c:575
+#: ../finch/gntpounce.c:371 ../pidgin/gtkpounce.c:577
 msgid "Pounce When Buddy..."
 msgstr "Pounce When Buddy..."
 
-#: ../finch/gntpounce.c:372
-msgid "Signs on"
-msgstr "Signs on"
-
 #: ../finch/gntpounce.c:373
-msgid "Signs off"
-msgstr "Signs off"
+msgid "Signs on"
+msgstr "Signs on"
 
 #: ../finch/gntpounce.c:374
+msgid "Signs off"
+msgstr "Signs off"
+
+#: ../finch/gntpounce.c:375
 msgid "Goes away"
 msgstr "Goes away"
 
-#: ../finch/gntpounce.c:375
-msgid "Returns from away"
-msgstr "Returns from away"
-
 #: ../finch/gntpounce.c:376
-msgid "Becomes idle"
-msgstr "Becomes idle"
+msgid "Returns from away"
+msgstr "Returns from away"
 
 #: ../finch/gntpounce.c:377
+msgid "Becomes idle"
+msgstr "Becomes idle"
+
+#: ../finch/gntpounce.c:378
 msgid "Is no longer idle"
 msgstr "Is no longer idle"
 
-#: ../finch/gntpounce.c:378
+#: ../finch/gntpounce.c:379
 msgid "Starts typing"
 msgstr "Starts typing"
 
-#: ../finch/gntpounce.c:379
+#: ../finch/gntpounce.c:380
 msgid "Pauses while typing"
 msgstr "Pauses while typing"
 
-#: ../finch/gntpounce.c:380
+#: ../finch/gntpounce.c:381
 msgid "Stops typing"
 msgstr "Stops typing"
 
-#: ../finch/gntpounce.c:381
+#: ../finch/gntpounce.c:382
 msgid "Sends a message"
 msgstr "Sends a message"
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:411 ../pidgin/gtkpounce.c:636
+#: ../finch/gntpounce.c:411 ../pidgin/gtkpounce.c:638
 msgid "Action"
 msgstr "Action"
 
@@ -1061,141 +1129,136 @@
 msgid "Pounce only when my status is not available"
 msgstr "Pounce only when my status is not available"
 
-#: ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:1278
+#: ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:1282
 msgid "Recurring"
 msgstr "Recurring"
 
-#: ../finch/gntpounce.c:649 ../pidgin/gtkpounce.c:1095
+#: ../finch/gntpounce.c:649 ../pidgin/gtkpounce.c:1097
 #, 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:680 ../finch/gntui.c:78 ../pidgin/gtkpounce.c:1325
+#: ../finch/gntpounce.c:682 ../finch/gntui.c:78 ../pidgin/gtkpounce.c:1329
 msgid "Buddy Pounces"
 msgstr "Buddy Pounces"
 
-#: ../finch/gntpounce.c:792 ../pidgin/gtkpounce.c:1452
+#: ../finch/gntpounce.c:794 ../pidgin/gtkpounce.c:1456
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s has started typing to you (%s)"
 
-#: ../finch/gntpounce.c:794 ../pidgin/gtkpounce.c:1454
+#: ../finch/gntpounce.c:796 ../pidgin/gtkpounce.c:1458
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s has paused while typing to you (%s)"
 
-#: ../finch/gntpounce.c:796 ../pidgin/gtkpounce.c:1456
+#: ../finch/gntpounce.c:798 ../pidgin/gtkpounce.c:1460
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s has signed on (%s)"
 
-#: ../finch/gntpounce.c:798 ../pidgin/gtkpounce.c:1458
+#: ../finch/gntpounce.c:800 ../pidgin/gtkpounce.c:1462
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s has returned from being idle (%s)"
 
-#: ../finch/gntpounce.c:800 ../pidgin/gtkpounce.c:1460
+#: ../finch/gntpounce.c:802 ../pidgin/gtkpounce.c:1464
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s has returned from being away (%s)"
 
-#: ../finch/gntpounce.c:802 ../pidgin/gtkpounce.c:1462
+#: ../finch/gntpounce.c:804 ../pidgin/gtkpounce.c:1466
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s has stopped typing to you (%s)"
 
-#: ../finch/gntpounce.c:804 ../pidgin/gtkpounce.c:1464
+#: ../finch/gntpounce.c:806 ../pidgin/gtkpounce.c:1468
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s has signed off (%s)"
 
-#: ../finch/gntpounce.c:806 ../pidgin/gtkpounce.c:1466
+#: ../finch/gntpounce.c:808 ../pidgin/gtkpounce.c:1470
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s has become idle (%s)"
 
-#: ../finch/gntpounce.c:808 ../pidgin/gtkpounce.c:1468
+#: ../finch/gntpounce.c:810 ../pidgin/gtkpounce.c:1472
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s has gone away. (%s)"
 
-#: ../finch/gntpounce.c:810 ../pidgin/gtkpounce.c:1470
+#: ../finch/gntpounce.c:812 ../pidgin/gtkpounce.c:1474
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s has sent you a message. (%s)"
 
-#: ../finch/gntpounce.c:811 ../pidgin/gtkpounce.c:1471
+#: ../finch/gntpounce.c:813 ../pidgin/gtkpounce.c:1475
 msgid "Unknown pounce event. Please report this!"
 msgstr "Unknown pounce event. Please report this!"
 
-#: ../finch/gntprefs.c:69 ../pidgin/gtkprefs.c:1812
+#: ../finch/gntprefs.c:79
+msgid "Based on keyboard use"
+msgstr "Based on keyboard use"
+
+#: ../finch/gntprefs.c:81 ../pidgin/gtkprefs.c:1815
 msgid "From last sent message"
 msgstr "From last sent message"
 
-#: ../finch/gntprefs.c:71 ../libpurple/plugins/autoreply.c:360
-#: ../pidgin/gtkprefs.c:820 ../pidgin/gtkprefs.c:829 ../pidgin/gtkprefs.c:1811
-#: ../pidgin/gtkprefs.c:1825 ../pidgin/plugins/win32/winprefs/winprefs.c:337
+#: ../finch/gntprefs.c:83 ../pidgin/gtkprefs.c:820 ../pidgin/gtkprefs.c:829
+#: ../pidgin/gtkprefs.c:1814 ../pidgin/gtkprefs.c:1828
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:337
 msgid "Never"
 msgstr "Never"
 
-#: ../finch/gntprefs.c:159
+#: ../finch/gntprefs.c:171
 msgid "Show Idle Time"
 msgstr "Show Idle Time"
 
-#: ../finch/gntprefs.c:160
+#: ../finch/gntprefs.c:172
 msgid "Show Offline Buddies"
 msgstr "Show Offline Buddies"
 
-#: ../finch/gntprefs.c:166
-msgid "Show Timestamps"
-msgstr "Show Timestamps"
-
-#: ../finch/gntprefs.c:167
+#: ../finch/gntprefs.c:179
 msgid "Notify buddies when you are typing"
 msgstr "Notify buddies when you are typing"
 
-#: ../finch/gntprefs.c:173
+#: ../finch/gntprefs.c:185
 msgid "Log format"
 msgstr "Log format"
 
-#: ../finch/gntprefs.c:174
+#: ../finch/gntprefs.c:186
 msgid "Log IMs"
 msgstr "Log IMs"
 
-#: ../finch/gntprefs.c:175
+#: ../finch/gntprefs.c:187
 msgid "Log chats"
 msgstr "Log chats"
 
-#: ../finch/gntprefs.c:176
+#: ../finch/gntprefs.c:188
 msgid "Log status change events"
 msgstr "Log status change events"
 
 #. Conversations
-#: ../finch/gntprefs.c:279 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:1915
+#: ../finch/gntprefs.c:241 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:1918
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:344
 msgid "Conversations"
 msgstr "Conversations"
 
-#: ../finch/gntprefs.c:280 ../pidgin/gtkprefs.c:1355 ../pidgin/gtkprefs.c:1926
+#: ../finch/gntprefs.c:242 ../pidgin/gtkprefs.c:1355 ../pidgin/gtkprefs.c:1929
 msgid "Logging"
 msgstr "Logging"
 
-#: ../finch/gntprefs.c:283 ../finch/gntui.c:82 ../pidgin/gtkdocklet.c:532
-#: ../pidgin/gtkprefs.c:1951
-msgid "Preferences"
-msgstr "Preferences"
-
-#: ../finch/gntrequest.c:521
+#: ../finch/gntrequest.c:532
 msgid "Not implemented yet."
 msgstr "Not implemented yet."
 
-#: ../finch/gntrequest.c:583 ../pidgin/gtkrequest.c:1514
-#: ../pidgin/gtkrequest.c:1559
+#: ../finch/gntrequest.c:597 ../pidgin/gtkrequest.c:1529
+#: ../pidgin/gtkrequest.c:1575
 msgid "Save File..."
 msgstr "Save File..."
 
-#: ../finch/gntrequest.c:583 ../pidgin/gtkrequest.c:1515
-#: ../pidgin/gtkrequest.c:1560
+#: ../finch/gntrequest.c:597 ../pidgin/gtkrequest.c:1530
+#: ../pidgin/gtkrequest.c:1576
 msgid "Open File..."
 msgstr "Open File..."
 
@@ -1208,102 +1271,102 @@
 msgid "Delete Status"
 msgstr "Delete Status"
 
-#: ../finch/gntstatus.c:167 ../pidgin/gtksavedstatuses.c:556
+#: ../finch/gntstatus.c:170 ../pidgin/gtksavedstatuses.c:557
 msgid "Saved Statuses"
 msgstr "Saved Statuses"
 
-#: ../finch/gntstatus.c:174 ../finch/gntstatus.c:526
+#: ../finch/gntstatus.c:177 ../finch/gntstatus.c:529
 #: ../libpurple/protocols/jabber/buddy.c:286
-#: ../libpurple/protocols/jabber/buddy.c:938
+#: ../libpurple/protocols/jabber/buddy.c:935
 #: ../libpurple/protocols/novell/novell.c:1484
-#: ../pidgin/gtksavedstatuses.c:463
+#: ../pidgin/gtksavedstatuses.c:464
 msgid "Title"
 msgstr "Title"
 
-#: ../finch/gntstatus.c:174 ../pidgin/gtksavedstatuses.c:478
+#: ../finch/gntstatus.c:177 ../pidgin/gtksavedstatuses.c:479
 msgid "Type"
 msgstr "Type"
 
-#: ../finch/gntstatus.c:174 ../finch/gntstatus.c:551 ../finch/gntstatus.c:563
+#: ../finch/gntstatus.c:177 ../finch/gntstatus.c:554 ../finch/gntstatus.c:566
 #: ../libpurple/protocols/bonjour/bonjour.c:258
 #: ../libpurple/protocols/bonjour/bonjour.c:265
 #: ../libpurple/protocols/bonjour/bonjour.c:328
-#: ../libpurple/protocols/gg/gg.c:1062 ../libpurple/protocols/gg/gg.c:1566
-#: ../libpurple/protocols/gg/gg.c:1584 ../libpurple/protocols/gg/gg.c:1594
-#: ../libpurple/protocols/gg/gg.c:1600 ../libpurple/protocols/gg/gg.c:1609
-#: ../libpurple/protocols/gg/gg.c:1614 ../libpurple/protocols/irc/irc.c:234
-#: ../libpurple/protocols/jabber/jabber.c:1233
-#: ../libpurple/protocols/jabber/jabber.c:1243
-#: ../libpurple/protocols/jabber/jabber.c:1253
-#: ../libpurple/protocols/jabber/jabber.c:1263
-#: ../libpurple/protocols/jabber/jabber.c:1273
-#: ../libpurple/protocols/jabber/jabber.c:1285
-#: ../libpurple/protocols/novell/novell.c:2836
-#: ../libpurple/protocols/novell/novell.c:2939
-#: ../libpurple/protocols/novell/novell.c:2945
-#: ../libpurple/protocols/novell/novell.c:2951
-#: ../libpurple/protocols/oscar/oscar.c:5494
+#: ../libpurple/protocols/gg/gg.c:1072 ../libpurple/protocols/gg/gg.c:1576
+#: ../libpurple/protocols/gg/gg.c:1594 ../libpurple/protocols/gg/gg.c:1604
+#: ../libpurple/protocols/gg/gg.c:1610 ../libpurple/protocols/gg/gg.c:1619
+#: ../libpurple/protocols/gg/gg.c:1624 ../libpurple/protocols/irc/irc.c:234
+#: ../libpurple/protocols/jabber/jabber.c:1246
+#: ../libpurple/protocols/jabber/jabber.c:1256
+#: ../libpurple/protocols/jabber/jabber.c:1266
+#: ../libpurple/protocols/jabber/jabber.c:1276
+#: ../libpurple/protocols/jabber/jabber.c:1286
+#: ../libpurple/protocols/jabber/jabber.c:1298
+#: ../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:5467
+#: ../libpurple/protocols/oscar/oscar.c:5685
+#: ../libpurple/protocols/oscar/oscar.c:5699
+#: ../libpurple/protocols/oscar/oscar.c:5715
 #: ../libpurple/protocols/oscar/oscar.c:5722
-#: ../libpurple/protocols/oscar/oscar.c:5736
-#: ../libpurple/protocols/oscar/oscar.c:5752
-#: ../libpurple/protocols/oscar/oscar.c:5759
-#: ../libpurple/protocols/oscar/oscar.c:5766
-#: ../libpurple/protocols/sametime/sametime.c:3287
-#: ../libpurple/protocols/sametime/sametime.c:3293
-#: ../libpurple/protocols/sametime/sametime.c:3299
-#: ../libpurple/protocols/sametime/sametime.c:3378
-#: ../libpurple/protocols/silc/buddy.c:1544
+#: ../libpurple/protocols/oscar/oscar.c:5729
+#: ../libpurple/protocols/sametime/sametime.c:3286
+#: ../libpurple/protocols/sametime/sametime.c:3292
+#: ../libpurple/protocols/sametime/sametime.c:3298
+#: ../libpurple/protocols/sametime/sametime.c:3377
+#: ../libpurple/protocols/silc/buddy.c:1551
 #: ../libpurple/protocols/simple/simple.c:246
-#: ../libpurple/protocols/yahoo/yahoo.c:3470
-#: ../libpurple/protocols/yahoo/yahoo.c:3476
-#: ../libpurple/protocols/zephyr/zephyr.c:2336
-#: ../pidgin/gtksavedstatuses.c:489 ../pidgin/gtksavedstatuses.c:953
+#: ../libpurple/protocols/yahoo/yahoo.c:3479
+#: ../libpurple/protocols/yahoo/yahoo.c:3485
+#: ../libpurple/protocols/zephyr/zephyr.c:2337
+#: ../pidgin/gtksavedstatuses.c:490 ../pidgin/gtksavedstatuses.c:954
 msgid "Message"
 msgstr "Message"
 
 #. Use
-#: ../finch/gntstatus.c:186 ../finch/gntstatus.c:580
+#: ../finch/gntstatus.c:189 ../finch/gntstatus.c:583
 msgid "Use"
 msgstr "Use"
 
-#: ../finch/gntstatus.c:291
+#: ../finch/gntstatus.c:294
 msgid "Invalid title"
 msgstr "Invalid title"
 
-#: ../finch/gntstatus.c:292
+#: ../finch/gntstatus.c:295
 msgid "Please enter a non-empty title for the status."
 msgstr "Please enter a non-empty title for the status."
 
-#: ../finch/gntstatus.c:299
+#: ../finch/gntstatus.c:302
 msgid "Duplicate title"
 msgstr "Duplicate title"
 
-#: ../finch/gntstatus.c:300
+#: ../finch/gntstatus.c:303
 msgid "Please enter a different title for the status."
 msgstr "Please enter a different title for the status."
 
-#: ../finch/gntstatus.c:440
+#: ../finch/gntstatus.c:443
 msgid "Substatus"
 msgstr "Sub-status"
 
-#: ../finch/gntstatus.c:451 ../pidgin/gtkft.c:698
+#: ../finch/gntstatus.c:454 ../pidgin/gtkft.c:698
 msgid "Status:"
 msgstr "Status:"
 
-#: ../finch/gntstatus.c:466
+#: ../finch/gntstatus.c:469
 msgid "Message:"
 msgstr "Message:"
 
-#: ../finch/gntstatus.c:515
+#: ../finch/gntstatus.c:518
 msgid "Edit Status"
 msgstr "Edit Status"
 
-#: ../finch/gntstatus.c:557
+#: ../finch/gntstatus.c:560
 msgid "Use different status for following accounts"
 msgstr "Use different status for the following accounts"
 
 #. Save & Use
-#: ../finch/gntstatus.c:591
+#: ../finch/gntstatus.c:594
 msgid "Save & Use"
 msgstr "Save & Use"
 
@@ -1327,64 +1390,64 @@
 "When the gnt clipboard contents change, the contents are made available to "
 "X, if possible."
 
-#: ../finch/plugins/gntgf.c:209
+#: ../finch/plugins/gntgf.c:231
 #, c-format
 msgid "%s just signed on"
 msgstr "%s just signed on"
 
-#: ../finch/plugins/gntgf.c:216
+#: ../finch/plugins/gntgf.c:238
 #, c-format
 msgid "%s just signed off"
 msgstr "%s just signed off"
 
-#: ../finch/plugins/gntgf.c:224
+#: ../finch/plugins/gntgf.c:246
 #, c-format
 msgid "%s sent you a message"
 msgstr "%s sent you a message"
 
-#: ../finch/plugins/gntgf.c:243
+#: ../finch/plugins/gntgf.c:265
 #, c-format
 msgid "%s said your nick in %s"
 msgstr "%s said your nick in %s"
 
-#: ../finch/plugins/gntgf.c:245
+#: ../finch/plugins/gntgf.c:267
 #, c-format
 msgid "%s sent a message in %s"
 msgstr "%s sent a message in %s"
 
-#: ../finch/plugins/gntgf.c:283
+#: ../finch/plugins/gntgf.c:305
 msgid "Buddy signs on/off"
 msgstr "Buddy signs on/off"
 
-#: ../finch/plugins/gntgf.c:284
+#: ../finch/plugins/gntgf.c:306
 msgid "You receive an IM"
 msgstr "You receive an IM"
 
-#: ../finch/plugins/gntgf.c:285
+#: ../finch/plugins/gntgf.c:307
 msgid "Someone speaks in a chat"
 msgstr "Someone speaks in chat"
 
-#: ../finch/plugins/gntgf.c:286
+#: ../finch/plugins/gntgf.c:308
 msgid "Someone says your name in a chat"
 msgstr "Someone says your name in chat"
 
-#: ../finch/plugins/gntgf.c:314
+#: ../finch/plugins/gntgf.c:336
 msgid "Notify with a toaster when"
 msgstr "Notify with a toaster when"
 
-#: ../finch/plugins/gntgf.c:329
+#: ../finch/plugins/gntgf.c:351
 msgid "Beep too!"
 msgstr "Beep too!"
 
-#: ../finch/plugins/gntgf.c:335
+#: ../finch/plugins/gntgf.c:357
 msgid "Set URGENT for the terminal window."
 msgstr "Set URGENT for the terminal window."
 
-#: ../finch/plugins/gntgf.c:355
+#: ../finch/plugins/gntgf.c:377
 msgid "GntGf"
 msgstr "GntGf"
 
-#: ../finch/plugins/gntgf.c:357 ../finch/plugins/gntgf.c:358
+#: ../finch/plugins/gntgf.c:379 ../finch/plugins/gntgf.c:380
 msgid "Toaster plugin"
 msgstr "Toaster plugin"
 
@@ -1441,83 +1504,89 @@
 msgid "Lastlog plugin."
 msgstr "Lastlog plugin."
 
-#: ../libpurple/account.c:777
+#: ../libpurple/account.c:790
 msgid "accounts"
 msgstr "accounts"
 
-#: ../libpurple/account.c:923
+#: ../libpurple/account.c:937 ../libpurple/protocols/jabber/auth.c:194
+#: ../libpurple/protocols/jabber/auth.c:233
 msgid "Password is required to sign on."
 msgstr "Password is required to sign on."
 
-#: ../libpurple/account.c:948
+#: ../libpurple/account.c:963
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "Enter password for %s (%s)"
 
-#: ../libpurple/account.c:955
+#: ../libpurple/account.c:970
 msgid "Enter Password"
 msgstr "Enter Password"
 
-#: ../libpurple/account.c:960
+#: ../libpurple/account.c:975
 msgid "Save password"
 msgstr "Save password"
 
-#: ../libpurple/account.c:994 ../libpurple/connection.c:104
+#: ../libpurple/account.c:1010 ../libpurple/connection.c:104
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "Missing protocol plug-in for %s"
 
-#: ../libpurple/account.c:1154 ../libpurple/protocols/gg/gg.c:696
-#: ../libpurple/protocols/jabber/jabber.c:1323
+#: ../libpurple/account.c:1012 ../libpurple/connection.c:107
+#: ../pidgin/gtkblist.c:3961
+msgid "Connection Error"
+msgstr "Connection Error"
+
+#: ../libpurple/account.c:1170 ../libpurple/protocols/gg/gg.c:702
+#: ../libpurple/protocols/jabber/jabber.c:1336
 msgid "New passwords do not match."
 msgstr "New passwords do not match."
 
-#: ../libpurple/account.c:1163
+#: ../libpurple/account.c:1179
 msgid "Fill out all fields completely."
 msgstr "Fill out all fields completely."
 
-#: ../libpurple/account.c:1186
+#: ../libpurple/account.c:1202
 msgid "Original password"
 msgstr "Original password"
 
-#: ../libpurple/account.c:1193
+#: ../libpurple/account.c:1209
 msgid "New password"
 msgstr "New password"
 
-#: ../libpurple/account.c:1200
+#: ../libpurple/account.c:1216
 msgid "New password (again)"
 msgstr "New password (again)"
 
-#: ../libpurple/account.c:1206
+#: ../libpurple/account.c:1222
 #, c-format
 msgid "Change password for %s"
 msgstr "Change password for %s"
 
-#: ../libpurple/account.c:1214
+#: ../libpurple/account.c:1230
 msgid "Please enter your current password and your new password."
 msgstr "Please enter your current password and your new password."
 
-#: ../libpurple/account.c:1244
+#: ../libpurple/account.c:1261
 #, c-format
 msgid "Change user information for %s"
 msgstr "Change user information for %s"
 
-#: ../libpurple/account.c:1247 ../libpurple/protocols/toc/toc.c:1670
+#: ../libpurple/account.c:1264 ../libpurple/protocols/toc/toc.c:1670
 msgid "Set User Info"
 msgstr "Set User Info"
 
-#: ../libpurple/account.c:1783 ../libpurple/protocols/gg/gg.c:1002
-#: ../libpurple/protocols/jabber/buddy.c:641
-#: ../libpurple/protocols/jabber/buddy.c:1404
-#: ../libpurple/protocols/jabber/buddy.c:1421
-#: ../libpurple/protocols/novell/novell.c:2829
+#: ../libpurple/account.c:1744 ../libpurple/protocols/gg/gg.c:1012
+#: ../libpurple/protocols/jabber/buddy.c:638
+#: ../libpurple/protocols/jabber/buddy.c:1424
+#: ../libpurple/protocols/jabber/buddy.c:1441
+#: ../libpurple/protocols/novell/novell.c:2831
 #: ../libpurple/protocols/qq/qq.c:230 ../pidgin/gtkft.c:159
 msgid "Unknown"
 msgstr "Unknown"
 
-#: ../libpurple/blist.c:523 ../libpurple/blist.c:1296
-#: ../libpurple/blist.c:1525 ../libpurple/protocols/jabber/roster.c:68
-#: ../pidgin/gtkblist.c:5185 ../pidgin/plugins/gevolution/gevolution.c:97
+#: ../libpurple/blist.c:523 ../libpurple/blist.c:1291
+#: ../libpurple/blist.c:1520 ../libpurple/protocols/jabber/roster.c:68
+#: ../pidgin/gtkblist.c:5233 ../pidgin/plugins/gevolution/gevolution.c:97
 #: ../pidgin/plugins/gevolution/gevo-util.c:64
 msgid "Buddies"
 msgstr "Buddies"
@@ -1541,7 +1610,7 @@
 msgstr "+++ %s signed off"
 
 #: ../libpurple/connection.c:440 ../libpurple/plugin.c:282
-#: ../libpurple/protocols/jabber/buddy.c:1692
+#: ../libpurple/protocols/jabber/buddy.c:1712
 #: ../libpurple/protocols/msn/servconn.c:139
 #: ../libpurple/protocols/msn/session.c:321
 msgid "Unknown error"
@@ -1564,40 +1633,40 @@
 msgid "Unable to send message."
 msgstr "Unable to send message."
 
-#: ../libpurple/conversation.c:1162
+#: ../libpurple/conversation.c:1164
 msgid "Send Message"
 msgstr "Send Message"
 
-#: ../libpurple/conversation.c:1163
+#: ../libpurple/conversation.c:1167
 msgid "_Send Message"
 msgstr "_Send Message"
 
-#: ../libpurple/conversation.c:1566
+#: ../libpurple/conversation.c:1570
 #, c-format
 msgid "%s entered the room."
 msgstr "%s entered the room."
 
-#: ../libpurple/conversation.c:1569
+#: ../libpurple/conversation.c:1573
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] entered the room."
 
-#: ../libpurple/conversation.c:1674
+#: ../libpurple/conversation.c:1678
 #, c-format
 msgid "You are now known as %s"
 msgstr "You are now known as %s"
 
-#: ../libpurple/conversation.c:1694
+#: ../libpurple/conversation.c:1698
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s is now known as %s"
 
-#: ../libpurple/conversation.c:1767
+#: ../libpurple/conversation.c:1771
 #, c-format
 msgid "%s left the room."
 msgstr "%s left the room."
 
-#: ../libpurple/conversation.c:1770
+#: ../libpurple/conversation.c:1774
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s left the room (%s)."
@@ -1617,6 +1686,10 @@
 msgid "Failed to get serv name: %s"
 msgstr "Failed to get serv name: %s"
 
+#: ../libpurple/dbus-server.h:83
+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
 msgid "No name"
 msgstr "No name"
@@ -1666,7 +1739,7 @@
 msgid "Unknown reason"
 msgstr "Unknown reason"
 
-#: ../libpurple/ft.c:204 ../libpurple/protocols/msn/msn.c:409
+#: ../libpurple/ft.c:204
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -1710,22 +1783,22 @@
 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:340
+#: ../libpurple/ft.c:342
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s wants to send you %s (%s)"
 
-#: ../libpurple/ft.c:347
+#: ../libpurple/ft.c:349
 #, c-format
 msgid "%s wants to send you a file"
 msgstr "%s wants to send you a file"
 
-#: ../libpurple/ft.c:388
+#: ../libpurple/ft.c:392
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "Accept file transfer request from %s?"
 
-#: ../libpurple/ft.c:392
+#: ../libpurple/ft.c:396
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -1736,60 +1809,60 @@
 "Remote host: %s\n"
 "Remote port: %d"
 
-#: ../libpurple/ft.c:425
+#: ../libpurple/ft.c:431
 #, c-format
 msgid "%s is offering to send file %s"
 msgstr "%s is offering to send file %s"
 
-#: ../libpurple/ft.c:477
+#: ../libpurple/ft.c:483
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s is not a valid filename.\n"
 
-#: ../libpurple/ft.c:498
+#: ../libpurple/ft.c:504
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "Offering to send %s to %s"
 
-#: ../libpurple/ft.c:510
+#: ../libpurple/ft.c:516
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr "Starting transfer of %s from %s"
 
-#: ../libpurple/ft.c:664
+#: ../libpurple/ft.c:670
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "Transfer of file %s complete"
 
-#: ../libpurple/ft.c:667
+#: ../libpurple/ft.c:673
 msgid "File transfer complete"
 msgstr "File transfer complete"
 
-#: ../libpurple/ft.c:1084
+#: ../libpurple/ft.c:1091
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "You cancelled the transfer of %s"
 
-#: ../libpurple/ft.c:1089
+#: ../libpurple/ft.c:1096
 msgid "File transfer cancelled"
 msgstr "File transfer cancelled"
 
-#: ../libpurple/ft.c:1147
+#: ../libpurple/ft.c:1154
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s cancelled the transfer of %s"
 
-#: ../libpurple/ft.c:1152
+#: ../libpurple/ft.c:1159
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s cancelled the file transfer"
 
-#: ../libpurple/ft.c:1209
+#: ../libpurple/ft.c:1216
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "File transfer to %s failed."
 
-#: ../libpurple/ft.c:1211
+#: ../libpurple/ft.c:1218
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "File transfer from %s failed."
@@ -2102,41 +2175,41 @@
 msgid "Set Autoaccept Setting"
 msgstr "Set Autoaccept Setting"
 
-#: ../libpurple/plugins/autoaccept.c:164 ../libpurple/plugins/autoreply.c:225
+#: ../libpurple/plugins/autoaccept.c:164
 msgid "_Save"
 msgstr "_Save"
 
-#: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/autoreply.c:226
-#: ../libpurple/plugins/idle.c:170 ../libpurple/plugins/idle.c:203
-#: ../libpurple/plugins/idle.c:228 ../libpurple/protocols/oscar/oscar.c:1434
-#: ../libpurple/protocols/oscar/oscar.c:2245
-#: ../libpurple/protocols/oscar/oscar.c:2291
-#: ../libpurple/protocols/oscar/oscar.c:5836
-#: ../libpurple/protocols/oscar/oscar.c:5888
-#: ../libpurple/protocols/oscar/oscar.c:6112
-#: ../libpurple/protocols/oscar/oscar.c:6181 ../libpurple/request.h:1350
-#: ../libpurple/request.h:1360
+#: ../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:1440
+#: ../libpurple/protocols/oscar/oscar.c:2234
+#: ../libpurple/protocols/oscar/oscar.c:2281
+#: ../libpurple/protocols/oscar/oscar.c:5799
+#: ../libpurple/protocols/oscar/oscar.c:5854
+#: ../libpurple/protocols/oscar/oscar.c:6080
+#: ../libpurple/protocols/oscar/oscar.c:6150 ../libpurple/request.h:1387
+#: ../libpurple/request.h:1397
 msgid "_Cancel"
 msgstr "_Cancel"
 
-#: ../libpurple/plugins/autoaccept.c:166
+#: ../libpurple/plugins/autoaccept.c:168
 msgid "Ask"
 msgstr "Ask"
 
-#: ../libpurple/plugins/autoaccept.c:167
+#: ../libpurple/plugins/autoaccept.c:169
 msgid "Auto Accept"
 msgstr "Auto Accept"
 
-#: ../libpurple/plugins/autoaccept.c:168
+#: ../libpurple/plugins/autoaccept.c:170
 msgid "Auto Reject"
 msgstr "Auto Reject"
 
-#: ../libpurple/plugins/autoaccept.c:181
+#: ../libpurple/plugins/autoaccept.c:184
 msgid "Autoaccept File Transfers..."
 msgstr "Autoaccept File Transfers..."
 
 #. XXX: Is there a better way than this? There really should be.
-#: ../libpurple/plugins/autoaccept.c:211
+#: ../libpurple/plugins/autoaccept.c:214
 msgid ""
 "Path to save the files in\n"
 "(Please provide the full path)"
@@ -2144,11 +2217,11 @@
 "Path to save the files in\n"
 "(Please provide the full path)"
 
-#: ../libpurple/plugins/autoaccept.c:216
+#: ../libpurple/plugins/autoaccept.c:219
 msgid "Automatically reject from users not in buddy list"
 msgstr "Automatically reject from users not in buddy list"
 
-#: ../libpurple/plugins/autoaccept.c:220
+#: ../libpurple/plugins/autoaccept.c:223
 msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
 "(only when there's no conversation with the sender)"
@@ -2156,112 +2229,8 @@
 "Notify with a popup when an autoaccepted file transfer is complete\n"
 "(only when there's no conversation with the sender)"
 
-#: ../libpurple/plugins/autoreply.c:23
-msgid "Autoreply"
-msgstr "Autoreply"
-
-#: ../libpurple/plugins/autoreply.c:25
-msgid "Autoreply for all the protocols"
-msgstr "Autoreply for all the protocols"
-
-#: ../libpurple/plugins/autoreply.c:26
-msgid ""
-"This plugin lets you set autoreply message for any protocol. You can set the "
-"global autoreply message from the Plugin-options dialog. To set some "
-"specific autoreply message for a particular buddy, right click on the buddy "
-"in the buddy-list window. To set autoreply messages for some account, go to "
-"the `Advanced' tab of the Account-edit dialog."
-msgstr ""
-"This plugin lets you set autoreply message for any protocol. You can set the "
-"global autoreply message from the Plugin-options dialog. To set some "
-"specific autoreply message for a particular buddy, right click on the buddy "
-"in the buddy-list window. To set autoreply messages for some account, go to "
-"the `Advanced' tab of the Account-edit dialog."
-
-#. XXX: There should be a way to reset to the default/account-default autoreply
-#: ../libpurple/plugins/autoreply.c:218
-#, c-format
-msgid "Set autoreply message for %s"
-msgstr "Set autoreply message for %s"
-
-#: ../libpurple/plugins/autoreply.c:220
-msgid "Set Autoreply Message"
-msgstr "Set Autoreply Message"
-
-#: ../libpurple/plugins/autoreply.c:221
-msgid ""
-"The following message will be sent to the buddy when the buddy sends you a "
-"message and autoreply is enabled."
-msgstr ""
-"The following message will be sent to the buddy when the buddy sends you a "
-"message and autoreply is enabled."
-
-#: ../libpurple/plugins/autoreply.c:238
-msgid "Set _Autoreply Message"
-msgstr "Set _Autoreply Message"
-
-#: ../libpurple/plugins/autoreply.c:249
-msgid "Autoreply message"
-msgstr "Autoreply message"
-
-#: ../libpurple/plugins/autoreply.c:336
-msgid "Send autoreply messages when"
-msgstr "Send autoreply messages when"
-
-#: ../libpurple/plugins/autoreply.c:340
-msgid "When my account is _away"
-msgstr "When my account is _away"
-
-#: ../libpurple/plugins/autoreply.c:344
-msgid "When my account is _idle"
-msgstr "When my account is _idle"
-
-#: ../libpurple/plugins/autoreply.c:348
-msgid "_Default reply"
-msgstr "_Default reply"
-
-#: ../libpurple/plugins/autoreply.c:354
-msgid "Status message"
-msgstr "Status message"
-
-#: ../libpurple/plugins/autoreply.c:358
-msgid "Autoreply with status message"
-msgstr "Autoreply with status message"
-
-#: ../libpurple/plugins/autoreply.c:362
-msgid "Always when there is a status message"
-msgstr "Always when there is a status message"
-
-#: ../libpurple/plugins/autoreply.c:364
-msgid "Only when there's no autoreply message"
-msgstr "Only when there's no autoreply message"
-
-#: ../libpurple/plugins/autoreply.c:369
-msgid "Delay between autoreplies"
-msgstr "Delay between autoreplies"
-
-#: ../libpurple/plugins/autoreply.c:373
-msgid "_Minimum delay (mins)"
-msgstr "_Minimum delay (mins)"
-
-#: ../libpurple/plugins/autoreply.c:377
-msgid "Times to send autoreplies"
-msgstr "Times to send autoreplies"
-
-#: ../libpurple/plugins/autoreply.c:381
-msgid "Ma_ximum count"
-msgstr "Ma_ximum count"
-
-#: ../libpurple/plugins/autoreply.c:428
-msgid ""
-"I am currently not available. Please leave your message, and I will get back "
-"to you as soon as possible."
-msgstr ""
-"I am currently not available. Please leave your message, and I will get back "
-"to you as soon as possible."
-
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1589
-#: ../libpurple/protocols/msn/msn.c:1619
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1613
+#: ../libpurple/protocols/msn/msn.c:1643
 msgid "Notes"
 msgstr "Notes"
 
@@ -2269,7 +2238,7 @@
 msgid "Enter your notes below..."
 msgstr "Enter your notes below..."
 
-#: ../libpurple/plugins/buddynote.c:61
+#: ../libpurple/plugins/buddynote.c:62
 msgid "Edit Notes..."
 msgstr "Edit Notes..."
 
@@ -2281,18 +2250,18 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/buddynote.c:86
+#: ../libpurple/plugins/buddynote.c:87
 msgid "Buddy Notes"
 msgstr "Buddy Notes"
 
 #. *< name
 #. *< version
-#: ../libpurple/plugins/buddynote.c:88
+#: ../libpurple/plugins/buddynote.c:89
 msgid "Store notes on particular buddies."
 msgstr "Store notes on particular buddies."
 
 #. *< summary
-#: ../libpurple/plugins/buddynote.c:89
+#: ../libpurple/plugins/buddynote.c:90
 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."
 
@@ -2351,46 +2320,46 @@
 msgid "Allows control by entering commands in a file."
 msgstr "Allows control by entering commands in a file."
 
-#: ../libpurple/plugins/idle.c:158 ../libpurple/plugins/idle.c:216
+#: ../libpurple/plugins/idle.c:158 ../libpurple/plugins/idle.c:218
 msgid "Minutes"
 msgstr "Minutes"
 
 #. This is a cultural reference.  Dy'er Mak'er is a song by Led Zeppelin.
 #. If that doesn't translate well into your language, drop the 's before translating.
-#: ../libpurple/plugins/idle.c:165 ../libpurple/plugins/idle.c:198
-#: ../libpurple/plugins/idle.c:223 ../libpurple/plugins/idle.c:315
+#: ../libpurple/plugins/idle.c:165 ../libpurple/plugins/idle.c:199
+#: ../libpurple/plugins/idle.c:225 ../libpurple/plugins/idle.c:318
 msgid "I'dle Mak'er"
 msgstr "I'dle Mak'er"
 
-#: ../libpurple/plugins/idle.c:166 ../libpurple/plugins/idle.c:255
+#: ../libpurple/plugins/idle.c:166 ../libpurple/plugins/idle.c:258
 msgid "Set Account Idle Time"
 msgstr "Set Account Idle Time"
 
-#: ../libpurple/plugins/idle.c:169 ../libpurple/plugins/idle.c:227
+#: ../libpurple/plugins/idle.c:169 ../libpurple/plugins/idle.c:229
 msgid "_Set"
 msgstr "_Set"
 
-#: ../libpurple/plugins/idle.c:183
+#: ../libpurple/plugins/idle.c:184
 msgid "None of your accounts are idle."
 msgstr "None of your accounts are idle."
 
-#: ../libpurple/plugins/idle.c:199 ../libpurple/plugins/idle.c:259
+#: ../libpurple/plugins/idle.c:200 ../libpurple/plugins/idle.c:262
 msgid "Unset Account Idle Time"
 msgstr "Unset Account Idle Time"
 
-#: ../libpurple/plugins/idle.c:202
+#: ../libpurple/plugins/idle.c:203
 msgid "_Unset"
 msgstr "_Unset"
 
-#: ../libpurple/plugins/idle.c:224 ../libpurple/plugins/idle.c:263
+#: ../libpurple/plugins/idle.c:226 ../libpurple/plugins/idle.c:266
 msgid "Set Idle Time for All Accounts"
 msgstr "Set Idle Time for All Accounts"
 
-#: ../libpurple/plugins/idle.c:268
+#: ../libpurple/plugins/idle.c:271
 msgid "Unset Idle Time for All Idled Accounts"
 msgstr "Unset Idle Time For All Idled Accounts"
 
-#: ../libpurple/plugins/idle.c:317 ../libpurple/plugins/idle.c:318
+#: ../libpurple/plugins/idle.c:320 ../libpurple/plugins/idle.c:321
 msgid "Allows you to hand-configure how long you've been idle"
 msgstr "Allows you to hand-configure how long you've been idle for"
 
@@ -2461,19 +2430,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/joinpart.c:264
+#: ../libpurple/plugins/joinpart.c:270
 msgid "Join/Part Hiding"
 msgstr "Join/Part Hiding"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/plugins/joinpart.c:267
+#: ../libpurple/plugins/joinpart.c:273
 msgid "Hides extraneous join/part messages."
 msgstr "Hides extraneous join/part messages."
 
 #. *  description
-#: ../libpurple/plugins/joinpart.c:269
+#: ../libpurple/plugins/joinpart.c:275
 msgid ""
 "This plugin hides join/part messages in large rooms, except for those users "
 "actively taking part in a conversation."
@@ -2592,19 +2561,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/log_reader.c:2126
+#: ../libpurple/plugins/log_reader.c:2132
 msgid "Log Reader"
 msgstr "Log Reader"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libpurple/plugins/log_reader.c:2130
+#: ../libpurple/plugins/log_reader.c:2136
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr "Includes other IM clients' logs in the log viewer."
 
 #. * description
-#: ../libpurple/plugins/log_reader.c:2134
+#: ../libpurple/plugins/log_reader.c:2140
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, and Trillian.\n"
@@ -2618,12 +2587,12 @@
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
 
-#: ../libpurple/plugins/mono/loader/mono.c:211
+#: ../libpurple/plugins/mono/loader/mono.c:217
 msgid "Mono Plugin Loader"
 msgstr "Mono Plug-in Loader"
 
-#: ../libpurple/plugins/mono/loader/mono.c:213
-#: ../libpurple/plugins/mono/loader/mono.c:214
+#: ../libpurple/plugins/mono/loader/mono.c:219
+#: ../libpurple/plugins/mono/loader/mono.c:220
 msgid "Loads .NET plugins with Mono."
 msgstr "Loads .NET plug-ins with Mono."
 
@@ -2688,31 +2657,31 @@
 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
 msgstr "You can edit/delete the pounce from the `Buddy Pounces' dialog"
 
-#: ../libpurple/plugins/offlinemsg.c:159
-#: ../libpurple/protocols/msn/dialog.c:132
-#: ../libpurple/protocols/msn/msn.c:519 ../libpurple/protocols/msn/msn.c:529
-#: ../libpurple/protocols/novell/novell.c:1915
-#: ../libpurple/protocols/silc/buddy.c:313
-#: ../libpurple/protocols/silc/pk.c:117 ../libpurple/protocols/silc/wb.c:303
+#: ../libpurple/plugins/offlinemsg.c:161
+#: ../libpurple/protocols/msn/dialog.c:133
+#: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532
+#: ../libpurple/protocols/novell/novell.c:1917
+#: ../libpurple/protocols/silc/buddy.c:314
+#: ../libpurple/protocols/silc/pk.c:119 ../libpurple/protocols/silc/wb.c:304
 #: ../pidgin/gtkrequest.c:267
 msgid "Yes"
 msgstr "Yes"
 
-#: ../libpurple/plugins/offlinemsg.c:160
-#: ../libpurple/protocols/msn/dialog.c:133
-#: ../libpurple/protocols/msn/msn.c:519 ../libpurple/protocols/msn/msn.c:529
-#: ../libpurple/protocols/novell/novell.c:1916
-#: ../libpurple/protocols/silc/buddy.c:314
-#: ../libpurple/protocols/silc/pk.c:118 ../libpurple/protocols/silc/wb.c:304
+#: ../libpurple/plugins/offlinemsg.c:162
+#: ../libpurple/protocols/msn/dialog.c:134
+#: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532
+#: ../libpurple/protocols/novell/novell.c:1918
+#: ../libpurple/protocols/silc/buddy.c:315
+#: ../libpurple/protocols/silc/pk.c:120 ../libpurple/protocols/silc/wb.c:305
 #: ../pidgin/gtkrequest.c:268
 msgid "No"
 msgstr "No"
 
-#: ../libpurple/plugins/offlinemsg.c:187
+#: ../libpurple/plugins/offlinemsg.c:189
 msgid "Save offline messages in pounce"
 msgstr "Save offline messages in pounce"
 
-#: ../libpurple/plugins/offlinemsg.c:191
+#: ../libpurple/plugins/offlinemsg.c:193
 msgid "Do not ask. Always save in pounce."
 msgstr "Do not ask. Always save in pounce."
 
@@ -2722,26 +2691,26 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/perl/perl.c:588
+#: ../libpurple/plugins/perl/perl.c:601
 msgid "Perl Plugin Loader"
 msgstr "Perl Plug-in Loader"
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../libpurple/plugins/perl/perl.c:590 ../libpurple/plugins/perl/perl.c:591
+#: ../libpurple/plugins/perl/perl.c:603 ../libpurple/plugins/perl/perl.c:604
 msgid "Provides support for loading perl plugins."
 msgstr "Provides support for loading perl plug-ins."
 
-#: ../libpurple/plugins/psychic.c:19
+#: ../libpurple/plugins/psychic.c:20
 msgid "Psychic Mode"
 msgstr "Psychic Mode"
 
-#: ../libpurple/plugins/psychic.c:20
+#: ../libpurple/plugins/psychic.c:21
 msgid "Psychic mode for incoming conversation"
 msgstr "Psychic mode for incoming conversation"
 
-#: ../libpurple/plugins/psychic.c:21
+#: ../libpurple/plugins/psychic.c:22
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
 "This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
@@ -2749,23 +2718,23 @@
 "Causes conversation windows to appear as other users begin to message you.  "
 "This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
 
-#: ../libpurple/plugins/psychic.c:66
+#: ../libpurple/plugins/psychic.c:72
 msgid "You feel a disturbance in the force..."
-msgstr "You have a premonition..."
-
-#: ../libpurple/plugins/psychic.c:85
+msgstr "You have a disturbance in the force..."
+
+#: ../libpurple/plugins/psychic.c:91
 msgid "Only enable for users on the buddy list"
 msgstr "Only enable for users on the buddy list"
 
-#: ../libpurple/plugins/psychic.c:90
+#: ../libpurple/plugins/psychic.c:96
 msgid "Disable when away"
 msgstr "Disable when away"
 
-#: ../libpurple/plugins/psychic.c:94
+#: ../libpurple/plugins/psychic.c:100
 msgid "Display notification message in conversations"
 msgstr "Display notification message in conversations"
 
-#: ../libpurple/plugins/psychic.c:99
+#: ../libpurple/plugins/psychic.c:105
 msgid "Raise psychic conversations"
 msgstr "Raise psychic conversations"
 
@@ -2830,7 +2799,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:257
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:275
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -2838,8 +2807,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:260
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:262
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:278
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:280
 msgid "Provides SSL support through GNUTLS."
 msgstr "Provides SSL support through GNUTLS."
 
@@ -2849,7 +2818,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:409
+#: ../libpurple/plugins/ssl/ssl-nss.c:415
 msgid "NSS"
 msgstr "NSS"
 
@@ -2857,8 +2826,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-nss.c:412
-#: ../libpurple/plugins/ssl/ssl-nss.c:414
+#: ../libpurple/plugins/ssl/ssl-nss.c:418
+#: ../libpurple/plugins/ssl/ssl-nss.c:420
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "Provides SSL support through Mozilla NSS."
 
@@ -2909,7 +2878,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/statenotify.c:142
+#: ../libpurple/plugins/statenotify.c:148
 msgid "Buddy State Notification"
 msgstr "Buddy State Notification"
 
@@ -2917,8 +2886,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/statenotify.c:145
-#: ../libpurple/plugins/statenotify.c:148
+#: ../libpurple/plugins/statenotify.c:151
+#: ../libpurple/plugins/statenotify.c:154
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
@@ -2926,15 +2895,15 @@
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
 
-#: ../libpurple/plugins/tcl/tcl.c:415
+#: ../libpurple/plugins/tcl/tcl.c:421
 msgid "Tcl Plugin Loader"
 msgstr "Tcl Plug-in Loader"
 
-#: ../libpurple/plugins/tcl/tcl.c:417 ../libpurple/plugins/tcl/tcl.c:418
+#: ../libpurple/plugins/tcl/tcl.c:423 ../libpurple/plugins/tcl/tcl.c:424
 msgid "Provides support for loading Tcl plugins"
 msgstr "Provides support for loading Tcl plug-ins"
 
-#: ../libpurple/plugins/tcl/tcl.c:483
+#: ../libpurple/plugins/tcl/tcl.c:495
 msgid ""
 "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
 "install ActiveTCL from http://www.activestate.com\n"
@@ -2957,18 +2926,18 @@
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
 #: ../libpurple/protocols/bonjour/bonjour.c:302
-#: ../libpurple/protocols/gg/gg.c:999 ../libpurple/protocols/irc/irc.c:516
-#: ../libpurple/protocols/irc/msgs.c:297
-#: ../libpurple/protocols/jabber/buddy.c:1414
-#: ../libpurple/protocols/novell/novell.c:2817
-#: ../libpurple/protocols/oscar/oscar.c:714
-#: ../libpurple/protocols/oscar/oscar.c:4522
-#: ../libpurple/protocols/oscar/oscar.c:5572
-#: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/silc/buddy.c:1469
-#: ../libpurple/protocols/yahoo/yahoo.c:3373
-#: ../libpurple/protocols/yahoo/yahoo.c:3446 ../libpurple/status.c:158
-#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkprefs.c:1821
-#: ../pidgin/gtkstatusbox.c:1090
+#: ../libpurple/protocols/gg/gg.c:1009 ../libpurple/protocols/irc/irc.c:530
+#: ../libpurple/protocols/irc/msgs.c:310
+#: ../libpurple/protocols/jabber/buddy.c:1434
+#: ../libpurple/protocols/novell/novell.c:2819
+#: ../libpurple/protocols/oscar/oscar.c:715
+#: ../libpurple/protocols/oscar/oscar.c:4500
+#: ../libpurple/protocols/oscar/oscar.c:5545
+#: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/silc/buddy.c:1476
+#: ../libpurple/protocols/yahoo/yahoo.c:3382
+#: ../libpurple/protocols/yahoo/yahoo.c:3455 ../libpurple/status.c:157
+#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1824
+#: ../pidgin/gtkstatusbox.c:1052
 msgid "Away"
 msgstr "Away"
 
@@ -2982,49 +2951,49 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:425
-#: ../libpurple/protocols/bonjour/bonjour.c:427
+#: ../libpurple/protocols/bonjour/bonjour.c:431
+#: ../libpurple/protocols/bonjour/bonjour.c:433
 msgid "Bonjour Protocol Plugin"
 msgstr "Bonjour Protocol Plug-in"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:463
-#: ../libpurple/protocols/bonjour/bonjour.c:470
-#: ../libpurple/protocols/bonjour/bonjour.c:528
+#: ../libpurple/protocols/bonjour/bonjour.c:476
+#: ../libpurple/protocols/bonjour/bonjour.c:483
+#: ../libpurple/protocols/bonjour/bonjour.c:541
 msgid "Purple Person"
 msgstr "Purple Person"
 
 #. Creating the user splits
-#: ../libpurple/protocols/bonjour/bonjour.c:567
-#: ../libpurple/protocols/silc/silc.c:925
+#: ../libpurple/protocols/bonjour/bonjour.c:589
+#: ../libpurple/protocols/silc/silc.c:926
 msgid "Hostname"
 msgstr "Hostname"
 
 #. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:571
-#: ../libpurple/protocols/gg/gg.c:622
-#: ../libpurple/protocols/jabber/jabber.c:822
+#: ../libpurple/protocols/bonjour/bonjour.c:593
+#: ../libpurple/protocols/gg/gg.c:627
+#: ../libpurple/protocols/jabber/jabber.c:824
 msgid "First name"
 msgstr "Forename"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:574
-#: ../libpurple/protocols/gg/gg.c:617
-#: ../libpurple/protocols/jabber/jabber.c:827
+#: ../libpurple/protocols/bonjour/bonjour.c:596
+#: ../libpurple/protocols/gg/gg.c:622
+#: ../libpurple/protocols/jabber/jabber.c:829
 msgid "Last name"
 msgstr "Surname"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:577
-#: ../libpurple/protocols/gg/gg.c:468
-#: ../libpurple/protocols/jabber/jabber.c:812
+#: ../libpurple/protocols/bonjour/bonjour.c:599
+#: ../libpurple/protocols/gg/gg.c:472
+#: ../libpurple/protocols/jabber/jabber.c:814
 #: ../libpurple/protocols/silc/silc.c:689
-#: ../libpurple/protocols/silc/silc.c:929
+#: ../libpurple/protocols/silc/silc.c:930
 msgid "E-mail"
 msgstr "E-mail"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:580
+#: ../libpurple/protocols/bonjour/bonjour.c:602
 msgid "AIM Account"
 msgstr "AIM Account"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:583
+#: ../libpurple/protocols/bonjour/bonjour.c:605
 msgid "XMPP Account"
 msgstr "XMPP Account"
 
@@ -3111,67 +3080,67 @@
 msgid "Save buddylist..."
 msgstr "Save buddylist..."
 
-#: ../libpurple/protocols/gg/gg.c:380
+#: ../libpurple/protocols/gg/gg.c:384
 msgid "Fill in the registration fields."
 msgstr "Fill in the registration fields."
 
-#: ../libpurple/protocols/gg/gg.c:385
+#: ../libpurple/protocols/gg/gg.c:389
 msgid "Passwords do not match."
 msgstr "Passwords do not match."
 
-#: ../libpurple/protocols/gg/gg.c:394
+#: ../libpurple/protocols/gg/gg.c:398
 msgid "Unable to register new account. Error occurred.\n"
 msgstr "Unable to register new account. Error occurred.\n"
 
-#: ../libpurple/protocols/gg/gg.c:407
+#: ../libpurple/protocols/gg/gg.c:411
 msgid "New Gadu-Gadu Account Registered"
 msgstr "New Gadu-Gadu Account Registered"
 
-#: ../libpurple/protocols/gg/gg.c:408
+#: ../libpurple/protocols/gg/gg.c:412
 msgid "Registration completed successfully!"
 msgstr "Registration completed successfully!"
 
-#: ../libpurple/protocols/gg/gg.c:473 ../libpurple/protocols/gg/gg.c:764
-#: ../libpurple/protocols/jabber/jabber.c:801
-#: ../libpurple/protocols/jabber/jabber.c:1358
+#: ../libpurple/protocols/gg/gg.c:477 ../libpurple/protocols/gg/gg.c:770
+#: ../libpurple/protocols/jabber/jabber.c:803
+#: ../libpurple/protocols/jabber/jabber.c:1371
 msgid "Password"
 msgstr "Password"
 
-#: ../libpurple/protocols/gg/gg.c:478 ../libpurple/protocols/gg/gg.c:769
+#: ../libpurple/protocols/gg/gg.c:482 ../libpurple/protocols/gg/gg.c:775
 msgid "Password (retype)"
 msgstr "Password (retype)"
 
-#: ../libpurple/protocols/gg/gg.c:483 ../libpurple/protocols/gg/gg.c:774
+#: ../libpurple/protocols/gg/gg.c:487 ../libpurple/protocols/gg/gg.c:780
 msgid "Enter current token"
 msgstr "Enter current token"
 
-#: ../libpurple/protocols/gg/gg.c:489 ../libpurple/protocols/gg/gg.c:780
+#: ../libpurple/protocols/gg/gg.c:493 ../libpurple/protocols/gg/gg.c:786
 msgid "Current token"
 msgstr "Current token"
 
-#: ../libpurple/protocols/gg/gg.c:493 ../libpurple/protocols/gg/gg.c:494
+#: ../libpurple/protocols/gg/gg.c:497 ../libpurple/protocols/gg/gg.c:498
 msgid "Register New Gadu-Gadu Account"
 msgstr "Register New Gadu-Gadu Account"
 
-#: ../libpurple/protocols/gg/gg.c:495
+#: ../libpurple/protocols/gg/gg.c:499
 msgid "Please, fill in the following fields"
 msgstr "Please fill in the following fields"
 
-#: ../libpurple/protocols/gg/gg.c:632 ../libpurple/protocols/gg/gg.c:1039
-#: ../libpurple/protocols/gg/gg.c:1113
-#: ../libpurple/protocols/jabber/jabber.c:837
-#: ../libpurple/protocols/oscar/oscar.c:3793
-#: ../libpurple/protocols/oscar/oscar.c:3806
+#: ../libpurple/protocols/gg/gg.c:637 ../libpurple/protocols/gg/gg.c:1049
+#: ../libpurple/protocols/gg/gg.c:1123
+#: ../libpurple/protocols/jabber/jabber.c:839
+#: ../libpurple/protocols/oscar/oscar.c:3779
+#: ../libpurple/protocols/oscar/oscar.c:3792
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "City"
 
-#: ../libpurple/protocols/gg/gg.c:637
+#: ../libpurple/protocols/gg/gg.c:642
 msgid "Year of birth"
 msgstr "Year of birth"
 
-#: ../libpurple/protocols/gg/gg.c:640 ../libpurple/protocols/msn/msn.c:1518
-#: ../libpurple/protocols/oscar/oscar.c:3736
+#: ../libpurple/protocols/gg/gg.c:645 ../libpurple/protocols/msn/msn.c:1542
+#: ../libpurple/protocols/oscar/oscar.c:3722
 #: ../libpurple/protocols/qq/buddy_info.c:46
 #: ../libpurple/protocols/qq/qq.c:224 ../libpurple/protocols/qq/qq.c:227
 #: ../libpurple/protocols/qq/qq.c:230 ../libpurple/protocols/qq/qq.c:234
@@ -3179,219 +3148,219 @@
 msgid "Gender"
 msgstr "Gender"
 
-#: ../libpurple/protocols/gg/gg.c:641
+#: ../libpurple/protocols/gg/gg.c:646
 msgid "Male or female"
 msgstr "Male or female"
 
-#: ../libpurple/protocols/gg/gg.c:642
-#: ../libpurple/protocols/oscar/oscar.c:3736
+#: ../libpurple/protocols/gg/gg.c:647
+#: ../libpurple/protocols/oscar/oscar.c:3722
 #: ../libpurple/protocols/qq/buddy_info.c:83
 #: ../libpurple/protocols/qq/qq.c:224
 msgid "Male"
 msgstr "Male"
 
-#: ../libpurple/protocols/gg/gg.c:643
-#: ../libpurple/protocols/oscar/oscar.c:3736
+#: ../libpurple/protocols/gg/gg.c:648
+#: ../libpurple/protocols/oscar/oscar.c:3722
 #: ../libpurple/protocols/qq/buddy_info.c:84
 #: ../libpurple/protocols/qq/qq.c:227
 msgid "Female"
 msgstr "Female"
 
-#: ../libpurple/protocols/gg/gg.c:647
+#: ../libpurple/protocols/gg/gg.c:652
 msgid "Only online"
 msgstr "Only online"
 
-#: ../libpurple/protocols/gg/gg.c:651 ../libpurple/protocols/gg/gg.c:652
+#: ../libpurple/protocols/gg/gg.c:656 ../libpurple/protocols/gg/gg.c:657
 msgid "Find buddies"
 msgstr "Find buddies"
 
-#: ../libpurple/protocols/gg/gg.c:653
+#: ../libpurple/protocols/gg/gg.c:658
 msgid "Please, enter your search criteria below"
 msgstr "Please enter your search criteria below"
 
-#: ../libpurple/protocols/gg/gg.c:690
+#: ../libpurple/protocols/gg/gg.c:696
 msgid "Fill in the fields."
 msgstr "Fill in the fields."
 
-#: ../libpurple/protocols/gg/gg.c:702
+#: ../libpurple/protocols/gg/gg.c:708
 msgid "Your current password is different from the one that you specified."
 msgstr "Your current password is different from the one that you specified."
 
-#: ../libpurple/protocols/gg/gg.c:716
+#: ../libpurple/protocols/gg/gg.c:722
 msgid "Unable to change password. Error occurred.\n"
 msgstr "Unable to change password. An error occured.\n"
 
-#: ../libpurple/protocols/gg/gg.c:725
+#: ../libpurple/protocols/gg/gg.c:731
 msgid "Change password for the Gadu-Gadu account"
 msgstr "Change password for the Gadu-Gadu account"
 
-#: ../libpurple/protocols/gg/gg.c:726
+#: ../libpurple/protocols/gg/gg.c:732
 msgid "Password was changed successfully!"
 msgstr "Password successfully changed!"
 
-#: ../libpurple/protocols/gg/gg.c:759
+#: ../libpurple/protocols/gg/gg.c:765
 msgid "Current password"
 msgstr "Current password"
 
-#: ../libpurple/protocols/gg/gg.c:784
+#: ../libpurple/protocols/gg/gg.c:790
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Please enter your current password and your new password for UIN: "
 
-#: ../libpurple/protocols/gg/gg.c:788 ../libpurple/protocols/gg/gg.c:789
+#: ../libpurple/protocols/gg/gg.c:794 ../libpurple/protocols/gg/gg.c:795
 msgid "Change Gadu-Gadu Password"
 msgstr "Change Gadu-Gadu password"
 
-#: ../libpurple/protocols/gg/gg.c:863
+#: ../libpurple/protocols/gg/gg.c:871
 #, c-format
 msgid "Select a chat for buddy: %s"
 msgstr "Select a chat for buddy: %s"
 
-#: ../libpurple/protocols/gg/gg.c:866 ../libpurple/protocols/gg/gg.c:867
+#: ../libpurple/protocols/gg/gg.c:874 ../libpurple/protocols/gg/gg.c:875
 msgid "Add to chat..."
 msgstr "Add to chat..."
 
-#: ../libpurple/protocols/gg/gg.c:993
-#: ../libpurple/protocols/jabber/buddy.c:1408
-#: ../libpurple/protocols/novell/novell.c:2826
-#: ../libpurple/protocols/oscar/oscar.c:809
-#: ../libpurple/protocols/oscar/oscar.c:5544
+#: ../libpurple/protocols/gg/gg.c:1003
+#: ../libpurple/protocols/jabber/buddy.c:1428
+#: ../libpurple/protocols/novell/novell.c:2828
+#: ../libpurple/protocols/oscar/oscar.c:810
+#: ../libpurple/protocols/oscar/oscar.c:5517
 #: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
-#: ../libpurple/protocols/yahoo/yahoo.c:2898 ../libpurple/status.c:154
-#: ../pidgin/gtkblist.c:3026 ../pidgin/gtkblist.c:3350
-#: ../pidgin/gtkdocklet.c:458 ../pidgin/gtkstatusbox.c:1092
+#: ../libpurple/protocols/yahoo/yahoo.c:2902 ../libpurple/status.c:153
+#: ../pidgin/gtkblist.c:3053 ../pidgin/gtkblist.c:3378
+#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1054
 msgid "Offline"
 msgstr "Offline"
 
-#: ../libpurple/protocols/gg/gg.c:996
-#: ../libpurple/protocols/jabber/buddy.c:1410
+#: ../libpurple/protocols/gg/gg.c:1006
+#: ../libpurple/protocols/jabber/buddy.c:1430
 #: ../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:2814
-#: ../libpurple/protocols/yahoo/yahoo.c:2900 ../libpurple/status.c:155
-#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1089
+#: ../libpurple/protocols/novell/novell.c:2816
+#: ../libpurple/protocols/yahoo/yahoo.c:2904 ../libpurple/status.c:154
+#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1051
 msgid "Available"
 msgstr "Available"
 
-#: ../libpurple/protocols/gg/gg.c:1028 ../libpurple/protocols/gg/gg.c:1104
-#: ../libpurple/protocols/oscar/oscar.c:2665
-#: ../libpurple/protocols/oscar/oscar.c:3703
+#: ../libpurple/protocols/gg/gg.c:1038 ../libpurple/protocols/gg/gg.c:1114
+#: ../libpurple/protocols/oscar/oscar.c:2658
+#: ../libpurple/protocols/oscar/oscar.c:3689
 msgid "UIN"
 msgstr "UIN"
 
-#: ../libpurple/protocols/gg/gg.c:1031 ../libpurple/protocols/gg/gg.c:1107
-#: ../libpurple/protocols/jabber/buddy.c:1565
-#: ../libpurple/protocols/jabber/buddy.c:1741
-#: ../libpurple/protocols/oscar/oscar.c:3714
+#: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1117
+#: ../libpurple/protocols/jabber/buddy.c:1585
+#: ../libpurple/protocols/jabber/buddy.c:1761
+#: ../libpurple/protocols/oscar/oscar.c:3700
 #: ../libpurple/protocols/silc/ops.c:1024
 msgid "First Name"
 msgstr "Forename"
 
-#: ../libpurple/protocols/gg/gg.c:1044 ../libpurple/protocols/gg/gg.c:1116
+#: ../libpurple/protocols/gg/gg.c:1054 ../libpurple/protocols/gg/gg.c:1126
 msgid "Birth Year"
 msgstr "Year of birth"
 
-#: ../libpurple/protocols/gg/gg.c:1098 ../libpurple/protocols/gg/gg.c:1167
-#: ../libpurple/protocols/oscar/oscar.c:3915
+#: ../libpurple/protocols/gg/gg.c:1108 ../libpurple/protocols/gg/gg.c:1177
+#: ../libpurple/protocols/oscar/oscar.c:3901
 msgid "Unable to display the search results."
 msgstr "Unable to display the search results."
 
-#: ../libpurple/protocols/gg/gg.c:1158
+#: ../libpurple/protocols/gg/gg.c:1168
 msgid "Gadu-Gadu Public Directory"
 msgstr "Gadu-Gadu Public Directory"
 
-#: ../libpurple/protocols/gg/gg.c:1159
+#: ../libpurple/protocols/gg/gg.c:1169
 msgid "Search results"
 msgstr "Search results"
 
-#: ../libpurple/protocols/gg/gg.c:1202
+#: ../libpurple/protocols/gg/gg.c:1212
 msgid "No matching users found"
 msgstr "No matching users found"
 
-#: ../libpurple/protocols/gg/gg.c:1203
+#: ../libpurple/protocols/gg/gg.c:1213
 msgid "There are no users matching your search criteria."
 msgstr "There are no users matching your search criteria."
 
-#: ../libpurple/protocols/gg/gg.c:1297 ../libpurple/protocols/gg/gg.c:1450
+#: ../libpurple/protocols/gg/gg.c:1307 ../libpurple/protocols/gg/gg.c:1460
 msgid "Unable to read socket"
 msgstr "Unable to read socket"
 
-#: ../libpurple/protocols/gg/gg.c:1382
+#: ../libpurple/protocols/gg/gg.c:1392
 msgid "Buddy list downloaded"
 msgstr "Buddy list downloaded"
 
-#: ../libpurple/protocols/gg/gg.c:1383
+#: ../libpurple/protocols/gg/gg.c:1393
 msgid "Your buddy list was downloaded from the server."
 msgstr "Your buddy list was downloaded from the server."
 
-#: ../libpurple/protocols/gg/gg.c:1390
+#: ../libpurple/protocols/gg/gg.c:1400
 msgid "Buddy list uploaded"
 msgstr "Buddy list uploaded"
 
-#: ../libpurple/protocols/gg/gg.c:1391
+#: ../libpurple/protocols/gg/gg.c:1401
 msgid "Your buddy list was stored on the server."
 msgstr "Your buddy list was stored on the server."
 
-#: ../libpurple/protocols/gg/gg.c:1496 ../libpurple/protocols/gg/gg.c:1702
+#: ../libpurple/protocols/gg/gg.c:1506 ../libpurple/protocols/gg/gg.c:1712
 msgid "Connection failed."
 msgstr "Connection failed."
 
-#: ../libpurple/protocols/gg/gg.c:1608 ../libpurple/protocols/msn/msn.c:528
+#: ../libpurple/protocols/gg/gg.c:1618 ../libpurple/protocols/msn/msn.c:531
 msgid "Blocked"
 msgstr "Blocked"
 
-#: ../libpurple/protocols/gg/gg.c:1631
+#: ../libpurple/protocols/gg/gg.c:1641
 msgid "Add to chat"
 msgstr "Add to chat"
 
-#: ../libpurple/protocols/gg/gg.c:1640
+#: ../libpurple/protocols/gg/gg.c:1650
 msgid "Unblock"
 msgstr "Unblock"
 
-#: ../libpurple/protocols/gg/gg.c:1644
+#: ../libpurple/protocols/gg/gg.c:1654
 msgid "Block"
 msgstr "Block"
 
-#: ../libpurple/protocols/gg/gg.c:1661
+#: ../libpurple/protocols/gg/gg.c:1671
 msgid "Chat _name:"
 msgstr "Chat _name:"
 
-#: ../libpurple/protocols/gg/gg.c:1901
+#: ../libpurple/protocols/gg/gg.c:1911
 msgid "Chat error"
 msgstr "Chat error"
 
-#: ../libpurple/protocols/gg/gg.c:1902
+#: ../libpurple/protocols/gg/gg.c:1912
 msgid "This chat name is already in use"
 msgstr "This chat name is already in use"
 
-#: ../libpurple/protocols/gg/gg.c:1985
+#: ../libpurple/protocols/gg/gg.c:1995
 msgid "Not connected to the server."
 msgstr "Not connected to the server."
 
-#: ../libpurple/protocols/gg/gg.c:2008
+#: ../libpurple/protocols/gg/gg.c:2018
 msgid "Find buddies..."
 msgstr "Find buddies..."
 
-#: ../libpurple/protocols/gg/gg.c:2014
-msgid "Change password..."
-msgstr "Change password..."
-
-#: ../libpurple/protocols/gg/gg.c:2020
-msgid "Upload buddylist to Server"
-msgstr "Upload buddylist to Server"
-
 #: ../libpurple/protocols/gg/gg.c:2024
+msgid "Change password..."
+msgstr "Change password..."
+
+#: ../libpurple/protocols/gg/gg.c:2030
+msgid "Upload buddylist to Server"
+msgstr "Upload buddylist to Server"
+
+#: ../libpurple/protocols/gg/gg.c:2034
 msgid "Download buddylist from Server"
 msgstr "Download buddylist from Server"
 
-#: ../libpurple/protocols/gg/gg.c:2028
+#: ../libpurple/protocols/gg/gg.c:2038
 msgid "Delete buddylist from Server"
 msgstr "Delete buddylist from Server"
 
-#: ../libpurple/protocols/gg/gg.c:2032
+#: ../libpurple/protocols/gg/gg.c:2042
 msgid "Save buddylist to file..."
 msgstr "Save buddylist to file..."
 
-#: ../libpurple/protocols/gg/gg.c:2036
+#: ../libpurple/protocols/gg/gg.c:2046
 msgid "Load buddylist from file..."
 msgstr "Load buddylist from file..."
 
@@ -3406,35 +3375,35 @@
 #. id
 #. name
 #. version
-#: ../libpurple/protocols/gg/gg.c:2134
+#: ../libpurple/protocols/gg/gg.c:2150
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu Protocol Plug-in"
 
 #. summary
-#: ../libpurple/protocols/gg/gg.c:2135
+#: ../libpurple/protocols/gg/gg.c:2151
 msgid "Polish popular IM"
 msgstr "Polish popular IM system"
 
-#: ../libpurple/protocols/gg/gg.c:2183
+#: ../libpurple/protocols/gg/gg.c:2205
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu User"
 
 #: ../libpurple/protocols/irc/cmds.c:43
-#: ../libpurple/protocols/silc/silc.c:1575
+#: ../libpurple/protocols/silc/silc.c:1577
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Unknown command: %s"
 
 #: ../libpurple/protocols/irc/cmds.c:503
-#: ../libpurple/protocols/jabber/chat.c:593
-#: ../libpurple/protocols/silc/silc.c:1283
+#: ../libpurple/protocols/jabber/chat.c:591
+#: ../libpurple/protocols/silc/silc.c:1285
 #, c-format
 msgid "current topic is: %s"
 msgstr "current topic is: %s"
 
 #: ../libpurple/protocols/irc/cmds.c:507
-#: ../libpurple/protocols/jabber/chat.c:597
-#: ../libpurple/protocols/silc/silc.c:1287
+#: ../libpurple/protocols/jabber/chat.c:595
+#: ../libpurple/protocols/silc/silc.c:1289
 msgid "No topic is set"
 msgstr "No topic is set"
 
@@ -3469,7 +3438,7 @@
 msgstr "MOTD for %s"
 
 #: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165
-#: ../libpurple/protocols/irc/irc.c:600 ../libpurple/protocols/irc/irc.c:625
+#: ../libpurple/protocols/irc/irc.c:614 ../libpurple/protocols/irc/irc.c:639
 msgid "Server has disconnected"
 msgstr "Server has disconnected"
 
@@ -3492,59 +3461,59 @@
 
 #. connect to the server
 #: ../libpurple/protocols/irc/irc.c:319
-#: ../libpurple/protocols/jabber/jabber.c:1038
+#: ../libpurple/protocols/jabber/jabber.c:1044
 #: ../libpurple/protocols/msn/session.c:344
-#: ../libpurple/protocols/novell/novell.c:2180
-#: ../libpurple/protocols/oscar/oscar.c:1269
+#: ../libpurple/protocols/novell/novell.c:2182
+#: ../libpurple/protocols/oscar/oscar.c:1270
 #: ../libpurple/protocols/qq/qq.c:136
-#: ../libpurple/protocols/sametime/sametime.c:3721
-#: ../libpurple/protocols/simple/simple.c:1669
-#: ../libpurple/protocols/yahoo/yahoo.c:2743
-#: ../libpurple/protocols/zephyr/zephyr.c:1620 ../pidgin/gtkstatusbox.c:609
+#: ../libpurple/protocols/sametime/sametime.c:3723
+#: ../libpurple/protocols/simple/simple.c:1671
+#: ../libpurple/protocols/yahoo/yahoo.c:2747
+#: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:659
 msgid "Connecting"
 msgstr "Connecting"
 
 #: ../libpurple/protocols/irc/irc.c:327
-#: ../libpurple/protocols/jabber/jabber.c:597
-#: ../libpurple/protocols/jabber/jabber.c:942
+#: ../libpurple/protocols/jabber/jabber.c:599
+#: ../libpurple/protocols/jabber/jabber.c:946
 msgid "SSL support unavailable"
 msgstr "SSL support unavailable"
 
 #: ../libpurple/protocols/irc/irc.c:338
 #: ../libpurple/protocols/simple/simple.c:464
-#: ../libpurple/protocols/simple/simple.c:1584
+#: ../libpurple/protocols/simple/simple.c:1586
 msgid "Couldn't create socket"
 msgstr "Couldn't create socket"
 
-#: ../libpurple/protocols/irc/irc.c:402
+#: ../libpurple/protocols/irc/irc.c:416
 #: ../libpurple/protocols/jabber/jabber.c:466
-#: ../libpurple/protocols/oscar/oscar.c:1265
+#: ../libpurple/protocols/oscar/oscar.c:1266
 msgid "Couldn't connect to host"
 msgstr "Couldn't connect to host"
 
-#: ../libpurple/protocols/irc/irc.c:424
+#: ../libpurple/protocols/irc/irc.c:438
 #: ../libpurple/protocols/jabber/jabber.c:495
 msgid "Connection Failed"
 msgstr "Connection Failed"
 
-#: ../libpurple/protocols/irc/irc.c:427
+#: ../libpurple/protocols/irc/irc.c:441
 #: ../libpurple/protocols/jabber/jabber.c:498
 msgid "SSL Handshake Failed"
 msgstr "SSL Handshake Failed"
 
-#: ../libpurple/protocols/irc/irc.c:597 ../libpurple/protocols/irc/irc.c:622
+#: ../libpurple/protocols/irc/irc.c:611 ../libpurple/protocols/irc/irc.c:636
 msgid "Read error"
 msgstr "Read error"
 
-#: ../libpurple/protocols/irc/irc.c:761
-#: ../libpurple/protocols/silc/chat.c:1421
+#: ../libpurple/protocols/irc/irc.c:775
+#: ../libpurple/protocols/silc/chat.c:1426
 #: ../libpurple/protocols/yahoo/yahoochat.c:1438
 msgid "Users"
 msgstr "Users"
 
-#: ../libpurple/protocols/irc/irc.c:764
-#: ../libpurple/protocols/sametime/sametime.c:3375
-#: ../libpurple/protocols/silc/chat.c:1424
+#: ../libpurple/protocols/irc/irc.c:778
+#: ../libpurple/protocols/sametime/sametime.c:3374
+#: ../libpurple/protocols/silc/chat.c:1429
 #: ../libpurple/protocols/silc/ops.c:1382
 #: ../libpurple/protocols/yahoo/yahoochat.c:1447
 msgid "Topic"
@@ -3558,56 +3527,55 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:895
+#: ../libpurple/protocols/irc/irc.c:915
 msgid "IRC Protocol Plugin"
 msgstr "IRC Protocol Plug-in"
 
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:896
+#: ../libpurple/protocols/irc/irc.c:916
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "The IRC Protocol Plug-in that Sucks Less"
 
 #. host to connect to
-#: ../libpurple/protocols/irc/irc.c:915 ../libpurple/protocols/irc/msgs.c:310
-#: ../libpurple/protocols/jabber/jabber.c:1994
-#: ../libpurple/protocols/msn/msn.c:2099
-#: ../libpurple/protocols/oscar/oscar.c:6623
-#: ../libpurple/protocols/qq/qq.c:746
-#: ../libpurple/protocols/sametime/sametime.c:5706
+#: ../libpurple/protocols/irc/irc.c:941 ../libpurple/protocols/irc/msgs.c:323
+#: ../libpurple/protocols/msn/msn.c:2135
+#: ../libpurple/protocols/oscar/oscar.c:6584
+#: ../libpurple/protocols/qq/qq.c:756
+#: ../libpurple/protocols/sametime/sametime.c:5727
 #: ../libpurple/protocols/silc/ops.c:1244
 #: ../libpurple/protocols/silc/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:1836
+#: ../libpurple/protocols/simple/simple.c:1850
 #: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "Server"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:918 ../libpurple/protocols/msn/msn.c:2104
-#: ../libpurple/protocols/oscar/oscar.c:6626
-#: ../libpurple/protocols/qq/qq.c:749
-#: ../libpurple/protocols/sametime/sametime.c:5711
-#: ../libpurple/protocols/silc/silc.c:1850
+#: ../libpurple/protocols/irc/irc.c:944 ../libpurple/protocols/msn/msn.c:2140
+#: ../libpurple/protocols/oscar/oscar.c:6587
+#: ../libpurple/protocols/qq/qq.c:759
+#: ../libpurple/protocols/sametime/sametime.c:5732
+#: ../libpurple/protocols/silc/silc.c:1870
 #: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "Port"
 
-#: ../libpurple/protocols/irc/irc.c:921
+#: ../libpurple/protocols/irc/irc.c:947
 msgid "Encodings"
 msgstr "Encodings"
 
-#: ../libpurple/protocols/irc/irc.c:924 ../libpurple/protocols/irc/msgs.c:303
-#: ../libpurple/protocols/jabber/jabber.c:797
-#: ../libpurple/protocols/silc/buddy.c:1532
+#: ../libpurple/protocols/irc/irc.c:950 ../libpurple/protocols/irc/msgs.c:316
+#: ../libpurple/protocols/jabber/jabber.c:799
+#: ../libpurple/protocols/silc/buddy.c:1539
 #: ../libpurple/protocols/silc/ops.c:1191
 #: ../libpurple/protocols/silc/ops.c:1194
 #: ../libpurple/protocols/silc/ops.c:1340
 #: ../libpurple/protocols/silc/ops.c:1343
-#: ../libpurple/protocols/silc/silc.c:923
+#: ../libpurple/protocols/silc/silc.c:924
 msgid "Username"
 msgstr "Username"
 
-#: ../libpurple/protocols/irc/irc.c:927 ../libpurple/protocols/irc/msgs.c:304
-#: ../libpurple/protocols/silc/silc.c:927
+#: ../libpurple/protocols/irc/irc.c:953 ../libpurple/protocols/irc/msgs.c:317
+#: ../libpurple/protocols/silc/silc.c:928
 msgid "Real name"
 msgstr "Real name"
 
@@ -3615,155 +3583,155 @@
 #. option = purple_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: ../libpurple/protocols/irc/irc.c:935
+#: ../libpurple/protocols/irc/irc.c:961
 msgid "Use SSL"
 msgstr "Use SSL"
 
-#: ../libpurple/protocols/irc/msgs.c:178
+#: ../libpurple/protocols/irc/msgs.c:187
 msgid "Bad mode"
 msgstr "Bad mode"
 
-#: ../libpurple/protocols/irc/msgs.c:189
+#: ../libpurple/protocols/irc/msgs.c:198
 #, c-format
 msgid "You are banned from %s."
 msgstr "You are banned from %s."
 
-#: ../libpurple/protocols/irc/msgs.c:190
+#: ../libpurple/protocols/irc/msgs.c:199
 msgid "Banned"
 msgstr "Banned"
 
-#: ../libpurple/protocols/irc/msgs.c:207
+#: ../libpurple/protocols/irc/msgs.c:216
 #, c-format
 msgid "Cannot ban %s: banlist is full"
 msgstr "Cannot ban %s: banlist is full"
 
-#: ../libpurple/protocols/irc/msgs.c:288
+#: ../libpurple/protocols/irc/msgs.c:301
 msgid " <i>(ircop)</i>"
 msgstr " <i>(ircop)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:289
+#: ../libpurple/protocols/irc/msgs.c:302
 msgid " <i>(identified)</i>"
 msgstr " <i>(identified)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:290
-#: ../libpurple/protocols/oscar/oscar.c:3704
+#: ../libpurple/protocols/irc/msgs.c:303
+#: ../libpurple/protocols/oscar/oscar.c:3690
 #: ../libpurple/protocols/silc/ops.c:1414
 msgid "Nick"
 msgstr "Nick"
 
-#: ../libpurple/protocols/irc/msgs.c:316
+#: ../libpurple/protocols/irc/msgs.c:329
 #: ../libpurple/protocols/silc/ops.c:1272
 msgid "Currently on"
 msgstr "Currently on"
 
-#: ../libpurple/protocols/irc/msgs.c:321
+#: ../libpurple/protocols/irc/msgs.c:334
 msgid "Idle for"
 msgstr "Idle for"
 
-#: ../libpurple/protocols/irc/msgs.c:324
+#: ../libpurple/protocols/irc/msgs.c:337
 msgid "Online since"
 msgstr "Online since"
 
-#: ../libpurple/protocols/irc/msgs.c:328
+#: ../libpurple/protocols/irc/msgs.c:341
 msgid "<b>Defining adjective:</b>"
 msgstr "<b>Defining adjective:</b>"
 
-#: ../libpurple/protocols/irc/msgs.c:328
+#: ../libpurple/protocols/irc/msgs.c:341
 msgid "Glorious"
 msgstr "Glorious"
 
-#: ../libpurple/protocols/irc/msgs.c:404
+#: ../libpurple/protocols/irc/msgs.c:417
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s has changed the topic to: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:406
+#: ../libpurple/protocols/irc/msgs.c:419
 #, c-format
 msgid "%s has cleared the topic."
 msgstr "%s has cleared the topic."
 
-#: ../libpurple/protocols/irc/msgs.c:414
+#: ../libpurple/protocols/irc/msgs.c:427
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "The topic for %s is: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:432
+#: ../libpurple/protocols/irc/msgs.c:445
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Unknown message '%s'"
 
-#: ../libpurple/protocols/irc/msgs.c:433
+#: ../libpurple/protocols/irc/msgs.c:446
 msgid "Unknown message"
 msgstr "Unknown message"
 
-#: ../libpurple/protocols/irc/msgs.c:433
+#: ../libpurple/protocols/irc/msgs.c:446
 msgid "The IRC server received a message it did not understand."
 msgstr "The IRC server received a message it did not understand."
 
-#: ../libpurple/protocols/irc/msgs.c:454
+#: ../libpurple/protocols/irc/msgs.c:467
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Users on %s: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:551
+#: ../libpurple/protocols/irc/msgs.c:572
 msgid "Time Response"
 msgstr "Time Response"
 
-#: ../libpurple/protocols/irc/msgs.c:552
+#: ../libpurple/protocols/irc/msgs.c:573
 msgid "The IRC server's local time is:"
 msgstr "The IRC server's local time is:"
 
-#: ../libpurple/protocols/irc/msgs.c:563
+#: ../libpurple/protocols/irc/msgs.c:584
 msgid "No such channel"
 msgstr "No such channel"
 
 #. does this happen?
-#: ../libpurple/protocols/irc/msgs.c:574
+#: ../libpurple/protocols/irc/msgs.c:595
 msgid "no such channel"
 msgstr "no such channel"
 
-#: ../libpurple/protocols/irc/msgs.c:577
+#: ../libpurple/protocols/irc/msgs.c:598
 msgid "User is not logged in"
 msgstr "User is not logged in"
 
-#: ../libpurple/protocols/irc/msgs.c:582
+#: ../libpurple/protocols/irc/msgs.c:603
 msgid "No such nick or channel"
 msgstr "No such nick or channel"
 
-#: ../libpurple/protocols/irc/msgs.c:602
+#: ../libpurple/protocols/irc/msgs.c:623
 msgid "Could not send"
 msgstr "Could not send"
 
-#: ../libpurple/protocols/irc/msgs.c:658
+#: ../libpurple/protocols/irc/msgs.c:679
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Joining %s requires an invitation."
 
-#: ../libpurple/protocols/irc/msgs.c:659
+#: ../libpurple/protocols/irc/msgs.c:680
 msgid "Invitation only"
 msgstr "Invitation only"
 
-#: ../libpurple/protocols/irc/msgs.c:771
+#: ../libpurple/protocols/irc/msgs.c:792
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "You have been kicked by %s: (%s)"
 
 #. Remove user from channel
-#: ../libpurple/protocols/irc/msgs.c:776 ../libpurple/protocols/silc/ops.c:720
+#: ../libpurple/protocols/irc/msgs.c:797 ../libpurple/protocols/silc/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Kicked by %s (%s)"
 
-#: ../libpurple/protocols/irc/msgs.c:799
+#: ../libpurple/protocols/irc/msgs.c:820
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "mode (%s %s) by %s"
 
-#: ../libpurple/protocols/irc/msgs.c:884 ../libpurple/protocols/irc/msgs.c:885
+#: ../libpurple/protocols/irc/msgs.c:905 ../libpurple/protocols/irc/msgs.c:906
 msgid "Invalid nickname"
 msgstr "Invalid nickname"
 
-#: ../libpurple/protocols/irc/msgs.c:886
+#: ../libpurple/protocols/irc/msgs.c:907
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
@@ -3771,7 +3739,7 @@
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
 
-#: ../libpurple/protocols/irc/msgs.c:891
+#: ../libpurple/protocols/irc/msgs.c:912
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
@@ -3779,52 +3747,52 @@
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
 
-#: ../libpurple/protocols/irc/msgs.c:930
+#: ../libpurple/protocols/irc/msgs.c:951
 msgid "Cannot change nick"
 msgstr "Cannot change nick"
 
-#: ../libpurple/protocols/irc/msgs.c:930
+#: ../libpurple/protocols/irc/msgs.c:951
 msgid "Could not change nick"
 msgstr "Could not change nick"
 
-#: ../libpurple/protocols/irc/msgs.c:951
+#: ../libpurple/protocols/irc/msgs.c:972
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "You have parted the channel%s%s"
 
-#: ../libpurple/protocols/irc/msgs.c:993
+#: ../libpurple/protocols/irc/msgs.c:1014
 msgid "Error: invalid PONG from server"
 msgstr "Error: invalid PONG from server"
 
-#: ../libpurple/protocols/irc/msgs.c:995
+#: ../libpurple/protocols/irc/msgs.c:1016
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING reply -- Lag: %lu seconds"
 
-#: ../libpurple/protocols/irc/msgs.c:1076
-#, c-format
-msgid "Cannot join %s:"
-msgstr "Cannot join %s:"
-
-#: ../libpurple/protocols/irc/msgs.c:1077
+#: ../libpurple/protocols/irc/msgs.c:1107
+#, c-format
+msgid "Cannot join %s: Registration is required."
+msgstr "Cannot join %s: Registration required."
+
+#: ../libpurple/protocols/irc/msgs.c:1108
 #: ../libpurple/protocols/silc/ops.c:1128
 msgid "Cannot join channel"
 msgstr "Cannot join channel"
 
-#: ../libpurple/protocols/irc/msgs.c:1111
+#: ../libpurple/protocols/irc/msgs.c:1142
 msgid "Nick or channel is temporarily unavailable."
 msgstr "Nick or channel is temporarily unavailable."
 
-#: ../libpurple/protocols/irc/msgs.c:1123
+#: ../libpurple/protocols/irc/msgs.c:1154
 #, c-format
 msgid "Wallops from %s"
 msgstr "Wallops from %s"
 
-#: ../libpurple/protocols/irc/parse.c:118
+#: ../libpurple/protocols/irc/parse.c:122
 msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr "action &lt;action to perform&gt;:  Perform an action."
 
-#: ../libpurple/protocols/irc/parse.c:119
+#: ../libpurple/protocols/irc/parse.c:123
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
@@ -3832,11 +3800,11 @@
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
 
-#: ../libpurple/protocols/irc/parse.c:120
+#: ../libpurple/protocols/irc/parse.c:124
 msgid "chanserv: Send a command to chanserv"
 msgstr "chanserv: Send a command to chanserv"
 
-#: ../libpurple/protocols/irc/parse.c:121
+#: ../libpurple/protocols/irc/parse.c:125
 msgid ""
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
@@ -3844,7 +3812,7 @@
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
 
-#: ../libpurple/protocols/irc/parse.c:122
+#: ../libpurple/protocols/irc/parse.c:126
 msgid ""
 "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
 "someone, preventing them from speaking if the channel is moderated (+m). You "
@@ -3854,7 +3822,7 @@
 "someone, preventing them from speaking if the channel is moderated (+m). You "
 "must be a channel operator to do this."
 
-#: ../libpurple/protocols/irc/parse.c:123
+#: ../libpurple/protocols/irc/parse.c:127
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
@@ -3862,7 +3830,7 @@
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
 
-#: ../libpurple/protocols/irc/parse.c:124
+#: ../libpurple/protocols/irc/parse.c:128
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -3870,7 +3838,7 @@
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
 
-#: ../libpurple/protocols/irc/parse.c:125
+#: ../libpurple/protocols/irc/parse.c:129
 msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -3878,7 +3846,7 @@
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
 
-#: ../libpurple/protocols/irc/parse.c:126
+#: ../libpurple/protocols/irc/parse.c:130
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
@@ -3886,7 +3854,7 @@
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
 
-#: ../libpurple/protocols/irc/parse.c:127
+#: ../libpurple/protocols/irc/parse.c:131
 msgid ""
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
@@ -3894,15 +3862,15 @@
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
 
-#: ../libpurple/protocols/irc/parse.c:128
+#: ../libpurple/protocols/irc/parse.c:132
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;action to perform&gt;:  Perform an action."
 
-#: ../libpurple/protocols/irc/parse.c:129
+#: ../libpurple/protocols/irc/parse.c:133
 msgid "memoserv: Send a command to memoserv"
 msgstr "memoserv: Send a command to memoserv"
 
-#: ../libpurple/protocols/irc/parse.c:130
+#: ../libpurple/protocols/irc/parse.c:134
 msgid ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
 "or user mode."
@@ -3910,7 +3878,7 @@
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
 "or user mode."
 
-#: ../libpurple/protocols/irc/parse.c:131
+#: ../libpurple/protocols/irc/parse.c:135
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -3918,20 +3886,20 @@
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
 
-#: ../libpurple/protocols/irc/parse.c:132
+#: ../libpurple/protocols/irc/parse.c:136
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [channel]:  List the users currently in a channel."
 
-#: ../libpurple/protocols/irc/parse.c:133
-#: ../libpurple/protocols/jabber/jabber.c:1798
+#: ../libpurple/protocols/irc/parse.c:137
+#: ../libpurple/protocols/jabber/jabber.c:1813
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;new nickname&gt;:  Change your nickname."
 
-#: ../libpurple/protocols/irc/parse.c:134
+#: ../libpurple/protocols/irc/parse.c:138
 msgid "nickserv: Send a command to nickserv"
 msgstr "nickserv: Send a command to nickserv"
 
-#: ../libpurple/protocols/irc/parse.c:135
+#: ../libpurple/protocols/irc/parse.c:139
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
@@ -3939,7 +3907,7 @@
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
 
-#: ../libpurple/protocols/irc/parse.c:136
+#: ../libpurple/protocols/irc/parse.c:140
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
@@ -3947,11 +3915,11 @@
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
 
-#: ../libpurple/protocols/irc/parse.c:137
+#: ../libpurple/protocols/irc/parse.c:141
 msgid "operserv: Send a command to operserv"
 msgstr "operserv: Send a command to operserv"
 
-#: ../libpurple/protocols/irc/parse.c:138
+#: ../libpurple/protocols/irc/parse.c:142
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
@@ -3959,7 +3927,7 @@
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
 
-#: ../libpurple/protocols/irc/parse.c:139
+#: ../libpurple/protocols/irc/parse.c:143
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
@@ -3967,7 +3935,7 @@
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
 
-#: ../libpurple/protocols/irc/parse.c:140
+#: ../libpurple/protocols/irc/parse.c:144
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -3975,15 +3943,15 @@
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
 
-#: ../libpurple/protocols/irc/parse.c:141
+#: ../libpurple/protocols/irc/parse.c:145
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr "quit [message]:  Disconnect from the server, with an optional message."
 
-#: ../libpurple/protocols/irc/parse.c:142
+#: ../libpurple/protocols/irc/parse.c:146
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...]:  Send a raw command to the server."
 
-#: ../libpurple/protocols/irc/parse.c:143
+#: ../libpurple/protocols/irc/parse.c:147
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
@@ -3991,23 +3959,23 @@
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
 
-#: ../libpurple/protocols/irc/parse.c:144
+#: ../libpurple/protocols/irc/parse.c:148
 msgid "time: Displays the current local time at the IRC server."
 msgstr "time: Displays the current local time at the IRC server."
 
-#: ../libpurple/protocols/irc/parse.c:145
+#: ../libpurple/protocols/irc/parse.c:149
 msgid "topic [new topic]:  View or change the channel topic."
 msgstr "topic [new topic]:  View or change the channel topic."
 
-#: ../libpurple/protocols/irc/parse.c:146
+#: ../libpurple/protocols/irc/parse.c:150
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
 msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
 
-#: ../libpurple/protocols/irc/parse.c:147
+#: ../libpurple/protocols/irc/parse.c:151
 msgid "version [nick]: send CTCP VERSION request to a user"
 msgstr "version [nick]: send CTCP VERSION request to a user"
 
-#: ../libpurple/protocols/irc/parse.c:148
+#: ../libpurple/protocols/irc/parse.c:152
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
@@ -4015,7 +3983,7 @@
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
 
-#: ../libpurple/protocols/irc/parse.c:149
+#: ../libpurple/protocols/irc/parse.c:153
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
@@ -4023,54 +3991,79 @@
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
 
-#: ../libpurple/protocols/irc/parse.c:150
+#: ../libpurple/protocols/irc/parse.c:154
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr "whois [server] &lt;nick&gt;:  Get information on a user."
 
-#: ../libpurple/protocols/irc/parse.c:444
+#: ../libpurple/protocols/irc/parse.c:155
+msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
+msgstr "whowas &lt;nick&gt;: Get information on a user that has logged off."
+
+#: ../libpurple/protocols/irc/parse.c:449
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Reply time from %s: %lu seconds"
 
-#: ../libpurple/protocols/irc/parse.c:445
+#: ../libpurple/protocols/irc/parse.c:450
 msgid "PONG"
 msgstr "PONG"
 
-#: ../libpurple/protocols/irc/parse.c:445
+#: ../libpurple/protocols/irc/parse.c:450
 msgid "CTCP PING reply"
 msgstr "CTCP PING reply"
 
-#: ../libpurple/protocols/irc/parse.c:556
-#: ../libpurple/protocols/irc/parse.c:560 ../libpurple/protocols/toc/toc.c:191
+#: ../libpurple/protocols/irc/parse.c:561
+#: ../libpurple/protocols/irc/parse.c:565 ../libpurple/protocols/toc/toc.c:191
 #: ../libpurple/protocols/toc/toc.c:694 ../libpurple/protocols/toc/toc.c:710
 #: ../libpurple/protocols/toc/toc.c:786
 msgid "Disconnected."
 msgstr "Disconnected."
 
-#: ../libpurple/protocols/jabber/auth.c:51
+#: ../libpurple/protocols/jabber/auth.c:52
 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:114
+#: ../libpurple/protocols/jabber/auth.c:115
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "Server requires plaintext authentication over an unencrypted stream"
 
-#: ../libpurple/protocols/jabber/auth.c:229
-msgid "Server couldn't authenticate you without a password"
-msgstr "Server couldn't authenticate you without a password"
-
-#: ../libpurple/protocols/jabber/auth.c:232
-#: ../libpurple/protocols/jabber/auth.c:233
-#: ../libpurple/protocols/jabber/auth.c:407
-#: ../libpurple/protocols/jabber/auth.c:408
-#: ../libpurple/protocols/jabber/auth.c:489
-#: ../libpurple/protocols/jabber/auth.c:490
+#: ../libpurple/protocols/jabber/auth.c:294
+#: ../libpurple/protocols/jabber/auth.c:483
+#, c-format
+msgid ""
+"%s requires plaintext authentication over an unencrypted connection.  Allow "
+"this and continue authentication?"
+msgstr ""
+"%s requires plaintext authentication over an unencrypted connection.  Allow "
+"this and continue authentication?"
+
+#: ../libpurple/protocols/jabber/auth.c:296
+#: ../libpurple/protocols/jabber/auth.c:297
+#: ../libpurple/protocols/jabber/auth.c:485
+#: ../libpurple/protocols/jabber/auth.c:486
+#: ../libpurple/protocols/jabber/auth.c:570
+#: ../libpurple/protocols/jabber/auth.c:571
 msgid "Plaintext Authentication"
 msgstr "Plaintext Authentication"
 
-#: ../libpurple/protocols/jabber/auth.c:234
-#: ../libpurple/protocols/jabber/auth.c:409
-#: ../libpurple/protocols/jabber/auth.c:491
+#: ../libpurple/protocols/jabber/auth.c:309
+#: ../libpurple/protocols/jabber/auth.c:498
+#: ../libpurple/protocols/jabber/auth.c:582
+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:437
+#: ../libpurple/protocols/jabber/auth.c:533
+#: ../libpurple/protocols/jabber/auth.c:748
+#: ../libpurple/protocols/jabber/auth.c:889
+#: ../libpurple/protocols/jabber/auth.c:914
+#: ../libpurple/protocols/jabber/auth.c:933
+#: ../libpurple/protocols/jabber/jabber.c:115
+msgid "Invalid response from server."
+msgstr "Invalid response from server."
+
+#: ../libpurple/protocols/jabber/auth.c:572
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
@@ -4078,95 +4071,79 @@
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
 
-#: ../libpurple/protocols/jabber/auth.c:240
-#: ../libpurple/protocols/jabber/auth.c:417
-#: ../libpurple/protocols/jabber/auth.c:499
-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:330
-#: ../libpurple/protocols/jabber/auth.c:452
-#: ../libpurple/protocols/jabber/auth.c:620
-#: ../libpurple/protocols/jabber/auth.c:754
-#: ../libpurple/protocols/jabber/auth.c:779
-#: ../libpurple/protocols/jabber/auth.c:798
-#: ../libpurple/protocols/jabber/jabber.c:115
-msgid "Invalid response from server."
-msgstr "Invalid response from server."
-
-#: ../libpurple/protocols/jabber/auth.c:641
+#: ../libpurple/protocols/jabber/auth.c:769
+#: ../libpurple/protocols/jabber/auth.c:792
 msgid "Invalid challenge from server"
 msgstr "Invalid challenge from server"
 
-#: ../libpurple/protocols/jabber/auth.c:729
+#: ../libpurple/protocols/jabber/auth.c:864
 msgid "SASL error"
 msgstr "SASL error"
 
 #: ../libpurple/protocols/jabber/buddy.c:271
-#: ../libpurple/protocols/jabber/buddy.c:790
-#: ../libpurple/protocols/sametime/sametime.c:4127
+#: ../libpurple/protocols/jabber/buddy.c:787
+#: ../libpurple/protocols/sametime/sametime.c:4128
 #: ../libpurple/protocols/silc/ops.c:1020
 msgid "Full Name"
 msgstr "Full Name"
 
 #: ../libpurple/protocols/jabber/buddy.c:272
-#: ../libpurple/protocols/jabber/buddy.c:803
+#: ../libpurple/protocols/jabber/buddy.c:800
 #: ../libpurple/protocols/silc/ops.c:1032
 msgid "Family Name"
 msgstr "Family Name"
 
 #: ../libpurple/protocols/jabber/buddy.c:273
-#: ../libpurple/protocols/jabber/buddy.c:807
+#: ../libpurple/protocols/jabber/buddy.c:804
 msgid "Given Name"
 msgstr "Given Name"
 
 #: ../libpurple/protocols/jabber/buddy.c:275
-#: ../libpurple/protocols/jabber/jabber.c:857
+#: ../libpurple/protocols/jabber/jabber.c:859
 msgid "URL"
 msgstr "URL"
 
 #: ../libpurple/protocols/jabber/buddy.c:276
-#: ../libpurple/protocols/jabber/buddy.c:859
+#: ../libpurple/protocols/jabber/buddy.c:856
 msgid "Street Address"
 msgstr "Street Address"
 
 #: ../libpurple/protocols/jabber/buddy.c:277
-#: ../libpurple/protocols/jabber/buddy.c:855
+#: ../libpurple/protocols/jabber/buddy.c:852
 msgid "Extended Address"
 msgstr "Extended Address"
 
 #: ../libpurple/protocols/jabber/buddy.c:278
-#: ../libpurple/protocols/jabber/buddy.c:863
+#: ../libpurple/protocols/jabber/buddy.c:860
 msgid "Locality"
 msgstr "Locality"
 
 #: ../libpurple/protocols/jabber/buddy.c:279
-#: ../libpurple/protocols/jabber/buddy.c:867
+#: ../libpurple/protocols/jabber/buddy.c:864
 msgid "Region"
 msgstr "Region"
 
 #: ../libpurple/protocols/jabber/buddy.c:280
-#: ../libpurple/protocols/jabber/buddy.c:871
+#: ../libpurple/protocols/jabber/buddy.c:868
 msgid "Postal Code"
 msgstr "Postal Code"
 
 #: ../libpurple/protocols/jabber/buddy.c:281
-#: ../libpurple/protocols/jabber/buddy.c:876
-#: ../libpurple/protocols/silc/silc.c:933
+#: ../libpurple/protocols/jabber/buddy.c:873
+#: ../libpurple/protocols/silc/silc.c:934
 msgid "Country"
 msgstr "Country"
 
 #: ../libpurple/protocols/jabber/buddy.c:282
-#: ../libpurple/protocols/jabber/buddy.c:887
-#: ../libpurple/protocols/jabber/buddy.c:894
+#: ../libpurple/protocols/jabber/buddy.c:884
+#: ../libpurple/protocols/jabber/buddy.c:891
 msgid "Telephone"
 msgstr "Telephone"
 
 #: ../libpurple/protocols/jabber/buddy.c:283
-#: ../libpurple/protocols/jabber/buddy.c:905
-#: ../libpurple/protocols/jabber/buddy.c:913
-#: ../libpurple/protocols/jabber/buddy.c:1571
+#: ../libpurple/protocols/jabber/buddy.c:902
+#: ../libpurple/protocols/jabber/buddy.c:910
+#: ../libpurple/protocols/jabber/buddy.c:1591
 #: ../libpurple/protocols/silc/ops.c:1075
 #: ../libpurple/protocols/silc/util.c:551
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1037
@@ -4174,40 +4151,40 @@
 msgstr "E-Mail"
 
 #: ../libpurple/protocols/jabber/buddy.c:284
-#: ../libpurple/protocols/jabber/buddy.c:928
+#: ../libpurple/protocols/jabber/buddy.c:925
 msgid "Organization Name"
 msgstr "Organisation Name"
 
 #: ../libpurple/protocols/jabber/buddy.c:285
-#: ../libpurple/protocols/jabber/buddy.c:932
+#: ../libpurple/protocols/jabber/buddy.c:929
 msgid "Organization Unit"
 msgstr "Organisation Unit"
 
 #: ../libpurple/protocols/jabber/buddy.c:287
-#: ../libpurple/protocols/jabber/buddy.c:941
+#: ../libpurple/protocols/jabber/buddy.c:938
 msgid "Role"
 msgstr "Role"
 
 #: ../libpurple/protocols/jabber/buddy.c:288
-#: ../libpurple/protocols/jabber/buddy.c:824
-#: ../libpurple/protocols/msn/msn.c:1587
-#: ../libpurple/protocols/oscar/oscar.c:3753
+#: ../libpurple/protocols/jabber/buddy.c:821
+#: ../libpurple/protocols/msn/msn.c:1611
+#: ../libpurple/protocols/oscar/oscar.c:3739
 msgid "Birthday"
 msgstr "Birthday"
 
 #: ../libpurple/protocols/jabber/buddy.c:289
-#: ../libpurple/protocols/jabber/buddy.c:944
-#: ../libpurple/protocols/jabber/chat.c:777 ../pidgin/gtkblist.c:3037
+#: ../libpurple/protocols/jabber/buddy.c:941
+#: ../libpurple/protocols/jabber/chat.c:775 ../pidgin/gtkblist.c:3064
 #: ../pidgin/gtkprefs.c:680
 msgid "Description"
 msgstr "Description"
 
-#: ../libpurple/protocols/jabber/buddy.c:582
-#: ../libpurple/protocols/jabber/buddy.c:583
+#: ../libpurple/protocols/jabber/buddy.c:578
+#: ../libpurple/protocols/jabber/buddy.c:579
 msgid "Edit XMPP vCard"
 msgstr "Edit XMPP vCard"
 
-#: ../libpurple/protocols/jabber/buddy.c:584
+#: ../libpurple/protocols/jabber/buddy.c:580
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
@@ -4215,113 +4192,113 @@
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
 
-#: ../libpurple/protocols/jabber/buddy.c:654
-#: ../libpurple/protocols/jabber/buddy.c:695
+#: ../libpurple/protocols/jabber/buddy.c:651
+#: ../libpurple/protocols/jabber/buddy.c:692
 msgid "Client"
 msgstr "Client"
 
-#: ../libpurple/protocols/jabber/buddy.c:658
-#: ../libpurple/protocols/jabber/buddy.c:699
+#: ../libpurple/protocols/jabber/buddy.c:655
+#: ../libpurple/protocols/jabber/buddy.c:696
 msgid "Operating System"
 msgstr "Operating System"
 
-#: ../libpurple/protocols/jabber/buddy.c:668
-#: ../libpurple/protocols/jabber/jabber.c:1997
+#: ../libpurple/protocols/jabber/buddy.c:665
+#: ../libpurple/protocols/jabber/libxmpp.c:198
 msgid "Resource"
 msgstr "Resource"
 
-#: ../libpurple/protocols/jabber/buddy.c:670
-#: ../libpurple/protocols/jabber/jabber.c:1232
-#: ../libpurple/protocols/jabber/jabber.c:1242
-#: ../libpurple/protocols/jabber/jabber.c:1252
-#: ../libpurple/protocols/jabber/jabber.c:1262
-#: ../libpurple/protocols/jabber/jabber.c:1272
+#: ../libpurple/protocols/jabber/buddy.c:667
+#: ../libpurple/protocols/jabber/jabber.c:1245
+#: ../libpurple/protocols/jabber/jabber.c:1255
+#: ../libpurple/protocols/jabber/jabber.c:1265
+#: ../libpurple/protocols/jabber/jabber.c:1275
+#: ../libpurple/protocols/jabber/jabber.c:1285
 msgid "Priority"
 msgstr "Priority"
 
-#: ../libpurple/protocols/jabber/buddy.c:811
+#: ../libpurple/protocols/jabber/buddy.c:808
 #: ../libpurple/protocols/silc/ops.c:1028
 msgid "Middle Name"
 msgstr "Middle Name"
 
-#: ../libpurple/protocols/jabber/buddy.c:844
-#: ../libpurple/protocols/jabber/jabber.c:832
-#: ../libpurple/protocols/oscar/oscar.c:3792
-#: ../libpurple/protocols/oscar/oscar.c:3805
+#: ../libpurple/protocols/jabber/buddy.c:841
+#: ../libpurple/protocols/jabber/jabber.c:834
+#: ../libpurple/protocols/oscar/oscar.c:3778
+#: ../libpurple/protocols/oscar/oscar.c:3791
 #: ../libpurple/protocols/qq/buddy_info.c:56
 #: ../libpurple/protocols/silc/ops.c:1064
 msgid "Address"
 msgstr "Address"
 
-#: ../libpurple/protocols/jabber/buddy.c:851
+#: ../libpurple/protocols/jabber/buddy.c:848
 msgid "P.O. Box"
 msgstr "P.O. Box"
 
-#: ../libpurple/protocols/jabber/buddy.c:965
+#: ../libpurple/protocols/jabber/buddy.c:962
 msgid "Photo"
 msgstr "Photo"
 
-#: ../libpurple/protocols/jabber/buddy.c:965
+#: ../libpurple/protocols/jabber/buddy.c:962
 msgid "Logo"
 msgstr "Logo"
 
-#: ../libpurple/protocols/jabber/buddy.c:1351
+#: ../libpurple/protocols/jabber/buddy.c:1371
 msgid "Un-hide From"
 msgstr "Un-hide From"
 
-#: ../libpurple/protocols/jabber/buddy.c:1355
+#: ../libpurple/protocols/jabber/buddy.c:1375
 msgid "Temporarily Hide From"
 msgstr "Temporarily Hide From"
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1363
+#: ../libpurple/protocols/jabber/buddy.c:1383
 msgid "Cancel Presence Notification"
 msgstr "Cancel Presence Notification"
 
-#: ../libpurple/protocols/jabber/buddy.c:1370
+#: ../libpurple/protocols/jabber/buddy.c:1390
 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:1379
+#: ../libpurple/protocols/jabber/buddy.c:1399
 msgid "Unsubscribe"
 msgstr "Unsubscribe"
 
-#: ../libpurple/protocols/jabber/buddy.c:1412
-#: ../libpurple/protocols/jabber/jabber.c:1241
+#: ../libpurple/protocols/jabber/buddy.c:1432
+#: ../libpurple/protocols/jabber/jabber.c:1254
 msgid "Chatty"
 msgstr "Chatty"
 
-#: ../libpurple/protocols/jabber/buddy.c:1416 ../libpurple/status.c:159
+#: ../libpurple/protocols/jabber/buddy.c:1436 ../libpurple/status.c:158
 msgid "Extended Away"
 msgstr "Extended Away"
 
-#: ../libpurple/protocols/jabber/buddy.c:1418
-#: ../libpurple/protocols/jabber/jabber.c:1271
-#: ../libpurple/protocols/oscar/oscar.c:708
-#: ../libpurple/protocols/oscar/oscar.c:5758
-#: ../libpurple/protocols/sametime/sametime.c:3298
+#: ../libpurple/protocols/jabber/buddy.c:1438
+#: ../libpurple/protocols/jabber/jabber.c:1284
+#: ../libpurple/protocols/oscar/oscar.c:709
+#: ../libpurple/protocols/oscar/oscar.c:5721
+#: ../libpurple/protocols/sametime/sametime.c:3297
 msgid "Do Not Disturb"
 msgstr "Do Not Disturb"
 
-#: ../libpurple/protocols/jabber/buddy.c:1563
+#: ../libpurple/protocols/jabber/buddy.c:1583
 msgid "JID"
 msgstr "JID"
 
-#: ../libpurple/protocols/jabber/buddy.c:1567
-#: ../libpurple/protocols/jabber/buddy.c:1746
-#: ../libpurple/protocols/oscar/oscar.c:3715
+#: ../libpurple/protocols/jabber/buddy.c:1587
+#: ../libpurple/protocols/jabber/buddy.c:1766
+#: ../libpurple/protocols/oscar/oscar.c:3701
 msgid "Last Name"
 msgstr "Surname"
 
-#: ../libpurple/protocols/jabber/buddy.c:1599
+#: ../libpurple/protocols/jabber/buddy.c:1619
 msgid "The following are the results of your search"
 msgstr "The following are the results of your search"
 
-#. current comment from XMPP User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:1674
+#. current comment from Jabber User Directory users.jabber.org
+#: ../libpurple/protocols/jabber/buddy.c:1694
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
@@ -4329,68 +4306,68 @@
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
 
-#: ../libpurple/protocols/jabber/buddy.c:1694
+#: ../libpurple/protocols/jabber/buddy.c:1714
 msgid "Directory Query Failed"
 msgstr "Directory Query Failed"
 
-#: ../libpurple/protocols/jabber/buddy.c:1695
+#: ../libpurple/protocols/jabber/buddy.c:1715
 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:1729
+#: ../libpurple/protocols/jabber/buddy.c:1749
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "Server Instructions: %s"
 
-#: ../libpurple/protocols/jabber/buddy.c:1736
+#: ../libpurple/protocols/jabber/buddy.c:1756
 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:1756
+#: ../libpurple/protocols/jabber/buddy.c:1776
 #: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3718
-#: ../libpurple/protocols/oscar/oscar.c:3727
+#: ../libpurple/protocols/oscar/oscar.c:3704
+#: ../libpurple/protocols/oscar/oscar.c:3713
 msgid "E-Mail Address"
 msgstr "E-Mail Address"
 
-#: ../libpurple/protocols/jabber/buddy.c:1765
-#: ../libpurple/protocols/jabber/buddy.c:1766
+#: ../libpurple/protocols/jabber/buddy.c:1785
+#: ../libpurple/protocols/jabber/buddy.c:1786
 msgid "Search for XMPP users"
 msgstr "Search for XMPP users"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:1767
+#: ../libpurple/protocols/jabber/buddy.c:1787
 #: ../libpurple/protocols/qq/group.c:123
-#: ../libpurple/protocols/qq/group_im.c:139
-#: ../libpurple/protocols/qq/sys_msg.c:162
-#: ../libpurple/protocols/qq/sys_msg.c:232
-#: ../libpurple/protocols/qq/sys_msg.c:250
-#: ../libpurple/protocols/sametime/sametime.c:5600
+#: ../libpurple/protocols/qq/group_im.c:145
+#: ../libpurple/protocols/qq/sys_msg.c:176
+#: ../libpurple/protocols/qq/sys_msg.c:253
+#: ../libpurple/protocols/qq/sys_msg.c:271
+#: ../libpurple/protocols/sametime/sametime.c:5611
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:473
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:358
 msgid "Search"
 msgstr "Search"
 
-#: ../libpurple/protocols/jabber/buddy.c:1780
+#: ../libpurple/protocols/jabber/buddy.c:1802
 msgid "Invalid Directory"
 msgstr "Invalid Directory"
 
-#: ../libpurple/protocols/jabber/buddy.c:1797
+#: ../libpurple/protocols/jabber/buddy.c:1819
 msgid "Enter a User Directory"
 msgstr "Enter a User Directory"
 
-#: ../libpurple/protocols/jabber/buddy.c:1798
+#: ../libpurple/protocols/jabber/buddy.c:1820
 msgid "Select a user directory to search"
 msgstr "Select a user directory to search"
 
-#: ../libpurple/protocols/jabber/buddy.c:1801
+#: ../libpurple/protocols/jabber/buddy.c:1823
 msgid "Search Directory"
 msgstr "Search Directory"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5254
+#: ../libpurple/protocols/oscar/oscar.c:5227
 #: ../libpurple/protocols/yahoo/yahoochat.c:999
 msgid "_Room:"
 msgstr "_Room:"
@@ -4403,80 +4380,80 @@
 msgid "_Handle:"
 msgstr "_Handle:"
 
-#: ../libpurple/protocols/jabber/chat.c:225
+#: ../libpurple/protocols/jabber/chat.c:223
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s is not a valid room name"
 
-#: ../libpurple/protocols/jabber/chat.c:226
+#: ../libpurple/protocols/jabber/chat.c:224
 msgid "Invalid Room Name"
 msgstr "Invalid Room Name"
 
-#: ../libpurple/protocols/jabber/chat.c:231
+#: ../libpurple/protocols/jabber/chat.c:229
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s is not a valid server name"
 
-#: ../libpurple/protocols/jabber/chat.c:232
-#: ../libpurple/protocols/jabber/chat.c:233
+#: ../libpurple/protocols/jabber/chat.c:230
+#: ../libpurple/protocols/jabber/chat.c:231
 msgid "Invalid Server Name"
 msgstr "Invalid Server Name"
 
-#: ../libpurple/protocols/jabber/chat.c:237
+#: ../libpurple/protocols/jabber/chat.c:235
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s is not a valid room handle"
 
-#: ../libpurple/protocols/jabber/chat.c:238
-#: ../libpurple/protocols/jabber/chat.c:239
+#: ../libpurple/protocols/jabber/chat.c:236
+#: ../libpurple/protocols/jabber/chat.c:237
 msgid "Invalid Room Handle"
 msgstr "Invalid Room Handle"
 
-#: ../libpurple/protocols/jabber/chat.c:398
+#: ../libpurple/protocols/jabber/chat.c:396
 msgid "Configuration error"
 msgstr "Configuration error"
 
-#: ../libpurple/protocols/jabber/chat.c:407
-#: ../libpurple/protocols/jabber/chat.c:550
+#: ../libpurple/protocols/jabber/chat.c:405
+#: ../libpurple/protocols/jabber/chat.c:548
 msgid "Unable to configure"
 msgstr "Unable to configure"
 
-#: ../libpurple/protocols/jabber/chat.c:422
+#: ../libpurple/protocols/jabber/chat.c:420
 msgid "Room Configuration Error"
 msgstr "Room Configuration Error"
 
-#: ../libpurple/protocols/jabber/chat.c:423
+#: ../libpurple/protocols/jabber/chat.c:421
 msgid "This room is not capable of being configured"
 msgstr "This room is not capable of being configured"
 
-#: ../libpurple/protocols/jabber/chat.c:472
-#: ../libpurple/protocols/jabber/chat.c:541
+#: ../libpurple/protocols/jabber/chat.c:470
+#: ../libpurple/protocols/jabber/chat.c:539
 msgid "Registration error"
 msgstr "Registration error"
 
-#: ../libpurple/protocols/jabber/chat.c:629
+#: ../libpurple/protocols/jabber/chat.c:627
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "Nick changing not supported in non-MUC chatrooms"
 
-#: ../libpurple/protocols/jabber/chat.c:680
-#: ../libpurple/protocols/jabber/chat.c:691
+#: ../libpurple/protocols/jabber/chat.c:678
+#: ../libpurple/protocols/jabber/chat.c:689
 #: ../libpurple/protocols/silc/ops.c:1451
 msgid "Error retrieving room list"
 msgstr "Error retrieving room list"
 
-#: ../libpurple/protocols/jabber/chat.c:739
+#: ../libpurple/protocols/jabber/chat.c:737
 msgid "Invalid Server"
 msgstr "Invalid Server"
 
-#: ../libpurple/protocols/jabber/chat.c:783
+#: ../libpurple/protocols/jabber/chat.c:781
 msgid "Enter a Conference Server"
 msgstr "Enter a Conference Server"
 
-#: ../libpurple/protocols/jabber/chat.c:784
+#: ../libpurple/protocols/jabber/chat.c:782
 msgid "Select a conference server to query"
 msgstr "Select a conference server to query"
 
-#: ../libpurple/protocols/jabber/chat.c:787
+#: ../libpurple/protocols/jabber/chat.c:785
 msgid "Find Rooms"
 msgstr "Find Rooms"
 
@@ -4499,416 +4476,420 @@
 msgid "Unable to create socket"
 msgstr "Unable to create socket"
 
-#: ../libpurple/protocols/jabber/jabber.c:567
-#: ../libpurple/protocols/jabber/jabber.c:910
+#: ../libpurple/protocols/jabber/jabber.c:564
+#: ../libpurple/protocols/jabber/jabber.c:914
 msgid "Invalid XMPP ID"
 msgstr "Invalid XMPP ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:638
+#: ../libpurple/protocols/jabber/jabber.c:569
+msgid "Invalid XMPP ID. Domain must be set."
+msgstr "Invalid XMPP ID. Domain must be set."
+
+#: ../libpurple/protocols/jabber/jabber.c:640
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registration of %s@%s successful"
 
-#: ../libpurple/protocols/jabber/jabber.c:640
-#: ../libpurple/protocols/jabber/jabber.c:641
+#: ../libpurple/protocols/jabber/jabber.c:642
+#: ../libpurple/protocols/jabber/jabber.c:643
 msgid "Registration Successful"
 msgstr "Registration Successful"
 
-#: ../libpurple/protocols/jabber/jabber.c:647
-#: ../libpurple/protocols/jabber/jabber.c:1509
+#: ../libpurple/protocols/jabber/jabber.c:649
+#: ../libpurple/protocols/jabber/jabber.c:1524
 msgid "Unknown Error"
 msgstr "Unknown Error"
 
-#: ../libpurple/protocols/jabber/jabber.c:649
-#: ../libpurple/protocols/jabber/jabber.c:650
+#: ../libpurple/protocols/jabber/jabber.c:651
+#: ../libpurple/protocols/jabber/jabber.c:652
 msgid "Registration Failed"
 msgstr "Registration Failed"
 
-#: ../libpurple/protocols/jabber/jabber.c:765
-#: ../libpurple/protocols/jabber/jabber.c:766
+#: ../libpurple/protocols/jabber/jabber.c:767
+#: ../libpurple/protocols/jabber/jabber.c:768
 msgid "Already Registered"
 msgstr "Already Registered"
 
-#: ../libpurple/protocols/jabber/jabber.c:842
-#: ../libpurple/protocols/oscar/oscar.c:3794
-#: ../libpurple/protocols/oscar/oscar.c:3807
+#: ../libpurple/protocols/jabber/jabber.c:844
+#: ../libpurple/protocols/oscar/oscar.c:3780
+#: ../libpurple/protocols/oscar/oscar.c:3793
 msgid "State"
 msgstr "County/State"
 
-#: ../libpurple/protocols/jabber/jabber.c:847
+#: ../libpurple/protocols/jabber/jabber.c:849
 msgid "Postal code"
 msgstr "Postcode"
 
-#: ../libpurple/protocols/jabber/jabber.c:852
+#: ../libpurple/protocols/jabber/jabber.c:854
 #: ../libpurple/protocols/silc/ops.c:1069
 #: ../libpurple/protocols/silc/silc.c:691
 #: ../libpurple/protocols/silc/util.c:553
 msgid "Phone"
 msgstr "Telephone"
 
-#: ../libpurple/protocols/jabber/jabber.c:862
+#: ../libpurple/protocols/jabber/jabber.c:864
 msgid "Date"
 msgstr "Date"
 
-#: ../libpurple/protocols/jabber/jabber.c:870
+#: ../libpurple/protocols/jabber/jabber.c:872
 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:873
-#: ../libpurple/protocols/jabber/jabber.c:874
+#: ../libpurple/protocols/jabber/jabber.c:875
+#: ../libpurple/protocols/jabber/jabber.c:876
 msgid "Register New XMPP Account"
 msgstr "Register New XMPP Account"
 
 #. Register button
-#: ../libpurple/protocols/jabber/jabber.c:875 ../pidgin/gtkaccount.c:1478
+#: ../libpurple/protocols/jabber/jabber.c:877 ../pidgin/gtkaccount.c:1521
 msgid "Register"
 msgstr "Register"
 
-#: ../libpurple/protocols/jabber/jabber.c:1042
+#: ../libpurple/protocols/jabber/jabber.c:1048
 msgid "Initializing Stream"
 msgstr "Initialising Stream"
 
-#: ../libpurple/protocols/jabber/jabber.c:1047
+#: ../libpurple/protocols/jabber/jabber.c:1053
 #: ../libpurple/protocols/msn/session.c:350
 msgid "Authenticating"
 msgstr "Authenticating"
 
-#: ../libpurple/protocols/jabber/jabber.c:1056
+#: ../libpurple/protocols/jabber/jabber.c:1062
 msgid "Re-initializing Stream"
 msgstr "Re-initialising Stream"
 
-#: ../libpurple/protocols/jabber/jabber.c:1115
-#: ../libpurple/protocols/jabber/jabber.c:1487
-#: ../libpurple/protocols/jabber/jabber.c:1528
-#: ../libpurple/protocols/jabber/jabber.c:1564
-#: ../libpurple/protocols/oscar/oscar.c:807
-#: ../libpurple/protocols/oscar/oscar.c:5542
+#: ../libpurple/protocols/jabber/jabber.c:1128
+#: ../libpurple/protocols/jabber/jabber.c:1502
+#: ../libpurple/protocols/jabber/jabber.c:1543
+#: ../libpurple/protocols/jabber/jabber.c:1579
+#: ../libpurple/protocols/oscar/oscar.c:808
+#: ../libpurple/protocols/oscar/oscar.c:5515
 msgid "Not Authorized"
 msgstr "Not Authorised"
 
-#: ../libpurple/protocols/jabber/jabber.c:1157
+#: ../libpurple/protocols/jabber/jabber.c:1170
 msgid "Both"
 msgstr "Both"
 
-#: ../libpurple/protocols/jabber/jabber.c:1159
+#: ../libpurple/protocols/jabber/jabber.c:1172
 msgid "From (To pending)"
 msgstr "From (To pending)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1164
+#: ../libpurple/protocols/jabber/jabber.c:1177
 msgid "To"
 msgstr "To"
 
-#: ../libpurple/protocols/jabber/jabber.c:1166
+#: ../libpurple/protocols/jabber/jabber.c:1179
 msgid "None (To pending)"
 msgstr "None (To pending)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1168
+#: ../libpurple/protocols/jabber/jabber.c:1181
 #: ../pidgin/plugins/gevolution/eds-utils.c:73
 #: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr "None"
 
-#: ../libpurple/protocols/jabber/jabber.c:1171
+#: ../libpurple/protocols/jabber/jabber.c:1184
 msgid "Subscription"
 msgstr "Subscription"
 
-#: ../libpurple/protocols/jabber/jabber.c:1301
+#: ../libpurple/protocols/jabber/jabber.c:1314
 msgid "Password Changed"
 msgstr "Password Changed"
 
-#: ../libpurple/protocols/jabber/jabber.c:1302
+#: ../libpurple/protocols/jabber/jabber.c:1315
 msgid "Your password has been changed."
 msgstr "Your password has been changed."
 
-#: ../libpurple/protocols/jabber/jabber.c:1306
-#: ../libpurple/protocols/jabber/jabber.c:1307
+#: ../libpurple/protocols/jabber/jabber.c:1319
+#: ../libpurple/protocols/jabber/jabber.c:1320
 msgid "Error changing password"
 msgstr "Error changing password"
 
-#: ../libpurple/protocols/jabber/jabber.c:1363
+#: ../libpurple/protocols/jabber/jabber.c:1376
 msgid "Password (again)"
 msgstr "Password (again)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1368
-#: ../libpurple/protocols/jabber/jabber.c:1369
+#: ../libpurple/protocols/jabber/jabber.c:1381
+#: ../libpurple/protocols/jabber/jabber.c:1382
 msgid "Change XMPP Password"
 msgstr "Change XMPP Password"
 
-#: ../libpurple/protocols/jabber/jabber.c:1369
+#: ../libpurple/protocols/jabber/jabber.c:1382
 msgid "Please enter your new password"
 msgstr "Please enter your new password"
 
-#: ../libpurple/protocols/jabber/jabber.c:1379
-#: ../libpurple/protocols/oscar/oscar.c:6343
-#: ../libpurple/protocols/silc/silc.c:1013
+#: ../libpurple/protocols/jabber/jabber.c:1394
+#: ../libpurple/protocols/oscar/oscar.c:6301
+#: ../libpurple/protocols/silc/silc.c:1015
 msgid "Set User Info..."
 msgstr "Set User Info..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1384
-#: ../libpurple/protocols/oscar/oscar.c:6354
-#: ../libpurple/protocols/silc/silc.c:1009
+#: ../libpurple/protocols/jabber/jabber.c:1399
+#: ../libpurple/protocols/oscar/oscar.c:6312
+#: ../libpurple/protocols/silc/silc.c:1011
 msgid "Change Password..."
 msgstr "Change Password..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1389
+#: ../libpurple/protocols/jabber/jabber.c:1404
 msgid "Search for Users..."
 msgstr "Search for Users..."
 
-#: ../libpurple/protocols/jabber/jabber.c:1467
+#: ../libpurple/protocols/jabber/jabber.c:1482
 msgid "Bad Request"
 msgstr "Bad Request"
 
-#: ../libpurple/protocols/jabber/jabber.c:1469
+#: ../libpurple/protocols/jabber/jabber.c:1484
 msgid "Conflict"
 msgstr "Conflict"
 
-#: ../libpurple/protocols/jabber/jabber.c:1471
+#: ../libpurple/protocols/jabber/jabber.c:1486
 msgid "Feature Not Implemented"
 msgstr "Feature Not Implemented"
 
-#: ../libpurple/protocols/jabber/jabber.c:1473
+#: ../libpurple/protocols/jabber/jabber.c:1488
 msgid "Forbidden"
 msgstr "Forbidden"
 
-#: ../libpurple/protocols/jabber/jabber.c:1475
+#: ../libpurple/protocols/jabber/jabber.c:1490
 msgid "Gone"
 msgstr "Gone"
 
-#: ../libpurple/protocols/jabber/jabber.c:1477
-#: ../libpurple/protocols/jabber/jabber.c:1554
+#: ../libpurple/protocols/jabber/jabber.c:1492
+#: ../libpurple/protocols/jabber/jabber.c:1569
 msgid "Internal Server Error"
 msgstr "Internal Server Error"
 
-#: ../libpurple/protocols/jabber/jabber.c:1479
+#: ../libpurple/protocols/jabber/jabber.c:1494
 msgid "Item Not Found"
 msgstr "Item Not Found"
 
-#: ../libpurple/protocols/jabber/jabber.c:1481
+#: ../libpurple/protocols/jabber/jabber.c:1496
 msgid "Malformed XMPP ID"
 msgstr "Malformed XMPP ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:1483
+#: ../libpurple/protocols/jabber/jabber.c:1498
 msgid "Not Acceptable"
 msgstr "Not Acceptable"
 
-#: ../libpurple/protocols/jabber/jabber.c:1485
+#: ../libpurple/protocols/jabber/jabber.c:1500
 msgid "Not Allowed"
 msgstr "Not Allowed"
 
-#: ../libpurple/protocols/jabber/jabber.c:1489
+#: ../libpurple/protocols/jabber/jabber.c:1504
 msgid "Payment Required"
 msgstr "Payment Required"
 
-#: ../libpurple/protocols/jabber/jabber.c:1491
+#: ../libpurple/protocols/jabber/jabber.c:1506
 msgid "Recipient Unavailable"
 msgstr "Recipient unavailable"
 
-#: ../libpurple/protocols/jabber/jabber.c:1495
+#: ../libpurple/protocols/jabber/jabber.c:1510
 msgid "Registration Required"
 msgstr "Registration Required"
 
-#: ../libpurple/protocols/jabber/jabber.c:1497
+#: ../libpurple/protocols/jabber/jabber.c:1512
 msgid "Remote Server Not Found"
 msgstr "Remote Server Not Found"
 
-#: ../libpurple/protocols/jabber/jabber.c:1499
+#: ../libpurple/protocols/jabber/jabber.c:1514
 msgid "Remote Server Timeout"
 msgstr "Remote Server Timeout"
 
-#: ../libpurple/protocols/jabber/jabber.c:1501
+#: ../libpurple/protocols/jabber/jabber.c:1516
 msgid "Server Overloaded"
 msgstr "Server Overloaded"
 
-#: ../libpurple/protocols/jabber/jabber.c:1503
+#: ../libpurple/protocols/jabber/jabber.c:1518
 msgid "Service Unavailable"
 msgstr "Service Unavailable"
 
-#: ../libpurple/protocols/jabber/jabber.c:1505
+#: ../libpurple/protocols/jabber/jabber.c:1520
 msgid "Subscription Required"
 msgstr "Subscription Required"
 
-#: ../libpurple/protocols/jabber/jabber.c:1507
+#: ../libpurple/protocols/jabber/jabber.c:1522
 msgid "Unexpected Request"
 msgstr "Unexpected Request"
 
-#: ../libpurple/protocols/jabber/jabber.c:1514
+#: ../libpurple/protocols/jabber/jabber.c:1529
 msgid "Authorization Aborted"
 msgstr "Authorisation Aborted"
 
-#: ../libpurple/protocols/jabber/jabber.c:1516
+#: ../libpurple/protocols/jabber/jabber.c:1531
 msgid "Incorrect encoding in authorization"
 msgstr "Incorrect encoding in authorisation"
 
-#: ../libpurple/protocols/jabber/jabber.c:1519
+#: ../libpurple/protocols/jabber/jabber.c:1534
 msgid "Invalid authzid"
 msgstr "Invalid authzid"
 
-#: ../libpurple/protocols/jabber/jabber.c:1522
+#: ../libpurple/protocols/jabber/jabber.c:1537
 msgid "Invalid Authorization Mechanism"
 msgstr "Invalid Authorisation Mechanism"
 
-#: ../libpurple/protocols/jabber/jabber.c:1525
+#: ../libpurple/protocols/jabber/jabber.c:1540
 msgid "Authorization mechanism too weak"
 msgstr "Authorisation mechanism too weak"
 
-#: ../libpurple/protocols/jabber/jabber.c:1530
+#: ../libpurple/protocols/jabber/jabber.c:1545
 msgid "Temporary Authentication Failure"
 msgstr "Temporary Authentication Failure"
 
-#: ../libpurple/protocols/jabber/jabber.c:1533
+#: ../libpurple/protocols/jabber/jabber.c:1548
 msgid "Authentication Failure"
 msgstr "Authentication Failure"
 
-#: ../libpurple/protocols/jabber/jabber.c:1539
+#: ../libpurple/protocols/jabber/jabber.c:1554
 msgid "Bad Format"
 msgstr "Bad Format"
 
-#: ../libpurple/protocols/jabber/jabber.c:1541
+#: ../libpurple/protocols/jabber/jabber.c:1556
 msgid "Bad Namespace Prefix"
 msgstr "Bad Namespace Prefix"
 
-#: ../libpurple/protocols/jabber/jabber.c:1544
+#: ../libpurple/protocols/jabber/jabber.c:1559
 msgid "Resource Conflict"
 msgstr "Resource Conflict"
 
-#: ../libpurple/protocols/jabber/jabber.c:1546
+#: ../libpurple/protocols/jabber/jabber.c:1561
 #: ../libpurple/protocols/silc/ops.c:1729
 msgid "Connection Timeout"
 msgstr "Connection Timeout"
 
-#: ../libpurple/protocols/jabber/jabber.c:1548
+#: ../libpurple/protocols/jabber/jabber.c:1563
 msgid "Host Gone"
 msgstr "Host Gone"
 
-#: ../libpurple/protocols/jabber/jabber.c:1550
+#: ../libpurple/protocols/jabber/jabber.c:1565
 msgid "Host Unknown"
 msgstr "Host Unknown"
 
-#: ../libpurple/protocols/jabber/jabber.c:1552
+#: ../libpurple/protocols/jabber/jabber.c:1567
 msgid "Improper Addressing"
 msgstr "Improper Addressing"
 
-#: ../libpurple/protocols/jabber/jabber.c:1556
+#: ../libpurple/protocols/jabber/jabber.c:1571
 msgid "Invalid ID"
 msgstr "Invalid ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:1558
+#: ../libpurple/protocols/jabber/jabber.c:1573
 msgid "Invalid Namespace"
 msgstr "Invalid Namespace"
 
-#: ../libpurple/protocols/jabber/jabber.c:1560
+#: ../libpurple/protocols/jabber/jabber.c:1575
 msgid "Invalid XML"
 msgstr "Invalid XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1562
+#: ../libpurple/protocols/jabber/jabber.c:1577
 msgid "Non-matching Hosts"
 msgstr "Non-matching Hosts"
 
-#: ../libpurple/protocols/jabber/jabber.c:1566
+#: ../libpurple/protocols/jabber/jabber.c:1581
 msgid "Policy Violation"
 msgstr "Policy Violation"
 
-#: ../libpurple/protocols/jabber/jabber.c:1568
+#: ../libpurple/protocols/jabber/jabber.c:1583
 msgid "Remote Connection Failed"
 msgstr "Remote Connection Failed"
 
-#: ../libpurple/protocols/jabber/jabber.c:1570
+#: ../libpurple/protocols/jabber/jabber.c:1585
 msgid "Resource Constraint"
 msgstr "Resource Constraint"
 
-#: ../libpurple/protocols/jabber/jabber.c:1572
+#: ../libpurple/protocols/jabber/jabber.c:1587
 msgid "Restricted XML"
 msgstr "Restricted XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1574
+#: ../libpurple/protocols/jabber/jabber.c:1589
 msgid "See Other Host"
 msgstr "See Other Host"
 
-#: ../libpurple/protocols/jabber/jabber.c:1576
+#: ../libpurple/protocols/jabber/jabber.c:1591
 msgid "System Shutdown"
 msgstr "System Shutdown"
 
-#: ../libpurple/protocols/jabber/jabber.c:1578
+#: ../libpurple/protocols/jabber/jabber.c:1593
 msgid "Undefined Condition"
 msgstr "Undefined Condition"
 
-#: ../libpurple/protocols/jabber/jabber.c:1580
+#: ../libpurple/protocols/jabber/jabber.c:1595
 msgid "Unsupported Encoding"
 msgstr "Unsupported Encoding"
 
-#: ../libpurple/protocols/jabber/jabber.c:1582
+#: ../libpurple/protocols/jabber/jabber.c:1597
 msgid "Unsupported Stanza Type"
 msgstr "Unsupported Stanza Type"
 
-#: ../libpurple/protocols/jabber/jabber.c:1584
+#: ../libpurple/protocols/jabber/jabber.c:1599
 msgid "Unsupported Version"
 msgstr "Unsupported Version"
 
-#: ../libpurple/protocols/jabber/jabber.c:1586
+#: ../libpurple/protocols/jabber/jabber.c:1601
 msgid "XML Not Well Formed"
 msgstr "XML Not Well Formed"
 
-#: ../libpurple/protocols/jabber/jabber.c:1588
+#: ../libpurple/protocols/jabber/jabber.c:1603
 msgid "Stream Error"
 msgstr "Stream Error"
 
-#: ../libpurple/protocols/jabber/jabber.c:1655
+#: ../libpurple/protocols/jabber/jabber.c:1670
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Unable to ban user %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1675
+#: ../libpurple/protocols/jabber/jabber.c:1690
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "Unknown affiliation: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1680
+#: ../libpurple/protocols/jabber/jabber.c:1695
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "Unable to affiliate user %s as \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1699
+#: ../libpurple/protocols/jabber/jabber.c:1714
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "Unknown role: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:1706
+#: ../libpurple/protocols/jabber/jabber.c:1721
 #, 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:1759
+#: ../libpurple/protocols/jabber/jabber.c:1774
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Unable to kick user %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1790
+#: ../libpurple/protocols/jabber/jabber.c:1805
 msgid "config:  Configure a chat room."
 msgstr "config:  Configure a chat room."
 
-#: ../libpurple/protocols/jabber/jabber.c:1794
+#: ../libpurple/protocols/jabber/jabber.c:1809
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Configure a chat room."
 
-#: ../libpurple/protocols/jabber/jabber.c:1803
+#: ../libpurple/protocols/jabber/jabber.c:1818
 msgid "part [room]:  Leave the room."
 msgstr "part [room]:  Leave the room."
 
-#: ../libpurple/protocols/jabber/jabber.c:1808
+#: ../libpurple/protocols/jabber/jabber.c:1823
 msgid "register:  Register with a chat room."
 msgstr "register:  Register with a chat room."
 
-#: ../libpurple/protocols/jabber/jabber.c:1814
+#: ../libpurple/protocols/jabber/jabber.c:1829
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [new topic]:  View or change the topic."
 
-#: ../libpurple/protocols/jabber/jabber.c:1820
+#: ../libpurple/protocols/jabber/jabber.c:1835
 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:1826
+#: ../libpurple/protocols/jabber/jabber.c:1841
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -4916,7 +4897,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:1832
+#: ../libpurple/protocols/jabber/jabber.c:1847
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -4924,19 +4905,19 @@
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
 
-#: ../libpurple/protocols/jabber/jabber.c:1838
+#: ../libpurple/protocols/jabber/jabber.c:1853
 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:1844
+#: ../libpurple/protocols/jabber/jabber.c:1859
 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:1850
+#: ../libpurple/protocols/jabber/jabber.c:1865
 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:1855
+#: ../libpurple/protocols/jabber/jabber.c:1870
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
@@ -4952,55 +4933,65 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/jabber/jabber.c:1972
-#: ../libpurple/protocols/jabber/jabber.c:1974
+#: ../libpurple/protocols/jabber/libxmpp.c:166
+#: ../libpurple/protocols/jabber/libxmpp.c:168
 msgid "XMPP Protocol Plugin"
 msgstr "XMPP Protocol Plug-in"
 
-#: ../libpurple/protocols/jabber/jabber.c:2000
+#. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
+#: ../libpurple/protocols/jabber/libxmpp.c:195 ../pidgin/gtkaccount.c:501
+msgid "Domain"
+msgstr "Domain"
+
+#: ../libpurple/protocols/jabber/libxmpp.c:201
 msgid "Force old (port 5223) SSL"
 msgstr "Force old (port 5223) SSL"
 
-#: ../libpurple/protocols/jabber/jabber.c:2005
+#: ../libpurple/protocols/jabber/libxmpp.c:206
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Allow plaintext auth over unencrypted streams"
 
-#: ../libpurple/protocols/jabber/jabber.c:2010
-#: ../libpurple/protocols/simple/simple.c:1842
+#: ../libpurple/protocols/jabber/libxmpp.c:211
+#: ../libpurple/protocols/simple/simple.c:1856
 msgid "Connect port"
 msgstr "Connect port"
 
 #. Account options
-#: ../libpurple/protocols/jabber/jabber.c:2014
-#: ../libpurple/protocols/silc/silc.c:1846
+#: ../libpurple/protocols/jabber/libxmpp.c:215
+#: ../libpurple/protocols/silc/silc.c:1866 ../pidgin/gtkaccount.c:830
 msgid "Connect server"
 msgstr "Connect server"
 
-#: ../libpurple/protocols/jabber/message.c:155
+#: ../libpurple/protocols/jabber/message.c:102
+#, c-format
+msgid "%s has left the conversation."
+msgstr "%s has left the conversation."
+
+#: ../libpurple/protocols/jabber/message.c:153
 #, c-format
 msgid "Message from %s"
 msgstr "Message from %s"
 
-#: ../libpurple/protocols/jabber/message.c:219
+#: ../libpurple/protocols/jabber/message.c:217
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s has set the topic to: %s"
 
-#: ../libpurple/protocols/jabber/message.c:221
+#: ../libpurple/protocols/jabber/message.c:219
 #, c-format
 msgid "The topic is: %s"
 msgstr "The topic is: %s"
 
-#: ../libpurple/protocols/jabber/message.c:269
+#: ../libpurple/protocols/jabber/message.c:267
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "Message delivery to %s failed: %s"
 
-#: ../libpurple/protocols/jabber/message.c:272
+#: ../libpurple/protocols/jabber/message.c:270
 msgid "XMPP Message Error"
 msgstr "XMPP Message Error"
 
-#: ../libpurple/protocols/jabber/message.c:352
+#: ../libpurple/protocols/jabber/message.c:359
 #, c-format
 msgid " (Code %s)"
 msgstr " (Code %s)"
@@ -5009,16 +5000,16 @@
 msgid "XML Parse error"
 msgstr "XML Parse error"
 
-#: ../libpurple/protocols/jabber/presence.c:282
+#: ../libpurple/protocols/jabber/presence.c:278
 msgid "Unknown Error in presence"
 msgstr "Unknown Error in presence"
 
-#: ../libpurple/protocols/jabber/presence.c:356
-#: ../libpurple/protocols/jabber/presence.c:357
+#: ../libpurple/protocols/jabber/presence.c:352
+#: ../libpurple/protocols/jabber/presence.c:353
 msgid "Create New Room"
 msgstr "Create New Room"
 
-#: ../libpurple/protocols/jabber/presence.c:358
+#: ../libpurple/protocols/jabber/presence.c:354
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -5026,20 +5017,20 @@
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
 
-#: ../libpurple/protocols/jabber/presence.c:361
+#: ../libpurple/protocols/jabber/presence.c:360
 msgid "_Configure Room"
 msgstr "_Configure Room"
 
-#: ../libpurple/protocols/jabber/presence.c:363
+#: ../libpurple/protocols/jabber/presence.c:361
 msgid "_Accept Defaults"
 msgstr "_Accept Defaults"
 
-#: ../libpurple/protocols/jabber/presence.c:401
+#: ../libpurple/protocols/jabber/presence.c:398
 #, c-format
 msgid "Error in chat %s"
 msgstr "Error in chat %s"
 
-#: ../libpurple/protocols/jabber/presence.c:404
+#: ../libpurple/protocols/jabber/presence.c:401
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Error joining chat %s"
@@ -5270,7 +5261,7 @@
 msgstr "Server too busy"
 
 #: ../libpurple/protocols/msn/error.c:222
-#: ../libpurple/protocols/oscar/oscar.c:1357
+#: ../libpurple/protocols/oscar/oscar.c:1363
 #: ../libpurple/protocols/silc/ops.c:1718 ../libpurple/protocols/toc/toc.c:728
 #: ../libpurple/proxy.c:1351
 msgid "Authentication failed"
@@ -5306,39 +5297,39 @@
 msgid "MSN Error: %s\n"
 msgstr "MSN Error: %s\n"
 
-#: ../libpurple/protocols/msn/msn.c:112
+#: ../libpurple/protocols/msn/msn.c:121
 msgid "You have just sent a Nudge!"
 msgstr "You have just sent a Nudge!"
 
-#: ../libpurple/protocols/msn/msn.c:137
+#: ../libpurple/protocols/msn/msn.c:146
 msgid "Your new MSN friendly name is too long."
 msgstr "Your new MSN friendly name is too long."
 
-#: ../libpurple/protocols/msn/msn.c:245
+#: ../libpurple/protocols/msn/msn.c:254
 msgid "Set your friendly name."
 msgstr "Set your friendly name."
 
-#: ../libpurple/protocols/msn/msn.c:246
+#: ../libpurple/protocols/msn/msn.c:255
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "This is the name that other MSN buddies will see you as."
 
-#: ../libpurple/protocols/msn/msn.c:262
+#: ../libpurple/protocols/msn/msn.c:273
 msgid "Set your home phone number."
 msgstr "Set your home telephone number."
 
-#: ../libpurple/protocols/msn/msn.c:277
+#: ../libpurple/protocols/msn/msn.c:290
 msgid "Set your work phone number."
 msgstr "Set your work telephone number."
 
-#: ../libpurple/protocols/msn/msn.c:292
+#: ../libpurple/protocols/msn/msn.c:307
 msgid "Set your mobile phone number."
 msgstr "Set your mobile phone number."
 
-#: ../libpurple/protocols/msn/msn.c:305
+#: ../libpurple/protocols/msn/msn.c:322
 msgid "Allow MSN Mobile pages?"
 msgstr "Allow MSN Mobile pages?"
 
-#: ../libpurple/protocols/msn/msn.c:306
+#: ../libpurple/protocols/msn/msn.c:323
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
@@ -5346,315 +5337,315 @@
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your mobile phone or other mobile device?"
 
-#: ../libpurple/protocols/msn/msn.c:310
+#: ../libpurple/protocols/msn/msn.c:329
 msgid "Allow"
 msgstr "Allow"
 
-#: ../libpurple/protocols/msn/msn.c:311
+#: ../libpurple/protocols/msn/msn.c:330
 msgid "Disallow"
 msgstr "Disallow"
 
-#: ../libpurple/protocols/msn/msn.c:327
+#: ../libpurple/protocols/msn/msn.c:346
 msgid "This Hotmail account may not be active."
 msgstr "This Hotmail account may not be active."
 
-#: ../libpurple/protocols/msn/msn.c:353
+#: ../libpurple/protocols/msn/msn.c:372
 msgid "Send a mobile message."
 msgstr "Send a mobile message."
 
-#: ../libpurple/protocols/msn/msn.c:355
+#: ../libpurple/protocols/msn/msn.c:374
 msgid "Page"
 msgstr "Page"
 
-#: ../libpurple/protocols/msn/msn.c:518
+#: ../libpurple/protocols/msn/msn.c:521
 msgid "Has you"
 msgstr "Has you"
 
-#: ../libpurple/protocols/msn/msn.c:548 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:2876
-#: ../libpurple/protocols/yahoo/yahoo.c:3480
+#: ../libpurple/protocols/msn/msn.c:551 ../libpurple/protocols/msn/state.c:33
+#: ../libpurple/protocols/yahoo/yahoo.c:2880
+#: ../libpurple/protocols/yahoo/yahoo.c:3489
 msgid "Be Right Back"
 msgstr "Be Right Back"
 
-#: ../libpurple/protocols/msn/msn.c:552 ../libpurple/protocols/msn/state.c:31
-#: ../libpurple/protocols/novell/novell.c:2820
-#: ../libpurple/protocols/novell/novell.c:2950
-#: ../libpurple/protocols/silc/buddy.c:1473
+#: ../libpurple/protocols/msn/msn.c:555 ../libpurple/protocols/msn/state.c:31
+#: ../libpurple/protocols/novell/novell.c:2822
+#: ../libpurple/protocols/novell/novell.c:2952
+#: ../libpurple/protocols/silc/buddy.c:1480
 #: ../libpurple/protocols/silc/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:2878
-#: ../libpurple/protocols/yahoo/yahoo.c:3483
+#: ../libpurple/protocols/yahoo/yahoo.c:2882
+#: ../libpurple/protocols/yahoo/yahoo.c:3492
 msgid "Busy"
 msgstr "Busy"
 
-#: ../libpurple/protocols/msn/msn.c:556
-#: ../libpurple/protocols/yahoo/yahoo.c:2886
-#: ../libpurple/protocols/yahoo/yahoo.c:3495
+#: ../libpurple/protocols/msn/msn.c:559
+#: ../libpurple/protocols/yahoo/yahoo.c:2890
+#: ../libpurple/protocols/yahoo/yahoo.c:3504
 msgid "On the Phone"
 msgstr "On the Phone"
 
-#: ../libpurple/protocols/msn/msn.c:560
-#: ../libpurple/protocols/yahoo/yahoo.c:2890
-#: ../libpurple/protocols/yahoo/yahoo.c:3501
+#: ../libpurple/protocols/msn/msn.c:563
+#: ../libpurple/protocols/yahoo/yahoo.c:2894
+#: ../libpurple/protocols/yahoo/yahoo.c:3510
 msgid "Out to Lunch"
 msgstr "Out to Lunch"
 
-#: ../libpurple/protocols/msn/msn.c:588
+#: ../libpurple/protocols/msn/msn.c:591
 msgid "Set Friendly Name..."
 msgstr "Set Friendly Name..."
 
-#: ../libpurple/protocols/msn/msn.c:593
+#: ../libpurple/protocols/msn/msn.c:596
 msgid "Set Home Phone Number..."
 msgstr "Set Home Telephone Number..."
 
-#: ../libpurple/protocols/msn/msn.c:597
+#: ../libpurple/protocols/msn/msn.c:600
 msgid "Set Work Phone Number..."
 msgstr "Set Work Telephone Number..."
 
-#: ../libpurple/protocols/msn/msn.c:601
+#: ../libpurple/protocols/msn/msn.c:604
 msgid "Set Mobile Phone Number..."
 msgstr "Set Mobile Phone Number..."
 
-#: ../libpurple/protocols/msn/msn.c:607
+#: ../libpurple/protocols/msn/msn.c:610
 msgid "Enable/Disable Mobile Devices..."
 msgstr "Enable/Disable Mobile Devices..."
 
-#: ../libpurple/protocols/msn/msn.c:612
+#: ../libpurple/protocols/msn/msn.c:615
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "Allow/Disallow Mobile Pages..."
 
-#: ../libpurple/protocols/msn/msn.c:622
+#: ../libpurple/protocols/msn/msn.c:626
 msgid "Open Hotmail Inbox"
 msgstr "Open Hotmail Inbox"
 
-#: ../libpurple/protocols/msn/msn.c:646
+#: ../libpurple/protocols/msn/msn.c:650
 msgid "Send to Mobile"
 msgstr "Send to Mobile"
 
-#: ../libpurple/protocols/msn/msn.c:656
-#: ../libpurple/protocols/novell/novell.c:3406
+#: ../libpurple/protocols/msn/msn.c:660
+#: ../libpurple/protocols/novell/novell.c:3408
 msgid "Initiate _Chat"
 msgstr "Initiate _Chat"
 
-#: ../libpurple/protocols/msn/msn.c:694
+#: ../libpurple/protocols/msn/msn.c:698
 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:719
+#: ../libpurple/protocols/msn/msn.c:723
 msgid "Failed to connect to server."
 msgstr "Failed to connect to server."
 
-#: ../libpurple/protocols/msn/msn.c:1439 ../libpurple/protocols/msn/msn.c:1784
+#: ../libpurple/protocols/msn/msn.c:1463 ../libpurple/protocols/msn/msn.c:1808
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:784
 msgid "Error retrieving profile"
 msgstr "Error retreiving profile"
 
-#: ../libpurple/protocols/msn/msn.c:1510 ../pidgin/plugins/convcolors.c:309
+#: ../libpurple/protocols/msn/msn.c:1534 ../pidgin/plugins/convcolors.c:309
 #: ../pidgin/plugins/pidginrc.c:448
 msgid "General"
 msgstr "General"
 
-#: ../libpurple/protocols/msn/msn.c:1517
-#: ../libpurple/protocols/oscar/oscar.c:3759
+#: ../libpurple/protocols/msn/msn.c:1541
+#: ../libpurple/protocols/oscar/oscar.c:3745
 #: ../libpurple/protocols/qq/buddy_info.c:45
 #: ../libpurple/protocols/qq/qq.c:219
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1057
 msgid "Age"
 msgstr "Age"
 
-#: ../libpurple/protocols/msn/msn.c:1519
+#: ../libpurple/protocols/msn/msn.c:1543
 #: ../libpurple/protocols/qq/buddy_info.c:51
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1072
 msgid "Occupation"
 msgstr "Occupation"
 
-#: ../libpurple/protocols/msn/msn.c:1520
+#: ../libpurple/protocols/msn/msn.c:1544
 #: ../libpurple/protocols/novell/novell.c:1478
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1052
 #: ../libpurple/protocols/zephyr/zephyr.c:798
-#: ../libpurple/protocols/zephyr/zephyr.c:1214
+#: ../libpurple/protocols/zephyr/zephyr.c:1215
 msgid "Location"
 msgstr "Location"
 
-#: ../libpurple/protocols/msn/msn.c:1525 ../libpurple/protocols/msn/msn.c:1717
-#: ../libpurple/protocols/msn/msn.c:1723 ../libpurple/protocols/msn/msn.c:1730
+#: ../libpurple/protocols/msn/msn.c:1549 ../libpurple/protocols/msn/msn.c:1741
+#: ../libpurple/protocols/msn/msn.c:1747 ../libpurple/protocols/msn/msn.c:1754
 msgid "Hobbies and Interests"
 msgstr "Hobbies and Interests"
 
-#: ../libpurple/protocols/msn/msn.c:1531 ../libpurple/protocols/msn/msn.c:1651
-#: ../libpurple/protocols/msn/msn.c:1657 ../libpurple/protocols/msn/msn.c:1664
-#: ../libpurple/protocols/msn/msn.c:1672 ../libpurple/protocols/msn/msn.c:1679
+#: ../libpurple/protocols/msn/msn.c:1555 ../libpurple/protocols/msn/msn.c:1675
+#: ../libpurple/protocols/msn/msn.c:1681 ../libpurple/protocols/msn/msn.c:1688
+#: ../libpurple/protocols/msn/msn.c:1696 ../libpurple/protocols/msn/msn.c:1703
 msgid "A Little About Me"
 msgstr "A Little About Me"
 
-#: ../libpurple/protocols/msn/msn.c:1548
+#: ../libpurple/protocols/msn/msn.c:1572
 msgid "Social"
 msgstr "Social"
 
-#: ../libpurple/protocols/msn/msn.c:1550
+#: ../libpurple/protocols/msn/msn.c:1574
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1062
 msgid "Marital Status"
 msgstr "Marital Status"
 
-#: ../libpurple/protocols/msn/msn.c:1551
+#: ../libpurple/protocols/msn/msn.c:1575
 msgid "Interests"
 msgstr "Interests"
 
-#: ../libpurple/protocols/msn/msn.c:1552
+#: ../libpurple/protocols/msn/msn.c:1576
 msgid "Pets"
 msgstr "Pets"
 
-#: ../libpurple/protocols/msn/msn.c:1553
+#: ../libpurple/protocols/msn/msn.c:1577
 msgid "Hometown"
 msgstr "Home town"
 
-#: ../libpurple/protocols/msn/msn.c:1554
+#: ../libpurple/protocols/msn/msn.c:1578
 msgid "Places Lived"
 msgstr "Places Lived"
 
-#: ../libpurple/protocols/msn/msn.c:1555
+#: ../libpurple/protocols/msn/msn.c:1579
 msgid "Fashion"
 msgstr "Fashion"
 
-#: ../libpurple/protocols/msn/msn.c:1556
+#: ../libpurple/protocols/msn/msn.c:1580
 msgid "Humor"
 msgstr "Humour"
 
-#: ../libpurple/protocols/msn/msn.c:1557
+#: ../libpurple/protocols/msn/msn.c:1581
 msgid "Music"
 msgstr "Music"
 
-#: ../libpurple/protocols/msn/msn.c:1558 ../libpurple/protocols/msn/msn.c:1739
-#: ../libpurple/protocols/msn/msn.c:1745
+#: ../libpurple/protocols/msn/msn.c:1582 ../libpurple/protocols/msn/msn.c:1763
+#: ../libpurple/protocols/msn/msn.c:1769
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1114
 msgid "Favorite Quote"
 msgstr "Favourite Quote"
 
-#: ../libpurple/protocols/msn/msn.c:1575
+#: ../libpurple/protocols/msn/msn.c:1599
 msgid "Contact Info"
 msgstr "Contact Info"
 
-#: ../libpurple/protocols/msn/msn.c:1576
+#: ../libpurple/protocols/msn/msn.c:1600
 msgid "Personal"
 msgstr "Personal"
 
-#: ../libpurple/protocols/msn/msn.c:1579
+#: ../libpurple/protocols/msn/msn.c:1603
 msgid "Significant Other"
 msgstr "Partner"
 
-#: ../libpurple/protocols/msn/msn.c:1580
+#: ../libpurple/protocols/msn/msn.c:1604
 msgid "Home Phone"
 msgstr "Home Telephone"
 
-#: ../libpurple/protocols/msn/msn.c:1581
+#: ../libpurple/protocols/msn/msn.c:1605
 msgid "Home Phone 2"
 msgstr "Home Telephone 2"
 
-#: ../libpurple/protocols/msn/msn.c:1582
-#: ../libpurple/protocols/oscar/oscar.c:3797
+#: ../libpurple/protocols/msn/msn.c:1606
+#: ../libpurple/protocols/oscar/oscar.c:3783
 msgid "Home Address"
 msgstr "Home Address"
 
-#: ../libpurple/protocols/msn/msn.c:1583
+#: ../libpurple/protocols/msn/msn.c:1607
 msgid "Personal Mobile"
 msgstr "Personal Mobile"
 
-#: ../libpurple/protocols/msn/msn.c:1584
+#: ../libpurple/protocols/msn/msn.c:1608
 msgid "Home Fax"
 msgstr "Home Fax"
 
-#: ../libpurple/protocols/msn/msn.c:1585
+#: ../libpurple/protocols/msn/msn.c:1609
 msgid "Personal E-Mail"
 msgstr "Personal E-mail"
 
-#: ../libpurple/protocols/msn/msn.c:1586
+#: ../libpurple/protocols/msn/msn.c:1610
 msgid "Personal IM"
 msgstr "Personal IM"
 
-#: ../libpurple/protocols/msn/msn.c:1588
+#: ../libpurple/protocols/msn/msn.c:1612
 msgid "Anniversary"
 msgstr "Anniversary"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1604
+#: ../libpurple/protocols/msn/msn.c:1628
 msgid "Work"
 msgstr "Work"
 
-#: ../libpurple/protocols/msn/msn.c:1606
+#: ../libpurple/protocols/msn/msn.c:1630
 #: ../libpurple/protocols/silc/ops.c:1044
 msgid "Job Title"
 msgstr "Job Title"
 
-#: ../libpurple/protocols/msn/msn.c:1607
-#: ../libpurple/protocols/oscar/oscar.c:3818
+#: ../libpurple/protocols/msn/msn.c:1631
+#: ../libpurple/protocols/oscar/oscar.c:3804
 msgid "Company"
 msgstr "Company"
 
-#: ../libpurple/protocols/msn/msn.c:1608
+#: ../libpurple/protocols/msn/msn.c:1632
 #: ../libpurple/protocols/novell/novell.c:1480
 msgid "Department"
 msgstr "Department"
 
-#: ../libpurple/protocols/msn/msn.c:1609
+#: ../libpurple/protocols/msn/msn.c:1633
 msgid "Profession"
 msgstr "Profession"
 
-#: ../libpurple/protocols/msn/msn.c:1610
+#: ../libpurple/protocols/msn/msn.c:1634
 msgid "Work Phone"
 msgstr "Work Telephone"
 
-#: ../libpurple/protocols/msn/msn.c:1611
+#: ../libpurple/protocols/msn/msn.c:1635
 msgid "Work Phone 2"
 msgstr "Work Telephone 2"
 
-#: ../libpurple/protocols/msn/msn.c:1612
-#: ../libpurple/protocols/oscar/oscar.c:3810
+#: ../libpurple/protocols/msn/msn.c:1636
+#: ../libpurple/protocols/oscar/oscar.c:3796
 msgid "Work Address"
 msgstr "Work Address"
 
-#: ../libpurple/protocols/msn/msn.c:1613
+#: ../libpurple/protocols/msn/msn.c:1637
 msgid "Work Mobile"
 msgstr "Work Mobile"
 
-#: ../libpurple/protocols/msn/msn.c:1614
+#: ../libpurple/protocols/msn/msn.c:1638
 msgid "Work Pager"
 msgstr "Work Pager"
 
-#: ../libpurple/protocols/msn/msn.c:1615
+#: ../libpurple/protocols/msn/msn.c:1639
 msgid "Work Fax"
 msgstr "Work Fax"
 
-#: ../libpurple/protocols/msn/msn.c:1616
+#: ../libpurple/protocols/msn/msn.c:1640
 msgid "Work E-Mail"
 msgstr "Work E-mail"
 
-#: ../libpurple/protocols/msn/msn.c:1617
+#: ../libpurple/protocols/msn/msn.c:1641
 msgid "Work IM"
 msgstr "Work IM"
 
-#: ../libpurple/protocols/msn/msn.c:1618
+#: ../libpurple/protocols/msn/msn.c:1642
 msgid "Start Date"
 msgstr "Start Date"
 
-#: ../libpurple/protocols/msn/msn.c:1688 ../libpurple/protocols/msn/msn.c:1694
-#: ../libpurple/protocols/msn/msn.c:1701 ../libpurple/protocols/msn/msn.c:1708
+#: ../libpurple/protocols/msn/msn.c:1712 ../libpurple/protocols/msn/msn.c:1718
+#: ../libpurple/protocols/msn/msn.c:1725 ../libpurple/protocols/msn/msn.c:1732
 msgid "Favorite Things"
 msgstr "Favourite Things"
 
-#: ../libpurple/protocols/msn/msn.c:1753
+#: ../libpurple/protocols/msn/msn.c:1777
 msgid "Last Updated"
 msgstr "Last Updated"
 
-#: ../libpurple/protocols/msn/msn.c:1764
+#: ../libpurple/protocols/msn/msn.c:1788
 #: ../libpurple/protocols/qq/buddy_info.c:60
 #: ../libpurple/protocols/silc/ops.c:1060
 msgid "Homepage"
 msgstr "Homepage"
 
-#: ../libpurple/protocols/msn/msn.c:1785
+#: ../libpurple/protocols/msn/msn.c:1809
 msgid "The user has not created a public profile."
 msgstr "The user has not created a public profile."
 
-#: ../libpurple/protocols/msn/msn.c:1786
+#: ../libpurple/protocols/msn/msn.c:1810
 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 "
@@ -5664,7 +5655,7 @@
 "that the user does not exist, or that the user exists but has not created a "
 "public profile."
 
-#: ../libpurple/protocols/msn/msn.c:1790
+#: ../libpurple/protocols/msn/msn.c:1814
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
@@ -5672,7 +5663,7 @@
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
 
-#: ../libpurple/protocols/msn/msn.c:1798
+#: ../libpurple/protocols/msn/msn.c:1822
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1216
 msgid "Profile URL"
 msgstr "Profile URL"
@@ -5687,19 +5678,19 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2078 ../libpurple/protocols/msn/msn.c:2080
+#: ../libpurple/protocols/msn/msn.c:2108 ../libpurple/protocols/msn/msn.c:2110
 msgid "MSN Protocol Plugin"
 msgstr "MSN Protocol Plug-in"
 
-#: ../libpurple/protocols/msn/msn.c:2108
+#: ../libpurple/protocols/msn/msn.c:2144
 msgid "Use HTTP Method"
 msgstr "Use HTTP Method"
 
-#: ../libpurple/protocols/msn/msn.c:2113
+#: ../libpurple/protocols/msn/msn.c:2149
 msgid "Show custom smileys"
 msgstr "Show custom smileys"
 
-#: ../libpurple/protocols/msn/msn.c:2121
+#: ../libpurple/protocols/msn/msn.c:2157
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: nudge a user to get their attention"
 
@@ -5768,15 +5759,15 @@
 msgid "Service Temporarily Unavailable."
 msgstr "Service Temporarily Unavailable."
 
-#: ../libpurple/protocols/msn/notification.c:823
+#: ../libpurple/protocols/msn/notification.c:840
 msgid "Unable to rename group"
 msgstr "Unable to rename group"
 
-#: ../libpurple/protocols/msn/notification.c:878
+#: ../libpurple/protocols/msn/notification.c:895
 msgid "Unable to delete group"
 msgstr "Unable to delete group"
 
-#: ../libpurple/protocols/msn/notification.c:1314
+#: ../libpurple/protocols/msn/notification.c:1323
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5833,8 +5824,8 @@
 msgstr "Error parsing HTTP."
 
 #: ../libpurple/protocols/msn/session.c:307
-#: ../libpurple/protocols/oscar/oscar.c:3471
-#: ../libpurple/protocols/yahoo/yahoo.c:201
+#: ../libpurple/protocols/oscar/oscar.c:3457
+#: ../libpurple/protocols/yahoo/yahoo.c:202
 msgid "You have signed on from another location."
 msgstr "You have signed on from another location."
 
@@ -5945,87 +5936,87 @@
 msgid "The screen name specified is invalid."
 msgstr "The screen name specified is invalid."
 
-#: ../libpurple/protocols/novell/nmuser.c:1878
+#: ../libpurple/protocols/novell/nmuser.c:1864
 msgid "Required parameters not passed in"
 msgstr "Required parameters not passed in"
 
-#: ../libpurple/protocols/novell/nmuser.c:1881
+#: ../libpurple/protocols/novell/nmuser.c:1867
 msgid "Unable to write to network"
 msgstr "Unable to write to network"
 
-#: ../libpurple/protocols/novell/nmuser.c:1884
+#: ../libpurple/protocols/novell/nmuser.c:1870
 msgid "Unable to read from network"
 msgstr "Unable to read from network"
 
-#: ../libpurple/protocols/novell/nmuser.c:1887
+#: ../libpurple/protocols/novell/nmuser.c:1873
 msgid "Error communicating with server"
 msgstr "Error communicating with server"
 
-#: ../libpurple/protocols/novell/nmuser.c:1891
+#: ../libpurple/protocols/novell/nmuser.c:1877
 msgid "Conference not found"
 msgstr "Conference not found"
 
-#: ../libpurple/protocols/novell/nmuser.c:1894
+#: ../libpurple/protocols/novell/nmuser.c:1880
 msgid "Conference does not exist"
 msgstr "Conference does not exist"
 
-#: ../libpurple/protocols/novell/nmuser.c:1898
+#: ../libpurple/protocols/novell/nmuser.c:1884
 msgid "A folder with that name already exists"
 msgstr "A folder with that name already exists"
 
-#: ../libpurple/protocols/novell/nmuser.c:1901
+#: ../libpurple/protocols/novell/nmuser.c:1887
 msgid "Not supported"
 msgstr "Not supported"
 
-#: ../libpurple/protocols/novell/nmuser.c:1905
+#: ../libpurple/protocols/novell/nmuser.c:1891
 msgid "Password has expired"
 msgstr "Password has expired"
 
-#: ../libpurple/protocols/novell/nmuser.c:1908
+#: ../libpurple/protocols/novell/nmuser.c:1894
 msgid "Incorrect password"
 msgstr "Incorrect password"
 
-#: ../libpurple/protocols/novell/nmuser.c:1911
+#: ../libpurple/protocols/novell/nmuser.c:1897
 msgid "User not found"
 msgstr "User not found"
 
-#: ../libpurple/protocols/novell/nmuser.c:1914
+#: ../libpurple/protocols/novell/nmuser.c:1900
 msgid "Account has been disabled"
 msgstr "Account has been disabled"
 
-#: ../libpurple/protocols/novell/nmuser.c:1917
+#: ../libpurple/protocols/novell/nmuser.c:1903
 msgid "The server could not access the directory"
 msgstr "The server could not access the directory"
 
-#: ../libpurple/protocols/novell/nmuser.c:1920
+#: ../libpurple/protocols/novell/nmuser.c:1906
 msgid "Your system administrator has disabled this operation"
 msgstr "Your system administrator has disabled this operation"
 
-#: ../libpurple/protocols/novell/nmuser.c:1923
+#: ../libpurple/protocols/novell/nmuser.c:1909
 msgid "The server is unavailable; try again later"
 msgstr "The server is unavailable; try again later"
 
-#: ../libpurple/protocols/novell/nmuser.c:1926
+#: ../libpurple/protocols/novell/nmuser.c:1912
 msgid "Cannot add a contact to the same folder twice"
 msgstr "Cannot add a contact to the same folder twice"
 
-#: ../libpurple/protocols/novell/nmuser.c:1929
+#: ../libpurple/protocols/novell/nmuser.c:1915
 msgid "Cannot add yourself"
 msgstr "Cannot add yourself"
 
-#: ../libpurple/protocols/novell/nmuser.c:1932
+#: ../libpurple/protocols/novell/nmuser.c:1918
 msgid "Master archive is misconfigured"
 msgstr "Master archive is misconfigured"
 
-#: ../libpurple/protocols/novell/nmuser.c:1936
+#: ../libpurple/protocols/novell/nmuser.c:1922
 msgid "Incorrect screen name or password"
 msgstr "Incorrect screen name or password."
 
-#: ../libpurple/protocols/novell/nmuser.c:1939
+#: ../libpurple/protocols/novell/nmuser.c:1925
 msgid "Could not recognize the host of the screen name you entered"
 msgstr "Could not recognise the host of the screen name you entered"
 
-#: ../libpurple/protocols/novell/nmuser.c:1942
+#: ../libpurple/protocols/novell/nmuser.c:1928
 msgid ""
 "Your account has been disabled because too many incorrect passwords were "
 "entered"
@@ -6033,31 +6024,31 @@
 "Your account has been disabled because too many incorrect passwords were "
 "entered"
 
-#: ../libpurple/protocols/novell/nmuser.c:1945
+#: ../libpurple/protocols/novell/nmuser.c:1931
 msgid "You cannot add the same person twice to a conversation"
 msgstr "You cannot add the same person twice to a conversation"
 
-#: ../libpurple/protocols/novell/nmuser.c:1949
+#: ../libpurple/protocols/novell/nmuser.c:1935
 msgid "You have reached your limit for the number of contacts allowed"
 msgstr "You have reached your limit for the number of contacts allowed"
 
-#: ../libpurple/protocols/novell/nmuser.c:1952
+#: ../libpurple/protocols/novell/nmuser.c:1938
 msgid "You have entered an incorrect screen name"
 msgstr "You have entered an incorrect screen name"
 
-#: ../libpurple/protocols/novell/nmuser.c:1955
+#: ../libpurple/protocols/novell/nmuser.c:1941
 msgid "An error occurred while updating the directory"
 msgstr "An error occurred while updating the directory"
 
-#: ../libpurple/protocols/novell/nmuser.c:1958
+#: ../libpurple/protocols/novell/nmuser.c:1944
 msgid "Incompatible protocol version"
 msgstr "Incompatible protocol version"
 
-#: ../libpurple/protocols/novell/nmuser.c:1961
+#: ../libpurple/protocols/novell/nmuser.c:1947
 msgid "The user has blocked you"
 msgstr "The user has blocked you"
 
-#: ../libpurple/protocols/novell/nmuser.c:1964
+#: ../libpurple/protocols/novell/nmuser.c:1950
 msgid ""
 "This evaluation version does not allow more than ten users to log in at one "
 "time"
@@ -6065,11 +6056,11 @@
 "This evaluation version does not allow more than ten users to log in at one "
 "time"
 
-#: ../libpurple/protocols/novell/nmuser.c:1967
+#: ../libpurple/protocols/novell/nmuser.c:1953
 msgid "The user is either offline or you are blocked"
 msgstr "The user is either offline or you are blocked"
 
-#: ../libpurple/protocols/novell/nmuser.c:1970
+#: ../libpurple/protocols/novell/nmuser.c:1956
 #, c-format
 msgid "Unknown error: 0x%X"
 msgstr "Unknown error: 0x%X"
@@ -6184,7 +6175,7 @@
 msgstr "Mailstop"
 
 #: ../libpurple/protocols/novell/novell.c:1502
-#: ../libpurple/protocols/sametime/sametime.c:4121
+#: ../libpurple/protocols/sametime/sametime.c:4122
 msgid "User ID"
 msgstr "User ID"
 
@@ -6244,11 +6235,11 @@
 msgstr "Would you like to join the conversation?"
 
 #. we don't want to reconnect in this case
-#: ../libpurple/protocols/novell/novell.c:2010
+#: ../libpurple/protocols/novell/novell.c:2012
 msgid "You have been logged out because you logged in at another workstation."
 msgstr "You have been logged out because you logged in at another workstation."
 
-#: ../libpurple/protocols/novell/novell.c:2067
+#: ../libpurple/protocols/novell/novell.c:2069
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -6260,7 +6251,7 @@
 #. *  purple_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: ../libpurple/protocols/novell/novell.c:2165
+#: ../libpurple/protocols/novell/novell.c:2167
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
@@ -6268,11 +6259,11 @@
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
 
-#: ../libpurple/protocols/novell/novell.c:2193
+#: ../libpurple/protocols/novell/novell.c:2195
 msgid "Error. SSL support is not installed."
 msgstr "Error: SSL support is not installed."
 
-#: ../libpurple/protocols/novell/novell.c:2502
+#: ../libpurple/protocols/novell/novell.c:2504
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "This conference has been closed. No more messages can be sent."
 
@@ -6286,22 +6277,22 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/novell/novell.c:3511
-#: ../libpurple/protocols/novell/novell.c:3513
+#: ../libpurple/protocols/novell/novell.c:3518
+#: ../libpurple/protocols/novell/novell.c:3520
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GroupWise Messenger Protocol Plug-in"
 
-#: ../libpurple/protocols/novell/novell.c:3532
+#: ../libpurple/protocols/novell/novell.c:3545
 msgid "Server address"
 msgstr "Server address"
 
-#: ../libpurple/protocols/novell/novell.c:3536
+#: ../libpurple/protocols/novell/novell.c:3549
 msgid "Server port"
 msgstr "Server port"
 
 #: ../libpurple/protocols/oscar/flap_connection.c:379
-#: ../libpurple/protocols/yahoo/yahoo.c:2287
-#: ../libpurple/protocols/yahoo/yahoo.c:2446
+#: ../libpurple/protocols/yahoo/yahoo.c:2292
+#: ../libpurple/protocols/yahoo/yahoo.c:2451
 #: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:580
 #: ../libpurple/proxy.c:1085 ../libpurple/proxy.c:1196
 #: ../libpurple/proxy.c:1296 ../libpurple/proxy.c:1424
@@ -6309,8 +6300,8 @@
 msgstr "Server closed the connection."
 
 #: ../libpurple/protocols/oscar/flap_connection.c:381
-#: ../libpurple/protocols/yahoo/yahoo.c:2281
-#: ../libpurple/protocols/yahoo/yahoo.c:2440 ../libpurple/proxy.c:592
+#: ../libpurple/protocols/yahoo/yahoo.c:2286
+#: ../libpurple/protocols/yahoo/yahoo.c:2445 ../libpurple/proxy.c:592
 #: ../libpurple/proxy.c:1097 ../libpurple/proxy.c:1208
 #: ../libpurple/proxy.c:1308 ../libpurple/proxy.c:1436
 #, c-format
@@ -6347,8 +6338,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/oscar/libaim.c:112
-#: ../libpurple/protocols/oscar/libaim.c:114
+#: ../libpurple/protocols/oscar/libaim.c:118
+#: ../libpurple/protocols/oscar/libaim.c:120
 msgid "AIM Protocol Plugin"
 msgstr "AIM Protocol Plugin"
 
@@ -6362,14 +6353,14 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/oscar/libicq.c:112
-#: ../libpurple/protocols/oscar/libicq.c:114
+#: ../libpurple/protocols/oscar/libicq.c:118
+#: ../libpurple/protocols/oscar/libicq.c:120
 msgid "ICQ Protocol Plugin"
 msgstr "ICQ Protocol Plugin"
 
-#: ../libpurple/protocols/oscar/libicq.c:135
-#: ../libpurple/protocols/yahoo/yahoo.c:4069
-#: ../libpurple/protocols/zephyr/zephyr.c:2984
+#: ../libpurple/protocols/oscar/libicq.c:147
+#: ../libpurple/protocols/yahoo/yahoo.c:4096
+#: ../libpurple/protocols/zephyr/zephyr.c:2997
 msgid "Encoding"
 msgstr "Encoding"
 
@@ -6499,7 +6490,7 @@
 msgid "Not while on AOL"
 msgstr "Not while on AOL"
 
-#: ../libpurple/protocols/oscar/oscar.c:329
+#: ../libpurple/protocols/oscar/oscar.c:330
 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 "
@@ -6511,7 +6502,7 @@
 "encoding he is using, you can specify it in the advanced account options for "
 "your AIM/ICQ account.)"
 
-#: ../libpurple/protocols/oscar/oscar.c:438
+#: ../libpurple/protocols/oscar/oscar.c:439
 #, c-format
 msgid ""
 "(There was an error receiving this message.  Either you and %s have "
@@ -6521,144 +6512,144 @@
 "different encodings selected, or %s has a buggy client.)"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:620 ../pidgin/gtkutils.c:2335
-#: ../pidgin/gtkutils.c:2357
+#: ../libpurple/protocols/oscar/oscar.c:621 ../pidgin/gtkutils.c:2306
+#: ../pidgin/gtkutils.c:2336
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:338
 msgid "Buddy Icon"
 msgstr "Buddy Icon"
 
-#: ../libpurple/protocols/oscar/oscar.c:623
+#: ../libpurple/protocols/oscar/oscar.c:624
 msgid "Voice"
 msgstr "Voice"
 
-#: ../libpurple/protocols/oscar/oscar.c:626
+#: ../libpurple/protocols/oscar/oscar.c:627
 msgid "AIM Direct IM"
 msgstr "AIM Direct IM"
 
-#: ../libpurple/protocols/oscar/oscar.c:629
+#: ../libpurple/protocols/oscar/oscar.c:630
 #: ../libpurple/protocols/silc/silc.c:687
 #: ../libpurple/protocols/silc/util.c:549
 msgid "Chat"
 msgstr "Chat"
 
-#: ../libpurple/protocols/oscar/oscar.c:632
-#: ../libpurple/protocols/oscar/oscar.c:5957
+#: ../libpurple/protocols/oscar/oscar.c:633
+#: ../libpurple/protocols/oscar/oscar.c:5923
 msgid "Get File"
 msgstr "Get File"
 
-#: ../libpurple/protocols/oscar/oscar.c:639
+#: ../libpurple/protocols/oscar/oscar.c:640
 msgid "Games"
 msgstr "Games"
 
-#: ../libpurple/protocols/oscar/oscar.c:642
+#: ../libpurple/protocols/oscar/oscar.c:643
 msgid "Add-Ins"
 msgstr "Add-Ins"
 
-#: ../libpurple/protocols/oscar/oscar.c:645
+#: ../libpurple/protocols/oscar/oscar.c:646
 msgid "Send Buddy List"
 msgstr "Send Buddy List"
 
-#: ../libpurple/protocols/oscar/oscar.c:648
+#: ../libpurple/protocols/oscar/oscar.c:649
 msgid "ICQ Direct Connect"
 msgstr "ICQ Direct Connect"
 
-#: ../libpurple/protocols/oscar/oscar.c:651
+#: ../libpurple/protocols/oscar/oscar.c:652
 msgid "AP User"
 msgstr "AP User"
 
-#: ../libpurple/protocols/oscar/oscar.c:654
+#: ../libpurple/protocols/oscar/oscar.c:655
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: ../libpurple/protocols/oscar/oscar.c:657
+#: ../libpurple/protocols/oscar/oscar.c:658
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: ../libpurple/protocols/oscar/oscar.c:660
+#: ../libpurple/protocols/oscar/oscar.c:661
 msgid "ICQ Server Relay"
 msgstr "ICQ Server Relay"
 
-#: ../libpurple/protocols/oscar/oscar.c:663
+#: ../libpurple/protocols/oscar/oscar.c:664
 msgid "Old ICQ UTF8"
 msgstr "Old ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:666
+#: ../libpurple/protocols/oscar/oscar.c:667
 msgid "Trillian Encryption"
 msgstr "Trillian Encryption"
 
-#: ../libpurple/protocols/oscar/oscar.c:669
+#: ../libpurple/protocols/oscar/oscar.c:670
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:672
+#: ../libpurple/protocols/oscar/oscar.c:673
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: ../libpurple/protocols/oscar/oscar.c:675
+#: ../libpurple/protocols/oscar/oscar.c:676
 msgid "Security Enabled"
 msgstr "Security Enabled"
 
-#: ../libpurple/protocols/oscar/oscar.c:678
+#: ../libpurple/protocols/oscar/oscar.c:679
 msgid "Video Chat"
 msgstr "Video Chat"
 
-#: ../libpurple/protocols/oscar/oscar.c:682
+#: ../libpurple/protocols/oscar/oscar.c:683
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: ../libpurple/protocols/oscar/oscar.c:685
+#: ../libpurple/protocols/oscar/oscar.c:686
 msgid "Live Video"
 msgstr "Live Video"
 
-#: ../libpurple/protocols/oscar/oscar.c:688
+#: ../libpurple/protocols/oscar/oscar.c:689
 msgid "Camera"
 msgstr "Camera"
 
-#: ../libpurple/protocols/oscar/oscar.c:706
-#: ../libpurple/protocols/oscar/oscar.c:5730
+#: ../libpurple/protocols/oscar/oscar.c:707
+#: ../libpurple/protocols/oscar/oscar.c:5693
 msgid "Free For Chat"
 msgstr "Free For Chat"
 
-#: ../libpurple/protocols/oscar/oscar.c:710
-#: ../libpurple/protocols/oscar/oscar.c:5765
+#: ../libpurple/protocols/oscar/oscar.c:711
+#: ../libpurple/protocols/oscar/oscar.c:5728
 msgid "Not Available"
 msgstr "Not Available"
 
-#: ../libpurple/protocols/oscar/oscar.c:712
-#: ../libpurple/protocols/oscar/oscar.c:5751
+#: ../libpurple/protocols/oscar/oscar.c:713
+#: ../libpurple/protocols/oscar/oscar.c:5714
 msgid "Occupied"
 msgstr "Occupied"
 
-#: ../libpurple/protocols/oscar/oscar.c:716
+#: ../libpurple/protocols/oscar/oscar.c:717
 msgid "Web Aware"
 msgstr "Web Aware"
 
-#: ../libpurple/protocols/oscar/oscar.c:718 ../libpurple/protocols/qq/qq.c:183
-#: ../libpurple/protocols/yahoo/yahoo.c:2894 ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:454 ../pidgin/gtkstatusbox.c:1091
+#: ../libpurple/protocols/oscar/oscar.c:719 ../libpurple/protocols/qq/qq.c:183
+#: ../libpurple/protocols/yahoo/yahoo.c:2898 ../libpurple/status.c:156
+#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1053
 msgid "Invisible"
 msgstr "Invisible"
 
-#: ../libpurple/protocols/oscar/oscar.c:720
+#: ../libpurple/protocols/oscar/oscar.c:721
 msgid "Online"
 msgstr "Online"
 
-#: ../libpurple/protocols/oscar/oscar.c:819
-#: ../libpurple/protocols/oscar/oscar.c:3711
+#: ../libpurple/protocols/oscar/oscar.c:820
+#: ../libpurple/protocols/oscar/oscar.c:3697
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:697 ../pidgin/gtkprefs.c:1015
 msgid "IP Address"
 msgstr "IP Address"
 
-#: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:2856
+#: ../libpurple/protocols/oscar/oscar.c:827
+#: ../libpurple/protocols/oscar/oscar.c:2849
 msgid "Warning Level"
 msgstr "Warning Level"
 
-#: ../libpurple/protocols/oscar/oscar.c:836
+#: ../libpurple/protocols/oscar/oscar.c:837
 msgid "Buddy Comment"
 msgstr "Buddy Comment"
 
-#: ../libpurple/protocols/oscar/oscar.c:976
+#: ../libpurple/protocols/oscar/oscar.c:977
 #, c-format
 msgid ""
 "Could not connect to authentication server:\n"
@@ -6667,7 +6658,7 @@
 "Could not connect to authentication server:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:984
+#: ../libpurple/protocols/oscar/oscar.c:985
 #, c-format
 msgid ""
 "Could not connect to BOS server:\n"
@@ -6676,20 +6667,20 @@
 "Could not connect to BOS server:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1024
+#: ../libpurple/protocols/oscar/oscar.c:1025
 msgid "Screen name sent"
 msgstr "Screen name sent"
 
-#: ../libpurple/protocols/oscar/oscar.c:1029
+#: ../libpurple/protocols/oscar/oscar.c:1030
 msgid "Connection established, cookie sent"
 msgstr "Connection established, cookie sent"
 
 #. TODO: Don't call this with ssi
-#: ../libpurple/protocols/oscar/oscar.c:1058
+#: ../libpurple/protocols/oscar/oscar.c:1059
 msgid "Finalizing connection"
 msgstr "Finalising connection"
 
-#: ../libpurple/protocols/oscar/oscar.c:1242
+#: ../libpurple/protocols/oscar/oscar.c:1243
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -6700,28 +6691,29 @@
 "invalid.  Screen names must either start with a letter and contain only "
 "letters, numbers and spaces, or contain only numbers."
 
-#: ../libpurple/protocols/oscar/oscar.c:1327
-#: ../libpurple/protocols/yahoo/yahoo.c:1929
+#: ../libpurple/protocols/oscar/oscar.c:1328
+#: ../libpurple/protocols/yahoo/yahoo.c:1934
 msgid "Invalid screen name."
 msgstr "Invalid screen name."
 
-#: ../libpurple/protocols/oscar/oscar.c:1334
+#: ../libpurple/protocols/oscar/oscar.c:1335
 #: ../libpurple/protocols/qq/login_logout.c:483
-#: ../libpurple/protocols/simple/simple.c:1035
-#: ../libpurple/protocols/yahoo/yahoo.c:1947
+#: ../libpurple/protocols/simple/simple.c:1037
+#: ../libpurple/protocols/yahoo/yahoo.c:1952
 msgid "Incorrect password."
 msgstr "Incorrect password."
 
-#: ../libpurple/protocols/oscar/oscar.c:1339
+#: ../libpurple/protocols/oscar/oscar.c:1340
 msgid "Your account is currently suspended."
 msgstr "Your account is currently suspended."
 
 #. service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1343
+#: ../libpurple/protocols/oscar/oscar.c:1344
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "The AOL Instant Messenger service is temporarily unavailable."
 
-#: ../libpurple/protocols/oscar/oscar.c:1348
+#: ../libpurple/protocols/oscar/oscar.c:1349
+#: ../libpurple/protocols/oscar/oscar.c:1360
 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."
@@ -6729,44 +6721,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:1353
+#: ../libpurple/protocols/oscar/oscar.c:1354
 #, 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:1388
+#: ../libpurple/protocols/oscar/oscar.c:1394
 msgid "Could Not Connect"
 msgstr "Could Not Connect"
 
-#: ../libpurple/protocols/oscar/oscar.c:1393
+#: ../libpurple/protocols/oscar/oscar.c:1399
 msgid "Received authorization"
 msgstr "Received authorisation"
 
-#: ../libpurple/protocols/oscar/oscar.c:1416
+#: ../libpurple/protocols/oscar/oscar.c:1422
 msgid "The SecurID key entered is invalid."
 msgstr "The SecurID key entered is invalid."
 
-#: ../libpurple/protocols/oscar/oscar.c:1430
+#: ../libpurple/protocols/oscar/oscar.c:1436
 msgid "Enter SecurID"
 msgstr "Enter SecurID"
 
-#: ../libpurple/protocols/oscar/oscar.c:1431
+#: ../libpurple/protocols/oscar/oscar.c:1437
 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:1433
-#: ../libpurple/protocols/oscar/oscar.c:2244
-#: ../libpurple/protocols/oscar/oscar.c:2290
-#: ../libpurple/protocols/oscar/oscar.c:5835
-#: ../libpurple/protocols/oscar/oscar.c:6111 ../libpurple/request.h:1350
+#: ../libpurple/protocols/oscar/oscar.c:1439
+#: ../libpurple/protocols/oscar/oscar.c:2233
+#: ../libpurple/protocols/oscar/oscar.c:2280
+#: ../libpurple/protocols/oscar/oscar.c:5798
+#: ../libpurple/protocols/oscar/oscar.c:6079 ../libpurple/request.h:1387
 msgid "_OK"
 msgstr "_OK"
 
-#: ../libpurple/protocols/oscar/oscar.c:1471
-#: ../libpurple/protocols/oscar/oscar.c:1514
+#: ../libpurple/protocols/oscar/oscar.c:1478
+#: ../libpurple/protocols/oscar/oscar.c:1521
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -6775,53 +6767,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:1474
-#: ../libpurple/protocols/oscar/oscar.c:1517
+#: ../libpurple/protocols/oscar/oscar.c:1481
+#: ../libpurple/protocols/oscar/oscar.c:1524
 msgid "Unable to get a valid AIM login hash."
 msgstr "Unable to get a valid AIM login hash."
 
-#: ../libpurple/protocols/oscar/oscar.c:1603
+#: ../libpurple/protocols/oscar/oscar.c:1610
 #, 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:1606
+#: ../libpurple/protocols/oscar/oscar.c:1613
 msgid "Unable to get a valid login hash."
 msgstr "Unable to get a valid login hash."
 
-#: ../libpurple/protocols/oscar/oscar.c:1632
+#: ../libpurple/protocols/oscar/oscar.c:1642
 msgid "Password sent"
 msgstr "Password sent"
 
-#: ../libpurple/protocols/oscar/oscar.c:1688
+#: ../libpurple/protocols/oscar/oscar.c:1698
 msgid "Unable to initialize connection"
 msgstr "Unable to initialise connection"
 
-#: ../libpurple/protocols/oscar/oscar.c:2214
+#: ../libpurple/protocols/oscar/oscar.c:2203
 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:2242
+#: ../libpurple/protocols/oscar/oscar.c:2231
 msgid "Authorization Request Message:"
 msgstr "Authorisation Request Message:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2243
+#: ../libpurple/protocols/oscar/oscar.c:2232
 msgid "Please authorize me!"
 msgstr "Please authorise me!"
 
-#: ../libpurple/protocols/oscar/oscar.c:2282
-#: ../libpurple/protocols/oscar/oscar.c:2289
-#: ../libpurple/protocols/oscar/oscar.c:2415
-#: ../libpurple/protocols/oscar/oscar.c:5223
-#: ../libpurple/protocols/yahoo/yahoo.c:986
+#: ../libpurple/protocols/oscar/oscar.c:2272
+#: ../libpurple/protocols/oscar/oscar.c:2279
+#: ../libpurple/protocols/oscar/oscar.c:2406
+#: ../libpurple/protocols/oscar/oscar.c:5196
+#: ../libpurple/protocols/yahoo/yahoo.c:987
 msgid "No reason given."
 msgstr "No reason given."
 
-#: ../libpurple/protocols/oscar/oscar.c:2288
+#: ../libpurple/protocols/oscar/oscar.c:2278
 msgid "Authorization Denied Message:"
 msgstr "Authorisation Denied Message:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2415
+#: ../libpurple/protocols/oscar/oscar.c:2406
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -6832,17 +6824,17 @@
 "following reason:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2416
+#: ../libpurple/protocols/oscar/oscar.c:2407
 msgid "ICQ authorization denied."
 msgstr "ICQ authorisation denied."
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2423
+#: ../libpurple/protocols/oscar/oscar.c:2414
 #, 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:2431
+#: ../libpurple/protocols/oscar/oscar.c:2422
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -6855,7 +6847,7 @@
 "From: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2439
+#: ../libpurple/protocols/oscar/oscar.c:2430
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -6868,7 +6860,7 @@
 "From: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2447
+#: ../libpurple/protocols/oscar/oscar.c:2438
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -6881,38 +6873,38 @@
 "Message is:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2468
+#: ../libpurple/protocols/oscar/oscar.c:2459
 #, 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:2474
+#: ../libpurple/protocols/oscar/oscar.c:2465
 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:2477 ../pidgin/gtkroomlist.c:308
+#: ../libpurple/protocols/oscar/oscar.c:2470 ../pidgin/gtkroomlist.c:308
 msgid "_Add"
 msgstr "_Add"
 
-#: ../libpurple/protocols/oscar/oscar.c:2478
+#: ../libpurple/protocols/oscar/oscar.c:2471
 msgid "_Decline"
 msgstr "_Decline"
 
-#: ../libpurple/protocols/oscar/oscar.c:2562
+#: ../libpurple/protocols/oscar/oscar.c:2555
 #, 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:2571
+#: ../libpurple/protocols/oscar/oscar.c:2564
 #, 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:2580
+#: ../libpurple/protocols/oscar/oscar.c:2573
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -6923,21 +6915,21 @@
 msgstr[1] ""
 "You missed %hu messages from %s because the rate limit has been exceeded."
 
-#: ../libpurple/protocols/oscar/oscar.c:2589
+#: ../libpurple/protocols/oscar/oscar.c:2582
 #, 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:2598
+#: ../libpurple/protocols/oscar/oscar.c:2591
 #, 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:2607
+#: ../libpurple/protocols/oscar/oscar.c:2600
 #, 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."
@@ -6945,61 +6937,61 @@
 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:2762
+#: ../libpurple/protocols/oscar/oscar.c:2755
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Unable to send message: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2762
-#: ../libpurple/protocols/oscar/oscar.c:2767
-#: ../libpurple/protocols/oscar/oscar.c:2829
-#: ../libpurple/protocols/oscar/oscar.c:2833
+#: ../libpurple/protocols/oscar/oscar.c:2755
+#: ../libpurple/protocols/oscar/oscar.c:2760
+#: ../libpurple/protocols/oscar/oscar.c:2822
+#: ../libpurple/protocols/oscar/oscar.c:2826
 msgid "Unknown reason."
 msgstr "Unknown reason."
 
-#: ../libpurple/protocols/oscar/oscar.c:2765
+#: ../libpurple/protocols/oscar/oscar.c:2758
 #: ../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:2829
+#: ../libpurple/protocols/oscar/oscar.c:2822
 #, c-format
 msgid "User information not available: %s"
 msgstr "User information not available: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2832
+#: ../libpurple/protocols/oscar/oscar.c:2825
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "User information for %s unavailable:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2861
+#: ../libpurple/protocols/oscar/oscar.c:2854
 msgid "Online Since"
 msgstr "Online Since"
 
-#: ../libpurple/protocols/oscar/oscar.c:2866
+#: ../libpurple/protocols/oscar/oscar.c:2859
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1161
 msgid "Member Since"
 msgstr "Member Since"
 
-#: ../libpurple/protocols/oscar/oscar.c:2871
+#: ../libpurple/protocols/oscar/oscar.c:2864
 msgid "Capabilities"
 msgstr "Capabilities"
 
-#: ../libpurple/protocols/oscar/oscar.c:2889
+#: ../libpurple/protocols/oscar/oscar.c:2894
 msgid "Available Message"
 msgstr "Available Message"
 
-#: ../libpurple/protocols/oscar/oscar.c:2915
+#: ../libpurple/protocols/oscar/oscar.c:2920
 msgid "Profile"
 msgstr "Profile"
 
-#: ../libpurple/protocols/oscar/oscar.c:2992
+#: ../libpurple/protocols/oscar/oscar.c:2997
 msgid "Your AIM connection may be lost."
 msgstr "Your AIM connection may be lost."
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3179
+#: ../libpurple/protocols/oscar/oscar.c:3184
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -7007,11 +6999,7 @@
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 
-#: ../libpurple/protocols/oscar/oscar.c:3400
-msgid "Rate limiting error."
-msgstr "Rate limiting error."
-
-#: ../libpurple/protocols/oscar/oscar.c:3401
+#: ../libpurple/protocols/oscar/oscar.c:3387
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -7019,85 +7007,85 @@
 "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:3473
+#: ../libpurple/protocols/oscar/oscar.c:3459
 msgid "You have been signed off for an unknown reason."
 msgstr "You have been signed off for an unknown reason."
 
-#: ../libpurple/protocols/oscar/oscar.c:3486
+#: ../libpurple/protocols/oscar/oscar.c:3472
 #: ../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:3733
+#: ../libpurple/protocols/oscar/oscar.c:3719
 #: ../libpurple/protocols/silc/util.c:581
 msgid "Mobile Phone"
 msgstr "Mobile Phone"
 
-#: ../libpurple/protocols/oscar/oscar.c:3763
+#: ../libpurple/protocols/oscar/oscar.c:3749
 msgid "Personal Web Page"
 msgstr "Personal Web Page"
 
-#: ../libpurple/protocols/oscar/oscar.c:3787
+#: ../libpurple/protocols/oscar/oscar.c:3773
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "Additional Information"
 
-#: ../libpurple/protocols/oscar/oscar.c:3795
-#: ../libpurple/protocols/oscar/oscar.c:3808
+#: ../libpurple/protocols/oscar/oscar.c:3781
+#: ../libpurple/protocols/oscar/oscar.c:3794
 msgid "Zip Code"
 msgstr "Postcode"
 
-#: ../libpurple/protocols/oscar/oscar.c:3819
+#: ../libpurple/protocols/oscar/oscar.c:3805
 msgid "Division"
 msgstr "Division"
 
-#: ../libpurple/protocols/oscar/oscar.c:3820
+#: ../libpurple/protocols/oscar/oscar.c:3806
 msgid "Position"
 msgstr "Position"
 
-#: ../libpurple/protocols/oscar/oscar.c:3822
+#: ../libpurple/protocols/oscar/oscar.c:3808
 msgid "Web Page"
 msgstr "Web Page"
 
-#: ../libpurple/protocols/oscar/oscar.c:3825
+#: ../libpurple/protocols/oscar/oscar.c:3811
 msgid "Work Information"
 msgstr "Work Information"
 
-#: ../libpurple/protocols/oscar/oscar.c:3881
+#: ../libpurple/protocols/oscar/oscar.c:3867
 msgid "Pop-Up Message"
 msgstr "Pop-Up Message"
 
-#: ../libpurple/protocols/oscar/oscar.c:3921
+#: ../libpurple/protocols/oscar/oscar.c:3907
 #, 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:3926
+#: ../libpurple/protocols/oscar/oscar.c:3912
 msgid "Screen name"
 msgstr "Screen name"
 
-#: ../libpurple/protocols/oscar/oscar.c:3952
+#: ../libpurple/protocols/oscar/oscar.c:3938
 #, 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:3973
+#: ../libpurple/protocols/oscar/oscar.c:3959
 #, 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:3975
+#: ../libpurple/protocols/oscar/oscar.c:3961
 msgid "Account Confirmation Requested"
 msgstr "Account Confirmation Requested"
 
-#: ../libpurple/protocols/oscar/oscar.c:4006
+#: ../libpurple/protocols/oscar/oscar.c:3992
 msgid "Error Changing Account Info"
 msgstr "Error Changing Account Info"
 
-#: ../libpurple/protocols/oscar/oscar.c:4009
+#: ../libpurple/protocols/oscar/oscar.c:3995
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7106,12 +7094,12 @@
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "differs from the original."
 
-#: ../libpurple/protocols/oscar/oscar.c:4012
+#: ../libpurple/protocols/oscar/oscar.c:3998
 #, 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:4015
+#: ../libpurple/protocols/oscar/oscar.c:4001
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7120,7 +7108,7 @@
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "is too long."
 
-#: ../libpurple/protocols/oscar/oscar.c:4018
+#: ../libpurple/protocols/oscar/oscar.c:4004
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
@@ -7129,7 +7117,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:4021
+#: ../libpurple/protocols/oscar/oscar.c:4007
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -7138,7 +7126,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:4024
+#: ../libpurple/protocols/oscar/oscar.c:4010
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
@@ -7147,31 +7135,31 @@
 "Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 
-#: ../libpurple/protocols/oscar/oscar.c:4027
+#: ../libpurple/protocols/oscar/oscar.c:4013
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Error 0x%04x: Unknown error."
 
-#: ../libpurple/protocols/oscar/oscar.c:4037
+#: ../libpurple/protocols/oscar/oscar.c:4023
 #, 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:4039
+#: ../libpurple/protocols/oscar/oscar.c:4025
 msgid "Account Info"
 msgstr "Account Info"
 
-#: ../libpurple/protocols/oscar/oscar.c:4212
+#: ../libpurple/protocols/oscar/oscar.c:4197
 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:4464
+#: ../libpurple/protocols/oscar/oscar.c:4442
 msgid "Unable to set AIM profile."
 msgstr "Unable to set AIM profile."
 
-#: ../libpurple/protocols/oscar/oscar.c:4465
+#: ../libpurple/protocols/oscar/oscar.c:4443
 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 "
@@ -7181,14 +7169,14 @@
 "completed.  Your profile remains unset; try setting it again when you are "
 "fully connected."
 
-#: ../libpurple/protocols/oscar/oscar.c:4479
+#: ../libpurple/protocols/oscar/oscar.c:4457
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
-"truncated it for you."
+"truncated for you."
 msgid_plural ""
 "The maximum profile length of %d bytes has been exceeded.  It has been "
-"truncated it for you."
+"truncated for you."
 msgstr[0] ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
 "truncated it for you."
@@ -7196,11 +7184,11 @@
 "The maximum profile length of %d bytes has been exceeded.  It has been "
 "truncated it for you."
 
-#: ../libpurple/protocols/oscar/oscar.c:4484
+#: ../libpurple/protocols/oscar/oscar.c:4462
 msgid "Profile too long."
 msgstr "Profile too long."
 
-#: ../libpurple/protocols/oscar/oscar.c:4529
+#: ../libpurple/protocols/oscar/oscar.c:4507
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -7215,11 +7203,11 @@
 "The maximum away message length of %d bytes has been exceeded.  It has been "
 "truncated for you."
 
-#: ../libpurple/protocols/oscar/oscar.c:4534
+#: ../libpurple/protocols/oscar/oscar.c:4512
 msgid "Away message too long."
 msgstr "Away message too long."
 
-#: ../libpurple/protocols/oscar/oscar.c:4603
+#: ../libpurple/protocols/oscar/oscar.c:4581
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -7230,17 +7218,17 @@
 "must either start with a letter and contain only letters, numbers and "
 "spaces, or contain only numbers."
 
-#: ../libpurple/protocols/oscar/oscar.c:4605
-#: ../libpurple/protocols/oscar/oscar.c:5030
-#: ../libpurple/protocols/oscar/oscar.c:5044
+#: ../libpurple/protocols/oscar/oscar.c:4583
+#: ../libpurple/protocols/oscar/oscar.c:5006
+#: ../libpurple/protocols/oscar/oscar.c:5020
 msgid "Unable To Add"
 msgstr "Unable To Add"
 
-#: ../libpurple/protocols/oscar/oscar.c:4709
+#: ../libpurple/protocols/oscar/oscar.c:4687
 msgid "Unable To Retrieve Buddy List"
 msgstr "Unable To Retrieve Buddy List"
 
-#: ../libpurple/protocols/oscar/oscar.c:4710
+#: ../libpurple/protocols/oscar/oscar.c:4688
 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."
@@ -7248,16 +7236,16 @@
 "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:4916
-#: ../libpurple/protocols/oscar/oscar.c:4921
-#: ../libpurple/protocols/oscar/oscar.c:5098
-#: ../libpurple/protocols/oscar/oscar.c:5099
-#: ../libpurple/protocols/oscar/oscar.c:5104
+#: ../libpurple/protocols/oscar/oscar.c:4892
+#: ../libpurple/protocols/oscar/oscar.c:4893
+#: ../libpurple/protocols/oscar/oscar.c:4898
+#: ../libpurple/protocols/oscar/oscar.c:5074
+#: ../libpurple/protocols/oscar/oscar.c:5075
+#: ../libpurple/protocols/oscar/oscar.c:5080
 msgid "Orphans"
 msgstr "Orphans"
 
-#: ../libpurple/protocols/oscar/oscar.c:5028
+#: ../libpurple/protocols/oscar/oscar.c:5004
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -7266,12 +7254,12 @@
 "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:5028
-#: ../libpurple/protocols/oscar/oscar.c:5042
+#: ../libpurple/protocols/oscar/oscar.c:5004
+#: ../libpurple/protocols/oscar/oscar.c:5018
 msgid "(no name)"
 msgstr "(no name)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5042
+#: ../libpurple/protocols/oscar/oscar.c:5018
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -7282,7 +7270,7 @@
 "for this is that you have the maximum number of allowed buddies in your "
 "buddy list."
 
-#: ../libpurple/protocols/oscar/oscar.c:5135
+#: ../libpurple/protocols/oscar/oscar.c:5111
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -7291,22 +7279,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:5141
+#: ../libpurple/protocols/oscar/oscar.c:5119
 msgid "Authorization Given"
 msgstr "Authorisation Given"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5219
+#: ../libpurple/protocols/oscar/oscar.c:5192
 #, 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:5220
+#: ../libpurple/protocols/oscar/oscar.c:5193
 msgid "Authorization Granted"
 msgstr "Authorisation Granted"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5223
+#: ../libpurple/protocols/oscar/oscar.c:5196
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -7317,51 +7305,51 @@
 "following reason:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5224
+#: ../libpurple/protocols/oscar/oscar.c:5197
 msgid "Authorization Denied"
 msgstr "Authorisation Denied"
 
-#: ../libpurple/protocols/oscar/oscar.c:5260
+#: ../libpurple/protocols/oscar/oscar.c:5233
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "_Exchange:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5300
+#: ../libpurple/protocols/oscar/oscar.c:5273
 msgid "Invalid chat name specified."
 msgstr "Invalid chat name specified."
 
-#: ../libpurple/protocols/oscar/oscar.c:5370
+#: ../libpurple/protocols/oscar/oscar.c:5343
 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:5509
-#: ../libpurple/protocols/oscar/oscar.c:5514
+#: ../libpurple/protocols/oscar/oscar.c:5482
+#: ../libpurple/protocols/oscar/oscar.c:5487
 msgid "Away Message"
 msgstr "Away Message"
 
-#: ../libpurple/protocols/oscar/oscar.c:5514
+#: ../libpurple/protocols/oscar/oscar.c:5487
 msgid "<i>(retrieving)</i>"
 msgstr " <i>(retrieving)</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:5724
+#: ../libpurple/protocols/oscar/oscar.c:5687
 msgid "iTunes Music Store Link"
 msgstr "iTunes Music Store Link"
 
-#: ../libpurple/protocols/oscar/oscar.c:5832
+#: ../libpurple/protocols/oscar/oscar.c:5795
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Buddy Comment for %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5833
+#: ../libpurple/protocols/oscar/oscar.c:5796
 msgid "Buddy Comment:"
 msgstr "Buddy Comment:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5879
+#: ../libpurple/protocols/oscar/oscar.c:5843
 #, 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:5883
+#: ../libpurple/protocols/oscar/oscar.c:5847
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
@@ -7369,63 +7357,63 @@
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5887
+#: ../libpurple/protocols/oscar/oscar.c:5853
 msgid "C_onnect"
 msgstr "C_onnect"
 
-#: ../libpurple/protocols/oscar/oscar.c:5922
+#: ../libpurple/protocols/oscar/oscar.c:5888
 msgid "Get AIM Info"
 msgstr "Get AIM Info"
 
-#: ../libpurple/protocols/oscar/oscar.c:5928
+#: ../libpurple/protocols/oscar/oscar.c:5894
 msgid "Edit Buddy Comment"
 msgstr "Edit Buddy Comment"
 
-#: ../libpurple/protocols/oscar/oscar.c:5936
+#: ../libpurple/protocols/oscar/oscar.c:5902
 msgid "Get Status Msg"
 msgstr "Get Status Msg"
 
-#: ../libpurple/protocols/oscar/oscar.c:5949
+#: ../libpurple/protocols/oscar/oscar.c:5915
 msgid "Direct IM"
 msgstr "Direct IM"
 
-#: ../libpurple/protocols/oscar/oscar.c:5971
+#: ../libpurple/protocols/oscar/oscar.c:5937
 msgid "Re-request Authorization"
 msgstr "Re-request Authorisation"
 
-#: ../libpurple/protocols/oscar/oscar.c:6030
+#: ../libpurple/protocols/oscar/oscar.c:5996
 msgid "Require authorization"
 msgstr "Require authorisation"
 
-#: ../libpurple/protocols/oscar/oscar.c:6033
+#: ../libpurple/protocols/oscar/oscar.c:5999
 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:6038
+#: ../libpurple/protocols/oscar/oscar.c:6004
 msgid "ICQ Privacy Options"
 msgstr "ICQ Privacy Options"
 
-#: ../libpurple/protocols/oscar/oscar.c:6055
+#: ../libpurple/protocols/oscar/oscar.c:6023
 msgid "The new formatting is invalid."
 msgstr "The new formatting is invalid."
 
-#: ../libpurple/protocols/oscar/oscar.c:6056
+#: ../libpurple/protocols/oscar/oscar.c:6024
 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:6109
+#: ../libpurple/protocols/oscar/oscar.c:6077
 msgid "Change Address To:"
 msgstr "Change Address To:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6154
+#: ../libpurple/protocols/oscar/oscar.c:6123
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>you are not waiting for authorisation</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6157
+#: ../libpurple/protocols/oscar/oscar.c:6126
 msgid "You are awaiting authorization from the following buddies"
 msgstr "You are awaiting authorisation from the following buddies"
 
-#: ../libpurple/protocols/oscar/oscar.c:6158
+#: ../libpurple/protocols/oscar/oscar.c:6127
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -7433,73 +7421,73 @@
 "You can re-request authorisation from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorisation.\""
 
-#: ../libpurple/protocols/oscar/oscar.c:6175
+#: ../libpurple/protocols/oscar/oscar.c:6144
 msgid "Find Buddy by E-Mail"
 msgstr "Find Buddy by E-Mail"
 
-#: ../libpurple/protocols/oscar/oscar.c:6176
+#: ../libpurple/protocols/oscar/oscar.c:6145
 msgid "Search for a buddy by e-mail address"
 msgstr "Search for a buddy by e-mail address"
 
-#: ../libpurple/protocols/oscar/oscar.c:6177
+#: ../libpurple/protocols/oscar/oscar.c:6146
 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:6180
+#: ../libpurple/protocols/oscar/oscar.c:6149
 msgid "_Search"
 msgstr "_Search"
 
-#: ../libpurple/protocols/oscar/oscar.c:6349
+#: ../libpurple/protocols/oscar/oscar.c:6307
 msgid "Set User Info (URL)..."
 msgstr "Set User Info (URL)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6360
+#: ../libpurple/protocols/oscar/oscar.c:6318
 msgid "Change Password (URL)"
 msgstr "Change Password (URL)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6364
+#: ../libpurple/protocols/oscar/oscar.c:6322
 msgid "Configure IM Forwarding (URL)"
 msgstr "Configure IM Forwarding (URL)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6374
+#: ../libpurple/protocols/oscar/oscar.c:6332
 msgid "Set Privacy Options..."
 msgstr "Show Privacy Options..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6381
+#: ../libpurple/protocols/oscar/oscar.c:6339
 msgid "Confirm Account"
 msgstr "Confirm Account"
 
-#: ../libpurple/protocols/oscar/oscar.c:6385
+#: ../libpurple/protocols/oscar/oscar.c:6343
 msgid "Display Currently Registered E-Mail Address"
 msgstr "Display Currently Registered E-mail Address"
 
-#: ../libpurple/protocols/oscar/oscar.c:6389
+#: ../libpurple/protocols/oscar/oscar.c:6347
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "Change Currently Registered E-mail Address"
 
-#: ../libpurple/protocols/oscar/oscar.c:6396
+#: ../libpurple/protocols/oscar/oscar.c:6354
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Show Buddies Awaiting Authorisation"
 
-#: ../libpurple/protocols/oscar/oscar.c:6402
+#: ../libpurple/protocols/oscar/oscar.c:6360
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "Search for Buddy by E-mail Address..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6407
+#: ../libpurple/protocols/oscar/oscar.c:6365
 msgid "Search for Buddy by Information"
 msgstr "Search for Buddy by Information"
 
-#: ../libpurple/protocols/oscar/oscar.c:6475
+#: ../libpurple/protocols/oscar/oscar.c:6433
 msgid "Use recent buddies group"
 msgstr "Use recent buddies group"
 
-#: ../libpurple/protocols/oscar/oscar.c:6478
+#: ../libpurple/protocols/oscar/oscar.c:6436
 msgid "Show how long you have been idle"
 msgstr "Show how long you have been idle"
 
-#: ../libpurple/protocols/oscar/oscar.c:6630
+#: ../libpurple/protocols/oscar/oscar.c:6591
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -7536,7 +7524,7 @@
 "for IM Images.  Because your IP address will be revealed, this may be "
 "considered a privacy risk."
 
-#: ../libpurple/protocols/oscar/peer.c:1020
+#: ../libpurple/protocols/oscar/peer.c:1022
 msgid "_Connect"
 msgstr "_Connect"
 
@@ -7701,92 +7689,100 @@
 msgid "Update my information"
 msgstr "Update my information"
 
-#: ../libpurple/protocols/qq/buddy_info.c:506
+#: ../libpurple/protocols/qq/buddy_info.c:507
 msgid "Your information has been updated"
 msgstr "Your information has been updated"
 
-#: ../libpurple/protocols/qq/buddy_info.c:565
+#: ../libpurple/protocols/qq/buddy_info.c:560
+#, c-format
 msgid ""
 "Setting custom faces is not currently supported. Please choose an image from "
+"%s."
 msgstr ""
 "Setting custom faces is not currently supported. Please choose an image from "
-
-#: ../libpurple/protocols/qq/buddy_info.c:582
-#: ../libpurple/protocols/qq/buddy_info.c:595
+"%s."
+
+#: ../libpurple/protocols/qq/buddy_info.c:577
+#: ../libpurple/protocols/qq/buddy_info.c:590
 msgid "Invalid QQ Face"
 msgstr "Invalid QQ Face"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:207
+#: ../libpurple/protocols/qq/buddy_opt.c:208
 #: ../libpurple/protocols/qq/group_opt.c:135
 #, c-format
 msgid "You rejected %d's request"
 msgstr "You rejected %d's request"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:208
+#: ../libpurple/protocols/qq/buddy_opt.c:209
 #: ../libpurple/protocols/qq/group_opt.c:136
 msgid "Input your reason:"
 msgstr "Enter your reason:"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:210
+#: ../libpurple/protocols/qq/buddy_opt.c:212
 msgid "Reject request"
 msgstr "Reject request"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:211
-#: ../libpurple/protocols/qq/group_opt.c:139
+#. title
+#: ../libpurple/protocols/qq/buddy_opt.c:213
+#: ../libpurple/protocols/qq/group_opt.c:140
 msgid "Sorry, you are not my type..."
 msgstr "Sorry, you are not my type..."
 
-#: ../libpurple/protocols/qq/buddy_opt.c:212
-#: ../libpurple/protocols/qq/group_im.c:136
-#: ../libpurple/protocols/qq/group_opt.c:125
-#: ../libpurple/protocols/qq/sys_msg.c:85
-#: ../libpurple/protocols/qq/sys_msg.c:228
+#: ../libpurple/protocols/qq/buddy_opt.c:214
+#: ../libpurple/protocols/qq/group_im.c:142
+#: ../libpurple/protocols/qq/group_opt.c:126
+#: ../libpurple/protocols/qq/sys_msg.c:91
+#: ../libpurple/protocols/qq/sys_msg.c:249
 msgid "Reject"
 msgstr "Reject"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:272
+#: ../libpurple/protocols/qq/buddy_opt.c:277
 msgid "Add buddy with auth request fails"
 msgstr "Add buddy with auth request failed"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:303
+#: ../libpurple/protocols/qq/buddy_opt.c:308
 msgid "You have successfully removed a buddy"
 msgstr "You have successfully removed a buddy"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:331
+#: ../libpurple/protocols/qq/buddy_opt.c:336
 msgid "You have successfully removed yourself from a buddy"
 msgstr "You have successfully removed yourself from a buddy"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:395
+#: ../libpurple/protocols/qq/buddy_opt.c:402
 #, c-format
 msgid "User %d needs authentication"
 msgstr "User %d needs authentication"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:397
+#: ../libpurple/protocols/qq/buddy_opt.c:404
 #: ../libpurple/protocols/qq/group_join.c:134
 msgid "Input request here"
 msgstr "Enter request here"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:398
+#. TODO: Awkward string to fix post string freeze - standardize auth dialogues? -evands
+#: ../libpurple/protocols/qq/buddy_opt.c:405
 #: ../libpurple/protocols/qq/group_join.c:135
 msgid "Would you be my friend?"
 msgstr "Would you like to be my friend?"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:399
+#. multiline
+#. masked
+#. hint
+#: ../libpurple/protocols/qq/buddy_opt.c:406
 #: ../libpurple/protocols/qq/group_join.c:136
-#: ../libpurple/protocols/qq/group_opt.c:140
+#: ../libpurple/protocols/qq/group_opt.c:142
 msgid "Send"
 msgstr "Send"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:406
+#: ../libpurple/protocols/qq/buddy_opt.c:416
 #, c-format
 msgid "You have added %d in buddy list"
 msgstr "You have added %d to your buddy list"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:503
+#: ../libpurple/protocols/qq/buddy_opt.c:513
 msgid "QQid Error"
 msgstr "QQid Error"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:504
+#: ../libpurple/protocols/qq/buddy_opt.c:514
 msgid "Invalid QQid"
 msgstr "Invalid QQid"
 
@@ -7822,59 +7818,59 @@
 msgid "You can only search for permanent QQ groups\n"
 msgstr "You can only search for permanent QQ groups\n"
 
-#: ../libpurple/protocols/qq/group_im.c:122
+#: ../libpurple/protocols/qq/group_im.c:124
 #, c-format
 msgid "User %d applied to join group %d"
 msgstr "User %d applied to join group %d"
 
-#: ../libpurple/protocols/qq/group_im.c:123
-#: ../libpurple/protocols/qq/group_im.c:172
-#: ../libpurple/protocols/qq/sys_msg.c:180
+#: ../libpurple/protocols/qq/group_im.c:125
+#: ../libpurple/protocols/qq/group_im.c:179
+#: ../libpurple/protocols/qq/sys_msg.c:195
 #, c-format
 msgid "Reason: %s"
 msgstr "Reason: %s"
 
-#: ../libpurple/protocols/qq/group_im.c:130
-#: ../libpurple/protocols/qq/group_im.c:174
-#: ../libpurple/protocols/qq/group_im.c:214
-#: ../libpurple/protocols/qq/group_im.c:249
-#: ../libpurple/protocols/qq/group_im.c:283
-#: ../libpurple/protocols/qq/group_join.c:229
-#: ../libpurple/protocols/qq/group_join.c:355
-#: ../libpurple/protocols/qq/group_opt.c:230
-#: ../libpurple/protocols/qq/group_opt.c:300
-#: ../libpurple/protocols/qq/group_opt.c:386
+#: ../libpurple/protocols/qq/group_im.c:134
+#: ../libpurple/protocols/qq/group_im.c:181
+#: ../libpurple/protocols/qq/group_im.c:221
+#: ../libpurple/protocols/qq/group_im.c:256
+#: ../libpurple/protocols/qq/group_im.c:290
+#: ../libpurple/protocols/qq/group_join.c:231
+#: ../libpurple/protocols/qq/group_join.c:357
+#: ../libpurple/protocols/qq/group_opt.c:234
+#: ../libpurple/protocols/qq/group_opt.c:304
+#: ../libpurple/protocols/qq/group_opt.c:390
 msgid "QQ Qun Operation"
 msgstr "QQ Qun Operation"
 
-#: ../libpurple/protocols/qq/group_im.c:133
+#: ../libpurple/protocols/qq/group_im.c:139
 #: ../libpurple/protocols/qq/group_opt.c:127
-#: ../libpurple/protocols/qq/sys_msg.c:87
-#: ../libpurple/protocols/qq/sys_msg.c:230
+#: ../libpurple/protocols/qq/sys_msg.c:92
+#: ../libpurple/protocols/qq/sys_msg.c:251
 msgid "Approve"
 msgstr "Approve"
 
-#: ../libpurple/protocols/qq/group_im.c:171
+#: ../libpurple/protocols/qq/group_im.c:178
 #, c-format
 msgid "You request to join group %d has been rejected by admin %d"
 msgstr "Your request to join group %d has been rejected by admin %d"
 
-#: ../libpurple/protocols/qq/group_im.c:212
+#: ../libpurple/protocols/qq/group_im.c:219
 #, c-format
 msgid "You request to join group %d has been approved by admin %d"
 msgstr "Your request to join group %d has been approved by admin %d"
 
-#: ../libpurple/protocols/qq/group_im.c:248
+#: ../libpurple/protocols/qq/group_im.c:255
 #, c-format
 msgid "You [%d] has exit group \"%d\""
 msgstr "You [%d] have left group \"%d\""
 
-#: ../libpurple/protocols/qq/group_im.c:282
+#: ../libpurple/protocols/qq/group_im.c:289
 #, c-format
 msgid "You [%d] has been added by group \"%d\""
 msgstr "You [%d] have been added to group \"%d\""
 
-#: ../libpurple/protocols/qq/group_im.c:283
+#: ../libpurple/protocols/qq/group_im.c:290
 msgid "This group has been added to your buddy list"
 msgstr "This group has been added to your buddy list"
 
@@ -7902,27 +7898,27 @@
 msgid "This group does not allow others to join"
 msgstr "This group does not allow others to join"
 
-#: ../libpurple/protocols/qq/group_join.c:229
+#: ../libpurple/protocols/qq/group_join.c:231
 msgid "You have successfully exited the group"
 msgstr "You have successfully left the group"
 
-#: ../libpurple/protocols/qq/group_join.c:253
+#: ../libpurple/protocols/qq/group_join.c:255
 msgid "QQ Group Auth"
 msgstr "QQ Group Auth"
 
-#: ../libpurple/protocols/qq/group_join.c:254
+#: ../libpurple/protocols/qq/group_join.c:256
 msgid "Your authorization operation has been accepted by the QQ server"
 msgstr "Your authorisation request has been accepted by the QQ server"
 
-#: ../libpurple/protocols/qq/group_join.c:325
+#: ../libpurple/protocols/qq/group_join.c:327
 msgid "You inputted a group id outside the acceptable range"
 msgstr "You inputted a group ID outside the permitted range"
 
-#: ../libpurple/protocols/qq/group_join.c:356
+#: ../libpurple/protocols/qq/group_join.c:358
 msgid "Are you sure to exit this Qun?"
 msgstr "Are you sure you want to leave this Qun?"
 
-#: ../libpurple/protocols/qq/group_join.c:358
+#: ../libpurple/protocols/qq/group_join.c:360
 msgid ""
 "Note, if you are the creator, \n"
 "this operation will eventually remove this Qun."
@@ -7930,7 +7926,7 @@
 "Note: if you are the creator \n"
 "this operation will eventually remove this Qun."
 
-#: ../libpurple/protocols/qq/group_join.c:361
+#: ../libpurple/protocols/qq/group_join.c:365
 msgid "Go ahead"
 msgstr "Continue"
 
@@ -7943,40 +7939,41 @@
 msgid "Group Operation Error"
 msgstr "Group Operation Error"
 
-#: ../libpurple/protocols/qq/group_opt.c:124
-#: ../libpurple/protocols/qq/sys_msg.c:84
+#. we wanna see window
+#: ../libpurple/protocols/qq/group_opt.c:123
+#: ../libpurple/protocols/qq/sys_msg.c:88
 msgid "Do you wanna approve the request?"
 msgstr "Do you want to approve the request?"
 
-#: ../libpurple/protocols/qq/group_opt.c:230
+#: ../libpurple/protocols/qq/group_opt.c:234
 msgid "You have successfully modify Qun member"
 msgstr "You have successfully modified the Qun member"
 
-#: ../libpurple/protocols/qq/group_opt.c:300
+#: ../libpurple/protocols/qq/group_opt.c:304
 msgid "You have successfully modify Qun information"
 msgstr "You have successfully modified the Qun information"
 
-#: ../libpurple/protocols/qq/group_opt.c:387
+#: ../libpurple/protocols/qq/group_opt.c:391
 msgid "You have successfully created a Qun"
 msgstr "You have successfully created a Qun"
 
-#: ../libpurple/protocols/qq/group_opt.c:389
+#: ../libpurple/protocols/qq/group_opt.c:393
 msgid "Would you like to set up the Qun details now?"
 msgstr "Would you like to set up the Qun details now?"
 
-#: ../libpurple/protocols/qq/group_opt.c:390
+#: ../libpurple/protocols/qq/group_opt.c:397
 msgid "Setup"
 msgstr "Setup"
 
-#: ../libpurple/protocols/qq/im.c:423
+#: ../libpurple/protocols/qq/im.c:430
 msgid "System Message"
 msgstr "System Message"
 
-#: ../libpurple/protocols/qq/im.c:567
+#: ../libpurple/protocols/qq/im.c:574
 msgid "Server ACK"
 msgstr "Server ACK"
 
-#: ../libpurple/protocols/qq/im.c:567
+#: ../libpurple/protocols/qq/im.c:574
 msgid "Send IM fail\n"
 msgstr "IM send failed\n"
 
@@ -7995,11 +7992,11 @@
 #. we didn't successfully connect. tdt->toc_fd is valid here
 #. TODO: Include error_message in the message below
 #: ../libpurple/protocols/qq/qq.c:139 ../libpurple/protocols/toc/toc.c:173
-#: ../libpurple/protocols/yahoo/yahoo.c:2375
-#: ../libpurple/protocols/yahoo/yahoo.c:2403
-#: ../libpurple/protocols/yahoo/yahoo.c:2510
-#: ../libpurple/protocols/yahoo/yahoo.c:2531
-#: ../libpurple/protocols/yahoo/yahoo.c:2615
+#: ../libpurple/protocols/yahoo/yahoo.c:2380
+#: ../libpurple/protocols/yahoo/yahoo.c:2408
+#: ../libpurple/protocols/yahoo/yahoo.c:2515
+#: ../libpurple/protocols/yahoo/yahoo.c:2536
+#: ../libpurple/protocols/yahoo/yahoo.c:2620
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:108
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:188
 #: ../libpurple/protocols/yahoo/ycht.c:549
@@ -8040,47 +8037,47 @@
 msgid "Invalid name"
 msgstr "Invalid name"
 
-#: ../libpurple/protocols/qq/qq.c:438
+#: ../libpurple/protocols/qq/qq.c:437
 #, c-format
 msgid "<b>Current Online</b>: %d<br>\n"
 msgstr "<b>Currently Online</b>: %d<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:439
+#: ../libpurple/protocols/qq/qq.c:438
 #, c-format
 msgid "<b>Last Refresh</b>: %s<br>\n"
 msgstr "<b>Last Refreshed</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:443
+#: ../libpurple/protocols/qq/qq.c:442
 #, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
 msgstr "<b>Connection Mode</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:444
+#: ../libpurple/protocols/qq/qq.c:443
 #, c-format
 msgid "<b>Server IP</b>: %s: %d<br>\n"
 msgstr "<b>Server IP</b>: %s: %d<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:445
+#: ../libpurple/protocols/qq/qq.c:444
 #, c-format
 msgid "<b>My Public IP</b>: %s<br>\n"
 msgstr "<b>My Public IP</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:450
+#: ../libpurple/protocols/qq/qq.c:449
 #, c-format
 msgid "<b>Login Time</b>: %s<br>\n"
 msgstr "<b>Login Time</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:451
+#: ../libpurple/protocols/qq/qq.c:450
 #, c-format
 msgid "<b>Last Login IP</b>: %s<br>\n"
 msgstr "<b>Last Login IP</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:452
+#: ../libpurple/protocols/qq/qq.c:451
 #, c-format
 msgid "<b>Last Login Time</b>: %s\n"
 msgstr "<b>Last Login Time</b>: %s\n"
 
-#: ../libpurple/protocols/qq/qq.c:456
+#: ../libpurple/protocols/qq/qq.c:455
 msgid "Login Information"
 msgstr "Login Information"
 
@@ -8100,6 +8097,10 @@
 msgid "Exit this QQ Qun"
 msgstr "Exit this QQ Qun"
 
+#: ../libpurple/protocols/qq/qq.c:582
+msgid "Block this buddy"
+msgstr "Block this buddy"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -8110,15 +8111,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/qq/qq.c:719 ../libpurple/protocols/qq/qq.c:721
+#: ../libpurple/protocols/qq/qq.c:723 ../libpurple/protocols/qq/qq.c:725
 msgid "QQ Protocol\tPlugin"
 msgstr "QQ Protocol\tPlugin"
 
-#: ../libpurple/protocols/qq/qq.c:740
+#: ../libpurple/protocols/qq/qq.c:750
 msgid "Login in TCP"
 msgstr "Login using TCP"
 
-#: ../libpurple/protocols/qq/qq.c:743
+#: ../libpurple/protocols/qq/qq.c:753
 msgid "Login Hidden"
 msgstr "Login Hidden"
 
@@ -8162,51 +8163,53 @@
 msgid "Login failed, no reply"
 msgstr "Login failed; no reply"
 
-#: ../libpurple/protocols/qq/sys_msg.c:103
+#: ../libpurple/protocols/qq/sys_msg.c:112
 msgid "Do you wanna add this buddy?"
 msgstr "Do you want to add this buddy to your buddy list?"
 
 #. only need to get value
-#: ../libpurple/protocols/qq/sys_msg.c:155
+#: ../libpurple/protocols/qq/sys_msg.c:168
 #, c-format
 msgid "You have been added by %s"
 msgstr "You have been added by %s"
 
-#: ../libpurple/protocols/qq/sys_msg.c:158
+#: ../libpurple/protocols/qq/sys_msg.c:171
 msgid "Would like to add him?"
 msgstr "Would you like to add this person?"
 
-#: ../libpurple/protocols/qq/sys_msg.c:164
+#: ../libpurple/protocols/qq/sys_msg.c:178
 #, c-format
 msgid "%s has added you [%s]"
 msgstr "%s has added you [%s]"
 
-#: ../libpurple/protocols/qq/sys_msg.c:179
+#: ../libpurple/protocols/qq/sys_msg.c:194
 #, c-format
 msgid "User %s rejected your request"
 msgstr "User %s rejected your request"
 
-#: ../libpurple/protocols/qq/sys_msg.c:199
+#: ../libpurple/protocols/qq/sys_msg.c:214
 #, c-format
 msgid "User %s has approved your request"
 msgstr "User %s has approved your request"
 
-#: ../libpurple/protocols/qq/sys_msg.c:222
+#. TODO: 'wanna' is not an appropriate word for this string. Fix after string freeze
+#. TODO: this should go through purple_account_request_authorization()
+#: ../libpurple/protocols/qq/sys_msg.c:241
 #, c-format
 msgid "%s wanna add you [%s] as friends"
 msgstr "%s wants to add you [%s] as a friend"
 
-#: ../libpurple/protocols/qq/sys_msg.c:223
+#: ../libpurple/protocols/qq/sys_msg.c:242
 #, c-format
 msgid "Message: %s"
 msgstr "Message: %s"
 
-#: ../libpurple/protocols/qq/sys_msg.c:244
+#: ../libpurple/protocols/qq/sys_msg.c:264
 #, c-format
 msgid "%s is not in your buddy list"
 msgstr "%s is not in your buddy list"
 
-#: ../libpurple/protocols/qq/sys_msg.c:246
+#: ../libpurple/protocols/qq/sys_msg.c:266
 msgid "Would you like to add him?"
 msgstr "Would you like to add this person?"
 
@@ -8299,7 +8302,7 @@
 
 #. this is a regular connect, error out
 #: ../libpurple/protocols/sametime/sametime.c:1732
-#: ../libpurple/protocols/sametime/sametime.c:3724
+#: ../libpurple/protocols/sametime/sametime.c:3726
 msgid "Unable to connect to host"
 msgstr "Unable to connect to host"
 
@@ -8316,41 +8319,41 @@
 msgid "Unable to send message: "
 msgstr "Unable to send message: "
 
-#: ../libpurple/protocols/sametime/sametime.c:2960
+#: ../libpurple/protocols/sametime/sametime.c:2959
 msgid "Place Closed"
 msgstr "Place Closed"
 
-#: ../libpurple/protocols/sametime/sametime.c:3230
+#: ../libpurple/protocols/sametime/sametime.c:3229
 msgid "Microphone"
 msgstr "Microphone"
 
-#: ../libpurple/protocols/sametime/sametime.c:3231
+#: ../libpurple/protocols/sametime/sametime.c:3230
 msgid "Speakers"
 msgstr "Speakers"
 
-#: ../libpurple/protocols/sametime/sametime.c:3232
+#: ../libpurple/protocols/sametime/sametime.c:3231
 msgid "Video Camera"
 msgstr "Video Camera"
 
-#: ../libpurple/protocols/sametime/sametime.c:3236
+#: ../libpurple/protocols/sametime/sametime.c:3235
 msgid "File Transfer"
 msgstr "File Transfer"
 
-#: ../libpurple/protocols/sametime/sametime.c:3270
-#: ../libpurple/protocols/sametime/sametime.c:4144
+#: ../libpurple/protocols/sametime/sametime.c:3269
+#: ../libpurple/protocols/sametime/sametime.c:4145
 msgid "Supports"
 msgstr "Supports"
 
-#: ../libpurple/protocols/sametime/sametime.c:3275
-#: ../libpurple/protocols/sametime/sametime.c:4118
+#: ../libpurple/protocols/sametime/sametime.c:3274
+#: ../libpurple/protocols/sametime/sametime.c:4119
 msgid "External User"
 msgstr "External User"
 
-#: ../libpurple/protocols/sametime/sametime.c:3381
+#: ../libpurple/protocols/sametime/sametime.c:3380
 msgid "Create conference with user"
 msgstr "Create conference with user"
 
-#: ../libpurple/protocols/sametime/sametime.c:3382
+#: ../libpurple/protocols/sametime/sametime.c:3381
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
@@ -8359,11 +8362,11 @@
 "Please enter a topic for the new conference, and an invitation message to be "
 "sent to %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:3386
+#: ../libpurple/protocols/sametime/sametime.c:3385
 msgid "New Conference"
 msgstr "New Conference"
 
-#: ../libpurple/protocols/sametime/sametime.c:3388
+#: ../libpurple/protocols/sametime/sametime.c:3387
 msgid "Create"
 msgstr "Create"
 
@@ -8394,23 +8397,23 @@
 msgid "Invite to Conference"
 msgstr "Invite to Conference"
 
-#: ../libpurple/protocols/sametime/sametime.c:3561
+#: ../libpurple/protocols/sametime/sametime.c:3562
 msgid "Invite to Conference..."
 msgstr "Invite to Conference..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3566
+#: ../libpurple/protocols/sametime/sametime.c:3567
 msgid "Send TEST Announcement"
 msgstr "Send TEST Announcement"
 
-#: ../libpurple/protocols/sametime/sametime.c:3585 ../pidgin/gtkconv.c:4161
+#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4177
 msgid "Topic:"
 msgstr "Topic:"
 
-#: ../libpurple/protocols/sametime/sametime.c:3613
+#: ../libpurple/protocols/sametime/sametime.c:3614
 msgid "No Sametime Community Server specified"
 msgstr "No Sametime Community Server specified"
 
-#: ../libpurple/protocols/sametime/sametime.c:3635
+#: ../libpurple/protocols/sametime/sametime.c:3636
 #, c-format
 msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
@@ -8419,38 +8422,42 @@
 "No host or IP address has been configured for the Meanwhile account %s. "
 "Please enter one below to continue logging in."
 
-#: ../libpurple/protocols/sametime/sametime.c:3640
+#: ../libpurple/protocols/sametime/sametime.c:3641
 msgid "Meanwhile Connection Setup"
 msgstr "Meanwhile Connection Setup"
 
-#: ../libpurple/protocols/sametime/sametime.c:3641
+#: ../libpurple/protocols/sametime/sametime.c:3642
 msgid "No Sametime Community Server Specified"
 msgstr "No Sametime Community Server Specified"
 
-#: ../libpurple/protocols/sametime/sametime.c:4134
+#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:3966
+msgid "Connect"
+msgstr "Connect"
+
+#: ../libpurple/protocols/sametime/sametime.c:4135
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "Unknown (0x%04x)<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:4136
+#: ../libpurple/protocols/sametime/sametime.c:4137
 msgid "Last Known Client"
 msgstr "Last Known Client"
 
-#: ../libpurple/protocols/sametime/sametime.c:4300
-#: ../libpurple/protocols/sametime/sametime.c:5495
+#: ../libpurple/protocols/sametime/sametime.c:4301
+#: ../libpurple/protocols/sametime/sametime.c:5506
 msgid "User Name"
 msgstr "User Name"
 
-#: ../libpurple/protocols/sametime/sametime.c:4303
-#: ../libpurple/protocols/sametime/sametime.c:5498
+#: ../libpurple/protocols/sametime/sametime.c:4304
+#: ../libpurple/protocols/sametime/sametime.c:5509
 msgid "Sametime ID"
 msgstr "Sametime ID"
 
-#: ../libpurple/protocols/sametime/sametime.c:4327
+#: ../libpurple/protocols/sametime/sametime.c:4328
 msgid "An ambiguous user ID was entered"
 msgstr "An ambiguous user ID was entered"
 
-#: ../libpurple/protocols/sametime/sametime.c:4328
+#: ../libpurple/protocols/sametime/sametime.c:4329
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
@@ -8459,15 +8466,15 @@
 "The identifier '%s' may possibly refer to any of the following users. Please "
 "select the correct user from the list below to add them to your buddy list."
 
-#: ../libpurple/protocols/sametime/sametime.c:4333
+#: ../libpurple/protocols/sametime/sametime.c:4334
 msgid "Select User"
 msgstr "Select User"
 
-#: ../libpurple/protocols/sametime/sametime.c:4417
+#: ../libpurple/protocols/sametime/sametime.c:4418
 msgid "Unable to add user: user not found"
 msgstr "Unable to add user: user not found"
 
-#: ../libpurple/protocols/sametime/sametime.c:4419
+#: ../libpurple/protocols/sametime/sametime.c:4420
 #, c-format
 msgid ""
 "The identifier '%s' did not match any users in your Sametime community. This "
@@ -8476,11 +8483,11 @@
 "The identifier '%s' did not match any users in your Sametime community. This "
 "entry has been removed from your buddy list."
 
-#: ../libpurple/protocols/sametime/sametime.c:4424
+#: ../libpurple/protocols/sametime/sametime.c:4425
 msgid "Unable to add user"
 msgstr "Unable to add user"
 
-#: ../libpurple/protocols/sametime/sametime.c:5010
+#: ../libpurple/protocols/sametime/sametime.c:5011
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -8489,63 +8496,63 @@
 "Error reading file %s: \n"
 "%s\n"
 
-#: ../libpurple/protocols/sametime/sametime.c:5145
+#: ../libpurple/protocols/sametime/sametime.c:5146
 msgid "Remotely Stored Buddy List"
 msgstr "Remotely Stored Buddy List"
 
-#: ../libpurple/protocols/sametime/sametime.c:5150
+#: ../libpurple/protocols/sametime/sametime.c:5151
 msgid "Buddy List Storage Mode"
 msgstr "Buddy List Storage Mode"
 
-#: ../libpurple/protocols/sametime/sametime.c:5153
+#: ../libpurple/protocols/sametime/sametime.c:5154
 msgid "Local Buddy List Only"
 msgstr "Local Buddy List Only"
 
-#: ../libpurple/protocols/sametime/sametime.c:5155
+#: ../libpurple/protocols/sametime/sametime.c:5156
 msgid "Merge List from Server"
 msgstr "Merge List from Server"
 
-#: ../libpurple/protocols/sametime/sametime.c:5157
+#: ../libpurple/protocols/sametime/sametime.c:5158
 msgid "Merge and Save List to Server"
 msgstr "Merge and Save List to Server"
 
-#: ../libpurple/protocols/sametime/sametime.c:5159
+#: ../libpurple/protocols/sametime/sametime.c:5160
 msgid "Synchronize List with Server"
 msgstr "Synchronise List with Server"
 
-#: ../libpurple/protocols/sametime/sametime.c:5208
+#: ../libpurple/protocols/sametime/sametime.c:5215
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "Import Sametime List for Account %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5247
+#: ../libpurple/protocols/sametime/sametime.c:5255
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "Export Sametime List for Account %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5300
+#: ../libpurple/protocols/sametime/sametime.c:5309
 msgid "Unable to add group: group exists"
 msgstr "Unable to add group: group exists"
 
-#: ../libpurple/protocols/sametime/sametime.c:5301
+#: ../libpurple/protocols/sametime/sametime.c:5310
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "A group named '%s' already exists in your buddy list."
 
-#: ../libpurple/protocols/sametime/sametime.c:5304
-#: ../libpurple/protocols/sametime/sametime.c:5433
+#: ../libpurple/protocols/sametime/sametime.c:5313
+#: ../libpurple/protocols/sametime/sametime.c:5443
 msgid "Unable to add group"
 msgstr "Unable to add group"
 
-#: ../libpurple/protocols/sametime/sametime.c:5363
+#: ../libpurple/protocols/sametime/sametime.c:5372
 msgid "Possible Matches"
 msgstr "Possible Matches"
 
-#: ../libpurple/protocols/sametime/sametime.c:5379
+#: ../libpurple/protocols/sametime/sametime.c:5388
 msgid "Notes Address Book group results"
 msgstr "Notes Address Book group results"
 
-#: ../libpurple/protocols/sametime/sametime.c:5380
+#: ../libpurple/protocols/sametime/sametime.c:5389
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -8556,15 +8563,15 @@
 "Book groups. Please select the correct group from the list below to add it "
 "to your buddy list."
 
-#: ../libpurple/protocols/sametime/sametime.c:5385
+#: ../libpurple/protocols/sametime/sametime.c:5394
 msgid "Select Notes Address Book"
 msgstr "Select Notes Address Book"
 
-#: ../libpurple/protocols/sametime/sametime.c:5427
+#: ../libpurple/protocols/sametime/sametime.c:5437
 msgid "Unable to add group: group not found"
 msgstr "Unable to add group: group not found"
 
-#: ../libpurple/protocols/sametime/sametime.c:5429
+#: ../libpurple/protocols/sametime/sametime.c:5439
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
@@ -8573,11 +8580,11 @@
 "The identifier '%s' did not match any Notes Address Book groups in your "
 "Sametime community."
 
-#: ../libpurple/protocols/sametime/sametime.c:5470
+#: ../libpurple/protocols/sametime/sametime.c:5480
 msgid "Notes Address Book Group"
 msgstr "Notes Address Book Group"
 
-#: ../libpurple/protocols/sametime/sametime.c:5471
+#: ../libpurple/protocols/sametime/sametime.c:5481
 msgid ""
 "Enter the name of a Notes Address Book group in the field below to add the "
 "group and its members to your buddy list."
@@ -8585,12 +8592,12 @@
 "Enter the name of a Notes Address Book group in the field below to add the "
 "group and its members to your buddy list."
 
-#: ../libpurple/protocols/sametime/sametime.c:5519
+#: ../libpurple/protocols/sametime/sametime.c:5530
 #, c-format
 msgid "Search results for '%s'"
 msgstr "Search results for '%s'"
 
-#: ../libpurple/protocols/sametime/sametime.c:5520
+#: ../libpurple/protocols/sametime/sametime.c:5531
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -8601,29 +8608,29 @@
 "may add these users to your buddy list or send them messages with the action "
 "buttons below."
 
-#: ../libpurple/protocols/sametime/sametime.c:5527 ../pidgin/gtknotify.c:709
+#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:716
 msgid "Search Results"
 msgstr "Search Results"
 
-#: ../libpurple/protocols/sametime/sametime.c:5552
+#: ../libpurple/protocols/sametime/sametime.c:5563
 msgid "No matches"
 msgstr "No matches"
 
-#: ../libpurple/protocols/sametime/sametime.c:5553
+#: ../libpurple/protocols/sametime/sametime.c:5564
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr ""
 "The identifier '%s' did not match any users in your Sametime community."
 
-#: ../libpurple/protocols/sametime/sametime.c:5557
+#: ../libpurple/protocols/sametime/sametime.c:5568
 msgid "No Matches"
 msgstr "No Matches"
 
-#: ../libpurple/protocols/sametime/sametime.c:5594
+#: ../libpurple/protocols/sametime/sametime.c:5605
 msgid "Search for a user"
 msgstr "Search for a user"
 
-#: ../libpurple/protocols/sametime/sametime.c:5595
+#: ../libpurple/protocols/sametime/sametime.c:5606
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
@@ -8631,39 +8638,39 @@
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
 
-#: ../libpurple/protocols/sametime/sametime.c:5598
+#: ../libpurple/protocols/sametime/sametime.c:5609
 msgid "User Search"
 msgstr "User Search"
 
-#: ../libpurple/protocols/sametime/sametime.c:5610
+#: ../libpurple/protocols/sametime/sametime.c:5622
 msgid "Import Sametime List..."
 msgstr "Import Sametime List..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5614
+#: ../libpurple/protocols/sametime/sametime.c:5626
 msgid "Export Sametime List..."
 msgstr "Export Sametime List..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5618
+#: ../libpurple/protocols/sametime/sametime.c:5630
 msgid "Add Notes Address Book Group..."
 msgstr "Add Notes Address Book Group..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5622
+#: ../libpurple/protocols/sametime/sametime.c:5634
 msgid "User Search..."
 msgstr "User Search..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5719
+#: ../libpurple/protocols/sametime/sametime.c:5740
 msgid "Force login (ignore server redirects)"
 msgstr "Force login (ignore server redirects)"
 
 #. pretend to be Sametime Connect
-#: ../libpurple/protocols/sametime/sametime.c:5729
+#: ../libpurple/protocols/sametime/sametime.c:5750
 msgid "Hide client identity"
 msgstr "Hide client identity"
 
 #: ../libpurple/protocols/silc/buddy.c:52
-#: ../libpurple/protocols/silc/buddy.c:420
-#: ../libpurple/protocols/silc/buddy.c:545
-#: ../libpurple/protocols/silc/buddy.c:711
+#: ../libpurple/protocols/silc/buddy.c:421
+#: ../libpurple/protocols/silc/buddy.c:546
+#: ../libpurple/protocols/silc/buddy.c:712
 #: ../libpurple/protocols/silc/ft.c:338
 #, c-format
 msgid "User %s is not present in the network"
@@ -8709,12 +8716,12 @@
 msgstr "Key agreement cannot be started with yourself"
 
 #: ../libpurple/protocols/silc/buddy.c:258
-#: ../libpurple/protocols/silc/buddy.c:388
-#: ../libpurple/protocols/silc/buddy.c:513
+#: ../libpurple/protocols/silc/buddy.c:389
+#: ../libpurple/protocols/silc/buddy.c:514
 msgid "The remote user is not present in the network any more"
 msgstr "The remote user is not present in the network any more"
 
-#: ../libpurple/protocols/silc/buddy.c:294
+#: ../libpurple/protocols/silc/buddy.c:295
 #, c-format
 msgid ""
 "Key agreement request received from %s. Would you like to perform the key "
@@ -8723,7 +8730,7 @@
 "Key agreement request received from %s. Would you like to perform the key "
 "agreement?"
 
-#: ../libpurple/protocols/silc/buddy.c:298
+#: ../libpurple/protocols/silc/buddy.c:299
 #, c-format
 msgid ""
 "The remote user is waiting key agreement on:\n"
@@ -8734,49 +8741,49 @@
 "Remote host: %s\n"
 "Remote port: %d"
 
-#: ../libpurple/protocols/silc/buddy.c:311
+#: ../libpurple/protocols/silc/buddy.c:312
 msgid "Key Agreement Request"
 msgstr "Key Agreement Request"
 
-#: ../libpurple/protocols/silc/buddy.c:387
-#: ../libpurple/protocols/silc/buddy.c:422
-#: ../libpurple/protocols/silc/buddy.c:464
+#: ../libpurple/protocols/silc/buddy.c:388
+#: ../libpurple/protocols/silc/buddy.c:423
+#: ../libpurple/protocols/silc/buddy.c:465
 msgid "IM With Password"
 msgstr "IM With Password"
 
-#: ../libpurple/protocols/silc/buddy.c:423
+#: ../libpurple/protocols/silc/buddy.c:424
 msgid "Cannot set IM key"
 msgstr "Cannot set IM key"
 
-#: ../libpurple/protocols/silc/buddy.c:465
+#: ../libpurple/protocols/silc/buddy.c:466
 msgid "Set IM Password"
 msgstr "Set IM Password"
 
-#: ../libpurple/protocols/silc/buddy.c:512
-#: ../libpurple/protocols/silc/buddy.c:547
+#: ../libpurple/protocols/silc/buddy.c:513
+#: ../libpurple/protocols/silc/buddy.c:548
 #: ../libpurple/protocols/silc/ops.c:1494
 #: ../libpurple/protocols/silc/ops.c:1505
 msgid "Get Public Key"
 msgstr "Get Public Key"
 
-#: ../libpurple/protocols/silc/buddy.c:548
+#: ../libpurple/protocols/silc/buddy.c:549
 #: ../libpurple/protocols/silc/ops.c:1495
 #: ../libpurple/protocols/silc/ops.c:1506
 msgid "Cannot fetch the public key"
 msgstr "Cannot fetch the public key"
 
-#: ../libpurple/protocols/silc/buddy.c:634
-#: ../libpurple/protocols/silc/buddy.c:1647
+#: ../libpurple/protocols/silc/buddy.c:635
+#: ../libpurple/protocols/silc/buddy.c:1654
 msgid "Show Public Key"
 msgstr "Show Public Key"
 
-#: ../libpurple/protocols/silc/buddy.c:635
-#: ../libpurple/protocols/silc/buddy.c:1030
+#: ../libpurple/protocols/silc/buddy.c:636
+#: ../libpurple/protocols/silc/buddy.c:1033
 #: ../libpurple/protocols/silc/chat.c:237
 msgid "Could not load public key"
 msgstr "Could not load public key"
 
-#: ../libpurple/protocols/silc/buddy.c:712
+#: ../libpurple/protocols/silc/buddy.c:713
 #: ../libpurple/protocols/silc/ops.c:1087
 #: ../libpurple/protocols/silc/ops.c:1159
 #: ../libpurple/protocols/silc/ops.c:1294
@@ -8785,18 +8792,18 @@
 msgid "User Information"
 msgstr "User Information"
 
-#: ../libpurple/protocols/silc/buddy.c:713
+#: ../libpurple/protocols/silc/buddy.c:714
 #: ../libpurple/protocols/silc/ops.c:1160
 #: ../libpurple/protocols/silc/ops.c:1314
 msgid "Cannot get user information"
 msgstr "Cannot get user information"
 
-#: ../libpurple/protocols/silc/buddy.c:734
+#: ../libpurple/protocols/silc/buddy.c:735
 #, c-format
 msgid "The %s buddy is not trusted"
 msgstr "The %s buddy is not trusted"
 
-#: ../libpurple/protocols/silc/buddy.c:737
+#: ../libpurple/protocols/silc/buddy.c:738
 msgid ""
 "You cannot receive buddy notifications until you import his/her public key.  "
 "You can use the Get Public Key command to get the public key."
@@ -8805,16 +8812,16 @@
 "You can use the Get Public Key command to get the public key."
 
 #. Open file selector to select the public key.
-#: ../libpurple/protocols/silc/buddy.c:1064
+#: ../libpurple/protocols/silc/buddy.c:1067
 msgid "Open..."
 msgstr "Open..."
 
-#: ../libpurple/protocols/silc/buddy.c:1073
+#: ../libpurple/protocols/silc/buddy.c:1078
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr "The %s buddy is not present in the network"
 
-#: ../libpurple/protocols/silc/buddy.c:1076
+#: ../libpurple/protocols/silc/buddy.c:1081
 msgid ""
 "To add the buddy you must import his/her public key. Press Import to import "
 "a public key."
@@ -8822,15 +8829,15 @@
 "To add the buddy you must import their public key. Press Import to import a "
 "public key."
 
-#: ../libpurple/protocols/silc/buddy.c:1079
+#: ../libpurple/protocols/silc/buddy.c:1085
 msgid "_Import..."
 msgstr "_Import..."
 
-#: ../libpurple/protocols/silc/buddy.c:1175
+#: ../libpurple/protocols/silc/buddy.c:1181
 msgid "Select correct user"
 msgstr "Select correct user"
 
-#: ../libpurple/protocols/silc/buddy.c:1177
+#: ../libpurple/protocols/silc/buddy.c:1183
 msgid ""
 "More than one user was found with the same public key. Select the correct "
 "user from the list to add to the buddy list."
@@ -8838,7 +8845,7 @@
 "More than one user was found with the same public key. Select the correct "
 "user from the list to add to the buddy list."
 
-#: ../libpurple/protocols/silc/buddy.c:1179
+#: ../libpurple/protocols/silc/buddy.c:1185
 msgid ""
 "More than one user was found with the same name. Select the correct user "
 "from the list to add to the buddy list."
@@ -8846,154 +8853,154 @@
 "More than one user was found with the same name. Select the correct user "
 "from the list to add to the buddy list."
 
-#: ../libpurple/protocols/silc/buddy.c:1467
+#: ../libpurple/protocols/silc/buddy.c:1474
 msgid "Detached"
 msgstr "Detached"
 
-#: ../libpurple/protocols/silc/buddy.c:1471
+#: ../libpurple/protocols/silc/buddy.c:1478
 #: ../libpurple/protocols/silc/silc.c:49
 msgid "Indisposed"
 msgstr "Indisposed"
 
-#: ../libpurple/protocols/silc/buddy.c:1475
+#: ../libpurple/protocols/silc/buddy.c:1482
 #: ../libpurple/protocols/silc/silc.c:51
 msgid "Wake Me Up"
 msgstr "Wake Me Up"
 
-#: ../libpurple/protocols/silc/buddy.c:1477
+#: ../libpurple/protocols/silc/buddy.c:1484
 #: ../libpurple/protocols/silc/silc.c:43
 msgid "Hyper Active"
 msgstr "Hyper Active"
 
-#: ../libpurple/protocols/silc/buddy.c:1479
+#: ../libpurple/protocols/silc/buddy.c:1486
 msgid "Robot"
 msgstr "Robot"
 
-#: ../libpurple/protocols/silc/buddy.c:1486
+#: ../libpurple/protocols/silc/buddy.c:1493
 #: ../libpurple/protocols/silc/silc.c:662
 #: ../libpurple/protocols/silc/util.c:512
 msgid "Happy"
 msgstr "Happy"
 
-#: ../libpurple/protocols/silc/buddy.c:1488
+#: ../libpurple/protocols/silc/buddy.c:1495
 #: ../libpurple/protocols/silc/silc.c:664
 #: ../libpurple/protocols/silc/util.c:514
 msgid "Sad"
 msgstr "Sad"
 
-#: ../libpurple/protocols/silc/buddy.c:1490
+#: ../libpurple/protocols/silc/buddy.c:1497
 #: ../libpurple/protocols/silc/silc.c:666
 #: ../libpurple/protocols/silc/util.c:516
 msgid "Angry"
 msgstr "Angry"
 
-#: ../libpurple/protocols/silc/buddy.c:1492
+#: ../libpurple/protocols/silc/buddy.c:1499
 #: ../libpurple/protocols/silc/silc.c:668
 #: ../libpurple/protocols/silc/util.c:518
 msgid "Jealous"
 msgstr "Jealous"
 
-#: ../libpurple/protocols/silc/buddy.c:1494
+#: ../libpurple/protocols/silc/buddy.c:1501
 #: ../libpurple/protocols/silc/silc.c:670
 #: ../libpurple/protocols/silc/util.c:520
 msgid "Ashamed"
 msgstr "Ashamed"
 
-#: ../libpurple/protocols/silc/buddy.c:1496
+#: ../libpurple/protocols/silc/buddy.c:1503
 #: ../libpurple/protocols/silc/silc.c:672
 #: ../libpurple/protocols/silc/util.c:522
 msgid "Invincible"
 msgstr "Invincible"
 
-#: ../libpurple/protocols/silc/buddy.c:1498
+#: ../libpurple/protocols/silc/buddy.c:1505
 #: ../libpurple/protocols/silc/util.c:524
 msgid "In Love"
 msgstr "In Love"
 
-#: ../libpurple/protocols/silc/buddy.c:1500
+#: ../libpurple/protocols/silc/buddy.c:1507
 #: ../libpurple/protocols/silc/silc.c:676
 #: ../libpurple/protocols/silc/util.c:526
 msgid "Sleepy"
 msgstr "Sleepy"
 
-#: ../libpurple/protocols/silc/buddy.c:1502
+#: ../libpurple/protocols/silc/buddy.c:1509
 #: ../libpurple/protocols/silc/silc.c:678
 #: ../libpurple/protocols/silc/util.c:528
 msgid "Bored"
 msgstr "Bored"
 
-#: ../libpurple/protocols/silc/buddy.c:1504
+#: ../libpurple/protocols/silc/buddy.c:1511
 #: ../libpurple/protocols/silc/silc.c:680
 #: ../libpurple/protocols/silc/util.c:530
 msgid "Excited"
 msgstr "Excited"
 
-#: ../libpurple/protocols/silc/buddy.c:1506
+#: ../libpurple/protocols/silc/buddy.c:1513
 #: ../libpurple/protocols/silc/silc.c:682
 #: ../libpurple/protocols/silc/util.c:532
 msgid "Anxious"
 msgstr "Anxious"
 
-#: ../libpurple/protocols/silc/buddy.c:1538
+#: ../libpurple/protocols/silc/buddy.c:1545
 #: ../libpurple/protocols/silc/ops.c:1202
 msgid "User Modes"
 msgstr "User Modes"
 
-#: ../libpurple/protocols/silc/buddy.c:1550
+#: ../libpurple/protocols/silc/buddy.c:1557
 #: ../libpurple/protocols/silc/ops.c:1207
 msgid "Mood"
 msgstr "Mood"
 
-#: ../libpurple/protocols/silc/buddy.c:1555
+#: ../libpurple/protocols/silc/buddy.c:1562
 #: ../libpurple/protocols/silc/ops.c:1219
 msgid "Preferred Contact"
 msgstr "Preferred Contact"
 
-#: ../libpurple/protocols/silc/buddy.c:1560
+#: ../libpurple/protocols/silc/buddy.c:1567
 #: ../libpurple/protocols/silc/ops.c:1224
 msgid "Preferred Language"
 msgstr "Preferred Language"
 
-#: ../libpurple/protocols/silc/buddy.c:1565
+#: ../libpurple/protocols/silc/buddy.c:1572
 #: ../libpurple/protocols/silc/ops.c:1229
 msgid "Device"
 msgstr "Device"
 
-#: ../libpurple/protocols/silc/buddy.c:1570
+#: ../libpurple/protocols/silc/buddy.c:1577
 #: ../libpurple/protocols/silc/ops.c:1234
 #: ../libpurple/protocols/silc/silc.c:730
 #: ../libpurple/protocols/silc/silc.c:732
 msgid "Timezone"
 msgstr "Timezone"
 
-#: ../libpurple/protocols/silc/buddy.c:1575
+#: ../libpurple/protocols/silc/buddy.c:1582
 #: ../libpurple/protocols/silc/ops.c:1239
 msgid "Geolocation"
 msgstr "Geolocation"
 
-#: ../libpurple/protocols/silc/buddy.c:1629
+#: ../libpurple/protocols/silc/buddy.c:1636
 msgid "Reset IM Key"
 msgstr "Reset IM Key"
 
-#: ../libpurple/protocols/silc/buddy.c:1635
+#: ../libpurple/protocols/silc/buddy.c:1642
 msgid "IM with Key Exchange"
 msgstr "IM with Key Exchange"
 
-#: ../libpurple/protocols/silc/buddy.c:1640
+#: ../libpurple/protocols/silc/buddy.c:1647
 msgid "IM with Password"
 msgstr "IM with Password"
 
-#: ../libpurple/protocols/silc/buddy.c:1653
+#: ../libpurple/protocols/silc/buddy.c:1660
 msgid "Get Public Key..."
 msgstr "Get Public Key..."
 
-#: ../libpurple/protocols/silc/buddy.c:1660
+#: ../libpurple/protocols/silc/buddy.c:1667
 #: ../libpurple/protocols/silc/ops.c:1624
 msgid "Kill User"
 msgstr "Kill User"
 
-#: ../libpurple/protocols/silc/buddy.c:1670
-#: ../libpurple/protocols/silc/chat.c:972
+#: ../libpurple/protocols/silc/buddy.c:1677
+#: ../libpurple/protocols/silc/chat.c:977
 msgid "Draw On Whiteboard"
 msgstr "Draw On Whiteboard"
 
@@ -9069,15 +9076,15 @@
 msgid "Open Public Key..."
 msgstr "Open Public Key..."
 
-#: ../libpurple/protocols/silc/chat.c:400
+#: ../libpurple/protocols/silc/chat.c:401
 msgid "Channel Passphrase"
 msgstr "Channel Passphrase"
 
-#: ../libpurple/protocols/silc/chat.c:407
+#: ../libpurple/protocols/silc/chat.c:408
 msgid "Channel Public Keys List"
 msgstr "Channel Public Keys List"
 
-#: ../libpurple/protocols/silc/chat.c:412
+#: ../libpurple/protocols/silc/chat.c:413
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -9091,131 +9098,131 @@
 "channel public keys are set then only users whose public keys are listed are "
 "able to join."
 
-#: ../libpurple/protocols/silc/chat.c:421
 #: ../libpurple/protocols/silc/chat.c:422
-#: ../libpurple/protocols/silc/chat.c:459
-#: ../libpurple/protocols/silc/chat.c:460
-#: ../libpurple/protocols/silc/chat.c:906
+#: ../libpurple/protocols/silc/chat.c:423
+#: ../libpurple/protocols/silc/chat.c:461
+#: ../libpurple/protocols/silc/chat.c:462
+#: ../libpurple/protocols/silc/chat.c:911
 msgid "Channel Authentication"
 msgstr "Channel Authentication"
 
-#: ../libpurple/protocols/silc/chat.c:423
-#: ../libpurple/protocols/silc/chat.c:461
+#: ../libpurple/protocols/silc/chat.c:424
+#: ../libpurple/protocols/silc/chat.c:463
 msgid "Add / Remove"
 msgstr "Add / Remove"
 
-#: ../libpurple/protocols/silc/chat.c:578
+#: ../libpurple/protocols/silc/chat.c:581
 msgid "Group Name"
 msgstr "Group name"
 
-#: ../libpurple/protocols/silc/chat.c:582
-#: ../libpurple/protocols/silc/ops.c:1909
-#: ../libpurple/protocols/silc/silc.c:938
+#: ../libpurple/protocols/silc/chat.c:585
+#: ../libpurple/protocols/silc/ops.c:1910
+#: ../libpurple/protocols/silc/silc.c:939
 msgid "Passphrase"
 msgstr "Passphrase"
 
-#: ../libpurple/protocols/silc/chat.c:593
+#: ../libpurple/protocols/silc/chat.c:596
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "Please enter the %s channel private group name and passphrase."
 
-#: ../libpurple/protocols/silc/chat.c:595
+#: ../libpurple/protocols/silc/chat.c:598
 msgid "Add Channel Private Group"
 msgstr "Add Channel Private Group"
 
-#: ../libpurple/protocols/silc/chat.c:722
+#: ../libpurple/protocols/silc/chat.c:726
 msgid "User Limit"
 msgstr "User Limit"
 
-#: ../libpurple/protocols/silc/chat.c:723
+#: ../libpurple/protocols/silc/chat.c:727
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr "Set user limit on channel. Set to zero to reset user limit."
 
-#: ../libpurple/protocols/silc/chat.c:886
+#: ../libpurple/protocols/silc/chat.c:891
 msgid "Invite List"
 msgstr "Invite List"
 
-#: ../libpurple/protocols/silc/chat.c:891
+#: ../libpurple/protocols/silc/chat.c:896
 msgid "Ban List"
 msgstr "Ban List"
 
-#: ../libpurple/protocols/silc/chat.c:899
+#: ../libpurple/protocols/silc/chat.c:904
 msgid "Add Private Group"
 msgstr "Add Private Group"
 
-#: ../libpurple/protocols/silc/chat.c:912
+#: ../libpurple/protocols/silc/chat.c:917
 msgid "Reset Permanent"
 msgstr "Reset Permanent"
 
-#: ../libpurple/protocols/silc/chat.c:917
+#: ../libpurple/protocols/silc/chat.c:922
 msgid "Set Permanent"
 msgstr "Set Permanent"
 
-#: ../libpurple/protocols/silc/chat.c:925
+#: ../libpurple/protocols/silc/chat.c:930
 msgid "Set User Limit"
 msgstr "Set User Limit"
 
-#: ../libpurple/protocols/silc/chat.c:931
+#: ../libpurple/protocols/silc/chat.c:936
 msgid "Reset Topic Restriction"
 msgstr "Reset Topic Restriction"
 
-#: ../libpurple/protocols/silc/chat.c:936
+#: ../libpurple/protocols/silc/chat.c:941
 msgid "Set Topic Restriction"
 msgstr "Set Topic Restriction"
 
-#: ../libpurple/protocols/silc/chat.c:943
+#: ../libpurple/protocols/silc/chat.c:948
 msgid "Reset Private Channel"
 msgstr "Reset Private Channel"
 
-#: ../libpurple/protocols/silc/chat.c:948
+#: ../libpurple/protocols/silc/chat.c:953
 msgid "Set Private Channel"
 msgstr "Set Private Channel"
 
-#: ../libpurple/protocols/silc/chat.c:955
+#: ../libpurple/protocols/silc/chat.c:960
 msgid "Reset Secret Channel"
 msgstr "Reset Secret Channel"
 
-#: ../libpurple/protocols/silc/chat.c:960
+#: ../libpurple/protocols/silc/chat.c:965
 msgid "Set Secret Channel"
 msgstr "Set Secret Channel"
 
-#: ../libpurple/protocols/silc/chat.c:1034
+#: ../libpurple/protocols/silc/chat.c:1039
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "You are channel founder on <I>%s</I>"
 
-#: ../libpurple/protocols/silc/chat.c:1038
+#: ../libpurple/protocols/silc/chat.c:1043
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "Channel founder on <I>%s</I> is <I>%s</I>"
 
-#: ../libpurple/protocols/silc/chat.c:1097
+#: ../libpurple/protocols/silc/chat.c:1102
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
 msgstr ""
 "You have to join the %s channel before you are able to join the private group"
 
-#: ../libpurple/protocols/silc/chat.c:1099
+#: ../libpurple/protocols/silc/chat.c:1104
 msgid "Join Private Group"
 msgstr "Join Private Group"
 
-#: ../libpurple/protocols/silc/chat.c:1100
+#: ../libpurple/protocols/silc/chat.c:1105
 msgid "Cannot join private group"
 msgstr "Cannot join private group"
 
-#: ../libpurple/protocols/silc/chat.c:1294
-#: ../libpurple/protocols/silc/silc.c:1146
+#: ../libpurple/protocols/silc/chat.c:1299
+#: ../libpurple/protocols/silc/silc.c:1148
 msgid "Call Command"
 msgstr "Call Command"
 
-#: ../libpurple/protocols/silc/chat.c:1294
-#: ../libpurple/protocols/silc/silc.c:1146
+#: ../libpurple/protocols/silc/chat.c:1299
+#: ../libpurple/protocols/silc/silc.c:1148
 msgid "Cannot call command"
 msgstr "Cannot call command"
 
-#: ../libpurple/protocols/silc/chat.c:1295
-#: ../libpurple/protocols/silc/silc.c:1147
+#: ../libpurple/protocols/silc/chat.c:1300
+#: ../libpurple/protocols/silc/silc.c:1149
 msgid "Unknown command"
 msgstr "Unknown command"
 
@@ -9325,7 +9332,7 @@
 msgstr "Job Role"
 
 #: ../libpurple/protocols/silc/ops.c:1052
-#: ../libpurple/protocols/silc/silc.c:931
+#: ../libpurple/protocols/silc/silc.c:932
 msgid "Organization"
 msgstr "Organisation"
 
@@ -9366,7 +9373,7 @@
 msgstr "_More..."
 
 #: ../libpurple/protocols/silc/ops.c:1371
-#: ../libpurple/protocols/silc/silc.c:997
+#: ../libpurple/protocols/silc/silc.c:999
 msgid "Detach From Server"
 msgstr "Detach From Server"
 
@@ -9504,51 +9511,51 @@
 msgid "Verifying server public key"
 msgstr "Verifying server public key"
 
-#: ../libpurple/protocols/silc/ops.c:1910
+#: ../libpurple/protocols/silc/ops.c:1911
 msgid "Passphrase required"
 msgstr "Passphrase required"
 
-#: ../libpurple/protocols/silc/ops.c:1939
+#: ../libpurple/protocols/silc/ops.c:1940
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Failure: Version mismatch, upgrade your client"
 
-#: ../libpurple/protocols/silc/ops.c:1942
+#: ../libpurple/protocols/silc/ops.c:1943
 msgid "Failure: Remote does not trust/support your public key"
 msgstr "Failure: Remote does not trust/support your public key"
 
-#: ../libpurple/protocols/silc/ops.c:1945
+#: ../libpurple/protocols/silc/ops.c:1946
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "Failure: Remote does not support proposed KE group"
 
-#: ../libpurple/protocols/silc/ops.c:1948
+#: ../libpurple/protocols/silc/ops.c:1949
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "Failure: Remote does not support proposed cipher"
 
-#: ../libpurple/protocols/silc/ops.c:1951
+#: ../libpurple/protocols/silc/ops.c:1952
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "Failure: Remote does not support proposed PKCS"
 
-#: ../libpurple/protocols/silc/ops.c:1954
+#: ../libpurple/protocols/silc/ops.c:1955
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "Failure: Remote does not support proposed hash function"
 
-#: ../libpurple/protocols/silc/ops.c:1957
+#: ../libpurple/protocols/silc/ops.c:1958
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "Failure: Remote does not support proposed HMAC"
 
-#: ../libpurple/protocols/silc/ops.c:1959
+#: ../libpurple/protocols/silc/ops.c:1960
 msgid "Failure: Incorrect signature"
 msgstr "Failure: Incorrect signature"
 
-#: ../libpurple/protocols/silc/ops.c:1961
+#: ../libpurple/protocols/silc/ops.c:1962
 msgid "Failure: Invalid cookie"
 msgstr "Failure: Invalid cookie"
 
-#: ../libpurple/protocols/silc/ops.c:1972
+#: ../libpurple/protocols/silc/ops.c:1973
 msgid "Failure: Authentication failed"
 msgstr "Failure: Authentication failed"
 
-#: ../libpurple/protocols/silc/pk.c:103
+#: ../libpurple/protocols/silc/pk.c:104
 #, c-format
 msgid ""
 "Received %s's public key. Your local copy does not match this key. Would you "
@@ -9557,12 +9564,12 @@
 "Received %s's public key. Your local copy does not match this key. Would you "
 "still like to accept this public key?"
 
-#: ../libpurple/protocols/silc/pk.c:108
+#: ../libpurple/protocols/silc/pk.c:109
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
 msgstr "Received %s's public key. Would you like to accept this public key?"
 
-#: ../libpurple/protocols/silc/pk.c:112
+#: ../libpurple/protocols/silc/pk.c:113
 #, c-format
 msgid ""
 "Fingerprint and babbleprint for the %s key are:\n"
@@ -9575,15 +9582,15 @@
 "%s\n"
 "%s\n"
 
-#: ../libpurple/protocols/silc/pk.c:115 ../libpurple/protocols/silc/pk.c:140
+#: ../libpurple/protocols/silc/pk.c:116 ../libpurple/protocols/silc/pk.c:142
 msgid "Verify Public Key"
 msgstr "Verify Public Key"
 
-#: ../libpurple/protocols/silc/pk.c:119
+#: ../libpurple/protocols/silc/pk.c:121
 msgid "_View..."
 msgstr "_View..."
 
-#: ../libpurple/protocols/silc/pk.c:141
+#: ../libpurple/protocols/silc/pk.c:143
 msgid "Unsupported public key type"
 msgstr "Unsupported public key type"
 
@@ -9633,7 +9640,7 @@
 msgid "Your Current Mood"
 msgstr "Your Current Mood"
 
-#: ../libpurple/protocols/silc/silc.c:660 ../pidgin/gtkprefs.c:1527
+#: ../libpurple/protocols/silc/silc.c:660 ../pidgin/gtkprefs.c:1529
 msgid "Normal"
 msgstr "Normal"
 
@@ -9698,169 +9705,169 @@
 "information. Please fill the information you would like other users to see "
 "about yourself."
 
-#: ../libpurple/protocols/silc/silc.c:779
-#: ../libpurple/protocols/silc/silc.c:785
-#: ../libpurple/protocols/silc/silc.c:1424
+#: ../libpurple/protocols/silc/silc.c:780
+#: ../libpurple/protocols/silc/silc.c:786
+#: ../libpurple/protocols/silc/silc.c:1426
 msgid "Message of the Day"
 msgstr "Message of the Day"
 
-#: ../libpurple/protocols/silc/silc.c:779
+#: ../libpurple/protocols/silc/silc.c:780
 msgid "No Message of the Day available"
 msgstr "No Message of the Day available"
 
-#: ../libpurple/protocols/silc/silc.c:780
-#: ../libpurple/protocols/silc/silc.c:1419
+#: ../libpurple/protocols/silc/silc.c:781
+#: ../libpurple/protocols/silc/silc.c:1421
 msgid "There is no Message of the Day associated with this connection"
 msgstr "There is no Message of the Day associated with this connection"
 
-#: ../libpurple/protocols/silc/silc.c:831
-#: ../libpurple/protocols/silc/silc.c:875
-#: ../libpurple/protocols/silc/silc.c:946
+#: ../libpurple/protocols/silc/silc.c:832
+#: ../libpurple/protocols/silc/silc.c:876
 #: ../libpurple/protocols/silc/silc.c:947
+#: ../libpurple/protocols/silc/silc.c:948
 msgid "Create New SILC Key Pair"
 msgstr "Create New SILC Key Pair"
 
-#: ../libpurple/protocols/silc/silc.c:831
+#: ../libpurple/protocols/silc/silc.c:832
 msgid "Passphrases do not match"
 msgstr "Passphrases do not match"
 
-#: ../libpurple/protocols/silc/silc.c:875
+#: ../libpurple/protocols/silc/silc.c:876
 msgid "Key Pair Generation failed"
 msgstr "Key Pair Generation failed"
 
-#: ../libpurple/protocols/silc/silc.c:914
+#: ../libpurple/protocols/silc/silc.c:915
 msgid "Key length"
 msgstr "Key length"
 
-#: ../libpurple/protocols/silc/silc.c:916
+#: ../libpurple/protocols/silc/silc.c:917
 msgid "Public key file"
 msgstr "Public key file"
 
-#: ../libpurple/protocols/silc/silc.c:918
+#: ../libpurple/protocols/silc/silc.c:919
 msgid "Private key file"
 msgstr "Private key file"
 
-#: ../libpurple/protocols/silc/silc.c:941
+#: ../libpurple/protocols/silc/silc.c:942
 msgid "Passphrase (retype)"
 msgstr "Passphrase (retype)"
 
-#: ../libpurple/protocols/silc/silc.c:948
+#: ../libpurple/protocols/silc/silc.c:949
 msgid "Generate Key Pair"
 msgstr "Generate Key Pair"
 
-#: ../libpurple/protocols/silc/silc.c:992
+#: ../libpurple/protocols/silc/silc.c:994
 msgid "Online Status"
 msgstr "Online Status"
 
-#: ../libpurple/protocols/silc/silc.c:1001
+#: ../libpurple/protocols/silc/silc.c:1003
 msgid "View Message of the Day"
 msgstr "View Message of the Day"
 
-#: ../libpurple/protocols/silc/silc.c:1005
+#: ../libpurple/protocols/silc/silc.c:1007
 msgid "Create SILC Key Pair..."
 msgstr "Create SILC key pair..."
 
-#: ../libpurple/protocols/silc/silc.c:1104
+#: ../libpurple/protocols/silc/silc.c:1106
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "User <I>%s</I> is not present in the network"
 
-#: ../libpurple/protocols/silc/silc.c:1295
+#: ../libpurple/protocols/silc/silc.c:1297
 msgid "Topic too long"
 msgstr "Topic too long."
 
-#: ../libpurple/protocols/silc/silc.c:1376
+#: ../libpurple/protocols/silc/silc.c:1378
 msgid "You must specify a nick"
 msgstr "You must specify a nick"
 
-#: ../libpurple/protocols/silc/silc.c:1478
+#: ../libpurple/protocols/silc/silc.c:1480
 #, c-format
 msgid "channel %s not found"
 msgstr "channel %s not found"
 
-#: ../libpurple/protocols/silc/silc.c:1483
+#: ../libpurple/protocols/silc/silc.c:1485
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "channel modes for %s: %s"
 
-#: ../libpurple/protocols/silc/silc.c:1485
+#: ../libpurple/protocols/silc/silc.c:1487
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "no channel modes are set on %s"
 
-#: ../libpurple/protocols/silc/silc.c:1498
+#: ../libpurple/protocols/silc/silc.c:1500
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "Failed to set cmodes for %s"
 
-#: ../libpurple/protocols/silc/silc.c:1528
+#: ../libpurple/protocols/silc/silc.c:1530
 #, c-format
 msgid "Unknown command: %s, (may be a client bug)"
 msgstr "Unknown command: %s, (may be a client bug)"
 
-#: ../libpurple/protocols/silc/silc.c:1591
+#: ../libpurple/protocols/silc/silc.c:1593
 msgid "part [channel]:  Leave the chat"
 msgstr "part [channel]:  Leave the chat"
 
-#: ../libpurple/protocols/silc/silc.c:1595
+#: ../libpurple/protocols/silc/silc.c:1597
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [channel]:  Leave the chat"
 
-#: ../libpurple/protocols/silc/silc.c:1599
+#: ../libpurple/protocols/silc/silc.c:1601
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;new topic&gt;]:  View or change the topic"
 
-#: ../libpurple/protocols/silc/silc.c:1604
+#: ../libpurple/protocols/silc/silc.c:1606
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 
-#: ../libpurple/protocols/silc/silc.c:1608
+#: ../libpurple/protocols/silc/silc.c:1610
 msgid "list:  List channels on this network"
 msgstr "list:  List channels on this network"
 
-#: ../libpurple/protocols/silc/silc.c:1612
+#: ../libpurple/protocols/silc/silc.c:1614
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;nick&gt;:  View nick's information"
 
-#: ../libpurple/protocols/silc/silc.c:1616
-#: ../libpurple/protocols/zephyr/zephyr.c:2684
+#: ../libpurple/protocols/silc/silc.c:1618
+#: ../libpurple/protocols/zephyr/zephyr.c:2685
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 
-#: ../libpurple/protocols/silc/silc.c:1620
+#: ../libpurple/protocols/silc/silc.c:1622
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr ""
 "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 
-#: ../libpurple/protocols/silc/silc.c:1624
+#: ../libpurple/protocols/silc/silc.c:1626
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd:  View the server's Message Of The Day"
 
-#: ../libpurple/protocols/silc/silc.c:1628
+#: ../libpurple/protocols/silc/silc.c:1630
 msgid "detach:  Detach this session"
 msgstr "detach:  Detach this session"
 
-#: ../libpurple/protocols/silc/silc.c:1632
+#: ../libpurple/protocols/silc/silc.c:1634
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr "quit [message]:  Disconnect from the server, with an optional message"
 
-#: ../libpurple/protocols/silc/silc.c:1636
+#: ../libpurple/protocols/silc/silc.c:1638
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;command&gt;:  Call any silc client command"
 
-#: ../libpurple/protocols/silc/silc.c:1642
+#: ../libpurple/protocols/silc/silc.c:1644
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 
-#: ../libpurple/protocols/silc/silc.c:1646
+#: ../libpurple/protocols/silc/silc.c:1648
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;newnick&gt;:  Change your nickname"
 
-#: ../libpurple/protocols/silc/silc.c:1650
+#: ../libpurple/protocols/silc/silc.c:1652
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;nick&gt;:  View nick's information"
 
-#: ../libpurple/protocols/silc/silc.c:1654
+#: ../libpurple/protocols/silc/silc.c:1656
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
@@ -9868,7 +9875,7 @@
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
 
-#: ../libpurple/protocols/silc/silc.c:1658
+#: ../libpurple/protocols/silc/silc.c:1660
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
@@ -9876,15 +9883,15 @@
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
 
-#: ../libpurple/protocols/silc/silc.c:1662
+#: ../libpurple/protocols/silc/silc.c:1664
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;usermodes&gt;:  Set your modes in the network"
 
-#: ../libpurple/protocols/silc/silc.c:1666
+#: ../libpurple/protocols/silc/silc.c:1668
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 
-#: ../libpurple/protocols/silc/silc.c:1670
+#: ../libpurple/protocols/silc/silc.c:1672
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
@@ -9892,35 +9899,35 @@
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
 
-#: ../libpurple/protocols/silc/silc.c:1674
+#: ../libpurple/protocols/silc/silc.c:1676
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 
-#: ../libpurple/protocols/silc/silc.c:1678
+#: ../libpurple/protocols/silc/silc.c:1680
 msgid "info [server]:  View server administrative details"
 msgstr "info [server]:  View server administrative details"
 
-#: ../libpurple/protocols/silc/silc.c:1682
+#: ../libpurple/protocols/silc/silc.c:1684
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 
-#: ../libpurple/protocols/silc/silc.c:1686
+#: ../libpurple/protocols/silc/silc.c:1688
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 
-#: ../libpurple/protocols/silc/silc.c:1690
+#: ../libpurple/protocols/silc/silc.c:1692
 msgid "stats:  View server and network statistics"
 msgstr "stats:  View server and network statistics"
 
-#: ../libpurple/protocols/silc/silc.c:1694
+#: ../libpurple/protocols/silc/silc.c:1696
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:  Send PING to the connected server"
 
-#: ../libpurple/protocols/silc/silc.c:1699
+#: ../libpurple/protocols/silc/silc.c:1701
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;channel&gt;:  List users in channel"
 
-#: ../libpurple/protocols/silc/silc.c:1703
+#: ../libpurple/protocols/silc/silc.c:1705
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -9937,64 +9944,64 @@
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/protocols/silc/silc.c:1814
+#: ../libpurple/protocols/silc/silc.c:1828
 msgid "SILC Protocol Plugin"
 msgstr "SILC Protocol Plug-in"
 
 #. *  description
-#: ../libpurple/protocols/silc/silc.c:1816
+#: ../libpurple/protocols/silc/silc.c:1830
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Secure Internet Live Conferencing (SILC) Protocol"
 
-#: ../libpurple/protocols/silc/silc.c:1842 ../pidgin/gtkprefs.c:1918
+#: ../libpurple/protocols/silc/silc.c:1862 ../pidgin/gtkprefs.c:1921
 msgid "Network"
 msgstr "Network"
 
-#: ../libpurple/protocols/silc/silc.c:1853
+#: ../libpurple/protocols/silc/silc.c:1873
 msgid "Public Key file"
 msgstr "Public Key file"
 
-#: ../libpurple/protocols/silc/silc.c:1857
+#: ../libpurple/protocols/silc/silc.c:1877
 msgid "Private Key file"
 msgstr "Private Key file"
 
-#: ../libpurple/protocols/silc/silc.c:1867
+#: ../libpurple/protocols/silc/silc.c:1887
 msgid "Cipher"
 msgstr "Cipher"
 
-#: ../libpurple/protocols/silc/silc.c:1877
+#: ../libpurple/protocols/silc/silc.c:1897
 msgid "HMAC"
 msgstr "HMAC"
 
-#: ../libpurple/protocols/silc/silc.c:1880
+#: ../libpurple/protocols/silc/silc.c:1900
 msgid "Public key authentication"
 msgstr "Public key authentication"
 
-#: ../libpurple/protocols/silc/silc.c:1883
+#: ../libpurple/protocols/silc/silc.c:1903
 msgid "Reject watching by other users"
 msgstr "Reject watching by other users"
 
-#: ../libpurple/protocols/silc/silc.c:1886
+#: ../libpurple/protocols/silc/silc.c:1906
 msgid "Block invites"
 msgstr "Block invites"
 
-#: ../libpurple/protocols/silc/silc.c:1889
+#: ../libpurple/protocols/silc/silc.c:1909
 msgid "Block IMs without Key Exchange"
 msgstr "Block IMs without Key Exchange"
 
-#: ../libpurple/protocols/silc/silc.c:1892
+#: ../libpurple/protocols/silc/silc.c:1912
 msgid "Reject online status attribute requests"
 msgstr "Reject online status attribute requests"
 
-#: ../libpurple/protocols/silc/silc.c:1895
+#: ../libpurple/protocols/silc/silc.c:1915
 msgid "Block messages to whiteboard"
 msgstr "Block messages to whiteboard"
 
-#: ../libpurple/protocols/silc/silc.c:1898
+#: ../libpurple/protocols/silc/silc.c:1918
 msgid "Automatically open whiteboard"
 msgstr "Automatically open whiteboard"
 
-#: ../libpurple/protocols/silc/silc.c:1901
+#: ../libpurple/protocols/silc/silc.c:1921
 msgid "Digitally sign and verify all messages"
 msgstr "Digitally sign and verify all messages"
 
@@ -10115,26 +10122,26 @@
 msgstr "Could not write"
 
 #: ../libpurple/protocols/simple/simple.c:438
-#: ../libpurple/protocols/simple/simple.c:1482
+#: ../libpurple/protocols/simple/simple.c:1484
 msgid "Could not connect"
 msgstr "Could not connect"
 
-#: ../libpurple/protocols/simple/simple.c:1516
-#: ../libpurple/protocols/simple/simple.c:1558
-#: ../libpurple/protocols/simple/simple.c:1571
-#: ../libpurple/protocols/simple/simple.c:1622
+#: ../libpurple/protocols/simple/simple.c:1518
+#: ../libpurple/protocols/simple/simple.c:1560
+#: ../libpurple/protocols/simple/simple.c:1573
+#: ../libpurple/protocols/simple/simple.c:1624
 msgid "Could not create listen socket"
 msgstr "Could not create listen socket"
 
-#: ../libpurple/protocols/simple/simple.c:1539
+#: ../libpurple/protocols/simple/simple.c:1541
 msgid "Couldn't resolve host"
 msgstr "Couldn't resolve host"
 
-#: ../libpurple/protocols/simple/simple.c:1630
+#: ../libpurple/protocols/simple/simple.c:1632
 msgid "Could not resolve hostname"
 msgstr "Could not resolve hostname"
 
-#: ../libpurple/protocols/simple/simple.c:1647
+#: ../libpurple/protocols/simple/simple.c:1649
 msgid "SIP screen names may not contain whitespaces or @ symbols"
 msgstr "SIP screen names may not contain whitespaces or @ symbols"
 
@@ -10146,36 +10153,36 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:1816
+#: ../libpurple/protocols/simple/simple.c:1824
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE Protocol Plug-in"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:1817
+#: ../libpurple/protocols/simple/simple.c:1825
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "The SIP/SIMPLE Protocol Plug-in"
 
-#: ../libpurple/protocols/simple/simple.c:1839
+#: ../libpurple/protocols/simple/simple.c:1853
 msgid "Publish status (note: everyone may watch you)"
 msgstr "Publish status (note: anyone can watch you)"
 
-#: ../libpurple/protocols/simple/simple.c:1845
+#: ../libpurple/protocols/simple/simple.c:1859
 msgid "Use UDP"
 msgstr "Use UDP"
 
-#: ../libpurple/protocols/simple/simple.c:1847
+#: ../libpurple/protocols/simple/simple.c:1861
 msgid "Use proxy"
 msgstr "Use proxy"
 
-#: ../libpurple/protocols/simple/simple.c:1849
+#: ../libpurple/protocols/simple/simple.c:1863
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../libpurple/protocols/simple/simple.c:1851
+#: ../libpurple/protocols/simple/simple.c:1865
 msgid "Auth User"
 msgstr "Auth User"
 
-#: ../libpurple/protocols/simple/simple.c:1853
+#: ../libpurple/protocols/simple/simple.c:1867
 msgid "Auth Domain"
 msgstr "Auth Domain"
 
@@ -10394,30 +10401,30 @@
 msgid "TOC Protocol Plugin"
 msgstr "TOC Protocol Plug-in"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:805
+#: ../libpurple/protocols/yahoo/yahoo.c:810
 msgid "Your Yahoo! message did not get sent."
 msgstr "Your Yahoo! message did not get sent."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:875
+#: ../libpurple/protocols/yahoo/yahoo.c:880
 #, c-format
 msgid "%s just sent you a Buzz!"
 msgstr "%s just sent you a Buzz!"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:925
+#: ../libpurple/protocols/yahoo/yahoo.c:927
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Yahoo! system message for %s:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:985
+#: ../libpurple/protocols/yahoo/yahoo.c:986
 msgid "Authorization denied message:"
 msgstr "Authorisation denied message:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1064
+#: ../libpurple/protocols/yahoo/yahoo.c:1067
 #, 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:1067
+#: ../libpurple/protocols/yahoo/yahoo.c:1070
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -10426,11 +10433,11 @@
 "%s has (retroactively) denied your request to add them to your list for the "
 "following reason: %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1070
+#: ../libpurple/protocols/yahoo/yahoo.c:1073
 msgid "Add buddy rejected"
 msgstr "Add buddy rejected"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1821
+#: ../libpurple/protocols/yahoo/yahoo.c:1824
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -10441,11 +10448,11 @@
 "method.  You will probably not be able to successfully sign on to Yahoo.  "
 "Check %s for updates."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1824
+#: ../libpurple/protocols/yahoo/yahoo.c:1827
 msgid "Failed Yahoo! Authentication"
 msgstr "Failed Yahoo! Authentication"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1890
+#: ../libpurple/protocols/yahoo/yahoo.c:1893
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -10454,148 +10461,149 @@
 "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:1893
+#: ../libpurple/protocols/yahoo/yahoo.c:1896
 msgid "Ignore buddy?"
 msgstr "Ignore buddy?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1950
+#: ../libpurple/protocols/yahoo/yahoo.c:1955
 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:1953
+#: ../libpurple/protocols/yahoo/yahoo.c:1958
 #, 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:2007
+#: ../libpurple/protocols/yahoo/yahoo.c:2012
 #, 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:2010
+#: ../libpurple/protocols/yahoo/yahoo.c:2015
 msgid "Could not add buddy to server list"
 msgstr "Could not add buddy to server list"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2129
+#: ../libpurple/protocols/yahoo/yahoo.c:2134
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Audible %s/%s/%s.swf ] %s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2461
+#: ../libpurple/protocols/yahoo/yahoo.c:2466
 msgid "Received unexpected HTTP response from server."
 msgstr "Received unexpected HTTP response from server."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2485
-#: ../libpurple/protocols/yahoo/yahoo.c:2664
-#: ../libpurple/protocols/yahoo/yahoo.c:2768
-#: ../libpurple/protocols/yahoo/yahoo.c:2778
+#: ../libpurple/protocols/yahoo/yahoo.c:2490
+#: ../libpurple/protocols/yahoo/yahoo.c:2669
+#: ../libpurple/protocols/yahoo/yahoo.c:2772
+#: ../libpurple/protocols/yahoo/yahoo.c:2782
 #: ../libpurple/protocols/yahoo/yahoochat.c:1455
 #: ../libpurple/protocols/yahoo/yahoochat.c:1525
 #: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "Connection problem"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2880
-#: ../libpurple/protocols/yahoo/yahoo.c:3486
+#: ../libpurple/protocols/yahoo/yahoo.c:2884
+#: ../libpurple/protocols/yahoo/yahoo.c:3495
 msgid "Not at Home"
 msgstr "Not at Home"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2882
-#: ../libpurple/protocols/yahoo/yahoo.c:3489
+#: ../libpurple/protocols/yahoo/yahoo.c:2886
+#: ../libpurple/protocols/yahoo/yahoo.c:3498
 msgid "Not at Desk"
 msgstr "Not at Desk"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2884
-#: ../libpurple/protocols/yahoo/yahoo.c:3492
+#: ../libpurple/protocols/yahoo/yahoo.c:2888
+#: ../libpurple/protocols/yahoo/yahoo.c:3501
 msgid "Not in Office"
 msgstr "Not in Office"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2888
-#: ../libpurple/protocols/yahoo/yahoo.c:3498
+#: ../libpurple/protocols/yahoo/yahoo.c:2892
+#: ../libpurple/protocols/yahoo/yahoo.c:3507
 msgid "On Vacation"
 msgstr "On Vacation"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2892
-#: ../libpurple/protocols/yahoo/yahoo.c:3504
+#: ../libpurple/protocols/yahoo/yahoo.c:2896
+#: ../libpurple/protocols/yahoo/yahoo.c:3513
 msgid "Stepped Out"
 msgstr "Stepped Out"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2985
-#: ../libpurple/protocols/yahoo/yahoo.c:3015
+#: ../libpurple/protocols/yahoo/yahoo.c:2989
+#: ../libpurple/protocols/yahoo/yahoo.c:3019
 msgid "Not on server list"
 msgstr "Not on server list"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3032
-#: ../libpurple/protocols/yahoo/yahoo.c:3090
+#: ../libpurple/protocols/yahoo/yahoo.c:3036
+#: ../libpurple/protocols/yahoo/yahoo.c:3094
 msgid "Appear Online"
 msgstr "Appear Online"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3035
-#: ../libpurple/protocols/yahoo/yahoo.c:3111
+#: ../libpurple/protocols/yahoo/yahoo.c:3039
+#: ../libpurple/protocols/yahoo/yahoo.c:3115
 msgid "Appear Permanently Offline"
 msgstr "Appear Permanently Offline"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3053
+#: ../libpurple/protocols/yahoo/yahoo.c:3057
 msgid "Presence"
 msgstr "Presence"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3096
+#: ../libpurple/protocols/yahoo/yahoo.c:3100
 msgid "Appear Offline"
 msgstr "Appear Offline"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3105
+#: ../libpurple/protocols/yahoo/yahoo.c:3109
 msgid "Don't Appear Permanently Offline"
 msgstr "Don't Appear Permanently Offline"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3153
+#: ../libpurple/protocols/yahoo/yahoo.c:3157
 msgid "Join in Chat"
 msgstr "Join in Chat"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3159
+#: ../libpurple/protocols/yahoo/yahoo.c:3163
 msgid "Initiate Conference"
 msgstr "Initiate Conference"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3187
+#: ../libpurple/protocols/yahoo/yahoo.c:3191
 msgid "Presence Settings"
 msgstr "Presence Settings"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3193
+#: ../libpurple/protocols/yahoo/yahoo.c:3197
 msgid "Start Doodling"
 msgstr "Start Doodling"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3225
+#. XXX Typo: This should be _("Activate which ID?") - fix after string freeze is over
+#: ../libpurple/protocols/yahoo/yahoo.c:3230
 msgid "Active which ID?"
 msgstr "Active which ID?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3234
+#: ../libpurple/protocols/yahoo/yahoo.c:3241
 msgid "Join who in chat?"
 msgstr "Join who in chat?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3244
+#: ../libpurple/protocols/yahoo/yahoo.c:3253
 msgid "Activate ID..."
 msgstr "Activate ID..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3248
+#: ../libpurple/protocols/yahoo/yahoo.c:3257
 msgid "Join User in Chat..."
 msgstr "Join User in Chat..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3755
+#: ../libpurple/protocols/yahoo/yahoo.c:3764
 msgid "You have just sent a Buzz!"
 msgstr "You have just sent a Buzz!"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3814
+#: ../libpurple/protocols/yahoo/yahoo.c:3823
 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:3819
+#: ../libpurple/protocols/yahoo/yahoo.c:3828
 msgid "list: List rooms on the Yahoo network"
 msgstr "list:  List rooms on the Yahoo network"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3823
+#: ../libpurple/protocols/yahoo/yahoo.c:3832
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Buzz a user to get their attention"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3827
+#: ../libpurple/protocols/yahoo/yahoo.c:3836
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: Request user to start a Doodle session"
 
@@ -10609,56 +10617,56 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4023
-#: ../libpurple/protocols/yahoo/yahoo.c:4025
+#: ../libpurple/protocols/yahoo/yahoo.c:4044
+#: ../libpurple/protocols/yahoo/yahoo.c:4046
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo Protocol Plug-in"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4042
+#: ../libpurple/protocols/yahoo/yahoo.c:4069
 msgid "Yahoo Japan"
 msgstr "Yahoo Japan"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4045
+#: ../libpurple/protocols/yahoo/yahoo.c:4072
 msgid "Pager server"
 msgstr "Pager server"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4048
+#: ../libpurple/protocols/yahoo/yahoo.c:4075
 msgid "Japan Pager server"
 msgstr "Japan Pager server"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4051
+#: ../libpurple/protocols/yahoo/yahoo.c:4078
 msgid "Pager port"
 msgstr "Pager port"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4054
+#: ../libpurple/protocols/yahoo/yahoo.c:4081
 msgid "File transfer server"
 msgstr "File transfer server"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4057
+#: ../libpurple/protocols/yahoo/yahoo.c:4084
 msgid "Japan file transfer server"
 msgstr "Japan file transfer server"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4060
+#: ../libpurple/protocols/yahoo/yahoo.c:4087
 msgid "File transfer port"
 msgstr "File transfer port"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4063
+#: ../libpurple/protocols/yahoo/yahoo.c:4090
 msgid "Chat room locale"
 msgstr "Chat room locale"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4066
+#: ../libpurple/protocols/yahoo/yahoo.c:4093
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignore conference and chatroom invitations"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4074
+#: ../libpurple/protocols/yahoo/yahoo.c:4101
 msgid "Chat room list URL"
 msgstr "Chat room list URL"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4077
+#: ../libpurple/protocols/yahoo/yahoo.c:4104
 msgid "Yahoo Chat server"
 msgstr "Yahoo Chat server"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4080
+#: ../libpurple/protocols/yahoo/yahoo.c:4107
 msgid "Yahoo Chat port"
 msgstr "Yahoo Chat port"
 
@@ -10872,74 +10880,74 @@
 msgstr "Unable to send to chat %s,%s,%s"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:786
-#: ../libpurple/protocols/zephyr/zephyr.c:1203
+#: ../libpurple/protocols/zephyr/zephyr.c:1204
 msgid "User"
 msgstr "User"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:791
-#: ../libpurple/protocols/zephyr/zephyr.c:1209
+#: ../libpurple/protocols/zephyr/zephyr.c:1210
 msgid "Hidden or not logged-in"
 msgstr "Hidden or not logged-in"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:797
-#: ../libpurple/protocols/zephyr/zephyr.c:1211
+#: ../libpurple/protocols/zephyr/zephyr.c:1212
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>At %s since %s"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:1545
 #: ../libpurple/protocols/zephyr/zephyr.c:1546
+#: ../libpurple/protocols/zephyr/zephyr.c:1547
 msgid "Anyone"
 msgstr "Anyone"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2353
+#: ../libpurple/protocols/zephyr/zephyr.c:2354
 msgid "_Class:"
 msgstr "_Class:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2359
+#: ../libpurple/protocols/zephyr/zephyr.c:2360
 msgid "_Instance:"
 msgstr "_Instance:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2365
+#: ../libpurple/protocols/zephyr/zephyr.c:2366
 msgid "_Recipient:"
 msgstr "_Recipient:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2376
+#: ../libpurple/protocols/zephyr/zephyr.c:2377
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "Attempt to subscribe to %s,%s,%s failed"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2689
+#: ../libpurple/protocols/zephyr/zephyr.c:2690
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;nick&gt;: Locate user"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2694
+#: ../libpurple/protocols/zephyr/zephyr.c:2695
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;nick&gt;: Locate user"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2699
+#: ../libpurple/protocols/zephyr/zephyr.c:2700
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "instance &lt;instance&gt;: Set the instance to be used on this class"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2704
+#: ../libpurple/protocols/zephyr/zephyr.c:2705
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "inst &lt;instance&gt;: Set the instance to be used on this class"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2709
+#: ../libpurple/protocols/zephyr/zephyr.c:2710
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "topic &lt;instance&gt;: Set the instance to be used on this class"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2715
+#: ../libpurple/protocols/zephyr/zephyr.c:2716
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2720
+#: ../libpurple/protocols/zephyr/zephyr.c:2721
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2726
+#: ../libpurple/protocols/zephyr/zephyr.c:2727
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
@@ -10947,7 +10955,7 @@
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2732
+#: ../libpurple/protocols/zephyr/zephyr.c:2733
 msgid ""
 "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
 "<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
@@ -10955,7 +10963,7 @@
 "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
 "<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2738
+#: ../libpurple/protocols/zephyr/zephyr.c:2739
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
@@ -10963,15 +10971,15 @@
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2743
+#: ../libpurple/protocols/zephyr/zephyr.c:2744
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2849
+#: ../libpurple/protocols/zephyr/zephyr.c:2850
 msgid "Resubscribe"
 msgstr "Resubscribe"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2852
+#: ../libpurple/protocols/zephyr/zephyr.c:2853
 msgid "Retrieve subscriptions from server"
 msgstr "Retrieve subscriptions from server"
 
@@ -10985,40 +10993,40 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/zephyr/zephyr.c:2939
-#: ../libpurple/protocols/zephyr/zephyr.c:2941
+#: ../libpurple/protocols/zephyr/zephyr.c:2946
+#: ../libpurple/protocols/zephyr/zephyr.c:2948
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr Protocol Plug-in"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2960
+#: ../libpurple/protocols/zephyr/zephyr.c:2973
 msgid "Use tzc"
 msgstr "Use tzc"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2963
+#: ../libpurple/protocols/zephyr/zephyr.c:2976
 msgid "tzc command"
 msgstr "tzc command"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2966
+#: ../libpurple/protocols/zephyr/zephyr.c:2979
 msgid "Export to .anyone"
 msgstr "Export to .anyone"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2969
+#: ../libpurple/protocols/zephyr/zephyr.c:2982
 msgid "Export to .zephyr.subs"
 msgstr "Export to .zephyr.subs"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2972
+#: ../libpurple/protocols/zephyr/zephyr.c:2985
 msgid "Import from .anyone"
 msgstr "Import from .anyone"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2975
+#: ../libpurple/protocols/zephyr/zephyr.c:2988
 msgid "Import from .zephyr.subs"
 msgstr "Import from .zephyr.subs"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2978
+#: ../libpurple/protocols/zephyr/zephyr.c:2991
 msgid "Realm"
 msgstr "Realm"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2981
+#: ../libpurple/protocols/zephyr/zephyr.c:2994
 msgid "Exposure"
 msgstr "Exposure"
 
@@ -11060,18 +11068,18 @@
 #. *
 #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
 #.
-#: ../libpurple/request.h:1341
+#: ../libpurple/request.h:1377
 msgid "_Yes"
 msgstr "_Yes"
 
-#: ../libpurple/request.h:1341
+#: ../libpurple/request.h:1377
 msgid "_No"
 msgstr "_No"
 
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
-#: ../libpurple/request.h:1360
+#: ../libpurple/request.h:1397
 msgid "_Accept"
 msgstr "_Accept"
 
@@ -11082,16 +11090,16 @@
 msgid "I'm not here right now"
 msgstr "I'm not here right now"
 
-#: ../libpurple/savedstatuses.c:526
+#: ../libpurple/savedstatuses.c:532
 msgid "saved statuses"
 msgstr "saved statuses"
 
-#: ../libpurple/server.c:228
+#: ../libpurple/server.c:233
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s is now known as %s.\n"
 
-#: ../libpurple/server.c:670
+#: ../libpurple/server.c:679
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -11100,58 +11108,58 @@
 "%s has invited %s to the chat room %s:\n"
 "%s"
 
-#: ../libpurple/server.c:675
+#: ../libpurple/server.c:684
 #, 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:679
+#: ../libpurple/server.c:688
 msgid "Accept chat invitation?"
 msgstr "Accept chat invitation?"
 
-#: ../libpurple/status.c:153
+#: ../libpurple/status.c:152
 msgid "Unset"
 msgstr "Unset"
 
-#: ../libpurple/status.c:156
+#: ../libpurple/status.c:155
 msgid "Unavailable"
 msgstr "Unavailable"
 
-#: ../libpurple/status.c:160
+#: ../libpurple/status.c:159
 msgid "Mobile"
 msgstr "Mobile"
 
-#: ../libpurple/status.c:611
+#: ../libpurple/status.c:608
 #, c-format
 msgid "%s changed status from %s to %s"
 msgstr "%s changed status from %s to %s"
 
-#: ../libpurple/status.c:621
+#: ../libpurple/status.c:618
 #, c-format
 msgid "%s is now %s"
 msgstr "%s is now %s"
 
-#: ../libpurple/status.c:626
+#: ../libpurple/status.c:623
 #, c-format
 msgid "%s is no longer %s"
 msgstr "%s is no longer %s"
 
-#: ../libpurple/status.c:1293
+#: ../libpurple/status.c:1233
 #, c-format
 msgid "%s became idle"
 msgstr "%s became idle"
 
-#: ../libpurple/status.c:1310
+#: ../libpurple/status.c:1250
 #, c-format
 msgid "%s became unidle"
 msgstr "%s is no longer idle"
 
-#: ../libpurple/status.c:1376
+#: ../libpurple/status.c:1312
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s became idle"
 
-#: ../libpurple/status.c:1378
+#: ../libpurple/status.c:1314
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s is no longer idle"
@@ -11161,12 +11169,12 @@
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2503
+#: ../libpurple/util.c:2553
 #, c-format
 msgid "Error Reading %s"
 msgstr "Error reading %s"
 
-#: ../libpurple/util.c:2504
+#: ../libpurple/util.c:2554
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -11175,62 +11183,62 @@
 "An error was encountered reading your %s.  They have not been loaded, and "
 "the old file has been renamed to %s~."
 
-#: ../libpurple/util.c:2967
+#: ../libpurple/util.c:3024
 msgid "Calculating..."
 msgstr "Calculating..."
 
-#: ../libpurple/util.c:2970
+#: ../libpurple/util.c:3027
 msgid "Unknown."
 msgstr "Unknown."
 
-#: ../libpurple/util.c:2996
+#: ../libpurple/util.c:3053
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d second"
 msgstr[1] "%d seconds"
 
-#: ../libpurple/util.c:3008
+#: ../libpurple/util.c:3065
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d day"
 msgstr[1] "%d days"
 
-#: ../libpurple/util.c:3016
+#: ../libpurple/util.c:3073
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d hour"
 msgstr[1] "%s, %d hours"
 
-#: ../libpurple/util.c:3022
+#: ../libpurple/util.c:3079
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hour"
 msgstr[1] "%d hours"
 
-#: ../libpurple/util.c:3030
+#: ../libpurple/util.c:3087
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d minute"
 msgstr[1] "%s, %d minutes"
 
-#: ../libpurple/util.c:3036
+#: ../libpurple/util.c:3093
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minute"
 msgstr[1] "%d minutes"
 
-#: ../libpurple/util.c:3303 ../libpurple/util.c:3601
+#: ../libpurple/util.c:3365 ../libpurple/util.c:3663
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "Unable to connect to %s"
 
-#: ../libpurple/util.c:3429
+#: ../libpurple/util.c:3491
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
@@ -11239,17 +11247,17 @@
 "Unable to allocate enough memory to hold the contents from %s.  The web "
 "server may be trying something malicious."
 
-#: ../libpurple/util.c:3464
+#: ../libpurple/util.c:3526
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "Error reading from %s: %s"
 
-#: ../libpurple/util.c:3495
+#: ../libpurple/util.c:3557
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "Error writing to %s: %s"
 
-#: ../libpurple/util.c:3520
+#: ../libpurple/util.c:3582
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "Unable to connect to %s: %s"
@@ -11275,55 +11283,55 @@
 msgstr "The orientation of the tray."
 
 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:390
+#: ../pidgin/gtkaccount.c:408
 msgid "Login Options"
 msgstr "Login Options"
 
-#: ../pidgin/gtkaccount.c:492
+#: ../pidgin/gtkaccount.c:524
 msgid "Local alias:"
 msgstr "Local alias:"
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:554
+#: ../pidgin/gtkaccount.c:586
 msgid "User Options"
 msgstr "User Options"
 
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:572
+#: ../pidgin/gtkaccount.c:604
 msgid "Use this buddy icon for this account:"
 msgstr "Use this buddy icon for this account:"
 
 #. Build the protocol options frame.
-#: ../pidgin/gtkaccount.c:684
+#: ../pidgin/gtkaccount.c:724
 #, c-format
 msgid "%s Options"
 msgstr "%s Options"
 
-#: ../pidgin/gtkaccount.c:881
+#: ../pidgin/gtkaccount.c:929
 msgid "Use GNOME Proxy Settings"
 msgstr "Use GNOME Proxy Settings"
 
-#: ../pidgin/gtkaccount.c:882
+#: ../pidgin/gtkaccount.c:930
 msgid "Use Global Proxy Settings"
 msgstr "Use Global Proxy Settings"
 
-#: ../pidgin/gtkaccount.c:888
+#: ../pidgin/gtkaccount.c:936
 msgid "No Proxy"
 msgstr "No Proxy"
 
-#: ../pidgin/gtkaccount.c:894
+#: ../pidgin/gtkaccount.c:942
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../pidgin/gtkaccount.c:900
+#: ../pidgin/gtkaccount.c:948
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../pidgin/gtkaccount.c:906
+#: ../pidgin/gtkaccount.c:954
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:912 ../pidgin/gtkprefs.c:1100
+#: ../pidgin/gtkaccount.c:960 ../pidgin/gtkprefs.c:1100
 msgid "Use Environmental Settings"
 msgstr "Use Environmental Settings"
 
@@ -11332,60 +11340,60 @@
 #. A) your network is really slow and you have nothing better to do than
 #. look at butterflies.
 #. B)You are looking really closely at something that shouldn't matter.
-#: ../pidgin/gtkaccount.c:951
+#: ../pidgin/gtkaccount.c:999
 msgid "If you look real closely"
 msgstr "If you look real closely"
 
 #. This is an easter egg. See the comment on the previous line in the source.
-#: ../pidgin/gtkaccount.c:954
+#: ../pidgin/gtkaccount.c:1002
 msgid "you can see the butterflies mating"
 msgstr "you can see the butterflies mating"
 
-#: ../pidgin/gtkaccount.c:975
+#: ../pidgin/gtkaccount.c:1023
 msgid "Proxy Options"
 msgstr "Proxy Options"
 
-#: ../pidgin/gtkaccount.c:989 ../pidgin/gtkprefs.c:1094
+#: ../pidgin/gtkaccount.c:1037 ../pidgin/gtkprefs.c:1094
 msgid "Proxy _type:"
 msgstr "Proxy _type:"
 
-#: ../pidgin/gtkaccount.c:998 ../pidgin/gtkprefs.c:1115
+#: ../pidgin/gtkaccount.c:1046 ../pidgin/gtkprefs.c:1115
 msgid "_Host:"
 msgstr "_Host:"
 
-#: ../pidgin/gtkaccount.c:1002 ../pidgin/gtkprefs.c:1133
+#: ../pidgin/gtkaccount.c:1050 ../pidgin/gtkprefs.c:1133
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../pidgin/gtkaccount.c:1010
+#: ../pidgin/gtkaccount.c:1058
 msgid "_Username:"
 msgstr "_Username:"
 
-#: ../pidgin/gtkaccount.c:1017 ../pidgin/gtkprefs.c:1170
+#: ../pidgin/gtkaccount.c:1065 ../pidgin/gtkprefs.c:1170
 msgid "Pa_ssword:"
 msgstr "Pa_ssword:"
 
-#: ../pidgin/gtkaccount.c:1428
+#: ../pidgin/gtkaccount.c:1471
 msgid "Add Account"
 msgstr "Add Account"
 
-#: ../pidgin/gtkaccount.c:1452
+#: ../pidgin/gtkaccount.c:1495
 msgid "_Basic"
 msgstr "_Basic"
 
-#: ../pidgin/gtkaccount.c:1463
+#: ../pidgin/gtkaccount.c:1506
 msgid "_Advanced"
 msgstr "_Advanced"
 
-#: ../pidgin/gtkaccount.c:1933 ../pidgin/gtkplugin.c:566
+#: ../pidgin/gtkaccount.c:1978 ../pidgin/gtkplugin.c:568
 msgid "Enabled"
 msgstr "Enabled"
 
-#: ../pidgin/gtkaccount.c:1961
+#: ../pidgin/gtkaccount.c:2006
 msgid "Protocol"
 msgstr "Protocol"
 
-#: ../pidgin/gtkaccount.c:2144
+#: ../pidgin/gtkaccount.c:2200
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -11408,11 +11416,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:704
+#: ../pidgin/gtkblist.c:724
 msgid "Join a Chat"
 msgstr "Join a Chat"
 
-#: ../pidgin/gtkblist.c:725
+#: ../pidgin/gtkblist.c:745
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
@@ -11420,222 +11428,222 @@
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 
-#: ../pidgin/gtkblist.c:736 ../pidgin/gtkpounce.c:529
+#: ../pidgin/gtkblist.c:756 ../pidgin/gtkpounce.c:531
 #: ../pidgin/gtkroomlist.c:399
 msgid "_Account:"
 msgstr "_Account:"
 
-#: ../pidgin/gtkblist.c:1010 ../pidgin/gtkprivacy.c:603
-#: ../pidgin/gtkprivacy.c:614
+#: ../pidgin/gtkblist.c:1045 ../pidgin/gtkprivacy.c:606
+#: ../pidgin/gtkprivacy.c:620
 msgid "_Block"
 msgstr "_Block"
 
-#: ../pidgin/gtkblist.c:1010
+#: ../pidgin/gtkblist.c:1045
 msgid "Un_block"
 msgstr "Un_block"
 
-#: ../pidgin/gtkblist.c:1061
+#: ../pidgin/gtkblist.c:1096
 msgid "Get _Info"
 msgstr "Get _Info"
 
-#: ../pidgin/gtkblist.c:1064 ../pidgin/pidginstock.c:91
+#: ../pidgin/gtkblist.c:1099 ../pidgin/pidginstock.c:84
 msgid "I_M"
 msgstr "I_M"
 
-#: ../pidgin/gtkblist.c:1070
+#: ../pidgin/gtkblist.c:1105
 msgid "_Send File"
 msgstr "_Send File"
 
-#: ../pidgin/gtkblist.c:1077
+#: ../pidgin/gtkblist.c:1112
 msgid "Add Buddy _Pounce"
 msgstr "Add Buddy _Pounce"
 
-#: ../pidgin/gtkblist.c:1081 ../pidgin/gtkblist.c:1085
-#: ../pidgin/gtkblist.c:1184 ../pidgin/gtkblist.c:1207
+#: ../pidgin/gtkblist.c:1116 ../pidgin/gtkblist.c:1120
+#: ../pidgin/gtkblist.c:1222 ../pidgin/gtkblist.c:1245
 msgid "View _Log"
 msgstr "View _Log"
 
-#: ../pidgin/gtkblist.c:1097
+#: ../pidgin/gtkblist.c:1132
 msgid "Alias..."
 msgstr "Alias..."
 
-#: ../pidgin/gtkblist.c:1106 ../pidgin/gtkblist.c:1192
-#: ../pidgin/gtkblist.c:1213
+#: ../pidgin/gtkblist.c:1141 ../pidgin/gtkblist.c:1230
+#: ../pidgin/gtkblist.c:1251
 msgid "_Alias..."
 msgstr "_Alias..."
 
-#: ../pidgin/gtkblist.c:1108 ../pidgin/gtkblist.c:1194
-#: ../pidgin/gtkblist.c:1215
+#: ../pidgin/gtkblist.c:1143 ../pidgin/gtkblist.c:1232
+#: ../pidgin/gtkblist.c:1253
 msgid "_Remove"
 msgstr "_Remove"
 
-#: ../pidgin/gtkblist.c:1155
+#: ../pidgin/gtkblist.c:1192
 msgid "Add a _Buddy"
 msgstr "Add a _Buddy"
 
-#: ../pidgin/gtkblist.c:1157
+#: ../pidgin/gtkblist.c:1195
 msgid "Add a C_hat"
 msgstr "Add a C_hat"
 
-#: ../pidgin/gtkblist.c:1160
+#: ../pidgin/gtkblist.c:1198
 msgid "_Delete Group"
 msgstr "_Delete Group"
 
-#: ../pidgin/gtkblist.c:1162
+#: ../pidgin/gtkblist.c:1200
 msgid "_Rename"
 msgstr "_Rename"
 
 #. join button
-#: ../pidgin/gtkblist.c:1180 ../pidgin/gtkroomlist.c:306
-#: ../pidgin/gtkroomlist.c:463 ../pidgin/pidginstock.c:89
+#: ../pidgin/gtkblist.c:1218 ../pidgin/gtkroomlist.c:306
+#: ../pidgin/gtkroomlist.c:463 ../pidgin/pidginstock.c:82
 msgid "_Join"
 msgstr "_Join"
 
-#: ../pidgin/gtkblist.c:1182
+#: ../pidgin/gtkblist.c:1220
 msgid "Auto-Join"
 msgstr "Auto-Join"
 
-#: ../pidgin/gtkblist.c:1220 ../pidgin/gtkblist.c:1243
+#: ../pidgin/gtkblist.c:1258 ../pidgin/gtkblist.c:1281
 msgid "_Collapse"
 msgstr "_Collapse"
 
-#: ../pidgin/gtkblist.c:1248
+#: ../pidgin/gtkblist.c:1286
 msgid "_Expand"
 msgstr "_Expand"
 
-#: ../pidgin/gtkblist.c:1493 ../pidgin/gtkblist.c:1505
-#: ../pidgin/gtkblist.c:4479 ../pidgin/gtkblist.c:4489
+#: ../pidgin/gtkblist.c:1531 ../pidgin/gtkblist.c:1543
+#: ../pidgin/gtkblist.c:4511 ../pidgin/gtkblist.c:4521
 msgid "/Tools/Mute Sounds"
 msgstr "/Tools/Mute Sounds"
 
-#: ../pidgin/gtkblist.c:1965 ../pidgin/gtkconv.c:4514
-#: ../pidgin/gtkpounce.c:421
+#: ../pidgin/gtkblist.c:2003 ../pidgin/gtkconv.c:4535
+#: ../pidgin/gtkpounce.c:423
 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:2805
+#: ../pidgin/gtkblist.c:2832
 msgid "/_Buddies"
 msgstr "/_Buddies"
 
-#: ../pidgin/gtkblist.c:2806
+#: ../pidgin/gtkblist.c:2833
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Buddies/New Instant _Message..."
 
-#: ../pidgin/gtkblist.c:2807
+#: ../pidgin/gtkblist.c:2834
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Buddies/Join a _Chat..."
 
-#: ../pidgin/gtkblist.c:2808
+#: ../pidgin/gtkblist.c:2835
 msgid "/Buddies/Get User _Info..."
 msgstr "/Buddies/Get User _Info..."
 
-#: ../pidgin/gtkblist.c:2809
+#: ../pidgin/gtkblist.c:2836
 msgid "/Buddies/View User _Log..."
 msgstr "/Buddies/View User _Log..."
 
-#: ../pidgin/gtkblist.c:2811
+#: ../pidgin/gtkblist.c:2838
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Buddies/Show _Offline Buddies"
 
-#: ../pidgin/gtkblist.c:2812
+#: ../pidgin/gtkblist.c:2839
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Buddies/Show _Empty Groups"
 
-#: ../pidgin/gtkblist.c:2813
+#: ../pidgin/gtkblist.c:2840
 msgid "/Buddies/Show Buddy _Details"
 msgstr "/Buddies/Show Buddy _Details"
 
-#: ../pidgin/gtkblist.c:2814
+#: ../pidgin/gtkblist.c:2841
 msgid "/Buddies/Show Idle _Times"
 msgstr "/Buddies/Show Idle _Times"
 
-#: ../pidgin/gtkblist.c:2815
+#: ../pidgin/gtkblist.c:2842
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Buddies/_Sort Buddies"
 
-#: ../pidgin/gtkblist.c:2817
+#: ../pidgin/gtkblist.c:2844
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Buddies/_Add Buddy..."
 
-#: ../pidgin/gtkblist.c:2818
+#: ../pidgin/gtkblist.c:2845
 msgid "/Buddies/Add C_hat..."
 msgstr "/Buddies/Add C_hat..."
 
-#: ../pidgin/gtkblist.c:2819
+#: ../pidgin/gtkblist.c:2846
 msgid "/Buddies/Add _Group..."
 msgstr "/Buddies/Add _Group..."
 
-#: ../pidgin/gtkblist.c:2821
+#: ../pidgin/gtkblist.c:2848
 msgid "/Buddies/_Quit"
 msgstr "/Buddies/_Quit"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:2824
+#: ../pidgin/gtkblist.c:2851
 msgid "/_Accounts"
 msgstr "/_Accounts"
 
-#: ../pidgin/gtkblist.c:2825 ../pidgin/gtkblist.c:6392
+#: ../pidgin/gtkblist.c:2852 ../pidgin/gtkblist.c:6448
 msgid "/Accounts/Add\\/Edit"
 msgstr "/Accounts/Add\\/Edit"
 
 #. Tools
-#: ../pidgin/gtkblist.c:2828
+#: ../pidgin/gtkblist.c:2855
 msgid "/_Tools"
 msgstr "/_Tools"
 
-#: ../pidgin/gtkblist.c:2829
+#: ../pidgin/gtkblist.c:2856
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Tools/Buddy _Pounces"
 
-#: ../pidgin/gtkblist.c:2830
+#: ../pidgin/gtkblist.c:2857
 msgid "/Tools/Plu_gins"
 msgstr "/Tools/Plu_g-ins"
 
-#: ../pidgin/gtkblist.c:2831
+#: ../pidgin/gtkblist.c:2858
 msgid "/Tools/Pr_eferences"
 msgstr "/Tools/Pr_eferences"
 
-#: ../pidgin/gtkblist.c:2832
+#: ../pidgin/gtkblist.c:2859
 msgid "/Tools/Pr_ivacy"
 msgstr "/Tools/Pr_ivacy"
 
-#: ../pidgin/gtkblist.c:2834
+#: ../pidgin/gtkblist.c:2861
 msgid "/Tools/_File Transfers"
 msgstr "/Tools/_File Transfers"
 
-#: ../pidgin/gtkblist.c:2835
+#: ../pidgin/gtkblist.c:2862
 msgid "/Tools/R_oom List"
 msgstr "/Tools/R_oom List"
 
-#: ../pidgin/gtkblist.c:2836
+#: ../pidgin/gtkblist.c:2863
 msgid "/Tools/System _Log"
 msgstr "/Tools/System _Log"
 
-#: ../pidgin/gtkblist.c:2838
+#: ../pidgin/gtkblist.c:2865
 msgid "/Tools/Mute _Sounds"
 msgstr "/Tools/Mute _Sounds"
 
 #. Help
-#: ../pidgin/gtkblist.c:2841
+#: ../pidgin/gtkblist.c:2868
 msgid "/_Help"
 msgstr "/_Help"
 
-#: ../pidgin/gtkblist.c:2842
+#: ../pidgin/gtkblist.c:2869
 msgid "/Help/Online _Help"
 msgstr "/Help/Online _Help"
 
-#: ../pidgin/gtkblist.c:2843
+#: ../pidgin/gtkblist.c:2870
 msgid "/Help/_Debug Window"
 msgstr "/Help/_Debug Window"
 
-#: ../pidgin/gtkblist.c:2844
+#: ../pidgin/gtkblist.c:2871
 msgid "/Help/_About"
 msgstr "/Help/_About"
 
-#: ../pidgin/gtkblist.c:2872
+#: ../pidgin/gtkblist.c:2899
 #, c-format
 msgid ""
 "\n"
@@ -11644,131 +11652,127 @@
 "\n"
 "<b>Account:</b> %s"
 
-#: ../pidgin/gtkblist.c:2950
+#: ../pidgin/gtkblist.c:2977
 msgid "Buddy Alias"
 msgstr "Buddy Alias"
 
-#: ../pidgin/gtkblist.c:2971
+#: ../pidgin/gtkblist.c:2998
 msgid "Logged In"
 msgstr "Logged In"
 
-#: ../pidgin/gtkblist.c:3017
+#: ../pidgin/gtkblist.c:3044
 msgid "Last Seen"
 msgstr "Last Seen"
 
-#: ../pidgin/gtkblist.c:3037
+#: ../pidgin/gtkblist.c:3064
 msgid "Spooky"
 msgstr "Spooky"
 
-#: ../pidgin/gtkblist.c:3039
+#: ../pidgin/gtkblist.c:3066
 msgid "Awesome"
 msgstr "Awesome"
 
-#: ../pidgin/gtkblist.c:3041
+#: ../pidgin/gtkblist.c:3068
 msgid "Rockin'"
 msgstr "Rockin'"
 
-#: ../pidgin/gtkblist.c:3366
+#: ../pidgin/gtkblist.c:3394
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Idle %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3368
+#: ../pidgin/gtkblist.c:3396
 #, c-format
 msgid "Idle %dm"
 msgstr "Idle %dm"
 
-#: ../pidgin/gtkblist.c:3505
+#: ../pidgin/gtkblist.c:3533
 msgid "/Buddies/New Instant Message..."
 msgstr "/Buddies/New Instant Message..."
 
-#: ../pidgin/gtkblist.c:3506 ../pidgin/gtkblist.c:3539
+#: ../pidgin/gtkblist.c:3534 ../pidgin/gtkblist.c:3567
 msgid "/Buddies/Join a Chat..."
 msgstr "/Buddies/Join a Chat..."
 
-#: ../pidgin/gtkblist.c:3507
+#: ../pidgin/gtkblist.c:3535
 msgid "/Buddies/Get User Info..."
 msgstr "/Buddies/Get User Info..."
 
-#: ../pidgin/gtkblist.c:3508
+#: ../pidgin/gtkblist.c:3536
 msgid "/Buddies/Add Buddy..."
 msgstr "/Buddies/Add Buddy..."
 
-#: ../pidgin/gtkblist.c:3509 ../pidgin/gtkblist.c:3542
+#: ../pidgin/gtkblist.c:3537 ../pidgin/gtkblist.c:3570
 msgid "/Buddies/Add Chat..."
 msgstr "/Buddies/Add Chat..."
 
-#: ../pidgin/gtkblist.c:3510
+#: ../pidgin/gtkblist.c:3538
 msgid "/Buddies/Add Group..."
 msgstr "/Buddies/Add Group..."
 
-#: ../pidgin/gtkblist.c:3545
-msgid "/Tools/Buddy Pounces"
-msgstr "/Tools/Buddy Pounces"
-
-#: ../pidgin/gtkblist.c:3548
+#: ../pidgin/gtkblist.c:3573
 msgid "/Tools/Privacy"
 msgstr "/Tools/Privacy"
 
-#: ../pidgin/gtkblist.c:3551
+#: ../pidgin/gtkblist.c:3576
 msgid "/Tools/Room List"
 msgstr "/Tools/Room List"
 
-#: ../pidgin/gtkblist.c:3648 ../pidgin/gtkdocklet.c:153
+#: ../pidgin/gtkblist.c:3673 ../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:3725
+#: ../pidgin/gtkblist.c:3750
 msgid "Manually"
 msgstr "Manually"
 
-#: ../pidgin/gtkblist.c:3727
+#: ../pidgin/gtkblist.c:3752
 msgid "Alphabetically"
 msgstr "Alphabetically"
 
-#: ../pidgin/gtkblist.c:3728
+#: ../pidgin/gtkblist.c:3753
 msgid "By status"
 msgstr "By status"
 
-#: ../pidgin/gtkblist.c:3729
+#: ../pidgin/gtkblist.c:3754
 msgid "By log size"
 msgstr "By log size"
 
-#: ../pidgin/gtkblist.c:3931 ../pidgin/gtkconn.c:178
+#: ../pidgin/gtkblist.c:3956 ../pidgin/gtkconn.c:178
 #, c-format
 msgid "%s disconnected"
 msgstr "%s disconnected"
 
-#: ../pidgin/gtkblist.c:3940
+#: ../pidgin/gtkblist.c:3966
 msgid "Re-enable Account"
 msgstr "Re-enable Account"
 
-#: ../pidgin/gtkblist.c:3961
+#: ../pidgin/gtkblist.c:3990
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s disconnected: %s</span>"
 
-#: ../pidgin/gtkblist.c:4114
+#: ../pidgin/gtkblist.c:4142
 msgid "<b>Username:</b>"
 msgstr "<b>Username:</b>"
 
-#: ../pidgin/gtkblist.c:4121
+#: ../pidgin/gtkblist.c:4149
 msgid "<b>Password:</b>"
 msgstr "<b>Password:</b>"
 
-#: ../pidgin/gtkblist.c:4132
+#: ../pidgin/gtkblist.c:4160
 msgid "_Login"
 msgstr "_Login"
 
-#: ../pidgin/gtkblist.c:4217
+#: ../pidgin/gtkblist.c:4245
 msgid "/Accounts"
 msgstr "/Accounts"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4231
+#: ../pidgin/gtkblist.c:4259
 #, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
@@ -11786,23 +11790,23 @@
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4473
+#: ../pidgin/gtkblist.c:4505
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Buddies/Show Offline Buddies"
 
-#: ../pidgin/gtkblist.c:4476
+#: ../pidgin/gtkblist.c:4508
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Buddies/Show Empty Groups"
 
-#: ../pidgin/gtkblist.c:4482
+#: ../pidgin/gtkblist.c:4514
 msgid "/Buddies/Show Buddy Details"
 msgstr "/Buddies/Show Buddy Details"
 
-#: ../pidgin/gtkblist.c:4485
+#: ../pidgin/gtkblist.c:4517
 msgid "/Buddies/Show Idle Times"
 msgstr "/Buddies/Show Idle Times"
 
-#: ../pidgin/gtkblist.c:5319
+#: ../pidgin/gtkblist.c:5367
 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. "
@@ -11812,17 +11816,17 @@
 "buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
 "The alias will be displayed in place of the screen name whenever possible.\n"
 
-#: ../pidgin/gtkblist.c:5379 ../pidgin/gtkblist.c:5740
+#: ../pidgin/gtkblist.c:5427 ../pidgin/gtkblist.c:5790
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:554
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:307
 msgid "Group:"
 msgstr "Group:"
 
-#: ../pidgin/gtkblist.c:5638
+#: ../pidgin/gtkblist.c:5686
 msgid "This protocol does not support chat rooms."
 msgstr "This protocol does not support chat rooms."
 
-#: ../pidgin/gtkblist.c:5654
+#: ../pidgin/gtkblist.c:5702
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -11830,7 +11834,7 @@
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 
-#: ../pidgin/gtkblist.c:5695
+#: ../pidgin/gtkblist.c:5743
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -11838,39 +11842,39 @@
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
 
-#: ../pidgin/gtkblist.c:5778
+#: ../pidgin/gtkblist.c:5828
 msgid "Please enter the name of the group to be added."
 msgstr "Please enter the name of the group to be added."
 
-#: ../pidgin/gtkblist.c:6412
+#: ../pidgin/gtkblist.c:6468
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/Accounts/"
 
-#: ../pidgin/gtkblist.c:6436
+#: ../pidgin/gtkblist.c:6492
 msgid "_Edit Account"
 msgstr "_Edit Account"
 
-#: ../pidgin/gtkblist.c:6449 ../pidgin/gtkconv.c:2920
+#: ../pidgin/gtkblist.c:6505 ../pidgin/gtkconv.c:2923
 msgid "No actions available"
 msgstr "No actions available"
 
-#: ../pidgin/gtkblist.c:6457
+#: ../pidgin/gtkblist.c:6513
 msgid "_Disable"
 msgstr "_Disable"
 
-#: ../pidgin/gtkblist.c:6469
+#: ../pidgin/gtkblist.c:6525
 msgid "Enable Account"
 msgstr "Enable Account"
 
-#: ../pidgin/gtkblist.c:6475
+#: ../pidgin/gtkblist.c:6531
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/Accounts/Enable Account"
 
-#: ../pidgin/gtkblist.c:6524
+#: ../pidgin/gtkblist.c:6580
 msgid "/Tools"
 msgstr "/Tools"
 
-#: ../pidgin/gtkblist.c:6594
+#: ../pidgin/gtkblist.c:6650
 msgid "/Buddies/Sort Buddies"
 msgstr "/Buddies/Sort Buddies"
 
@@ -11887,22 +11891,22 @@
 "%s will not attempt to reconnect the account until you correct the error and "
 "re-enable the account."
 
-#: ../pidgin/gtkconv.c:782 ../pidgin/gtkconv.c:808
+#: ../pidgin/gtkconv.c:788 ../pidgin/gtkconv.c:814
 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:802
+#: ../pidgin/gtkconv.c:808
 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:855
+#: ../pidgin/gtkconv.c:861
 msgid "Invite Buddy Into Chat Room"
 msgstr "Invite Buddy Into Chat Room"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:885
+#: ../pidgin/gtkconv.c:891
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -11910,42 +11914,42 @@
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 
-#: ../pidgin/gtkconv.c:906
+#: ../pidgin/gtkconv.c:912
 msgid "_Buddy:"
 msgstr "_Buddy:"
 
-#: ../pidgin/gtkconv.c:926 ../pidgin/gtksavedstatuses.c:1141
-#: ../pidgin/gtksavedstatuses.c:1477
+#: ../pidgin/gtkconv.c:932 ../pidgin/gtksavedstatuses.c:1142
+#: ../pidgin/gtksavedstatuses.c:1478
 msgid "_Message:"
 msgstr "_Message:"
 
-#: ../pidgin/gtkconv.c:983 ../pidgin/gtkconv.c:2487 ../pidgin/gtkdebug.c:218
+#: ../pidgin/gtkconv.c:989 ../pidgin/gtkconv.c:2499 ../pidgin/gtkdebug.c:218
 #: ../pidgin/gtkft.c:542
 msgid "Unable to open file."
 msgstr "Unable to open file."
 
-#: ../pidgin/gtkconv.c:989
+#: ../pidgin/gtkconv.c:995
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Conversation with %s</h1>\n"
 
-#: ../pidgin/gtkconv.c:1013
+#: ../pidgin/gtkconv.c:1031
 msgid "Save Conversation"
 msgstr "Save Conversation"
 
-#: ../pidgin/gtkconv.c:1160 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:756
+#: ../pidgin/gtkconv.c:1180 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:742
 msgid "Find"
 msgstr "Find"
 
-#: ../pidgin/gtkconv.c:1186 ../pidgin/gtkdebug.c:194
+#: ../pidgin/gtkconv.c:1206 ../pidgin/gtkdebug.c:194
 msgid "_Search for:"
 msgstr "_Search for:"
 
-#: ../pidgin/gtkconv.c:1338
+#: ../pidgin/gtkconv.c:1358
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr "Logging started. Future messages in this conversation will be logged."
 
-#: ../pidgin/gtkconv.c:1346
+#: ../pidgin/gtkconv.c:1366
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr ""
@@ -11967,129 +11971,129 @@
 msgid "Last said"
 msgstr "Last said"
 
-#: ../pidgin/gtkconv.c:2495
+#: ../pidgin/gtkconv.c:2507
 msgid "Unable to save icon file to disk."
 msgstr "Unable to save icon file to disk."
 
-#: ../pidgin/gtkconv.c:2565
+#: ../pidgin/gtkconv.c:2558
 msgid "Save Icon"
 msgstr "Save Icon"
 
-#: ../pidgin/gtkconv.c:2614
+#: ../pidgin/gtkconv.c:2610
 msgid "Animate"
 msgstr "Animate"
 
-#: ../pidgin/gtkconv.c:2619
+#: ../pidgin/gtkconv.c:2615
 msgid "Hide Icon"
 msgstr "Hide Icon"
 
-#: ../pidgin/gtkconv.c:2622
+#: ../pidgin/gtkconv.c:2618
 msgid "Save Icon As..."
 msgstr "Save Icon As..."
 
-#: ../pidgin/gtkconv.c:2626
+#: ../pidgin/gtkconv.c:2622
 msgid "Set Custom Icon..."
 msgstr "Set Custom Icon..."
 
-#: ../pidgin/gtkconv.c:2633
+#: ../pidgin/gtkconv.c:2635
 msgid "Remove Custom Icon"
 msgstr "Remove Custom Icon"
 
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2774
+#: ../pidgin/gtkconv.c:2777
 msgid "/_Conversation"
 msgstr "/_Conversation"
 
-#: ../pidgin/gtkconv.c:2776
+#: ../pidgin/gtkconv.c:2779
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Conversation/New Instant _Message..."
 
-#: ../pidgin/gtkconv.c:2781
+#: ../pidgin/gtkconv.c:2784
 msgid "/Conversation/_Find..."
 msgstr "/Conversation/_Find..."
 
-#: ../pidgin/gtkconv.c:2783
+#: ../pidgin/gtkconv.c:2786
 msgid "/Conversation/View _Log"
 msgstr "/Conversation/View _Log"
 
-#: ../pidgin/gtkconv.c:2784
+#: ../pidgin/gtkconv.c:2787
 msgid "/Conversation/_Save As..."
 msgstr "/Conversation/_Save As..."
 
-#: ../pidgin/gtkconv.c:2786
+#: ../pidgin/gtkconv.c:2789
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Conversation/Clea_r Scrollback"
 
-#: ../pidgin/gtkconv.c:2790
-msgid "/Conversation/Se_nd File..."
-msgstr "/Conversation/Se_nd File..."
-
-#: ../pidgin/gtkconv.c:2791
-msgid "/Conversation/Add Buddy _Pounce..."
-msgstr "/Conversation/Add Buddy _Pounce..."
-
 #: ../pidgin/gtkconv.c:2793
+msgid "/Conversation/Se_nd File..."
+msgstr "/Conversation/Se_nd File..."
+
+#: ../pidgin/gtkconv.c:2794
+msgid "/Conversation/Add Buddy _Pounce..."
+msgstr "/Conversation/Add Buddy _Pounce..."
+
+#: ../pidgin/gtkconv.c:2796
 msgid "/Conversation/_Get Info"
 msgstr "/Conversation/_Get Info"
 
-#: ../pidgin/gtkconv.c:2795
+#: ../pidgin/gtkconv.c:2798
 msgid "/Conversation/In_vite..."
 msgstr "/Conversation/In_vite..."
 
-#: ../pidgin/gtkconv.c:2797
+#: ../pidgin/gtkconv.c:2800
 msgid "/Conversation/M_ore"
 msgstr "/Conversation/M_ore"
 
-#: ../pidgin/gtkconv.c:2801
+#: ../pidgin/gtkconv.c:2804
 msgid "/Conversation/Al_ias..."
 msgstr "/Conversation/Al_ias..."
 
-#: ../pidgin/gtkconv.c:2803
+#: ../pidgin/gtkconv.c:2806
 msgid "/Conversation/_Block..."
 msgstr "/Conversation/_Block..."
 
-#: ../pidgin/gtkconv.c:2805
+#: ../pidgin/gtkconv.c:2808
 msgid "/Conversation/_Unblock..."
 msgstr "/Conversation/_Unblock..."
 
-#: ../pidgin/gtkconv.c:2807
+#: ../pidgin/gtkconv.c:2810
 msgid "/Conversation/_Add..."
 msgstr "/Conversation/_Add..."
 
-#: ../pidgin/gtkconv.c:2809
+#: ../pidgin/gtkconv.c:2812
 msgid "/Conversation/_Remove..."
 msgstr "/Conversation/_Remove..."
 
-#: ../pidgin/gtkconv.c:2814
+#: ../pidgin/gtkconv.c:2817
 msgid "/Conversation/_Close"
 msgstr "/Conversation/_Close"
 
 #. Options
-#: ../pidgin/gtkconv.c:2818
+#: ../pidgin/gtkconv.c:2821
 msgid "/_Options"
 msgstr "/_Options"
 
-#: ../pidgin/gtkconv.c:2819
+#: ../pidgin/gtkconv.c:2822
 msgid "/Options/Enable _Logging"
 msgstr "/Options/Enable _Logging"
 
-#: ../pidgin/gtkconv.c:2820
+#: ../pidgin/gtkconv.c:2823
 msgid "/Options/Enable _Sounds"
 msgstr "/Options/Enable _Sounds"
 
-#: ../pidgin/gtkconv.c:2821
+#: ../pidgin/gtkconv.c:2824
 msgid "/Options/Show Buddy _Icon"
 msgstr "/Options/Show Buddy _Icons"
 
-#: ../pidgin/gtkconv.c:2823
+#: ../pidgin/gtkconv.c:2826
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Options/Show Formatting _Toolbars"
 
-#: ../pidgin/gtkconv.c:2824
+#: ../pidgin/gtkconv.c:2827
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Options/Show Ti_mestamps"
 
-#: ../pidgin/gtkconv.c:2899
+#: ../pidgin/gtkconv.c:2902
 msgid "/Conversation/More"
 msgstr "/Conversation/More"
 
@@ -12098,164 +12102,164 @@
 #. 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:2944 ../pidgin/gtkconv.c:2976
+#: ../pidgin/gtkconv.c:2947 ../pidgin/gtkconv.c:2979
 msgid "/Conversation"
 msgstr "/Conversation"
 
-#: ../pidgin/gtkconv.c:2984
+#: ../pidgin/gtkconv.c:2987
 msgid "/Conversation/View Log"
 msgstr "/Conversation/View Log"
 
-#: ../pidgin/gtkconv.c:2990
+#: ../pidgin/gtkconv.c:2993
 msgid "/Conversation/Send File..."
 msgstr "/Conversation/Send File..."
 
-#: ../pidgin/gtkconv.c:2994
+#: ../pidgin/gtkconv.c:2997
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversation/Add Buddy Pounce..."
 
-#: ../pidgin/gtkconv.c:3000
+#: ../pidgin/gtkconv.c:3003
 msgid "/Conversation/Get Info"
 msgstr "/Conversation/Get Info"
 
-#: ../pidgin/gtkconv.c:3004
+#: ../pidgin/gtkconv.c:3007
 msgid "/Conversation/Invite..."
 msgstr "/Conversation/Invite..."
 
-#: ../pidgin/gtkconv.c:3010
+#: ../pidgin/gtkconv.c:3013
 msgid "/Conversation/Alias..."
 msgstr "/Conversation/Alias..."
 
-#: ../pidgin/gtkconv.c:3014
+#: ../pidgin/gtkconv.c:3017
 msgid "/Conversation/Block..."
 msgstr "/Conversation/Block..."
 
-#: ../pidgin/gtkconv.c:3018
+#: ../pidgin/gtkconv.c:3021
 msgid "/Conversation/Unblock..."
 msgstr "/Conversation/Unblock..."
 
-#: ../pidgin/gtkconv.c:3022
+#: ../pidgin/gtkconv.c:3025
 msgid "/Conversation/Add..."
 msgstr "/Conversation/Add..."
 
-#: ../pidgin/gtkconv.c:3026
+#: ../pidgin/gtkconv.c:3029
 msgid "/Conversation/Remove..."
 msgstr "/Conversation/Remove..."
 
-#: ../pidgin/gtkconv.c:3030
+#: ../pidgin/gtkconv.c:3033
 msgid "/Options/Enable Logging"
 msgstr "/Options/Enable Logging"
 
-#: ../pidgin/gtkconv.c:3033
+#: ../pidgin/gtkconv.c:3036
 msgid "/Options/Enable Sounds"
 msgstr "/Options/Enable Sounds"
 
-#: ../pidgin/gtkconv.c:3046
+#: ../pidgin/gtkconv.c:3049
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Options/Show Formatting Toolbars"
 
-#: ../pidgin/gtkconv.c:3049
-msgid "/Options/Show Timestamps"
-msgstr "/Options/Show Timestamps"
-
 #: ../pidgin/gtkconv.c:3052
+msgid "/Options/Show Timestamps"
+msgstr "/Options/Show Timestamps"
+
+#: ../pidgin/gtkconv.c:3055
 msgid "/Options/Show Buddy Icon"
 msgstr "/Options/Show Buddy Icons"
 
-#: ../pidgin/gtkconv.c:3136 ../pidgin/gtkconv.c:3173
+#: ../pidgin/gtkconv.c:3139 ../pidgin/gtkconv.c:3181
 msgid "User is typing..."
 msgstr "User is typing..."
 
-#: ../pidgin/gtkconv.c:3176
+#: ../pidgin/gtkconv.c:3184
 msgid "User has typed something and stopped"
 msgstr "User has typed something and stopped"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3358
+#: ../pidgin/gtkconv.c:3366
 msgid "_Send To"
 msgstr "_Send To"
 
-#: ../pidgin/gtkconv.c:4065
+#: ../pidgin/gtkconv.c:4080
 msgid "_Send"
 msgstr "_Send"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4213
+#: ../pidgin/gtkconv.c:4229
 msgid "0 people in room"
 msgstr "0 people in room"
 
-#: ../pidgin/gtkconv.c:5382 ../pidgin/gtkconv.c:5503
+#: ../pidgin/gtkconv.c:5421 ../pidgin/gtkconv.c:5542
 #, 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:6059 ../pidgin/gtkstatusbox.c:607
+#: ../pidgin/gtkconv.c:6108 ../pidgin/gtkstatusbox.c:657
 msgid "Typing"
 msgstr "Typing"
 
-#: ../pidgin/gtkconv.c:6065
+#: ../pidgin/gtkconv.c:6114
 msgid "Stopped Typing"
 msgstr "Stopped Typing"
 
-#: ../pidgin/gtkconv.c:6070
+#: ../pidgin/gtkconv.c:6119
 msgid "Nick Said"
 msgstr "Nick Said"
 
-#: ../pidgin/gtkconv.c:6075 ../pidgin/gtkdocklet.c:500
+#: ../pidgin/gtkconv.c:6124 ../pidgin/gtkdocklet.c:492
 msgid "Unread Messages"
 msgstr "Unread Messages"
 
-#: ../pidgin/gtkconv.c:6080
+#: ../pidgin/gtkconv.c:6129
 msgid "New Event"
 msgstr "New Event"
 
-#: ../pidgin/gtkconv.c:7201
+#: ../pidgin/gtkconv.c:7258
 msgid "Confirm close"
 msgstr "Confirm close"
 
-#: ../pidgin/gtkconv.c:7233
+#: ../pidgin/gtkconv.c:7290
 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:7768
+#: ../pidgin/gtkconv.c:7812
 msgid "Close other tabs"
 msgstr "Close other tabs"
 
-#: ../pidgin/gtkconv.c:7774
+#: ../pidgin/gtkconv.c:7818
 msgid "Close all tabs"
 msgstr "Close all tabs"
 
-#: ../pidgin/gtkconv.c:7782
+#: ../pidgin/gtkconv.c:7826
 msgid "Detach this tab"
 msgstr "Detach this tab"
 
-#: ../pidgin/gtkconv.c:7788
+#: ../pidgin/gtkconv.c:7832
 msgid "Close this tab"
 msgstr "Close this tab"
 
-#: ../pidgin/gtkconv.c:8091
+#: ../pidgin/gtkconv.c:8216
 msgid "Close conversation"
 msgstr "Close conversation"
 
-#: ../pidgin/gtkconv.c:8555
+#: ../pidgin/gtkconv.c:8737
 msgid "Last created window"
 msgstr "Last created window"
 
-#: ../pidgin/gtkconv.c:8557
+#: ../pidgin/gtkconv.c:8739
 msgid "Separate IM and Chat windows"
 msgstr "Separate IM and Chat windows"
 
-#: ../pidgin/gtkconv.c:8559 ../pidgin/gtkprefs.c:1303
+#: ../pidgin/gtkconv.c:8741 ../pidgin/gtkprefs.c:1303
 msgid "New window"
 msgstr "New window"
 
-#: ../pidgin/gtkconv.c:8561
+#: ../pidgin/gtkconv.c:8743
 msgid "By group"
 msgstr "By group"
 
-#: ../pidgin/gtkconv.c:8563
+#: ../pidgin/gtkconv.c:8745
 msgid "By account"
 msgstr "By account"
 
@@ -12263,63 +12267,63 @@
 msgid "Save Debug Log"
 msgstr "Save Debug Log"
 
-#: ../pidgin/gtkdebug.c:594
+#: ../pidgin/gtkdebug.c:581
 msgid "Invert"
 msgstr "Invert"
 
-#: ../pidgin/gtkdebug.c:597
+#: ../pidgin/gtkdebug.c:584
 msgid "Highlight matches"
 msgstr "Highlight matches"
 
-#: ../pidgin/gtkdebug.c:664
+#: ../pidgin/gtkdebug.c:651
 msgid "_Icon Only"
 msgstr "_Icon Only"
 
-#: ../pidgin/gtkdebug.c:665
+#: ../pidgin/gtkdebug.c:652
 msgid "_Text Only"
 msgstr "_Text Only"
 
-#: ../pidgin/gtkdebug.c:666
+#: ../pidgin/gtkdebug.c:653
 msgid "_Both Icon & Text"
 msgstr "_Both Icon & Text"
 
-#: ../pidgin/gtkdebug.c:802
+#: ../pidgin/gtkdebug.c:774
 msgid "Filter"
 msgstr "Filter"
 
-#: ../pidgin/gtkdebug.c:821
+#: ../pidgin/gtkdebug.c:793
 msgid "Right click for more options."
 msgstr "Right click for more options."
 
-#: ../pidgin/gtkdebug.c:851
+#: ../pidgin/gtkdebug.c:823
 msgid "Level "
 msgstr "Level "
 
-#: ../pidgin/gtkdebug.c:852 ../pidgin/gtkdebug.c:858
+#: ../pidgin/gtkdebug.c:824 ../pidgin/gtkdebug.c:830
 msgid "Select the debug filter level."
 msgstr "Select the debug filter level."
 
-#: ../pidgin/gtkdebug.c:860
+#: ../pidgin/gtkdebug.c:832
 msgid "All"
 msgstr "All"
 
-#: ../pidgin/gtkdebug.c:861
+#: ../pidgin/gtkdebug.c:833
 msgid "Misc"
 msgstr "Misc"
 
-#: ../pidgin/gtkdebug.c:863
+#: ../pidgin/gtkdebug.c:835
 msgid "Warning"
 msgstr "Warning"
 
-#: ../pidgin/gtkdebug.c:864
+#: ../pidgin/gtkdebug.c:836
 msgid "Error "
 msgstr "Error "
 
-#: ../pidgin/gtkdebug.c:865
+#: ../pidgin/gtkdebug.c:837
 msgid "Fatal Error"
 msgstr "Fatal Error"
 
-#: ../pidgin/gtkdialogs.c:71 ../pidgin/gtkdialogs.c:116
+#: ../pidgin/gtkdialogs.c:71 ../pidgin/gtkdialogs.c:117
 msgid "lead developer"
 msgstr "lead developer"
 
@@ -12329,8 +12333,8 @@
 #: ../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:87 ../pidgin/gtkdialogs.c:88
-#: ../pidgin/gtkdialogs.c:89
+#: ../pidgin/gtkdialogs.c:85 ../pidgin/gtkdialogs.c:88
+#: ../pidgin/gtkdialogs.c:89 ../pidgin/gtkdialogs.c:90
 msgid "developer"
 msgstr "developer"
 
@@ -12338,361 +12342,375 @@
 msgid "developer & webmaster"
 msgstr "developer & webmaster"
 
-#: ../pidgin/gtkdialogs.c:85
+#: ../pidgin/gtkdialogs.c:86
 msgid "support"
 msgstr "support"
 
-#: ../pidgin/gtkdialogs.c:86
+#: ../pidgin/gtkdialogs.c:87
 msgid "support/QA"
 msgstr "support/QA"
 
-#: ../pidgin/gtkdialogs.c:108
+#: ../pidgin/gtkdialogs.c:109
 msgid "win32 port"
 msgstr "win32 port"
 
-#: ../pidgin/gtkdialogs.c:109 ../pidgin/gtkdialogs.c:110
+#: ../pidgin/gtkdialogs.c:110 ../pidgin/gtkdialogs.c:111
 msgid "maintainer"
 msgstr "maintainer"
 
-#: ../pidgin/gtkdialogs.c:111
+#: ../pidgin/gtkdialogs.c:112
 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:122
+#: ../pidgin/gtkdialogs.c:123
 msgid "Afrikaans"
 msgstr "Afrikaans"
 
-#: ../pidgin/gtkdialogs.c:123
+#: ../pidgin/gtkdialogs.c:124
 msgid "Arabic"
 msgstr "Arabic"
 
-#: ../pidgin/gtkdialogs.c:124 ../pidgin/gtkdialogs.c:125
-#: ../pidgin/gtkdialogs.c:206
+#: ../pidgin/gtkdialogs.c:125 ../pidgin/gtkdialogs.c:126
+#: ../pidgin/gtkdialogs.c:211
 msgid "Bulgarian"
 msgstr "Bulgarian"
 
-#: ../pidgin/gtkdialogs.c:126 ../pidgin/gtkdialogs.c:127
-#: ../pidgin/gtkdialogs.c:128 ../pidgin/gtkdialogs.c:129
+#: ../pidgin/gtkdialogs.c:127 ../pidgin/gtkdialogs.c:128
+#: ../pidgin/gtkdialogs.c:129 ../pidgin/gtkdialogs.c:130
 msgid "Bengali"
 msgstr "Bengali"
 
-#: ../pidgin/gtkdialogs.c:130
+#: ../pidgin/gtkdialogs.c:131
 msgid "Bosnian"
 msgstr "Bosnian"
 
-#: ../pidgin/gtkdialogs.c:131 ../pidgin/gtkdialogs.c:207
-#: ../pidgin/gtkdialogs.c:208
+#: ../pidgin/gtkdialogs.c:132 ../pidgin/gtkdialogs.c:212
+#: ../pidgin/gtkdialogs.c:213
 msgid "Catalan"
 msgstr "Catalan"
 
-#: ../pidgin/gtkdialogs.c:132 ../pidgin/gtkdialogs.c:133
+#: ../pidgin/gtkdialogs.c:133 ../pidgin/gtkdialogs.c:134
 msgid "Valencian-Catalan"
 msgstr "Valencian Catalan"
 
-#: ../pidgin/gtkdialogs.c:134 ../pidgin/gtkdialogs.c:209
+#: ../pidgin/gtkdialogs.c:135 ../pidgin/gtkdialogs.c:214
 msgid "Czech"
 msgstr "Czech"
 
-#: ../pidgin/gtkdialogs.c:135 ../pidgin/gtkdialogs.c:136
+#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
 msgid "Danish"
 msgstr "Danish"
 
-#: ../pidgin/gtkdialogs.c:137 ../pidgin/gtkdialogs.c:138
-#: ../pidgin/gtkdialogs.c:210
+#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
+#: ../pidgin/gtkdialogs.c:215
 msgid "German"
 msgstr "German"
 
-#: ../pidgin/gtkdialogs.c:139 ../pidgin/gtkdialogs.c:140
-#: ../pidgin/gtkdialogs.c:141
+#: ../pidgin/gtkdialogs.c:140 ../pidgin/gtkdialogs.c:141
+#: ../pidgin/gtkdialogs.c:142
 msgid "Dzongkha"
 msgstr "Dzongkha"
 
-#: ../pidgin/gtkdialogs.c:142 ../pidgin/gtkdialogs.c:143
+#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:144
 msgid "Greek"
 msgstr "Greek"
 
-#: ../pidgin/gtkdialogs.c:144
-msgid "Australian English"
-msgstr "Australian English"
-
 #: ../pidgin/gtkdialogs.c:145
+msgid "Australian English"
+msgstr "Australian English"
+
+#: ../pidgin/gtkdialogs.c:146
 msgid "Canadian English"
 msgstr "Canadian English"
 
-#: ../pidgin/gtkdialogs.c:146
+#: ../pidgin/gtkdialogs.c:147
 msgid "British English"
 msgstr "British English"
 
-#: ../pidgin/gtkdialogs.c:147
+#: ../pidgin/gtkdialogs.c:148
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../pidgin/gtkdialogs.c:148 ../pidgin/gtkdialogs.c:211
-#: ../pidgin/gtkdialogs.c:212 ../pidgin/gtkdialogs.c:213
-#: ../pidgin/gtkdialogs.c:214
+#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:216
+#: ../pidgin/gtkdialogs.c:217 ../pidgin/gtkdialogs.c:218
+#: ../pidgin/gtkdialogs.c:219
 msgid "Spanish"
 msgstr "Spanish"
 
-#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:150
+#: ../pidgin/gtkdialogs.c:150 ../pidgin/gtkdialogs.c:151
 msgid "Euskera(Basque)"
 msgstr "Euskera (Basque)"
 
-#: ../pidgin/gtkdialogs.c:151 ../pidgin/gtkdialogs.c:152
-#: ../pidgin/gtkdialogs.c:153
+#: ../pidgin/gtkdialogs.c:152 ../pidgin/gtkdialogs.c:153
+#: ../pidgin/gtkdialogs.c:154
 msgid "Persian"
 msgstr "Persian"
 
-#: ../pidgin/gtkdialogs.c:154 ../pidgin/gtkdialogs.c:215
-#: ../pidgin/gtkdialogs.c:216
+#: ../pidgin/gtkdialogs.c:155 ../pidgin/gtkdialogs.c:220
+#: ../pidgin/gtkdialogs.c:221
 msgid "Finnish"
 msgstr "Finnish"
 
-#: ../pidgin/gtkdialogs.c:155 ../pidgin/gtkdialogs.c:217
-#: ../pidgin/gtkdialogs.c:218 ../pidgin/gtkdialogs.c:219
-#: ../pidgin/gtkdialogs.c:220
+#: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:222
+#: ../pidgin/gtkdialogs.c:223 ../pidgin/gtkdialogs.c:224
+#: ../pidgin/gtkdialogs.c:225
 msgid "French"
 msgstr "French"
 
-#: ../pidgin/gtkdialogs.c:156
+#: ../pidgin/gtkdialogs.c:157
 msgid "Galician"
 msgstr "Galician"
 
-#: ../pidgin/gtkdialogs.c:157 ../pidgin/gtkdialogs.c:158
+#: ../pidgin/gtkdialogs.c:158 ../pidgin/gtkdialogs.c:159
 msgid "Gujarati"
 msgstr "Gujarati"
 
-#: ../pidgin/gtkdialogs.c:159 ../pidgin/gtkdialogs.c:221
+#: ../pidgin/gtkdialogs.c:159
+msgid "Gujarati Language Team"
+msgstr "Gujarati Language Team"
+
+#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:226
 msgid "Hebrew"
 msgstr "Hebrew"
 
-#: ../pidgin/gtkdialogs.c:160
-msgid "Hindi"
-msgstr "Hindi"
-
 #: ../pidgin/gtkdialogs.c:161
+msgid "Hindi"
+msgstr "Hindi"
+
+#: ../pidgin/gtkdialogs.c:162
 msgid "Hungarian"
 msgstr "Hungarian"
 
-#: ../pidgin/gtkdialogs.c:162
+#: ../pidgin/gtkdialogs.c:163
 msgid "Indonesian"
 msgstr "Indonesian"
 
-#: ../pidgin/gtkdialogs.c:163 ../pidgin/gtkdialogs.c:222
+#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:227
 msgid "Italian"
 msgstr "Italian"
 
-#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:223
-#: ../pidgin/gtkdialogs.c:224 ../pidgin/gtkdialogs.c:225
+#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:228
+#: ../pidgin/gtkdialogs.c:229 ../pidgin/gtkdialogs.c:230
 msgid "Japanese"
 msgstr "Japanese"
 
-#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:226
+#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:231
 msgid "Georgian"
 msgstr "Georgian"
 
 #: ../pidgin/gtkdialogs.c:166
+msgid "Ubuntu Georgian Translators"
+msgstr "Ubuntu Georgian Translators"
+
+#: ../pidgin/gtkdialogs.c:167
 msgid "Kannada"
 msgstr "Kannada"
 
-#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:227
+#: ../pidgin/gtkdialogs.c:167
+msgid "Kannada Translation team"
+msgstr "Kannada Translation team"
+
+#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:232
 msgid "Korean"
 msgstr "Korean"
 
-#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:169
-#: ../pidgin/gtkdialogs.c:170
+#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:170
+#: ../pidgin/gtkdialogs.c:171
 msgid "Kurdish"
 msgstr "Kurdish"
 
-#: ../pidgin/gtkdialogs.c:171 ../pidgin/gtkdialogs.c:228
-#: ../pidgin/gtkdialogs.c:229
+#: ../pidgin/gtkdialogs.c:172 ../pidgin/gtkdialogs.c:233
+#: ../pidgin/gtkdialogs.c:234
 msgid "Lithuanian"
 msgstr "Lithuanian"
 
-#: ../pidgin/gtkdialogs.c:172
+#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:174
+#: ../pidgin/gtkdialogs.c:235
 msgid "Macedonian"
 msgstr "Macedonian"
 
-#: ../pidgin/gtkdialogs.c:173
-msgid "Bokmål Norwegian"
-msgstr "Bokmål Norwegian"
-
-#: ../pidgin/gtkdialogs.c:174
-msgid "Nepali"
-msgstr "Nepali"
-
 #: ../pidgin/gtkdialogs.c:175
+msgid "Bokmål Norwegian"
+msgstr "Bokmål Norwegian"
+
+#: ../pidgin/gtkdialogs.c:176
+msgid "Nepali"
+msgstr "Nepali"
+
+#: ../pidgin/gtkdialogs.c:177
 msgid "Dutch, Flemish"
 msgstr "Dutch, Flemish"
 
-#: ../pidgin/gtkdialogs.c:176
+#: ../pidgin/gtkdialogs.c:178
 msgid "Norwegian"
 msgstr "Norwegian"
 
-#: ../pidgin/gtkdialogs.c:177 ../pidgin/gtkdialogs.c:178
-#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:230
+#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:180
+#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:236
 msgid "Polish"
 msgstr "Polish"
 
-#: ../pidgin/gtkdialogs.c:180
+#: ../pidgin/gtkdialogs.c:182
 msgid "Portuguese"
 msgstr "Portuguese"
 
-#: ../pidgin/gtkdialogs.c:181
+#: ../pidgin/gtkdialogs.c:183
 msgid "Portuguese-Brazil"
 msgstr "Portuguese-Brazil"
 
-#: ../pidgin/gtkdialogs.c:182
+#: ../pidgin/gtkdialogs.c:184
 msgid "Pashto"
 msgstr "Pashto"
 
-#: ../pidgin/gtkdialogs.c:183
+#: ../pidgin/gtkdialogs.c:185
 msgid "Romanian"
 msgstr "Romanian"
 
-#: ../pidgin/gtkdialogs.c:184 ../pidgin/gtkdialogs.c:231
-#: ../pidgin/gtkdialogs.c:232
+#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:238
 msgid "Russian"
 msgstr "Russian"
 
-#: ../pidgin/gtkdialogs.c:185 ../pidgin/gtkdialogs.c:186
-#: ../pidgin/gtkdialogs.c:233 ../pidgin/gtkdialogs.c:234
-#: ../pidgin/gtkdialogs.c:235
+#: ../pidgin/gtkdialogs.c:187 ../pidgin/gtkdialogs.c:188
+#: ../pidgin/gtkdialogs.c:239 ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:241
 msgid "Slovak"
 msgstr "Slovak"
 
-#: ../pidgin/gtkdialogs.c:187 ../pidgin/gtkdialogs.c:236
+#: ../pidgin/gtkdialogs.c:189 ../pidgin/gtkdialogs.c:242
 msgid "Slovenian"
 msgstr "Slovenian"
 
-#: ../pidgin/gtkdialogs.c:188
+#: ../pidgin/gtkdialogs.c:190
 msgid "Albanian"
 msgstr "Albanian"
 
-#: ../pidgin/gtkdialogs.c:189 ../pidgin/gtkdialogs.c:190
+#: ../pidgin/gtkdialogs.c:191 ../pidgin/gtkdialogs.c:192
 msgid "Serbian"
 msgstr "Serbian"
 
-#: ../pidgin/gtkdialogs.c:191 ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:193 ../pidgin/gtkdialogs.c:243
 msgid "Swedish"
 msgstr "Swedish"
 
-#: ../pidgin/gtkdialogs.c:192
+#: ../pidgin/gtkdialogs.c:194
 msgid "Tamil"
 msgstr "Tamil"
 
-#: ../pidgin/gtkdialogs.c:193
+#: ../pidgin/gtkdialogs.c:195
 msgid "Telugu"
 msgstr "Telugu"
 
-#: ../pidgin/gtkdialogs.c:194
+#: ../pidgin/gtkdialogs.c:196
 msgid "Thai"
 msgstr "Thai"
 
-#: ../pidgin/gtkdialogs.c:195
+#: ../pidgin/gtkdialogs.c:197 ../pidgin/gtkdialogs.c:244
 msgid "Turkish"
 msgstr "Turkish"
 
-#: ../pidgin/gtkdialogs.c:196
+#: ../pidgin/gtkdialogs.c:198
 msgid "Vietnamese"
 msgstr "Vietnamese"
 
-#: ../pidgin/gtkdialogs.c:196
+#: ../pidgin/gtkdialogs.c:198
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh and the Gnome-Vi Team"
 
-#: ../pidgin/gtkdialogs.c:197 ../pidgin/gtkdialogs.c:238
+#: ../pidgin/gtkdialogs.c:199 ../pidgin/gtkdialogs.c:245
 msgid "Simplified Chinese"
 msgstr "Simplified Chinese"
 
-#: ../pidgin/gtkdialogs.c:198 ../pidgin/gtkdialogs.c:199
-#: ../pidgin/gtkdialogs.c:239
+#: ../pidgin/gtkdialogs.c:200 ../pidgin/gtkdialogs.c:201
+#: ../pidgin/gtkdialogs.c:202
+msgid "Hong Kong Chinese"
+msgstr "Hong Kong Chinese"
+
+#: ../pidgin/gtkdialogs.c:203 ../pidgin/gtkdialogs.c:204
+#: ../pidgin/gtkdialogs.c:246
 msgid "Traditional Chinese"
 msgstr "Traditional Chinese"
 
-#: ../pidgin/gtkdialogs.c:205
+#: ../pidgin/gtkdialogs.c:210
 msgid "Amharic"
 msgstr "Amharic"
 
-#: ../pidgin/gtkdialogs.c:324
+#: ../pidgin/gtkdialogs.c:331
 #, c-format
 msgid "About %s"
 msgstr "About %s"
 
-#: ../pidgin/gtkdialogs.c:360
-#, c-format
-msgid ""
-"%s is a modular messaging client capable of using AIM, MSN, Yahoo!, XMPP, "
-"ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, "
-"Zephyr, Gadu-Gadu, and QQ all at once.  It is written using GTK+.<BR><BR>You "
-"may modify and redistribute the program under the terms of the GPL (version "
-"2 or later).  A copy of the GPL is contained in the 'COPYING' file "
-"distributed with %s.  %s is copyrighted by its contributors.  See the "
-"'COPYRIGHT' file for the complete list of contributors.  We provide no "
-"warranty for this program.<BR><BR>"
-msgstr ""
-"%s is a modular messaging client capable of using AIM, MSN, Yahoo!, XMPP, "
-"ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, "
-"Zephyr, Gadu-Gadu, and QQ all at once.  It is written using GTK+.<BR><BR>You "
-"may modify and redistribute the program under the terms of the GPL (version "
-"2 or later).  A copy of the GPL is contained in the 'COPYING' file "
-"distributed with %s.  %s is copyrighted by its contributors.  See the "
-"'COPYRIGHT' file for the complete list of contributors.  We provide no "
-"warranty for this program.<BR><BR>"
-
-#: ../pidgin/gtkdialogs.c:375
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidwgin on irc.freenode.net<BR><BR>"
-
-#: ../pidgin/gtkdialogs.c:378
-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:369
+#, c-format
+msgid ""
+"%s is a graphical modular messaging client based on libpurple which is "
+"capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "
+"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu, and QQ all at "
+"once.  It is written using GTK+.<BR><BR>You may modify and redistribute the "
+"program under the terms of the GPL (version 2 or later).  A copy of the GPL "
+"is contained in the 'COPYING' file distributed with %s.  %s is copyrighted "
+"by its contributors.  See the 'COPYRIGHT' file for the complete list of "
+"contributors.  We provide no warranty for this program.<BR><BR>"
+msgstr ""
+"%s is a graphical modular messaging client based on libpurple which is "
+"capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "
+"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu, and QQ all at "
+"once.  It is written using GTK+.<BR><BR>You may modify and redistribute the "
+"program under the terms of the GPL (version 2 or later).  A copy of the GPL "
+"is contained in the 'COPYING' file distributed with %s.  %s is copyrighted "
+"by its contributors.  See the 'COPYRIGHT' file for the complete list of "
+"contributors.  We provide no warranty for this program.<BR><BR>"
 
 #: ../pidgin/gtkdialogs.c:384
+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:389
 msgid "Current Developers"
 msgstr "Current Developers"
 
-#: ../pidgin/gtkdialogs.c:399
+#: ../pidgin/gtkdialogs.c:404
 msgid "Crazy Patch Writers"
 msgstr "Crazy Patch Writers"
 
-#: ../pidgin/gtkdialogs.c:414
+#: ../pidgin/gtkdialogs.c:419
 msgid "Retired Developers"
 msgstr "Retired Developers"
 
-#: ../pidgin/gtkdialogs.c:429
+#: ../pidgin/gtkdialogs.c:434
 msgid "Artists"
 msgstr "Artists"
 
-#: ../pidgin/gtkdialogs.c:444
+#: ../pidgin/gtkdialogs.c:449
 msgid "Current Translators"
 msgstr "Current Translators"
 
-#: ../pidgin/gtkdialogs.c:464
+#: ../pidgin/gtkdialogs.c:469
 msgid "Past Translators"
 msgstr "Past Translators"
 
-#: ../pidgin/gtkdialogs.c:482
+#: ../pidgin/gtkdialogs.c:487
 msgid "Debugging Information"
 msgstr "Debugging Information"
 
-#: ../pidgin/gtkdialogs.c:850
+#: ../pidgin/gtkdialogs.c:856
 msgid "Get User Info"
 msgstr "Get User Info"
 
-#: ../pidgin/gtkdialogs.c:852
+#: ../pidgin/gtkdialogs.c:858
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
@@ -12700,11 +12718,11 @@
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
 
-#: ../pidgin/gtkdialogs.c:941
+#: ../pidgin/gtkdialogs.c:948
 msgid "View User Log"
 msgstr "View User Log"
 
-#: ../pidgin/gtkdialogs.c:943
+#: ../pidgin/gtkdialogs.c:950
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
@@ -12712,32 +12730,32 @@
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
 
-#: ../pidgin/gtkdialogs.c:962
+#: ../pidgin/gtkdialogs.c:970
 msgid "Alias Contact"
 msgstr "Alias Contact"
 
-#: ../pidgin/gtkdialogs.c:963
+#: ../pidgin/gtkdialogs.c:971
 msgid "Enter an alias for this contact."
 msgstr "Enter an alias for this contact."
 
-#: ../pidgin/gtkdialogs.c:983
+#: ../pidgin/gtkdialogs.c:993
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Enter an alias for %s."
 
-#: ../pidgin/gtkdialogs.c:985
+#: ../pidgin/gtkdialogs.c:995
 msgid "Alias Buddy"
 msgstr "Alias Buddy"
 
-#: ../pidgin/gtkdialogs.c:1004
+#: ../pidgin/gtkdialogs.c:1016
 msgid "Alias Chat"
 msgstr "Alias Chat"
 
-#: ../pidgin/gtkdialogs.c:1005
+#: ../pidgin/gtkdialogs.c:1017
 msgid "Enter an alias for this chat."
 msgstr "Enter an alias for this chat."
 
-#: ../pidgin/gtkdialogs.c:1042
+#: ../pidgin/gtkdialogs.c:1056
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -12752,15 +12770,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:1050
+#: ../pidgin/gtkdialogs.c:1064
 msgid "Remove Contact"
 msgstr "Remove Contact"
 
-#: ../pidgin/gtkdialogs.c:1051
+#: ../pidgin/gtkdialogs.c:1067
 msgid "_Remove Contact"
 msgstr "_Remove Contact"
 
-#: ../pidgin/gtkdialogs.c:1081
+#: ../pidgin/gtkdialogs.c:1098
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
@@ -12769,15 +12787,15 @@
 "You are about to merge the group called %s into the group called %s. Do you "
 "want to continue?"
 
-#: ../pidgin/gtkdialogs.c:1088
+#: ../pidgin/gtkdialogs.c:1105
 msgid "Merge Groups"
 msgstr "Merge Groups"
 
-#: ../pidgin/gtkdialogs.c:1089
+#: ../pidgin/gtkdialogs.c:1108
 msgid "_Merge Groups"
 msgstr "_Merge Groups"
 
-#: ../pidgin/gtkdialogs.c:1139
+#: ../pidgin/gtkdialogs.c:1158
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -12786,30 +12804,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:1142
+#: ../pidgin/gtkdialogs.c:1161
 msgid "Remove Group"
 msgstr "Remove Group"
 
-#: ../pidgin/gtkdialogs.c:1143
+#: ../pidgin/gtkdialogs.c:1164
 msgid "_Remove Group"
 msgstr "_Remove Group"
 
-#: ../pidgin/gtkdialogs.c:1176
+#: ../pidgin/gtkdialogs.c:1197
 #, 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:1179
+#: ../pidgin/gtkdialogs.c:1200
 msgid "Remove Buddy"
 msgstr "Remove Buddy"
 
-#: ../pidgin/gtkdialogs.c:1180
+#: ../pidgin/gtkdialogs.c:1203
 msgid "_Remove Buddy"
 msgstr "_Remove Buddy"
 
-#: ../pidgin/gtkdialogs.c:1201
+#: ../pidgin/gtkdialogs.c:1224
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -12818,11 +12836,11 @@
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 
-#: ../pidgin/gtkdialogs.c:1204
+#: ../pidgin/gtkdialogs.c:1227
 msgid "Remove Chat"
 msgstr "Remove Chat"
 
-#: ../pidgin/gtkdialogs.c:1205
+#: ../pidgin/gtkdialogs.c:1230
 msgid "_Remove Chat"
 msgstr "_Remove Chat"
 
@@ -12830,30 +12848,27 @@
 msgid "Right-click for more unread messages...\n"
 msgstr "Right-click for more unread messages...\n"
 
-#: ../pidgin/gtkdocklet.c:443
+#: ../pidgin/gtkdocklet.c:435
 msgid "Change Status"
 msgstr "Change Status"
 
-#: ../pidgin/gtkdocklet.c:495
+#: ../pidgin/gtkdocklet.c:487
 msgid "Show Buddy List"
 msgstr "Show Buddy List"
 
-#: ../pidgin/gtkdocklet.c:521
+#: ../pidgin/gtkdocklet.c:513
 msgid "New Message..."
 msgstr "New Message..."
 
-#: ../pidgin/gtkdocklet.c:536
+#: ../pidgin/gtkdocklet.c:528
 msgid "Mute Sounds"
 msgstr "Mute Sounds"
 
-#: ../pidgin/gtkdocklet.c:543
+#: ../pidgin/gtkdocklet.c:535
 msgid "Blink on new message"
 msgstr "Blink on new message"
 
-#. TODO: need a submenu to change status, this needs to "link"
-#. * to the status in the buddy list gtkstatusbox
-#.
-#: ../pidgin/gtkdocklet.c:554
+#: ../pidgin/gtkdocklet.c:542
 msgid "Quit"
 msgstr "Quit"
 
@@ -12934,7 +12949,7 @@
 msgstr "File transfer _details"
 
 #. Pause button
-#: ../pidgin/gtkft.c:835 ../pidgin/pidginstock.c:96
+#: ../pidgin/gtkft.c:835 ../pidgin/pidginstock.c:89
 msgid "_Pause"
 msgstr "_Pause"
 
@@ -12951,35 +12966,35 @@
 msgid "_Reset formatting"
 msgstr "_Reset formatting"
 
-#: ../pidgin/gtkimhtml.c:1294
+#: ../pidgin/gtkimhtml.c:1284
 msgid "Hyperlink color"
 msgstr "Hyperlink colour"
 
-#: ../pidgin/gtkimhtml.c:1295
+#: ../pidgin/gtkimhtml.c:1285
 msgid "Color to draw hyperlinks."
 msgstr "Colour to draw hyperlinks."
 
-#: ../pidgin/gtkimhtml.c:1298
+#: ../pidgin/gtkimhtml.c:1288
 msgid "Hyperlink prelight color"
 msgstr "Hyperlink prelight colour"
 
-#: ../pidgin/gtkimhtml.c:1299
+#: ../pidgin/gtkimhtml.c:1289
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "Colour to draw hyperlinks when mouse is over them."
 
-#: ../pidgin/gtkimhtml.c:1515
+#: ../pidgin/gtkimhtml.c:1505
 msgid "_Copy E-Mail Address"
 msgstr "_Copy E-Mail Address"
 
-#: ../pidgin/gtkimhtml.c:1527
+#: ../pidgin/gtkimhtml.c:1517
 msgid "_Open Link in Browser"
 msgstr "_Open Link in Browser"
 
-#: ../pidgin/gtkimhtml.c:1537
+#: ../pidgin/gtkimhtml.c:1527
 msgid "_Copy Link Location"
 msgstr "_Copy Link Location"
 
-#: ../pidgin/gtkimhtml.c:3201
+#: ../pidgin/gtkimhtml.c:3200
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -12989,7 +13004,7 @@
 "\n"
 "Defaulting to PNG."
 
-#: ../pidgin/gtkimhtml.c:3204
+#: ../pidgin/gtkimhtml.c:3203
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -12999,7 +13014,7 @@
 "\n"
 "Defaulting to PNG."
 
-#: ../pidgin/gtkimhtml.c:3217
+#: ../pidgin/gtkimhtml.c:3216
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -13010,7 +13025,7 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3220
+#: ../pidgin/gtkimhtml.c:3219
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -13021,35 +13036,35 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3300 ../pidgin/gtkimhtml.c:3312
+#: ../pidgin/gtkimhtml.c:3299 ../pidgin/gtkimhtml.c:3311
 msgid "Save Image"
 msgstr "Save Image"
 
-#: ../pidgin/gtkimhtml.c:3340
+#: ../pidgin/gtkimhtml.c:3339
 msgid "_Save Image..."
 msgstr "_Save Image..."
 
-#: ../pidgin/gtkimhtmltoolbar.c:147
+#: ../pidgin/gtkimhtmltoolbar.c:151
 msgid "Select Font"
 msgstr "Select Font"
 
-#: ../pidgin/gtkimhtmltoolbar.c:226
+#: ../pidgin/gtkimhtmltoolbar.c:230
 msgid "Select Text Color"
 msgstr "Select Text Colour"
 
-#: ../pidgin/gtkimhtmltoolbar.c:305
+#: ../pidgin/gtkimhtmltoolbar.c:309
 msgid "Select Background Color"
 msgstr "Select Background Colour"
 
-#: ../pidgin/gtkimhtmltoolbar.c:394
+#: ../pidgin/gtkimhtmltoolbar.c:398
 msgid "_URL"
 msgstr "_URL"
 
-#: ../pidgin/gtkimhtmltoolbar.c:402
+#: ../pidgin/gtkimhtmltoolbar.c:406
 msgid "_Description"
 msgstr "_Description"
 
-#: ../pidgin/gtkimhtmltoolbar.c:405
+#: ../pidgin/gtkimhtmltoolbar.c:409
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
@@ -13057,85 +13072,85 @@
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
 
-#: ../pidgin/gtkimhtmltoolbar.c:409
+#: ../pidgin/gtkimhtmltoolbar.c:413
 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:414
+#: ../pidgin/gtkimhtmltoolbar.c:418
 msgid "Insert Link"
 msgstr "Insert Link"
 
-#: ../pidgin/gtkimhtmltoolbar.c:418
+#: ../pidgin/gtkimhtmltoolbar.c:422
 msgid "_Insert"
 msgstr "_Insert"
 
-#: ../pidgin/gtkimhtmltoolbar.c:487
+#: ../pidgin/gtkimhtmltoolbar.c:491
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Failed to store image: %s\n"
 
-#: ../pidgin/gtkimhtmltoolbar.c:513 ../pidgin/gtkimhtmltoolbar.c:523
+#: ../pidgin/gtkimhtmltoolbar.c:517 ../pidgin/gtkimhtmltoolbar.c:527
 msgid "Insert Image"
 msgstr "Insert Image"
 
-#: ../pidgin/gtkimhtmltoolbar.c:721
+#: ../pidgin/gtkimhtmltoolbar.c:725
 msgid "This theme has no available smileys."
 msgstr "This theme has no available smileys."
 
 #. show everything
-#: ../pidgin/gtkimhtmltoolbar.c:735
+#: ../pidgin/gtkimhtmltoolbar.c:739
 msgid "Smile!"
 msgstr "Smile!"
 
-#: ../pidgin/gtkimhtmltoolbar.c:922 ../pidgin/plugins/convcolors.c:287
+#: ../pidgin/gtkimhtmltoolbar.c:926 ../pidgin/plugins/convcolors.c:287
 msgid "Bold"
 msgstr "Bold"
 
-#: ../pidgin/gtkimhtmltoolbar.c:933 ../pidgin/plugins/convcolors.c:294
+#: ../pidgin/gtkimhtmltoolbar.c:937 ../pidgin/plugins/convcolors.c:294
 msgid "Italic"
 msgstr "Italic"
 
-#: ../pidgin/gtkimhtmltoolbar.c:944 ../pidgin/plugins/convcolors.c:301
+#: ../pidgin/gtkimhtmltoolbar.c:948 ../pidgin/plugins/convcolors.c:301
 msgid "Underline"
 msgstr "Underline"
 
-#: ../pidgin/gtkimhtmltoolbar.c:960
+#: ../pidgin/gtkimhtmltoolbar.c:964
 msgid "Larger font size"
 msgstr "Larger font size"
 
-#: ../pidgin/gtkimhtmltoolbar.c:972
+#: ../pidgin/gtkimhtmltoolbar.c:976
 msgid "Smaller font size"
 msgstr "Smaller font size"
 
-#: ../pidgin/gtkimhtmltoolbar.c:989
+#: ../pidgin/gtkimhtmltoolbar.c:993
 msgid "Font face"
 msgstr "Font face"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1001
+#: ../pidgin/gtkimhtmltoolbar.c:1005
 msgid "Foreground font color"
 msgstr "Foreground font colour"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1013
+#: ../pidgin/gtkimhtmltoolbar.c:1017
 msgid "Background color"
 msgstr "Background colour"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1029
+#: ../pidgin/gtkimhtmltoolbar.c:1033
 msgid "Reset formatting"
 msgstr "Reset formatting"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1044
+#: ../pidgin/gtkimhtmltoolbar.c:1048
 msgid "Insert link"
 msgstr "Insert link"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1054
+#: ../pidgin/gtkimhtmltoolbar.c:1058
 msgid "Insert image"
 msgstr "Insert image"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1065
+#: ../pidgin/gtkimhtmltoolbar.c:1069
 msgid "Insert smiley"
 msgstr "Insert smiley"
 
-#: ../pidgin/gtklog.c:262
+#: ../pidgin/gtklog.c:267
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation with "
@@ -13144,7 +13159,7 @@
 "Are you sure you want to permanently delete the log of the conversation with "
 "%s which started at %s?"
 
-#: ../pidgin/gtklog.c:273
+#: ../pidgin/gtklog.c:278
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation in %"
@@ -13153,7 +13168,7 @@
 "Are you sure you want to permanently delete the log of the conversation in %"
 "s which started at %s?"
 
-#: ../pidgin/gtklog.c:278
+#: ../pidgin/gtklog.c:283
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the system log which started at %"
@@ -13162,21 +13177,21 @@
 "Are you sure you want to permanently delete the system log which started at %"
 "s?"
 
-#: ../pidgin/gtklog.c:419
+#: ../pidgin/gtklog.c:427
 #, 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:422
+#: ../pidgin/gtklog.c:430
 #, 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:469
+#: ../pidgin/gtklog.c:477
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../pidgin/gtklog.c:516
+#: ../pidgin/gtklog.c:524
 msgid ""
 "System events will only be logged if the \"Log all status changes to system "
 "log\" preference is enabled."
@@ -13184,7 +13199,7 @@
 "System events will only be logged if the \"Log all status changes to system "
 "log\" preference is enabled."
 
-#: ../pidgin/gtklog.c:520
+#: ../pidgin/gtklog.c:528
 msgid ""
 "Instant messages will only be logged if the \"Log all instant messages\" "
 "preference is enabled."
@@ -13192,45 +13207,45 @@
 "Instant messages will only be logged if the \"Log all instant messages\" "
 "preference is enabled."
 
-#: ../pidgin/gtklog.c:523
+#: ../pidgin/gtklog.c:531
 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:527
+#: ../pidgin/gtklog.c:535
 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:542
+#: ../pidgin/gtklog.c:550
 msgid "_Browse logs folder"
 msgstr "_Browse logs folder"
 
-#: ../pidgin/gtklog.c:606
+#: ../pidgin/gtklog.c:614
 msgid "Total log size:"
 msgstr "Total log size:"
 
-#: ../pidgin/gtklog.c:675
+#: ../pidgin/gtklog.c:683
 #, c-format
 msgid "Conversations in %s"
 msgstr "Conversations in %s"
 
-#: ../pidgin/gtklog.c:683 ../pidgin/gtklog.c:735
+#: ../pidgin/gtklog.c:691 ../pidgin/gtklog.c:753
 #, c-format
 msgid "Conversations with %s"
 msgstr "Conversations with %s"
 
-#: ../pidgin/gtklog.c:760
+#: ../pidgin/gtklog.c:778
 msgid "System Log"
 msgstr "System Log"
 
-#: ../pidgin/gtkmain.c:364
+#: ../pidgin/gtkmain.c:373
 #, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s. Try `%s -h' for more information.\n"
 
-#: ../pidgin/gtkmain.c:366
+#: ../pidgin/gtkmain.c:375
 #, c-format
 msgid ""
 "%s %s\n"
@@ -13255,44 +13270,44 @@
 "                      account(s) to use, separated by commas)\n"
 "  -v, --version       display the current version and exit\n"
 
-#: ../pidgin/gtkmain.c:488
+#: ../pidgin/gtkmain.c:493
 #, 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"
 "no fault of your own.\n"
 "\n"
-"If you can reproduce the crash, please notify the Pidgin\n"
-"developers by reporting a bug at\n"
-"%sbug.php\n"
+"If you can reproduce the crash, please notify the developers\n"
+"by reporting a bug at:\n"
+"%snewticket/\n"
 "\n"
 "Please make sure to specify what you were doing at the time\n"
 "and post the backtrace from the core file.  If you do not know\n"
 "how to get the backtrace, please read the instructions at\n"
-"%sgdb.php\n"
+"%swiki/GetABacktrace\n"
 "\n"
 "If you need further assistance, please IM either SeanEgn or \n"
 "LSchiere (via AIM).  Contact information for Sean and Luke \n"
 "on other protocols is at\n"
-"%scontactinfo.php\n"
+"%swiki/DeveloperPages\n"
 msgstr ""
 "%s has segfaulted and attempted to dump a core file.\n"
 "This is a bug in the software and has happened through\n"
 "no fault of your own.\n"
 "\n"
-"If you can reproduce the crash, please notify the Pidgin\n"
-"developers by reporting a bug at\n"
-"%sbug.php\n"
+"If you can reproduce the crash, please notify the developers\n"
+"by reporting a bug at:\n"
+"%snewticket/\n"
 "\n"
 "Please make sure to specify what you were doing at the time\n"
 "and post the backtrace from the core file.  If you do not know\n"
 "how to get the backtrace, please read the instructions at\n"
-"%sgdb.php\n"
+"%swiki/GetABacktrace\n"
 "\n"
 "If you need further assistance, please IM either SeanEgn or \n"
 "LSchiere (via AIM).  Contact information for Sean and Luke \n"
 "on other protocols is at\n"
-"%scontactinfo.php\n"
+"%swiki/DeveloperPages\n"
 
 #: ../pidgin/gtknotify.c:337
 msgid "Open All Messages"
@@ -13320,22 +13335,22 @@
 msgstr[0] "<b>You have %d new e-mail.</b>"
 msgstr[1] "<b>You have %d new e-mails.</b>"
 
-#: ../pidgin/gtknotify.c:909
+#: ../pidgin/gtknotify.c:951
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "The browser command \"%s\" is invalid."
 
-#: ../pidgin/gtknotify.c:911 ../pidgin/gtknotify.c:923
-#: ../pidgin/gtknotify.c:936 ../pidgin/gtknotify.c:1064
+#: ../pidgin/gtknotify.c:953 ../pidgin/gtknotify.c:965
+#: ../pidgin/gtknotify.c:978 ../pidgin/gtknotify.c:1106
 msgid "Unable to open URL"
 msgstr "Unable to open URL"
 
-#: ../pidgin/gtknotify.c:921 ../pidgin/gtknotify.c:934
+#: ../pidgin/gtknotify.c:963 ../pidgin/gtknotify.c:976
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "Error launching \"%s\": %s"
 
-#: ../pidgin/gtknotify.c:1065
+#: ../pidgin/gtknotify.c:1107
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
@@ -13349,11 +13364,11 @@
 msgid "Multiple plugins will be unloaded."
 msgstr "Multiple plug-ins will be unloaded."
 
-#: ../pidgin/gtkplugin.c:285
+#: ../pidgin/gtkplugin.c:287
 msgid "Unload Plugins"
 msgstr "Unload Plug-ins"
 
-#: ../pidgin/gtkplugin.c:397
+#: ../pidgin/gtkplugin.c:399
 #, c-format
 msgid ""
 "%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
@@ -13364,7 +13379,7 @@
 "<span weight=\"bold\">Web site:</span>\t\t%s\n"
 "<span weight=\"bold\">Filename:</span>\t%s"
 
-#: ../pidgin/gtkplugin.c:407
+#: ../pidgin/gtkplugin.c:409
 #, c-format
 msgid ""
 "%s\n"
@@ -13375,11 +13390,11 @@
 "<span foreground=\"#ff0000\" weight=\"bold\">Error: %s\n"
 "Check the plug-in website for an update.</span>"
 
-#: ../pidgin/gtkplugin.c:533
+#: ../pidgin/gtkplugin.c:535
 msgid "Configure Pl_ugin"
 msgstr "Configure Pl_ug-in"
 
-#: ../pidgin/gtkplugin.c:596
+#: ../pidgin/gtkplugin.c:598
 msgid "<b>Plugin Details</b>"
 msgstr "<b>Plug-in Details</b>"
 
@@ -13388,95 +13403,95 @@
 msgstr "Select a file"
 
 #. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:522
+#: ../pidgin/gtkpounce.c:524
 msgid "Pounce on Whom"
 msgstr "Pounce on Whom"
 
-#: ../pidgin/gtkpounce.c:549
+#: ../pidgin/gtkpounce.c:551
 msgid "_Buddy name:"
 msgstr "_Buddy name:"
 
-#: ../pidgin/gtkpounce.c:583
+#: ../pidgin/gtkpounce.c:585
 msgid "Si_gns on"
 msgstr "Si_gns on"
 
-#: ../pidgin/gtkpounce.c:585
+#: ../pidgin/gtkpounce.c:587
 msgid "Signs o_ff"
 msgstr "Signs o_ff"
 
-#: ../pidgin/gtkpounce.c:587
-msgid "Goes a_way"
-msgstr "Goes a_way"
-
 #: ../pidgin/gtkpounce.c:589
-msgid "Ret_urns from away"
-msgstr "Ret_urn from away"
+msgid "Goes a_way"
+msgstr "Goes a_way"
 
 #: ../pidgin/gtkpounce.c:591
+msgid "Ret_urns from away"
+msgstr "Ret_urn from away"
+
+#: ../pidgin/gtkpounce.c:593
 msgid "Becomes _idle"
 msgstr "Becomes _idle"
 
-#: ../pidgin/gtkpounce.c:593
+#: ../pidgin/gtkpounce.c:595
 msgid "Is no longer i_dle"
 msgstr "Is no longer i_dle"
 
-#: ../pidgin/gtkpounce.c:595
+#: ../pidgin/gtkpounce.c:597
 msgid "Starts _typing"
 msgstr "Starts _typing"
 
-#: ../pidgin/gtkpounce.c:597
+#: ../pidgin/gtkpounce.c:599
 msgid "P_auses while typing"
 msgstr "P_auses while typing"
 
-#: ../pidgin/gtkpounce.c:599
-msgid "Stops t_yping"
-msgstr "Stops t_yping"
-
 #: ../pidgin/gtkpounce.c:601
+msgid "Stops t_yping"
+msgstr "Stops t_yping"
+
+#: ../pidgin/gtkpounce.c:603
 msgid "Sends a _message"
 msgstr "Sends a _message"
 
-#: ../pidgin/gtkpounce.c:644
+#: ../pidgin/gtkpounce.c:646
 msgid "Ope_n an IM window"
 msgstr "Ope_n a message window"
 
-#: ../pidgin/gtkpounce.c:646
+#: ../pidgin/gtkpounce.c:648
 msgid "_Pop up a notification"
 msgstr "_Pop up a notification"
 
-#: ../pidgin/gtkpounce.c:648
+#: ../pidgin/gtkpounce.c:650
 msgid "Send a _message"
 msgstr "Send a _message"
 
-#: ../pidgin/gtkpounce.c:650
+#: ../pidgin/gtkpounce.c:652
 msgid "E_xecute a command"
 msgstr "E_xecute a command"
 
-#: ../pidgin/gtkpounce.c:652
+#: ../pidgin/gtkpounce.c:654
 msgid "P_lay a sound"
 msgstr "P_lay a sound"
 
-#: ../pidgin/gtkpounce.c:657
+#: ../pidgin/gtkpounce.c:659
 msgid "Brows_e..."
 msgstr "Brows_e..."
 
-#: ../pidgin/gtkpounce.c:659
+#: ../pidgin/gtkpounce.c:661
 msgid "Br_owse..."
 msgstr "Br_owse..."
 
-#: ../pidgin/gtkpounce.c:660
+#: ../pidgin/gtkpounce.c:662
 msgid "Pre_view"
 msgstr "Pre_view"
 
-#: ../pidgin/gtkpounce.c:784
+#: ../pidgin/gtkpounce.c:786
 msgid "P_ounce only when my status is not available"
 msgstr "P_ounce only when my status is \"not available\""
 
-#: ../pidgin/gtkpounce.c:789
+#: ../pidgin/gtkpounce.c:791
 msgid "_Recurring"
 msgstr "_Recurring"
 
-#: ../pidgin/gtkpounce.c:1243
+#: ../pidgin/gtkpounce.c:1247
 msgid "Pounce Target"
 msgstr "Pounce Target"
 
@@ -13504,7 +13519,7 @@
 msgid "_Show system tray icon:"
 msgstr "_Show system tray icon:"
 
-#: ../pidgin/gtkprefs.c:819 ../pidgin/gtkprefs.c:831 ../pidgin/gtkprefs.c:1646
+#: ../pidgin/gtkprefs.c:819 ../pidgin/gtkprefs.c:831 ../pidgin/gtkprefs.c:1649
 #: ../pidgin/plugins/timestamp_format.c:42
 #: ../pidgin/plugins/timestamp_format.c:51
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:338
@@ -13523,7 +13538,7 @@
 msgid "_Hide new IM conversations:"
 msgstr "_Hide new IM conversations:"
 
-#: ../pidgin/gtkprefs.c:830 ../pidgin/gtkprefs.c:1826
+#: ../pidgin/gtkprefs.c:830 ../pidgin/gtkprefs.c:1829
 msgid "When away"
 msgstr "When away"
 
@@ -13749,59 +13764,64 @@
 msgid "Log all _status changes to system log"
 msgstr "Log all _status changes to system log"
 
+#: ../pidgin/gtkprefs.c:1475 ../pidgin/gtkprefs.c:1564
+#: ../pidgin/gtkprefs.c:1757
+msgid "(default)"
+msgstr "(default)"
+
 #: ../pidgin/gtkprefs.c:1513
 msgid "Sound Selection"
 msgstr "Sound Selection"
 
-#: ../pidgin/gtkprefs.c:1521
+#: ../pidgin/gtkprefs.c:1523
 msgid "Quietest"
 msgstr "Quietest"
 
-#: ../pidgin/gtkprefs.c:1523
+#: ../pidgin/gtkprefs.c:1525
 msgid "Quieter"
 msgstr "Quieter"
 
-#: ../pidgin/gtkprefs.c:1525
+#: ../pidgin/gtkprefs.c:1527
 msgid "Quiet"
 msgstr "Quiet"
 
-#: ../pidgin/gtkprefs.c:1529
+#: ../pidgin/gtkprefs.c:1531
 msgid "Loud"
 msgstr "Loud"
 
-#: ../pidgin/gtkprefs.c:1531
+#: ../pidgin/gtkprefs.c:1533
 msgid "Louder"
 msgstr "Louder"
 
-#: ../pidgin/gtkprefs.c:1533
+#: ../pidgin/gtkprefs.c:1535
 msgid "Loudest"
 msgstr "Loudest"
 
-#: ../pidgin/gtkprefs.c:1596
+#: ../pidgin/gtkprefs.c:1598
 msgid "Sound Method"
 msgstr "Sound Method"
 
-#: ../pidgin/gtkprefs.c:1597
+#: ../pidgin/gtkprefs.c:1599
 msgid "_Method:"
 msgstr "_Method:"
 
-#: ../pidgin/gtkprefs.c:1599
-msgid "Console beep"
-msgstr "Console beep"
-
 #: ../pidgin/gtkprefs.c:1601
+msgid "Console beep"
+msgstr "Console beep"
+
+#: ../pidgin/gtkprefs.c:1603
 msgid "Automatic"
 msgstr "Automatic"
 
-#: ../pidgin/gtkprefs.c:1604
+#: ../pidgin/gtkprefs.c:1607
 msgid "Command"
 msgstr "Command"
 
-#: ../pidgin/gtkprefs.c:1605
+#: ../pidgin/gtkprefs.c:1608
 msgid "No sounds"
 msgstr "No sounds"
 
-#: ../pidgin/gtkprefs.c:1613
+#: ../pidgin/gtkprefs.c:1616
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -13810,117 +13830,117 @@
 "Sound c_ommand:\n"
 "(%s for filename)"
 
-#: ../pidgin/gtkprefs.c:1639
+#: ../pidgin/gtkprefs.c:1642
 msgid "Sound Options"
 msgstr "Sound Options"
 
-#: ../pidgin/gtkprefs.c:1640
+#: ../pidgin/gtkprefs.c:1643
 msgid "Sounds when conversation has _focus"
 msgstr "Sounds when conversation has _focus"
 
-#: ../pidgin/gtkprefs.c:1642
+#: ../pidgin/gtkprefs.c:1645
 msgid "Enable sounds:"
 msgstr "Enable sounds:"
 
-#: ../pidgin/gtkprefs.c:1644
+#: ../pidgin/gtkprefs.c:1647
 msgid "Only when available"
 msgstr "Only when available"
 
-#: ../pidgin/gtkprefs.c:1645
+#: ../pidgin/gtkprefs.c:1648
 msgid "Only when not available"
 msgstr "Only when not available"
 
-#: ../pidgin/gtkprefs.c:1653
+#: ../pidgin/gtkprefs.c:1656
 msgid "Volume:"
 msgstr "Volume:"
 
-#: ../pidgin/gtkprefs.c:1681
+#: ../pidgin/gtkprefs.c:1684
 msgid "Sound Events"
 msgstr "Sound Events"
 
-#: ../pidgin/gtkprefs.c:1732
+#: ../pidgin/gtkprefs.c:1735
 msgid "Play"
 msgstr "Play"
 
-#: ../pidgin/gtkprefs.c:1739
+#: ../pidgin/gtkprefs.c:1742
 msgid "Event"
 msgstr "Event"
 
-#: ../pidgin/gtkprefs.c:1758
+#: ../pidgin/gtkprefs.c:1761
 msgid "Test"
 msgstr "Test"
 
-#: ../pidgin/gtkprefs.c:1762
+#: ../pidgin/gtkprefs.c:1765
 msgid "Reset"
 msgstr "Reset"
 
-#: ../pidgin/gtkprefs.c:1766
+#: ../pidgin/gtkprefs.c:1769
 msgid "Choose..."
 msgstr "Choose..."
 
-#: ../pidgin/gtkprefs.c:1809
+#: ../pidgin/gtkprefs.c:1812
 msgid "_Report idle time:"
 msgstr "_Report idle time:"
 
-#: ../pidgin/gtkprefs.c:1814
+#: ../pidgin/gtkprefs.c:1817
 msgid "Based on keyboard or mouse use"
 msgstr "Based on keyboard or mouse use"
 
-#: ../pidgin/gtkprefs.c:1823
+#: ../pidgin/gtkprefs.c:1826
 msgid "_Auto-reply:"
 msgstr "_Auto-reply:"
 
-#: ../pidgin/gtkprefs.c:1827
+#: ../pidgin/gtkprefs.c:1830
 msgid "When both away and idle"
 msgstr "When both away and idle"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1833
+#: ../pidgin/gtkprefs.c:1836
 msgid "Auto-away"
 msgstr "Auto-away"
 
-#: ../pidgin/gtkprefs.c:1835
+#: ../pidgin/gtkprefs.c:1838
 msgid "Change status when _idle"
 msgstr "Change status when _idle"
 
-#: ../pidgin/gtkprefs.c:1839
+#: ../pidgin/gtkprefs.c:1842
 msgid "_Minutes before changing status:"
 msgstr "_Minutes before changing status:"
 
-#: ../pidgin/gtkprefs.c:1847
+#: ../pidgin/gtkprefs.c:1850
 msgid "Change _status to:"
 msgstr "Change _status to:"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1868
+#: ../pidgin/gtkprefs.c:1871
 msgid "Status at Startup"
 msgstr "Status at Startup"
 
-#: ../pidgin/gtkprefs.c:1870
+#: ../pidgin/gtkprefs.c:1873
 msgid "Use status from last _exit at startup"
 msgstr "Use status from last _exit at startup"
 
-#: ../pidgin/gtkprefs.c:1876
+#: ../pidgin/gtkprefs.c:1879
 msgid "Status to a_pply at startup:"
 msgstr "Status to a_pply at startup:"
 
-#: ../pidgin/gtkprefs.c:1914
+#: ../pidgin/gtkprefs.c:1917
 msgid "Interface"
 msgstr "Interface"
 
-#: ../pidgin/gtkprefs.c:1916
+#: ../pidgin/gtkprefs.c:1919
 msgid "Smiley Themes"
 msgstr "Smiley Themes"
 
-#: ../pidgin/gtkprefs.c:1917
+#: ../pidgin/gtkprefs.c:1920
 msgid "Sounds"
 msgstr "Sounds"
 
-#: ../pidgin/gtkprefs.c:1923
+#: ../pidgin/gtkprefs.c:1926
 msgid "Browser"
 msgstr "Browser"
 
-#: ../pidgin/gtkprefs.c:1927
+#: ../pidgin/gtkprefs.c:1930
 msgid "Status / Idle"
 msgstr "Status / Idle"
 
@@ -13957,7 +13977,7 @@
 msgid "Set privacy for:"
 msgstr "Set privacy for:"
 
-#: ../pidgin/gtkprivacy.c:560 ../pidgin/gtkprivacy.c:576
+#: ../pidgin/gtkprivacy.c:560 ../pidgin/gtkprivacy.c:577
 msgid "Permit User"
 msgstr "Permit User"
 
@@ -13969,38 +13989,38 @@
 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:565 ../pidgin/gtkprivacy.c:578
+#: ../pidgin/gtkprivacy.c:565 ../pidgin/gtkprivacy.c:581
 msgid "_Permit"
 msgstr "_Permit"
 
-#: ../pidgin/gtkprivacy.c:570
+#: ../pidgin/gtkprivacy.c:571
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "Allow %s to contact you?"
 
-#: ../pidgin/gtkprivacy.c:572
+#: ../pidgin/gtkprivacy.c:573
 #, 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:599 ../pidgin/gtkprivacy.c:612
+#: ../pidgin/gtkprivacy.c:602 ../pidgin/gtkprivacy.c:616
 msgid "Block User"
 msgstr "Block User"
 
-#: ../pidgin/gtkprivacy.c:600
+#: ../pidgin/gtkprivacy.c:603
 msgid "Type a user to block."
 msgstr "Type a user to block."
 
-#: ../pidgin/gtkprivacy.c:601
+#: ../pidgin/gtkprivacy.c:604
 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:612
 #, c-format
 msgid "Block %s?"
 msgstr "Block %s?"
 
-#: ../pidgin/gtkprivacy.c:610
+#: ../pidgin/gtkprivacy.c:614
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "Are you sure you want to block %s?"
@@ -14009,23 +14029,23 @@
 msgid "Apply"
 msgstr "Apply"
 
-#: ../pidgin/gtkrequest.c:1469
+#: ../pidgin/gtkrequest.c:1481
 msgid "That file already exists"
 msgstr "That file already exists"
 
-#: ../pidgin/gtkrequest.c:1470
+#: ../pidgin/gtkrequest.c:1482
 msgid "Would you like to overwrite it?"
 msgstr "Would you like to overwrite it?"
 
-#: ../pidgin/gtkrequest.c:1471
+#: ../pidgin/gtkrequest.c:1485
 msgid "Overwrite"
 msgstr "Overwrite"
 
-#: ../pidgin/gtkrequest.c:1472
+#: ../pidgin/gtkrequest.c:1486
 msgid "Choose New Name"
 msgstr "Choose New Name"
 
-#: ../pidgin/gtkrequest.c:1607 ../pidgin/gtkrequest.c:1621
+#: ../pidgin/gtkrequest.c:1624 ../pidgin/gtkrequest.c:1638
 msgid "Select Folder..."
 msgstr "Select Folder..."
 
@@ -14048,37 +14068,37 @@
 msgstr "Are you sure you want to delete the selected saved statuses?"
 
 #. Use button
-#: ../pidgin/gtksavedstatuses.c:579 ../pidgin/gtksavedstatuses.c:1213
+#: ../pidgin/gtksavedstatuses.c:580 ../pidgin/gtksavedstatuses.c:1214
 msgid "_Use"
 msgstr "_Use"
 
-#: ../pidgin/gtksavedstatuses.c:725
+#: ../pidgin/gtksavedstatuses.c:726
 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:913
+#: ../pidgin/gtksavedstatuses.c:914
 msgid "Different"
 msgstr "Different"
 
-#: ../pidgin/gtksavedstatuses.c:1106
+#: ../pidgin/gtksavedstatuses.c:1107
 msgid "_Title:"
 msgstr "_Title:"
 
-#: ../pidgin/gtksavedstatuses.c:1125 ../pidgin/gtksavedstatuses.c:1446
+#: ../pidgin/gtksavedstatuses.c:1126 ../pidgin/gtksavedstatuses.c:1447
 msgid "_Status:"
 msgstr "_Status:"
 
 #. Different status message expander
-#: ../pidgin/gtksavedstatuses.c:1157
+#: ../pidgin/gtksavedstatuses.c:1158
 msgid "Use a _different status for some accounts"
 msgstr "Use a _different status for some accounts"
 
 #. Save & Use button
-#: ../pidgin/gtksavedstatuses.c:1221
+#: ../pidgin/gtksavedstatuses.c:1222
 msgid "Sa_ve & Use"
 msgstr "Sa_ve & Use"
 
-#: ../pidgin/gtksavedstatuses.c:1427
+#: ../pidgin/gtksavedstatuses.c:1428
 #, c-format
 msgid "Status for %s"
 msgstr "Status for %s"
@@ -14131,39 +14151,43 @@
 msgid "GStreamer failed to initialize."
 msgstr "GStreamer failed to initialize."
 
-#: ../pidgin/gtkstatusbox.c:611
+#: ../pidgin/gtkstatusbox.c:661
 msgid "Waiting for network connection"
 msgstr "Waiting for network connection"
 
-#: ../pidgin/gtkutils.c:1320 ../pidgin/gtkutils.c:1343
+#: ../pidgin/gtkutils.c:590
+msgid "Google Talk"
+msgstr "Google Talk"
+
+#: ../pidgin/gtkutils.c:1305 ../pidgin/gtkutils.c:1328
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "The following error has occurred loading %s: %s"
 
-#: ../pidgin/gtkutils.c:1323 ../pidgin/gtkutils.c:1345
+#: ../pidgin/gtkutils.c:1308 ../pidgin/gtkutils.c:1330
 msgid "Failed to load image"
 msgstr "Failed to load image"
 
-#: ../pidgin/gtkutils.c:1420
+#: ../pidgin/gtkutils.c:1404
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "Cannot send folder %s."
 
-#: ../pidgin/gtkutils.c:1421
+#: ../pidgin/gtkutils.c:1405
 #, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
-"individually"
+"individually."
 msgstr ""
 "%s cannot transfer a folder. You will need to send the files within "
-"individually"
-
-#: ../pidgin/gtkutils.c:1453 ../pidgin/gtkutils.c:1462
-#: ../pidgin/gtkutils.c:1467
+"individually."
+
+#: ../pidgin/gtkutils.c:1437 ../pidgin/gtkutils.c:1449
+#: ../pidgin/gtkutils.c:1456
 msgid "You have dragged an image"
 msgstr "You have dragged an image"
 
-#: ../pidgin/gtkutils.c:1454
+#: ../pidgin/gtkutils.c:1438
 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."
@@ -14171,23 +14195,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:1458 ../pidgin/gtkutils.c:1473
+#: ../pidgin/gtkutils.c:1444 ../pidgin/gtkutils.c:1465
 msgid "Set as buddy icon"
 msgstr "Set as buddy icon"
 
-#: ../pidgin/gtkutils.c:1459 ../pidgin/gtkutils.c:1474
+#: ../pidgin/gtkutils.c:1445 ../pidgin/gtkutils.c:1466
 msgid "Send image file"
 msgstr "Send image file"
 
-#: ../pidgin/gtkutils.c:1460 ../pidgin/gtkutils.c:1474
+#: ../pidgin/gtkutils.c:1446 ../pidgin/gtkutils.c:1466
 msgid "Insert in message"
 msgstr "Insert in message"
 
-#: ../pidgin/gtkutils.c:1463
+#: ../pidgin/gtkutils.c:1450
 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:1468
+#: ../pidgin/gtkutils.c:1457
 msgid ""
 "You can send this image as a file transfer or embed it into this message, or "
 "use it as the buddy icon for this user."
@@ -14195,7 +14219,7 @@
 "You can send this image as a file transfer or embed it into this message, or "
 "use it as the buddy icon for this user."
 
-#: ../pidgin/gtkutils.c:1470
+#: ../pidgin/gtkutils.c:1459
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -14208,11 +14232,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:1524
+#: ../pidgin/gtkutils.c:1517
 msgid "Cannot send launcher"
 msgstr "Cannot send launcher"
 
-#: ../pidgin/gtkutils.c:1524
+#: ../pidgin/gtkutils.c:1517
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
@@ -14220,7 +14244,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:2291
+#: ../pidgin/gtkutils.c:2264
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -14231,60 +14255,66 @@
 "<b>File size:</b> %s\n"
 "<b>Image size:</b> %dx%d"
 
-#: ../pidgin/gtkutils.c:2611
+#: ../pidgin/gtkutils.c:2560
 #, 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:2613
+#: ../pidgin/gtkutils.c:2562
 msgid "Icon Error"
 msgstr "Icon Error"
 
-#: ../pidgin/gtkutils.c:2614
+#: ../pidgin/gtkutils.c:2563
 msgid "Could not set icon"
 msgstr "Could not set icon"
 
-#: ../pidgin/gtkutils.c:2715
+#: ../pidgin/gtkutils.c:2663
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Failed to open file \"%s\": %s"
 
-#: ../pidgin/gtkutils.c:2764
+#: ../pidgin/gtkutils.c:2712
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
 msgstr ""
 "Failed to load image \"%s\": reason not known; probably a corrupt image file"
 
-#: ../pidgin/gtkwhiteboard.c:756 ../pidgin/gtkwhiteboard.c:775
+#: ../pidgin/gtkwhiteboard.c:760 ../pidgin/gtkwhiteboard.c:779
 msgid "Save File"
 msgstr "Save File"
 
-#: ../pidgin/gtkwhiteboard.c:863
+#: ../pidgin/gtkwhiteboard.c:867
 msgid "Select color"
 msgstr "Select colour"
 
-#: ../pidgin/pidginstock.c:88
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+#: ../pidgin/pidgin.h:50
+msgid "Pidgin"
+msgstr "Pidgin"
+
+#: ../pidgin/pidginstock.c:81
 msgid "_Alias"
 msgstr "_Alias"
 
-#: ../pidgin/pidginstock.c:90
+#: ../pidgin/pidginstock.c:83
 msgid "Close _tabs"
 msgstr "Close _tabs"
 
-#: ../pidgin/pidginstock.c:92
+#: ../pidgin/pidginstock.c:85
 msgid "_Get Info"
 msgstr "_Get Info"
 
-#: ../pidgin/pidginstock.c:93
+#: ../pidgin/pidginstock.c:86
 msgid "_Invite"
 msgstr "_Invite"
 
-#: ../pidgin/pidginstock.c:94
+#: ../pidgin/pidginstock.c:87
 msgid "_Modify"
 msgstr "_Modify"
 
-#: ../pidgin/pidginstock.c:95
+#: ../pidgin/pidginstock.c:88
 msgid "_Open Mail"
 msgstr "_Open Mail"
 
@@ -14392,21 +14422,21 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/contact_priority.c:182
+#: ../pidgin/plugins/contact_priority.c:187
 msgid "Contact Priority"
 msgstr "Contact Priority"
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../pidgin/plugins/contact_priority.c:185
+#: ../pidgin/plugins/contact_priority.c:190
 msgid ""
 "Allows for controlling the values associated with different buddy states."
 msgstr ""
 "Allows for controlling the values associated with different buddy states."
 
 #. *< description
-#: ../pidgin/plugins/contact_priority.c:187
+#: ../pidgin/plugins/contact_priority.c:192
 msgid ""
 "Allows for changing the point values of idle/away/offline states for buddies "
 "in contact priority computations."
@@ -14467,11 +14497,20 @@
 msgid "Conversation Placement"
 msgstr "Conversation Placement"
 
-#: ../pidgin/plugins/extplacement.c:106
+#. Translators: "New conversations" should match the text in the preferences dialog and "By conversation count" should be the same text used above
+#: ../pidgin/plugins/extplacement.c:105
+msgid ""
+"Note: The preference for \"New conversations\" must be set to \"By "
+"conversation count\"."
+msgstr ""
+"Note: The preference for \"New conversations\" must be set to \"By "
+"conversation count\"."
+
+#: ../pidgin/plugins/extplacement.c:111
 msgid "Number of conversations per window"
 msgstr "Number of conversations per window"
 
-#: ../pidgin/plugins/extplacement.c:112
+#: ../pidgin/plugins/extplacement.c:117
 msgid "Separate IM and Chat windows when placing by number"
 msgstr "Separate IM and Chat windows when placing by number"
 
@@ -14481,19 +14520,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/extplacement.c:135
+#: ../pidgin/plugins/extplacement.c:146
 msgid "ExtPlacement"
 msgstr "ExtPlacement"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/extplacement.c:137
+#: ../pidgin/plugins/extplacement.c:148
 msgid "Extra conversation placement options."
 msgstr "Extra conversation placement options."
 
 #. *< summary
 #. *  description
-#: ../pidgin/plugins/extplacement.c:139
+#: ../pidgin/plugins/extplacement.c:150
 msgid ""
 "Restrict the number of conversations per windows, optionally separating IMs "
 "and Chats"
@@ -14501,36 +14540,6 @@
 "Restrict the number of conversations per windows, optionally separating IMs "
 "and Chats"
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../pidgin/plugins/gaiminc.c:91
-msgid "Pidgin Demonstration Plugin"
-msgstr "Pidgin Demonstration Plug-in"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../pidgin/plugins/gaiminc.c:94
-msgid "An example plugin that does stuff - see the description."
-msgstr "An example plug-in that does stuff - see the description."
-
-#. *  description
-#: ../pidgin/plugins/gaiminc.c:96
-msgid ""
-"This is a really cool plugin that does a lot of stuff:\n"
-"- It tells you who wrote the program when you log in\n"
-"- It reverses all incoming text\n"
-"- It sends a message to people on your list immediately when they sign on"
-msgstr ""
-"This is a really cool plug-in that does a lot of stuff:\n"
-"- It tells you who wrote the program when you log in\n"
-"- It reverses all incoming text\n"
-"- It sends a message to people on your list immediately when they sign on"
-
 #. Configuration frame
 #: ../pidgin/plugins/gestures/gestures.c:235
 msgid "Mouse Gestures Configuration"
@@ -14555,19 +14564,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gestures/gestures.c:289
+#: ../pidgin/plugins/gestures/gestures.c:295
 msgid "Mouse Gestures"
 msgstr "Mouse Gestures"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/gestures/gestures.c:292
+#: ../pidgin/plugins/gestures/gestures.c:298
 msgid "Provides support for mouse gestures"
 msgstr "Provides support for mouse gestures"
 
 #. *  description
-#: ../pidgin/plugins/gestures/gestures.c:294
+#: ../pidgin/plugins/gestures/gestures.c:300
 msgid ""
 "Allows support for mouse gestures in conversation windows.\n"
 "Drag the middle mouse button to perform certain actions:\n"
@@ -14660,7 +14669,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gevolution/gevolution.c:521
+#: ../pidgin/plugins/gevolution/gevolution.c:526
 msgid "Evolution Integration"
 msgstr "Evolution Integration"
 
@@ -14668,8 +14677,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/gevolution/gevolution.c:524
-#: ../pidgin/plugins/gevolution/gevolution.c:526
+#: ../pidgin/plugins/gevolution/gevolution.c:529
+#: ../pidgin/plugins/gevolution/gevolution.c:531
 msgid "Provides integration with Evolution."
 msgstr "Provides integration with Evolution."
 
@@ -14824,12 +14833,12 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:668
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:674
 msgid "Music Messaging Plugin for collaborative composition."
 msgstr "Music Messaging Plugin for collaborative composition."
 
 #. *  summary
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:670
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:676
 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."
@@ -14915,7 +14924,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/notify.c:895
+#: ../pidgin/plugins/notify.c:901
 msgid "Message Notification"
 msgstr "Message Notification"
 
@@ -14923,10 +14932,40 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/notify.c:898 ../pidgin/plugins/notify.c:900
+#: ../pidgin/plugins/notify.c:904 ../pidgin/plugins/notify.c:906
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "Provides a variety of ways of notifying you of unread messages."
 
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/pidgininc.c:91
+msgid "Pidgin Demonstration Plugin"
+msgstr "Pidgin Demonstration Plug-in"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/pidgininc.c:94
+msgid "An example plugin that does stuff - see the description."
+msgstr "An example plug-in that does stuff - see the description."
+
+#. *  description
+#: ../pidgin/plugins/pidgininc.c:96
+msgid ""
+"This is a really cool plugin that does a lot of stuff:\n"
+"- It tells you who wrote the program when you log in\n"
+"- It reverses all incoming text\n"
+"- It sends a message to people on your list immediately when they sign on"
+msgstr ""
+"This is a really cool plug-in that does a lot of stuff:\n"
+"- It tells you who wrote the program when you log in\n"
+"- It reverses all incoming text\n"
+"- It sends a message to people on your list immediately when they sign on"
+
 #: ../pidgin/plugins/pidginrc.c:41
 msgid "Cursor Color"
 msgstr "Cursor Colour"
@@ -14939,38 +14978,30 @@
 msgid "Hyperlink Color"
 msgstr "Hyperlink Colour"
 
-#: ../pidgin/plugins/pidginrc.c:56
-msgid "GtkTreeView Expander Size"
-msgstr "GtkTreeView Expander Size"
-
-#: ../pidgin/plugins/pidginrc.c:57
+#: ../pidgin/plugins/pidginrc.c:54
 msgid "GtkTreeView Horizontal Separation"
 msgstr "GtkTreeView Horizontal Separation"
 
-#: ../pidgin/plugins/pidginrc.c:76
+#: ../pidgin/plugins/pidginrc.c:73
 msgid "Conversation Entry"
 msgstr "Conversation Entry"
 
-#: ../pidgin/plugins/pidginrc.c:77
+#: ../pidgin/plugins/pidginrc.c:74
 msgid "Conversation History"
 msgstr "Conversation History"
 
-#: ../pidgin/plugins/pidginrc.c:78
+#: ../pidgin/plugins/pidginrc.c:75
 msgid "Log Viewer"
 msgstr "Log Viewer"
 
-#: ../pidgin/plugins/pidginrc.c:79
+#: ../pidgin/plugins/pidginrc.c:76
 msgid "Request Dialog"
 msgstr "Request Dialog"
 
-#: ../pidgin/plugins/pidginrc.c:80
+#: ../pidgin/plugins/pidginrc.c:77
 msgid "Notify Dialog"
 msgstr "Notify Dialog"
 
-#: ../pidgin/plugins/pidginrc.c:91
-msgid "GtkTreeView Indent Expanders"
-msgstr "GtkTreeView Indent Expanders"
-
 #: ../pidgin/plugins/pidginrc.c:322
 msgid "Select Color"
 msgstr "Select Colour"
@@ -14992,36 +15023,56 @@
 msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+ Text Shortcut Theme"
 
-#: ../pidgin/plugins/pidginrc.c:508
+#.
+#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
+#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
+#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
+#.
+#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
+#. widget_bool_prefs_set[i], hbox);
+#. gtk_size_group_add_widget(labelsg, check);
+#.
+#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
+#. *
+#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
+#. *
+#. gtk_widget_set_sensitive(widget_bool_widgets[i],
+#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
+#. g_signal_connect(G_OBJECT(check), "toggled",
+#. G_CALLBACK(pidgin_toggle_sensitive),
+#. widget_bool_widgets[i]);
+#. }
+#.
+#: ../pidgin/plugins/pidginrc.c:510
 msgid "Interface colors"
 msgstr "Interface colours"
 
-#: ../pidgin/plugins/pidginrc.c:532
+#: ../pidgin/plugins/pidginrc.c:534
 msgid "Widget Sizes"
 msgstr "Widget Sizes"
 
-#: ../pidgin/plugins/pidginrc.c:553
+#: ../pidgin/plugins/pidginrc.c:555
 msgid "Fonts"
 msgstr "Fonts"
 
-#: ../pidgin/plugins/pidginrc.c:576
+#: ../pidgin/plugins/pidginrc.c:578
 msgid "Tools"
 msgstr "Tools"
 
-#: ../pidgin/plugins/pidginrc.c:581
+#: ../pidgin/plugins/pidginrc.c:583
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
 msgstr "Write settings to %s%sgtkrc-2.0"
 
-#: ../pidgin/plugins/pidginrc.c:589
+#: ../pidgin/plugins/pidginrc.c:591
 msgid "Re-read gtkrc files"
 msgstr "Re-read gtkrc files"
 
-#: ../pidgin/plugins/pidginrc.c:616
+#: ../pidgin/plugins/pidginrc.c:624
 msgid "Pidgin GTK+ Theme Control"
 msgstr "Pidgin GTK+ Theme Control"
 
-#: ../pidgin/plugins/pidginrc.c:618 ../pidgin/plugins/pidginrc.c:619
+#: ../pidgin/plugins/pidginrc.c:626 ../pidgin/plugins/pidginrc.c:627
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "Provides access to commonly used gtkrc settings."
 
@@ -15151,11 +15202,11 @@
 msgid "Enable replacement of last word on send"
 msgstr "Enable replacement of last word on send"
 
-#: ../pidgin/plugins/spellchk.c:2367
+#: ../pidgin/plugins/spellchk.c:2373
 msgid "Text replacement"
 msgstr "Text replacement"
 
-#: ../pidgin/plugins/spellchk.c:2369 ../pidgin/plugins/spellchk.c:2370
+#: ../pidgin/plugins/spellchk.c:2375 ../pidgin/plugins/spellchk.c:2376
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "Replaces text in outgoing messages according to user-defined rules."
 
@@ -15187,19 +15238,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/timestamp.c:196
+#: ../pidgin/plugins/timestamp.c:202
 msgid "Timestamp"
 msgstr "Timestamp"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/timestamp.c:199
+#: ../pidgin/plugins/timestamp.c:205
 msgid "Display iChat-style timestamps"
 msgstr "Display iChat-style timestamps"
 
 #. *  description
-#: ../pidgin/plugins/timestamp.c:201
+#: ../pidgin/plugins/timestamp.c:207
 msgid "Display iChat-style timestamps every N minutes."
 msgstr "Display iChat-style timestamps every N minutes."
 
@@ -15208,9 +15259,8 @@
 msgstr "Timestamp Format Options"
 
 #: ../pidgin/plugins/timestamp_format.c:26
-#, c-format
-msgid "_Force (traditional %s) 24-hour time format"
-msgstr "_Force (traditional %s) 24-hour time format"
+msgid "_Force 24-hour time format"
+msgstr "_Force 24-hour time format"
 
 #: ../pidgin/plugins/timestamp_format.c:33
 msgid "Show dates in..."
@@ -15240,19 +15290,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/timestamp_format.c:144
+#: ../pidgin/plugins/timestamp_format.c:151
 msgid "Message Timestamp Formats"
 msgstr "Message Timestamp Formats"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/timestamp_format.c:147
+#: ../pidgin/plugins/timestamp_format.c:154
 msgid "Customizes the message timestamp formats."
 msgstr "Customises the message timestamp formats."
 
 #. *  description
-#: ../pidgin/plugins/timestamp_format.c:149
+#: ../pidgin/plugins/timestamp_format.c:156
 msgid ""
 "This plugin allows the user to customize conversation and logging message "
 "timestamp formats."
@@ -15307,19 +15357,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:658
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:664
 msgid "Transparency"
 msgstr "Transparency"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:661
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:667
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "Variable Transparency for the buddy list and conversations."
 
 #. *  description
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:663
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:669
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
@@ -15363,15 +15413,15 @@
 msgid "_Flash window when chat messages are received"
 msgstr "_Flash window when chat messages are received"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:369
-msgid "Pidgwin Options"
-msgstr "Pidgin Options"
-
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:371
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:375
+msgid "Windows Pidgin Options"
+msgstr "Windows Pidgin Options"
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:377
 msgid "Options specific to Pidgin for Windows."
 msgstr "Options specific to Pidgin for Windows."
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:372
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:378
 msgid ""
 "Provides options specific to Pidgin for Windows , such as buddy list docking."
 msgstr ""