changeset 8100:26ba7c8bc1c0

[gaim-migrate @ 8800] update committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Wed, 14 Jan 2004 17:11:04 +0000
parents 40163e984818
children a987d9729ebe
files ChangeLog po/en_GB.po
diffstat 2 files changed, 2274 insertions(+), 1893 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Jan 14 16:55:07 2004 +0000
+++ b/ChangeLog	Wed Jan 14 17:11:04 2004 +0000
@@ -3,6 +3,7 @@
 version 0.76cvs:
 	* WYSIWYG text input (with scrollbars, too!)
 	* Catalan translation updated (Xan (DXpublica))
+	* English (British) translation updated (Luke Ross (lukeross))
 
 version 0.75 (01/09/2004):
 	* New Yahoo! auth method
--- a/po/en_GB.po	Wed Jan 14 16:55:07 2004 +0000
+++ b/po/en_GB.po	Wed Jan 14 17:11:04 2004 +0000
@@ -1,15 +1,16 @@
-# British English translations for gaim
+# Gaim British English (en_GB) translations
 # Copyright (C) 2003 Luke Ross <lukeross@sys3175.co.uk>
+#
 # This file is distributed under the same license as the Gaim package.
-# Luke Ross <lukeross@sys3175.co.uk>, 2003.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: Gaim 0.73\n"
-"POT-Creation-Date: 2003-11-25 14:12+0000\n"
-"PO-Revision-Date: 2003-11-25 14:54+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-01-14 12:07+0000\n"
+"PO-Revision-Date: 2004-01-14 12:26+0000\n"
 "Last-Translator: Luke Ross <lukeross@sys3175.co.uk>\n"
+"Language-Team:  <en_GB@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -133,7 +134,7 @@
 msgid "Gaim - Away"
 msgstr "Gaim - Away"
 
-#: plugins/docklet/docklet.c:114 src/gtkaccount.c:482 src/gtkaccount.c:1768
+#: plugins/docklet/docklet.c:114 src/gtkaccount.c:482 src/gtkaccount.c:1761
 msgid "Auto-login"
 msgstr "Auto-login"
 
@@ -149,16 +150,16 @@
 msgid "New..."
 msgstr "New..."
 
-#: plugins/docklet/docklet.c:153 src/gtkblist.c:2328 src/gtkpounce.c:411
-#: src/gtkprefs.c:1467 src/protocols/gg/gg.c:51 src/protocols/irc/msgs.c:187
-#: src/protocols/jabber/jabber.c:929 src/protocols/jabber/jutil.c:98
-#: src/protocols/jabber/presence.c:84 src/protocols/oscar/oscar.c:2844
-#: src/protocols/oscar/oscar.c:4591 src/protocols/oscar/oscar.c:5537
-#: src/protocols/oscar/oscar.c:6138
+#: plugins/docklet/docklet.c:153 src/gtkblist.c:2726 src/gtkpounce.c:413
+#: src/gtkprefs.c:1456 src/protocols/gg/gg.c:51 src/protocols/irc/msgs.c:187
+#: src/protocols/jabber/jabber.c:961 src/protocols/jabber/jutil.c:99
+#: src/protocols/jabber/presence.c:84 src/protocols/oscar/oscar.c:2843
+#: src/protocols/oscar/oscar.c:4604 src/protocols/oscar/oscar.c:5563
+#: src/protocols/oscar/oscar.c:6164
 msgid "Away"
 msgstr "Away"
 
-#: plugins/docklet/docklet.c:159 src/away.c:515
+#: plugins/docklet/docklet.c:159 src/away.c:517
 msgid "Back"
 msgstr "Back"
 
@@ -166,16 +167,16 @@
 msgid "Mute Sounds"
 msgstr "Mute Sounds"
 
-#: plugins/docklet/docklet.c:172 src/gtkft.c:559
+#: plugins/docklet/docklet.c:172 src/gtkft.c:583
 msgid "File Transfers"
 msgstr "File Transfers"
 
 #. And now for the buttons
-#: plugins/docklet/docklet.c:173 src/gtkaccount.c:1927 src/main.c:323
+#: plugins/docklet/docklet.c:173 src/gtkaccount.c:1920 src/main.c:326
 msgid "Accounts"
 msgstr "Accounts"
 
-#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2331 src/main.c:333
+#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2322 src/main.c:332
 msgid "Preferences"
 msgstr "Preferences"
 
@@ -233,14 +234,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/filectl.c:201
+#: plugins/filectl.c:223
 msgid "Gaim File Control"
 msgstr "Gaim File Control"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/filectl.c:204 plugins/filectl.c:206
+#: plugins/filectl.c:226 plugins/filectl.c:228
 msgid "Allows you to control Gaim by entering commands in a file."
 msgstr "Allows you to control Gaim by entering commands in a file."
 
@@ -267,19 +268,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gaim-remote/remote.c:714
+#: plugins/gaim-remote/remote.c:715
 msgid "Remote Control"
 msgstr "Remote Control"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gaim-remote/remote.c:717
+#: plugins/gaim-remote/remote.c:718
 msgid "Provides remote control for gaim applications."
 msgstr "Provides remote control for gaim applications."
 
 #. *  description
-#: plugins/gaim-remote/remote.c:719
+#: plugins/gaim-remote/remote.c:720
 msgid ""
 "Gives Gaim the ability to be remote-controlled through third-party "
 "applications or through the gaim-remote tool."
@@ -294,19 +295,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gaiminc.c:81
+#: plugins/gaiminc.c:87
 msgid "Gaim Demonstration Plugin"
 msgstr "Gaim Demonstration Plugin"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gaiminc.c:84
+#: plugins/gaiminc.c:90
 msgid "An example plugin that does stuff - see the description."
 msgstr "An example plugin that does stuff - see the description."
 
 #. *  description
-#: plugins/gaiminc.c:86
+#: plugins/gaiminc.c:92
 msgid ""
 "This is a really cool plugin that does a lot of stuff:\n"
 "- It tells you who wrote the program when you log in\n"
@@ -371,50 +372,176 @@
 "Drag up and then to the left to switch to the previous conversation.\n"
 "Drag up and then to the right to switch to the next conversation."
 
-#: plugins/gtik.c:719
-msgid "Gnome Stock Ticker Properties"
-msgstr "Gnome Stock Ticker Properties"
-
-#: plugins/gtik.c:731
-msgid "Update Frequency in min"
-msgstr "Update Frequency in min"
-
-#: plugins/gtik.c:747
-msgid "Enter symbols delimited with \"+\" in the box below."
-msgstr "Enter symbols delimited with \"+\" in the box below."
-
-#. OUTPUT FORMAT and SCROLL DIRECTION
-#: plugins/gtik.c:757
-msgid "Check this box to display only symbols and price:"
-msgstr "Check this box to display only symbols and price:"
-
-#: plugins/gtik.c:758
-msgid "Check this box to scroll left to right:"
-msgstr "Check this box to scroll left to right:"
-
-#: plugins/gtik.c:994
-msgid "(No"
-msgstr "(No"
-
-#: plugins/gtik.c:995
-msgid "Change"
-msgstr "Change"
-
-#: plugins/history.c:75
+#: plugins/gevolution/add_buddy_dialog.c:136
+#: plugins/gevolution/assoc-buddy.c:76
+msgid "Local Addressbook"
+msgstr "Local Addressbook"
+
+#: plugins/gevolution/add_buddy_dialog.c:146
+#: plugins/gevolution/add_buddy_dialog.c:157
+#: plugins/gevolution/assoc-buddy.c:86 plugins/gevolution/assoc-buddy.c:97
+#: src/gtkblist.c:2519 src/gtkprefs.c:833 src/gtkprefs.c:1484
+msgid "None"
+msgstr "None"
+
+#: plugins/gevolution/add_buddy_dialog.c:190
+#: plugins/gevolution/assoc-buddy.c:180 src/gtkprefs.c:1764
+#: src/protocols/jabber/jabber.c:619 src/protocols/msn/msn.c:1350
+#: src/protocols/trepia/trepia.c:401
+msgid "Name"
+msgstr "Name"
+
+#: plugins/gevolution/add_buddy_dialog.c:201
+msgid "Instant Messaging"
+msgstr "Instant Messaging"
+
+#. Add the label.
+#: plugins/gevolution/add_buddy_dialog.c:482
+msgid "Select a person from your address book below, or add a new person."
+msgstr "Select a person from your address book below, or add a new person."
+
+#. "Search"
+#: plugins/gevolution/add_buddy_dialog.c:495
+#: plugins/gevolution/assoc-buddy.c:385 src/protocols/oscar/oscar.c:6424
+msgid "Search"
+msgstr "Search"
+
+#: plugins/gevolution/add_buddy_dialog.c:566
+#: plugins/gevolution/new_person_dialog.c:310 src/gtkblist.c:3515
+#: src/gtkblist.c:3837
+msgid "Group:"
+msgstr "Group:"
+
+#. "New Person" button
+#: plugins/gevolution/add_buddy_dialog.c:592
+#: plugins/gevolution/assoc-buddy.c:488
+msgid "New Person"
+msgstr "New Person"
+
+#. "Select Buddy" button
+#: plugins/gevolution/add_buddy_dialog.c:609
+msgid "Select Buddy"
+msgstr "Select Buddy"
+
+#. Add the label.
+#: plugins/gevolution/assoc-buddy.c:372
+msgid ""
+"Select a person from your address book to add this buddy to, or create a new "
+"person."
+msgstr ""
+"Select a person from your address book to add this buddy to, or create a new "
+"person."
+
+#. Add the disclosure
+#: plugins/gevolution/assoc-buddy.c:451
+msgid "Show user details"
+msgstr "Show user details"
+
+#: plugins/gevolution/assoc-buddy.c:452
+msgid "Hide user details"
+msgstr "Hide user details"
+
+#. "Associate Buddy" button
+#: plugins/gevolution/assoc-buddy.c:505
+msgid "_Associate Buddy"
+msgstr "_Associate Buddy"
+
+#: plugins/gevolution/gevo-util.c:66 plugins/gevolution/gevolution.c:90
+#: src/blist.c:672 src/blist.c:859 src/blist.c:2078 src/gtkblist.c:3342
+#: src/protocols/jabber/roster.c:66 src/protocols/msn/notification.c:1168
+msgid "Buddies"
+msgstr "Buddies"
+
+#: plugins/gevolution/gevolution.c:214
+msgid "Add to Address Book"
+msgstr "Add to Address Book"
+
+#. Configuration frame
+#: plugins/gevolution/gevolution.c:343
+msgid "Evolution Integration Configuration"
+msgstr "Evolution Integration Configuration"
+
+#. Label
+#: plugins/gevolution/gevolution.c:346
+msgid "Select all accounts that buddies should be auto-added to."
+msgstr "Select all accounts that buddies should be auto-added to."
+
+#: plugins/gevolution/gevolution.c:376 src/gtkconn.c:614
+msgid "Account"
+msgstr "Account"
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/gevolution/gevolution.c:457
+msgid "Evolution Integration"
+msgstr "Evolution Integration"
+
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/gevolution/gevolution.c:460 plugins/gevolution/gevolution.c:462
+msgid "Provides integration with Ximian Evolution."
+msgstr "Provides integration with Ximian Evolution."
+
+#: plugins/gevolution/new_person_dialog.c:270
+msgid "Please enter the person's information below."
+msgstr "Please enter the person's information below."
+
+#: plugins/gevolution/new_person_dialog.c:274
+msgid "Please enter the buddy's screen name and account type below."
+msgstr "Please enter the buddy's screen name and account type below."
+
+#: plugins/gevolution/new_person_dialog.c:294
+msgid "Account type:"
+msgstr "Account type:"
+
+#: plugins/gevolution/new_person_dialog.c:298 src/gtkaccount.c:391
+msgid "Screenname:"
+msgstr "Screenname:"
+
+#. Optional Information section
+#: plugins/gevolution/new_person_dialog.c:318
+msgid "Optional information:"
+msgstr "Optional information"
+
+#. Label
+#: plugins/gevolution/new_person_dialog.c:341 src/gtkaccount.c:318
+#: src/protocols/oscar/oscar.c:3078
+msgid "Buddy Icon"
+msgstr "Buddy Icon"
+
+#: plugins/gevolution/new_person_dialog.c:353
+msgid "First name:"
+msgstr "First name:"
+
+#: plugins/gevolution/new_person_dialog.c:365
+msgid "Last name:"
+msgstr "Last name:"
+
+#: plugins/gevolution/new_person_dialog.c:385
+msgid "E-mail:"
+msgstr "E-mail:"
+
+#: plugins/history.c:74
 msgid "History"
 msgstr "History"
 
-#: plugins/history.c:77
+#: plugins/history.c:76
 msgid "Shows recently logged conversations in new conversations."
 msgstr "Shows recently logged conversations in new conversations."
 
-#: plugins/history.c:78
-msgid ""
-"When a new conversation is opened this plugin will insert the last XXX of "
-"the last conversation into the current conversation."
-msgstr ""
-"When a new conversation is opened this plugin will insert the last XXX of "
-"the last conversation into the current conversation."
+#: plugins/history.c:77
+msgid ""
+"When a new conversation is opened this plugin will insert the last "
+"conversation into the current conversation."
+msgstr ""
+"When a new conversation is opened this plugin will insert the last "
+"conversation into the current conversation."
 
 #. *< api_version
 #. *< type
@@ -671,19 +798,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/relnot.c:133
+#: plugins/relnot.c:134
 msgid "Release Notification"
 msgstr "Release Notification"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/relnot.c:136
+#: plugins/relnot.c:137
 msgid "Checks periodically for new releases."
 msgstr "Checks periodically for new releases."
 
 #. *  description
-#: plugins/relnot.c:138
+#: plugins/relnot.c:139
 msgid ""
 "Checks periodically for new releases and notifies the user with the "
 "ChangeLog."
@@ -766,14 +893,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl-gnutls.c:197
+#: plugins/ssl/ssl-gnutls.c:218
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/ssl/ssl-gnutls.c:200 plugins/ssl/ssl-gnutls.c:202
+#: plugins/ssl/ssl-gnutls.c:221 plugins/ssl/ssl-gnutls.c:223
 msgid "Provides SSL support through GNUTLS."
 msgstr "Provides SSL support through GNUTLS."
 
@@ -784,14 +911,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl-nss.c:296
+#: plugins/ssl/ssl-nss.c:306
 msgid "NSS"
 msgstr "NSS"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/ssl/ssl-nss.c:299 plugins/ssl/ssl-nss.c:301
+#: plugins/ssl/ssl-nss.c:309 plugins/ssl/ssl-nss.c:311
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "Provides SSL support through Mozilla NSS."
 
@@ -813,7 +940,7 @@
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "Provides a wrapper around SSL support libraries."
 
-#: plugins/statenotify.c:30 src/gtkpounce.c:793
+#: plugins/statenotify.c:30 src/gtkpounce.c:801
 #, c-format
 msgid "%s has gone away."
 msgstr "%s has gone away."
@@ -855,11 +982,11 @@
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
 
-#: plugins/tcl/tcl.c:344
+#: plugins/tcl/tcl.c:348
 msgid "Tcl Plugin Loader"
 msgstr "Tcl Plugin Loader"
 
-#: plugins/tcl/tcl.c:346 plugins/tcl/tcl.c:347
+#: plugins/tcl/tcl.c:350 plugins/tcl/tcl.c:351
 msgid "Provides support for loading Tcl plugins"
 msgstr "Provides support for loading Tcl plugins"
 
@@ -931,7 +1058,7 @@
 msgstr "_Show slider bar in IM window"
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:365 src/gtkprefs.c:844
+#: plugins/win32/transparency/win2ktrans.c:365 src/gtkprefs.c:836
 msgid "Buddy List Window"
 msgstr "Buddy List Window"
 
@@ -978,8 +1105,8 @@
 msgstr "_Start Gaim on Windows startup"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:366 src/gtkblist.c:2165
-#: src/gtkprefs.c:2264
+#: plugins/win32/winprefs/winprefs.c:366 src/gtkblist.c:2560
+#: src/gtkprefs.c:2255
 msgid "Buddy List"
 msgstr "Buddy List"
 
@@ -998,8 +1125,8 @@
 msgstr "_Keep Buddy List window on top"
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:386 src/gtkprefs.c:880
-#: src/gtkprefs.c:2265
+#: plugins/win32/winprefs/winprefs.c:386 src/gtkprefs.c:874
+#: src/gtkprefs.c:2256
 msgid "Conversations"
 msgstr "Conversations"
 
@@ -1015,12 +1142,16 @@
 msgid "Options specific to Windows Gaim."
 msgstr "Options specific to Windows Gaim."
 
-#: src/about.c:57
-#, c-format
-msgid "About Gaim v%s"
-msgstr "About Gaim v%s"
-
-#: src/about.c:89
+#: src/about.c:59
+msgid "About Gaim"
+msgstr "About Gaim"
+
+#: src/about.c:74
+#, c-format
+msgid "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
+
+#: src/about.c:94
 msgid ""
 "Gaim is a modular Instant Messaging client capable of using AIM, ICQ, "
 "Yahoo!, MSN, IRC, Jabber, Napster, Zephyr, and Gadu-Gadu all at once.  It is "
@@ -1030,154 +1161,166 @@
 "Yahoo!, MSN, IRC, Jabber, Napster, Zephyr, and Gadu-Gadu all at once.  It is "
 "written using Gtk+ and is licensed under the GPL.<BR><BR>"
 
-#: src/about.c:99
+#: 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>"
 
-#: src/about.c:104
+#: src/about.c:109
 msgid "Active Developers"
 msgstr "Active Developers"
 
-#: src/about.c:105
-msgid "maintainer"
-msgstr "maintainer"
-
-#: src/about.c:107
-msgid "lead developer"
-msgstr "lead developer"
-
 #: src/about.c:110
+msgid "maintainer"
+msgstr "maintainer"
+
+#: src/about.c:112
+msgid "lead developer"
+msgstr "lead developer"
+
+#: src/about.c:115
 msgid "developer & webmaster"
 msgstr "developer & webmaster"
 
-#: src/about.c:111
+#: src/about.c:116
 msgid "win32 port"
 msgstr "win32 port"
 
-#: src/about.c:114 src/about.c:115 src/about.c:116
+#: src/about.c:119 src/about.c:120 src/about.c:121
 msgid "developer"
 msgstr "developer"
 
-#: src/about.c:117
+#: src/about.c:122
 msgid "support"
 msgstr "support"
 
-#: src/about.c:124
+#: src/about.c:129
 msgid "Crazy Patch Writers"
 msgstr "Crazy Patch Writers"
 
-#: src/about.c:145
+#: src/about.c:143
 msgid "Retired Developers"
 msgstr "Retired Developers"
 
-#: src/about.c:146
+#: src/about.c:144
 msgid "former libfaim maintainer"
 msgstr "former libfaim maintainer"
 
-#: src/about.c:147
+#: src/about.c:145
 msgid "former lead developer"
 msgstr "former lead developer"
 
-#: src/about.c:150
+#: src/about.c:148
 msgid "former maintainer"
 msgstr "former maintainer"
 
-#: src/about.c:151
+#: src/about.c:149
 msgid "former Jabber developer"
 msgstr "former Jabber developer"
 
-#: src/about.c:152
+#: src/about.c:150
 msgid "original author"
 msgstr "original author"
 
-#: src/about.c:155
+#: src/about.c:153
 msgid "hacker and designated driver [lazy bum]"
 msgstr "hacker and designated driver [lazy bum]"
 
-#: src/about.c:163
+#: src/about.c:161
 msgid "Current Translators"
 msgstr "Current Translators"
 
-#: src/about.c:164 src/about.c:195
+#: src/about.c:162 src/about.c:195
 msgid "Catalan"
 msgstr "Catalan"
 
-#: src/about.c:165 src/about.c:196
+#: src/about.c:163 src/about.c:196
 msgid "Czech"
 msgstr "Czech"
 
-#: src/about.c:166
+#: src/about.c:164
 msgid "Danish"
 msgstr "Danish"
 
-#: src/about.c:167 src/about.c:197
+#: src/about.c:165
+msgid "British English"
+msgstr "Proper English"
+
+#: src/about.c:166 src/about.c:197
 msgid "German"
 msgstr "German"
 
-#: src/about.c:168 src/about.c:198
+#: src/about.c:167 src/about.c:198
 msgid "Spanish"
 msgstr "Spanish"
 
-#: src/about.c:169
+#: src/about.c:168 src/about.c:199
 msgid "Finnish"
 msgstr "Finnish"
 
-#: src/about.c:170 src/about.c:199
+#: src/about.c:169 src/about.c:200
 msgid "French"
 msgstr "French"
 
+#: src/about.c:170
+msgid "Hindi"
+msgstr "Hindi"
+
 #: src/about.c:171
-msgid "Hindi"
-msgstr "Hindi"
-
-#: src/about.c:172
 msgid "Hungarian"
 msgstr "Hungarian"
 
-#: src/about.c:173 src/about.c:201
+#: src/about.c:172 src/about.c:202
 msgid "Italian"
 msgstr "Italian"
 
-#: src/about.c:174 src/about.c:203
+#: src/about.c:173 src/about.c:204
 msgid "Korean"
 msgstr "Korean"
 
-#: src/about.c:175
+#: src/about.c:174
 msgid "Dutch; Flemish"
 msgstr "Dutch; Flemish"
 
-#: src/about.c:176
+#: src/about.c:175
 msgid "Norwegian"
 msgstr "Norwegian"
 
-#: src/about.c:177 src/about.c:204
+#: src/about.c:176 src/about.c:205
 msgid "Polish"
 msgstr "Polish"
 
-#: src/about.c:178
+#: src/about.c:177
 msgid "Portuguese"
 msgstr "Portuguese"
 
-#: src/about.c:179
+#: src/about.c:178
 msgid "Portuguese-Brazil"
 msgstr "Portuguese-Brazil"
 
-#: src/about.c:180
+#: src/about.c:179
 msgid "Romanian"
 msgstr "Romanian"
 
-#: src/about.c:181 src/about.c:205
+#: src/about.c:180 src/about.c:206
 msgid "Russian"
 msgstr "Russian"
 
-#: src/about.c:182
+#: src/about.c:181
 msgid "Serbian"
 msgstr "Serbian"
 
-#: src/about.c:183 src/about.c:207
+#: src/about.c:182 src/about.c:208
 msgid "Swedish"
 msgstr "Swedish"
 
+#: src/about.c:183
+msgid "Vietnamese"
+msgstr "Vietnamese"
+
+#: src/about.c:183
+msgid "Gnome Vi Team"
+msgstr "Gnome Vi Team"
+
 #: src/about.c:184
 msgid "Simplified Chinese"
 msgstr "Simplified Chinese"
@@ -1198,135 +1341,124 @@
 msgid "Bulgarian"
 msgstr "Bulgarian"
 
-#: src/about.c:200
+#: src/about.c:201
 msgid "Hebrew"
 msgstr "Hebrew"
 
-#: src/about.c:202
+#: src/about.c:203
 msgid "Japanese"
 msgstr "Japanese"
 
-#: src/about.c:206
+#: src/about.c:207
 msgid "Slovak"
 msgstr "Slovak"
 
-#: src/about.c:208
+#: src/about.c:209
 msgid "Chinese"
 msgstr "Chinese"
 
-#: src/about.c:221 src/dialogs.c:2180 src/gtkrequest.c:198
-#: src/protocols/msn/msn.c:247
-msgid "Close"
-msgstr "Close"
-
-#: src/account.c:275 src/protocols/jabber/jabber.c:981
+#: src/account.c:274 src/protocols/jabber/jabber.c:1013
 msgid "New passwords do not match."
 msgstr "New passwords do not match."
 
-#: src/account.c:283
+#: src/account.c:282
 msgid "Fill out all fields completely."
 msgstr "Fill out all fields completely."
 
-#: src/account.c:308
+#: src/account.c:307
 msgid "Original password"
 msgstr "Original password"
 
-#: src/account.c:314
+#: src/account.c:313
 msgid "New password"
 msgstr "New password"
 
-#: src/account.c:320
+#: src/account.c:319
 msgid "New password (again)"
 msgstr "New password (again)"
 
-#: src/account.c:325
+#: src/account.c:324
 #, c-format
 msgid "Change password for %s"
 msgstr "Change password for %s"
 
-#: src/account.c:331
+#: src/account.c:332
 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:334 src/connection.c:193 src/dialogs.c:1720
-#: src/dialogs.c:1737 src/dialogs.c:1780 src/gtkblist.c:1527
-#: src/gtkrequest.c:195 src/protocols/jabber/jabber.c:1026
-#: src/protocols/msn/msn.c:181 src/protocols/msn/msn.c:192
-#: src/protocols/msn/msn.c:203 src/protocols/msn/msn.c:214
-#: src/protocols/oscar/oscar.c:2455 src/protocols/oscar/oscar.c:2535
-#: src/protocols/oscar/oscar.c:6188 src/protocols/oscar/oscar.c:6284
-#: src/protocols/oscar/oscar.c:6333 src/protocols/oscar/oscar.c:6415
-#: src/protocols/yahoo/yahoo.c:2232 src/request.h:852
+#: src/account.c:335 src/connection.c:195 src/dialogs.c:1471
+#: src/dialogs.c:1488 src/dialogs.c:1507 src/gtkblist.c:1915
+#: src/gtkrequest.c:192 src/protocols/jabber/jabber.c:1058
+#: src/protocols/jabber/xdata.c:334 src/protocols/msn/msn.c:181
+#: src/protocols/msn/msn.c:192 src/protocols/msn/msn.c:203
+#: src/protocols/msn/msn.c:214 src/protocols/oscar/oscar.c:2454
+#: src/protocols/oscar/oscar.c:2534 src/protocols/oscar/oscar.c:6214
+#: src/protocols/oscar/oscar.c:6310 src/protocols/oscar/oscar.c:6359
+#: src/protocols/oscar/oscar.c:6441 src/protocols/yahoo/yahoo.c:2398
+#: src/protocols/yahoo/yahoo.c:2406 src/request.h:1020
 msgid "OK"
 msgstr "OK"
 
-#. Cancel button.
-#: src/account.c:335 src/account.c:369 src/buddy_chat.c:371
-#: src/connection.c:194 src/dialogs.c:459 src/dialogs.c:471 src/dialogs.c:484
-#: src/dialogs.c:505 src/dialogs.c:890 src/dialogs.c:1554 src/dialogs.c:1721
-#: src/dialogs.c:1738 src/dialogs.c:1781 src/dialogs.c:1897
-#: src/gtkaccount.c:1622 src/gtkaccount.c:2090 src/gtkblist.c:1528
-#: src/gtkblist.c:3467 src/gtkconn.c:148 src/gtkprivacy.c:568
-#: src/gtkprivacy.c:581 src/gtkprivacy.c:606 src/gtkprivacy.c:617
-#: src/gtkrequest.c:196 src/protocols/icq/gaim_icq.c:277
-#: src/protocols/jabber/buddy.c:512 src/protocols/jabber/jabber.c:657
-#: src/protocols/jabber/jabber.c:1027 src/protocols/msn/msn.c:182
-#: src/protocols/msn/msn.c:193 src/protocols/msn/msn.c:204
-#: src/protocols/msn/msn.c:215 src/protocols/msn/msn.c:228
-#: src/protocols/oscar/oscar.c:2419 src/protocols/oscar/oscar.c:2456
-#: src/protocols/oscar/oscar.c:2491 src/protocols/oscar/oscar.c:2536
-#: src/protocols/oscar/oscar.c:6016 src/protocols/oscar/oscar.c:6189
-#: src/protocols/oscar/oscar.c:6285 src/protocols/oscar/oscar.c:6334
-#: src/protocols/oscar/oscar.c:6399 src/protocols/oscar/oscar.c:6416
-#: src/protocols/trepia/trepia.c:347 src/protocols/yahoo/yahoo.c:2233
-#: src/request.h:852 src/request.h:862
+#: src/account.c:336 src/account.c:370 src/connection.c:196 src/dialogs.c:353
+#: src/dialogs.c:365 src/dialogs.c:378 src/dialogs.c:399 src/dialogs.c:1314
+#: src/dialogs.c:1472 src/dialogs.c:1489 src/dialogs.c:1508
+#: src/gtkaccount.c:1614 src/gtkaccount.c:2083 src/gtkblist.c:1916
+#: src/gtkblist.c:3875 src/gtkconn.c:169 src/gtkprivacy.c:570
+#: src/gtkprivacy.c:583 src/gtkprivacy.c:608 src/gtkprivacy.c:619
+#: src/gtkrequest.c:193 src/protocols/icq/gaim_icq.c:277
+#: src/protocols/jabber/buddy.c:512 src/protocols/jabber/jabber.c:688
+#: src/protocols/jabber/jabber.c:1059 src/protocols/jabber/xdata.c:335
+#: src/protocols/msn/msn.c:182 src/protocols/msn/msn.c:193
+#: src/protocols/msn/msn.c:204 src/protocols/msn/msn.c:215
+#: src/protocols/msn/msn.c:228 src/protocols/oscar/oscar.c:2418
+#: src/protocols/oscar/oscar.c:2455 src/protocols/oscar/oscar.c:2490
+#: src/protocols/oscar/oscar.c:2535 src/protocols/oscar/oscar.c:6042
+#: src/protocols/oscar/oscar.c:6215 src/protocols/oscar/oscar.c:6311
+#: src/protocols/oscar/oscar.c:6360 src/protocols/oscar/oscar.c:6425
+#: src/protocols/oscar/oscar.c:6442 src/protocols/trepia/trepia.c:347
+#: src/protocols/yahoo/yahoo.c:2399 src/protocols/yahoo/yahoo.c:2407
+#: src/request.h:1020 src/request.h:1030
 msgid "Cancel"
 msgstr "Cancel"
 
-#: src/account.c:361
+#: src/account.c:362
 #, c-format
 msgid "Change user information for %s"
 msgstr "Change user information for %s"
 
-#: src/account.c:368 src/dialogs.c:886 src/dialogs.c:1542 src/dialogs.c:2189
-#: src/gtkrequest.c:202 src/protocols/jabber/buddy.c:511
-#: src/protocols/trepia/trepia.c:346
+#: src/account.c:369 src/dialogs.c:1302 src/gtkrequest.c:199
+#: src/protocols/jabber/buddy.c:511 src/protocols/trepia/trepia.c:346
 msgid "Save"
 msgstr "Save"
 
-#: src/away.c:208
-msgid "Gaim - Away!"
-msgstr "Gaim - Away!"
-
-#: src/away.c:269
+#: src/away.c:210
+msgid "Away!"
+msgstr "Away!"
+
+#: src/away.c:271
 msgid "I'm Back!"
 msgstr "I'm Back!"
 
-#: src/away.c:368
+#: src/away.c:370
 msgid "New Away Message"
 msgstr "New Away Message"
 
-#: src/away.c:388
+#: src/away.c:390
 msgid "Remove Away Message"
 msgstr "Remove Away Message"
 
-#: src/away.c:583
+#: src/away.c:585
 msgid "Set All Away"
 msgstr "Set All Away"
 
-#: src/blist.c:551 src/gtkprefs.c:2267
+#: src/blist.c:577 src/gtkprefs.c:2258
 msgid "Chats"
 msgstr "Chats"
 
-#: src/blist.c:646 src/blist.c:834 src/blist.c:2042 src/gtkblist.c:2945
-#: src/protocols/jabber/roster.c:66 src/protocols/msn/notification.c:1160
-msgid "Buddies"
-msgstr "Buddies"
-
-#: src/blist.c:1134
+#: src/blist.c:1159
 #, c-format
 msgid ""
 "%d buddy from group %s was not removed because its account was not logged "
@@ -1341,30 +1473,30 @@
 "%d buddies from group %s were not removed because their accounts were not "
 "logged in.  These buddies and the group were not removed.\n"
 
-#: src/blist.c:1143
+#: src/blist.c:1168
 msgid "Group not removed"
 msgstr "Group not removed"
 
-#: src/blist.c:1193 src/gtkaccount.c:159 src/gtkutils.c:844
-#: src/protocols/jabber/auth.c:110 src/protocols/jabber/buddy.c:563
+#: src/blist.c:1218 src/gtkaccount.c:160 src/gtkutils.c:848
+#: src/protocols/jabber/auth.c:145 src/protocols/jabber/buddy.c:568
 msgid "Unknown"
 msgstr "Unknown"
 
-#: src/blist.c:1516
+#: src/blist.c:1545
 msgid "Invalid Groupname"
 msgstr "Invalid Groupname"
 
-#: src/blist.c:2159
+#: src/blist.c:2195
 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:2161
+#: src/blist.c:2197
 msgid "Buddy List Error"
 msgstr "Buddy List Error"
 
-#: src/buddy_chat.c:312 src/gtkblist.c:3359
+#: src/buddy_chat.c:214 src/gtkblist.c:3765
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -1372,109 +1504,113 @@
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 
-#: src/buddy_chat.c:326
-msgid "Join Chat"
-msgstr "Join Chat"
-
-#: src/buddy_chat.c:332
-msgid "Buddy Chat"
-msgstr "Buddy Chat"
-
-#: src/buddy_chat.c:342
-msgid "Join Chat As:"
-msgstr "Join Chat As:"
-
-#. Join button.
-#: src/buddy_chat.c:365
-msgid "Join"
-msgstr "Join"
-
-#: src/connection.c:117 src/connection.c:165
+#: src/buddy_chat.c:225
+msgid "Join a Chat"
+msgstr "Join a Chat"
+
+#: src/buddy_chat.c:227 src/gtkblist.c:918
+msgid "_Join"
+msgstr "_Join"
+
+#: src/buddy_chat.c:244
+msgid ""
+"Please enter the appropriate information about the chat you would like to "
+"join.\n"
+msgstr ""
+"Please enter the appropriate information about the chat you would like to "
+"join.\n"
+
+#: src/buddy_chat.c:255 src/dialogs.c:589 src/dialogs.c:664
+#: src/gtkpounce.c:360
+msgid "_Account:"
+msgstr "_Account:"
+
+#: src/connection.c:119 src/connection.c:167
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "Missing protocol plugin for %s"
 
-#: src/connection.c:122
+#: src/connection.c:124
 msgid "Registration Error"
 msgstr "Registration Error"
 
-#: src/connection.c:170
+#: src/connection.c:172
 msgid "Connection Error"
 msgstr "Connection Error"
 
-#: src/connection.c:191
+#: src/connection.c:193
 #, c-format
 msgid "Enter password for %s"
 msgstr "Enter password for %s"
 
-#: src/conversation.c:324
+#: src/conversation.c:315
 msgid "Unable to send message. The message is too large."
 msgstr "Unable to send message. The message is too large."
 
-#: src/conversation.c:332
+#: src/conversation.c:323
 msgid "Unable to send message."
 msgstr "Unable to send message."
 
-#: src/conversation.c:1905
+#: src/conversation.c:1919
 #, c-format
 msgid "%s entered the room."
 msgstr "%s entered the room."
 
-#: src/conversation.c:1908
+#: src/conversation.c:1922
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] entered the room."
 
-#: src/conversation.c:1993
+#: src/conversation.c:2007
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s is now known as %s"
 
-#: src/conversation.c:2035
+#: src/conversation.c:2049
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s left the room (%s)."
 
-#: src/conversation.c:2037
+#: src/conversation.c:2051
 #, c-format
 msgid "%s left the room."
 msgstr "%s left the room."
 
-#: src/conversation.c:2110
+#: src/conversation.c:2124
 #, c-format
 msgid "(+%d more)"
 msgstr "(+%d more)"
 
-#: src/conversation.c:2112
+#: src/conversation.c:2126
 #, c-format
 msgid " left the room (%s)."
 msgstr " left the room (%s)."
 
-#: src/conversation.c:2394
+#: src/conversation.c:2408
 msgid "Last created window"
 msgstr "Last created window"
 
-#: src/conversation.c:2396
+#: src/conversation.c:2410
 msgid "New window"
 msgstr "New window"
 
-#: src/conversation.c:2398
+#: src/conversation.c:2412
 msgid "By group"
 msgstr "By group"
 
-#: src/conversation.c:2400
+#: src/conversation.c:2414
 msgid "By account"
 msgstr "By account"
 
-#: src/dialogs.c:307
+#: src/dialogs.c:202
 msgid "Warn User"
 msgstr "Warn User"
 
-#: src/dialogs.c:310
+#: src/dialogs.c:205
 msgid "_Warn"
 msgstr "_Warn"
 
-#: src/dialogs.c:326
+#: src/dialogs.c:221
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -1487,26 +1623,26 @@
 "This will increase %s's warning level and he or she will be subject to "
 "harsher rate limiting.\n"
 
-#: src/dialogs.c:335
+#: src/dialogs.c:230
 msgid "Warn _anonymously?"
 msgstr "Warn _anonymously?"
 
-#: src/dialogs.c:342
+#: src/dialogs.c:237
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>Anonymous warnings are less severe.</b>"
 
-#: src/dialogs.c:455
+#: src/dialogs.c:349
 #, 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:457 src/dialogs.c:458
+#: src/dialogs.c:351 src/dialogs.c:352
 msgid "Remove Buddy"
 msgstr "Remove Buddy"
 
-#: src/dialogs.c:467
+#: src/dialogs.c:361
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -1515,11 +1651,11 @@
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 
-#: src/dialogs.c:469 src/dialogs.c:470
+#: src/dialogs.c:363 src/dialogs.c:364
 msgid "Remove Chat"
 msgstr "Remove Chat"
 
-#: src/dialogs.c:479
+#: src/dialogs.c:373
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -1528,11 +1664,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:482 src/dialogs.c:483
+#: src/dialogs.c:376 src/dialogs.c:377
 msgid "Remove Group"
 msgstr "Remove Group"
 
-#: src/dialogs.c:500
+#: src/dialogs.c:394
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
@@ -1541,31 +1677,27 @@
 "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:503 src/dialogs.c:504
+#: src/dialogs.c:397 src/dialogs.c:398
 msgid "Remove Contact"
 msgstr "Remove Contact"
 
-#: src/dialogs.c:652
-msgid "New Message"
-msgstr "New Message"
-
-#: src/dialogs.c:670
+#: src/dialogs.c:543
+msgid "New Instant Message"
+msgstr "New Instant Message"
+
+#: src/dialogs.c:561
 msgid "Please enter the screenname of the person you would like to IM.\n"
 msgstr "Please enter the screenname of the person you would like to IM.\n"
 
-#: src/dialogs.c:686 src/dialogs.c:763
+#: src/dialogs.c:573 src/dialogs.c:648
 msgid "_Screenname:"
 msgstr "_Screenname:"
 
-#: src/dialogs.c:701 src/dialogs.c:779 src/gtkpounce.c:358
-msgid "_Account:"
-msgstr "_Account:"
-
-#: src/dialogs.c:732
+#: src/dialogs.c:618
 msgid "Get User Info"
 msgstr "Get User Info"
 
-#: src/dialogs.c:751
+#: src/dialogs.c:636
 msgid ""
 "Please enter the screenname of the person whose info you would like to "
 "view.\n"
@@ -1573,25 +1705,15 @@
 "Please enter the screenname of the person whose info you would like to "
 "view.\n"
 
-#: src/dialogs.c:845 src/protocols/jabber/jabber.c:1037
-#: src/protocols/oscar/oscar.c:6484 src/protocols/toc/toc.c:1532
-msgid "Set User Info"
-msgstr "Set User Info"
-
-#: src/dialogs.c:854
-#, c-format
-msgid "Changing info for %s:"
-msgstr "Changing info for %s:"
-
-#: src/dialogs.c:969
+#: src/dialogs.c:740
 msgid "Insert Link"
 msgstr "Insert Link"
 
-#: src/dialogs.c:971
-msgid "Insert"
-msgstr "Insert"
-
-#: src/dialogs.c:993
+#: src/dialogs.c:742
+msgid "_Insert"
+msgstr "_Insert"
+
+#: src/dialogs.c:767
 msgid ""
 "Please enter the URL and description of the link that you want to insert.  "
 "The description is optional.\n"
@@ -1599,176 +1721,102 @@
 "Please enter the URL and description of the link that you want to insert.  "
 "The description is optional.\n"
 
-#: src/dialogs.c:1011 src/protocols/jabber/buddy.c:249
-#: src/protocols/jabber/jabber.c:638
-msgid "URL"
-msgstr "URL"
-
-#: src/dialogs.c:1021 src/gtkprefs.c:601 src/gtkprefs.c:1803
-#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:738
-msgid "Description"
-msgstr "Description"
-
-#: src/dialogs.c:1157 src/dialogs.c:1174
+#: src/dialogs.c:780
+msgid "_URL:"
+msgstr "_URL:"
+
+#: src/dialogs.c:793
+msgid "_Description:"
+msgstr "_Description:"
+
+#: src/dialogs.c:916 src/dialogs.c:933
 msgid "Select Text Color"
-msgstr "Select Text Color"
-
-#: src/dialogs.c:1209 src/dialogs.c:1226
+msgstr "Select Text Colour"
+
+#: src/dialogs.c:968 src/dialogs.c:985
 msgid "Select Background Color"
-msgstr "Select Background Color"
-
-#: src/dialogs.c:1311 src/dialogs.c:1337
+msgstr "Select Background Colour"
+
+#: src/dialogs.c:1070 src/dialogs.c:1096
 msgid "Select Font"
 msgstr "Select Font"
 
-#: src/dialogs.c:1403
+#: src/dialogs.c:1160
 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:1405
+#: src/dialogs.c:1162
 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:1415
+#: src/dialogs.c:1172
 msgid "You cannot create an empty away message"
 msgstr "You cannot create an empty away message"
 
-#: src/dialogs.c:1480 src/dialogs.c:1488
+#: src/dialogs.c:1234
 msgid "New away message"
 msgstr "New away message"
 
-#: src/dialogs.c:1498
+#: src/dialogs.c:1255
 msgid "Away title: "
 msgstr "Away title: "
 
-#: src/dialogs.c:1546
+#: src/dialogs.c:1306
 msgid "Save & Use"
 msgstr "Save & Use"
 
-#: src/dialogs.c:1550
+#: src/dialogs.c:1310
 msgid "Use"
 msgstr "Use"
 
 #. show everything
-#: src/dialogs.c:1699
+#: src/dialogs.c:1450
 msgid "Smile!"
 msgstr "Smile!"
 
-#: src/dialogs.c:1717
+#: src/dialogs.c:1468
 msgid "Alias Chat"
 msgstr "Alias Chat"
 
-#: src/dialogs.c:1717
-msgid "Alias chat"
-msgstr "Alias chat"
-
-#: src/dialogs.c:1718
-msgid "Please enter an aliased name for this chat."
-msgstr "Please enter an aliased name for this chat."
-
-#: src/dialogs.c:1734
+#: src/dialogs.c:1469
+msgid "Enter an alias for this chat."
+msgstr "Enter an alias for this chat."
+
+#: src/dialogs.c:1485
 msgid "Alias Contact"
 msgstr "Alias Contact"
 
-#: src/dialogs.c:1734
-msgid "Alias contact"
-msgstr "Alias contact"
-
-#: src/dialogs.c:1735
-msgid "Please enter an aliased name for this contact."
-msgstr "Please enter an aliased name for this contact."
-
-#: src/dialogs.c:1766
-msgid "_Screenname"
-msgstr "_Screenname"
-
-#: src/dialogs.c:1771 src/gtkblist.c:838 src/gtkblist.c:926 src/gtkblist.c:945
-msgid "_Alias"
-msgstr "_Alias"
-
-#: src/dialogs.c:1775
+#: src/dialogs.c:1486
+msgid "Enter an alias for this contact."
+msgstr "Enter an alias for this contact."
+
+#: src/dialogs.c:1503
+#, c-format
+msgid "Enter an alias for %s."
+msgstr "Enter an alias for %s."
+
+#: src/dialogs.c:1505
 msgid "Alias Buddy"
 msgstr "Alias Buddy"
 
-#: src/dialogs.c:1776
-msgid "Alias buddy"
-msgstr "Alias buddy"
-
-#: src/dialogs.c:1777
-msgid ""
-"Please enter an aliased name for the person below, or rename this contact in "
-"your buddy list."
-msgstr ""
-"Please enter an aliased name for the person below, or rename this contact in "
-"your buddy list."
-
-#: src/dialogs.c:1813 src/dialogs.c:1820
-#, c-format
-msgid "Couldn't write to %s."
-msgstr "Couldn't write to %s."
-
-#: src/dialogs.c:1844
-msgid "Save Log File"
-msgstr "Save Log File"
-
-#: src/dialogs.c:1872
-#, c-format
-msgid "Couldn't remove file %s."
-msgstr "Couldn't remove file %s."
-
-#: src/dialogs.c:1891
-#, c-format
-msgid "You are about to remove the log file for %s.  Do you want to continue?"
-msgstr "You are about to remove the log file for %s.  Do you want to continue?"
-
-#: src/dialogs.c:1892 src/dialogs.c:2062
-msgid "System Log"
-msgstr "System Log"
-
-#: src/dialogs.c:1893 src/dialogs.c:1895
-msgid "Remove Log"
-msgstr "Remove Log"
-
-#: src/dialogs.c:1923 src/dialogs.c:2083
-#, c-format
-msgid "Couldn't open log file %s."
-msgstr "Couldn't open log file %s."
-
-#: src/dialogs.c:2060
-#, c-format
-msgid "Conversations with %s"
-msgstr "Conversations with %s"
-
-#: src/dialogs.c:2104 src/protocols/jabber/jabber.c:643
-msgid "Date"
-msgstr "Date"
-
-#: src/dialogs.c:2161
-msgid "Log"
-msgstr "Log"
-
-#: src/dialogs.c:2184
-msgid "Clear"
-msgstr "Clear"
-
-#: src/ft.c:123
+#: src/ft.c:141
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s is not a valid filename.\n"
 
-#: src/ft.c:137
+#: src/ft.c:154
 #, c-format
 msgid "%s was not found.\n"
 msgstr "%s was not found.\n"
 
-#: src/ft.c:693
+#: src/ft.c:756
 #, c-format
 msgid "File transfer to %s aborted.\n"
 msgstr "File transfer to %s aborted.\n"
 
-#: src/ft.c:695
+#: src/ft.c:758
 #, c-format
 msgid "File transfer from %s aborted.\n"
 msgstr "File transfer from %s aborted.\n"
@@ -1781,7 +1829,7 @@
 msgid "Size of the expander arrow"
 msgstr "Size of the expander arrow"
 
-#: src/gaim-remote.c:33
+#: src/gaim-remote.c:66
 #, c-format
 msgid ""
 "Usage: %s command [OPTIONS] [URI]\n"
@@ -1802,11 +1850,11 @@
 "    OPTIONS:\n"
 "       -h, --help [commmand]    Show help for command\n"
 
-#: src/gaim-remote.c:139 src/gaim-remote.c:155
+#: src/gaim-remote.c:175 src/gaim-remote.c:191
 msgid "Gaim not running (on session 0)\n"
 msgstr "Gaim not running (on session 0)\n"
 
-#: src/gaim-remote.c:167
+#: src/gaim-remote.c:204
 msgid ""
 "\n"
 "Using AIM: URIs:\n"
@@ -1818,14 +1866,14 @@
 "needs to be escaped, or the command will stop at that point.\n"
 "Also,the following will just open a conversation window to a screenname,\n"
 "with no message:\n"
-"\tgaim-remote uri aim:goim?screenname=Penguin\n"
+"\tgaim-remote uri 'aim:goim?screenname=Penguin'\n"
 "\n"
 "Joining a chat:\n"
-"\tgaim-remote uri aim:gochat?roomname=PenguinLounge\n"
+"\tgaim-remote uri 'aim:gochat?roomname=PenguinLounge'\n"
 "...joins the 'PenguinLounge' chat room.\n"
 "\n"
 "Adding a buddy to your buddy list:\n"
-"\tgaim-remote uri aim:addbuddy?screenname=Penguin\n"
+"\tgaim-remote uri 'aim:addbuddy?screenname=Penguin'\n"
 "...prompts you to add 'Penguin' to your buddy list.\n"
 msgstr ""
 "\n"
@@ -1838,17 +1886,17 @@
 "needs to be escaped, or the command will stop at that point.\n"
 "Also,the following will just open a conversation window to a screenname,\n"
 "with no message:\n"
-"\tgaim-remote uri aim:goim?screenname=Penguin\n"
+"\tgaim-remote uri 'aim:goim?screenname=Penguin'\n"
 "\n"
 "Joining a chat:\n"
-"\tgaim-remote uri aim:gochat?roomname=PenguinLounge\n"
+"\tgaim-remote uri 'aim:gochat?roomname=PenguinLounge'\n"
 "...joins the 'PenguinLounge' chat room.\n"
 "\n"
 "Adding a buddy to your buddy list:\n"
-"\tgaim-remote uri aim:addbuddy?screenname=Penguin\n"
+"\tgaim-remote uri 'aim:addbuddy?screenname=Penguin'\n"
 "...prompts you to add 'Penguin' to your buddy list.\n"
 
-#: src/gaim-remote.c:187
+#: src/gaim-remote.c:223
 msgid ""
 "\n"
 "Close running copy of Gaim\n"
@@ -1857,27 +1905,27 @@
 "Close running copy of Gaim\n"
 
 #. for people like myself, who are too lazy to add an away msg :)
-#: src/gaimrc.c:44
+#: src/gaimrc.c:46
 msgid "sorry, i ran out for a while. bbl"
 msgstr "sorry, i ran out for a while. bbl"
 
-#: src/gaimrc.c:373 src/gaimrc.c:1450
+#: src/gaimrc.c:375 src/gaimrc.c:1452
 msgid "boring default"
 msgstr "boring default"
 
-#: src/gaimrc.c:1259 src/gtkblist.c:2126
+#: src/gaimrc.c:1261 src/gtkblist.c:2521
 msgid "Alphabetical"
 msgstr "Alphabetical"
 
-#: src/gaimrc.c:1261 src/gtkblist.c:2127
+#: src/gaimrc.c:1263 src/gtkblist.c:2522
 msgid "By status"
 msgstr "By status"
 
-#: src/gaimrc.c:1263 src/gtkblist.c:2128
+#: src/gaimrc.c:1265 src/gtkblist.c:2523
 msgid "By log size"
 msgstr "By log size"
 
-#: src/gaimrc.c:1548
+#: src/gaimrc.c:1550
 #, c-format
 msgid "Could not open config file %s."
 msgstr "Could not open config file %s."
@@ -1893,10 +1941,6 @@
 "<b>File size:</b> %s\n"
 "<b>Image size:</b> %dx%d"
 
-#: src/gtkaccount.c:318 src/protocols/oscar/oscar.c:3077
-msgid "Buddy Icon"
-msgstr "Buddy Icon"
-
 #. Build the login options frame.
 #: src/gtkaccount.c:369
 msgid "Login Options"
@@ -1906,16 +1950,11 @@
 msgid "Protocol:"
 msgstr "Protocol:"
 
-#: src/gtkaccount.c:391
-msgid "Screenname:"
-msgstr "Screenname:"
-
-#: src/gtkaccount.c:464 src/main.c:307 src/protocols/irc/irc.c:161
-#: src/protocols/jabber/chat.c:56
+#: src/gtkaccount.c:464 src/main.c:310
 msgid "Password:"
 msgstr "Password:"
 
-#: src/gtkaccount.c:469 src/gtkblist.c:3099 src/gtkblist.c:3418
+#: src/gtkaccount.c:469 src/gtkblist.c:3502 src/gtkblist.c:3824
 msgid "Alias:"
 msgstr "Alias:"
 
@@ -1951,119 +1990,119 @@
 msgstr "%s Options"
 
 #. Use Global Proxy Settings
-#: src/gtkaccount.c:747
+#: src/gtkaccount.c:741
 msgid "Use Global Proxy Settings"
 msgstr "Use Global Proxy Settings"
 
 #. No Proxy
-#: src/gtkaccount.c:754
+#: src/gtkaccount.c:748
 msgid "No Proxy"
 msgstr "No Proxy"
 
 #. HTTP
-#: src/gtkaccount.c:761
+#: src/gtkaccount.c:755
 msgid "HTTP"
 msgstr "HTTP"
 
 #. SOCKS 4
-#: src/gtkaccount.c:768
+#: src/gtkaccount.c:762
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
 #. SOCKS 5
-#: src/gtkaccount.c:775
+#: src/gtkaccount.c:769
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:782 src/gtkprefs.c:1101
+#: src/gtkaccount.c:776 src/gtkprefs.c:1090
 msgid "Use Environmental Settings"
 msgstr "Use Environmental Settings"
 
-#: src/gtkaccount.c:815
+#: src/gtkaccount.c:809
 msgid "you can see the butterflies mating"
 msgstr "you can see the butterflies mating"
 
-#: src/gtkaccount.c:819
+#: src/gtkaccount.c:813
 msgid "If you look real closely"
 msgstr "If you look real closely"
 
-#: src/gtkaccount.c:835
+#: src/gtkaccount.c:829
 msgid "Proxy Options"
 msgstr "Proxy Options"
 
-#: src/gtkaccount.c:851 src/gtkprefs.c:1095
+#: src/gtkaccount.c:845 src/gtkprefs.c:1084
 msgid "Proxy _type:"
 msgstr "Proxy _type:"
 
-#: src/gtkaccount.c:860
+#: src/gtkaccount.c:854 src/gtkprefs.c:1114
 msgid "_Host:"
 msgstr "_Host:"
 
-#: src/gtkaccount.c:864
+#: src/gtkaccount.c:858 src/gtkprefs.c:1131
 msgid "_Port:"
 msgstr "_Port:"
 
-#: src/gtkaccount.c:872
+#: src/gtkaccount.c:866
 msgid "_Username:"
 msgstr "_Username:"
 
-#: src/gtkaccount.c:877
+#: src/gtkaccount.c:871 src/gtkprefs.c:1166
 msgid "Pa_ssword:"
 msgstr "Pa_ssword:"
 
-#: src/gtkaccount.c:1218
+#: src/gtkaccount.c:1210
 msgid "Add Account"
 msgstr "Add Account"
 
-#: src/gtkaccount.c:1220
+#: src/gtkaccount.c:1212
 msgid "Modify Account"
 msgstr "Modify Account"
 
 #. Add the disclosure
-#: src/gtkaccount.c:1244
+#: src/gtkaccount.c:1236
 msgid "Show more options"
 msgstr "Show more options"
 
-#: src/gtkaccount.c:1245
+#: src/gtkaccount.c:1237
 msgid "Show fewer options"
 msgstr "Show fewer options"
 
 #. Register button
-#: src/gtkaccount.c:1272 src/protocols/jabber/jabber.c:656
+#: src/gtkaccount.c:1264 src/protocols/jabber/jabber.c:687
 msgid "Register"
 msgstr "Register"
 
-#: src/gtkaccount.c:1617
+#: src/gtkaccount.c:1609
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Are you sure you want to delete %s?"
 
-#: src/gtkaccount.c:1621 src/gtkrequest.c:199
+#: src/gtkaccount.c:1613 src/gtkrequest.c:196
 msgid "Delete"
 msgstr "Delete"
 
-#: src/gtkaccount.c:1734
+#: src/gtkaccount.c:1727
 msgid "Screen Name"
 msgstr "Screen Name"
 
-#: src/gtkaccount.c:1757 src/protocols/jabber/jabber.c:927
-#: src/protocols/oscar/oscar.c:2850 src/protocols/oscar/oscar.c:4589
-#: src/protocols/oscar/oscar.c:6137 src/protocols/yahoo/yahoo.c:2032
+#: src/gtkaccount.c:1750 src/protocols/jabber/jabber.c:959
+#: src/protocols/oscar/oscar.c:2849 src/protocols/oscar/oscar.c:4602
+#: src/protocols/oscar/oscar.c:6163 src/protocols/yahoo/yahoo.c:2193
 #: src/protocols/zephyr/zephyr.c:886 src/protocols/zephyr/zephyr.c:896
 msgid "Online"
 msgstr "Online"
 
-#: src/gtkaccount.c:1775
+#: src/gtkaccount.c:1768
 msgid "Protocol"
 msgstr "Protocol"
 
-#: src/gtkaccount.c:2065
+#: src/gtkaccount.c:2058
 #, 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:2079
+#: src/gtkaccount.c:2072
 msgid ""
 "\n"
 "\n"
@@ -2073,184 +2112,191 @@
 "\n"
 "Do you wish to add him or her to your buddy list?"
 
-#: src/gtkaccount.c:2083
-msgid "Gaim - Information"
-msgstr "Gaim - Information"
-
-#: src/gtkaccount.c:2087
+#: src/gtkaccount.c:2076
+msgid "Information"
+msgstr "Information"
+
+#: src/gtkaccount.c:2080
 msgid "Add buddy to your list?"
 msgstr "Add buddy to your list?"
 
-#: src/gtkaccount.c:2089 src/gtkblist.c:3466 src/gtkconv.c:1257
-#: src/gtkconv.c:3110 src/gtkconv.c:4280 src/gtkrequest.c:200
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:2692
+#. Add button
+#: src/gtkaccount.c:2082 src/gtkblist.c:3874 src/gtkconv.c:1233
+#: src/gtkconv.c:3165 src/gtkconv.c:3256 src/gtkrequest.c:197
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:2691
 msgid "Add"
 msgstr "Add"
 
-#: src/gtkblist.c:811
+#: src/gtkblist.c:807
 msgid "_Get Info"
 msgstr "_Get Info"
 
-#: src/gtkblist.c:814
+#: src/gtkblist.c:810
 msgid "_IM"
 msgstr "_IM"
 
-#: src/gtkblist.c:816
+#: src/gtkblist.c:812
 msgid "Add Buddy _Pounce"
 msgstr "Add Buddy _Pounce"
 
-#: src/gtkblist.c:818
+#: src/gtkblist.c:814
 msgid "View _Log"
 msgstr "View _Log"
 
-#: src/gtkblist.c:840 src/gtkblist.c:928 src/gtkblist.c:950
+#: src/gtkblist.c:834 src/gtkblist.c:923 src/gtkblist.c:942
+msgid "_Alias..."
+msgstr "_Alias..."
+
+#: src/gtkblist.c:836 src/gtkblist.c:925 src/gtkblist.c:947 src/gtkconn.c:360
 msgid "_Remove"
 msgstr "_Remove"
 
+#: src/gtkblist.c:899
+msgid "Add a _Buddy"
+msgstr "Add a _Buddy"
+
+#: src/gtkblist.c:901
+msgid "Add a C_hat"
+msgstr "Add a C_hat"
+
 #: src/gtkblist.c:903
-msgid "Add a _Buddy"
-msgstr "Add a _Buddy"
+msgid "_Delete Group"
+msgstr "_Delete Group"
 
 #: src/gtkblist.c:905
-msgid "Add a C_hat"
-msgstr "Add a C_hat"
-
-#: src/gtkblist.c:907
-msgid "_Delete Group"
-msgstr "_Delete Group"
-
-#: src/gtkblist.c:909
 msgid "_Rename"
 msgstr "_Rename"
 
-#: src/gtkblist.c:921
-msgid "_Join"
-msgstr "_Join"
-
-#: src/gtkblist.c:923
+#: src/gtkblist.c:920
 msgid "Auto-Join"
 msgstr "Auto-Join"
 
-#: src/gtkblist.c:947 src/gtkblist.c:982
+#: src/gtkblist.c:944 src/gtkblist.c:979
 msgid "_Collapse"
 msgstr "_Collapse"
 
-#: src/gtkblist.c:987
+#: src/gtkblist.c:984
 msgid "_Expand"
 msgstr "_Expand"
 
+#: src/gtkblist.c:1515 src/gtkconv.c:3933
+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:1477
+#: src/gtkblist.c:1863
 msgid "/_Buddies"
 msgstr "/_Buddies"
 
-#: src/gtkblist.c:1478
-msgid "/Buddies/New _Instant Message..."
-msgstr "/Buddies/New _Instant Message..."
-
-#: src/gtkblist.c:1479
+#: src/gtkblist.c:1864
+msgid "/Buddies/New Instant _Message..."
+msgstr "/Buddies/New Instant _Message..."
+
+#: src/gtkblist.c:1865
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Buddies/Join a _Chat..."
 
-#: src/gtkblist.c:1480
+#: src/gtkblist.c:1866
 msgid "/Buddies/Get _User Info..."
 msgstr "/Buddies/Get _User Info..."
 
-#: src/gtkblist.c:1482
+#: src/gtkblist.c:1868
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Buddies/Show _Offline Buddies"
 
-#: src/gtkblist.c:1483
+#: src/gtkblist.c:1869
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Buddies/Show _Empty Groups"
 
-#: src/gtkblist.c:1484
-msgid "/Buddies/_Add a Buddy..."
-msgstr "/Buddies/_Add a Buddy..."
-
-#: src/gtkblist.c:1485
-msgid "/Buddies/Add a C_hat..."
-msgstr "/Buddies/Add a C_hat..."
-
-#: src/gtkblist.c:1486
-msgid "/Buddies/Add a _Group..."
-msgstr "/Buddies/Add a _Group..."
-
-#: src/gtkblist.c:1488
+#: src/gtkblist.c:1870
+msgid "/Buddies/_Add Buddy..."
+msgstr "/Buddies/_Add Buddy..."
+
+#: src/gtkblist.c:1871
+msgid "/Buddies/Add C_hat..."
+msgstr "/Buddies/Add C_hat..."
+
+#: src/gtkblist.c:1872
+msgid "/Buddies/Add _Group..."
+msgstr "/Buddies/Add _Group..."
+
+#: src/gtkblist.c:1874
 msgid "/Buddies/_Signoff"
 msgstr "/Buddies/_Signoff"
 
-#: src/gtkblist.c:1489
+#: src/gtkblist.c:1875
 msgid "/Buddies/_Quit"
 msgstr "/Buddies/_Quit"
 
 #. Tools
-#: src/gtkblist.c:1492
+#: src/gtkblist.c:1878
 msgid "/_Tools"
 msgstr "/_Tools"
 
-#: src/gtkblist.c:1493
+#: src/gtkblist.c:1879
 msgid "/Tools/_Away"
 msgstr "/Tools/_Away"
 
-#: src/gtkblist.c:1494
+#: src/gtkblist.c:1880
 msgid "/Tools/Buddy _Pounce"
 msgstr "/Tools/Buddy _Pounce"
 
-#: src/gtkblist.c:1495
+#: src/gtkblist.c:1881
 msgid "/Tools/P_rotocol Actions"
 msgstr "/Tools/P_rotocol Actions"
 
-#: src/gtkblist.c:1497
+#: src/gtkblist.c:1883
 msgid "/Tools/A_ccounts"
 msgstr "/Tools/A_ccounts"
 
-#: src/gtkblist.c:1498
-msgid "/Tools/_File Transfers..."
-msgstr "/Tools/_File Transfers..."
-
-#: src/gtkblist.c:1499
-msgid "/Tools/Preferences"
-msgstr "/Tools/Preferences"
-
-#: src/gtkblist.c:1500
+#: src/gtkblist.c:1884
+msgid "/Tools/_File Transfers"
+msgstr "/Tools/_File Transfers"
+
+#: src/gtkblist.c:1885
+msgid "/Tools/Pr_eferences"
+msgstr "/Tools/Pr_eferences"
+
+#: src/gtkblist.c:1886
 msgid "/Tools/Pr_ivacy"
 msgstr "/Tools/Pr_ivacy"
 
-#: src/gtkblist.c:1502
+#: src/gtkblist.c:1889
 msgid "/Tools/View System _Log"
 msgstr "/Tools/View System _Log"
 
 #. Help
-#: src/gtkblist.c:1505
+#: src/gtkblist.c:1893
 msgid "/_Help"
 msgstr "/_Help"
 
-#: src/gtkblist.c:1506
+#: src/gtkblist.c:1894
 msgid "/Help/Online _Help"
 msgstr "/Help/Online _Help"
 
-#: src/gtkblist.c:1507
+#: src/gtkblist.c:1895
 msgid "/Help/_Debug Window"
 msgstr "/Help/_Debug Window"
 
-#: src/gtkblist.c:1508
+#: src/gtkblist.c:1896
 msgid "/Help/_About"
 msgstr "/Help/_About"
 
-#: src/gtkblist.c:1524
+#: src/gtkblist.c:1912
 msgid "Rename Group"
 msgstr "Rename Group"
 
-#: src/gtkblist.c:1524
+#: src/gtkblist.c:1912
 msgid "New group name"
 msgstr "New group name"
 
-#: src/gtkblist.c:1525
+#: src/gtkblist.c:1913
 msgid "Please enter a new name for the selected group."
 msgstr "Please enter a new name for the selected group."
 
-#: src/gtkblist.c:1554
+#: src/gtkblist.c:1941
 #, c-format
 msgid ""
 "\n"
@@ -2259,16 +2305,16 @@
 "\n"
 "<b>Account:</b> %s"
 
-#: src/gtkblist.c:1617 src/protocols/oscar/oscar.c:5517
+#: src/gtkblist.c:2005 src/protocols/oscar/oscar.c:5543
 msgid "<b>Status:</b> Offline"
 msgstr "<b>Status:</b> Offline"
 
-#: src/gtkblist.c:1629
+#: src/gtkblist.c:2020
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:1644
+#: src/gtkblist.c:2036
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -2276,7 +2322,7 @@
 "\n"
 "<b>Account:</b>"
 
-#: src/gtkblist.c:1645
+#: src/gtkblist.c:2037
 msgid ""
 "\n"
 "<b>Contact Alias:</b>"
@@ -2284,7 +2330,7 @@
 "\n"
 "<b>Contact Alias:</b>"
 
-#: src/gtkblist.c:1646
+#: src/gtkblist.c:2038
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -2292,7 +2338,7 @@
 "\n"
 "<b>Alias:</b>"
 
-#: src/gtkblist.c:1647
+#: src/gtkblist.c:2039
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -2300,7 +2346,15 @@
 "\n"
 "<b>Nickname:</b>"
 
-#: src/gtkblist.c:1648
+#: src/gtkblist.c:2040
+msgid ""
+"\n"
+"<b>Logged In:</b>"
+msgstr ""
+"\n"
+"<b>Logged In:</b>"
+
+#: src/gtkblist.c:2041
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -2308,7 +2362,7 @@
 "\n"
 "<b>Idle:</b>"
 
-#: src/gtkblist.c:1649
+#: src/gtkblist.c:2042
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -2316,7 +2370,7 @@
 "\n"
 "<b>Warned:</b>"
 
-#: src/gtkblist.c:1651
+#: src/gtkblist.c:2044
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2324,7 +2378,7 @@
 "\n"
 "<b>Description:</b> Spooky"
 
-#: src/gtkblist.c:1652
+#: src/gtkblist.c:2045
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
@@ -2332,7 +2386,7 @@
 "\n"
 "<b>Status</b>: Awesome"
 
-#: src/gtkblist.c:1653
+#: src/gtkblist.c:2046
 msgid ""
 "\n"
 "<b>Status</b>: Rockin'"
@@ -2340,85 +2394,81 @@
 "\n"
 "<b>Status</b>: Rockin'"
 
-#: src/gtkblist.c:1921
+#: src/gtkblist.c:2316
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "Idle (%dh%02dm) "
 
-#: src/gtkblist.c:1923
+#: src/gtkblist.c:2318
 #, c-format
 msgid "Idle (%dm) "
 msgstr "Idle (%dm) "
 
-#: src/gtkblist.c:1928
+#: src/gtkblist.c:2323
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "Warned (%d%%) "
 
-#: src/gtkblist.c:1931
+#: src/gtkblist.c:2326
 msgid "Offline "
 msgstr "Offline "
 
-#: src/gtkblist.c:2124 src/gtkprefs.c:841 src/gtkprefs.c:1495
-msgid "None"
-msgstr "None"
-
-#: src/gtkblist.c:2192
+#: src/gtkblist.c:2587
 msgid "/Tools/Away"
 msgstr "/Tools/Away"
 
-#: src/gtkblist.c:2195
+#: src/gtkblist.c:2590
 msgid "/Tools/Buddy Pounce"
 msgstr "/Tools/Buddy Pounce"
 
-#: src/gtkblist.c:2198
+#: src/gtkblist.c:2593
 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:2282
+#: src/gtkblist.c:2680
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Buddies/Show Offline Buddies"
 
-#: src/gtkblist.c:2284
+#: src/gtkblist.c:2682
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Buddies/Show Empty Groups"
 
-#: src/gtkblist.c:2302 src/gtkconv.c:1216
+#: src/gtkblist.c:2700 src/gtkconv.c:1192
 msgid "IM"
 msgstr "IM"
 
-#: src/gtkblist.c:2308
+#: src/gtkblist.c:2706
 msgid "Send a message to the selected buddy"
 msgstr "Send a message to the selected buddy"
 
-#: src/gtkblist.c:2311 src/protocols/napster/napster.c:529
+#: src/gtkblist.c:2709 src/protocols/napster/napster.c:529
 msgid "Get Info"
 msgstr "Get Info"
 
-#: src/gtkblist.c:2317
+#: src/gtkblist.c:2715
 msgid "Get information on the selected buddy"
 msgstr "Get information on the selected buddy"
 
-#: src/gtkblist.c:2320 src/protocols/oscar/oscar.c:3086
+#: src/gtkblist.c:2718 src/protocols/oscar/oscar.c:3087
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gtkblist.c:2325
+#: src/gtkblist.c:2723
 msgid "Join a chat room"
 msgstr "Join a chat room"
 
-#: src/gtkblist.c:2333
+#: src/gtkblist.c:2731
 msgid "Set an away message"
 msgstr "Set an away message"
 
-#: src/gtkblist.c:3041 src/protocols/yahoo/yahoo.c:2166
+#: src/gtkblist.c:3444 src/protocols/yahoo/yahoo.c:2325
 msgid "Add Buddy"
 msgstr "Add Buddy"
 
-#: src/gtkblist.c:3064
+#: src/gtkblist.c:3467
 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. "
@@ -2428,24 +2478,20 @@
 "buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
 "The alias will be displayed in place of the screen name whenever possible.\n"
 
-#: src/gtkblist.c:3086 src/main.c:289
+#: src/gtkblist.c:3489 src/main.c:292
 msgid "Screen Name:"
 msgstr "Screen Name:"
 
-#: src/gtkblist.c:3112 src/gtkblist.c:3429
-msgid "Group:"
-msgstr "Group:"
-
 #. Set up stuff for the account box
-#: src/gtkblist.c:3121 src/gtkblist.c:3399
+#: src/gtkblist.c:3524 src/gtkblist.c:3805
 msgid "Account:"
 msgstr "Account:"
 
-#: src/gtkblist.c:3366
+#: src/gtkblist.c:3772
 msgid "Add Chat"
 msgstr "Add Chat"
 
-#: src/gtkblist.c:3389
+#: src/gtkblist.c:3795
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -2453,77 +2499,86 @@
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
 
-#: src/gtkblist.c:3463
+#: src/gtkblist.c:3871
 msgid "Add Group"
 msgstr "Add Group"
 
-#: src/gtkblist.c:3463
-msgid "Add a new group"
-msgstr "Add a new group"
-
-#: src/gtkblist.c:3464
+#: src/gtkblist.c:3872
 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:3965
+#: src/gtkblist.c:4389
 msgid "No actions available"
 msgstr "No actions available"
 
-#: src/gtkconn.c:58 src/gtkconn.c:242 src/gtkconn.c:253
+#: src/gtkconn.c:79 src/gtkconn.c:251 src/gtkconn.c:262
 msgid "Done."
 msgstr "Done."
 
-#: src/gtkconn.c:137
+#: src/gtkconn.c:158
 msgid "Signon: "
 msgstr "Signon: "
 
-#: src/gtkconn.c:195
+#: src/gtkconn.c:204
 msgid "Signon"
 msgstr "Signon"
 
-#: src/gtkconn.c:208
+#: src/gtkconn.c:217
 msgid "Cancel All"
 msgstr "Cancel All"
 
-#: src/gtkconn.c:359
+#: src/gtkconn.c:360 src/gtkconn.c:587
+msgid "_Reconnect"
+msgstr "_Reconnect"
+
+#: src/gtkconn.c:551
+#, c-format
+msgid ""
+"<span weight=\"bold\" size=\"larger\">%s has been disconnected.</span>\n"
+"\n"
+"%s\n"
+"%s"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">%s has been disconnected.</span>\n"
+"\n"
+"%s\n"
+"%s"
+
+#: src/gtkconn.c:553
 msgid "Reason Unknown."
 msgstr "Reason Unknown."
 
-#: src/gtkconn.c:368
-msgid "Reconnect"
-msgstr "Reconnect"
-
-#: src/gtkconn.c:407
-msgid "Account"
-msgstr "Account"
-
-#: src/gtkconn.c:415
+#: src/gtkconn.c:592
+msgid "Reconnect _All"
+msgstr "Reconnect _All"
+
+#: src/gtkconn.c:622
 msgid "Time"
 msgstr "Time"
 
-#: src/gtkconv.c:185
+#: src/gtkconv.c:188
 msgid "That file already exists"
 msgstr "That file already exists"
 
-#: src/gtkconv.c:186 src/gtkft.c:1034
+#: src/gtkconv.c:189 src/gtkft.c:1078
 msgid "Would you like to overwrite it?"
 msgstr "Would you like to overwrite it?"
 
-#: src/gtkconv.c:241
+#: src/gtkconv.c:245
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Failed to store image: %s\n"
 
-#: src/gtkconv.c:311
-msgid "Gaim - Insert Image"
-msgstr "Gaim - Insert Image"
-
-#: src/gtkconv.c:615
-msgid "Gaim - Invite Buddy Into Chat Room"
-msgstr "Gaim - Invite Buddy Into Chat Room"
+#: src/gtkconv.c:301
+msgid "Insert Image"
+msgstr "Insert Image"
+
+#: src/gtkconv.c:606
+msgid "Invite Buddy Into Chat Room"
+msgstr "Invite Buddy Into Chat Room"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:643
+#: src/gtkconv.c:634
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -2531,463 +2586,476 @@
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 
-#: src/gtkconv.c:664
+#: src/gtkconv.c:655
 msgid "_Buddy:"
 msgstr "_Buddy:"
 
-#: src/gtkconv.c:684
+#: src/gtkconv.c:675
 msgid "_Message:"
 msgstr "_Message:"
 
-#: src/gtkconv.c:780
-msgid ""
-"<span weight='bold' size='larger'>Enter a search phrase\n"
-"</span>"
-msgstr ""
-"<span weight='bold' size='larger'>Enter a search phrase\n"
-"</span>"
+#: src/gtkconv.c:765
+msgid "Find"
+msgstr "Find"
 
 #: src/gtkconv.c:787
-msgid "Search term: "
-msgstr "Search term: "
-
-#: src/gtkconv.c:1224
+msgid "_Search for:"
+msgstr "_Search for:"
+
+#: src/gtkconv.c:1200
 msgid "Un-Ignore"
 msgstr "Un-Ignore"
 
-#: src/gtkconv.c:1226 src/gtkprefs.c:774
+#: src/gtkconv.c:1202 src/gtkprefs.c:766
 msgid "Ignore"
 msgstr "Ignore"
 
 #. Info button
-#: src/gtkconv.c:1235 src/gtkconv.c:3133
+#: src/gtkconv.c:1211 src/gtkconv.c:3179
 msgid "Info"
 msgstr "Info"
 
-#: src/gtkconv.c:1244
+#: src/gtkconv.c:1220
 msgid "Get Away Msg"
 msgstr "Get Away Msg"
 
-#: src/gtkconv.c:1255 src/gtkconv.c:3116 src/gtkconv.c:4265
-#: src/gtkrequest.c:201
+#. Remove button
+#: src/gtkconv.c:1231 src/gtkconv.c:3172 src/gtkconv.c:3263
+#: src/gtkrequest.c:198
 msgid "Remove"
 msgstr "Remove"
 
-#: src/gtkconv.c:2372
+#: src/gtkconv.c:2414
 msgid "User is typing..."
 msgstr "User is typing..."
 
-#: src/gtkconv.c:2380
+#: src/gtkconv.c:2422
 msgid "User has typed something and paused"
 msgstr "User has typed something and paused"
 
 #. Build the Send As menu
-#: src/gtkconv.c:2483
+#: src/gtkconv.c:2525
 msgid "_Send As"
 msgstr "_Send As"
 
-#: src/gtkconv.c:2905
-msgid "Gaim - Save Conversation"
-msgstr "Gaim - Save Conversation"
+#: src/gtkconv.c:2944
+msgid "Save Conversation"
+msgstr "Save Conversation"
 
 #. Conversation menu
-#: src/gtkconv.c:2922
+#: src/gtkconv.c:2961
 msgid "/_Conversation"
 msgstr "/_Conversation"
 
-#: src/gtkconv.c:2924
-msgid "/Conversation/_Save As..."
-msgstr "/Conversation/_Save As..."
-
-#: src/gtkconv.c:2926
+#: src/gtkconv.c:2963
+msgid "/Conversation/New Instant _Message..."
+msgstr "/Conversation/New Instant _Message..."
+
+#: src/gtkconv.c:2968
+msgid "/Conversation/_Find..."
+msgstr "/Conversation/_Find..."
+
+#: src/gtkconv.c:2969
 msgid "/Conversation/View _Log"
 msgstr "/Conversation/View _Log"
 
-#: src/gtkconv.c:2927
-msgid "/Conversation/Search..."
-msgstr "/Conversation/Search..."
-
-#: src/gtkconv.c:2931
+#: src/gtkconv.c:2970
+msgid "/Conversation/_Save As..."
+msgstr "/Conversation/_Save As..."
+
+#: src/gtkconv.c:2975
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Conversation/Add Buddy _Pounce..."
 
-#: src/gtkconv.c:2933
+#: src/gtkconv.c:2977
+msgid "/Conversation/_Get Info"
+msgstr "/Conversation/_Get Info"
+
+#: src/gtkconv.c:2979
+msgid "/Conversation/_Warn..."
+msgstr "/Conversation/_Warn..."
+
+#: src/gtkconv.c:2981
+msgid "/Conversation/In_vite..."
+msgstr "/Conversation/In_vite..."
+
+#: src/gtkconv.c:2986
 msgid "/Conversation/A_lias..."
 msgstr "/Conversation/A_lias..."
 
-#: src/gtkconv.c:2935
-msgid "/Conversation/_Get Info..."
-msgstr "/Conversation/_Get Info..."
-
-#: src/gtkconv.c:2937
-msgid "/Conversation/In_vite..."
-msgstr "/Conversation/In_vite..."
-
-#: src/gtkconv.c:2942
-msgid "/Conversation/Insert _URL..."
-msgstr "/Conversation/Insert _URL..."
-
-#: src/gtkconv.c:2944
-msgid "/Conversation/Insert _Image..."
-msgstr "/Conversation/Insert _Image..."
-
-#: src/gtkconv.c:2949
-msgid "/Conversation/_Warn..."
-msgstr "/Conversation/_Warn..."
-
-#: src/gtkconv.c:2951
+#: src/gtkconv.c:2988
 msgid "/Conversation/_Block..."
 msgstr "/Conversation/_Block..."
 
-#: src/gtkconv.c:2953
+#: src/gtkconv.c:2990
 msgid "/Conversation/_Add..."
 msgstr "/Conversation/_Add..."
 
-#: src/gtkconv.c:2955
+#: src/gtkconv.c:2992
 msgid "/Conversation/_Remove..."
 msgstr "/Conversation/_Remove..."
 
-#: src/gtkconv.c:2960
+#: src/gtkconv.c:2997
+msgid "/Conversation/Insert Lin_k..."
+msgstr "/Conversation/Insert Lin_k..."
+
+#: src/gtkconv.c:2999
+msgid "/Conversation/Insert Imag_e..."
+msgstr "/Conversation/Insert Imag_e..."
+
+#: src/gtkconv.c:3004
 msgid "/Conversation/_Close"
 msgstr "/Conversation/_Close"
 
 #. Options
-#: src/gtkconv.c:2964
+#: src/gtkconv.c:3008
 msgid "/_Options"
 msgstr "/_Options"
 
-#: src/gtkconv.c:2965
-msgid "/Options/Enable _Logging"
-msgstr "/Options/Enable _Logging"
-
-#: src/gtkconv.c:2966
-msgid "/Options/Enable _Sounds"
-msgstr "/Options/Enable _Sounds"
-
-#: src/gtkconv.c:2967
-msgid "/Options/Show Formatting _Toolbar"
-msgstr "/Options/Show Formatting _Toolbar"
-
 #: src/gtkconv.c:3009
+msgid "/Options/Enable _Logging"
+msgstr "/Options/Enable _Logging"
+
+#: src/gtkconv.c:3010
+msgid "/Options/Enable _Sounds"
+msgstr "/Options/Enable _Sounds"
+
+#: src/gtkconv.c:3011
+msgid "/Options/Show Formatting _Toolbar"
+msgstr "/Options/Show Formatting _Toolbar"
+
+#: src/gtkconv.c:3053
 msgid "/Conversation/View Log"
 msgstr "/Conversation/View Log"
 
-#: src/gtkconv.c:3014
+#: src/gtkconv.c:3058
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversation/Add Buddy Pounce..."
 
-#: src/gtkconv.c:3018
-msgid "/Conversation/Alias..."
-msgstr "/Conversation/Alias..."
-
-#: src/gtkconv.c:3022
-msgid "/Conversation/Get Info..."
-msgstr "/Conversation/Get Info..."
-
-#: src/gtkconv.c:3026
+#: src/gtkconv.c:3064
+msgid "/Conversation/Get Info"
+msgstr "/Conversation/Get Info"
+
+#: src/gtkconv.c:3068
+msgid "/Conversation/Warn..."
+msgstr "/Conversation/Warn..."
+
+#: src/gtkconv.c:3072
 msgid "/Conversation/Invite..."
 msgstr "/Conversation/Invite..."
 
-#: src/gtkconv.c:3032
-msgid "/Conversation/Insert URL..."
-msgstr "/Conversation/Insert URL..."
-
-#: src/gtkconv.c:3036
-msgid "/Conversation/Insert Image..."
-msgstr "/Conversation/Insert Image..."
-
-#: src/gtkconv.c:3042
-msgid "/Conversation/Warn..."
-msgstr "/Conversation/Warn..."
-
-#: src/gtkconv.c:3046
+#: src/gtkconv.c:3078
+msgid "/Conversation/Alias..."
+msgstr "/Conversation/Alias..."
+
+#: src/gtkconv.c:3082
 msgid "/Conversation/Block..."
 msgstr "/Conversation/Block..."
 
-#: src/gtkconv.c:3050
+#: src/gtkconv.c:3086
 msgid "/Conversation/Add..."
 msgstr "/Conversation/Add..."
 
-#: src/gtkconv.c:3054
+#: src/gtkconv.c:3090
 msgid "/Conversation/Remove..."
 msgstr "/Conversation/Remove..."
 
-#: src/gtkconv.c:3060
+#: src/gtkconv.c:3096
+msgid "/Conversation/Insert Link..."
+msgstr "/Conversation/Insert Link..."
+
+#: src/gtkconv.c:3100
+msgid "/Conversation/Insert Image..."
+msgstr "/Conversation/Insert Image..."
+
+#: src/gtkconv.c:3106
 msgid "/Options/Enable Logging"
 msgstr "/Options/Enable Logging"
 
-#: src/gtkconv.c:3063
+#: src/gtkconv.c:3109
 msgid "/Options/Enable Sounds"
 msgstr "/Options/Enable Sounds"
 
-#: src/gtkconv.c:3066
+#: src/gtkconv.c:3112
 msgid "/Options/Show Formatting Toolbar"
 msgstr "/Options/Show Formatting Toolbar"
 
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:3090 src/gtkconv.c:3092 src/gtkconv.c:3190 src/gtkconv.c:3192
-#: src/gtkconv.c:5975
+#: src/gtkconv.c:3135 src/gtkconv.c:3137 src/gtkconv.c:3235 src/gtkconv.c:3237
 msgid "Send"
 msgstr "Send"
 
-#: src/gtkconv.c:3113 src/gtkconv.c:4283
-msgid "Add the user to your buddy list"
-msgstr "Add the user to your buddy list"
-
-#: src/gtkconv.c:3119 src/gtkconv.c:4268
-msgid "Remove the user from your buddy list"
-msgstr "Remove the user from your buddy list"
-
+#. Now, um, just kind of all over the place. Huh?
 #. Warn button
-#: src/gtkconv.c:3126
+#: src/gtkconv.c:3151
 msgid "Warn"
 msgstr "Warn"
 
-#: src/gtkconv.c:3130
+#: src/gtkconv.c:3154
 msgid "Warn the user"
 msgstr "Warn the user"
 
-#: src/gtkconv.c:3137 src/gtkconv.c:3575
-msgid "Get the user's information"
-msgstr "Get the user's information"
-
 #. Block button
-#: src/gtkconv.c:3140 src/gtkprivacy.c:605 src/gtkprivacy.c:616
+#: src/gtkconv.c:3158 src/gtkprivacy.c:607 src/gtkprivacy.c:618
 msgid "Block"
 msgstr "Block"
 
-#: src/gtkconv.c:3144
+#: src/gtkconv.c:3161
 msgid "Block the user"
 msgstr "Block the user"
 
+#: src/gtkconv.c:3168
+msgid "Add the user to your buddy list"
+msgstr "Add the user to your buddy list"
+
+#: src/gtkconv.c:3175
+msgid "Remove the user from your buddy list"
+msgstr "Remove the user from your buddy list"
+
+#: src/gtkconv.c:3182 src/gtkconv.c:3681
+msgid "Get the user's information"
+msgstr "Get the user's information"
+
 #. Invite
-#: src/gtkconv.c:3202 src/gtkconv.c:5978
+#: src/gtkconv.c:3249
 msgid "Invite"
 msgstr "Invite"
 
-#: src/gtkconv.c:3205
+#: src/gtkconv.c:3252
 msgid "Invite a user"
 msgstr "Invite a user"
 
-#: src/gtkconv.c:3244
+#: src/gtkconv.c:3259
+msgid "Add the chat to your buddy list"
+msgstr "Add the chat to your buddy list"
+
+#: src/gtkconv.c:3266
+msgid "Remove the chat from your buddy list"
+msgstr "Remove the chat from your buddy list"
+
+#: src/gtkconv.c:3322
 msgid "Bold"
 msgstr "Bold"
 
-#: src/gtkconv.c:3255
+#: src/gtkconv.c:3333
 msgid "Italic"
 msgstr "Italic"
 
-#: src/gtkconv.c:3266
+#: src/gtkconv.c:3344
 msgid "Underline"
 msgstr "Underline"
 
-#: src/gtkconv.c:3282
+#: src/gtkconv.c:3360
 msgid "Larger font size"
 msgstr "Larger font size"
 
-#: src/gtkconv.c:3294
-msgid "Normal font size"
-msgstr "Normal font size"
-
-#: src/gtkconv.c:3306
+#: src/gtkconv.c:3385
 msgid "Smaller font size"
 msgstr "Smaller font size"
 
-#: src/gtkconv.c:3323
+#: src/gtkconv.c:3402
 msgid "Font Face"
 msgstr "Font Face"
 
-#: src/gtkconv.c:3335
+#: src/gtkconv.c:3414
 msgid "Foreground font color"
 msgstr "Foreground font colour"
 
-#: src/gtkconv.c:3347
+#: src/gtkconv.c:3426
 msgid "Background color"
 msgstr "Background colour"
 
-#: src/gtkconv.c:3362
+#: src/gtkconv.c:3441
+msgid "Insert link"
+msgstr "Insert link"
+
+#: src/gtkconv.c:3452
 msgid "Insert image"
 msgstr "Insert image"
 
-#: src/gtkconv.c:3373
-msgid "Insert link"
-msgstr "Insert link"
-
-#: src/gtkconv.c:3384
+#: src/gtkconv.c:3463
 msgid "Insert smiley"
 msgstr "Insert smiley"
 
-#: src/gtkconv.c:3444
+#: src/gtkconv.c:3548
 msgid "Topic:"
 msgstr "Topic:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3495
+#: src/gtkconv.c:3605
 msgid "0 people in room"
 msgstr "0 people in room"
 
-#: src/gtkconv.c:3552
+#: src/gtkconv.c:3658
 msgid "IM the user"
 msgstr "IM the user"
 
-#: src/gtkconv.c:3564
+#: src/gtkconv.c:3670
 msgid "Ignore the user"
 msgstr "Ignore the user"
 
-#: src/gtkconv.c:4081
+#: src/gtkconv.c:4216
 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:4740 src/gtkconv.c:4772 src/gtkconv.c:4893 src/gtkconv.c:4960
 #, 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:5222
+#: src/gtkconv.c:5292
 msgid "Animate"
 msgstr "Animate"
 
-#: src/gtkconv.c:5227
+#: src/gtkconv.c:5297
 msgid "Hide Icon"
 msgstr "Hide Icon"
 
-#: src/gtkconv.c:5233
+#: src/gtkconv.c:5303
 msgid "Save Icon As..."
 msgstr "Save Icon As..."
 
-#: src/gtkconv.c:5712 src/gtkconv.c:5715
+#: src/gtkconv.c:5700 src/gtkconv.c:5703
 msgid "<main>/Conversation/Close"
 msgstr "<main>/Conversation/Close"
 
-#: src/gtkdebug.c:133
+#: src/gtkdebug.c:135
 msgid "Debug Window"
 msgstr "Debug Window"
 
-#: src/gtkdebug.c:173
+#: src/gtkdebug.c:175
 msgid "Pause"
 msgstr "Pause"
 
-#: src/gtkdebug.c:179
+#: src/gtkdebug.c:181
 msgid "Timestamps"
 msgstr "Timestamps"
 
-#: src/gtkft.c:126
+#: src/gtkft.c:135
 #, c-format
 msgid "%.2f KB/s"
 msgstr "%.2f KB/s"
 
-#: src/gtkft.c:200
+#: src/gtkft.c:209
 msgid "<b>Receiving From:</b>"
 msgstr "<b>Receiving From:</b>"
 
-#: src/gtkft.c:203
+#: src/gtkft.c:212
 msgid "<b>Sending To:</b>"
 msgstr "<b>Sending To:</b>"
 
-#: src/gtkft.c:436
+#: src/gtkft.c:460
 msgid "Progress"
 msgstr "Progress"
 
-#: src/gtkft.c:443
+#: src/gtkft.c:467
 msgid "Filename"
 msgstr "Filename"
 
-#: src/gtkft.c:450
+#: src/gtkft.c:474
 msgid "Size"
 msgstr "Size"
 
-#: src/gtkft.c:457
+#: src/gtkft.c:481
 msgid "Remaining"
 msgstr "Remaining"
 
-#: src/gtkft.c:487
+#: src/gtkft.c:511
 msgid "Filename:"
 msgstr "Filename:"
 
-#: src/gtkft.c:488
+#: src/gtkft.c:512
 msgid "Status:"
 msgstr "Status:"
 
-#: src/gtkft.c:489
+#: src/gtkft.c:513
 msgid "Speed:"
 msgstr "Speed:"
 
-#: src/gtkft.c:490
+#: src/gtkft.c:514
 msgid "Time Elapsed:"
 msgstr "Time Elapsed:"
 
-#: src/gtkft.c:491
+#: src/gtkft.c:515
 msgid "Time Remaining:"
 msgstr "Time Remaining:"
 
-#: src/gtkft.c:588
+#: src/gtkft.c:612
 msgid "_Keep the dialog open"
 msgstr "_Keep the dialog open"
 
-#: src/gtkft.c:598
+#: src/gtkft.c:622
 msgid "_Clear finished transfers"
 msgstr "_Clear finished transfers"
 
 #. "Download Details" arrow
-#: src/gtkft.c:607
-msgid "Show download details"
-msgstr "Show download details"
-
-#: src/gtkft.c:608
-msgid "Hide download details"
-msgstr "Hide download details"
+#: src/gtkft.c:631
+msgid "Show transfer details"
+msgstr "Show transfer details"
+
+#: src/gtkft.c:632
+msgid "Hide transfer details"
+msgstr "Hide transfer details"
 
 #. Pause button
-#: src/gtkft.c:650 src/stock.c:86
+#: src/gtkft.c:674 src/stock.c:87
 msgid "_Pause"
 msgstr "_Pause"
 
 #. Resume button
-#: src/gtkft.c:660
+#: src/gtkft.c:684
 msgid "_Resume"
 msgstr "_Resume"
 
-#: src/gtkft.c:1011
+#: src/gtkft.c:884
+msgid "Canceled"
+msgstr "Cancelled"
+
+#: src/gtkft.c:886
+msgid "Failed"
+msgstr "Failed"
+
+#: src/gtkft.c:1055
 msgid "That file does not exist."
 msgstr "That file does not exist."
 
-#: src/gtkft.c:1020
+#: src/gtkft.c:1064
 msgid "Cannot send a file of 0 bytes."
 msgstr "Cannot send a file of 0 bytes."
 
-#: src/gtkft.c:1033
+#: src/gtkft.c:1077
 msgid "That file already exists."
 msgstr "That file already exists."
 
-#: src/gtkft.c:1058
-msgid "Gaim - Open..."
-msgstr "Gaim - Open..."
-
-#: src/gtkft.c:1060 src/protocols/toc/toc.c:2042
-msgid "Gaim - Save As..."
-msgstr "Gaim - Save As..."
-
-#: src/gtkft.c:1107
+#: src/gtkft.c:1102
+msgid "Open..."
+msgstr "Open..."
+
+#: src/gtkft.c:1104
+msgid "Save As..."
+msgstr "Save As..."
+
+#: src/gtkft.c:1151
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s wants to send you %s (%s)"
 
-#: src/gtkimhtml.c:614
+#: src/gtkimhtml.c:711
 msgid "_Copy E-Mail Address"
 msgstr "_Copy E-Mail Address"
 
-#: src/gtkimhtml.c:626
+#: src/gtkimhtml.c:723
 msgid "_Copy Link Location"
 msgstr "_Copy Link Location"
 
-#: src/gtkimhtml.c:636
+#: src/gtkimhtml.c:733
 msgid "_Open Link in Browser"
 msgstr "_Open Link in Browser"
 
-#: src/gtkimhtml.c:1744
+#: src/gtkimhtml.c:1910
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
@@ -2995,41 +3063,41 @@
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
 
-#: src/gtkimhtml.c:1752
+#: src/gtkimhtml.c:1918
 #, c-format
 msgid "Error saving image: %s"
 msgstr "Error saving image: %s"
 
-#: src/gtkimhtml.c:1761
+#: src/gtkimhtml.c:1927
 msgid "Save Image"
 msgstr "Save Image"
 
-#: src/gtkimhtml.c:1784
+#: src/gtkimhtml.c:1950
 msgid "_Save Image..."
 msgstr "_Save Image..."
 
-#: src/gtklog.c:244
+#: src/gtklog.c:257
 msgid "Conversations with"
 msgstr "Conversations with"
 
-#: src/gtknotify.c:211
+#: src/gtknotify.c:213
 #, 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:219
+#: src/gtknotify.c:221
 #, c-format
 msgid "<span weight=\"bold\">From:</span> %s\n"
 msgstr "<span weight=\"bold\">From:</span> %s\n"
 
-#: src/gtknotify.c:224
+#: src/gtknotify.c:226
 #, c-format
 msgid "<span weight=\"bold\">Subject:</span> %s\n"
 msgstr "<span weight=\"bold\">Subject:</span> %s\n"
 
-#: src/gtknotify.c:228
+#: src/gtknotify.c:230
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3040,7 +3108,7 @@
 "\n"
 "%s%s%s%s"
 
-#: src/gtknotify.c:243
+#: src/gtknotify.c:245
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3051,176 +3119,176 @@
 "\n"
 "%s"
 
-#: src/gtknotify.c:428 src/gtknotify.c:448 src/gtknotify.c:456
+#: src/gtknotify.c:432 src/gtknotify.c:452 src/gtknotify.c:460
 msgid "Unable to open URL"
 msgstr "Unable to open URL"
 
-#: src/gtknotify.c:429
+#: src/gtknotify.c:433
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 
-#: src/gtknotify.c:446
+#: src/gtknotify.c:450
 #, c-format
 msgid "The browser \"%s\" is invalid."
 msgstr "The browser \"%s\" is invalid."
 
-#: src/gtknotify.c:453
+#: src/gtknotify.c:457
 #, c-format
 msgid "Error launching \"command\": %s"
 msgstr "Error launching \"command\": %s"
 
-#: src/gtkpounce.c:140
+#: src/gtkpounce.c:142
 msgid "Select a file"
 msgstr "Select a file"
 
-#: src/gtkpounce.c:189
+#: src/gtkpounce.c:191
 msgid "Please enter a buddy to pounce."
 msgstr "Please enter a buddy to pounce."
 
 #. "New Buddy Pounce"
-#: src/gtkpounce.c:333 src/gtkpounce.c:738
+#: src/gtkpounce.c:335 src/gtkpounce.c:740
 msgid "New Buddy Pounce"
 msgstr "New Buddy Pounce"
 
-#: src/gtkpounce.c:333
+#: src/gtkpounce.c:335
 msgid "Edit Buddy Pounce"
 msgstr "Edit Buddy Pounce"
 
 #. Create the "Pounce Who" frame.
-#: src/gtkpounce.c:351
+#: src/gtkpounce.c:353
 msgid "Pounce Who"
 msgstr "Pounce Who"
 
-#: src/gtkpounce.c:377
+#: src/gtkpounce.c:379
 msgid "_Buddy Name:"
 msgstr "_Buddy Name:"
 
 #. Create the "Pounce When" frame.
-#: src/gtkpounce.c:399
+#: src/gtkpounce.c:401
 msgid "Pounce When"
 msgstr "Pounce When"
 
-#: src/gtkpounce.c:407 src/main.c:339
+#: src/gtkpounce.c:409 src/main.c:338
 msgid "Sign on"
 msgstr "Sign on"
 
-#: src/gtkpounce.c:409
+#: src/gtkpounce.c:411
 msgid "Sign off"
 msgstr "Sign off"
 
-#: src/gtkpounce.c:413
+#: src/gtkpounce.c:415
 msgid "Return from away"
 msgstr "Return from away"
 
-#: src/gtkpounce.c:415 src/gtkprefs.c:1492 src/protocols/msn/state.c:30
-#: src/protocols/yahoo/yahoo.c:2028
+#: src/gtkpounce.c:417 src/gtkprefs.c:1481 src/protocols/msn/state.c:30
+#: src/protocols/yahoo/yahoo.c:2189
 msgid "Idle"
 msgstr "Idle"
 
-#: src/gtkpounce.c:417
+#: src/gtkpounce.c:419
 msgid "Return from idle"
 msgstr "Return from idle"
 
-#: src/gtkpounce.c:419
+#: src/gtkpounce.c:421
 msgid "Buddy starts typing"
 msgstr "Buddy starts typing"
 
-#: src/gtkpounce.c:421
+#: src/gtkpounce.c:423
 msgid "Buddy stops typing"
 msgstr "Buddy stops typing"
 
 #. Create the "Pounce Action" frame.
-#: src/gtkpounce.c:450
+#: src/gtkpounce.c:452
 msgid "Pounce Action"
 msgstr "Pounce Action"
 
-#: src/gtkpounce.c:457
+#: src/gtkpounce.c:459
 msgid "Open an IM window"
 msgstr "Open an IM window"
 
-#: src/gtkpounce.c:458
-msgid "Popup notification"
-msgstr "Popup notification"
-
-#: src/gtkpounce.c:459
-msgid "Send a message"
-msgstr "Send a message"
-
 #: src/gtkpounce.c:460
+msgid "Popup notification"
+msgstr "Popup notification"
+
+#: src/gtkpounce.c:461
+msgid "Send a message"
+msgstr "Send a message"
+
+#: src/gtkpounce.c:462
 msgid "Execute a command"
 msgstr "Execute a command"
 
-#: src/gtkpounce.c:461
+#: src/gtkpounce.c:463
 msgid "Play a sound"
 msgstr "Play a sound"
 
-#: src/gtkpounce.c:465 src/gtkpounce.c:467
+#: src/gtkpounce.c:467 src/gtkpounce.c:469
 msgid "Browse"
 msgstr "Browse"
 
-#: src/gtkpounce.c:468 src/gtkprefs.c:2081
+#: src/gtkpounce.c:470 src/gtkprefs.c:2071
 msgid "Test"
 msgstr "Test"
 
-#: src/gtkpounce.c:551
+#: src/gtkpounce.c:553
 msgid "_Save this pounce after activation"
 msgstr "_Save this pounce after activation"
 
 #. "Remove Buddy Pounce"
-#: src/gtkpounce.c:745
+#: src/gtkpounce.c:747
 msgid "Remove Buddy Pounce"
 msgstr "Remove Buddy Pounce"
 
-#: src/gtkpounce.c:786
+#: src/gtkpounce.c:794
 #, c-format
 msgid "%s has started typing to you"
 msgstr "%s has started typing to you"
 
-#: src/gtkpounce.c:787
+#: src/gtkpounce.c:795
 #, c-format
 msgid "%s has signed on"
 msgstr "%s has signed on"
 
-#: src/gtkpounce.c:788
+#: src/gtkpounce.c:796
 #, c-format
 msgid "%s has returned from being idle"
 msgstr "%s has returned from being idle"
 
-#: src/gtkpounce.c:789
+#: src/gtkpounce.c:797
 #, c-format
 msgid "%s has returned from being away"
 msgstr "%s has returned from being away"
 
-#: src/gtkpounce.c:790
+#: src/gtkpounce.c:798
 #, c-format
 msgid "%s has stopped typing to you"
 msgstr "%s has stopped typing to you"
 
-#: src/gtkpounce.c:791
+#: src/gtkpounce.c:799
 #, c-format
 msgid "%s has signed off"
 msgstr "%s has signed off"
 
-#: src/gtkpounce.c:792
+#: src/gtkpounce.c:800
 #, c-format
 msgid "%s has become idle"
 msgstr "%s has become idle"
 
-#: src/gtkpounce.c:794
+#: src/gtkpounce.c:802
 msgid "Unknown pounce event. Please report this!"
 msgstr "Unknown pounce event. Please report this!"
 
-#: src/gtkprefs.c:373
+#: src/gtkprefs.c:367
 msgid "Interface Options"
 msgstr "Interface Options"
 
-#: src/gtkprefs.c:375
+#: src/gtkprefs.c:369
 msgid "D_isplay remote nicknames if no alias is set"
 msgstr "D_isplay remote nicknames if no alias is set"
 
-#: src/gtkprefs.c:561
+#: src/gtkprefs.c:555
 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."
@@ -3228,361 +3296,360 @@
 "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:594
+#: src/gtkprefs.c:590
 msgid "Icon"
 msgstr "Icon"
 
-#: src/gtkprefs.c:668
+#: src/gtkprefs.c:597 src/gtkprefs.c:1793 src/protocols/jabber/buddy.c:263
+#: src/protocols/jabber/buddy.c:748
+msgid "Description"
+msgstr "Description"
+
+#: src/gtkprefs.c:661
 msgid "Style"
 msgstr "Style"
 
-#: src/gtkprefs.c:669
+#: src/gtkprefs.c:662
 msgid "_Bold"
 msgstr "_Bold"
 
-#: src/gtkprefs.c:671
+#: src/gtkprefs.c:664
 msgid "_Italics"
 msgstr "_Italics"
 
-#: src/gtkprefs.c:673
+#: src/gtkprefs.c:666
 msgid "_Underline"
 msgstr "_Underline"
 
-#: src/gtkprefs.c:675
+#: src/gtkprefs.c:668
 msgid "_Strikethrough"
 msgstr "_Strikethrough"
 
-#: src/gtkprefs.c:678
+#: src/gtkprefs.c:671
 msgid "Face"
 msgstr "Face"
 
-#: src/gtkprefs.c:681
+#: src/gtkprefs.c:674
 msgid "Use custo_m face"
 msgstr "Use custo_m face"
 
-#: src/gtkprefs.c:698
+#: src/gtkprefs.c:691
 msgid "Use custom si_ze"
 msgstr "Use custom si_ze"
 
-#: src/gtkprefs.c:711
+#: src/gtkprefs.c:703
 msgid "Color"
-msgstr "Color"
-
-#: src/gtkprefs.c:715
+msgstr "Colour"
+
+#: src/gtkprefs.c:707
 msgid "_Text color"
 msgstr "_Text colour"
 
-#: src/gtkprefs.c:734
+#: src/gtkprefs.c:726
 msgid "Bac_kground color"
 msgstr "Bac_kground colour"
 
-#: src/gtkprefs.c:762 src/gtkprefs.c:992 src/gtkprefs.c:1045
+#: src/gtkprefs.c:754 src/gtkprefs.c:986 src/gtkprefs.c:1034
 msgid "Display"
 msgstr "Display"
 
+#: src/gtkprefs.c:755
+msgid "Show graphical _smileys"
+msgstr "Show graphical _smileys"
+
+#: src/gtkprefs.c:757
+msgid "Show _timestamp on messages"
+msgstr "Show _timestamp on messages"
+
+#: src/gtkprefs.c:759
+msgid "Show _URLs as links"
+msgstr "Show _URLs as links"
+
 #: src/gtkprefs.c:763
-msgid "Show graphical _smileys"
-msgstr "Show graphical _smileys"
-
-#: src/gtkprefs.c:765
-msgid "Show _timestamp on messages"
-msgstr "Show _timestamp on messages"
+msgid "_Highlight misspelled words"
+msgstr "_Highlight misspelled words"
 
 #: src/gtkprefs.c:767
-msgid "Show _URLs as links"
-msgstr "Show _URLs as links"
+msgid "Ignore c_olors"
+msgstr "Ignore c_olours"
+
+#: src/gtkprefs.c:769
+msgid "Ignore font _faces"
+msgstr "Ignore font _faces"
 
 #: src/gtkprefs.c:771
-msgid "_Highlight misspelled words"
-msgstr "_Highlight misspelled words"
-
-#: src/gtkprefs.c:775
-msgid "Ignore c_olors"
-msgstr "Ignore c_olors"
-
-#: src/gtkprefs.c:777
-msgid "Ignore font _faces"
-msgstr "Ignore font _faces"
-
-#: src/gtkprefs.c:779
 msgid "Ignore font si_zes"
 msgstr "Ignore font si_zes"
 
-#: src/gtkprefs.c:792
+#: src/gtkprefs.c:784
 msgid "Send Message"
 msgstr "Send Message"
 
-#: src/gtkprefs.c:793
+#: src/gtkprefs.c:785
 msgid "Enter _sends message"
 msgstr "Enter _sends message"
 
-#: src/gtkprefs.c:795
+#: src/gtkprefs.c:787
 msgid "C_ontrol-Enter sends message"
 msgstr "C_ontrol-Enter sends message"
 
-#: src/gtkprefs.c:798
+#: src/gtkprefs.c:790
 msgid "Window Closing"
 msgstr "Window Closing"
 
-#: src/gtkprefs.c:799
+#: src/gtkprefs.c:791
 msgid "_Escape closes window"
 msgstr "_Escape closes window"
 
-#: src/gtkprefs.c:802
+#: src/gtkprefs.c:794
 msgid "Insertions"
 msgstr "Insertions"
 
-#: src/gtkprefs.c:803
+#: src/gtkprefs.c:795
 msgid "Control-{B/I/U} inserts _HTML tags"
 msgstr "Control-{B/I/U} inserts _HTML tags"
 
-#: src/gtkprefs.c:805
+#: src/gtkprefs.c:797
 msgid "Control-(number) _inserts smileys"
 msgstr "Control-(number) _inserts smileys"
 
-#: src/gtkprefs.c:821
+#: src/gtkprefs.c:813
 msgid "Buddy List Sorting"
 msgstr "Buddy List Sorting"
 
-#: src/gtkprefs.c:830
-msgid "Sorting:"
-msgstr "Sorting:"
-
-#: src/gtkprefs.c:835
+#: src/gtkprefs.c:822
+msgid "_Sorting:"
+msgstr "_Sorting:"
+
+#: src/gtkprefs.c:827
 msgid "Buddy List Toolbar"
 msgstr "Buddy List Toolbar"
 
-#: src/gtkprefs.c:836 src/gtkprefs.c:962 src/gtkprefs.c:1018
+#: src/gtkprefs.c:828 src/gtkprefs.c:959 src/gtkprefs.c:1010
 msgid "Show _buttons as:"
 msgstr "Show _buttons as:"
 
-#: src/gtkprefs.c:838 src/gtkprefs.c:964 src/gtkprefs.c:1020
+#: src/gtkprefs.c:830 src/gtkprefs.c:961 src/gtkprefs.c:1012
 msgid "Pictures"
 msgstr "Pictures"
 
-#: src/gtkprefs.c:839 src/gtkprefs.c:965 src/gtkprefs.c:1021
+#: src/gtkprefs.c:831 src/gtkprefs.c:962 src/gtkprefs.c:1013
 msgid "Text"
 msgstr "Text"
 
-#: src/gtkprefs.c:840 src/gtkprefs.c:966 src/gtkprefs.c:1022
+#: src/gtkprefs.c:832 src/gtkprefs.c:963 src/gtkprefs.c:1014
 msgid "Pictures and text"
 msgstr "Pictures and text"
 
-#: src/gtkprefs.c:845 src/gtkprefs.c:980 src/gtkprefs.c:1036
+#: src/gtkprefs.c:837 src/gtkprefs.c:974 src/gtkprefs.c:1025
 msgid "_Raise window on events"
 msgstr "_Raise window on events"
 
-#: src/gtkprefs.c:848
+#: src/gtkprefs.c:840
 msgid "Group Display"
 msgstr "Group Display"
 
-#: src/gtkprefs.c:849
+#: src/gtkprefs.c:841
 msgid "Show _numbers in groups"
 msgstr "Show _numbers in groups"
 
-#: src/gtkprefs.c:852
+#: src/gtkprefs.c:844
 msgid "Buddy Display"
 msgstr "Buddy Display"
 
-#: src/gtkprefs.c:853 src/gtkprefs.c:987
+#: src/gtkprefs.c:845 src/gtkprefs.c:981
 msgid "Show buddy _icons"
 msgstr "Show buddy _icons"
 
-#: src/gtkprefs.c:855
+#: src/gtkprefs.c:847
 msgid "Show _warning levels"
 msgstr "Show _warning levels"
 
-#: src/gtkprefs.c:857
+#: src/gtkprefs.c:849
 msgid "Show idle _times"
 msgstr "Show idle _times"
 
-#: src/gtkprefs.c:859
+#: src/gtkprefs.c:851
 msgid "Dim i_dle buddies"
 msgstr "Dim i_dle buddies"
 
-#: src/gtkprefs.c:884
+#: src/gtkprefs.c:853
+msgid "_Automatically expand contacts"
+msgstr "_Automatically expand contacts"
+
+#: src/gtkprefs.c:878
 msgid "_Placement:"
 msgstr "_Placement:"
 
+#: src/gtkprefs.c:885
+msgid "Send _URLs as Links"
+msgstr "Send _URLs as Links"
+
+#: src/gtkprefs.c:888
+msgid "Show _Formatting Toolbar"
+msgstr "Show _Formatting Toolbar"
+
 #: src/gtkprefs.c:891
-msgid "Send _URLs as Links"
-msgstr "Send _URLs as Links"
+msgid "Show a_liases in tabs/titles"
+msgstr "Show a_liases in tabs/titles"
 
 #: src/gtkprefs.c:894
-msgid "Show Formatting Toolbar"
-msgstr "Show Formatting Toolbar"
-
-#: src/gtkprefs.c:897
 msgid "Tab Options"
 msgstr "Tab Options"
 
-#: src/gtkprefs.c:899
+#: src/gtkprefs.c:896
 msgid "_Tab Placement:"
 msgstr "_Tab Placement:"
 
-#: src/gtkprefs.c:901
+#: src/gtkprefs.c:898
 msgid "Top"
 msgstr "Top"
 
-#: src/gtkprefs.c:902
+#: src/gtkprefs.c:899
 msgid "Bottom"
 msgstr "Bottom"
 
-#: src/gtkprefs.c:903
+#: src/gtkprefs.c:900
 msgid "Left"
 msgstr "Left"
 
-#: src/gtkprefs.c:904
+#: src/gtkprefs.c:901
 msgid "Right"
 msgstr "Right"
 
-#: src/gtkprefs.c:910
+#: src/gtkprefs.c:907
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Show IMs and chats in _tabbed windows"
 
-#: src/gtkprefs.c:913
+#: src/gtkprefs.c:910
 msgid "Show IMs and chats in _same tabbed window"
 msgstr "Show IMs and chats in _same tabbed window"
 
-#: src/gtkprefs.c:923
+#: src/gtkprefs.c:920
 msgid "Show _close button on tabs"
 msgstr "Show _close button on tabs"
 
-#: src/gtkprefs.c:934
+#: src/gtkprefs.c:931
 msgid "Show status _icons on tabs"
 msgstr "Show status _icons on tabs"
 
-#: src/gtkprefs.c:961 src/gtkprefs.c:1017
+#: src/gtkprefs.c:958 src/gtkprefs.c:1009
 msgid "Window"
 msgstr "Window"
 
-#: src/gtkprefs.c:971 src/gtkprefs.c:1027
+#: src/gtkprefs.c:968 src/gtkprefs.c:1019
 msgid "New window _width:"
 msgstr "New window _width:"
 
-#: src/gtkprefs.c:974 src/gtkprefs.c:1030
+#: src/gtkprefs.c:970 src/gtkprefs.c:1021
 msgid "New window _height:"
 msgstr "New window _height:"
 
-#: src/gtkprefs.c:977 src/gtkprefs.c:1033
+#: src/gtkprefs.c:972 src/gtkprefs.c:1023
 msgid "_Entry field height:"
 msgstr "_Entry field height:"
 
-#: src/gtkprefs.c:982
+#: src/gtkprefs.c:976
 msgid "Hide window on _send"
 msgstr "Hide window on _send"
 
-#: src/gtkprefs.c:986
+#: src/gtkprefs.c:980
 msgid "Buddy Icons"
 msgstr "Buddy Icons"
 
-#: src/gtkprefs.c:989
+#: src/gtkprefs.c:983
 msgid "Enable buddy icon a_nimation"
 msgstr "Enable buddy icon a_nimation"
 
-#: src/gtkprefs.c:993
+#: src/gtkprefs.c:987
 msgid "Show _logins in window"
 msgstr "Show _logins in window"
 
-#: src/gtkprefs.c:995
-msgid "Show a_liases in tabs/titles"
-msgstr "Show a_liases in tabs/titles"
-
-#: src/gtkprefs.c:998
+#: src/gtkprefs.c:990
 msgid "Typing Notification"
 msgstr "Typing Notification"
 
-#: src/gtkprefs.c:999
+#: src/gtkprefs.c:991
 msgid "Notify buddies that you are _typing to them"
 msgstr "Notify buddies that you are _typing to them"
 
-#: src/gtkprefs.c:1039
+#: src/gtkprefs.c:1028
 msgid "Tab Completion"
 msgstr "Tab Completion"
 
-#: src/gtkprefs.c:1040
+#: src/gtkprefs.c:1029
 msgid "_Tab-complete nicks"
 msgstr "_Tab-complete nicks"
 
-#: src/gtkprefs.c:1042
+#: src/gtkprefs.c:1031
 msgid "_Old-style tab completion"
 msgstr "_Old-style tab completion"
 
-#: src/gtkprefs.c:1046
+#: src/gtkprefs.c:1035
 msgid "_Show people joining in window"
 msgstr "_Show people joining in window"
 
-#: src/gtkprefs.c:1048
+#: src/gtkprefs.c:1037
 msgid "_Show people leaving in window"
 msgstr "_Show people leaving in window"
 
-#: src/gtkprefs.c:1050
+#: src/gtkprefs.c:1039
 msgid "Co_lorize screennames"
-msgstr "Co_lorise screennames"
-
-#: src/gtkprefs.c:1094
+msgstr "Co_lourise screennames"
+
+#: src/gtkprefs.c:1083
 msgid "Proxy Type"
 msgstr "Proxy Type"
 
-#: src/gtkprefs.c:1097
+#: src/gtkprefs.c:1086
 msgid "No proxy"
 msgstr "No proxy"
 
-#: src/gtkprefs.c:1104
+#: src/gtkprefs.c:1093
 msgid "Proxy Server"
 msgstr "Proxy Server"
 
-#: src/gtkprefs.c:1125
-msgid "_Host"
-msgstr "_Host"
-
-#: src/gtkprefs.c:1142 src/protocols/irc/irc.c:553
-#: src/protocols/jabber/jabber.c:1153 src/protocols/msn/msn.c:1656
-#: src/protocols/napster/napster.c:642 src/protocols/trepia/trepia.c:1345
-msgid "Port"
-msgstr "Port"
-
-#: src/gtkprefs.c:1160
-msgid "_User"
-msgstr "_User"
-
-#: src/gtkprefs.c:1177
-msgid "Pa_ssword"
-msgstr "Pa_ssword"
-
-#: src/gtkprefs.c:1214
+#: src/gtkprefs.c:1149
+msgid "_User:"
+msgstr "_User:"
+
+#: src/gtkprefs.c:1203
 msgid "Opera"
 msgstr "Opera"
 
-#: src/gtkprefs.c:1215
+#: src/gtkprefs.c:1204
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/gtkprefs.c:1216
+#: src/gtkprefs.c:1205
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: src/gtkprefs.c:1217
+#: src/gtkprefs.c:1206
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/gtkprefs.c:1218
+#: src/gtkprefs.c:1207
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/gtkprefs.c:1227
+#: src/gtkprefs.c:1208
+msgid "Firebird"
+msgstr "Firebird"
+
+#: src/gtkprefs.c:1217
 msgid "Manual"
 msgstr "Manual"
 
-#: src/gtkprefs.c:1268
+#: src/gtkprefs.c:1258
 msgid "Browser Selection"
 msgstr "Browser Selection"
 
-#: src/gtkprefs.c:1272
+#: src/gtkprefs.c:1262
 msgid "_Browser:"
 msgstr "_Browser:"
 
-#: src/gtkprefs.c:1282
+#: src/gtkprefs.c:1272
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -3591,63 +3658,63 @@
 "_Manual:\n"
 "(%s for URL)"
 
-#: src/gtkprefs.c:1303
+#: src/gtkprefs.c:1293
 msgid "Browser Options"
 msgstr "Browser Options"
 
-#: src/gtkprefs.c:1304
+#: src/gtkprefs.c:1294
 msgid "Open new _window by default"
 msgstr "Open new _window by default"
 
-#: src/gtkprefs.c:1320
+#: src/gtkprefs.c:1310
 msgid "Message Logs"
 msgstr "Message Logs"
 
-#: src/gtkprefs.c:1323
+#: src/gtkprefs.c:1313
 msgid "Log _Format:"
 msgstr "Log _Format:"
 
-#: src/gtkprefs.c:1327
+#: src/gtkprefs.c:1316
 msgid "_Log all instant messages"
 msgstr "_Log all instant messages"
 
-#: src/gtkprefs.c:1329
+#: src/gtkprefs.c:1318
 msgid "Log all c_hats"
 msgstr "Log all c_hats"
 
-#: src/gtkprefs.c:1384
+#: src/gtkprefs.c:1373
 msgid "Sound Options"
 msgstr "Sound Options"
 
+#: src/gtkprefs.c:1374
+msgid "_No sounds when you log in"
+msgstr "_No sounds when you log in"
+
+#: src/gtkprefs.c:1376
+msgid "_Sounds while away"
+msgstr "_Sounds while away"
+
+#: src/gtkprefs.c:1380
+msgid "Sound Method"
+msgstr "Sound Method"
+
+#: src/gtkprefs.c:1381
+msgid "_Method:"
+msgstr "_Method:"
+
+#: src/gtkprefs.c:1383
+msgid "Console beep"
+msgstr "Console beep"
+
 #: src/gtkprefs.c:1385
-msgid "_No sounds when you log in"
-msgstr "_No sounds when you log in"
-
-#: src/gtkprefs.c:1387
-msgid "_Sounds while away"
-msgstr "_Sounds while away"
-
-#: src/gtkprefs.c:1391
-msgid "Sound Method"
-msgstr "Sound Method"
+msgid "Automatic"
+msgstr "Automatic"
 
 #: src/gtkprefs.c:1392
-msgid "_Method:"
-msgstr "_Method:"
-
-#: src/gtkprefs.c:1394
-msgid "Console beep"
-msgstr "Console beep"
-
-#: src/gtkprefs.c:1396
-msgid "Automatic"
-msgstr "Automatic"
-
-#: src/gtkprefs.c:1403
 msgid "Command"
 msgstr "Command"
 
-#: src/gtkprefs.c:1413
+#: src/gtkprefs.c:1402
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -3656,67 +3723,67 @@
 "Sound c_ommand:\n"
 "(%s for filename)"
 
-#: src/gtkprefs.c:1468
+#: src/gtkprefs.c:1457
 msgid "_Sending messages removes away status"
 msgstr "_Sending messages removes away status"
 
-#: src/gtkprefs.c:1470
+#: src/gtkprefs.c:1459
 msgid "_Queue new messages when away"
 msgstr "_Queue new messages when away"
 
-#: src/gtkprefs.c:1473
+#: src/gtkprefs.c:1462
 msgid "Auto-response"
 msgstr "Auto-response"
 
-#: src/gtkprefs.c:1476
+#: src/gtkprefs.c:1465
 msgid "Seconds before _resending:"
 msgstr "Seconds before _resending:"
 
-#: src/gtkprefs.c:1479
+#: src/gtkprefs.c:1468
 msgid "_Send auto-response"
 msgstr "_Send auto-response"
 
-#: src/gtkprefs.c:1481
+#: src/gtkprefs.c:1470
 msgid "_Only send auto-response when idle"
 msgstr "_Only send auto-response when idle"
 
-#: src/gtkprefs.c:1483
+#: src/gtkprefs.c:1472
 msgid "Send auto-response in _active conversations"
 msgstr "Send auto-response in _active conversations"
 
-#: src/gtkprefs.c:1493
+#: src/gtkprefs.c:1482
 msgid "Idle _time reporting:"
 msgstr "Idle _time reporting:"
 
-#: src/gtkprefs.c:1496
+#: src/gtkprefs.c:1485
 msgid "Gaim usage"
 msgstr "Gaim usage"
 
-#: src/gtkprefs.c:1499
+#: src/gtkprefs.c:1488
 msgid "X usage"
 msgstr "X usage"
 
-#: src/gtkprefs.c:1501
+#: src/gtkprefs.c:1490
 msgid "Windows usage"
 msgstr "Windows usage"
 
-#: src/gtkprefs.c:1509
+#: src/gtkprefs.c:1498
 msgid "Auto-away"
 msgstr "Auto-away"
 
-#: src/gtkprefs.c:1510
+#: src/gtkprefs.c:1499
 msgid "Set away _when idle"
 msgstr "Set away _when idle"
 
-#: src/gtkprefs.c:1512
+#: src/gtkprefs.c:1502
 msgid "_Minutes before setting away:"
 msgstr "_Minutes before setting away:"
 
-#: src/gtkprefs.c:1519
+#: src/gtkprefs.c:1508
 msgid "Away m_essage:"
 msgstr "Away m_essage:"
 
-#: src/gtkprefs.c:1581
+#: src/gtkprefs.c:1570
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3731,7 +3798,7 @@
 "<span weight=\"bold\">Web site:</span>\t\t%s\n"
 "<span weight=\"bold\">File name:</span>\t%s"
 
-#: src/gtkprefs.c:1586
+#: src/gtkprefs.c:1575
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3746,177 +3813,172 @@
 "<span weight=\"bold\">URL:</span>  %s\n"
 "<span weight=\"bold\">File name:</span>  %s"
 
-#: src/gtkprefs.c:1767
+#: src/gtkprefs.c:1757
 msgid "Load"
 msgstr "Load"
 
-#: src/gtkprefs.c:1774 src/protocols/jabber/jabber.c:588
-#: src/protocols/msn/msn.c:1344 src/protocols/trepia/trepia.c:401
-msgid "Name"
-msgstr "Name"
-
-#: src/gtkprefs.c:1821
+#: src/gtkprefs.c:1811
 msgid "Details"
 msgstr "Details"
 
-#: src/gtkprefs.c:1948
+#: src/gtkprefs.c:1938
 msgid "Sound Selection"
 msgstr "Sound Selection"
 
-#: src/gtkprefs.c:2055
+#: src/gtkprefs.c:2045
 msgid "Play"
 msgstr "Play"
 
-#: src/gtkprefs.c:2062
+#: src/gtkprefs.c:2052
 msgid "Event"
 msgstr "Event"
 
-#: src/gtkprefs.c:2085
+#: src/gtkprefs.c:2075
 msgid "Reset"
 msgstr "Reset"
 
-#: src/gtkprefs.c:2089
+#: src/gtkprefs.c:2079
 msgid "Choose..."
 msgstr "Choose..."
 
-#: src/gtkprefs.c:2223
+#: src/gtkprefs.c:2214
 msgid "_Edit"
 msgstr "_Edit"
 
-#: src/gtkprefs.c:2259
+#: src/gtkprefs.c:2250
 msgid "Interface"
 msgstr "Interface"
 
-#: src/gtkprefs.c:2260
+#: src/gtkprefs.c:2251
 msgid "Smiley Themes"
 msgstr "Smiley Themes"
 
-#: src/gtkprefs.c:2261
+#: src/gtkprefs.c:2252
 msgid "Fonts"
 msgstr "Fonts"
 
-#: src/gtkprefs.c:2262
+#: src/gtkprefs.c:2253
 msgid "Message Text"
 msgstr "Message Text"
 
-#: src/gtkprefs.c:2263
+#: src/gtkprefs.c:2254
 msgid "Shortcuts"
 msgstr "Shortcuts"
 
-#: src/gtkprefs.c:2266
+#: src/gtkprefs.c:2257
 msgid "IMs"
 msgstr "IMs"
 
-#: src/gtkprefs.c:2268
+#: src/gtkprefs.c:2259
 msgid "Proxy"
 msgstr "Proxy"
 
 #. We use the registered default browser in windows
-#: src/gtkprefs.c:2271
+#: src/gtkprefs.c:2262
 msgid "Browser"
 msgstr "Browser"
 
-#: src/gtkprefs.c:2273
+#: src/gtkprefs.c:2264
 msgid "Logging"
 msgstr "Logging"
 
-#: src/gtkprefs.c:2274
+#: src/gtkprefs.c:2265
 msgid "Sounds"
 msgstr "Sounds"
 
-#: src/gtkprefs.c:2275
+#: src/gtkprefs.c:2266
 msgid "Sound Events"
 msgstr "Sound Events"
 
-#: src/gtkprefs.c:2276
+#: src/gtkprefs.c:2267
 msgid "Away / Idle"
 msgstr "Away / Idle"
 
-#: src/gtkprefs.c:2277
+#: src/gtkprefs.c:2268
 msgid "Away Messages"
 msgstr "Away Messages"
 
-#: src/gtkprefs.c:2280
+#: src/gtkprefs.c:2271
 msgid "Plugins"
 msgstr "Plugins"
 
-#: src/gtkprivacy.c:86
+#: src/gtkprivacy.c:87
 msgid "Allow all users to contact me"
 msgstr "Allow all users to contact me"
 
-#: src/gtkprivacy.c:87
+#: src/gtkprivacy.c:88
 msgid "Allow only the users on my buddy list"
 msgstr "Allow only the users on my buddy list"
 
-#: src/gtkprivacy.c:88
-msgid "Allow only the users below"
-msgstr "Allow only the users below"
-
 #: src/gtkprivacy.c:89
+msgid "Allow only the users below"
+msgstr "Allow only the users below"
+
+#: src/gtkprivacy.c:90
 msgid "Block all users"
 msgstr "Block all users"
 
-#: src/gtkprivacy.c:90
+#: src/gtkprivacy.c:91
 msgid "Block the users below"
 msgstr "Block the users below"
 
-#: src/gtkprivacy.c:368
+#: src/gtkprivacy.c:370
 msgid "Privacy"
 msgstr "Privacy"
 
-#: src/gtkprivacy.c:383
+#: src/gtkprivacy.c:385
 msgid "Changes to privacy settings take effect immediately."
 msgstr "Changes to privacy settings take effect immediately."
 
 #. "Set privacy for:" label
-#: src/gtkprivacy.c:395
+#: src/gtkprivacy.c:397
 msgid "Set privacy for:"
 msgstr "Set privacy for:"
 
-#: src/gtkprivacy.c:562 src/gtkprivacy.c:578
+#: src/gtkprivacy.c:564 src/gtkprivacy.c:580
 msgid "Permit User"
 msgstr "Permit User"
 
-#: src/gtkprivacy.c:563
+#: src/gtkprivacy.c:565
 msgid "Type a user you permit to contact you."
 msgstr "Type a user you permit to contact you."
 
-#: src/gtkprivacy.c:564
+#: src/gtkprivacy.c:566
 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:567 src/gtkprivacy.c:580
+#: src/gtkprivacy.c:569 src/gtkprivacy.c:582
 msgid "Permit"
 msgstr "Permit"
 
-#: src/gtkprivacy.c:572
+#: src/gtkprivacy.c:574
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "Allow %s to contact you?"
 
-#: src/gtkprivacy.c:574
+#: src/gtkprivacy.c:576
 #, 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:601 src/gtkprivacy.c:614
+#: src/gtkprivacy.c:603 src/gtkprivacy.c:616
 msgid "Block User"
 msgstr "Block User"
 
-#: src/gtkprivacy.c:602
+#: src/gtkprivacy.c:604
 msgid "Type a user to block."
 msgstr "Type a user to block."
 
-#: src/gtkprivacy.c:603
+#: src/gtkprivacy.c:605
 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:610
+#: src/gtkprivacy.c:612
 #, c-format
 msgid "Block %s?"
 msgstr "Block %s?"
 
-#: src/gtkprivacy.c:612
+#: src/gtkprivacy.c:614
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "Are you sure you want to block %s?"
@@ -3924,64 +3986,68 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:193 src/protocols/gg/gg.c:660 src/request.h:843
+#: src/gtkrequest.c:190 src/protocols/gg/gg.c:660 src/request.h:1011
 msgid "Yes"
 msgstr "Yes"
 
-#: src/gtkrequest.c:194 src/protocols/gg/gg.c:660 src/request.h:843
+#: src/gtkrequest.c:191 src/protocols/gg/gg.c:660 src/request.h:1011
 msgid "No"
 msgstr "No"
 
-#: src/gtkrequest.c:197
+#: src/gtkrequest.c:194
 msgid "Apply"
 msgstr "Apply"
 
-#: src/gtksound.c:61
+#: src/gtkrequest.c:195 src/protocols/msn/msn.c:247
+msgid "Close"
+msgstr "Close"
+
+#: src/gtksound.c:62
 msgid "Buddy logs in"
 msgstr "Buddy logs in"
 
-#: src/gtksound.c:62
+#: src/gtksound.c:63
 msgid "Buddy logs out"
 msgstr "Buddy logs out"
 
-#: src/gtksound.c:63
+#: src/gtksound.c:64
 msgid "Message received"
 msgstr "Message received"
 
-#: src/gtksound.c:64
+#: src/gtksound.c:65
 msgid "Message received begins conversation"
 msgstr "Message received begins conversation"
 
-#: src/gtksound.c:65
+#: src/gtksound.c:66
 msgid "Message sent"
 msgstr "Message sent"
 
-#: src/gtksound.c:66
+#: src/gtksound.c:67
 msgid "Person enters chat"
 msgstr "Person enters chat"
 
-#: src/gtksound.c:67
-msgid "Person leaves chat"
-msgstr "Person leaves chat"
-
 #: src/gtksound.c:68
+msgid "Person leaves chat"
+msgstr "Person leaves chat"
+
+#: src/gtksound.c:69
 msgid "You talk in chat"
 msgstr "You talk in chat"
 
-#: src/gtksound.c:69
+#: src/gtksound.c:70
 msgid "Others talk in chat"
 msgstr "Others talk in chat"
 
-#: src/gtksound.c:72
+#: src/gtksound.c:73
 msgid "Someone says your name in chat"
 msgstr "Someone says your name in chat"
 
-#: src/gtksound.c:156
+#: src/gtksound.c:157
 #, 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:172
+#: src/gtksound.c:173
 msgid ""
 "Unable to play sound because the 'Command' sound method has been chosen, but "
 "no command has been set."
@@ -3989,7 +4055,7 @@
 "Unable to play sound because the 'Command' sound method has been chosen, but "
 "no command has been set."
 
-#: src/gtksound.c:184
+#: src/gtksound.c:185
 #, c-format
 msgid ""
 "Unable to play sound because the configured sound command could not be "
@@ -3998,68 +4064,72 @@
 "Unable to play sound because the configured sound command could not be "
 "launched: %s"
 
-#: src/gtkutils.c:291
+#: src/gtkutils.c:296
 msgid "Can't save icon file to disk."
 msgstr "Can't save icon file to disk."
 
-#: src/gtkutils.c:326
-msgid "Gaim - Save Icon"
-msgstr "Gaim - Save Icon"
-
-#: src/log.c:82
+#: src/gtkutils.c:331
+msgid "Save Icon"
+msgstr "Save Icon"
+
+#: src/log.c:88
 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:409
+#: src/log.c:425
 msgid "XML"
 msgstr "XML"
 
-#: src/log.c:488
-#, c-format
-msgid "<font color=\"#16569E\">(%s) <b>%s <AUTO-REPLY>:</b></font> %s<br/>\n"
-msgstr "<font color=\"#16569E\">(%s) <b>%s <AUTO-REPLY>:</b></font> %s<br/>\n"
-
-#: src/log.c:490
-#, c-format
-msgid "<font color=\"#A82F2F\">(%s) <b>%s <AUTO-REPLY>:</b></font> %s<br/>\n"
-msgstr "<font color=\"#A82F2F\">(%s) <b>%s <AUTO-REPLY>:</b></font> %s<br/>\n"
-
-#: src/log.c:531 src/log.c:663
-msgid "<font color=\"red\"><b>log->logger_data was NULL!</b></font>"
-msgstr "<font color=\"red\"><b>log->logger_data was NULL!</b></font>"
-
-#: src/log.c:541 src/log.c:673
+#: src/log.c:506
+#, c-format
+msgid ""
+"<font color=\"#16569E\">(%s) <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
+msgstr ""
+"<font color=\"#16569E\">(%s) <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
+
+#: src/log.c:508
+#, c-format
+msgid ""
+"<font color=\"#A82F2F\">(%s) <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
+msgstr ""
+"<font color=\"#A82F2F\">(%s) <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
+
+#: src/log.c:552 src/log.c:688
+msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
+msgstr "<font color=\"red\"><b>Unable to find log path!</b></font>"
+
+#: src/log.c:562 src/log.c:698
 #, 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:545
+#: src/log.c:566
 msgid "HTML"
 msgstr "HTML"
 
-#: src/log.c:623
+#: src/log.c:641
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
-#: src/log.c:677
+#: src/log.c:702
 msgid "Plain text"
 msgstr "Plain text"
 
-#: src/main.c:148
+#: src/main.c:151
 msgid "Please enter your login."
 msgstr "Please enter your login."
 
-#: src/main.c:231
+#: src/main.c:234
 msgid "<New User>"
 msgstr "<New User>"
 
-#: src/main.c:273
+#: src/main.c:276
 msgid "Login"
 msgstr "Login"
 
 #. full help text
-#: src/main.c:551
+#: src/main.c:555
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -4093,12 +4163,12 @@
 "  -h, --help          display this help and exit\n"
 
 #. short message
-#: src/main.c:566
+#: src/main.c:570
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr "Gaim %s. Try `%s -h' for more information.\n"
 
-#: src/plugin.c:260
+#: src/plugin.c:269
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
@@ -4107,24 +4177,24 @@
 "The required plugin %s was not found. Please install this plugin and try "
 "again."
 
-#: src/plugin.c:265 src/plugin.c:293
+#: src/plugin.c:274 src/plugin.c:302
 msgid "Gaim was unable to load your plugin."
 msgstr "Gaim was unable to load your plugin."
 
-#: src/plugin.c:289
+#: src/plugin.c:298
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "The required plugin %s was unable to load."
 
-#: src/prefs.c:111 src/status.c:270
+#: src/prefs.c:113 src/status.c:271
 msgid "Slightly less boring default"
 msgstr "Slightly less boring default"
 
-#: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:110
+#: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:111
 #: src/protocols/msn/msn.c:344 src/protocols/msn/state.c:27
 #: src/protocols/msn/state.c:28 src/protocols/msn/state.c:35
-#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2304
-#: src/protocols/yahoo/yahoo.c:2405
+#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2492
+#: src/protocols/yahoo/yahoo.c:2601
 msgid "Available"
 msgstr "Available"
 
@@ -4136,11 +4206,11 @@
 msgid "Away for friends only"
 msgstr "Away for friends only"
 
-#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:932
-#: src/protocols/jabber/presence.c:91 src/protocols/oscar/oscar.c:2848
-#: src/protocols/oscar/oscar.c:4579 src/protocols/oscar/oscar.c:4606
-#: src/protocols/oscar/oscar.c:6143 src/protocols/yahoo/yahoo.c:2026
-#: src/protocols/yahoo/yahoo.c:2324 src/protocols/yahoo/yahoo.c:2415
+#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:964
+#: src/protocols/jabber/presence.c:91 src/protocols/oscar/oscar.c:2847
+#: src/protocols/oscar/oscar.c:4592 src/protocols/oscar/oscar.c:4619
+#: src/protocols/oscar/oscar.c:6169 src/protocols/yahoo/yahoo.c:2187
+#: src/protocols/yahoo/yahoo.c:2512 src/protocols/yahoo/yahoo.c:2611
 msgid "Invisible"
 msgstr "Invisible"
 
@@ -4160,7 +4230,9 @@
 msgid "Unable to connect to server."
 msgstr "Unable to connect to server."
 
-#: src/protocols/gg/gg.c:142
+#: src/protocols/gg/gg.c:142 src/protocols/jabber/auth.c:65
+#: src/protocols/jabber/auth.c:168 src/protocols/jabber/auth.c:335
+#: src/protocols/jabber/auth.c:433 src/protocols/jabber/auth.c:445
 msgid "Invalid response from server."
 msgstr "Invalid response from server."
 
@@ -4195,7 +4267,12 @@
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
 #: src/protocols/gg/gg.c:399 src/protocols/icq/gaim_icq.c:344
-#: src/protocols/toc/toc.c:200
+#: src/protocols/msn/dispatch.c:208 src/protocols/msn/msn.c:492
+#: src/protocols/msn/notification.c:2165 src/protocols/napster/napster.c:463
+#: src/protocols/napster/napster.c:494 src/protocols/toc/toc.c:200
+#: src/protocols/yahoo/yahoo.c:1856 src/protocols/yahoo/yahoo.c:1887
+#: src/protocols/yahoo/yahoo.c:1950 src/protocols/yahoo/yahoo_filexfer.c:68
+#: src/protocols/yahoo/yahoo_filexfer.c:139
 msgid "Unable to connect."
 msgstr "Unable to connect."
 
@@ -4257,28 +4334,30 @@
 msgid "Active"
 msgstr "Active"
 
-#: src/protocols/gg/gg.c:664 src/protocols/oscar/oscar.c:3957
+#: src/protocols/gg/gg.c:664 src/protocols/oscar/oscar.c:3970
 msgid "UIN"
 msgstr "UIN"
 
-#: src/protocols/gg/gg.c:668
-msgid "First name"
-msgstr "First name"
+#. First Name
+#: src/protocols/gg/gg.c:668 src/protocols/jabber/jabber.c:634
+#: src/protocols/oscar/oscar.c:3975 src/protocols/trepia/trepia.c:267
+msgid "First Name"
+msgstr "First Name"
 
 #. Last Name
-#: src/protocols/gg/gg.c:673 src/protocols/jabber/jabber.c:608
-#: src/protocols/oscar/oscar.c:3965 src/protocols/trepia/trepia.c:274
+#: src/protocols/gg/gg.c:673 src/protocols/jabber/jabber.c:639
+#: src/protocols/oscar/oscar.c:3978 src/protocols/trepia/trepia.c:274
 msgid "Last Name"
 msgstr "Last Name"
 
-#: src/protocols/gg/gg.c:677 src/protocols/gg/gg.c:1389
-#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:3959
+#: src/protocols/gg/gg.c:677 src/protocols/gg/gg.c:1388
+#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:3972
 msgid "Nick"
 msgstr "Nick"
 
 #: src/protocols/gg/gg.c:684 src/protocols/gg/gg.c:687
-msgid "Birth year"
-msgstr "Birth year"
+msgid "Birth Year"
+msgstr "Birth Year"
 
 #: src/protocols/gg/gg.c:693 src/protocols/gg/gg.c:695
 #: src/protocols/gg/gg.c:697
@@ -4286,19 +4365,19 @@
 msgstr "Sex"
 
 #. City
-#: src/protocols/gg/gg.c:701 src/protocols/jabber/jabber.c:618
-#: src/protocols/oscar/oscar.c:4011 src/protocols/oscar/oscar.c:4027
+#: src/protocols/gg/gg.c:701 src/protocols/jabber/jabber.c:649
+#: src/protocols/oscar/oscar.c:4024 src/protocols/oscar/oscar.c:4040
 #: src/protocols/trepia/trepia.c:331 src/protocols/trepia/trepia.c:430
 msgid "City"
 msgstr "City"
 
 #. res[0] == username
-#: src/protocols/gg/gg.c:722 src/protocols/msn/msn.c:1282
-#: src/protocols/msn/msn.c:1524 src/protocols/napster/napster.c:387
-#: src/protocols/oscar/oscar.c:2890 src/protocols/oscar/oscar.c:3200
-#: src/protocols/toc/toc.c:498 src/protocols/yahoo/yahoo.c:2581
-#: src/protocols/yahoo/yahoo.c:2603 src/protocols/yahoo/yahoo.c:2626
-#: src/protocols/yahoo/yahoo.c:2813 src/protocols/zephyr/zephyr.c:355
+#: src/protocols/gg/gg.c:722 src/protocols/msn/msn.c:1286
+#: src/protocols/msn/msn.c:1530 src/protocols/napster/napster.c:387
+#: src/protocols/oscar/oscar.c:2889 src/protocols/oscar/oscar.c:3211
+#: src/protocols/toc/toc.c:498 src/protocols/yahoo/yahoo.c:2788
+#: src/protocols/yahoo/yahoo.c:2810 src/protocols/yahoo/yahoo.c:2833
+#: src/protocols/yahoo/yahoo.c:2991 src/protocols/zephyr/zephyr.c:355
 msgid "Buddy Information"
 msgstr "Buddy Information"
 
@@ -4400,8 +4479,8 @@
 msgid "Directory Search"
 msgstr "Directory Search"
 
-#: src/protocols/gg/gg.c:1204 src/protocols/jabber/jabber.c:1044
-#: src/protocols/oscar/oscar.c:6498 src/protocols/toc/toc.c:1546
+#: src/protocols/gg/gg.c:1204 src/protocols/jabber/jabber.c:1076
+#: src/protocols/toc/toc.c:1546
 msgid "Change Password"
 msgstr "Change Password"
 
@@ -4439,7 +4518,7 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/gg/gg.c:1370 src/protocols/gg/gg.c:1372
+#: src/protocols/gg/gg.c:1369 src/protocols/gg/gg.c:1371
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu Protocol Plugin"
 
@@ -4452,17 +4531,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:184
-#: src/protocols/msn/notification.c:949 src/protocols/msn/notification.c:1270
-#: src/protocols/msn/notification.c:1435 src/protocols/oscar/oscar.c:2620
-#: src/protocols/oscar/oscar.c:5137
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:190
+#: src/protocols/msn/notification.c:957 src/protocols/msn/notification.c:1284
+#: src/protocols/msn/notification.c:1451 src/protocols/oscar/oscar.c:2619
+#: src/protocols/oscar/oscar.c:5160
 msgid "Authorize"
 msgstr "Authorise"
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:185
-#: src/protocols/msn/notification.c:950 src/protocols/msn/notification.c:1272
-#: src/protocols/msn/notification.c:1437 src/protocols/oscar/oscar.c:2622
-#: src/protocols/oscar/oscar.c:5138
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:191
+#: src/protocols/msn/notification.c:958 src/protocols/msn/notification.c:1286
+#: src/protocols/msn/notification.c:1453 src/protocols/oscar/oscar.c:2621
+#: src/protocols/oscar/oscar.c:5161
 msgid "Deny"
 msgstr "Deny"
 
@@ -4505,53 +4584,61 @@
 "<B>Supported IRC Commands:</B><BR>AWAY JOIN ME MODE<BR>MSG NICK OPERWALL "
 "PING<BR>QUERY QUIT QUOTE UMODE<BR>WALLOPS WHOIS"
 
-#: src/protocols/irc/cmds.c:459
+#: src/protocols/irc/cmds.c:459 src/protocols/jabber/chat.c:542
 #, c-format
 msgid "current topic is: %s"
 msgstr "current topic is: %s"
 
-#: src/protocols/irc/cmds.c:461
+#: src/protocols/irc/cmds.c:461 src/protocols/jabber/chat.c:544
 msgid "No topic is set"
 msgstr "No topic is set"
 
-#: src/protocols/irc/irc.c:64
+#: src/protocols/irc/irc.c:72
 msgid "Error displaying MOTD"
 msgstr "Error displaying MOTD"
 
-#: src/protocols/irc/irc.c:64
+#: src/protocols/irc/irc.c:72
 msgid "No MOTD available"
 msgstr "No MOTD available"
 
-#: src/protocols/irc/irc.c:65
+#: src/protocols/irc/irc.c:73
 msgid "There is no MOTD associated with this connection."
 msgstr "There is no MOTD associated with this connection."
 
-#: src/protocols/irc/irc.c:68
+#: src/protocols/irc/irc.c:76
 #, c-format
 msgid "MOTD for %s"
 msgstr "MOTD for %s"
 
-#: src/protocols/irc/irc.c:137
+#: src/protocols/irc/irc.c:139
 msgid "View MOTD"
 msgstr "View MOTD"
 
-#: src/protocols/irc/irc.c:156
-msgid "Channel:"
-msgstr "Channel:"
-
-#: src/protocols/irc/irc.c:180
+#: src/protocols/irc/irc.c:158
+msgid "_Channel:"
+msgstr "_Channel:"
+
+#: src/protocols/irc/irc.c:163 src/protocols/jabber/chat.c:57
+msgid "_Password:"
+msgstr "_Password:"
+
+#: src/protocols/irc/irc.c:182
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC nicks may not contain whitespace"
 
-#: src/protocols/irc/irc.c:199 src/protocols/toc/toc.c:228
+#: src/protocols/irc/irc.c:201 src/protocols/toc/toc.c:228
 #, c-format
 msgid "Signon: %s"
 msgstr "Signon: %s"
 
-#: src/protocols/irc/irc.c:208
+#: src/protocols/irc/irc.c:210
 msgid "Couldn't create socket"
 msgstr "Couldn't create socket"
 
+#: src/protocols/irc/irc.c:359 src/protocols/trepia/trepia.c:972
+msgid "Read error"
+msgstr "Read error"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -4561,26 +4648,32 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:532
+#: src/protocols/irc/irc.c:533
 msgid "IRC Protocol Plugin"
 msgstr "IRC Protocol Plugin"
 
 #. *  summary
-#: src/protocols/irc/irc.c:533
+#: src/protocols/irc/irc.c:534
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "The IRC Protocol Plugin that Sucks Less"
 
-#: src/protocols/irc/irc.c:550 src/protocols/irc/msgs.c:197
-#: src/protocols/jabber/jabber.c:1143 src/protocols/napster/napster.c:637
+#: src/protocols/irc/irc.c:551 src/protocols/irc/msgs.c:197
+#: src/protocols/jabber/jabber.c:1209 src/protocols/napster/napster.c:636
 msgid "Server"
 msgstr "Server"
 
-#: src/protocols/irc/irc.c:556
+#: src/protocols/irc/irc.c:554 src/protocols/jabber/jabber.c:1230
+#: src/protocols/msn/msn.c:1661 src/protocols/napster/napster.c:641
+#: src/protocols/trepia/trepia.c:1344
+msgid "Port"
+msgstr "Port"
+
+#: src/protocols/irc/irc.c:557
 msgid "Encoding"
 msgstr "Encoding"
 
-#: src/protocols/irc/irc.c:559 src/protocols/irc/msgs.c:191
-#: src/protocols/jabber/jabber.c:578
+#: src/protocols/irc/irc.c:560 src/protocols/irc/msgs.c:191
+#: src/protocols/jabber/jabber.c:609
 msgid "Username"
 msgstr "Username"
 
@@ -4605,7 +4698,7 @@
 msgid " <i>(identified)</i>"
 msgstr " <i>(identified)</i>"
 
-#: src/protocols/irc/msgs.c:192 src/protocols/yahoo/yahoo.c:2684
+#: src/protocols/irc/msgs.c:192 src/protocols/yahoo/yahoo.c:2891
 msgid "Realname"
 msgstr "Realname"
 
@@ -4654,84 +4747,88 @@
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr "Gaim has sent a message the IRC server did not understand."
 
+#: src/protocols/irc/msgs.c:370
+msgid "No such channel"
+msgstr "No such channel"
+
 #. does this happen?
-#: src/protocols/irc/msgs.c:371
+#: src/protocols/irc/msgs.c:381
 msgid "no such channel"
 msgstr "no such channel"
 
-#: src/protocols/irc/msgs.c:374
+#: src/protocols/irc/msgs.c:384
 msgid "User is not logged in"
 msgstr "User is not logged in"
 
-#: src/protocols/irc/msgs.c:379
+#: src/protocols/irc/msgs.c:389
 msgid "No such nick or channel"
 msgstr "No such nick or channel"
 
-#: src/protocols/irc/msgs.c:399
+#: src/protocols/irc/msgs.c:409
 msgid "Could not send"
 msgstr "Could not send"
 
-#: src/protocols/irc/msgs.c:455
+#: src/protocols/irc/msgs.c:465
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Joining %s requires an invitation."
 
-#: src/protocols/irc/msgs.c:456
+#: src/protocols/irc/msgs.c:466
 msgid "Invitation only"
 msgstr "Invitation only"
 
-#: src/protocols/irc/msgs.c:552
+#: src/protocols/irc/msgs.c:562
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "You have been kicked by %s: (%s)"
 
-#: src/protocols/irc/msgs.c:560
+#: src/protocols/irc/msgs.c:570
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Kicked by %s (%s)"
 
-#: src/protocols/irc/msgs.c:581
+#: src/protocols/irc/msgs.c:591
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "mode (%s %s) by %s"
 
-#: src/protocols/irc/msgs.c:660
+#: src/protocols/irc/msgs.c:670
 msgid "Could not change nick"
 msgstr "Could not change nick"
 
-#: src/protocols/irc/msgs.c:661
+#: src/protocols/irc/msgs.c:671
 msgid "Cannot change nick"
 msgstr "Cannot change nick"
 
-#: src/protocols/irc/msgs.c:682
+#: src/protocols/irc/msgs.c:692
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "You have parted the channel%s%s"
 
-#: src/protocols/irc/msgs.c:720
+#: src/protocols/irc/msgs.c:730
 msgid "Error: invalid PONG from server"
 msgstr "Error: invalid PONG from server"
 
-#: src/protocols/irc/msgs.c:722
+#: src/protocols/irc/msgs.c:732
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING reply -- Lag: %lu seconds"
 
-#: src/protocols/irc/msgs.c:792
+#: src/protocols/irc/msgs.c:802
 #, c-format
 msgid "Cannot join %s:"
 msgstr "Cannot join %s:"
 
-#: src/protocols/irc/msgs.c:793
+#: src/protocols/irc/msgs.c:803
 msgid "Cannot join channel"
 msgstr "Cannot join channel"
 
-#: src/protocols/irc/msgs.c:823
+#: src/protocols/irc/msgs.c:833
 #, c-format
 msgid "Wallops from %s"
 msgstr "Wallops from %s"
 
-#: src/protocols/irc/parse.c:160
+#: src/protocols/irc/parse.c:161
 msgid ""
 "(There was an error converting this message.  Check the 'Encoding' option in "
 "the Account Editor)"
@@ -4739,150 +4836,159 @@
 "(There was an error converting this message.  Check the 'Encoding' option in "
 "the Account Editor)"
 
-#: src/protocols/irc/parse.c:291
+#: src/protocols/irc/parse.c:292
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Reply time from %s: %lu seconds"
 
-#: src/protocols/irc/parse.c:292
+#: src/protocols/irc/parse.c:293
 msgid "PONG"
 msgstr "PONG"
 
-#: src/protocols/irc/parse.c:292
+#: src/protocols/irc/parse.c:293
 msgid "CTCP PING reply"
 msgstr "CTCP PING reply"
 
-#: src/protocols/irc/parse.c:391
-msgid "Disconnected"
-msgstr "Disconnected"
-
-#: src/protocols/jabber/auth.c:51
+#: src/protocols/irc/parse.c:392 src/protocols/oscar/oscar.c:535
+#: src/protocols/toc/toc.c:218 src/protocols/toc/toc.c:625
+#: src/protocols/toc/toc.c:641 src/protocols/toc/toc.c:709
+msgid "Disconnected."
+msgstr "Disconnected."
+
+#: src/protocols/jabber/auth.c:52
 msgid "Server requires SSL for login"
 msgstr "Server requires SSL for login"
 
-#: src/protocols/jabber/auth.c:59 src/protocols/jabber/auth.c:281
-#: src/protocols/jabber/auth.c:380 src/protocols/jabber/auth.c:392
-msgid "Invalid response from server"
-msgstr "Invalid response from server"
-
-#: src/protocols/jabber/auth.c:86 src/protocols/jabber/auth.c:143
+#: src/protocols/jabber/auth.c:94 src/protocols/jabber/auth.c:194
+msgid "Server requires plaintext authentication over an unencrypted stream"
+msgstr "Server requires plaintext authentication over an unencrypted stream"
+
+#: src/protocols/jabber/auth.c:116 src/protocols/jabber/auth.c:199
 msgid "Server does not use any supported authentication method"
 msgstr "Server does not use any supported authentication method"
 
-#: src/protocols/jabber/auth.c:301
+#: src/protocols/jabber/auth.c:180 src/protocols/jabber/jabber.c:463
+msgid "Unknown Error"
+msgstr "Unknown Error"
+
+#: src/protocols/jabber/auth.c:356
 msgid "Invalid challenge from server"
 msgstr "Invalid challenge from server"
 
-#: src/protocols/jabber/auth.c:395
+#: src/protocols/jabber/auth.c:448
 msgid "Bad Protocol"
 msgstr "Bad Protocol"
 
-#: src/protocols/jabber/auth.c:398
+#: src/protocols/jabber/auth.c:451
 msgid "Encryption Required"
 msgstr "Encryption Required"
 
-#: src/protocols/jabber/auth.c:401
+#: src/protocols/jabber/auth.c:454
 msgid "Invalid authzid"
 msgstr "Invalid authzid"
 
-#: src/protocols/jabber/auth.c:404
+#: src/protocols/jabber/auth.c:457
 msgid "Invalid Mechanism"
 msgstr "Invalid Mechanism"
 
-#: src/protocols/jabber/auth.c:406
+#: src/protocols/jabber/auth.c:459
 msgid "Invalid Realm"
 msgstr "Invalid Realm"
 
-#: src/protocols/jabber/auth.c:409
+#: src/protocols/jabber/auth.c:462
 msgid "Mechanism Too Weak"
 msgstr "Mechanism Too Weak"
 
-#: src/protocols/jabber/auth.c:412 src/protocols/jabber/jabber.c:158
-#: src/protocols/jabber/jabber.c:867 src/protocols/jabber/jabber.c:917
-#: src/protocols/oscar/oscar.c:5545
+#: src/protocols/jabber/auth.c:465 src/protocols/jabber/jabber.c:148
+#: src/protocols/jabber/jabber.c:899 src/protocols/jabber/jabber.c:949
+#: src/protocols/oscar/oscar.c:5571
 msgid "Not Authorized"
 msgstr "Not Authorised"
 
-#: src/protocols/jabber/auth.c:415
+#: src/protocols/jabber/auth.c:468
 msgid "Temporary Authentication Failure"
 msgstr "Temporary Authentication Failure"
 
-#: src/protocols/jabber/auth.c:417
+#: src/protocols/jabber/auth.c:470
 msgid "Authentication Failure"
 msgstr "Authentication Failure"
 
-#: src/protocols/jabber/buddy.c:245 src/protocols/jabber/buddy.c:597
+#: src/protocols/jabber/buddy.c:245 src/protocols/jabber/buddy.c:603
 msgid "Full Name"
 msgstr "Full Name"
 
-#: src/protocols/jabber/buddy.c:246 src/protocols/jabber/buddy.c:610
+#: src/protocols/jabber/buddy.c:246 src/protocols/jabber/buddy.c:616
 msgid "Family Name"
 msgstr "Family Name"
 
-#: src/protocols/jabber/buddy.c:247 src/protocols/jabber/buddy.c:614
+#: src/protocols/jabber/buddy.c:247 src/protocols/jabber/buddy.c:620
 msgid "Given Name"
 msgstr "Given Name"
 
-#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:625
-#: src/protocols/jabber/jabber.c:598 src/protocols/yahoo/yahoo.c:2678
+#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:635
+#: src/protocols/jabber/jabber.c:629 src/protocols/yahoo/yahoo.c:2887
 msgid "Nickname"
 msgstr "Nickname"
 
-#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:653
+#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/jabber.c:669
+msgid "URL"
+msgstr "URL"
+
+#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:663
 msgid "Street Address"
 msgstr "Street Address"
 
-#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/buddy.c:649
+#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/buddy.c:659
 msgid "Extended Address"
 msgstr "Extended Address"
 
-#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:657
+#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:667
 msgid "Locality"
 msgstr "Locality"
 
-#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:661
+#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:671
 msgid "Region"
 msgstr "Region"
 
-#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:665
-#: src/protocols/jabber/jabber.c:628
+#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:675
+#: src/protocols/jabber/jabber.c:659
 msgid "Postal Code"
 msgstr "Postal Code"
 
 #. Country
-#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:670
+#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:680
 #: src/protocols/trepia/trepia.c:339 src/protocols/trepia/trepia.c:448
 msgid "Country"
 msgstr "Country"
 
-#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:681
-#: src/protocols/jabber/buddy.c:688
+#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:691
+#: src/protocols/jabber/buddy.c:698
 msgid "Telephone"
 msgstr "Telephone"
 
-#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:699
-#: src/protocols/jabber/buddy.c:707 src/protocols/yahoo/yahoo.c:2672
+#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:709
+#: src/protocols/jabber/buddy.c:717 src/protocols/yahoo/yahoo.c:2883
 msgid "Email"
 msgstr "Email"
 
-#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:722
+#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:732
 msgid "Organization Name"
-msgstr "Organization Name"
-
-#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:726
+msgstr "Organisation Name"
+
+#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:736
 msgid "Organization Unit"
-msgstr "Organization Unit"
-
-#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:732
+msgstr "Organisation Unit"
+
+#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:742
 msgid "Title"
 msgstr "Title"
 
-#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:735
+#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:745
 msgid "Role"
 msgstr "Role"
 
-#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:628
-#: src/protocols/oscar/oscar.c:3991
+#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:638
+#: src/protocols/oscar/oscar.c:4004
 msgid "Birthday"
 msgstr "Birthday"
 
@@ -4898,371 +5004,404 @@
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
 
-#: src/protocols/jabber/buddy.c:546
+#: src/protocols/jabber/buddy.c:551
 msgid "Jabber ID"
 msgstr "Jabber ID"
 
-#: src/protocols/jabber/buddy.c:556 src/protocols/jabber/buddy.c:563
-#: src/protocols/jabber/buddy.c:574 src/protocols/jabber/jabber.c:904
-#: src/protocols/jabber/jabber.c:917
+#: src/protocols/jabber/buddy.c:561 src/protocols/jabber/buddy.c:568
+#: src/protocols/jabber/buddy.c:579 src/protocols/jabber/jabber.c:936
+#: src/protocols/jabber/jabber.c:949
 msgid "Status"
 msgstr "Status"
 
-#: src/protocols/jabber/buddy.c:572 src/protocols/jabber/jabber.c:1146
+#: src/protocols/jabber/buddy.c:577 src/protocols/jabber/jabber.c:1212
 msgid "Resource"
 msgstr "Resource"
 
-#: src/protocols/jabber/buddy.c:618
+#: src/protocols/jabber/buddy.c:624
 msgid "Middle Name"
 msgstr "Middle Name"
 
-#: src/protocols/jabber/buddy.c:633 src/protocols/jabber/jabber.c:613
-#: src/protocols/oscar/oscar.c:4008 src/protocols/oscar/oscar.c:4024
+#: src/protocols/jabber/buddy.c:643 src/protocols/jabber/jabber.c:644
+#: src/protocols/oscar/oscar.c:4021 src/protocols/oscar/oscar.c:4037
 msgid "Address"
 msgstr "Address"
 
-#: src/protocols/jabber/buddy.c:645
+#: src/protocols/jabber/buddy.c:655
 msgid "P.O. Box"
 msgstr "P.O. Box"
 
-#: src/protocols/jabber/buddy.c:751
+#: src/protocols/jabber/buddy.c:761
 msgid "Photo"
 msgstr "Photo"
 
-#: src/protocols/jabber/buddy.c:751
+#: src/protocols/jabber/buddy.c:761
 msgid "Logo"
 msgstr "Logo"
 
-#: src/protocols/jabber/buddy.c:765
+#: src/protocols/jabber/buddy.c:775
 msgid "Jabber Profile"
 msgstr "Jabber Profile"
 
-#: src/protocols/jabber/buddy.c:904
+#: src/protocols/jabber/buddy.c:915
 msgid "Un-hide From"
 msgstr "Un-hide From"
 
-#: src/protocols/jabber/buddy.c:907
+#: src/protocols/jabber/buddy.c:918
 msgid "Temporarily Hide From"
 msgstr "Temporarily Hide From"
 
-#: src/protocols/jabber/buddy.c:915
+#: src/protocols/jabber/buddy.c:926
 msgid "Cancel Presence Notification"
 msgstr "Cancel Presence Notification"
 
-#: src/protocols/jabber/buddy.c:923
+#: src/protocols/jabber/buddy.c:934
 msgid "(Re-)Request authorization"
-msgstr "(Re-)Request authorization"
-
-#: src/protocols/jabber/buddy.c:929
+msgstr "(Re-)Request authorisation"
+
+#: src/protocols/jabber/buddy.c:940
 msgid "Unsubscribe"
 msgstr "Unsubscribe"
 
-#: src/protocols/jabber/chat.c:37 src/protocols/yahoo/yahoochat.c:870
-msgid "Room:"
-msgstr "Room:"
-
-#: src/protocols/jabber/chat.c:44
-msgid "Server:"
-msgstr "Server:"
-
-#: src/protocols/jabber/chat.c:50
-msgid "Handle:"
-msgstr "Handle:"
-
-#: src/protocols/jabber/chat.c:158
+#: src/protocols/jabber/chat.c:40 src/protocols/yahoo/yahoochat.c:942
+msgid "_Room:"
+msgstr "_Room:"
+
+#: src/protocols/jabber/chat.c:45
+msgid "_Server:"
+msgstr "_Server:"
+
+#: src/protocols/jabber/chat.c:51
+msgid "_Handle:"
+msgstr "_Handle:"
+
+#: src/protocols/jabber/chat.c:159
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s is not a valid room name"
 
-#: src/protocols/jabber/chat.c:159
+#: src/protocols/jabber/chat.c:160
 msgid "Invalid Room Name"
 msgstr "Invalid Room Name"
 
-#: src/protocols/jabber/chat.c:164
+#: src/protocols/jabber/chat.c:165
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s is not a valid server name"
 
-#: src/protocols/jabber/chat.c:165 src/protocols/jabber/chat.c:166
+#: src/protocols/jabber/chat.c:166 src/protocols/jabber/chat.c:167
 msgid "Invalid Server Name"
 msgstr "Invalid Server Name"
 
-#: src/protocols/jabber/chat.c:170
+#: src/protocols/jabber/chat.c:171
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s is not a valid room handle"
 
-#: src/protocols/jabber/chat.c:171 src/protocols/jabber/chat.c:172
+#: src/protocols/jabber/chat.c:172 src/protocols/jabber/chat.c:173
 msgid "Invalid Room Handle"
 msgstr "Invalid Room Handle"
 
-#: src/protocols/jabber/jabber.c:82
+#: src/protocols/jabber/chat.c:334 src/protocols/jabber/chat.c:487
+#: src/protocols/jabber/message.c:280
+#, c-format
+msgid " (Code %s)"
+msgstr " (Code %s)"
+
+#: src/protocols/jabber/chat.c:337
+msgid "Configuration error"
+msgstr "Configuration error"
+
+#: src/protocols/jabber/chat.c:348 src/protocols/jabber/chat.c:501
+msgid "Unable to configure"
+msgstr "Unable to configure"
+
+#: src/protocols/jabber/chat.c:362
+msgid "Room Configuration Error"
+msgstr "Room Configuration Error"
+
+#: src/protocols/jabber/chat.c:363
+msgid "This room is not capable of being configured"
+msgstr "This room is not capable of being configured"
+
+#: src/protocols/jabber/chat.c:490
+msgid "Registration error"
+msgstr "Registration error"
+
+#: src/protocols/jabber/chat.c:571
+msgid "Nick changing not supported in non-MUC chatrooms"
+msgstr "Nick changing not supported in non-MUC chatrooms"
+
+#: src/protocols/jabber/jabber.c:72
 msgid "Error initializing session"
 msgstr "Error initializing session"
 
-#: src/protocols/jabber/jabber.c:133
+#: src/protocols/jabber/jabber.c:123
 msgid "Bad Format"
 msgstr "Bad Format"
 
-#: src/protocols/jabber/jabber.c:135
+#: src/protocols/jabber/jabber.c:125
 msgid "Bad Namespace Prefix"
 msgstr "Bad Namespace Prefix"
 
-#: src/protocols/jabber/jabber.c:138
+#: src/protocols/jabber/jabber.c:128
 msgid "Resource Conflict"
 msgstr "Resource Conflict"
 
-#: src/protocols/jabber/jabber.c:140
+#: src/protocols/jabber/jabber.c:130
 msgid "Connection Timeout"
 msgstr "Connection Timeout"
 
-#: src/protocols/jabber/jabber.c:142
+#: src/protocols/jabber/jabber.c:132
 msgid "Host Gone"
 msgstr "Host Gone"
 
-#: src/protocols/jabber/jabber.c:144
+#: src/protocols/jabber/jabber.c:134
 msgid "Host Unknown"
 msgstr "Host Unknown"
 
+#: src/protocols/jabber/jabber.c:136
+msgid "Improper Addressing"
+msgstr "Improper Addressing"
+
+#: src/protocols/jabber/jabber.c:138
+msgid "Internal Server Error"
+msgstr "Internal Server Error"
+
+#: src/protocols/jabber/jabber.c:140
+msgid "Invalid ID"
+msgstr "Invalid ID"
+
+#: src/protocols/jabber/jabber.c:142
+msgid "Invalid Namespace"
+msgstr "Invalid Namespace"
+
+#: src/protocols/jabber/jabber.c:144
+msgid "Invalid XML"
+msgstr "Invalid XML"
+
 #: src/protocols/jabber/jabber.c:146
-msgid "Improper Addressing"
-msgstr "Improper Addressing"
-
-#: src/protocols/jabber/jabber.c:148
-msgid "Internal Server Error"
-msgstr "Internal Server Error"
+msgid "Non-matching Hosts"
+msgstr "Non-matching Hosts"
 
 #: src/protocols/jabber/jabber.c:150
-msgid "Invalid ID"
-msgstr "Invalid ID"
+msgid "Policy Violation"
+msgstr "Policy Violation"
 
 #: src/protocols/jabber/jabber.c:152
-msgid "Invalid Namespace"
-msgstr "Invalid Namespace"
+msgid "Remote Connection Failed"
+msgstr "Remote Connection Failed"
 
 #: src/protocols/jabber/jabber.c:154
-msgid "Invalid XML"
-msgstr "Invalid XML"
+msgid "Resource Constraint"
+msgstr "Resource Constraint"
 
 #: src/protocols/jabber/jabber.c:156
-msgid "Non-matching Hosts"
-msgstr "Non-matching Hosts"
+msgid "Restricted XML"
+msgstr "Restricted XML"
+
+#: src/protocols/jabber/jabber.c:158
+msgid "See Other Host"
+msgstr "See Other Host"
 
 #: src/protocols/jabber/jabber.c:160
-msgid "Policy Violation"
-msgstr "Policy Violation"
+msgid "System Shutdown"
+msgstr "System Shutdown"
 
 #: src/protocols/jabber/jabber.c:162
-msgid "Remote Connection Failed"
-msgstr "Remote Connection Failed"
+msgid "Undefined Condition"
+msgstr "Undefined Condition"
 
 #: src/protocols/jabber/jabber.c:164
-msgid "Resource Constraint"
-msgstr "Resource Constraint"
+msgid "Unsupported Encoding"
+msgstr "Unsupported Encoding"
 
 #: src/protocols/jabber/jabber.c:166
-msgid "Restricted XML"
-msgstr "Restricted XML"
+msgid "Unsupported Stanza Type"
+msgstr "Unsupported Stanza Type"
 
 #: src/protocols/jabber/jabber.c:168
-msgid "See Other Host"
-msgstr "See Other Host"
+msgid "Unsupported Version"
+msgstr "Unsupported Version"
 
 #: src/protocols/jabber/jabber.c:170
-msgid "System Shutdown"
-msgstr "System Shutdown"
+msgid "XML Not Well Formed"
+msgstr "XML Not Well Formed"
 
 #: src/protocols/jabber/jabber.c:172
-msgid "Undefined Condition"
-msgstr "Undefined Condition"
-
-#: src/protocols/jabber/jabber.c:174
-msgid "Unsupported Encoding"
-msgstr "Unsupported Encoding"
-
-#: src/protocols/jabber/jabber.c:176
-msgid "Unsupported Stanza Type"
-msgstr "Unsupported Stanza Type"
-
-#: src/protocols/jabber/jabber.c:178
-msgid "Unsupported Version"
-msgstr "Unsupported Version"
-
-#: src/protocols/jabber/jabber.c:180
-msgid "XML Not Well Formed"
-msgstr "XML Not Well Formed"
-
-#: src/protocols/jabber/jabber.c:182
 msgid "Stream Error"
 msgstr "Stream Error"
 
-#: src/protocols/jabber/jabber.c:245 src/protocols/msn/httpmethod.c:216
+#: src/protocols/jabber/jabber.c:237 src/protocols/msn/httpmethod.c:234
 #: src/protocols/msn/msn.c:82 src/protocols/msn/msn.c:102
 #: src/protocols/msn/msn.c:160 src/protocols/msn/msn.c:260
-#: src/protocols/msn/msn.c:536 src/protocols/msn/msn.c:707
-#: src/protocols/msn/msn.c:730 src/protocols/msn/msn.c:762
-#: src/protocols/msn/msn.c:770 src/protocols/msn/msn.c:803
-#: src/protocols/msn/msn.c:811 src/protocols/msn/msn.c:825
-#: src/protocols/msn/msn.c:834 src/protocols/msn/msn.c:849
-#: src/protocols/msn/msn.c:859 src/protocols/msn/msn.c:881
-#: src/protocols/msn/msn.c:931 src/protocols/msn/msn.c:969
-#: src/protocols/msn/msn.c:1067 src/protocols/msn/msn.c:1099
-#: src/protocols/msn/msn.c:1120 src/protocols/msn/msn.c:1131
-#: src/protocols/msn/msn.c:1142 src/protocols/msn/msn.c:1166
-#: src/protocols/msn/msn.c:1178 src/protocols/msn/msn.c:1259
+#: src/protocols/msn/msn.c:538 src/protocols/msn/msn.c:709
+#: src/protocols/msn/msn.c:732 src/protocols/msn/msn.c:764
+#: src/protocols/msn/msn.c:772 src/protocols/msn/msn.c:805
+#: src/protocols/msn/msn.c:813 src/protocols/msn/msn.c:827
+#: src/protocols/msn/msn.c:836 src/protocols/msn/msn.c:851
+#: src/protocols/msn/msn.c:861 src/protocols/msn/msn.c:883
+#: src/protocols/msn/msn.c:933 src/protocols/msn/msn.c:971
+#: src/protocols/msn/msn.c:1069 src/protocols/msn/msn.c:1101
+#: src/protocols/msn/msn.c:1122 src/protocols/msn/msn.c:1133
+#: src/protocols/msn/msn.c:1144 src/protocols/msn/msn.c:1168
+#: src/protocols/msn/msn.c:1180 src/protocols/msn/msn.c:1261
 #: src/protocols/msn/notification.c:179 src/protocols/msn/notification.c:207
-#: src/protocols/msn/notification.c:1664 src/protocols/msn/notification.c:1684
-#: src/protocols/trepia/trepia.c:248 src/protocols/trepia/trepia.c:749
-#: src/protocols/trepia/trepia.c:1033 src/protocols/trepia/trepia.c:1077
-#: src/protocols/trepia/trepia.c:1176 src/protocols/trepia/trepia.c:1232
+#: src/protocols/msn/notification.c:1680 src/protocols/msn/notification.c:1700
+#: src/protocols/msn/session.c:208 src/protocols/trepia/trepia.c:248
+#: src/protocols/trepia/trepia.c:749 src/protocols/trepia/trepia.c:1033
+#: src/protocols/trepia/trepia.c:1077 src/protocols/trepia/trepia.c:1176
+#: src/protocols/trepia/trepia.c:1232
 msgid "Write error"
 msgstr "Write error"
 
-#: src/protocols/jabber/jabber.c:282 src/protocols/jabber/jabber.c:302
+#: src/protocols/jabber/jabber.c:275 src/protocols/jabber/jabber.c:295
 msgid "Read Error"
 msgstr "Read Error"
 
-#: src/protocols/jabber/jabber.c:356
+#: src/protocols/jabber/jabber.c:349
 msgid "SSL Handshake Failed"
 msgstr "SSL Handshake Failed"
 
-#: src/protocols/jabber/jabber.c:393 src/protocols/jabber/jabber.c:687
+#: src/protocols/jabber/jabber.c:388 src/protocols/jabber/jabber.c:718
 msgid "Invalid Jabber ID"
 msgstr "Invalid Jabber ID"
 
-#: src/protocols/jabber/jabber.c:427 src/protocols/jabber/jabber.c:721
+#: src/protocols/jabber/jabber.c:416 src/protocols/jabber/jabber.c:745
+msgid "SSL support unavailable"
+msgstr "SSL support unavailable"
+
+#: src/protocols/jabber/jabber.c:426 src/protocols/jabber/jabber.c:755
 #: src/protocols/trepia/trepia.c:1116
 msgid "Unable to create socket"
 msgstr "Unable to create socket"
 
-#: src/protocols/jabber/jabber.c:452
+#: src/protocols/jabber/jabber.c:451
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registration of %s@%s successful"
 
-#: src/protocols/jabber/jabber.c:454 src/protocols/jabber/jabber.c:455
+#: src/protocols/jabber/jabber.c:453 src/protocols/jabber/jabber.c:454
 msgid "Registration Successful"
 msgstr "Registration Successful"
 
-#: src/protocols/jabber/jabber.c:464
-msgid "Unknown Error"
-msgstr "Unknown Error"
-
-#: src/protocols/jabber/jabber.c:467
+#: src/protocols/jabber/jabber.c:466
 #, c-format
 msgid "Registration of %s@%s failed: %s"
 msgstr "Registration of %s@%s failed: %s"
 
-#: src/protocols/jabber/jabber.c:469 src/protocols/jabber/jabber.c:470
+#: src/protocols/jabber/jabber.c:468 src/protocols/jabber/jabber.c:469
 msgid "Registration Failed"
 msgstr "Registration Failed"
 
-#: src/protocols/jabber/jabber.c:568 src/protocols/jabber/jabber.c:569
+#: src/protocols/jabber/jabber.c:581 src/protocols/jabber/jabber.c:582
 msgid "Already Registered"
 msgstr "Already Registered"
 
-#: src/protocols/jabber/jabber.c:582 src/protocols/jabber/jabber.c:1014
+#: src/protocols/jabber/jabber.c:613 src/protocols/jabber/jabber.c:1046
 msgid "Password"
 msgstr "Password"
 
-#: src/protocols/jabber/jabber.c:593
+#: src/protocols/jabber/jabber.c:624
 msgid "E-Mail"
 msgstr "E-Mail"
 
-#. First Name
-#: src/protocols/jabber/jabber.c:603 src/protocols/oscar/oscar.c:3962
-#: src/protocols/trepia/trepia.c:267
-msgid "First Name"
-msgstr "First Name"
-
 #. State
-#: src/protocols/jabber/jabber.c:623 src/protocols/oscar/oscar.c:4014
-#: src/protocols/oscar/oscar.c:4030 src/protocols/trepia/trepia.c:335
+#: src/protocols/jabber/jabber.c:654 src/protocols/oscar/oscar.c:4027
+#: src/protocols/oscar/oscar.c:4043 src/protocols/trepia/trepia.c:335
 #: src/protocols/trepia/trepia.c:439
 msgid "State"
 msgstr "State"
 
-#: src/protocols/jabber/jabber.c:633
+#: src/protocols/jabber/jabber.c:664
 msgid "Phone"
 msgstr "Phone"
 
-#: src/protocols/jabber/jabber.c:651
+#: src/protocols/jabber/jabber.c:674
+msgid "Date"
+msgstr "Date"
+
+#: src/protocols/jabber/jabber.c:682
 msgid "Please fill out the information below to register your new account."
 msgstr "Please fill out the information below to register your new account."
 
-#: src/protocols/jabber/jabber.c:654 src/protocols/jabber/jabber.c:655
+#: src/protocols/jabber/jabber.c:685 src/protocols/jabber/jabber.c:686
 msgid "Register New Jabber Account"
 msgstr "Register New Jabber Account"
 
-#: src/protocols/jabber/jabber.c:770 src/protocols/msn/dispatch.c:219
-#: src/protocols/msn/msn.c:481 src/protocols/napster/napster.c:487
+#: src/protocols/jabber/jabber.c:799 src/protocols/msn/dispatch.c:212
+#: src/protocols/msn/msn.c:483 src/protocols/napster/napster.c:487
 #: src/protocols/oscar/oscar.c:694 src/protocols/trepia/trepia.c:1110
-#: src/protocols/yahoo/yahoo.c:1923
+#: src/protocols/yahoo/yahoo.c:2073
 msgid "Connecting"
 msgstr "Connecting"
 
-#: src/protocols/jabber/jabber.c:774
+#: src/protocols/jabber/jabber.c:803
 msgid "Initializing Stream"
 msgstr "Initializing Stream"
 
-#: src/protocols/jabber/jabber.c:780
+#: src/protocols/jabber/jabber.c:809
 msgid "Authenticating"
 msgstr "Authenticating"
 
-#: src/protocols/jabber/jabber.c:788
+#: src/protocols/jabber/jabber.c:819
 msgid "Re-initializing Stream"
 msgstr "Re-initializing Stream"
 
-#: src/protocols/jabber/jabber.c:912 src/protocols/jabber/jabber.c:965
-#: src/protocols/jabber/presence.c:270
+#: src/protocols/jabber/jabber.c:944 src/protocols/jabber/jabber.c:997
+#: src/protocols/jabber/presence.c:295
 msgid "Error"
 msgstr "Error"
 
-#: src/protocols/jabber/jabber.c:928 src/protocols/jabber/jutil.c:101
+#: src/protocols/jabber/jabber.c:960 src/protocols/jabber/jutil.c:102
 #: src/protocols/jabber/presence.c:82
 msgid "Chatty"
 msgstr "Chatty"
 
-#: src/protocols/jabber/jabber.c:930 src/protocols/jabber/jutil.c:104
+#: src/protocols/jabber/jabber.c:962 src/protocols/jabber/jutil.c:105
 #: src/protocols/jabber/presence.c:87
 msgid "Extended Away"
 msgstr "Extended Away"
 
-#: src/protocols/jabber/jabber.c:931 src/protocols/jabber/jutil.c:107
-#: src/protocols/jabber/presence.c:89 src/protocols/oscar/oscar.c:2838
-#: src/protocols/oscar/oscar.c:4594 src/protocols/oscar/oscar.c:6139
+#: src/protocols/jabber/jabber.c:963 src/protocols/jabber/jutil.c:108
+#: src/protocols/jabber/presence.c:89 src/protocols/oscar/oscar.c:2837
+#: src/protocols/oscar/oscar.c:4607 src/protocols/oscar/oscar.c:6165
 msgid "Do Not Disturb"
 msgstr "Do Not Disturb"
 
-#: src/protocols/jabber/jabber.c:947
+#: src/protocols/jabber/jabber.c:979
 msgid "Password Changed"
 msgstr "Password Changed"
 
-#: src/protocols/jabber/jabber.c:948
+#: src/protocols/jabber/jabber.c:980
 msgid "Your password has been changed."
 msgstr "Your password has been changed."
 
-#: src/protocols/jabber/jabber.c:958
+#: src/protocols/jabber/jabber.c:990
 #, c-format
 msgid "Error changing password: %s"
 msgstr "Error changing password: %s"
 
-#: src/protocols/jabber/jabber.c:962
+#: src/protocols/jabber/jabber.c:994
 msgid "Unknown error occurred changing password"
 msgstr "Unknown error occurred changing password"
 
-#: src/protocols/jabber/jabber.c:1019
+#: src/protocols/jabber/jabber.c:1051
 msgid "Password (again)"
 msgstr "Password (again)"
 
-#: src/protocols/jabber/jabber.c:1024 src/protocols/jabber/jabber.c:1025
+#: src/protocols/jabber/jabber.c:1056 src/protocols/jabber/jabber.c:1057
 msgid "Change Jabber Password"
 msgstr "Change Jabber Password"
 
-#: src/protocols/jabber/jabber.c:1025
+#: src/protocols/jabber/jabber.c:1057
 msgid "Please enter your new password"
 msgstr "Please enter your new password"
 
+#: src/protocols/jabber/jabber.c:1069 src/protocols/toc/toc.c:1532
+msgid "Set User Info"
+msgstr "Set User Info"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -5273,60 +5412,88 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/jabber/jabber.c:1123 src/protocols/jabber/jabber.c:1125
+#: src/protocols/jabber/jabber.c:1189 src/protocols/jabber/jabber.c:1191
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber Protocol Plugin"
 
-#: src/protocols/jabber/jabber.c:1149
-msgid "Force Old SSL"
-msgstr "Force Old SSL"
-
-#: src/protocols/jabber/jabber.c:1157
+#: src/protocols/jabber/jabber.c:1215
+msgid "Use TLS if available"
+msgstr "Use TLS if available"
+
+#: src/protocols/jabber/jabber.c:1220
+msgid "Force old SSL"
+msgstr "Force old SSL"
+
+#: src/protocols/jabber/jabber.c:1225
+msgid "Allow plaintext auth over unencrypted streams"
+msgstr "Allow plaintext auth over unencrypted streams"
+
+#: src/protocols/jabber/jabber.c:1234
 msgid "Connect server"
 msgstr "Connect server"
 
-#: src/protocols/jabber/message.c:125
+#: src/protocols/jabber/message.c:106
 #, c-format
 msgid "Message from %s"
 msgstr "Message from %s"
 
-#: src/protocols/jabber/message.c:219
+#: src/protocols/jabber/message.c:168
+#, c-format
+msgid "%s has set the topic to: %s"
+msgstr "%s has set the topic to: %s"
+
+#: src/protocols/jabber/message.c:170
+#, c-format
+msgid "The topic is: %s"
+msgstr "The topic is: %s"
+
+#: src/protocols/jabber/message.c:217
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "Message delivery to %s failed: %s"
 
-#: src/protocols/jabber/message.c:222
+#: src/protocols/jabber/message.c:220
 msgid "Jabber Message Error"
 msgstr "Jabber Message Error"
 
-#: src/protocols/jabber/message.c:281
-#, c-format
-msgid " (Code %s)"
-msgstr " (Code %s)"
-
 #: src/protocols/jabber/parser.c:129
 msgid "XML Parse error"
 msgstr "XML Parse error"
 
-#: src/protocols/jabber/presence.c:170
-#, c-format
-msgid "%s (Code %s)"
-msgstr "%s (Code %s)"
-
-#: src/protocols/jabber/presence.c:175
+#: src/protocols/jabber/presence.c:180
 msgid "Unknown Error in presence"
 msgstr "Unknown Error in presence"
 
-#: src/protocols/jabber/presence.c:179
+#: src/protocols/jabber/presence.c:185
 #, 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:260 src/protocols/oscar/oscar.c:2949
+#: src/protocols/jabber/presence.c:246 src/protocols/jabber/presence.c:247
+msgid "Create New Room"
+msgstr "Create New Room"
+
+#: src/protocols/jabber/presence.c:248
+msgid ""
+"You are creating a new room.  Would you like to configure it, or accept the "
+"default settings?"
+msgstr ""
+"You are creating a new room.  Would you like to configure it, or accept the "
+"default settings?"
+
+#: src/protocols/jabber/presence.c:250
+msgid "Configure Room"
+msgstr "Configure Room"
+
+#: src/protocols/jabber/presence.c:252
+msgid "Accept Defaults"
+msgstr "Accept Defaults"
+
+#: src/protocols/jabber/presence.c:285 src/protocols/oscar/oscar.c:2948
 msgid "Unknown error"
 msgstr "Unknown error"
 
-#: src/protocols/jabber/presence.c:266
+#: src/protocols/jabber/presence.c:291
 msgid "Unable to join chat"
 msgstr "Unable to join chat"
 
@@ -5360,15 +5527,15 @@
 msgid "Protocol version not supported"
 msgstr "Protocol version not supported"
 
-#: src/protocols/msn/dispatch.c:117 src/protocols/msn/notification.c:785
+#: src/protocols/msn/dispatch.c:117 src/protocols/msn/notification.c:792
 msgid "Unable to request CVR\n"
 msgstr "Unable to request CVR\n"
 
-#: src/protocols/msn/dispatch.c:126 src/protocols/msn/notification.c:794
+#: src/protocols/msn/dispatch.c:126 src/protocols/msn/notification.c:801
 msgid "Unable to request INF\n"
 msgstr "Unable to request INF\n"
 
-#: src/protocols/msn/dispatch.c:147 src/protocols/msn/notification.c:1911
+#: src/protocols/msn/dispatch.c:147 src/protocols/msn/notification.c:1927
 msgid "Got invalid XFR"
 msgstr "Got invalid XFR"
 
@@ -5376,27 +5543,20 @@
 msgid "Unable to transfer"
 msgstr "Unable to transfer"
 
-#: src/protocols/msn/dispatch.c:199
+#: src/protocols/msn/dispatch.c:192
 msgid "Unable to parse message."
 msgstr "Unable to parse message."
 
-#: src/protocols/msn/dispatch.c:215 src/protocols/msn/msn.c:490
-#: src/protocols/msn/notification.c:2141 src/protocols/napster/napster.c:463
-#: src/protocols/napster/napster.c:494 src/protocols/yahoo/yahoo.c:1715
-#: src/protocols/yahoo/yahoo.c:1746 src/protocols/yahoo/yahoo.c:1811
-msgid "Unable to connect"
-msgstr "Unable to connect"
-
-#: src/protocols/msn/dispatch.c:239 src/protocols/msn/notification.c:890
-#: src/protocols/msn/notification.c:2163
+#: src/protocols/msn/dispatch.c:232 src/protocols/msn/notification.c:897
+#: src/protocols/msn/notification.c:2187
 msgid "Unable to write to server"
 msgstr "Unable to write to server"
 
-#: src/protocols/msn/dispatch.c:243 src/protocols/msn/notification.c:2170
+#: src/protocols/msn/dispatch.c:236 src/protocols/msn/notification.c:2194
 msgid "Syncing with server"
 msgstr "Syncing with server"
 
-#: src/protocols/msn/dispatch.c:257 src/protocols/msn/notification.c:2184
+#: src/protocols/msn/dispatch.c:250 src/protocols/msn/notification.c:2208
 msgid "Error reading from server"
 msgstr "Error reading from server"
 
@@ -5492,7 +5652,7 @@
 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:183
+#: src/protocols/msn/error.c:107 src/protocols/oscar/oscar.c:182
 msgid "Not logged in"
 msgstr "Not logged in"
 
@@ -5655,41 +5815,41 @@
 msgid "Page"
 msgstr "Page"
 
-#: src/protocols/msn/msn.c:332 src/protocols/yahoo/yahoo.c:2142
+#: src/protocols/msn/msn.c:332 src/protocols/yahoo/yahoo.c:2301
 #, c-format
 msgid "<b>Status:</b> %s"
 msgstr "<b>Status:</b> %s"
 
-#: src/protocols/msn/msn.c:345 src/protocols/msn/msn.c:626
+#: src/protocols/msn/msn.c:345 src/protocols/msn/msn.c:628
 #: src/protocols/msn/state.c:32
 msgid "Away From Computer"
 msgstr "Away From Computer"
 
-#: src/protocols/msn/msn.c:346 src/protocols/msn/msn.c:628
-#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:2008
-#: src/protocols/yahoo/yahoo.c:2306 src/protocols/yahoo/yahoo.c:2406
+#: src/protocols/msn/msn.c:346 src/protocols/msn/msn.c:630
+#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:2169
+#: src/protocols/yahoo/yahoo.c:2494 src/protocols/yahoo/yahoo.c:2602
 msgid "Be Right Back"
 msgstr "Be Right Back"
 
-#: src/protocols/msn/msn.c:347 src/protocols/msn/msn.c:630
-#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:2010
-#: src/protocols/yahoo/yahoo.c:2308 src/protocols/yahoo/yahoo.c:2407
+#: src/protocols/msn/msn.c:347 src/protocols/msn/msn.c:632
+#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:2171
+#: src/protocols/yahoo/yahoo.c:2496 src/protocols/yahoo/yahoo.c:2603
 msgid "Busy"
 msgstr "Busy"
 
-#: src/protocols/msn/msn.c:348 src/protocols/msn/msn.c:632
-#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2018
-#: src/protocols/yahoo/yahoo.c:2316 src/protocols/yahoo/yahoo.c:2411
+#: src/protocols/msn/msn.c:348 src/protocols/msn/msn.c:634
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2179
+#: src/protocols/yahoo/yahoo.c:2504 src/protocols/yahoo/yahoo.c:2607
 msgid "On The Phone"
 msgstr "On The Phone"
 
-#: src/protocols/msn/msn.c:349 src/protocols/msn/msn.c:634
-#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:2022
-#: src/protocols/yahoo/yahoo.c:2320 src/protocols/yahoo/yahoo.c:2413
+#: src/protocols/msn/msn.c:349 src/protocols/msn/msn.c:636
+#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:2183
+#: src/protocols/yahoo/yahoo.c:2508 src/protocols/yahoo/yahoo.c:2609
 msgid "Out To Lunch"
 msgstr "Out To Lunch"
 
-#: src/protocols/msn/msn.c:350 src/protocols/msn/msn.c:636
+#: src/protocols/msn/msn.c:350 src/protocols/msn/msn.c:638
 #: src/protocols/zephyr/zephyr.c:883 src/protocols/zephyr/zephyr.c:898
 msgid "Hidden"
 msgstr "Hidden"
@@ -5727,10 +5887,14 @@
 msgstr "Initiate Chat"
 
 #: src/protocols/msn/msn.c:457
-msgid "SSL support is needed for MSN. Please install it."
-msgstr "SSL support is needed for MSN. Please install it."
-
-#: src/protocols/msn/msn.c:743
+msgid ""
+"SSL support is needed for MSN. Please install a supported SSL library. See "
+"http://gaim.sf.net/faq-ssl.php for more information."
+msgstr ""
+"SSL support is needed for MSN. Please install a supported SSL library. See "
+"http://gaim.sf.net/faq-ssl.php for more information."
+
+#: src/protocols/msn/msn.c:745
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\". Perhaps you meant "
@@ -5739,11 +5903,11 @@
 "An MSN screenname must be in the form \"user@server.com\". Perhaps you meant "
 "%s@hotmail.com. No changes were made to your allow list."
 
-#: src/protocols/msn/msn.c:747 src/protocols/msn/msn.c:787
+#: src/protocols/msn/msn.c:749 src/protocols/msn/msn.c:789
 msgid "Invalid MSN screenname"
 msgstr "Invalid MSN screenname"
 
-#: src/protocols/msn/msn.c:783
+#: src/protocols/msn/msn.c:785
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\". Perhaps you meant "
@@ -5752,73 +5916,73 @@
 "An MSN screenname must be in the form \"user@server.com\". Perhaps you meant "
 "%s@hotmail.com. No changes were made to your block list."
 
-#: src/protocols/msn/msn.c:1283 src/protocols/yahoo/yahoo.c:2582
+#: src/protocols/msn/msn.c:1287 src/protocols/yahoo/yahoo.c:2789
 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:1351 src/protocols/oscar/oscar.c:3996
+#: src/protocols/msn/msn.c:1357 src/protocols/oscar/oscar.c:4009
 #: src/protocols/trepia/trepia.c:285 src/protocols/trepia/trepia.c:413
-#: src/protocols/yahoo/yahoo.c:2696
+#: src/protocols/yahoo/yahoo.c:2899
 msgid "Age"
 msgstr "Age"
 
 #. Gender
-#: src/protocols/msn/msn.c:1358 src/protocols/oscar/oscar.c:3982
+#: src/protocols/msn/msn.c:1364 src/protocols/oscar/oscar.c:3995
 #: src/protocols/trepia/trepia.c:279 src/protocols/trepia/trepia.c:421
-#: src/protocols/yahoo/yahoo.c:2708
+#: src/protocols/yahoo/yahoo.c:2907
 msgid "Gender"
 msgstr "Gender"
 
-#: src/protocols/msn/msn.c:1366 src/protocols/yahoo/yahoo.c:2702
+#: src/protocols/msn/msn.c:1372 src/protocols/yahoo/yahoo.c:2903
 msgid "Marital Status"
 msgstr "Marital Status"
 
-#: src/protocols/msn/msn.c:1373 src/protocols/yahoo/yahoo.c:2690
+#: src/protocols/msn/msn.c:1379 src/protocols/yahoo/yahoo.c:2895
 msgid "Location"
 msgstr "Location"
 
-#: src/protocols/msn/msn.c:1381 src/protocols/yahoo/yahoo.c:2714
+#: src/protocols/msn/msn.c:1387 src/protocols/yahoo/yahoo.c:2911
 msgid "Occupation"
 msgstr "Occupation"
 
-#: src/protocols/msn/msn.c:1398 src/protocols/msn/msn.c:1404
-#: src/protocols/msn/msn.c:1411 src/protocols/msn/msn.c:1418
-#: src/protocols/msn/msn.c:1425
+#: src/protocols/msn/msn.c:1404 src/protocols/msn/msn.c:1410
+#: src/protocols/msn/msn.c:1417 src/protocols/msn/msn.c:1424
+#: src/protocols/msn/msn.c:1431
 msgid "A Little About Me"
 msgstr "A Little About Me"
 
-#: src/protocols/msn/msn.c:1434 src/protocols/msn/msn.c:1447
-#: src/protocols/msn/msn.c:1454
+#: src/protocols/msn/msn.c:1440 src/protocols/msn/msn.c:1453
+#: src/protocols/msn/msn.c:1460
 msgid "Favorite Things"
-msgstr "Favorite Things"
-
-#: src/protocols/msn/msn.c:1463 src/protocols/msn/msn.c:1469
-#: src/protocols/msn/msn.c:1476
+msgstr "Favourite Things"
+
+#: src/protocols/msn/msn.c:1469 src/protocols/msn/msn.c:1475
+#: src/protocols/msn/msn.c:1482
 msgid "Hobbies and Interests"
 msgstr "Hobbies and Interests"
 
-#: src/protocols/msn/msn.c:1485 src/protocols/msn/msn.c:1491
-#: src/protocols/yahoo/yahoo.c:2758
+#: src/protocols/msn/msn.c:1491 src/protocols/msn/msn.c:1497
+#: src/protocols/yahoo/yahoo.c:2946
 msgid "Favorite Quote"
-msgstr "Favorite Quote"
-
-#: src/protocols/msn/msn.c:1499 src/protocols/yahoo/yahoo.c:2802
+msgstr "Favourite Quote"
+
+#: src/protocols/msn/msn.c:1505 src/protocols/yahoo/yahoo.c:2982
 msgid "Last Updated"
 msgstr "Last Updated"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1510 src/protocols/trepia/trepia.c:289
+#: src/protocols/msn/msn.c:1516 src/protocols/trepia/trepia.c:289
 #: src/protocols/trepia/trepia.c:457
 msgid "Homepage"
 msgstr "Homepage"
 
-#: src/protocols/msn/msn.c:1532 src/protocols/yahoo/yahoo.c:2820
+#: src/protocols/msn/msn.c:1538 src/protocols/yahoo/yahoo.c:2997
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "User information for %s unavailable"
 
-#: src/protocols/msn/msn.c:1534 src/protocols/yahoo/yahoo.c:2822
+#: src/protocols/msn/msn.c:1540 src/protocols/yahoo/yahoo.c:2999
 msgid "The user's profile is empty."
 msgstr "The user's profile is empty."
 
@@ -5832,15 +5996,15 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/msn/msn.c:1632 src/protocols/msn/msn.c:1634
+#: src/protocols/msn/msn.c:1637 src/protocols/msn/msn.c:1639
 msgid "MSN Protocol Plugin"
 msgstr "MSN Protocol Plugin"
 
-#: src/protocols/msn/msn.c:1651 src/protocols/trepia/trepia.c:1340
+#: src/protocols/msn/msn.c:1656 src/protocols/trepia/trepia.c:1339
 msgid "Login server"
 msgstr "Login server"
 
-#: src/protocols/msn/msn.c:1661
+#: src/protocols/msn/msn.c:1666
 msgid "Use HTTP Method"
 msgstr "Use HTTP Method"
 
@@ -5877,46 +6041,47 @@
 msgid "Retrieving buddy list"
 msgstr "Retrieving buddy list"
 
-#: src/protocols/msn/notification.c:704
+#: src/protocols/msn/notification.c:711
 msgid "Unable to connect to passport server"
 msgstr "Unable to connect to passport server"
 
-#: src/protocols/msn/notification.c:709 src/protocols/msn/notification.c:741
+#: src/protocols/msn/notification.c:716 src/protocols/msn/notification.c:748
 #: src/protocols/oscar/oscar.c:1362
 msgid "Password sent"
 msgstr "Password sent"
 
-#: src/protocols/msn/notification.c:736
+#: src/protocols/msn/notification.c:743
 msgid "Unable to send password"
 msgstr "Unable to send password"
 
-#: src/protocols/msn/notification.c:772
+#: src/protocols/msn/notification.c:779
 msgid "Protocol not supported"
 msgstr "Protocol not supported"
 
-#: src/protocols/msn/notification.c:814
+#: src/protocols/msn/notification.c:821
 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:819
+#: src/protocols/msn/notification.c:826
 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:945
+msgstr ""
+"You have been disconnected. The MSN servers are going down temporarily."
+
+#: src/protocols/msn/notification.c:953
 #, 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:1264 src/protocols/msn/notification.c:1429
+#: src/protocols/msn/notification.c:1278 src/protocols/msn/notification.c:1445
 #, 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:1956
+#: src/protocols/msn/notification.c:1972
 msgid "Unable to transfer to notification server"
 msgstr "Unable to transfer to notification server"
 
-#: src/protocols/msn/notification.c:2104
+#: src/protocols/msn/notification.c:2128
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5947,7 +6112,7 @@
 "After the maintenance has been completed, you will be able to successfully "
 "sign in."
 
-#: src/protocols/msn/servconn.c:528
+#: src/protocols/msn/servconn.c:533
 msgid "Received HTTP error. Please report this."
 msgstr "Received HTTP error. Please report this."
 
@@ -6008,10 +6173,10 @@
 msgid "%s requested a PING"
 msgstr "%s requested a PING"
 
-#: src/protocols/napster/napster.c:543 src/protocols/oscar/oscar.c:5208
+#: src/protocols/napster/napster.c:543 src/protocols/oscar/oscar.c:5231
 #: src/protocols/toc/toc.c:1259
-msgid "Join what group:"
-msgstr "Join what group:"
+msgid "_Group:"
+msgstr "_Group:"
 
 #. *< api_version
 #. *< type
@@ -6023,103 +6188,103 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/napster/napster.c:619 src/protocols/napster/napster.c:621
+#: src/protocols/napster/napster.c:618 src/protocols/napster/napster.c:620
 msgid "NAPSTER Protocol Plugin"
 msgstr "NAPSTER Protocol Plugin"
 
+#: src/protocols/oscar/oscar.c:178
+msgid "Invalid error"
+msgstr "Invalid error"
+
 #: src/protocols/oscar/oscar.c:179
-msgid "Invalid error"
-msgstr "Invalid error"
-
-#: src/protocols/oscar/oscar.c:180
 msgid "Invalid SNAC"
 msgstr "Invalid SNAC"
 
-#: src/protocols/oscar/oscar.c:181
+#: src/protocols/oscar/oscar.c:180
 msgid "Rate to host"
 msgstr "Rate to host"
 
-#: src/protocols/oscar/oscar.c:182
+#: src/protocols/oscar/oscar.c:181
 msgid "Rate to client"
 msgstr "Rate to client"
 
-#: src/protocols/oscar/oscar.c:184
+#: src/protocols/oscar/oscar.c:183
 msgid "Service unavailable"
 msgstr "Service unavailable"
 
-#: src/protocols/oscar/oscar.c:185
+#: src/protocols/oscar/oscar.c:184
 msgid "Service not defined"
 msgstr "Service not defined"
 
+#: src/protocols/oscar/oscar.c:185
+msgid "Obsolete SNAC"
+msgstr "Obsolete SNAC"
+
 #: src/protocols/oscar/oscar.c:186
-msgid "Obsolete SNAC"
-msgstr "Obsolete SNAC"
-
-#: src/protocols/oscar/oscar.c:187
 msgid "Not supported by host"
 msgstr "Not supported by host"
 
-#: src/protocols/oscar/oscar.c:188
+#: src/protocols/oscar/oscar.c:187
 msgid "Not supported by client"
 msgstr "Not supported by client"
 
+#: src/protocols/oscar/oscar.c:188
+msgid "Refused by client"
+msgstr "Refused by client"
+
 #: src/protocols/oscar/oscar.c:189
-msgid "Refused by client"
-msgstr "Refused by client"
+msgid "Reply too big"
+msgstr "Reply too big"
 
 #: src/protocols/oscar/oscar.c:190
-msgid "Reply too big"
-msgstr "Reply too big"
+msgid "Responses lost"
+msgstr "Responses lost"
 
 #: src/protocols/oscar/oscar.c:191
-msgid "Responses lost"
-msgstr "Responses lost"
+msgid "Request denied"
+msgstr "Request denied"
 
 #: src/protocols/oscar/oscar.c:192
-msgid "Request denied"
-msgstr "Request denied"
-
-#: src/protocols/oscar/oscar.c:193
 msgid "Busted SNAC payload"
 msgstr "Busted SNAC payload"
 
-#: src/protocols/oscar/oscar.c:194
+#: src/protocols/oscar/oscar.c:193
 msgid "Insufficient rights"
 msgstr "Insufficient rights"
 
+#: src/protocols/oscar/oscar.c:194
+msgid "In local permit/deny"
+msgstr "In local permit/deny"
+
 #: src/protocols/oscar/oscar.c:195
-msgid "In local permit/deny"
-msgstr "In local permit/deny"
+msgid "Too evil (sender)"
+msgstr "Too evil (sender)"
 
 #: src/protocols/oscar/oscar.c:196
-msgid "Too evil (sender)"
-msgstr "Too evil (sender)"
+msgid "Too evil (receiver)"
+msgstr "Too evil (receiver)"
 
 #: src/protocols/oscar/oscar.c:197
-msgid "Too evil (receiver)"
-msgstr "Too evil (receiver)"
+msgid "User temporarily unavailable"
+msgstr "User temporarily unavailable"
 
 #: src/protocols/oscar/oscar.c:198
-msgid "User temporarily unavailable"
-msgstr "User temporarily unavailable"
+msgid "No match"
+msgstr "No match"
 
 #: src/protocols/oscar/oscar.c:199
-msgid "No match"
-msgstr "No match"
+msgid "List overflow"
+msgstr "List overflow"
 
 #: src/protocols/oscar/oscar.c:200
-msgid "List overflow"
-msgstr "List overflow"
-
-#: src/protocols/oscar/oscar.c:201
 msgid "Request ambiguous"
 msgstr "Request ambiguous"
 
-#: src/protocols/oscar/oscar.c:202
+#: src/protocols/oscar/oscar.c:201
 msgid "Queue full"
 msgstr "Queue full"
 
-#: src/protocols/oscar/oscar.c:203
+#: src/protocols/oscar/oscar.c:202
 msgid "Not while on AOL"
 msgstr "Not while on AOL"
 
@@ -6133,12 +6298,6 @@
 msgid "Direct IM with %s failed"
 msgstr "Direct IM with %s failed"
 
-#: src/protocols/oscar/oscar.c:535 src/protocols/toc/toc.c:218
-#: src/protocols/toc/toc.c:625 src/protocols/toc/toc.c:641
-#: src/protocols/toc/toc.c:709
-msgid "Disconnected."
-msgstr "Disconnected."
-
 #: src/protocols/oscar/oscar.c:547 src/protocols/toc/toc.c:885
 #, c-format
 msgid "You have been disconnected from chat room %s."
@@ -6169,7 +6328,8 @@
 msgstr "Connection established, cookie sent"
 
 #: src/protocols/oscar/oscar.c:854 src/protocols/oscar/oscar.c:867
-#: src/protocols/oscar/oscar.c:872
+#: src/protocols/oscar/oscar.c:872 src/protocols/yahoo/yahoo_filexfer.c:202
+#: src/protocols/yahoo/yahoo_filexfer.c:210
 msgid "File Transfer Aborted"
 msgstr "File Transfer Aborted"
 
@@ -6177,7 +6337,8 @@
 msgid "Unable to establish listener socket."
 msgstr "Unable to establish listener socket."
 
-#: src/protocols/oscar/oscar.c:868
+#: src/protocols/oscar/oscar.c:868 src/protocols/yahoo/yahoo_filexfer.c:203
+#: src/protocols/yahoo/yahoo_filexfer.c:211
 msgid "Unable to establish file descriptor."
 msgstr "Unable to establish file descriptor."
 
@@ -6217,7 +6378,7 @@
 
 #: src/protocols/oscar/oscar.c:1174
 msgid "Received authorization"
-msgstr "Received authorization"
+msgstr "Received authorisation"
 
 #: src/protocols/oscar/oscar.c:1209 src/protocols/oscar/oscar.c:1239
 #: src/protocols/oscar/oscar.c:1327
@@ -6237,21 +6398,21 @@
 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:1912 src/protocols/oscar/oscar.c:5646
+#: src/protocols/oscar/oscar.c:1911 src/protocols/oscar/oscar.c:5672
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Direct IM with %s established"
 
-#: src/protocols/oscar/oscar.c:2241 src/protocols/oscar/oscar.c:2263
+#: src/protocols/oscar/oscar.c:2240 src/protocols/oscar/oscar.c:2262
 msgid "(There was an error receiving this message)"
 msgstr "(There was an error receiving this message)"
 
-#: src/protocols/oscar/oscar.c:2410
+#: src/protocols/oscar/oscar.c:2409
 #, 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:2413
+#: src/protocols/oscar/oscar.c:2412
 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 "
@@ -6261,48 +6422,48 @@
 "for IM Images.  Because your IP address will be revealed, this may be "
 "considered a privacy risk."
 
-#: src/protocols/oscar/oscar.c:2418 src/protocols/oscar/oscar.c:6015
+#: src/protocols/oscar/oscar.c:2417 src/protocols/oscar/oscar.c:6041
 msgid "Connect"
 msgstr "Connect"
 
-#: src/protocols/oscar/oscar.c:2445
+#: src/protocols/oscar/oscar.c:2444
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Please authorise me so I can add you to my buddy list."
 
+#: src/protocols/oscar/oscar.c:2452
+msgid "Authorization Request Message:"
+msgstr "Authorisation Request Message:"
+
 #: src/protocols/oscar/oscar.c:2453
-msgid "Authorization Request Message:"
-msgstr "Authorization Request Message:"
-
-#: src/protocols/oscar/oscar.c:2454
 msgid "Please authorize me!"
 msgstr "Please authorise me!"
 
-#: src/protocols/oscar/oscar.c:2482
+#: src/protocols/oscar/oscar.c:2481
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
 "you want to send an authorization request?"
 msgstr ""
-"The user %s requires authorization before being added to a buddy list.  Do "
-"you want to send an authorization request?"
-
-#: src/protocols/oscar/oscar.c:2487 src/protocols/oscar/oscar.c:2489
+"The user %s requires authorisation before being added to a buddy list.  Do "
+"you want to send an authorisation request?"
+
+#: src/protocols/oscar/oscar.c:2486 src/protocols/oscar/oscar.c:2488
 msgid "Request Authorization"
-msgstr "Request Authorization"
-
-#: src/protocols/oscar/oscar.c:2525 src/protocols/oscar/oscar.c:2527
-#: src/protocols/oscar/oscar.c:2534 src/protocols/oscar/oscar.c:2610
-#: src/protocols/oscar/oscar.c:2630 src/protocols/oscar/oscar.c:2986
-#: src/protocols/oscar/oscar.c:3043 src/protocols/oscar/oscar.c:5129
-#: src/protocols/oscar/oscar.c:5175
+msgstr "Request Authorisation"
+
+#: src/protocols/oscar/oscar.c:2524 src/protocols/oscar/oscar.c:2526
+#: src/protocols/oscar/oscar.c:2533 src/protocols/oscar/oscar.c:2609
+#: src/protocols/oscar/oscar.c:2629 src/protocols/oscar/oscar.c:2985
+#: src/protocols/oscar/oscar.c:3045 src/protocols/oscar/oscar.c:5152
+#: src/protocols/oscar/oscar.c:5198
 msgid "No reason given."
 msgstr "No reason given."
 
-#: src/protocols/oscar/oscar.c:2533
+#: src/protocols/oscar/oscar.c:2532
 msgid "Authorization Denied Message:"
-msgstr "Authorization Denied Message:"
-
-#: src/protocols/oscar/oscar.c:2610
+msgstr "Authorisation Denied Message:"
+
+#: src/protocols/oscar/oscar.c:2609
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -6311,11 +6472,11 @@
 "The user %u wants to add you to their buddy list for the following reason:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2618 src/protocols/oscar/oscar.c:5135
+#: src/protocols/oscar/oscar.c:2617 src/protocols/oscar/oscar.c:5158
 msgid "Authorization Request"
-msgstr "Authorization Request"
-
-#: src/protocols/oscar/oscar.c:2630
+msgstr "Authorisation Request"
+
+#: src/protocols/oscar/oscar.c:2629
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -6326,17 +6487,17 @@
 "following reason:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2631
+#: src/protocols/oscar/oscar.c:2630
 msgid "ICQ authorization denied."
-msgstr "ICQ authorization denied."
+msgstr "ICQ authorisation denied."
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:2638
+#: src/protocols/oscar/oscar.c:2637
 #, 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:2646
+#: src/protocols/oscar/oscar.c:2645
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -6349,7 +6510,7 @@
 "From: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2654
+#: src/protocols/oscar/oscar.c:2653
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -6362,7 +6523,7 @@
 "From: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2662
+#: src/protocols/oscar/oscar.c:2661
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -6375,34 +6536,34 @@
 "Message is:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2683
+#: src/protocols/oscar/oscar.c:2682
 #, 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:2689
+#: src/protocols/oscar/oscar.c:2688
 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:2693
+#: src/protocols/oscar/oscar.c:2692
 msgid "Decline"
 msgstr "Decline"
 
-#: src/protocols/oscar/oscar.c:2775
+#: src/protocols/oscar/oscar.c:2774
 #, 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:2784
+#: src/protocols/oscar/oscar.c:2783
 #, 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:2793
+#: src/protocols/oscar/oscar.c:2792
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -6413,177 +6574,190 @@
 msgstr[1] ""
 "You missed %hu messages from %s because the rate limit has been exceeded."
 
-#: src/protocols/oscar/oscar.c:2802
+#: src/protocols/oscar/oscar.c:2801
 #, 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:2811
+#: src/protocols/oscar/oscar.c:2810
 #, 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:2820
+#: src/protocols/oscar/oscar.c:2819
 #, 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:2836 src/protocols/oscar/oscar.c:4603
-#: src/protocols/oscar/oscar.c:6142
+#: src/protocols/oscar/oscar.c:2835 src/protocols/oscar/oscar.c:4616
+#: src/protocols/oscar/oscar.c:6168
 msgid "Free For Chat"
 msgstr "Free For Chat"
 
-#: src/protocols/oscar/oscar.c:2840 src/protocols/oscar/oscar.c:4597
-#: src/protocols/oscar/oscar.c:6140
+#: src/protocols/oscar/oscar.c:2839 src/protocols/oscar/oscar.c:4610
+#: src/protocols/oscar/oscar.c:6166
 msgid "Not Available"
 msgstr "Not Available"
 
-#: src/protocols/oscar/oscar.c:2842 src/protocols/oscar/oscar.c:4600
-#: src/protocols/oscar/oscar.c:6141
+#: src/protocols/oscar/oscar.c:2841 src/protocols/oscar/oscar.c:4613
+#: src/protocols/oscar/oscar.c:6167
 msgid "Occupied"
 msgstr "Occupied"
 
-#: src/protocols/oscar/oscar.c:2846
+#: src/protocols/oscar/oscar.c:2845
 msgid "Web Aware"
 msgstr "Web Aware"
 
-#: src/protocols/oscar/oscar.c:2889
+#: src/protocols/oscar/oscar.c:2888
 #, 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:2948
+#: src/protocols/oscar/oscar.c:2947
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC threw error: %s\n"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:2984
+#: src/protocols/oscar/oscar.c:2983
 #, 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:3041
+#: src/protocols/oscar/oscar.c:3042
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "User information for %s unavailable:"
 
-#: src/protocols/oscar/oscar.c:3080
+#: src/protocols/oscar/oscar.c:3081
 msgid "Voice"
 msgstr "Voice"
 
-#: src/protocols/oscar/oscar.c:3083
+#: src/protocols/oscar/oscar.c:3084
 msgid "AIM Direct IM"
 msgstr "AIM Direct IM"
 
-#: src/protocols/oscar/oscar.c:3089 src/protocols/oscar/oscar.c:6241
+#: src/protocols/oscar/oscar.c:3090 src/protocols/oscar/oscar.c:6267
 msgid "Get File"
 msgstr "Get File"
 
-#: src/protocols/oscar/oscar.c:3092 src/protocols/oscar/oscar.c:6233
+#: src/protocols/oscar/oscar.c:3093 src/protocols/oscar/oscar.c:6259
+#: src/protocols/yahoo/yahoo.c:2350
 msgid "Send File"
 msgstr "Send File"
 
-#: src/protocols/oscar/oscar.c:3096
+#: src/protocols/oscar/oscar.c:3097
 msgid "Games"
 msgstr "Games"
 
-#: src/protocols/oscar/oscar.c:3099
+#: src/protocols/oscar/oscar.c:3100
 msgid "Add-Ins"
 msgstr "Add-Ins"
 
-#: src/protocols/oscar/oscar.c:3102
+#: src/protocols/oscar/oscar.c:3103
 msgid "Send Buddy List"
 msgstr "Send Buddy List"
 
-#: src/protocols/oscar/oscar.c:3105
+#: src/protocols/oscar/oscar.c:3106
 msgid "ICQ Direct Connect"
 msgstr "ICQ Direct Connect"
 
-#: src/protocols/oscar/oscar.c:3108
+#: src/protocols/oscar/oscar.c:3109
 msgid "AP User"
 msgstr "AP User"
 
-#: src/protocols/oscar/oscar.c:3111
+#: src/protocols/oscar/oscar.c:3112
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:3114
+#: src/protocols/oscar/oscar.c:3115
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: src/protocols/oscar/oscar.c:3117
+#: src/protocols/oscar/oscar.c:3118
 msgid "ICQ Server Relay"
 msgstr "ICQ Server Relay"
 
-#: src/protocols/oscar/oscar.c:3120
+#: src/protocols/oscar/oscar.c:3121
 msgid "Old ICQ UTF8"
 msgstr "Old ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:3123
+#: src/protocols/oscar/oscar.c:3124
 msgid "Trillian Encryption"
 msgstr "Trillian Encryption"
 
-#: src/protocols/oscar/oscar.c:3126
+#: src/protocols/oscar/oscar.c:3127
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:3129
+#: src/protocols/oscar/oscar.c:3130
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: src/protocols/oscar/oscar.c:3132
+#: src/protocols/oscar/oscar.c:3133
 msgid "Security Enabled"
 msgstr "Security Enabled"
 
-#: src/protocols/oscar/oscar.c:3135
+#: src/protocols/oscar/oscar.c:3136
 msgid "Video Chat"
 msgstr "Video Chat"
 
-#: src/protocols/oscar/oscar.c:3164
+#: src/protocols/oscar/oscar.c:3140
+msgid "iChat AV"
+msgstr "iChat AV"
+
+#: src/protocols/oscar/oscar.c:3143
+msgid "Live Video"
+msgstr "Live Video"
+
+#: src/protocols/oscar/oscar.c:3146
+msgid "Camera"
+msgstr "Camera"
+
+#: src/protocols/oscar/oscar.c:3175
 #, c-format
 msgid "Username: <b>%s</b><br>\n"
 msgstr "Username: <b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3165
+#: src/protocols/oscar/oscar.c:3176
 #, c-format
 msgid "Warning Level: <b>%d%%</b><br>\n"
 msgstr "Warning Level: <b>%d%%</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3168
+#: src/protocols/oscar/oscar.c:3179
 #, c-format
 msgid "Online Since: <b>%s</b><br>\n"
 msgstr "Online Since: <b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3172
+#: src/protocols/oscar/oscar.c:3183
 #, c-format
 msgid "Member Since: <b>%s</b><br>\n"
 msgstr "Member Since: <b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3177
+#: src/protocols/oscar/oscar.c:3188
 #, c-format
 msgid "Idle: <b>%s</b>"
 msgstr "Idle: <b>%s</b>"
 
-#: src/protocols/oscar/oscar.c:3180
+#: src/protocols/oscar/oscar.c:3191
 msgid "Idle: <b>Active</b>"
 msgstr "Idle: <b>Active</b>"
 
-#: src/protocols/oscar/oscar.c:3219
+#: src/protocols/oscar/oscar.c:3230
 msgid "Your AIM connection may be lost."
 msgstr "Your AIM connection may be lost."
 
-#: src/protocols/oscar/oscar.c:3613
+#: src/protocols/oscar/oscar.c:3624
 msgid "Rate limiting error."
 msgstr "Rate limiting error."
 
-#: src/protocols/oscar/oscar.c:3614
+#: src/protocols/oscar/oscar.c:3625
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -6591,7 +6765,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:3675
+#: src/protocols/oscar/oscar.c:3688
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
@@ -6599,109 +6773,109 @@
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
 
-#: src/protocols/oscar/oscar.c:3677
+#: src/protocols/oscar/oscar.c:3690
 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:3708
+#: src/protocols/oscar/oscar.c:3721
 msgid "Finalizing connection"
 msgstr "Finalizing connection"
 
-#: src/protocols/oscar/oscar.c:3968 src/protocols/oscar/oscar.c:3974
+#: src/protocols/oscar/oscar.c:3981 src/protocols/oscar/oscar.c:3987
 msgid "Email Address"
 msgstr "Email Address"
 
-#: src/protocols/oscar/oscar.c:3979
+#: src/protocols/oscar/oscar.c:3992
 msgid "Mobile Phone"
 msgstr "Mobile Phone"
 
-#: src/protocols/oscar/oscar.c:3982 src/protocols/trepia/trepia.c:281
+#: src/protocols/oscar/oscar.c:3995 src/protocols/trepia/trepia.c:281
 #: src/protocols/trepia/trepia.c:422
 msgid "Female"
 msgstr "Female"
 
-#: src/protocols/oscar/oscar.c:3982 src/protocols/trepia/trepia.c:280
+#: src/protocols/oscar/oscar.c:3995 src/protocols/trepia/trepia.c:280
 #: src/protocols/trepia/trepia.c:422
 msgid "Male"
 msgstr "Male"
 
-#: src/protocols/oscar/oscar.c:3999
+#: src/protocols/oscar/oscar.c:4012
 msgid "Personal Web Page"
 msgstr "Personal Web Page"
 
-#: src/protocols/oscar/oscar.c:4002
+#: src/protocols/oscar/oscar.c:4015
 msgid "Additional Information"
 msgstr "Additional Information"
 
-#: src/protocols/oscar/oscar.c:4006
+#: src/protocols/oscar/oscar.c:4019
 msgid "Home Address"
 msgstr "Home Address"
 
-#: src/protocols/oscar/oscar.c:4017 src/protocols/oscar/oscar.c:4033
+#: src/protocols/oscar/oscar.c:4030 src/protocols/oscar/oscar.c:4046
 msgid "Zip Code"
-msgstr "Zip Code"
-
-#: src/protocols/oscar/oscar.c:4022
+msgstr "Postcode"
+
+#: src/protocols/oscar/oscar.c:4035
 msgid "Work Address"
 msgstr "Work Address"
 
-#: src/protocols/oscar/oscar.c:4038
+#: src/protocols/oscar/oscar.c:4051
 msgid "Work Information"
 msgstr "Work Information"
 
-#: src/protocols/oscar/oscar.c:4040
+#: src/protocols/oscar/oscar.c:4053
 msgid "Company"
 msgstr "Company"
 
-#: src/protocols/oscar/oscar.c:4043
+#: src/protocols/oscar/oscar.c:4056
 msgid "Division"
 msgstr "Division"
 
-#: src/protocols/oscar/oscar.c:4046
+#: src/protocols/oscar/oscar.c:4059
 msgid "Position"
 msgstr "Position"
 
-#: src/protocols/oscar/oscar.c:4049
+#: src/protocols/oscar/oscar.c:4062
 msgid "Web Page"
 msgstr "Web Page"
 
-#: src/protocols/oscar/oscar.c:4055
+#: src/protocols/oscar/oscar.c:4068
 #, c-format
 msgid "ICQ Info for %s"
 msgstr "ICQ Info for %s"
 
-#: src/protocols/oscar/oscar.c:4105
+#: src/protocols/oscar/oscar.c:4118
 msgid "Pop-Up Message"
 msgstr "Pop-Up Message"
 
-#: src/protocols/oscar/oscar.c:4126
+#: src/protocols/oscar/oscar.c:4139
 #, c-format
 msgid "The following screennames are associated with %s"
 msgstr "The following screennames are associated with %s"
 
-#: src/protocols/oscar/oscar.c:4130
+#: src/protocols/oscar/oscar.c:4143
 msgid "Search Results"
 msgstr "Search Results"
 
-#: src/protocols/oscar/oscar.c:4147
+#: src/protocols/oscar/oscar.c:4160
 #, c-format
 msgid "No results found for email address %s"
 msgstr "No results found for email address %s"
 
-#: src/protocols/oscar/oscar.c:4168
+#: src/protocols/oscar/oscar.c:4181
 #, 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:4170
+#: src/protocols/oscar/oscar.c:4183
 msgid "Account Confirmation Requested"
 msgstr "Account Confirmation Requested"
 
-#: src/protocols/oscar/oscar.c:4198
+#: src/protocols/oscar/oscar.c:4211
 msgid "Error Changing Account Info"
 msgstr "Error Changing Account Info"
 
-#: src/protocols/oscar/oscar.c:4201
+#: src/protocols/oscar/oscar.c:4214
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -6710,7 +6884,7 @@
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "differs from the original."
 
-#: src/protocols/oscar/oscar.c:4204
+#: src/protocols/oscar/oscar.c:4217
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -6719,7 +6893,7 @@
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "ends in a space."
 
-#: src/protocols/oscar/oscar.c:4207
+#: src/protocols/oscar/oscar.c:4220
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -6728,7 +6902,7 @@
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "is too long."
 
-#: src/protocols/oscar/oscar.c:4210
+#: src/protocols/oscar/oscar.c:4223
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -6737,7 +6911,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:4213
+#: src/protocols/oscar/oscar.c:4226
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -6746,7 +6920,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:4216
+#: src/protocols/oscar/oscar.c:4229
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
@@ -6755,12 +6929,12 @@
 "Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 
-#: src/protocols/oscar/oscar.c:4219
+#: src/protocols/oscar/oscar.c:4232
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Error 0x%04x: Unknown error."
 
-#: src/protocols/oscar/oscar.c:4229
+#: src/protocols/oscar/oscar.c:4242
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -6769,20 +6943,20 @@
 "Your screen name is currently formatted as follows:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4230 src/protocols/oscar/oscar.c:4237
+#: src/protocols/oscar/oscar.c:4243 src/protocols/oscar/oscar.c:4250
 msgid "Account Info"
 msgstr "Account Info"
 
-#: src/protocols/oscar/oscar.c:4235
+#: src/protocols/oscar/oscar.c:4248
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "The email address for %s is %s"
 
-#: src/protocols/oscar/oscar.c:4467
+#: src/protocols/oscar/oscar.c:4480
 msgid "Unable to set AIM profile."
 msgstr "Unable to set AIM profile."
 
-#: src/protocols/oscar/oscar.c:4468
+#: src/protocols/oscar/oscar.c:4481
 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 "
@@ -6792,7 +6966,7 @@
 "completed.  Your profile remains unset; try setting it again when you are "
 "fully connected."
 
-#: src/protocols/oscar/oscar.c:4495
+#: src/protocols/oscar/oscar.c:4508
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -6807,15 +6981,15 @@
 "The maximum profile length of %d bytes has been exceeded.  Gaim has "
 "truncated it for you."
 
-#: src/protocols/oscar/oscar.c:4500
+#: src/protocols/oscar/oscar.c:4513
 msgid "Profile too long."
 msgstr "Profile too long."
 
-#: src/protocols/oscar/oscar.c:4517
+#: src/protocols/oscar/oscar.c:4530
 msgid "Unable to set AIM away message."
 msgstr "Unable to set AIM away message."
 
-#: src/protocols/oscar/oscar.c:4518
+#: src/protocols/oscar/oscar.c:4531
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -6825,7 +6999,7 @@
 "procedure completed.  You remain in a \"present\" state; try setting it "
 "again when you are fully connected."
 
-#: src/protocols/oscar/oscar.c:4558
+#: src/protocols/oscar/oscar.c:4571
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -6840,15 +7014,33 @@
 "The maximum away message length of %d bytes has been exceeded.  Gaim has "
 "truncated it for you."
 
-#: src/protocols/oscar/oscar.c:4563
+#: src/protocols/oscar/oscar.c:4576
 msgid "Away message too long."
 msgstr "Away message too long."
 
-#: src/protocols/oscar/oscar.c:4777
+#: src/protocols/oscar/oscar.c:4663
+#, c-format
+msgid ""
+"Could not add the buddy %s because the screen name is invalid.  Screen names "
+"must either start with a letter and contain only letters, numbers and "
+"spaces, or contain only numbers.  The buddy will be removed from your buddy "
+"list."
+msgstr ""
+"Could not add the buddy %s because the screen name is invalid.  Screen names "
+"must either start with a letter and contain only letters, numbers and "
+"spaces, or contain only numbers.  The buddy will be removed from your buddy "
+"list."
+
+#: src/protocols/oscar/oscar.c:4664 src/protocols/oscar/oscar.c:5066
+#: src/protocols/oscar/oscar.c:5079
+msgid "Unable To Add"
+msgstr "Unable To Add"
+
+#: src/protocols/oscar/oscar.c:4800
 msgid "Unable To Retrieve Buddy List"
 msgstr "Unable To Retrieve Buddy List"
 
-#: src/protocols/oscar/oscar.c:4778
+#: src/protocols/oscar/oscar.c:4801
 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 "
@@ -6858,12 +7050,12 @@
 "servers.  Your buddy list is not lost, and will probably become available in "
 "a few hours."
 
-#: src/protocols/oscar/oscar.c:4870 src/protocols/oscar/oscar.c:4871
-#: src/protocols/oscar/oscar.c:4876
+#: src/protocols/oscar/oscar.c:4893 src/protocols/oscar/oscar.c:4894
+#: src/protocols/oscar/oscar.c:4899
 msgid "Orphans"
 msgstr "Orphans"
 
-#: src/protocols/oscar/oscar.c:5042
+#: src/protocols/oscar/oscar.c:5065
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -6872,15 +7064,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:5042 src/protocols/oscar/oscar.c:5055
+#: src/protocols/oscar/oscar.c:5065 src/protocols/oscar/oscar.c:5078
 msgid "(no name)"
 msgstr "(no name)"
 
-#: src/protocols/oscar/oscar.c:5043 src/protocols/oscar/oscar.c:5056
-msgid "Unable To Add"
-msgstr "Unable To Add"
-
-#: src/protocols/oscar/oscar.c:5055
+#: src/protocols/oscar/oscar.c:5078
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -6891,7 +7079,7 @@
 "for this is that you have the maximum number of allowed buddies in your "
 "buddy list."
 
-#: src/protocols/oscar/oscar.c:5090
+#: src/protocols/oscar/oscar.c:5113
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -6900,11 +7088,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:5096
+#: src/protocols/oscar/oscar.c:5119
 msgid "Authorization Given"
-msgstr "Authorization Given"
-
-#: src/protocols/oscar/oscar.c:5129
+msgstr "Authorisation Given"
+
+#: src/protocols/oscar/oscar.c:5152
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -6914,17 +7102,17 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:5171
+#: src/protocols/oscar/oscar.c:5194
 #, 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:5172
+#: src/protocols/oscar/oscar.c:5195
 msgid "Authorization Granted"
-msgstr "Authorization Granted"
+msgstr "Authorisation Granted"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:5175
+#: src/protocols/oscar/oscar.c:5198
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -6935,56 +7123,56 @@
 "following reason:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5176
+#: src/protocols/oscar/oscar.c:5199
 msgid "Authorization Denied"
-msgstr "Authorization Denied"
-
-#: src/protocols/oscar/oscar.c:5213 src/protocols/toc/toc.c:1264
-msgid "Exchange:"
-msgstr "Exchange:"
-
-#: src/protocols/oscar/oscar.c:5450
+msgstr "Authorisation Denied"
+
+#: src/protocols/oscar/oscar.c:5236 src/protocols/toc/toc.c:1264
+msgid "_Exchange:"
+msgstr "_Exchange:"
+
+#: src/protocols/oscar/oscar.c:5474
 msgid "<b>Status:</b> "
 msgstr "<b>Status:</b> "
 
-#: src/protocols/oscar/oscar.c:5459
-msgid "<b>Logged In:</b> "
-msgstr "<b>Logged In:</b> "
-
-#: src/protocols/oscar/oscar.c:5471
+#: src/protocols/oscar/oscar.c:5486
 msgid "<b>IP Address:</b> "
 msgstr "<b>IP Address:</b> "
 
-#: src/protocols/oscar/oscar.c:5479
+#: src/protocols/oscar/oscar.c:5494
 msgid "<b>Capabilities:</b> "
 msgstr "<b>Capabilities:</b> "
 
-#: src/protocols/oscar/oscar.c:5486
+#: src/protocols/oscar/oscar.c:5503
+msgid "<b>Buddy Comment:</b> "
+msgstr "<b>Buddy Comment:</b> "
+
+#: src/protocols/oscar/oscar.c:5512
 msgid "<b>Available:</b> "
 msgstr "<b>Available:</b> "
 
-#: src/protocols/oscar/oscar.c:5504
+#: src/protocols/oscar/oscar.c:5530
 msgid "<b>Away Message:</b> "
 msgstr "<b>Away Message:</b> "
 
-#: src/protocols/oscar/oscar.c:5513
+#: src/protocols/oscar/oscar.c:5539
 msgid "<b>Status:</b> Not Authorized"
 msgstr "<b>Status:</b> Not Authorised"
 
-#: src/protocols/oscar/oscar.c:5547 src/protocols/yahoo/yahoo.c:2030
+#: src/protocols/oscar/oscar.c:5573 src/protocols/yahoo/yahoo.c:2191
 msgid "Offline"
 msgstr "Offline"
 
-#: src/protocols/oscar/oscar.c:5995
+#: src/protocols/oscar/oscar.c:6021
 msgid "Unable to open Direct IM"
 msgstr "Unable to open Direct IM"
 
-#: src/protocols/oscar/oscar.c:6008
+#: src/protocols/oscar/oscar.c:6034
 #, 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:6011
+#: src/protocols/oscar/oscar.c:6037
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
@@ -6992,117 +7180,121 @@
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
 
-#: src/protocols/oscar/oscar.c:6186
+#: src/protocols/oscar/oscar.c:6212
 msgid "Buddy Comment:"
 msgstr "Buddy Comment:"
 
-#: src/protocols/oscar/oscar.c:6202
+#: src/protocols/oscar/oscar.c:6228
 msgid "Edit Buddy Comment"
 msgstr "Edit Buddy Comment"
 
-#: src/protocols/oscar/oscar.c:6210
+#: src/protocols/oscar/oscar.c:6236
 msgid "Get Status Msg"
 msgstr "Get Status Msg"
 
-#: src/protocols/oscar/oscar.c:6225
+#: src/protocols/oscar/oscar.c:6251
 msgid "Direct IM"
 msgstr "Direct IM"
 
-#: src/protocols/oscar/oscar.c:6254
+#: src/protocols/oscar/oscar.c:6280
 msgid "Re-request Authorization"
-msgstr "Re-request Authorization"
-
-#: src/protocols/oscar/oscar.c:6275
+msgstr "Re-request Authorisation"
+
+#: src/protocols/oscar/oscar.c:6301
 msgid "The new formatting is invalid."
 msgstr "The new formatting is invalid."
 
-#: src/protocols/oscar/oscar.c:6276
+#: src/protocols/oscar/oscar.c:6302
 msgid "Screenname formatting can change only capitalization and whitespace."
-msgstr "Screenname formatting can change only capitalization and whitespace."
-
-#: src/protocols/oscar/oscar.c:6282
+msgstr "Screenname formatting can change only capitalisation and whitespace."
+
+#: src/protocols/oscar/oscar.c:6308
 msgid "New screenname formatting:"
 msgstr "New screenname formatting:"
 
-#: src/protocols/oscar/oscar.c:6331
+#: src/protocols/oscar/oscar.c:6357
 msgid "Change Address To:"
 msgstr "Change Address To:"
 
-#: src/protocols/oscar/oscar.c:6375
+#: src/protocols/oscar/oscar.c:6401
 msgid "<i>you are not waiting for authorization</i>"
-msgstr "<i>you are not waiting for authorization</i>"
-
-#: src/protocols/oscar/oscar.c:6378
+msgstr "<i>you are not waiting for authorisation</i>"
+
+#: src/protocols/oscar/oscar.c:6404
 msgid "You are awaiting authorization from the following buddies"
-msgstr "You are awaiting authorization from the following buddies"
-
-#: src/protocols/oscar/oscar.c:6379
+msgstr "You are awaiting authorisation from the following buddies"
+
+#: src/protocols/oscar/oscar.c:6405
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
 msgstr ""
-"You can re-request authorization from these buddies by right-clicking on "
-"them and selecting \"Re-request Authorization.\""
-
-#: src/protocols/oscar/oscar.c:6393
+"You can re-request authorisation from these buddies by right-clicking on "
+"them and selecting \"Re-request Authorisation.\""
+
+#: src/protocols/oscar/oscar.c:6419
 msgid "Find Buddy by E-mail"
 msgstr "Find Buddy by E-mail"
 
-#: src/protocols/oscar/oscar.c:6394
+#: src/protocols/oscar/oscar.c:6420
 msgid "Search for a buddy by e-mail address"
 msgstr "Search for a buddy by e-mail address"
 
-#: src/protocols/oscar/oscar.c:6395
+#: src/protocols/oscar/oscar.c:6421
 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:6398
-msgid "Search"
-msgstr "Search"
-
-#: src/protocols/oscar/oscar.c:6412
+#: src/protocols/oscar/oscar.c:6438
 msgid "Available Message:"
 msgstr "Available Message:"
 
-#: src/protocols/oscar/oscar.c:6413
+#: src/protocols/oscar/oscar.c:6439
 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:6491
-msgid "Set Available Message"
-msgstr "Set Available Message"
-
-#: src/protocols/oscar/oscar.c:6505
-msgid "Change Password (URL)"
-msgstr "Change Password (URL)"
-
-#: src/protocols/oscar/oscar.c:6513
-msgid "Configure IM Forwarding (URL)"
-msgstr "Configure IM Forwarding (URL)"
+#: src/protocols/oscar/oscar.c:6510
+msgid "Set User Info..."
+msgstr "Set User Info..."
+
+#: src/protocols/oscar/oscar.c:6517
+msgid "Set Available Message..."
+msgstr "Set Available Message..."
 
 #: src/protocols/oscar/oscar.c:6524
-msgid "Format Screenname"
-msgstr "Format Screenname"
-
-#: src/protocols/oscar/oscar.c:6530
+msgid "Change Password..."
+msgstr "Change Password..."
+
+#: src/protocols/oscar/oscar.c:6531
+msgid "Change Password (URL)"
+msgstr "Change Password (URL)"
+
+#: src/protocols/oscar/oscar.c:6539
+msgid "Configure IM Forwarding (URL)"
+msgstr "Configure IM Forwarding (URL)"
+
+#: src/protocols/oscar/oscar.c:6550
+msgid "Format Screenname..."
+msgstr "Format Screenname..."
+
+#: src/protocols/oscar/oscar.c:6556
 msgid "Confirm Account"
 msgstr "Confirm Account"
 
-#: src/protocols/oscar/oscar.c:6536
-msgid "Display Current Registered Address"
-msgstr "Display Current Registered Address"
-
-#: src/protocols/oscar/oscar.c:6542
-msgid "Change Current Registered Address"
-msgstr "Change Current Registered Address"
-
-#: src/protocols/oscar/oscar.c:6551
+#: src/protocols/oscar/oscar.c:6562
+msgid "Display Currently Registered Address"
+msgstr "Display Currently Registered Address"
+
+#: src/protocols/oscar/oscar.c:6568
+msgid "Change Currently Registered Address..."
+msgstr "Change Currently Registered Address"
+
+#: src/protocols/oscar/oscar.c:6577
 msgid "Show Buddies Awaiting Authorization"
-msgstr "Show Buddies Awaiting Authorization"
-
-#: src/protocols/oscar/oscar.c:6559
-msgid "Search for Buddy by Email"
-msgstr "Search for Buddy by Email"
+msgstr "Show Buddies Awaiting Authorisation"
+
+#: src/protocols/oscar/oscar.c:6585
+msgid "Search for Buddy by Email..."
+msgstr "Search for Buddy by Email..."
 
 #. *< api_version
 #. *< type
@@ -7114,15 +7306,15 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/oscar/oscar.c:6680 src/protocols/oscar/oscar.c:6682
+#: src/protocols/oscar/oscar.c:6705 src/protocols/oscar/oscar.c:6707
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ Protocol Plugin"
 
-#: src/protocols/oscar/oscar.c:6699
+#: src/protocols/oscar/oscar.c:6724
 msgid "Auth host"
 msgstr "Auth host"
 
-#: src/protocols/oscar/oscar.c:6704
+#: src/protocols/oscar/oscar.c:6729
 msgid "Auth port"
 msgstr "Auth port"
 
@@ -7292,21 +7484,21 @@
 
 #: src/protocols/toc/toc.c:1700
 msgid "File transfer failed; other side probably canceled."
-msgstr "File transfer failed; other side probably canceled."
+msgstr "File transfer failed; other side probably cancelled."
 
 #: src/protocols/toc/toc.c:1745 src/protocols/toc/toc.c:1785
-#: src/protocols/toc/toc.c:1997
+#: src/protocols/toc/toc.c:1909 src/protocols/toc/toc.c:1997
 msgid "Could not connect for transfer."
 msgstr "Could not connect for transfer."
 
-#: src/protocols/toc/toc.c:1909
-msgid "Could not connect for transfer!"
-msgstr "Could not connect for transfer!"
-
 #: src/protocols/toc/toc.c:1942
 msgid "Could not write file header.  The file will not be transferred."
 msgstr "Could not write file header.  The file will not be transferred."
 
+#: src/protocols/toc/toc.c:2042
+msgid "Gaim - Save As..."
+msgstr "Gaim - Save As..."
+
 #: src/protocols/toc/toc.c:2076
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
@@ -7329,15 +7521,15 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/toc/toc.c:2159 src/protocols/toc/toc.c:2161
+#: src/protocols/toc/toc.c:2158 src/protocols/toc/toc.c:2160
 msgid "TOC Protocol Plugin"
 msgstr "TOC Protocol Plugin"
 
-#: src/protocols/toc/toc.c:2178
+#: src/protocols/toc/toc.c:2177
 msgid "TOC host"
 msgstr "TOC host"
 
-#: src/protocols/toc/toc.c:2182
+#: src/protocols/toc/toc.c:2181
 msgid "TOC port"
 msgstr "TOC port"
 
@@ -7406,10 +7598,6 @@
 msgid "Local Users"
 msgstr "Local Users"
 
-#: src/protocols/trepia/trepia.c:972
-msgid "Read error"
-msgstr "Read error"
-
 #: src/protocols/trepia/trepia.c:1073
 msgid "Logging in"
 msgstr "Logging in"
@@ -7424,20 +7612,33 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/trepia/trepia.c:1321 src/protocols/trepia/trepia.c:1323
+#: src/protocols/trepia/trepia.c:1320 src/protocols/trepia/trepia.c:1322
 msgid "Trepia Protocol Plugin"
 msgstr "Trepia Protocol Plugin"
 
-#: src/protocols/yahoo/yahoo.c:700
+#: src/protocols/yahoo/yahoo.c:298
+msgid ""
+"You have been logged off as you have logged in on a different machine or "
+"device."
+msgstr ""
+"You have been logged off as you have logged in on a different machine or "
+"device."
+
+#: src/protocols/yahoo/yahoo.c:731
 msgid "Your Yahoo! message did not get sent."
 msgstr "Your Yahoo! message did not get sent."
 
-#: src/protocols/yahoo/yahoo.c:758
+#: src/protocols/yahoo/yahoo.c:773
+#, c-format
+msgid "Yahoo! system message for %s:"
+msgstr "Yahoo! system message for %s:"
+
+#: src/protocols/yahoo/yahoo.c:839
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr "%s has (retroactively) denied your request to add them to your list."
 
-#: src/protocols/yahoo/yahoo.c:760
+#: src/protocols/yahoo/yahoo.c:842
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -7446,11 +7647,11 @@
 "%s has (retroactively) denied your request to add them to your list for the "
 "following reason: %s."
 
-#: src/protocols/yahoo/yahoo.c:761
+#: src/protocols/yahoo/yahoo.c:845
 msgid "Add buddy rejected"
 msgstr "Add buddy rejected"
 
-#: src/protocols/yahoo/yahoo.c:1381
+#: src/protocols/yahoo/yahoo.c:1497
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -7461,11 +7662,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:1384
+#: src/protocols/yahoo/yahoo.c:1500
 msgid "Failed Yahoo! Authentication"
 msgstr "Failed Yahoo! Authentication"
 
-#: src/protocols/yahoo/yahoo.c:1457
+#: src/protocols/yahoo/yahoo.c:1573
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -7474,86 +7675,99 @@
 "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:1460
+#: src/protocols/yahoo/yahoo.c:1576
 msgid "Ignore buddy?"
 msgstr "Ignore buddy?"
 
-#: src/protocols/yahoo/yahoo.c:1489
+#: src/protocols/yahoo/yahoo.c:1609
 msgid "Invalid username."
 msgstr "Invalid username."
 
-#: src/protocols/yahoo/yahoo.c:1492
+#: src/protocols/yahoo/yahoo.c:1612
 msgid "Incorrect password."
 msgstr "Incorrect password."
 
-#: src/protocols/yahoo/yahoo.c:1495
-msgid "Unknown error."
-msgstr "Unknown error."
-
-#: src/protocols/yahoo/yahoo.c:1542
+#: src/protocols/yahoo/yahoo.c:1615
+msgid "Your account is locked, please log in to the yahoo website."
+msgstr "Your account is locked, please log in to the yahoo website."
+
+#: src/protocols/yahoo/yahoo.c:1618
+#, c-format
+msgid "Unknown error number %d."
+msgstr "Unknown error number %d"
+
+#: src/protocols/yahoo/yahoo.c:1675
 #, 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:1544
+#: src/protocols/yahoo/yahoo.c:1677
 msgid "Could not add buddy to server list"
 msgstr "Could not add buddy to server list"
 
-#: src/protocols/yahoo/yahoo.c:1646 src/protocols/yahoo/yahoo.c:1776
+#: src/protocols/yahoo/yahoo.c:1787 src/protocols/yahoo/yahoo.c:1916
 msgid "Unable to read"
 msgstr "Unable to read"
 
-#: src/protocols/yahoo/yahoo.c:1801 src/protocols/yahoo/yahoo.c:1910
-#: src/protocols/yahoo/yahoo.c:1934
+#: src/protocols/yahoo/yahoo.c:1940 src/protocols/yahoo/yahoo.c:2048
+#: src/protocols/yahoo/yahoo.c:2089
 msgid "Connection problem"
 msgstr "Connection problem"
 
-#: src/protocols/yahoo/yahoo.c:2012 src/protocols/yahoo/yahoo.c:2310
-#: src/protocols/yahoo/yahoo.c:2408
+#: src/protocols/yahoo/yahoo.c:2173 src/protocols/yahoo/yahoo.c:2498
+#: src/protocols/yahoo/yahoo.c:2604
 msgid "Not At Home"
 msgstr "Not At Home"
 
-#: src/protocols/yahoo/yahoo.c:2014 src/protocols/yahoo/yahoo.c:2312
-#: src/protocols/yahoo/yahoo.c:2409
+#: src/protocols/yahoo/yahoo.c:2175 src/protocols/yahoo/yahoo.c:2500
+#: src/protocols/yahoo/yahoo.c:2605
 msgid "Not At Desk"
 msgstr "Not At Desk"
 
-#: src/protocols/yahoo/yahoo.c:2016 src/protocols/yahoo/yahoo.c:2314
-#: src/protocols/yahoo/yahoo.c:2410
+#: src/protocols/yahoo/yahoo.c:2177 src/protocols/yahoo/yahoo.c:2502
+#: src/protocols/yahoo/yahoo.c:2606
 msgid "Not In Office"
 msgstr "Not In Office"
 
-#: src/protocols/yahoo/yahoo.c:2020 src/protocols/yahoo/yahoo.c:2318
-#: src/protocols/yahoo/yahoo.c:2412
+#: src/protocols/yahoo/yahoo.c:2181 src/protocols/yahoo/yahoo.c:2506
+#: src/protocols/yahoo/yahoo.c:2608
 msgid "On Vacation"
 msgstr "On Vacation"
 
-#: src/protocols/yahoo/yahoo.c:2024 src/protocols/yahoo/yahoo.c:2322
-#: src/protocols/yahoo/yahoo.c:2414
+#: src/protocols/yahoo/yahoo.c:2185 src/protocols/yahoo/yahoo.c:2510
+#: src/protocols/yahoo/yahoo.c:2610
 msgid "Stepped Out"
 msgstr "Stepped Out"
 
-#: src/protocols/yahoo/yahoo.c:2088 src/protocols/yahoo/yahoo.c:2122
+#: src/protocols/yahoo/yahoo.c:2249 src/protocols/yahoo/yahoo.c:2281
 msgid "Not on server list"
 msgstr "Not on server list"
 
-#: src/protocols/yahoo/yahoo.c:2178
+#: src/protocols/yahoo/yahoo.c:2337
 msgid "Join in Chat"
 msgstr "Join in Chat"
 
-#: src/protocols/yahoo/yahoo.c:2184
+#: src/protocols/yahoo/yahoo.c:2343
 msgid "Initiate Conference"
 msgstr "Initiate Conference"
 
-#: src/protocols/yahoo/yahoo.c:2230
+#: src/protocols/yahoo/yahoo.c:2396
 msgid "Active which ID?"
 msgstr "Active which ID?"
 
-#: src/protocols/yahoo/yahoo.c:2241
-msgid "Activate ID"
-msgstr "Activate ID"
-
-#: src/protocols/yahoo/yahoo.c:2599
+#: src/protocols/yahoo/yahoo.c:2404
+msgid "Join who in chat?"
+msgstr "Join who in chat?"
+
+#: src/protocols/yahoo/yahoo.c:2415
+msgid "Activate ID..."
+msgstr "Activate ID..."
+
+#: src/protocols/yahoo/yahoo.c:2421
+msgid "Join user in chat..."
+msgstr "Join user in chat..."
+
+#: src/protocols/yahoo/yahoo.c:2806
 msgid ""
 "<b>Sorry, profiles marked as containing adult content are not supported at "
 "this time.</b><br><br>\n"
@@ -7561,7 +7775,7 @@
 "<b>Sorry, profiles marked as containing adult content are not supported at "
 "this time.</b><br><br>\n"
 
-#: src/protocols/yahoo/yahoo.c:2600 src/protocols/yahoo/yahoo.c:2623
+#: src/protocols/yahoo/yahoo.c:2807 src/protocols/yahoo/yahoo.c:2830
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser<br>"
@@ -7569,42 +7783,42 @@
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser<br>"
 
-#: src/protocols/yahoo/yahoo.c:2622
+#: src/protocols/yahoo/yahoo.c:2829
 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:2667
+#: src/protocols/yahoo/yahoo.c:2877 src/protocols/yahoo/yahoo.c:2878
 msgid "Yahoo! ID"
 msgstr "Yahoo! ID"
 
-#: src/protocols/yahoo/yahoo.c:2727 src/protocols/yahoo/yahoo.c:2731
-#: src/protocols/yahoo/yahoo.c:2735
+#: src/protocols/yahoo/yahoo.c:2922 src/protocols/yahoo/yahoo.c:2925
+#: src/protocols/yahoo/yahoo.c:2928
 msgid "Hobbies"
 msgstr "Hobbies"
 
-#: src/protocols/yahoo/yahoo.c:2746 src/protocols/yahoo/yahoo.c:2750
+#: src/protocols/yahoo/yahoo.c:2937 src/protocols/yahoo/yahoo.c:2940
 msgid "Latest News"
 msgstr "Latest News"
 
-#: src/protocols/yahoo/yahoo.c:2768
+#: src/protocols/yahoo/yahoo.c:2954
 msgid "Home Page"
 msgstr "Home Page"
 
-#: src/protocols/yahoo/yahoo.c:2782
+#: src/protocols/yahoo/yahoo.c:2966
 msgid "Cool Link 1"
 msgstr "Cool Link 1"
 
-#: src/protocols/yahoo/yahoo.c:2787
+#: src/protocols/yahoo/yahoo.c:2970
 msgid "Cool Link 2"
 msgstr "Cool Link 2"
 
-#: src/protocols/yahoo/yahoo.c:2790
+#: src/protocols/yahoo/yahoo.c:2972
 msgid "Cool Link 3"
 msgstr "Cool Link 3"
 
-#: src/protocols/yahoo/yahoo.c:2796
+#: src/protocols/yahoo/yahoo.c:2978
 msgid "Member Since"
 msgstr "Member Since"
 
@@ -7618,42 +7832,50 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/yahoo/yahoo.c:2961 src/protocols/yahoo/yahoo.c:2963
+#: src/protocols/yahoo/yahoo.c:3178 src/protocols/yahoo/yahoo.c:3180
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo Protocol Plugin"
 
-#: src/protocols/yahoo/yahoo.c:2980
+#: src/protocols/yahoo/yahoo.c:3197
 msgid "Pager host"
 msgstr "Pager host"
 
-#: src/protocols/yahoo/yahoo.c:2985
+#: src/protocols/yahoo/yahoo.c:3200
 msgid "Pager port"
 msgstr "Pager port"
 
-#: src/protocols/yahoo/yahoochat.c:194
+#: src/protocols/yahoo/yahoo.c:3203
+msgid "File transfer host"
+msgstr "File transfer host"
+
+#: src/protocols/yahoo/yahoo.c:3206
+msgid "File transfer port"
+msgstr "File transfer port"
+
+#: src/protocols/yahoo/yahoochat.c:198
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr "%s declined your conference invitation to room \"%s\" because \"%s\"."
 
-#: src/protocols/yahoo/yahoochat.c:196
+#: src/protocols/yahoo/yahoochat.c:200
 msgid "Invitation Rejected"
 msgstr "Invitation Rejected"
 
-#: src/protocols/yahoo/yahoochat.c:333
+#: src/protocols/yahoo/yahoochat.c:350
 msgid "Failed to join chat"
 msgstr "Failed to join chat"
 
-#: src/protocols/yahoo/yahoochat.c:333
+#: src/protocols/yahoo/yahoochat.c:350
 msgid "Maybe the room is full?"
-msgstr "Maybe the room is full?"
-
-#: src/protocols/yahoo/yahoochat.c:531
+msgstr "Perhaps the room is full?"
+
+#: src/protocols/yahoo/yahoochat.c:562
 msgid "Failed to join buddy in chat"
 msgstr "Failed to join buddy in chat"
 
-#: src/protocols/yahoo/yahoochat.c:532
+#: src/protocols/yahoo/yahoochat.c:563
 msgid "Maybe they're not in a chat?"
-msgstr "Maybe they're not in a chat?"
+msgstr "Perhaps they're not in a chat?"
 
 #: src/protocols/zephyr/zephyr.c:344
 #, c-format
@@ -7695,16 +7917,16 @@
 msgstr "ZLocate"
 
 #: src/protocols/zephyr/zephyr.c:908
-msgid "Class:"
-msgstr "Class:"
+msgid "_Class:"
+msgstr "_Class:"
 
 #: src/protocols/zephyr/zephyr.c:913
-msgid "Instance:"
-msgstr "Instance:"
+msgid "_Instance:"
+msgstr "_Instance:"
 
 #: src/protocols/zephyr/zephyr.c:918
-msgid "Recipient:"
-msgstr "Recipient:"
+msgid "_Recipient:"
+msgstr "_Recipient:"
 
 #. *< api_version
 #. *< type
@@ -7716,15 +7938,25 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/zephyr/zephyr.c:1050 src/protocols/zephyr/zephyr.c:1052
+#: src/protocols/zephyr/zephyr.c:1049 src/protocols/zephyr/zephyr.c:1051
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr Protocol Plugin"
 
-#: src/proxy.c:1681
+#. Forbidden
+#: src/proxy.c:1015
+msgid "Access denied: proxy server forbids port 80 tunnelling."
+msgstr "Access denied: proxy server forbids port 80 tunnelling."
+
+#: src/proxy.c:1017
+#, c-format
+msgid "Proxy connection error %d"
+msgstr "Proxy connection error %d"
+
+#: src/proxy.c:1737
 msgid "Invalid proxy settings"
 msgstr "Invalid proxy settings"
 
-#: src/proxy.c:1681
+#: src/proxy.c:1737
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -7733,43 +7965,43 @@
 "invalid."
 
 #. * Custom away message.
-#: src/prpl.h:187
+#: src/prpl.h:189
 msgid "Custom"
 msgstr "Custom"
 
 #. *
 #. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #.
-#: src/request.h:862
+#: src/request.h:1030
 msgid "Accept"
 msgstr "Accept"
 
-#: src/server.c:56
+#: src/server.c:58
 msgid "Please enter your password"
 msgstr "Please enter your password"
 
-#: src/server.c:948
+#: src/server.c:950
 #, c-format
 msgid "(%d message)"
 msgid_plural "(%d messages)"
 msgstr[0] "(%d message)"
 msgstr[1] "(%d messages)"
 
-#: src/server.c:961
+#: src/server.c:963
 msgid "(1 message)"
 msgstr "(1 message)"
 
-#: src/server.c:1142 src/server.c:1152
+#: src/server.c:1147 src/server.c:1157
 #, c-format
 msgid "%s logged in."
 msgstr "%s logged in."
 
-#: src/server.c:1169 src/server.c:1177
+#: src/server.c:1174 src/server.c:1182
 #, c-format
 msgid "%s logged out."
 msgstr "%s logged out."
 
-#: src/server.c:1224
+#: src/server.c:1229
 #, c-format
 msgid ""
 "%s has just been warned by %s.\n"
@@ -7778,11 +8010,11 @@
 "%s has just been warned by %s.\n"
 "Your new warning level is %d%%"
 
-#: src/server.c:1227
+#: src/server.c:1232
 msgid "an anonymous person"
 msgstr "an anonymous person"
 
-#: src/server.c:1330
+#: src/server.c:1335
 #, c-format
 msgid ""
 "User '%s' invites %s to buddy chat room: '%s'\n"
@@ -7791,68 +8023,216 @@
 "User '%s' invites %s to buddy chat room: '%s'\n"
 "%s"
 
-#: src/server.c:1334
+#: src/server.c:1339
 #, 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:1340
+#: src/server.c:1345
 msgid "Accept chat invitation?"
 msgstr "Accept chat invitation?"
 
 #. for people like myself who are too lazy to add an away msg :)
 #. I don't know who "myself" is in this context.  The exclamation point
 #. * makes it slightly less boring ;)
-#: src/status.c:35
+#: src/status.c:36
 msgid "Sorry, I ran out for a bit!"
 msgstr "Sorry, I ran out for a bit!"
 
-#: src/stock.c:84
+#: src/stock.c:85
 msgid "_Modify"
 msgstr "_Modify"
 
-#: src/stock.c:85
+#: src/stock.c:86
 msgid "_Open Mail"
 msgstr "_Open Mail"
 
-#: src/util.c:1590
+#: src/util.c:1820
 msgid "Calculating..."
 msgstr "Calculating..."
 
-#: src/util.c:1593
+#: src/util.c:1823
 msgid "Unknown."
 msgstr "Unknown."
 
-#: src/util.c:1624 src/util.c:1629 src/util.c:1634 src/util.c:1637
+#: src/util.c:1854 src/util.c:1859 src/util.c:1864 src/util.c:1867
 msgid "day"
 msgid_plural "days"
 msgstr[0] "day"
 msgstr[1] "days"
 
-#: src/util.c:1625 src/util.c:1629 src/util.c:1643 src/util.c:1645
+#: src/util.c:1855 src/util.c:1859 src/util.c:1873 src/util.c:1875
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "hour"
 msgstr[1] "hours"
 
-#: src/util.c:1625 src/util.c:1634 src/util.c:1643 src/util.c:1648
+#: src/util.c:1855 src/util.c:1864 src/util.c:1873 src/util.c:1878
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minute"
 msgstr[1] "minutes"
 
-#: src/util.c:1980
+#: src/util.c:2210
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Error opening connection.\n"
 
-#: src/win32/win32dep.c:254
+#: src/win32/win32dep.c:271
 msgid "Moving Gaim Settings.."
 msgstr "Moving Gaim Settings.."
 
-#: src/win32/win32dep.c:257
+#: src/win32/win32dep.c:274
 msgid "Moving Gaim user settings to: "
 msgstr "Moving Gaim user settings to: "
 
-#: src/win32/win32dep.c:259
+#: src/win32/win32dep.c:276
 msgid "Notification"
 msgstr "Notification"
+
+#~ msgid "Gnome Stock Ticker Properties"
+#~ msgstr "Gnome Stock Ticker Properties"
+
+#~ msgid "Update Frequency in min"
+#~ msgstr "Update Frequency in min"
+
+#~ msgid "Enter symbols delimited with \"+\" in the box below."
+#~ msgstr "Enter symbols delimited with \"+\" in the box below."
+
+#~ msgid "Check this box to display only symbols and price:"
+#~ msgstr "Check this box to display only symbols and price:"
+
+#~ msgid "Check this box to scroll left to right:"
+#~ msgstr "Check this box to scroll left to right:"
+
+#~ msgid "(No"
+#~ msgstr "(No"
+
+#~ msgid "Change"
+#~ msgstr "Change"
+
+#~ msgid "Gaim - Away!"
+#~ msgstr "Gaim - Away!"
+
+#~ msgid "Buddy Chat"
+#~ msgstr "Buddy Chat"
+
+#~ msgid "Join Chat As:"
+#~ msgstr "Join Chat As:"
+
+#~ msgid "Join"
+#~ msgstr "Join"
+
+#~ msgid "New Message"
+#~ msgstr "New Message"
+
+#~ msgid "Changing info for %s:"
+#~ msgstr "Changing info for %s:"
+
+#~ msgid "Alias chat"
+#~ msgstr "Alias chat"
+
+#~ msgid "Alias contact"
+#~ msgstr "Alias contact"
+
+#~ msgid "_Screenname"
+#~ msgstr "_Screenname"
+
+#~ msgid "Alias buddy"
+#~ msgstr "Alias buddy"
+
+#~ msgid ""
+#~ "Please enter an aliased name for the person below, or rename this contact "
+#~ "in your buddy list."
+#~ msgstr ""
+#~ "Please enter an aliased name for the person below, or rename this contact "
+#~ "in your buddy list."
+
+#~ msgid "Couldn't write to %s."
+#~ msgstr "Couldn't write to %s."
+
+#~ msgid "Save Log File"
+#~ msgstr "Save Log File"
+
+#~ msgid "Couldn't remove file %s."
+#~ msgstr "Couldn't remove file %s."
+
+#~ msgid ""
+#~ "You are about to remove the log file for %s.  Do you want to continue?"
+#~ msgstr ""
+#~ "You are about to remove the log file for %s.  Do you want to continue?"
+
+#~ msgid "System Log"
+#~ msgstr "System Log"
+
+#~ msgid "Remove Log"
+#~ msgstr "Remove Log"
+
+#~ msgid "Couldn't open log file %s."
+#~ msgstr "Couldn't open log file %s."
+
+#~ msgid "Conversations with %s"
+#~ msgstr "Conversations with %s"
+
+#~ msgid "Log"
+#~ msgstr "Log"
+
+#~ msgid "Clear"
+#~ msgstr "Clear"
+
+#~ msgid "Gaim - Information"
+#~ msgstr "Gaim - Information"
+
+#~ msgid "Add a new group"
+#~ msgstr "Add a new group"
+
+#~ msgid "Gaim - Insert Image"
+#~ msgstr "Gaim - Insert Image"
+
+#~ msgid ""
+#~ "<span weight='bold' size='larger'>Enter a search phrase\n"
+#~ "</span>"
+#~ msgstr ""
+#~ "<span weight='bold' size='larger'>Enter a search phrase\n"
+#~ "</span>"
+
+#~ msgid "/Conversation/Search..."
+#~ msgstr "/Conversation/Search..."
+
+#~ msgid "/Conversation/Insert _URL..."
+#~ msgstr "/Conversation/Insert _URL..."
+
+#~ msgid "Normal font size"
+#~ msgstr "Normal font size"
+
+#~ msgid "_Host"
+#~ msgstr "_Host"
+
+#~ msgid "Pa_ssword"
+#~ msgstr "Pa_ssword"
+
+#~ msgid "Gaim - Save Icon"
+#~ msgstr "Gaim - Save Icon"
+
+#~ msgid "<font color=\"red\"><b>log->logger_data was NULL!</b></font>"
+#~ msgstr "<font color=\"red\"><b>log->logger_data was NULL!</b></font>"
+
+#~ msgid "Disconnected"
+#~ msgstr "Disconnected"
+
+#~ msgid "Invalid response from server"
+#~ msgstr "Invalid response from server"
+
+#~ msgid "%s (Code %s)"
+#~ msgstr "%s (Code %s)"
+
+#~ msgid "SSL support is needed for MSN. Please install it."
+#~ msgstr "SSL support is needed for MSN. Please install it."
+
+#~ msgid "Join what group:"
+#~ msgstr "Join what group:"
+
+#~ msgid "Could not connect for transfer!"
+#~ msgstr "Could not connect for transfer!"
+
+#~ msgid "Unknown error."
+#~ msgstr "Unknown error."