changeset 8469:918b7f58e148

[gaim-migrate @ 9202] update committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Thu, 18 Mar 2004 17:58:02 +0000
parents 91e9a268924a
children 9949b752d1ab
files po/en_GB.po
diffstat 1 files changed, 2235 insertions(+), 2005 deletions(-) [+]
line wrap: on
line diff
--- a/po/en_GB.po	Thu Mar 18 05:22:07 2004 +0000
+++ b/po/en_GB.po	Thu Mar 18 17:58:02 2004 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: Gaim 0.73\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-14 12:07+0000\n"
+"POT-Creation-Date: 2004-03-18 17:35+0000\n"
 "PO-Revision-Date: 2004-01-14 12:26+0000\n"
 "Last-Translator: Luke Ross <lukeross@sys3175.co.uk>\n"
 "Language-Team:  <en_GB@li.org>\n"
@@ -23,14 +23,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/autorecon.c:104
+#: plugins/autorecon.c:110
 msgid "Auto-Reconnect"
 msgstr "Auto-Reconnect"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/autorecon.c:107 plugins/autorecon.c:109
+#: plugins/autorecon.c:113 plugins/autorecon.c:115
 msgid "When you are kicked offline, this reconnects you."
 msgstr "When you are kicked offline, this reconnects you."
 
@@ -134,7 +134,7 @@
 msgid "Gaim - Away"
 msgstr "Gaim - Away"
 
-#: plugins/docklet/docklet.c:114 src/gtkaccount.c:482 src/gtkaccount.c:1761
+#: plugins/docklet/docklet.c:114 src/gtkaccount.c:495 src/gtkaccount.c:1820
 msgid "Auto-login"
 msgstr "Auto-login"
 
@@ -150,16 +150,16 @@
 msgid "New..."
 msgstr "New..."
 
-#: plugins/docklet/docklet.c:153 src/gtkblist.c:2726 src/gtkpounce.c:413
-#: src/gtkprefs.c:1456 src/protocols/gg/gg.c:51 src/protocols/irc/msgs.c:187
-#: src/protocols/jabber/jabber.c:961 src/protocols/jabber/jutil.c:99
-#: src/protocols/jabber/presence.c:84 src/protocols/oscar/oscar.c:2843
-#: src/protocols/oscar/oscar.c:4604 src/protocols/oscar/oscar.c:5563
-#: src/protocols/oscar/oscar.c:6164
+#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1576 src/protocols/gg/gg.c:51
+#: src/protocols/irc/msgs.c:187 src/protocols/jabber/jabber.c:960
+#: src/protocols/jabber/jutil.c:99 src/protocols/jabber/presence.c:58
+#: src/protocols/jabber/presence.c:114 src/protocols/oscar/oscar.c:2939
+#: src/protocols/oscar/oscar.c:4748 src/protocols/oscar/oscar.c:5794
+#: src/protocols/oscar/oscar.c:6412
 msgid "Away"
 msgstr "Away"
 
-#: plugins/docklet/docklet.c:159 src/away.c:517
+#: plugins/docklet/docklet.c:159 src/away.c:522
 msgid "Back"
 msgstr "Back"
 
@@ -167,16 +167,16 @@
 msgid "Mute Sounds"
 msgstr "Mute Sounds"
 
-#: plugins/docklet/docklet.c:172 src/gtkft.c:583
+#: plugins/docklet/docklet.c:172 src/gtkft.c:605
 msgid "File Transfers"
 msgstr "File Transfers"
 
 #. And now for the buttons
-#: plugins/docklet/docklet.c:173 src/gtkaccount.c:1920 src/main.c:326
+#: plugins/docklet/docklet.c:173 src/gtkaccount.c:1999 src/main.c:288
 msgid "Accounts"
 msgstr "Accounts"
 
-#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2322 src/main.c:332
+#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2564 src/main.c:294
 msgid "Preferences"
 msgstr "Preferences"
 
@@ -380,14 +380,15 @@
 #: plugins/gevolution/add_buddy_dialog.c:146
 #: plugins/gevolution/add_buddy_dialog.c:157
 #: plugins/gevolution/assoc-buddy.c:86 plugins/gevolution/assoc-buddy.c:97
-#: src/gtkblist.c:2519 src/gtkprefs.c:833 src/gtkprefs.c:1484
+#: src/gtkblist.c:2879 src/gtkprefs.c:851 src/gtkprefs.c:1604
+#: src/protocols/jabber/jabber.c:916
 msgid "None"
 msgstr "None"
 
 #: plugins/gevolution/add_buddy_dialog.c:190
-#: plugins/gevolution/assoc-buddy.c:180 src/gtkprefs.c:1764
-#: src/protocols/jabber/jabber.c:619 src/protocols/msn/msn.c:1350
-#: src/protocols/trepia/trepia.c:401
+#: plugins/gevolution/assoc-buddy.c:180 src/gtkprefs.c:1981
+#: src/gtkroomlist.c:561 src/protocols/jabber/jabber.c:590
+#: src/protocols/msn/msn.c:1367 src/protocols/trepia/trepia.c:401
 msgid "Name"
 msgstr "Name"
 
@@ -402,13 +403,13 @@
 
 #. "Search"
 #: plugins/gevolution/add_buddy_dialog.c:495
-#: plugins/gevolution/assoc-buddy.c:385 src/protocols/oscar/oscar.c:6424
+#: plugins/gevolution/assoc-buddy.c:385 src/protocols/oscar/oscar.c:6682
 msgid "Search"
 msgstr "Search"
 
 #: plugins/gevolution/add_buddy_dialog.c:566
-#: plugins/gevolution/new_person_dialog.c:310 src/gtkblist.c:3515
-#: src/gtkblist.c:3837
+#: plugins/gevolution/new_person_dialog.c:310 src/gtkblist.c:3897
+#: src/gtkblist.c:4225
 msgid "Group:"
 msgstr "Group:"
 
@@ -447,8 +448,8 @@
 msgstr "_Associate Buddy"
 
 #: plugins/gevolution/gevo-util.c:66 plugins/gevolution/gevolution.c:90
-#: src/blist.c:672 src/blist.c:859 src/blist.c:2078 src/gtkblist.c:3342
-#: src/protocols/jabber/roster.c:66 src/protocols/msn/notification.c:1168
+#: src/blist.c:674 src/blist.c:861 src/blist.c:2094 src/gtkblist.c:3722
+#: src/protocols/jabber/roster.c:66 src/protocols/msn/notification.c:792
 msgid "Buddies"
 msgstr "Buddies"
 
@@ -457,16 +458,16 @@
 msgstr "Add to Address Book"
 
 #. Configuration frame
-#: plugins/gevolution/gevolution.c:343
+#: plugins/gevolution/gevolution.c:347
 msgid "Evolution Integration Configuration"
 msgstr "Evolution Integration Configuration"
 
 #. Label
-#: plugins/gevolution/gevolution.c:346
+#: plugins/gevolution/gevolution.c:350
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr "Select all accounts that buddies should be auto-added to."
 
-#: plugins/gevolution/gevolution.c:376 src/gtkconn.c:614
+#: plugins/gevolution/gevolution.c:380 src/gtkconn.c:620
 msgid "Account"
 msgstr "Account"
 
@@ -477,14 +478,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gevolution/gevolution.c:457
+#: plugins/gevolution/gevolution.c:461
 msgid "Evolution Integration"
 msgstr "Evolution Integration"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gevolution/gevolution.c:460 plugins/gevolution/gevolution.c:462
+#: plugins/gevolution/gevolution.c:464 plugins/gevolution/gevolution.c:466
 msgid "Provides integration with Ximian Evolution."
 msgstr "Provides integration with Ximian Evolution."
 
@@ -500,7 +501,7 @@
 msgid "Account type:"
 msgstr "Account type:"
 
-#: plugins/gevolution/new_person_dialog.c:298 src/gtkaccount.c:391
+#: plugins/gevolution/new_person_dialog.c:298
 msgid "Screenname:"
 msgstr "Screenname:"
 
@@ -511,7 +512,7 @@
 
 #. Label
 #: plugins/gevolution/new_person_dialog.c:341 src/gtkaccount.c:318
-#: src/protocols/oscar/oscar.c:3078
+#: src/protocols/oscar/oscar.c:3174
 msgid "Buddy Icon"
 msgstr "Buddy Icon"
 
@@ -738,13 +739,13 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/perl/perl.c:524
+#: plugins/perl/perl.c:530
 msgid "Perl Plugin Loader"
 msgstr "Perl Plugin Loader"
 
 #. *< name
 #. *< version
-#: plugins/perl/perl.c:526 plugins/perl/perl.c:527
+#: plugins/perl/perl.c:532 plugins/perl/perl.c:533
 msgid "Provides support for loading perl plugins."
 msgstr "Provides support for loading perl plugins."
 
@@ -893,14 +894,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl-gnutls.c:218
+#: plugins/ssl/ssl-gnutls.c:223
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/ssl/ssl-gnutls.c:221 plugins/ssl/ssl-gnutls.c:223
+#: plugins/ssl/ssl-gnutls.c:226 plugins/ssl/ssl-gnutls.c:228
 msgid "Provides SSL support through GNUTLS."
 msgstr "Provides SSL support through GNUTLS."
 
@@ -911,14 +912,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl-nss.c:306
+#: plugins/ssl/ssl-nss.c:312
 msgid "NSS"
 msgstr "NSS"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/ssl/ssl-nss.c:309 plugins/ssl/ssl-nss.c:311
+#: plugins/ssl/ssl-nss.c:315 plugins/ssl/ssl-nss.c:317
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "Provides SSL support through Mozilla NSS."
 
@@ -940,7 +941,7 @@
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "Provides a wrapper around SSL support libraries."
 
-#: plugins/statenotify.c:30 src/gtkpounce.c:801
+#: plugins/statenotify.c:30 src/gtkpounce.c:820
 #, c-format
 msgid "%s has gone away."
 msgstr "%s has gone away."
@@ -982,11 +983,11 @@
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
 
-#: plugins/tcl/tcl.c:348
+#: plugins/tcl/tcl.c:349
 msgid "Tcl Plugin Loader"
 msgstr "Tcl Plugin Loader"
 
-#: plugins/tcl/tcl.c:350 plugins/tcl/tcl.c:351
+#: plugins/tcl/tcl.c:351 plugins/tcl/tcl.c:352
 msgid "Provides support for loading Tcl plugins"
 msgstr "Provides support for loading Tcl plugins"
 
@@ -997,14 +998,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ticker/ticker.c:74 plugins/ticker/ticker.c:330
+#: plugins/ticker/ticker.c:74 plugins/ticker/ticker.c:328
 msgid "Buddy Ticker"
 msgstr "Buddy Ticker"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/ticker/ticker.c:333 plugins/ticker/ticker.c:335
+#: plugins/ticker/ticker.c:331 plugins/ticker/ticker.c:333
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "A horizontal scrolling version of the buddy list."
 
@@ -1058,7 +1059,7 @@
 msgstr "_Show slider bar in IM window"
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:365 src/gtkprefs.c:836
+#: plugins/win32/transparency/win2ktrans.c:365 src/gtkprefs.c:854
 msgid "Buddy List Window"
 msgstr "Buddy List Window"
 
@@ -1105,8 +1106,8 @@
 msgstr "_Start Gaim on Windows startup"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:366 src/gtkblist.c:2560
-#: src/gtkprefs.c:2255
+#: plugins/win32/winprefs/winprefs.c:366 src/gtkblist.c:2920
+#: src/gtkprefs.c:2480
 msgid "Buddy List"
 msgstr "Buddy List"
 
@@ -1125,8 +1126,8 @@
 msgstr "_Keep Buddy List window on top"
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:386 src/gtkprefs.c:874
-#: src/gtkprefs.c:2256
+#: plugins/win32/winprefs/winprefs.c:386 src/gtkprefs.c:892
+#: src/gtkprefs.c:2481 src/protocols/msn/msn.c:1697
 msgid "Conversations"
 msgstr "Conversations"
 
@@ -1357,80 +1358,80 @@
 msgid "Chinese"
 msgstr "Chinese"
 
-#: src/account.c:274 src/protocols/jabber/jabber.c:1013
+#: src/account.c:275 src/protocols/jabber/jabber.c:1001
 msgid "New passwords do not match."
 msgstr "New passwords do not match."
 
-#: src/account.c:282
+#: src/account.c:283
 msgid "Fill out all fields completely."
 msgstr "Fill out all fields completely."
 
-#: src/account.c:307
+#: src/account.c:308
 msgid "Original password"
 msgstr "Original password"
 
-#: src/account.c:313
+#: src/account.c:314
 msgid "New password"
 msgstr "New password"
 
-#: src/account.c:319
+#: src/account.c:320
 msgid "New password (again)"
 msgstr "New password (again)"
 
-#: src/account.c:324
+#: src/account.c:325
 #, c-format
 msgid "Change password for %s"
 msgstr "Change password for %s"
 
-#: src/account.c:332
+#: src/account.c:333
 msgid "Please enter your current password and your new password."
 msgstr "Please enter your current password and your new password."
 
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:335 src/connection.c:195 src/dialogs.c:1471
-#: src/dialogs.c:1488 src/dialogs.c:1507 src/gtkblist.c:1915
-#: src/gtkrequest.c:192 src/protocols/jabber/jabber.c:1058
-#: src/protocols/jabber/xdata.c:334 src/protocols/msn/msn.c:181
-#: src/protocols/msn/msn.c:192 src/protocols/msn/msn.c:203
-#: src/protocols/msn/msn.c:214 src/protocols/oscar/oscar.c:2454
-#: src/protocols/oscar/oscar.c:2534 src/protocols/oscar/oscar.c:6214
-#: src/protocols/oscar/oscar.c:6310 src/protocols/oscar/oscar.c:6359
-#: src/protocols/oscar/oscar.c:6441 src/protocols/yahoo/yahoo.c:2398
-#: src/protocols/yahoo/yahoo.c:2406 src/request.h:1020
+#: src/account.c:336 src/connection.c:198 src/dialogs.c:472 src/dialogs.c:528
+#: src/gtkblist.c:2278 src/gtkrequest.c:225 src/protocols/jabber/jabber.c:1046
+#: src/protocols/jabber/xdata.c:337 src/protocols/msn/msn.c:182
+#: src/protocols/msn/msn.c:193 src/protocols/msn/msn.c:204
+#: src/protocols/msn/msn.c:215 src/protocols/oscar/oscar.c:2549
+#: src/protocols/oscar/oscar.c:2630 src/protocols/oscar/oscar.c:6472
+#: src/protocols/oscar/oscar.c:6568 src/protocols/oscar/oscar.c:6617
+#: src/protocols/oscar/oscar.c:6699 src/protocols/yahoo/yahoo.c:2500
+#: src/protocols/yahoo/yahoo.c:2508 src/request.h:1237
 msgid "OK"
 msgstr "OK"
 
-#: src/account.c:336 src/account.c:370 src/connection.c:196 src/dialogs.c:353
-#: src/dialogs.c:365 src/dialogs.c:378 src/dialogs.c:399 src/dialogs.c:1314
-#: src/dialogs.c:1472 src/dialogs.c:1489 src/dialogs.c:1508
-#: src/gtkaccount.c:1614 src/gtkaccount.c:2083 src/gtkblist.c:1916
-#: src/gtkblist.c:3875 src/gtkconn.c:169 src/gtkprivacy.c:570
-#: src/gtkprivacy.c:583 src/gtkprivacy.c:608 src/gtkprivacy.c:619
-#: src/gtkrequest.c:193 src/protocols/icq/gaim_icq.c:277
-#: src/protocols/jabber/buddy.c:512 src/protocols/jabber/jabber.c:688
-#: src/protocols/jabber/jabber.c:1059 src/protocols/jabber/xdata.c:335
-#: src/protocols/msn/msn.c:182 src/protocols/msn/msn.c:193
-#: src/protocols/msn/msn.c:204 src/protocols/msn/msn.c:215
-#: src/protocols/msn/msn.c:228 src/protocols/oscar/oscar.c:2418
-#: src/protocols/oscar/oscar.c:2455 src/protocols/oscar/oscar.c:2490
-#: src/protocols/oscar/oscar.c:2535 src/protocols/oscar/oscar.c:6042
-#: src/protocols/oscar/oscar.c:6215 src/protocols/oscar/oscar.c:6311
-#: src/protocols/oscar/oscar.c:6360 src/protocols/oscar/oscar.c:6425
-#: src/protocols/oscar/oscar.c:6442 src/protocols/trepia/trepia.c:347
-#: src/protocols/yahoo/yahoo.c:2399 src/protocols/yahoo/yahoo.c:2407
-#: src/request.h:1020 src/request.h:1030
+#: src/account.c:337 src/account.c:371 src/connection.c:199 src/dialogs.c:306
+#: src/dialogs.c:318 src/dialogs.c:331 src/dialogs.c:352 src/dialogs.c:473
+#: src/dialogs.c:529 src/dialogs.c:837 src/dialogs.c:858 src/dialogs.c:875
+#: src/dialogs.c:894 src/gtkaccount.c:1673 src/gtkaccount.c:2164
+#: src/gtkblist.c:2279 src/gtkblist.c:4264 src/gtkconn.c:168
+#: src/gtkimhtmltoolbar.c:366 src/gtkprivacy.c:561 src/gtkprivacy.c:574
+#: src/gtkprivacy.c:599 src/gtkprivacy.c:610 src/gtkrequest.c:226
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/jabber/buddy.c:514
+#: src/protocols/jabber/chat.c:691 src/protocols/jabber/jabber.c:659
+#: src/protocols/jabber/jabber.c:1047 src/protocols/jabber/xdata.c:338
+#: src/protocols/msn/msn.c:183 src/protocols/msn/msn.c:194
+#: src/protocols/msn/msn.c:205 src/protocols/msn/msn.c:216
+#: src/protocols/msn/msn.c:229 src/protocols/oscar/oscar.c:2513
+#: src/protocols/oscar/oscar.c:2550 src/protocols/oscar/oscar.c:2586
+#: src/protocols/oscar/oscar.c:2631 src/protocols/oscar/oscar.c:6291
+#: src/protocols/oscar/oscar.c:6473 src/protocols/oscar/oscar.c:6569
+#: src/protocols/oscar/oscar.c:6618 src/protocols/oscar/oscar.c:6683
+#: src/protocols/oscar/oscar.c:6700 src/protocols/trepia/trepia.c:347
+#: src/protocols/yahoo/yahoo.c:2501 src/protocols/yahoo/yahoo.c:2509
+#: src/request.h:1237 src/request.h:1247
 msgid "Cancel"
 msgstr "Cancel"
 
-#: src/account.c:362
+#: src/account.c:363
 #, c-format
 msgid "Change user information for %s"
 msgstr "Change user information for %s"
 
-#: src/account.c:369 src/dialogs.c:1302 src/gtkrequest.c:199
-#: src/protocols/jabber/buddy.c:511 src/protocols/trepia/trepia.c:346
+#: src/account.c:370 src/dialogs.c:825 src/gtkrequest.c:232
+#: src/protocols/jabber/buddy.c:513 src/protocols/trepia/trepia.c:346
 msgid "Save"
 msgstr "Save"
 
@@ -1438,27 +1439,27 @@
 msgid "Away!"
 msgstr "Away!"
 
-#: src/away.c:271
+#: src/away.c:275
 msgid "I'm Back!"
 msgstr "I'm Back!"
 
-#: src/away.c:370
+#: src/away.c:375
 msgid "New Away Message"
 msgstr "New Away Message"
 
-#: src/away.c:390
+#: src/away.c:395
 msgid "Remove Away Message"
 msgstr "Remove Away Message"
 
-#: src/away.c:585
+#: src/away.c:590
 msgid "Set All Away"
 msgstr "Set All Away"
 
-#: src/blist.c:577 src/gtkprefs.c:2258
+#: src/blist.c:579 src/gtkprefs.c:2483
 msgid "Chats"
 msgstr "Chats"
 
-#: src/blist.c:1159
+#: src/blist.c:1181
 #, c-format
 msgid ""
 "%d buddy from group %s was not removed because its account was not logged "
@@ -1473,59 +1474,30 @@
 "%d buddies from group %s were not removed because their accounts were not "
 "logged in.  These buddies and the group were not removed.\n"
 
-#: src/blist.c:1168
+#: src/blist.c:1190
 msgid "Group not removed"
 msgstr "Group not removed"
 
-#: src/blist.c:1218 src/gtkaccount.c:160 src/gtkutils.c:848
-#: src/protocols/jabber/auth.c:145 src/protocols/jabber/buddy.c:568
+#: src/blist.c:1240 src/gtkaccount.c:162 src/gtkft.c:153 src/gtkutils.c:860
+#: src/protocols/jabber/buddy.c:569
 msgid "Unknown"
 msgstr "Unknown"
 
-#: src/blist.c:1545
+#: src/blist.c:1567
 msgid "Invalid Groupname"
 msgstr "Invalid Groupname"
 
-#: src/blist.c:2195
+#: src/blist.c:2209
 msgid ""
 "An error was encountered parsing your buddy list.  It has not been loaded."
 msgstr ""
 "An error was encountered parsing your buddy list.  It has not been loaded."
 
-#: src/blist.c:2197
+#: src/blist.c:2211
 msgid "Buddy List Error"
 msgstr "Buddy List Error"
 
-#: src/buddy_chat.c:214 src/gtkblist.c:3765
-msgid ""
-"You are not currently signed on with any protocols that have the ability to "
-"chat."
-msgstr ""
-"You are not currently signed on with any protocols that have the ability to "
-"chat."
-
-#: src/buddy_chat.c:225
-msgid "Join a Chat"
-msgstr "Join a Chat"
-
-#: src/buddy_chat.c:227 src/gtkblist.c:918
-msgid "_Join"
-msgstr "_Join"
-
-#: src/buddy_chat.c:244
-msgid ""
-"Please enter the appropriate information about the chat you would like to "
-"join.\n"
-msgstr ""
-"Please enter the appropriate information about the chat you would like to "
-"join.\n"
-
-#: src/buddy_chat.c:255 src/dialogs.c:589 src/dialogs.c:664
-#: src/gtkpounce.c:360
-msgid "_Account:"
-msgstr "_Account:"
-
-#: src/connection.c:119 src/connection.c:167
+#: src/connection.c:119 src/connection.c:170
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "Missing protocol plugin for %s"
@@ -1534,83 +1506,84 @@
 msgid "Registration Error"
 msgstr "Registration Error"
 
-#: src/connection.c:172
+#: src/connection.c:175
 msgid "Connection Error"
 msgstr "Connection Error"
 
-#: src/connection.c:193
+#: src/connection.c:196
 #, c-format
 msgid "Enter password for %s"
 msgstr "Enter password for %s"
 
-#: src/conversation.c:315
+#: src/conversation.c:296
 msgid "Unable to send message. The message is too large."
 msgstr "Unable to send message. The message is too large."
 
-#: src/conversation.c:323
+#: src/conversation.c:304
 msgid "Unable to send message."
 msgstr "Unable to send message."
 
-#: src/conversation.c:1919
+#: src/conversation.c:1968
 #, c-format
 msgid "%s entered the room."
 msgstr "%s entered the room."
 
-#: src/conversation.c:1922
+#: src/conversation.c:1971
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] entered the room."
 
-#: src/conversation.c:2007
+#: src/conversation.c:2063
+#, c-format
+msgid "You are now known as %s"
+msgstr "You are now known as %s"
+
+#: src/conversation.c:2066
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s is now known as %s"
 
-#: src/conversation.c:2049
+#: src/conversation.c:2109
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s left the room (%s)."
 
-#: src/conversation.c:2051
+#: src/conversation.c:2111
 #, c-format
 msgid "%s left the room."
 msgstr "%s left the room."
 
-#: src/conversation.c:2124
+#: src/conversation.c:2184
 #, c-format
 msgid "(+%d more)"
 msgstr "(+%d more)"
 
-#: src/conversation.c:2126
+#: src/conversation.c:2186
 #, c-format
 msgid " left the room (%s)."
 msgstr " left the room (%s)."
 
-#: src/conversation.c:2408
+#: src/conversation.c:2466
 msgid "Last created window"
 msgstr "Last created window"
 
-#: src/conversation.c:2410
+#: src/conversation.c:2468 src/gtkprefs.c:1380
 msgid "New window"
 msgstr "New window"
 
-#: src/conversation.c:2412
+#: src/conversation.c:2470
 msgid "By group"
 msgstr "By group"
 
-#: src/conversation.c:2414
+#: src/conversation.c:2472
 msgid "By account"
 msgstr "By account"
 
-#: src/dialogs.c:202
+#: src/dialogs.c:155
 msgid "Warn User"
 msgstr "Warn User"
 
-#: src/dialogs.c:205
-msgid "_Warn"
-msgstr "_Warn"
-
-#: src/dialogs.c:221
+#: src/dialogs.c:174
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -1623,26 +1596,26 @@
 "This will increase %s's warning level and he or she will be subject to "
 "harsher rate limiting.\n"
 
-#: src/dialogs.c:230
+#: src/dialogs.c:183
 msgid "Warn _anonymously?"
 msgstr "Warn _anonymously?"
 
-#: src/dialogs.c:237
+#: src/dialogs.c:190
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>Anonymous warnings are less severe.</b>"
 
-#: src/dialogs.c:349
+#: src/dialogs.c:302
 #, 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?"
 
-#: src/dialogs.c:351 src/dialogs.c:352
+#: src/dialogs.c:304 src/dialogs.c:305
 msgid "Remove Buddy"
 msgstr "Remove Buddy"
 
-#: src/dialogs.c:361
+#: src/dialogs.c:314
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -1651,11 +1624,11 @@
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 
-#: src/dialogs.c:363 src/dialogs.c:364
+#: src/dialogs.c:316 src/dialogs.c:317
 msgid "Remove Chat"
 msgstr "Remove Chat"
 
-#: src/dialogs.c:373
+#: src/dialogs.c:326
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -1664,11 +1637,11 @@
 "You are about to remove the group %s and all its members from your buddy "
 "list.  Do you want to continue?"
 
-#: src/dialogs.c:376 src/dialogs.c:377
+#: src/dialogs.c:329 src/dialogs.c:330
 msgid "Remove Group"
 msgstr "Remove Group"
 
-#: src/dialogs.c:394
+#: src/dialogs.c:347
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
@@ -1677,146 +1650,123 @@
 "You are about to remove the contact containing %s and %d other buddies from "
 "your buddy list.  Do you want to continue?"
 
-#: src/dialogs.c:397 src/dialogs.c:398
+#: src/dialogs.c:350 src/dialogs.c:351
 msgid "Remove Contact"
 msgstr "Remove Contact"
 
-#: src/dialogs.c:543
+#: src/dialogs.c:454 src/dialogs.c:510
+msgid "_Screen name"
+msgstr "_Screen name"
+
+#: src/dialogs.c:460 src/dialogs.c:516
+msgid "_Account"
+msgstr "_Account"
+
+#: src/dialogs.c:467
 msgid "New Instant Message"
 msgstr "New Instant Message"
 
-#: src/dialogs.c:561
-msgid "Please enter the screenname of the person you would like to IM.\n"
-msgstr "Please enter the screenname of the person you would like to IM.\n"
-
-#: src/dialogs.c:573 src/dialogs.c:648
-msgid "_Screenname:"
-msgstr "_Screenname:"
-
-#: src/dialogs.c:618
+#: src/dialogs.c:469
+msgid "Please enter the screen name of the person you would like to IM."
+msgstr "Please enter the screen name of the person you would like to IM."
+
+#: src/dialogs.c:523
 msgid "Get User Info"
 msgstr "Get User Info"
 
-#: src/dialogs.c:636
-msgid ""
-"Please enter the screenname of the person whose info you would like to "
-"view.\n"
-msgstr ""
-"Please enter the screenname of the person whose info you would like to "
-"view.\n"
-
-#: src/dialogs.c:740
-msgid "Insert Link"
-msgstr "Insert Link"
-
-#: src/dialogs.c:742
-msgid "_Insert"
-msgstr "_Insert"
-
-#: src/dialogs.c:767
-msgid ""
-"Please enter the URL and description of the link that you want to insert.  "
-"The description is optional.\n"
-msgstr ""
-"Please enter the URL and description of the link that you want to insert.  "
-"The description is optional.\n"
-
-#: src/dialogs.c:780
-msgid "_URL:"
-msgstr "_URL:"
-
-#: src/dialogs.c:793
-msgid "_Description:"
-msgstr "_Description:"
-
-#: src/dialogs.c:916 src/dialogs.c:933
+#: src/dialogs.c:525
+msgid ""
+"Please enter the screen name of the person whose info you would like to view."
+msgstr ""
+"Please enter the screen name of the person whose info you would like to view."
+
+#: src/dialogs.c:553 src/gtkimhtmltoolbar.c:209
 msgid "Select Text Color"
 msgstr "Select Text Colour"
 
-#: src/dialogs.c:968 src/dialogs.c:985
+#: src/dialogs.c:581 src/gtkimhtmltoolbar.c:279
 msgid "Select Background Color"
 msgstr "Select Background Colour"
 
-#: src/dialogs.c:1070 src/dialogs.c:1096
+#: src/dialogs.c:620 src/gtkimhtmltoolbar.c:133
 msgid "Select Font"
 msgstr "Select Font"
 
-#: src/dialogs.c:1160
+#: src/dialogs.c:682
 msgid "You cannot save an away message with a blank title"
 msgstr "You cannot save an away message with a blank title"
 
-#: src/dialogs.c:1162
+#: src/dialogs.c:684
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 
-#: src/dialogs.c:1172
+#: src/dialogs.c:694
 msgid "You cannot create an empty away message"
 msgstr "You cannot create an empty away message"
 
-#: src/dialogs.c:1234
+#: src/dialogs.c:756
 msgid "New away message"
 msgstr "New away message"
 
-#: src/dialogs.c:1255
+#: src/dialogs.c:777
 msgid "Away title: "
 msgstr "Away title: "
 
-#: src/dialogs.c:1306
+#: src/dialogs.c:829
 msgid "Save & Use"
 msgstr "Save & Use"
 
-#: src/dialogs.c:1310
+#: src/dialogs.c:833
 msgid "Use"
 msgstr "Use"
 
-#. show everything
-#: src/dialogs.c:1450
-msgid "Smile!"
-msgstr "Smile!"
-
-#: src/dialogs.c:1468
+#: src/dialogs.c:854
 msgid "Alias Chat"
 msgstr "Alias Chat"
 
-#: src/dialogs.c:1469
+#: src/dialogs.c:855
 msgid "Enter an alias for this chat."
 msgstr "Enter an alias for this chat."
 
-#: src/dialogs.c:1485
+#: src/dialogs.c:857 src/dialogs.c:874 src/dialogs.c:893 src/gtkrequest.c:233
+msgid "Alias"
+msgstr "Alias"
+
+#: src/dialogs.c:871
 msgid "Alias Contact"
 msgstr "Alias Contact"
 
-#: src/dialogs.c:1486
+#: src/dialogs.c:872
 msgid "Enter an alias for this contact."
 msgstr "Enter an alias for this contact."
 
-#: src/dialogs.c:1503
+#: src/dialogs.c:889
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Enter an alias for %s."
 
-#: src/dialogs.c:1505
+#: src/dialogs.c:891
 msgid "Alias Buddy"
 msgstr "Alias Buddy"
 
-#: src/ft.c:141
+#: src/ft.c:139
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s is not a valid filename.\n"
 
-#: src/ft.c:154
+#: src/ft.c:152
 #, c-format
 msgid "%s was not found.\n"
 msgstr "%s was not found.\n"
 
-#: src/ft.c:756
+#: src/ft.c:769
 #, c-format
 msgid "File transfer to %s aborted.\n"
 msgstr "File transfer to %s aborted.\n"
 
-#: src/ft.c:758
+#: src/ft.c:771
 #, c-format
 msgid "File transfer from %s aborted.\n"
 msgstr "File transfer from %s aborted.\n"
@@ -1858,13 +1808,13 @@
 msgid ""
 "\n"
 "Using AIM: URIs:\n"
-"Sending an IM to a screenname:\n"
+"Sending an IM to a screen name:\n"
 "\tgaim-remote uri 'aim:goim?screenname=Penguin&message=hello+world'\n"
-"In this case, 'Penguin' is the screenname we wish to IM, and 'hello world'\n"
+"In this case, 'Penguin' is the screen name we wish to IM, and 'hello world'\n"
 "is the message to be sent.  '+' must be used in place of spaces.\n"
 "Please note the quoting used above - if you run this from a shell the '&'\n"
 "needs to be escaped, or the command will stop at that point.\n"
-"Also,the following will just open a conversation window to a screenname,\n"
+"Also,the following will just open a conversation window to a screen name,\n"
 "with no message:\n"
 "\tgaim-remote uri 'aim:goim?screenname=Penguin'\n"
 "\n"
@@ -1878,13 +1828,13 @@
 msgstr ""
 "\n"
 "Using AIM: URIs:\n"
-"Sending an IM to a screenname:\n"
+"Sending an IM to a screen name:\n"
 "\tgaim-remote uri 'aim:goim?screenname=Penguin&message=hello+world'\n"
-"In this case, 'Penguin' is the screenname we wish to IM, and 'hello world'\n"
+"In this case, 'Penguin' is the screen name we wish to IM, and 'hello world'\n"
 "is the message to be sent.  '+' must be used in place of spaces.\n"
 "Please note the quoting used above - if you run this from a shell the '&'\n"
 "needs to be escaped, or the command will stop at that point.\n"
-"Also,the following will just open a conversation window to a screenname,\n"
+"Also,the following will just open a conversation window to a screen name,\n"
 "with no message:\n"
 "\tgaim-remote uri 'aim:goim?screenname=Penguin'\n"
 "\n"
@@ -1909,23 +1859,23 @@
 msgid "sorry, i ran out for a while. bbl"
 msgstr "sorry, i ran out for a while. bbl"
 
-#: src/gaimrc.c:375 src/gaimrc.c:1452
+#: src/gaimrc.c:375 src/gaimrc.c:1451
 msgid "boring default"
 msgstr "boring default"
 
-#: src/gaimrc.c:1261 src/gtkblist.c:2521
+#: src/gaimrc.c:1260 src/gtkblist.c:2881
 msgid "Alphabetical"
 msgstr "Alphabetical"
 
-#: src/gaimrc.c:1263 src/gtkblist.c:2522
+#: src/gaimrc.c:1262 src/gtkblist.c:2882
 msgid "By status"
 msgstr "By status"
 
-#: src/gaimrc.c:1265 src/gtkblist.c:2523
+#: src/gaimrc.c:1264 src/gtkblist.c:2883
 msgid "By log size"
 msgstr "By log size"
 
-#: src/gaimrc.c:1550
+#: src/gaimrc.c:1549
 #, c-format
 msgid "Could not open config file %s."
 msgstr "Could not open config file %s."
@@ -1942,167 +1892,171 @@
 "<b>Image size:</b> %dx%d"
 
 #. Build the login options frame.
-#: src/gtkaccount.c:369
+#: src/gtkaccount.c:382
 msgid "Login Options"
 msgstr "Login Options"
 
-#: src/gtkaccount.c:386
+#: src/gtkaccount.c:399
 msgid "Protocol:"
 msgstr "Protocol:"
 
-#: src/gtkaccount.c:464 src/main.c:310
+#: src/gtkaccount.c:404 src/gtkblist.c:3869
+msgid "Screen Name:"
+msgstr "Screen Name:"
+
+#: src/gtkaccount.c:477
 msgid "Password:"
 msgstr "Password:"
 
-#: src/gtkaccount.c:469 src/gtkblist.c:3502 src/gtkblist.c:3824
+#: src/gtkaccount.c:482 src/gtkblist.c:3883 src/gtkblist.c:4211
 msgid "Alias:"
 msgstr "Alias:"
 
-#: src/gtkaccount.c:473
+#: src/gtkaccount.c:486
 msgid "Remember password"
 msgstr "Remember password"
 
 #. Build the user options frame.
-#: src/gtkaccount.c:527
+#: src/gtkaccount.c:540
 msgid "User Options"
 msgstr "User Options"
 
-#: src/gtkaccount.c:540
+#: src/gtkaccount.c:553
 msgid "New mail notifications"
 msgstr "New mail notifications"
 
-#: src/gtkaccount.c:549
+#: src/gtkaccount.c:562
 msgid "Buddy icon file:"
 msgstr "Buddy icon file:"
 
-#: src/gtkaccount.c:558
+#: src/gtkaccount.c:572
 msgid "_Browse"
 msgstr "_Browse"
 
-#: src/gtkaccount.c:564
+#: src/gtkaccount.c:578
 msgid "_Reset"
 msgstr "_Reset"
 
 #. Build the protocol options frame.
-#: src/gtkaccount.c:626
+#: src/gtkaccount.c:640
 #, c-format
 msgid "%s Options"
 msgstr "%s Options"
 
 #. Use Global Proxy Settings
-#: src/gtkaccount.c:741
+#: src/gtkaccount.c:772
 msgid "Use Global Proxy Settings"
 msgstr "Use Global Proxy Settings"
 
 #. No Proxy
-#: src/gtkaccount.c:748
+#: src/gtkaccount.c:779
 msgid "No Proxy"
 msgstr "No Proxy"
 
 #. HTTP
-#: src/gtkaccount.c:755
+#: src/gtkaccount.c:786
 msgid "HTTP"
 msgstr "HTTP"
 
 #. SOCKS 4
-#: src/gtkaccount.c:762
+#: src/gtkaccount.c:793
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
 #. SOCKS 5
-#: src/gtkaccount.c:769
+#: src/gtkaccount.c:800
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:776 src/gtkprefs.c:1090
+#: src/gtkaccount.c:807 src/gtkprefs.c:1181
 msgid "Use Environmental Settings"
 msgstr "Use Environmental Settings"
 
-#: src/gtkaccount.c:809
+#: src/gtkaccount.c:840
 msgid "you can see the butterflies mating"
 msgstr "you can see the butterflies mating"
 
-#: src/gtkaccount.c:813
+#: src/gtkaccount.c:844
 msgid "If you look real closely"
 msgstr "If you look real closely"
 
-#: src/gtkaccount.c:829
+#: src/gtkaccount.c:860
 msgid "Proxy Options"
 msgstr "Proxy Options"
 
-#: src/gtkaccount.c:845 src/gtkprefs.c:1084
+#: src/gtkaccount.c:876 src/gtkprefs.c:1175
 msgid "Proxy _type:"
 msgstr "Proxy _type:"
 
-#: src/gtkaccount.c:854 src/gtkprefs.c:1114
+#: src/gtkaccount.c:885 src/gtkprefs.c:1205
 msgid "_Host:"
 msgstr "_Host:"
 
-#: src/gtkaccount.c:858 src/gtkprefs.c:1131
+#: src/gtkaccount.c:889 src/gtkprefs.c:1223
 msgid "_Port:"
 msgstr "_Port:"
 
-#: src/gtkaccount.c:866
+#: src/gtkaccount.c:897
 msgid "_Username:"
 msgstr "_Username:"
 
-#: src/gtkaccount.c:871 src/gtkprefs.c:1166
+#: src/gtkaccount.c:902 src/gtkprefs.c:1260
 msgid "Pa_ssword:"
 msgstr "Pa_ssword:"
 
-#: src/gtkaccount.c:1210
+#: src/gtkaccount.c:1260
 msgid "Add Account"
 msgstr "Add Account"
 
-#: src/gtkaccount.c:1212
+#: src/gtkaccount.c:1262
 msgid "Modify Account"
 msgstr "Modify Account"
 
 #. Add the disclosure
-#: src/gtkaccount.c:1236
+#: src/gtkaccount.c:1286
 msgid "Show more options"
 msgstr "Show more options"
 
-#: src/gtkaccount.c:1237
+#: src/gtkaccount.c:1287
 msgid "Show fewer options"
 msgstr "Show fewer options"
 
 #. Register button
-#: src/gtkaccount.c:1264 src/protocols/jabber/jabber.c:687
+#: src/gtkaccount.c:1314 src/protocols/jabber/jabber.c:658
 msgid "Register"
 msgstr "Register"
 
-#: src/gtkaccount.c:1609
+#: src/gtkaccount.c:1668
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Are you sure you want to delete %s?"
 
-#: src/gtkaccount.c:1613 src/gtkrequest.c:196
+#: src/gtkaccount.c:1672 src/gtkrequest.c:229
 msgid "Delete"
 msgstr "Delete"
 
-#: src/gtkaccount.c:1727
+#: src/gtkaccount.c:1786
 msgid "Screen Name"
 msgstr "Screen Name"
 
-#: src/gtkaccount.c:1750 src/protocols/jabber/jabber.c:959
-#: src/protocols/oscar/oscar.c:2849 src/protocols/oscar/oscar.c:4602
-#: src/protocols/oscar/oscar.c:6163 src/protocols/yahoo/yahoo.c:2193
-#: src/protocols/zephyr/zephyr.c:886 src/protocols/zephyr/zephyr.c:896
+#: src/gtkaccount.c:1809 src/protocols/jabber/jabber.c:958
+#: src/protocols/oscar/oscar.c:2945 src/protocols/oscar/oscar.c:4746
+#: src/protocols/oscar/oscar.c:6411 src/protocols/yahoo/yahoo.c:2295
+#: src/protocols/zephyr/zephyr.c:1176 src/protocols/zephyr/zephyr.c:1186
 msgid "Online"
 msgstr "Online"
 
-#: src/gtkaccount.c:1768
+#: src/gtkaccount.c:1827
 msgid "Protocol"
 msgstr "Protocol"
 
-#: src/gtkaccount.c:2058
+#: src/gtkaccount.c:2139
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr "%s%s%s%s has made %s his or her buddy%s%s%s"
 
-#: src/gtkaccount.c:2072
+#: src/gtkaccount.c:2153
 msgid ""
 "\n"
 "\n"
@@ -2112,191 +2066,226 @@
 "\n"
 "Do you wish to add him or her to your buddy list?"
 
-#: src/gtkaccount.c:2076
+#: src/gtkaccount.c:2157
 msgid "Information"
 msgstr "Information"
 
-#: src/gtkaccount.c:2080
+#: src/gtkaccount.c:2161
 msgid "Add buddy to your list?"
 msgstr "Add buddy to your list?"
 
 #. Add button
-#: src/gtkaccount.c:2082 src/gtkblist.c:3874 src/gtkconv.c:1233
-#: src/gtkconv.c:3165 src/gtkconv.c:3256 src/gtkrequest.c:197
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:2691
+#: src/gtkaccount.c:2163 src/gtkblist.c:4263 src/gtkconv.c:1072
+#: src/gtkconv.c:3289 src/gtkconv.c:3380 src/gtkrequest.c:230
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:2787
 msgid "Add"
 msgstr "Add"
 
-#: src/gtkblist.c:807
-msgid "_Get Info"
-msgstr "_Get Info"
-
-#: src/gtkblist.c:810
-msgid "_IM"
-msgstr "_IM"
-
-#: src/gtkblist.c:812
+#: src/gtkblist.c:803 src/gtkblist.c:4151
+msgid ""
+"You are not currently signed on with any protocols that have the ability to "
+"chat."
+msgstr ""
+"You are not currently signed on with any protocols that have the ability to "
+"chat."
+
+#: src/gtkblist.c:816
+msgid "Join a Chat"
+msgstr "Join a Chat"
+
+#: src/gtkblist.c:837
+msgid ""
+"Please enter the appropriate information about the chat you would like to "
+"join.\n"
+msgstr ""
+"Please enter the appropriate information about the chat you would like to "
+"join.\n"
+
+#: src/gtkblist.c:850 src/gtkpounce.c:361 src/gtkroomlist.c:365
+msgid "_Account:"
+msgstr "_Account:"
+
+#: src/gtkblist.c:1088 src/gtkblist.c:3070
+msgid "Get _Info"
+msgstr "Get _Info"
+
+#: src/gtkblist.c:1091 src/gtkblist.c:3061
+msgid "I_M"
+msgstr "I_M"
+
+#: src/gtkblist.c:1093
 msgid "Add Buddy _Pounce"
 msgstr "Add Buddy _Pounce"
 
-#: src/gtkblist.c:814
+#: src/gtkblist.c:1095
 msgid "View _Log"
 msgstr "View _Log"
 
-#: src/gtkblist.c:834 src/gtkblist.c:923 src/gtkblist.c:942
+#: src/gtkblist.c:1115 src/gtkblist.c:1187 src/gtkblist.c:1200
 msgid "_Alias..."
 msgstr "_Alias..."
 
-#: src/gtkblist.c:836 src/gtkblist.c:925 src/gtkblist.c:947 src/gtkconn.c:360
+#: src/gtkblist.c:1117 src/gtkblist.c:1189 src/gtkblist.c:1205
+#: src/gtkconn.c:361
 msgid "_Remove"
 msgstr "_Remove"
 
-#: src/gtkblist.c:899
+#: src/gtkblist.c:1162
 msgid "Add a _Buddy"
 msgstr "Add a _Buddy"
 
-#: src/gtkblist.c:901
+#: src/gtkblist.c:1164
 msgid "Add a C_hat"
 msgstr "Add a C_hat"
 
-#: src/gtkblist.c:903
+#: src/gtkblist.c:1166
 msgid "_Delete Group"
 msgstr "_Delete Group"
 
-#: src/gtkblist.c:905
+#: src/gtkblist.c:1168
 msgid "_Rename"
 msgstr "_Rename"
 
-#: src/gtkblist.c:920
+#. join button
+#: src/gtkblist.c:1182 src/gtkroomlist.c:261 src/gtkroomlist.c:417
+#: src/stock.c:87
+msgid "_Join"
+msgstr "_Join"
+
+#: src/gtkblist.c:1184
 msgid "Auto-Join"
 msgstr "Auto-Join"
 
-#: src/gtkblist.c:944 src/gtkblist.c:979
+#: src/gtkblist.c:1202 src/gtkblist.c:1228
 msgid "_Collapse"
 msgstr "_Collapse"
 
-#: src/gtkblist.c:984
+#: src/gtkblist.c:1233
 msgid "_Expand"
 msgstr "_Expand"
 
-#: src/gtkblist.c:1515 src/gtkconv.c:3933
+#: src/gtkblist.c:1884 src/gtkconv.c:3864
 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
-#: src/gtkblist.c:1863
+#: src/gtkblist.c:2225
 msgid "/_Buddies"
 msgstr "/_Buddies"
 
-#: src/gtkblist.c:1864
+#: src/gtkblist.c:2226
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Buddies/New Instant _Message..."
 
-#: src/gtkblist.c:1865
+#: src/gtkblist.c:2227
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Buddies/Join a _Chat..."
 
-#: src/gtkblist.c:1866
-msgid "/Buddies/Get _User Info..."
-msgstr "/Buddies/Get _User Info..."
-
-#: src/gtkblist.c:1868
+#: src/gtkblist.c:2228
+msgid "/Buddies/Get User _Info..."
+msgstr "/Buddies/Get User _Info..."
+
+#: src/gtkblist.c:2230
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Buddies/Show _Offline Buddies"
 
-#: src/gtkblist.c:1869
+#: src/gtkblist.c:2231
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Buddies/Show _Empty Groups"
 
-#: src/gtkblist.c:1870
+#: src/gtkblist.c:2232
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Buddies/_Add Buddy..."
 
-#: src/gtkblist.c:1871
+#: src/gtkblist.c:2233
 msgid "/Buddies/Add C_hat..."
 msgstr "/Buddies/Add C_hat..."
 
-#: src/gtkblist.c:1872
+#: src/gtkblist.c:2234
 msgid "/Buddies/Add _Group..."
 msgstr "/Buddies/Add _Group..."
 
-#: src/gtkblist.c:1874
+#: src/gtkblist.c:2236
 msgid "/Buddies/_Signoff"
 msgstr "/Buddies/_Signoff"
 
-#: src/gtkblist.c:1875
+#: src/gtkblist.c:2237
 msgid "/Buddies/_Quit"
 msgstr "/Buddies/_Quit"
 
 #. Tools
-#: src/gtkblist.c:1878
+#: src/gtkblist.c:2240
 msgid "/_Tools"
 msgstr "/_Tools"
 
-#: src/gtkblist.c:1879
+#: src/gtkblist.c:2241
 msgid "/Tools/_Away"
 msgstr "/Tools/_Away"
 
-#: src/gtkblist.c:1880
+#: src/gtkblist.c:2242
 msgid "/Tools/Buddy _Pounce"
 msgstr "/Tools/Buddy _Pounce"
 
-#: src/gtkblist.c:1881
+#: src/gtkblist.c:2243
 msgid "/Tools/P_rotocol Actions"
 msgstr "/Tools/P_rotocol Actions"
 
-#: src/gtkblist.c:1883
+#: src/gtkblist.c:2245
 msgid "/Tools/A_ccounts"
 msgstr "/Tools/A_ccounts"
 
-#: src/gtkblist.c:1884
+#: src/gtkblist.c:2246
 msgid "/Tools/_File Transfers"
 msgstr "/Tools/_File Transfers"
 
-#: src/gtkblist.c:1885
+#: src/gtkblist.c:2247
+msgid "/Tools/R_oom List"
+msgstr "/Tools/R_oom List"
+
+#: src/gtkblist.c:2248
 msgid "/Tools/Pr_eferences"
 msgstr "/Tools/Pr_eferences"
 
-#: src/gtkblist.c:1886
+#: src/gtkblist.c:2249
 msgid "/Tools/Pr_ivacy"
 msgstr "/Tools/Pr_ivacy"
 
-#: src/gtkblist.c:1889
+#: src/gtkblist.c:2252
 msgid "/Tools/View System _Log"
 msgstr "/Tools/View System _Log"
 
 #. Help
-#: src/gtkblist.c:1893
+#: src/gtkblist.c:2256
 msgid "/_Help"
 msgstr "/_Help"
 
-#: src/gtkblist.c:1894
+#: src/gtkblist.c:2257
 msgid "/Help/Online _Help"
 msgstr "/Help/Online _Help"
 
-#: src/gtkblist.c:1895
+#: src/gtkblist.c:2258
 msgid "/Help/_Debug Window"
 msgstr "/Help/_Debug Window"
 
-#: src/gtkblist.c:1896
+#: src/gtkblist.c:2259
 msgid "/Help/_About"
 msgstr "/Help/_About"
 
-#: src/gtkblist.c:1912
+#: src/gtkblist.c:2275
 msgid "Rename Group"
 msgstr "Rename Group"
 
-#: src/gtkblist.c:1912
+#: src/gtkblist.c:2275
 msgid "New group name"
 msgstr "New group name"
 
-#: src/gtkblist.c:1913
+#: src/gtkblist.c:2276
 msgid "Please enter a new name for the selected group."
 msgstr "Please enter a new name for the selected group."
 
-#: src/gtkblist.c:1941
+#: src/gtkblist.c:2304
 #, c-format
 msgid ""
 "\n"
@@ -2305,16 +2294,16 @@
 "\n"
 "<b>Account:</b> %s"
 
-#: src/gtkblist.c:2005 src/protocols/oscar/oscar.c:5543
+#: src/gtkblist.c:2368 src/protocols/oscar/oscar.c:5774
 msgid "<b>Status:</b> Offline"
 msgstr "<b>Status:</b> Offline"
 
-#: src/gtkblist.c:2020
+#: src/gtkblist.c:2383
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:2036
+#: src/gtkblist.c:2399
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -2322,7 +2311,7 @@
 "\n"
 "<b>Account:</b>"
 
-#: src/gtkblist.c:2037
+#: src/gtkblist.c:2400
 msgid ""
 "\n"
 "<b>Contact Alias:</b>"
@@ -2330,7 +2319,7 @@
 "\n"
 "<b>Contact Alias:</b>"
 
-#: src/gtkblist.c:2038
+#: src/gtkblist.c:2401
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -2338,7 +2327,7 @@
 "\n"
 "<b>Alias:</b>"
 
-#: src/gtkblist.c:2039
+#: src/gtkblist.c:2402
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -2346,7 +2335,7 @@
 "\n"
 "<b>Nickname:</b>"
 
-#: src/gtkblist.c:2040
+#: src/gtkblist.c:2403
 msgid ""
 "\n"
 "<b>Logged In:</b>"
@@ -2354,7 +2343,7 @@
 "\n"
 "<b>Logged In:</b>"
 
-#: src/gtkblist.c:2041
+#: src/gtkblist.c:2404
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -2362,7 +2351,7 @@
 "\n"
 "<b>Idle:</b>"
 
-#: src/gtkblist.c:2042
+#: src/gtkblist.c:2405
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -2370,7 +2359,7 @@
 "\n"
 "<b>Warned:</b>"
 
-#: src/gtkblist.c:2044
+#: src/gtkblist.c:2407
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2378,7 +2367,7 @@
 "\n"
 "<b>Description:</b> Spooky"
 
-#: src/gtkblist.c:2045
+#: src/gtkblist.c:2408
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
@@ -2386,7 +2375,7 @@
 "\n"
 "<b>Status</b>: Awesome"
 
-#: src/gtkblist.c:2046
+#: src/gtkblist.c:2409
 msgid ""
 "\n"
 "<b>Status</b>: Rockin'"
@@ -2394,81 +2383,77 @@
 "\n"
 "<b>Status</b>: Rockin'"
 
-#: src/gtkblist.c:2316
+#: src/gtkblist.c:2679
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "Idle (%dh%02dm) "
 
-#: src/gtkblist.c:2318
+#: src/gtkblist.c:2681
 #, c-format
 msgid "Idle (%dm) "
 msgstr "Idle (%dm) "
 
-#: src/gtkblist.c:2323
+#: src/gtkblist.c:2686
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "Warned (%d%%) "
 
-#: src/gtkblist.c:2326
+#: src/gtkblist.c:2689
 msgid "Offline "
 msgstr "Offline "
 
-#: src/gtkblist.c:2587
+#: src/gtkblist.c:2947
 msgid "/Tools/Away"
 msgstr "/Tools/Away"
 
-#: src/gtkblist.c:2590
+#: src/gtkblist.c:2950
 msgid "/Tools/Buddy Pounce"
 msgstr "/Tools/Buddy Pounce"
 
-#: src/gtkblist.c:2593
+#: src/gtkblist.c:2953
 msgid "/Tools/Protocol Actions"
 msgstr "/Tools/Protocol Actions"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:2680
+#: src/gtkblist.c:3041
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Buddies/Show Offline Buddies"
 
-#: src/gtkblist.c:2682
+#: src/gtkblist.c:3043
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Buddies/Show Empty Groups"
 
-#: src/gtkblist.c:2700 src/gtkconv.c:1192
-msgid "IM"
-msgstr "IM"
-
-#: src/gtkblist.c:2706
+#: src/gtkblist.c:3067
 msgid "Send a message to the selected buddy"
 msgstr "Send a message to the selected buddy"
 
-#: src/gtkblist.c:2709 src/protocols/napster/napster.c:529
-msgid "Get Info"
-msgstr "Get Info"
-
-#: src/gtkblist.c:2715
+#: src/gtkblist.c:3076
 msgid "Get information on the selected buddy"
 msgstr "Get information on the selected buddy"
 
-#: src/gtkblist.c:2718 src/protocols/oscar/oscar.c:3087
-msgid "Chat"
-msgstr "Chat"
-
-#: src/gtkblist.c:2723
+#: src/gtkblist.c:3079
+msgid "_Chat"
+msgstr "_Chat"
+
+#: src/gtkblist.c:3084
 msgid "Join a chat room"
 msgstr "Join a chat room"
 
-#: src/gtkblist.c:2731
+#: src/gtkblist.c:3087
+msgid "_Away"
+msgstr "_Away"
+
+#: src/gtkblist.c:3092
 msgid "Set an away message"
 msgstr "Set an away message"
 
-#: src/gtkblist.c:3444 src/protocols/yahoo/yahoo.c:2325
+#: src/gtkblist.c:3824 src/protocols/yahoo/yahoo.c:2427
 msgid "Add Buddy"
 msgstr "Add Buddy"
 
-#: src/gtkblist.c:3467
+#: src/gtkblist.c:3847
 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. "
@@ -2478,20 +2463,16 @@
 "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"
 
-#: src/gtkblist.c:3489 src/main.c:292
-msgid "Screen Name:"
-msgstr "Screen Name:"
-
 #. Set up stuff for the account box
-#: src/gtkblist.c:3524 src/gtkblist.c:3805
+#: src/gtkblist.c:3907 src/gtkblist.c:4191
 msgid "Account:"
 msgstr "Account:"
 
-#: src/gtkblist.c:3772
+#: src/gtkblist.c:4158
 msgid "Add Chat"
 msgstr "Add Chat"
 
-#: src/gtkblist.c:3795
+#: src/gtkblist.c:4181
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -2499,39 +2480,39 @@
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
 
-#: src/gtkblist.c:3871
+#: src/gtkblist.c:4260
 msgid "Add Group"
 msgstr "Add Group"
 
-#: src/gtkblist.c:3872
+#: src/gtkblist.c:4261
 msgid "Please enter the name of the group to be added."
 msgstr "Please enter the name of the group to be added."
 
-#: src/gtkblist.c:4389
+#: src/gtkblist.c:4780
 msgid "No actions available"
 msgstr "No actions available"
 
-#: src/gtkconn.c:79 src/gtkconn.c:251 src/gtkconn.c:262
+#: src/gtkconn.c:78 src/gtkconn.c:250 src/gtkconn.c:261
 msgid "Done."
 msgstr "Done."
 
-#: src/gtkconn.c:158
+#: src/gtkconn.c:157
 msgid "Signon: "
 msgstr "Signon: "
 
-#: src/gtkconn.c:204
+#: src/gtkconn.c:203
 msgid "Signon"
 msgstr "Signon"
 
-#: src/gtkconn.c:217
+#: src/gtkconn.c:216
 msgid "Cancel All"
 msgstr "Cancel All"
 
-#: src/gtkconn.c:360 src/gtkconn.c:587
+#: src/gtkconn.c:361 src/gtkconn.c:593
 msgid "_Reconnect"
 msgstr "_Reconnect"
 
-#: src/gtkconn.c:551
+#: src/gtkconn.c:557
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">%s has been disconnected.</span>\n"
@@ -2544,41 +2525,32 @@
 "%s\n"
 "%s"
 
-#: src/gtkconn.c:553
+#: src/gtkconn.c:559
 msgid "Reason Unknown."
 msgstr "Reason Unknown."
 
-#: src/gtkconn.c:592
+#: src/gtkconn.c:598
 msgid "Reconnect _All"
 msgstr "Reconnect _All"
 
-#: src/gtkconn.c:622
+#: src/gtkconn.c:628
 msgid "Time"
 msgstr "Time"
 
-#: src/gtkconv.c:188
+#: src/gtkconv.c:183
 msgid "That file already exists"
 msgstr "That file already exists"
 
-#: src/gtkconv.c:189 src/gtkft.c:1078
+#: src/gtkconv.c:184 src/gtkft.c:1106
 msgid "Would you like to overwrite it?"
 msgstr "Would you like to overwrite it?"
 
-#: src/gtkconv.c:245
-#, c-format
-msgid "Failed to store image: %s\n"
-msgstr "Failed to store image: %s\n"
-
-#: src/gtkconv.c:301
-msgid "Insert Image"
-msgstr "Insert Image"
-
-#: src/gtkconv.c:606
+#: src/gtkconv.c:470
 msgid "Invite Buddy Into Chat Room"
 msgstr "Invite Buddy Into Chat Room"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:634
+#: src/gtkconv.c:498
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -2586,339 +2558,299 @@
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 
-#: src/gtkconv.c:655
+#: src/gtkconv.c:519
 msgid "_Buddy:"
 msgstr "_Buddy:"
 
-#: src/gtkconv.c:675
+#: src/gtkconv.c:539
 msgid "_Message:"
 msgstr "_Message:"
 
-#: src/gtkconv.c:765
+#: src/gtkconv.c:632
 msgid "Find"
 msgstr "Find"
 
-#: src/gtkconv.c:787
+#: src/gtkconv.c:658
 msgid "_Search for:"
 msgstr "_Search for:"
 
-#: src/gtkconv.c:1200
+#: src/gtkconv.c:1030
+msgid "IM"
+msgstr "IM"
+
+#: src/gtkconv.c:1038
 msgid "Un-Ignore"
 msgstr "Un-Ignore"
 
-#: src/gtkconv.c:1202 src/gtkprefs.c:766
+#: src/gtkconv.c:1040 src/gtkprefs.c:784
 msgid "Ignore"
 msgstr "Ignore"
 
 #. Info button
-#: src/gtkconv.c:1211 src/gtkconv.c:3179
+#: src/gtkconv.c:1049 src/gtkconv.c:3303
 msgid "Info"
 msgstr "Info"
 
-#: src/gtkconv.c:1220
+#: src/gtkconv.c:1058
 msgid "Get Away Msg"
 msgstr "Get Away Msg"
 
 #. Remove button
-#: src/gtkconv.c:1231 src/gtkconv.c:3172 src/gtkconv.c:3263
-#: src/gtkrequest.c:198
+#: src/gtkconv.c:1070 src/gtkconv.c:3296 src/gtkconv.c:3387
+#: src/gtkrequest.c:231
 msgid "Remove"
 msgstr "Remove"
 
-#: src/gtkconv.c:2414
+#: src/gtkconv.c:2162
+msgid "Animate"
+msgstr "Animate"
+
+#: src/gtkconv.c:2167
+msgid "Hide Icon"
+msgstr "Hide Icon"
+
+#: src/gtkconv.c:2173
+msgid "Save Icon As..."
+msgstr "Save Icon As..."
+
+#: src/gtkconv.c:2536
 msgid "User is typing..."
 msgstr "User is typing..."
 
-#: src/gtkconv.c:2422
+#: src/gtkconv.c:2544
 msgid "User has typed something and paused"
 msgstr "User has typed something and paused"
 
 #. Build the Send As menu
-#: src/gtkconv.c:2525
+#: src/gtkconv.c:2647
 msgid "_Send As"
 msgstr "_Send As"
 
-#: src/gtkconv.c:2944
+#: src/gtkconv.c:3067
 msgid "Save Conversation"
 msgstr "Save Conversation"
 
 #. Conversation menu
-#: src/gtkconv.c:2961
+#: src/gtkconv.c:3084
 msgid "/_Conversation"
 msgstr "/_Conversation"
 
-#: src/gtkconv.c:2963
+#: src/gtkconv.c:3086
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Conversation/New Instant _Message..."
 
-#: src/gtkconv.c:2968
+#: src/gtkconv.c:3091
 msgid "/Conversation/_Find..."
 msgstr "/Conversation/_Find..."
 
-#: src/gtkconv.c:2969
+#: src/gtkconv.c:3093
 msgid "/Conversation/View _Log"
 msgstr "/Conversation/View _Log"
 
-#: src/gtkconv.c:2970
+#: src/gtkconv.c:3094
 msgid "/Conversation/_Save As..."
 msgstr "/Conversation/_Save As..."
 
-#: src/gtkconv.c:2975
+#: src/gtkconv.c:3099
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Conversation/Add Buddy _Pounce..."
 
-#: src/gtkconv.c:2977
+#: src/gtkconv.c:3101
 msgid "/Conversation/_Get Info"
 msgstr "/Conversation/_Get Info"
 
-#: src/gtkconv.c:2979
+#: src/gtkconv.c:3103
 msgid "/Conversation/_Warn..."
 msgstr "/Conversation/_Warn..."
 
-#: src/gtkconv.c:2981
+#: src/gtkconv.c:3105
 msgid "/Conversation/In_vite..."
 msgstr "/Conversation/In_vite..."
 
-#: src/gtkconv.c:2986
+#: src/gtkconv.c:3110
 msgid "/Conversation/A_lias..."
 msgstr "/Conversation/A_lias..."
 
-#: src/gtkconv.c:2988
+#: src/gtkconv.c:3112
 msgid "/Conversation/_Block..."
 msgstr "/Conversation/_Block..."
 
-#: src/gtkconv.c:2990
+#: src/gtkconv.c:3114
 msgid "/Conversation/_Add..."
 msgstr "/Conversation/_Add..."
 
-#: src/gtkconv.c:2992
+#: src/gtkconv.c:3116
 msgid "/Conversation/_Remove..."
 msgstr "/Conversation/_Remove..."
 
-#: src/gtkconv.c:2997
+#: src/gtkconv.c:3121
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Conversation/Insert Lin_k..."
 
-#: src/gtkconv.c:2999
+#: src/gtkconv.c:3123
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Conversation/Insert Imag_e..."
 
-#: src/gtkconv.c:3004
+#: src/gtkconv.c:3128
 msgid "/Conversation/_Close"
 msgstr "/Conversation/_Close"
 
 #. Options
-#: src/gtkconv.c:3008
+#: src/gtkconv.c:3132
 msgid "/_Options"
 msgstr "/_Options"
 
-#: src/gtkconv.c:3009
+#: src/gtkconv.c:3133
 msgid "/Options/Enable _Logging"
 msgstr "/Options/Enable _Logging"
 
-#: src/gtkconv.c:3010
+#: src/gtkconv.c:3134
 msgid "/Options/Enable _Sounds"
 msgstr "/Options/Enable _Sounds"
 
-#: src/gtkconv.c:3011
+#: src/gtkconv.c:3135
 msgid "/Options/Show Formatting _Toolbar"
 msgstr "/Options/Show Formatting _Toolbar"
 
-#: src/gtkconv.c:3053
+#: src/gtkconv.c:3177
 msgid "/Conversation/View Log"
 msgstr "/Conversation/View Log"
 
-#: src/gtkconv.c:3058
+#: src/gtkconv.c:3182
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversation/Add Buddy Pounce..."
 
-#: src/gtkconv.c:3064
+#: src/gtkconv.c:3188
 msgid "/Conversation/Get Info"
 msgstr "/Conversation/Get Info"
 
-#: src/gtkconv.c:3068
+#: src/gtkconv.c:3192
 msgid "/Conversation/Warn..."
 msgstr "/Conversation/Warn..."
 
-#: src/gtkconv.c:3072
+#: src/gtkconv.c:3196
 msgid "/Conversation/Invite..."
 msgstr "/Conversation/Invite..."
 
-#: src/gtkconv.c:3078
+#: src/gtkconv.c:3202
 msgid "/Conversation/Alias..."
 msgstr "/Conversation/Alias..."
 
-#: src/gtkconv.c:3082
+#: src/gtkconv.c:3206
 msgid "/Conversation/Block..."
 msgstr "/Conversation/Block..."
 
-#: src/gtkconv.c:3086
+#: src/gtkconv.c:3210
 msgid "/Conversation/Add..."
 msgstr "/Conversation/Add..."
 
-#: src/gtkconv.c:3090
+#: src/gtkconv.c:3214
 msgid "/Conversation/Remove..."
 msgstr "/Conversation/Remove..."
 
-#: src/gtkconv.c:3096
+#: src/gtkconv.c:3220
 msgid "/Conversation/Insert Link..."
 msgstr "/Conversation/Insert Link..."
 
-#: src/gtkconv.c:3100
+#: src/gtkconv.c:3224
 msgid "/Conversation/Insert Image..."
 msgstr "/Conversation/Insert Image..."
 
-#: src/gtkconv.c:3106
+#: src/gtkconv.c:3230
 msgid "/Options/Enable Logging"
 msgstr "/Options/Enable Logging"
 
-#: src/gtkconv.c:3109
+#: src/gtkconv.c:3233
 msgid "/Options/Enable Sounds"
 msgstr "/Options/Enable Sounds"
 
-#: src/gtkconv.c:3112
+#: src/gtkconv.c:3236
 msgid "/Options/Show Formatting Toolbar"
 msgstr "/Options/Show Formatting Toolbar"
 
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:3135 src/gtkconv.c:3137 src/gtkconv.c:3235 src/gtkconv.c:3237
+#: src/gtkconv.c:3259 src/gtkconv.c:3261 src/gtkconv.c:3359 src/gtkconv.c:3361
 msgid "Send"
 msgstr "Send"
 
 #. Now, um, just kind of all over the place. Huh?
 #. Warn button
-#: src/gtkconv.c:3151
+#: src/gtkconv.c:3275
 msgid "Warn"
 msgstr "Warn"
 
-#: src/gtkconv.c:3154
+#: src/gtkconv.c:3278
 msgid "Warn the user"
 msgstr "Warn the user"
 
 #. Block button
-#: src/gtkconv.c:3158 src/gtkprivacy.c:607 src/gtkprivacy.c:618
+#: src/gtkconv.c:3282 src/gtkprivacy.c:598 src/gtkprivacy.c:609
 msgid "Block"
 msgstr "Block"
 
-#: src/gtkconv.c:3161
+#: src/gtkconv.c:3285
 msgid "Block the user"
 msgstr "Block the user"
 
-#: src/gtkconv.c:3168
+#: src/gtkconv.c:3292
 msgid "Add the user to your buddy list"
 msgstr "Add the user to your buddy list"
 
-#: src/gtkconv.c:3175
+#: src/gtkconv.c:3299
 msgid "Remove the user from your buddy list"
 msgstr "Remove the user from your buddy list"
 
-#: src/gtkconv.c:3182 src/gtkconv.c:3681
+#: src/gtkconv.c:3306 src/gtkconv.c:3628
 msgid "Get the user's information"
 msgstr "Get the user's information"
 
 #. Invite
-#: src/gtkconv.c:3249
+#: src/gtkconv.c:3373
 msgid "Invite"
 msgstr "Invite"
 
-#: src/gtkconv.c:3252
+#: src/gtkconv.c:3376
 msgid "Invite a user"
 msgstr "Invite a user"
 
-#: src/gtkconv.c:3259
+#: src/gtkconv.c:3383
 msgid "Add the chat to your buddy list"
 msgstr "Add the chat to your buddy list"
 
-#: src/gtkconv.c:3266
+#: src/gtkconv.c:3390
 msgid "Remove the chat from your buddy list"
 msgstr "Remove the chat from your buddy list"
 
-#: src/gtkconv.c:3322
-msgid "Bold"
-msgstr "Bold"
-
-#: src/gtkconv.c:3333
-msgid "Italic"
-msgstr "Italic"
-
-#: src/gtkconv.c:3344
-msgid "Underline"
-msgstr "Underline"
-
-#: src/gtkconv.c:3360
-msgid "Larger font size"
-msgstr "Larger font size"
-
-#: src/gtkconv.c:3385
-msgid "Smaller font size"
-msgstr "Smaller font size"
-
-#: src/gtkconv.c:3402
-msgid "Font Face"
-msgstr "Font Face"
-
-#: src/gtkconv.c:3414
-msgid "Foreground font color"
-msgstr "Foreground font colour"
-
-#: src/gtkconv.c:3426
-msgid "Background color"
-msgstr "Background colour"
-
-#: src/gtkconv.c:3441
-msgid "Insert link"
-msgstr "Insert link"
-
-#: src/gtkconv.c:3452
-msgid "Insert image"
-msgstr "Insert image"
-
-#: src/gtkconv.c:3463
-msgid "Insert smiley"
-msgstr "Insert smiley"
-
-#: src/gtkconv.c:3548
+#: src/gtkconv.c:3490
 msgid "Topic:"
 msgstr "Topic:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3605
+#: src/gtkconv.c:3550
 msgid "0 people in room"
 msgstr "0 people in room"
 
-#: src/gtkconv.c:3658
+#: src/gtkconv.c:3605
 msgid "IM the user"
 msgstr "IM the user"
 
-#: src/gtkconv.c:3670
+#: src/gtkconv.c:3617
 msgid "Ignore the user"
 msgstr "Ignore the user"
 
-#: src/gtkconv.c:4216
+#: src/gtkconv.c:4155
 msgid "Close conversation"
 msgstr "Close conversation"
 
-#: src/gtkconv.c:4740 src/gtkconv.c:4772 src/gtkconv.c:4893 src/gtkconv.c:4960
+#: src/gtkconv.c:4668 src/gtkconv.c:4700 src/gtkconv.c:4821 src/gtkconv.c:4888
 #, 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"
 
-#: src/gtkconv.c:5292
-msgid "Animate"
-msgstr "Animate"
-
-#: src/gtkconv.c:5297
-msgid "Hide Icon"
-msgstr "Hide Icon"
-
-#: src/gtkconv.c:5303
-msgid "Save Icon As..."
-msgstr "Save Icon As..."
-
-#: src/gtkconv.c:5700 src/gtkconv.c:5703
+#: src/gtkconv.c:5404 src/gtkconv.c:5407
 msgid "<main>/Conversation/Close"
 msgstr "<main>/Conversation/Close"
 
@@ -2939,6 +2871,10 @@
 msgid "%.2f KB/s"
 msgstr "%.2f KB/s"
 
+#: src/gtkft.c:156 src/gtkft.c:957
+msgid "Finished"
+msgstr "Finished"
+
 #: src/gtkft.c:209
 msgid "<b>Receiving From:</b>"
 msgstr "<b>Receiving From:</b>"
@@ -2947,115 +2883,123 @@
 msgid "<b>Sending To:</b>"
 msgstr "<b>Sending To:</b>"
 
-#: src/gtkft.c:460
+#: src/gtkft.c:386
+msgid "There is no application configured to open this type of file."
+msgstr "There is no application configured to open this type of file."
+
+#: src/gtkft.c:391
+msgid "An error occurred while opening the file."
+msgstr "An error occurred while opening the file."
+
+#: src/gtkft.c:482
 msgid "Progress"
 msgstr "Progress"
 
-#: src/gtkft.c:467
+#: src/gtkft.c:489
 msgid "Filename"
 msgstr "Filename"
 
-#: src/gtkft.c:474
+#: src/gtkft.c:496
 msgid "Size"
 msgstr "Size"
 
-#: src/gtkft.c:481
+#: src/gtkft.c:503
 msgid "Remaining"
 msgstr "Remaining"
 
-#: src/gtkft.c:511
+#: src/gtkft.c:533
 msgid "Filename:"
 msgstr "Filename:"
 
-#: src/gtkft.c:512
+#: src/gtkft.c:534
 msgid "Status:"
 msgstr "Status:"
 
-#: src/gtkft.c:513
+#: src/gtkft.c:535
 msgid "Speed:"
 msgstr "Speed:"
 
-#: src/gtkft.c:514
+#: src/gtkft.c:536
 msgid "Time Elapsed:"
 msgstr "Time Elapsed:"
 
-#: src/gtkft.c:515
+#: src/gtkft.c:537
 msgid "Time Remaining:"
 msgstr "Time Remaining:"
 
-#: src/gtkft.c:612
+#: src/gtkft.c:634
 msgid "_Keep the dialog open"
 msgstr "_Keep the dialog open"
 
-#: src/gtkft.c:622
+#: src/gtkft.c:644
 msgid "_Clear finished transfers"
 msgstr "_Clear finished transfers"
 
 #. "Download Details" arrow
-#: src/gtkft.c:631
+#: src/gtkft.c:653
 msgid "Show transfer details"
 msgstr "Show transfer details"
 
-#: src/gtkft.c:632
+#: src/gtkft.c:654
 msgid "Hide transfer details"
 msgstr "Hide transfer details"
 
 #. Pause button
-#: src/gtkft.c:674 src/stock.c:87
+#: src/gtkft.c:696 src/stock.c:90
 msgid "_Pause"
 msgstr "_Pause"
 
 #. Resume button
-#: src/gtkft.c:684
+#: src/gtkft.c:706
 msgid "_Resume"
 msgstr "_Resume"
 
-#: src/gtkft.c:884
+#: src/gtkft.c:908
 msgid "Canceled"
 msgstr "Cancelled"
 
-#: src/gtkft.c:886
+#: src/gtkft.c:910
 msgid "Failed"
 msgstr "Failed"
 
-#: src/gtkft.c:1055
+#: src/gtkft.c:1082
 msgid "That file does not exist."
 msgstr "That file does not exist."
 
-#: src/gtkft.c:1064
+#: src/gtkft.c:1091
 msgid "Cannot send a file of 0 bytes."
 msgstr "Cannot send a file of 0 bytes."
 
-#: src/gtkft.c:1077
+#: src/gtkft.c:1105
 msgid "That file already exists."
 msgstr "That file already exists."
 
-#: src/gtkft.c:1102
+#: src/gtkft.c:1131
 msgid "Open..."
 msgstr "Open..."
 
-#: src/gtkft.c:1104
+#: src/gtkft.c:1133
 msgid "Save As..."
 msgstr "Save As..."
 
-#: src/gtkft.c:1151
+#: src/gtkft.c:1181
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s wants to send you %s (%s)"
 
-#: src/gtkimhtml.c:711
+#: src/gtkimhtml.c:829
 msgid "_Copy E-Mail Address"
 msgstr "_Copy E-Mail Address"
 
-#: src/gtkimhtml.c:723
+#: src/gtkimhtml.c:841
 msgid "_Copy Link Location"
 msgstr "_Copy Link Location"
 
-#: src/gtkimhtml.c:733
+#: src/gtkimhtml.c:851
 msgid "_Open Link in Browser"
 msgstr "_Open Link in Browser"
 
-#: src/gtkimhtml.c:1910
+#: src/gtkimhtml.c:2262
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
@@ -3063,41 +3007,124 @@
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
 
-#: src/gtkimhtml.c:1918
+#: src/gtkimhtml.c:2270
 #, c-format
 msgid "Error saving image: %s"
 msgstr "Error saving image: %s"
 
-#: src/gtkimhtml.c:1927
+#: src/gtkimhtml.c:2279
 msgid "Save Image"
 msgstr "Save Image"
 
-#: src/gtkimhtml.c:1950
+#: src/gtkimhtml.c:2302
 msgid "_Save Image..."
 msgstr "_Save Image..."
 
+#: src/gtkimhtmltoolbar.c:350
+msgid "_URL"
+msgstr "_URL"
+
+#: src/gtkimhtmltoolbar.c:354
+msgid "_Description"
+msgstr "_Description"
+
+#: src/gtkimhtmltoolbar.c:359
+msgid "Insert Link"
+msgstr "Insert Link"
+
+#: src/gtkimhtmltoolbar.c:361
+msgid ""
+"Please enter the URL and description of the link that you want to insert. "
+"The description is optional."
+msgstr ""
+"Please enter the URL and description of the link that you want to insert. "
+"The description is optional."
+
+#: src/gtkimhtmltoolbar.c:365
+msgid "_Insert"
+msgstr "_Insert"
+
+#: src/gtkimhtmltoolbar.c:422
+#, c-format
+msgid "Failed to store image: %s\n"
+msgstr "Failed to store image: %s\n"
+
+#: src/gtkimhtmltoolbar.c:448
+msgid "Insert Image"
+msgstr "Insert Image"
+
+#. show everything
+#: src/gtkimhtmltoolbar.c:592
+msgid "Smile!"
+msgstr "Smile!"
+
+#: src/gtkimhtmltoolbar.c:722
+msgid "Bold"
+msgstr "Bold"
+
+#: src/gtkimhtmltoolbar.c:733
+msgid "Italic"
+msgstr "Italic"
+
+#: src/gtkimhtmltoolbar.c:744
+msgid "Underline"
+msgstr "Underline"
+
+#: src/gtkimhtmltoolbar.c:760
+msgid "Larger font size"
+msgstr "Larger font size"
+
+#: src/gtkimhtmltoolbar.c:772
+msgid "Smaller font size"
+msgstr "Smaller font size"
+
+#: src/gtkimhtmltoolbar.c:789
+msgid "Font Face"
+msgstr "Font Face"
+
+#: src/gtkimhtmltoolbar.c:801
+msgid "Foreground font color"
+msgstr "Foreground font colour"
+
+#: src/gtkimhtmltoolbar.c:813
+msgid "Background color"
+msgstr "Background colour"
+
+#: src/gtkimhtmltoolbar.c:828
+msgid "Insert link"
+msgstr "Insert link"
+
+#: src/gtkimhtmltoolbar.c:838
+msgid "Insert image"
+msgstr "Insert image"
+
+#: src/gtkimhtmltoolbar.c:849
+msgid "Insert smiley"
+msgstr "Insert smiley"
+
 #: src/gtklog.c:257
 msgid "Conversations with"
 msgstr "Conversations with"
 
-#: src/gtknotify.c:213
+#. Descriptive label
+#: src/gtknotify.c:215
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s has %d new message."
 msgstr[1] "%s has %d new messages."
 
-#: src/gtknotify.c:221
+#: src/gtknotify.c:227
 #, c-format
 msgid "<span weight=\"bold\">From:</span> %s\n"
 msgstr "<span weight=\"bold\">From:</span> %s\n"
 
-#: src/gtknotify.c:226
+#: src/gtknotify.c:233
 #, c-format
 msgid "<span weight=\"bold\">Subject:</span> %s\n"
 msgstr "<span weight=\"bold\">Subject:</span> %s\n"
 
-#: src/gtknotify.c:230
+#: src/gtknotify.c:237
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3108,7 +3135,7 @@
 "\n"
 "%s%s%s%s"
 
-#: src/gtknotify.c:245
+#: src/gtknotify.c:253
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3119,176 +3146,184 @@
 "\n"
 "%s"
 
-#: src/gtknotify.c:432 src/gtknotify.c:452 src/gtknotify.c:460
+#: src/gtknotify.c:439
+#, c-format
+msgid "The browser command \"%s\" is invalid."
+msgstr "The browser command \"%s\" is invalid."
+
+#: src/gtknotify.c:442 src/gtknotify.c:456 src/gtknotify.c:471
+#: src/gtknotify.c:579
 msgid "Unable to open URL"
 msgstr "Unable to open URL"
 
-#: src/gtknotify.c:433
+#: src/gtknotify.c:453 src/gtknotify.c:468
+#, c-format
+msgid "Error launching \"%s\": %s"
+msgstr "Error launching \"%s\": %s"
+
+#: src/gtknotify.c:580
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 
-#: src/gtknotify.c:450
-#, c-format
-msgid "The browser \"%s\" is invalid."
-msgstr "The browser \"%s\" is invalid."
-
-#: src/gtknotify.c:457
-#, c-format
-msgid "Error launching \"command\": %s"
-msgstr "Error launching \"command\": %s"
-
-#: src/gtkpounce.c:142
+#: src/gtkpounce.c:143
 msgid "Select a file"
 msgstr "Select a file"
 
-#: src/gtkpounce.c:191
+#: src/gtkpounce.c:192
 msgid "Please enter a buddy to pounce."
 msgstr "Please enter a buddy to pounce."
 
 #. "New Buddy Pounce"
-#: src/gtkpounce.c:335 src/gtkpounce.c:740
+#: src/gtkpounce.c:336 src/gtkpounce.c:756
 msgid "New Buddy Pounce"
 msgstr "New Buddy Pounce"
 
-#: src/gtkpounce.c:335
+#: src/gtkpounce.c:336
 msgid "Edit Buddy Pounce"
 msgstr "Edit Buddy Pounce"
 
 #. Create the "Pounce Who" frame.
-#: src/gtkpounce.c:353
+#: src/gtkpounce.c:354
 msgid "Pounce Who"
 msgstr "Pounce Who"
 
-#: src/gtkpounce.c:379
+#: src/gtkpounce.c:381
 msgid "_Buddy Name:"
 msgstr "_Buddy Name:"
 
 #. Create the "Pounce When" frame.
-#: src/gtkpounce.c:401
+#: src/gtkpounce.c:404
 msgid "Pounce When"
 msgstr "Pounce When"
 
-#: src/gtkpounce.c:409 src/main.c:338
-msgid "Sign on"
-msgstr "Sign on"
-
-#: src/gtkpounce.c:411
-msgid "Sign off"
-msgstr "Sign off"
-
-#: src/gtkpounce.c:415
-msgid "Return from away"
-msgstr "Return from away"
-
-#: src/gtkpounce.c:417 src/gtkprefs.c:1481 src/protocols/msn/state.c:30
-#: src/protocols/yahoo/yahoo.c:2189
-msgid "Idle"
-msgstr "Idle"
-
-#: src/gtkpounce.c:419
-msgid "Return from idle"
-msgstr "Return from idle"
-
-#: src/gtkpounce.c:421
-msgid "Buddy starts typing"
-msgstr "Buddy starts typing"
-
-#: src/gtkpounce.c:423
-msgid "Buddy stops typing"
-msgstr "Buddy stops typing"
+#: src/gtkpounce.c:412
+msgid "_Sign on"
+msgstr "_Sign on"
+
+#: src/gtkpounce.c:414
+msgid "Sign _off"
+msgstr "Sign _off"
+
+#: src/gtkpounce.c:416
+msgid "A_way"
+msgstr "A_way"
+
+#: src/gtkpounce.c:418
+msgid "Re_turn from away"
+msgstr "Re_turn from away"
+
+#: src/gtkpounce.c:420
+msgid "_Idle"
+msgstr "_Idle"
+
+#: src/gtkpounce.c:422
+msgid "Retur_n from idle"
+msgstr "Retur_n from idle"
+
+#: src/gtkpounce.c:424
+msgid "Buddy starts _typing"
+msgstr "Buddy starts _typing"
+
+#: src/gtkpounce.c:426
+msgid "Buddy stops t_yping"
+msgstr "Buddy stops t_yping"
 
 #. Create the "Pounce Action" frame.
-#: src/gtkpounce.c:452
+#: src/gtkpounce.c:455
 msgid "Pounce Action"
 msgstr "Pounce Action"
 
-#: src/gtkpounce.c:459
-msgid "Open an IM window"
-msgstr "Open an IM window"
-
-#: src/gtkpounce.c:460
-msgid "Popup notification"
-msgstr "Popup notification"
-
-#: src/gtkpounce.c:461
-msgid "Send a message"
-msgstr "Send a message"
-
 #: src/gtkpounce.c:462
-msgid "Execute a command"
-msgstr "Execute a command"
+msgid "Op_en an IM window"
+msgstr "Op_en an IM window"
 
 #: src/gtkpounce.c:463
-msgid "Play a sound"
-msgstr "Play a sound"
-
-#: src/gtkpounce.c:467 src/gtkpounce.c:469
-msgid "Browse"
-msgstr "Browse"
-
-#: src/gtkpounce.c:470 src/gtkprefs.c:2071
-msgid "Test"
-msgstr "Test"
-
-#: src/gtkpounce.c:553
-msgid "_Save this pounce after activation"
-msgstr "_Save this pounce after activation"
+msgid "_Popup notification"
+msgstr "_Popup notification"
+
+#: src/gtkpounce.c:464
+msgid "Send a _message"
+msgstr "Send a _message"
+
+#: src/gtkpounce.c:465
+msgid "E_xecute a command"
+msgstr "E_xecute a command"
+
+#: src/gtkpounce.c:466
+msgid "P_lay a sound"
+msgstr "P_lay a sound"
+
+#: src/gtkpounce.c:470
+msgid "B_rowse..."
+msgstr "B_rowse..."
+
+#: src/gtkpounce.c:472
+msgid "Bro_wse..."
+msgstr "Bro_wse..."
+
+#: src/gtkpounce.c:473
+msgid "Pre_view"
+msgstr "Pre_view"
+
+#: src/gtkpounce.c:556
+msgid "Sav_e this pounce after activation"
+msgstr "Sav_e this pounce after activation"
 
 #. "Remove Buddy Pounce"
-#: src/gtkpounce.c:747
+#: src/gtkpounce.c:763
 msgid "Remove Buddy Pounce"
 msgstr "Remove Buddy Pounce"
 
-#: src/gtkpounce.c:794
+#: src/gtkpounce.c:813
 #, c-format
 msgid "%s has started typing to you"
 msgstr "%s has started typing to you"
 
-#: src/gtkpounce.c:795
+#: src/gtkpounce.c:814
 #, c-format
 msgid "%s has signed on"
 msgstr "%s has signed on"
 
-#: src/gtkpounce.c:796
+#: src/gtkpounce.c:815
 #, c-format
 msgid "%s has returned from being idle"
 msgstr "%s has returned from being idle"
 
-#: src/gtkpounce.c:797
+#: src/gtkpounce.c:816
 #, c-format
 msgid "%s has returned from being away"
 msgstr "%s has returned from being away"
 
-#: src/gtkpounce.c:798
+#: src/gtkpounce.c:817
 #, c-format
 msgid "%s has stopped typing to you"
 msgstr "%s has stopped typing to you"
 
-#: src/gtkpounce.c:799
+#: src/gtkpounce.c:818
 #, c-format
 msgid "%s has signed off"
 msgstr "%s has signed off"
 
-#: src/gtkpounce.c:800
+#: src/gtkpounce.c:819
 #, c-format
 msgid "%s has become idle"
 msgstr "%s has become idle"
 
-#: src/gtkpounce.c:802
+#: src/gtkpounce.c:821
 msgid "Unknown pounce event. Please report this!"
 msgstr "Unknown pounce event. Please report this!"
 
-#: src/gtkprefs.c:367
+#: src/gtkprefs.c:374
 msgid "Interface Options"
 msgstr "Interface Options"
 
-#: src/gtkprefs.c:369
+#: src/gtkprefs.c:376
 msgid "D_isplay remote nicknames if no alias is set"
 msgstr "D_isplay remote nicknames if no alias is set"
 
-#: src/gtkprefs.c:555
+#: src/gtkprefs.c:562
 msgid ""
 "Select a smiley theme that you would like to use from the list below. New "
 "themes can be installed by dragging and dropping them onto the theme list."
@@ -3296,360 +3331,419 @@
 "Select a smiley theme that you would like to use from the list below. New "
 "themes can be installed by dragging and dropping them onto the theme list."
 
-#: src/gtkprefs.c:590
+#: src/gtkprefs.c:597
 msgid "Icon"
 msgstr "Icon"
 
-#: src/gtkprefs.c:597 src/gtkprefs.c:1793 src/protocols/jabber/buddy.c:263
-#: src/protocols/jabber/buddy.c:748
+#: src/gtkprefs.c:604 src/gtkprefs.c:2018 src/protocols/jabber/buddy.c:265
+#: src/protocols/jabber/buddy.c:748 src/protocols/jabber/chat.c:683
 msgid "Description"
 msgstr "Description"
 
-#: src/gtkprefs.c:661
+#: src/gtkprefs.c:671
 msgid "Style"
 msgstr "Style"
 
-#: src/gtkprefs.c:662
+#: src/gtkprefs.c:672
 msgid "_Bold"
 msgstr "_Bold"
 
-#: src/gtkprefs.c:664
+#: src/gtkprefs.c:674
 msgid "_Italics"
 msgstr "_Italics"
 
-#: src/gtkprefs.c:666
+#: src/gtkprefs.c:676
 msgid "_Underline"
 msgstr "_Underline"
 
-#: src/gtkprefs.c:668
+#. who in their right mind would use this as a default anyway?
+#. * and plus, it wouldn't work as the code currently existed,
+#. * and then i went and applied simguy's patch to remove the
+#. * non-functional code.
+#. *
+#. * remove this after string freeze ends
+#.
+#: src/gtkprefs.c:686
 msgid "_Strikethrough"
 msgstr "_Strikethrough"
 
-#: src/gtkprefs.c:671
+#: src/gtkprefs.c:689
 msgid "Face"
 msgstr "Face"
 
-#: src/gtkprefs.c:674
+#: src/gtkprefs.c:692
 msgid "Use custo_m face"
 msgstr "Use custo_m face"
 
-#: src/gtkprefs.c:691
+#: src/gtkprefs.c:709
 msgid "Use custom si_ze"
 msgstr "Use custom si_ze"
 
-#: src/gtkprefs.c:703
+#: src/gtkprefs.c:721
 msgid "Color"
 msgstr "Colour"
 
-#: src/gtkprefs.c:707
+#: src/gtkprefs.c:725
 msgid "_Text color"
 msgstr "_Text colour"
 
-#: src/gtkprefs.c:726
+#: src/gtkprefs.c:744
 msgid "Bac_kground color"
 msgstr "Bac_kground colour"
 
-#: src/gtkprefs.c:754 src/gtkprefs.c:986 src/gtkprefs.c:1034
+#: src/gtkprefs.c:772 src/gtkprefs.c:1004 src/gtkprefs.c:1052
 msgid "Display"
 msgstr "Display"
 
-#: src/gtkprefs.c:755
+#: src/gtkprefs.c:773
 msgid "Show graphical _smileys"
 msgstr "Show graphical _smileys"
 
-#: src/gtkprefs.c:757
+#: src/gtkprefs.c:775
 msgid "Show _timestamp on messages"
 msgstr "Show _timestamp on messages"
 
-#: src/gtkprefs.c:759
+#: src/gtkprefs.c:777
 msgid "Show _URLs as links"
 msgstr "Show _URLs as links"
 
-#: src/gtkprefs.c:763
+#: src/gtkprefs.c:781
 msgid "_Highlight misspelled words"
 msgstr "_Highlight misspelled words"
 
-#: src/gtkprefs.c:767
+#: src/gtkprefs.c:785
 msgid "Ignore c_olors"
 msgstr "Ignore c_olours"
 
-#: src/gtkprefs.c:769
+#: src/gtkprefs.c:787
 msgid "Ignore font _faces"
 msgstr "Ignore font _faces"
 
-#: src/gtkprefs.c:771
+#: src/gtkprefs.c:789
 msgid "Ignore font si_zes"
 msgstr "Ignore font si_zes"
 
-#: src/gtkprefs.c:784
+#: src/gtkprefs.c:802
 msgid "Send Message"
 msgstr "Send Message"
 
-#: src/gtkprefs.c:785
+#: src/gtkprefs.c:803
 msgid "Enter _sends message"
 msgstr "Enter _sends message"
 
-#: src/gtkprefs.c:787
+#: src/gtkprefs.c:805
 msgid "C_ontrol-Enter sends message"
 msgstr "C_ontrol-Enter sends message"
 
-#: src/gtkprefs.c:790
+#: src/gtkprefs.c:808
 msgid "Window Closing"
 msgstr "Window Closing"
 
-#: src/gtkprefs.c:791
+#: src/gtkprefs.c:809
 msgid "_Escape closes window"
 msgstr "_Escape closes window"
 
-#: src/gtkprefs.c:794
+#: src/gtkprefs.c:812
 msgid "Insertions"
 msgstr "Insertions"
 
-#: src/gtkprefs.c:795
+#: src/gtkprefs.c:813
 msgid "Control-{B/I/U} inserts _HTML tags"
 msgstr "Control-{B/I/U} inserts _HTML tags"
 
-#: src/gtkprefs.c:797
+#: src/gtkprefs.c:815
 msgid "Control-(number) _inserts smileys"
 msgstr "Control-(number) _inserts smileys"
 
-#: src/gtkprefs.c:813
+#: src/gtkprefs.c:831
 msgid "Buddy List Sorting"
 msgstr "Buddy List Sorting"
 
-#: src/gtkprefs.c:822
+#: src/gtkprefs.c:840
 msgid "_Sorting:"
 msgstr "_Sorting:"
 
-#: src/gtkprefs.c:827
+#: src/gtkprefs.c:845
 msgid "Buddy List Toolbar"
 msgstr "Buddy List Toolbar"
 
-#: src/gtkprefs.c:828 src/gtkprefs.c:959 src/gtkprefs.c:1010
+#: src/gtkprefs.c:846 src/gtkprefs.c:977 src/gtkprefs.c:1028
 msgid "Show _buttons as:"
 msgstr "Show _buttons as:"
 
-#: src/gtkprefs.c:830 src/gtkprefs.c:961 src/gtkprefs.c:1012
+#: src/gtkprefs.c:848 src/gtkprefs.c:979 src/gtkprefs.c:1030
 msgid "Pictures"
 msgstr "Pictures"
 
-#: src/gtkprefs.c:831 src/gtkprefs.c:962 src/gtkprefs.c:1013
+#: src/gtkprefs.c:849 src/gtkprefs.c:980 src/gtkprefs.c:1031
 msgid "Text"
 msgstr "Text"
 
-#: src/gtkprefs.c:832 src/gtkprefs.c:963 src/gtkprefs.c:1014
+#: src/gtkprefs.c:850 src/gtkprefs.c:981 src/gtkprefs.c:1032
 msgid "Pictures and text"
 msgstr "Pictures and text"
 
-#: src/gtkprefs.c:837 src/gtkprefs.c:974 src/gtkprefs.c:1025
+#: src/gtkprefs.c:855 src/gtkprefs.c:992 src/gtkprefs.c:1043
 msgid "_Raise window on events"
 msgstr "_Raise window on events"
 
-#: src/gtkprefs.c:840
+#: src/gtkprefs.c:858
 msgid "Group Display"
 msgstr "Group Display"
 
-#: src/gtkprefs.c:841
+#: src/gtkprefs.c:859
 msgid "Show _numbers in groups"
 msgstr "Show _numbers in groups"
 
-#: src/gtkprefs.c:844
+#: src/gtkprefs.c:862
 msgid "Buddy Display"
 msgstr "Buddy Display"
 
-#: src/gtkprefs.c:845 src/gtkprefs.c:981
+#: src/gtkprefs.c:863 src/gtkprefs.c:999
 msgid "Show buddy _icons"
 msgstr "Show buddy _icons"
 
-#: src/gtkprefs.c:847
+#: src/gtkprefs.c:865
 msgid "Show _warning levels"
 msgstr "Show _warning levels"
 
-#: src/gtkprefs.c:849
+#: src/gtkprefs.c:867
 msgid "Show idle _times"
 msgstr "Show idle _times"
 
-#: src/gtkprefs.c:851
+#: src/gtkprefs.c:869
 msgid "Dim i_dle buddies"
 msgstr "Dim i_dle buddies"
 
-#: src/gtkprefs.c:853
+#: src/gtkprefs.c:871
 msgid "_Automatically expand contacts"
 msgstr "_Automatically expand contacts"
 
-#: src/gtkprefs.c:878
+#: src/gtkprefs.c:896
 msgid "_Placement:"
 msgstr "_Placement:"
 
-#: src/gtkprefs.c:885
+#: src/gtkprefs.c:903
 msgid "Send _URLs as Links"
 msgstr "Send _URLs as Links"
 
-#: src/gtkprefs.c:888
+#: src/gtkprefs.c:906
 msgid "Show _Formatting Toolbar"
 msgstr "Show _Formatting Toolbar"
 
-#: src/gtkprefs.c:891
+#: src/gtkprefs.c:909
 msgid "Show a_liases in tabs/titles"
 msgstr "Show a_liases in tabs/titles"
 
-#: src/gtkprefs.c:894
+#: src/gtkprefs.c:912
 msgid "Tab Options"
 msgstr "Tab Options"
 
-#: src/gtkprefs.c:896
+#: src/gtkprefs.c:914
 msgid "_Tab Placement:"
 msgstr "_Tab Placement:"
 
-#: src/gtkprefs.c:898
+#: src/gtkprefs.c:916
 msgid "Top"
 msgstr "Top"
 
-#: src/gtkprefs.c:899
+#: src/gtkprefs.c:917
 msgid "Bottom"
 msgstr "Bottom"
 
-#: src/gtkprefs.c:900
+#: src/gtkprefs.c:918
 msgid "Left"
 msgstr "Left"
 
-#: src/gtkprefs.c:901
+#: src/gtkprefs.c:919
 msgid "Right"
 msgstr "Right"
 
-#: src/gtkprefs.c:907
+#: src/gtkprefs.c:925
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Show IMs and chats in _tabbed windows"
 
-#: src/gtkprefs.c:910
+#: src/gtkprefs.c:928
 msgid "Show IMs and chats in _same tabbed window"
 msgstr "Show IMs and chats in _same tabbed window"
 
-#: src/gtkprefs.c:920
+#: src/gtkprefs.c:938
 msgid "Show _close button on tabs"
 msgstr "Show _close button on tabs"
 
-#: src/gtkprefs.c:931
+#: src/gtkprefs.c:949
 msgid "Show status _icons on tabs"
 msgstr "Show status _icons on tabs"
 
-#: src/gtkprefs.c:958 src/gtkprefs.c:1009
+#: src/gtkprefs.c:976 src/gtkprefs.c:1027
 msgid "Window"
 msgstr "Window"
 
-#: src/gtkprefs.c:968 src/gtkprefs.c:1019
+#: src/gtkprefs.c:986 src/gtkprefs.c:1037
 msgid "New window _width:"
 msgstr "New window _width:"
 
-#: src/gtkprefs.c:970 src/gtkprefs.c:1021
+#: src/gtkprefs.c:988 src/gtkprefs.c:1039
 msgid "New window _height:"
 msgstr "New window _height:"
 
-#: src/gtkprefs.c:972 src/gtkprefs.c:1023
+#: src/gtkprefs.c:990 src/gtkprefs.c:1041
 msgid "_Entry field height:"
 msgstr "_Entry field height:"
 
-#: src/gtkprefs.c:976
+#: src/gtkprefs.c:994
 msgid "Hide window on _send"
 msgstr "Hide window on _send"
 
-#: src/gtkprefs.c:980
+#: src/gtkprefs.c:998
 msgid "Buddy Icons"
 msgstr "Buddy Icons"
 
-#: src/gtkprefs.c:983
+#: src/gtkprefs.c:1001
 msgid "Enable buddy icon a_nimation"
 msgstr "Enable buddy icon a_nimation"
 
-#: src/gtkprefs.c:987
+#: src/gtkprefs.c:1005
 msgid "Show _logins in window"
 msgstr "Show _logins in window"
 
-#: src/gtkprefs.c:990
+#: src/gtkprefs.c:1008
 msgid "Typing Notification"
 msgstr "Typing Notification"
 
-#: src/gtkprefs.c:991
+#: src/gtkprefs.c:1009
 msgid "Notify buddies that you are _typing to them"
 msgstr "Notify buddies that you are _typing to them"
 
-#: src/gtkprefs.c:1028
+#: src/gtkprefs.c:1046
 msgid "Tab Completion"
 msgstr "Tab Completion"
 
-#: src/gtkprefs.c:1029
+#: src/gtkprefs.c:1047
 msgid "_Tab-complete nicks"
 msgstr "_Tab-complete nicks"
 
-#: src/gtkprefs.c:1031
+#: src/gtkprefs.c:1049
 msgid "_Old-style tab completion"
 msgstr "_Old-style tab completion"
 
-#: src/gtkprefs.c:1035
+#: src/gtkprefs.c:1053
 msgid "_Show people joining in window"
 msgstr "_Show people joining in window"
 
-#: src/gtkprefs.c:1037
+#: src/gtkprefs.c:1055
 msgid "_Show people leaving in window"
 msgstr "_Show people leaving in window"
 
-#: src/gtkprefs.c:1039
-msgid "Co_lorize screennames"
-msgstr "Co_lourise screennames"
-
-#: src/gtkprefs.c:1083
+#: src/gtkprefs.c:1057
+msgid "Co_lorize screen names"
+msgstr "Co_lourise screen names"
+
+#: src/gtkprefs.c:1078
+msgid "IP Address"
+msgstr "IP Address"
+
+#: src/gtkprefs.c:1080
+msgid "_Autodetect IP Address"
+msgstr "_Autodetect IP Address"
+
+#: src/gtkprefs.c:1089
+msgid "Public _IP:"
+msgstr "Public _IP:"
+
+#: src/gtkprefs.c:1113
+msgid "Ports"
+msgstr "Ports"
+
+#: src/gtkprefs.c:1116
+msgid "_Manually specify range of ports to listen on"
+msgstr "_Manually specify range of ports to listen on"
+
+#: src/gtkprefs.c:1119
+msgid "_Start Port:"
+msgstr "_Start Port:"
+
+#: src/gtkprefs.c:1126
+msgid "_End Port:"
+msgstr "_End Port:"
+
+#: src/gtkprefs.c:1174
 msgid "Proxy Type"
 msgstr "Proxy Type"
 
-#: src/gtkprefs.c:1086
+#: src/gtkprefs.c:1177
 msgid "No proxy"
 msgstr "No proxy"
 
-#: src/gtkprefs.c:1093
+#: src/gtkprefs.c:1184
 msgid "Proxy Server"
 msgstr "Proxy Server"
 
-#: src/gtkprefs.c:1149
+#: src/gtkprefs.c:1242
 msgid "_User:"
 msgstr "_User:"
 
-#: src/gtkprefs.c:1203
+#: src/gtkprefs.c:1298
 msgid "Opera"
 msgstr "Opera"
 
-#: src/gtkprefs.c:1204
+#: src/gtkprefs.c:1299
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/gtkprefs.c:1205
+#: src/gtkprefs.c:1300
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: src/gtkprefs.c:1206
+#: src/gtkprefs.c:1301
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/gtkprefs.c:1207
+#: src/gtkprefs.c:1302
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/gtkprefs.c:1208
+#: src/gtkprefs.c:1303
 msgid "Firebird"
 msgstr "Firebird"
 
-#: src/gtkprefs.c:1217
+#: src/gtkprefs.c:1304
+msgid "Firefox"
+msgstr "Firefox"
+
+#: src/gtkprefs.c:1305
+msgid "Gnome Default"
+msgstr "Gnome Default"
+
+#: src/gtkprefs.c:1314
 msgid "Manual"
 msgstr "Manual"
 
-#: src/gtkprefs.c:1258
+#: src/gtkprefs.c:1365
 msgid "Browser Selection"
 msgstr "Browser Selection"
 
-#: src/gtkprefs.c:1262
+#: src/gtkprefs.c:1369
 msgid "_Browser:"
 msgstr "_Browser:"
 
-#: src/gtkprefs.c:1272
+#: src/gtkprefs.c:1376
+msgid "_Open link in:"
+msgstr "_Open Link in:"
+
+#: src/gtkprefs.c:1378
+msgid "Browser default"
+msgstr "Browser default"
+
+#: src/gtkprefs.c:1379
+msgid "Existing window"
+msgstr "Existing window"
+
+#: src/gtkprefs.c:1381
+msgid "New tab"
+msgstr "New tab"
+
+#: src/gtkprefs.c:1395
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -3658,63 +3752,55 @@
 "_Manual:\n"
 "(%s for URL)"
 
-#: src/gtkprefs.c:1293
-msgid "Browser Options"
-msgstr "Browser Options"
-
-#: src/gtkprefs.c:1294
-msgid "Open new _window by default"
-msgstr "Open new _window by default"
-
-#: src/gtkprefs.c:1310
+#: src/gtkprefs.c:1428
 msgid "Message Logs"
 msgstr "Message Logs"
 
-#: src/gtkprefs.c:1313
+#: src/gtkprefs.c:1431
 msgid "Log _Format:"
 msgstr "Log _Format:"
 
-#: src/gtkprefs.c:1316
+#: src/gtkprefs.c:1434
 msgid "_Log all instant messages"
 msgstr "_Log all instant messages"
 
-#: src/gtkprefs.c:1318
+#: src/gtkprefs.c:1436
 msgid "Log all c_hats"
 msgstr "Log all c_hats"
 
-#: src/gtkprefs.c:1373
+#: src/gtkprefs.c:1491
 msgid "Sound Options"
 msgstr "Sound Options"
 
-#: src/gtkprefs.c:1374
+#: src/gtkprefs.c:1492
 msgid "_No sounds when you log in"
 msgstr "_No sounds when you log in"
 
-#: src/gtkprefs.c:1376
+#: src/gtkprefs.c:1494
 msgid "_Sounds while away"
 msgstr "_Sounds while away"
 
-#: src/gtkprefs.c:1380
+#: src/gtkprefs.c:1498
 msgid "Sound Method"
 msgstr "Sound Method"
 
-#: src/gtkprefs.c:1381
+#: src/gtkprefs.c:1499
 msgid "_Method:"
 msgstr "_Method:"
 
-#: src/gtkprefs.c:1383
+#: src/gtkprefs.c:1501
 msgid "Console beep"
 msgstr "Console beep"
 
-#: src/gtkprefs.c:1385
+#: src/gtkprefs.c:1503
 msgid "Automatic"
 msgstr "Automatic"
 
-#: src/gtkprefs.c:1392
+#: src/gtkprefs.c:1510
 msgid "Command"
 msgstr "Command"
 
-#: src/gtkprefs.c:1402
+#: src/gtkprefs.c:1520
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -3723,67 +3809,72 @@
 "Sound c_ommand:\n"
 "(%s for filename)"
 
-#: src/gtkprefs.c:1457
+#: src/gtkprefs.c:1577
 msgid "_Sending messages removes away status"
 msgstr "_Sending messages removes away status"
 
-#: src/gtkprefs.c:1459
+#: src/gtkprefs.c:1579
 msgid "_Queue new messages when away"
 msgstr "_Queue new messages when away"
 
-#: src/gtkprefs.c:1462
+#: src/gtkprefs.c:1582
 msgid "Auto-response"
 msgstr "Auto-response"
 
-#: src/gtkprefs.c:1465
+#: src/gtkprefs.c:1585
 msgid "Seconds before _resending:"
 msgstr "Seconds before _resending:"
 
-#: src/gtkprefs.c:1468
+#: src/gtkprefs.c:1588
 msgid "_Send auto-response"
 msgstr "_Send auto-response"
 
-#: src/gtkprefs.c:1470
+#: src/gtkprefs.c:1590
 msgid "_Only send auto-response when idle"
 msgstr "_Only send auto-response when idle"
 
-#: src/gtkprefs.c:1472
+#: src/gtkprefs.c:1592
 msgid "Send auto-response in _active conversations"
 msgstr "Send auto-response in _active conversations"
 
-#: src/gtkprefs.c:1482
+#: src/gtkprefs.c:1601 src/protocols/msn/state.c:30
+#: src/protocols/yahoo/yahoo.c:2291
+msgid "Idle"
+msgstr "Idle"
+
+#: src/gtkprefs.c:1602
 msgid "Idle _time reporting:"
 msgstr "Idle _time reporting:"
 
-#: src/gtkprefs.c:1485
+#: src/gtkprefs.c:1605
 msgid "Gaim usage"
 msgstr "Gaim usage"
 
-#: src/gtkprefs.c:1488
+#: src/gtkprefs.c:1608
 msgid "X usage"
 msgstr "X usage"
 
-#: src/gtkprefs.c:1490
+#: src/gtkprefs.c:1610
 msgid "Windows usage"
 msgstr "Windows usage"
 
-#: src/gtkprefs.c:1498
+#: src/gtkprefs.c:1618
 msgid "Auto-away"
 msgstr "Auto-away"
 
-#: src/gtkprefs.c:1499
+#: src/gtkprefs.c:1619
 msgid "Set away _when idle"
 msgstr "Set away _when idle"
 
-#: src/gtkprefs.c:1502
+#: src/gtkprefs.c:1623
 msgid "_Minutes before setting away:"
 msgstr "_Minutes before setting away:"
 
-#: src/gtkprefs.c:1508
+#: src/gtkprefs.c:1631
 msgid "Away m_essage:"
 msgstr "Away m_essage:"
 
-#: src/gtkprefs.c:1570
+#: src/gtkprefs.c:1786
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3798,7 +3889,7 @@
 "<span weight=\"bold\">Web site:</span>\t\t%s\n"
 "<span weight=\"bold\">File name:</span>\t%s"
 
-#: src/gtkprefs.c:1575
+#: src/gtkprefs.c:1791
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3813,172 +3904,188 @@
 "<span weight=\"bold\">URL:</span>  %s\n"
 "<span weight=\"bold\">File name:</span>  %s"
 
-#: src/gtkprefs.c:1757
+#: src/gtkprefs.c:1974
 msgid "Load"
 msgstr "Load"
 
-#: src/gtkprefs.c:1811
+#: src/gtkprefs.c:1988
+msgid "Summary"
+msgstr "Summary"
+
+#: src/gtkprefs.c:2036
 msgid "Details"
 msgstr "Details"
 
-#: src/gtkprefs.c:1938
+#: src/gtkprefs.c:2163
 msgid "Sound Selection"
 msgstr "Sound Selection"
 
-#: src/gtkprefs.c:2045
+#: src/gtkprefs.c:2270
 msgid "Play"
 msgstr "Play"
 
-#: src/gtkprefs.c:2052
+#: src/gtkprefs.c:2277
 msgid "Event"
 msgstr "Event"
 
-#: src/gtkprefs.c:2075
+#: src/gtkprefs.c:2296
+msgid "Test"
+msgstr "Test"
+
+#: src/gtkprefs.c:2300
 msgid "Reset"
 msgstr "Reset"
 
-#: src/gtkprefs.c:2079
+#: src/gtkprefs.c:2304
 msgid "Choose..."
 msgstr "Choose..."
 
-#: src/gtkprefs.c:2214
+#: src/gtkprefs.c:2439
 msgid "_Edit"
 msgstr "_Edit"
 
-#: src/gtkprefs.c:2250
+#: src/gtkprefs.c:2475
 msgid "Interface"
 msgstr "Interface"
 
-#: src/gtkprefs.c:2251
+#: src/gtkprefs.c:2476
 msgid "Smiley Themes"
 msgstr "Smiley Themes"
 
-#: src/gtkprefs.c:2252
+#: src/gtkprefs.c:2477
 msgid "Fonts"
 msgstr "Fonts"
 
-#: src/gtkprefs.c:2253
+#: src/gtkprefs.c:2478
 msgid "Message Text"
 msgstr "Message Text"
 
-#: src/gtkprefs.c:2254
+#: src/gtkprefs.c:2479
 msgid "Shortcuts"
 msgstr "Shortcuts"
 
-#: src/gtkprefs.c:2257
+#: src/gtkprefs.c:2482
 msgid "IMs"
 msgstr "IMs"
 
-#: src/gtkprefs.c:2259
+#: src/gtkprefs.c:2484
+msgid "Network"
+msgstr "Network"
+
+#: src/gtkprefs.c:2485
 msgid "Proxy"
 msgstr "Proxy"
 
 #. We use the registered default browser in windows
-#: src/gtkprefs.c:2262
+#: src/gtkprefs.c:2488
 msgid "Browser"
 msgstr "Browser"
 
-#: src/gtkprefs.c:2264
+#: src/gtkprefs.c:2490
 msgid "Logging"
 msgstr "Logging"
 
-#: src/gtkprefs.c:2265
+#: src/gtkprefs.c:2491
 msgid "Sounds"
 msgstr "Sounds"
 
-#: src/gtkprefs.c:2266
+#: src/gtkprefs.c:2492
 msgid "Sound Events"
 msgstr "Sound Events"
 
-#: src/gtkprefs.c:2267
+#: src/gtkprefs.c:2493
 msgid "Away / Idle"
 msgstr "Away / Idle"
 
-#: src/gtkprefs.c:2268
+#: src/gtkprefs.c:2494
 msgid "Away Messages"
 msgstr "Away Messages"
 
-#: src/gtkprefs.c:2271
+#: src/gtkprefs.c:2496
+msgid "Protocols"
+msgstr "Protocols"
+
+#: src/gtkprefs.c:2512
 msgid "Plugins"
 msgstr "Plugins"
 
-#: src/gtkprivacy.c:87
+#: src/gtkprivacy.c:77
 msgid "Allow all users to contact me"
 msgstr "Allow all users to contact me"
 
-#: src/gtkprivacy.c:88
+#: src/gtkprivacy.c:78
 msgid "Allow only the users on my buddy list"
 msgstr "Allow only the users on my buddy list"
 
-#: src/gtkprivacy.c:89
+#: src/gtkprivacy.c:79
 msgid "Allow only the users below"
 msgstr "Allow only the users below"
 
-#: src/gtkprivacy.c:90
+#: src/gtkprivacy.c:80
 msgid "Block all users"
 msgstr "Block all users"
 
-#: src/gtkprivacy.c:91
-msgid "Block the users below"
-msgstr "Block the users below"
-
-#: src/gtkprivacy.c:370
+#: src/gtkprivacy.c:81
+msgid "Block only the users below"
+msgstr "Block only the users below"
+
+#: src/gtkprivacy.c:360 src/protocols/jabber/jabber.c:1406
 msgid "Privacy"
 msgstr "Privacy"
 
-#: src/gtkprivacy.c:385
+#: src/gtkprivacy.c:375
 msgid "Changes to privacy settings take effect immediately."
 msgstr "Changes to privacy settings take effect immediately."
 
 #. "Set privacy for:" label
-#: src/gtkprivacy.c:397
+#: src/gtkprivacy.c:387
 msgid "Set privacy for:"
 msgstr "Set privacy for:"
 
-#: src/gtkprivacy.c:564 src/gtkprivacy.c:580
+#: src/gtkprivacy.c:555 src/gtkprivacy.c:571
 msgid "Permit User"
 msgstr "Permit User"
 
-#: src/gtkprivacy.c:565
+#: src/gtkprivacy.c:556
 msgid "Type a user you permit to contact you."
 msgstr "Type a user you permit to contact you."
 
-#: src/gtkprivacy.c:566
+#: src/gtkprivacy.c:557
 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."
 
-#: src/gtkprivacy.c:569 src/gtkprivacy.c:582
+#: src/gtkprivacy.c:560 src/gtkprivacy.c:573
 msgid "Permit"
 msgstr "Permit"
 
-#: src/gtkprivacy.c:574
+#: src/gtkprivacy.c:565
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "Allow %s to contact you?"
 
-#: src/gtkprivacy.c:576
+#: src/gtkprivacy.c:567
 #, 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?"
 
-#: src/gtkprivacy.c:603 src/gtkprivacy.c:616
+#: src/gtkprivacy.c:594 src/gtkprivacy.c:607
 msgid "Block User"
 msgstr "Block User"
 
-#: src/gtkprivacy.c:604
+#: src/gtkprivacy.c:595
 msgid "Type a user to block."
 msgstr "Type a user to block."
 
-#: src/gtkprivacy.c:605
+#: src/gtkprivacy.c:596
 msgid "Please enter the name of the user you wish to block."
 msgstr "Please enter the name of the user you wish to block."
 
-#: src/gtkprivacy.c:612
+#: src/gtkprivacy.c:603
 #, c-format
 msgid "Block %s?"
 msgstr "Block %s?"
 
-#: src/gtkprivacy.c:614
+#: src/gtkprivacy.c:605
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "Are you sure you want to block %s?"
@@ -3986,22 +4093,39 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:190 src/protocols/gg/gg.c:660 src/request.h:1011
+#: src/gtkrequest.c:223 src/protocols/gg/gg.c:663 src/request.h:1228
 msgid "Yes"
 msgstr "Yes"
 
-#: src/gtkrequest.c:191 src/protocols/gg/gg.c:660 src/request.h:1011
+#: src/gtkrequest.c:224 src/protocols/gg/gg.c:663 src/request.h:1228
 msgid "No"
 msgstr "No"
 
-#: src/gtkrequest.c:194
+#: src/gtkrequest.c:227
 msgid "Apply"
 msgstr "Apply"
 
-#: src/gtkrequest.c:195 src/protocols/msn/msn.c:247
+#: src/gtkrequest.c:228 src/protocols/msn/msn.c:248
 msgid "Close"
 msgstr "Close"
 
+#: src/gtkroomlist.c:322
+msgid ""
+"You are not currently signed on with any protocols that have the ability to "
+"list rooms."
+msgstr ""
+"You are not currently signed on with any protocols that have the ability to "
+"list rooms."
+
+#: src/gtkroomlist.c:335
+msgid "Room List"
+msgstr "Room List"
+
+#. list button
+#: src/gtkroomlist.c:410
+msgid "_Get List"
+msgstr "_Get List"
+
 #: src/gtksound.c:62
 msgid "Buddy logs in"
 msgstr "Buddy logs in"
@@ -4064,11 +4188,11 @@
 "Unable to play sound because the configured sound command could not be "
 "launched: %s"
 
-#: src/gtkutils.c:296
+#: src/gtkutils.c:297
 msgid "Can't save icon file to disk."
 msgstr "Can't save icon file to disk."
 
-#: src/gtkutils.c:331
+#: src/gtkutils.c:332
 msgid "Save Icon"
 msgstr "Save Icon"
 
@@ -4076,60 +4200,72 @@
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color=\"red\">The logger has no read function</font></b>"
 
-#: src/log.c:425
+#: src/log.c:433
 msgid "XML"
 msgstr "XML"
 
-#: src/log.c:506
-#, c-format
-msgid ""
-"<font color=\"#16569E\">(%s) <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
-msgstr ""
-"<font color=\"#16569E\">(%s) <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
-
-#: src/log.c:508
-#, c-format
-msgid ""
-"<font color=\"#A82F2F\">(%s) <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
-msgstr ""
-"<font color=\"#A82F2F\">(%s) <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
-
-#: src/log.c:552 src/log.c:688
+#: src/log.c:514
+#, c-format
+msgid ""
+"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
+"REPLY&gt;:</b></font> %s<br/>\n"
+msgstr ""
+"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
+"REPLY&gt;:</b></font> %s<br/>\n"
+
+#: src/log.c:516
+#, c-format
+msgid ""
+"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
+"REPLY&gt;:</b></font> %s<br/>\n"
+msgstr ""
+"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
+"REPLY&gt;:</b></font> %s<br/>\n"
+
+#: src/log.c:560 src/log.c:696
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>Unable to find log path!</b></font>"
 
-#: src/log.c:562 src/log.c:698
+#: src/log.c:570 src/log.c:706
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>Could not read file: %s</b></font>"
 
-#: src/log.c:566
+#: src/log.c:574
 msgid "HTML"
 msgstr "HTML"
 
-#: src/log.c:641
+#: src/log.c:649
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
-#: src/log.c:702
+#: src/log.c:710
 msgid "Plain text"
 msgstr "Plain text"
 
-#: src/main.c:151
-msgid "Please enter your login."
-msgstr "Please enter your login."
-
-#: src/main.c:234
-msgid "<New User>"
-msgstr "<New User>"
-
-#: src/main.c:276
+#: src/main.c:157
+msgid "Please create an account."
+msgstr "Please create an account."
+
+#: src/main.c:239
 msgid "Login"
 msgstr "Login"
 
+#: src/main.c:257
+msgid "<b>Screen Name:</b>"
+msgstr "<b>Screen Name:</b>"
+
+#: src/main.c:271
+msgid "<b>Password:</b>"
+msgstr "<b>Password:</b>"
+
+#: src/main.c:300
+msgid "Sign on"
+msgstr "Sign on"
+
 #. full help text
-#: src/main.c:555
+#: src/main.c:524
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -4163,7 +4299,7 @@
 "  -h, --help          display this help and exit\n"
 
 #. short message
-#: src/main.c:570
+#: src/main.c:539
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr "Gaim %s. Try `%s -h' for more information.\n"
@@ -4191,10 +4327,10 @@
 msgstr "Slightly less boring default"
 
 #: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:111
-#: src/protocols/msn/msn.c:344 src/protocols/msn/state.c:27
+#: src/protocols/msn/msn.c:345 src/protocols/msn/state.c:27
 #: src/protocols/msn/state.c:28 src/protocols/msn/state.c:35
-#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2492
-#: src/protocols/yahoo/yahoo.c:2601
+#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2594
+#: src/protocols/yahoo/yahoo.c:2703
 msgid "Available"
 msgstr "Available"
 
@@ -4207,10 +4343,11 @@
 msgstr "Away for friends only"
 
 #: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:964
-#: src/protocols/jabber/presence.c:91 src/protocols/oscar/oscar.c:2847
-#: src/protocols/oscar/oscar.c:4592 src/protocols/oscar/oscar.c:4619
-#: src/protocols/oscar/oscar.c:6169 src/protocols/yahoo/yahoo.c:2187
-#: src/protocols/yahoo/yahoo.c:2512 src/protocols/yahoo/yahoo.c:2611
+#: src/protocols/jabber/presence.c:121 src/protocols/oscar/oscar.c:2943
+#: src/protocols/oscar/oscar.c:4668 src/protocols/oscar/oscar.c:4739
+#: src/protocols/oscar/oscar.c:4763 src/protocols/oscar/oscar.c:6417
+#: src/protocols/oscar/oscar.c:6421 src/protocols/yahoo/yahoo.c:2289
+#: src/protocols/yahoo/yahoo.c:2614 src/protocols/yahoo/yahoo.c:2713
 msgid "Invisible"
 msgstr "Invisible"
 
@@ -4230,9 +4367,10 @@
 msgid "Unable to connect to server."
 msgstr "Unable to connect to server."
 
-#: src/protocols/gg/gg.c:142 src/protocols/jabber/auth.c:65
-#: src/protocols/jabber/auth.c:168 src/protocols/jabber/auth.c:335
-#: src/protocols/jabber/auth.c:433 src/protocols/jabber/auth.c:445
+#: src/protocols/gg/gg.c:142 src/protocols/jabber/auth.c:130
+#: src/protocols/jabber/auth.c:204 src/protocols/jabber/auth.c:354
+#: src/protocols/jabber/auth.c:452 src/protocols/jabber/auth.c:464
+#: src/protocols/jabber/jabber.c:103
 msgid "Invalid response from server."
 msgstr "Invalid response from server."
 
@@ -4266,158 +4404,158 @@
 msgstr "Unable to read socket"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: src/protocols/gg/gg.c:399 src/protocols/icq/gaim_icq.c:344
-#: src/protocols/msn/dispatch.c:208 src/protocols/msn/msn.c:492
-#: src/protocols/msn/notification.c:2165 src/protocols/napster/napster.c:463
+#: src/protocols/gg/gg.c:402 src/protocols/icq/gaim_icq.c:344
+#: src/protocols/msn/dispatch.c:208 src/protocols/msn/msn.c:496
+#: src/protocols/msn/notification.c:1789 src/protocols/napster/napster.c:463
 #: src/protocols/napster/napster.c:494 src/protocols/toc/toc.c:200
-#: src/protocols/yahoo/yahoo.c:1856 src/protocols/yahoo/yahoo.c:1887
-#: src/protocols/yahoo/yahoo.c:1950 src/protocols/yahoo/yahoo_filexfer.c:68
+#: src/protocols/yahoo/yahoo.c:1954 src/protocols/yahoo/yahoo.c:1985
+#: src/protocols/yahoo/yahoo.c:2048 src/protocols/yahoo/yahoo_filexfer.c:68
 #: src/protocols/yahoo/yahoo_filexfer.c:139
 msgid "Unable to connect."
 msgstr "Unable to connect."
 
-#: src/protocols/gg/gg.c:415
+#: src/protocols/gg/gg.c:418
 msgid "Reading data"
 msgstr "Reading data"
 
-#: src/protocols/gg/gg.c:418
+#: src/protocols/gg/gg.c:421
 msgid "Balancer handshake"
 msgstr "Balancer handshake"
 
-#: src/protocols/gg/gg.c:421
+#: src/protocols/gg/gg.c:424
 msgid "Reading server key"
 msgstr "Reading server key"
 
-#: src/protocols/gg/gg.c:424
+#: src/protocols/gg/gg.c:427
 msgid "Exchanging key hash"
 msgstr "Exchanging key hash"
 
-#: src/protocols/gg/gg.c:434
+#: src/protocols/gg/gg.c:437
 msgid "Critical error in GG library\n"
 msgstr "Critical error in GG library\n"
 
-#: src/protocols/gg/gg.c:452 src/protocols/gg/gg.c:543
+#: src/protocols/gg/gg.c:455 src/protocols/gg/gg.c:546
 #: src/protocols/toc/toc.c:176
 #, c-format
 msgid "Connect to %s failed"
 msgstr "Connect to %s failed"
 
-#: src/protocols/gg/gg.c:500
+#: src/protocols/gg/gg.c:503
 msgid "Unable to ping server"
 msgstr "Unable to ping server"
 
-#: src/protocols/gg/gg.c:512
+#: src/protocols/gg/gg.c:515
 msgid "Send as message"
 msgstr "Send as message"
 
-#: src/protocols/gg/gg.c:517
+#: src/protocols/gg/gg.c:520
 msgid "Looking up GG server"
 msgstr "Looking up GG server"
 
-#: src/protocols/gg/gg.c:520
+#: src/protocols/gg/gg.c:523
 msgid "Invalid Gadu-Gadu UIN specified"
 msgstr "Invalid Gadu-Gadu UIN specified"
 
-#: src/protocols/gg/gg.c:567
+#: src/protocols/gg/gg.c:570
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr "You are trying to send a message to an invalid Gadu-Gadu UIN."
 
-#: src/protocols/gg/gg.c:629
+#: src/protocols/gg/gg.c:632
 msgid "Couldn't get search results"
 msgstr "Couldn't get search results"
 
-#: src/protocols/gg/gg.c:634
+#: src/protocols/gg/gg.c:637
 msgid "Gadu-Gadu Search Engine"
 msgstr "Gadu-Gadu Search Engine"
 
-#: src/protocols/gg/gg.c:659
+#: src/protocols/gg/gg.c:662
 msgid "Active"
 msgstr "Active"
 
-#: src/protocols/gg/gg.c:664 src/protocols/oscar/oscar.c:3970
+#: src/protocols/gg/gg.c:667 src/protocols/oscar/oscar.c:4106
 msgid "UIN"
 msgstr "UIN"
 
 #. First Name
-#: src/protocols/gg/gg.c:668 src/protocols/jabber/jabber.c:634
-#: src/protocols/oscar/oscar.c:3975 src/protocols/trepia/trepia.c:267
+#: src/protocols/gg/gg.c:671 src/protocols/jabber/jabber.c:605
+#: src/protocols/oscar/oscar.c:4111 src/protocols/trepia/trepia.c:267
 msgid "First Name"
-msgstr "First Name"
+msgstr "Forename"
 
 #. Last Name
-#: src/protocols/gg/gg.c:673 src/protocols/jabber/jabber.c:639
-#: src/protocols/oscar/oscar.c:3978 src/protocols/trepia/trepia.c:274
+#: src/protocols/gg/gg.c:676 src/protocols/jabber/jabber.c:610
+#: src/protocols/oscar/oscar.c:4114 src/protocols/trepia/trepia.c:274
 msgid "Last Name"
-msgstr "Last Name"
-
-#: src/protocols/gg/gg.c:677 src/protocols/gg/gg.c:1388
-#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:3972
+msgstr "Surname"
+
+#: src/protocols/gg/gg.c:680 src/protocols/gg/gg.c:1392
+#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4108
 msgid "Nick"
 msgstr "Nick"
 
-#: src/protocols/gg/gg.c:684 src/protocols/gg/gg.c:687
+#: src/protocols/gg/gg.c:687 src/protocols/gg/gg.c:690
 msgid "Birth Year"
 msgstr "Birth Year"
 
-#: src/protocols/gg/gg.c:693 src/protocols/gg/gg.c:695
-#: src/protocols/gg/gg.c:697
+#: src/protocols/gg/gg.c:696 src/protocols/gg/gg.c:698
+#: src/protocols/gg/gg.c:700
 msgid "Sex"
 msgstr "Sex"
 
 #. City
-#: src/protocols/gg/gg.c:701 src/protocols/jabber/jabber.c:649
-#: src/protocols/oscar/oscar.c:4024 src/protocols/oscar/oscar.c:4040
+#: src/protocols/gg/gg.c:704 src/protocols/jabber/jabber.c:620
+#: src/protocols/oscar/oscar.c:4160 src/protocols/oscar/oscar.c:4176
 #: src/protocols/trepia/trepia.c:331 src/protocols/trepia/trepia.c:430
 msgid "City"
 msgstr "City"
 
 #. res[0] == username
-#: src/protocols/gg/gg.c:722 src/protocols/msn/msn.c:1286
-#: src/protocols/msn/msn.c:1530 src/protocols/napster/napster.c:387
-#: src/protocols/oscar/oscar.c:2889 src/protocols/oscar/oscar.c:3211
-#: src/protocols/toc/toc.c:498 src/protocols/yahoo/yahoo.c:2788
-#: src/protocols/yahoo/yahoo.c:2810 src/protocols/yahoo/yahoo.c:2833
-#: src/protocols/yahoo/yahoo.c:2991 src/protocols/zephyr/zephyr.c:355
+#: src/protocols/gg/gg.c:725 src/protocols/msn/msn.c:1303
+#: src/protocols/msn/msn.c:1547 src/protocols/napster/napster.c:387
+#: src/protocols/oscar/oscar.c:2985 src/protocols/oscar/oscar.c:3311
+#: src/protocols/toc/toc.c:498 src/protocols/yahoo/yahoo.c:2887
+#: src/protocols/yahoo/yahoo.c:2909 src/protocols/yahoo/yahoo.c:2932
+#: src/protocols/yahoo/yahoo.c:3090 src/protocols/zephyr/zephyr.c:536
 msgid "Buddy Information"
 msgstr "Buddy Information"
 
-#: src/protocols/gg/gg.c:741
+#: src/protocols/gg/gg.c:744
 msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr "There is no Buddy List stored on the Gadu-Gadu server."
 
-#: src/protocols/gg/gg.c:749
+#: src/protocols/gg/gg.c:752
 msgid "Couldn't Import Buddy List from Server"
 msgstr "Couldn't Import Buddy List from Server"
 
-#: src/protocols/gg/gg.c:812
+#: src/protocols/gg/gg.c:815
 msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "Buddy List successfully transferred to Gadu-Gadu server"
 
-#: src/protocols/gg/gg.c:820
+#: src/protocols/gg/gg.c:823
 msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "Couldn't transfer Buddy List to Gadu-Gadu server"
 
-#: src/protocols/gg/gg.c:828
+#: src/protocols/gg/gg.c:831
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
 msgstr "Buddy List successfully deleted from Gadu-Gadu server"
 
-#: src/protocols/gg/gg.c:836
+#: src/protocols/gg/gg.c:839
 msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "Couldn't delete Buddy List from Gadu-Gadu server"
 
-#: src/protocols/gg/gg.c:844
+#: src/protocols/gg/gg.c:847
 msgid "Password changed successfully"
 msgstr "Password changed successfully"
 
-#: src/protocols/gg/gg.c:851
+#: src/protocols/gg/gg.c:854
 msgid "Password couldn't be changed"
 msgstr "Password couldn't be changed"
 
-#: src/protocols/gg/gg.c:968
+#: src/protocols/gg/gg.c:971
 msgid "Error communicating with Gadu-Gadu server"
 msgstr "Error communicating with Gadu-Gadu server"
 
-#: src/protocols/gg/gg.c:969
+#: src/protocols/gg/gg.c:972
 msgid ""
 "Gaim was unable to complete your request due to a problem communicating with "
 "the Gadu-Gadu HTTP server.  Please try again later."
@@ -4425,11 +4563,11 @@
 "Gaim was unable to complete your request due to a problem communicating with "
 "the Gadu-Gadu HTTP server.  Please try again later."
 
-#: src/protocols/gg/gg.c:997
+#: src/protocols/gg/gg.c:1000
 msgid "Unable to import Gadu-Gadu buddy list"
 msgstr "Unable to import Gadu-Gadu buddy list"
 
-#: src/protocols/gg/gg.c:998
+#: src/protocols/gg/gg.c:1001
 msgid ""
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
@@ -4437,25 +4575,25 @@
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
 
-#: src/protocols/gg/gg.c:1071
+#: src/protocols/gg/gg.c:1074
 msgid "Couldn't export buddy list"
 msgstr "Couldn't export buddy list"
 
-#: src/protocols/gg/gg.c:1072 src/protocols/gg/gg.c:1095
+#: src/protocols/gg/gg.c:1075 src/protocols/gg/gg.c:1098
 msgid ""
 "Gaim was unable to connect to the buddy list server.  Please try again later."
 msgstr ""
 "Gaim was unable to connect to the buddy list server.  Please try again later."
 
-#: src/protocols/gg/gg.c:1094
+#: src/protocols/gg/gg.c:1097
 msgid "Unable to delete Gadu-Gadu buddy list"
 msgstr "Unable to delete Gadu-Gadu buddy list"
 
-#: src/protocols/gg/gg.c:1143
+#: src/protocols/gg/gg.c:1146
 msgid "Unable to access directory"
 msgstr "Unable to access directory"
 
-#: src/protocols/gg/gg.c:1144
+#: src/protocols/gg/gg.c:1147
 msgid ""
 "Gaim was unable to search the Directory because it was unable to connect to "
 "the directory server.  Please try again later."
@@ -4463,11 +4601,11 @@
 "Gaim was unable to search the Directory because it was unable to connect to "
 "the directory server.  Please try again later."
 
-#: src/protocols/gg/gg.c:1177
+#: src/protocols/gg/gg.c:1180
 msgid "Unable to change Gadu-Gadu password"
 msgstr "Unable to change Gadu-Gadu password"
 
-#: src/protocols/gg/gg.c:1178
+#: src/protocols/gg/gg.c:1181
 msgid ""
 "Gaim was unable to change your password due to an error connecting to the "
 "Gadu-Gadu server.  Please try again later."
@@ -4475,32 +4613,32 @@
 "Gaim was unable to change your password due to an error connecting to the "
 "Gadu-Gadu server.  Please try again later."
 
-#: src/protocols/gg/gg.c:1195
+#: src/protocols/gg/gg.c:1198
 msgid "Directory Search"
 msgstr "Directory Search"
 
-#: src/protocols/gg/gg.c:1204 src/protocols/jabber/jabber.c:1076
+#: src/protocols/gg/gg.c:1207 src/protocols/jabber/jabber.c:1063
 #: src/protocols/toc/toc.c:1546
 msgid "Change Password"
 msgstr "Change Password"
 
-#: src/protocols/gg/gg.c:1212
+#: src/protocols/gg/gg.c:1215
 msgid "Import Buddy List from Server"
 msgstr "Import Buddy List from Server"
 
-#: src/protocols/gg/gg.c:1218
+#: src/protocols/gg/gg.c:1221
 msgid "Export Buddy List to Server"
 msgstr "Export Buddy List to Server"
 
-#: src/protocols/gg/gg.c:1224
+#: src/protocols/gg/gg.c:1227
 msgid "Delete Buddy List from Server"
 msgstr "Delete Buddy List from Server"
 
-#: src/protocols/gg/gg.c:1257
+#: src/protocols/gg/gg.c:1260
 msgid "Unable to access user profile."
 msgstr "Unable to access user profile."
 
-#: src/protocols/gg/gg.c:1258
+#: src/protocols/gg/gg.c:1261
 msgid ""
 "Gaim was unable to access this user's profile due to an error connecting to "
 "the directory server.  Please try again later."
@@ -4518,7 +4656,7 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/gg/gg.c:1369 src/protocols/gg/gg.c:1371
+#: src/protocols/gg/gg.c:1373 src/protocols/gg/gg.c:1375
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu Protocol Plugin"
 
@@ -4531,17 +4669,17 @@
 msgid "The user %s (%s%s%s%s%s) wants you to authorize them."
 msgstr "The user %s (%s%s%s%s%s) wants you to authorise them."
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:190
-#: src/protocols/msn/notification.c:957 src/protocols/msn/notification.c:1284
-#: src/protocols/msn/notification.c:1451 src/protocols/oscar/oscar.c:2619
-#: src/protocols/oscar/oscar.c:5160
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:224
+#: src/protocols/msn/notification.c:581 src/protocols/msn/notification.c:908
+#: src/protocols/msn/notification.c:1075 src/protocols/oscar/oscar.c:2715
+#: src/protocols/oscar/oscar.c:5374
 msgid "Authorize"
 msgstr "Authorise"
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:191
-#: src/protocols/msn/notification.c:958 src/protocols/msn/notification.c:1286
-#: src/protocols/msn/notification.c:1453 src/protocols/oscar/oscar.c:2621
-#: src/protocols/oscar/oscar.c:5161
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:225
+#: src/protocols/msn/notification.c:582 src/protocols/msn/notification.c:910
+#: src/protocols/msn/notification.c:1077 src/protocols/oscar/oscar.c:2717
+#: src/protocols/oscar/oscar.c:5375
 msgid "Deny"
 msgstr "Deny"
 
@@ -4584,61 +4722,85 @@
 "<B>Supported IRC Commands:</B><BR>AWAY JOIN ME MODE<BR>MSG NICK OPERWALL "
 "PING<BR>QUERY QUIT QUOTE UMODE<BR>WALLOPS WHOIS"
 
-#: src/protocols/irc/cmds.c:459 src/protocols/jabber/chat.c:542
+#: src/protocols/irc/cmds.c:466 src/protocols/jabber/chat.c:527
 #, c-format
 msgid "current topic is: %s"
 msgstr "current topic is: %s"
 
-#: src/protocols/irc/cmds.c:461 src/protocols/jabber/chat.c:544
+#: src/protocols/irc/cmds.c:468 src/protocols/jabber/chat.c:529
 msgid "No topic is set"
 msgstr "No topic is set"
 
-#: src/protocols/irc/irc.c:72
+#: src/protocols/irc/dcc_send.c:272 src/protocols/yahoo/yahoo_filexfer.c:199
+#: src/protocols/yahoo/yahoo_filexfer.c:208
+#: src/protocols/yahoo/yahoo_filexfer.c:217
+msgid "File Transfer Aborted"
+msgstr "File Transfer Aborted"
+
+#: src/protocols/irc/dcc_send.c:273
+msgid "Gaim could not open a listening port."
+msgstr "Gaim could not open a listening port."
+
+#: src/protocols/irc/irc.c:73
 msgid "Error displaying MOTD"
 msgstr "Error displaying MOTD"
 
-#: src/protocols/irc/irc.c:72
+#: src/protocols/irc/irc.c:73
 msgid "No MOTD available"
 msgstr "No MOTD available"
 
-#: src/protocols/irc/irc.c:73
+#: src/protocols/irc/irc.c:74
 msgid "There is no MOTD associated with this connection."
 msgstr "There is no MOTD associated with this connection."
 
-#: src/protocols/irc/irc.c:76
+#: src/protocols/irc/irc.c:77
 #, c-format
 msgid "MOTD for %s"
 msgstr "MOTD for %s"
 
-#: src/protocols/irc/irc.c:139
+#: src/protocols/irc/irc.c:140
 msgid "View MOTD"
 msgstr "View MOTD"
 
-#: src/protocols/irc/irc.c:158
+#: src/protocols/irc/irc.c:154 src/protocols/jabber/buddy.c:883
+#: src/protocols/oscar/oscar.c:3189 src/protocols/oscar/oscar.c:6517
+#: src/protocols/yahoo/yahoo.c:2452
+msgid "Send File"
+msgstr "Send File"
+
+#: src/protocols/irc/irc.c:168
 msgid "_Channel:"
 msgstr "_Channel:"
 
-#: src/protocols/irc/irc.c:163 src/protocols/jabber/chat.c:57
+#: src/protocols/irc/irc.c:173 src/protocols/jabber/chat.c:59
 msgid "_Password:"
 msgstr "_Password:"
 
-#: src/protocols/irc/irc.c:182
+#: src/protocols/irc/irc.c:192
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC nicks may not contain whitespace"
 
-#: src/protocols/irc/irc.c:201 src/protocols/toc/toc.c:228
+#: src/protocols/irc/irc.c:211 src/protocols/toc/toc.c:228
 #, c-format
 msgid "Signon: %s"
 msgstr "Signon: %s"
 
-#: src/protocols/irc/irc.c:210
+#: src/protocols/irc/irc.c:220
 msgid "Couldn't create socket"
 msgstr "Couldn't create socket"
 
-#: src/protocols/irc/irc.c:359 src/protocols/trepia/trepia.c:972
+#: src/protocols/irc/irc.c:369 src/protocols/trepia/trepia.c:977
 msgid "Read error"
 msgstr "Read error"
 
+#: src/protocols/irc/irc.c:503 src/protocols/yahoo/yahoochat.c:1343
+msgid "Users"
+msgstr "Users"
+
+#: src/protocols/irc/irc.c:506 src/protocols/yahoo/yahoochat.c:1352
+msgid "Topic"
+msgstr "Topic"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -4648,32 +4810,32 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:533
+#: src/protocols/irc/irc.c:611
 msgid "IRC Protocol Plugin"
 msgstr "IRC Protocol Plugin"
 
 #. *  summary
-#: src/protocols/irc/irc.c:534
+#: src/protocols/irc/irc.c:612
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "The IRC Protocol Plugin that Sucks Less"
 
-#: src/protocols/irc/irc.c:551 src/protocols/irc/msgs.c:197
-#: src/protocols/jabber/jabber.c:1209 src/protocols/napster/napster.c:636
+#: src/protocols/irc/irc.c:629 src/protocols/irc/msgs.c:197
+#: src/protocols/jabber/jabber.c:1369 src/protocols/napster/napster.c:637
 msgid "Server"
 msgstr "Server"
 
-#: src/protocols/irc/irc.c:554 src/protocols/jabber/jabber.c:1230
-#: src/protocols/msn/msn.c:1661 src/protocols/napster/napster.c:641
-#: src/protocols/trepia/trepia.c:1344
+#: src/protocols/irc/irc.c:632 src/protocols/jabber/jabber.c:1390
+#: src/protocols/msn/msn.c:1680 src/protocols/napster/napster.c:642
+#: src/protocols/trepia/trepia.c:1350
 msgid "Port"
 msgstr "Port"
 
-#: src/protocols/irc/irc.c:557
+#: src/protocols/irc/irc.c:635
 msgid "Encoding"
 msgstr "Encoding"
 
-#: src/protocols/irc/irc.c:560 src/protocols/irc/msgs.c:191
-#: src/protocols/jabber/jabber.c:609
+#: src/protocols/irc/irc.c:638 src/protocols/irc/msgs.c:191
+#: src/protocols/jabber/jabber.c:580
 msgid "Username"
 msgstr "Username"
 
@@ -4698,7 +4860,7 @@
 msgid " <i>(identified)</i>"
 msgstr " <i>(identified)</i>"
 
-#: src/protocols/irc/msgs.c:192 src/protocols/yahoo/yahoo.c:2891
+#: src/protocols/irc/msgs.c:192 src/protocols/yahoo/yahoo.c:2990
 msgid "Realname"
 msgstr "Realname"
 
@@ -4724,111 +4886,111 @@
 msgid "Buddy Information for %s"
 msgstr "Buddy Information for %s"
 
-#: src/protocols/irc/msgs.c:247
+#: src/protocols/irc/msgs.c:277
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s has changed the topic to: %s"
 
-#: src/protocols/irc/msgs.c:252
+#: src/protocols/irc/msgs.c:282
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "The topic for %s is: %s"
 
-#: src/protocols/irc/msgs.c:266
+#: src/protocols/irc/msgs.c:296
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Unknown message '%s'"
 
-#: src/protocols/irc/msgs.c:267
+#: src/protocols/irc/msgs.c:297
 msgid "Unknown message"
 msgstr "Unknown message"
 
-#: src/protocols/irc/msgs.c:267
+#: src/protocols/irc/msgs.c:297
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr "Gaim has sent a message the IRC server did not understand."
 
-#: src/protocols/irc/msgs.c:370
+#: src/protocols/irc/msgs.c:400
 msgid "No such channel"
 msgstr "No such channel"
 
 #. does this happen?
-#: src/protocols/irc/msgs.c:381
+#: src/protocols/irc/msgs.c:411
 msgid "no such channel"
 msgstr "no such channel"
 
-#: src/protocols/irc/msgs.c:384
+#: src/protocols/irc/msgs.c:414
 msgid "User is not logged in"
 msgstr "User is not logged in"
 
-#: src/protocols/irc/msgs.c:389
+#: src/protocols/irc/msgs.c:419
 msgid "No such nick or channel"
 msgstr "No such nick or channel"
 
-#: src/protocols/irc/msgs.c:409
+#: src/protocols/irc/msgs.c:439
 msgid "Could not send"
 msgstr "Could not send"
 
-#: src/protocols/irc/msgs.c:465
+#: src/protocols/irc/msgs.c:495
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Joining %s requires an invitation."
 
-#: src/protocols/irc/msgs.c:466
+#: src/protocols/irc/msgs.c:496
 msgid "Invitation only"
 msgstr "Invitation only"
 
-#: src/protocols/irc/msgs.c:562
+#: src/protocols/irc/msgs.c:592
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "You have been kicked by %s: (%s)"
 
-#: src/protocols/irc/msgs.c:570
+#: src/protocols/irc/msgs.c:597
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Kicked by %s (%s)"
 
-#: src/protocols/irc/msgs.c:591
+#: src/protocols/irc/msgs.c:618
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "mode (%s %s) by %s"
 
-#: src/protocols/irc/msgs.c:670
+#: src/protocols/irc/msgs.c:697
 msgid "Could not change nick"
 msgstr "Could not change nick"
 
-#: src/protocols/irc/msgs.c:671
+#: src/protocols/irc/msgs.c:698
 msgid "Cannot change nick"
 msgstr "Cannot change nick"
 
-#: src/protocols/irc/msgs.c:692
+#: src/protocols/irc/msgs.c:719
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "You have parted the channel%s%s"
 
-#: src/protocols/irc/msgs.c:730
+#: src/protocols/irc/msgs.c:759
 msgid "Error: invalid PONG from server"
 msgstr "Error: invalid PONG from server"
 
-#: src/protocols/irc/msgs.c:732
+#: src/protocols/irc/msgs.c:761
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING reply -- Lag: %lu seconds"
 
-#: src/protocols/irc/msgs.c:802
+#: src/protocols/irc/msgs.c:836
 #, c-format
 msgid "Cannot join %s:"
 msgstr "Cannot join %s:"
 
-#: src/protocols/irc/msgs.c:803
+#: src/protocols/irc/msgs.c:837
 msgid "Cannot join channel"
 msgstr "Cannot join channel"
 
-#: src/protocols/irc/msgs.c:833
+#: src/protocols/irc/msgs.c:867
 #, c-format
 msgid "Wallops from %s"
 msgstr "Wallops from %s"
 
-#: src/protocols/irc/parse.c:161
+#: src/protocols/irc/parse.c:166
 msgid ""
 "(There was an error converting this message.  Check the 'Encoding' option in "
 "the Account Editor)"
@@ -4836,167 +4998,138 @@
 "(There was an error converting this message.  Check the 'Encoding' option in "
 "the Account Editor)"
 
-#: src/protocols/irc/parse.c:292
+#: src/protocols/irc/parse.c:297
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Reply time from %s: %lu seconds"
 
-#: src/protocols/irc/parse.c:293
+#: src/protocols/irc/parse.c:298
 msgid "PONG"
 msgstr "PONG"
 
-#: src/protocols/irc/parse.c:293
+#: src/protocols/irc/parse.c:298
 msgid "CTCP PING reply"
 msgstr "CTCP PING reply"
 
-#: src/protocols/irc/parse.c:392 src/protocols/oscar/oscar.c:535
+#: src/protocols/irc/parse.c:400 src/protocols/oscar/oscar.c:581
 #: src/protocols/toc/toc.c:218 src/protocols/toc/toc.c:625
 #: src/protocols/toc/toc.c:641 src/protocols/toc/toc.c:709
 msgid "Disconnected."
 msgstr "Disconnected."
 
-#: src/protocols/jabber/auth.c:52
+#: src/protocols/jabber/auth.c:51
 msgid "Server requires SSL for login"
 msgstr "Server requires SSL for login"
 
-#: src/protocols/jabber/auth.c:94 src/protocols/jabber/auth.c:194
+#: src/protocols/jabber/auth.c:111
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "Server requires plaintext authentication over an unencrypted stream"
 
-#: src/protocols/jabber/auth.c:116 src/protocols/jabber/auth.c:199
+#: src/protocols/jabber/auth.c:160 src/protocols/jabber/auth.c:161
+#: src/protocols/jabber/auth.c:238 src/protocols/jabber/auth.c:239
+msgid "Plaintext Authentication"
+msgstr "Plaintext Authentication"
+
+#: src/protocols/jabber/auth.c:162 src/protocols/jabber/auth.c:240
+msgid ""
+"This server requires plaintext authentication over an unencrypted "
+"connection.  Allow this and continue authentication?"
+msgstr ""
+"This server requires plaintext authentication over an unencrypted "
+"connection.  Allow this and continue authentication?"
+
+#: src/protocols/jabber/auth.c:170 src/protocols/jabber/auth.c:248
 msgid "Server does not use any supported authentication method"
 msgstr "Server does not use any supported authentication method"
 
-#: src/protocols/jabber/auth.c:180 src/protocols/jabber/jabber.c:463
-msgid "Unknown Error"
-msgstr "Unknown Error"
-
-#: src/protocols/jabber/auth.c:356
+#: src/protocols/jabber/auth.c:375
 msgid "Invalid challenge from server"
 msgstr "Invalid challenge from server"
 
-#: src/protocols/jabber/auth.c:448
-msgid "Bad Protocol"
-msgstr "Bad Protocol"
-
-#: src/protocols/jabber/auth.c:451
-msgid "Encryption Required"
-msgstr "Encryption Required"
-
-#: src/protocols/jabber/auth.c:454
-msgid "Invalid authzid"
-msgstr "Invalid authzid"
-
-#: src/protocols/jabber/auth.c:457
-msgid "Invalid Mechanism"
-msgstr "Invalid Mechanism"
-
-#: src/protocols/jabber/auth.c:459
-msgid "Invalid Realm"
-msgstr "Invalid Realm"
-
-#: src/protocols/jabber/auth.c:462
-msgid "Mechanism Too Weak"
-msgstr "Mechanism Too Weak"
-
-#: src/protocols/jabber/auth.c:465 src/protocols/jabber/jabber.c:148
-#: src/protocols/jabber/jabber.c:899 src/protocols/jabber/jabber.c:949
-#: src/protocols/oscar/oscar.c:5571
-msgid "Not Authorized"
-msgstr "Not Authorised"
-
-#: src/protocols/jabber/auth.c:468
-msgid "Temporary Authentication Failure"
-msgstr "Temporary Authentication Failure"
-
-#: src/protocols/jabber/auth.c:470
-msgid "Authentication Failure"
-msgstr "Authentication Failure"
-
-#: src/protocols/jabber/buddy.c:245 src/protocols/jabber/buddy.c:603
+#: src/protocols/jabber/buddy.c:247 src/protocols/jabber/buddy.c:603
 msgid "Full Name"
 msgstr "Full Name"
 
-#: src/protocols/jabber/buddy.c:246 src/protocols/jabber/buddy.c:616
+#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:616
 msgid "Family Name"
 msgstr "Family Name"
 
-#: src/protocols/jabber/buddy.c:247 src/protocols/jabber/buddy.c:620
+#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:620
 msgid "Given Name"
 msgstr "Given Name"
 
-#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:635
-#: src/protocols/jabber/jabber.c:629 src/protocols/yahoo/yahoo.c:2887
+#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:635
+#: src/protocols/jabber/jabber.c:600 src/protocols/yahoo/yahoo.c:2986
 msgid "Nickname"
 msgstr "Nickname"
 
-#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/jabber.c:669
+#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/jabber.c:640
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:663
+#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:663
 msgid "Street Address"
 msgstr "Street Address"
 
-#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/buddy.c:659
+#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:659
 msgid "Extended Address"
 msgstr "Extended Address"
 
-#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:667
+#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:667
 msgid "Locality"
 msgstr "Locality"
 
-#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:671
+#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:671
 msgid "Region"
 msgstr "Region"
 
-#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:675
-#: src/protocols/jabber/jabber.c:659
+#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:675
+#: src/protocols/jabber/jabber.c:630
 msgid "Postal Code"
 msgstr "Postal Code"
 
 #. Country
-#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:680
+#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:680
 #: src/protocols/trepia/trepia.c:339 src/protocols/trepia/trepia.c:448
 msgid "Country"
 msgstr "Country"
 
-#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:691
+#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:691
 #: src/protocols/jabber/buddy.c:698
 msgid "Telephone"
 msgstr "Telephone"
 
-#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:709
-#: src/protocols/jabber/buddy.c:717 src/protocols/yahoo/yahoo.c:2883
+#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:709
+#: src/protocols/jabber/buddy.c:717 src/protocols/yahoo/yahoo.c:2982
 msgid "Email"
 msgstr "Email"
 
-#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:732
+#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:732
 msgid "Organization Name"
 msgstr "Organisation Name"
 
-#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:736
+#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:736
 msgid "Organization Unit"
 msgstr "Organisation Unit"
 
-#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:742
+#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:742
 msgid "Title"
 msgstr "Title"
 
-#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:745
+#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:745
 msgid "Role"
 msgstr "Role"
 
-#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:638
-#: src/protocols/oscar/oscar.c:4004
+#: src/protocols/jabber/buddy.c:264 src/protocols/jabber/buddy.c:638
+#: src/protocols/oscar/oscar.c:4140
 msgid "Birthday"
 msgstr "Birthday"
 
-#: src/protocols/jabber/buddy.c:506 src/protocols/jabber/buddy.c:507
+#: src/protocols/jabber/buddy.c:508 src/protocols/jabber/buddy.c:509
 msgid "Edit Jabber vCard"
 msgstr "Edit Jabber vCard"
 
-#: src/protocols/jabber/buddy.c:508
+#: src/protocols/jabber/buddy.c:510
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
@@ -5004,17 +5137,16 @@
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
 
-#: src/protocols/jabber/buddy.c:551
+#: src/protocols/jabber/buddy.c:552
 msgid "Jabber ID"
 msgstr "Jabber ID"
 
-#: src/protocols/jabber/buddy.c:561 src/protocols/jabber/buddy.c:568
-#: src/protocols/jabber/buddy.c:579 src/protocols/jabber/jabber.c:936
-#: src/protocols/jabber/jabber.c:949
+#: src/protocols/jabber/buddy.c:562 src/protocols/jabber/buddy.c:569
+#: src/protocols/jabber/buddy.c:580 src/protocols/jabber/jabber.c:930
 msgid "Status"
 msgstr "Status"
 
-#: src/protocols/jabber/buddy.c:577 src/protocols/jabber/jabber.c:1212
+#: src/protocols/jabber/buddy.c:578 src/protocols/jabber/jabber.c:1372
 msgid "Resource"
 msgstr "Resource"
 
@@ -5022,8 +5154,8 @@
 msgid "Middle Name"
 msgstr "Middle Name"
 
-#: src/protocols/jabber/buddy.c:643 src/protocols/jabber/jabber.c:644
-#: src/protocols/oscar/oscar.c:4021 src/protocols/oscar/oscar.c:4037
+#: src/protocols/jabber/buddy.c:643 src/protocols/jabber/jabber.c:615
+#: src/protocols/oscar/oscar.c:4157 src/protocols/oscar/oscar.c:4173
 msgid "Address"
 msgstr "Address"
 
@@ -5039,333 +5171,288 @@
 msgid "Logo"
 msgstr "Logo"
 
-#: src/protocols/jabber/buddy.c:775
+#: src/protocols/jabber/buddy.c:777
 msgid "Jabber Profile"
 msgstr "Jabber Profile"
 
-#: src/protocols/jabber/buddy.c:915
+#: src/protocols/jabber/buddy.c:893
 msgid "Un-hide From"
 msgstr "Un-hide From"
 
-#: src/protocols/jabber/buddy.c:918
+#: src/protocols/jabber/buddy.c:896
 msgid "Temporarily Hide From"
 msgstr "Temporarily Hide From"
 
-#: src/protocols/jabber/buddy.c:926
+#: src/protocols/jabber/buddy.c:905
 msgid "Cancel Presence Notification"
 msgstr "Cancel Presence Notification"
 
-#: src/protocols/jabber/buddy.c:934
+#: src/protocols/jabber/buddy.c:913
 msgid "(Re-)Request authorization"
 msgstr "(Re-)Request authorisation"
 
-#: src/protocols/jabber/buddy.c:940
+#: src/protocols/jabber/buddy.c:919
 msgid "Unsubscribe"
 msgstr "Unsubscribe"
 
-#: src/protocols/jabber/chat.c:40 src/protocols/yahoo/yahoochat.c:942
+#: src/protocols/jabber/chat.c:42 src/protocols/yahoo/yahoochat.c:965
 msgid "_Room:"
 msgstr "_Room:"
 
-#: src/protocols/jabber/chat.c:45
+#: src/protocols/jabber/chat.c:47
 msgid "_Server:"
 msgstr "_Server:"
 
-#: src/protocols/jabber/chat.c:51
+#: src/protocols/jabber/chat.c:53
 msgid "_Handle:"
 msgstr "_Handle:"
 
-#: src/protocols/jabber/chat.c:159
+#: src/protocols/jabber/chat.c:164
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s is not a valid room name"
 
-#: src/protocols/jabber/chat.c:160
+#: src/protocols/jabber/chat.c:165
 msgid "Invalid Room Name"
 msgstr "Invalid Room Name"
 
-#: src/protocols/jabber/chat.c:165
+#: src/protocols/jabber/chat.c:170
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s is not a valid server name"
 
-#: src/protocols/jabber/chat.c:166 src/protocols/jabber/chat.c:167
+#: src/protocols/jabber/chat.c:171 src/protocols/jabber/chat.c:172
 msgid "Invalid Server Name"
 msgstr "Invalid Server Name"
 
-#: src/protocols/jabber/chat.c:171
+#: src/protocols/jabber/chat.c:176
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s is not a valid room handle"
 
-#: src/protocols/jabber/chat.c:172 src/protocols/jabber/chat.c:173
+#: src/protocols/jabber/chat.c:177 src/protocols/jabber/chat.c:178
 msgid "Invalid Room Handle"
 msgstr "Invalid Room Handle"
 
-#: src/protocols/jabber/chat.c:334 src/protocols/jabber/chat.c:487
-#: src/protocols/jabber/message.c:280
-#, c-format
-msgid " (Code %s)"
-msgstr " (Code %s)"
-
-#: src/protocols/jabber/chat.c:337
+#: src/protocols/jabber/chat.c:332
 msgid "Configuration error"
 msgstr "Configuration error"
 
-#: src/protocols/jabber/chat.c:348 src/protocols/jabber/chat.c:501
+#: src/protocols/jabber/chat.c:341 src/protocols/jabber/chat.c:486
 msgid "Unable to configure"
 msgstr "Unable to configure"
 
-#: src/protocols/jabber/chat.c:362
+#: src/protocols/jabber/chat.c:357
 msgid "Room Configuration Error"
 msgstr "Room Configuration Error"
 
-#: src/protocols/jabber/chat.c:363
+#: src/protocols/jabber/chat.c:358
 msgid "This room is not capable of being configured"
 msgstr "This room is not capable of being configured"
 
-#: src/protocols/jabber/chat.c:490
+#: src/protocols/jabber/chat.c:408 src/protocols/jabber/chat.c:477
 msgid "Registration error"
 msgstr "Registration error"
 
-#: src/protocols/jabber/chat.c:571
+#: src/protocols/jabber/chat.c:556
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "Nick changing not supported in non-MUC chatrooms"
 
-#: src/protocols/jabber/jabber.c:72
+#: src/protocols/jabber/chat.c:599 src/protocols/jabber/chat.c:610
+msgid "Roomlist Error"
+msgstr "Roomlist Error"
+
+#: src/protocols/jabber/chat.c:600 src/protocols/jabber/chat.c:611
+msgid "Error retreiving roomlist"
+msgstr "Error retreiving roomlist"
+
+#: src/protocols/jabber/chat.c:651
+msgid "Invalid Server"
+msgstr "Invalid Server"
+
+#: src/protocols/jabber/chat.c:688
+msgid "Enter a Conference Server"
+msgstr "Enter a Conference Server"
+
+#: src/protocols/jabber/chat.c:689
+msgid "Select a conference server to query"
+msgstr "Select a conference server to query"
+
+#: src/protocols/jabber/chat.c:691
+msgid "Find Rooms"
+msgstr "Find Rooms"
+
+#: src/protocols/jabber/jabber.c:73
 msgid "Error initializing session"
 msgstr "Error initializing session"
 
-#: src/protocols/jabber/jabber.c:123
-msgid "Bad Format"
-msgstr "Bad Format"
-
-#: src/protocols/jabber/jabber.c:125
-msgid "Bad Namespace Prefix"
-msgstr "Bad Namespace Prefix"
-
-#: src/protocols/jabber/jabber.c:128
-msgid "Resource Conflict"
-msgstr "Resource Conflict"
-
-#: src/protocols/jabber/jabber.c:130
-msgid "Connection Timeout"
-msgstr "Connection Timeout"
-
-#: src/protocols/jabber/jabber.c:132
-msgid "Host Gone"
-msgstr "Host Gone"
-
-#: src/protocols/jabber/jabber.c:134
-msgid "Host Unknown"
-msgstr "Host Unknown"
-
-#: src/protocols/jabber/jabber.c:136
-msgid "Improper Addressing"
-msgstr "Improper Addressing"
-
-#: src/protocols/jabber/jabber.c:138
-msgid "Internal Server Error"
-msgstr "Internal Server Error"
-
-#: src/protocols/jabber/jabber.c:140
-msgid "Invalid ID"
-msgstr "Invalid ID"
-
-#: src/protocols/jabber/jabber.c:142
-msgid "Invalid Namespace"
-msgstr "Invalid Namespace"
-
-#: src/protocols/jabber/jabber.c:144
-msgid "Invalid XML"
-msgstr "Invalid XML"
-
-#: src/protocols/jabber/jabber.c:146
-msgid "Non-matching Hosts"
-msgstr "Non-matching Hosts"
-
-#: src/protocols/jabber/jabber.c:150
-msgid "Policy Violation"
-msgstr "Policy Violation"
-
-#: src/protocols/jabber/jabber.c:152
-msgid "Remote Connection Failed"
-msgstr "Remote Connection Failed"
-
-#: src/protocols/jabber/jabber.c:154
-msgid "Resource Constraint"
-msgstr "Resource Constraint"
-
-#: src/protocols/jabber/jabber.c:156
-msgid "Restricted XML"
-msgstr "Restricted XML"
-
-#: src/protocols/jabber/jabber.c:158
-msgid "See Other Host"
-msgstr "See Other Host"
-
-#: src/protocols/jabber/jabber.c:160
-msgid "System Shutdown"
-msgstr "System Shutdown"
-
-#: src/protocols/jabber/jabber.c:162
-msgid "Undefined Condition"
-msgstr "Undefined Condition"
-
-#: src/protocols/jabber/jabber.c:164
-msgid "Unsupported Encoding"
-msgstr "Unsupported Encoding"
-
-#: src/protocols/jabber/jabber.c:166
-msgid "Unsupported Stanza Type"
-msgstr "Unsupported Stanza Type"
-
-#: src/protocols/jabber/jabber.c:168
-msgid "Unsupported Version"
-msgstr "Unsupported Version"
-
-#: src/protocols/jabber/jabber.c:170
-msgid "XML Not Well Formed"
-msgstr "XML Not Well Formed"
-
-#: src/protocols/jabber/jabber.c:172
-msgid "Stream Error"
-msgstr "Stream Error"
-
-#: src/protocols/jabber/jabber.c:237 src/protocols/msn/httpmethod.c:234
-#: src/protocols/msn/msn.c:82 src/protocols/msn/msn.c:102
-#: src/protocols/msn/msn.c:160 src/protocols/msn/msn.c:260
-#: src/protocols/msn/msn.c:538 src/protocols/msn/msn.c:709
-#: src/protocols/msn/msn.c:732 src/protocols/msn/msn.c:764
-#: src/protocols/msn/msn.c:772 src/protocols/msn/msn.c:805
-#: src/protocols/msn/msn.c:813 src/protocols/msn/msn.c:827
-#: src/protocols/msn/msn.c:836 src/protocols/msn/msn.c:851
-#: src/protocols/msn/msn.c:861 src/protocols/msn/msn.c:883
-#: src/protocols/msn/msn.c:933 src/protocols/msn/msn.c:971
-#: src/protocols/msn/msn.c:1069 src/protocols/msn/msn.c:1101
-#: src/protocols/msn/msn.c:1122 src/protocols/msn/msn.c:1133
-#: src/protocols/msn/msn.c:1144 src/protocols/msn/msn.c:1168
-#: src/protocols/msn/msn.c:1180 src/protocols/msn/msn.c:1261
-#: src/protocols/msn/notification.c:179 src/protocols/msn/notification.c:207
-#: src/protocols/msn/notification.c:1680 src/protocols/msn/notification.c:1700
-#: src/protocols/msn/session.c:208 src/protocols/trepia/trepia.c:248
-#: src/protocols/trepia/trepia.c:749 src/protocols/trepia/trepia.c:1033
-#: src/protocols/trepia/trepia.c:1077 src/protocols/trepia/trepia.c:1176
-#: src/protocols/trepia/trepia.c:1232
+#: src/protocols/jabber/jabber.c:203 src/protocols/msn/httpmethod.c:255
+#: src/protocols/msn/msn.c:83 src/protocols/msn/msn.c:103
+#: src/protocols/msn/msn.c:161 src/protocols/msn/msn.c:261
+#: src/protocols/msn/msn.c:548 src/protocols/msn/msn.c:721
+#: src/protocols/msn/msn.c:744 src/protocols/msn/msn.c:776
+#: src/protocols/msn/msn.c:784 src/protocols/msn/msn.c:817
+#: src/protocols/msn/msn.c:825 src/protocols/msn/msn.c:839
+#: src/protocols/msn/msn.c:848 src/protocols/msn/msn.c:863
+#: src/protocols/msn/msn.c:873 src/protocols/msn/msn.c:895
+#: src/protocols/msn/msn.c:945 src/protocols/msn/msn.c:983
+#: src/protocols/msn/msn.c:1085 src/protocols/msn/msn.c:1118
+#: src/protocols/msn/msn.c:1139 src/protocols/msn/msn.c:1150
+#: src/protocols/msn/msn.c:1161 src/protocols/msn/msn.c:1185
+#: src/protocols/msn/msn.c:1197 src/protocols/msn/msn.c:1278
+#: src/protocols/msn/notification.c:147 src/protocols/msn/notification.c:175
+#: src/protocols/msn/notification.c:1304 src/protocols/msn/notification.c:1324
+#: src/protocols/msn/session.c:205 src/protocols/trepia/trepia.c:248
+#: src/protocols/trepia/trepia.c:749 src/protocols/trepia/trepia.c:1038
+#: src/protocols/trepia/trepia.c:1082 src/protocols/trepia/trepia.c:1181
+#: src/protocols/trepia/trepia.c:1237
 msgid "Write error"
 msgstr "Write error"
 
-#: src/protocols/jabber/jabber.c:275 src/protocols/jabber/jabber.c:295
+#: src/protocols/jabber/jabber.c:241 src/protocols/jabber/jabber.c:261
 msgid "Read Error"
 msgstr "Read Error"
 
-#: src/protocols/jabber/jabber.c:349
+#: src/protocols/jabber/jabber.c:316
+msgid "Connection Failed"
+msgstr "Connection Failed"
+
+#: src/protocols/jabber/jabber.c:319
 msgid "SSL Handshake Failed"
 msgstr "SSL Handshake Failed"
 
-#: src/protocols/jabber/jabber.c:388 src/protocols/jabber/jabber.c:718
+#: src/protocols/jabber/jabber.c:362 src/protocols/jabber/jabber.c:691
 msgid "Invalid Jabber ID"
 msgstr "Invalid Jabber ID"
 
-#: src/protocols/jabber/jabber.c:416 src/protocols/jabber/jabber.c:745
+#: src/protocols/jabber/jabber.c:390 src/protocols/jabber/jabber.c:718
 msgid "SSL support unavailable"
 msgstr "SSL support unavailable"
 
-#: src/protocols/jabber/jabber.c:426 src/protocols/jabber/jabber.c:755
-#: src/protocols/trepia/trepia.c:1116
+#: src/protocols/jabber/jabber.c:400 src/protocols/jabber/jabber.c:728
+#: src/protocols/trepia/trepia.c:1121
 msgid "Unable to create socket"
 msgstr "Unable to create socket"
 
-#: src/protocols/jabber/jabber.c:451
+#: src/protocols/jabber/jabber.c:425
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registration of %s@%s successful"
 
-#: src/protocols/jabber/jabber.c:453 src/protocols/jabber/jabber.c:454
+#: src/protocols/jabber/jabber.c:427 src/protocols/jabber/jabber.c:428
 msgid "Registration Successful"
 msgstr "Registration Successful"
 
-#: src/protocols/jabber/jabber.c:466
-#, c-format
-msgid "Registration of %s@%s failed: %s"
-msgstr "Registration of %s@%s failed: %s"
-
-#: src/protocols/jabber/jabber.c:468 src/protocols/jabber/jabber.c:469
+#: src/protocols/jabber/jabber.c:434 src/protocols/jabber/jabber.c:1183
+msgid "Unknown Error"
+msgstr "Unknown Error"
+
+#: src/protocols/jabber/jabber.c:436 src/protocols/jabber/jabber.c:437
 msgid "Registration Failed"
 msgstr "Registration Failed"
 
-#: src/protocols/jabber/jabber.c:581 src/protocols/jabber/jabber.c:582
+#: src/protocols/jabber/jabber.c:548 src/protocols/jabber/jabber.c:549
 msgid "Already Registered"
 msgstr "Already Registered"
 
-#: src/protocols/jabber/jabber.c:613 src/protocols/jabber/jabber.c:1046
+#: src/protocols/jabber/jabber.c:584 src/protocols/jabber/jabber.c:1034
 msgid "Password"
 msgstr "Password"
 
-#: src/protocols/jabber/jabber.c:624
+#: src/protocols/jabber/jabber.c:595
 msgid "E-Mail"
 msgstr "E-Mail"
 
 #. State
-#: src/protocols/jabber/jabber.c:654 src/protocols/oscar/oscar.c:4027
-#: src/protocols/oscar/oscar.c:4043 src/protocols/trepia/trepia.c:335
+#: src/protocols/jabber/jabber.c:625 src/protocols/oscar/oscar.c:4163
+#: src/protocols/oscar/oscar.c:4179 src/protocols/trepia/trepia.c:335
 #: src/protocols/trepia/trepia.c:439
 msgid "State"
-msgstr "State"
-
-#: src/protocols/jabber/jabber.c:664
+msgstr "County/State"
+
+#: src/protocols/jabber/jabber.c:635
 msgid "Phone"
-msgstr "Phone"
-
-#: src/protocols/jabber/jabber.c:674
+msgstr "Telephone"
+
+#: src/protocols/jabber/jabber.c:645
 msgid "Date"
 msgstr "Date"
 
-#: src/protocols/jabber/jabber.c:682
+#: src/protocols/jabber/jabber.c:653
 msgid "Please fill out the information below to register your new account."
 msgstr "Please fill out the information below to register your new account."
 
-#: src/protocols/jabber/jabber.c:685 src/protocols/jabber/jabber.c:686
+#: src/protocols/jabber/jabber.c:656 src/protocols/jabber/jabber.c:657
 msgid "Register New Jabber Account"
 msgstr "Register New Jabber Account"
 
-#: src/protocols/jabber/jabber.c:799 src/protocols/msn/dispatch.c:212
-#: src/protocols/msn/msn.c:483 src/protocols/napster/napster.c:487
-#: src/protocols/oscar/oscar.c:694 src/protocols/trepia/trepia.c:1110
-#: src/protocols/yahoo/yahoo.c:2073
+#: src/protocols/jabber/jabber.c:774 src/protocols/msn/dispatch.c:212
+#: src/protocols/msn/msn.c:487 src/protocols/napster/napster.c:487
+#: src/protocols/oscar/oscar.c:750 src/protocols/trepia/trepia.c:1115
+#: src/protocols/yahoo/yahoo.c:2173
 msgid "Connecting"
 msgstr "Connecting"
 
-#: src/protocols/jabber/jabber.c:803
+#: src/protocols/jabber/jabber.c:778
 msgid "Initializing Stream"
-msgstr "Initializing Stream"
-
-#: src/protocols/jabber/jabber.c:809
+msgstr "Initialising Stream"
+
+#: src/protocols/jabber/jabber.c:784
 msgid "Authenticating"
 msgstr "Authenticating"
 
-#: src/protocols/jabber/jabber.c:819
+#: src/protocols/jabber/jabber.c:793
 msgid "Re-initializing Stream"
-msgstr "Re-initializing Stream"
-
-#: src/protocols/jabber/jabber.c:944 src/protocols/jabber/jabber.c:997
-#: src/protocols/jabber/presence.c:295
+msgstr "Re-initialising Stream"
+
+#: src/protocols/jabber/jabber.c:873 src/protocols/jabber/jabber.c:1161
+#: src/protocols/jabber/jabber.c:1202 src/protocols/jabber/jabber.c:1235
+#: src/protocols/oscar/oscar.c:5802
+msgid "Not Authorized"
+msgstr "Not Authorised"
+
+#: src/protocols/jabber/jabber.c:905
+msgid "Both"
+msgstr "Both"
+
+#: src/protocols/jabber/jabber.c:907
+msgid "From (To pending)"
+msgstr "From (To pending)"
+
+#: src/protocols/jabber/jabber.c:909
+msgid "From"
+msgstr "From"
+
+#: src/protocols/jabber/jabber.c:912
+msgid "To"
+msgstr "To"
+
+#: src/protocols/jabber/jabber.c:914
+msgid "None (To pending)"
+msgstr "None (To pending)"
+
+#: src/protocols/jabber/jabber.c:918
+msgid "Subscription"
+msgstr "Subscription"
+
+#: src/protocols/jabber/jabber.c:938
 msgid "Error"
 msgstr "Error"
 
-#: src/protocols/jabber/jabber.c:960 src/protocols/jabber/jutil.c:102
-#: src/protocols/jabber/presence.c:82
+#: src/protocols/jabber/jabber.c:959 src/protocols/jabber/jutil.c:102
+#: src/protocols/jabber/presence.c:61 src/protocols/jabber/presence.c:112
 msgid "Chatty"
 msgstr "Chatty"
 
-#: src/protocols/jabber/jabber.c:962 src/protocols/jabber/jutil.c:105
-#: src/protocols/jabber/presence.c:87
+#: src/protocols/jabber/jabber.c:961 src/protocols/jabber/jutil.c:105
+#: src/protocols/jabber/presence.c:63 src/protocols/jabber/presence.c:117
 msgid "Extended Away"
 msgstr "Extended Away"
 
-#: src/protocols/jabber/jabber.c:963 src/protocols/jabber/jutil.c:108
-#: src/protocols/jabber/presence.c:89 src/protocols/oscar/oscar.c:2837
-#: src/protocols/oscar/oscar.c:4607 src/protocols/oscar/oscar.c:6165
+#: src/protocols/jabber/jabber.c:962 src/protocols/jabber/jutil.c:108
+#: src/protocols/jabber/presence.c:65 src/protocols/jabber/presence.c:119
+#: src/protocols/oscar/oscar.c:2933 src/protocols/oscar/oscar.c:4751
+#: src/protocols/oscar/oscar.c:6413
 msgid "Do Not Disturb"
 msgstr "Do Not Disturb"
 
@@ -5377,31 +5464,222 @@
 msgid "Your password has been changed."
 msgstr "Your password has been changed."
 
-#: src/protocols/jabber/jabber.c:990
-#, c-format
-msgid "Error changing password: %s"
-msgstr "Error changing password: %s"
-
-#: src/protocols/jabber/jabber.c:994
-msgid "Unknown error occurred changing password"
-msgstr "Unknown error occurred changing password"
-
-#: src/protocols/jabber/jabber.c:1051
+#: src/protocols/jabber/jabber.c:984 src/protocols/jabber/jabber.c:985
+msgid "Error changing password"
+msgstr "Error changing password"
+
+#: src/protocols/jabber/jabber.c:1039
 msgid "Password (again)"
 msgstr "Password (again)"
 
-#: src/protocols/jabber/jabber.c:1056 src/protocols/jabber/jabber.c:1057
+#: src/protocols/jabber/jabber.c:1044 src/protocols/jabber/jabber.c:1045
 msgid "Change Jabber Password"
 msgstr "Change Jabber Password"
 
-#: src/protocols/jabber/jabber.c:1057
+#: src/protocols/jabber/jabber.c:1045
 msgid "Please enter your new password"
 msgstr "Please enter your new password"
 
-#: src/protocols/jabber/jabber.c:1069 src/protocols/toc/toc.c:1532
+#: src/protocols/jabber/jabber.c:1056 src/protocols/toc/toc.c:1532
 msgid "Set User Info"
 msgstr "Set User Info"
 
+#: src/protocols/jabber/jabber.c:1141
+msgid "Bad Request"
+msgstr "Bad Request"
+
+#: src/protocols/jabber/jabber.c:1143
+msgid "Conflict"
+msgstr "Conflict"
+
+#: src/protocols/jabber/jabber.c:1145
+msgid "Feature Not Implemented"
+msgstr "Feature Not Implemented"
+
+#: src/protocols/jabber/jabber.c:1147
+msgid "Forbidden"
+msgstr "Forbidden"
+
+#: src/protocols/jabber/jabber.c:1149
+msgid "Gone"
+msgstr "Gone"
+
+#: src/protocols/jabber/jabber.c:1151 src/protocols/jabber/jabber.c:1225
+msgid "Internal Server Error"
+msgstr "Internal Server Error"
+
+#: src/protocols/jabber/jabber.c:1153
+msgid "Item Not Found"
+msgstr "Item Not Found"
+
+#: src/protocols/jabber/jabber.c:1155
+msgid "Malformed Jabber ID"
+msgstr "Malformed Jabber ID"
+
+#: src/protocols/jabber/jabber.c:1157
+msgid "Not Acceptable"
+msgstr "Not Acceptable"
+
+#: src/protocols/jabber/jabber.c:1159
+msgid "Not Allowed"
+msgstr "Not Allowed"
+
+#: src/protocols/jabber/jabber.c:1163
+msgid "Payment Required"
+msgstr "Payment Required"
+
+#: src/protocols/jabber/jabber.c:1165
+msgid "Recipient Unavailable"
+msgstr "Recipient unavailable"
+
+#: src/protocols/jabber/jabber.c:1169
+msgid "Registration Required"
+msgstr "Registration Required"
+
+#: src/protocols/jabber/jabber.c:1171
+msgid "Remote Server Not Found"
+msgstr "Remote Server Not Found"
+
+#: src/protocols/jabber/jabber.c:1173
+msgid "Remote Server Timeout"
+msgstr "Remote Server Timeout"
+
+#: src/protocols/jabber/jabber.c:1175
+msgid "Server Overloaded"
+msgstr "Server Overloaded"
+
+#: src/protocols/jabber/jabber.c:1177
+msgid "Service Unavailable"
+msgstr "Service Unavailable"
+
+#: src/protocols/jabber/jabber.c:1179
+msgid "Subscription Required"
+msgstr "Subscription Required"
+
+#: src/protocols/jabber/jabber.c:1181
+msgid "Unexpected Request"
+msgstr "Unexpected Request"
+
+#: src/protocols/jabber/jabber.c:1188
+msgid "Authorization Aborted"
+msgstr "Authorisation Aborted"
+
+#: src/protocols/jabber/jabber.c:1190
+msgid "Incorrect encoding in authorization"
+msgstr "Incorrect encoding in authorisation"
+
+#: src/protocols/jabber/jabber.c:1193
+msgid "Invalid authzid"
+msgstr "Invalid authzid"
+
+#: src/protocols/jabber/jabber.c:1196
+msgid "Invalid Authorization Mechanism"
+msgstr "Invalid Authorisation Mechanism"
+
+#: src/protocols/jabber/jabber.c:1199
+msgid "Authorization mechanism too weak"
+msgstr "Authorisation mechanism too weak"
+
+#: src/protocols/jabber/jabber.c:1204
+msgid "Temporary Authentication Failure"
+msgstr "Temporary Authentication Failure"
+
+#: src/protocols/jabber/jabber.c:1206
+msgid "Authentication Failure"
+msgstr "Authentication Failure"
+
+#: src/protocols/jabber/jabber.c:1210
+msgid "Bad Format"
+msgstr "Bad Format"
+
+#: src/protocols/jabber/jabber.c:1212
+msgid "Bad Namespace Prefix"
+msgstr "Bad Namespace Prefix"
+
+#: src/protocols/jabber/jabber.c:1215
+msgid "Resource Conflict"
+msgstr "Resource Conflict"
+
+#: src/protocols/jabber/jabber.c:1217
+msgid "Connection Timeout"
+msgstr "Connection Timeout"
+
+#: src/protocols/jabber/jabber.c:1219
+msgid "Host Gone"
+msgstr "Host Gone"
+
+#: src/protocols/jabber/jabber.c:1221
+msgid "Host Unknown"
+msgstr "Host Unknown"
+
+#: src/protocols/jabber/jabber.c:1223
+msgid "Improper Addressing"
+msgstr "Improper Addressing"
+
+#: src/protocols/jabber/jabber.c:1227
+msgid "Invalid ID"
+msgstr "Invalid ID"
+
+#: src/protocols/jabber/jabber.c:1229
+msgid "Invalid Namespace"
+msgstr "Invalid Namespace"
+
+#: src/protocols/jabber/jabber.c:1231
+msgid "Invalid XML"
+msgstr "Invalid XML"
+
+#: src/protocols/jabber/jabber.c:1233
+msgid "Non-matching Hosts"
+msgstr "Non-matching Hosts"
+
+#: src/protocols/jabber/jabber.c:1237
+msgid "Policy Violation"
+msgstr "Policy Violation"
+
+#: src/protocols/jabber/jabber.c:1239
+msgid "Remote Connection Failed"
+msgstr "Remote Connection Failed"
+
+#: src/protocols/jabber/jabber.c:1241
+msgid "Resource Constraint"
+msgstr "Resource Constraint"
+
+#: src/protocols/jabber/jabber.c:1243
+msgid "Restricted XML"
+msgstr "Restricted XML"
+
+#: src/protocols/jabber/jabber.c:1245
+msgid "See Other Host"
+msgstr "See Other Host"
+
+#: src/protocols/jabber/jabber.c:1247
+msgid "System Shutdown"
+msgstr "System Shutdown"
+
+#: src/protocols/jabber/jabber.c:1249
+msgid "Undefined Condition"
+msgstr "Undefined Condition"
+
+#: src/protocols/jabber/jabber.c:1251
+msgid "Unsupported Encoding"
+msgstr "Unsupported Encoding"
+
+#: src/protocols/jabber/jabber.c:1253
+msgid "Unsupported Stanza Type"
+msgstr "Unsupported Stanza Type"
+
+#: src/protocols/jabber/jabber.c:1255
+msgid "Unsupported Version"
+msgstr "Unsupported Version"
+
+#: src/protocols/jabber/jabber.c:1257
+msgid "XML Not Well Formed"
+msgstr "XML Not Well Formed"
+
+#: src/protocols/jabber/jabber.c:1259
+msgid "Stream Error"
+msgstr "Stream Error"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -5412,68 +5690,77 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/jabber/jabber.c:1189 src/protocols/jabber/jabber.c:1191
+#: src/protocols/jabber/jabber.c:1348 src/protocols/jabber/jabber.c:1350
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber Protocol Plugin"
 
-#: src/protocols/jabber/jabber.c:1215
+#: src/protocols/jabber/jabber.c:1375
 msgid "Use TLS if available"
 msgstr "Use TLS if available"
 
-#: src/protocols/jabber/jabber.c:1220
+#: src/protocols/jabber/jabber.c:1380
 msgid "Force old SSL"
 msgstr "Force old SSL"
 
-#: src/protocols/jabber/jabber.c:1225
+#: src/protocols/jabber/jabber.c:1385
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Allow plaintext auth over unencrypted streams"
 
-#: src/protocols/jabber/jabber.c:1234
+#: src/protocols/jabber/jabber.c:1394
 msgid "Connect server"
 msgstr "Connect server"
 
-#: src/protocols/jabber/message.c:106
+#: src/protocols/jabber/jabber.c:1411
+msgid "Hide Operating System"
+msgstr "Hide Operating System"
+
+#: src/protocols/jabber/message.c:111
 #, c-format
 msgid "Message from %s"
 msgstr "Message from %s"
 
-#: src/protocols/jabber/message.c:168
+#: src/protocols/jabber/message.c:173
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s has set the topic to: %s"
 
-#: src/protocols/jabber/message.c:170
+#: src/protocols/jabber/message.c:175
 #, c-format
 msgid "The topic is: %s"
 msgstr "The topic is: %s"
 
-#: src/protocols/jabber/message.c:217
+#: src/protocols/jabber/message.c:222
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "Message delivery to %s failed: %s"
 
-#: src/protocols/jabber/message.c:220
+#: src/protocols/jabber/message.c:225
 msgid "Jabber Message Error"
 msgstr "Jabber Message Error"
 
-#: src/protocols/jabber/parser.c:129
+#: src/protocols/jabber/message.c:288
+#, c-format
+msgid " (Code %s)"
+msgstr " (Code %s)"
+
+#: src/protocols/jabber/parser.c:131
 msgid "XML Parse error"
 msgstr "XML Parse error"
 
-#: src/protocols/jabber/presence.c:180
+#: src/protocols/jabber/presence.c:216
 msgid "Unknown Error in presence"
 msgstr "Unknown Error in presence"
 
-#: src/protocols/jabber/presence.c:185
+#: src/protocols/jabber/presence.c:219
 #, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr "The user %s wants to add you to their buddy list."
 
-#: src/protocols/jabber/presence.c:246 src/protocols/jabber/presence.c:247
+#: src/protocols/jabber/presence.c:272 src/protocols/jabber/presence.c:273
 msgid "Create New Room"
 msgstr "Create New Room"
 
-#: src/protocols/jabber/presence.c:248
+#: src/protocols/jabber/presence.c:274
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -5481,45 +5768,46 @@
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
 
-#: src/protocols/jabber/presence.c:250
+#: src/protocols/jabber/presence.c:276
 msgid "Configure Room"
 msgstr "Configure Room"
 
-#: src/protocols/jabber/presence.c:252
+#: src/protocols/jabber/presence.c:278
 msgid "Accept Defaults"
 msgstr "Accept Defaults"
 
-#: src/protocols/jabber/presence.c:285 src/protocols/oscar/oscar.c:2948
-msgid "Unknown error"
-msgstr "Unknown error"
-
-#: src/protocols/jabber/presence.c:291
-msgid "Unable to join chat"
-msgstr "Unable to join chat"
-
-#: src/protocols/jabber/si.c:233
-#, c-format
-msgid "Could not send %s to %s, protocol not supported."
-msgstr "Could not send %s to %s, protocol not supported."
-
-#: src/protocols/jabber/si.c:234 src/protocols/jabber/si.c:235
+#: src/protocols/jabber/presence.c:298
+#, c-format
+msgid "Error in chat %s"
+msgstr "Error in chat %s"
+
+#: src/protocols/jabber/presence.c:301
+#, c-format
+msgid "Error joining chat %s"
+msgstr "Error joining chat %s"
+
+#: src/protocols/jabber/si.c:579
+#, c-format
+msgid "Unable to send file to %s, user does not support file transfers"
+msgstr "Unable to send file to %s, user does not support file transfers"
+
+#: src/protocols/jabber/si.c:580 src/protocols/jabber/si.c:581
 msgid "File Send Failed"
 msgstr "File Send Failed"
 
-#: src/protocols/msn/dispatch.c:42 src/protocols/msn/notification.c:278
-#: src/protocols/msn/notification.c:521
+#: src/protocols/msn/dispatch.c:42 src/protocols/msn/notification.c:246
 msgid "Unable to request USR\n"
 msgstr "Unable to request USR\n"
 
-#: src/protocols/msn/dispatch.c:59 src/protocols/msn/notification.c:295
+#: src/protocols/msn/dispatch.c:59 src/protocols/msn/notification.c:263
 msgid "Unable to login using MD5"
 msgstr "Unable to login using MD5"
 
-#: src/protocols/msn/dispatch.c:68 src/protocols/msn/notification.c:304
+#: src/protocols/msn/dispatch.c:68 src/protocols/msn/notification.c:272
 msgid "Unable to send USR"
 msgstr "Unable to send USR"
 
-#: src/protocols/msn/dispatch.c:73 src/protocols/msn/notification.c:309
+#: src/protocols/msn/dispatch.c:73 src/protocols/msn/notification.c:277
 msgid "Requesting to send password"
 msgstr "Requesting to send password"
 
@@ -5527,15 +5815,15 @@
 msgid "Protocol version not supported"
 msgstr "Protocol version not supported"
 
-#: src/protocols/msn/dispatch.c:117 src/protocols/msn/notification.c:792
+#: src/protocols/msn/dispatch.c:117 src/protocols/msn/notification.c:416
 msgid "Unable to request CVR\n"
 msgstr "Unable to request CVR\n"
 
-#: src/protocols/msn/dispatch.c:126 src/protocols/msn/notification.c:801
+#: src/protocols/msn/dispatch.c:126 src/protocols/msn/notification.c:425
 msgid "Unable to request INF\n"
 msgstr "Unable to request INF\n"
 
-#: src/protocols/msn/dispatch.c:147 src/protocols/msn/notification.c:1927
+#: src/protocols/msn/dispatch.c:147 src/protocols/msn/notification.c:1551
 msgid "Got invalid XFR"
 msgstr "Got invalid XFR"
 
@@ -5547,16 +5835,16 @@
 msgid "Unable to parse message."
 msgstr "Unable to parse message."
 
-#: src/protocols/msn/dispatch.c:232 src/protocols/msn/notification.c:897
-#: src/protocols/msn/notification.c:2187
+#: src/protocols/msn/dispatch.c:232 src/protocols/msn/notification.c:521
+#: src/protocols/msn/notification.c:1811
 msgid "Unable to write to server"
 msgstr "Unable to write to server"
 
-#: src/protocols/msn/dispatch.c:236 src/protocols/msn/notification.c:2194
+#: src/protocols/msn/dispatch.c:236 src/protocols/msn/notification.c:1818
 msgid "Syncing with server"
 msgstr "Syncing with server"
 
-#: src/protocols/msn/dispatch.c:250 src/protocols/msn/notification.c:2208
+#: src/protocols/msn/dispatch.c:250 src/protocols/msn/notification.c:1832
 msgid "Error reading from server"
 msgstr "Error reading from server"
 
@@ -5652,241 +5940,249 @@
 msgid "Too many hits to a FND"
 msgstr "Too many hits to a FND"
 
-#: src/protocols/msn/error.c:107 src/protocols/oscar/oscar.c:182
+#: src/protocols/msn/error.c:107 src/protocols/oscar/oscar.c:185
 msgid "Not logged in"
 msgstr "Not logged in"
 
 #: src/protocols/msn/error.c:111
-msgid "Internal server error"
-msgstr "Internal server error"
+msgid "Service Temporarily Unavailable"
+msgstr "Service Temporarily Unavailable"
 
 #: src/protocols/msn/error.c:114
 msgid "Database server error"
 msgstr "Database server error"
 
 #: src/protocols/msn/error.c:117
+msgid "Command disabled"
+msgstr "Command disabled"
+
+#: src/protocols/msn/error.c:120
 msgid "File operation error"
 msgstr "File operation error"
 
-#: src/protocols/msn/error.c:120
+#: src/protocols/msn/error.c:123
 msgid "Memory allocation error"
 msgstr "Memory allocation error"
 
-#: src/protocols/msn/error.c:123
+#: src/protocols/msn/error.c:126
 msgid "Wrong CHL value sent to server"
 msgstr "Wrong CHL value sent to server"
 
-#: src/protocols/msn/error.c:127
+#: src/protocols/msn/error.c:130
 msgid "Server busy"
 msgstr "Server busy"
 
-#: src/protocols/msn/error.c:130 src/protocols/msn/error.c:143
-#: src/protocols/msn/error.c:198
+#: src/protocols/msn/error.c:133 src/protocols/msn/error.c:146
+#: src/protocols/msn/error.c:201
 msgid "Server unavailable"
 msgstr "Server unavailable"
 
-#: src/protocols/msn/error.c:133
+#: src/protocols/msn/error.c:136
 msgid "Peer Notification server down"
 msgstr "Peer Notification server down"
 
-#: src/protocols/msn/error.c:136
+#: src/protocols/msn/error.c:139
 msgid "Database connect error"
 msgstr "Database connect error"
 
-#: src/protocols/msn/error.c:140
+#: src/protocols/msn/error.c:143
 msgid "Server is going down (abandon ship)"
 msgstr "Server is going down (abandon ship)"
 
-#: src/protocols/msn/error.c:147
+#: src/protocols/msn/error.c:150
 msgid "Error creating connection"
 msgstr "Error creating connection"
 
-#: src/protocols/msn/error.c:151
+#: src/protocols/msn/error.c:154
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR parameters are either unknown or not allowed"
 
-#: src/protocols/msn/error.c:154 src/protocols/msn/notification.c:636
+#: src/protocols/msn/error.c:157 src/protocols/msn/notification.c:310
 msgid "Unable to write"
 msgstr "Unable to write"
 
-#: src/protocols/msn/error.c:157
+#: src/protocols/msn/error.c:160
 msgid "Session overload"
 msgstr "Session overload"
 
-#: src/protocols/msn/error.c:160
+#: src/protocols/msn/error.c:163
 msgid "User is too active"
 msgstr "User is too active"
 
-#: src/protocols/msn/error.c:163
+#: src/protocols/msn/error.c:166
 msgid "Too many sessions"
 msgstr "Too many sessions"
 
-#: src/protocols/msn/error.c:166 src/protocols/msn/error.c:172
+#: src/protocols/msn/error.c:169 src/protocols/msn/error.c:175
 msgid "Not expected"
 msgstr "Not expected"
 
-#: src/protocols/msn/error.c:169
+#: src/protocols/msn/error.c:172
 msgid "Bad friend file"
 msgstr "Bad friend file"
 
-#: src/protocols/msn/error.c:177
+#: src/protocols/msn/error.c:180
 msgid "Friendly name changes too rapidly"
 msgstr "Friendly name changes too rapidly"
 
-#: src/protocols/msn/error.c:186
+#: src/protocols/msn/error.c:189
 msgid "Server too busy"
 msgstr "Server too busy"
 
-#: src/protocols/msn/error.c:190 src/protocols/oscar/oscar.c:1076
+#: src/protocols/msn/error.c:193 src/protocols/oscar/oscar.c:1163
 #: src/protocols/toc/toc.c:659
 msgid "Authentication failed"
 msgstr "Authentication failed"
 
-#: src/protocols/msn/error.c:193
+#: src/protocols/msn/error.c:196
 msgid "Not allowed when offline"
 msgstr "Not allowed when offline"
 
-#: src/protocols/msn/error.c:201
+#: src/protocols/msn/error.c:204
 msgid "Not accepting new users"
 msgstr "Not accepting new users"
 
-#: src/protocols/msn/error.c:205
+#: src/protocols/msn/error.c:208
 msgid "Kids Passport without parental consent"
 msgstr "Kids Passport without parental consent"
 
-#: src/protocols/msn/error.c:209
+#: src/protocols/msn/error.c:212
 msgid "Passport account not yet verified"
 msgstr "Passport account not yet verified"
 
-#: src/protocols/msn/error.c:213
+#: src/protocols/msn/error.c:215
+msgid "Bad ticket"
+msgstr "Bad ticket"
+
+#: src/protocols/msn/error.c:219
 #, c-format
 msgid "Unknown Error Code %d"
 msgstr "Unknown Error Code %d"
 
-#: src/protocols/msn/msn.c:70
+#: src/protocols/msn/msn.c:71
 msgid "Your new MSN friendly name is too long."
 msgstr "Your new MSN friendly name is too long."
 
-#: src/protocols/msn/msn.c:177
+#: src/protocols/msn/msn.c:178
 msgid "Set your friendly name."
 msgstr "Set your friendly name."
 
-#: src/protocols/msn/msn.c:178
+#: src/protocols/msn/msn.c:179
 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."
 
-#: src/protocols/msn/msn.c:190
+#: src/protocols/msn/msn.c:191
 msgid "Set your home phone number."
 msgstr "Set your home phone number."
 
-#: src/protocols/msn/msn.c:201
+#: src/protocols/msn/msn.c:202
 msgid "Set your work phone number."
 msgstr "Set your work phone number."
 
-#: src/protocols/msn/msn.c:212
+#: src/protocols/msn/msn.c:213
 msgid "Set your mobile phone number."
 msgstr "Set your mobile phone number."
 
-#: src/protocols/msn/msn.c:221
+#: src/protocols/msn/msn.c:222
 msgid "Allow MSN Mobile pages?"
 msgstr "Allow MSN Mobile pages?"
 
-#: src/protocols/msn/msn.c:222
+#: src/protocols/msn/msn.c:223
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
 msgstr ""
 "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?"
-
-#: src/protocols/msn/msn.c:226
+"Mobile pages to your mobile phone or other mobile device?"
+
+#: src/protocols/msn/msn.c:227
 msgid "Allow"
 msgstr "Allow"
 
-#: src/protocols/msn/msn.c:227
+#: src/protocols/msn/msn.c:228
 msgid "Disallow"
 msgstr "Disallow"
 
-#: src/protocols/msn/msn.c:244
+#: src/protocols/msn/msn.c:245
 msgid "Send a mobile message."
 msgstr "Send a mobile message."
 
-#: src/protocols/msn/msn.c:246
+#: src/protocols/msn/msn.c:247
 msgid "Page"
 msgstr "Page"
 
-#: src/protocols/msn/msn.c:332 src/protocols/yahoo/yahoo.c:2301
+#: src/protocols/msn/msn.c:333 src/protocols/yahoo/yahoo.c:2403
 #, c-format
 msgid "<b>Status:</b> %s"
 msgstr "<b>Status:</b> %s"
 
-#: src/protocols/msn/msn.c:345 src/protocols/msn/msn.c:628
+#: src/protocols/msn/msn.c:346 src/protocols/msn/msn.c:640
 #: src/protocols/msn/state.c:32
 msgid "Away From Computer"
 msgstr "Away From Computer"
 
-#: src/protocols/msn/msn.c:346 src/protocols/msn/msn.c:630
-#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:2169
-#: src/protocols/yahoo/yahoo.c:2494 src/protocols/yahoo/yahoo.c:2602
+#: src/protocols/msn/msn.c:347 src/protocols/msn/msn.c:642
+#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:2271
+#: src/protocols/yahoo/yahoo.c:2596 src/protocols/yahoo/yahoo.c:2704
 msgid "Be Right Back"
 msgstr "Be Right Back"
 
-#: src/protocols/msn/msn.c:347 src/protocols/msn/msn.c:632
-#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:2171
-#: src/protocols/yahoo/yahoo.c:2496 src/protocols/yahoo/yahoo.c:2603
+#: src/protocols/msn/msn.c:348 src/protocols/msn/msn.c:644
+#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:2273
+#: src/protocols/yahoo/yahoo.c:2598 src/protocols/yahoo/yahoo.c:2705
 msgid "Busy"
 msgstr "Busy"
 
-#: src/protocols/msn/msn.c:348 src/protocols/msn/msn.c:634
-#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2179
-#: src/protocols/yahoo/yahoo.c:2504 src/protocols/yahoo/yahoo.c:2607
+#: src/protocols/msn/msn.c:349 src/protocols/msn/msn.c:646
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2281
+#: src/protocols/yahoo/yahoo.c:2606 src/protocols/yahoo/yahoo.c:2709
 msgid "On The Phone"
 msgstr "On The Phone"
 
-#: src/protocols/msn/msn.c:349 src/protocols/msn/msn.c:636
-#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:2183
-#: src/protocols/yahoo/yahoo.c:2508 src/protocols/yahoo/yahoo.c:2609
+#: src/protocols/msn/msn.c:350 src/protocols/msn/msn.c:648
+#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:2285
+#: src/protocols/yahoo/yahoo.c:2610 src/protocols/yahoo/yahoo.c:2711
 msgid "Out To Lunch"
 msgstr "Out To Lunch"
 
-#: src/protocols/msn/msn.c:350 src/protocols/msn/msn.c:638
-#: src/protocols/zephyr/zephyr.c:883 src/protocols/zephyr/zephyr.c:898
+#: src/protocols/msn/msn.c:351 src/protocols/msn/msn.c:650
+#: src/protocols/zephyr/zephyr.c:1173 src/protocols/zephyr/zephyr.c:1188
 msgid "Hidden"
 msgstr "Hidden"
 
-#: src/protocols/msn/msn.c:362
+#: src/protocols/msn/msn.c:363
 msgid "Set Friendly Name"
 msgstr "Set Friendly Name"
 
-#: src/protocols/msn/msn.c:370
+#: src/protocols/msn/msn.c:371
 msgid "Set Home Phone Number"
 msgstr "Set Home Phone Number"
 
-#: src/protocols/msn/msn.c:376
+#: src/protocols/msn/msn.c:377
 msgid "Set Work Phone Number"
 msgstr "Set Work Phone Number"
 
-#: src/protocols/msn/msn.c:382
+#: src/protocols/msn/msn.c:383
 msgid "Set Mobile Phone Number"
 msgstr "Set Mobile Phone Number"
 
-#: src/protocols/msn/msn.c:391
+#: src/protocols/msn/msn.c:392
 msgid "Enable/Disable Mobile Devices"
 msgstr "Enable/Disable Mobile Devices"
 
-#: src/protocols/msn/msn.c:398
+#: src/protocols/msn/msn.c:399
 msgid "Allow/Disallow Mobile Pages"
 msgstr "Allow/Disallow Mobile Pages"
 
-#: src/protocols/msn/msn.c:424
+#: src/protocols/msn/msn.c:425
 msgid "Send to Mobile"
 msgstr "Send to Mobile"
 
-#: src/protocols/msn/msn.c:433
+#: src/protocols/msn/msn.c:434
 msgid "Initiate Chat"
 msgstr "Initiate Chat"
 
-#: src/protocols/msn/msn.c:457
+#: src/protocols/msn/msn.c:458
 msgid ""
 "SSL support is needed for MSN. Please install a supported SSL library. See "
 "http://gaim.sf.net/faq-ssl.php for more information."
@@ -5894,95 +6190,95 @@
 "SSL support is needed for MSN. Please install a supported SSL library. See "
 "http://gaim.sf.net/faq-ssl.php for more information."
 
-#: src/protocols/msn/msn.c:745
-#, c-format
-msgid ""
-"An MSN screenname must be in the form \"user@server.com\". Perhaps you meant "
-"%s@hotmail.com. No changes were made to your allow list."
-msgstr ""
-"An MSN screenname must be in the form \"user@server.com\". Perhaps you meant "
-"%s@hotmail.com. No changes were made to your allow list."
-
-#: src/protocols/msn/msn.c:749 src/protocols/msn/msn.c:789
-msgid "Invalid MSN screenname"
-msgstr "Invalid MSN screenname"
-
-#: src/protocols/msn/msn.c:785
-#, c-format
-msgid ""
-"An MSN screenname must be in the form \"user@server.com\". Perhaps you meant "
-"%s@hotmail.com. No changes were made to your block list."
-msgstr ""
-"An MSN screenname must be in the form \"user@server.com\". Perhaps you meant "
-"%s@hotmail.com. No changes were made to your block list."
-
-#: src/protocols/msn/msn.c:1287 src/protocols/yahoo/yahoo.c:2789
+#: src/protocols/msn/msn.c:757
+#, c-format
+msgid ""
+"An MSN screen name must be in the form \"user@server.com\". Perhaps you "
+"meant %s@hotmail.com. No changes were made to your allow list."
+msgstr ""
+"An MSN screen name must be in the form \"user@server.com\". Perhaps you "
+"meant %s@hotmail.com. No changes were made to your allow list."
+
+#: src/protocols/msn/msn.c:761 src/protocols/msn/msn.c:801
+msgid "Invalid MSN screen name"
+msgstr "Invalid MSN screen name"
+
+#: src/protocols/msn/msn.c:797
+#, c-format
+msgid ""
+"An MSN screen name must be in the form \"user@server.com\". Perhaps you "
+"meant %s@hotmail.com. No changes were made to your block list."
+msgstr ""
+"An MSN screen name must be in the form \"user@server.com\". Perhaps you "
+"meant %s@hotmail.com. No changes were made to your block list."
+
+#: src/protocols/msn/msn.c:1304 src/protocols/yahoo/yahoo.c:2888
 msgid "<html><body><b>Error retrieving profile</b></body></html>"
 msgstr "<html><body><b>Error retrieving profile</b></body></html>"
 
 #. Age
-#: src/protocols/msn/msn.c:1357 src/protocols/oscar/oscar.c:4009
+#: src/protocols/msn/msn.c:1374 src/protocols/oscar/oscar.c:4145
 #: src/protocols/trepia/trepia.c:285 src/protocols/trepia/trepia.c:413
-#: src/protocols/yahoo/yahoo.c:2899
+#: src/protocols/yahoo/yahoo.c:2998
 msgid "Age"
 msgstr "Age"
 
 #. Gender
-#: src/protocols/msn/msn.c:1364 src/protocols/oscar/oscar.c:3995
+#: src/protocols/msn/msn.c:1381 src/protocols/oscar/oscar.c:4131
 #: src/protocols/trepia/trepia.c:279 src/protocols/trepia/trepia.c:421
-#: src/protocols/yahoo/yahoo.c:2907
+#: src/protocols/yahoo/yahoo.c:3006
 msgid "Gender"
 msgstr "Gender"
 
-#: src/protocols/msn/msn.c:1372 src/protocols/yahoo/yahoo.c:2903
+#: src/protocols/msn/msn.c:1389 src/protocols/yahoo/yahoo.c:3002
 msgid "Marital Status"
 msgstr "Marital Status"
 
-#: src/protocols/msn/msn.c:1379 src/protocols/yahoo/yahoo.c:2895
+#: src/protocols/msn/msn.c:1396 src/protocols/yahoo/yahoo.c:2994
 msgid "Location"
 msgstr "Location"
 
-#: src/protocols/msn/msn.c:1387 src/protocols/yahoo/yahoo.c:2911
+#: src/protocols/msn/msn.c:1404 src/protocols/yahoo/yahoo.c:3010
 msgid "Occupation"
 msgstr "Occupation"
 
-#: src/protocols/msn/msn.c:1404 src/protocols/msn/msn.c:1410
-#: src/protocols/msn/msn.c:1417 src/protocols/msn/msn.c:1424
-#: src/protocols/msn/msn.c:1431
+#: src/protocols/msn/msn.c:1421 src/protocols/msn/msn.c:1427
+#: src/protocols/msn/msn.c:1434 src/protocols/msn/msn.c:1441
+#: src/protocols/msn/msn.c:1448
 msgid "A Little About Me"
 msgstr "A Little About Me"
 
-#: src/protocols/msn/msn.c:1440 src/protocols/msn/msn.c:1453
-#: src/protocols/msn/msn.c:1460
+#: src/protocols/msn/msn.c:1457 src/protocols/msn/msn.c:1470
+#: src/protocols/msn/msn.c:1477
 msgid "Favorite Things"
 msgstr "Favourite Things"
 
-#: src/protocols/msn/msn.c:1469 src/protocols/msn/msn.c:1475
-#: src/protocols/msn/msn.c:1482
+#: src/protocols/msn/msn.c:1486 src/protocols/msn/msn.c:1492
+#: src/protocols/msn/msn.c:1499
 msgid "Hobbies and Interests"
 msgstr "Hobbies and Interests"
 
-#: src/protocols/msn/msn.c:1491 src/protocols/msn/msn.c:1497
-#: src/protocols/yahoo/yahoo.c:2946
+#: src/protocols/msn/msn.c:1508 src/protocols/msn/msn.c:1514
+#: src/protocols/yahoo/yahoo.c:3045
 msgid "Favorite Quote"
 msgstr "Favourite Quote"
 
-#: src/protocols/msn/msn.c:1505 src/protocols/yahoo/yahoo.c:2982
+#: src/protocols/msn/msn.c:1522 src/protocols/yahoo/yahoo.c:3081
 msgid "Last Updated"
 msgstr "Last Updated"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1516 src/protocols/trepia/trepia.c:289
+#: src/protocols/msn/msn.c:1533 src/protocols/trepia/trepia.c:289
 #: src/protocols/trepia/trepia.c:457
 msgid "Homepage"
 msgstr "Homepage"
 
-#: src/protocols/msn/msn.c:1538 src/protocols/yahoo/yahoo.c:2997
+#: src/protocols/msn/msn.c:1555 src/protocols/yahoo/yahoo.c:3096
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "User information for %s unavailable"
 
-#: src/protocols/msn/msn.c:1540 src/protocols/yahoo/yahoo.c:2999
+#: src/protocols/msn/msn.c:1557 src/protocols/yahoo/yahoo.c:3098
 msgid "The user's profile is empty."
 msgstr "The user's profile is empty."
 
@@ -5996,92 +6292,88 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/msn/msn.c:1637 src/protocols/msn/msn.c:1639
+#: src/protocols/msn/msn.c:1655 src/protocols/msn/msn.c:1657
 msgid "MSN Protocol Plugin"
 msgstr "MSN Protocol Plugin"
 
-#: src/protocols/msn/msn.c:1656 src/protocols/trepia/trepia.c:1339
+#: src/protocols/msn/msn.c:1675 src/protocols/trepia/trepia.c:1345
 msgid "Login server"
 msgstr "Login server"
 
-#: src/protocols/msn/msn.c:1666
+#: src/protocols/msn/msn.c:1684
 msgid "Use HTTP Method"
 msgstr "Use HTTP Method"
 
-#: src/protocols/msn/notification.c:247
+#: src/protocols/msn/msn.c:1702
+msgid "Display conversation closed notices"
+msgstr "Display conversation closed notices"
+
+#: src/protocols/msn/msn.c:1707
+msgid "Display timeout notices"
+msgstr "Display timeout notices"
+
+#: src/protocols/msn/nexus.c:56
+msgid "Unable to connect to server"
+msgstr "Unable to connect to server"
+
+#: src/protocols/msn/nexus.c:121 src/protocols/msn/nexus.c:130
+msgid "Unable to write to MSN Nexus server."
+msgstr "Unable to write to MSN Nexus server."
+
+#: src/protocols/msn/nexus.c:147
+msgid "MSN Nexus server returned invalid redirect information."
+msgstr "MSN Nexus server returned invalid redirect information."
+
+#: src/protocols/msn/nexus.c:204
+msgid "Unknown error when attempting to authorize with MSN login server."
+msgstr "Unknown error when attempting to authorise with MSN login server."
+
+#: src/protocols/msn/notification.c:215
 #, c-format
 msgid "MSN Error: %s\n"
 msgstr "MSN Error: %s\n"
 
-#: src/protocols/msn/notification.c:322
-msgid "Unable to connect to server"
-msgstr "Unable to connect to server"
-
-#: src/protocols/msn/notification.c:377 src/protocols/msn/notification.c:546
-msgid "Unable to write to MSN Nexus server."
-msgstr "Unable to write to MSN Nexus server."
-
-#: src/protocols/msn/notification.c:386 src/protocols/msn/notification.c:561
-msgid "Unable to read from MSN Nexus server."
-msgstr "Unable to read from MSN Nexus server."
-
-#: src/protocols/msn/notification.c:406
-msgid "MSN Nexus server returned invalid redirect information."
-msgstr "MSN Nexus server returned invalid redirect information."
-
-#: src/protocols/msn/notification.c:460
-msgid "Unknown error when attempting to authorize with MSN login server."
-msgstr "Unknown error when attempting to authorise with MSN login server."
-
-#: src/protocols/msn/notification.c:572
-msgid "MSN Nexus server returned invalid information."
-msgstr "MSN Nexus server returned invalid information."
-
-#: src/protocols/msn/notification.c:641 src/protocols/trepia/trepia.c:686
+#: src/protocols/msn/notification.c:315 src/protocols/trepia/trepia.c:686
 msgid "Retrieving buddy list"
 msgstr "Retrieving buddy list"
 
-#: src/protocols/msn/notification.c:711
-msgid "Unable to connect to passport server"
-msgstr "Unable to connect to passport server"
-
-#: src/protocols/msn/notification.c:716 src/protocols/msn/notification.c:748
-#: src/protocols/oscar/oscar.c:1362
+#: src/protocols/msn/notification.c:340 src/protocols/msn/notification.c:372
+#: src/protocols/oscar/oscar.c:1452
 msgid "Password sent"
 msgstr "Password sent"
 
-#: src/protocols/msn/notification.c:743
+#: src/protocols/msn/notification.c:367
 msgid "Unable to send password"
 msgstr "Unable to send password"
 
-#: src/protocols/msn/notification.c:779
+#: src/protocols/msn/notification.c:403
 msgid "Protocol not supported"
 msgstr "Protocol not supported"
 
-#: src/protocols/msn/notification.c:821
+#: src/protocols/msn/notification.c:445
 msgid "You have been disconnected. You have signed on from another location."
 msgstr "You have been disconnected. You have signed on from another location."
 
-#: src/protocols/msn/notification.c:826
+#: src/protocols/msn/notification.c:450
 msgid "You have been disconnected. The MSN servers are going down temporarily."
 msgstr ""
 "You have been disconnected. The MSN servers are going down temporarily."
 
-#: src/protocols/msn/notification.c:953
+#: src/protocols/msn/notification.c:577
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr "The user %s (%s) wants to add %s to his or her buddy list."
 
-#: src/protocols/msn/notification.c:1278 src/protocols/msn/notification.c:1445
+#: src/protocols/msn/notification.c:902 src/protocols/msn/notification.c:1069
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list."
 msgstr "The user %s (%s) wants to add you to their buddy list."
 
-#: src/protocols/msn/notification.c:1972
+#: src/protocols/msn/notification.c:1596
 msgid "Unable to transfer to notification server"
 msgstr "Unable to transfer to notification server"
 
-#: src/protocols/msn/notification.c:2128
+#: src/protocols/msn/notification.c:1752
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -6112,20 +6404,20 @@
 "After the maintenance has been completed, you will be able to successfully "
 "sign in."
 
-#: src/protocols/msn/servconn.c:533
+#: src/protocols/msn/servconn.c:536
 msgid "Received HTTP error. Please report this."
 msgstr "Received HTTP error. Please report this."
 
-#: src/protocols/msn/switchboard.c:147
+#: src/protocols/msn/switchboard.c:150
 msgid "The conversation has become inactive and timed out."
 msgstr "The conversation has become inactive and timed out."
 
-#: src/protocols/msn/switchboard.c:154
+#: src/protocols/msn/switchboard.c:159
 #, c-format
 msgid "%s has closed the conversation window."
 msgstr "%s has closed the conversation window."
 
-#: src/protocols/msn/switchboard.c:277
+#: src/protocols/msn/switchboard.c:285
 msgid "An MSN message may not have been received."
 msgstr "An MSN message may not have been received."
 
@@ -6173,7 +6465,11 @@
 msgid "%s requested a PING"
 msgstr "%s requested a PING"
 
-#: src/protocols/napster/napster.c:543 src/protocols/oscar/oscar.c:5231
+#: src/protocols/napster/napster.c:529
+msgid "Get Info"
+msgstr "Get Info"
+
+#: src/protocols/napster/napster.c:543 src/protocols/oscar/oscar.c:5445
 #: src/protocols/toc/toc.c:1259
 msgid "_Group:"
 msgstr "_Group:"
@@ -6188,178 +6484,183 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/napster/napster.c:618 src/protocols/napster/napster.c:620
+#: src/protocols/napster/napster.c:619 src/protocols/napster/napster.c:621
 msgid "NAPSTER Protocol Plugin"
 msgstr "NAPSTER Protocol Plugin"
 
-#: src/protocols/oscar/oscar.c:178
+#: src/protocols/oscar/oscar.c:181
 msgid "Invalid error"
 msgstr "Invalid error"
 
-#: src/protocols/oscar/oscar.c:179
+#: src/protocols/oscar/oscar.c:182
 msgid "Invalid SNAC"
 msgstr "Invalid SNAC"
 
-#: src/protocols/oscar/oscar.c:180
+#: src/protocols/oscar/oscar.c:183
 msgid "Rate to host"
 msgstr "Rate to host"
 
-#: src/protocols/oscar/oscar.c:181
-msgid "Rate to client"
-msgstr "Rate to client"
-
-#: src/protocols/oscar/oscar.c:183
-msgid "Service unavailable"
-msgstr "Service unavailable"
-
 #: src/protocols/oscar/oscar.c:184
-msgid "Service not defined"
-msgstr "Service not defined"
-
-#: src/protocols/oscar/oscar.c:185
-msgid "Obsolete SNAC"
-msgstr "Obsolete SNAC"
+msgid "Rate to client"
+msgstr "Rate to client"
 
 #: src/protocols/oscar/oscar.c:186
-msgid "Not supported by host"
-msgstr "Not supported by host"
+msgid "Service unavailable"
+msgstr "Service unavailable"
 
 #: src/protocols/oscar/oscar.c:187
+msgid "Service not defined"
+msgstr "Service not defined"
+
+#: src/protocols/oscar/oscar.c:188
+msgid "Obsolete SNAC"
+msgstr "Obsolete SNAC"
+
+#: src/protocols/oscar/oscar.c:189
+msgid "Not supported by host"
+msgstr "Not supported by host"
+
+#: src/protocols/oscar/oscar.c:190
 msgid "Not supported by client"
 msgstr "Not supported by client"
 
-#: src/protocols/oscar/oscar.c:188
+#: src/protocols/oscar/oscar.c:191
 msgid "Refused by client"
 msgstr "Refused by client"
 
-#: src/protocols/oscar/oscar.c:189
+#: src/protocols/oscar/oscar.c:192
 msgid "Reply too big"
 msgstr "Reply too big"
 
-#: src/protocols/oscar/oscar.c:190
+#: src/protocols/oscar/oscar.c:193
 msgid "Responses lost"
 msgstr "Responses lost"
 
-#: src/protocols/oscar/oscar.c:191
+#: src/protocols/oscar/oscar.c:194
 msgid "Request denied"
 msgstr "Request denied"
 
-#: src/protocols/oscar/oscar.c:192
+#: src/protocols/oscar/oscar.c:195
 msgid "Busted SNAC payload"
 msgstr "Busted SNAC payload"
 
-#: src/protocols/oscar/oscar.c:193
+#: src/protocols/oscar/oscar.c:196
 msgid "Insufficient rights"
 msgstr "Insufficient rights"
 
-#: src/protocols/oscar/oscar.c:194
-msgid "In local permit/deny"
-msgstr "In local permit/deny"
-
-#: src/protocols/oscar/oscar.c:195
-msgid "Too evil (sender)"
-msgstr "Too evil (sender)"
-
-#: src/protocols/oscar/oscar.c:196
-msgid "Too evil (receiver)"
-msgstr "Too evil (receiver)"
-
 #: src/protocols/oscar/oscar.c:197
-msgid "User temporarily unavailable"
-msgstr "User temporarily unavailable"
+msgid "In local permit/deny"
+msgstr "In local permit/deny"
 
 #: src/protocols/oscar/oscar.c:198
-msgid "No match"
-msgstr "No match"
+msgid "Too evil (sender)"
+msgstr "Too evil (sender)"
 
 #: src/protocols/oscar/oscar.c:199
-msgid "List overflow"
-msgstr "List overflow"
+msgid "Too evil (receiver)"
+msgstr "Too evil (receiver)"
 
 #: src/protocols/oscar/oscar.c:200
+msgid "User temporarily unavailable"
+msgstr "User temporarily unavailable"
+
+#: src/protocols/oscar/oscar.c:201
+msgid "No match"
+msgstr "No match"
+
+#: src/protocols/oscar/oscar.c:202
+msgid "List overflow"
+msgstr "List overflow"
+
+#: src/protocols/oscar/oscar.c:203
 msgid "Request ambiguous"
 msgstr "Request ambiguous"
 
-#: src/protocols/oscar/oscar.c:201
+#: src/protocols/oscar/oscar.c:204
 msgid "Queue full"
 msgstr "Queue full"
 
-#: src/protocols/oscar/oscar.c:202
+#: src/protocols/oscar/oscar.c:205
 msgid "Not while on AOL"
 msgstr "Not while on AOL"
 
-#: src/protocols/oscar/oscar.c:475
+#: src/protocols/oscar/oscar.c:520
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "Direct IM with %s closed"
 
-#: src/protocols/oscar/oscar.c:477
+#: src/protocols/oscar/oscar.c:522
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "Direct IM with %s failed"
 
-#: src/protocols/oscar/oscar.c:547 src/protocols/toc/toc.c:885
+#: src/protocols/oscar/oscar.c:593 src/protocols/toc/toc.c:885
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "You have been disconnected from chat room %s."
 
-#: src/protocols/oscar/oscar.c:563
+#: src/protocols/oscar/oscar.c:609
 msgid "Chat is currently unavailable"
 msgstr "Chat is currently unavailable"
 
-#: src/protocols/oscar/oscar.c:634 src/protocols/oscar/oscar.c:690
+#: src/protocols/oscar/oscar.c:680 src/protocols/oscar/oscar.c:746
 msgid "Couldn't connect to host"
 msgstr "Couldn't connect to host"
 
-#: src/protocols/oscar/oscar.c:644
+#: src/protocols/oscar/oscar.c:690
 msgid "Screen name sent"
 msgstr "Screen name sent"
 
-#: src/protocols/oscar/oscar.c:678
+#: src/protocols/oscar/oscar.c:705
+#, c-format
+msgid ""
+"Unable to login: Could not sign on as %s because the screen name is "
+"invalid.  Screen names must either start with a letter and contain only "
+"letters, numbers and spaces, or contain only numbers."
+msgstr ""
+"Unable to login: Could not sign on as %s because the screen name is "
+"invalid.  Screen names must either start with a letter and contain only "
+"letters, numbers and spaces, or contain only numbers."
+
+#: src/protocols/oscar/oscar.c:734
 msgid "Unable to login to AIM"
 msgstr "Unable to login to AIM"
 
-#: src/protocols/oscar/oscar.c:779 src/protocols/oscar/oscar.c:1167
+#: src/protocols/oscar/oscar.c:838 src/protocols/oscar/oscar.c:1256
 msgid "Could Not Connect"
 msgstr "Could Not Connect"
 
-#: src/protocols/oscar/oscar.c:787
+#: src/protocols/oscar/oscar.c:846
 msgid "Connection established, cookie sent"
 msgstr "Connection established, cookie sent"
 
-#: src/protocols/oscar/oscar.c:854 src/protocols/oscar/oscar.c:867
-#: src/protocols/oscar/oscar.c:872 src/protocols/yahoo/yahoo_filexfer.c:202
-#: src/protocols/yahoo/yahoo_filexfer.c:210
-msgid "File Transfer Aborted"
-msgstr "File Transfer Aborted"
-
-#: src/protocols/oscar/oscar.c:855
+#: src/protocols/oscar/oscar.c:959 src/protocols/yahoo/yahoo_filexfer.c:209
+#: src/protocols/yahoo/yahoo_filexfer.c:218
+msgid "Unable to establish file descriptor."
+msgstr "Unable to establish file descriptor."
+
+#: src/protocols/oscar/oscar.c:964
+msgid "Unable to create new connection."
+msgstr "Unable to create new connection."
+
+#: src/protocols/oscar/oscar.c:1035
 msgid "Unable to establish listener socket."
 msgstr "Unable to establish listener socket."
 
-#: src/protocols/oscar/oscar.c:868 src/protocols/yahoo/yahoo_filexfer.c:203
-#: src/protocols/yahoo/yahoo_filexfer.c:211
-msgid "Unable to establish file descriptor."
-msgstr "Unable to establish file descriptor."
-
-#: src/protocols/oscar/oscar.c:873
-msgid "Unable to create new connection."
-msgstr "Unable to create new connection."
-
-#: src/protocols/oscar/oscar.c:1053 src/protocols/toc/toc.c:571
+#: src/protocols/oscar/oscar.c:1140 src/protocols/toc/toc.c:571
 msgid "Incorrect nickname or password."
 msgstr "Incorrect nickname or password."
 
-#: src/protocols/oscar/oscar.c:1058
+#: src/protocols/oscar/oscar.c:1145
 msgid "Your account is currently suspended."
 msgstr "Your account is currently suspended."
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:1062
+#: src/protocols/oscar/oscar.c:1149
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "The AOL Instant Messenger service is temporarily unavailable."
 
-#: src/protocols/oscar/oscar.c:1067
+#: src/protocols/oscar/oscar.c:1154
 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."
@@ -6367,21 +6668,21 @@
 "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."
 
-#: src/protocols/oscar/oscar.c:1072
+#: src/protocols/oscar/oscar.c:1159
 #, 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"
 
-#: src/protocols/oscar/oscar.c:1104
+#: src/protocols/oscar/oscar.c:1191
 msgid "Internal Error"
 msgstr "Internal Error"
 
-#: src/protocols/oscar/oscar.c:1174
+#: src/protocols/oscar/oscar.c:1263
 msgid "Received authorization"
 msgstr "Received authorisation"
 
-#: src/protocols/oscar/oscar.c:1209 src/protocols/oscar/oscar.c:1239
-#: src/protocols/oscar/oscar.c:1327
+#: src/protocols/oscar/oscar.c:1299 src/protocols/oscar/oscar.c:1329
+#: src/protocols/oscar/oscar.c:1417
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -6390,29 +6691,29 @@
 "You may be disconnected shortly.  You may want to use TOC until this is "
 "fixed.  Check %s for updates."
 
-#: src/protocols/oscar/oscar.c:1212 src/protocols/oscar/oscar.c:1242
+#: src/protocols/oscar/oscar.c:1302 src/protocols/oscar/oscar.c:1332
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr "Gaim was unable to get a valid AIM login hash."
 
-#: src/protocols/oscar/oscar.c:1330
+#: src/protocols/oscar/oscar.c:1420
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim was unable to get a valid login hash."
 
-#: src/protocols/oscar/oscar.c:1911 src/protocols/oscar/oscar.c:5672
+#: src/protocols/oscar/oscar.c:2002 src/protocols/oscar/oscar.c:5908
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Direct IM with %s established"
 
-#: src/protocols/oscar/oscar.c:2240 src/protocols/oscar/oscar.c:2262
+#: src/protocols/oscar/oscar.c:2333 src/protocols/oscar/oscar.c:2355
 msgid "(There was an error receiving this message)"
 msgstr "(There was an error receiving this message)"
 
-#: src/protocols/oscar/oscar.c:2409
+#: src/protocols/oscar/oscar.c:2504
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s has just asked to directly connect to %s"
 
-#: src/protocols/oscar/oscar.c:2412
+#: src/protocols/oscar/oscar.c:2507
 msgid ""
 "This requires a direct connection between the two computers and is necessary "
 "for IM Images.  Because your IP address will be revealed, this may be "
@@ -6422,23 +6723,23 @@
 "for IM Images.  Because your IP address will be revealed, this may be "
 "considered a privacy risk."
 
-#: src/protocols/oscar/oscar.c:2417 src/protocols/oscar/oscar.c:6041
+#: src/protocols/oscar/oscar.c:2512 src/protocols/oscar/oscar.c:6290
 msgid "Connect"
 msgstr "Connect"
 
-#: src/protocols/oscar/oscar.c:2444
+#: src/protocols/oscar/oscar.c:2539
 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."
 
-#: src/protocols/oscar/oscar.c:2452
+#: src/protocols/oscar/oscar.c:2547
 msgid "Authorization Request Message:"
 msgstr "Authorisation Request Message:"
 
-#: src/protocols/oscar/oscar.c:2453
+#: src/protocols/oscar/oscar.c:2548
 msgid "Please authorize me!"
 msgstr "Please authorise me!"
 
-#: src/protocols/oscar/oscar.c:2481
+#: src/protocols/oscar/oscar.c:2577
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
@@ -6447,23 +6748,23 @@
 "The user %s requires authorisation before being added to a buddy list.  Do "
 "you want to send an authorisation request?"
 
-#: src/protocols/oscar/oscar.c:2486 src/protocols/oscar/oscar.c:2488
+#: src/protocols/oscar/oscar.c:2582 src/protocols/oscar/oscar.c:2584
 msgid "Request Authorization"
 msgstr "Request Authorisation"
 
-#: src/protocols/oscar/oscar.c:2524 src/protocols/oscar/oscar.c:2526
-#: src/protocols/oscar/oscar.c:2533 src/protocols/oscar/oscar.c:2609
-#: src/protocols/oscar/oscar.c:2629 src/protocols/oscar/oscar.c:2985
-#: src/protocols/oscar/oscar.c:3045 src/protocols/oscar/oscar.c:5152
-#: src/protocols/oscar/oscar.c:5198
+#: src/protocols/oscar/oscar.c:2620 src/protocols/oscar/oscar.c:2622
+#: src/protocols/oscar/oscar.c:2629 src/protocols/oscar/oscar.c:2705
+#: src/protocols/oscar/oscar.c:2725 src/protocols/oscar/oscar.c:3081
+#: src/protocols/oscar/oscar.c:3141 src/protocols/oscar/oscar.c:5366
+#: src/protocols/oscar/oscar.c:5412
 msgid "No reason given."
 msgstr "No reason given."
 
-#: src/protocols/oscar/oscar.c:2532
+#: src/protocols/oscar/oscar.c:2628
 msgid "Authorization Denied Message:"
 msgstr "Authorisation Denied Message:"
 
-#: src/protocols/oscar/oscar.c:2609
+#: src/protocols/oscar/oscar.c:2705
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -6472,11 +6773,11 @@
 "The user %u wants to add you to their buddy list for the following reason:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2617 src/protocols/oscar/oscar.c:5158
+#: src/protocols/oscar/oscar.c:2713 src/protocols/oscar/oscar.c:5372
 msgid "Authorization Request"
 msgstr "Authorisation Request"
 
-#: src/protocols/oscar/oscar.c:2629
+#: src/protocols/oscar/oscar.c:2725
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -6487,17 +6788,17 @@
 "following reason:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2630
+#: src/protocols/oscar/oscar.c:2726
 msgid "ICQ authorization denied."
 msgstr "ICQ authorisation denied."
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:2637
+#: src/protocols/oscar/oscar.c:2733
 #, 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."
 
-#: src/protocols/oscar/oscar.c:2645
+#: src/protocols/oscar/oscar.c:2741
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -6510,7 +6811,7 @@
 "From: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2653
+#: src/protocols/oscar/oscar.c:2749
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -6523,7 +6824,7 @@
 "From: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2661
+#: src/protocols/oscar/oscar.c:2757
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -6536,34 +6837,34 @@
 "Message is:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2682
+#: src/protocols/oscar/oscar.c:2778
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ user %u has sent you a buddy: %s (%s)"
 
-#: src/protocols/oscar/oscar.c:2688
+#: src/protocols/oscar/oscar.c:2784
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Do you want to add this buddy to your buddy list?"
 
-#: src/protocols/oscar/oscar.c:2692
+#: src/protocols/oscar/oscar.c:2788
 msgid "Decline"
 msgstr "Decline"
 
-#: src/protocols/oscar/oscar.c:2774
+#: src/protocols/oscar/oscar.c:2870
 #, 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."
 
-#: src/protocols/oscar/oscar.c:2783
+#: src/protocols/oscar/oscar.c:2879
 #, 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."
 
-#: src/protocols/oscar/oscar.c:2792
+#: src/protocols/oscar/oscar.c:2888
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -6574,190 +6875,193 @@
 msgstr[1] ""
 "You missed %hu messages from %s because the rate limit has been exceeded."
 
-#: src/protocols/oscar/oscar.c:2801
+#: src/protocols/oscar/oscar.c:2897
 #, 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."
 
-#: src/protocols/oscar/oscar.c:2810
+#: src/protocols/oscar/oscar.c:2906
 #, 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."
 
-#: src/protocols/oscar/oscar.c:2819
+#: src/protocols/oscar/oscar.c:2915
 #, 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."
 msgstr[0] "You missed %hu message from %s for an unknown reason."
 msgstr[1] "You missed %hu messages from %s for an unknown reason."
 
-#: src/protocols/oscar/oscar.c:2835 src/protocols/oscar/oscar.c:4616
-#: src/protocols/oscar/oscar.c:6168
+#: src/protocols/oscar/oscar.c:2931 src/protocols/oscar/oscar.c:4760
+#: src/protocols/oscar/oscar.c:6416
 msgid "Free For Chat"
 msgstr "Free For Chat"
 
-#: src/protocols/oscar/oscar.c:2839 src/protocols/oscar/oscar.c:4610
-#: src/protocols/oscar/oscar.c:6166
+#: src/protocols/oscar/oscar.c:2935 src/protocols/oscar/oscar.c:4754
+#: src/protocols/oscar/oscar.c:6414
 msgid "Not Available"
 msgstr "Not Available"
 
-#: src/protocols/oscar/oscar.c:2841 src/protocols/oscar/oscar.c:4613
-#: src/protocols/oscar/oscar.c:6167
+#: src/protocols/oscar/oscar.c:2937 src/protocols/oscar/oscar.c:4757
+#: src/protocols/oscar/oscar.c:6415
 msgid "Occupied"
 msgstr "Occupied"
 
-#: src/protocols/oscar/oscar.c:2845
+#: src/protocols/oscar/oscar.c:2941
 msgid "Web Aware"
 msgstr "Web Aware"
 
-#: src/protocols/oscar/oscar.c:2888
+#: src/protocols/oscar/oscar.c:2984
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 
-#: src/protocols/oscar/oscar.c:2947
+#: src/protocols/oscar/oscar.c:3043
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC threw error: %s\n"
 
+#: src/protocols/oscar/oscar.c:3044
+msgid "Unknown error"
+msgstr "Unknown error"
+
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:2983
+#: src/protocols/oscar/oscar.c:3079
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "Your message to %s did not get sent:"
 
-#: src/protocols/oscar/oscar.c:3042
+#: src/protocols/oscar/oscar.c:3138
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "User information for %s unavailable:"
 
-#: src/protocols/oscar/oscar.c:3081
+#: src/protocols/oscar/oscar.c:3177
 msgid "Voice"
 msgstr "Voice"
 
-#: src/protocols/oscar/oscar.c:3084
+#: src/protocols/oscar/oscar.c:3180
 msgid "AIM Direct IM"
 msgstr "AIM Direct IM"
 
-#: src/protocols/oscar/oscar.c:3090 src/protocols/oscar/oscar.c:6267
+#: src/protocols/oscar/oscar.c:3183
+msgid "Chat"
+msgstr "Chat"
+
+#: src/protocols/oscar/oscar.c:3186 src/protocols/oscar/oscar.c:6525
 msgid "Get File"
 msgstr "Get File"
 
-#: src/protocols/oscar/oscar.c:3093 src/protocols/oscar/oscar.c:6259
-#: src/protocols/yahoo/yahoo.c:2350
-msgid "Send File"
-msgstr "Send File"
-
-#: src/protocols/oscar/oscar.c:3097
+#: src/protocols/oscar/oscar.c:3193
 msgid "Games"
 msgstr "Games"
 
-#: src/protocols/oscar/oscar.c:3100
+#: src/protocols/oscar/oscar.c:3196
 msgid "Add-Ins"
 msgstr "Add-Ins"
 
-#: src/protocols/oscar/oscar.c:3103
+#: src/protocols/oscar/oscar.c:3199
 msgid "Send Buddy List"
 msgstr "Send Buddy List"
 
-#: src/protocols/oscar/oscar.c:3106
+#: src/protocols/oscar/oscar.c:3202
 msgid "ICQ Direct Connect"
 msgstr "ICQ Direct Connect"
 
-#: src/protocols/oscar/oscar.c:3109
+#: src/protocols/oscar/oscar.c:3205
 msgid "AP User"
 msgstr "AP User"
 
-#: src/protocols/oscar/oscar.c:3112
+#: src/protocols/oscar/oscar.c:3208
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:3115
+#: src/protocols/oscar/oscar.c:3211
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: src/protocols/oscar/oscar.c:3118
+#: src/protocols/oscar/oscar.c:3214
 msgid "ICQ Server Relay"
 msgstr "ICQ Server Relay"
 
-#: src/protocols/oscar/oscar.c:3121
+#: src/protocols/oscar/oscar.c:3217
 msgid "Old ICQ UTF8"
 msgstr "Old ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:3124
+#: src/protocols/oscar/oscar.c:3220
 msgid "Trillian Encryption"
 msgstr "Trillian Encryption"
 
-#: src/protocols/oscar/oscar.c:3127
+#: src/protocols/oscar/oscar.c:3223
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:3130
+#: src/protocols/oscar/oscar.c:3226
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: src/protocols/oscar/oscar.c:3133
+#: src/protocols/oscar/oscar.c:3229
 msgid "Security Enabled"
 msgstr "Security Enabled"
 
-#: src/protocols/oscar/oscar.c:3136
+#: src/protocols/oscar/oscar.c:3232
 msgid "Video Chat"
 msgstr "Video Chat"
 
-#: src/protocols/oscar/oscar.c:3140
+#: src/protocols/oscar/oscar.c:3236
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: src/protocols/oscar/oscar.c:3143
+#: src/protocols/oscar/oscar.c:3239
 msgid "Live Video"
 msgstr "Live Video"
 
-#: src/protocols/oscar/oscar.c:3146
+#: src/protocols/oscar/oscar.c:3242
 msgid "Camera"
 msgstr "Camera"
 
-#: src/protocols/oscar/oscar.c:3175
+#: src/protocols/oscar/oscar.c:3271
 #, c-format
 msgid "Username: <b>%s</b><br>\n"
 msgstr "Username: <b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3176
+#: src/protocols/oscar/oscar.c:3272
 #, c-format
 msgid "Warning Level: <b>%d%%</b><br>\n"
 msgstr "Warning Level: <b>%d%%</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3179
+#: src/protocols/oscar/oscar.c:3275
 #, c-format
 msgid "Online Since: <b>%s</b><br>\n"
 msgstr "Online Since: <b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3183
+#: src/protocols/oscar/oscar.c:3279
 #, c-format
 msgid "Member Since: <b>%s</b><br>\n"
 msgstr "Member Since: <b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3188
+#: src/protocols/oscar/oscar.c:3284
 #, c-format
 msgid "Idle: <b>%s</b>"
 msgstr "Idle: <b>%s</b>"
 
-#: src/protocols/oscar/oscar.c:3191
+#: src/protocols/oscar/oscar.c:3287
 msgid "Idle: <b>Active</b>"
 msgstr "Idle: <b>Active</b>"
 
-#: src/protocols/oscar/oscar.c:3230
+#: src/protocols/oscar/oscar.c:3359
 msgid "Your AIM connection may be lost."
 msgstr "Your AIM connection may be lost."
 
-#: src/protocols/oscar/oscar.c:3624
+#: src/protocols/oscar/oscar.c:3760
 msgid "Rate limiting error."
 msgstr "Rate limiting error."
 
-#: src/protocols/oscar/oscar.c:3625
+#: src/protocols/oscar/oscar.c:3761
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -6765,7 +7069,7 @@
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
 
-#: src/protocols/oscar/oscar.c:3688
+#: src/protocols/oscar/oscar.c:3824
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
@@ -6773,109 +7077,109 @@
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
 
-#: src/protocols/oscar/oscar.c:3690
+#: src/protocols/oscar/oscar.c:3826
 msgid "You have been signed off for an unknown reason."
 msgstr "You have been signed off for an unknown reason."
 
-#: src/protocols/oscar/oscar.c:3721
+#: src/protocols/oscar/oscar.c:3857
 msgid "Finalizing connection"
 msgstr "Finalizing connection"
 
-#: src/protocols/oscar/oscar.c:3981 src/protocols/oscar/oscar.c:3987
+#: src/protocols/oscar/oscar.c:4117 src/protocols/oscar/oscar.c:4123
 msgid "Email Address"
 msgstr "Email Address"
 
-#: src/protocols/oscar/oscar.c:3992
+#: src/protocols/oscar/oscar.c:4128
 msgid "Mobile Phone"
 msgstr "Mobile Phone"
 
-#: src/protocols/oscar/oscar.c:3995 src/protocols/trepia/trepia.c:281
+#: src/protocols/oscar/oscar.c:4131 src/protocols/trepia/trepia.c:281
 #: src/protocols/trepia/trepia.c:422
 msgid "Female"
 msgstr "Female"
 
-#: src/protocols/oscar/oscar.c:3995 src/protocols/trepia/trepia.c:280
+#: src/protocols/oscar/oscar.c:4131 src/protocols/trepia/trepia.c:280
 #: src/protocols/trepia/trepia.c:422
 msgid "Male"
 msgstr "Male"
 
-#: src/protocols/oscar/oscar.c:4012
+#: src/protocols/oscar/oscar.c:4148
 msgid "Personal Web Page"
 msgstr "Personal Web Page"
 
-#: src/protocols/oscar/oscar.c:4015
+#: src/protocols/oscar/oscar.c:4151
 msgid "Additional Information"
 msgstr "Additional Information"
 
-#: src/protocols/oscar/oscar.c:4019
+#: src/protocols/oscar/oscar.c:4155
 msgid "Home Address"
 msgstr "Home Address"
 
-#: src/protocols/oscar/oscar.c:4030 src/protocols/oscar/oscar.c:4046
+#: src/protocols/oscar/oscar.c:4166 src/protocols/oscar/oscar.c:4182
 msgid "Zip Code"
 msgstr "Postcode"
 
-#: src/protocols/oscar/oscar.c:4035
+#: src/protocols/oscar/oscar.c:4171
 msgid "Work Address"
 msgstr "Work Address"
 
-#: src/protocols/oscar/oscar.c:4051
+#: src/protocols/oscar/oscar.c:4187
 msgid "Work Information"
 msgstr "Work Information"
 
-#: src/protocols/oscar/oscar.c:4053
+#: src/protocols/oscar/oscar.c:4189
 msgid "Company"
 msgstr "Company"
 
-#: src/protocols/oscar/oscar.c:4056
+#: src/protocols/oscar/oscar.c:4192
 msgid "Division"
 msgstr "Division"
 
-#: src/protocols/oscar/oscar.c:4059
+#: src/protocols/oscar/oscar.c:4195
 msgid "Position"
 msgstr "Position"
 
-#: src/protocols/oscar/oscar.c:4062
+#: src/protocols/oscar/oscar.c:4198
 msgid "Web Page"
 msgstr "Web Page"
 
-#: src/protocols/oscar/oscar.c:4068
+#: src/protocols/oscar/oscar.c:4204
 #, c-format
 msgid "ICQ Info for %s"
 msgstr "ICQ Info for %s"
 
-#: src/protocols/oscar/oscar.c:4118
+#: src/protocols/oscar/oscar.c:4254
 msgid "Pop-Up Message"
 msgstr "Pop-Up Message"
 
-#: src/protocols/oscar/oscar.c:4139
-#, c-format
-msgid "The following screennames are associated with %s"
-msgstr "The following screennames are associated with %s"
-
-#: src/protocols/oscar/oscar.c:4143
+#: src/protocols/oscar/oscar.c:4275
+#, c-format
+msgid "The following screen names are associated with %s"
+msgstr "The following screen names are associated with %s"
+
+#: src/protocols/oscar/oscar.c:4279
 msgid "Search Results"
 msgstr "Search Results"
 
-#: src/protocols/oscar/oscar.c:4160
+#: src/protocols/oscar/oscar.c:4296
 #, c-format
 msgid "No results found for email address %s"
 msgstr "No results found for email address %s"
 
-#: src/protocols/oscar/oscar.c:4181
+#: src/protocols/oscar/oscar.c:4317
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "You should receive an email asking to confirm %s."
 
-#: src/protocols/oscar/oscar.c:4183
+#: src/protocols/oscar/oscar.c:4319
 msgid "Account Confirmation Requested"
 msgstr "Account Confirmation Requested"
 
-#: src/protocols/oscar/oscar.c:4211
+#: src/protocols/oscar/oscar.c:4347
 msgid "Error Changing Account Info"
 msgstr "Error Changing Account Info"
 
-#: src/protocols/oscar/oscar.c:4214
+#: src/protocols/oscar/oscar.c:4350
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -6884,7 +7188,7 @@
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "differs from the original."
 
-#: src/protocols/oscar/oscar.c:4217
+#: src/protocols/oscar/oscar.c:4353
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -6893,7 +7197,7 @@
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "ends in a space."
 
-#: src/protocols/oscar/oscar.c:4220
+#: src/protocols/oscar/oscar.c:4356
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -6902,7 +7206,7 @@
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "is too long."
 
-#: src/protocols/oscar/oscar.c:4223
+#: src/protocols/oscar/oscar.c:4359
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -6911,7 +7215,7 @@
 "Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this screen name."
 
-#: src/protocols/oscar/oscar.c:4226
+#: src/protocols/oscar/oscar.c:4362
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -6920,7 +7224,7 @@
 "Error 0x%04x: Unable to change email address because the given address has "
 "too many screen names associated with it."
 
-#: src/protocols/oscar/oscar.c:4229
+#: src/protocols/oscar/oscar.c:4365
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
@@ -6929,12 +7233,12 @@
 "Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 
-#: src/protocols/oscar/oscar.c:4232
+#: src/protocols/oscar/oscar.c:4368
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Error 0x%04x: Unknown error."
 
-#: src/protocols/oscar/oscar.c:4242
+#: src/protocols/oscar/oscar.c:4378
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -6943,20 +7247,20 @@
 "Your screen name is currently formatted as follows:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4243 src/protocols/oscar/oscar.c:4250
+#: src/protocols/oscar/oscar.c:4379 src/protocols/oscar/oscar.c:4386
 msgid "Account Info"
 msgstr "Account Info"
 
-#: src/protocols/oscar/oscar.c:4248
+#: src/protocols/oscar/oscar.c:4384
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "The email address for %s is %s"
 
-#: src/protocols/oscar/oscar.c:4480
+#: src/protocols/oscar/oscar.c:4616
 msgid "Unable to set AIM profile."
 msgstr "Unable to set AIM profile."
 
-#: src/protocols/oscar/oscar.c:4481
+#: src/protocols/oscar/oscar.c:4617
 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 "
@@ -6966,7 +7270,7 @@
 "completed.  Your profile remains unset; try setting it again when you are "
 "fully connected."
 
-#: src/protocols/oscar/oscar.c:4508
+#: src/protocols/oscar/oscar.c:4644
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -6981,15 +7285,19 @@
 "The maximum profile length of %d bytes has been exceeded.  Gaim has "
 "truncated it for you."
 
-#: src/protocols/oscar/oscar.c:4513
+#: src/protocols/oscar/oscar.c:4649
 msgid "Profile too long."
 msgstr "Profile too long."
 
-#: src/protocols/oscar/oscar.c:4530
+#: src/protocols/oscar/oscar.c:4665 src/protocols/oscar/oscar.c:6420
+msgid "Visible"
+msgstr "Visible"
+
+#: src/protocols/oscar/oscar.c:4676
 msgid "Unable to set AIM away message."
 msgstr "Unable to set AIM away message."
 
-#: src/protocols/oscar/oscar.c:4531
+#: src/protocols/oscar/oscar.c:4677
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -6999,7 +7307,7 @@
 "procedure completed.  You remain in a \"present\" state; try setting it "
 "again when you are fully connected."
 
-#: src/protocols/oscar/oscar.c:4571
+#: src/protocols/oscar/oscar.c:4717
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -7014,33 +7322,31 @@
 "The maximum away message length of %d bytes has been exceeded.  Gaim has "
 "truncated it for you."
 
-#: src/protocols/oscar/oscar.c:4576
+#: src/protocols/oscar/oscar.c:4722
 msgid "Away message too long."
 msgstr "Away message too long."
 
-#: src/protocols/oscar/oscar.c:4663
+#: src/protocols/oscar/oscar.c:4815
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
 "must either start with a letter and contain only letters, numbers and "
-"spaces, or contain only numbers.  The buddy will be removed from your buddy "
-"list."
+"spaces, or contain only numbers."
 msgstr ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
 "must either start with a letter and contain only letters, numbers and "
-"spaces, or contain only numbers.  The buddy will be removed from your buddy "
-"list."
-
-#: src/protocols/oscar/oscar.c:4664 src/protocols/oscar/oscar.c:5066
-#: src/protocols/oscar/oscar.c:5079
+"spaces, or contain only numbers."
+
+#: src/protocols/oscar/oscar.c:4816 src/protocols/oscar/oscar.c:5233
+#: src/protocols/oscar/oscar.c:5246
 msgid "Unable To Add"
 msgstr "Unable To Add"
 
-#: src/protocols/oscar/oscar.c:4800
+#: src/protocols/oscar/oscar.c:4952
 msgid "Unable To Retrieve Buddy List"
 msgstr "Unable To Retrieve Buddy List"
 
-#: src/protocols/oscar/oscar.c:4801
+#: src/protocols/oscar/oscar.c:4953
 msgid ""
 "Gaim was temporarily unable to retrieve your buddy list from the AIM "
 "servers.  Your buddy list is not lost, and will probably become available in "
@@ -7050,12 +7356,13 @@
 "servers.  Your buddy list is not lost, and will probably become available in "
 "a few hours."
 
-#: src/protocols/oscar/oscar.c:4893 src/protocols/oscar/oscar.c:4894
-#: src/protocols/oscar/oscar.c:4899
+#: src/protocols/oscar/oscar.c:5129 src/protocols/oscar/oscar.c:5130
+#: src/protocols/oscar/oscar.c:5135 src/protocols/oscar/oscar.c:5290
+#: src/protocols/oscar/oscar.c:5291 src/protocols/oscar/oscar.c:5296
 msgid "Orphans"
 msgstr "Orphans"
 
-#: src/protocols/oscar/oscar.c:5065
+#: src/protocols/oscar/oscar.c:5232
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -7064,11 +7371,11 @@
 "Could not add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 
-#: src/protocols/oscar/oscar.c:5065 src/protocols/oscar/oscar.c:5078
+#: src/protocols/oscar/oscar.c:5232 src/protocols/oscar/oscar.c:5245
 msgid "(no name)"
 msgstr "(no name)"
 
-#: src/protocols/oscar/oscar.c:5078
+#: src/protocols/oscar/oscar.c:5245
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -7079,7 +7386,7 @@
 "for this is that you have the maximum number of allowed buddies in your "
 "buddy list."
 
-#: src/protocols/oscar/oscar.c:5113
+#: src/protocols/oscar/oscar.c:5327
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -7088,11 +7395,11 @@
 "The user %s has given you permission to add you to their buddy list.  Do you "
 "want to add them?"
 
-#: src/protocols/oscar/oscar.c:5119
+#: src/protocols/oscar/oscar.c:5333
 msgid "Authorization Given"
 msgstr "Authorisation Given"
 
-#: src/protocols/oscar/oscar.c:5152
+#: src/protocols/oscar/oscar.c:5366
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -7102,17 +7409,17 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:5194
+#: src/protocols/oscar/oscar.c:5408
 #, 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."
 
-#: src/protocols/oscar/oscar.c:5195
+#: src/protocols/oscar/oscar.c:5409
 msgid "Authorization Granted"
 msgstr "Authorisation Granted"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:5198
+#: src/protocols/oscar/oscar.c:5412
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -7123,56 +7430,60 @@
 "following reason:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5199
+#: src/protocols/oscar/oscar.c:5413
 msgid "Authorization Denied"
 msgstr "Authorisation Denied"
 
-#: src/protocols/oscar/oscar.c:5236 src/protocols/toc/toc.c:1264
+#: src/protocols/oscar/oscar.c:5450 src/protocols/toc/toc.c:1264
 msgid "_Exchange:"
 msgstr "_Exchange:"
 
-#: src/protocols/oscar/oscar.c:5474
+#: src/protocols/oscar/oscar.c:5472
+msgid "Invalid chat name specified."
+msgstr "Invalid chat name specified."
+
+#: src/protocols/oscar/oscar.c:5703
 msgid "<b>Status:</b> "
 msgstr "<b>Status:</b> "
 
-#: src/protocols/oscar/oscar.c:5486
+#: src/protocols/oscar/oscar.c:5715
 msgid "<b>IP Address:</b> "
 msgstr "<b>IP Address:</b> "
 
-#: src/protocols/oscar/oscar.c:5494
+#: src/protocols/oscar/oscar.c:5723
 msgid "<b>Capabilities:</b> "
 msgstr "<b>Capabilities:</b> "
 
-#: src/protocols/oscar/oscar.c:5503
+#: src/protocols/oscar/oscar.c:5732
 msgid "<b>Buddy Comment:</b> "
 msgstr "<b>Buddy Comment:</b> "
 
-#: src/protocols/oscar/oscar.c:5512
+#: src/protocols/oscar/oscar.c:5741
 msgid "<b>Available:</b> "
 msgstr "<b>Available:</b> "
 
-#: src/protocols/oscar/oscar.c:5530
+#: src/protocols/oscar/oscar.c:5762
 msgid "<b>Away Message:</b> "
 msgstr "<b>Away Message:</b> "
 
-#: src/protocols/oscar/oscar.c:5539
+#: src/protocols/oscar/oscar.c:5770
 msgid "<b>Status:</b> Not Authorized"
 msgstr "<b>Status:</b> Not Authorised"
 
-#: src/protocols/oscar/oscar.c:5573 src/protocols/yahoo/yahoo.c:2191
+#: src/protocols/oscar/oscar.c:5804 src/protocols/yahoo/yahoo.c:2293
 msgid "Offline"
 msgstr "Offline"
 
-#: src/protocols/oscar/oscar.c:6021
+#: src/protocols/oscar/oscar.c:6270
 msgid "Unable to open Direct IM"
 msgstr "Unable to open Direct IM"
 
-#: src/protocols/oscar/oscar.c:6034
+#: src/protocols/oscar/oscar.c:6283
 #, 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."
 
-#: src/protocols/oscar/oscar.c:6037
+#: src/protocols/oscar/oscar.c:6286
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
@@ -7180,51 +7491,51 @@
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
 
-#: src/protocols/oscar/oscar.c:6212
+#: src/protocols/oscar/oscar.c:6470
 msgid "Buddy Comment:"
 msgstr "Buddy Comment:"
 
-#: src/protocols/oscar/oscar.c:6228
+#: src/protocols/oscar/oscar.c:6486
 msgid "Edit Buddy Comment"
 msgstr "Edit Buddy Comment"
 
-#: src/protocols/oscar/oscar.c:6236
+#: src/protocols/oscar/oscar.c:6494
 msgid "Get Status Msg"
 msgstr "Get Status Msg"
 
-#: src/protocols/oscar/oscar.c:6251
+#: src/protocols/oscar/oscar.c:6509
 msgid "Direct IM"
 msgstr "Direct IM"
 
-#: src/protocols/oscar/oscar.c:6280
+#: src/protocols/oscar/oscar.c:6538
 msgid "Re-request Authorization"
 msgstr "Re-request Authorisation"
 
-#: src/protocols/oscar/oscar.c:6301
+#: src/protocols/oscar/oscar.c:6559
 msgid "The new formatting is invalid."
 msgstr "The new formatting is invalid."
 
-#: src/protocols/oscar/oscar.c:6302
-msgid "Screenname formatting can change only capitalization and whitespace."
-msgstr "Screenname formatting can change only capitalisation and whitespace."
-
-#: src/protocols/oscar/oscar.c:6308
-msgid "New screenname formatting:"
-msgstr "New screenname formatting:"
-
-#: src/protocols/oscar/oscar.c:6357
+#: src/protocols/oscar/oscar.c:6560
+msgid "Screen name formatting can change only capitalization and whitespace."
+msgstr "Screen name formatting can change only capitalisation and whitespace."
+
+#: src/protocols/oscar/oscar.c:6566
+msgid "New screen name formatting:"
+msgstr "New screen name formatting:"
+
+#: src/protocols/oscar/oscar.c:6615
 msgid "Change Address To:"
 msgstr "Change Address To:"
 
-#: src/protocols/oscar/oscar.c:6401
+#: src/protocols/oscar/oscar.c:6659
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>you are not waiting for authorisation</i>"
 
-#: src/protocols/oscar/oscar.c:6404
+#: src/protocols/oscar/oscar.c:6662
 msgid "You are awaiting authorization from the following buddies"
 msgstr "You are awaiting authorisation from the following buddies"
 
-#: src/protocols/oscar/oscar.c:6405
+#: src/protocols/oscar/oscar.c:6663
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -7232,67 +7543,67 @@
 "You can re-request authorisation from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorisation.\""
 
-#: src/protocols/oscar/oscar.c:6419
+#: src/protocols/oscar/oscar.c:6677
 msgid "Find Buddy by E-mail"
 msgstr "Find Buddy by E-mail"
 
-#: src/protocols/oscar/oscar.c:6420
+#: src/protocols/oscar/oscar.c:6678
 msgid "Search for a buddy by e-mail address"
 msgstr "Search for a buddy by e-mail address"
 
-#: src/protocols/oscar/oscar.c:6421
+#: src/protocols/oscar/oscar.c:6679
 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."
 
-#: src/protocols/oscar/oscar.c:6438
+#: src/protocols/oscar/oscar.c:6696
 msgid "Available Message:"
 msgstr "Available Message:"
 
-#: src/protocols/oscar/oscar.c:6439
+#: src/protocols/oscar/oscar.c:6697
 msgid "I'm doing work and hoping for a distraction--IM me!"
 msgstr "I'm doing work and hoping for a distraction--IM me!"
 
-#: src/protocols/oscar/oscar.c:6510
+#: src/protocols/oscar/oscar.c:6768
 msgid "Set User Info..."
 msgstr "Set User Info..."
 
-#: src/protocols/oscar/oscar.c:6517
+#: src/protocols/oscar/oscar.c:6775
 msgid "Set Available Message..."
 msgstr "Set Available Message..."
 
-#: src/protocols/oscar/oscar.c:6524
+#: src/protocols/oscar/oscar.c:6782
 msgid "Change Password..."
 msgstr "Change Password..."
 
-#: src/protocols/oscar/oscar.c:6531
+#: src/protocols/oscar/oscar.c:6789
 msgid "Change Password (URL)"
 msgstr "Change Password (URL)"
 
-#: src/protocols/oscar/oscar.c:6539
+#: src/protocols/oscar/oscar.c:6797
 msgid "Configure IM Forwarding (URL)"
 msgstr "Configure IM Forwarding (URL)"
 
-#: src/protocols/oscar/oscar.c:6550
-msgid "Format Screenname..."
-msgstr "Format Screenname..."
-
-#: src/protocols/oscar/oscar.c:6556
+#: src/protocols/oscar/oscar.c:6808
+msgid "Format Screen Name..."
+msgstr "Format Screen Name..."
+
+#: src/protocols/oscar/oscar.c:6814
 msgid "Confirm Account"
 msgstr "Confirm Account"
 
-#: src/protocols/oscar/oscar.c:6562
+#: src/protocols/oscar/oscar.c:6820
 msgid "Display Currently Registered Address"
 msgstr "Display Currently Registered Address"
 
-#: src/protocols/oscar/oscar.c:6568
+#: src/protocols/oscar/oscar.c:6826
 msgid "Change Currently Registered Address..."
 msgstr "Change Currently Registered Address"
 
-#: src/protocols/oscar/oscar.c:6577
+#: src/protocols/oscar/oscar.c:6835
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Show Buddies Awaiting Authorisation"
 
-#: src/protocols/oscar/oscar.c:6585
+#: src/protocols/oscar/oscar.c:6843
 msgid "Search for Buddy by Email..."
 msgstr "Search for Buddy by Email..."
 
@@ -7306,15 +7617,15 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/oscar/oscar.c:6705 src/protocols/oscar/oscar.c:6707
+#: src/protocols/oscar/oscar.c:6964 src/protocols/oscar/oscar.c:6966
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ Protocol Plugin"
 
-#: src/protocols/oscar/oscar.c:6724
+#: src/protocols/oscar/oscar.c:6983
 msgid "Auth host"
 msgstr "Auth host"
 
-#: src/protocols/oscar/oscar.c:6729
+#: src/protocols/oscar/oscar.c:6988
 msgid "Auth port"
 msgstr "Auth port"
 
@@ -7521,15 +7832,15 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/toc/toc.c:2158 src/protocols/toc/toc.c:2160
+#: src/protocols/toc/toc.c:2159 src/protocols/toc/toc.c:2161
 msgid "TOC Protocol Plugin"
 msgstr "TOC Protocol Plugin"
 
-#: src/protocols/toc/toc.c:2177
+#: src/protocols/toc/toc.c:2178
 msgid "TOC host"
 msgstr "TOC host"
 
-#: src/protocols/toc/toc.c:2181
+#: src/protocols/toc/toc.c:2182
 msgid "TOC port"
 msgstr "TOC port"
 
@@ -7598,7 +7909,7 @@
 msgid "Local Users"
 msgstr "Local Users"
 
-#: src/protocols/trepia/trepia.c:1073
+#: src/protocols/trepia/trepia.c:1078
 msgid "Logging in"
 msgstr "Logging in"
 
@@ -7612,11 +7923,11 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/trepia/trepia.c:1320 src/protocols/trepia/trepia.c:1322
+#: src/protocols/trepia/trepia.c:1326 src/protocols/trepia/trepia.c:1328
 msgid "Trepia Protocol Plugin"
 msgstr "Trepia Protocol Plugin"
 
-#: src/protocols/yahoo/yahoo.c:298
+#: src/protocols/yahoo/yahoo.c:308
 msgid ""
 "You have been logged off as you have logged in on a different machine or "
 "device."
@@ -7624,21 +7935,25 @@
 "You have been logged off as you have logged in on a different machine or "
 "device."
 
-#: src/protocols/yahoo/yahoo.c:731
+#: src/protocols/yahoo/yahoo.c:747
 msgid "Your Yahoo! message did not get sent."
 msgstr "Your Yahoo! message did not get sent."
 
-#: src/protocols/yahoo/yahoo.c:773
+#: src/protocols/yahoo/yahoo.c:765
+msgid "Buzz!!"
+msgstr "Buzz!!"
+
+#: src/protocols/yahoo/yahoo.c:800
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Yahoo! system message for %s:"
 
-#: src/protocols/yahoo/yahoo.c:839
+#: src/protocols/yahoo/yahoo.c:866
 #, 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."
 
-#: src/protocols/yahoo/yahoo.c:842
+#: src/protocols/yahoo/yahoo.c:869
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -7647,11 +7962,11 @@
 "%s has (retroactively) denied your request to add them to your list for the "
 "following reason: %s."
 
-#: src/protocols/yahoo/yahoo.c:845
+#: src/protocols/yahoo/yahoo.c:872
 msgid "Add buddy rejected"
 msgstr "Add buddy rejected"
 
-#: src/protocols/yahoo/yahoo.c:1497
+#: src/protocols/yahoo/yahoo.c:1595
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -7662,11 +7977,11 @@
 "method.  This version of Gaim will likely not be able to successfully sign "
 "on to Yahoo.  Check %s for updates."
 
-#: src/protocols/yahoo/yahoo.c:1500
+#: src/protocols/yahoo/yahoo.c:1598
 msgid "Failed Yahoo! Authentication"
 msgstr "Failed Yahoo! Authentication"
 
-#: src/protocols/yahoo/yahoo.c:1573
+#: src/protocols/yahoo/yahoo.c:1671
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -7675,99 +7990,100 @@
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
 "\"Yes\" will remove and ignore the buddy."
 
-#: src/protocols/yahoo/yahoo.c:1576
+#: src/protocols/yahoo/yahoo.c:1674
 msgid "Ignore buddy?"
 msgstr "Ignore buddy?"
 
-#: src/protocols/yahoo/yahoo.c:1609
+#: src/protocols/yahoo/yahoo.c:1707
 msgid "Invalid username."
 msgstr "Invalid username."
 
-#: src/protocols/yahoo/yahoo.c:1612
+#: src/protocols/yahoo/yahoo.c:1710
 msgid "Incorrect password."
 msgstr "Incorrect password."
 
-#: src/protocols/yahoo/yahoo.c:1615
+#: src/protocols/yahoo/yahoo.c:1713
 msgid "Your account is locked, please log in to the yahoo website."
 msgstr "Your account is locked, please log in to the yahoo website."
 
-#: src/protocols/yahoo/yahoo.c:1618
+#: src/protocols/yahoo/yahoo.c:1716
 #, c-format
 msgid "Unknown error number %d."
 msgstr "Unknown error number %d"
 
-#: src/protocols/yahoo/yahoo.c:1675
+#: src/protocols/yahoo/yahoo.c:1773
 #, 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."
 
-#: src/protocols/yahoo/yahoo.c:1677
+#: src/protocols/yahoo/yahoo.c:1775
 msgid "Could not add buddy to server list"
 msgstr "Could not add buddy to server list"
 
-#: src/protocols/yahoo/yahoo.c:1787 src/protocols/yahoo/yahoo.c:1916
+#: src/protocols/yahoo/yahoo.c:1885 src/protocols/yahoo/yahoo.c:2016
 msgid "Unable to read"
 msgstr "Unable to read"
 
-#: src/protocols/yahoo/yahoo.c:1940 src/protocols/yahoo/yahoo.c:2048
-#: src/protocols/yahoo/yahoo.c:2089
+#: src/protocols/yahoo/yahoo.c:2038 src/protocols/yahoo/yahoo.c:2148
+#: src/protocols/yahoo/yahoo.c:2191 src/protocols/yahoo/yahoochat.c:1360
+#: src/protocols/yahoo/yahoochat.c:1421
 msgid "Connection problem"
 msgstr "Connection problem"
 
-#: src/protocols/yahoo/yahoo.c:2173 src/protocols/yahoo/yahoo.c:2498
-#: src/protocols/yahoo/yahoo.c:2604
+#: src/protocols/yahoo/yahoo.c:2275 src/protocols/yahoo/yahoo.c:2600
+#: src/protocols/yahoo/yahoo.c:2706
 msgid "Not At Home"
 msgstr "Not At Home"
 
-#: src/protocols/yahoo/yahoo.c:2175 src/protocols/yahoo/yahoo.c:2500
-#: src/protocols/yahoo/yahoo.c:2605
+#: src/protocols/yahoo/yahoo.c:2277 src/protocols/yahoo/yahoo.c:2602
+#: src/protocols/yahoo/yahoo.c:2707
 msgid "Not At Desk"
 msgstr "Not At Desk"
 
-#: src/protocols/yahoo/yahoo.c:2177 src/protocols/yahoo/yahoo.c:2502
-#: src/protocols/yahoo/yahoo.c:2606
+#: src/protocols/yahoo/yahoo.c:2279 src/protocols/yahoo/yahoo.c:2604
+#: src/protocols/yahoo/yahoo.c:2708
 msgid "Not In Office"
 msgstr "Not In Office"
 
-#: src/protocols/yahoo/yahoo.c:2181 src/protocols/yahoo/yahoo.c:2506
-#: src/protocols/yahoo/yahoo.c:2608
+#: src/protocols/yahoo/yahoo.c:2283 src/protocols/yahoo/yahoo.c:2608
+#: src/protocols/yahoo/yahoo.c:2710
 msgid "On Vacation"
 msgstr "On Vacation"
 
-#: src/protocols/yahoo/yahoo.c:2185 src/protocols/yahoo/yahoo.c:2510
-#: src/protocols/yahoo/yahoo.c:2610
+#: src/protocols/yahoo/yahoo.c:2287 src/protocols/yahoo/yahoo.c:2612
+#: src/protocols/yahoo/yahoo.c:2712
 msgid "Stepped Out"
 msgstr "Stepped Out"
 
-#: src/protocols/yahoo/yahoo.c:2249 src/protocols/yahoo/yahoo.c:2281
+#: src/protocols/yahoo/yahoo.c:2351 src/protocols/yahoo/yahoo.c:2383
 msgid "Not on server list"
 msgstr "Not on server list"
 
-#: src/protocols/yahoo/yahoo.c:2337
+#: src/protocols/yahoo/yahoo.c:2439
 msgid "Join in Chat"
 msgstr "Join in Chat"
 
-#: src/protocols/yahoo/yahoo.c:2343
+#: src/protocols/yahoo/yahoo.c:2445
 msgid "Initiate Conference"
 msgstr "Initiate Conference"
 
-#: src/protocols/yahoo/yahoo.c:2396
+#: src/protocols/yahoo/yahoo.c:2498
 msgid "Active which ID?"
 msgstr "Active which ID?"
 
-#: src/protocols/yahoo/yahoo.c:2404
+#: src/protocols/yahoo/yahoo.c:2506
 msgid "Join who in chat?"
 msgstr "Join who in chat?"
 
-#: src/protocols/yahoo/yahoo.c:2415
+#: src/protocols/yahoo/yahoo.c:2517
 msgid "Activate ID..."
 msgstr "Activate ID..."
 
-#: src/protocols/yahoo/yahoo.c:2421
+#: src/protocols/yahoo/yahoo.c:2523
 msgid "Join user in chat..."
 msgstr "Join user in chat..."
 
-#: src/protocols/yahoo/yahoo.c:2806
+#: src/protocols/yahoo/yahoo.c:2905
 msgid ""
 "<b>Sorry, profiles marked as containing adult content are not supported at "
 "this time.</b><br><br>\n"
@@ -7775,7 +8091,7 @@
 "<b>Sorry, profiles marked as containing adult content are not supported at "
 "this time.</b><br><br>\n"
 
-#: src/protocols/yahoo/yahoo.c:2807 src/protocols/yahoo/yahoo.c:2830
+#: src/protocols/yahoo/yahoo.c:2906 src/protocols/yahoo/yahoo.c:2929
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser<br>"
@@ -7783,42 +8099,42 @@
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser<br>"
 
-#: src/protocols/yahoo/yahoo.c:2829
+#: src/protocols/yahoo/yahoo.c:2928
 msgid ""
 "<b>Sorry, non-English profiles are not supported at this time.</b><br><br>\n"
 msgstr ""
 "<b>Sorry, non-English profiles are not supported at this time.</b><br><br>\n"
 
-#: src/protocols/yahoo/yahoo.c:2877 src/protocols/yahoo/yahoo.c:2878
+#: src/protocols/yahoo/yahoo.c:2976 src/protocols/yahoo/yahoo.c:2977
 msgid "Yahoo! ID"
 msgstr "Yahoo! ID"
 
-#: src/protocols/yahoo/yahoo.c:2922 src/protocols/yahoo/yahoo.c:2925
-#: src/protocols/yahoo/yahoo.c:2928
+#: src/protocols/yahoo/yahoo.c:3021 src/protocols/yahoo/yahoo.c:3024
+#: src/protocols/yahoo/yahoo.c:3027
 msgid "Hobbies"
 msgstr "Hobbies"
 
-#: src/protocols/yahoo/yahoo.c:2937 src/protocols/yahoo/yahoo.c:2940
+#: src/protocols/yahoo/yahoo.c:3036 src/protocols/yahoo/yahoo.c:3039
 msgid "Latest News"
 msgstr "Latest News"
 
-#: src/protocols/yahoo/yahoo.c:2954
+#: src/protocols/yahoo/yahoo.c:3053
 msgid "Home Page"
 msgstr "Home Page"
 
-#: src/protocols/yahoo/yahoo.c:2966
+#: src/protocols/yahoo/yahoo.c:3065
 msgid "Cool Link 1"
 msgstr "Cool Link 1"
 
-#: src/protocols/yahoo/yahoo.c:2970
+#: src/protocols/yahoo/yahoo.c:3069
 msgid "Cool Link 2"
 msgstr "Cool Link 2"
 
-#: src/protocols/yahoo/yahoo.c:2972
+#: src/protocols/yahoo/yahoo.c:3071
 msgid "Cool Link 3"
 msgstr "Cool Link 3"
 
-#: src/protocols/yahoo/yahoo.c:2978
+#: src/protocols/yahoo/yahoo.c:3077
 msgid "Member Since"
 msgstr "Member Since"
 
@@ -7832,26 +8148,38 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/yahoo/yahoo.c:3178 src/protocols/yahoo/yahoo.c:3180
+#: src/protocols/yahoo/yahoo.c:3283 src/protocols/yahoo/yahoo.c:3285
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo Protocol Plugin"
 
-#: src/protocols/yahoo/yahoo.c:3197
+#: src/protocols/yahoo/yahoo.c:3302
 msgid "Pager host"
 msgstr "Pager host"
 
-#: src/protocols/yahoo/yahoo.c:3200
+#: src/protocols/yahoo/yahoo.c:3305
 msgid "Pager port"
 msgstr "Pager port"
 
-#: src/protocols/yahoo/yahoo.c:3203
+#: src/protocols/yahoo/yahoo.c:3308
 msgid "File transfer host"
 msgstr "File transfer host"
 
-#: src/protocols/yahoo/yahoo.c:3206
+#: src/protocols/yahoo/yahoo.c:3311
 msgid "File transfer port"
 msgstr "File transfer port"
 
+#: src/protocols/yahoo/yahoo.c:3314
+msgid "Chat Room List Url"
+msgstr "Chat Room List Url"
+
+#: src/protocols/yahoo/yahoo_filexfer.c:200
+msgid ""
+"Gaim cannot send files over Yahoo! that are bigger than One Megabyte "
+"(1,048,576 bytes)."
+msgstr ""
+"Gaim cannot send files over Yahoo! that are bigger than One Megabyte "
+"(1,048,576 bytes)."
+
 #: src/protocols/yahoo/yahoochat.c:198
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
@@ -7869,42 +8197,72 @@
 msgid "Maybe the room is full?"
 msgstr "Perhaps the room is full?"
 
-#: src/protocols/yahoo/yahoochat.c:562
+#: src/protocols/yahoo/yahoochat.c:426
+#, c-format
+msgid "You are now chatting in %s."
+msgstr "You are now chatting in %s."
+
+#: src/protocols/yahoo/yahoochat.c:580
 msgid "Failed to join buddy in chat"
 msgstr "Failed to join buddy in chat"
 
-#: src/protocols/yahoo/yahoochat.c:563
+#: src/protocols/yahoo/yahoochat.c:581
 msgid "Maybe they're not in a chat?"
 msgstr "Perhaps they're not in a chat?"
 
-#: src/protocols/zephyr/zephyr.c:344
+#: src/protocols/yahoo/yahoochat.c:1301
+msgid "Unable to connect"
+msgstr "Unable to connect"
+
+#: src/protocols/yahoo/yahoochat.c:1301
+msgid "Fetching the room list failed."
+msgstr "Fetching the room list failed."
+
+#: src/protocols/yahoo/yahoochat.c:1346
+msgid "Voices"
+msgstr "Voices"
+
+#: src/protocols/yahoo/yahoochat.c:1349
+msgid "Webcams"
+msgstr "Webcams"
+
+#: src/protocols/yahoo/yahoochat.c:1360 src/protocols/yahoo/yahoochat.c:1421
+msgid "Unable to fetch room list."
+msgstr "Unable to fetch room list."
+
+#: src/protocols/yahoo/yahoochat.c:1414
+msgid "User Rooms"
+msgstr "User Rooms"
+
+#: src/protocols/zephyr/zephyr.c:525
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>User:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:346
+#: src/protocols/zephyr/zephyr.c:527
 #, c-format
 msgid "<b>Alias:</b> %s<br>"
 msgstr "<b>Alias:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:348
+#: src/protocols/zephyr/zephyr.c:529
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>Hidden or not logged-in"
 
-#: src/protocols/zephyr/zephyr.c:352
+#: src/protocols/zephyr/zephyr.c:533
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>At %s since %s"
 
-#: src/protocols/zephyr/zephyr.c:584 src/protocols/zephyr/zephyr.c:585
+#: src/protocols/zephyr/zephyr.c:793 src/protocols/zephyr/zephyr.c:794
+#: src/protocols/zephyr/zephyr.c:982 src/protocols/zephyr/zephyr.c:983
 msgid "Anyone"
 msgstr "Anyone"
 
-#: src/protocols/zephyr/zephyr.c:609
+#: src/protocols/zephyr/zephyr.c:820
 msgid "Already logged in with Zephyr"
 msgstr "Already logged in with Zephyr"
 
-#: src/protocols/zephyr/zephyr.c:610
+#: src/protocols/zephyr/zephyr.c:821
 msgid ""
 "Because Zephyr uses your system username, you are unable to have multiple "
 "accounts on it when logged in as the same user."
@@ -7912,19 +8270,19 @@
 "Because Zephyr uses your system username, you are unable to have multiple "
 "accounts on it when logged in as the same user."
 
-#: src/protocols/zephyr/zephyr.c:868
+#: src/protocols/zephyr/zephyr.c:1158
 msgid "ZLocate"
 msgstr "ZLocate"
 
-#: src/protocols/zephyr/zephyr.c:908
+#: src/protocols/zephyr/zephyr.c:1198
 msgid "_Class:"
 msgstr "_Class:"
 
-#: src/protocols/zephyr/zephyr.c:913
+#: src/protocols/zephyr/zephyr.c:1203
 msgid "_Instance:"
 msgstr "_Instance:"
 
-#: src/protocols/zephyr/zephyr.c:918
+#: src/protocols/zephyr/zephyr.c:1208
 msgid "_Recipient:"
 msgstr "_Recipient:"
 
@@ -7938,25 +8296,37 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/zephyr/zephyr.c:1049 src/protocols/zephyr/zephyr.c:1051
+#: src/protocols/zephyr/zephyr.c:1358 src/protocols/zephyr/zephyr.c:1360
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr Protocol Plugin"
 
+#: src/protocols/zephyr/zephyr.c:1377
+msgid "Export to .anyone"
+msgstr "Export to .anyone"
+
+#: src/protocols/zephyr/zephyr.c:1380
+msgid "Export to .zephyr.subs"
+msgstr "Export to .zephyr.subs"
+
+#: src/protocols/zephyr/zephyr.c:1383
+msgid "Exposure"
+msgstr "Exposure"
+
 #. Forbidden
-#: src/proxy.c:1015
+#: src/proxy.c:954
 msgid "Access denied: proxy server forbids port 80 tunnelling."
 msgstr "Access denied: proxy server forbids port 80 tunnelling."
 
-#: src/proxy.c:1017
+#: src/proxy.c:956
 #, c-format
 msgid "Proxy connection error %d"
 msgstr "Proxy connection error %d"
 
-#: src/proxy.c:1737
+#: src/proxy.c:1695
 msgid "Invalid proxy settings"
 msgstr "Invalid proxy settings"
 
-#: src/proxy.c:1737
+#: src/proxy.c:1695
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -7972,7 +8342,7 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #.
-#: src/request.h:1030
+#: src/request.h:1247
 msgid "Accept"
 msgstr "Accept"
 
@@ -7980,28 +8350,28 @@
 msgid "Please enter your password"
 msgstr "Please enter your password"
 
-#: src/server.c:950
+#: src/server.c:960
 #, c-format
 msgid "(%d message)"
 msgid_plural "(%d messages)"
 msgstr[0] "(%d message)"
 msgstr[1] "(%d messages)"
 
-#: src/server.c:963
+#: src/server.c:974
 msgid "(1 message)"
 msgstr "(1 message)"
 
-#: src/server.c:1147 src/server.c:1157
+#: src/server.c:1161 src/server.c:1171
 #, c-format
 msgid "%s logged in."
 msgstr "%s logged in."
 
-#: src/server.c:1174 src/server.c:1182
+#: src/server.c:1188 src/server.c:1196
 #, c-format
 msgid "%s logged out."
 msgstr "%s logged out."
 
-#: src/server.c:1229
+#: src/server.c:1243
 #, c-format
 msgid ""
 "%s has just been warned by %s.\n"
@@ -8010,11 +8380,11 @@
 "%s has just been warned by %s.\n"
 "Your new warning level is %d%%"
 
-#: src/server.c:1232
+#: src/server.c:1246
 msgid "an anonymous person"
 msgstr "an anonymous person"
 
-#: src/server.c:1335
+#: src/server.c:1349
 #, c-format
 msgid ""
 "User '%s' invites %s to buddy chat room: '%s'\n"
@@ -8023,12 +8393,12 @@
 "User '%s' invites %s to buddy chat room: '%s'\n"
 "%s"
 
-#: src/server.c:1339
+#: src/server.c:1353
 #, c-format
 msgid "User '%s' invites %s to buddy chat room: '%s'\n"
 msgstr "User '%s' invites %s to buddy chat room: '%s'\n"
 
-#: src/server.c:1345
+#: src/server.c:1359
 msgid "Accept chat invitation?"
 msgstr "Accept chat invitation?"
 
@@ -8039,200 +8409,60 @@
 msgid "Sorry, I ran out for a bit!"
 msgstr "Sorry, I ran out for a bit!"
 
-#: src/stock.c:85
+#: src/stock.c:86
+msgid "_Alias"
+msgstr "_Alias"
+
+#: src/stock.c:88
 msgid "_Modify"
 msgstr "_Modify"
 
-#: src/stock.c:86
+#: src/stock.c:89
 msgid "_Open Mail"
 msgstr "_Open Mail"
 
-#: src/util.c:1820
+#: src/stock.c:91
+msgid "_Warn"
+msgstr "_Warn"
+
+#: src/util.c:1884
 msgid "Calculating..."
 msgstr "Calculating..."
 
-#: src/util.c:1823
+#: src/util.c:1887
 msgid "Unknown."
 msgstr "Unknown."
 
-#: src/util.c:1854 src/util.c:1859 src/util.c:1864 src/util.c:1867
+#: src/util.c:1918 src/util.c:1923 src/util.c:1928 src/util.c:1931
 msgid "day"
 msgid_plural "days"
 msgstr[0] "day"
 msgstr[1] "days"
 
-#: src/util.c:1855 src/util.c:1859 src/util.c:1873 src/util.c:1875
+#: src/util.c:1919 src/util.c:1923 src/util.c:1937 src/util.c:1939
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "hour"
 msgstr[1] "hours"
 
-#: src/util.c:1855 src/util.c:1864 src/util.c:1873 src/util.c:1878
+#: src/util.c:1919 src/util.c:1928 src/util.c:1937 src/util.c:1942
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minute"
 msgstr[1] "minutes"
 
-#: src/util.c:2210
+#: src/util.c:2274
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Error opening connection.\n"
 
-#: src/win32/win32dep.c:271
+#: src/win32/win32dep.c:272
 msgid "Moving Gaim Settings.."
 msgstr "Moving Gaim Settings.."
 
-#: src/win32/win32dep.c:274
+#: src/win32/win32dep.c:275
 msgid "Moving Gaim user settings to: "
 msgstr "Moving Gaim user settings to: "
 
-#: src/win32/win32dep.c:276
+#: src/win32/win32dep.c:277
 msgid "Notification"
 msgstr "Notification"
-
-#~ msgid "Gnome Stock Ticker Properties"
-#~ msgstr "Gnome Stock Ticker Properties"
-
-#~ msgid "Update Frequency in min"
-#~ msgstr "Update Frequency in min"
-
-#~ msgid "Enter symbols delimited with \"+\" in the box below."
-#~ msgstr "Enter symbols delimited with \"+\" in the box below."
-
-#~ msgid "Check this box to display only symbols and price:"
-#~ msgstr "Check this box to display only symbols and price:"
-
-#~ msgid "Check this box to scroll left to right:"
-#~ msgstr "Check this box to scroll left to right:"
-
-#~ msgid "(No"
-#~ msgstr "(No"
-
-#~ msgid "Change"
-#~ msgstr "Change"
-
-#~ msgid "Gaim - Away!"
-#~ msgstr "Gaim - Away!"
-
-#~ msgid "Buddy Chat"
-#~ msgstr "Buddy Chat"
-
-#~ msgid "Join Chat As:"
-#~ msgstr "Join Chat As:"
-
-#~ msgid "Join"
-#~ msgstr "Join"
-
-#~ msgid "New Message"
-#~ msgstr "New Message"
-
-#~ msgid "Changing info for %s:"
-#~ msgstr "Changing info for %s:"
-
-#~ msgid "Alias chat"
-#~ msgstr "Alias chat"
-
-#~ msgid "Alias contact"
-#~ msgstr "Alias contact"
-
-#~ msgid "_Screenname"
-#~ msgstr "_Screenname"
-
-#~ msgid "Alias buddy"
-#~ msgstr "Alias buddy"
-
-#~ msgid ""
-#~ "Please enter an aliased name for the person below, or rename this contact "
-#~ "in your buddy list."
-#~ msgstr ""
-#~ "Please enter an aliased name for the person below, or rename this contact "
-#~ "in your buddy list."
-
-#~ msgid "Couldn't write to %s."
-#~ msgstr "Couldn't write to %s."
-
-#~ msgid "Save Log File"
-#~ msgstr "Save Log File"
-
-#~ msgid "Couldn't remove file %s."
-#~ msgstr "Couldn't remove file %s."
-
-#~ msgid ""
-#~ "You are about to remove the log file for %s.  Do you want to continue?"
-#~ msgstr ""
-#~ "You are about to remove the log file for %s.  Do you want to continue?"
-
-#~ msgid "System Log"
-#~ msgstr "System Log"
-
-#~ msgid "Remove Log"
-#~ msgstr "Remove Log"
-
-#~ msgid "Couldn't open log file %s."
-#~ msgstr "Couldn't open log file %s."
-
-#~ msgid "Conversations with %s"
-#~ msgstr "Conversations with %s"
-
-#~ msgid "Log"
-#~ msgstr "Log"
-
-#~ msgid "Clear"
-#~ msgstr "Clear"
-
-#~ msgid "Gaim - Information"
-#~ msgstr "Gaim - Information"
-
-#~ msgid "Add a new group"
-#~ msgstr "Add a new group"
-
-#~ msgid "Gaim - Insert Image"
-#~ msgstr "Gaim - Insert Image"
-
-#~ msgid ""
-#~ "<span weight='bold' size='larger'>Enter a search phrase\n"
-#~ "</span>"
-#~ msgstr ""
-#~ "<span weight='bold' size='larger'>Enter a search phrase\n"
-#~ "</span>"
-
-#~ msgid "/Conversation/Search..."
-#~ msgstr "/Conversation/Search..."
-
-#~ msgid "/Conversation/Insert _URL..."
-#~ msgstr "/Conversation/Insert _URL..."
-
-#~ msgid "Normal font size"
-#~ msgstr "Normal font size"
-
-#~ msgid "_Host"
-#~ msgstr "_Host"
-
-#~ msgid "Pa_ssword"
-#~ msgstr "Pa_ssword"
-
-#~ msgid "Gaim - Save Icon"
-#~ msgstr "Gaim - Save Icon"
-
-#~ msgid "<font color=\"red\"><b>log->logger_data was NULL!</b></font>"
-#~ msgstr "<font color=\"red\"><b>log->logger_data was NULL!</b></font>"
-
-#~ msgid "Disconnected"
-#~ msgstr "Disconnected"
-
-#~ msgid "Invalid response from server"
-#~ msgstr "Invalid response from server"
-
-#~ msgid "%s (Code %s)"
-#~ msgstr "%s (Code %s)"
-
-#~ msgid "SSL support is needed for MSN. Please install it."
-#~ msgstr "SSL support is needed for MSN. Please install it."
-
-#~ msgid "Join what group:"
-#~ msgstr "Join what group:"
-
-#~ msgid "Could not connect for transfer!"
-#~ msgstr "Could not connect for transfer!"
-
-#~ msgid "Unknown error."
-#~ msgstr "Unknown error."