diff po/en_GB.po @ 8711:05ed6143ec76

[gaim-migrate @ 9465] 2 updates committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Mon, 19 Apr 2004 15:04:12 +0000
parents 918b7f58e148
children 809ef4f1b20e
line wrap: on
line diff
--- a/po/en_GB.po	Mon Apr 19 04:20:24 2004 +0000
+++ b/po/en_GB.po	Mon Apr 19 15:04:12 2004 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: Gaim 0.73\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-18 17:35+0000\n"
+"POT-Creation-Date: 2004-04-19 10:52+0100\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"
@@ -134,7 +134,7 @@
 msgid "Gaim - Away"
 msgstr "Gaim - Away"
 
-#: plugins/docklet/docklet.c:114 src/gtkaccount.c:495 src/gtkaccount.c:1820
+#: plugins/docklet/docklet.c:114 src/gtkaccount.c:497 src/gtkaccount.c:1891
 msgid "Auto-login"
 msgstr "Auto-login"
 
@@ -150,16 +150,18 @@
 msgid "New..."
 msgstr "New..."
 
-#: 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
+#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1623 src/protocols/gg/gg.c:51
+#: src/protocols/irc/msgs.c:187 src/protocols/jabber/jabber.c:951
+#: src/protocols/jabber/jutil.c:32 src/protocols/jabber/presence.c:63
+#: src/protocols/jabber/presence.c:119 src/protocols/oscar/oscar.c:520
+#: src/protocols/oscar/oscar.c:4820 src/protocols/oscar/oscar.c:5803
+#: src/protocols/oscar/oscar.c:6421
 msgid "Away"
 msgstr "Away"
 
+#. else...
 #: plugins/docklet/docklet.c:159 src/away.c:522
+#: src/protocols/oscar/oscar.c:4738 src/protocols/oscar/oscar.c:6429
 msgid "Back"
 msgstr "Back"
 
@@ -172,11 +174,11 @@
 msgstr "File Transfers"
 
 #. And now for the buttons
-#: plugins/docklet/docklet.c:173 src/gtkaccount.c:1999 src/main.c:288
+#: plugins/docklet/docklet.c:173 src/gtkaccount.c:2070 src/main.c:287
 msgid "Accounts"
 msgstr "Accounts"
 
-#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2564 src/main.c:294
+#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2611 src/main.c:293
 msgid "Preferences"
 msgstr "Preferences"
 
@@ -234,33 +236,46 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/filectl.c:223
+#: plugins/filectl.c:222
 msgid "Gaim File Control"
 msgstr "Gaim File Control"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/filectl.c:226 plugins/filectl.c:228
+#: plugins/filectl.c:225 plugins/filectl.c:227
 msgid "Allows you to control Gaim by entering commands in a file."
 msgstr "Allows you to control Gaim by entering commands in a file."
 
-#: plugins/gaim-remote/remote.c:88
+#: plugins/gaim-remote/remote.c:89
 msgid "Not connected to AIM"
 msgstr "Not connected to AIM"
 
-#: plugins/gaim-remote/remote.c:97 plugins/gaim-remote/remote.c:136
+#: plugins/gaim-remote/remote.c:98 plugins/gaim-remote/remote.c:137
 msgid "No screenname given."
 msgstr "No screenname given."
 
-#: plugins/gaim-remote/remote.c:173
+#: plugins/gaim-remote/remote.c:174
 msgid "No roomname given."
 msgstr "No roomname given."
 
-#: plugins/gaim-remote/remote.c:192
+#: plugins/gaim-remote/remote.c:193
 msgid "Invalid AIM URI"
 msgstr "Invalid AIM URI"
 
+#: plugins/gaim-remote/remote.c:651
+#, c-format
+msgid ""
+"Failed to assign %s to a socket:\n"
+"%s"
+msgstr ""
+"Failed to assign %s to a socket:\n"
+"%s"
+
+#: plugins/gaim-remote/remote.c:674
+msgid "Unable to open socket"
+msgstr "Unable to open socket"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -268,19 +283,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gaim-remote/remote.c:715
+#: plugins/gaim-remote/remote.c:722
 msgid "Remote Control"
 msgstr "Remote Control"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gaim-remote/remote.c:718
+#: plugins/gaim-remote/remote.c:725
 msgid "Provides remote control for gaim applications."
 msgstr "Provides remote control for gaim applications."
 
 #. *  description
-#: plugins/gaim-remote/remote.c:720
+#: plugins/gaim-remote/remote.c:727
 msgid ""
 "Gives Gaim the ability to be remote-controlled through third-party "
 "applications or through the gaim-remote tool."
@@ -380,15 +395,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:2879 src/gtkprefs.c:851 src/gtkprefs.c:1604
-#: src/protocols/jabber/jabber.c:916
+#: src/gtkblist.c:2964 src/gtkprefs.c:870 src/gtkprefs.c:1651
+#: src/protocols/jabber/jabber.c:915
 msgid "None"
 msgstr "None"
 
 #: plugins/gevolution/add_buddy_dialog.c:190
-#: plugins/gevolution/assoc-buddy.c:180 src/gtkprefs.c:1981
+#: plugins/gevolution/assoc-buddy.c:180 src/gtkprefs.c:2028
 #: src/gtkroomlist.c:561 src/protocols/jabber/jabber.c:590
-#: src/protocols/msn/msn.c:1367 src/protocols/trepia/trepia.c:401
+#: src/protocols/msn/msn.c:1394 src/protocols/trepia/trepia.c:398
 msgid "Name"
 msgstr "Name"
 
@@ -403,13 +418,13 @@
 
 #. "Search"
 #: plugins/gevolution/add_buddy_dialog.c:495
-#: plugins/gevolution/assoc-buddy.c:385 src/protocols/oscar/oscar.c:6682
+#: plugins/gevolution/assoc-buddy.c:385 src/protocols/oscar/oscar.c:6692
 msgid "Search"
 msgstr "Search"
 
 #: plugins/gevolution/add_buddy_dialog.c:566
-#: plugins/gevolution/new_person_dialog.c:310 src/gtkblist.c:3897
-#: src/gtkblist.c:4225
+#: plugins/gevolution/new_person_dialog.c:310 src/gtkblist.c:3982
+#: src/gtkblist.c:4310
 msgid "Group:"
 msgstr "Group:"
 
@@ -448,8 +463,8 @@
 msgstr "_Associate Buddy"
 
 #: plugins/gevolution/gevo-util.c:66 plugins/gevolution/gevolution.c:90
-#: 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
+#: src/blist.c:685 src/blist.c:872 src/blist.c:2105 src/gtkblist.c:3807
+#: src/protocols/jabber/roster.c:66 src/protocols/msn/notification.c:793
 msgid "Buddies"
 msgstr "Buddies"
 
@@ -511,8 +526,8 @@
 msgstr "Optional information"
 
 #. Label
-#: plugins/gevolution/new_person_dialog.c:341 src/gtkaccount.c:318
-#: src/protocols/oscar/oscar.c:3174
+#: plugins/gevolution/new_person_dialog.c:341 src/gtkaccount.c:320
+#: src/protocols/oscar/oscar.c:425
 msgid "Buddy Icon"
 msgstr "Buddy Icon"
 
@@ -640,14 +655,18 @@
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
 msgstr "Test plugin IPC support, as a server. This registers the IPC commands."
 
-#: plugins/mailchk.c:156
+#: plugins/mailchk.c:157
 msgid "Mail Checker"
 msgstr "Mail Checker"
 
-#: plugins/mailchk.c:158 plugins/mailchk.c:159
+#: plugins/mailchk.c:159
 msgid "Checks for new local mail."
 msgstr "Checks for new local mail."
 
+#: plugins/mailchk.c:160
+msgid "Adds a small box to the buddy list that shows if you have new mail."
+msgstr "Adds a small box to the buddy list that shows if you have new mail."
+
 #. ---------- "Notify For" ----------
 #: plugins/notify.c:572
 msgid "Notify For"
@@ -1059,7 +1078,7 @@
 msgstr "_Show slider bar in IM window"
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:365 src/gtkprefs.c:854
+#: plugins/win32/transparency/win2ktrans.c:365 src/gtkprefs.c:873
 msgid "Buddy List Window"
 msgstr "Buddy List Window"
 
@@ -1106,8 +1125,8 @@
 msgstr "_Start Gaim on Windows startup"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:366 src/gtkblist.c:2920
-#: src/gtkprefs.c:2480
+#: plugins/win32/winprefs/winprefs.c:366 src/gtkblist.c:3005
+#: src/gtkprefs.c:2527
 msgid "Buddy List"
 msgstr "Buddy List"
 
@@ -1126,8 +1145,8 @@
 msgstr "_Keep Buddy List window on top"
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:386 src/gtkprefs.c:892
-#: src/gtkprefs.c:2481 src/protocols/msn/msn.c:1697
+#: plugins/win32/winprefs/winprefs.c:386 src/gtkprefs.c:911
+#: src/gtkprefs.c:2528 src/protocols/msn/msn.c:1731
 msgid "Conversations"
 msgstr "Conversations"
 
@@ -1163,8 +1182,8 @@
 "written using Gtk+ and is licensed under the GPL.<BR><BR>"
 
 #: src/about.c:104
-msgid "<FONT SIZE=\"3\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"3\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
+msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 
 #: src/about.c:109
 msgid "Active Developers"
@@ -1198,239 +1217,243 @@
 msgid "Crazy Patch Writers"
 msgstr "Crazy Patch Writers"
 
-#: src/about.c:143
+#: src/about.c:144
 msgid "Retired Developers"
 msgstr "Retired Developers"
 
-#: src/about.c:144
-msgid "former libfaim maintainer"
-msgstr "former libfaim maintainer"
-
 #: src/about.c:145
+msgid "former libfaim maintainer"
+msgstr "former libfaim maintainer"
+
+#: src/about.c:146
 msgid "former lead developer"
 msgstr "former lead developer"
 
-#: src/about.c:148
+#: src/about.c:149
 msgid "former maintainer"
 msgstr "former maintainer"
 
-#: src/about.c:149
-msgid "former Jabber developer"
-msgstr "former Jabber developer"
-
 #: src/about.c:150
+msgid "former Jabber developer"
+msgstr "former Jabber developer"
+
+#: src/about.c:151
 msgid "original author"
 msgstr "original author"
 
-#: src/about.c:153
+#: src/about.c:154
 msgid "hacker and designated driver [lazy bum]"
 msgstr "hacker and designated driver [lazy bum]"
 
-#: src/about.c:161
+#: src/about.c:162
 msgid "Current Translators"
 msgstr "Current Translators"
 
-#: src/about.c:162 src/about.c:195
+#: src/about.c:163 src/about.c:197
 msgid "Catalan"
 msgstr "Catalan"
 
-#: src/about.c:163 src/about.c:196
+#: src/about.c:164 src/about.c:198
 msgid "Czech"
 msgstr "Czech"
 
-#: src/about.c:164
-msgid "Danish"
-msgstr "Danish"
-
 #: src/about.c:165
+msgid "Danish"
+msgstr "Danish"
+
+#: src/about.c:166
 msgid "British English"
 msgstr "Proper English"
 
-#: src/about.c:166 src/about.c:197
+#: src/about.c:167 src/about.c:199
 msgid "German"
 msgstr "German"
 
-#: src/about.c:167 src/about.c:198
+#: src/about.c:168 src/about.c:200
 msgid "Spanish"
 msgstr "Spanish"
 
-#: src/about.c:168 src/about.c:199
+#: src/about.c:169 src/about.c:201
 msgid "Finnish"
 msgstr "Finnish"
 
-#: src/about.c:169 src/about.c:200
+#: src/about.c:170 src/about.c:202
 msgid "French"
 msgstr "French"
 
-#: src/about.c:170
+#: src/about.c:171
 msgid "Hindi"
 msgstr "Hindi"
 
-#: src/about.c:171
+#: src/about.c:172
 msgid "Hungarian"
 msgstr "Hungarian"
 
-#: src/about.c:172 src/about.c:202
+#: src/about.c:173 src/about.c:204
 msgid "Italian"
 msgstr "Italian"
 
-#: src/about.c:173 src/about.c:204
+#: src/about.c:174 src/about.c:206
 msgid "Korean"
 msgstr "Korean"
 
-#: src/about.c:174
+#: src/about.c:175
 msgid "Dutch; Flemish"
 msgstr "Dutch; Flemish"
 
-#: src/about.c:175
+#: src/about.c:176
+msgid "Macedonian"
+msgstr "Macedonian"
+
+#: src/about.c:177
 msgid "Norwegian"
 msgstr "Norwegian"
 
-#: src/about.c:176 src/about.c:205
+#: src/about.c:178 src/about.c:207
 msgid "Polish"
 msgstr "Polish"
 
-#: src/about.c:177
+#: src/about.c:179
 msgid "Portuguese"
 msgstr "Portuguese"
 
-#: src/about.c:178
+#: src/about.c:180
 msgid "Portuguese-Brazil"
 msgstr "Portuguese-Brazil"
 
-#: src/about.c:179
+#: src/about.c:181
 msgid "Romanian"
 msgstr "Romanian"
 
-#: src/about.c:180 src/about.c:206
-msgid "Russian"
-msgstr "Russian"
-
-#: src/about.c:181
-msgid "Serbian"
-msgstr "Serbian"
-
 #: src/about.c:182 src/about.c:208
-msgid "Swedish"
-msgstr "Swedish"
+msgid "Russian"
+msgstr "Russian"
 
 #: src/about.c:183
+msgid "Serbian"
+msgstr "Serbian"
+
+#: src/about.c:184 src/about.c:210
+msgid "Swedish"
+msgstr "Swedish"
+
+#: src/about.c:185
 msgid "Vietnamese"
 msgstr "Vietnamese"
 
-#: src/about.c:183
+#: src/about.c:185
 msgid "Gnome Vi Team"
 msgstr "Gnome Vi Team"
 
-#: src/about.c:184
+#: src/about.c:186
 msgid "Simplified Chinese"
 msgstr "Simplified Chinese"
 
-#: src/about.c:185
+#: src/about.c:187
 msgid "Traditional Chinese"
 msgstr "Traditional Chinese"
 
-#: src/about.c:192
+#: src/about.c:194
 msgid "Past Translators"
 msgstr "Past Translators"
 
-#: src/about.c:193
+#: src/about.c:195
 msgid "Amharic"
 msgstr "Amharic"
 
-#: src/about.c:194
+#: src/about.c:196
 msgid "Bulgarian"
 msgstr "Bulgarian"
 
-#: src/about.c:201
+#: src/about.c:203
 msgid "Hebrew"
 msgstr "Hebrew"
 
-#: src/about.c:203
+#: src/about.c:205
 msgid "Japanese"
 msgstr "Japanese"
 
-#: src/about.c:207
+#: src/about.c:209
 msgid "Slovak"
 msgstr "Slovak"
 
-#: src/about.c:209
+#: src/about.c:211
 msgid "Chinese"
 msgstr "Chinese"
 
-#: src/account.c:275 src/protocols/jabber/jabber.c:1001
+#: src/account.c:279 src/protocols/jabber/jabber.c:992
 msgid "New passwords do not match."
 msgstr "New passwords do not match."
 
-#: src/account.c:283
+#: src/account.c:288
 msgid "Fill out all fields completely."
 msgstr "Fill out all fields completely."
 
-#: src/account.c:308
+#: src/account.c:313
 msgid "Original password"
 msgstr "Original password"
 
-#: src/account.c:314
+#: src/account.c:320
 msgid "New password"
 msgstr "New password"
 
-#: src/account.c:320
+#: src/account.c:327
 msgid "New password (again)"
 msgstr "New password (again)"
 
-#: src/account.c:325
+#: src/account.c:333
 #, c-format
 msgid "Change password for %s"
 msgstr "Change password for %s"
 
-#: src/account.c:333
+#: src/account.c:341
 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: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
+#: src/account.c:344 src/connection.c:198 src/dialogs.c:471 src/dialogs.c:527
+#: src/gtkblist.c:2363 src/gtkrequest.c:235 src/protocols/jabber/jabber.c:1037
+#: src/protocols/jabber/xdata.c:337 src/protocols/msn/msn.c:194
+#: src/protocols/msn/msn.c:205 src/protocols/msn/msn.c:216
+#: src/protocols/msn/msn.c:227 src/protocols/oscar/oscar.c:2763
+#: src/protocols/oscar/oscar.c:2844 src/protocols/oscar/oscar.c:6482
+#: src/protocols/oscar/oscar.c:6578 src/protocols/oscar/oscar.c:6627
+#: src/protocols/oscar/oscar.c:6709 src/protocols/yahoo/yahoo.c:2504
+#: src/protocols/yahoo/yahoo.c:2512 src/request.h:1240
 msgid "OK"
 msgstr "OK"
 
-#: 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/account.c:345 src/account.c:383 src/connection.c:199 src/dialogs.c:305
+#: src/dialogs.c:317 src/dialogs.c:330 src/dialogs.c:351 src/dialogs.c:472
+#: src/dialogs.c:528 src/dialogs.c:851 src/dialogs.c:872 src/dialogs.c:889
+#: src/dialogs.c:908 src/gtkaccount.c:1744 src/gtkaccount.c:2235
+#: src/gtkblist.c:2364 src/gtkblist.c:4349 src/gtkconn.c:168
+#: src/gtkimhtmltoolbar.c:399 src/gtkprivacy.c:575 src/gtkprivacy.c:588
+#: src/gtkprivacy.c:613 src/gtkprivacy.c:624 src/gtkrequest.c:236
 #: 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
+#: src/protocols/jabber/chat.c:693 src/protocols/jabber/jabber.c:659
+#: src/protocols/jabber/jabber.c:1038 src/protocols/jabber/xdata.c:338
+#: src/protocols/msn/msn.c:195 src/protocols/msn/msn.c:206
+#: src/protocols/msn/msn.c:217 src/protocols/msn/msn.c:228
+#: src/protocols/msn/msn.c:241 src/protocols/oscar/oscar.c:2725
+#: src/protocols/oscar/oscar.c:2764 src/protocols/oscar/oscar.c:2800
+#: src/protocols/oscar/oscar.c:2845 src/protocols/oscar/oscar.c:6300
+#: src/protocols/oscar/oscar.c:6483 src/protocols/oscar/oscar.c:6579
+#: src/protocols/oscar/oscar.c:6628 src/protocols/oscar/oscar.c:6693
+#: src/protocols/oscar/oscar.c:6710 src/protocols/trepia/trepia.c:347
+#: src/protocols/yahoo/yahoo.c:2505 src/protocols/yahoo/yahoo.c:2513
+#: src/request.h:1240 src/request.h:1250
 msgid "Cancel"
 msgstr "Cancel"
 
-#: src/account.c:363
+#: src/account.c:374
 #, c-format
 msgid "Change user information for %s"
 msgstr "Change user information for %s"
 
-#: src/account.c:370 src/dialogs.c:825 src/gtkrequest.c:232
+#: src/account.c:382 src/dialogs.c:839 src/gtkrequest.c:242
 #: src/protocols/jabber/buddy.c:513 src/protocols/trepia/trepia.c:346
 msgid "Save"
 msgstr "Save"
@@ -1455,11 +1478,11 @@
 msgid "Set All Away"
 msgstr "Set All Away"
 
-#: src/blist.c:579 src/gtkprefs.c:2483
+#: src/blist.c:590 src/gtkprefs.c:2530
 msgid "Chats"
 msgstr "Chats"
 
-#: src/blist.c:1181
+#: src/blist.c:1192
 #, c-format
 msgid ""
 "%d buddy from group %s was not removed because its account was not logged "
@@ -1474,26 +1497,26 @@
 "%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:1190
+#: src/blist.c:1201
 msgid "Group not removed"
 msgstr "Group not removed"
 
-#: src/blist.c:1240 src/gtkaccount.c:162 src/gtkft.c:153 src/gtkutils.c:860
+#: src/blist.c:1251 src/gtkaccount.c:164 src/gtkft.c:153 src/gtkutils.c:860
 #: src/protocols/jabber/buddy.c:569
 msgid "Unknown"
 msgstr "Unknown"
 
-#: src/blist.c:1567
+#: src/blist.c:1578
 msgid "Invalid Groupname"
 msgstr "Invalid Groupname"
 
-#: src/blist.c:2209
+#: src/blist.c:2220
 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:2211
+#: src/blist.c:2222
 msgid "Buddy List Error"
 msgstr "Buddy List Error"
 
@@ -1567,7 +1590,7 @@
 msgid "Last created window"
 msgstr "Last created window"
 
-#: src/conversation.c:2468 src/gtkprefs.c:1380
+#: src/conversation.c:2468 src/gtkprefs.c:1399
 msgid "New window"
 msgstr "New window"
 
@@ -1579,11 +1602,11 @@
 msgid "By account"
 msgstr "By account"
 
-#: src/dialogs.c:155
+#: src/dialogs.c:154
 msgid "Warn User"
 msgstr "Warn User"
 
-#: src/dialogs.c:174
+#: src/dialogs.c:173
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -1596,26 +1619,26 @@
 "This will increase %s's warning level and he or she will be subject to "
 "harsher rate limiting.\n"
 
-#: src/dialogs.c:183
+#: src/dialogs.c:182
 msgid "Warn _anonymously?"
 msgstr "Warn _anonymously?"
 
-#: src/dialogs.c:190
+#: src/dialogs.c:189
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>Anonymous warnings are less severe.</b>"
 
-#: src/dialogs.c:302
+#: src/dialogs.c:301
 #, 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:304 src/dialogs.c:305
+#: src/dialogs.c:303 src/dialogs.c:304
 msgid "Remove Buddy"
 msgstr "Remove Buddy"
 
-#: src/dialogs.c:314
+#: src/dialogs.c:313
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -1624,11 +1647,11 @@
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 
-#: src/dialogs.c:316 src/dialogs.c:317
+#: src/dialogs.c:315 src/dialogs.c:316
 msgid "Remove Chat"
 msgstr "Remove Chat"
 
-#: src/dialogs.c:326
+#: src/dialogs.c:325
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -1637,11 +1660,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:329 src/dialogs.c:330
+#: src/dialogs.c:328 src/dialogs.c:329
 msgid "Remove Group"
 msgstr "Remove Group"
 
-#: src/dialogs.c:347
+#: src/dialogs.c:346
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
@@ -1650,123 +1673,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:350 src/dialogs.c:351
+#: src/dialogs.c:349 src/dialogs.c:350
 msgid "Remove Contact"
 msgstr "Remove Contact"
 
-#: src/dialogs.c:454 src/dialogs.c:510
+#: src/dialogs.c:453 src/dialogs.c:509
 msgid "_Screen name"
 msgstr "_Screen name"
 
-#: src/dialogs.c:460 src/dialogs.c:516
+#: src/dialogs.c:459 src/dialogs.c:515
 msgid "_Account"
 msgstr "_Account"
 
-#: src/dialogs.c:467
+#: src/dialogs.c:466
 msgid "New Instant Message"
 msgstr "New Instant Message"
 
-#: src/dialogs.c:469
+#: src/dialogs.c:468
 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
+#: src/dialogs.c:522
 msgid "Get User Info"
 msgstr "Get User Info"
 
-#: src/dialogs.c:525
+#: src/dialogs.c:524
 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
+#: src/dialogs.c:552 src/gtkimhtmltoolbar.c:240
 msgid "Select Text Color"
 msgstr "Select Text Colour"
 
-#: src/dialogs.c:581 src/gtkimhtmltoolbar.c:279
+#: src/dialogs.c:580 src/gtkimhtmltoolbar.c:310
 msgid "Select Background Color"
 msgstr "Select Background Colour"
 
-#: src/dialogs.c:620 src/gtkimhtmltoolbar.c:133
+#: src/dialogs.c:619 src/gtkimhtmltoolbar.c:164
 msgid "Select Font"
 msgstr "Select Font"
 
-#: src/dialogs.c:682
+#: src/dialogs.c:692
 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:684
+#: src/dialogs.c:694
 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:694
+#: src/dialogs.c:704
 msgid "You cannot create an empty away message"
 msgstr "You cannot create an empty away message"
 
-#: src/dialogs.c:756
+#: src/dialogs.c:766
 msgid "New away message"
 msgstr "New away message"
 
-#: src/dialogs.c:777
+#: src/dialogs.c:787
 msgid "Away title: "
 msgstr "Away title: "
 
-#: src/dialogs.c:829
+#: src/dialogs.c:843
 msgid "Save & Use"
 msgstr "Save & Use"
 
-#: src/dialogs.c:833
+#: src/dialogs.c:847
 msgid "Use"
 msgstr "Use"
 
-#: src/dialogs.c:854
+#: src/dialogs.c:868
 msgid "Alias Chat"
 msgstr "Alias Chat"
 
-#: src/dialogs.c:855
+#: src/dialogs.c:869
 msgid "Enter an alias for this chat."
 msgstr "Enter an alias for this chat."
 
-#: src/dialogs.c:857 src/dialogs.c:874 src/dialogs.c:893 src/gtkrequest.c:233
+#: src/dialogs.c:871 src/dialogs.c:888 src/dialogs.c:907 src/gtkrequest.c:243
 msgid "Alias"
 msgstr "Alias"
 
-#: src/dialogs.c:871
+#: src/dialogs.c:885
 msgid "Alias Contact"
 msgstr "Alias Contact"
 
-#: src/dialogs.c:872
+#: src/dialogs.c:886
 msgid "Enter an alias for this contact."
 msgstr "Enter an alias for this contact."
 
-#: src/dialogs.c:889
+#: src/dialogs.c:903
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Enter an alias for %s."
 
-#: src/dialogs.c:891
+#: src/dialogs.c:905
 msgid "Alias Buddy"
 msgstr "Alias Buddy"
 
-#: src/ft.c:139
+#: src/ft.c:144
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s is not a valid filename.\n"
 
-#: src/ft.c:152
+#: src/ft.c:157
 #, c-format
 msgid "%s was not found.\n"
 msgstr "%s was not found.\n"
 
-#: src/ft.c:769
+#: src/ft.c:786
 #, c-format
 msgid "File transfer to %s aborted.\n"
 msgstr "File transfer to %s aborted.\n"
 
-#: src/ft.c:771
+#: src/ft.c:788
 #, c-format
 msgid "File transfer from %s aborted.\n"
 msgstr "File transfer from %s aborted.\n"
@@ -1863,24 +1886,19 @@
 msgid "boring default"
 msgstr "boring default"
 
-#: src/gaimrc.c:1260 src/gtkblist.c:2881
+#: src/gaimrc.c:1260 src/gtkblist.c:2966
 msgid "Alphabetical"
 msgstr "Alphabetical"
 
-#: src/gaimrc.c:1262 src/gtkblist.c:2882
+#: src/gaimrc.c:1262 src/gtkblist.c:2967
 msgid "By status"
 msgstr "By status"
 
-#: src/gaimrc.c:1264 src/gtkblist.c:2883
+#: src/gaimrc.c:1264 src/gtkblist.c:2968
 msgid "By log size"
 msgstr "By log size"
 
-#: src/gaimrc.c:1549
-#, c-format
-msgid "Could not open config file %s."
-msgstr "Could not open config file %s."
-
-#: src/gtkaccount.c:287
+#: src/gtkaccount.c:289
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -1892,171 +1910,171 @@
 "<b>Image size:</b> %dx%d"
 
 #. Build the login options frame.
-#: src/gtkaccount.c:382
+#: src/gtkaccount.c:384
 msgid "Login Options"
 msgstr "Login Options"
 
-#: src/gtkaccount.c:399
+#: src/gtkaccount.c:401
 msgid "Protocol:"
 msgstr "Protocol:"
 
-#: src/gtkaccount.c:404 src/gtkblist.c:3869
+#: src/gtkaccount.c:406 src/gtkblist.c:3954
 msgid "Screen Name:"
 msgstr "Screen Name:"
 
-#: src/gtkaccount.c:477
+#: src/gtkaccount.c:479
 msgid "Password:"
 msgstr "Password:"
 
-#: src/gtkaccount.c:482 src/gtkblist.c:3883 src/gtkblist.c:4211
+#: src/gtkaccount.c:484 src/gtkblist.c:3968 src/gtkblist.c:4296
 msgid "Alias:"
 msgstr "Alias:"
 
-#: src/gtkaccount.c:486
+#: src/gtkaccount.c:488
 msgid "Remember password"
 msgstr "Remember password"
 
 #. Build the user options frame.
-#: src/gtkaccount.c:540
+#: src/gtkaccount.c:542
 msgid "User Options"
 msgstr "User Options"
 
-#: src/gtkaccount.c:553
+#: src/gtkaccount.c:555
 msgid "New mail notifications"
 msgstr "New mail notifications"
 
-#: src/gtkaccount.c:562
+#: src/gtkaccount.c:564
 msgid "Buddy icon file:"
 msgstr "Buddy icon file:"
 
-#: src/gtkaccount.c:572
+#: src/gtkaccount.c:574
 msgid "_Browse"
 msgstr "_Browse"
 
-#: src/gtkaccount.c:578
+#: src/gtkaccount.c:580
 msgid "_Reset"
 msgstr "_Reset"
 
 #. Build the protocol options frame.
-#: src/gtkaccount.c:640
+#: src/gtkaccount.c:642
 #, c-format
 msgid "%s Options"
 msgstr "%s Options"
 
 #. Use Global Proxy Settings
-#: src/gtkaccount.c:772
+#: src/gtkaccount.c:778 src/gtkaccount.c:825
 msgid "Use Global Proxy Settings"
 msgstr "Use Global Proxy Settings"
 
 #. No Proxy
-#: src/gtkaccount.c:779
+#: src/gtkaccount.c:784 src/gtkaccount.c:832
 msgid "No Proxy"
 msgstr "No Proxy"
 
 #. HTTP
-#: src/gtkaccount.c:786
+#: src/gtkaccount.c:790 src/gtkaccount.c:839
 msgid "HTTP"
 msgstr "HTTP"
 
 #. SOCKS 4
-#: src/gtkaccount.c:793
+#: src/gtkaccount.c:796 src/gtkaccount.c:846
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
 #. SOCKS 5
-#: src/gtkaccount.c:800
+#: src/gtkaccount.c:802 src/gtkaccount.c:853
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:807 src/gtkprefs.c:1181
+#: src/gtkaccount.c:808 src/gtkaccount.c:860 src/gtkprefs.c:1200
 msgid "Use Environmental Settings"
 msgstr "Use Environmental Settings"
 
-#: src/gtkaccount.c:840
+#: src/gtkaccount.c:899
 msgid "you can see the butterflies mating"
 msgstr "you can see the butterflies mating"
 
-#: src/gtkaccount.c:844
+#: src/gtkaccount.c:903
 msgid "If you look real closely"
 msgstr "If you look real closely"
 
-#: src/gtkaccount.c:860
+#: src/gtkaccount.c:919
 msgid "Proxy Options"
 msgstr "Proxy Options"
 
-#: src/gtkaccount.c:876 src/gtkprefs.c:1175
+#: src/gtkaccount.c:937 src/gtkprefs.c:1194
 msgid "Proxy _type:"
 msgstr "Proxy _type:"
 
-#: src/gtkaccount.c:885 src/gtkprefs.c:1205
+#: src/gtkaccount.c:946 src/gtkprefs.c:1224
 msgid "_Host:"
 msgstr "_Host:"
 
-#: src/gtkaccount.c:889 src/gtkprefs.c:1223
+#: src/gtkaccount.c:950 src/gtkprefs.c:1242
 msgid "_Port:"
 msgstr "_Port:"
 
-#: src/gtkaccount.c:897
+#: src/gtkaccount.c:958
 msgid "_Username:"
 msgstr "_Username:"
 
-#: src/gtkaccount.c:902 src/gtkprefs.c:1260
+#: src/gtkaccount.c:963 src/gtkprefs.c:1279
 msgid "Pa_ssword:"
 msgstr "Pa_ssword:"
 
-#: src/gtkaccount.c:1260
+#: src/gtkaccount.c:1331
 msgid "Add Account"
 msgstr "Add Account"
 
-#: src/gtkaccount.c:1262
+#: src/gtkaccount.c:1333
 msgid "Modify Account"
 msgstr "Modify Account"
 
 #. Add the disclosure
-#: src/gtkaccount.c:1286
+#: src/gtkaccount.c:1357
 msgid "Show more options"
 msgstr "Show more options"
 
-#: src/gtkaccount.c:1287
+#: src/gtkaccount.c:1358
 msgid "Show fewer options"
 msgstr "Show fewer options"
 
 #. Register button
-#: src/gtkaccount.c:1314 src/protocols/jabber/jabber.c:658
+#: src/gtkaccount.c:1385 src/protocols/jabber/jabber.c:658
 msgid "Register"
 msgstr "Register"
 
-#: src/gtkaccount.c:1668
+#: src/gtkaccount.c:1739
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Are you sure you want to delete %s?"
 
-#: src/gtkaccount.c:1672 src/gtkrequest.c:229
+#: src/gtkaccount.c:1743 src/gtkrequest.c:239
 msgid "Delete"
 msgstr "Delete"
 
-#: src/gtkaccount.c:1786
+#: src/gtkaccount.c:1857 src/protocols/oscar/oscar.c:3360
 msgid "Screen Name"
 msgstr "Screen Name"
 
-#: 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
+#: src/gtkaccount.c:1880 src/protocols/jabber/jabber.c:949
+#: src/protocols/oscar/oscar.c:526 src/protocols/oscar/oscar.c:4818
+#: src/protocols/oscar/oscar.c:6420 src/protocols/yahoo/yahoo.c:2299
+#: src/protocols/zephyr/zephyr.c:1173 src/protocols/zephyr/zephyr.c:1183
 msgid "Online"
 msgstr "Online"
 
-#: src/gtkaccount.c:1827
+#: src/gtkaccount.c:1898
 msgid "Protocol"
 msgstr "Protocol"
 
-#: src/gtkaccount.c:2139
+#: src/gtkaccount.c:2210
 #, 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:2153
+#: src/gtkaccount.c:2224
 msgid ""
 "\n"
 "\n"
@@ -2066,22 +2084,22 @@
 "\n"
 "Do you wish to add him or her to your buddy list?"
 
-#: src/gtkaccount.c:2157
+#: src/gtkaccount.c:2228
 msgid "Information"
 msgstr "Information"
 
-#: src/gtkaccount.c:2161
+#: src/gtkaccount.c:2232
 msgid "Add buddy to your list?"
 msgstr "Add buddy to your list?"
 
 #. Add button
-#: 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
+#: src/gtkaccount.c:2234 src/gtkblist.c:4348 src/gtkconv.c:1108
+#: src/gtkconv.c:3339 src/gtkconv.c:3430 src/gtkrequest.c:240
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:3007
 msgid "Add"
 msgstr "Add"
 
-#: src/gtkblist.c:803 src/gtkblist.c:4151
+#: src/gtkblist.c:801 src/gtkblist.c:4236
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -2089,11 +2107,11 @@
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 
-#: src/gtkblist.c:816
+#: src/gtkblist.c:814
 msgid "Join a Chat"
 msgstr "Join a Chat"
 
-#: src/gtkblist.c:837
+#: src/gtkblist.c:835
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
@@ -2101,191 +2119,191 @@
 "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
+#: src/gtkblist.c:848 src/gtkpounce.c:361 src/gtkroomlist.c:365
 msgid "_Account:"
 msgstr "_Account:"
 
-#: src/gtkblist.c:1088 src/gtkblist.c:3070
+#: src/gtkblist.c:1087 src/gtkblist.c:3155
 msgid "Get _Info"
 msgstr "Get _Info"
 
-#: src/gtkblist.c:1091 src/gtkblist.c:3061
+#: src/gtkblist.c:1090 src/gtkblist.c:3146
 msgid "I_M"
 msgstr "I_M"
 
-#: src/gtkblist.c:1093
+#: src/gtkblist.c:1092
 msgid "Add Buddy _Pounce"
 msgstr "Add Buddy _Pounce"
 
-#: src/gtkblist.c:1095
+#: src/gtkblist.c:1094
 msgid "View _Log"
 msgstr "View _Log"
 
-#: src/gtkblist.c:1115 src/gtkblist.c:1187 src/gtkblist.c:1200
+#: src/gtkblist.c:1159 src/gtkblist.c:1260 src/gtkblist.c:1274
 msgid "_Alias..."
 msgstr "_Alias..."
 
-#: src/gtkblist.c:1117 src/gtkblist.c:1189 src/gtkblist.c:1205
+#: src/gtkblist.c:1161 src/gtkblist.c:1262 src/gtkblist.c:1279
 #: src/gtkconn.c:361
 msgid "_Remove"
 msgstr "_Remove"
 
-#: src/gtkblist.c:1162
+#: src/gtkblist.c:1206
 msgid "Add a _Buddy"
 msgstr "Add a _Buddy"
 
-#: src/gtkblist.c:1164
+#: src/gtkblist.c:1208
 msgid "Add a C_hat"
 msgstr "Add a C_hat"
 
-#: src/gtkblist.c:1166
+#: src/gtkblist.c:1210
 msgid "_Delete Group"
 msgstr "_Delete Group"
 
-#: src/gtkblist.c:1168
+#: src/gtkblist.c:1212
 msgid "_Rename"
 msgstr "_Rename"
 
 #. join button
-#: src/gtkblist.c:1182 src/gtkroomlist.c:261 src/gtkroomlist.c:417
+#: src/gtkblist.c:1238 src/gtkroomlist.c:261 src/gtkroomlist.c:417
 #: src/stock.c:87
 msgid "_Join"
 msgstr "_Join"
 
-#: src/gtkblist.c:1184
+#: src/gtkblist.c:1240
 msgid "Auto-Join"
 msgstr "Auto-Join"
 
-#: src/gtkblist.c:1202 src/gtkblist.c:1228
+#: src/gtkblist.c:1276 src/gtkblist.c:1302
 msgid "_Collapse"
 msgstr "_Collapse"
 
-#: src/gtkblist.c:1233
+#: src/gtkblist.c:1307
 msgid "_Expand"
 msgstr "_Expand"
 
-#: src/gtkblist.c:1884 src/gtkconv.c:3864
+#: src/gtkblist.c:1964 src/gtkconv.c:3917
 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:2225
+#: src/gtkblist.c:2312
 msgid "/_Buddies"
 msgstr "/_Buddies"
 
-#: src/gtkblist.c:2226
+#: src/gtkblist.c:2313
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Buddies/New Instant _Message..."
 
-#: src/gtkblist.c:2227
+#: src/gtkblist.c:2314
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Buddies/Join a _Chat..."
 
-#: src/gtkblist.c:2228
+#: src/gtkblist.c:2315
 msgid "/Buddies/Get User _Info..."
 msgstr "/Buddies/Get User _Info..."
 
-#: src/gtkblist.c:2230
+#: src/gtkblist.c:2317
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Buddies/Show _Offline Buddies"
 
-#: src/gtkblist.c:2231
+#: src/gtkblist.c:2318
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Buddies/Show _Empty Groups"
 
-#: src/gtkblist.c:2232
+#: src/gtkblist.c:2319
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Buddies/_Add Buddy..."
 
-#: src/gtkblist.c:2233
+#: src/gtkblist.c:2320
 msgid "/Buddies/Add C_hat..."
 msgstr "/Buddies/Add C_hat..."
 
-#: src/gtkblist.c:2234
+#: src/gtkblist.c:2321
 msgid "/Buddies/Add _Group..."
 msgstr "/Buddies/Add _Group..."
 
-#: src/gtkblist.c:2236
+#: src/gtkblist.c:2323
 msgid "/Buddies/_Signoff"
 msgstr "/Buddies/_Signoff"
 
-#: src/gtkblist.c:2237
+#: src/gtkblist.c:2324
 msgid "/Buddies/_Quit"
 msgstr "/Buddies/_Quit"
 
 #. Tools
-#: src/gtkblist.c:2240
+#: src/gtkblist.c:2327
 msgid "/_Tools"
 msgstr "/_Tools"
 
-#: src/gtkblist.c:2241
+#: src/gtkblist.c:2328
 msgid "/Tools/_Away"
 msgstr "/Tools/_Away"
 
-#: src/gtkblist.c:2242
+#: src/gtkblist.c:2329
 msgid "/Tools/Buddy _Pounce"
 msgstr "/Tools/Buddy _Pounce"
 
-#: src/gtkblist.c:2243
+#: src/gtkblist.c:2330
 msgid "/Tools/P_rotocol Actions"
 msgstr "/Tools/P_rotocol Actions"
 
-#: src/gtkblist.c:2245
+#: src/gtkblist.c:2332
 msgid "/Tools/A_ccounts"
 msgstr "/Tools/A_ccounts"
 
-#: src/gtkblist.c:2246
+#: src/gtkblist.c:2333
 msgid "/Tools/_File Transfers"
 msgstr "/Tools/_File Transfers"
 
-#: src/gtkblist.c:2247
+#: src/gtkblist.c:2334
 msgid "/Tools/R_oom List"
 msgstr "/Tools/R_oom List"
 
-#: src/gtkblist.c:2248
+#: src/gtkblist.c:2335
 msgid "/Tools/Pr_eferences"
 msgstr "/Tools/Pr_eferences"
 
-#: src/gtkblist.c:2249
+#: src/gtkblist.c:2336
 msgid "/Tools/Pr_ivacy"
 msgstr "/Tools/Pr_ivacy"
 
-#: src/gtkblist.c:2252
+#: src/gtkblist.c:2338
 msgid "/Tools/View System _Log"
 msgstr "/Tools/View System _Log"
 
 #. Help
-#: src/gtkblist.c:2256
+#: src/gtkblist.c:2341
 msgid "/_Help"
 msgstr "/_Help"
 
-#: src/gtkblist.c:2257
+#: src/gtkblist.c:2342
 msgid "/Help/Online _Help"
 msgstr "/Help/Online _Help"
 
-#: src/gtkblist.c:2258
+#: src/gtkblist.c:2343
 msgid "/Help/_Debug Window"
 msgstr "/Help/_Debug Window"
 
-#: src/gtkblist.c:2259
+#: src/gtkblist.c:2344
 msgid "/Help/_About"
 msgstr "/Help/_About"
 
-#: src/gtkblist.c:2275
+#: src/gtkblist.c:2360
 msgid "Rename Group"
 msgstr "Rename Group"
 
-#: src/gtkblist.c:2275
+#: src/gtkblist.c:2360
 msgid "New group name"
 msgstr "New group name"
 
-#: src/gtkblist.c:2276
+#: src/gtkblist.c:2361
 msgid "Please enter a new name for the selected group."
 msgstr "Please enter a new name for the selected group."
 
-#: src/gtkblist.c:2304
+#: src/gtkblist.c:2389
 #, c-format
 msgid ""
 "\n"
@@ -2294,16 +2312,16 @@
 "\n"
 "<b>Account:</b> %s"
 
-#: src/gtkblist.c:2368 src/protocols/oscar/oscar.c:5774
+#: src/gtkblist.c:2453
 msgid "<b>Status:</b> Offline"
 msgstr "<b>Status:</b> Offline"
 
-#: src/gtkblist.c:2383
+#: src/gtkblist.c:2468
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:2399
+#: src/gtkblist.c:2484
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -2311,7 +2329,7 @@
 "\n"
 "<b>Account:</b>"
 
-#: src/gtkblist.c:2400
+#: src/gtkblist.c:2485
 msgid ""
 "\n"
 "<b>Contact Alias:</b>"
@@ -2319,7 +2337,7 @@
 "\n"
 "<b>Contact Alias:</b>"
 
-#: src/gtkblist.c:2401
+#: src/gtkblist.c:2486
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -2327,7 +2345,7 @@
 "\n"
 "<b>Alias:</b>"
 
-#: src/gtkblist.c:2402
+#: src/gtkblist.c:2487
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -2335,7 +2353,7 @@
 "\n"
 "<b>Nickname:</b>"
 
-#: src/gtkblist.c:2403
+#: src/gtkblist.c:2488
 msgid ""
 "\n"
 "<b>Logged In:</b>"
@@ -2343,7 +2361,7 @@
 "\n"
 "<b>Logged In:</b>"
 
-#: src/gtkblist.c:2404
+#: src/gtkblist.c:2489
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -2351,7 +2369,7 @@
 "\n"
 "<b>Idle:</b>"
 
-#: src/gtkblist.c:2405
+#: src/gtkblist.c:2490
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -2359,7 +2377,7 @@
 "\n"
 "<b>Warned:</b>"
 
-#: src/gtkblist.c:2407
+#: src/gtkblist.c:2492
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2367,7 +2385,7 @@
 "\n"
 "<b>Description:</b> Spooky"
 
-#: src/gtkblist.c:2408
+#: src/gtkblist.c:2493
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
@@ -2375,7 +2393,7 @@
 "\n"
 "<b>Status</b>: Awesome"
 
-#: src/gtkblist.c:2409
+#: src/gtkblist.c:2494
 msgid ""
 "\n"
 "<b>Status</b>: Rockin'"
@@ -2383,77 +2401,77 @@
 "\n"
 "<b>Status</b>: Rockin'"
 
-#: src/gtkblist.c:2679
+#: src/gtkblist.c:2764
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "Idle (%dh%02dm) "
 
-#: src/gtkblist.c:2681
+#: src/gtkblist.c:2766
 #, c-format
 msgid "Idle (%dm) "
 msgstr "Idle (%dm) "
 
-#: src/gtkblist.c:2686
+#: src/gtkblist.c:2771
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "Warned (%d%%) "
 
-#: src/gtkblist.c:2689
+#: src/gtkblist.c:2774
 msgid "Offline "
 msgstr "Offline "
 
-#: src/gtkblist.c:2947
+#: src/gtkblist.c:3032
 msgid "/Tools/Away"
 msgstr "/Tools/Away"
 
-#: src/gtkblist.c:2950
+#: src/gtkblist.c:3035
 msgid "/Tools/Buddy Pounce"
 msgstr "/Tools/Buddy Pounce"
 
-#: src/gtkblist.c:2953
+#: src/gtkblist.c:3038
 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:3041
+#: src/gtkblist.c:3126
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Buddies/Show Offline Buddies"
 
-#: src/gtkblist.c:3043
+#: src/gtkblist.c:3128
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Buddies/Show Empty Groups"
 
-#: src/gtkblist.c:3067
+#: src/gtkblist.c:3152
 msgid "Send a message to the selected buddy"
 msgstr "Send a message to the selected buddy"
 
-#: src/gtkblist.c:3076
+#: src/gtkblist.c:3161
 msgid "Get information on the selected buddy"
 msgstr "Get information on the selected buddy"
 
-#: src/gtkblist.c:3079
+#: src/gtkblist.c:3164
 msgid "_Chat"
 msgstr "_Chat"
 
-#: src/gtkblist.c:3084
+#: src/gtkblist.c:3169
 msgid "Join a chat room"
 msgstr "Join a chat room"
 
-#: src/gtkblist.c:3087
+#: src/gtkblist.c:3172
 msgid "_Away"
 msgstr "_Away"
 
-#: src/gtkblist.c:3092
+#: src/gtkblist.c:3177
 msgid "Set an away message"
 msgstr "Set an away message"
 
-#: src/gtkblist.c:3824 src/protocols/yahoo/yahoo.c:2427
+#: src/gtkblist.c:3909 src/protocols/yahoo/yahoo.c:2431
 msgid "Add Buddy"
 msgstr "Add Buddy"
 
-#: src/gtkblist.c:3847
+#: src/gtkblist.c:3932
 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. "
@@ -2464,15 +2482,15 @@
 "The alias will be displayed in place of the screen name whenever possible.\n"
 
 #. Set up stuff for the account box
-#: src/gtkblist.c:3907 src/gtkblist.c:4191
+#: src/gtkblist.c:3992 src/gtkblist.c:4276
 msgid "Account:"
 msgstr "Account:"
 
-#: src/gtkblist.c:4158
+#: src/gtkblist.c:4243
 msgid "Add Chat"
 msgstr "Add Chat"
 
-#: src/gtkblist.c:4181
+#: src/gtkblist.c:4266
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -2480,15 +2498,15 @@
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
 
-#: src/gtkblist.c:4260
+#: src/gtkblist.c:4345
 msgid "Add Group"
 msgstr "Add Group"
 
-#: src/gtkblist.c:4261
+#: src/gtkblist.c:4346
 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:4780
+#: src/gtkblist.c:4866
 msgid "No actions available"
 msgstr "No actions available"
 
@@ -2537,20 +2555,25 @@
 msgid "Time"
 msgstr "Time"
 
-#: src/gtkconv.c:183
+#: src/gtkconv.c:173
+#, c-format
+msgid "<h1>Conversation with %s</h1>\n"
+msgstr "<h1>Conversation with %s</h1>\n"
+
+#: src/gtkconv.c:191
 msgid "That file already exists"
 msgstr "That file already exists"
 
-#: src/gtkconv.c:184 src/gtkft.c:1106
+#: src/gtkconv.c:192 src/gtkft.c:1106
 msgid "Would you like to overwrite it?"
 msgstr "Would you like to overwrite it?"
 
-#: src/gtkconv.c:470
+#: src/gtkconv.c:506
 msgid "Invite Buddy Into Chat Room"
 msgstr "Invite Buddy Into Chat Room"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:498
+#: src/gtkconv.c:534
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -2558,299 +2581,299 @@
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 
-#: src/gtkconv.c:519
+#: src/gtkconv.c:555
 msgid "_Buddy:"
 msgstr "_Buddy:"
 
-#: src/gtkconv.c:539
+#: src/gtkconv.c:575
 msgid "_Message:"
 msgstr "_Message:"
 
-#: src/gtkconv.c:632
+#: src/gtkconv.c:668
 msgid "Find"
 msgstr "Find"
 
-#: src/gtkconv.c:658
+#: src/gtkconv.c:694
 msgid "_Search for:"
 msgstr "_Search for:"
 
-#: src/gtkconv.c:1030
+#: src/gtkconv.c:1066
 msgid "IM"
 msgstr "IM"
 
-#: src/gtkconv.c:1038
+#: src/gtkconv.c:1074
 msgid "Un-Ignore"
 msgstr "Un-Ignore"
 
-#: src/gtkconv.c:1040 src/gtkprefs.c:784
+#: src/gtkconv.c:1076 src/gtkprefs.c:803
 msgid "Ignore"
 msgstr "Ignore"
 
 #. Info button
-#: src/gtkconv.c:1049 src/gtkconv.c:3303
+#: src/gtkconv.c:1085 src/gtkconv.c:3353
 msgid "Info"
 msgstr "Info"
 
-#: src/gtkconv.c:1058
+#: src/gtkconv.c:1094
 msgid "Get Away Msg"
 msgstr "Get Away Msg"
 
 #. Remove button
-#: src/gtkconv.c:1070 src/gtkconv.c:3296 src/gtkconv.c:3387
-#: src/gtkrequest.c:231
+#: src/gtkconv.c:1106 src/gtkconv.c:3346 src/gtkconv.c:3437
+#: src/gtkrequest.c:241
 msgid "Remove"
 msgstr "Remove"
 
-#: src/gtkconv.c:2162
+#: src/gtkconv.c:2208
 msgid "Animate"
 msgstr "Animate"
 
-#: src/gtkconv.c:2167
+#: src/gtkconv.c:2213
 msgid "Hide Icon"
 msgstr "Hide Icon"
 
-#: src/gtkconv.c:2173
+#: src/gtkconv.c:2219
 msgid "Save Icon As..."
 msgstr "Save Icon As..."
 
-#: src/gtkconv.c:2536
+#: src/gtkconv.c:2586
 msgid "User is typing..."
 msgstr "User is typing..."
 
-#: src/gtkconv.c:2544
+#: src/gtkconv.c:2594
 msgid "User has typed something and paused"
 msgstr "User has typed something and paused"
 
 #. Build the Send As menu
-#: src/gtkconv.c:2647
+#: src/gtkconv.c:2697
 msgid "_Send As"
 msgstr "_Send As"
 
-#: src/gtkconv.c:3067
+#: src/gtkconv.c:3117
 msgid "Save Conversation"
 msgstr "Save Conversation"
 
 #. Conversation menu
-#: src/gtkconv.c:3084
+#: src/gtkconv.c:3134
 msgid "/_Conversation"
 msgstr "/_Conversation"
 
-#: src/gtkconv.c:3086
+#: src/gtkconv.c:3136
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Conversation/New Instant _Message..."
 
-#: src/gtkconv.c:3091
+#: src/gtkconv.c:3141
 msgid "/Conversation/_Find..."
 msgstr "/Conversation/_Find..."
 
-#: src/gtkconv.c:3093
+#: src/gtkconv.c:3143
 msgid "/Conversation/View _Log"
 msgstr "/Conversation/View _Log"
 
-#: src/gtkconv.c:3094
+#: src/gtkconv.c:3144
 msgid "/Conversation/_Save As..."
 msgstr "/Conversation/_Save As..."
 
-#: src/gtkconv.c:3099
+#: src/gtkconv.c:3149
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Conversation/Add Buddy _Pounce..."
 
-#: src/gtkconv.c:3101
+#: src/gtkconv.c:3151
 msgid "/Conversation/_Get Info"
 msgstr "/Conversation/_Get Info"
 
-#: src/gtkconv.c:3103
+#: src/gtkconv.c:3153
 msgid "/Conversation/_Warn..."
 msgstr "/Conversation/_Warn..."
 
-#: src/gtkconv.c:3105
+#: src/gtkconv.c:3155
 msgid "/Conversation/In_vite..."
 msgstr "/Conversation/In_vite..."
 
-#: src/gtkconv.c:3110
+#: src/gtkconv.c:3160
 msgid "/Conversation/A_lias..."
 msgstr "/Conversation/A_lias..."
 
-#: src/gtkconv.c:3112
+#: src/gtkconv.c:3162
 msgid "/Conversation/_Block..."
 msgstr "/Conversation/_Block..."
 
-#: src/gtkconv.c:3114
+#: src/gtkconv.c:3164
 msgid "/Conversation/_Add..."
 msgstr "/Conversation/_Add..."
 
-#: src/gtkconv.c:3116
+#: src/gtkconv.c:3166
 msgid "/Conversation/_Remove..."
 msgstr "/Conversation/_Remove..."
 
-#: src/gtkconv.c:3121
+#: src/gtkconv.c:3171
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Conversation/Insert Lin_k..."
 
-#: src/gtkconv.c:3123
+#: src/gtkconv.c:3173
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Conversation/Insert Imag_e..."
 
-#: src/gtkconv.c:3128
+#: src/gtkconv.c:3178
 msgid "/Conversation/_Close"
 msgstr "/Conversation/_Close"
 
 #. Options
-#: src/gtkconv.c:3132
+#: src/gtkconv.c:3182
 msgid "/_Options"
 msgstr "/_Options"
 
-#: src/gtkconv.c:3133
+#: src/gtkconv.c:3183
 msgid "/Options/Enable _Logging"
 msgstr "/Options/Enable _Logging"
 
-#: src/gtkconv.c:3134
+#: src/gtkconv.c:3184
 msgid "/Options/Enable _Sounds"
 msgstr "/Options/Enable _Sounds"
 
-#: src/gtkconv.c:3135
+#: src/gtkconv.c:3185
 msgid "/Options/Show Formatting _Toolbar"
 msgstr "/Options/Show Formatting _Toolbar"
 
-#: src/gtkconv.c:3177
+#: src/gtkconv.c:3227
 msgid "/Conversation/View Log"
 msgstr "/Conversation/View Log"
 
-#: src/gtkconv.c:3182
+#: src/gtkconv.c:3232
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversation/Add Buddy Pounce..."
 
-#: src/gtkconv.c:3188
+#: src/gtkconv.c:3238
 msgid "/Conversation/Get Info"
 msgstr "/Conversation/Get Info"
 
-#: src/gtkconv.c:3192
+#: src/gtkconv.c:3242
 msgid "/Conversation/Warn..."
 msgstr "/Conversation/Warn..."
 
-#: src/gtkconv.c:3196
+#: src/gtkconv.c:3246
 msgid "/Conversation/Invite..."
 msgstr "/Conversation/Invite..."
 
-#: src/gtkconv.c:3202
+#: src/gtkconv.c:3252
 msgid "/Conversation/Alias..."
 msgstr "/Conversation/Alias..."
 
-#: src/gtkconv.c:3206
+#: src/gtkconv.c:3256
 msgid "/Conversation/Block..."
 msgstr "/Conversation/Block..."
 
-#: src/gtkconv.c:3210
+#: src/gtkconv.c:3260
 msgid "/Conversation/Add..."
 msgstr "/Conversation/Add..."
 
-#: src/gtkconv.c:3214
+#: src/gtkconv.c:3264
 msgid "/Conversation/Remove..."
 msgstr "/Conversation/Remove..."
 
-#: src/gtkconv.c:3220
+#: src/gtkconv.c:3270
 msgid "/Conversation/Insert Link..."
 msgstr "/Conversation/Insert Link..."
 
-#: src/gtkconv.c:3224
+#: src/gtkconv.c:3274
 msgid "/Conversation/Insert Image..."
 msgstr "/Conversation/Insert Image..."
 
-#: src/gtkconv.c:3230
+#: src/gtkconv.c:3280
 msgid "/Options/Enable Logging"
 msgstr "/Options/Enable Logging"
 
-#: src/gtkconv.c:3233
+#: src/gtkconv.c:3283
 msgid "/Options/Enable Sounds"
 msgstr "/Options/Enable Sounds"
 
-#: src/gtkconv.c:3236
+#: src/gtkconv.c:3286
 msgid "/Options/Show Formatting Toolbar"
 msgstr "/Options/Show Formatting Toolbar"
 
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:3259 src/gtkconv.c:3261 src/gtkconv.c:3359 src/gtkconv.c:3361
+#: src/gtkconv.c:3309 src/gtkconv.c:3311 src/gtkconv.c:3409 src/gtkconv.c:3411
 msgid "Send"
 msgstr "Send"
 
 #. Now, um, just kind of all over the place. Huh?
 #. Warn button
-#: src/gtkconv.c:3275
+#: src/gtkconv.c:3325
 msgid "Warn"
 msgstr "Warn"
 
-#: src/gtkconv.c:3278
+#: src/gtkconv.c:3328
 msgid "Warn the user"
 msgstr "Warn the user"
 
 #. Block button
-#: src/gtkconv.c:3282 src/gtkprivacy.c:598 src/gtkprivacy.c:609
+#: src/gtkconv.c:3332 src/gtkprivacy.c:612 src/gtkprivacy.c:623
 msgid "Block"
 msgstr "Block"
 
-#: src/gtkconv.c:3285
+#: src/gtkconv.c:3335
 msgid "Block the user"
 msgstr "Block the user"
 
-#: src/gtkconv.c:3292
+#: src/gtkconv.c:3342
 msgid "Add the user to your buddy list"
 msgstr "Add the user to your buddy list"
 
-#: src/gtkconv.c:3299
+#: src/gtkconv.c:3349
 msgid "Remove the user from your buddy list"
 msgstr "Remove the user from your buddy list"
 
-#: src/gtkconv.c:3306 src/gtkconv.c:3628
+#: src/gtkconv.c:3356 src/gtkconv.c:3678
 msgid "Get the user's information"
 msgstr "Get the user's information"
 
 #. Invite
-#: src/gtkconv.c:3373
+#: src/gtkconv.c:3423
 msgid "Invite"
 msgstr "Invite"
 
-#: src/gtkconv.c:3376
+#: src/gtkconv.c:3426
 msgid "Invite a user"
 msgstr "Invite a user"
 
-#: src/gtkconv.c:3383
+#: src/gtkconv.c:3433
 msgid "Add the chat to your buddy list"
 msgstr "Add the chat to your buddy list"
 
-#: src/gtkconv.c:3390
+#: src/gtkconv.c:3440
 msgid "Remove the chat from your buddy list"
 msgstr "Remove the chat from your buddy list"
 
-#: src/gtkconv.c:3490
+#: src/gtkconv.c:3540
 msgid "Topic:"
 msgstr "Topic:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3550
+#: src/gtkconv.c:3600
 msgid "0 people in room"
 msgstr "0 people in room"
 
-#: src/gtkconv.c:3605
+#: src/gtkconv.c:3655
 msgid "IM the user"
 msgstr "IM the user"
 
-#: src/gtkconv.c:3617
+#: src/gtkconv.c:3667
 msgid "Ignore the user"
 msgstr "Ignore the user"
 
-#: src/gtkconv.c:4155
+#: src/gtkconv.c:4208
 msgid "Close conversation"
 msgstr "Close conversation"
 
-#: src/gtkconv.c:4668 src/gtkconv.c:4700 src/gtkconv.c:4821 src/gtkconv.c:4888
+#: src/gtkconv.c:4736 src/gtkconv.c:4768 src/gtkconv.c:4889 src/gtkconv.c:4956
 #, 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:5404 src/gtkconv.c:5407
+#: src/gtkconv.c:5475 src/gtkconv.c:5478
 msgid "<main>/Conversation/Close"
 msgstr "<main>/Conversation/Close"
 
@@ -2982,24 +3005,40 @@
 msgid "Save As..."
 msgstr "Save As..."
 
-#: src/gtkft.c:1181
+#: src/gtkft.c:1183
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s wants to send you %s (%s)"
 
-#: src/gtkimhtml.c:829
+#: src/gtkft.c:1216
+#, c-format
+msgid "Accept file transfer request from %s?"
+msgstr "Accept file transfer request from %s?"
+
+#: src/gtkft.c:1220
+#, c-format
+msgid ""
+"A file is available for download from:\n"
+"Remote host: %s\n"
+"Remote port: %d"
+msgstr ""
+"A file is available for download from:\n"
+"Remote host: %s\n"
+"Remote port: %d"
+
+#: src/gtkimhtml.c:1108
 msgid "_Copy E-Mail Address"
 msgstr "_Copy E-Mail Address"
 
-#: src/gtkimhtml.c:841
+#: src/gtkimhtml.c:1120
 msgid "_Copy Link Location"
 msgstr "_Copy Link Location"
 
-#: src/gtkimhtml.c:851
+#: src/gtkimhtml.c:1130
 msgid "_Open Link in Browser"
 msgstr "_Open Link in Browser"
 
-#: src/gtkimhtml.c:2262
+#: src/gtkimhtml.c:2615
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
@@ -3007,32 +3046,32 @@
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
 
-#: src/gtkimhtml.c:2270
+#: src/gtkimhtml.c:2623
 #, c-format
 msgid "Error saving image: %s"
 msgstr "Error saving image: %s"
 
-#: src/gtkimhtml.c:2279
+#: src/gtkimhtml.c:2632
 msgid "Save Image"
 msgstr "Save Image"
 
-#: src/gtkimhtml.c:2302
+#: src/gtkimhtml.c:2655
 msgid "_Save Image..."
 msgstr "_Save Image..."
 
-#: src/gtkimhtmltoolbar.c:350
+#: src/gtkimhtmltoolbar.c:383
 msgid "_URL"
 msgstr "_URL"
 
-#: src/gtkimhtmltoolbar.c:354
+#: src/gtkimhtmltoolbar.c:387
 msgid "_Description"
 msgstr "_Description"
 
-#: src/gtkimhtmltoolbar.c:359
+#: src/gtkimhtmltoolbar.c:392
 msgid "Insert Link"
 msgstr "Insert Link"
 
-#: src/gtkimhtmltoolbar.c:361
+#: src/gtkimhtmltoolbar.c:394
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
@@ -3040,91 +3079,96 @@
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
 
-#: src/gtkimhtmltoolbar.c:365
+#: src/gtkimhtmltoolbar.c:398
 msgid "_Insert"
 msgstr "_Insert"
 
-#: src/gtkimhtmltoolbar.c:422
+#: src/gtkimhtmltoolbar.c:455
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Failed to store image: %s\n"
 
-#: src/gtkimhtmltoolbar.c:448
+#: src/gtkimhtmltoolbar.c:481
 msgid "Insert Image"
 msgstr "Insert Image"
 
 #. show everything
-#: src/gtkimhtmltoolbar.c:592
+#: src/gtkimhtmltoolbar.c:625
 msgid "Smile!"
 msgstr "Smile!"
 
-#: src/gtkimhtmltoolbar.c:722
+#: src/gtkimhtmltoolbar.c:825
 msgid "Bold"
 msgstr "Bold"
 
-#: src/gtkimhtmltoolbar.c:733
+#: src/gtkimhtmltoolbar.c:836
 msgid "Italic"
 msgstr "Italic"
 
-#: src/gtkimhtmltoolbar.c:744
+#: src/gtkimhtmltoolbar.c:847
 msgid "Underline"
 msgstr "Underline"
 
-#: src/gtkimhtmltoolbar.c:760
+#: src/gtkimhtmltoolbar.c:863
 msgid "Larger font size"
 msgstr "Larger font size"
 
-#: src/gtkimhtmltoolbar.c:772
+#: src/gtkimhtmltoolbar.c:875
 msgid "Smaller font size"
 msgstr "Smaller font size"
 
-#: src/gtkimhtmltoolbar.c:789
+#: src/gtkimhtmltoolbar.c:892
 msgid "Font Face"
 msgstr "Font Face"
 
-#: src/gtkimhtmltoolbar.c:801
+#: src/gtkimhtmltoolbar.c:904
 msgid "Foreground font color"
 msgstr "Foreground font colour"
 
-#: src/gtkimhtmltoolbar.c:813
+#: src/gtkimhtmltoolbar.c:916
 msgid "Background color"
 msgstr "Background colour"
 
-#: src/gtkimhtmltoolbar.c:828
+#: src/gtkimhtmltoolbar.c:931
 msgid "Insert link"
 msgstr "Insert link"
 
-#: src/gtkimhtmltoolbar.c:838
+#: src/gtkimhtmltoolbar.c:941
 msgid "Insert image"
 msgstr "Insert image"
 
-#: src/gtkimhtmltoolbar.c:849
+#: src/gtkimhtmltoolbar.c:952
 msgid "Insert smiley"
 msgstr "Insert smiley"
 
-#: src/gtklog.c:257
+#: src/gtklog.c:282
 msgid "Conversations with"
 msgstr "Conversations with"
 
+#. Window **********
+#: src/gtklog.c:368 src/gtklog.c:384
+msgid "System Log"
+msgstr "System Log"
+
 #. Descriptive label
-#: src/gtknotify.c:215
+#: src/gtknotify.c:217
 #, 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:227
+#: src/gtknotify.c:229
 #, c-format
 msgid "<span weight=\"bold\">From:</span> %s\n"
 msgstr "<span weight=\"bold\">From:</span> %s\n"
 
-#: src/gtknotify.c:233
+#: src/gtknotify.c:235
 #, c-format
 msgid "<span weight=\"bold\">Subject:</span> %s\n"
 msgstr "<span weight=\"bold\">Subject:</span> %s\n"
 
-#: src/gtknotify.c:237
+#: src/gtknotify.c:239
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3135,7 +3179,7 @@
 "\n"
 "%s%s%s%s"
 
-#: src/gtknotify.c:253
+#: src/gtknotify.c:255
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3146,22 +3190,22 @@
 "\n"
 "%s"
 
-#: src/gtknotify.c:439
+#: src/gtknotify.c:441
 #, 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
+#: src/gtknotify.c:444 src/gtknotify.c:458 src/gtknotify.c:473
+#: src/gtknotify.c:581
 msgid "Unable to open URL"
 msgstr "Unable to open URL"
 
-#: src/gtknotify.c:453 src/gtknotify.c:468
+#: src/gtknotify.c:455 src/gtknotify.c:470
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "Error launching \"%s\": %s"
 
-#: src/gtknotify.c:580
+#: src/gtknotify.c:582
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
@@ -3315,15 +3359,15 @@
 msgid "Unknown pounce event. Please report this!"
 msgstr "Unknown pounce event. Please report this!"
 
-#: src/gtkprefs.c:374
+#: src/gtkprefs.c:385
 msgid "Interface Options"
 msgstr "Interface Options"
 
-#: src/gtkprefs.c:376
+#: src/gtkprefs.c:387
 msgid "D_isplay remote nicknames if no alias is set"
 msgstr "D_isplay remote nicknames if no alias is set"
 
-#: src/gtkprefs.c:562
+#: src/gtkprefs.c:581
 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."
@@ -3331,28 +3375,28 @@
 "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:597
+#: src/gtkprefs.c:616
 msgid "Icon"
 msgstr "Icon"
 
-#: 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
+#: src/gtkprefs.c:623 src/gtkprefs.c:2065 src/protocols/jabber/buddy.c:265
+#: src/protocols/jabber/buddy.c:748 src/protocols/jabber/chat.c:684
 msgid "Description"
 msgstr "Description"
 
-#: src/gtkprefs.c:671
+#: src/gtkprefs.c:690
 msgid "Style"
 msgstr "Style"
 
-#: src/gtkprefs.c:672
+#: src/gtkprefs.c:691
 msgid "_Bold"
 msgstr "_Bold"
 
-#: src/gtkprefs.c:674
-msgid "_Italics"
-msgstr "_Italics"
-
-#: src/gtkprefs.c:676
+#: src/gtkprefs.c:693
+msgid "_Italic"
+msgstr "_Italic"
+
+#: src/gtkprefs.c:695
 msgid "_Underline"
 msgstr "_Underline"
 
@@ -3363,387 +3407,388 @@
 #. *
 #. * remove this after string freeze ends
 #.
-#: src/gtkprefs.c:686
+#: src/gtkprefs.c:705
 msgid "_Strikethrough"
 msgstr "_Strikethrough"
 
-#: src/gtkprefs.c:689
+#: src/gtkprefs.c:708
 msgid "Face"
 msgstr "Face"
 
-#: src/gtkprefs.c:692
+#: src/gtkprefs.c:711
 msgid "Use custo_m face"
 msgstr "Use custo_m face"
 
-#: src/gtkprefs.c:709
+#: src/gtkprefs.c:728
 msgid "Use custom si_ze"
 msgstr "Use custom si_ze"
 
-#: src/gtkprefs.c:721
+#: src/gtkprefs.c:740
 msgid "Color"
 msgstr "Colour"
 
-#: src/gtkprefs.c:725
+#: src/gtkprefs.c:744
 msgid "_Text color"
 msgstr "_Text colour"
 
-#: src/gtkprefs.c:744
+#: src/gtkprefs.c:763
 msgid "Bac_kground color"
 msgstr "Bac_kground colour"
 
-#: src/gtkprefs.c:772 src/gtkprefs.c:1004 src/gtkprefs.c:1052
+#: src/gtkprefs.c:791 src/gtkprefs.c:1023 src/gtkprefs.c:1071
 msgid "Display"
 msgstr "Display"
 
-#: src/gtkprefs.c:773
+#: src/gtkprefs.c:792
 msgid "Show graphical _smileys"
 msgstr "Show graphical _smileys"
 
-#: src/gtkprefs.c:775
+#: src/gtkprefs.c:794
 msgid "Show _timestamp on messages"
 msgstr "Show _timestamp on messages"
 
-#: src/gtkprefs.c:777
+#: src/gtkprefs.c:796
 msgid "Show _URLs as links"
 msgstr "Show _URLs as links"
 
-#: src/gtkprefs.c:781
+#: src/gtkprefs.c:800
 msgid "_Highlight misspelled words"
 msgstr "_Highlight misspelled words"
 
-#: src/gtkprefs.c:785
+#: src/gtkprefs.c:804
 msgid "Ignore c_olors"
 msgstr "Ignore c_olours"
 
-#: src/gtkprefs.c:787
+#: src/gtkprefs.c:806
 msgid "Ignore font _faces"
 msgstr "Ignore font _faces"
 
-#: src/gtkprefs.c:789
+#: src/gtkprefs.c:808
 msgid "Ignore font si_zes"
 msgstr "Ignore font si_zes"
 
-#: src/gtkprefs.c:802
+#: src/gtkprefs.c:821
 msgid "Send Message"
 msgstr "Send Message"
 
-#: src/gtkprefs.c:803
+#: src/gtkprefs.c:822
 msgid "Enter _sends message"
 msgstr "Enter _sends message"
 
-#: src/gtkprefs.c:805
+#: src/gtkprefs.c:824
 msgid "C_ontrol-Enter sends message"
 msgstr "C_ontrol-Enter sends message"
 
-#: src/gtkprefs.c:808
+#: src/gtkprefs.c:827
 msgid "Window Closing"
 msgstr "Window Closing"
 
-#: src/gtkprefs.c:809
+#: src/gtkprefs.c:828
 msgid "_Escape closes window"
 msgstr "_Escape closes window"
 
-#: src/gtkprefs.c:812
+#: src/gtkprefs.c:831
 msgid "Insertions"
 msgstr "Insertions"
 
-#: src/gtkprefs.c:813
+#: src/gtkprefs.c:832
 msgid "Control-{B/I/U} inserts _HTML tags"
 msgstr "Control-{B/I/U} inserts _HTML tags"
 
-#: src/gtkprefs.c:815
+#: src/gtkprefs.c:834
 msgid "Control-(number) _inserts smileys"
 msgstr "Control-(number) _inserts smileys"
 
-#: src/gtkprefs.c:831
+#: src/gtkprefs.c:850
 msgid "Buddy List Sorting"
 msgstr "Buddy List Sorting"
 
-#: src/gtkprefs.c:840
+#: src/gtkprefs.c:859
 msgid "_Sorting:"
 msgstr "_Sorting:"
 
-#: src/gtkprefs.c:845
+#: src/gtkprefs.c:864
 msgid "Buddy List Toolbar"
 msgstr "Buddy List Toolbar"
 
-#: src/gtkprefs.c:846 src/gtkprefs.c:977 src/gtkprefs.c:1028
+#: src/gtkprefs.c:865 src/gtkprefs.c:996 src/gtkprefs.c:1047
 msgid "Show _buttons as:"
 msgstr "Show _buttons as:"
 
-#: src/gtkprefs.c:848 src/gtkprefs.c:979 src/gtkprefs.c:1030
+#: src/gtkprefs.c:867 src/gtkprefs.c:998 src/gtkprefs.c:1049
 msgid "Pictures"
 msgstr "Pictures"
 
-#: src/gtkprefs.c:849 src/gtkprefs.c:980 src/gtkprefs.c:1031
+#: src/gtkprefs.c:868 src/gtkprefs.c:999 src/gtkprefs.c:1050
 msgid "Text"
 msgstr "Text"
 
-#: src/gtkprefs.c:850 src/gtkprefs.c:981 src/gtkprefs.c:1032
+#: src/gtkprefs.c:869 src/gtkprefs.c:1000 src/gtkprefs.c:1051
 msgid "Pictures and text"
 msgstr "Pictures and text"
 
-#: src/gtkprefs.c:855 src/gtkprefs.c:992 src/gtkprefs.c:1043
+#: src/gtkprefs.c:874 src/gtkprefs.c:1011 src/gtkprefs.c:1062
 msgid "_Raise window on events"
 msgstr "_Raise window on events"
 
-#: src/gtkprefs.c:858
+#: src/gtkprefs.c:877
 msgid "Group Display"
 msgstr "Group Display"
 
-#: src/gtkprefs.c:859
+#: src/gtkprefs.c:878
 msgid "Show _numbers in groups"
 msgstr "Show _numbers in groups"
 
-#: src/gtkprefs.c:862
+#: src/gtkprefs.c:881
 msgid "Buddy Display"
 msgstr "Buddy Display"
 
-#: src/gtkprefs.c:863 src/gtkprefs.c:999
+#: src/gtkprefs.c:882 src/gtkprefs.c:1018
 msgid "Show buddy _icons"
 msgstr "Show buddy _icons"
 
-#: src/gtkprefs.c:865
+#: src/gtkprefs.c:884
 msgid "Show _warning levels"
 msgstr "Show _warning levels"
 
-#: src/gtkprefs.c:867
+#: src/gtkprefs.c:886
 msgid "Show idle _times"
 msgstr "Show idle _times"
 
-#: src/gtkprefs.c:869
+#: src/gtkprefs.c:888
 msgid "Dim i_dle buddies"
 msgstr "Dim i_dle buddies"
 
-#: src/gtkprefs.c:871
+#: src/gtkprefs.c:890
 msgid "_Automatically expand contacts"
 msgstr "_Automatically expand contacts"
 
-#: src/gtkprefs.c:896
+#: src/gtkprefs.c:915
 msgid "_Placement:"
 msgstr "_Placement:"
 
-#: src/gtkprefs.c:903
-msgid "Send _URLs as Links"
-msgstr "Send _URLs as Links"
-
-#: src/gtkprefs.c:906
-msgid "Show _Formatting Toolbar"
-msgstr "Show _Formatting Toolbar"
-
-#: src/gtkprefs.c:909
+#: src/gtkprefs.c:922
+msgid "Send _URLs as links"
+msgstr "Send _URLs as links"
+
+#: src/gtkprefs.c:925
+msgid "Show _formatting toolbar"
+msgstr "Show _formatting toolbar"
+
+#: src/gtkprefs.c:928
 msgid "Show a_liases in tabs/titles"
 msgstr "Show a_liases in tabs/titles"
 
-#: src/gtkprefs.c:912
+#: src/gtkprefs.c:931
 msgid "Tab Options"
 msgstr "Tab Options"
 
-#: src/gtkprefs.c:914
+#: src/gtkprefs.c:933
 msgid "_Tab Placement:"
 msgstr "_Tab Placement:"
 
-#: src/gtkprefs.c:916
+#: src/gtkprefs.c:935
 msgid "Top"
 msgstr "Top"
 
-#: src/gtkprefs.c:917
+#: src/gtkprefs.c:936
 msgid "Bottom"
 msgstr "Bottom"
 
-#: src/gtkprefs.c:918
+#: src/gtkprefs.c:937
 msgid "Left"
 msgstr "Left"
 
-#: src/gtkprefs.c:919
+#: src/gtkprefs.c:938
 msgid "Right"
 msgstr "Right"
 
-#: src/gtkprefs.c:925
+#: src/gtkprefs.c:944
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Show IMs and chats in _tabbed windows"
 
-#: src/gtkprefs.c:928
+#: src/gtkprefs.c:947
 msgid "Show IMs and chats in _same tabbed window"
 msgstr "Show IMs and chats in _same tabbed window"
 
-#: src/gtkprefs.c:938
+#: src/gtkprefs.c:957
 msgid "Show _close button on tabs"
 msgstr "Show _close button on tabs"
 
-#: src/gtkprefs.c:949
+#: src/gtkprefs.c:968
 msgid "Show status _icons on tabs"
 msgstr "Show status _icons on tabs"
 
-#: src/gtkprefs.c:976 src/gtkprefs.c:1027
+#: src/gtkprefs.c:995 src/gtkprefs.c:1046
 msgid "Window"
 msgstr "Window"
 
-#: src/gtkprefs.c:986 src/gtkprefs.c:1037
+#: src/gtkprefs.c:1005 src/gtkprefs.c:1056
 msgid "New window _width:"
 msgstr "New window _width:"
 
-#: src/gtkprefs.c:988 src/gtkprefs.c:1039
+#: src/gtkprefs.c:1007 src/gtkprefs.c:1058
 msgid "New window _height:"
 msgstr "New window _height:"
 
-#: src/gtkprefs.c:990 src/gtkprefs.c:1041
+#: src/gtkprefs.c:1009 src/gtkprefs.c:1060
 msgid "_Entry field height:"
 msgstr "_Entry field height:"
 
-#: src/gtkprefs.c:994
+#: src/gtkprefs.c:1013
 msgid "Hide window on _send"
 msgstr "Hide window on _send"
 
-#: src/gtkprefs.c:998
+#: src/gtkprefs.c:1017
 msgid "Buddy Icons"
 msgstr "Buddy Icons"
 
-#: src/gtkprefs.c:1001
+#: src/gtkprefs.c:1020
 msgid "Enable buddy icon a_nimation"
 msgstr "Enable buddy icon a_nimation"
 
-#: src/gtkprefs.c:1005
+#: src/gtkprefs.c:1024
 msgid "Show _logins in window"
 msgstr "Show _logins in window"
 
-#: src/gtkprefs.c:1008
+#: src/gtkprefs.c:1027
 msgid "Typing Notification"
 msgstr "Typing Notification"
 
-#: src/gtkprefs.c:1009
+#: src/gtkprefs.c:1028
 msgid "Notify buddies that you are _typing to them"
 msgstr "Notify buddies that you are _typing to them"
 
-#: src/gtkprefs.c:1046
+#: src/gtkprefs.c:1065
 msgid "Tab Completion"
 msgstr "Tab Completion"
 
-#: src/gtkprefs.c:1047
+#: src/gtkprefs.c:1066
 msgid "_Tab-complete nicks"
 msgstr "_Tab-complete nicks"
 
-#: src/gtkprefs.c:1049
+#: src/gtkprefs.c:1068
 msgid "_Old-style tab completion"
 msgstr "_Old-style tab completion"
 
-#: src/gtkprefs.c:1053
+#: src/gtkprefs.c:1072
 msgid "_Show people joining in window"
 msgstr "_Show people joining in window"
 
-#: src/gtkprefs.c:1055
+#: src/gtkprefs.c:1074
 msgid "_Show people leaving in window"
 msgstr "_Show people leaving in window"
 
-#: src/gtkprefs.c:1057
+#: src/gtkprefs.c:1076
 msgid "Co_lorize screen names"
 msgstr "Co_lourise screen names"
 
-#: src/gtkprefs.c:1078
+#: src/gtkprefs.c:1097 src/protocols/oscar/oscar.c:587
+#: src/protocols/oscar/oscar.c:4215
 msgid "IP Address"
 msgstr "IP Address"
 
-#: src/gtkprefs.c:1080
+#: src/gtkprefs.c:1099
 msgid "_Autodetect IP Address"
 msgstr "_Autodetect IP Address"
 
-#: src/gtkprefs.c:1089
+#: src/gtkprefs.c:1108
 msgid "Public _IP:"
 msgstr "Public _IP:"
 
-#: src/gtkprefs.c:1113
+#: src/gtkprefs.c:1132
 msgid "Ports"
 msgstr "Ports"
 
-#: src/gtkprefs.c:1116
+#: src/gtkprefs.c:1135
 msgid "_Manually specify range of ports to listen on"
 msgstr "_Manually specify range of ports to listen on"
 
-#: src/gtkprefs.c:1119
+#: src/gtkprefs.c:1138
 msgid "_Start Port:"
 msgstr "_Start Port:"
 
-#: src/gtkprefs.c:1126
+#: src/gtkprefs.c:1145
 msgid "_End Port:"
 msgstr "_End Port:"
 
-#: src/gtkprefs.c:1174
+#: src/gtkprefs.c:1193
 msgid "Proxy Type"
 msgstr "Proxy Type"
 
-#: src/gtkprefs.c:1177
+#: src/gtkprefs.c:1196
 msgid "No proxy"
 msgstr "No proxy"
 
-#: src/gtkprefs.c:1184
+#: src/gtkprefs.c:1203
 msgid "Proxy Server"
 msgstr "Proxy Server"
 
-#: src/gtkprefs.c:1242
+#: src/gtkprefs.c:1261
 msgid "_User:"
 msgstr "_User:"
 
-#: src/gtkprefs.c:1298
+#: src/gtkprefs.c:1317
 msgid "Opera"
 msgstr "Opera"
 
-#: src/gtkprefs.c:1299
+#: src/gtkprefs.c:1318
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/gtkprefs.c:1300
+#: src/gtkprefs.c:1319
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: src/gtkprefs.c:1301
+#: src/gtkprefs.c:1320
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/gtkprefs.c:1302
+#: src/gtkprefs.c:1321
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/gtkprefs.c:1303
+#: src/gtkprefs.c:1322
 msgid "Firebird"
 msgstr "Firebird"
 
-#: src/gtkprefs.c:1304
+#: src/gtkprefs.c:1323
 msgid "Firefox"
 msgstr "Firefox"
 
-#: src/gtkprefs.c:1305
+#: src/gtkprefs.c:1324
 msgid "Gnome Default"
 msgstr "Gnome Default"
 
-#: src/gtkprefs.c:1314
+#: src/gtkprefs.c:1333
 msgid "Manual"
 msgstr "Manual"
 
-#: src/gtkprefs.c:1365
+#: src/gtkprefs.c:1384
 msgid "Browser Selection"
 msgstr "Browser Selection"
 
-#: src/gtkprefs.c:1369
+#: src/gtkprefs.c:1388
 msgid "_Browser:"
 msgstr "_Browser:"
 
-#: src/gtkprefs.c:1376
+#: src/gtkprefs.c:1395
 msgid "_Open link in:"
 msgstr "_Open Link in:"
 
-#: src/gtkprefs.c:1378
+#: src/gtkprefs.c:1397
 msgid "Browser default"
 msgstr "Browser default"
 
-#: src/gtkprefs.c:1379
+#: src/gtkprefs.c:1398
 msgid "Existing window"
 msgstr "Existing window"
 
-#: src/gtkprefs.c:1381
+#: src/gtkprefs.c:1400
 msgid "New tab"
 msgstr "New tab"
 
-#: src/gtkprefs.c:1395
+#: src/gtkprefs.c:1414
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -3752,55 +3797,83 @@
 "_Manual:\n"
 "(%s for URL)"
 
-#: src/gtkprefs.c:1428
+#: src/gtkprefs.c:1451
 msgid "Message Logs"
 msgstr "Message Logs"
 
-#: src/gtkprefs.c:1431
+#: src/gtkprefs.c:1454
 msgid "Log _Format:"
 msgstr "Log _Format:"
 
-#: src/gtkprefs.c:1434
+#: src/gtkprefs.c:1457
 msgid "_Log all instant messages"
 msgstr "_Log all instant messages"
 
-#: src/gtkprefs.c:1436
+#: src/gtkprefs.c:1459
 msgid "Log all c_hats"
 msgstr "Log all c_hats"
 
-#: src/gtkprefs.c:1491
+#: src/gtkprefs.c:1462
+msgid "System Logs"
+msgstr "System Logs"
+
+#: src/gtkprefs.c:1464
+msgid "_Enable system log"
+msgstr "_Enable system log"
+
+#: src/gtkprefs.c:1467
+msgid "Log when buddies _sign on/sign off"
+msgstr "Log when buddies _sign on/sign off"
+
+#: src/gtkprefs.c:1473
+msgid "Log when buddies become _idle/un-idle"
+msgstr "Log when buddies become _idle/un-idle"
+
+#: src/gtkprefs.c:1479
+msgid "Log when buddies go away/come _back"
+msgstr "Log when buddies go away/come _back"
+
+#: src/gtkprefs.c:1485
+msgid "Log your _own signons/idleness/awayness"
+msgstr "Log your _own signons/idleness/awayness"
+
+#: src/gtkprefs.c:1536
 msgid "Sound Options"
 msgstr "Sound Options"
 
-#: src/gtkprefs.c:1492
-msgid "_No sounds when you log in"
-msgstr "_No sounds when you log in"
-
-#: src/gtkprefs.c:1494
+#: src/gtkprefs.c:1537
+msgid "Sounds when you _log in"
+msgstr "Sounds when you _log in"
+
+#: src/gtkprefs.c:1539
+msgid "Sounds when conversation has _focus"
+msgstr "Sounds when conversation has _focus"
+
+#: src/gtkprefs.c:1541
 msgid "_Sounds while away"
 msgstr "_Sounds while away"
 
-#: src/gtkprefs.c:1498
+#: src/gtkprefs.c:1545
 msgid "Sound Method"
 msgstr "Sound Method"
 
-#: src/gtkprefs.c:1499
+#: src/gtkprefs.c:1546
 msgid "_Method:"
 msgstr "_Method:"
 
-#: src/gtkprefs.c:1501
+#: src/gtkprefs.c:1548
 msgid "Console beep"
 msgstr "Console beep"
 
-#: src/gtkprefs.c:1503
+#: src/gtkprefs.c:1550
 msgid "Automatic"
 msgstr "Automatic"
 
-#: src/gtkprefs.c:1510
+#: src/gtkprefs.c:1557
 msgid "Command"
 msgstr "Command"
 
-#: src/gtkprefs.c:1520
+#: src/gtkprefs.c:1567
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -3809,72 +3882,72 @@
 "Sound c_ommand:\n"
 "(%s for filename)"
 
-#: src/gtkprefs.c:1577
+#: src/gtkprefs.c:1624
 msgid "_Sending messages removes away status"
 msgstr "_Sending messages removes away status"
 
-#: src/gtkprefs.c:1579
+#: src/gtkprefs.c:1626
 msgid "_Queue new messages when away"
 msgstr "_Queue new messages when away"
 
-#: src/gtkprefs.c:1582
+#: src/gtkprefs.c:1629
 msgid "Auto-response"
 msgstr "Auto-response"
 
-#: src/gtkprefs.c:1585
+#: src/gtkprefs.c:1632
 msgid "Seconds before _resending:"
 msgstr "Seconds before _resending:"
 
-#: src/gtkprefs.c:1588
+#: src/gtkprefs.c:1635
 msgid "_Send auto-response"
 msgstr "_Send auto-response"
 
-#: src/gtkprefs.c:1590
+#: src/gtkprefs.c:1637
 msgid "_Only send auto-response when idle"
 msgstr "_Only send auto-response when idle"
 
-#: src/gtkprefs.c:1592
+#: src/gtkprefs.c:1639
 msgid "Send auto-response in _active conversations"
 msgstr "Send auto-response in _active conversations"
 
-#: src/gtkprefs.c:1601 src/protocols/msn/state.c:30
-#: src/protocols/yahoo/yahoo.c:2291
+#: src/gtkprefs.c:1648 src/protocols/msn/state.c:30
+#: src/protocols/oscar/oscar.c:3373 src/protocols/yahoo/yahoo.c:2295
 msgid "Idle"
 msgstr "Idle"
 
-#: src/gtkprefs.c:1602
+#: src/gtkprefs.c:1649
 msgid "Idle _time reporting:"
 msgstr "Idle _time reporting:"
 
-#: src/gtkprefs.c:1605
+#: src/gtkprefs.c:1652
 msgid "Gaim usage"
 msgstr "Gaim usage"
 
-#: src/gtkprefs.c:1608
+#: src/gtkprefs.c:1655
 msgid "X usage"
 msgstr "X usage"
 
-#: src/gtkprefs.c:1610
+#: src/gtkprefs.c:1657
 msgid "Windows usage"
 msgstr "Windows usage"
 
-#: src/gtkprefs.c:1618
+#: src/gtkprefs.c:1665
 msgid "Auto-away"
 msgstr "Auto-away"
 
-#: src/gtkprefs.c:1619
+#: src/gtkprefs.c:1666
 msgid "Set away _when idle"
 msgstr "Set away _when idle"
 
-#: src/gtkprefs.c:1623
+#: src/gtkprefs.c:1670
 msgid "_Minutes before setting away:"
 msgstr "_Minutes before setting away:"
 
-#: src/gtkprefs.c:1631
+#: src/gtkprefs.c:1678
 msgid "Away m_essage:"
 msgstr "Away m_essage:"
 
-#: src/gtkprefs.c:1786
+#: src/gtkprefs.c:1833
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3889,7 +3962,7 @@
 "<span weight=\"bold\">Web site:</span>\t\t%s\n"
 "<span weight=\"bold\">File name:</span>\t%s"
 
-#: src/gtkprefs.c:1791
+#: src/gtkprefs.c:1838
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3904,108 +3977,108 @@
 "<span weight=\"bold\">URL:</span>  %s\n"
 "<span weight=\"bold\">File name:</span>  %s"
 
-#: src/gtkprefs.c:1974
+#: src/gtkprefs.c:2021
 msgid "Load"
 msgstr "Load"
 
-#: src/gtkprefs.c:1988
+#: src/gtkprefs.c:2035
 msgid "Summary"
 msgstr "Summary"
 
-#: src/gtkprefs.c:2036
+#: src/gtkprefs.c:2083
 msgid "Details"
 msgstr "Details"
 
-#: src/gtkprefs.c:2163
+#: src/gtkprefs.c:2210
 msgid "Sound Selection"
 msgstr "Sound Selection"
 
-#: src/gtkprefs.c:2270
+#: src/gtkprefs.c:2317
 msgid "Play"
 msgstr "Play"
 
-#: src/gtkprefs.c:2277
+#: src/gtkprefs.c:2324
 msgid "Event"
 msgstr "Event"
 
-#: src/gtkprefs.c:2296
+#: src/gtkprefs.c:2343
 msgid "Test"
 msgstr "Test"
 
-#: src/gtkprefs.c:2300
+#: src/gtkprefs.c:2347
 msgid "Reset"
 msgstr "Reset"
 
-#: src/gtkprefs.c:2304
+#: src/gtkprefs.c:2351
 msgid "Choose..."
 msgstr "Choose..."
 
-#: src/gtkprefs.c:2439
+#: src/gtkprefs.c:2486
 msgid "_Edit"
 msgstr "_Edit"
 
-#: src/gtkprefs.c:2475
+#: src/gtkprefs.c:2522
 msgid "Interface"
 msgstr "Interface"
 
-#: src/gtkprefs.c:2476
+#: src/gtkprefs.c:2523
 msgid "Smiley Themes"
 msgstr "Smiley Themes"
 
-#: src/gtkprefs.c:2477
+#: src/gtkprefs.c:2524
 msgid "Fonts"
 msgstr "Fonts"
 
-#: src/gtkprefs.c:2478
+#: src/gtkprefs.c:2525
 msgid "Message Text"
 msgstr "Message Text"
 
-#: src/gtkprefs.c:2479
+#: src/gtkprefs.c:2526
 msgid "Shortcuts"
 msgstr "Shortcuts"
 
-#: src/gtkprefs.c:2482
+#: src/gtkprefs.c:2529
 msgid "IMs"
 msgstr "IMs"
 
-#: src/gtkprefs.c:2484
+#: src/gtkprefs.c:2531
 msgid "Network"
 msgstr "Network"
 
-#: src/gtkprefs.c:2485
+#: src/gtkprefs.c:2532
 msgid "Proxy"
 msgstr "Proxy"
 
 #. We use the registered default browser in windows
-#: src/gtkprefs.c:2488
+#: src/gtkprefs.c:2535
 msgid "Browser"
 msgstr "Browser"
 
-#: src/gtkprefs.c:2490
+#: src/gtkprefs.c:2537
 msgid "Logging"
 msgstr "Logging"
 
-#: src/gtkprefs.c:2491
+#: src/gtkprefs.c:2538
 msgid "Sounds"
 msgstr "Sounds"
 
-#: src/gtkprefs.c:2492
+#: src/gtkprefs.c:2539
 msgid "Sound Events"
 msgstr "Sound Events"
 
-#: src/gtkprefs.c:2493
+#: src/gtkprefs.c:2540
 msgid "Away / Idle"
 msgstr "Away / Idle"
 
-#: src/gtkprefs.c:2494
+#: src/gtkprefs.c:2541
 msgid "Away Messages"
 msgstr "Away Messages"
 
-#: src/gtkprefs.c:2496
+#: src/gtkprefs.c:2543
 msgid "Protocols"
 msgstr "Protocols"
 
-#: src/gtkprefs.c:2512
+#: src/gtkprefs.c:2559
 msgid "Plugins"
 msgstr "Plugins"
 
@@ -4029,63 +4102,63 @@
 msgid "Block only the users below"
 msgstr "Block only the users below"
 
-#: src/gtkprivacy.c:360 src/protocols/jabber/jabber.c:1406
+#: src/gtkprivacy.c:374 src/protocols/jabber/jabber.c:1398
 msgid "Privacy"
 msgstr "Privacy"
 
-#: src/gtkprivacy.c:375
+#: src/gtkprivacy.c:389
 msgid "Changes to privacy settings take effect immediately."
 msgstr "Changes to privacy settings take effect immediately."
 
 #. "Set privacy for:" label
-#: src/gtkprivacy.c:387
+#: src/gtkprivacy.c:401
 msgid "Set privacy for:"
 msgstr "Set privacy for:"
 
-#: src/gtkprivacy.c:555 src/gtkprivacy.c:571
+#: src/gtkprivacy.c:569 src/gtkprivacy.c:585
 msgid "Permit User"
 msgstr "Permit User"
 
-#: src/gtkprivacy.c:556
+#: src/gtkprivacy.c:570
 msgid "Type a user you permit to contact you."
 msgstr "Type a user you permit to contact you."
 
-#: src/gtkprivacy.c:557
+#: src/gtkprivacy.c:571
 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:560 src/gtkprivacy.c:573
+#: src/gtkprivacy.c:574 src/gtkprivacy.c:587
 msgid "Permit"
 msgstr "Permit"
 
-#: src/gtkprivacy.c:565
+#: src/gtkprivacy.c:579
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "Allow %s to contact you?"
 
-#: src/gtkprivacy.c:567
+#: src/gtkprivacy.c:581
 #, 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:594 src/gtkprivacy.c:607
+#: src/gtkprivacy.c:608 src/gtkprivacy.c:621
 msgid "Block User"
 msgstr "Block User"
 
-#: src/gtkprivacy.c:595
+#: src/gtkprivacy.c:609
 msgid "Type a user to block."
 msgstr "Type a user to block."
 
-#: src/gtkprivacy.c:596
+#: src/gtkprivacy.c:610
 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:603
+#: src/gtkprivacy.c:617
 #, c-format
 msgid "Block %s?"
 msgstr "Block %s?"
 
-#: src/gtkprivacy.c:605
+#: src/gtkprivacy.c:619
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "Are you sure you want to block %s?"
@@ -4093,19 +4166,19 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:223 src/protocols/gg/gg.c:663 src/request.h:1228
+#: src/gtkrequest.c:233 src/protocols/gg/gg.c:663 src/request.h:1231
 msgid "Yes"
 msgstr "Yes"
 
-#: src/gtkrequest.c:224 src/protocols/gg/gg.c:663 src/request.h:1228
+#: src/gtkrequest.c:234 src/protocols/gg/gg.c:663 src/request.h:1231
 msgid "No"
 msgstr "No"
 
-#: src/gtkrequest.c:227
+#: src/gtkrequest.c:237
 msgid "Apply"
 msgstr "Apply"
 
-#: src/gtkrequest.c:228 src/protocols/msn/msn.c:248
+#: src/gtkrequest.c:238 src/protocols/msn/msn.c:260
 msgid "Close"
 msgstr "Close"
 
@@ -4166,12 +4239,12 @@
 msgid "Someone says your name in chat"
 msgstr "Someone says your name in chat"
 
-#: src/gtksound.c:157
+#: src/gtksound.c:158
 #, c-format
 msgid "Unable to play sound because the chosen file (%s) does not exist."
 msgstr "Unable to play sound because the chosen file (%s) does not exist."
 
-#: src/gtksound.c:173
+#: src/gtksound.c:174
 msgid ""
 "Unable to play sound because the 'Command' sound method has been chosen, but "
 "no command has been set."
@@ -4179,7 +4252,7 @@
 "Unable to play sound because the 'Command' sound method has been chosen, but "
 "no command has been set."
 
-#: src/gtksound.c:185
+#: src/gtksound.c:186
 #, c-format
 msgid ""
 "Unable to play sound because the configured sound command could not be "
@@ -4196,15 +4269,15 @@
 msgid "Save Icon"
 msgstr "Save Icon"
 
-#: src/log.c:88
+#: src/log.c:106
 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:433
+#: src/log.c:476
 msgid "XML"
 msgstr "XML"
 
-#: src/log.c:514
+#: src/log.c:561
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4213,7 +4286,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
 
-#: src/log.c:516
+#: src/log.c:563
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4222,50 +4295,50 @@
 "<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
+#: src/log.c:614 src/log.c:800
 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:570 src/log.c:706
+#: src/log.c:624 src/log.c:812
 #, 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:574
+#: src/log.c:661
 msgid "HTML"
 msgstr "HTML"
 
-#: src/log.c:649
+#: src/log.c:745
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
-#: src/log.c:710
+#: src/log.c:845
 msgid "Plain text"
 msgstr "Plain text"
 
-#: src/main.c:157
+#: src/main.c:156
 msgid "Please create an account."
 msgstr "Please create an account."
 
-#: src/main.c:239
+#: src/main.c:238
 msgid "Login"
 msgstr "Login"
 
-#: src/main.c:257
+#: src/main.c:256
 msgid "<b>Screen Name:</b>"
 msgstr "<b>Screen Name:</b>"
 
-#: src/main.c:271
+#: src/main.c:270
 msgid "<b>Password:</b>"
 msgstr "<b>Password:</b>"
 
-#: src/main.c:300
+#: src/main.c:299
 msgid "Sign on"
 msgstr "Sign on"
 
 #. full help text
-#: src/main.c:524
+#: src/main.c:523
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -4278,7 +4351,7 @@
 "                      account(s) to use, seperated by commas)\n"
 "  -n, --loginwin      don't automatically login; show login window\n"
 "  -u, --user=NAME     use account NAME\n"
-"  -f, --file=FILE     use FILE as config\n"
+"  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
 "  -v, --version       display the current version and exit\n"
 "  -h, --help          display this help and exit\n"
@@ -4293,13 +4366,13 @@
 "                      account(s) to use, seperated by commas)\n"
 "  -n, --loginwin      don't automatically login; show login window\n"
 "  -u, --user=NAME     use account NAME\n"
-"  -f, --file=FILE     use FILE as config\n"
+"  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
 "  -v, --version       display the current version and exit\n"
 "  -h, --help          display this help and exit\n"
 
 #. short message
-#: src/main.c:539
+#: src/main.c:538
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr "Gaim %s. Try `%s -h' for more information.\n"
@@ -4322,15 +4395,15 @@
 msgid "The required plugin %s was unable to load."
 msgstr "The required plugin %s was unable to load."
 
-#: src/prefs.c:113 src/status.c:271
+#: src/prefs.c:113 src/status.c:273
 msgid "Slightly less boring default"
 msgstr "Slightly less boring default"
 
-#: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:111
-#: src/protocols/msn/msn.c:345 src/protocols/msn/state.c:27
+#: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:44
+#: src/protocols/msn/msn.c:359 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:2594
-#: src/protocols/yahoo/yahoo.c:2703
+#: src/protocols/msn/state.c:36 src/protocols/oscar/oscar.c:606
+#: src/protocols/yahoo/yahoo.c:2599 src/protocols/yahoo/yahoo.c:2714
 msgid "Available"
 msgstr "Available"
 
@@ -4342,12 +4415,12 @@
 msgid "Away for friends only"
 msgstr "Away for friends only"
 
-#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:964
-#: 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
+#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:955
+#: src/protocols/jabber/presence.c:126 src/protocols/oscar/oscar.c:524
+#: src/protocols/oscar/oscar.c:4733 src/protocols/oscar/oscar.c:4811
+#: src/protocols/oscar/oscar.c:4835 src/protocols/oscar/oscar.c:6426
+#: src/protocols/oscar/oscar.c:6431 src/protocols/yahoo/yahoo.c:2293
+#: src/protocols/yahoo/yahoo.c:2619 src/protocols/yahoo/yahoo.c:2724
 msgid "Invisible"
 msgstr "Invisible"
 
@@ -4405,11 +4478,11 @@
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
 #: 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:1954 src/protocols/yahoo/yahoo.c:1985
-#: src/protocols/yahoo/yahoo.c:2048 src/protocols/yahoo/yahoo_filexfer.c:68
+#: src/protocols/msn/dispatch.c:208 src/protocols/msn/msn.c:513
+#: src/protocols/msn/servconn.c:77 src/protocols/napster/napster.c:475
+#: src/protocols/napster/napster.c:506 src/protocols/toc/toc.c:200
+#: src/protocols/yahoo/yahoo.c:1958 src/protocols/yahoo/yahoo.c:1989
+#: src/protocols/yahoo/yahoo.c:2052 src/protocols/yahoo/yahoo_filexfer.c:68
 #: src/protocols/yahoo/yahoo_filexfer.c:139
 msgid "Unable to connect."
 msgstr "Unable to connect."
@@ -4472,24 +4545,24 @@
 msgid "Active"
 msgstr "Active"
 
-#: src/protocols/gg/gg.c:667 src/protocols/oscar/oscar.c:4106
+#: src/protocols/gg/gg.c:667 src/protocols/oscar/oscar.c:4207
 msgid "UIN"
 msgstr "UIN"
 
 #. First Name
 #: src/protocols/gg/gg.c:671 src/protocols/jabber/jabber.c:605
-#: src/protocols/oscar/oscar.c:4111 src/protocols/trepia/trepia.c:267
+#: src/protocols/oscar/oscar.c:4218 src/protocols/trepia/trepia.c:267
 msgid "First Name"
 msgstr "Forename"
 
 #. Last Name
 #: src/protocols/gg/gg.c:676 src/protocols/jabber/jabber.c:610
-#: src/protocols/oscar/oscar.c:4114 src/protocols/trepia/trepia.c:274
+#: src/protocols/oscar/oscar.c:4219 src/protocols/trepia/trepia.c:274
 msgid "Last Name"
 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
+#: src/protocols/gg/gg.c:680 src/protocols/gg/gg.c:1393
+#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4208
 msgid "Nick"
 msgstr "Nick"
 
@@ -4504,18 +4577,18 @@
 
 #. City
 #: 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
+#: src/protocols/oscar/oscar.c:4261 src/protocols/oscar/oscar.c:4269
+#: src/protocols/trepia/trepia.c:331 src/protocols/trepia/trepia.c:410
 msgid "City"
 msgstr "City"
 
 #. res[0] == username
-#: 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
+#: src/protocols/gg/gg.c:725 src/protocols/msn/msn.c:1330
+#: src/protocols/msn/msn.c:1574 src/protocols/napster/napster.c:393
+#: src/protocols/oscar/oscar.c:3185 src/protocols/oscar/oscar.c:3401
+#: src/protocols/toc/toc.c:498 src/protocols/yahoo/yahoo.c:2898
+#: src/protocols/yahoo/yahoo.c:2920 src/protocols/yahoo/yahoo.c:2943
+#: src/protocols/yahoo/yahoo.c:3101 src/protocols/zephyr/zephyr.c:567
 msgid "Buddy Information"
 msgstr "Buddy Information"
 
@@ -4617,7 +4690,7 @@
 msgid "Directory Search"
 msgstr "Directory Search"
 
-#: src/protocols/gg/gg.c:1207 src/protocols/jabber/jabber.c:1063
+#: src/protocols/gg/gg.c:1207 src/protocols/jabber/jabber.c:1054
 #: src/protocols/toc/toc.c:1546
 msgid "Change Password"
 msgstr "Change Password"
@@ -4656,7 +4729,7 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/gg/gg.c:1373 src/protocols/gg/gg.c:1375
+#: src/protocols/gg/gg.c:1374 src/protocols/gg/gg.c:1376
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu Protocol Plugin"
 
@@ -4669,17 +4742,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: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
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:229
+#: src/protocols/msn/notification.c:588 src/protocols/msn/notification.c:909
+#: src/protocols/msn/notification.c:1076 src/protocols/oscar/oscar.c:2935
+#: src/protocols/oscar/oscar.c:5446
 msgid "Authorize"
 msgstr "Authorise"
 
-#: 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
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:230
+#: src/protocols/msn/notification.c:589 src/protocols/msn/notification.c:911
+#: src/protocols/msn/notification.c:1078 src/protocols/oscar/oscar.c:2937
+#: src/protocols/oscar/oscar.c:5447
 msgid "Deny"
 msgstr "Deny"
 
@@ -4699,12 +4772,12 @@
 msgid "Gaim User"
 msgstr "Gaim User"
 
-#: src/protocols/irc/cmds.c:41
+#: src/protocols/irc/cmds.c:43
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Unknown command: %s"
 
-#: src/protocols/irc/cmds.c:135
+#: src/protocols/irc/cmds.c:137
 msgid ""
 "<B>Supported IRC Commands:</B><BR>AWAY INVITE JOIN KICK<BR>ME MODE MSG "
 "NAMES<BR>NICK OP DEOP OPERWALL<BR>PART PING QUERY QUIT<BR>QUOTE REMOVE TOPIC "
@@ -4714,7 +4787,7 @@
 "NAMES<BR>NICK OP DEOP OPERWALL<BR>PART PING QUERY QUIT<BR>QUOTE REMOVE TOPIC "
 "UMODE<BR>VOICE DEVOICE WALLOPS WHOIS<BR>"
 
-#: src/protocols/irc/cmds.c:144
+#: src/protocols/irc/cmds.c:146
 msgid ""
 "<B>Supported IRC Commands:</B><BR>AWAY JOIN ME MODE<BR>MSG NICK OPERWALL "
 "PING<BR>QUERY QUIT QUOTE UMODE<BR>WALLOPS WHOIS"
@@ -4722,12 +4795,12 @@
 "<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:466 src/protocols/jabber/chat.c:527
+#: src/protocols/irc/cmds.c:469 src/protocols/jabber/chat.c:527
 #, c-format
 msgid "current topic is: %s"
 msgstr "current topic is: %s"
 
-#: src/protocols/irc/cmds.c:468 src/protocols/jabber/chat.c:529
+#: src/protocols/irc/cmds.c:472 src/protocols/jabber/chat.c:529
 msgid "No topic is set"
 msgstr "No topic is set"
 
@@ -4763,8 +4836,8 @@
 msgstr "View MOTD"
 
 #: 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
+#: src/protocols/oscar/oscar.c:440 src/protocols/oscar/oscar.c:6527
+#: src/protocols/yahoo/yahoo.c:2456
 msgid "Send File"
 msgstr "Send File"
 
@@ -4776,28 +4849,28 @@
 msgid "_Password:"
 msgstr "_Password:"
 
-#: src/protocols/irc/irc.c:192
+#: src/protocols/irc/irc.c:193
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC nicks may not contain whitespace"
 
-#: src/protocols/irc/irc.c:211 src/protocols/toc/toc.c:228
+#: src/protocols/irc/irc.c:212 src/protocols/toc/toc.c:228
 #, c-format
 msgid "Signon: %s"
 msgstr "Signon: %s"
 
-#: src/protocols/irc/irc.c:220
+#: src/protocols/irc/irc.c:221
 msgid "Couldn't create socket"
 msgstr "Couldn't create socket"
 
-#: src/protocols/irc/irc.c:369 src/protocols/trepia/trepia.c:977
+#: src/protocols/irc/irc.c:370 src/protocols/trepia/trepia.c:926
 msgid "Read error"
 msgstr "Read error"
 
-#: src/protocols/irc/irc.c:503 src/protocols/yahoo/yahoochat.c:1343
+#: src/protocols/irc/irc.c:504 src/protocols/yahoo/yahoochat.c:1343
 msgid "Users"
 msgstr "Users"
 
-#: src/protocols/irc/irc.c:506 src/protocols/yahoo/yahoochat.c:1352
+#: src/protocols/irc/irc.c:507 src/protocols/yahoo/yahoochat.c:1352
 msgid "Topic"
 msgstr "Topic"
 
@@ -4810,31 +4883,31 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:611
+#: src/protocols/irc/irc.c:613
 msgid "IRC Protocol Plugin"
 msgstr "IRC Protocol Plugin"
 
 #. *  summary
-#: src/protocols/irc/irc.c:612
+#: src/protocols/irc/irc.c:614
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "The IRC Protocol Plugin that Sucks Less"
 
-#: src/protocols/irc/irc.c:629 src/protocols/irc/msgs.c:197
-#: src/protocols/jabber/jabber.c:1369 src/protocols/napster/napster.c:637
+#: src/protocols/irc/irc.c:631 src/protocols/irc/msgs.c:197
+#: src/protocols/jabber/jabber.c:1361 src/protocols/napster/napster.c:658
 msgid "Server"
 msgstr "Server"
 
-#: 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
+#: src/protocols/irc/irc.c:634 src/protocols/jabber/jabber.c:1382
+#: src/protocols/msn/msn.c:1714 src/protocols/napster/napster.c:663
+#: src/protocols/trepia/trepia.c:1307
 msgid "Port"
 msgstr "Port"
 
-#: src/protocols/irc/irc.c:635
+#: src/protocols/irc/irc.c:637 src/protocols/zephyr/zephyr.c:1392
 msgid "Encoding"
 msgstr "Encoding"
 
-#: src/protocols/irc/irc.c:638 src/protocols/irc/msgs.c:191
+#: src/protocols/irc/irc.c:640 src/protocols/irc/msgs.c:191
 #: src/protocols/jabber/jabber.c:580
 msgid "Username"
 msgstr "Username"
@@ -4860,7 +4933,7 @@
 msgid " <i>(identified)</i>"
 msgstr " <i>(identified)</i>"
 
-#: src/protocols/irc/msgs.c:192 src/protocols/yahoo/yahoo.c:2990
+#: src/protocols/irc/msgs.c:192 src/protocols/yahoo/yahoo.c:3001
 msgid "Realname"
 msgstr "Realname"
 
@@ -4886,111 +4959,111 @@
 msgid "Buddy Information for %s"
 msgstr "Buddy Information for %s"
 
-#: src/protocols/irc/msgs.c:277
+#: src/protocols/irc/msgs.c:278
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s has changed the topic to: %s"
 
-#: src/protocols/irc/msgs.c:282
+#: src/protocols/irc/msgs.c:283
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "The topic for %s is: %s"
 
-#: src/protocols/irc/msgs.c:296
+#: src/protocols/irc/msgs.c:299
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Unknown message '%s'"
 
-#: src/protocols/irc/msgs.c:297
+#: src/protocols/irc/msgs.c:300
 msgid "Unknown message"
 msgstr "Unknown message"
 
-#: src/protocols/irc/msgs.c:297
+#: src/protocols/irc/msgs.c:300
 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:400
+#: src/protocols/irc/msgs.c:403
 msgid "No such channel"
 msgstr "No such channel"
 
 #. does this happen?
-#: src/protocols/irc/msgs.c:411
+#: src/protocols/irc/msgs.c:414
 msgid "no such channel"
 msgstr "no such channel"
 
-#: src/protocols/irc/msgs.c:414
+#: src/protocols/irc/msgs.c:417
 msgid "User is not logged in"
 msgstr "User is not logged in"
 
-#: src/protocols/irc/msgs.c:419
+#: src/protocols/irc/msgs.c:422
 msgid "No such nick or channel"
 msgstr "No such nick or channel"
 
-#: src/protocols/irc/msgs.c:439
+#: src/protocols/irc/msgs.c:442
 msgid "Could not send"
 msgstr "Could not send"
 
-#: src/protocols/irc/msgs.c:495
+#: src/protocols/irc/msgs.c:498
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Joining %s requires an invitation."
 
-#: src/protocols/irc/msgs.c:496
+#: src/protocols/irc/msgs.c:499
 msgid "Invitation only"
 msgstr "Invitation only"
 
-#: src/protocols/irc/msgs.c:592
+#: src/protocols/irc/msgs.c:595
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "You have been kicked by %s: (%s)"
 
-#: src/protocols/irc/msgs.c:597
+#: src/protocols/irc/msgs.c:600
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Kicked by %s (%s)"
 
-#: src/protocols/irc/msgs.c:618
+#: src/protocols/irc/msgs.c:621
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "mode (%s %s) by %s"
 
-#: src/protocols/irc/msgs.c:697
+#: src/protocols/irc/msgs.c:700
 msgid "Could not change nick"
 msgstr "Could not change nick"
 
-#: src/protocols/irc/msgs.c:698
+#: src/protocols/irc/msgs.c:701
 msgid "Cannot change nick"
 msgstr "Cannot change nick"
 
-#: src/protocols/irc/msgs.c:719
+#: src/protocols/irc/msgs.c:722
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "You have parted the channel%s%s"
 
-#: src/protocols/irc/msgs.c:759
+#: src/protocols/irc/msgs.c:762
 msgid "Error: invalid PONG from server"
 msgstr "Error: invalid PONG from server"
 
-#: src/protocols/irc/msgs.c:761
+#: src/protocols/irc/msgs.c:764
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING reply -- Lag: %lu seconds"
 
-#: src/protocols/irc/msgs.c:836
+#: src/protocols/irc/msgs.c:839
 #, c-format
 msgid "Cannot join %s:"
 msgstr "Cannot join %s:"
 
-#: src/protocols/irc/msgs.c:837
+#: src/protocols/irc/msgs.c:840
 msgid "Cannot join channel"
 msgstr "Cannot join channel"
 
-#: src/protocols/irc/msgs.c:867
+#: src/protocols/irc/msgs.c:870
 #, c-format
 msgid "Wallops from %s"
 msgstr "Wallops from %s"
 
-#: src/protocols/irc/parse.c:166
+#: src/protocols/irc/parse.c:165 src/protocols/zephyr/zephyr.c:199
 msgid ""
 "(There was an error converting this message.  Check the 'Encoding' option in "
 "the Account Editor)"
@@ -4998,20 +5071,20 @@
 "(There was an error converting this message.  Check the 'Encoding' option in "
 "the Account Editor)"
 
-#: src/protocols/irc/parse.c:297
+#: src/protocols/irc/parse.c:318
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Reply time from %s: %lu seconds"
 
-#: src/protocols/irc/parse.c:298
+#: src/protocols/irc/parse.c:319
 msgid "PONG"
 msgstr "PONG"
 
-#: src/protocols/irc/parse.c:298
+#: src/protocols/irc/parse.c:319
 msgid "CTCP PING reply"
 msgstr "CTCP PING reply"
 
-#: src/protocols/irc/parse.c:400 src/protocols/oscar/oscar.c:581
+#: src/protocols/irc/parse.c:421 src/protocols/oscar/oscar.c:780
 #: 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."
@@ -5059,7 +5132,7 @@
 msgstr "Given Name"
 
 #: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:635
-#: src/protocols/jabber/jabber.c:600 src/protocols/yahoo/yahoo.c:2986
+#: src/protocols/jabber/jabber.c:600 src/protocols/yahoo/yahoo.c:2997
 msgid "Nickname"
 msgstr "Nickname"
 
@@ -5090,7 +5163,7 @@
 
 #. Country
 #: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:680
-#: src/protocols/trepia/trepia.c:339 src/protocols/trepia/trepia.c:448
+#: src/protocols/trepia/trepia.c:339 src/protocols/trepia/trepia.c:416
 msgid "Country"
 msgstr "Country"
 
@@ -5100,7 +5173,7 @@
 msgstr "Telephone"
 
 #: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:709
-#: src/protocols/jabber/buddy.c:717 src/protocols/yahoo/yahoo.c:2982
+#: src/protocols/jabber/buddy.c:717 src/protocols/yahoo/yahoo.c:2993
 msgid "Email"
 msgstr "Email"
 
@@ -5121,7 +5194,7 @@
 msgstr "Role"
 
 #: src/protocols/jabber/buddy.c:264 src/protocols/jabber/buddy.c:638
-#: src/protocols/oscar/oscar.c:4140
+#: src/protocols/oscar/oscar.c:4242
 msgid "Birthday"
 msgstr "Birthday"
 
@@ -5142,11 +5215,14 @@
 msgstr "Jabber ID"
 
 #: src/protocols/jabber/buddy.c:562 src/protocols/jabber/buddy.c:569
-#: src/protocols/jabber/buddy.c:580 src/protocols/jabber/jabber.c:930
+#: src/protocols/jabber/buddy.c:580 src/protocols/jabber/jabber.c:929
+#: src/protocols/msn/msn.c:347 src/protocols/oscar/oscar.c:568
+#: src/protocols/oscar/oscar.c:574 src/protocols/oscar/oscar.c:576
+#: src/protocols/yahoo/yahoo.c:2407
 msgid "Status"
 msgstr "Status"
 
-#: src/protocols/jabber/buddy.c:578 src/protocols/jabber/jabber.c:1372
+#: src/protocols/jabber/buddy.c:578 src/protocols/jabber/jabber.c:1364
 msgid "Resource"
 msgstr "Resource"
 
@@ -5155,7 +5231,7 @@
 msgstr "Middle Name"
 
 #: src/protocols/jabber/buddy.c:643 src/protocols/jabber/jabber.c:615
-#: src/protocols/oscar/oscar.c:4157 src/protocols/oscar/oscar.c:4173
+#: src/protocols/oscar/oscar.c:4260 src/protocols/oscar/oscar.c:4268
 msgid "Address"
 msgstr "Address"
 
@@ -5258,27 +5334,27 @@
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "Nick changing not supported in non-MUC chatrooms"
 
-#: src/protocols/jabber/chat.c:599 src/protocols/jabber/chat.c:610
+#: src/protocols/jabber/chat.c:600 src/protocols/jabber/chat.c:611
 msgid "Roomlist Error"
 msgstr "Roomlist Error"
 
-#: src/protocols/jabber/chat.c:600 src/protocols/jabber/chat.c:611
+#: src/protocols/jabber/chat.c:601 src/protocols/jabber/chat.c:612
 msgid "Error retreiving roomlist"
 msgstr "Error retreiving roomlist"
 
-#: src/protocols/jabber/chat.c:651
+#: src/protocols/jabber/chat.c:652
 msgid "Invalid Server"
 msgstr "Invalid Server"
 
-#: src/protocols/jabber/chat.c:688
+#: src/protocols/jabber/chat.c:689
 msgid "Enter a Conference Server"
 msgstr "Enter a Conference Server"
 
-#: src/protocols/jabber/chat.c:689
+#: src/protocols/jabber/chat.c:690
 msgid "Select a conference server to query"
 msgstr "Select a conference server to query"
 
-#: src/protocols/jabber/chat.c:691
+#: src/protocols/jabber/chat.c:693
 msgid "Find Rooms"
 msgstr "Find Rooms"
 
@@ -5288,24 +5364,24 @@
 
 #: 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/msn.c:173 src/protocols/msn/msn.c:273
+#: src/protocols/msn/msn.c:570 src/protocols/msn/msn.c:742
+#: src/protocols/msn/msn.c:771 src/protocols/msn/msn.c:803
+#: src/protocols/msn/msn.c:811 src/protocols/msn/msn.c:844
+#: src/protocols/msn/msn.c:852 src/protocols/msn/msn.c:866
+#: src/protocols/msn/msn.c:875 src/protocols/msn/msn.c:890
+#: src/protocols/msn/msn.c:900 src/protocols/msn/msn.c:922
+#: src/protocols/msn/msn.c:972 src/protocols/msn/msn.c:1010
+#: src/protocols/msn/msn.c:1112 src/protocols/msn/msn.c:1145
+#: src/protocols/msn/msn.c:1166 src/protocols/msn/msn.c:1177
+#: src/protocols/msn/msn.c:1188 src/protocols/msn/msn.c:1212
+#: src/protocols/msn/msn.c:1224 src/protocols/msn/msn.c:1305
 #: 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
+#: src/protocols/msn/notification.c:1299 src/protocols/msn/notification.c:1319
+#: src/protocols/msn/session.c:209 src/protocols/trepia/trepia.c:248
+#: src/protocols/trepia/trepia.c:698 src/protocols/trepia/trepia.c:987
+#: src/protocols/trepia/trepia.c:1031 src/protocols/trepia/trepia.c:1130
+#: src/protocols/trepia/trepia.c:1186
 msgid "Write error"
 msgstr "Write error"
 
@@ -5330,7 +5406,7 @@
 msgstr "SSL support unavailable"
 
 #: src/protocols/jabber/jabber.c:400 src/protocols/jabber/jabber.c:728
-#: src/protocols/trepia/trepia.c:1121
+#: src/protocols/trepia/trepia.c:1070
 msgid "Unable to create socket"
 msgstr "Unable to create socket"
 
@@ -5343,7 +5419,7 @@
 msgid "Registration Successful"
 msgstr "Registration Successful"
 
-#: src/protocols/jabber/jabber.c:434 src/protocols/jabber/jabber.c:1183
+#: src/protocols/jabber/jabber.c:434 src/protocols/jabber/jabber.c:1174
 msgid "Unknown Error"
 msgstr "Unknown Error"
 
@@ -5355,7 +5431,7 @@
 msgid "Already Registered"
 msgstr "Already Registered"
 
-#: src/protocols/jabber/jabber.c:584 src/protocols/jabber/jabber.c:1034
+#: src/protocols/jabber/jabber.c:584 src/protocols/jabber/jabber.c:1025
 msgid "Password"
 msgstr "Password"
 
@@ -5364,9 +5440,9 @@
 msgstr "E-Mail"
 
 #. State
-#: 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
+#: src/protocols/jabber/jabber.c:625 src/protocols/oscar/oscar.c:4262
+#: src/protocols/oscar/oscar.c:4270 src/protocols/trepia/trepia.c:335
+#: src/protocols/trepia/trepia.c:413
 msgid "State"
 msgstr "County/State"
 
@@ -5387,9 +5463,9 @@
 msgstr "Register New Jabber Account"
 
 #: 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
+#: src/protocols/msn/msn.c:504 src/protocols/napster/napster.c:499
+#: src/protocols/oscar/oscar.c:947 src/protocols/trepia/trepia.c:1064
+#: src/protocols/yahoo/yahoo.c:2177 src/protocols/zephyr/zephyr.c:864
 msgid "Connecting"
 msgstr "Connecting"
 
@@ -5405,278 +5481,278 @@
 msgid "Re-initializing Stream"
 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
+#: src/protocols/jabber/jabber.c:873 src/protocols/jabber/jabber.c:1152
+#: src/protocols/jabber/jabber.c:1193 src/protocols/jabber/jabber.c:1226
+#: src/protocols/oscar/oscar.c:574 src/protocols/oscar/oscar.c:5811
 msgid "Not Authorized"
 msgstr "Not Authorised"
 
-#: src/protocols/jabber/jabber.c:905
+#: src/protocols/jabber/jabber.c:904
 msgid "Both"
 msgstr "Both"
 
-#: src/protocols/jabber/jabber.c:907
+#: src/protocols/jabber/jabber.c:906
 msgid "From (To pending)"
 msgstr "From (To pending)"
 
-#: src/protocols/jabber/jabber.c:909
+#: src/protocols/jabber/jabber.c:908
 msgid "From"
 msgstr "From"
 
-#: src/protocols/jabber/jabber.c:912
+#: src/protocols/jabber/jabber.c:911
 msgid "To"
 msgstr "To"
 
-#: src/protocols/jabber/jabber.c:914
+#: src/protocols/jabber/jabber.c:913
 msgid "None (To pending)"
 msgstr "None (To pending)"
 
-#: src/protocols/jabber/jabber.c:918
+#: src/protocols/jabber/jabber.c:917
 msgid "Subscription"
 msgstr "Subscription"
 
-#: src/protocols/jabber/jabber.c:938
+#: src/protocols/jabber/jabber.c:937
 msgid "Error"
 msgstr "Error"
 
-#: src/protocols/jabber/jabber.c:959 src/protocols/jabber/jutil.c:102
-#: src/protocols/jabber/presence.c:61 src/protocols/jabber/presence.c:112
+#: src/protocols/jabber/jabber.c:950 src/protocols/jabber/jutil.c:35
+#: src/protocols/jabber/presence.c:66 src/protocols/jabber/presence.c:117
 msgid "Chatty"
 msgstr "Chatty"
 
-#: src/protocols/jabber/jabber.c:961 src/protocols/jabber/jutil.c:105
-#: src/protocols/jabber/presence.c:63 src/protocols/jabber/presence.c:117
+#: src/protocols/jabber/jabber.c:952 src/protocols/jabber/jutil.c:38
+#: src/protocols/jabber/presence.c:68 src/protocols/jabber/presence.c:122
 msgid "Extended Away"
 msgstr "Extended Away"
 
-#: 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
+#: src/protocols/jabber/jabber.c:953 src/protocols/jabber/jutil.c:41
+#: src/protocols/jabber/presence.c:70 src/protocols/jabber/presence.c:124
+#: src/protocols/oscar/oscar.c:514 src/protocols/oscar/oscar.c:4823
+#: src/protocols/oscar/oscar.c:6422
 msgid "Do Not Disturb"
 msgstr "Do Not Disturb"
 
-#: src/protocols/jabber/jabber.c:979
+#: src/protocols/jabber/jabber.c:970
 msgid "Password Changed"
 msgstr "Password Changed"
 
-#: src/protocols/jabber/jabber.c:980
+#: src/protocols/jabber/jabber.c:971
 msgid "Your password has been changed."
 msgstr "Your password has been changed."
 
-#: src/protocols/jabber/jabber.c:984 src/protocols/jabber/jabber.c:985
+#: src/protocols/jabber/jabber.c:975 src/protocols/jabber/jabber.c:976
 msgid "Error changing password"
 msgstr "Error changing password"
 
-#: src/protocols/jabber/jabber.c:1039
+#: src/protocols/jabber/jabber.c:1030
 msgid "Password (again)"
 msgstr "Password (again)"
 
-#: src/protocols/jabber/jabber.c:1044 src/protocols/jabber/jabber.c:1045
+#: src/protocols/jabber/jabber.c:1035 src/protocols/jabber/jabber.c:1036
 msgid "Change Jabber Password"
 msgstr "Change Jabber Password"
 
-#: src/protocols/jabber/jabber.c:1045
+#: src/protocols/jabber/jabber.c:1036
 msgid "Please enter your new password"
 msgstr "Please enter your new password"
 
-#: src/protocols/jabber/jabber.c:1056 src/protocols/toc/toc.c:1532
+#: src/protocols/jabber/jabber.c:1047 src/protocols/toc/toc.c:1532
 msgid "Set User Info"
 msgstr "Set User Info"
 
-#: src/protocols/jabber/jabber.c:1141
+#: src/protocols/jabber/jabber.c:1132
 msgid "Bad Request"
 msgstr "Bad Request"
 
-#: src/protocols/jabber/jabber.c:1143
+#: src/protocols/jabber/jabber.c:1134
 msgid "Conflict"
 msgstr "Conflict"
 
-#: src/protocols/jabber/jabber.c:1145
+#: src/protocols/jabber/jabber.c:1136
 msgid "Feature Not Implemented"
 msgstr "Feature Not Implemented"
 
-#: src/protocols/jabber/jabber.c:1147
+#: src/protocols/jabber/jabber.c:1138
 msgid "Forbidden"
 msgstr "Forbidden"
 
-#: src/protocols/jabber/jabber.c:1149
+#: src/protocols/jabber/jabber.c:1140
 msgid "Gone"
 msgstr "Gone"
 
-#: src/protocols/jabber/jabber.c:1151 src/protocols/jabber/jabber.c:1225
+#: src/protocols/jabber/jabber.c:1142 src/protocols/jabber/jabber.c:1216
 msgid "Internal Server Error"
 msgstr "Internal Server Error"
 
-#: src/protocols/jabber/jabber.c:1153
+#: src/protocols/jabber/jabber.c:1144
 msgid "Item Not Found"
 msgstr "Item Not Found"
 
-#: src/protocols/jabber/jabber.c:1155
+#: src/protocols/jabber/jabber.c:1146
 msgid "Malformed Jabber ID"
 msgstr "Malformed Jabber ID"
 
-#: src/protocols/jabber/jabber.c:1157
+#: src/protocols/jabber/jabber.c:1148
 msgid "Not Acceptable"
 msgstr "Not Acceptable"
 
-#: src/protocols/jabber/jabber.c:1159
+#: src/protocols/jabber/jabber.c:1150
 msgid "Not Allowed"
 msgstr "Not Allowed"
 
-#: src/protocols/jabber/jabber.c:1163
+#: src/protocols/jabber/jabber.c:1154
 msgid "Payment Required"
 msgstr "Payment Required"
 
-#: src/protocols/jabber/jabber.c:1165
+#: src/protocols/jabber/jabber.c:1156
 msgid "Recipient Unavailable"
 msgstr "Recipient unavailable"
 
-#: src/protocols/jabber/jabber.c:1169
+#: src/protocols/jabber/jabber.c:1160
 msgid "Registration Required"
 msgstr "Registration Required"
 
-#: src/protocols/jabber/jabber.c:1171
+#: src/protocols/jabber/jabber.c:1162
 msgid "Remote Server Not Found"
 msgstr "Remote Server Not Found"
 
-#: src/protocols/jabber/jabber.c:1173
+#: src/protocols/jabber/jabber.c:1164
 msgid "Remote Server Timeout"
 msgstr "Remote Server Timeout"
 
-#: src/protocols/jabber/jabber.c:1175
+#: src/protocols/jabber/jabber.c:1166
 msgid "Server Overloaded"
 msgstr "Server Overloaded"
 
-#: src/protocols/jabber/jabber.c:1177
+#: src/protocols/jabber/jabber.c:1168
 msgid "Service Unavailable"
 msgstr "Service Unavailable"
 
-#: src/protocols/jabber/jabber.c:1179
+#: src/protocols/jabber/jabber.c:1170
 msgid "Subscription Required"
 msgstr "Subscription Required"
 
-#: src/protocols/jabber/jabber.c:1181
+#: src/protocols/jabber/jabber.c:1172
 msgid "Unexpected Request"
 msgstr "Unexpected Request"
 
-#: src/protocols/jabber/jabber.c:1188
+#: src/protocols/jabber/jabber.c:1179
 msgid "Authorization Aborted"
 msgstr "Authorisation Aborted"
 
-#: src/protocols/jabber/jabber.c:1190
+#: src/protocols/jabber/jabber.c:1181
 msgid "Incorrect encoding in authorization"
 msgstr "Incorrect encoding in authorisation"
 
-#: src/protocols/jabber/jabber.c:1193
+#: src/protocols/jabber/jabber.c:1184
 msgid "Invalid authzid"
 msgstr "Invalid authzid"
 
-#: src/protocols/jabber/jabber.c:1196
+#: src/protocols/jabber/jabber.c:1187
 msgid "Invalid Authorization Mechanism"
 msgstr "Invalid Authorisation Mechanism"
 
-#: src/protocols/jabber/jabber.c:1199
+#: src/protocols/jabber/jabber.c:1190
 msgid "Authorization mechanism too weak"
 msgstr "Authorisation mechanism too weak"
 
-#: src/protocols/jabber/jabber.c:1204
+#: src/protocols/jabber/jabber.c:1195
 msgid "Temporary Authentication Failure"
 msgstr "Temporary Authentication Failure"
 
-#: src/protocols/jabber/jabber.c:1206
+#: src/protocols/jabber/jabber.c:1197
 msgid "Authentication Failure"
 msgstr "Authentication Failure"
 
+#: src/protocols/jabber/jabber.c:1201
+msgid "Bad Format"
+msgstr "Bad Format"
+
+#: src/protocols/jabber/jabber.c:1203
+msgid "Bad Namespace Prefix"
+msgstr "Bad Namespace Prefix"
+
+#: src/protocols/jabber/jabber.c:1206
+msgid "Resource Conflict"
+msgstr "Resource Conflict"
+
+#: src/protocols/jabber/jabber.c:1208
+msgid "Connection Timeout"
+msgstr "Connection Timeout"
+
 #: 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
+#: src/protocols/jabber/jabber.c:1212
 msgid "Host Unknown"
 msgstr "Host Unknown"
 
-#: src/protocols/jabber/jabber.c:1223
+#: src/protocols/jabber/jabber.c:1214
 msgid "Improper Addressing"
 msgstr "Improper Addressing"
 
-#: src/protocols/jabber/jabber.c:1227
+#: src/protocols/jabber/jabber.c:1218
 msgid "Invalid ID"
 msgstr "Invalid ID"
 
-#: src/protocols/jabber/jabber.c:1229
+#: src/protocols/jabber/jabber.c:1220
 msgid "Invalid Namespace"
 msgstr "Invalid Namespace"
 
-#: src/protocols/jabber/jabber.c:1231
+#: src/protocols/jabber/jabber.c:1222
 msgid "Invalid XML"
 msgstr "Invalid XML"
 
-#: src/protocols/jabber/jabber.c:1233
+#: src/protocols/jabber/jabber.c:1224
 msgid "Non-matching Hosts"
 msgstr "Non-matching Hosts"
 
-#: src/protocols/jabber/jabber.c:1237
+#: src/protocols/jabber/jabber.c:1228
 msgid "Policy Violation"
 msgstr "Policy Violation"
 
-#: src/protocols/jabber/jabber.c:1239
+#: src/protocols/jabber/jabber.c:1230
 msgid "Remote Connection Failed"
 msgstr "Remote Connection Failed"
 
-#: src/protocols/jabber/jabber.c:1241
+#: src/protocols/jabber/jabber.c:1232
 msgid "Resource Constraint"
 msgstr "Resource Constraint"
 
-#: src/protocols/jabber/jabber.c:1243
+#: src/protocols/jabber/jabber.c:1234
 msgid "Restricted XML"
 msgstr "Restricted XML"
 
-#: src/protocols/jabber/jabber.c:1245
+#: src/protocols/jabber/jabber.c:1236
 msgid "See Other Host"
 msgstr "See Other Host"
 
-#: src/protocols/jabber/jabber.c:1247
+#: src/protocols/jabber/jabber.c:1238
 msgid "System Shutdown"
 msgstr "System Shutdown"
 
-#: src/protocols/jabber/jabber.c:1249
+#: src/protocols/jabber/jabber.c:1240
 msgid "Undefined Condition"
 msgstr "Undefined Condition"
 
-#: src/protocols/jabber/jabber.c:1251
+#: src/protocols/jabber/jabber.c:1242
 msgid "Unsupported Encoding"
 msgstr "Unsupported Encoding"
 
-#: src/protocols/jabber/jabber.c:1253
+#: src/protocols/jabber/jabber.c:1244
 msgid "Unsupported Stanza Type"
 msgstr "Unsupported Stanza Type"
 
-#: src/protocols/jabber/jabber.c:1255
+#: src/protocols/jabber/jabber.c:1246
 msgid "Unsupported Version"
 msgstr "Unsupported Version"
 
-#: src/protocols/jabber/jabber.c:1257
+#: src/protocols/jabber/jabber.c:1248
 msgid "XML Not Well Formed"
 msgstr "XML Not Well Formed"
 
-#: src/protocols/jabber/jabber.c:1259
+#: src/protocols/jabber/jabber.c:1250
 msgid "Stream Error"
 msgstr "Stream Error"
 
@@ -5690,27 +5766,27 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/jabber/jabber.c:1348 src/protocols/jabber/jabber.c:1350
+#: src/protocols/jabber/jabber.c:1340 src/protocols/jabber/jabber.c:1342
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber Protocol Plugin"
 
-#: src/protocols/jabber/jabber.c:1375
+#: src/protocols/jabber/jabber.c:1367
 msgid "Use TLS if available"
 msgstr "Use TLS if available"
 
-#: src/protocols/jabber/jabber.c:1380
+#: src/protocols/jabber/jabber.c:1372
 msgid "Force old SSL"
 msgstr "Force old SSL"
 
-#: src/protocols/jabber/jabber.c:1385
+#: src/protocols/jabber/jabber.c:1377
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Allow plaintext auth over unencrypted streams"
 
-#: src/protocols/jabber/jabber.c:1394
+#: src/protocols/jabber/jabber.c:1386
 msgid "Connect server"
 msgstr "Connect server"
 
-#: src/protocols/jabber/jabber.c:1411
+#: src/protocols/jabber/jabber.c:1403
 msgid "Hide Operating System"
 msgstr "Hide Operating System"
 
@@ -5729,16 +5805,16 @@
 msgid "The topic is: %s"
 msgstr "The topic is: %s"
 
-#: src/protocols/jabber/message.c:222
+#: src/protocols/jabber/message.c:225
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "Message delivery to %s failed: %s"
 
-#: src/protocols/jabber/message.c:225
+#: src/protocols/jabber/message.c:228
 msgid "Jabber Message Error"
 msgstr "Jabber Message Error"
 
-#: src/protocols/jabber/message.c:288
+#: src/protocols/jabber/message.c:291
 #, c-format
 msgid " (Code %s)"
 msgstr " (Code %s)"
@@ -5747,20 +5823,20 @@
 msgid "XML Parse error"
 msgstr "XML Parse error"
 
-#: src/protocols/jabber/presence.c:216
+#: src/protocols/jabber/presence.c:221
 msgid "Unknown Error in presence"
 msgstr "Unknown Error in presence"
 
-#: src/protocols/jabber/presence.c:219
+#: src/protocols/jabber/presence.c:224
 #, 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:272 src/protocols/jabber/presence.c:273
+#: src/protocols/jabber/presence.c:277 src/protocols/jabber/presence.c:278
 msgid "Create New Room"
 msgstr "Create New Room"
 
-#: src/protocols/jabber/presence.c:274
+#: src/protocols/jabber/presence.c:279
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -5768,20 +5844,20 @@
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
 
-#: src/protocols/jabber/presence.c:276
+#: src/protocols/jabber/presence.c:281
 msgid "Configure Room"
 msgstr "Configure Room"
 
-#: src/protocols/jabber/presence.c:278
+#: src/protocols/jabber/presence.c:283
 msgid "Accept Defaults"
 msgstr "Accept Defaults"
 
-#: src/protocols/jabber/presence.c:298
+#: src/protocols/jabber/presence.c:303
 #, c-format
 msgid "Error in chat %s"
 msgstr "Error in chat %s"
 
-#: src/protocols/jabber/presence.c:301
+#: src/protocols/jabber/presence.c:306
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Error joining chat %s"
@@ -5795,19 +5871,19 @@
 msgid "File Send Failed"
 msgstr "File Send Failed"
 
-#: src/protocols/msn/dispatch.c:42 src/protocols/msn/notification.c:246
+#: src/protocols/msn/dispatch.c:42 src/protocols/msn/notification.c:240
 msgid "Unable to request USR\n"
 msgstr "Unable to request USR\n"
 
-#: src/protocols/msn/dispatch.c:59 src/protocols/msn/notification.c:263
+#: src/protocols/msn/dispatch.c:59 src/protocols/msn/notification.c:257
 msgid "Unable to login using MD5"
 msgstr "Unable to login using MD5"
 
-#: src/protocols/msn/dispatch.c:68 src/protocols/msn/notification.c:272
+#: src/protocols/msn/dispatch.c:68 src/protocols/msn/notification.c:266
 msgid "Unable to send USR"
 msgstr "Unable to send USR"
 
-#: src/protocols/msn/dispatch.c:73 src/protocols/msn/notification.c:277
+#: src/protocols/msn/dispatch.c:73 src/protocols/msn/notification.c:271
 msgid "Requesting to send password"
 msgstr "Requesting to send password"
 
@@ -5815,15 +5891,15 @@
 msgid "Protocol version not supported"
 msgstr "Protocol version not supported"
 
-#: src/protocols/msn/dispatch.c:117 src/protocols/msn/notification.c:416
+#: src/protocols/msn/dispatch.c:117 src/protocols/msn/notification.c:410
 msgid "Unable to request CVR\n"
 msgstr "Unable to request CVR\n"
 
-#: src/protocols/msn/dispatch.c:126 src/protocols/msn/notification.c:425
+#: src/protocols/msn/dispatch.c:126 src/protocols/msn/notification.c:419
 msgid "Unable to request INF\n"
 msgstr "Unable to request INF\n"
 
-#: src/protocols/msn/dispatch.c:147 src/protocols/msn/notification.c:1551
+#: src/protocols/msn/dispatch.c:147 src/protocols/msn/notification.c:1564
 msgid "Got invalid XFR"
 msgstr "Got invalid XFR"
 
@@ -5835,259 +5911,272 @@
 msgid "Unable to parse message."
 msgstr "Unable to parse message."
 
-#: src/protocols/msn/dispatch.c:232 src/protocols/msn/notification.c:521
-#: src/protocols/msn/notification.c:1811
+#: src/protocols/msn/dispatch.c:232 src/protocols/msn/notification.c:528
+#: src/protocols/msn/notification.c:1826
 msgid "Unable to write to server"
 msgstr "Unable to write to server"
 
-#: src/protocols/msn/dispatch.c:236 src/protocols/msn/notification.c:1818
+#: src/protocols/msn/dispatch.c:236 src/protocols/msn/notification.c:1833
 msgid "Syncing with server"
 msgstr "Syncing with server"
 
-#: src/protocols/msn/dispatch.c:250 src/protocols/msn/notification.c:1832
+#: src/protocols/msn/dispatch.c:250
 msgid "Error reading from server"
 msgstr "Error reading from server"
 
 #: src/protocols/msn/error.c:33
+msgid "Unable to parse message"
+msgstr "Unable to parse message"
+
+#: src/protocols/msn/error.c:36
 msgid "Syntax Error (probably a Gaim bug)"
 msgstr "Syntax Error (probably a Gaim bug)"
 
-#: src/protocols/msn/error.c:37
-msgid "Invalid Parameter (probably a Gaim bug)"
-msgstr "Invalid Parameter (probably a Gaim bug)"
-
 #: src/protocols/msn/error.c:40
-msgid "Invalid User"
-msgstr "Invalid User"
-
-#: src/protocols/msn/error.c:44
+msgid "Invalid email address"
+msgstr "Invalid email address"
+
+#: src/protocols/msn/error.c:43
+msgid "User does not exist"
+msgstr "User does not exist"
+
+#: src/protocols/msn/error.c:47
 msgid "Fully Qualified Domain Name missing"
 msgstr "Fully Qualified Domain Name missing"
 
-#: src/protocols/msn/error.c:47
-msgid "Already Logged In"
-msgstr "Already Logged In"
-
 #: src/protocols/msn/error.c:50
-msgid "Invalid Username"
-msgstr "Invalid Username"
+msgid "Already Logged In"
+msgstr "Already Logged In"
 
 #: src/protocols/msn/error.c:53
+msgid "Invalid Username"
+msgstr "Invalid Username"
+
+#: src/protocols/msn/error.c:56
 msgid "Invalid Friendly Name"
 msgstr "Invalid Friendly Name"
 
-#: src/protocols/msn/error.c:56
+#: src/protocols/msn/error.c:59
 msgid "List Full"
 msgstr "List Full"
 
-#: src/protocols/msn/error.c:59
+#: src/protocols/msn/error.c:62
 msgid "Already there"
 msgstr "Already there"
 
-#: src/protocols/msn/error.c:62
+#: src/protocols/msn/error.c:65
 msgid "Not on list"
 msgstr "Not on list"
 
-#: src/protocols/msn/error.c:65
+#: src/protocols/msn/error.c:68 src/protocols/zephyr/zephyr.c:527
 msgid "User is offline"
 msgstr "User is offline"
 
-#: src/protocols/msn/error.c:68
+#: src/protocols/msn/error.c:71
 msgid "Already in the mode"
 msgstr "Already in the mode"
 
-#: src/protocols/msn/error.c:71
+#: src/protocols/msn/error.c:74
 msgid "Already in opposite list"
 msgstr "Already in opposite list"
 
-#: src/protocols/msn/error.c:74
+#: src/protocols/msn/error.c:77
 msgid "Too many groups"
 msgstr "Too many groups"
 
-#: src/protocols/msn/error.c:77
+#: src/protocols/msn/error.c:80
 msgid "Invalid group"
 msgstr "Invalid group"
 
-#: src/protocols/msn/error.c:80
+#: src/protocols/msn/error.c:83
 msgid "User not in group"
 msgstr "User not in group"
 
-#: src/protocols/msn/error.c:83
+#: src/protocols/msn/error.c:86
 msgid "Group name too long"
 msgstr "Group name too long"
 
-#: src/protocols/msn/error.c:86
+#: src/protocols/msn/error.c:89
 msgid "Cannot remove group zero"
 msgstr "Cannot remove group zero"
 
-#: src/protocols/msn/error.c:90
+#: src/protocols/msn/error.c:93
 msgid "Tried to add a contact to a group that doesn't exist"
 msgstr "Tried to add a contact to a group that doesn't exist"
 
-#: src/protocols/msn/error.c:94
+#: src/protocols/msn/error.c:97
 msgid "Switchboard failed"
 msgstr "Switchboard failed"
 
-#: src/protocols/msn/error.c:97
+#: src/protocols/msn/error.c:100
 msgid "Notify Transfer failed"
 msgstr "Notify Transfer failed"
 
-#: src/protocols/msn/error.c:101
+#: src/protocols/msn/error.c:104
 msgid "Required fields missing"
 msgstr "Required fields missing"
 
-#: src/protocols/msn/error.c:104
+#: src/protocols/msn/error.c:107
 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:185
+#: src/protocols/msn/error.c:110 src/protocols/oscar/oscar.c:186
 msgid "Not logged in"
 msgstr "Not logged in"
 
-#: src/protocols/msn/error.c:111
-msgid "Service Temporarily Unavailable"
-msgstr "Service Temporarily Unavailable"
-
 #: src/protocols/msn/error.c:114
-msgid "Database server error"
-msgstr "Database server error"
+msgid "Service Temporarily Unavailable"
+msgstr "Service Temporarily Unavailable"
 
 #: src/protocols/msn/error.c:117
+msgid "Database server error"
+msgstr "Database server error"
+
+#: src/protocols/msn/error.c:120
 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:123
-msgid "Memory allocation error"
-msgstr "Memory allocation error"
+msgid "File operation error"
+msgstr "File operation error"
 
 #: src/protocols/msn/error.c:126
+msgid "Memory allocation error"
+msgstr "Memory allocation error"
+
+#: src/protocols/msn/error.c:129
 msgid "Wrong CHL value sent to server"
 msgstr "Wrong CHL value sent to server"
 
-#: src/protocols/msn/error.c:130
+#: src/protocols/msn/error.c:133
 msgid "Server busy"
 msgstr "Server busy"
 
-#: src/protocols/msn/error.c:133 src/protocols/msn/error.c:146
-#: src/protocols/msn/error.c:201
+#: src/protocols/msn/error.c:136 src/protocols/msn/error.c:149
+#: src/protocols/msn/error.c:204
 msgid "Server unavailable"
 msgstr "Server unavailable"
 
-#: src/protocols/msn/error.c:136
+#: src/protocols/msn/error.c:139
 msgid "Peer Notification server down"
 msgstr "Peer Notification server down"
 
-#: src/protocols/msn/error.c:139
+#: src/protocols/msn/error.c:142
 msgid "Database connect error"
 msgstr "Database connect error"
 
-#: src/protocols/msn/error.c:143
+#: src/protocols/msn/error.c:146
 msgid "Server is going down (abandon ship)"
 msgstr "Server is going down (abandon ship)"
 
-#: src/protocols/msn/error.c:150
+#: src/protocols/msn/error.c:153
 msgid "Error creating connection"
 msgstr "Error creating connection"
 
-#: src/protocols/msn/error.c:154
+#: src/protocols/msn/error.c:157
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR parameters are either unknown or not allowed"
 
-#: src/protocols/msn/error.c:157 src/protocols/msn/notification.c:310
+#: src/protocols/msn/error.c:160 src/protocols/msn/notification.c:304
 msgid "Unable to write"
 msgstr "Unable to write"
 
-#: src/protocols/msn/error.c:160
+#: src/protocols/msn/error.c:163
 msgid "Session overload"
 msgstr "Session overload"
 
-#: src/protocols/msn/error.c:163
+#: src/protocols/msn/error.c:166
 msgid "User is too active"
 msgstr "User is too active"
 
-#: src/protocols/msn/error.c:166
+#: src/protocols/msn/error.c:169
 msgid "Too many sessions"
 msgstr "Too many sessions"
 
-#: src/protocols/msn/error.c:169 src/protocols/msn/error.c:175
-msgid "Not expected"
-msgstr "Not expected"
-
 #: src/protocols/msn/error.c:172
+msgid "Passport not verified"
+msgstr "Passport not yet verified"
+
+#: src/protocols/msn/error.c:175
 msgid "Bad friend file"
 msgstr "Bad friend file"
 
-#: src/protocols/msn/error.c:180
+#: src/protocols/msn/error.c:178
+msgid "Not expected"
+msgstr "Not expected"
+
+#: src/protocols/msn/error.c:183
 msgid "Friendly name changes too rapidly"
 msgstr "Friendly name changes too rapidly"
 
-#: src/protocols/msn/error.c:189
+#: src/protocols/msn/error.c:192
 msgid "Server too busy"
 msgstr "Server too busy"
 
-#: src/protocols/msn/error.c:193 src/protocols/oscar/oscar.c:1163
+#: src/protocols/msn/error.c:196 src/protocols/oscar/oscar.c:1360
 #: src/protocols/toc/toc.c:659
 msgid "Authentication failed"
 msgstr "Authentication failed"
 
-#: src/protocols/msn/error.c:196
+#: src/protocols/msn/error.c:199
 msgid "Not allowed when offline"
 msgstr "Not allowed when offline"
 
-#: src/protocols/msn/error.c:204
+#: src/protocols/msn/error.c:207
 msgid "Not accepting new users"
 msgstr "Not accepting new users"
 
-#: src/protocols/msn/error.c:208
+#: src/protocols/msn/error.c:211
 msgid "Kids Passport without parental consent"
 msgstr "Kids Passport without parental consent"
 
-#: src/protocols/msn/error.c:212
+#: src/protocols/msn/error.c:215
 msgid "Passport account not yet verified"
 msgstr "Passport account not yet verified"
 
-#: src/protocols/msn/error.c:215
+#: src/protocols/msn/error.c:218
 msgid "Bad ticket"
 msgstr "Bad ticket"
 
-#: src/protocols/msn/error.c:219
+#: src/protocols/msn/error.c:222
 #, c-format
 msgid "Unknown Error Code %d"
 msgstr "Unknown Error Code %d"
 
+#: src/protocols/msn/error.c:234
+#, c-format
+msgid "MSN Error: %s\n"
+msgstr "MSN Error: %s\n"
+
 #: 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:178
+#: src/protocols/msn/msn.c:190
 msgid "Set your friendly name."
 msgstr "Set your friendly name."
 
-#: src/protocols/msn/msn.c:179
+#: src/protocols/msn/msn.c:191
 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:191
+#: src/protocols/msn/msn.c:203
 msgid "Set your home phone number."
 msgstr "Set your home phone number."
 
-#: src/protocols/msn/msn.c:202
+#: src/protocols/msn/msn.c:214
 msgid "Set your work phone number."
 msgstr "Set your work phone number."
 
-#: src/protocols/msn/msn.c:213
+#: src/protocols/msn/msn.c:225
 msgid "Set your mobile phone number."
 msgstr "Set your mobile phone number."
 
-#: src/protocols/msn/msn.c:222
+#: src/protocols/msn/msn.c:234
 msgid "Allow MSN Mobile pages?"
 msgstr "Allow MSN Mobile pages?"
 
-#: src/protocols/msn/msn.c:223
+#: src/protocols/msn/msn.c:235
 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?"
@@ -6095,94 +6184,89 @@
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your mobile phone or other mobile device?"
 
-#: src/protocols/msn/msn.c:227
+#: src/protocols/msn/msn.c:239
 msgid "Allow"
 msgstr "Allow"
 
-#: src/protocols/msn/msn.c:228
+#: src/protocols/msn/msn.c:240
 msgid "Disallow"
 msgstr "Disallow"
 
-#: src/protocols/msn/msn.c:245
+#: src/protocols/msn/msn.c:257
 msgid "Send a mobile message."
 msgstr "Send a mobile message."
 
-#: src/protocols/msn/msn.c:247
+#: src/protocols/msn/msn.c:259
 msgid "Page"
 msgstr "Page"
 
-#: 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:346 src/protocols/msn/msn.c:640
+#: src/protocols/msn/msn.c:360 src/protocols/msn/msn.c:661
 #: src/protocols/msn/state.c:32
 msgid "Away From Computer"
 msgstr "Away From Computer"
 
-#: 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
+#: src/protocols/msn/msn.c:361 src/protocols/msn/msn.c:663
+#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:2275
+#: src/protocols/yahoo/yahoo.c:2601 src/protocols/yahoo/yahoo.c:2715
 msgid "Be Right Back"
 msgstr "Be Right Back"
 
-#: 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
+#: src/protocols/msn/msn.c:362 src/protocols/msn/msn.c:665
+#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:2277
+#: src/protocols/yahoo/yahoo.c:2603 src/protocols/yahoo/yahoo.c:2716
 msgid "Busy"
 msgstr "Busy"
 
-#: 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
+#: src/protocols/msn/msn.c:363 src/protocols/msn/msn.c:667
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2285
+#: src/protocols/yahoo/yahoo.c:2611 src/protocols/yahoo/yahoo.c:2720
 msgid "On The Phone"
 msgstr "On The Phone"
 
-#: 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
+#: src/protocols/msn/msn.c:364 src/protocols/msn/msn.c:669
+#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:2289
+#: src/protocols/yahoo/yahoo.c:2615 src/protocols/yahoo/yahoo.c:2722
 msgid "Out To Lunch"
 msgstr "Out To Lunch"
 
-#: src/protocols/msn/msn.c:351 src/protocols/msn/msn.c:650
-#: src/protocols/zephyr/zephyr.c:1173 src/protocols/zephyr/zephyr.c:1188
+#: src/protocols/msn/msn.c:365 src/protocols/msn/msn.c:671
+#: src/protocols/zephyr/zephyr.c:1170 src/protocols/zephyr/zephyr.c:1185
 msgid "Hidden"
 msgstr "Hidden"
 
-#: src/protocols/msn/msn.c:363
+#: src/protocols/msn/msn.c:377
 msgid "Set Friendly Name"
 msgstr "Set Friendly Name"
 
-#: src/protocols/msn/msn.c:371
+#: src/protocols/msn/msn.c:385
 msgid "Set Home Phone Number"
 msgstr "Set Home Phone Number"
 
-#: src/protocols/msn/msn.c:377
+#: src/protocols/msn/msn.c:391
 msgid "Set Work Phone Number"
 msgstr "Set Work Phone Number"
 
-#: src/protocols/msn/msn.c:383
+#: src/protocols/msn/msn.c:397
 msgid "Set Mobile Phone Number"
 msgstr "Set Mobile Phone Number"
 
-#: src/protocols/msn/msn.c:392
+#: src/protocols/msn/msn.c:406
 msgid "Enable/Disable Mobile Devices"
 msgstr "Enable/Disable Mobile Devices"
 
-#: src/protocols/msn/msn.c:399
+#: src/protocols/msn/msn.c:413
 msgid "Allow/Disallow Mobile Pages"
 msgstr "Allow/Disallow Mobile Pages"
 
-#: src/protocols/msn/msn.c:425
+#: src/protocols/msn/msn.c:439
 msgid "Send to Mobile"
 msgstr "Send to Mobile"
 
-#: src/protocols/msn/msn.c:434
+#: src/protocols/msn/msn.c:448
 msgid "Initiate Chat"
 msgstr "Initiate Chat"
 
-#: src/protocols/msn/msn.c:458
+#: src/protocols/msn/msn.c:472
 msgid ""
 "SSL support is needed for MSN. Please install a supported SSL library. See "
 "http://gaim.sf.net/faq-ssl.php for more information."
@@ -6190,7 +6274,7 @@
 "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:757
+#: src/protocols/msn/msn.c:784
 #, c-format
 msgid ""
 "An MSN screen name must be in the form \"user@server.com\". Perhaps you "
@@ -6199,11 +6283,11 @@
 "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
+#: src/protocols/msn/msn.c:788 src/protocols/msn/msn.c:828
 msgid "Invalid MSN screen name"
 msgstr "Invalid MSN screen name"
 
-#: src/protocols/msn/msn.c:797
+#: src/protocols/msn/msn.c:824
 #, c-format
 msgid ""
 "An MSN screen name must be in the form \"user@server.com\". Perhaps you "
@@ -6212,73 +6296,73 @@
 "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
+#: src/protocols/msn/msn.c:1331 src/protocols/yahoo/yahoo.c:2899
 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:1374 src/protocols/oscar/oscar.c:4145
-#: src/protocols/trepia/trepia.c:285 src/protocols/trepia/trepia.c:413
-#: src/protocols/yahoo/yahoo.c:2998
+#: src/protocols/msn/msn.c:1401 src/protocols/oscar/oscar.c:4247
+#: src/protocols/trepia/trepia.c:285 src/protocols/trepia/trepia.c:404
+#: src/protocols/yahoo/yahoo.c:3009
 msgid "Age"
 msgstr "Age"
 
 #. Gender
-#: 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:3006
+#: src/protocols/msn/msn.c:1408 src/protocols/oscar/oscar.c:4234
+#: src/protocols/trepia/trepia.c:279 src/protocols/trepia/trepia.c:406
+#: src/protocols/yahoo/yahoo.c:3017
 msgid "Gender"
 msgstr "Gender"
 
-#: src/protocols/msn/msn.c:1389 src/protocols/yahoo/yahoo.c:3002
+#: src/protocols/msn/msn.c:1416 src/protocols/yahoo/yahoo.c:3013
 msgid "Marital Status"
 msgstr "Marital Status"
 
-#: src/protocols/msn/msn.c:1396 src/protocols/yahoo/yahoo.c:2994
+#: src/protocols/msn/msn.c:1423 src/protocols/yahoo/yahoo.c:3005
 msgid "Location"
 msgstr "Location"
 
-#: src/protocols/msn/msn.c:1404 src/protocols/yahoo/yahoo.c:3010
+#: src/protocols/msn/msn.c:1431 src/protocols/yahoo/yahoo.c:3021
 msgid "Occupation"
 msgstr "Occupation"
 
-#: 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
+#: src/protocols/msn/msn.c:1448 src/protocols/msn/msn.c:1454
+#: src/protocols/msn/msn.c:1461 src/protocols/msn/msn.c:1468
+#: src/protocols/msn/msn.c:1475
 msgid "A Little About Me"
 msgstr "A Little About Me"
 
-#: src/protocols/msn/msn.c:1457 src/protocols/msn/msn.c:1470
-#: src/protocols/msn/msn.c:1477
+#: src/protocols/msn/msn.c:1484 src/protocols/msn/msn.c:1497
+#: src/protocols/msn/msn.c:1504
 msgid "Favorite Things"
 msgstr "Favourite Things"
 
-#: src/protocols/msn/msn.c:1486 src/protocols/msn/msn.c:1492
-#: src/protocols/msn/msn.c:1499
+#: src/protocols/msn/msn.c:1513 src/protocols/msn/msn.c:1519
+#: src/protocols/msn/msn.c:1526
 msgid "Hobbies and Interests"
 msgstr "Hobbies and Interests"
 
-#: src/protocols/msn/msn.c:1508 src/protocols/msn/msn.c:1514
-#: src/protocols/yahoo/yahoo.c:3045
+#: src/protocols/msn/msn.c:1535 src/protocols/msn/msn.c:1541
+#: src/protocols/yahoo/yahoo.c:3056
 msgid "Favorite Quote"
 msgstr "Favourite Quote"
 
-#: src/protocols/msn/msn.c:1522 src/protocols/yahoo/yahoo.c:3081
+#: src/protocols/msn/msn.c:1549 src/protocols/yahoo/yahoo.c:3092
 msgid "Last Updated"
 msgstr "Last Updated"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1533 src/protocols/trepia/trepia.c:289
-#: src/protocols/trepia/trepia.c:457
+#: src/protocols/msn/msn.c:1560 src/protocols/trepia/trepia.c:289
+#: src/protocols/trepia/trepia.c:419
 msgid "Homepage"
 msgstr "Homepage"
 
-#: src/protocols/msn/msn.c:1555 src/protocols/yahoo/yahoo.c:3096
+#: src/protocols/msn/msn.c:1582 src/protocols/yahoo/yahoo.c:3107
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "User information for %s unavailable"
 
-#: src/protocols/msn/msn.c:1557 src/protocols/yahoo/yahoo.c:3098
+#: src/protocols/msn/msn.c:1584 src/protocols/yahoo/yahoo.c:3109
 msgid "The user's profile is empty."
 msgstr "The user's profile is empty."
 
@@ -6292,23 +6376,23 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/msn/msn.c:1655 src/protocols/msn/msn.c:1657
+#: src/protocols/msn/msn.c:1689 src/protocols/msn/msn.c:1691
 msgid "MSN Protocol Plugin"
 msgstr "MSN Protocol Plugin"
 
-#: src/protocols/msn/msn.c:1675 src/protocols/trepia/trepia.c:1345
+#: src/protocols/msn/msn.c:1709 src/protocols/trepia/trepia.c:1302
 msgid "Login server"
 msgstr "Login server"
 
-#: src/protocols/msn/msn.c:1684
+#: src/protocols/msn/msn.c:1718
 msgid "Use HTTP Method"
 msgstr "Use HTTP Method"
 
-#: src/protocols/msn/msn.c:1702
+#: src/protocols/msn/msn.c:1736
 msgid "Display conversation closed notices"
 msgstr "Display conversation closed notices"
 
-#: src/protocols/msn/msn.c:1707
+#: src/protocols/msn/msn.c:1741
 msgid "Display timeout notices"
 msgstr "Display timeout notices"
 
@@ -6328,52 +6412,56 @@
 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:315 src/protocols/trepia/trepia.c:686
+#: src/protocols/msn/notification.c:309 src/protocols/trepia/trepia.c:635
 msgid "Retrieving buddy list"
 msgstr "Retrieving buddy list"
 
-#: src/protocols/msn/notification.c:340 src/protocols/msn/notification.c:372
-#: src/protocols/oscar/oscar.c:1452
+#: src/protocols/msn/notification.c:334 src/protocols/msn/notification.c:366
+#: src/protocols/oscar/oscar.c:1649
 msgid "Password sent"
 msgstr "Password sent"
 
-#: src/protocols/msn/notification.c:367
+#: src/protocols/msn/notification.c:361
 msgid "Unable to send password"
 msgstr "Unable to send password"
 
-#: src/protocols/msn/notification.c:403
+#: src/protocols/msn/notification.c:397
 msgid "Protocol not supported"
 msgstr "Protocol not supported"
 
-#: src/protocols/msn/notification.c:445
+#: src/protocols/msn/notification.c:440
 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:450
+#: src/protocols/msn/notification.c:445
 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:577
+#: src/protocols/msn/notification.c:584
 #, 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:902 src/protocols/msn/notification.c:1069
+#: src/protocols/msn/notification.c:903 src/protocols/msn/notification.c:1070
 #, 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:1596
+#: src/protocols/msn/notification.c:1362
+#, c-format
+msgid ""
+"Your MSN buddy list for %s is temporarily unavailable. Please wait and try "
+"again."
+msgstr ""
+"Your MSN buddy list for %s is temporarily unavailable. Please wait and try "
+"again."
+
+#: src/protocols/msn/notification.c:1607
 msgid "Unable to transfer to notification server"
 msgstr "Unable to transfer to notification server"
 
-#: src/protocols/msn/notification.c:1752
+#: src/protocols/msn/notification.c:1776
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -6404,7 +6492,11 @@
 "After the maintenance has been completed, you will be able to successfully "
 "sign in."
 
-#: src/protocols/msn/servconn.c:536
+#: src/protocols/msn/servconn.c:389
+msgid "IO Error."
+msgstr "IO Error."
+
+#: src/protocols/msn/servconn.c:527
 msgid "Received HTTP error. Please report this."
 msgstr "Received HTTP error. Please report this."
 
@@ -6417,7 +6509,7 @@
 msgid "%s has closed the conversation window."
 msgstr "%s has closed the conversation window."
 
-#: src/protocols/msn/switchboard.c:285
+#: src/protocols/msn/switchboard.c:300
 msgid "An MSN message may not have been received."
 msgstr "An MSN message may not have been received."
 
@@ -6430,28 +6522,28 @@
 msgid "Unable to read message from server.  Command is %hd, length is %hd."
 msgstr "Unable to read message from server.  Command is %hd, length is %hd."
 
-#: src/protocols/napster/napster.c:303
+#: src/protocols/napster/napster.c:307
 #, c-format
 msgid "users: %s, files: %s, size: %sGB"
 msgstr "users: %s, files: %s, size: %sGB"
 
 #. MSG_SERVER_HOTLIST_ERROR
-#: src/protocols/napster/napster.c:314
+#: src/protocols/napster/napster.c:318
 #, c-format
 msgid "Unable to add \"%s\" to your Napster hotlist"
 msgstr "Unable to add \"%s\" to your Napster hotlist"
 
-#: src/protocols/napster/napster.c:322
+#: src/protocols/napster/napster.c:326
 msgid "You were disconnected from the server."
 msgstr "You were disconnected from the server."
 
 #. MSG_CLIENT_WHOIS
-#: src/protocols/napster/napster.c:378
+#: src/protocols/napster/napster.c:384
 #, c-format
 msgid "%s requested your information"
 msgstr "%s requested your information"
 
-#: src/protocols/napster/napster.c:410
+#: src/protocols/napster/napster.c:422
 msgid ""
 "You were disconnected from the server, because you logged on from a "
 "different location"
@@ -6460,16 +6552,16 @@
 "different location"
 
 #. MSG_CLIENT_PING
-#: src/protocols/napster/napster.c:416
+#: src/protocols/napster/napster.c:428
 #, c-format
 msgid "%s requested a PING"
 msgstr "%s requested a PING"
 
-#: src/protocols/napster/napster.c:529
+#: src/protocols/napster/napster.c:541
 msgid "Get Info"
 msgstr "Get Info"
 
-#: src/protocols/napster/napster.c:543 src/protocols/oscar/oscar.c:5445
+#: src/protocols/napster/napster.c:555 src/protocols/oscar/oscar.c:5517
 #: src/protocols/toc/toc.c:1259
 msgid "_Group:"
 msgstr "_Group:"
@@ -6484,134 +6576,250 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/napster/napster.c:619 src/protocols/napster/napster.c:621
+#: src/protocols/napster/napster.c:640 src/protocols/napster/napster.c:642
 msgid "NAPSTER Protocol Plugin"
 msgstr "NAPSTER Protocol Plugin"
 
-#: src/protocols/oscar/oscar.c:181
+#: src/protocols/oscar/oscar.c:182
 msgid "Invalid error"
 msgstr "Invalid error"
 
-#: src/protocols/oscar/oscar.c:182
+#: src/protocols/oscar/oscar.c:183
 msgid "Invalid SNAC"
 msgstr "Invalid SNAC"
 
-#: src/protocols/oscar/oscar.c:183
+#: src/protocols/oscar/oscar.c:184
 msgid "Rate to host"
 msgstr "Rate to host"
 
-#: src/protocols/oscar/oscar.c:184
+#: src/protocols/oscar/oscar.c:185
 msgid "Rate to client"
 msgstr "Rate to client"
 
-#: src/protocols/oscar/oscar.c:186
-msgid "Service unavailable"
-msgstr "Service unavailable"
-
 #: src/protocols/oscar/oscar.c:187
-msgid "Service not defined"
-msgstr "Service not defined"
+msgid "Service unavailable"
+msgstr "Service unavailable"
 
 #: src/protocols/oscar/oscar.c:188
+msgid "Service not defined"
+msgstr "Service not defined"
+
+#: src/protocols/oscar/oscar.c:189
 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 host"
+msgstr "Not supported by host"
+
+#: src/protocols/oscar/oscar.c:191
 msgid "Not supported by client"
 msgstr "Not supported by client"
 
-#: src/protocols/oscar/oscar.c:191
+#: src/protocols/oscar/oscar.c:192
 msgid "Refused by client"
 msgstr "Refused by client"
 
-#: src/protocols/oscar/oscar.c:192
+#: src/protocols/oscar/oscar.c:193
 msgid "Reply too big"
 msgstr "Reply too big"
 
-#: src/protocols/oscar/oscar.c:193
+#: src/protocols/oscar/oscar.c:194
 msgid "Responses lost"
 msgstr "Responses lost"
 
-#: src/protocols/oscar/oscar.c:194
+#: src/protocols/oscar/oscar.c:195
 msgid "Request denied"
 msgstr "Request denied"
 
-#: src/protocols/oscar/oscar.c:195
+#: src/protocols/oscar/oscar.c:196
 msgid "Busted SNAC payload"
 msgstr "Busted SNAC payload"
 
-#: src/protocols/oscar/oscar.c:196
+#: src/protocols/oscar/oscar.c:197
 msgid "Insufficient rights"
 msgstr "Insufficient rights"
 
-#: src/protocols/oscar/oscar.c:197
+#: src/protocols/oscar/oscar.c:198
 msgid "In local permit/deny"
 msgstr "In local permit/deny"
 
-#: src/protocols/oscar/oscar.c:198
+#: src/protocols/oscar/oscar.c:199
 msgid "Too evil (sender)"
 msgstr "Too evil (sender)"
 
-#: src/protocols/oscar/oscar.c:199
-msgid "Too evil (receiver)"
-msgstr "Too evil (receiver)"
-
 #: src/protocols/oscar/oscar.c:200
-msgid "User temporarily unavailable"
-msgstr "User temporarily unavailable"
+msgid "Too evil (receiver)"
+msgstr "Too evil (receiver)"
 
 #: src/protocols/oscar/oscar.c:201
+msgid "User temporarily unavailable"
+msgstr "User temporarily unavailable"
+
+#: src/protocols/oscar/oscar.c:202
 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 "List overflow"
+msgstr "List overflow"
+
+#: src/protocols/oscar/oscar.c:204
 msgid "Request ambiguous"
 msgstr "Request ambiguous"
 
-#: src/protocols/oscar/oscar.c:204
+#: src/protocols/oscar/oscar.c:205
 msgid "Queue full"
 msgstr "Queue full"
 
-#: src/protocols/oscar/oscar.c:205
+#: src/protocols/oscar/oscar.c:206
 msgid "Not while on AOL"
 msgstr "Not while on AOL"
 
-#: src/protocols/oscar/oscar.c:520
+#: src/protocols/oscar/oscar.c:428
+msgid "Voice"
+msgstr "Voice"
+
+#: src/protocols/oscar/oscar.c:431
+msgid "AIM Direct IM"
+msgstr "AIM Direct IM"
+
+#: src/protocols/oscar/oscar.c:434
+msgid "Chat"
+msgstr "Chat"
+
+#: src/protocols/oscar/oscar.c:437 src/protocols/oscar/oscar.c:6535
+msgid "Get File"
+msgstr "Get File"
+
+#: src/protocols/oscar/oscar.c:444
+msgid "Games"
+msgstr "Games"
+
+#: src/protocols/oscar/oscar.c:447
+msgid "Add-Ins"
+msgstr "Add-Ins"
+
+#: src/protocols/oscar/oscar.c:450
+msgid "Send Buddy List"
+msgstr "Send Buddy List"
+
+#: src/protocols/oscar/oscar.c:453
+msgid "ICQ Direct Connect"
+msgstr "ICQ Direct Connect"
+
+#: src/protocols/oscar/oscar.c:456
+msgid "AP User"
+msgstr "AP User"
+
+#: src/protocols/oscar/oscar.c:459
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+#: src/protocols/oscar/oscar.c:462
+msgid "Nihilist"
+msgstr "Nihilist"
+
+#: src/protocols/oscar/oscar.c:465
+msgid "ICQ Server Relay"
+msgstr "ICQ Server Relay"
+
+#: src/protocols/oscar/oscar.c:468
+msgid "Old ICQ UTF8"
+msgstr "Old ICQ UTF8"
+
+#: src/protocols/oscar/oscar.c:471
+msgid "Trillian Encryption"
+msgstr "Trillian Encryption"
+
+#: src/protocols/oscar/oscar.c:474
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+#: src/protocols/oscar/oscar.c:477
+msgid "Hiptop"
+msgstr "Hiptop"
+
+#: src/protocols/oscar/oscar.c:480
+msgid "Security Enabled"
+msgstr "Security Enabled"
+
+#: src/protocols/oscar/oscar.c:483
+msgid "Video Chat"
+msgstr "Video Chat"
+
+#: src/protocols/oscar/oscar.c:487
+msgid "iChat AV"
+msgstr "iChat AV"
+
+#: src/protocols/oscar/oscar.c:490
+msgid "Live Video"
+msgstr "Live Video"
+
+#: src/protocols/oscar/oscar.c:493
+msgid "Camera"
+msgstr "Camera"
+
+#: src/protocols/oscar/oscar.c:512 src/protocols/oscar/oscar.c:4832
+#: src/protocols/oscar/oscar.c:6425
+msgid "Free For Chat"
+msgstr "Free For Chat"
+
+#: src/protocols/oscar/oscar.c:516 src/protocols/oscar/oscar.c:4826
+#: src/protocols/oscar/oscar.c:6423
+msgid "Not Available"
+msgstr "Not Available"
+
+#: src/protocols/oscar/oscar.c:518 src/protocols/oscar/oscar.c:4829
+#: src/protocols/oscar/oscar.c:6424
+msgid "Occupied"
+msgstr "Occupied"
+
+#: src/protocols/oscar/oscar.c:522
+msgid "Web Aware"
+msgstr "Web Aware"
+
+#: src/protocols/oscar/oscar.c:576 src/protocols/oscar/oscar.c:5813
+#: src/protocols/yahoo/yahoo.c:2297
+msgid "Offline"
+msgstr "Offline"
+
+#: src/protocols/oscar/oscar.c:593
+msgid "Capabilities"
+msgstr "Capabilities"
+
+#: src/protocols/oscar/oscar.c:599
+msgid "Buddy Comment"
+msgstr "Buddy Comment"
+
+#: src/protocols/oscar/oscar.c:719
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "Direct IM with %s closed"
 
-#: src/protocols/oscar/oscar.c:522
+#: src/protocols/oscar/oscar.c:721
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "Direct IM with %s failed"
 
-#: src/protocols/oscar/oscar.c:593 src/protocols/toc/toc.c:885
+#: src/protocols/oscar/oscar.c:792 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:609
+#: src/protocols/oscar/oscar.c:808
 msgid "Chat is currently unavailable"
 msgstr "Chat is currently unavailable"
 
-#: src/protocols/oscar/oscar.c:680 src/protocols/oscar/oscar.c:746
+#: src/protocols/oscar/oscar.c:879 src/protocols/oscar/oscar.c:943
 msgid "Couldn't connect to host"
 msgstr "Couldn't connect to host"
 
-#: src/protocols/oscar/oscar.c:690
+#: src/protocols/oscar/oscar.c:889
 msgid "Screen name sent"
 msgstr "Screen name sent"
 
-#: src/protocols/oscar/oscar.c:705
+#: src/protocols/oscar/oscar.c:903
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -6622,45 +6830,45 @@
 "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
+#: src/protocols/oscar/oscar.c:931
 msgid "Unable to login to AIM"
 msgstr "Unable to login to AIM"
 
-#: src/protocols/oscar/oscar.c:838 src/protocols/oscar/oscar.c:1256
+#: src/protocols/oscar/oscar.c:1035 src/protocols/oscar/oscar.c:1453
 msgid "Could Not Connect"
 msgstr "Could Not Connect"
 
-#: src/protocols/oscar/oscar.c:846
+#: src/protocols/oscar/oscar.c:1043
 msgid "Connection established, cookie sent"
 msgstr "Connection established, cookie sent"
 
-#: src/protocols/oscar/oscar.c:959 src/protocols/yahoo/yahoo_filexfer.c:209
+#: src/protocols/oscar/oscar.c:1156 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
+#: src/protocols/oscar/oscar.c:1161
 msgid "Unable to create new connection."
 msgstr "Unable to create new connection."
 
-#: src/protocols/oscar/oscar.c:1035
+#: src/protocols/oscar/oscar.c:1232
 msgid "Unable to establish listener socket."
 msgstr "Unable to establish listener socket."
 
-#: src/protocols/oscar/oscar.c:1140 src/protocols/toc/toc.c:571
+#: src/protocols/oscar/oscar.c:1337 src/protocols/toc/toc.c:571
 msgid "Incorrect nickname or password."
 msgstr "Incorrect nickname or password."
 
-#: src/protocols/oscar/oscar.c:1145
+#: src/protocols/oscar/oscar.c:1342
 msgid "Your account is currently suspended."
 msgstr "Your account is currently suspended."
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:1149
+#: src/protocols/oscar/oscar.c:1346
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "The AOL Instant Messenger service is temporarily unavailable."
 
-#: src/protocols/oscar/oscar.c:1154
+#: src/protocols/oscar/oscar.c:1351
 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."
@@ -6668,21 +6876,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:1159
+#: src/protocols/oscar/oscar.c:1356
 #, 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:1191
+#: src/protocols/oscar/oscar.c:1388
 msgid "Internal Error"
 msgstr "Internal Error"
 
-#: src/protocols/oscar/oscar.c:1263
+#: src/protocols/oscar/oscar.c:1460
 msgid "Received authorization"
 msgstr "Received authorisation"
 
-#: src/protocols/oscar/oscar.c:1299 src/protocols/oscar/oscar.c:1329
-#: src/protocols/oscar/oscar.c:1417
+#: src/protocols/oscar/oscar.c:1496 src/protocols/oscar/oscar.c:1526
+#: src/protocols/oscar/oscar.c:1614
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -6691,29 +6899,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:1302 src/protocols/oscar/oscar.c:1332
+#: src/protocols/oscar/oscar.c:1499 src/protocols/oscar/oscar.c:1529
 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:1420
+#: src/protocols/oscar/oscar.c:1617
 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:2002 src/protocols/oscar/oscar.c:5908
+#: src/protocols/oscar/oscar.c:2199 src/protocols/oscar/oscar.c:5917
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Direct IM with %s established"
 
-#: src/protocols/oscar/oscar.c:2333 src/protocols/oscar/oscar.c:2355
+#: src/protocols/oscar/oscar.c:2533 src/protocols/oscar/oscar.c:2555
 msgid "(There was an error receiving this message)"
 msgstr "(There was an error receiving this message)"
 
-#: src/protocols/oscar/oscar.c:2504
+#: src/protocols/oscar/oscar.c:2716
 #, 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:2507
+#: src/protocols/oscar/oscar.c:2719
 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 "
@@ -6723,23 +6931,23 @@
 "for IM Images.  Because your IP address will be revealed, this may be "
 "considered a privacy risk."
 
-#: src/protocols/oscar/oscar.c:2512 src/protocols/oscar/oscar.c:6290
+#: src/protocols/oscar/oscar.c:2724 src/protocols/oscar/oscar.c:6299
 msgid "Connect"
 msgstr "Connect"
 
-#: src/protocols/oscar/oscar.c:2539
+#: src/protocols/oscar/oscar.c:2753
 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:2547
+#: src/protocols/oscar/oscar.c:2761
 msgid "Authorization Request Message:"
 msgstr "Authorisation Request Message:"
 
-#: src/protocols/oscar/oscar.c:2548
+#: src/protocols/oscar/oscar.c:2762
 msgid "Please authorize me!"
 msgstr "Please authorise me!"
 
-#: src/protocols/oscar/oscar.c:2577
+#: src/protocols/oscar/oscar.c:2791
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
@@ -6748,23 +6956,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:2582 src/protocols/oscar/oscar.c:2584
+#: src/protocols/oscar/oscar.c:2796 src/protocols/oscar/oscar.c:2798
 msgid "Request Authorization"
 msgstr "Request Authorisation"
 
-#: 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
+#: src/protocols/oscar/oscar.c:2834 src/protocols/oscar/oscar.c:2836
+#: src/protocols/oscar/oscar.c:2843 src/protocols/oscar/oscar.c:2925
+#: src/protocols/oscar/oscar.c:2945 src/protocols/oscar/oscar.c:3281
+#: src/protocols/oscar/oscar.c:3341 src/protocols/oscar/oscar.c:5438
+#: src/protocols/oscar/oscar.c:5484
 msgid "No reason given."
 msgstr "No reason given."
 
-#: src/protocols/oscar/oscar.c:2628
+#: src/protocols/oscar/oscar.c:2842
 msgid "Authorization Denied Message:"
 msgstr "Authorisation Denied Message:"
 
-#: src/protocols/oscar/oscar.c:2705
+#: src/protocols/oscar/oscar.c:2925
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -6773,11 +6981,11 @@
 "The user %u wants to add you to their buddy list for the following reason:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2713 src/protocols/oscar/oscar.c:5372
+#: src/protocols/oscar/oscar.c:2933 src/protocols/oscar/oscar.c:5444
 msgid "Authorization Request"
 msgstr "Authorisation Request"
 
-#: src/protocols/oscar/oscar.c:2725
+#: src/protocols/oscar/oscar.c:2945
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -6788,17 +6996,17 @@
 "following reason:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2726
+#: src/protocols/oscar/oscar.c:2946
 msgid "ICQ authorization denied."
 msgstr "ICQ authorisation denied."
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:2733
+#: src/protocols/oscar/oscar.c:2953
 #, 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:2741
+#: src/protocols/oscar/oscar.c:2961
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -6811,7 +7019,7 @@
 "From: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2749
+#: src/protocols/oscar/oscar.c:2969
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -6824,7 +7032,7 @@
 "From: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2757
+#: src/protocols/oscar/oscar.c:2977
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -6837,34 +7045,34 @@
 "Message is:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2778
+#: src/protocols/oscar/oscar.c:2998
 #, 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:2784
+#: src/protocols/oscar/oscar.c:3004
 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:2788
+#: src/protocols/oscar/oscar.c:3008
 msgid "Decline"
 msgstr "Decline"
 
-#: src/protocols/oscar/oscar.c:2870
+#: src/protocols/oscar/oscar.c:3090
 #, 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:2879
+#: src/protocols/oscar/oscar.c:3099
 #, 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:2888
+#: src/protocols/oscar/oscar.c:3108
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -6875,193 +7083,82 @@
 msgstr[1] ""
 "You missed %hu messages from %s because the rate limit has been exceeded."
 
-#: src/protocols/oscar/oscar.c:2897
+#: src/protocols/oscar/oscar.c:3117
 #, 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:2906
+#: src/protocols/oscar/oscar.c:3126
 #, 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:2915
+#: src/protocols/oscar/oscar.c:3135
 #, 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: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:2935 src/protocols/oscar/oscar.c:4754
-#: src/protocols/oscar/oscar.c:6414
-msgid "Not Available"
-msgstr "Not Available"
-
-#: 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:2941
-msgid "Web Aware"
-msgstr "Web Aware"
-
-#: src/protocols/oscar/oscar.c:2984
+#: src/protocols/oscar/oscar.c:3184
 #, 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:3043
+#: src/protocols/oscar/oscar.c:3243
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC threw error: %s\n"
 
-#: src/protocols/oscar/oscar.c:3044
+#: src/protocols/oscar/oscar.c:3244
 msgid "Unknown error"
 msgstr "Unknown error"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:3079
+#: src/protocols/oscar/oscar.c:3279
 #, 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:3138
+#: src/protocols/oscar/oscar.c:3338
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "User information for %s unavailable:"
 
-#: src/protocols/oscar/oscar.c:3177
-msgid "Voice"
-msgstr "Voice"
-
-#: src/protocols/oscar/oscar.c:3180
-msgid "AIM Direct IM"
-msgstr "AIM Direct IM"
-
-#: 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:3193
-msgid "Games"
-msgstr "Games"
-
-#: src/protocols/oscar/oscar.c:3196
-msgid "Add-Ins"
-msgstr "Add-Ins"
-
-#: src/protocols/oscar/oscar.c:3199
-msgid "Send Buddy List"
-msgstr "Send Buddy List"
-
-#: src/protocols/oscar/oscar.c:3202
-msgid "ICQ Direct Connect"
-msgstr "ICQ Direct Connect"
-
-#: src/protocols/oscar/oscar.c:3205
-msgid "AP User"
-msgstr "AP User"
-
-#: src/protocols/oscar/oscar.c:3208
-msgid "ICQ RTF"
-msgstr "ICQ RTF"
-
-#: src/protocols/oscar/oscar.c:3211
-msgid "Nihilist"
-msgstr "Nihilist"
-
-#: src/protocols/oscar/oscar.c:3214
-msgid "ICQ Server Relay"
-msgstr "ICQ Server Relay"
-
-#: src/protocols/oscar/oscar.c:3217
-msgid "Old ICQ UTF8"
-msgstr "Old ICQ UTF8"
-
-#: src/protocols/oscar/oscar.c:3220
-msgid "Trillian Encryption"
-msgstr "Trillian Encryption"
-
-#: src/protocols/oscar/oscar.c:3223
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
-#: src/protocols/oscar/oscar.c:3226
-msgid "Hiptop"
-msgstr "Hiptop"
-
-#: src/protocols/oscar/oscar.c:3229
-msgid "Security Enabled"
-msgstr "Security Enabled"
-
-#: src/protocols/oscar/oscar.c:3232
-msgid "Video Chat"
-msgstr "Video Chat"
-
-#: src/protocols/oscar/oscar.c:3236
-msgid "iChat AV"
-msgstr "iChat AV"
-
-#: src/protocols/oscar/oscar.c:3239
-msgid "Live Video"
-msgstr "Live Video"
-
-#: src/protocols/oscar/oscar.c:3242
-msgid "Camera"
-msgstr "Camera"
-
-#: 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:3272
-#, c-format
-msgid "Warning Level: <b>%d%%</b><br>\n"
-msgstr "Warning Level: <b>%d%%</b><br>\n"
-
-#: 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:3279
-#, c-format
-msgid "Member Since: <b>%s</b><br>\n"
-msgstr "Member Since: <b>%s</b><br>\n"
-
-#: src/protocols/oscar/oscar.c:3284
-#, c-format
-msgid "Idle: <b>%s</b>"
-msgstr "Idle: <b>%s</b>"
-
-#: src/protocols/oscar/oscar.c:3287
-msgid "Idle: <b>Active</b>"
-msgstr "Idle: <b>Active</b>"
-
-#: src/protocols/oscar/oscar.c:3359
+#: src/protocols/oscar/oscar.c:3361
+msgid "Warning Level"
+msgstr "Warning Level"
+
+#: src/protocols/oscar/oscar.c:3364
+msgid "Online Since"
+msgstr "Online Since"
+
+#: src/protocols/oscar/oscar.c:3368 src/protocols/yahoo/yahoo.c:3088
+msgid "Member Since"
+msgstr "Member Since"
+
+#: src/protocols/oscar/oscar.c:3450
 msgid "Your AIM connection may be lost."
 msgstr "Your AIM connection may be lost."
 
-#: src/protocols/oscar/oscar.c:3760
+#. The conversion failed!
+#: src/protocols/oscar/oscar.c:3636
+msgid ""
+"[Unable to display a message from this user because it contained invalid "
+"characters.]"
+msgstr ""
+"[Unable to display a message from this user because it contained invalid "
+"characters.]"
+
+#: src/protocols/oscar/oscar.c:3854
 msgid "Rate limiting error."
 msgstr "Rate limiting error."
 
-#: src/protocols/oscar/oscar.c:3761
+#: src/protocols/oscar/oscar.c:3855
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -7069,7 +7166,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:3824
+#: src/protocols/oscar/oscar.c:3918
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
@@ -7077,109 +7174,109 @@
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
 
-#: src/protocols/oscar/oscar.c:3826
+#: src/protocols/oscar/oscar.c:3920
 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:3857
+#: src/protocols/oscar/oscar.c:3951
 msgid "Finalizing connection"
 msgstr "Finalizing connection"
 
-#: src/protocols/oscar/oscar.c:4117 src/protocols/oscar/oscar.c:4123
+#: src/protocols/oscar/oscar.c:4221 src/protocols/oscar/oscar.c:4228
 msgid "Email Address"
 msgstr "Email Address"
 
-#: src/protocols/oscar/oscar.c:4128
+#: src/protocols/oscar/oscar.c:4233
 msgid "Mobile Phone"
 msgstr "Mobile Phone"
 
-#: src/protocols/oscar/oscar.c:4131 src/protocols/trepia/trepia.c:281
-#: src/protocols/trepia/trepia.c:422
+#: src/protocols/oscar/oscar.c:4234 src/protocols/trepia/trepia.c:281
+#: src/protocols/trepia/trepia.c:407
 msgid "Female"
 msgstr "Female"
 
-#: src/protocols/oscar/oscar.c:4131 src/protocols/trepia/trepia.c:280
-#: src/protocols/trepia/trepia.c:422
+#: src/protocols/oscar/oscar.c:4234 src/protocols/trepia/trepia.c:280
+#: src/protocols/trepia/trepia.c:407
 msgid "Male"
 msgstr "Male"
 
-#: src/protocols/oscar/oscar.c:4148
+#: src/protocols/oscar/oscar.c:4250
 msgid "Personal Web Page"
 msgstr "Personal Web Page"
 
-#: src/protocols/oscar/oscar.c:4151
+#: src/protocols/oscar/oscar.c:4254
 msgid "Additional Information"
 msgstr "Additional Information"
 
-#: src/protocols/oscar/oscar.c:4155
+#: src/protocols/oscar/oscar.c:4259
 msgid "Home Address"
 msgstr "Home Address"
 
-#: src/protocols/oscar/oscar.c:4166 src/protocols/oscar/oscar.c:4182
+#: src/protocols/oscar/oscar.c:4263 src/protocols/oscar/oscar.c:4271
 msgid "Zip Code"
 msgstr "Postcode"
 
-#: src/protocols/oscar/oscar.c:4171
+#: src/protocols/oscar/oscar.c:4267
 msgid "Work Address"
 msgstr "Work Address"
 
-#: src/protocols/oscar/oscar.c:4187
+#: src/protocols/oscar/oscar.c:4275
 msgid "Work Information"
 msgstr "Work Information"
 
-#: src/protocols/oscar/oscar.c:4189
+#: src/protocols/oscar/oscar.c:4276
 msgid "Company"
 msgstr "Company"
 
-#: src/protocols/oscar/oscar.c:4192
+#: src/protocols/oscar/oscar.c:4277
 msgid "Division"
 msgstr "Division"
 
-#: src/protocols/oscar/oscar.c:4195
+#: src/protocols/oscar/oscar.c:4278
 msgid "Position"
 msgstr "Position"
 
-#: src/protocols/oscar/oscar.c:4198
+#: src/protocols/oscar/oscar.c:4280
 msgid "Web Page"
 msgstr "Web Page"
 
-#: src/protocols/oscar/oscar.c:4204
+#: src/protocols/oscar/oscar.c:4286
 #, c-format
 msgid "ICQ Info for %s"
 msgstr "ICQ Info for %s"
 
-#: src/protocols/oscar/oscar.c:4254
+#: src/protocols/oscar/oscar.c:4336
 msgid "Pop-Up Message"
 msgstr "Pop-Up Message"
 
-#: src/protocols/oscar/oscar.c:4275
+#: src/protocols/oscar/oscar.c:4357
 #, 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
+#: src/protocols/oscar/oscar.c:4361
 msgid "Search Results"
 msgstr "Search Results"
 
-#: src/protocols/oscar/oscar.c:4296
+#: src/protocols/oscar/oscar.c:4378
 #, c-format
 msgid "No results found for email address %s"
 msgstr "No results found for email address %s"
 
-#: src/protocols/oscar/oscar.c:4317
+#: src/protocols/oscar/oscar.c:4399
 #, 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:4319
+#: src/protocols/oscar/oscar.c:4401
 msgid "Account Confirmation Requested"
 msgstr "Account Confirmation Requested"
 
-#: src/protocols/oscar/oscar.c:4347
+#: src/protocols/oscar/oscar.c:4429
 msgid "Error Changing Account Info"
 msgstr "Error Changing Account Info"
 
-#: src/protocols/oscar/oscar.c:4350
+#: src/protocols/oscar/oscar.c:4432
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7188,7 +7285,7 @@
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "differs from the original."
 
-#: src/protocols/oscar/oscar.c:4353
+#: src/protocols/oscar/oscar.c:4435
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7197,7 +7294,7 @@
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "ends in a space."
 
-#: src/protocols/oscar/oscar.c:4356
+#: src/protocols/oscar/oscar.c:4438
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7206,7 +7303,7 @@
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "is too long."
 
-#: src/protocols/oscar/oscar.c:4359
+#: src/protocols/oscar/oscar.c:4441
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -7215,7 +7312,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:4362
+#: src/protocols/oscar/oscar.c:4444
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -7224,7 +7321,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:4365
+#: src/protocols/oscar/oscar.c:4447
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
@@ -7233,12 +7330,12 @@
 "Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 
-#: src/protocols/oscar/oscar.c:4368
+#: src/protocols/oscar/oscar.c:4450
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Error 0x%04x: Unknown error."
 
-#: src/protocols/oscar/oscar.c:4378
+#: src/protocols/oscar/oscar.c:4460
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -7247,20 +7344,20 @@
 "Your screen name is currently formatted as follows:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4379 src/protocols/oscar/oscar.c:4386
+#: src/protocols/oscar/oscar.c:4461 src/protocols/oscar/oscar.c:4468
 msgid "Account Info"
 msgstr "Account Info"
 
-#: src/protocols/oscar/oscar.c:4384
+#: src/protocols/oscar/oscar.c:4466
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "The email address for %s is %s"
 
-#: src/protocols/oscar/oscar.c:4616
+#: src/protocols/oscar/oscar.c:4681
 msgid "Unable to set AIM profile."
 msgstr "Unable to set AIM profile."
 
-#: src/protocols/oscar/oscar.c:4617
+#: src/protocols/oscar/oscar.c:4682
 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 "
@@ -7270,7 +7367,7 @@
 "completed.  Your profile remains unset; try setting it again when you are "
 "fully connected."
 
-#: src/protocols/oscar/oscar.c:4644
+#: src/protocols/oscar/oscar.c:4709
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -7285,19 +7382,19 @@
 "The maximum profile length of %d bytes has been exceeded.  Gaim has "
 "truncated it for you."
 
-#: src/protocols/oscar/oscar.c:4649
+#: src/protocols/oscar/oscar.c:4714
 msgid "Profile too long."
 msgstr "Profile too long."
 
-#: src/protocols/oscar/oscar.c:4665 src/protocols/oscar/oscar.c:6420
+#: src/protocols/oscar/oscar.c:4730 src/protocols/oscar/oscar.c:6430
 msgid "Visible"
 msgstr "Visible"
 
-#: src/protocols/oscar/oscar.c:4676
+#: src/protocols/oscar/oscar.c:4748
 msgid "Unable to set AIM away message."
 msgstr "Unable to set AIM away message."
 
-#: src/protocols/oscar/oscar.c:4677
+#: src/protocols/oscar/oscar.c:4749
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -7307,7 +7404,7 @@
 "procedure completed.  You remain in a \"present\" state; try setting it "
 "again when you are fully connected."
 
-#: src/protocols/oscar/oscar.c:4717
+#: src/protocols/oscar/oscar.c:4789
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -7322,11 +7419,11 @@
 "The maximum away message length of %d bytes has been exceeded.  Gaim has "
 "truncated it for you."
 
-#: src/protocols/oscar/oscar.c:4722
+#: src/protocols/oscar/oscar.c:4794
 msgid "Away message too long."
 msgstr "Away message too long."
 
-#: src/protocols/oscar/oscar.c:4815
+#: src/protocols/oscar/oscar.c:4887
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -7337,16 +7434,16 @@
 "must either start with a letter and contain only letters, numbers and "
 "spaces, or contain only numbers."
 
-#: src/protocols/oscar/oscar.c:4816 src/protocols/oscar/oscar.c:5233
-#: src/protocols/oscar/oscar.c:5246
+#: src/protocols/oscar/oscar.c:4888 src/protocols/oscar/oscar.c:5305
+#: src/protocols/oscar/oscar.c:5318
 msgid "Unable To Add"
 msgstr "Unable To Add"
 
-#: src/protocols/oscar/oscar.c:4952
+#: src/protocols/oscar/oscar.c:5024
 msgid "Unable To Retrieve Buddy List"
 msgstr "Unable To Retrieve Buddy List"
 
-#: src/protocols/oscar/oscar.c:4953
+#: src/protocols/oscar/oscar.c:5025
 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 "
@@ -7356,13 +7453,13 @@
 "servers.  Your buddy list is not lost, and will probably become available in "
 "a few hours."
 
-#: 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
+#: src/protocols/oscar/oscar.c:5201 src/protocols/oscar/oscar.c:5202
+#: src/protocols/oscar/oscar.c:5207 src/protocols/oscar/oscar.c:5362
+#: src/protocols/oscar/oscar.c:5363 src/protocols/oscar/oscar.c:5368
 msgid "Orphans"
 msgstr "Orphans"
 
-#: src/protocols/oscar/oscar.c:5232
+#: src/protocols/oscar/oscar.c:5304
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -7371,11 +7468,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:5232 src/protocols/oscar/oscar.c:5245
+#: src/protocols/oscar/oscar.c:5304 src/protocols/oscar/oscar.c:5317
 msgid "(no name)"
 msgstr "(no name)"
 
-#: src/protocols/oscar/oscar.c:5245
+#: src/protocols/oscar/oscar.c:5317
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -7386,7 +7483,7 @@
 "for this is that you have the maximum number of allowed buddies in your "
 "buddy list."
 
-#: src/protocols/oscar/oscar.c:5327
+#: src/protocols/oscar/oscar.c:5399
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -7395,11 +7492,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:5333
+#: src/protocols/oscar/oscar.c:5405
 msgid "Authorization Given"
 msgstr "Authorisation Given"
 
-#: src/protocols/oscar/oscar.c:5366
+#: src/protocols/oscar/oscar.c:5438
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -7409,17 +7506,17 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:5408
+#: src/protocols/oscar/oscar.c:5480
 #, 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:5409
+#: src/protocols/oscar/oscar.c:5481
 msgid "Authorization Granted"
 msgstr "Authorisation Granted"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:5412
+#: src/protocols/oscar/oscar.c:5484
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -7430,60 +7527,32 @@
 "following reason:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5413
+#: src/protocols/oscar/oscar.c:5485
 msgid "Authorization Denied"
 msgstr "Authorisation Denied"
 
-#: src/protocols/oscar/oscar.c:5450 src/protocols/toc/toc.c:1264
+#: src/protocols/oscar/oscar.c:5522 src/protocols/toc/toc.c:1264
 msgid "_Exchange:"
 msgstr "_Exchange:"
 
-#: src/protocols/oscar/oscar.c:5472
+#: src/protocols/oscar/oscar.c:5544
 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:5715
-msgid "<b>IP Address:</b> "
-msgstr "<b>IP Address:</b> "
-
-#: src/protocols/oscar/oscar.c:5723
-msgid "<b>Capabilities:</b> "
-msgstr "<b>Capabilities:</b> "
-
-#: src/protocols/oscar/oscar.c:5732
-msgid "<b>Buddy Comment:</b> "
-msgstr "<b>Buddy Comment:</b> "
-
-#: src/protocols/oscar/oscar.c:5741
-msgid "<b>Available:</b> "
-msgstr "<b>Available:</b> "
-
-#: src/protocols/oscar/oscar.c:5762
-msgid "<b>Away Message:</b> "
-msgstr "<b>Away Message:</b> "
-
-#: src/protocols/oscar/oscar.c:5770
-msgid "<b>Status:</b> Not Authorized"
-msgstr "<b>Status:</b> Not Authorised"
-
-#: src/protocols/oscar/oscar.c:5804 src/protocols/yahoo/yahoo.c:2293
-msgid "Offline"
-msgstr "Offline"
-
-#: src/protocols/oscar/oscar.c:6270
+#: src/protocols/oscar/oscar.c:5785
+msgid "Away Message"
+msgstr "Away Message"
+
+#: src/protocols/oscar/oscar.c:6279
 msgid "Unable to open Direct IM"
 msgstr "Unable to open Direct IM"
 
-#: src/protocols/oscar/oscar.c:6283
+#: src/protocols/oscar/oscar.c:6292
 #, 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:6286
+#: src/protocols/oscar/oscar.c:6295
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
@@ -7491,51 +7560,51 @@
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
 
-#: src/protocols/oscar/oscar.c:6470
+#: src/protocols/oscar/oscar.c:6480
 msgid "Buddy Comment:"
 msgstr "Buddy Comment:"
 
-#: src/protocols/oscar/oscar.c:6486
+#: src/protocols/oscar/oscar.c:6496
 msgid "Edit Buddy Comment"
 msgstr "Edit Buddy Comment"
 
-#: src/protocols/oscar/oscar.c:6494
+#: src/protocols/oscar/oscar.c:6504
 msgid "Get Status Msg"
 msgstr "Get Status Msg"
 
-#: src/protocols/oscar/oscar.c:6509
+#: src/protocols/oscar/oscar.c:6519
 msgid "Direct IM"
 msgstr "Direct IM"
 
-#: src/protocols/oscar/oscar.c:6538
+#: src/protocols/oscar/oscar.c:6548
 msgid "Re-request Authorization"
 msgstr "Re-request Authorisation"
 
-#: src/protocols/oscar/oscar.c:6559
+#: src/protocols/oscar/oscar.c:6569
 msgid "The new formatting is invalid."
 msgstr "The new formatting is invalid."
 
-#: src/protocols/oscar/oscar.c:6560
+#: src/protocols/oscar/oscar.c:6570
 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
+#: src/protocols/oscar/oscar.c:6576
 msgid "New screen name formatting:"
 msgstr "New screen name formatting:"
 
-#: src/protocols/oscar/oscar.c:6615
+#: src/protocols/oscar/oscar.c:6625
 msgid "Change Address To:"
 msgstr "Change Address To:"
 
-#: src/protocols/oscar/oscar.c:6659
+#: src/protocols/oscar/oscar.c:6669
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>you are not waiting for authorisation</i>"
 
-#: src/protocols/oscar/oscar.c:6662
+#: src/protocols/oscar/oscar.c:6672
 msgid "You are awaiting authorization from the following buddies"
 msgstr "You are awaiting authorisation from the following buddies"
 
-#: src/protocols/oscar/oscar.c:6663
+#: src/protocols/oscar/oscar.c:6673
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -7543,70 +7612,78 @@
 "You can re-request authorisation from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorisation.\""
 
-#: src/protocols/oscar/oscar.c:6677
+#: src/protocols/oscar/oscar.c:6687
 msgid "Find Buddy by E-mail"
 msgstr "Find Buddy by E-mail"
 
-#: src/protocols/oscar/oscar.c:6678
+#: src/protocols/oscar/oscar.c:6688
 msgid "Search for a buddy by e-mail address"
 msgstr "Search for a buddy by e-mail address"
 
-#: src/protocols/oscar/oscar.c:6679
+#: src/protocols/oscar/oscar.c:6689
 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:6696
+#: src/protocols/oscar/oscar.c:6706
 msgid "Available Message:"
 msgstr "Available Message:"
 
-#: src/protocols/oscar/oscar.c:6697
+#: src/protocols/oscar/oscar.c:6707
 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:6768
+#: src/protocols/oscar/oscar.c:6783
 msgid "Set User Info..."
 msgstr "Set User Info..."
 
-#: src/protocols/oscar/oscar.c:6775
+#: src/protocols/oscar/oscar.c:6790
+msgid "Set User Info (URL)..."
+msgstr "Set User Info (URL)..."
+
+#: src/protocols/oscar/oscar.c:6798
 msgid "Set Available Message..."
 msgstr "Set Available Message..."
 
-#: src/protocols/oscar/oscar.c:6782
+#: src/protocols/oscar/oscar.c:6805
 msgid "Change Password..."
 msgstr "Change Password..."
 
-#: src/protocols/oscar/oscar.c:6789
+#: src/protocols/oscar/oscar.c:6812
 msgid "Change Password (URL)"
 msgstr "Change Password (URL)"
 
-#: src/protocols/oscar/oscar.c:6797
+#: src/protocols/oscar/oscar.c:6820
 msgid "Configure IM Forwarding (URL)"
 msgstr "Configure IM Forwarding (URL)"
 
-#: src/protocols/oscar/oscar.c:6808
+#: src/protocols/oscar/oscar.c:6831
 msgid "Format Screen Name..."
 msgstr "Format Screen Name..."
 
-#: src/protocols/oscar/oscar.c:6814
+#: src/protocols/oscar/oscar.c:6837
 msgid "Confirm Account"
 msgstr "Confirm Account"
 
-#: src/protocols/oscar/oscar.c:6820
+#: src/protocols/oscar/oscar.c:6843
 msgid "Display Currently Registered Address"
 msgstr "Display Currently Registered Address"
 
-#: src/protocols/oscar/oscar.c:6826
+#: src/protocols/oscar/oscar.c:6849
 msgid "Change Currently Registered Address..."
 msgstr "Change Currently Registered Address"
 
-#: src/protocols/oscar/oscar.c:6835
+#: src/protocols/oscar/oscar.c:6858
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Show Buddies Awaiting Authorisation"
 
-#: src/protocols/oscar/oscar.c:6843
+#: src/protocols/oscar/oscar.c:6866
 msgid "Search for Buddy by Email..."
 msgstr "Search for Buddy by Email..."
 
+#: src/protocols/oscar/oscar.c:6873
+msgid "Search for Buddy by Information"
+msgstr "Search for Buddy by Information"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -7617,15 +7694,15 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/oscar/oscar.c:6964 src/protocols/oscar/oscar.c:6966
+#: src/protocols/oscar/oscar.c:6997 src/protocols/oscar/oscar.c:6999
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ Protocol Plugin"
 
-#: src/protocols/oscar/oscar.c:6983
+#: src/protocols/oscar/oscar.c:7016
 msgid "Auth host"
 msgstr "Auth host"
 
-#: src/protocols/oscar/oscar.c:6988
+#: src/protocols/oscar/oscar.c:7021
 msgid "Auth port"
 msgstr "Auth port"
 
@@ -7832,15 +7909,15 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/toc/toc.c:2159 src/protocols/toc/toc.c:2161
+#: src/protocols/toc/toc.c:2168 src/protocols/toc/toc.c:2170
 msgid "TOC Protocol Plugin"
 msgstr "TOC Protocol Plugin"
 
-#: src/protocols/toc/toc.c:2178
+#: src/protocols/toc/toc.c:2187
 msgid "TOC host"
 msgstr "TOC host"
 
-#: src/protocols/toc/toc.c:2182
+#: src/protocols/toc/toc.c:2191
 msgid "TOC port"
 msgstr "TOC port"
 
@@ -7893,23 +7970,23 @@
 msgid "Set your Trepia profile data."
 msgstr "Set your Trepia profile data."
 
-#: src/protocols/trepia/trepia.c:468
+#: src/protocols/trepia/trepia.c:424
 msgid "Profile"
 msgstr "Profile"
 
-#: src/protocols/trepia/trepia.c:490
+#: src/protocols/trepia/trepia.c:439
 msgid "Set Profile"
 msgstr "Set Profile"
 
-#: src/protocols/trepia/trepia.c:526
+#: src/protocols/trepia/trepia.c:475
 msgid "Visit Homepage"
 msgstr "Visit Homepage"
 
-#: src/protocols/trepia/trepia.c:872 src/protocols/trepia/trepia.c:875
+#: src/protocols/trepia/trepia.c:821 src/protocols/trepia/trepia.c:824
 msgid "Local Users"
 msgstr "Local Users"
 
-#: src/protocols/trepia/trepia.c:1078
+#: src/protocols/trepia/trepia.c:1027
 msgid "Logging in"
 msgstr "Logging in"
 
@@ -7923,7 +8000,7 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/trepia/trepia.c:1326 src/protocols/trepia/trepia.c:1328
+#: src/protocols/trepia/trepia.c:1283 src/protocols/trepia/trepia.c:1285
 msgid "Trepia Protocol Plugin"
 msgstr "Trepia Protocol Plugin"
 
@@ -7966,7 +8043,7 @@
 msgid "Add buddy rejected"
 msgstr "Add buddy rejected"
 
-#: src/protocols/yahoo/yahoo.c:1595
+#: src/protocols/yahoo/yahoo.c:1599
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -7977,11 +8054,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:1598
+#: src/protocols/yahoo/yahoo.c:1602
 msgid "Failed Yahoo! Authentication"
 msgstr "Failed Yahoo! Authentication"
 
-#: src/protocols/yahoo/yahoo.c:1671
+#: src/protocols/yahoo/yahoo.c:1675
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -7990,100 +8067,109 @@
 "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:1674
+#: src/protocols/yahoo/yahoo.c:1678
 msgid "Ignore buddy?"
 msgstr "Ignore buddy?"
 
-#: src/protocols/yahoo/yahoo.c:1707
+#: src/protocols/yahoo/yahoo.c:1711
 msgid "Invalid username."
 msgstr "Invalid username."
 
-#: src/protocols/yahoo/yahoo.c:1710
+#: src/protocols/yahoo/yahoo.c:1714
 msgid "Incorrect password."
 msgstr "Incorrect password."
 
-#: src/protocols/yahoo/yahoo.c:1713
+#: src/protocols/yahoo/yahoo.c:1717
 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:1716
+#: src/protocols/yahoo/yahoo.c:1720
 #, c-format
 msgid "Unknown error number %d."
 msgstr "Unknown error number %d"
 
-#: src/protocols/yahoo/yahoo.c:1773
+#: src/protocols/yahoo/yahoo.c:1777
 #, 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:1775
+#: src/protocols/yahoo/yahoo.c:1779
 msgid "Could not add buddy to server list"
 msgstr "Could not add buddy to server list"
 
-#: src/protocols/yahoo/yahoo.c:1885 src/protocols/yahoo/yahoo.c:2016
+#: src/protocols/yahoo/yahoo.c:1889 src/protocols/yahoo/yahoo.c:2020
 msgid "Unable to read"
 msgstr "Unable to read"
 
-#: 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/yahoo.c:2042 src/protocols/yahoo/yahoo.c:2152
+#: src/protocols/yahoo/yahoo.c:2195 src/protocols/yahoo/yahoochat.c:1360
 #: src/protocols/yahoo/yahoochat.c:1421
 msgid "Connection problem"
 msgstr "Connection problem"
 
-#: src/protocols/yahoo/yahoo.c:2275 src/protocols/yahoo/yahoo.c:2600
-#: src/protocols/yahoo/yahoo.c:2706
+#: src/protocols/yahoo/yahoo.c:2279 src/protocols/yahoo/yahoo.c:2605
+#: src/protocols/yahoo/yahoo.c:2717
 msgid "Not At Home"
 msgstr "Not At Home"
 
-#: src/protocols/yahoo/yahoo.c:2277 src/protocols/yahoo/yahoo.c:2602
-#: src/protocols/yahoo/yahoo.c:2707
+#: src/protocols/yahoo/yahoo.c:2281 src/protocols/yahoo/yahoo.c:2607
+#: src/protocols/yahoo/yahoo.c:2718
 msgid "Not At Desk"
 msgstr "Not At Desk"
 
-#: src/protocols/yahoo/yahoo.c:2279 src/protocols/yahoo/yahoo.c:2604
-#: src/protocols/yahoo/yahoo.c:2708
+#: src/protocols/yahoo/yahoo.c:2283 src/protocols/yahoo/yahoo.c:2609
+#: src/protocols/yahoo/yahoo.c:2719
 msgid "Not In Office"
 msgstr "Not In Office"
 
-#: src/protocols/yahoo/yahoo.c:2283 src/protocols/yahoo/yahoo.c:2608
-#: src/protocols/yahoo/yahoo.c:2710
+#: src/protocols/yahoo/yahoo.c:2287 src/protocols/yahoo/yahoo.c:2613
+#: src/protocols/yahoo/yahoo.c:2721
 msgid "On Vacation"
 msgstr "On Vacation"
 
-#: src/protocols/yahoo/yahoo.c:2287 src/protocols/yahoo/yahoo.c:2612
-#: src/protocols/yahoo/yahoo.c:2712
+#: src/protocols/yahoo/yahoo.c:2291 src/protocols/yahoo/yahoo.c:2617
+#: src/protocols/yahoo/yahoo.c:2723
 msgid "Stepped Out"
 msgstr "Stepped Out"
 
-#: src/protocols/yahoo/yahoo.c:2351 src/protocols/yahoo/yahoo.c:2383
+#: src/protocols/yahoo/yahoo.c:2355 src/protocols/yahoo/yahoo.c:2387
 msgid "Not on server list"
 msgstr "Not on server list"
 
-#: src/protocols/yahoo/yahoo.c:2439
+#: src/protocols/yahoo/yahoo.c:2407
+#, c-format
+msgid ""
+"\n"
+"<b>%s:</b> %s"
+msgstr ""
+"\n"
+"<b>%s:</b> %s"
+
+#: src/protocols/yahoo/yahoo.c:2443
 msgid "Join in Chat"
 msgstr "Join in Chat"
 
-#: src/protocols/yahoo/yahoo.c:2445
+#: src/protocols/yahoo/yahoo.c:2449
 msgid "Initiate Conference"
 msgstr "Initiate Conference"
 
-#: src/protocols/yahoo/yahoo.c:2498
+#: src/protocols/yahoo/yahoo.c:2502
 msgid "Active which ID?"
 msgstr "Active which ID?"
 
-#: src/protocols/yahoo/yahoo.c:2506
+#: src/protocols/yahoo/yahoo.c:2510
 msgid "Join who in chat?"
 msgstr "Join who in chat?"
 
-#: src/protocols/yahoo/yahoo.c:2517
+#: src/protocols/yahoo/yahoo.c:2521
 msgid "Activate ID..."
 msgstr "Activate ID..."
 
-#: src/protocols/yahoo/yahoo.c:2523
+#: src/protocols/yahoo/yahoo.c:2527
 msgid "Join user in chat..."
 msgstr "Join user in chat..."
 
-#: src/protocols/yahoo/yahoo.c:2905
+#: src/protocols/yahoo/yahoo.c:2916
 msgid ""
 "<b>Sorry, profiles marked as containing adult content are not supported at "
 "this time.</b><br><br>\n"
@@ -8091,7 +8177,7 @@
 "<b>Sorry, profiles marked as containing adult content are not supported at "
 "this time.</b><br><br>\n"
 
-#: src/protocols/yahoo/yahoo.c:2906 src/protocols/yahoo/yahoo.c:2929
+#: src/protocols/yahoo/yahoo.c:2917 src/protocols/yahoo/yahoo.c:2940
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser<br>"
@@ -8099,45 +8185,41 @@
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser<br>"
 
-#: src/protocols/yahoo/yahoo.c:2928
+#: src/protocols/yahoo/yahoo.c:2939
 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:2976 src/protocols/yahoo/yahoo.c:2977
+#: src/protocols/yahoo/yahoo.c:2987 src/protocols/yahoo/yahoo.c:2988
 msgid "Yahoo! ID"
 msgstr "Yahoo! ID"
 
-#: src/protocols/yahoo/yahoo.c:3021 src/protocols/yahoo/yahoo.c:3024
-#: src/protocols/yahoo/yahoo.c:3027
+#: src/protocols/yahoo/yahoo.c:3032 src/protocols/yahoo/yahoo.c:3035
+#: src/protocols/yahoo/yahoo.c:3038
 msgid "Hobbies"
 msgstr "Hobbies"
 
-#: src/protocols/yahoo/yahoo.c:3036 src/protocols/yahoo/yahoo.c:3039
+#: src/protocols/yahoo/yahoo.c:3047 src/protocols/yahoo/yahoo.c:3050
 msgid "Latest News"
 msgstr "Latest News"
 
-#: src/protocols/yahoo/yahoo.c:3053
+#: src/protocols/yahoo/yahoo.c:3064
 msgid "Home Page"
 msgstr "Home Page"
 
-#: src/protocols/yahoo/yahoo.c:3065
+#: src/protocols/yahoo/yahoo.c:3076
 msgid "Cool Link 1"
 msgstr "Cool Link 1"
 
-#: src/protocols/yahoo/yahoo.c:3069
+#: src/protocols/yahoo/yahoo.c:3080
 msgid "Cool Link 2"
 msgstr "Cool Link 2"
 
-#: src/protocols/yahoo/yahoo.c:3071
+#: src/protocols/yahoo/yahoo.c:3082
 msgid "Cool Link 3"
 msgstr "Cool Link 3"
 
-#: src/protocols/yahoo/yahoo.c:3077
-msgid "Member Since"
-msgstr "Member Since"
-
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -8148,27 +8230,27 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/yahoo/yahoo.c:3283 src/protocols/yahoo/yahoo.c:3285
+#: src/protocols/yahoo/yahoo.c:3295 src/protocols/yahoo/yahoo.c:3297
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo Protocol Plugin"
 
-#: src/protocols/yahoo/yahoo.c:3302
+#: src/protocols/yahoo/yahoo.c:3314
 msgid "Pager host"
 msgstr "Pager host"
 
-#: src/protocols/yahoo/yahoo.c:3305
+#: src/protocols/yahoo/yahoo.c:3317
 msgid "Pager port"
 msgstr "Pager port"
 
-#: src/protocols/yahoo/yahoo.c:3308
+#: src/protocols/yahoo/yahoo.c:3320
 msgid "File transfer host"
 msgstr "File transfer host"
 
-#: src/protocols/yahoo/yahoo.c:3311
+#: src/protocols/yahoo/yahoo.c:3323
 msgid "File transfer port"
 msgstr "File transfer port"
 
-#: src/protocols/yahoo/yahoo.c:3314
+#: src/protocols/yahoo/yahoo.c:3326
 msgid "Chat Room List Url"
 msgstr "Chat Room List Url"
 
@@ -8234,35 +8316,34 @@
 msgid "User Rooms"
 msgstr "User Rooms"
 
-#: src/protocols/zephyr/zephyr.c:525
+#: src/protocols/zephyr/zephyr.c:557
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>User:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:527
+#: src/protocols/zephyr/zephyr.c:559
 #, c-format
 msgid "<b>Alias:</b> %s<br>"
 msgstr "<b>Alias:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:529
+#: src/protocols/zephyr/zephyr.c:561
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>Hidden or not logged-in"
 
-#: src/protocols/zephyr/zephyr.c:533
+#: src/protocols/zephyr/zephyr.c:565
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>At %s since %s"
 
-#: src/protocols/zephyr/zephyr.c:793 src/protocols/zephyr/zephyr.c:794
-#: src/protocols/zephyr/zephyr.c:982 src/protocols/zephyr/zephyr.c:983
+#: src/protocols/zephyr/zephyr.c:831 src/protocols/zephyr/zephyr.c:832
 msgid "Anyone"
 msgstr "Anyone"
 
-#: src/protocols/zephyr/zephyr.c:820
+#: src/protocols/zephyr/zephyr.c:858
 msgid "Already logged in with Zephyr"
 msgstr "Already logged in with Zephyr"
 
-#: src/protocols/zephyr/zephyr.c:821
+#: src/protocols/zephyr/zephyr.c:858
 msgid ""
 "Because Zephyr uses your system username, you are unable to have multiple "
 "accounts on it when logged in as the same user."
@@ -8270,11 +8351,11 @@
 "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:1158
+#: src/protocols/zephyr/zephyr.c:1155
 msgid "ZLocate"
 msgstr "ZLocate"
 
-#: src/protocols/zephyr/zephyr.c:1198
+#: src/protocols/zephyr/zephyr.c:1197
 msgid "_Class:"
 msgstr "_Class:"
 
@@ -8282,7 +8363,7 @@
 msgid "_Instance:"
 msgstr "_Instance:"
 
-#: src/protocols/zephyr/zephyr.c:1208
+#: src/protocols/zephyr/zephyr.c:1209
 msgid "_Recipient:"
 msgstr "_Recipient:"
 
@@ -8296,37 +8377,37 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/zephyr/zephyr.c:1358 src/protocols/zephyr/zephyr.c:1360
+#: src/protocols/zephyr/zephyr.c:1364 src/protocols/zephyr/zephyr.c:1366
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr Protocol Plugin"
 
-#: src/protocols/zephyr/zephyr.c:1377
+#: src/protocols/zephyr/zephyr.c:1383
 msgid "Export to .anyone"
 msgstr "Export to .anyone"
 
-#: src/protocols/zephyr/zephyr.c:1380
+#: src/protocols/zephyr/zephyr.c:1386
 msgid "Export to .zephyr.subs"
 msgstr "Export to .zephyr.subs"
 
-#: src/protocols/zephyr/zephyr.c:1383
+#: src/protocols/zephyr/zephyr.c:1389
 msgid "Exposure"
 msgstr "Exposure"
 
 #. Forbidden
-#: src/proxy.c:954
+#: src/proxy.c:955
 msgid "Access denied: proxy server forbids port 80 tunnelling."
 msgstr "Access denied: proxy server forbids port 80 tunnelling."
 
-#: src/proxy.c:956
+#: src/proxy.c:957
 #, c-format
 msgid "Proxy connection error %d"
 msgstr "Proxy connection error %d"
 
-#: src/proxy.c:1695
+#: src/proxy.c:1696
 msgid "Invalid proxy settings"
 msgstr "Invalid proxy settings"
 
-#: src/proxy.c:1695
+#: src/proxy.c:1696
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -8335,14 +8416,14 @@
 "invalid."
 
 #. * Custom away message.
-#: src/prpl.h:189
+#: src/prpl.h:194
 msgid "Custom"
 msgstr "Custom"
 
 #. *
 #. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #.
-#: src/request.h:1247
+#: src/request.h:1250
 msgid "Accept"
 msgstr "Accept"
 
@@ -8350,28 +8431,58 @@
 msgid "Please enter your password"
 msgstr "Please enter your password"
 
-#: src/server.c:960
+#: src/server.c:962
 #, c-format
 msgid "(%d message)"
 msgid_plural "(%d messages)"
 msgstr[0] "(%d message)"
 msgstr[1] "(%d messages)"
 
-#: src/server.c:974
+#: src/server.c:976
 msgid "(1 message)"
 msgstr "(1 message)"
 
-#: src/server.c:1161 src/server.c:1171
+#: src/server.c:1160 src/server.c:1170
 #, c-format
 msgid "%s logged in."
 msgstr "%s logged in."
 
-#: src/server.c:1188 src/server.c:1196
+#: src/server.c:1184
+#, c-format
+msgid "%s signed on"
+msgstr "%s signed on"
+
+#: src/server.c:1200
+#, c-format
+msgid "%s came back"
+msgstr "%s came back"
+
+#: src/server.c:1202
+#, c-format
+msgid "%s went away"
+msgstr "%s went away."
+
+#: src/server.c:1217
+#, c-format
+msgid "%s became idle"
+msgstr "%s became idle"
+
+#: src/server.c:1231
+#, c-format
+msgid "%s became unidle"
+msgstr "%s is no longer idle"
+
+#: src/server.c:1244 src/server.c:1252
 #, c-format
 msgid "%s logged out."
 msgstr "%s logged out."
 
-#: src/server.c:1243
+#: src/server.c:1267
+#, c-format
+msgid "%s signed off"
+msgstr "%s signed off"
+
+#: src/server.c:1317
 #, c-format
 msgid ""
 "%s has just been warned by %s.\n"
@@ -8380,11 +8491,11 @@
 "%s has just been warned by %s.\n"
 "Your new warning level is %d%%"
 
-#: src/server.c:1246
+#: src/server.c:1320
 msgid "an anonymous person"
 msgstr "an anonymous person"
 
-#: src/server.c:1349
+#: src/server.c:1430
 #, c-format
 msgid ""
 "User '%s' invites %s to buddy chat room: '%s'\n"
@@ -8393,12 +8504,12 @@
 "User '%s' invites %s to buddy chat room: '%s'\n"
 "%s"
 
-#: src/server.c:1353
+#: src/server.c:1434
 #, 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:1359
+#: src/server.c:1440
 msgid "Accept chat invitation?"
 msgstr "Accept chat invitation?"
 
@@ -8425,33 +8536,33 @@
 msgid "_Warn"
 msgstr "_Warn"
 
-#: src/util.c:1884
+#: src/util.c:2040
 msgid "Calculating..."
 msgstr "Calculating..."
 
-#: src/util.c:1887
+#: src/util.c:2043
 msgid "Unknown."
 msgstr "Unknown."
 
-#: src/util.c:1918 src/util.c:1923 src/util.c:1928 src/util.c:1931
+#: src/util.c:2074 src/util.c:2079 src/util.c:2084 src/util.c:2087
 msgid "day"
 msgid_plural "days"
 msgstr[0] "day"
 msgstr[1] "days"
 
-#: src/util.c:1919 src/util.c:1923 src/util.c:1937 src/util.c:1939
+#: src/util.c:2075 src/util.c:2079 src/util.c:2093 src/util.c:2095
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "hour"
 msgstr[1] "hours"
 
-#: src/util.c:1919 src/util.c:1928 src/util.c:1937 src/util.c:1942
+#: src/util.c:2075 src/util.c:2084 src/util.c:2093 src/util.c:2098
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minute"
 msgstr[1] "minutes"
 
-#: src/util.c:2274
+#: src/util.c:2430
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Error opening connection.\n"