diff po/en_GB.po @ 9664:ce26d84eed8f

[gaim-migrate @ 10516] 7 updates committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Wed, 04 Aug 2004 23:10:58 +0000
parents 8c4d99bea74d
children 14c1ffd053e5
line wrap: on
line diff
--- a/po/en_GB.po	Wed Aug 04 18:27:09 2004 +0000
+++ b/po/en_GB.po	Wed Aug 04 23:10:58 2004 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: Gaim 0.73\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-07-16 00:15-0400\n"
+"POT-Creation-Date: 2004-08-04 13:03+0100\n"
 "PO-Revision-Date: 2004-01-14 12:26+0000\n"
 "Last-Translator: Luke Ross <lukeross@sys3175.co.uk>\n"
 "Language-Team:  <en_GB@li.org>\n"
@@ -16,18 +16,22 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n>1;\n"
 
-#: plugins/autorecon.c:174
+#: plugins/autorecon.c:233
 msgid "Error Message Suppression"
 msgstr "Error Message Suppression"
 
-#: plugins/autorecon.c:178
+#: plugins/autorecon.c:237
 msgid "Hide Disconnect Errors"
 msgstr "Hide Disconnect Errors"
 
-#: plugins/autorecon.c:182
+#: plugins/autorecon.c:241
 msgid "Hide Login Errors"
 msgstr "Hide Login Errors"
 
+#: plugins/autorecon.c:245
+msgid "Restore Away State On Reconnent"
+msgstr "Restore Away State On Reconnent"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -35,15 +39,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/autorecon.c:204
+#: plugins/autorecon.c:267
 msgid "Auto-Reconnect"
 msgstr "Auto-Reconnect"
 
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: plugins/autorecon.c:207 plugins/autorecon.c:209
+#: plugins/autorecon.c:270 plugins/autorecon.c:272
 msgid "When you are kicked offline, this reconnects you."
 msgstr "When you are kicked offline, this reconnects you."
 
@@ -147,7 +150,7 @@
 msgid "Gaim - Away"
 msgstr "Gaim - Away"
 
-#: plugins/docklet/docklet.c:114 src/gtkaccount.c:727 src/gtkaccount.c:2152
+#: plugins/docklet/docklet.c:114 src/gtkaccount.c:734 src/gtkaccount.c:2155
 msgid "Auto-login"
 msgstr "Auto-login"
 
@@ -163,21 +166,21 @@
 msgid "New..."
 msgstr "New..."
 
-#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1809 src/protocols/gg/gg.c:51
-#: src/protocols/irc/msgs.c:187 src/protocols/jabber/jabber.c:960
+#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1802 src/protocols/gg/gg.c:51
+#: src/protocols/irc/msgs.c:189 src/protocols/jabber/jabber.c:960
 #: src/protocols/jabber/jutil.c:32 src/protocols/jabber/presence.c:63
-#: src/protocols/jabber/presence.c:119 src/protocols/novell/novell.c:2724
-#: src/protocols/novell/novell.c:2841 src/protocols/novell/novell.c:2893
-#: src/protocols/oscar/oscar.c:532 src/protocols/oscar/oscar.c:5484
-#: src/protocols/oscar/oscar.c:6489 src/protocols/oscar/oscar.c:6689
+#: src/protocols/jabber/presence.c:121 src/protocols/novell/novell.c:2771
+#: src/protocols/novell/novell.c:2888 src/protocols/novell/novell.c:2940
+#: src/protocols/oscar/oscar.c:516 src/protocols/oscar/oscar.c:5486
+#: src/protocols/oscar/oscar.c:6492 src/protocols/oscar/oscar.c:6692
 #: src/protocols/silc/buddy.c:1379 src/protocols/silc/silc.c:46
 #: src/protocols/silc/silc.c:76
 msgid "Away"
 msgstr "Away"
 
 #. else...
-#: plugins/docklet/docklet.c:159 src/away.c:550
-#: src/protocols/oscar/oscar.c:5402 src/protocols/oscar/oscar.c:6697
+#: plugins/docklet/docklet.c:159 src/away.c:565
+#: src/protocols/oscar/oscar.c:5404 src/protocols/oscar/oscar.c:6700
 msgid "Back"
 msgstr "Back"
 
@@ -189,11 +192,11 @@
 msgid "File Transfers"
 msgstr "File Transfers"
 
-#: plugins/docklet/docklet.c:173 src/gtkaccount.c:2333
+#: plugins/docklet/docklet.c:173 src/gtkaccount.c:2336
 msgid "Accounts"
 msgstr "Accounts"
 
-#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2503
+#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2484
 msgid "Preferences"
 msgstr "Preferences"
 
@@ -301,28 +304,27 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: plugins/filectl.c:225 plugins/filectl.c:227
 msgid "Allows you to control Gaim by entering commands in a file."
 msgstr "Allows you to control Gaim by entering commands in a file."
 
-#: plugins/gaim-remote/remote.c:89
+#: plugins/gaim-remote/remote.c:90
 msgid "Not connected to AIM"
 msgstr "Not connected to AIM"
 
-#: plugins/gaim-remote/remote.c:98 plugins/gaim-remote/remote.c:137
+#: plugins/gaim-remote/remote.c:99 plugins/gaim-remote/remote.c:138
 msgid "No screenname given."
 msgstr "No screenname given."
 
-#: plugins/gaim-remote/remote.c:174
+#: plugins/gaim-remote/remote.c:175
 msgid "No roomname given."
 msgstr "No roomname given."
 
-#: plugins/gaim-remote/remote.c:193
+#: plugins/gaim-remote/remote.c:194
 msgid "Invalid AIM URI"
 msgstr "Invalid AIM URI"
 
-#: plugins/gaim-remote/remote.c:651
+#: plugins/gaim-remote/remote.c:668
 #, c-format
 msgid ""
 "Failed to assign %s to a socket:\n"
@@ -331,7 +333,7 @@
 "Failed to assign %s to a socket:\n"
 "%s"
 
-#: plugins/gaim-remote/remote.c:674
+#: plugins/gaim-remote/remote.c:691
 msgid "Unable to open socket"
 msgstr "Unable to open socket"
 
@@ -342,19 +344,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gaim-remote/remote.c:722
+#: plugins/gaim-remote/remote.c:739
 msgid "Remote Control"
 msgstr "Remote Control"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gaim-remote/remote.c:725
+#: plugins/gaim-remote/remote.c:742
 msgid "Provides remote control for gaim applications."
 msgstr "Provides remote control for gaim applications."
 
 #. *  description
-#: plugins/gaim-remote/remote.c:727
+#: plugins/gaim-remote/remote.c:744
 msgid ""
 "Gives Gaim the ability to be remote-controlled through third-party "
 "applications or through the gaim-remote tool."
@@ -454,14 +456,14 @@
 #: plugins/gevolution/add_buddy_dialog.c:143
 #: plugins/gevolution/add_buddy_dialog.c:154
 #: plugins/gevolution/assoc-buddy.c:81 plugins/gevolution/assoc-buddy.c:92
-#: src/gtkblist.c:3015 src/gtkprefs.c:961 src/gtkprefs.c:1014
-#: src/gtkprefs.c:1822 src/protocols/jabber/jabber.c:924
+#: src/gtkblist.c:3006 src/gtkprefs.c:956 src/gtkprefs.c:1008
+#: src/gtkprefs.c:1816 src/protocols/jabber/jabber.c:924
 msgid "None"
 msgstr "None"
 
 #: plugins/gevolution/add_buddy_dialog.c:187
-#: plugins/gevolution/assoc-buddy.c:175 src/gtkprefs.c:2175
-#: src/gtkroomlist.c:553 src/protocols/jabber/jabber.c:598
+#: plugins/gevolution/assoc-buddy.c:175 src/gtkprefs.c:2157
+#: src/gtkroomlist.c:552 src/protocols/jabber/jabber.c:598
 #: src/protocols/msn/msn.c:1311 src/protocols/trepia/trepia.c:398
 msgid "Name"
 msgstr "Name"
@@ -477,7 +479,7 @@
 
 #. "Search"
 #: plugins/gevolution/add_buddy_dialog.c:492
-#: plugins/gevolution/assoc-buddy.c:380 src/protocols/oscar/oscar.c:6975
+#: plugins/gevolution/assoc-buddy.c:380 src/protocols/oscar/oscar.c:6976
 msgid "Search"
 msgstr "Search"
 
@@ -522,7 +524,7 @@
 msgstr "_Associate Buddy"
 
 #: plugins/gevolution/gevo-util.c:64 plugins/gevolution/gevolution.c:89
-#: src/blist.c:775 src/blist.c:963 src/blist.c:1870 src/gtkblist.c:3867
+#: src/blist.c:775 src/blist.c:963 src/blist.c:1899 src/gtkblist.c:3865
 #: src/protocols/jabber/roster.c:66
 msgid "Buddies"
 msgstr "Buddies"
@@ -541,7 +543,7 @@
 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:384 plugins/idle.c:51 src/gtkconn.c:620
+#: plugins/gevolution/gevolution.c:384 plugins/idle.c:51 src/gtkconn.c:619
 msgid "Account"
 msgstr "Account"
 
@@ -559,7 +561,6 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: plugins/gevolution/gevolution.c:468 plugins/gevolution/gevolution.c:470
 msgid "Provides integration with Ximian Evolution."
 msgstr "Provides integration with Ximian Evolution."
@@ -586,8 +587,8 @@
 msgstr "Optional information"
 
 #. Label
-#: plugins/gevolution/new_person_dialog.c:338 src/gtkaccount.c:378
-#: src/gtkaccount.c:408 src/protocols/oscar/oscar.c:438
+#: plugins/gevolution/new_person_dialog.c:338 src/gtkaccount.c:380
+#: src/gtkaccount.c:410 src/protocols/oscar/oscar.c:422
 msgid "Buddy Icon"
 msgstr "Buddy Icon"
 
@@ -633,7 +634,6 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: plugins/iconaway.c:83 plugins/iconaway.c:85
 msgid "Iconifies the buddy list and your conversations when you go away."
 msgstr "Iconifies the buddy list and your conversations when you go away."
@@ -654,7 +654,7 @@
 msgid "_Set"
 msgstr "_Set"
 
-#: plugins/idle.c:67 src/dialogs.c:786
+#: plugins/idle.c:67 src/dialogs.c:808
 msgid "_Cancel"
 msgstr "_Cancel"
 
@@ -804,7 +804,6 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: plugins/notify.c:795 plugins/notify.c:797
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "Provides a variety of ways of notifying you of unread messages."
@@ -816,14 +815,13 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/perl/perl.c:531
+#: plugins/perl/perl.c:532
 msgid "Perl Plugin Loader"
 msgstr "Perl Plugin Loader"
 
 #. *< name
 #. *< version
-#. *< summary
-#: plugins/perl/perl.c:533 plugins/perl/perl.c:534
+#: plugins/perl/perl.c:534 plugins/perl/perl.c:535
 msgid "Provides support for loading perl plugins."
 msgstr "Provides support for loading perl plugins."
 
@@ -904,15 +902,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/signals-test.c:566
+#: plugins/signals-test.c:582
 msgid "Signals Test"
 msgstr "Signals Test"
 
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: plugins/signals-test.c:569 plugins/signals-test.c:571
+#: plugins/signals-test.c:585 plugins/signals-test.c:587
 msgid "Test to see that all signals are working properly."
 msgstr "Test to see that all signals are working properly."
 
@@ -930,7 +927,6 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: plugins/simple.c:34 plugins/simple.c:36
 msgid "Tests to see that most things are working."
 msgstr "Tests to see that most things are working."
@@ -981,7 +977,6 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: plugins/ssl/ssl-gnutls.c:226 plugins/ssl/ssl-gnutls.c:228
 msgid "Provides SSL support through GNUTLS."
 msgstr "Provides SSL support through GNUTLS."
@@ -993,15 +988,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl-nss.c:312
+#: plugins/ssl/ssl-nss.c:314
 msgid "NSS"
 msgstr "NSS"
 
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: plugins/ssl/ssl-nss.c:315 plugins/ssl/ssl-nss.c:317
+#: plugins/ssl/ssl-nss.c:317 plugins/ssl/ssl-nss.c:319
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "Provides SSL support through Mozilla NSS."
 
@@ -1019,31 +1013,42 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: plugins/ssl/ssl.c:94 plugins/ssl/ssl.c:96
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "Provides a wrapper around SSL support libraries."
 
-#: plugins/statenotify.c:30
+#: plugins/statenotify.c:37
 #, c-format
 msgid "%s has gone away."
 msgstr "%s has gone away."
 
-#: plugins/statenotify.c:36
+#: plugins/statenotify.c:44
 #, c-format
 msgid "%s is no longer away."
 msgstr "%s is no longer away."
 
-#: plugins/statenotify.c:42
+#: plugins/statenotify.c:51
 #, c-format
 msgid "%s has become idle."
 msgstr "%s has become idle."
 
-#: plugins/statenotify.c:48
+#: plugins/statenotify.c:58
 #, c-format
 msgid "%s is no longer idle."
 msgstr "%s is no longer idle."
 
+#: plugins/statenotify.c:69
+msgid "Notify When"
+msgstr "Notify When"
+
+#: plugins/statenotify.c:72
+msgid "Buddy Goes _Away"
+msgstr "Buddy Goes _Away"
+
+#: plugins/statenotify.c:75
+msgid "Buddy Goes _Idle"
+msgstr "Buddy Becomes _Idle"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -1051,15 +1056,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/statenotify.c:78
+#: plugins/statenotify.c:113
 msgid "Buddy State Notification"
 msgstr "Buddy State Notification"
 
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: plugins/statenotify.c:81 plugins/statenotify.c:84
+#: plugins/statenotify.c:116 plugins/statenotify.c:119
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
@@ -1089,7 +1093,6 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: plugins/ticker/ticker.c:331 plugins/ticker/ticker.c:333
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "A horizontal scrolling version of the buddy list."
@@ -1124,7 +1127,6 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: plugins/timestamp.c:271 plugins/timestamp.c:273
 msgid "Adds iChat-style timestamps to conversations every N minutes."
 msgstr "Adds iChat-style timestamps to conversations every N minutes."
@@ -1149,7 +1151,7 @@
 msgstr "_Show slider bar in IM window"
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:405 src/gtkprefs.c:955
+#: plugins/win32/transparency/win2ktrans.c:405 src/gtkprefs.c:950
 msgid "Buddy List Window"
 msgstr "Buddy List Window"
 
@@ -1202,8 +1204,8 @@
 msgstr "_Start Gaim on Windows startup"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3058
-#: src/gtkprefs.c:2412
+#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3051
+#: src/gtkprefs.c:2394
 msgid "Buddy List"
 msgstr "Buddy List"
 
@@ -1222,8 +1224,8 @@
 msgstr "_Keep Buddy List window on top"
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:1006
-#: src/gtkprefs.c:2413 src/protocols/msn/msn.c:1638
+#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:1001
+#: src/gtkprefs.c:2395 src/protocols/msn/msn.c:1639
 msgid "Conversations"
 msgstr "Conversations"
 
@@ -1243,12 +1245,12 @@
 msgid "About Gaim"
 msgstr "About Gaim"
 
-#: src/about.c:75
+#: 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:95
+#: src/about.c:94
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
@@ -1258,215 +1260,215 @@
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
 "at once.  It is written using Gtk+ and is licensed under the GPL.<BR><BR>"
 
-#: src/about.c:106
+#: src/about.c:105
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 
+#: src/about.c:110
+msgid "Active Developers"
+msgstr "Active Developers"
+
 #: src/about.c:111
-msgid "Active Developers"
-msgstr "Active Developers"
-
-#: src/about.c:112
 msgid "maintainer"
 msgstr "maintainer"
 
-#: src/about.c:114
+#: src/about.c:113
 msgid "lead developer"
 msgstr "lead developer"
 
+#: src/about.c:116
+msgid "developer & webmaster"
+msgstr "developer & webmaster"
+
 #: src/about.c:117
-msgid "developer & webmaster"
-msgstr "developer & webmaster"
-
-#: src/about.c:118
 msgid "win32 port"
 msgstr "win32 port"
 
-#: src/about.c:121 src/about.c:122 src/about.c:123 src/about.c:124
+#: src/about.c:120 src/about.c:121 src/about.c:122 src/about.c:123
 msgid "developer"
 msgstr "developer"
 
-#: src/about.c:125
+#: src/about.c:124
 msgid "support"
 msgstr "support"
 
-#: src/about.c:132
+#: src/about.c:131
 msgid "Crazy Patch Writers"
 msgstr "Crazy Patch Writers"
 
+#: src/about.c:147
+msgid "Retired Developers"
+msgstr "Retired Developers"
+
 #: src/about.c:148
-msgid "Retired Developers"
-msgstr "Retired Developers"
-
-#: src/about.c:149
 msgid "former libfaim maintainer"
 msgstr "former libfaim maintainer"
 
-#: src/about.c:150
+#: src/about.c:149
 msgid "former lead developer"
 msgstr "former lead developer"
 
-#: src/about.c:153
+#: src/about.c:152
 msgid "former maintainer"
 msgstr "former maintainer"
 
-#: src/about.c:154
+#: src/about.c:153
 msgid "former Jabber developer"
 msgstr "former Jabber developer"
 
-#: src/about.c:155
+#: src/about.c:154
 msgid "original author"
 msgstr "original author"
 
-#: src/about.c:158
+#: src/about.c:157
 msgid "hacker and designated driver [lazy bum]"
 msgstr "hacker and designated driver [lazy bum]"
 
-#: src/about.c:166
+#: src/about.c:165
 msgid "Current Translators"
 msgstr "Current Translators"
 
+#: src/about.c:166 src/about.c:205
+msgid "Bulgarian"
+msgstr "Bulgarian"
+
 #: src/about.c:167 src/about.c:206
-msgid "Bulgarian"
-msgstr "Bulgarian"
-
-#: src/about.c:168 src/about.c:207
 msgid "Catalan"
 msgstr "Catalan"
 
-#: src/about.c:169 src/about.c:208
+#: src/about.c:168 src/about.c:207
 msgid "Czech"
 msgstr "Czech"
 
+#: src/about.c:169
+msgid "Danish"
+msgstr "Danish"
+
 #: src/about.c:170
-msgid "Danish"
-msgstr "Danish"
-
-#: src/about.c:171
 msgid "British English"
 msgstr "Proper English"
 
-#: src/about.c:172
+#: src/about.c:171
 msgid "Canadian English"
 msgstr "Canadian English"
 
-#: src/about.c:173 src/about.c:209
+#: src/about.c:172 src/about.c:208
 msgid "German"
 msgstr "German"
 
-#: src/about.c:174 src/about.c:210
+#: src/about.c:173 src/about.c:209
 msgid "Spanish"
 msgstr "Spanish"
 
-#: src/about.c:175 src/about.c:211
+#: src/about.c:174 src/about.c:210
 msgid "Finnish"
 msgstr "Finnish"
 
-#: src/about.c:176 src/about.c:212
+#: src/about.c:175 src/about.c:211
 msgid "French"
 msgstr "French"
 
+#: src/about.c:176
+msgid "Hebrew"
+msgstr "Hebrew"
+
 #: src/about.c:177
-msgid "Hebrew"
-msgstr "Hebrew"
-
-#: src/about.c:178
 msgid "Hindi"
 msgstr "Hindi"
 
-#: src/about.c:179
+#: src/about.c:178
 msgid "Hungarian"
 msgstr "Hungarian"
 
+#: src/about.c:179 src/about.c:212
+msgid "Italian"
+msgstr "Italian"
+
 #: src/about.c:180 src/about.c:213
-msgid "Italian"
-msgstr "Italian"
-
-#: src/about.c:181 src/about.c:214
 msgid "Japanese"
 msgstr "Japanese"
 
-#: src/about.c:182
+#: src/about.c:181
 msgid "Lithuanian"
 msgstr "Lithuanian"
 
-#: src/about.c:183 src/about.c:215
+#: src/about.c:182 src/about.c:214
 msgid "Korean"
 msgstr "Korean"
 
-#: src/about.c:184
+#: src/about.c:183
 msgid "Dutch; Flemish"
 msgstr "Dutch; Flemish"
 
+#: src/about.c:184
+msgid "Macedonian"
+msgstr "Macedonian"
+
 #: src/about.c:185
-msgid "Macedonian"
-msgstr "Macedonian"
-
-#: src/about.c:186
 msgid "Norwegian"
 msgstr "Norwegian"
 
-#: src/about.c:187 src/about.c:216
+#: src/about.c:186 src/about.c:215
 msgid "Polish"
 msgstr "Polish"
 
-#: src/about.c:188
+#: src/about.c:187
 msgid "Portuguese"
 msgstr "Portuguese"
 
+#: src/about.c:188
+msgid "Portuguese-Brazil"
+msgstr "Portuguese-Brazil"
+
 #: src/about.c:189
-msgid "Portuguese-Brazil"
-msgstr "Portuguese-Brazil"
-
-#: src/about.c:190
 msgid "Romanian"
 msgstr "Romanian"
 
-#: src/about.c:191 src/about.c:217 src/about.c:218
+#: src/about.c:190 src/about.c:216 src/about.c:217
 msgid "Russian"
 msgstr "Russian"
 
+#: src/about.c:191
+msgid "Serbian"
+msgstr "Serbian"
+
 #: src/about.c:192
-msgid "Serbian"
-msgstr "Serbian"
-
-#: src/about.c:193
 msgid "Slovenian"
 msgstr "Slovenian"
 
-#: src/about.c:194 src/about.c:220
+#: src/about.c:193 src/about.c:219
 msgid "Swedish"
 msgstr "Swedish"
 
-#: src/about.c:195
+#: src/about.c:194
 msgid "Vietnamese"
 msgstr "Vietnamese"
 
-#: src/about.c:195
+#: src/about.c:194
 msgid "and the Gnome-Vi Team"
 msgstr "and the Gnome-Vi Team"
 
+#: src/about.c:195
+msgid "Simplified Chinese"
+msgstr "Simplified Chinese"
+
 #: src/about.c:196
-msgid "Simplified Chinese"
-msgstr "Simplified Chinese"
-
-#: src/about.c:197
 msgid "Traditional Chinese"
 msgstr "Traditional Chinese"
 
+#: src/about.c:203
+msgid "Past Translators"
+msgstr "Past Translators"
+
 #: src/about.c:204
-msgid "Past Translators"
-msgstr "Past Translators"
-
-#: src/about.c:205
 msgid "Amharic"
 msgstr "Amharic"
 
-#: src/about.c:219
+#: src/about.c:218
 msgid "Slovak"
 msgstr "Slovak"
 
-#: src/about.c:221
+#: src/about.c:220
 msgid "Chinese"
 msgstr "Chinese"
 
@@ -1502,46 +1504,46 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:342 src/connection.c:197 src/dialogs.c:462 src/dialogs.c:518
-#: src/dialogs.c:571 src/gtkblist.c:2391 src/gtkrequest.c:242
+#: src/account.c:342 src/connection.c:197 src/dialogs.c:473 src/dialogs.c:529
+#: src/dialogs.c:582 src/gtkblist.c:2380 src/gtkrequest.c:242
 #: src/protocols/jabber/jabber.c:1048 src/protocols/jabber/xdata.c:337
 #: src/protocols/msn/msn.c:226 src/protocols/msn/msn.c:241
 #: src/protocols/msn/msn.c:256 src/protocols/msn/msn.c:271
-#: src/protocols/oscar/oscar.c:3370 src/protocols/oscar/oscar.c:3464
-#: src/protocols/oscar/oscar.c:6758 src/protocols/oscar/oscar.c:6854
-#: src/protocols/oscar/oscar.c:6906 src/protocols/oscar/oscar.c:6992
+#: src/protocols/oscar/oscar.c:3361 src/protocols/oscar/oscar.c:3455
+#: src/protocols/oscar/oscar.c:6763 src/protocols/oscar/oscar.c:6855
+#: src/protocols/oscar/oscar.c:6907 src/protocols/oscar/oscar.c:6993
 #: src/protocols/silc/buddy.c:460 src/protocols/silc/buddy.c:1132
 #: src/protocols/silc/chat.c:409 src/protocols/silc/chat.c:447
-#: src/protocols/silc/chat.c:710 src/protocols/silc/ops.c:1063
-#: src/protocols/silc/ops.c:1671 src/protocols/silc/silc.c:692
-#: src/protocols/yahoo/yahoo.c:2752 src/protocols/yahoo/yahoo.c:2761
+#: src/protocols/silc/chat.c:710 src/protocols/silc/ops.c:1072
+#: src/protocols/silc/ops.c:1680 src/protocols/silc/silc.c:692
+#: src/protocols/yahoo/yahoo.c:2795 src/protocols/yahoo/yahoo.c:2804
 #: src/request.h:1243
 msgid "OK"
 msgstr "OK"
 
-#: src/account.c:343 src/account.c:381 src/away.c:334 src/connection.c:198
+#: src/account.c:343 src/account.c:381 src/away.c:349 src/connection.c:198
 #: src/dialogs.c:299 src/dialogs.c:311 src/dialogs.c:324 src/dialogs.c:345
-#: src/dialogs.c:463 src/dialogs.c:519 src/dialogs.c:572 src/dialogs.c:808
-#: src/dialogs.c:824 src/dialogs.c:842 src/gtkaccount.c:2002
-#: src/gtkaccount.c:2498 src/gtkblist.c:2392 src/gtkblist.c:4412
-#: src/gtkconn.c:168 src/gtkimhtmltoolbar.c:414 src/gtkprivacy.c:587
-#: src/gtkprivacy.c:600 src/gtkprivacy.c:625 src/gtkprivacy.c:636
+#: src/dialogs.c:474 src/dialogs.c:530 src/dialogs.c:583 src/dialogs.c:830
+#: src/dialogs.c:846 src/dialogs.c:864 src/gtkaccount.c:2005
+#: src/gtkaccount.c:2501 src/gtkblist.c:2381 src/gtkblist.c:4412
+#: src/gtkconn.c:168 src/gtkimhtmltoolbar.c:419 src/gtkprivacy.c:585
+#: src/gtkprivacy.c:598 src/gtkprivacy.c:623 src/gtkprivacy.c:634
 #: src/gtkrequest.c:243 src/protocols/icq/gaim_icq.c:277
-#: src/protocols/jabber/buddy.c:515 src/protocols/jabber/chat.c:710
+#: src/protocols/jabber/buddy.c:515 src/protocols/jabber/chat.c:702
 #: src/protocols/jabber/jabber.c:667 src/protocols/jabber/jabber.c:1049
 #: src/protocols/jabber/xdata.c:338 src/protocols/msn/msn.c:227
 #: src/protocols/msn/msn.c:242 src/protocols/msn/msn.c:257
 #: src/protocols/msn/msn.c:272 src/protocols/msn/msn.c:289
-#: src/protocols/oscar/oscar.c:1377 src/protocols/oscar/oscar.c:3330
-#: src/protocols/oscar/oscar.c:3371 src/protocols/oscar/oscar.c:3408
-#: src/protocols/oscar/oscar.c:3465 src/protocols/oscar/oscar.c:6759
-#: src/protocols/oscar/oscar.c:6855 src/protocols/oscar/oscar.c:6907
-#: src/protocols/oscar/oscar.c:6976 src/protocols/oscar/oscar.c:6993
+#: src/protocols/oscar/oscar.c:1363 src/protocols/oscar/oscar.c:3321
+#: src/protocols/oscar/oscar.c:3362 src/protocols/oscar/oscar.c:3399
+#: src/protocols/oscar/oscar.c:3456 src/protocols/oscar/oscar.c:6764
+#: src/protocols/oscar/oscar.c:6856 src/protocols/oscar/oscar.c:6908
+#: src/protocols/oscar/oscar.c:6977 src/protocols/oscar/oscar.c:6994
 #: src/protocols/silc/buddy.c:461 src/protocols/silc/buddy.c:1037
 #: src/protocols/silc/buddy.c:1133 src/protocols/silc/chat.c:582
-#: src/protocols/silc/chat.c:711 src/protocols/silc/ops.c:1672
+#: src/protocols/silc/chat.c:711 src/protocols/silc/ops.c:1681
 #: src/protocols/silc/silc.c:693 src/protocols/trepia/trepia.c:347
-#: src/protocols/yahoo/yahoo.c:2753 src/protocols/yahoo/yahoo.c:2762
+#: src/protocols/yahoo/yahoo.c:2796 src/protocols/yahoo/yahoo.c:2805
 #: src/request.h:1243 src/request.h:1253
 msgid "Cancel"
 msgstr "Cancel"
@@ -1556,34 +1558,34 @@
 msgid "Save"
 msgstr "Save"
 
-#: src/away.c:211
+#: src/away.c:227
 msgid "Away!"
 msgstr "Away!"
 
-#: src/away.c:276
+#: src/away.c:291
 msgid "I'm Back!"
 msgstr "I'm Back!"
 
-#: src/away.c:330
+#: src/away.c:345
 #, c-format
 msgid "Are you sure you want to remove the away message \"%s\"?"
 msgstr "Are you sure you want to remove the away message \"%s\"?"
 
-#: src/away.c:332 src/away.c:423
+#: src/away.c:347 src/away.c:438
 msgid "Remove Away Message"
 msgstr "Remove Away Message"
 
 #. Remove button
-#: src/away.c:333 src/gtkconv.c:1388 src/gtkconv.c:3680 src/gtkconv.c:3784
+#: src/away.c:348 src/gtkconv.c:1378 src/gtkconv.c:3718 src/gtkconv.c:3822
 #: src/gtkrequest.c:248
 msgid "Remove"
 msgstr "Remove"
 
-#: src/away.c:403
+#: src/away.c:418
 msgid "New Away Message"
 msgstr "New Away Message"
 
-#: src/away.c:618
+#: src/away.c:633
 msgid "Set All Away"
 msgstr "Set All Away"
 
@@ -1591,7 +1593,7 @@
 msgid "Chats"
 msgstr "Chats"
 
-#: src/blist.c:1321
+#: src/blist.c:1318
 #, c-format
 msgid ""
 "%d buddy from group %s was not removed because its account was not logged "
@@ -1606,16 +1608,11 @@
 "%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:1330
+#: src/blist.c:1327
 msgid "Group not removed"
 msgstr "Group not removed"
 
-#: src/blist.c:1393 src/gtkaccount.c:167 src/gtkft.c:154 src/gtkutils.c:627
-#: src/protocols/jabber/buddy.c:570 src/protocols/novell/novell.c:2736
-msgid "Unknown"
-msgstr "Unknown"
-
-#: src/blist.c:2001
+#: src/blist.c:2030
 msgid ""
 "An error was encountered parsing your buddy list.  It has not been loaded, "
 "and the old file has moved to blist.xml~."
@@ -1623,7 +1620,7 @@
 "An error was encountered parsing your buddy list.  It has not been loaded, "
 "and the old file has been moved to blist.xml~."
 
-#: src/blist.c:2004
+#: src/blist.c:2033
 msgid "Buddy List Error"
 msgstr "Buddy List Error"
 
@@ -1645,71 +1642,71 @@
 msgid "Enter password for %s"
 msgstr "Enter password for %s"
 
-#: src/conversation.c:261
+#: src/conversation.c:229
 msgid "Unable to send message. The message is too large."
 msgstr "Unable to send message. The message is too large."
 
-#: src/conversation.c:269
+#: src/conversation.c:237
 msgid "Unable to send message."
 msgstr "Unable to send message."
 
-#: src/conversation.c:1953
+#: src/conversation.c:1950
 #, c-format
 msgid "%s entered the room."
 msgstr "%s entered the room."
 
-#: src/conversation.c:1956
+#: src/conversation.c:1953
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] entered the room."
 
-#: src/conversation.c:2047
+#: src/conversation.c:2049
 #, c-format
 msgid "You are now known as %s"
 msgstr "You are now known as %s"
 
-#: src/conversation.c:2050
+#: src/conversation.c:2052
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s is now known as %s"
 
-#: src/conversation.c:2092
+#: src/conversation.c:2093
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s left the room (%s)."
 
-#: src/conversation.c:2094
+#: src/conversation.c:2095
 #, c-format
 msgid "%s left the room."
 msgstr "%s left the room."
 
-#: src/conversation.c:2165
+#: src/conversation.c:2164
 #, c-format
 msgid "(+%d more)"
 msgstr "(+%d more)"
 
-#: src/conversation.c:2167
+#: src/conversation.c:2166
 #, c-format
 msgid " left the room (%s)."
 msgstr " left the room (%s)."
 
-#: src/conversation.c:2457
+#: src/conversation.c:2571
 msgid "Last created window"
 msgstr "Last created window"
 
-#: src/conversation.c:2459
+#: src/conversation.c:2573
 msgid "Separate IM and Chat windows"
 msgstr "Separate IM and Chat windows"
 
-#: src/conversation.c:2461 src/gtkprefs.c:1384
+#: src/conversation.c:2575 src/gtkprefs.c:1377
 msgid "New window"
 msgstr "New window"
 
-#: src/conversation.c:2463
+#: src/conversation.c:2577
 msgid "By group"
 msgstr "By group"
 
-#: src/conversation.c:2465
+#: src/conversation.c:2579
 msgid "By account"
 msgstr "By account"
 
@@ -1788,103 +1785,103 @@
 msgid "Remove Contact"
 msgstr "Remove Contact"
 
-#: src/dialogs.c:444 src/dialogs.c:500 src/dialogs.c:552
+#: src/dialogs.c:455 src/dialogs.c:511 src/dialogs.c:563
 msgid "_Screen name"
 msgstr "_Screen name"
 
-#: src/dialogs.c:450 src/dialogs.c:506 src/dialogs.c:558
+#: src/dialogs.c:461 src/dialogs.c:517 src/dialogs.c:569
 msgid "_Account"
 msgstr "_Account"
 
-#: src/dialogs.c:457
+#: src/dialogs.c:468
 msgid "New Instant Message"
 msgstr "New Instant Message"
 
-#: src/dialogs.c:459
+#: src/dialogs.c:470
 msgid "Please enter the screen name of the person you would like to IM."
 msgstr "Please enter the screen name of the person you would like to IM."
 
-#: src/dialogs.c:513
+#: src/dialogs.c:524
 msgid "Get User Info"
 msgstr "Get User Info"
 
-#: src/dialogs.c:515
+#: src/dialogs.c:526
 msgid ""
 "Please enter the screen name of the person whose info you would like to view."
 msgstr ""
 "Please enter the screen name of the person whose info you would like to view."
 
-#: src/dialogs.c:566
+#: src/dialogs.c:577
 msgid "Get User Log"
 msgstr "Get User Log"
 
-#: src/dialogs.c:568
+#: src/dialogs.c:579
 msgid ""
 "Please enter the screen name of the person whose log you would like to view."
 msgstr ""
 "Please enter the screen name of the person whose log you would like to view."
 
-#: src/dialogs.c:623
+#: src/dialogs.c:645
 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:625
+#: src/dialogs.c:647
 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:635
+#: src/dialogs.c:657
 msgid "You cannot create an empty away message"
 msgstr "You cannot create an empty away message"
 
-#: src/dialogs.c:697
+#: src/dialogs.c:719
 msgid "New away message"
 msgstr "New away message"
 
-#: src/dialogs.c:718
+#: src/dialogs.c:740
 msgid "Away title: "
 msgstr "Away title: "
 
-#: src/dialogs.c:774
+#: src/dialogs.c:796
 msgid "_Save"
 msgstr "_Save"
 
-#: src/dialogs.c:778
+#: src/dialogs.c:800
 msgid "Sa_ve & Use"
 msgstr "Sa_ve & Use"
 
-#: src/dialogs.c:782
-msgid "_Use"
-msgstr "_Use"
-
 #: src/dialogs.c:804
+msgid "_Use"
+msgstr "_Use"
+
+#: src/dialogs.c:826
 msgid "Alias Chat"
 msgstr "Alias Chat"
 
-#: src/dialogs.c:805
+#: src/dialogs.c:827
 msgid "Enter an alias for this chat."
 msgstr "Enter an alias for this chat."
 
-#: src/dialogs.c:807 src/dialogs.c:823 src/dialogs.c:841 src/gtkrequest.c:250
+#: src/dialogs.c:829 src/dialogs.c:845 src/dialogs.c:863 src/gtkrequest.c:250
 #: src/protocols/silc/chat.c:572
 msgid "Alias"
 msgstr "Alias"
 
-#: src/dialogs.c:820
+#: src/dialogs.c:842
 msgid "Alias Contact"
 msgstr "Alias Contact"
 
-#: src/dialogs.c:821
+#: src/dialogs.c:843
 msgid "Enter an alias for this contact."
 msgstr "Enter an alias for this contact."
 
-#: src/dialogs.c:837
+#: src/dialogs.c:859
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Enter an alias for %s."
 
-#: src/dialogs.c:839
+#: src/dialogs.c:861
 msgid "Alias Buddy"
 msgstr "Alias Buddy"
 
@@ -1952,6 +1949,9 @@
 "\n"
 "    COMMANDS:\n"
 "       uri                      Handle AIM: URI\n"
+"       away                     Popup the away dialog with the default "
+"message\n"
+"       back                     Remove the away dialog\n"
 "       quit                     Close running copy of Gaim\n"
 "\n"
 "    OPTIONS:\n"
@@ -1961,16 +1961,20 @@
 "\n"
 "    COMMANDS:\n"
 "       uri                      Handle AIM: URI\n"
+"       away                     Popup the away dialog with the default "
+"message\n"
+"       back                     Remove the away dialog\n"
 "       quit                     Close running copy of Gaim\n"
 "\n"
 "    OPTIONS:\n"
 "       -h, --help [command]     Show help for command\n"
 
-#: src/gaim-remote.c:174 src/gaim-remote.c:190
+#: src/gaim-remote.c:176 src/gaim-remote.c:192 src/gaim-remote.c:208
+#: src/gaim-remote.c:224
 msgid "Gaim not running (on session 0)\n"
 msgstr "Gaim not running (on session 0)\n"
 
-#: src/gaim-remote.c:203
+#: src/gaim-remote.c:238
 msgid ""
 "\n"
 "Using AIM: URIs:\n"
@@ -2012,7 +2016,7 @@
 "\tgaim-remote uri 'aim:addbuddy?screenname=Penguin'\n"
 "...prompts you to add 'Penguin' to your buddy list.\n"
 
-#: src/gaim-remote.c:222
+#: src/gaim-remote.c:257
 msgid ""
 "\n"
 "Close running copy of Gaim\n"
@@ -2020,28 +2024,12 @@
 "\n"
 "Close running copy of Gaim\n"
 
-#. for people like myself, who are too lazy to add an away msg :)
-#: 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:372 src/gaimrc.c:1417
-msgid "boring default"
-msgstr "boring default"
-
-#: src/gaimrc.c:1227 src/gtkblist.c:3017
-msgid "Alphabetical"
-msgstr "Alphabetical"
-
-#: src/gaimrc.c:1229 src/gtkblist.c:3018
-msgid "By status"
-msgstr "By status"
-
-#: src/gaimrc.c:1231 src/gtkblist.c:3019
-msgid "By log size"
-msgstr "By log size"
-
-#: src/gtkaccount.c:331
+#: src/gtkaccount.c:169 src/gtkft.c:154 src/gtkutils.c:627
+#: src/protocols/jabber/buddy.c:570 src/protocols/novell/novell.c:2783
+msgid "Unknown"
+msgstr "Unknown"
+
+#: src/gtkaccount.c:333
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -2053,164 +2041,164 @@
 "<b>Image size:</b> %dx%d"
 
 #. Build the login options frame.
-#: src/gtkaccount.c:614
+#: src/gtkaccount.c:621
 msgid "Login Options"
 msgstr "Login Options"
 
-#: src/gtkaccount.c:631
+#: src/gtkaccount.c:638
 msgid "Protocol:"
 msgstr "Protocol:"
 
-#: src/gtkaccount.c:636 src/gtkblist.c:4018
+#: src/gtkaccount.c:643 src/gtkblist.c:4018
 msgid "Screen Name:"
 msgstr "Screen Name:"
 
-#: src/gtkaccount.c:709
+#: src/gtkaccount.c:716
 msgid "Password:"
 msgstr "Password:"
 
-#: src/gtkaccount.c:714 src/gtkblist.c:4032 src/gtkblist.c:4360
+#: src/gtkaccount.c:721 src/gtkblist.c:4032 src/gtkblist.c:4360
 msgid "Alias:"
 msgstr "Alias:"
 
-#: src/gtkaccount.c:718
+#: src/gtkaccount.c:725
 msgid "Remember password"
 msgstr "Remember password"
 
 #. Build the user options frame.
-#: src/gtkaccount.c:774
+#: src/gtkaccount.c:781
 msgid "User Options"
 msgstr "User Options"
 
-#: src/gtkaccount.c:787
+#: src/gtkaccount.c:794
 msgid "New mail notifications"
 msgstr "New mail notifications"
 
-#: src/gtkaccount.c:796
+#: src/gtkaccount.c:803
 msgid "Buddy icon:"
 msgstr "Buddy icon:"
 
 #. Build the protocol options frame.
-#: src/gtkaccount.c:885
+#: src/gtkaccount.c:892
 #, c-format
 msgid "%s Options"
 msgstr "%s Options"
 
 #. Use Global Proxy Settings
-#: src/gtkaccount.c:1021 src/gtkaccount.c:1068
+#: src/gtkaccount.c:1028 src/gtkaccount.c:1075
 msgid "Use Global Proxy Settings"
 msgstr "Use Global Proxy Settings"
 
 #. No Proxy
-#: src/gtkaccount.c:1027 src/gtkaccount.c:1075
+#: src/gtkaccount.c:1034 src/gtkaccount.c:1082
 msgid "No Proxy"
 msgstr "No Proxy"
 
 #. HTTP
-#: src/gtkaccount.c:1033 src/gtkaccount.c:1082
+#: src/gtkaccount.c:1040 src/gtkaccount.c:1089
 msgid "HTTP"
 msgstr "HTTP"
 
 #. SOCKS 4
-#: src/gtkaccount.c:1039 src/gtkaccount.c:1089
+#: src/gtkaccount.c:1046 src/gtkaccount.c:1096
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
 #. SOCKS 5
-#: src/gtkaccount.c:1045 src/gtkaccount.c:1096
+#: src/gtkaccount.c:1052 src/gtkaccount.c:1103
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:1051 src/gtkaccount.c:1103 src/gtkprefs.c:1187
+#: src/gtkaccount.c:1058 src/gtkaccount.c:1110 src/gtkprefs.c:1180
 msgid "Use Environmental Settings"
 msgstr "Use Environmental Settings"
 
-#: src/gtkaccount.c:1142
+#: src/gtkaccount.c:1149
 msgid "you can see the butterflies mating"
 msgstr "you can see the butterflies mating"
 
-#: src/gtkaccount.c:1146
+#: src/gtkaccount.c:1153
 msgid "If you look real closely"
 msgstr "If you look real closely"
 
-#: src/gtkaccount.c:1162
+#: src/gtkaccount.c:1169
 msgid "Proxy Options"
 msgstr "Proxy Options"
 
-#: src/gtkaccount.c:1180 src/gtkprefs.c:1181
+#: src/gtkaccount.c:1187 src/gtkprefs.c:1174
 msgid "Proxy _type:"
 msgstr "Proxy _type:"
 
-#: src/gtkaccount.c:1189 src/gtkprefs.c:1208
+#: src/gtkaccount.c:1196 src/gtkprefs.c:1201
 msgid "_Host:"
 msgstr "_Host:"
 
-#: src/gtkaccount.c:1193 src/gtkprefs.c:1226
+#: src/gtkaccount.c:1200 src/gtkprefs.c:1219
 msgid "_Port:"
 msgstr "_Port:"
 
-#: src/gtkaccount.c:1201
+#: src/gtkaccount.c:1208
 msgid "_Username:"
 msgstr "_Username:"
 
-#: src/gtkaccount.c:1206 src/gtkprefs.c:1263
+#: src/gtkaccount.c:1213 src/gtkprefs.c:1256
 msgid "Pa_ssword:"
 msgstr "Pa_ssword:"
 
-#: src/gtkaccount.c:1578
+#: src/gtkaccount.c:1581
 msgid "Add Account"
 msgstr "Add Account"
 
-#: src/gtkaccount.c:1580
+#: src/gtkaccount.c:1583
 msgid "Modify Account"
 msgstr "Modify Account"
 
 #. Add the disclosure
-#: src/gtkaccount.c:1604
+#: src/gtkaccount.c:1607
 msgid "Show more options"
 msgstr "Show more options"
 
-#: src/gtkaccount.c:1605
+#: src/gtkaccount.c:1608
 msgid "Show fewer options"
 msgstr "Show fewer options"
 
 #. Register button
-#: src/gtkaccount.c:1632 src/protocols/jabber/jabber.c:666
+#: src/gtkaccount.c:1635 src/protocols/jabber/jabber.c:666
 msgid "Register"
 msgstr "Register"
 
-#: src/gtkaccount.c:1997
+#: src/gtkaccount.c:2000
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Are you sure you want to delete %s?"
 
-#: src/gtkaccount.c:2001 src/gtkrequest.c:246
+#: src/gtkaccount.c:2004 src/gtkrequest.c:246
 msgid "Delete"
 msgstr "Delete"
 
-#: src/gtkaccount.c:2115 src/protocols/oscar/oscar.c:3998
+#: src/gtkaccount.c:2118 src/protocols/oscar/oscar.c:3990
 msgid "Screen Name"
 msgstr "Screen Name"
 
-#: src/gtkaccount.c:2139 src/protocols/jabber/jabber.c:958
-#: src/protocols/oscar/oscar.c:538 src/protocols/oscar/oscar.c:5482
-#: src/protocols/oscar/oscar.c:6688 src/protocols/silc/silc.c:44
-#: src/protocols/yahoo/yahoo.c:2515 src/protocols/zephyr/zephyr.c:1360
-#: src/protocols/zephyr/zephyr.c:1372
+#: src/gtkaccount.c:2142 src/protocols/jabber/jabber.c:958
+#: src/protocols/oscar/oscar.c:522 src/protocols/oscar/oscar.c:5484
+#: src/protocols/oscar/oscar.c:6691 src/protocols/silc/silc.c:44
+#: src/protocols/yahoo/yahoo.c:2558 src/protocols/zephyr/zephyr.c:1363
+#: src/protocols/zephyr/zephyr.c:1375
 msgid "Online"
 msgstr "Online"
 
-#: src/gtkaccount.c:2160
+#: src/gtkaccount.c:2163
 msgid "Protocol"
 msgstr "Protocol"
 
-#: src/gtkaccount.c:2473
+#: src/gtkaccount.c:2476
 #, 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:2487
+#: src/gtkaccount.c:2490
 msgid ""
 "\n"
 "\n"
@@ -2220,27 +2208,27 @@
 "\n"
 "Do you wish to add him or her to your buddy list?"
 
-#: src/gtkaccount.c:2491
+#: src/gtkaccount.c:2494
 msgid "Information"
 msgstr "Information"
 
-#: src/gtkaccount.c:2495
+#: src/gtkaccount.c:2498
 msgid "Add buddy to your list?"
 msgstr "Add buddy to your list?"
 
 #. Add button
-#: src/gtkaccount.c:2497 src/gtkblist.c:4411 src/gtkconv.c:1390
-#: src/gtkconv.c:3673 src/gtkconv.c:3777 src/gtkrequest.c:247
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:3627
+#: src/gtkaccount.c:2500 src/gtkblist.c:4411 src/gtkconv.c:1380
+#: src/gtkconv.c:3711 src/gtkconv.c:3815 src/gtkrequest.c:247
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:3618
 #: src/protocols/silc/chat.c:581
 msgid "Add"
 msgstr "Add"
 
-#: src/gtkblist.c:815
+#: src/gtkblist.c:802
 msgid "Join a Chat"
 msgstr "Join a Chat"
 
-#: src/gtkblist.c:836
+#: src/gtkblist.c:823
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
@@ -2248,203 +2236,203 @@
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 
-#: src/gtkblist.c:847 src/gtkpounce.c:412 src/gtkroomlist.c:354
+#: src/gtkblist.c:834 src/gtkpounce.c:411 src/gtkroomlist.c:353
 msgid "_Account:"
 msgstr "_Account:"
 
-#: src/gtkblist.c:1133 src/gtkblist.c:3212
+#: src/gtkblist.c:1122 src/gtkblist.c:3204
 msgid "Get _Info"
 msgstr "Get _Info"
 
-#: src/gtkblist.c:1136 src/gtkblist.c:3203
+#: src/gtkblist.c:1125 src/gtkblist.c:3194
 msgid "I_M"
 msgstr "I_M"
 
-#: src/gtkblist.c:1141
+#: src/gtkblist.c:1130
 msgid "_Send File"
 msgstr "_Send File"
 
-#: src/gtkblist.c:1145
+#: src/gtkblist.c:1134
 msgid "Add Buddy _Pounce"
 msgstr "Add Buddy _Pounce"
 
-#: src/gtkblist.c:1147
+#: src/gtkblist.c:1136
 msgid "View _Log"
 msgstr "View _Log"
 
-#: src/gtkblist.c:1155 src/gtkblist.c:1241 src/gtkblist.c:1255
+#: src/gtkblist.c:1144 src/gtkblist.c:1230 src/gtkblist.c:1244
 msgid "_Alias..."
 msgstr "_Alias..."
 
-#: src/gtkblist.c:1157 src/gtkblist.c:1243 src/gtkblist.c:1260
-#: src/gtkconn.c:361
+#: src/gtkblist.c:1146 src/gtkblist.c:1232 src/gtkblist.c:1249
+#: src/gtkconn.c:360
 msgid "_Remove"
 msgstr "_Remove"
 
-#: src/gtkblist.c:1203
+#: src/gtkblist.c:1192
 msgid "Add a _Buddy"
 msgstr "Add a _Buddy"
 
-#: src/gtkblist.c:1205
+#: src/gtkblist.c:1194
 msgid "Add a C_hat"
 msgstr "Add a C_hat"
 
-#: src/gtkblist.c:1207
+#: src/gtkblist.c:1196
 msgid "_Delete Group"
 msgstr "_Delete Group"
 
-#: src/gtkblist.c:1209
+#: src/gtkblist.c:1198
 msgid "_Rename"
 msgstr "_Rename"
 
 #. join button
-#: src/gtkblist.c:1231 src/gtkroomlist.c:263 src/gtkroomlist.c:409
+#: src/gtkblist.c:1220 src/gtkroomlist.c:263 src/gtkroomlist.c:408
 #: src/stock.c:87
 msgid "_Join"
 msgstr "_Join"
 
-#: src/gtkblist.c:1233
+#: src/gtkblist.c:1222
 msgid "Auto-Join"
 msgstr "Auto-Join"
 
-#: src/gtkblist.c:1257 src/gtkblist.c:1286
+#: src/gtkblist.c:1246 src/gtkblist.c:1275
 msgid "_Collapse"
 msgstr "_Collapse"
 
-#: src/gtkblist.c:1291
+#: src/gtkblist.c:1280
 msgid "_Expand"
 msgstr "_Expand"
 
-#: src/gtkblist.c:1949 src/gtkconv.c:4315 src/gtkpounce.c:314
+#: src/gtkblist.c:1938 src/gtkconv.c:4405 src/gtkpounce.c:314
 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:2336
+#: src/gtkblist.c:2325
 msgid "/_Buddies"
 msgstr "/_Buddies"
 
-#: src/gtkblist.c:2337
+#: src/gtkblist.c:2326
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Buddies/New Instant _Message..."
 
-#: src/gtkblist.c:2338
+#: src/gtkblist.c:2327
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Buddies/Join a _Chat..."
 
-#: src/gtkblist.c:2339
+#: src/gtkblist.c:2328
 msgid "/Buddies/Get User _Info..."
 msgstr "/Buddies/Get User _Info..."
 
-#: src/gtkblist.c:2340
+#: src/gtkblist.c:2329
 msgid "/Buddies/View User _Log..."
 msgstr "/Buddies/View User _Log..."
 
-#: src/gtkblist.c:2342
+#: src/gtkblist.c:2331
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Buddies/Show _Offline Buddies"
 
-#: src/gtkblist.c:2343
+#: src/gtkblist.c:2332
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Buddies/Show _Empty Groups"
 
-#: src/gtkblist.c:2344
+#: src/gtkblist.c:2333
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Buddies/_Add Buddy..."
 
-#: src/gtkblist.c:2345
+#: src/gtkblist.c:2334
 msgid "/Buddies/Add C_hat..."
 msgstr "/Buddies/Add C_hat..."
 
-#: src/gtkblist.c:2346
+#: src/gtkblist.c:2335
 msgid "/Buddies/Add _Group..."
 msgstr "/Buddies/Add _Group..."
 
-#: src/gtkblist.c:2348
+#: src/gtkblist.c:2337
 msgid "/Buddies/_Signoff"
 msgstr "/Buddies/_Signoff"
 
-#: src/gtkblist.c:2349
+#: src/gtkblist.c:2338
 msgid "/Buddies/_Quit"
 msgstr "/Buddies/_Quit"
 
 #. Tools
-#: src/gtkblist.c:2352
+#: src/gtkblist.c:2341
 msgid "/_Tools"
 msgstr "/_Tools"
 
-#: src/gtkblist.c:2353
+#: src/gtkblist.c:2342
 msgid "/Tools/_Away"
 msgstr "/Tools/_Away"
 
-#: src/gtkblist.c:2354
+#: src/gtkblist.c:2343
 msgid "/Tools/Buddy _Pounce"
 msgstr "/Tools/Buddy _Pounce"
 
-#: src/gtkblist.c:2355
+#: src/gtkblist.c:2344
 msgid "/Tools/Account Ac_tions"
 msgstr "/Tools/Account Ac_tions"
 
-#: src/gtkblist.c:2356
+#: src/gtkblist.c:2345
 msgid "/Tools/Pl_ugin Actions"
 msgstr "/Tools/Pl_ugin Actions"
 
-#: src/gtkblist.c:2358
+#: src/gtkblist.c:2347
 msgid "/Tools/A_ccounts"
 msgstr "/Tools/A_ccounts"
 
-#: src/gtkblist.c:2359
+#: src/gtkblist.c:2348
 msgid "/Tools/_File Transfers"
 msgstr "/Tools/_File Transfers"
 
-#: src/gtkblist.c:2360
+#: src/gtkblist.c:2349
 msgid "/Tools/R_oom List"
 msgstr "/Tools/R_oom List"
 
-#: src/gtkblist.c:2361
+#: src/gtkblist.c:2350
 msgid "/Tools/Pr_eferences"
 msgstr "/Tools/Pr_eferences"
 
-#: src/gtkblist.c:2362
+#: src/gtkblist.c:2351
 msgid "/Tools/Pr_ivacy"
 msgstr "/Tools/Pr_ivacy"
 
-#: src/gtkblist.c:2364
+#: src/gtkblist.c:2353
 msgid "/Tools/View System _Log"
 msgstr "/Tools/View System _Log"
 
 #. Help
-#: src/gtkblist.c:2367
+#: src/gtkblist.c:2356
 msgid "/_Help"
 msgstr "/_Help"
 
-#: src/gtkblist.c:2368
+#: src/gtkblist.c:2357
 msgid "/Help/Online _Help"
 msgstr "/Help/Online _Help"
 
-#: src/gtkblist.c:2369
+#: src/gtkblist.c:2358
 msgid "/Help/_Debug Window"
 msgstr "/Help/_Debug Window"
 
-#: src/gtkblist.c:2370
+#: src/gtkblist.c:2359
 msgid "/Help/_About"
 msgstr "/Help/_About"
 
-#: src/gtkblist.c:2388
+#: src/gtkblist.c:2377
 msgid "Rename Group"
 msgstr "Rename Group"
 
-#: src/gtkblist.c:2388
+#: src/gtkblist.c:2377
 msgid "New group name"
 msgstr "New group name"
 
-#: src/gtkblist.c:2389
+#: src/gtkblist.c:2378
 msgid "Please enter a new name for the selected group."
 msgstr "Please enter a new name for the selected group."
 
-#: src/gtkblist.c:2417
+#: src/gtkblist.c:2406
 #, c-format
 msgid ""
 "\n"
@@ -2453,7 +2441,7 @@
 "\n"
 "<b>Account:</b> %s"
 
-#: src/gtkblist.c:2481
+#: src/gtkblist.c:2470
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
@@ -2461,12 +2449,12 @@
 "\n"
 "<b>Status:</b> Offline"
 
-#: src/gtkblist.c:2496
+#: src/gtkblist.c:2485
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:2512
+#: src/gtkblist.c:2501
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -2474,7 +2462,7 @@
 "\n"
 "<b>Account:</b>"
 
-#: src/gtkblist.c:2513
+#: src/gtkblist.c:2502
 msgid ""
 "\n"
 "<b>Contact Alias:</b>"
@@ -2482,7 +2470,7 @@
 "\n"
 "<b>Contact Alias:</b>"
 
-#: src/gtkblist.c:2514
+#: src/gtkblist.c:2503
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -2490,7 +2478,7 @@
 "\n"
 "<b>Alias:</b>"
 
-#: src/gtkblist.c:2515
+#: src/gtkblist.c:2504
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -2498,7 +2486,7 @@
 "\n"
 "<b>Nickname:</b>"
 
-#: src/gtkblist.c:2516
+#: src/gtkblist.c:2505
 msgid ""
 "\n"
 "<b>Logged In:</b>"
@@ -2506,7 +2494,7 @@
 "\n"
 "<b>Logged In:</b>"
 
-#: src/gtkblist.c:2517
+#: src/gtkblist.c:2506
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -2514,7 +2502,7 @@
 "\n"
 "<b>Idle:</b>"
 
-#: src/gtkblist.c:2518
+#: src/gtkblist.c:2507
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -2522,7 +2510,7 @@
 "\n"
 "<b>Warned:</b>"
 
-#: src/gtkblist.c:2520
+#: src/gtkblist.c:2509
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2530,7 +2518,7 @@
 "\n"
 "<b>Description:</b> Spooky"
 
-#: src/gtkblist.c:2521
+#: src/gtkblist.c:2510
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
@@ -2538,7 +2526,7 @@
 "\n"
 "<b>Status</b>: Awesome"
 
-#: src/gtkblist.c:2522
+#: src/gtkblist.c:2511
 msgid ""
 "\n"
 "<b>Status</b>: Rockin'"
@@ -2546,92 +2534,104 @@
 "\n"
 "<b>Status</b>: Rockin'"
 
-#: src/gtkblist.c:2804
+#: src/gtkblist.c:2793
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "Idle (%dh%02dm) "
 
-#: src/gtkblist.c:2806
+#: src/gtkblist.c:2795
 #, c-format
 msgid "Idle (%dm) "
 msgstr "Idle (%dm) "
 
-#: src/gtkblist.c:2811
+#: src/gtkblist.c:2800
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "Warned (%d%%) "
 
-#: src/gtkblist.c:2814
+#: src/gtkblist.c:2803
 msgid "Offline "
 msgstr "Offline "
 
 #. Make menu items sensitive/insensitive where appropriate
-#: src/gtkblist.c:2932
+#: src/gtkblist.c:2921
 msgid "/Buddies/Join a Chat..."
 msgstr "/Buddies/Join a Chat..."
 
-#: src/gtkblist.c:2935
+#: src/gtkblist.c:2924
 msgid "/Tools/Room List"
 msgstr "/Tools/Room List"
 
-#: src/gtkblist.c:2938
+#: src/gtkblist.c:2927
 msgid "/Tools/Privacy"
 msgstr "/Tools/Privacy"
 
+#: src/gtkblist.c:3008
+msgid "Alphabetical"
+msgstr "Alphabetical"
+
+#: src/gtkblist.c:3009
+msgid "By status"
+msgstr "By status"
+
+#: src/gtkblist.c:3010
+msgid "By log size"
+msgstr "By log size"
+
+#: src/gtkblist.c:3076
+msgid "/Tools/Away"
+msgstr "/Tools/Away"
+
+#: src/gtkblist.c:3079
+msgid "/Tools/Buddy Pounce"
+msgstr "/Tools/Buddy Pounce"
+
+#: src/gtkblist.c:3082
+msgid "/Tools/Account Actions"
+msgstr "/Tools/Account Actions"
+
 #: src/gtkblist.c:3085
-msgid "/Tools/Away"
-msgstr "/Tools/Away"
-
-#: src/gtkblist.c:3088
-msgid "/Tools/Buddy Pounce"
-msgstr "/Tools/Buddy Pounce"
-
-#: src/gtkblist.c:3091
-msgid "/Tools/Account Actions"
-msgstr "/Tools/Account Actions"
-
-#: src/gtkblist.c:3094
 msgid "/Tools/Plugin Actions"
 msgstr "/Tools/Plugin Actions"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:3183
+#: src/gtkblist.c:3174
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Buddies/Show Offline Buddies"
 
-#: src/gtkblist.c:3185
+#: src/gtkblist.c:3176
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Buddies/Show Empty Groups"
 
-#: src/gtkblist.c:3209
+#: src/gtkblist.c:3200
 msgid "Send a message to the selected buddy"
 msgstr "Send a message to the selected buddy"
 
-#: src/gtkblist.c:3218
+#: src/gtkblist.c:3210
 msgid "Get information on the selected buddy"
 msgstr "Get information on the selected buddy"
 
-#: src/gtkblist.c:3221
+#: src/gtkblist.c:3214
 msgid "_Chat"
 msgstr "_Chat"
 
-#: src/gtkblist.c:3226
+#: src/gtkblist.c:3219
 msgid "Join a chat room"
 msgstr "Join a chat room"
 
-#: src/gtkblist.c:3229
+#: src/gtkblist.c:3224
 msgid "_Away"
 msgstr "_Away"
 
-#: src/gtkblist.c:3234
+#: src/gtkblist.c:3229
 msgid "Set an away message"
 msgstr "Set an away message"
 
 #: src/gtkblist.c:3972 src/protocols/silc/buddy.c:731
 #: src/protocols/silc/buddy.c:989 src/protocols/silc/buddy.c:1034
-#: src/protocols/silc/buddy.c:1124 src/protocols/yahoo/yahoo.c:2682
+#: src/protocols/silc/buddy.c:1124 src/protocols/yahoo/yahoo.c:2725
 msgid "Add Buddy"
 msgstr "Add Buddy"
 
@@ -2682,7 +2682,7 @@
 msgid "No actions available"
 msgstr "No actions available"
 
-#: src/gtkconn.c:78 src/gtkconn.c:250 src/gtkconn.c:261
+#: src/gtkconn.c:78 src/gtkconn.c:249 src/gtkconn.c:260
 msgid "Done."
 msgstr "Done."
 
@@ -2694,15 +2694,15 @@
 msgid "Signon"
 msgstr "Signon"
 
-#: src/gtkconn.c:216
+#: src/gtkconn.c:215
 msgid "Cancel All"
 msgstr "Cancel All"
 
-#: src/gtkconn.c:361 src/gtkconn.c:593
+#: src/gtkconn.c:360 src/gtkconn.c:592
 msgid "_Reconnect"
 msgstr "_Reconnect"
 
-#: src/gtkconn.c:557
+#: src/gtkconn.c:556
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">%s has been disconnected.</span>\n"
@@ -2715,15 +2715,15 @@
 "%s\n"
 "%s"
 
-#: src/gtkconn.c:559
+#: src/gtkconn.c:558
 msgid "Reason Unknown."
 msgstr "Reason Unknown."
 
-#: src/gtkconn.c:598
+#: src/gtkconn.c:597
 msgid "Reconnect _All"
 msgstr "Reconnect _All"
 
-#: src/gtkconn.c:628
+#: src/gtkconn.c:627
 msgid "Time"
 msgstr "Time"
 
@@ -2736,7 +2736,11 @@
 msgid "Supported debug options are:  version"
 msgstr "Supported debug options are:  version"
 
-#: src/gtkconv.c:336
+#: src/gtkconv.c:347
+msgid "No such command (in this context)."
+msgstr "No such command (in this context)."
+
+#: src/gtkconv.c:350
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -2744,11 +2748,7 @@
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
 
-#: src/gtkconv.c:370
-msgid "No such command (in this context)."
-msgstr "No such command (in this context)."
-
-#: src/gtkconv.c:443
+#: src/gtkconv.c:434
 msgid ""
 "No such command. If you didn't mean to type a command, you can turn commands "
 "off from Tools->Preferences->Interface->Conversation->Enable \"slash\" "
@@ -2758,7 +2758,7 @@
 "off from Tools->Preferences->Interface->Conversation->Enable \"slash\" "
 "commands."
 
-#: src/gtkconv.c:451
+#: src/gtkconv.c:442
 msgid ""
 "Syntax Error:  You typed the wrong number of arguments to that command. If "
 "you didn't mean to type a command, you can turn commands off from Tools-"
@@ -2768,28 +2768,28 @@
 "you didn't mean to type a command, you can turn commands off from Tools-"
 ">Preferences->Interface->Conversation->Enable \"slash\" commands."
 
-#: src/gtkconv.c:458
+#: src/gtkconv.c:449
 msgid "Your command failed for an unknown reason."
 msgstr "Your command failed for an unknown reason."
 
-#: src/gtkconv.c:465
+#: src/gtkconv.c:456
 msgid "That command only works in Chats, not IMs."
 msgstr "That command only works in Chats, not IMs."
 
-#: src/gtkconv.c:468
+#: src/gtkconv.c:459
 msgid "That command only works in IMs, not Chats."
 msgstr "That command only works in IMs, not Chats."
 
-#: src/gtkconv.c:472
+#: src/gtkconv.c:463
 msgid "That command doesn't work on this protocol."
 msgstr "That command doesn't work on this protocol."
 
-#: src/gtkconv.c:693
+#: src/gtkconv.c:685
 msgid "Invite Buddy Into Chat Room"
 msgstr "Invite Buddy Into Chat Room"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:721
+#: src/gtkconv.c:713
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -2797,348 +2797,347 @@
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 
-#: src/gtkconv.c:742
+#: src/gtkconv.c:734
 msgid "_Buddy:"
 msgstr "_Buddy:"
 
-#: src/gtkconv.c:762
+#: src/gtkconv.c:754
 msgid "_Message:"
 msgstr "_Message:"
 
-#: src/gtkconv.c:799 src/gtkconv.c:2489 src/gtkdebug.c:182
+#: src/gtkconv.c:791 src/gtkconv.c:2476 src/gtkdebug.c:182
 msgid "Unable to open file."
 msgstr "Unable to read file."
 
-#: src/gtkconv.c:804
+#: src/gtkconv.c:796
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Conversation with %s</h1>\n"
 
-#: src/gtkconv.c:818
+#: src/gtkconv.c:810
 msgid "Save Conversation"
 msgstr "Save Conversation"
 
-#: src/gtkconv.c:895 src/gtkdebug.c:131
+#: src/gtkconv.c:887 src/gtkdebug.c:131
 msgid "Find"
 msgstr "Find"
 
-#: src/gtkconv.c:921 src/gtkdebug.c:159
+#: src/gtkconv.c:913 src/gtkdebug.c:159
 msgid "_Search for:"
 msgstr "_Search for:"
 
-#: src/gtkconv.c:1338
+#: src/gtkconv.c:1328
 msgid "IM"
 msgstr "IM"
 
-#. Block button
-#: src/gtkconv.c:1347 src/gtkconv.c:3666 src/protocols/oscar/oscar.c:453
-#: src/protocols/oscar/oscar.c:6798
+#. Send File button
+#: src/gtkconv.c:1337 src/gtkconv.c:3704 src/protocols/oscar/oscar.c:437
 msgid "Send File"
 msgstr "Send File"
 
-#: src/gtkconv.c:1356
+#: src/gtkconv.c:1346
 msgid "Un-Ignore"
 msgstr "Un-Ignore"
 
-#: src/gtkconv.c:1358 src/gtkprefs.c:826
+#: src/gtkconv.c:1348 src/gtkprefs.c:825
 msgid "Ignore"
 msgstr "Ignore"
 
 #. Info button
-#: src/gtkconv.c:1367 src/gtkconv.c:3687
+#: src/gtkconv.c:1357 src/gtkconv.c:3725
 msgid "Info"
 msgstr "Info"
 
-#: src/gtkconv.c:1376
+#: src/gtkconv.c:1366
 msgid "Get Away Msg"
 msgstr "Get Away Msg"
 
-#: src/gtkconv.c:2497
+#: src/gtkconv.c:2484
 msgid "Unable to save icon file to disk."
 msgstr "Unable to save icon file to disk."
 
-#: src/gtkconv.c:2514
+#: src/gtkconv.c:2501
 msgid "Save Icon"
 msgstr "Save Icon"
 
-#: src/gtkconv.c:2544
+#: src/gtkconv.c:2531
 msgid "Animate"
 msgstr "Animate"
 
-#: src/gtkconv.c:2549
+#: src/gtkconv.c:2536
 msgid "Hide Icon"
 msgstr "Hide Icon"
 
-#: src/gtkconv.c:2555
+#: src/gtkconv.c:2542
 msgid "Save Icon As..."
 msgstr "Save Icon As..."
 
-#: src/gtkconv.c:2939
+#: src/gtkconv.c:2926
 msgid "User is typing..."
 msgstr "User is typing..."
 
-#: src/gtkconv.c:2947
+#: src/gtkconv.c:2934
 msgid "User has typed something and paused"
 msgstr "User has typed something and paused"
 
 #. Build the Send As menu
-#: src/gtkconv.c:3050
+#: src/gtkconv.c:3037
 msgid "_Send As"
 msgstr "_Send As"
 
 #. Conversation menu
-#: src/gtkconv.c:3450
+#: src/gtkconv.c:3488
 msgid "/_Conversation"
 msgstr "/_Conversation"
 
-#: src/gtkconv.c:3452
+#: src/gtkconv.c:3490
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Conversation/New Instant _Message..."
 
-#: src/gtkconv.c:3457
+#: src/gtkconv.c:3495
 msgid "/Conversation/_Find..."
 msgstr "/Conversation/_Find..."
 
-#: src/gtkconv.c:3459
+#: src/gtkconv.c:3497
 msgid "/Conversation/View _Log"
 msgstr "/Conversation/View _Log"
 
-#: src/gtkconv.c:3460
+#: src/gtkconv.c:3498
 msgid "/Conversation/_Save As..."
 msgstr "/Conversation/_Save As..."
 
-#: src/gtkconv.c:3462
+#: src/gtkconv.c:3500
 msgid "/Conversation/Clear"
 msgstr "/Conversation/Clear"
 
-#: src/gtkconv.c:3466
+#: src/gtkconv.c:3504
 msgid "/Conversation/Se_nd File..."
 msgstr "/Conversation/Se_nd File..."
 
-#: src/gtkconv.c:3467
+#: src/gtkconv.c:3505
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Conversation/Add Buddy _Pounce..."
 
-#: src/gtkconv.c:3469
+#: src/gtkconv.c:3507
 msgid "/Conversation/_Get Info"
 msgstr "/Conversation/_Get Info"
 
-#: src/gtkconv.c:3471
+#: src/gtkconv.c:3509
 msgid "/Conversation/_Warn..."
 msgstr "/Conversation/_Warn..."
 
-#: src/gtkconv.c:3473
+#: src/gtkconv.c:3511
 msgid "/Conversation/In_vite..."
 msgstr "/Conversation/In_vite..."
 
-#: src/gtkconv.c:3478
+#: src/gtkconv.c:3516
 msgid "/Conversation/A_lias..."
 msgstr "/Conversation/A_lias..."
 
-#: src/gtkconv.c:3480
+#: src/gtkconv.c:3518
 msgid "/Conversation/_Block..."
 msgstr "/Conversation/_Block..."
 
-#: src/gtkconv.c:3482
+#: src/gtkconv.c:3520
 msgid "/Conversation/_Add..."
 msgstr "/Conversation/_Add..."
 
-#: src/gtkconv.c:3484
+#: src/gtkconv.c:3522
 msgid "/Conversation/_Remove..."
 msgstr "/Conversation/_Remove..."
 
-#: src/gtkconv.c:3489
+#: src/gtkconv.c:3527
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Conversation/Insert Lin_k..."
 
-#: src/gtkconv.c:3491
+#: src/gtkconv.c:3529
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Conversation/Insert Imag_e..."
 
-#: src/gtkconv.c:3496
+#: src/gtkconv.c:3534
 msgid "/Conversation/_Close"
 msgstr "/Conversation/_Close"
 
 #. Options
-#: src/gtkconv.c:3500
+#: src/gtkconv.c:3538
 msgid "/_Options"
 msgstr "/_Options"
 
-#: src/gtkconv.c:3501
+#: src/gtkconv.c:3539
 msgid "/Options/Enable _Logging"
 msgstr "/Options/Enable _Logging"
 
-#: src/gtkconv.c:3502
+#: src/gtkconv.c:3540
 msgid "/Options/Enable _Sounds"
 msgstr "/Options/Enable _Sounds"
 
-#: src/gtkconv.c:3503
+#: src/gtkconv.c:3541
 msgid "/Options/Show Formatting _Toolbar"
 msgstr "/Options/Show Formatting _Toolbar"
 
-#: src/gtkconv.c:3504
+#: src/gtkconv.c:3542
 msgid "/Options/Show T_imestamps"
 msgstr "/Options/Show T_imestamps"
 
-#: src/gtkconv.c:3546
+#: src/gtkconv.c:3584
 msgid "/Conversation/View Log"
 msgstr "/Conversation/View Log"
 
-#: src/gtkconv.c:3551
+#: src/gtkconv.c:3589
 msgid "/Conversation/Send File..."
 msgstr "/Conversation/Send File..."
 
-#: src/gtkconv.c:3555
+#: src/gtkconv.c:3593
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversation/Add Buddy Pounce..."
 
-#: src/gtkconv.c:3561
+#: src/gtkconv.c:3599
 msgid "/Conversation/Get Info"
 msgstr "/Conversation/Get Info"
 
-#: src/gtkconv.c:3565
+#: src/gtkconv.c:3603
 msgid "/Conversation/Warn..."
 msgstr "/Conversation/Warn..."
 
-#: src/gtkconv.c:3569
+#: src/gtkconv.c:3607
 msgid "/Conversation/Invite..."
 msgstr "/Conversation/Invite..."
 
-#: src/gtkconv.c:3575
+#: src/gtkconv.c:3613
 msgid "/Conversation/Alias..."
 msgstr "/Conversation/Alias..."
 
-#: src/gtkconv.c:3579
+#: src/gtkconv.c:3617
 msgid "/Conversation/Block..."
 msgstr "/Conversation/Block..."
 
-#: src/gtkconv.c:3583
+#: src/gtkconv.c:3621
 msgid "/Conversation/Add..."
 msgstr "/Conversation/Add..."
 
-#: src/gtkconv.c:3587
+#: src/gtkconv.c:3625
 msgid "/Conversation/Remove..."
 msgstr "/Conversation/Remove..."
 
-#: src/gtkconv.c:3593
+#: src/gtkconv.c:3631
 msgid "/Conversation/Insert Link..."
 msgstr "/Conversation/Insert Link..."
 
-#: src/gtkconv.c:3597
+#: src/gtkconv.c:3635
 msgid "/Conversation/Insert Image..."
 msgstr "/Conversation/Insert Image..."
 
-#: src/gtkconv.c:3603
+#: src/gtkconv.c:3641
 msgid "/Options/Enable Logging"
 msgstr "/Options/Enable Logging"
 
-#: src/gtkconv.c:3606
+#: src/gtkconv.c:3644
 msgid "/Options/Enable Sounds"
 msgstr "/Options/Enable Sounds"
 
-#: src/gtkconv.c:3609
+#: src/gtkconv.c:3647
 msgid "/Options/Show Formatting Toolbar"
 msgstr "/Options/Show Formatting Toolbar"
 
-#: src/gtkconv.c:3612
+#: src/gtkconv.c:3650
 msgid "/Options/Show Timestamps"
 msgstr "/Options/Show Timestamps"
 
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:3636 src/gtkconv.c:3638 src/gtkconv.c:3756 src/gtkconv.c:3758
+#: src/gtkconv.c:3674 src/gtkconv.c:3676 src/gtkconv.c:3794 src/gtkconv.c:3796
 msgid "Send"
 msgstr "Send"
 
 #. Now, um, just kind of all over the place. Huh?
 #. Warn button
-#: src/gtkconv.c:3652
+#: src/gtkconv.c:3690
 msgid "Warn"
 msgstr "Warn"
 
-#: src/gtkconv.c:3655
+#: src/gtkconv.c:3693
 msgid "Warn the user"
 msgstr "Warn the user"
 
 #. Block button
-#: src/gtkconv.c:3659 src/gtkprivacy.c:624 src/gtkprivacy.c:635
+#: src/gtkconv.c:3697 src/gtkprivacy.c:622 src/gtkprivacy.c:633
 msgid "Block"
 msgstr "Block"
 
-#: src/gtkconv.c:3662
+#: src/gtkconv.c:3700
 msgid "Block the user"
 msgstr "Block the user"
 
-#: src/gtkconv.c:3669
+#: src/gtkconv.c:3707
 msgid "Send a file to the user"
 msgstr "Send a file to the user"
 
-#: src/gtkconv.c:3676
+#: src/gtkconv.c:3714
 msgid "Add the user to your buddy list"
 msgstr "Add the user to your buddy list"
 
-#: src/gtkconv.c:3683
+#: src/gtkconv.c:3721
 msgid "Remove the user from your buddy list"
 msgstr "Remove the user from your buddy list"
 
-#: src/gtkconv.c:3690 src/gtkconv.c:4039
+#: src/gtkconv.c:3728 src/gtkconv.c:4108
 msgid "Get the user's information"
 msgstr "Get the user's information"
 
 #. Invite
-#: src/gtkconv.c:3770
+#: src/gtkconv.c:3808
 msgid "Invite"
 msgstr "Invite"
 
-#: src/gtkconv.c:3773
+#: src/gtkconv.c:3811
 msgid "Invite a user"
 msgstr "Invite a user"
 
-#: src/gtkconv.c:3780
+#: src/gtkconv.c:3818
 msgid "Add the chat to your buddy list"
 msgstr "Add the chat to your buddy list"
 
-#: src/gtkconv.c:3787
+#: src/gtkconv.c:3825
 msgid "Remove the chat from your buddy list"
 msgstr "Remove the chat from your buddy list"
 
-#: src/gtkconv.c:3897
+#: src/gtkconv.c:3961
 msgid "Topic:"
 msgstr "Topic:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3960
+#: src/gtkconv.c:4024
 msgid "0 people in room"
 msgstr "0 people in room"
 
-#: src/gtkconv.c:4016
+#: src/gtkconv.c:4085
 msgid "IM the user"
 msgstr "IM the user"
 
-#: src/gtkconv.c:4028
+#: src/gtkconv.c:4097
 msgid "Ignore the user"
 msgstr "Ignore the user"
 
-#: src/gtkconv.c:4627
+#: src/gtkconv.c:4695
 msgid "Close conversation"
 msgstr "Close conversation"
 
-#: src/gtkconv.c:5169 src/gtkconv.c:5201 src/gtkconv.c:5322 src/gtkconv.c:5389
+#: src/gtkconv.c:5227 src/gtkconv.c:5256 src/gtkconv.c:5352 src/gtkconv.c:5404
 #, 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:5901 src/gtkconv.c:5904
+#: src/gtkconv.c:5958 src/gtkconv.c:5961
 msgid "<main>/Conversation/Close"
 msgstr "<main>/Conversation/Close"
 
-#: src/gtkconv.c:6276
+#: src/gtkconv.c:6333
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 
-#: src/gtkconv.c:6279
+#: src/gtkconv.c:6336
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -3146,11 +3145,7 @@
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 
-#: src/gtkconv.c:6283
-msgid "help:  List available commands."
-msgstr "help:  List available commands."
-
-#: src/gtkconv.c:6287
+#: src/gtkconv.c:6340
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;command&gt;:  Help on a specific command."
 
@@ -3175,11 +3170,11 @@
 msgid "%.2f KB/s"
 msgstr "%.2f KB/s"
 
-#: src/gtkft.c:157 src/gtkft.c:967
+#: src/gtkft.c:157 src/gtkft.c:962
 msgid "Finished"
 msgstr "Finished"
 
-#: src/gtkft.c:160 src/gtkft.c:918
+#: src/gtkft.c:160 src/gtkft.c:913
 msgid "Canceled"
 msgstr "Cancelled"
 
@@ -3239,34 +3234,34 @@
 msgid "Time Remaining:"
 msgstr "Time Remaining:"
 
-#: src/gtkft.c:641
+#: src/gtkft.c:636
 msgid "_Keep the dialog open"
 msgstr "_Keep the dialog open"
 
-#: src/gtkft.c:651
+#: src/gtkft.c:646
 msgid "_Clear finished transfers"
 msgstr "_Clear finished transfers"
 
 #. "Download Details" arrow
-#: src/gtkft.c:660
+#: src/gtkft.c:655
 msgid "Show transfer details"
 msgstr "Show transfer details"
 
-#: src/gtkft.c:661
+#: src/gtkft.c:656
 msgid "Hide transfer details"
 msgstr "Hide transfer details"
 
 #. Pause button
-#: src/gtkft.c:703 src/stock.c:90
+#: src/gtkft.c:698 src/stock.c:90
 msgid "_Pause"
 msgstr "_Pause"
 
 #. Resume button
-#: src/gtkft.c:713
+#: src/gtkft.c:708
 msgid "_Resume"
 msgstr "_Resume"
 
-#: src/gtkft.c:920
+#: src/gtkft.c:915
 msgid "Failed"
 msgstr "Failed"
 
@@ -3294,7 +3289,7 @@
 msgid "_Open Link in Browser"
 msgstr "_Open Link in Browser"
 
-#: src/gtkimhtml.c:2797
+#: src/gtkimhtml.c:2803
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
@@ -3302,16 +3297,16 @@
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
 
-#: src/gtkimhtml.c:2805
+#: src/gtkimhtml.c:2811
 #, c-format
 msgid "Error saving image: %s"
 msgstr "Error saving image: %s"
 
-#: src/gtkimhtml.c:2814
+#: src/gtkimhtml.c:2888 src/gtkimhtml.c:2900
 msgid "Save Image"
 msgstr "Save Image"
 
-#: src/gtkimhtml.c:2837
+#: src/gtkimhtml.c:2921
 msgid "_Save Image..."
 msgstr "_Save Image..."
 
@@ -3327,15 +3322,15 @@
 msgid "Select Background Color"
 msgstr "Select Background Colour"
 
-#: src/gtkimhtmltoolbar.c:392
+#: src/gtkimhtmltoolbar.c:394
 msgid "_URL"
 msgstr "_URL"
 
-#: src/gtkimhtmltoolbar.c:397
+#: src/gtkimhtmltoolbar.c:402
 msgid "_Description"
 msgstr "_Description"
 
-#: src/gtkimhtmltoolbar.c:400
+#: src/gtkimhtmltoolbar.c:405
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
@@ -3343,86 +3338,87 @@
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
 
-#: src/gtkimhtmltoolbar.c:404
+#: src/gtkimhtmltoolbar.c:409
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "Please enter the URL of the link that you want to insert."
 
-#: src/gtkimhtmltoolbar.c:409
+#: src/gtkimhtmltoolbar.c:414
 msgid "Insert Link"
 msgstr "Insert Link"
 
-#: src/gtkimhtmltoolbar.c:413
+#: src/gtkimhtmltoolbar.c:418
 msgid "_Insert"
 msgstr "_Insert"
 
-#: src/gtkimhtmltoolbar.c:481
+#: src/gtkimhtmltoolbar.c:487
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Failed to store image: %s\n"
 
-#: src/gtkimhtmltoolbar.c:507 src/gtkimhtmltoolbar.c:517
+#: src/gtkimhtmltoolbar.c:513 src/gtkimhtmltoolbar.c:523
 msgid "Insert Image"
 msgstr "Insert Image"
 
-#: src/gtkimhtmltoolbar.c:655
+#: src/gtkimhtmltoolbar.c:661
 msgid "This theme has no available smileys."
 msgstr "This theme has no available smileys."
 
 #. show everything
-#: src/gtkimhtmltoolbar.c:670
+#: src/gtkimhtmltoolbar.c:676
 msgid "Smile!"
 msgstr "Smile!"
 
-#: src/gtkimhtmltoolbar.c:888
+#: src/gtkimhtmltoolbar.c:894
 msgid "Bold"
 msgstr "Bold"
 
-#: src/gtkimhtmltoolbar.c:899
+#: src/gtkimhtmltoolbar.c:905
 msgid "Italic"
 msgstr "Italic"
 
-#: src/gtkimhtmltoolbar.c:910
+#: src/gtkimhtmltoolbar.c:916
 msgid "Underline"
 msgstr "Underline"
 
-#: src/gtkimhtmltoolbar.c:926
+#: src/gtkimhtmltoolbar.c:932
 msgid "Larger font size"
 msgstr "Larger font size"
 
-#: src/gtkimhtmltoolbar.c:938
+#: src/gtkimhtmltoolbar.c:944
 msgid "Smaller font size"
 msgstr "Smaller font size"
 
-#: src/gtkimhtmltoolbar.c:955
+#: src/gtkimhtmltoolbar.c:961
 msgid "Font Face"
 msgstr "Font Face"
 
-#: src/gtkimhtmltoolbar.c:967
+#: src/gtkimhtmltoolbar.c:973
 msgid "Foreground font color"
 msgstr "Foreground font colour"
 
-#: src/gtkimhtmltoolbar.c:979
+#: src/gtkimhtmltoolbar.c:985
 msgid "Background color"
 msgstr "Background colour"
 
-#: src/gtkimhtmltoolbar.c:994
+#: src/gtkimhtmltoolbar.c:1000
 msgid "Insert link"
 msgstr "Insert link"
 
-#: src/gtkimhtmltoolbar.c:1004
+#: src/gtkimhtmltoolbar.c:1010
 msgid "Insert image"
 msgstr "Insert image"
 
-#: src/gtkimhtmltoolbar.c:1015
+#: src/gtkimhtmltoolbar.c:1021
 msgid "Insert smiley"
 msgstr "Insert smiley"
 
 #: src/gtklog.c:302
-msgid "Conversations with"
-msgstr "Conversations with"
+#, c-format
+msgid "Conversations with %s"
+msgstr "Conversations with %s"
 
 #. Window **********
-#: src/gtklog.c:392 src/gtklog.c:408
+#: src/gtklog.c:395 src/gtklog.c:411
 msgid "System Log"
 msgstr "System Log"
 
@@ -3466,22 +3462,22 @@
 "\n"
 "%s"
 
-#: src/gtknotify.c:429
+#: src/gtknotify.c:421
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "The browser command \"%s\" is invalid."
 
-#: src/gtknotify.c:432 src/gtknotify.c:446 src/gtknotify.c:461
-#: src/gtknotify.c:579
+#: src/gtknotify.c:424 src/gtknotify.c:438 src/gtknotify.c:453
+#: src/gtknotify.c:571
 msgid "Unable to open URL"
 msgstr "Unable to open URL"
 
-#: src/gtknotify.c:443 src/gtknotify.c:458
+#: src/gtknotify.c:435 src/gtknotify.c:450
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "Error launching \"%s\": %s"
 
-#: src/gtknotify.c:580
+#: src/gtknotify.c:572
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
@@ -3496,7 +3492,7 @@
 msgstr "Please enter a buddy to pounce."
 
 #. "New Buddy Pounce"
-#: src/gtkpounce.c:387 src/gtkpounce.c:890
+#: src/gtkpounce.c:387 src/gtkpounce.c:889
 msgid "New Buddy Pounce"
 msgstr "New Buddy Pounce"
 
@@ -3505,138 +3501,138 @@
 msgstr "Edit Buddy Pounce"
 
 #. Create the "Pounce Who" frame.
-#: src/gtkpounce.c:405
+#: src/gtkpounce.c:404
 msgid "Pounce Who"
 msgstr "Pounce Who"
 
-#: src/gtkpounce.c:432
+#: src/gtkpounce.c:431
 msgid "_Buddy name:"
 msgstr "_Buddy name:"
 
 #. Create the "Pounce When" frame.
-#: src/gtkpounce.c:456
+#: src/gtkpounce.c:455
 msgid "Pounce When"
 msgstr "Pounce When"
 
-#: src/gtkpounce.c:464 src/main.c:296
-msgid "_Sign on"
-msgstr "_Sign on"
-
-#: src/gtkpounce.c:466
+#: src/gtkpounce.c:463
+msgid "Si_gn on"
+msgstr "Si_gn on"
+
+#: src/gtkpounce.c:465
 msgid "Sign _off"
 msgstr "Sign _off"
 
-#: src/gtkpounce.c:468
+#: src/gtkpounce.c:467
 msgid "A_way"
 msgstr "A_way"
 
-#: src/gtkpounce.c:470
-msgid "Re_turn from away"
-msgstr "Re_turn from away"
-
-#: src/gtkpounce.c:472
+#: src/gtkpounce.c:469
+msgid "_Return from away"
+msgstr "_Return from away"
+
+#: src/gtkpounce.c:471
 msgid "_Idle"
 msgstr "_Idle"
 
-#: src/gtkpounce.c:474
+#: src/gtkpounce.c:473
 msgid "Retur_n from idle"
 msgstr "Retur_n from idle"
 
-#: src/gtkpounce.c:476
+#: src/gtkpounce.c:475
 msgid "Buddy starts _typing"
 msgstr "Buddy starts _typing"
 
-#: src/gtkpounce.c:478
+#: src/gtkpounce.c:477
 msgid "Buddy stops t_yping"
 msgstr "Buddy stops t_yping"
 
 #. Create the "Pounce Action" frame.
-#: src/gtkpounce.c:507
+#: src/gtkpounce.c:506
 msgid "Pounce Action"
 msgstr "Pounce Action"
 
-#: src/gtkpounce.c:515
+#: src/gtkpounce.c:514
 msgid "Op_en an IM window"
 msgstr "Op_en an IM window"
 
-#: src/gtkpounce.c:517
+#: src/gtkpounce.c:516
 msgid "_Popup notification"
 msgstr "_Popup notification"
 
-#: src/gtkpounce.c:519
+#: src/gtkpounce.c:518
 msgid "Send a _message"
 msgstr "Send a _message"
 
-#: src/gtkpounce.c:521
+#: src/gtkpounce.c:520
 msgid "E_xecute a command"
 msgstr "E_xecute a command"
 
-#: src/gtkpounce.c:523
+#: src/gtkpounce.c:522
 msgid "P_lay a sound"
 msgstr "P_lay a sound"
 
-#: src/gtkpounce.c:527
+#: src/gtkpounce.c:526
 msgid "B_rowse..."
 msgstr "B_rowse..."
 
+#: src/gtkpounce.c:528
+msgid "Bro_wse..."
+msgstr "Bro_wse..."
+
 #: src/gtkpounce.c:529
-msgid "Bro_wse..."
-msgstr "Bro_wse..."
-
-#: src/gtkpounce.c:530
 msgid "Pre_view"
 msgstr "Pre_view"
 
-#: src/gtkpounce.c:613
+#: src/gtkpounce.c:612
 msgid "Sav_e this pounce after activation"
 msgstr "Sav_e this pounce after activation"
 
 #. "Remove Buddy Pounce"
-#: src/gtkpounce.c:897
+#: src/gtkpounce.c:896
 msgid "Remove Buddy Pounce"
 msgstr "Remove Buddy Pounce"
 
-#: src/gtkpounce.c:961
+#: src/gtkpounce.c:960
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s has started typing to you (%s)"
 
-#: src/gtkpounce.c:963
+#: src/gtkpounce.c:962
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s has signed on (%s)"
 
-#: src/gtkpounce.c:965
+#: src/gtkpounce.c:964
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s has returned from being idle (%s)"
 
-#: src/gtkpounce.c:967
+#: src/gtkpounce.c:966
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s has returned from being away (%s)"
 
-#: src/gtkpounce.c:969
+#: src/gtkpounce.c:968
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s has stopped typing to you (%s)"
 
-#: src/gtkpounce.c:971
+#: src/gtkpounce.c:970
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s has signed off (%s)"
 
-#: src/gtkpounce.c:973
+#: src/gtkpounce.c:972
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s has become idle (%s)"
 
-#: src/gtkpounce.c:975
+#: src/gtkpounce.c:974
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s has gone away. (%s)"
 
-#: src/gtkpounce.c:976
+#: src/gtkpounce.c:975
 msgid "Unknown pounce event. Please report this!"
 msgstr "Unknown pounce event. Please report this!"
 
@@ -3660,8 +3656,8 @@
 msgid "Icon"
 msgstr "Icon"
 
-#: src/gtkprefs.c:722 src/gtkprefs.c:2212 src/protocols/jabber/buddy.c:264
-#: src/protocols/jabber/buddy.c:748 src/protocols/jabber/chat.c:701
+#: src/gtkprefs.c:722 src/gtkprefs.c:2194 src/protocols/jabber/buddy.c:264
+#: src/protocols/jabber/buddy.c:748 src/protocols/jabber/chat.c:693
 msgid "Description"
 msgstr "Description"
 
@@ -3677,31 +3673,27 @@
 msgid "_Highlight misspelled words"
 msgstr "_Highlight misspelled words"
 
-#: src/gtkprefs.c:827
+#: src/gtkprefs.c:826
 msgid "Ignore c_olors"
 msgstr "Ignore c_olours"
 
-#: src/gtkprefs.c:829
+#: src/gtkprefs.c:828
 msgid "Ignore font _faces"
 msgstr "Ignore font _faces"
 
-#: src/gtkprefs.c:831
+#: src/gtkprefs.c:830
 msgid "Ignore font si_zes"
 msgstr "Ignore font si_zes"
 
-#: src/gtkprefs.c:834
-msgid "_Ignore formatting on incoming messages"
-msgstr "_Ignore formatting on incoming messages"
-
-#: src/gtkprefs.c:838
+#: src/gtkprefs.c:833
 msgid "Default Formatting"
 msgstr "Default Formatting"
 
-#: src/gtkprefs.c:840
+#: src/gtkprefs.c:835
 msgid "_Send default formatting with outgoing messages"
 msgstr "_Send default formatting with outgoing messages"
 
-#: src/gtkprefs.c:872
+#: src/gtkprefs.c:867
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting. :)"
@@ -3709,269 +3701,269 @@
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting. :)"
 
-#: src/gtkprefs.c:875
+#: src/gtkprefs.c:870
 msgid "_Clear Formatting"
 msgstr "_Clear Formatting"
 
-#: src/gtkprefs.c:912
+#: src/gtkprefs.c:907
 msgid "Send Message"
 msgstr "Send Message"
 
-#: src/gtkprefs.c:913
+#: src/gtkprefs.c:908
 msgid "Enter _sends message"
 msgstr "Enter _sends message"
 
-#: src/gtkprefs.c:915
+#: src/gtkprefs.c:910
 msgid "C_ontrol-Enter sends message"
 msgstr "C_ontrol-Enter sends message"
 
-#: src/gtkprefs.c:918
+#: src/gtkprefs.c:913
 msgid "Window Closing"
 msgstr "Window Closing"
 
-#: src/gtkprefs.c:919
+#: src/gtkprefs.c:914
 msgid "_Escape closes window"
 msgstr "_Escape closes window"
 
-#: src/gtkprefs.c:922
+#: src/gtkprefs.c:917
 msgid "Insertions"
 msgstr "Insertions"
 
-#: src/gtkprefs.c:923
+#: src/gtkprefs.c:918
 msgid "Control-{B/I/U} changes _formatting"
 msgstr "Control-{B/I/U} changes _formatting"
 
-#: src/gtkprefs.c:925
+#: src/gtkprefs.c:920
 msgid "Control-(number) _inserts smileys"
 msgstr "Control-(number) _inserts smileys"
 
-#: src/gtkprefs.c:941
+#: src/gtkprefs.c:936
 msgid "Buddy List Sorting"
 msgstr "Buddy List Sorting"
 
-#: src/gtkprefs.c:950
+#: src/gtkprefs.c:945
 msgid "_Sorting:"
 msgstr "_Sorting:"
 
-#: src/gtkprefs.c:956 src/gtkprefs.c:1009
+#: src/gtkprefs.c:951 src/gtkprefs.c:1003
 msgid "Show _buttons as:"
 msgstr "Show _buttons as:"
 
-#: src/gtkprefs.c:958 src/gtkprefs.c:1011
+#: src/gtkprefs.c:953 src/gtkprefs.c:1005
 msgid "Pictures"
 msgstr "Pictures"
 
-#: src/gtkprefs.c:959 src/gtkprefs.c:1012
+#: src/gtkprefs.c:954 src/gtkprefs.c:1006
 msgid "Text"
 msgstr "Text"
 
-#: src/gtkprefs.c:960 src/gtkprefs.c:1013
+#: src/gtkprefs.c:955 src/gtkprefs.c:1007
 msgid "Pictures and text"
 msgstr "Pictures and text"
 
-#: src/gtkprefs.c:963
+#: src/gtkprefs.c:958
 msgid "_Raise window on events"
 msgstr "_Raise window on events"
 
-#: src/gtkprefs.c:966
+#: src/gtkprefs.c:961
 msgid "Buddy Display"
 msgstr "Buddy Display"
 
-#: src/gtkprefs.c:967 src/gtkprefs.c:1027
+#: src/gtkprefs.c:962 src/gtkprefs.c:1020
 msgid "Show buddy _icons"
 msgstr "Show buddy _icons"
 
-#: src/gtkprefs.c:969
+#: src/gtkprefs.c:964
 msgid "Show _warning levels"
 msgstr "Show _warning levels"
 
-#: src/gtkprefs.c:971
+#: src/gtkprefs.c:966
 msgid "Show idle _times"
 msgstr "Show idle _times"
 
-#: src/gtkprefs.c:973
+#: src/gtkprefs.c:968
 msgid "Dim i_dle buddies"
 msgstr "Dim i_dle buddies"
 
-#: src/gtkprefs.c:975
+#: src/gtkprefs.c:970
 msgid "_Automatically expand contacts"
 msgstr "_Automatically expand contacts"
 
-#: src/gtkprefs.c:1020
+#: src/gtkprefs.c:1013
 msgid "Enable \"_slash\" commands"
 msgstr "Enable \"_slash\" commands"
 
-#: src/gtkprefs.c:1023
+#: src/gtkprefs.c:1016
 msgid "Show _formatting toolbar"
 msgstr "Show _formatting toolbar"
 
-#: src/gtkprefs.c:1025
+#: src/gtkprefs.c:1018
 msgid "Show _aliases in tabs/titles"
 msgstr "Show _aliases in tabs/titles"
 
-#: src/gtkprefs.c:1029
+#: src/gtkprefs.c:1022
 msgid "Enable buddy ic_on animation"
 msgstr "Enable buddy ic_on animation"
 
-#: src/gtkprefs.c:1031
+#: src/gtkprefs.c:1024
 msgid "_Notify buddies that you are typing to them"
 msgstr "_Notify buddies that you are typing to them"
 
-#: src/gtkprefs.c:1033
+#: src/gtkprefs.c:1026
 msgid "_Raise IM window on events"
 msgstr "_Raise IM window on events"
 
-#: src/gtkprefs.c:1036
+#: src/gtkprefs.c:1029
 msgid "Raise chat _window on events"
 msgstr "Raise chat _window on events"
 
-#: src/gtkprefs.c:1038
+#: src/gtkprefs.c:1031
 msgid "Use _multi-colored screen names in chats"
 msgstr "Use _multi-coloured screen names in chats"
 
 #. All the tab options!
-#: src/gtkprefs.c:1042
+#: src/gtkprefs.c:1035
 msgid "Tab Options"
 msgstr "Tab Options"
 
-#: src/gtkprefs.c:1044
+#: src/gtkprefs.c:1037
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Show IMs and chats in _tabbed windows"
 
-#: src/gtkprefs.c:1059
+#: src/gtkprefs.c:1052
 msgid "Show _close button on tabs"
 msgstr "Show _close button on tabs"
 
-#: src/gtkprefs.c:1062
+#: src/gtkprefs.c:1055
 msgid "Tab p_lacement:"
 msgstr "Tab P_lacement:"
 
-#: src/gtkprefs.c:1064
+#: src/gtkprefs.c:1057
 msgid "Top"
 msgstr "Top"
 
-#: src/gtkprefs.c:1065
+#: src/gtkprefs.c:1058
 msgid "Bottom"
 msgstr "Bottom"
 
-#: src/gtkprefs.c:1066
+#: src/gtkprefs.c:1059
 msgid "Left"
 msgstr "Left"
 
-#: src/gtkprefs.c:1067
+#: src/gtkprefs.c:1060
 msgid "Right"
 msgstr "Right"
 
-#: src/gtkprefs.c:1073
+#: src/gtkprefs.c:1066
 msgid "New conversation _placement:"
 msgstr "New conversation _placement:"
 
-#: src/gtkprefs.c:1124 src/protocols/oscar/oscar.c:596
-#: src/protocols/oscar/oscar.c:4855
+#: src/gtkprefs.c:1117 src/protocols/oscar/oscar.c:580
+#: src/protocols/oscar/oscar.c:4850
 msgid "IP Address"
 msgstr "IP Address"
 
-#: src/gtkprefs.c:1126
+#: src/gtkprefs.c:1119
 msgid "_Autodetect IP Address"
 msgstr "_Autodetect IP Address"
 
-#: src/gtkprefs.c:1135
+#: src/gtkprefs.c:1128
 msgid "Public _IP:"
 msgstr "Public _IP:"
 
-#: src/gtkprefs.c:1159
+#: src/gtkprefs.c:1152
 msgid "Ports"
 msgstr "Ports"
 
-#: src/gtkprefs.c:1162
+#: src/gtkprefs.c:1155
 msgid "_Manually specify range of ports to listen on"
 msgstr "_Manually specify range of ports to listen on"
 
+#: src/gtkprefs.c:1158
+msgid "_Start Port:"
+msgstr "_Start Port:"
+
 #: src/gtkprefs.c:1165
-msgid "_Start Port:"
-msgstr "_Start Port:"
+msgid "_End Port:"
+msgstr "_End Port:"
 
 #: src/gtkprefs.c:1172
-msgid "_End Port:"
-msgstr "_End Port:"
-
-#: src/gtkprefs.c:1179
 msgid "Proxy Server"
 msgstr "Proxy Server"
 
-#: src/gtkprefs.c:1183
+#: src/gtkprefs.c:1176
 msgid "No proxy"
 msgstr "No proxy"
 
-#: src/gtkprefs.c:1245
+#: src/gtkprefs.c:1238
 msgid "_User:"
 msgstr "_User:"
 
-#: src/gtkprefs.c:1301
+#: src/gtkprefs.c:1294
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: src/gtkprefs.c:1302
+#: src/gtkprefs.c:1295
 msgid "Firebird"
 msgstr "Firebird"
 
-#: src/gtkprefs.c:1303
+#: src/gtkprefs.c:1296
 msgid "Firefox"
 msgstr "Firefox"
 
-#: src/gtkprefs.c:1304
+#: src/gtkprefs.c:1297
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/gtkprefs.c:1305
+#: src/gtkprefs.c:1298
 msgid "Gnome Default"
 msgstr "Gnome Default"
 
-#: src/gtkprefs.c:1306
+#: src/gtkprefs.c:1299
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/gtkprefs.c:1307
+#: src/gtkprefs.c:1300
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: src/gtkprefs.c:1308
+#: src/gtkprefs.c:1301
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/gtkprefs.c:1309
+#: src/gtkprefs.c:1302
 msgid "Opera"
 msgstr "Opera"
 
-#: src/gtkprefs.c:1318
+#: src/gtkprefs.c:1311
 msgid "Manual"
 msgstr "Manual"
 
-#: src/gtkprefs.c:1369
+#: src/gtkprefs.c:1362
 msgid "Browser Selection"
 msgstr "Browser Selection"
 
-#: src/gtkprefs.c:1373
+#: src/gtkprefs.c:1366
 msgid "_Browser:"
 msgstr "_Browser:"
 
-#: src/gtkprefs.c:1380
+#: src/gtkprefs.c:1373
 msgid "_Open link in:"
 msgstr "_Open Link in:"
 
-#: src/gtkprefs.c:1382
+#: src/gtkprefs.c:1375
 msgid "Browser default"
 msgstr "Browser default"
 
-#: src/gtkprefs.c:1383
+#: src/gtkprefs.c:1376
 msgid "Existing window"
 msgstr "Existing window"
 
-#: src/gtkprefs.c:1385
+#: src/gtkprefs.c:1378
 msgid "New tab"
 msgstr "New tab"
 
-#: src/gtkprefs.c:1399
+#: src/gtkprefs.c:1392
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -3980,83 +3972,83 @@
 "_Manual:\n"
 "(%s for URL)"
 
-#: src/gtkprefs.c:1436
+#: src/gtkprefs.c:1429
 msgid "Message Logs"
 msgstr "Message Logs"
 
-#: src/gtkprefs.c:1439
+#: src/gtkprefs.c:1432
 msgid "Log _Format:"
 msgstr "Log _Format:"
 
-#: src/gtkprefs.c:1442
+#: src/gtkprefs.c:1435
 msgid "_Log all instant messages"
 msgstr "_Log all instant messages"
 
-#: src/gtkprefs.c:1444
+#: src/gtkprefs.c:1437
 msgid "Log all c_hats"
 msgstr "Log all c_hats"
 
-#: src/gtkprefs.c:1447
+#: src/gtkprefs.c:1440
 msgid "System Logs"
 msgstr "System Logs"
 
-#: src/gtkprefs.c:1449
+#: src/gtkprefs.c:1442
 msgid "_Enable system log"
 msgstr "_Enable system log"
 
-#: src/gtkprefs.c:1452
+#: src/gtkprefs.c:1445
 msgid "Log when buddies _sign on/sign off"
 msgstr "Log when buddies _sign on/sign off"
 
-#: src/gtkprefs.c:1458
+#: src/gtkprefs.c:1451
 msgid "Log when buddies become _idle/un-idle"
 msgstr "Log when buddies become _idle/un-idle"
 
-#: src/gtkprefs.c:1464
+#: src/gtkprefs.c:1457
 msgid "Log when buddies go away/come _back"
 msgstr "Log when buddies go away/come _back"
 
-#: src/gtkprefs.c:1470
+#: src/gtkprefs.c:1463
 msgid "Log your _own signons/idleness/awayness"
 msgstr "Log your _own signons/idleness/awayness"
 
-#: src/gtkprefs.c:1596
+#: src/gtkprefs.c:1589
 msgid "Sound Selection"
 msgstr "Sound Selection"
 
-#: src/gtkprefs.c:1647
+#: src/gtkprefs.c:1640
 msgid "Sound Options"
 msgstr "Sound Options"
 
-#: src/gtkprefs.c:1648
+#: src/gtkprefs.c:1641
 msgid "Sounds when conversation has _focus"
 msgstr "Sounds when conversation has _focus"
 
-#: src/gtkprefs.c:1650
+#: src/gtkprefs.c:1643
 msgid "_Sounds while away"
 msgstr "_Sounds while away"
 
-#: src/gtkprefs.c:1654
+#: src/gtkprefs.c:1647
 msgid "Sound Method"
 msgstr "Sound Method"
 
-#: src/gtkprefs.c:1655
+#: src/gtkprefs.c:1648
 msgid "_Method:"
 msgstr "_Method:"
 
-#: src/gtkprefs.c:1657
+#: src/gtkprefs.c:1650
 msgid "Console beep"
 msgstr "Console beep"
 
+#: src/gtkprefs.c:1652
+msgid "Automatic"
+msgstr "Automatic"
+
 #: src/gtkprefs.c:1659
-msgid "Automatic"
-msgstr "Automatic"
-
-#: src/gtkprefs.c:1666
 msgid "Command"
 msgstr "Command"
 
-#: src/gtkprefs.c:1674
+#: src/gtkprefs.c:1667
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -4065,86 +4057,90 @@
 "Sound c_ommand:\n"
 "(%s for filename)"
 
-#: src/gtkprefs.c:1701
+#: src/gtkprefs.c:1694
 msgid "Sound Events"
 msgstr "Sound Events"
 
-#: src/gtkprefs.c:1752
+#: src/gtkprefs.c:1745
 msgid "Play"
 msgstr "Play"
 
-#: src/gtkprefs.c:1759
+#: src/gtkprefs.c:1752
 msgid "Event"
 msgstr "Event"
 
-#: src/gtkprefs.c:1778
+#: src/gtkprefs.c:1771
 msgid "Test"
 msgstr "Test"
 
-#: src/gtkprefs.c:1782
+#: src/gtkprefs.c:1775
 msgid "Reset"
 msgstr "Reset"
 
-#: src/gtkprefs.c:1786
+#: src/gtkprefs.c:1779
 msgid "Choose..."
 msgstr "Choose..."
 
-#: src/gtkprefs.c:1810
+#: src/gtkprefs.c:1803
 msgid "_Queue new messages when away"
 msgstr "_Queue new messages when away"
 
-#: src/gtkprefs.c:1813
-msgid "Auto-response"
-msgstr "Auto-response"
-
-#: src/gtkprefs.c:1814
-msgid "_Send auto-response"
-msgstr "_Send auto-response"
-
-#: src/gtkprefs.c:1816
-msgid "_Only send auto-response when idle"
-msgstr "_Only send auto-response when idle"
-
-#: src/gtkprefs.c:1819 src/protocols/msn/msn.c:1179
-#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2730
-#: src/protocols/oscar/oscar.c:4011 src/protocols/yahoo/yahoo.c:2511
+#: src/gtkprefs.c:1806
+msgid "_Auto-reply:"
+msgstr "_Auto-reply:"
+
+#: src/gtkprefs.c:1808
+msgid "Never"
+msgstr "Never"
+
+#: src/gtkprefs.c:1809
+msgid "Only when away"
+msgstr "Only when away"
+
+#: src/gtkprefs.c:1810
+msgid "Only when away and idle"
+msgstr "Only when away and idle"
+
+#: src/gtkprefs.c:1813 src/protocols/msn/msn.c:1179
+#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2777
+#: src/protocols/oscar/oscar.c:4003 src/protocols/yahoo/yahoo.c:2554
 #: src/protocols/yahoo/yahoo_profile.c:664
 msgid "Idle"
 msgstr "Idle"
 
-#: src/gtkprefs.c:1820
+#: src/gtkprefs.c:1814
 msgid "Idle _time reporting:"
 msgstr "Idle _time reporting:"
 
-#: src/gtkprefs.c:1823
+#: src/gtkprefs.c:1817
 msgid "Gaim usage"
 msgstr "Gaim usage"
 
-#: src/gtkprefs.c:1826
+#: src/gtkprefs.c:1820
 msgid "X usage"
 msgstr "X usage"
 
-#: src/gtkprefs.c:1828
+#: src/gtkprefs.c:1822
 msgid "Windows usage"
 msgstr "Windows usage"
 
-#: src/gtkprefs.c:1836
+#: src/gtkprefs.c:1830
 msgid "Auto-away"
 msgstr "Auto-away"
 
-#: src/gtkprefs.c:1837
+#: src/gtkprefs.c:1831
 msgid "Set away _when idle"
 msgstr "Set away _when idle"
 
-#: src/gtkprefs.c:1841
+#: src/gtkprefs.c:1835
 msgid "_Minutes before setting away:"
 msgstr "_Minutes before setting away:"
 
-#: src/gtkprefs.c:1849
+#: src/gtkprefs.c:1843
 msgid "Away m_essage:"
 msgstr "Away m_essage:"
 
-#: src/gtkprefs.c:1930
+#: src/gtkprefs.c:1912
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4159,7 +4155,7 @@
 "<span weight=\"bold\">Web site:</span>\t\t%s\n"
 "<span weight=\"bold\">File name:</span>\t%s"
 
-#: src/gtkprefs.c:1935
+#: src/gtkprefs.c:1917
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4174,64 +4170,64 @@
 "<span weight=\"bold\">URL:</span>  %s\n"
 "<span weight=\"bold\">File name:</span>  %s"
 
-#: src/gtkprefs.c:2168
+#: src/gtkprefs.c:2150
 msgid "Load"
 msgstr "Load"
 
-#: src/gtkprefs.c:2182
+#: src/gtkprefs.c:2164
 msgid "Summary"
 msgstr "Summary"
 
-#: src/gtkprefs.c:2230
+#: src/gtkprefs.c:2212
 msgid "Details"
 msgstr "Details"
 
-#: src/gtkprefs.c:2375
+#: src/gtkprefs.c:2357
 msgid "_Edit"
 msgstr "_Edit"
 
-#: src/gtkprefs.c:2411
+#: src/gtkprefs.c:2393
 msgid "Interface"
 msgstr "Interface"
 
-#: src/gtkprefs.c:2414
+#: src/gtkprefs.c:2396
 msgid "Message Text"
 msgstr "Message Text"
 
-#: src/gtkprefs.c:2415
+#: src/gtkprefs.c:2397
 msgid "Shortcuts"
 msgstr "Shortcuts"
 
-#: src/gtkprefs.c:2416
+#: src/gtkprefs.c:2398
 msgid "Smiley Themes"
 msgstr "Smiley Themes"
 
-#: src/gtkprefs.c:2417
+#: src/gtkprefs.c:2399
 msgid "Sounds"
 msgstr "Sounds"
 
-#: src/gtkprefs.c:2418
+#: src/gtkprefs.c:2400
 msgid "Network"
 msgstr "Network"
 
 #. We use the registered default browser in windows
-#: src/gtkprefs.c:2421
+#: src/gtkprefs.c:2403
 msgid "Browser"
 msgstr "Browser"
 
-#: src/gtkprefs.c:2423
+#: src/gtkprefs.c:2405
 msgid "Logging"
 msgstr "Logging"
 
-#: src/gtkprefs.c:2424
+#: src/gtkprefs.c:2406
 msgid "Away / Idle"
 msgstr "Away / Idle"
 
-#: src/gtkprefs.c:2425
+#: src/gtkprefs.c:2407
 msgid "Away Messages"
 msgstr "Away Messages"
 
-#: src/gtkprefs.c:2428
+#: src/gtkprefs.c:2410
 msgid "Plugins"
 msgstr "Plugins"
 
@@ -4255,63 +4251,63 @@
 msgid "Block only the users below"
 msgstr "Block only the users below"
 
-#: src/gtkprivacy.c:385 src/protocols/jabber/jabber.c:1449
+#: src/gtkprivacy.c:385 src/protocols/jabber/jabber.c:1466
 msgid "Privacy"
 msgstr "Privacy"
 
-#: src/gtkprivacy.c:400
+#: src/gtkprivacy.c:398
 msgid "Changes to privacy settings take effect immediately."
 msgstr "Changes to privacy settings take effect immediately."
 
 #. "Set privacy for:" label
-#: src/gtkprivacy.c:412
+#: src/gtkprivacy.c:410
 msgid "Set privacy for:"
 msgstr "Set privacy for:"
 
-#: src/gtkprivacy.c:581 src/gtkprivacy.c:597
+#: src/gtkprivacy.c:579 src/gtkprivacy.c:595
 msgid "Permit User"
 msgstr "Permit User"
 
-#: src/gtkprivacy.c:582
+#: src/gtkprivacy.c:580
 msgid "Type a user you permit to contact you."
 msgstr "Type a user you permit to contact you."
 
-#: src/gtkprivacy.c:583
+#: src/gtkprivacy.c:581
 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:586 src/gtkprivacy.c:599
+#: src/gtkprivacy.c:584 src/gtkprivacy.c:597
 msgid "Permit"
 msgstr "Permit"
 
-#: src/gtkprivacy.c:591
+#: src/gtkprivacy.c:589
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "Allow %s to contact you?"
 
-#: src/gtkprivacy.c:593
+#: src/gtkprivacy.c:591
 #, 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:620 src/gtkprivacy.c:633
+#: src/gtkprivacy.c:618 src/gtkprivacy.c:631
 msgid "Block User"
 msgstr "Block User"
 
-#: src/gtkprivacy.c:621
+#: src/gtkprivacy.c:619
 msgid "Type a user to block."
 msgstr "Type a user to block."
 
-#: src/gtkprivacy.c:622
+#: src/gtkprivacy.c:620
 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:629
+#: src/gtkprivacy.c:627
 #, c-format
 msgid "Block %s?"
 msgstr "Block %s?"
 
-#: src/gtkprivacy.c:631
+#: src/gtkprivacy.c:629
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "Are you sure you want to block %s?"
@@ -4320,13 +4316,13 @@
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
 #: src/gtkrequest.c:240 src/protocols/gg/gg.c:949
-#: src/protocols/novell/novell.c:1845 src/protocols/silc/buddy.c:307
+#: src/protocols/novell/novell.c:1865 src/protocols/silc/buddy.c:307
 #: src/protocols/silc/pk.c:116 src/request.h:1234
 msgid "Yes"
 msgstr "Yes"
 
 #: src/gtkrequest.c:241 src/protocols/gg/gg.c:949
-#: src/protocols/novell/novell.c:1846 src/protocols/silc/buddy.c:308
+#: src/protocols/novell/novell.c:1866 src/protocols/silc/buddy.c:308
 #: src/protocols/silc/pk.c:117 src/request.h:1234
 msgid "No"
 msgstr "No"
@@ -4340,19 +4336,19 @@
 msgid "Close"
 msgstr "Close"
 
-#: src/gtkrequest.c:1391
+#: src/gtkrequest.c:1392
 msgid "That file already exists"
 msgstr "That file already exists"
 
-#: src/gtkrequest.c:1392
+#: src/gtkrequest.c:1393
 msgid "Would you like to overwrite it?"
 msgstr "Would you like to overwrite it?"
 
-#: src/gtkrequest.c:1430 src/gtkrequest.c:1451
+#: src/gtkrequest.c:1431 src/gtkrequest.c:1452
 msgid "Save File..."
 msgstr "Save File..."
 
-#: src/gtkrequest.c:1431 src/gtkrequest.c:1452
+#: src/gtkrequest.c:1432 src/gtkrequest.c:1453
 msgid "Open File..."
 msgstr "Open File..."
 
@@ -4361,7 +4357,7 @@
 msgstr "Room List"
 
 #. list button
-#: src/gtkroomlist.c:402
+#: src/gtkroomlist.c:401
 msgid "_Get List"
 msgstr "_Get List"
 
@@ -4435,7 +4431,7 @@
 msgid "XML"
 msgstr "XML"
 
-#: src/log.c:574
+#: src/log.c:575
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4444,7 +4440,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
 
-#: src/log.c:576
+#: src/log.c:577
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4453,55 +4449,59 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
 
-#: src/log.c:627 src/log.c:814
+#: src/log.c:628 src/log.c:815
 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:637 src/log.c:826
+#: src/log.c:638 src/log.c:827
 #, 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:674
+#: src/log.c:675
 msgid "HTML"
 msgstr "HTML"
 
-#: src/log.c:759
+#: src/log.c:760
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
-#: src/log.c:859
+#: src/log.c:860
 msgid "Plain text"
 msgstr "Plain text"
 
-#: src/main.c:153
+#: src/main.c:150
 msgid "Please create an account."
 msgstr "Please create an account."
 
-#: src/main.c:235
+#: src/main.c:232
 msgid "Login"
 msgstr "Login"
 
-#: src/main.c:253
+#: src/main.c:248
 msgid "<b>_Account:</b>"
 msgstr "<b>_Account:</b>"
 
-#: src/main.c:267
+#: src/main.c:262
 msgid "<b>_Password:</b>"
 msgstr "<b>_Password:</b>"
 
 #. And now for the buttons
-#: src/main.c:284
+#: src/main.c:279
 msgid "_Accounts"
 msgstr "_Accounts"
 
-#: src/main.c:290
+#: src/main.c:285
 msgid "_Preferences"
 msgstr "_Preferences"
 
+#: src/main.c:291
+msgid "_Sign on"
+msgstr "_Sign on"
+
 #. full help text
-#: src/main.c:520
+#: src/main.c:517
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -4535,11 +4535,25 @@
 "  -h, --help          display this help and exit\n"
 
 #. short message
-#: src/main.c:535
+#: src/main.c:532
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr "Gaim %s. Try `%s -h' for more information.\n"
 
+#: src/main.c:845
+msgid "Unable to load preferences"
+msgstr "Unable to load preferences"
+
+#: src/main.c:845
+msgid ""
+"Gaim was not able to load your preferences because they are stored in an old "
+"format that is no longer used.  Please reconfigure your settings using the "
+"Preferences window."
+msgstr ""
+"Gaim was not able to load your preferences because they are stored in an old "
+"format that is no longer used.  Please reconfigure your settings using the "
+"Preferences window."
+
 #: src/plugin.c:286
 #, c-format
 msgid ""
@@ -4565,10 +4579,10 @@
 #: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:44
 #: src/protocols/msn/msn.c:462 src/protocols/msn/state.c:29
 #: src/protocols/msn/state.c:30 src/protocols/msn/state.c:37
-#: src/protocols/msn/state.c:38 src/protocols/novell/novell.c:2721
-#: src/protocols/novell/novell.c:2840 src/protocols/novell/novell.c:2891
-#: src/protocols/oscar/oscar.c:616 src/protocols/yahoo/yahoo.c:2851
-#: src/protocols/yahoo/yahoo.c:2967
+#: src/protocols/msn/state.c:38 src/protocols/novell/novell.c:2768
+#: src/protocols/novell/novell.c:2887 src/protocols/novell/novell.c:2938
+#: src/protocols/oscar/oscar.c:602 src/protocols/yahoo/yahoo.c:2894
+#: src/protocols/yahoo/yahoo.c:3010
 msgid "Available"
 msgstr "Available"
 
@@ -4581,11 +4595,11 @@
 msgstr "Away for friends only"
 
 #: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:964
-#: src/protocols/jabber/presence.c:126 src/protocols/oscar/oscar.c:536
-#: src/protocols/oscar/oscar.c:5397 src/protocols/oscar/oscar.c:5475
-#: src/protocols/oscar/oscar.c:5499 src/protocols/oscar/oscar.c:6694
-#: src/protocols/oscar/oscar.c:6699 src/protocols/yahoo/yahoo.c:2509
-#: src/protocols/yahoo/yahoo.c:2871 src/protocols/yahoo/yahoo.c:2979
+#: src/protocols/jabber/presence.c:128 src/protocols/oscar/oscar.c:520
+#: src/protocols/oscar/oscar.c:5399 src/protocols/oscar/oscar.c:5477
+#: src/protocols/oscar/oscar.c:5501 src/protocols/oscar/oscar.c:6697
+#: src/protocols/oscar/oscar.c:6702 src/protocols/yahoo/yahoo.c:2552
+#: src/protocols/yahoo/yahoo.c:2914 src/protocols/yahoo/yahoo.c:3022
 msgid "Invisible"
 msgstr "Invisible"
 
@@ -4601,7 +4615,7 @@
 msgid "Unable to resolve hostname."
 msgstr "Unable to resolve hostname."
 
-#: src/protocols/gg/gg.c:139 src/protocols/novell/novell.c:1665
+#: src/protocols/gg/gg.c:139 src/protocols/novell/novell.c:1685
 msgid "Unable to connect to server."
 msgstr "Unable to connect to server."
 
@@ -4628,17 +4642,17 @@
 msgid "Unknown Error Code."
 msgstr "Unknown Error Code."
 
-#: src/protocols/gg/gg.c:242 src/protocols/oscar/oscar.c:3820
+#: src/protocols/gg/gg.c:242 src/protocols/oscar/oscar.c:3807
 #, 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"
 
 #. res[0] == username
 #: src/protocols/gg/gg.c:243 src/protocols/gg/gg.c:1011
-#: src/protocols/napster/napster.c:393 src/protocols/oscar/oscar.c:3824
-#: src/protocols/oscar/oscar.c:4040 src/protocols/silc/ops.c:1067
-#: src/protocols/silc/ops.c:1128 src/protocols/toc/toc.c:468
-#: src/protocols/zephyr/zephyr.c:635
+#: src/protocols/napster/napster.c:393 src/protocols/oscar/oscar.c:3811
+#: src/protocols/oscar/oscar.c:4032 src/protocols/silc/ops.c:1076
+#: src/protocols/silc/ops.c:1137 src/protocols/toc/toc.c:468
+#: src/protocols/zephyr/zephyr.c:644
 msgid "Buddy Information"
 msgstr "Buddy Information"
 
@@ -4658,10 +4672,10 @@
 #. we didn't successfully connect. tdt->toc_fd is valid here
 #: src/protocols/gg/gg.c:674 src/protocols/icq/gaim_icq.c:344
 #: src/protocols/napster/napster.c:475 src/protocols/napster/napster.c:506
-#: src/protocols/toc/toc.c:170 src/protocols/yahoo/yahoo.c:2156
-#: src/protocols/yahoo/yahoo.c:2185 src/protocols/yahoo/yahoo.c:2248
+#: src/protocols/toc/toc.c:170 src/protocols/yahoo/yahoo.c:2199
+#: src/protocols/yahoo/yahoo.c:2228 src/protocols/yahoo/yahoo.c:2291
 #: src/protocols/yahoo/yahoo_filexfer.c:68
-#: src/protocols/yahoo/yahoo_filexfer.c:109
+#: src/protocols/yahoo/yahoo_filexfer.c:109 src/protocols/yahoo/ycht.c:482
 msgid "Unable to connect."
 msgstr "Unable to connect."
 
@@ -4723,26 +4737,26 @@
 msgid "Active"
 msgstr "Active"
 
-#: src/protocols/gg/gg.c:953 src/protocols/oscar/oscar.c:4847
+#: src/protocols/gg/gg.c:953 src/protocols/oscar/oscar.c:4842
 msgid "UIN"
 msgstr "UIN"
 
 #. First Name
 #: src/protocols/gg/gg.c:957 src/protocols/jabber/jabber.c:613
-#: src/protocols/oscar/oscar.c:4858 src/protocols/silc/ops.c:790
+#: src/protocols/oscar/oscar.c:4853 src/protocols/silc/ops.c:799
 #: src/protocols/trepia/trepia.c:267
 msgid "First Name"
 msgstr "Forename"
 
 #. Last Name
 #: src/protocols/gg/gg.c:962 src/protocols/jabber/jabber.c:618
-#: src/protocols/oscar/oscar.c:4859 src/protocols/trepia/trepia.c:274
+#: src/protocols/oscar/oscar.c:4854 src/protocols/trepia/trepia.c:274
 msgid "Last Name"
 msgstr "Surname"
 
 #: src/protocols/gg/gg.c:966 src/protocols/gg/gg.c:1707
-#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4848
-#: src/protocols/silc/ops.c:1184
+#: src/protocols/irc/msgs.c:182 src/protocols/oscar/oscar.c:4843
+#: src/protocols/silc/ops.c:1193
 msgid "Nick"
 msgstr "Nick"
 
@@ -4757,7 +4771,7 @@
 
 #. City
 #: src/protocols/gg/gg.c:990 src/protocols/jabber/jabber.c:628
-#: src/protocols/oscar/oscar.c:4902 src/protocols/oscar/oscar.c:4910
+#: src/protocols/oscar/oscar.c:4897 src/protocols/oscar/oscar.c:4905
 #: src/protocols/trepia/trepia.c:331 src/protocols/trepia/trepia.c:410
 msgid "City"
 msgstr "City"
@@ -4862,7 +4876,7 @@
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
 #: src/protocols/gg/gg.c:1497 src/protocols/jabber/jabber.c:1062
-#: src/protocols/toc/toc.c:1550
+#: src/protocols/toc/toc.c:1551
 msgid "Change Password"
 msgstr "Change Password"
 
@@ -4900,7 +4914,6 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: src/protocols/gg/gg.c:1686 src/protocols/gg/gg.c:1688
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu Protocol Plugin"
@@ -4914,15 +4927,15 @@
 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:232
-#: src/protocols/msn/userlist.c:100 src/protocols/oscar/oscar.c:3555
-#: src/protocols/oscar/oscar.c:6126
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:235
+#: src/protocols/msn/userlist.c:100 src/protocols/oscar/oscar.c:3546
+#: src/protocols/oscar/oscar.c:6131
 msgid "Authorize"
 msgstr "Authorise"
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:233
-#: src/protocols/msn/userlist.c:101 src/protocols/oscar/oscar.c:3557
-#: src/protocols/oscar/oscar.c:6127
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:236
+#: src/protocols/msn/userlist.c:101 src/protocols/oscar/oscar.c:3548
+#: src/protocols/oscar/oscar.c:6132
 msgid "Deny"
 msgstr "Deny"
 
@@ -4947,13 +4960,13 @@
 msgid "Unknown command: %s"
 msgstr "Unknown command: %s"
 
-#: src/protocols/irc/cmds.c:448 src/protocols/jabber/chat.c:544
+#: src/protocols/irc/cmds.c:448 src/protocols/jabber/chat.c:536
 #: src/protocols/silc/silc.c:995
 #, c-format
 msgid "current topic is: %s"
 msgstr "current topic is: %s"
 
-#: src/protocols/irc/cmds.c:451 src/protocols/jabber/chat.c:546
+#: src/protocols/irc/cmds.c:451 src/protocols/jabber/chat.c:538
 #: src/protocols/silc/silc.c:998
 msgid "No topic is set"
 msgstr "No topic is set"
@@ -4986,51 +4999,51 @@
 msgid "MOTD for %s"
 msgstr "MOTD for %s"
 
-#: src/protocols/irc/irc.c:93 src/protocols/irc/irc.c:373
+#: src/protocols/irc/irc.c:93 src/protocols/irc/irc.c:388
 msgid "Server has disconnected"
 msgstr "Server has disconnected"
 
-#: src/protocols/irc/irc.c:147
+#: src/protocols/irc/irc.c:158
 msgid "View MOTD"
 msgstr "View MOTD"
 
-#: src/protocols/irc/irc.c:169 src/protocols/silc/chat.c:32
+#: src/protocols/irc/irc.c:180 src/protocols/silc/chat.c:32
 msgid "_Channel:"
 msgstr "_Channel:"
 
-#: src/protocols/irc/irc.c:174 src/protocols/jabber/chat.c:59
+#: src/protocols/irc/irc.c:185 src/protocols/jabber/chat.c:59
 msgid "_Password:"
 msgstr "_Password:"
 
-#: src/protocols/irc/irc.c:194
+#: src/protocols/irc/irc.c:205
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC nicks may not contain whitespace"
 
-#: src/protocols/irc/irc.c:213 src/protocols/toc/toc.c:198
+#: src/protocols/irc/irc.c:224 src/protocols/toc/toc.c:198
 #, c-format
 msgid "Signon: %s"
 msgstr "Signon: %s"
 
-#: src/protocols/irc/irc.c:222
+#: src/protocols/irc/irc.c:233
 msgid "Couldn't create socket"
 msgstr "Couldn't create socket"
 
-#: src/protocols/irc/irc.c:237 src/protocols/jabber/jabber.c:297
-#: src/protocols/oscar/oscar.c:1529 src/protocols/oscar/oscar.c:1593
+#: src/protocols/irc/irc.c:248 src/protocols/jabber/jabber.c:297
+#: src/protocols/oscar/oscar.c:1519 src/protocols/oscar/oscar.c:1583
 msgid "Couldn't connect to host"
 msgstr "Couldn't connect to host"
 
-#: src/protocols/irc/irc.c:370 src/protocols/trepia/trepia.c:926
+#: src/protocols/irc/irc.c:385 src/protocols/trepia/trepia.c:926
 msgid "Read error"
 msgstr "Read error"
 
-#: src/protocols/irc/irc.c:521 src/protocols/silc/chat.c:1363
+#: src/protocols/irc/irc.c:536 src/protocols/silc/chat.c:1356
 #: src/protocols/yahoo/yahoochat.c:1380
 msgid "Users"
 msgstr "Users"
 
-#: src/protocols/irc/irc.c:524 src/protocols/silc/chat.c:1366
-#: src/protocols/silc/ops.c:1146 src/protocols/yahoo/yahoochat.c:1389
+#: src/protocols/irc/irc.c:539 src/protocols/silc/chat.c:1359
+#: src/protocols/silc/ops.c:1155 src/protocols/yahoo/yahoochat.c:1389
 msgid "Topic"
 msgstr "Topic"
 
@@ -5043,51 +5056,57 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:628
+#: src/protocols/irc/irc.c:643
 msgid "IRC Protocol Plugin"
 msgstr "IRC Protocol Plugin"
 
 #. *  summary
-#: src/protocols/irc/irc.c:629
+#: src/protocols/irc/irc.c:644
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "The IRC Protocol Plugin that Sucks Less"
 
-#: src/protocols/irc/irc.c:648 src/protocols/irc/msgs.c:197
-#: src/protocols/jabber/jabber.c:1559 src/protocols/napster/napster.c:644
-#: src/protocols/silc/ops.c:1008 src/protocols/silc/ops.c:1110
+#: src/protocols/irc/irc.c:663 src/protocols/irc/msgs.c:201
+#: src/protocols/jabber/jabber.c:1576 src/protocols/napster/napster.c:644
+#: src/protocols/silc/ops.c:1017 src/protocols/silc/ops.c:1119
 msgid "Server"
 msgstr "Server"
 
-#: src/protocols/irc/irc.c:651 src/protocols/jabber/jabber.c:1580
-#: src/protocols/msn/msn.c:1758 src/protocols/napster/napster.c:649
-#: src/protocols/silc/silc.c:1576 src/protocols/trepia/trepia.c:1297
+#: src/protocols/irc/irc.c:666 src/protocols/jabber/jabber.c:1597
+#: src/protocols/msn/msn.c:1759 src/protocols/napster/napster.c:649
+#: src/protocols/silc/silc.c:1577 src/protocols/trepia/trepia.c:1297
 msgid "Port"
 msgstr "Port"
 
-#: src/protocols/irc/irc.c:654 src/protocols/zephyr/zephyr.c:1915
+#: src/protocols/irc/irc.c:669 src/protocols/zephyr/zephyr.c:1919
 msgid "Encoding"
 msgstr "Encoding"
 
-#: src/protocols/irc/irc.c:657 src/protocols/irc/msgs.c:191
+#: src/protocols/irc/irc.c:672 src/protocols/irc/msgs.c:195
 #: src/protocols/jabber/jabber.c:588 src/protocols/silc/buddy.c:1445
-#: src/protocols/silc/ops.c:955 src/protocols/silc/ops.c:957
-#: src/protocols/silc/ops.c:1104 src/protocols/silc/ops.c:1106
+#: src/protocols/silc/ops.c:964 src/protocols/silc/ops.c:966
+#: src/protocols/silc/ops.c:1113 src/protocols/silc/ops.c:1115
 msgid "Username"
 msgstr "Username"
 
-#: src/protocols/irc/msgs.c:98
+#: src/protocols/irc/msgs.c:97
 msgid "Bad mode"
 msgstr "Bad mode"
 
-#: src/protocols/irc/msgs.c:109
+#: src/protocols/irc/msgs.c:108
 #, c-format
 msgid "You are banned from %s."
 msgstr "You are banned from %s."
 
-#: src/protocols/irc/msgs.c:110
+#: src/protocols/irc/msgs.c:109
 msgid "Banned"
 msgstr "Banned"
 
+#: src/protocols/irc/msgs.c:182 src/protocols/irc/msgs.c:201
+#: src/protocols/irc/msgs.c:214
+#, c-format
+msgid "<b>%s:</b> %s"
+msgstr "<b>%s:</b> %s"
+
 #: src/protocols/irc/msgs.c:184
 msgid " <i>(ircop)</i>"
 msgstr " <i>(ircop)</i>"
@@ -5096,138 +5115,145 @@
 msgid " <i>(identified)</i>"
 msgstr " <i>(identified)</i>"
 
-#: src/protocols/irc/msgs.c:192 src/protocols/silc/ops.c:949
-#: src/protocols/silc/ops.c:1098 src/protocols/yahoo/yahoo_profile.c:1005
+#: src/protocols/irc/msgs.c:189 src/protocols/irc/msgs.c:195
+#: src/protocols/irc/msgs.c:196 src/protocols/irc/msgs.c:207
+#: src/protocols/msn/msn.c:1179 src/protocols/yahoo/yahoo_profile.c:664
+#, c-format
+msgid "<b>%s:</b> %s<br>"
+msgstr "<b>%s:</b> %s<br>"
+
+#: src/protocols/irc/msgs.c:196 src/protocols/silc/ops.c:958
+#: src/protocols/silc/ops.c:1107 src/protocols/yahoo/yahoo_profile.c:1005
 msgid "Realname"
 msgstr "Realname"
 
-#: src/protocols/irc/msgs.c:202 src/protocols/silc/ops.c:1021
+#: src/protocols/irc/msgs.c:207 src/protocols/silc/ops.c:1030
 msgid "Currently on"
 msgstr "Currently on"
 
-#: src/protocols/irc/msgs.c:207
+#: src/protocols/irc/msgs.c:212
 #, c-format
 msgid "<b>Idle for:</b> %s<br>"
 msgstr "<b>Idle for:</b> %s<br>"
 
-#: src/protocols/irc/msgs.c:209
+#: src/protocols/irc/msgs.c:214
 msgid "Online since"
 msgstr "Online since"
 
-#: src/protocols/irc/msgs.c:212
+#: src/protocols/irc/msgs.c:217
 msgid "<br><b>Defining adjective:</b> Glorious<br>"
 msgstr "<br><b>Defining adjective:</b> Glorious<br>"
 
-#: src/protocols/irc/msgs.c:219
+#: src/protocols/irc/msgs.c:224
 #, c-format
 msgid "Buddy Information for %s"
 msgstr "Buddy Information for %s"
 
-#: src/protocols/irc/msgs.c:279
+#: src/protocols/irc/msgs.c:284
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s has changed the topic to: %s"
 
-#: src/protocols/irc/msgs.c:284
+#: src/protocols/irc/msgs.c:289
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "The topic for %s is: %s"
 
-#: src/protocols/irc/msgs.c:301
+#: src/protocols/irc/msgs.c:306
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Unknown message '%s'"
 
-#: src/protocols/irc/msgs.c:302
+#: src/protocols/irc/msgs.c:307
 msgid "Unknown message"
 msgstr "Unknown message"
 
-#: src/protocols/irc/msgs.c:302
+#: src/protocols/irc/msgs.c:307
 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:325
+#: src/protocols/irc/msgs.c:330
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Users on %s: %s"
 
-#: src/protocols/irc/msgs.c:407
+#: src/protocols/irc/msgs.c:424
 msgid "No such channel"
 msgstr "No such channel"
 
 #. does this happen?
-#: src/protocols/irc/msgs.c:418
+#: src/protocols/irc/msgs.c:435
 msgid "no such channel"
 msgstr "no such channel"
 
-#: src/protocols/irc/msgs.c:421
+#: src/protocols/irc/msgs.c:438
 msgid "User is not logged in"
 msgstr "User is not logged in"
 
-#: src/protocols/irc/msgs.c:426
+#: src/protocols/irc/msgs.c:443
 msgid "No such nick or channel"
 msgstr "No such nick or channel"
 
-#: src/protocols/irc/msgs.c:446
+#: src/protocols/irc/msgs.c:463
 msgid "Could not send"
 msgstr "Could not send"
 
-#: src/protocols/irc/msgs.c:502
+#: src/protocols/irc/msgs.c:519
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Joining %s requires an invitation."
 
-#: src/protocols/irc/msgs.c:503
+#: src/protocols/irc/msgs.c:520
 msgid "Invitation only"
 msgstr "Invitation only"
 
-#: src/protocols/irc/msgs.c:606
+#: src/protocols/irc/msgs.c:623
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "You have been kicked by %s: (%s)"
 
-#: src/protocols/irc/msgs.c:611
+#: src/protocols/irc/msgs.c:628
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Kicked by %s (%s)"
 
-#: src/protocols/irc/msgs.c:632
+#: src/protocols/irc/msgs.c:649
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "mode (%s %s) by %s"
 
-#: src/protocols/irc/msgs.c:711
+#: src/protocols/irc/msgs.c:758
 msgid "Could not change nick"
 msgstr "Could not change nick"
 
-#: src/protocols/irc/msgs.c:712
+#: src/protocols/irc/msgs.c:759
 msgid "Cannot change nick"
 msgstr "Cannot change nick"
 
-#: src/protocols/irc/msgs.c:733
+#: src/protocols/irc/msgs.c:780
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "You have parted the channel%s%s"
 
-#: src/protocols/irc/msgs.c:773
+#: src/protocols/irc/msgs.c:820
 msgid "Error: invalid PONG from server"
 msgstr "Error: invalid PONG from server"
 
-#: src/protocols/irc/msgs.c:775
+#: src/protocols/irc/msgs.c:822
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING reply -- Lag: %lu seconds"
 
-#: src/protocols/irc/msgs.c:850
+#: src/protocols/irc/msgs.c:897
 #, c-format
 msgid "Cannot join %s:"
 msgstr "Cannot join %s:"
 
-#: src/protocols/irc/msgs.c:851 src/protocols/silc/ops.c:894
+#: src/protocols/irc/msgs.c:898 src/protocols/silc/ops.c:903
 msgid "Cannot join channel"
 msgstr "Cannot join channel"
 
-#: src/protocols/irc/msgs.c:887
+#: src/protocols/irc/msgs.c:934
 #, c-format
 msgid "Wallops from %s"
 msgstr "Wallops from %s"
@@ -5326,7 +5352,7 @@
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [channel]:  List the users currently in a channel."
 
-#: src/protocols/irc/parse.c:122 src/protocols/jabber/jabber.c:1407
+#: src/protocols/irc/parse.c:122 src/protocols/jabber/jabber.c:1410
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;new nickname&gt;:  Change your nickname."
 
@@ -5414,7 +5440,7 @@
 msgid "whois &lt;nick&gt;:  Get information on a user."
 msgstr "whois &lt;nick&gt;:  Get information on a user."
 
-#: src/protocols/irc/parse.c:228 src/protocols/zephyr/zephyr.c:256
+#: src/protocols/irc/parse.c:242 src/protocols/zephyr/zephyr.c:265
 msgid ""
 "(There was an error converting this message.  Check the 'Encoding' option in "
 "the Account Editor)"
@@ -5422,20 +5448,20 @@
 "(There was an error converting this message.  Check the 'Encoding' option in "
 "the Account Editor)"
 
-#: src/protocols/irc/parse.c:382
+#: src/protocols/irc/parse.c:394
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Reply time from %s: %lu seconds"
 
-#: src/protocols/irc/parse.c:383
+#: src/protocols/irc/parse.c:395
 msgid "PONG"
 msgstr "PONG"
 
-#: src/protocols/irc/parse.c:383
+#: src/protocols/irc/parse.c:395
 msgid "CTCP PING reply"
 msgstr "CTCP PING reply"
 
-#: src/protocols/irc/parse.c:485 src/protocols/oscar/oscar.c:1430
+#: src/protocols/irc/parse.c:497 src/protocols/oscar/oscar.c:1416
 #: src/protocols/toc/toc.c:188 src/protocols/toc/toc.c:596
 #: src/protocols/toc/toc.c:612 src/protocols/toc/toc.c:689
 msgid "Disconnected."
@@ -5471,12 +5497,12 @@
 msgstr "Invalid challenge from server"
 
 #: src/protocols/jabber/buddy.c:246 src/protocols/jabber/buddy.c:604
-#: src/protocols/silc/ops.c:786
+#: src/protocols/silc/ops.c:795
 msgid "Full Name"
 msgstr "Full Name"
 
 #: src/protocols/jabber/buddy.c:247 src/protocols/jabber/buddy.c:617
-#: src/protocols/silc/ops.c:798
+#: src/protocols/silc/ops.c:807
 msgid "Family Name"
 msgstr "Family Name"
 
@@ -5486,8 +5512,8 @@
 
 #: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:635
 #: src/protocols/jabber/jabber.c:608 src/protocols/msn/msn.c:1172
-#: src/protocols/silc/buddy.c:1442 src/protocols/silc/ops.c:802
-#: src/protocols/silc/ops.c:945 src/protocols/silc/ops.c:1094
+#: src/protocols/silc/buddy.c:1442 src/protocols/silc/ops.c:811
+#: src/protocols/silc/ops.c:954 src/protocols/silc/ops.c:1103
 #: src/protocols/yahoo/yahoo_profile.c:1000
 msgid "Nickname"
 msgstr "Nickname"
@@ -5551,7 +5577,7 @@
 msgstr "Role"
 
 #: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:638
-#: src/protocols/oscar/oscar.c:4883
+#: src/protocols/oscar/oscar.c:4878
 msgid "Birthday"
 msgstr "Birthday"
 
@@ -5573,24 +5599,24 @@
 
 #: src/protocols/jabber/buddy.c:563 src/protocols/jabber/buddy.c:570
 #: src/protocols/jabber/buddy.c:581 src/protocols/jabber/jabber.c:938
-#: src/protocols/msn/msn.c:450 src/protocols/novell/novell.c:2743
-#: src/protocols/novell/novell.c:2747 src/protocols/oscar/oscar.c:578
-#: src/protocols/oscar/oscar.c:584 src/protocols/oscar/oscar.c:586
-#: src/protocols/yahoo/yahoo.c:2634
+#: src/protocols/msn/msn.c:450 src/protocols/novell/novell.c:2790
+#: src/protocols/novell/novell.c:2794 src/protocols/oscar/oscar.c:562
+#: src/protocols/oscar/oscar.c:568 src/protocols/oscar/oscar.c:570
+#: src/protocols/yahoo/yahoo.c:2677
 msgid "Status"
 msgstr "Status"
 
-#: src/protocols/jabber/buddy.c:579 src/protocols/jabber/jabber.c:1562
+#: src/protocols/jabber/buddy.c:579 src/protocols/jabber/jabber.c:1579
 msgid "Resource"
 msgstr "Resource"
 
-#: src/protocols/jabber/buddy.c:625 src/protocols/silc/ops.c:794
+#: src/protocols/jabber/buddy.c:625 src/protocols/silc/ops.c:803
 msgid "Middle Name"
 msgstr "Middle Name"
 
 #: src/protocols/jabber/buddy.c:643 src/protocols/jabber/jabber.c:623
-#: src/protocols/oscar/oscar.c:4901 src/protocols/oscar/oscar.c:4909
-#: src/protocols/silc/ops.c:830
+#: src/protocols/oscar/oscar.c:4896 src/protocols/oscar/oscar.c:4904
+#: src/protocols/silc/ops.c:839
 msgid "Address"
 msgstr "Address"
 
@@ -5673,51 +5699,51 @@
 msgid "Invalid Room Handle"
 msgstr "Invalid Room Handle"
 
-#: src/protocols/jabber/chat.c:349
+#: src/protocols/jabber/chat.c:341
 msgid "Configuration error"
 msgstr "Configuration error"
 
-#: src/protocols/jabber/chat.c:358 src/protocols/jabber/chat.c:503
+#: src/protocols/jabber/chat.c:350 src/protocols/jabber/chat.c:495
 msgid "Unable to configure"
 msgstr "Unable to configure"
 
-#: src/protocols/jabber/chat.c:374
+#: src/protocols/jabber/chat.c:366
 msgid "Room Configuration Error"
 msgstr "Room Configuration Error"
 
-#: src/protocols/jabber/chat.c:375
+#: src/protocols/jabber/chat.c:367
 msgid "This room is not capable of being configured"
 msgstr "This room is not capable of being configured"
 
-#: src/protocols/jabber/chat.c:425 src/protocols/jabber/chat.c:494
+#: src/protocols/jabber/chat.c:417 src/protocols/jabber/chat.c:486
 msgid "Registration error"
 msgstr "Registration error"
 
-#: src/protocols/jabber/chat.c:573
+#: src/protocols/jabber/chat.c:565
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "Nick changing not supported in non-MUC chatrooms"
 
-#: src/protocols/jabber/chat.c:617 src/protocols/jabber/chat.c:628
+#: src/protocols/jabber/chat.c:609 src/protocols/jabber/chat.c:620
 msgid "Roomlist Error"
 msgstr "Roomlist Error"
 
-#: src/protocols/jabber/chat.c:618 src/protocols/jabber/chat.c:629
+#: src/protocols/jabber/chat.c:610 src/protocols/jabber/chat.c:621
 msgid "Error retreiving roomlist"
 msgstr "Error retreiving roomlist"
 
-#: src/protocols/jabber/chat.c:669
+#: src/protocols/jabber/chat.c:661
 msgid "Invalid Server"
 msgstr "Invalid Server"
 
-#: src/protocols/jabber/chat.c:706
+#: src/protocols/jabber/chat.c:698
 msgid "Enter a Conference Server"
 msgstr "Enter a Conference Server"
 
-#: src/protocols/jabber/chat.c:707
+#: src/protocols/jabber/chat.c:699
 msgid "Select a conference server to query"
 msgstr "Select a conference server to query"
 
-#: src/protocols/jabber/chat.c:710
+#: src/protocols/jabber/chat.c:702
 msgid "Find Rooms"
 msgstr "Find Rooms"
 
@@ -5787,13 +5813,13 @@
 msgstr "E-Mail"
 
 #. State
-#: src/protocols/jabber/jabber.c:633 src/protocols/oscar/oscar.c:4903
-#: src/protocols/oscar/oscar.c:4911 src/protocols/trepia/trepia.c:335
+#: src/protocols/jabber/jabber.c:633 src/protocols/oscar/oscar.c:4898
+#: src/protocols/oscar/oscar.c:4906 src/protocols/trepia/trepia.c:335
 #: src/protocols/trepia/trepia.c:413
 msgid "State"
 msgstr "County/State"
 
-#: src/protocols/jabber/jabber.c:643 src/protocols/silc/ops.c:835
+#: src/protocols/jabber/jabber.c:643 src/protocols/silc/ops.c:844
 #: src/protocols/silc/silc.c:639 src/protocols/silc/util.c:510
 msgid "Phone"
 msgstr "Telephone"
@@ -5816,9 +5842,9 @@
 
 #. connect to the server
 #: src/protocols/jabber/jabber.c:783 src/protocols/msn/msn.c:608
-#: src/protocols/napster/napster.c:499 src/protocols/novell/novell.c:2105
-#: src/protocols/oscar/oscar.c:1597 src/protocols/trepia/trepia.c:1064
-#: src/protocols/yahoo/yahoo.c:2379 src/protocols/zephyr/zephyr.c:1017
+#: src/protocols/napster/napster.c:499 src/protocols/novell/novell.c:2123
+#: src/protocols/oscar/oscar.c:1587 src/protocols/trepia/trepia.c:1064
+#: src/protocols/yahoo/yahoo.c:2422 src/protocols/zephyr/zephyr.c:1018
 msgid "Connecting"
 msgstr "Connecting"
 
@@ -5836,7 +5862,7 @@
 
 #: src/protocols/jabber/jabber.c:882 src/protocols/jabber/jabber.c:1159
 #: src/protocols/jabber/jabber.c:1200 src/protocols/jabber/jabber.c:1233
-#: src/protocols/oscar/oscar.c:584 src/protocols/oscar/oscar.c:6497
+#: src/protocols/oscar/oscar.c:568 src/protocols/oscar/oscar.c:6500
 msgid "Not Authorized"
 msgstr "Not Authorised"
 
@@ -5869,19 +5895,19 @@
 msgstr "Error"
 
 #: src/protocols/jabber/jabber.c:959 src/protocols/jabber/jutil.c:35
-#: src/protocols/jabber/presence.c:66 src/protocols/jabber/presence.c:117
+#: src/protocols/jabber/presence.c:66 src/protocols/jabber/presence.c:119
 msgid "Chatty"
 msgstr "Chatty"
 
 #: src/protocols/jabber/jabber.c:961 src/protocols/jabber/jutil.c:38
-#: src/protocols/jabber/presence.c:68 src/protocols/jabber/presence.c:122
+#: src/protocols/jabber/presence.c:68 src/protocols/jabber/presence.c:124
 msgid "Extended Away"
 msgstr "Extended Away"
 
 #: src/protocols/jabber/jabber.c:962 src/protocols/jabber/jutil.c:41
-#: src/protocols/jabber/presence.c:70 src/protocols/jabber/presence.c:124
-#: src/protocols/oscar/oscar.c:526 src/protocols/oscar/oscar.c:5487
-#: src/protocols/oscar/oscar.c:6690
+#: src/protocols/jabber/presence.c:70 src/protocols/jabber/presence.c:126
+#: src/protocols/oscar/oscar.c:510 src/protocols/oscar/oscar.c:5489
+#: src/protocols/oscar/oscar.c:6693
 msgid "Do Not Disturb"
 msgstr "Do Not Disturb"
 
@@ -5909,7 +5935,7 @@
 msgid "Please enter your new password"
 msgstr "Please enter your new password"
 
-#: src/protocols/jabber/jabber.c:1057 src/protocols/toc/toc.c:1540
+#: src/protocols/jabber/jabber.c:1057 src/protocols/toc/toc.c:1541
 msgid "Set User Info"
 msgstr "Set User Info"
 
@@ -6029,7 +6055,7 @@
 msgid "Resource Conflict"
 msgstr "Resource Conflict"
 
-#: src/protocols/jabber/jabber.c:1215 src/protocols/silc/ops.c:1491
+#: src/protocols/jabber/jabber.c:1215 src/protocols/silc/ops.c:1500
 msgid "Connection Timeout"
 msgstr "Connection Timeout"
 
@@ -6119,49 +6145,49 @@
 msgid "Unable to kick user %s"
 msgstr "Unable to kick user %s"
 
-#: src/protocols/jabber/jabber.c:1401
+#: src/protocols/jabber/jabber.c:1402
 msgid "config:  Configure a chat room."
 msgstr "config:  Configure a chat room."
 
-#: src/protocols/jabber/jabber.c:1404
+#: src/protocols/jabber/jabber.c:1406
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Configure a chat room."
 
-#: src/protocols/jabber/jabber.c:1411
+#: src/protocols/jabber/jabber.c:1415
 msgid "part [room]:  Leave the room."
 msgstr "part [room]:  Leave the room."
 
-#: src/protocols/jabber/jabber.c:1414
+#: src/protocols/jabber/jabber.c:1420
 msgid "register:  Register with a chat room."
 msgstr "register:  Register with a chat room."
 
-#: src/protocols/jabber/jabber.c:1419
+#: src/protocols/jabber/jabber.c:1426
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [new topic]:  View or change the topic."
 
-#: src/protocols/jabber/jabber.c:1423
+#: src/protocols/jabber/jabber.c:1432
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;user&gt; [room]:  Ban a user from the room."
 
-#: src/protocols/jabber/jabber.c:1427
+#: src/protocols/jabber/jabber.c:1438
 msgid "invite &lt;user&gt; [room]:  Invite a user to the room."
 msgstr "invite &lt;user&gt; [room]:  Invite a user to the room."
 
-#: src/protocols/jabber/jabber.c:1431
+#: src/protocols/jabber/jabber.c:1444
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt;room&gt; [server]:  Join a chat on this server."
 
-#: src/protocols/jabber/jabber.c:1435
+#: src/protocols/jabber/jabber.c:1450
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;user&gt; [room]:  Kick a user from the room."
 
-#: src/protocols/jabber/jabber.c:1439
+#: src/protocols/jabber/jabber.c:1455
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 
-#: src/protocols/jabber/jabber.c:1453
+#: src/protocols/jabber/jabber.c:1470
 msgid "Hide Operating System"
 msgstr "Hide Operating System"
 
@@ -6175,25 +6201,24 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: src/protocols/jabber/jabber.c:1537 src/protocols/jabber/jabber.c:1539
+#: src/protocols/jabber/jabber.c:1554 src/protocols/jabber/jabber.c:1556
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber Protocol Plugin"
 
-#: src/protocols/jabber/jabber.c:1565
+#: src/protocols/jabber/jabber.c:1582
 msgid "Use TLS if available"
 msgstr "Use TLS if available"
 
-#: src/protocols/jabber/jabber.c:1570
+#: src/protocols/jabber/jabber.c:1587
 msgid "Force old SSL"
 msgstr "Force old SSL"
 
-#: src/protocols/jabber/jabber.c:1575
+#: src/protocols/jabber/jabber.c:1592
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Allow plaintext auth over unencrypted streams"
 
 #. Account options
-#: src/protocols/jabber/jabber.c:1584 src/protocols/silc/silc.c:1572
+#: src/protocols/jabber/jabber.c:1601 src/protocols/silc/silc.c:1573
 msgid "Connect server"
 msgstr "Connect server"
 
@@ -6212,16 +6237,16 @@
 msgid "The topic is: %s"
 msgstr "The topic is: %s"
 
-#: src/protocols/jabber/message.c:225
+#: src/protocols/jabber/message.c:226
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "Message delivery to %s failed: %s"
 
-#: src/protocols/jabber/message.c:228
+#: src/protocols/jabber/message.c:229
 msgid "Jabber Message Error"
 msgstr "Jabber Message Error"
 
-#: src/protocols/jabber/message.c:291
+#: src/protocols/jabber/message.c:293
 #, c-format
 msgid " (Code %s)"
 msgstr " (Code %s)"
@@ -6230,20 +6255,20 @@
 msgid "XML Parse error"
 msgstr "XML Parse error"
 
-#: src/protocols/jabber/presence.c:224
+#: src/protocols/jabber/presence.c:227
 msgid "Unknown Error in presence"
 msgstr "Unknown Error in presence"
 
-#: src/protocols/jabber/presence.c:227
+#: src/protocols/jabber/presence.c:230
 #, 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:280 src/protocols/jabber/presence.c:281
+#: src/protocols/jabber/presence.c:283 src/protocols/jabber/presence.c:284
 msgid "Create New Room"
 msgstr "Create New Room"
 
-#: src/protocols/jabber/presence.c:282
+#: src/protocols/jabber/presence.c:285
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -6251,20 +6276,20 @@
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
 
-#: src/protocols/jabber/presence.c:284
+#: src/protocols/jabber/presence.c:287
 msgid "Configure Room"
 msgstr "Configure Room"
 
-#: src/protocols/jabber/presence.c:286
+#: src/protocols/jabber/presence.c:289
 msgid "Accept Defaults"
 msgstr "Accept Defaults"
 
-#: src/protocols/jabber/presence.c:308
+#: src/protocols/jabber/presence.c:311
 #, c-format
 msgid "Error in chat %s"
 msgstr "Error in chat %s"
 
-#: src/protocols/jabber/presence.c:311
+#: src/protocols/jabber/presence.c:314
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Error joining chat %s"
@@ -6282,11 +6307,11 @@
 msgid "Miscellaneous error"
 msgstr "Miscellaneous error"
 
-#: src/protocols/msn/cmdproc.c:338
+#: src/protocols/msn/cmdproc.c:339
 msgid "You have signed on from another location."
 msgstr "You have signed on from another location."
 
-#: src/protocols/msn/cmdproc.c:340
+#: src/protocols/msn/cmdproc.c:341
 msgid "The MSN servers are going down temporarily."
 msgstr "The MSN servers are going down temporarily."
 
@@ -6334,7 +6359,7 @@
 msgid "Not on list"
 msgstr "Not on list"
 
-#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:593
+#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:602
 msgid "User is offline"
 msgstr "User is offline"
 
@@ -6479,8 +6504,8 @@
 msgid "Server too busy"
 msgstr "Server too busy"
 
-#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2026
-#: src/protocols/silc/ops.c:1480 src/protocols/toc/toc.c:630
+#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2016
+#: src/protocols/silc/ops.c:1489 src/protocols/toc/toc.c:630
 msgid "Authentication failed"
 msgstr "Authentication failed"
 
@@ -6566,40 +6591,49 @@
 msgid "Page"
 msgstr "Page"
 
+#: src/protocols/msn/msn.c:450 src/protocols/yahoo/yahoo.c:2677
+#, c-format
+msgid ""
+"\n"
+"<b>%s:</b> %s"
+msgstr ""
+"\n"
+"<b>%s:</b> %s"
+
 #: src/protocols/msn/msn.c:463 src/protocols/msn/msn.c:756
 #: src/protocols/msn/state.c:34
 msgid "Away From Computer"
 msgstr "Away From Computer"
 
 #: src/protocols/msn/msn.c:464 src/protocols/msn/msn.c:758
-#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2491
-#: src/protocols/yahoo/yahoo.c:2853 src/protocols/yahoo/yahoo.c:2969
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2534
+#: src/protocols/yahoo/yahoo.c:2896 src/protocols/yahoo/yahoo.c:3012
 msgid "Be Right Back"
 msgstr "Be Right Back"
 
 #: src/protocols/msn/msn.c:465 src/protocols/msn/msn.c:760
-#: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2727
-#: src/protocols/novell/novell.c:2842 src/protocols/novell/novell.c:2896
+#: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2774
+#: src/protocols/novell/novell.c:2889 src/protocols/novell/novell.c:2943
 #: src/protocols/silc/buddy.c:1383 src/protocols/silc/silc.c:47
-#: src/protocols/silc/silc.c:78 src/protocols/yahoo/yahoo.c:2493
-#: src/protocols/yahoo/yahoo.c:2855 src/protocols/yahoo/yahoo.c:2970
+#: src/protocols/silc/silc.c:78 src/protocols/yahoo/yahoo.c:2536
+#: src/protocols/yahoo/yahoo.c:2898 src/protocols/yahoo/yahoo.c:3013
 msgid "Busy"
 msgstr "Busy"
 
 #: src/protocols/msn/msn.c:466 src/protocols/msn/msn.c:762
-#: src/protocols/msn/state.c:35 src/protocols/yahoo/yahoo.c:2501
-#: src/protocols/yahoo/yahoo.c:2863 src/protocols/yahoo/yahoo.c:2974
+#: src/protocols/msn/state.c:35 src/protocols/yahoo/yahoo.c:2544
+#: src/protocols/yahoo/yahoo.c:2906 src/protocols/yahoo/yahoo.c:3017
 msgid "On The Phone"
 msgstr "On The Phone"
 
 #: src/protocols/msn/msn.c:467 src/protocols/msn/msn.c:764
-#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2505
-#: src/protocols/yahoo/yahoo.c:2867 src/protocols/yahoo/yahoo.c:2976
+#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2548
+#: src/protocols/yahoo/yahoo.c:2910 src/protocols/yahoo/yahoo.c:3019
 msgid "Out To Lunch"
 msgstr "Out To Lunch"
 
 #: src/protocols/msn/msn.c:468 src/protocols/msn/msn.c:766
-#: src/protocols/zephyr/zephyr.c:1355 src/protocols/zephyr/zephyr.c:1374
+#: src/protocols/zephyr/zephyr.c:1358 src/protocols/zephyr/zephyr.c:1377
 msgid "Hidden"
 msgstr "Hidden"
 
@@ -6648,7 +6682,7 @@
 "http://gaim.sf.net/faq-ssl.php for more information."
 
 #: src/protocols/msn/msn.c:1167 src/protocols/yahoo/yahoo_profile.c:659
-#: src/protocols/zephyr/zephyr.c:626
+#: src/protocols/zephyr/zephyr.c:635
 #, c-format
 msgid "<b>Alias:</b> %s<br>"
 msgstr "<b>Alias:</b> %s<br>"
@@ -6665,11 +6699,6 @@
 msgid "<font sml=\"msn\">%s</font><br>"
 msgstr "<font sml=\"msn\">%s</font><br>"
 
-#: src/protocols/msn/msn.c:1179 src/protocols/yahoo/yahoo_profile.c:664
-#, c-format
-msgid "<b>%s:</b> %s<br>"
-msgstr "<b>%s:</b> %s<br>"
-
 #: src/protocols/msn/msn.c:1242
 msgid "MSN Profile"
 msgstr "MSN Profile"
@@ -6680,14 +6709,14 @@
 msgstr "Error retreiving profile"
 
 #. Age
-#: src/protocols/msn/msn.c:1318 src/protocols/oscar/oscar.c:4888
+#: src/protocols/msn/msn.c:1318 src/protocols/oscar/oscar.c:4883
 #: src/protocols/trepia/trepia.c:285 src/protocols/trepia/trepia.c:404
 #: src/protocols/yahoo/yahoo_profile.c:1015
 msgid "Age"
 msgstr "Age"
 
 #. Gender
-#: src/protocols/msn/msn.c:1325 src/protocols/oscar/oscar.c:4874
+#: src/protocols/msn/msn.c:1325 src/protocols/oscar/oscar.c:4869
 #: src/protocols/trepia/trepia.c:279 src/protocols/trepia/trepia.c:406
 #: src/protocols/yahoo/yahoo_profile.c:1025
 msgid "Gender"
@@ -6731,7 +6760,7 @@
 msgstr "Last Updated"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1479 src/protocols/silc/ops.c:826
+#: src/protocols/msn/msn.c:1479 src/protocols/silc/ops.c:835
 #: src/protocols/trepia/trepia.c:289 src/protocols/trepia/trepia.c:419
 msgid "Homepage"
 msgstr "Homepage"
@@ -6750,6 +6779,7 @@
 "that the user does not exist, or that the user exists but has not created a "
 "public profile."
 
+#. This should never happen
 #: src/protocols/msn/msn.c:1506
 msgid ""
 "Gaim could not find any information in the user's profile. The user most "
@@ -6762,11 +6792,11 @@
 msgid "Profile URL"
 msgstr "Profile URL"
 
-#: src/protocols/msn/msn.c:1643
+#: src/protocols/msn/msn.c:1644
 msgid "Display conversation closed notices"
 msgstr "Display conversation closed notices"
 
-#: src/protocols/msn/msn.c:1648
+#: src/protocols/msn/msn.c:1649
 msgid "Display timeout notices"
 msgstr "Display timeout notices"
 
@@ -6780,16 +6810,15 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: src/protocols/msn/msn.c:1732 src/protocols/msn/msn.c:1734
+#: src/protocols/msn/msn.c:1733 src/protocols/msn/msn.c:1735
 msgid "MSN Protocol Plugin"
 msgstr "MSN Protocol Plugin"
 
-#: src/protocols/msn/msn.c:1753 src/protocols/trepia/trepia.c:1292
+#: src/protocols/msn/msn.c:1754 src/protocols/trepia/trepia.c:1292
 msgid "Login server"
 msgstr "Login server"
 
-#: src/protocols/msn/msn.c:1762
+#: src/protocols/msn/msn.c:1763
 msgid "Use HTTP Method"
 msgstr "Use HTTP Method"
 
@@ -6810,7 +6839,7 @@
 msgstr "Retrieving buddy list"
 
 #: src/protocols/msn/notification.c:144 src/protocols/msn/notification.c:173
-#: src/protocols/oscar/oscar.c:2315
+#: src/protocols/oscar/oscar.c:2306
 msgid "Password sent"
 msgstr "Password sent"
 
@@ -6942,8 +6971,8 @@
 msgid "%s requested a PING"
 msgstr "%s requested a PING"
 
-#: src/protocols/napster/napster.c:541 src/protocols/oscar/oscar.c:6197
-#: src/protocols/toc/toc.c:1266
+#: src/protocols/napster/napster.c:541 src/protocols/oscar/oscar.c:6202
+#: src/protocols/toc/toc.c:1267
 msgid "_Group:"
 msgstr "_Group:"
 
@@ -6957,7 +6986,6 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: src/protocols/napster/napster.c:624 src/protocols/napster/napster.c:626
 msgid "NAPSTER Protocol Plugin"
 msgstr "NAPSTER Protocol Plugin"
@@ -7091,43 +7119,43 @@
 msgid "Unknown error: 0x%X"
 msgstr "Unknown error: 0x%X"
 
-#: src/protocols/novell/novell.c:116
+#: src/protocols/novell/novell.c:117
 #, c-format
 msgid "Login failed (%s)."
 msgstr "Login failed (%s)."
 
-#: src/protocols/novell/novell.c:229
+#: src/protocols/novell/novell.c:230
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr "Unable to send message. Could not get details for user (%s)."
 
-#: src/protocols/novell/novell.c:375
+#: src/protocols/novell/novell.c:379
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
 msgstr "Unable to add %s to your buddy list (%s)."
 
 #. TODO: Improve this! message to who or for what conference?
-#: src/protocols/novell/novell.c:401
+#: src/protocols/novell/novell.c:405
 #, c-format
 msgid "Unable to send message (%s)."
 msgstr "Unable to send message (%s)."
 
-#: src/protocols/novell/novell.c:472 src/protocols/novell/novell.c:965
+#: src/protocols/novell/novell.c:476 src/protocols/novell/novell.c:969
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "Unable to invite user (%s)."
 
-#: src/protocols/novell/novell.c:511
+#: src/protocols/novell/novell.c:515
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr "Unable to send message to %s. Could not create the conference (%s)."
 
-#: src/protocols/novell/novell.c:516
+#: src/protocols/novell/novell.c:520
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
 msgstr "Unable to send message. Could not create the conference (%s)."
 
-#: src/protocols/novell/novell.c:563
+#: src/protocols/novell/novell.c:567
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
@@ -7136,7 +7164,7 @@
 "Unable to move user %s to folder %s in the server side list. Error while "
 "creating folder (%s)."
 
-#: src/protocols/novell/novell.c:611
+#: src/protocols/novell/novell.c:615
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
@@ -7145,46 +7173,46 @@
 "Unable to add %s to your buddy list. Error creating folder in server side "
 "list (%s)."
 
-#: src/protocols/novell/novell.c:683
+#: src/protocols/novell/novell.c:687
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr "Could not get details for user %s (%s)."
 
-#: src/protocols/novell/novell.c:729 src/protocols/novell/novell.c:875
+#: src/protocols/novell/novell.c:733 src/protocols/novell/novell.c:879
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
 msgstr "Unable to add user to privacy list (%s)."
 
-#: src/protocols/novell/novell.c:776
+#: src/protocols/novell/novell.c:780
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
 msgstr "Unable to add %s to deny list (%s)."
 
-#: src/protocols/novell/novell.c:829
+#: src/protocols/novell/novell.c:833
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
 msgstr "Unable to add %s to permit list (%s)."
 
-#: src/protocols/novell/novell.c:897
+#: src/protocols/novell/novell.c:901
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "Unable to remove %s from privacy list (%s)."
 
-#: src/protocols/novell/novell.c:920 src/protocols/novell/novell.c:1574
+#: src/protocols/novell/novell.c:924 src/protocols/novell/novell.c:1594
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "Unable to change server side privacy settings (%s)."
 
-#: src/protocols/novell/novell.c:992
+#: src/protocols/novell/novell.c:996
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "Unable to create conference (%s)."
 
-#: src/protocols/novell/novell.c:1103 src/protocols/novell/novell.c:1613
+#: src/protocols/novell/novell.c:1107 src/protocols/novell/novell.c:1633
 msgid "Error communicating with server. Closing connection."
 msgstr "Error communicating with server. Closing connection."
 
-#: src/protocols/novell/novell.c:1426
+#: src/protocols/novell/novell.c:1446
 msgid "Userid"
 msgstr "User ID"
 
@@ -7195,46 +7223,46 @@
 #. tag, value);
 #. }
 #.
-#: src/protocols/novell/novell.c:1440
+#: src/protocols/novell/novell.c:1460
 msgid "Full name"
 msgstr "Full name"
 
-#: src/protocols/novell/novell.c:1460
+#: src/protocols/novell/novell.c:1480
 msgid "User Properties"
 msgstr "User Properties"
 
-#: src/protocols/novell/novell.c:1564
+#: src/protocols/novell/novell.c:1584
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "GroupWise Conference %d"
 
-#: src/protocols/novell/novell.c:1589
+#: src/protocols/novell/novell.c:1609
 msgid "Unable to make SSL connection to server."
 msgstr "Unable to make SSL connection to server."
 
-#: src/protocols/novell/novell.c:1619
+#: src/protocols/novell/novell.c:1639
 #, c-format
 msgid "Error processing event or response (%s)."
 msgstr "Error processing event or response (%s)."
 
-#: src/protocols/novell/novell.c:1653
+#: src/protocols/novell/novell.c:1673
 msgid "Authenticating..."
 msgstr "Authenticating..."
 
-#: src/protocols/novell/novell.c:1668
+#: src/protocols/novell/novell.c:1688
 msgid "Waiting for response..."
 msgstr "Waiting for response..."
 
-#: src/protocols/novell/novell.c:1803
+#: src/protocols/novell/novell.c:1823
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "%s has been invited to this conversation."
 
-#: src/protocols/novell/novell.c:1830
+#: src/protocols/novell/novell.c:1850
 msgid "Invitation to Conversation"
 msgstr "Invitation to Conversation"
 
-#: src/protocols/novell/novell.c:1831
+#: src/protocols/novell/novell.c:1851
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -7245,15 +7273,15 @@
 "\n"
 "Sent: %s"
 
-#: src/protocols/novell/novell.c:1833
+#: src/protocols/novell/novell.c:1853
 msgid "Would you like to join the conversation?"
 msgstr "Would you like to join the conversation?"
 
-#: src/protocols/novell/novell.c:1938
+#: src/protocols/novell/novell.c:1956
 msgid "You have been logged out because you logged in at another workstation."
 msgstr "You have been logged out because you logged in at another workstation."
 
-#: src/protocols/novell/novell.c:1992
+#: src/protocols/novell/novell.c:2010
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -7265,7 +7293,7 @@
 #. *  gaim_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: src/protocols/novell/novell.c:2090
+#: src/protocols/novell/novell.c:2108
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
@@ -7273,28 +7301,28 @@
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
 
-#: src/protocols/novell/novell.c:2112
+#: src/protocols/novell/novell.c:2130
 msgid "Error. SSL support is not installed."
 msgstr "Error: SSL support is not installed."
 
-#: src/protocols/novell/novell.c:2421
+#: src/protocols/novell/novell.c:2434
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "This conference has been closed. No more messages can be sent."
 
-#: src/protocols/novell/novell.c:2733 src/protocols/oscar/oscar.c:586
-#: src/protocols/oscar/oscar.c:6499 src/protocols/yahoo/yahoo.c:2513
+#: src/protocols/novell/novell.c:2780 src/protocols/oscar/oscar.c:570
+#: src/protocols/oscar/oscar.c:6502 src/protocols/yahoo/yahoo.c:2556
 msgid "Offline"
 msgstr "Offline"
 
-#: src/protocols/novell/novell.c:2744
+#: src/protocols/novell/novell.c:2791
 msgid "Message"
 msgstr "Message"
 
-#: src/protocols/novell/novell.c:2843 src/protocols/novell/novell.c:2899
+#: src/protocols/novell/novell.c:2890 src/protocols/novell/novell.c:2946
 msgid "Appear Offline"
 msgstr "Appear Offline"
 
-#: src/protocols/novell/novell.c:3293
+#: src/protocols/novell/novell.c:3340
 msgid "Initiate _Chat"
 msgstr "Initiate _Chat"
 
@@ -7308,16 +7336,15 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: src/protocols/novell/novell.c:3389 src/protocols/novell/novell.c:3391
+#: src/protocols/novell/novell.c:3436 src/protocols/novell/novell.c:3438
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GroupWise Messenger Protocol Plugin"
 
-#: src/protocols/novell/novell.c:3410
+#: src/protocols/novell/novell.c:3457
 msgid "Server address"
 msgstr "Server address"
 
-#: src/protocols/novell/novell.c:3414
+#: src/protocols/novell/novell.c:3461
 msgid "Server port"
 msgstr "Server port"
 
@@ -7417,7 +7444,7 @@
 msgid "Not while on AOL"
 msgstr "Not while on AOL"
 
-#: src/protocols/oscar/oscar.c:403
+#: src/protocols/oscar/oscar.c:400
 msgid ""
 "(There was an error converting this message.  The buddy you are speaking to "
 "most likely has a buggy client.)"
@@ -7425,157 +7452,157 @@
 "(There was an error converting this message.  The buddy you are speaking to "
 "most likely has a buggy client.)"
 
-#: src/protocols/oscar/oscar.c:441
+#: src/protocols/oscar/oscar.c:425
 msgid "Voice"
 msgstr "Voice"
 
-#: src/protocols/oscar/oscar.c:444
+#: src/protocols/oscar/oscar.c:428
 msgid "AIM Direct IM"
 msgstr "AIM Direct IM"
 
-#: src/protocols/oscar/oscar.c:447 src/protocols/silc/silc.c:635
+#: src/protocols/oscar/oscar.c:431 src/protocols/silc/silc.c:635
 #: src/protocols/silc/util.c:506
 msgid "Chat"
 msgstr "Chat"
 
-#: src/protocols/oscar/oscar.c:450 src/protocols/oscar/oscar.c:6803
+#: src/protocols/oscar/oscar.c:434 src/protocols/oscar/oscar.c:6804
 msgid "Get File"
 msgstr "Get File"
 
-#: src/protocols/oscar/oscar.c:457
+#: src/protocols/oscar/oscar.c:441
 msgid "Games"
 msgstr "Games"
 
-#: src/protocols/oscar/oscar.c:460
+#: src/protocols/oscar/oscar.c:444
 msgid "Add-Ins"
 msgstr "Add-Ins"
 
-#: src/protocols/oscar/oscar.c:463
+#: src/protocols/oscar/oscar.c:447
 msgid "Send Buddy List"
 msgstr "Send Buddy List"
 
-#: src/protocols/oscar/oscar.c:466
+#: src/protocols/oscar/oscar.c:450
 msgid "ICQ Direct Connect"
 msgstr "ICQ Direct Connect"
 
-#: src/protocols/oscar/oscar.c:469
+#: src/protocols/oscar/oscar.c:453
 msgid "AP User"
 msgstr "AP User"
 
-#: src/protocols/oscar/oscar.c:472
+#: src/protocols/oscar/oscar.c:456
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:475
+#: src/protocols/oscar/oscar.c:459
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: src/protocols/oscar/oscar.c:478
+#: src/protocols/oscar/oscar.c:462
 msgid "ICQ Server Relay"
 msgstr "ICQ Server Relay"
 
-#: src/protocols/oscar/oscar.c:481
+#: src/protocols/oscar/oscar.c:465
 msgid "Old ICQ UTF8"
 msgstr "Old ICQ UTF8"
 
+#: src/protocols/oscar/oscar.c:468
+msgid "Trillian Encryption"
+msgstr "Trillian Encryption"
+
+#: src/protocols/oscar/oscar.c:471
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+#: src/protocols/oscar/oscar.c:474
+msgid "Hiptop"
+msgstr "Hiptop"
+
+#: src/protocols/oscar/oscar.c:477
+msgid "Security Enabled"
+msgstr "Security Enabled"
+
+#: src/protocols/oscar/oscar.c:480
+msgid "Video Chat"
+msgstr "Video Chat"
+
 #: src/protocols/oscar/oscar.c:484
-msgid "Trillian Encryption"
-msgstr "Trillian Encryption"
+msgid "iChat AV"
+msgstr "iChat AV"
 
 #: src/protocols/oscar/oscar.c:487
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
+msgid "Live Video"
+msgstr "Live Video"
 
 #: src/protocols/oscar/oscar.c:490
-msgid "Hiptop"
-msgstr "Hiptop"
-
-#: src/protocols/oscar/oscar.c:493
-msgid "Security Enabled"
-msgstr "Security Enabled"
-
-#: src/protocols/oscar/oscar.c:496
-msgid "Video Chat"
-msgstr "Video Chat"
-
-#: src/protocols/oscar/oscar.c:500
-msgid "iChat AV"
-msgstr "iChat AV"
-
-#: src/protocols/oscar/oscar.c:503
-msgid "Live Video"
-msgstr "Live Video"
-
-#: src/protocols/oscar/oscar.c:506
 msgid "Camera"
 msgstr "Camera"
 
-#: src/protocols/oscar/oscar.c:524 src/protocols/oscar/oscar.c:5496
-#: src/protocols/oscar/oscar.c:6693
+#: src/protocols/oscar/oscar.c:508 src/protocols/oscar/oscar.c:5498
+#: src/protocols/oscar/oscar.c:6696
 msgid "Free For Chat"
 msgstr "Free For Chat"
 
-#: src/protocols/oscar/oscar.c:528 src/protocols/oscar/oscar.c:5490
-#: src/protocols/oscar/oscar.c:6691
+#: src/protocols/oscar/oscar.c:512 src/protocols/oscar/oscar.c:5492
+#: src/protocols/oscar/oscar.c:6694
 msgid "Not Available"
 msgstr "Not Available"
 
-#: src/protocols/oscar/oscar.c:530 src/protocols/oscar/oscar.c:5493
-#: src/protocols/oscar/oscar.c:6692
+#: src/protocols/oscar/oscar.c:514 src/protocols/oscar/oscar.c:5495
+#: src/protocols/oscar/oscar.c:6695
 msgid "Occupied"
 msgstr "Occupied"
 
-#: src/protocols/oscar/oscar.c:534
+#: src/protocols/oscar/oscar.c:518
 msgid "Web Aware"
 msgstr "Web Aware"
 
-#: src/protocols/oscar/oscar.c:602
+#: src/protocols/oscar/oscar.c:586
 msgid "Capabilities"
 msgstr "Capabilities"
 
-#: src/protocols/oscar/oscar.c:609
+#: src/protocols/oscar/oscar.c:595
 msgid "Buddy Comment"
 msgstr "Buddy Comment"
 
-#: src/protocols/oscar/oscar.c:744
+#: src/protocols/oscar/oscar.c:730
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "Direct IM with %s closed"
 
-#: src/protocols/oscar/oscar.c:746
+#: src/protocols/oscar/oscar.c:732
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "Direct IM with %s failed"
 
-#: src/protocols/oscar/oscar.c:753
+#: src/protocols/oscar/oscar.c:739
 msgid "Direct Connect failed"
 msgstr "Direct Connect failed"
 
-#: src/protocols/oscar/oscar.c:830 src/protocols/oscar/oscar.c:961
+#: src/protocols/oscar/oscar.c:816 src/protocols/oscar/oscar.c:947
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Direct IM with %s established"
 
-#: src/protocols/oscar/oscar.c:911
+#: src/protocols/oscar/oscar.c:897
 #, c-format
 msgid "Attempting to connect to %s at %s:%hu for Direct IM."
 msgstr "Attempting to connect to %s at %s:%hu for Direct IM."
 
-#: src/protocols/oscar/oscar.c:1328
+#: src/protocols/oscar/oscar.c:1314
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "Asking %s to connect to us at %s:%hu for Direct IM."
 
-#: src/protocols/oscar/oscar.c:1333
+#: src/protocols/oscar/oscar.c:1319
 msgid "Unable to open Direct IM"
 msgstr "Unable to open Direct IM"
 
-#: src/protocols/oscar/oscar.c:1368
+#: src/protocols/oscar/oscar.c:1354
 #, 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:1372
+#: src/protocols/oscar/oscar.c:1358
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
@@ -7583,24 +7610,24 @@
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
 
-#: src/protocols/oscar/oscar.c:1376 src/protocols/oscar/oscar.c:3329
+#: src/protocols/oscar/oscar.c:1362 src/protocols/oscar/oscar.c:3320
 msgid "Connect"
 msgstr "Connect"
 
-#: src/protocols/oscar/oscar.c:1442 src/protocols/toc/toc.c:872
+#: src/protocols/oscar/oscar.c:1429 src/protocols/toc/toc.c:873
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "You have been disconnected from chat room %s."
 
-#: src/protocols/oscar/oscar.c:1458
+#: src/protocols/oscar/oscar.c:1448
 msgid "Chat is currently unavailable"
 msgstr "Chat is currently unavailable"
 
-#: src/protocols/oscar/oscar.c:1539
+#: src/protocols/oscar/oscar.c:1529
 msgid "Screen name sent"
 msgstr "Screen name sent"
 
-#: src/protocols/oscar/oscar.c:1553
+#: src/protocols/oscar/oscar.c:1543
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -7611,46 +7638,46 @@
 "invalid.  Screen names must either start with a letter and contain only "
 "letters, numbers and spaces, or contain only numbers."
 
-#: src/protocols/oscar/oscar.c:1581
+#: src/protocols/oscar/oscar.c:1571
 msgid "Unable to login to AIM"
 msgstr "Unable to login to AIM"
 
-#: src/protocols/oscar/oscar.c:1682 src/protocols/oscar/oscar.c:2119
+#: src/protocols/oscar/oscar.c:1672 src/protocols/oscar/oscar.c:2109
 msgid "Could Not Connect"
 msgstr "Could Not Connect"
 
-#: src/protocols/oscar/oscar.c:1690
+#: src/protocols/oscar/oscar.c:1680
 msgid "Connection established, cookie sent"
 msgstr "Connection established, cookie sent"
 
-#: src/protocols/oscar/oscar.c:1803 src/protocols/yahoo/yahoo_filexfer.c:180
+#: src/protocols/oscar/oscar.c:1793 src/protocols/yahoo/yahoo_filexfer.c:180
 #: src/protocols/yahoo/yahoo_filexfer.c:189
 #: src/protocols/yahoo/yahoo_filexfer.c:199
 msgid "Unable to establish file descriptor."
 msgstr "Unable to establish file descriptor."
 
-#: src/protocols/oscar/oscar.c:1808
+#: src/protocols/oscar/oscar.c:1798
 msgid "Unable to create new connection."
 msgstr "Unable to create new connection."
 
-#: src/protocols/oscar/oscar.c:1879
+#: src/protocols/oscar/oscar.c:1869
 msgid "Unable to establish listener socket."
 msgstr "Unable to establish listener socket."
 
-#: src/protocols/oscar/oscar.c:2003 src/protocols/toc/toc.c:541
+#: src/protocols/oscar/oscar.c:1993 src/protocols/toc/toc.c:541
 msgid "Incorrect nickname or password."
 msgstr "Incorrect nickname or password."
 
-#: src/protocols/oscar/oscar.c:2008
+#: src/protocols/oscar/oscar.c:1998
 msgid "Your account is currently suspended."
 msgstr "Your account is currently suspended."
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:2012
+#: src/protocols/oscar/oscar.c:2002
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "The AOL Instant Messenger service is temporarily unavailable."
 
-#: src/protocols/oscar/oscar.c:2017
+#: src/protocols/oscar/oscar.c:2007
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
@@ -7658,21 +7685,21 @@
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
 
-#: src/protocols/oscar/oscar.c:2022
+#: src/protocols/oscar/oscar.c:2012
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "The client version you are using is too old. Please upgrade at %s"
 
-#: src/protocols/oscar/oscar.c:2054
+#: src/protocols/oscar/oscar.c:2044
 msgid "Internal Error"
 msgstr "Internal Error"
 
-#: src/protocols/oscar/oscar.c:2126
+#: src/protocols/oscar/oscar.c:2116
 msgid "Received authorization"
 msgstr "Received authorisation"
 
-#: src/protocols/oscar/oscar.c:2162 src/protocols/oscar/oscar.c:2192
-#: src/protocols/oscar/oscar.c:2280
+#: src/protocols/oscar/oscar.c:2152 src/protocols/oscar/oscar.c:2182
+#: src/protocols/oscar/oscar.c:2271
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -7681,24 +7708,24 @@
 "You may be disconnected shortly.  You may want to use TOC until this is "
 "fixed.  Check %s for updates."
 
-#: src/protocols/oscar/oscar.c:2165 src/protocols/oscar/oscar.c:2195
+#: src/protocols/oscar/oscar.c:2155 src/protocols/oscar/oscar.c:2185
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr "Gaim was unable to get a valid AIM login hash."
 
-#: src/protocols/oscar/oscar.c:2283
+#: src/protocols/oscar/oscar.c:2274
 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:3113 src/protocols/oscar/oscar.c:3135
+#: src/protocols/oscar/oscar.c:3104 src/protocols/oscar/oscar.c:3126
 msgid "(There was an error receiving this message)"
 msgstr "(There was an error receiving this message)"
 
-#: src/protocols/oscar/oscar.c:3321
+#: src/protocols/oscar/oscar.c:3312
 #, 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:3324
+#: src/protocols/oscar/oscar.c:3315
 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 "
@@ -7708,19 +7735,19 @@
 "for IM Images.  Because your IP address will be revealed, this may be "
 "considered a privacy risk."
 
-#: src/protocols/oscar/oscar.c:3360
+#: src/protocols/oscar/oscar.c:3351
 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:3368
+#: src/protocols/oscar/oscar.c:3359
 msgid "Authorization Request Message:"
 msgstr "Authorisation Request Message:"
 
-#: src/protocols/oscar/oscar.c:3369
+#: src/protocols/oscar/oscar.c:3360
 msgid "Please authorize me!"
 msgstr "Please authorise me!"
 
-#: src/protocols/oscar/oscar.c:3399
+#: src/protocols/oscar/oscar.c:3390
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
@@ -7729,23 +7756,23 @@
 "The user %s requires authorisation before being added to a buddy list.  Do "
 "you want to send an authorisation request?"
 
-#: src/protocols/oscar/oscar.c:3404 src/protocols/oscar/oscar.c:3406
+#: src/protocols/oscar/oscar.c:3395 src/protocols/oscar/oscar.c:3397
 msgid "Request Authorization"
 msgstr "Request Authorisation"
 
-#: src/protocols/oscar/oscar.c:3454 src/protocols/oscar/oscar.c:3456
-#: src/protocols/oscar/oscar.c:3463 src/protocols/oscar/oscar.c:3545
-#: src/protocols/oscar/oscar.c:3565 src/protocols/oscar/oscar.c:3919
-#: src/protocols/oscar/oscar.c:3979 src/protocols/oscar/oscar.c:6118
-#: src/protocols/oscar/oscar.c:6164
+#: src/protocols/oscar/oscar.c:3445 src/protocols/oscar/oscar.c:3447
+#: src/protocols/oscar/oscar.c:3454 src/protocols/oscar/oscar.c:3536
+#: src/protocols/oscar/oscar.c:3556 src/protocols/oscar/oscar.c:3908
+#: src/protocols/oscar/oscar.c:3965 src/protocols/oscar/oscar.c:3969
+#: src/protocols/oscar/oscar.c:6123 src/protocols/oscar/oscar.c:6169
 msgid "No reason given."
 msgstr "No reason given."
 
-#: src/protocols/oscar/oscar.c:3462
+#: src/protocols/oscar/oscar.c:3453
 msgid "Authorization Denied Message:"
 msgstr "Authorisation Denied Message:"
 
-#: src/protocols/oscar/oscar.c:3545
+#: src/protocols/oscar/oscar.c:3536
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -7754,11 +7781,11 @@
 "The user %u wants to add you to their buddy list for the following reason:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3553 src/protocols/oscar/oscar.c:6124
+#: src/protocols/oscar/oscar.c:3544 src/protocols/oscar/oscar.c:6129
 msgid "Authorization Request"
 msgstr "Authorisation Request"
 
-#: src/protocols/oscar/oscar.c:3565
+#: src/protocols/oscar/oscar.c:3556
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7769,17 +7796,17 @@
 "following reason:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3566
+#: src/protocols/oscar/oscar.c:3557
 msgid "ICQ authorization denied."
 msgstr "ICQ authorisation denied."
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:3573
+#: src/protocols/oscar/oscar.c:3564
 #, 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:3581
+#: src/protocols/oscar/oscar.c:3572
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -7792,7 +7819,7 @@
 "From: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3589
+#: src/protocols/oscar/oscar.c:3580
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -7805,7 +7832,7 @@
 "From: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3597
+#: src/protocols/oscar/oscar.c:3588
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -7818,34 +7845,34 @@
 "Message is:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3618
+#: src/protocols/oscar/oscar.c:3609
 #, 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:3624
+#: src/protocols/oscar/oscar.c:3615
 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:3628
+#: src/protocols/oscar/oscar.c:3619
 msgid "Decline"
 msgstr "Decline"
 
-#: src/protocols/oscar/oscar.c:3713
+#: src/protocols/oscar/oscar.c:3703
 #, 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:3722
+#: src/protocols/oscar/oscar.c:3712
 #, 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:3731
+#: src/protocols/oscar/oscar.c:3721
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -7856,70 +7883,78 @@
 msgstr[1] ""
 "You missed %hu messages from %s because the rate limit has been exceeded."
 
-#: src/protocols/oscar/oscar.c:3740
+#: src/protocols/oscar/oscar.c:3730
 #, 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:3749
+#: src/protocols/oscar/oscar.c:3739
 #, 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:3758
+#: src/protocols/oscar/oscar.c:3748
 #, 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:3815 src/protocols/oscar/oscar.c:4039
+#: src/protocols/oscar/oscar.c:3802 src/protocols/oscar/oscar.c:4031
 #, c-format
 msgid "Info for %s"
 msgstr "Info for %s"
 
-#: src/protocols/oscar/oscar.c:3881
+#: src/protocols/oscar/oscar.c:3868
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC threw error: %s\n"
 
-#: src/protocols/oscar/oscar.c:3882
+#: src/protocols/oscar/oscar.c:3869
 msgid "Unknown error"
 msgstr "Unknown error"
 
-#. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:3917
+#: src/protocols/oscar/oscar.c:3905
+msgid "Your message did not get sent."
+msgstr "Your message did not get sent."
+
+#: src/protocols/oscar/oscar.c:3906
 #, 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:3976
+#: src/protocols/oscar/oscar.c:3965
+#, c-format
+msgid "User information not available: %s"
+msgstr "User information not available: %s"
+
+#: src/protocols/oscar/oscar.c:3967
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "User information for %s unavailable:"
 
-#: src/protocols/oscar/oscar.c:3999
+#: src/protocols/oscar/oscar.c:3991
 msgid "Warning Level"
 msgstr "Warning Level"
 
-#: src/protocols/oscar/oscar.c:4002
+#: src/protocols/oscar/oscar.c:3994
 msgid "Online Since"
 msgstr "Online Since"
 
-#: src/protocols/oscar/oscar.c:4006 src/protocols/yahoo/yahoo_profile.c:1118
+#: src/protocols/oscar/oscar.c:3998 src/protocols/yahoo/yahoo_profile.c:1118
 msgid "Member Since"
 msgstr "Member Since"
 
-#: src/protocols/oscar/oscar.c:4090
+#: src/protocols/oscar/oscar.c:4082
 msgid "Your AIM connection may be lost."
 msgstr "Your AIM connection may be lost."
 
 #. The conversion failed!
-#: src/protocols/oscar/oscar.c:4276
+#: src/protocols/oscar/oscar.c:4268
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -7927,11 +7962,11 @@
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 
-#: src/protocols/oscar/oscar.c:4494
+#: src/protocols/oscar/oscar.c:4488
 msgid "Rate limiting error."
 msgstr "Rate limiting error."
 
-#: src/protocols/oscar/oscar.c:4495
+#: src/protocols/oscar/oscar.c:4489
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -7939,7 +7974,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:4558
+#: src/protocols/oscar/oscar.c:4552
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
@@ -7947,113 +7982,113 @@
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
 
-#: src/protocols/oscar/oscar.c:4560
+#: src/protocols/oscar/oscar.c:4554
 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:4591
+#: src/protocols/oscar/oscar.c:4585
 msgid "Finalizing connection"
 msgstr "Finalizing connection"
 
-#: src/protocols/oscar/oscar.c:4861 src/protocols/oscar/oscar.c:4868
+#: src/protocols/oscar/oscar.c:4856 src/protocols/oscar/oscar.c:4863
 msgid "Email Address"
 msgstr "Email Address"
 
-#: src/protocols/oscar/oscar.c:4873 src/protocols/silc/util.c:538
+#: src/protocols/oscar/oscar.c:4868 src/protocols/silc/util.c:538
 msgid "Mobile Phone"
 msgstr "Mobile Phone"
 
-#: src/protocols/oscar/oscar.c:4874
+#: src/protocols/oscar/oscar.c:4869
 msgid "Not specified"
 msgstr "Not specified"
 
-#: src/protocols/oscar/oscar.c:4875 src/protocols/trepia/trepia.c:281
+#: src/protocols/oscar/oscar.c:4870 src/protocols/trepia/trepia.c:281
 #: src/protocols/trepia/trepia.c:407
 msgid "Female"
 msgstr "Female"
 
-#: src/protocols/oscar/oscar.c:4875 src/protocols/trepia/trepia.c:280
+#: src/protocols/oscar/oscar.c:4870 src/protocols/trepia/trepia.c:280
 #: src/protocols/trepia/trepia.c:407
 msgid "Male"
 msgstr "Male"
 
-#: src/protocols/oscar/oscar.c:4891
+#: src/protocols/oscar/oscar.c:4886
 msgid "Personal Web Page"
 msgstr "Personal Web Page"
 
-#: src/protocols/oscar/oscar.c:4895
+#: src/protocols/oscar/oscar.c:4890
 msgid "Additional Information"
 msgstr "Additional Information"
 
-#: src/protocols/oscar/oscar.c:4900
+#: src/protocols/oscar/oscar.c:4895
 msgid "Home Address"
 msgstr "Home Address"
 
-#: src/protocols/oscar/oscar.c:4904 src/protocols/oscar/oscar.c:4912
+#: src/protocols/oscar/oscar.c:4899 src/protocols/oscar/oscar.c:4907
 msgid "Zip Code"
 msgstr "Postcode"
 
-#: src/protocols/oscar/oscar.c:4908
+#: src/protocols/oscar/oscar.c:4903
 msgid "Work Address"
 msgstr "Work Address"
 
+#: src/protocols/oscar/oscar.c:4911
+msgid "Work Information"
+msgstr "Work Information"
+
+#: src/protocols/oscar/oscar.c:4912
+msgid "Company"
+msgstr "Company"
+
+#: src/protocols/oscar/oscar.c:4913
+msgid "Division"
+msgstr "Division"
+
+#: src/protocols/oscar/oscar.c:4914
+msgid "Position"
+msgstr "Position"
+
 #: src/protocols/oscar/oscar.c:4916
-msgid "Work Information"
-msgstr "Work Information"
-
-#: src/protocols/oscar/oscar.c:4917
-msgid "Company"
-msgstr "Company"
-
-#: src/protocols/oscar/oscar.c:4918
-msgid "Division"
-msgstr "Division"
-
-#: src/protocols/oscar/oscar.c:4919
-msgid "Position"
-msgstr "Position"
-
-#: src/protocols/oscar/oscar.c:4921
 msgid "Web Page"
 msgstr "Web Page"
 
-#: src/protocols/oscar/oscar.c:4927
+#: src/protocols/oscar/oscar.c:4926
 #, c-format
 msgid "ICQ Info for %s"
 msgstr "ICQ Info for %s"
 
-#: src/protocols/oscar/oscar.c:4976
+#: src/protocols/oscar/oscar.c:4975
 msgid "Pop-Up Message"
 msgstr "Pop-Up Message"
 
-#: src/protocols/oscar/oscar.c:4997
+#: src/protocols/oscar/oscar.c:4996
 #, c-format
 msgid "The following screen names are associated with %s"
 msgstr "The following screen names are associated with %s"
 
-#: src/protocols/oscar/oscar.c:5001
+#: src/protocols/oscar/oscar.c:5000
 msgid "Search Results"
 msgstr "Search Results"
 
-#: src/protocols/oscar/oscar.c:5018
+#: src/protocols/oscar/oscar.c:5017
 #, c-format
 msgid "No results found for email address %s"
 msgstr "No results found for email address %s"
 
-#: src/protocols/oscar/oscar.c:5039
+#: src/protocols/oscar/oscar.c:5038
 #, 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:5041
+#: src/protocols/oscar/oscar.c:5040
 msgid "Account Confirmation Requested"
 msgstr "Account Confirmation Requested"
 
-#: src/protocols/oscar/oscar.c:5069
+#: src/protocols/oscar/oscar.c:5071
 msgid "Error Changing Account Info"
 msgstr "Error Changing Account Info"
 
-#: src/protocols/oscar/oscar.c:5072
+#: src/protocols/oscar/oscar.c:5074
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8062,7 +8097,7 @@
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "differs from the original."
 
-#: src/protocols/oscar/oscar.c:5075
+#: src/protocols/oscar/oscar.c:5077
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8071,7 +8106,7 @@
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "ends in a space."
 
-#: src/protocols/oscar/oscar.c:5078
+#: src/protocols/oscar/oscar.c:5080
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8080,7 +8115,7 @@
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "is too long."
 
-#: src/protocols/oscar/oscar.c:5081
+#: src/protocols/oscar/oscar.c:5083
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -8089,7 +8124,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:5084
+#: src/protocols/oscar/oscar.c:5086
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -8098,7 +8133,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:5087
+#: src/protocols/oscar/oscar.c:5089
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
@@ -8107,12 +8142,12 @@
 "Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 
-#: src/protocols/oscar/oscar.c:5090
+#: src/protocols/oscar/oscar.c:5092
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Error 0x%04x: Unknown error."
 
-#: src/protocols/oscar/oscar.c:5100
+#: src/protocols/oscar/oscar.c:5102
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -8121,26 +8156,26 @@
 "Your screen name is currently formatted as follows:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5101 src/protocols/oscar/oscar.c:5108
+#: src/protocols/oscar/oscar.c:5103 src/protocols/oscar/oscar.c:5110
 msgid "Account Info"
 msgstr "Account Info"
 
-#: src/protocols/oscar/oscar.c:5106
+#: src/protocols/oscar/oscar.c:5108
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "The email address for %s is %s"
 
-#: src/protocols/oscar/oscar.c:5171
+#: src/protocols/oscar/oscar.c:5173
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 
-#: src/protocols/oscar/oscar.c:5345
+#: src/protocols/oscar/oscar.c:5347
 msgid "Unable to set AIM profile."
 msgstr "Unable to set AIM profile."
 
-#: src/protocols/oscar/oscar.c:5346
+#: src/protocols/oscar/oscar.c:5348
 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 "
@@ -8150,7 +8185,7 @@
 "completed.  Your profile remains unset; try setting it again when you are "
 "fully connected."
 
-#: src/protocols/oscar/oscar.c:5373
+#: src/protocols/oscar/oscar.c:5375
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -8165,19 +8200,19 @@
 "The maximum profile length of %d bytes has been exceeded.  Gaim has "
 "truncated it for you."
 
-#: src/protocols/oscar/oscar.c:5378
+#: src/protocols/oscar/oscar.c:5380
 msgid "Profile too long."
 msgstr "Profile too long."
 
-#: src/protocols/oscar/oscar.c:5394 src/protocols/oscar/oscar.c:6698
+#: src/protocols/oscar/oscar.c:5396 src/protocols/oscar/oscar.c:6701
 msgid "Visible"
 msgstr "Visible"
 
-#: src/protocols/oscar/oscar.c:5412
+#: src/protocols/oscar/oscar.c:5414
 msgid "Unable to set AIM away message."
 msgstr "Unable to set AIM away message."
 
-#: src/protocols/oscar/oscar.c:5413
+#: src/protocols/oscar/oscar.c:5415
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -8187,7 +8222,7 @@
 "procedure completed.  You remain in a \"present\" state; try setting it "
 "again when you are fully connected."
 
-#: src/protocols/oscar/oscar.c:5453
+#: src/protocols/oscar/oscar.c:5455
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -8202,11 +8237,11 @@
 "The maximum away message length of %d bytes has been exceeded.  Gaim has "
 "truncated it for you."
 
-#: src/protocols/oscar/oscar.c:5458
+#: src/protocols/oscar/oscar.c:5460
 msgid "Away message too long."
 msgstr "Away message too long."
 
-#: src/protocols/oscar/oscar.c:5536
+#: src/protocols/oscar/oscar.c:5538
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -8217,16 +8252,16 @@
 "must either start with a letter and contain only letters, numbers and "
 "spaces, or contain only numbers."
 
-#: src/protocols/oscar/oscar.c:5537 src/protocols/oscar/oscar.c:5985
-#: src/protocols/oscar/oscar.c:5998
+#: src/protocols/oscar/oscar.c:5540 src/protocols/oscar/oscar.c:5989
+#: src/protocols/oscar/oscar.c:6003
 msgid "Unable To Add"
 msgstr "Unable To Add"
 
-#: src/protocols/oscar/oscar.c:5698
+#: src/protocols/oscar/oscar.c:5701
 msgid "Unable To Retrieve Buddy List"
 msgstr "Unable To Retrieve Buddy List"
 
-#: src/protocols/oscar/oscar.c:5699
+#: src/protocols/oscar/oscar.c:5702
 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 "
@@ -8236,13 +8271,13 @@
 "servers.  Your buddy list is not lost, and will probably become available in "
 "a few hours."
 
-#: src/protocols/oscar/oscar.c:5881 src/protocols/oscar/oscar.c:5882
-#: src/protocols/oscar/oscar.c:5887 src/protocols/oscar/oscar.c:6042
-#: src/protocols/oscar/oscar.c:6043 src/protocols/oscar/oscar.c:6048
+#: src/protocols/oscar/oscar.c:5884 src/protocols/oscar/oscar.c:5885
+#: src/protocols/oscar/oscar.c:5890 src/protocols/oscar/oscar.c:6047
+#: src/protocols/oscar/oscar.c:6048 src/protocols/oscar/oscar.c:6053
 msgid "Orphans"
 msgstr "Orphans"
 
-#: src/protocols/oscar/oscar.c:5984
+#: src/protocols/oscar/oscar.c:5987
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -8251,11 +8286,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:5984 src/protocols/oscar/oscar.c:5997
+#: src/protocols/oscar/oscar.c:5987 src/protocols/oscar/oscar.c:6001
 msgid "(no name)"
 msgstr "(no name)"
 
-#: src/protocols/oscar/oscar.c:5997
+#: src/protocols/oscar/oscar.c:6001
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -8266,7 +8301,7 @@
 "for this is that you have the maximum number of allowed buddies in your "
 "buddy list."
 
-#: src/protocols/oscar/oscar.c:6079
+#: src/protocols/oscar/oscar.c:6084
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -8275,11 +8310,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:6085
+#: src/protocols/oscar/oscar.c:6090
 msgid "Authorization Given"
 msgstr "Authorisation Given"
 
-#: src/protocols/oscar/oscar.c:6118
+#: src/protocols/oscar/oscar.c:6123
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -8289,17 +8324,17 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:6160
+#: src/protocols/oscar/oscar.c:6165
 #, 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:6161
+#: src/protocols/oscar/oscar.c:6166
 msgid "Authorization Granted"
 msgstr "Authorisation Granted"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:6164
+#: src/protocols/oscar/oscar.c:6169
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -8310,71 +8345,76 @@
 "following reason:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:6165
+#: src/protocols/oscar/oscar.c:6170
 msgid "Authorization Denied"
 msgstr "Authorisation Denied"
 
-#: src/protocols/oscar/oscar.c:6202 src/protocols/toc/toc.c:1271
+#: src/protocols/oscar/oscar.c:6207 src/protocols/toc/toc.c:1272
 msgid "_Exchange:"
 msgstr "_Exchange:"
 
-#: src/protocols/oscar/oscar.c:6224
+#: src/protocols/oscar/oscar.c:6229
 msgid "Invalid chat name specified."
 msgstr "Invalid chat name specified."
 
-#: src/protocols/oscar/oscar.c:6314
+#: src/protocols/oscar/oscar.c:6319
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 
-#: src/protocols/oscar/oscar.c:6471
+#: src/protocols/oscar/oscar.c:6474
 msgid "Away Message"
 msgstr "Away Message"
 
-#: src/protocols/oscar/oscar.c:6756
+#: src/protocols/oscar/oscar.c:6760
+#, c-format
+msgid "Buddy Comment for %s"
+msgstr "Buddy Comment for %s"
+
+#: src/protocols/oscar/oscar.c:6761
 msgid "Buddy Comment:"
 msgstr "Buddy Comment:"
 
-#: src/protocols/oscar/oscar.c:6774
+#: src/protocols/oscar/oscar.c:6780
 msgid "Edit Buddy Comment"
 msgstr "Edit Buddy Comment"
 
-#: src/protocols/oscar/oscar.c:6780
+#: src/protocols/oscar/oscar.c:6786
 msgid "Get Status Msg"
 msgstr "Get Status Msg"
 
-#: src/protocols/oscar/oscar.c:6792
+#: src/protocols/oscar/oscar.c:6798
 msgid "Direct IM"
 msgstr "Direct IM"
 
-#: src/protocols/oscar/oscar.c:6814
+#: src/protocols/oscar/oscar.c:6815
 msgid "Re-request Authorization"
 msgstr "Re-request Authorisation"
 
-#: src/protocols/oscar/oscar.c:6844
+#: src/protocols/oscar/oscar.c:6845
 msgid "The new formatting is invalid."
 msgstr "The new formatting is invalid."
 
-#: src/protocols/oscar/oscar.c:6845
+#: src/protocols/oscar/oscar.c:6846
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "Screen name formatting can change only capitalisation and whitespace."
 
-#: src/protocols/oscar/oscar.c:6852
+#: src/protocols/oscar/oscar.c:6853
 msgid "New screen name formatting:"
 msgstr "New screen name formatting:"
 
-#: src/protocols/oscar/oscar.c:6904
+#: src/protocols/oscar/oscar.c:6905
 msgid "Change Address To:"
 msgstr "Change Address To:"
 
-#: src/protocols/oscar/oscar.c:6949
+#: src/protocols/oscar/oscar.c:6950
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>you are not waiting for authorisation</i>"
 
-#: src/protocols/oscar/oscar.c:6952
+#: src/protocols/oscar/oscar.c:6953
 msgid "You are awaiting authorization from the following buddies"
 msgstr "You are awaiting authorisation from the following buddies"
 
-#: src/protocols/oscar/oscar.c:6953
+#: src/protocols/oscar/oscar.c:6954
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -8382,75 +8422,75 @@
 "You can re-request authorisation from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorisation.\""
 
-#: src/protocols/oscar/oscar.c:6970
+#: src/protocols/oscar/oscar.c:6971
 msgid "Find Buddy by E-mail"
 msgstr "Find Buddy by E-mail"
 
-#: src/protocols/oscar/oscar.c:6971
+#: src/protocols/oscar/oscar.c:6972
 msgid "Search for a buddy by e-mail address"
 msgstr "Search for a buddy by e-mail address"
 
-#: src/protocols/oscar/oscar.c:6972
+#: src/protocols/oscar/oscar.c:6973
 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:6989
-msgid "Available Message:"
-msgstr "Available Message:"
-
 #: src/protocols/oscar/oscar.c:6990
+msgid "Available Message:"
+msgstr "Available Message:"
+
+#: src/protocols/oscar/oscar.c:6991
 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:7072 src/protocols/silc/silc.c:789
+#: src/protocols/oscar/oscar.c:7073 src/protocols/silc/silc.c:789
 msgid "Set User Info..."
 msgstr "Set User Info..."
 
-#: src/protocols/oscar/oscar.c:7077
+#: src/protocols/oscar/oscar.c:7078
 msgid "Set User Info (URL)..."
 msgstr "Set User Info (URL)..."
 
-#: src/protocols/oscar/oscar.c:7083
+#: src/protocols/oscar/oscar.c:7084
 msgid "Set Available Message..."
 msgstr "Set Available Message..."
 
-#: src/protocols/oscar/oscar.c:7088 src/protocols/silc/silc.c:785
+#: src/protocols/oscar/oscar.c:7089 src/protocols/silc/silc.c:785
 msgid "Change Password..."
 msgstr "Change Password..."
 
-#: src/protocols/oscar/oscar.c:7093
+#: src/protocols/oscar/oscar.c:7094
 msgid "Change Password (URL)"
 msgstr "Change Password (URL)"
 
-#: src/protocols/oscar/oscar.c:7097
+#: src/protocols/oscar/oscar.c:7098
 msgid "Configure IM Forwarding (URL)"
 msgstr "Configure IM Forwarding (URL)"
 
-#: src/protocols/oscar/oscar.c:7106
+#: src/protocols/oscar/oscar.c:7107
 msgid "Format Screen Name..."
 msgstr "Format Screen Name..."
 
-#: src/protocols/oscar/oscar.c:7110
+#: src/protocols/oscar/oscar.c:7111
 msgid "Confirm Account"
 msgstr "Confirm Account"
 
-#: src/protocols/oscar/oscar.c:7114
+#: src/protocols/oscar/oscar.c:7115
 msgid "Display Currently Registered Address"
 msgstr "Display Currently Registered Address"
 
-#: src/protocols/oscar/oscar.c:7118
+#: src/protocols/oscar/oscar.c:7119
 msgid "Change Currently Registered Address..."
 msgstr "Change Currently Registered Address"
 
-#: src/protocols/oscar/oscar.c:7125
+#: src/protocols/oscar/oscar.c:7126
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Show Buddies Awaiting Authorisation"
 
-#: src/protocols/oscar/oscar.c:7131
+#: src/protocols/oscar/oscar.c:7132
 msgid "Search for Buddy by Email..."
 msgstr "Search for Buddy by Email..."
 
-#: src/protocols/oscar/oscar.c:7136
+#: src/protocols/oscar/oscar.c:7137
 msgid "Search for Buddy by Information"
 msgstr "Search for Buddy by Information"
 
@@ -8464,16 +8504,15 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: src/protocols/oscar/oscar.c:7254 src/protocols/oscar/oscar.c:7256
+#: src/protocols/oscar/oscar.c:7255 src/protocols/oscar/oscar.c:7257
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ Protocol Plugin"
 
-#: src/protocols/oscar/oscar.c:7275
+#: src/protocols/oscar/oscar.c:7276
 msgid "Auth host"
 msgstr "Auth host"
 
-#: src/protocols/oscar/oscar.c:7280
+#: src/protocols/oscar/oscar.c:7281
 msgid "Auth port"
 msgstr "Auth port"
 
@@ -8562,12 +8601,12 @@
 msgstr "Set IM Password"
 
 #: src/protocols/silc/buddy.c:506 src/protocols/silc/buddy.c:541
-#: src/protocols/silc/ops.c:1256 src/protocols/silc/ops.c:1267
+#: src/protocols/silc/ops.c:1265 src/protocols/silc/ops.c:1276
 msgid "Get Public Key"
 msgstr "Get Public Key"
 
-#: src/protocols/silc/buddy.c:542 src/protocols/silc/ops.c:1257
-#: src/protocols/silc/ops.c:1268
+#: src/protocols/silc/buddy.c:542 src/protocols/silc/ops.c:1266
+#: src/protocols/silc/ops.c:1277
 msgid "Cannot fetch the public key"
 msgstr "Cannot fetch the public key"
 
@@ -8580,14 +8619,14 @@
 msgid "Could not load public key"
 msgstr "Could not load public key"
 
-#: src/protocols/silc/buddy.c:707 src/protocols/silc/ops.c:853
-#: src/protocols/silc/ops.c:925 src/protocols/silc/ops.c:1060
-#: src/protocols/silc/ops.c:1061 src/protocols/silc/ops.c:1079
+#: src/protocols/silc/buddy.c:707 src/protocols/silc/ops.c:862
+#: src/protocols/silc/ops.c:934 src/protocols/silc/ops.c:1069
+#: src/protocols/silc/ops.c:1070 src/protocols/silc/ops.c:1088
 msgid "User Information"
 msgstr "User Information"
 
-#: src/protocols/silc/buddy.c:708 src/protocols/silc/ops.c:926
-#: src/protocols/silc/ops.c:1080
+#: src/protocols/silc/buddy.c:708 src/protocols/silc/ops.c:935
+#: src/protocols/silc/ops.c:1089
 msgid "Cannot get user information"
 msgstr "Cannot get user information"
 
@@ -8724,36 +8763,36 @@
 msgid "Anxious"
 msgstr "Anxious"
 
-#: src/protocols/silc/buddy.c:1448 src/protocols/silc/ops.c:962
+#: src/protocols/silc/buddy.c:1448 src/protocols/silc/ops.c:971
 msgid "User Modes"
 msgstr "User Modes"
 
-#: src/protocols/silc/buddy.c:1457 src/protocols/silc/ops.c:971
+#: src/protocols/silc/buddy.c:1457 src/protocols/silc/ops.c:980
 msgid "Mood"
 msgstr "Mood"
 
-#: src/protocols/silc/buddy.c:1461 src/protocols/silc/ops.c:977
+#: src/protocols/silc/buddy.c:1461 src/protocols/silc/ops.c:986
 msgid "Status Text"
 msgstr "Status Text"
 
-#: src/protocols/silc/buddy.c:1466 src/protocols/silc/ops.c:983
+#: src/protocols/silc/buddy.c:1466 src/protocols/silc/ops.c:992
 msgid "Preferred Contact"
 msgstr "Preferred Contact"
 
-#: src/protocols/silc/buddy.c:1471 src/protocols/silc/ops.c:988
+#: src/protocols/silc/buddy.c:1471 src/protocols/silc/ops.c:997
 msgid "Preferred Language"
 msgstr "Preferred Language"
 
-#: src/protocols/silc/buddy.c:1476 src/protocols/silc/ops.c:993
+#: src/protocols/silc/buddy.c:1476 src/protocols/silc/ops.c:1002
 msgid "Device"
 msgstr "Device"
 
-#: src/protocols/silc/buddy.c:1481 src/protocols/silc/ops.c:998
+#: src/protocols/silc/buddy.c:1481 src/protocols/silc/ops.c:1007
 #: src/protocols/silc/silc.c:678 src/protocols/silc/silc.c:680
 msgid "Timezone"
 msgstr "Timezone"
 
-#: src/protocols/silc/buddy.c:1486 src/protocols/silc/ops.c:1003
+#: src/protocols/silc/buddy.c:1486 src/protocols/silc/ops.c:1012
 msgid "Geolocation"
 msgstr "Geolocation"
 
@@ -8773,7 +8812,7 @@
 msgid "Get Public Key..."
 msgstr "Get Public Key..."
 
-#: src/protocols/silc/buddy.c:1555 src/protocols/silc/ops.c:1389
+#: src/protocols/silc/buddy.c:1555 src/protocols/silc/ops.c:1398
 msgid "Kill User"
 msgstr "Kill User"
 
@@ -8883,7 +8922,7 @@
 msgid "Group Name"
 msgstr "Group name"
 
-#: src/protocols/silc/chat.c:567 src/protocols/silc/ops.c:1669
+#: src/protocols/silc/chat.c:567 src/protocols/silc/ops.c:1678
 msgid "Passphrase"
 msgstr "Passphrase"
 
@@ -8956,36 +8995,36 @@
 msgid "Set Secret Channel"
 msgstr "Set Secret Channel"
 
-#: src/protocols/silc/chat.c:989
+#: src/protocols/silc/chat.c:981
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "You are channel founder on <I>%s</I>"
 
-#: src/protocols/silc/chat.c:993
+#: src/protocols/silc/chat.c:985
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "Channel founder on <I>%s</I> is <I>%s</I>"
 
-#: src/protocols/silc/chat.c:1046
+#: src/protocols/silc/chat.c:1039
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
 msgstr ""
 "You have to join the %s channel before you are able to join the private group"
 
-#: src/protocols/silc/chat.c:1048
+#: src/protocols/silc/chat.c:1041
 msgid "Join Private Group"
 msgstr "Join Private Group"
 
-#: src/protocols/silc/chat.c:1049
+#: src/protocols/silc/chat.c:1042
 msgid "Cannot join private group"
 msgstr "Cannot join private group"
 
-#: src/protocols/silc/chat.c:1242 src/protocols/silc/silc.c:888
+#: src/protocols/silc/chat.c:1235 src/protocols/silc/silc.c:888
 msgid "Cannot call command"
 msgstr "Cannot call command"
 
-#: src/protocols/silc/chat.c:1243 src/protocols/silc/silc.c:889
+#: src/protocols/silc/chat.c:1236 src/protocols/silc/silc.c:889
 msgid "Unknown command"
 msgstr "Unknown command"
 
@@ -9041,144 +9080,144 @@
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr "%s has changed the topic of <I>%s</I> to: %s"
 
-#: src/protocols/silc/ops.c:413
+#: src/protocols/silc/ops.c:414
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr "<I>%s</I> set channel <I>%s</I> modes to: %s"
 
-#: src/protocols/silc/ops.c:417
+#: src/protocols/silc/ops.c:418
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr "<I>%s</I> removed all channel <I>%s</I> modes"
 
-#: src/protocols/silc/ops.c:448
+#: src/protocols/silc/ops.c:451
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr "<I>%s</I> set <I>%s's</I> modes to: %s"
 
-#: src/protocols/silc/ops.c:452
+#: src/protocols/silc/ops.c:459
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr "<I>%s</I> removed all <I>%s's</I> modes"
 
-#: src/protocols/silc/ops.c:479
+#: src/protocols/silc/ops.c:488
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 
-#: src/protocols/silc/ops.c:509 src/protocols/silc/ops.c:514
-#: src/protocols/silc/ops.c:519
+#: src/protocols/silc/ops.c:518 src/protocols/silc/ops.c:523
+#: src/protocols/silc/ops.c:528
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr "You have been killed by %s (%s)"
 
-#: src/protocols/silc/ops.c:540 src/protocols/silc/ops.c:545
-#: src/protocols/silc/ops.c:550
+#: src/protocols/silc/ops.c:549 src/protocols/silc/ops.c:554
+#: src/protocols/silc/ops.c:559
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr "Killed by %s (%s)"
 
-#: src/protocols/silc/ops.c:596
+#: src/protocols/silc/ops.c:605
 msgid "Server signoff"
 msgstr "Server signoff"
 
-#: src/protocols/silc/ops.c:783
+#: src/protocols/silc/ops.c:792
 msgid "Personal Information"
 msgstr "Personal Information"
 
-#: src/protocols/silc/ops.c:806
+#: src/protocols/silc/ops.c:815
 msgid "Birth Day"
 msgstr "Birth Day"
 
-#: src/protocols/silc/ops.c:810
+#: src/protocols/silc/ops.c:819
 msgid "Job Title"
 msgstr "Job Title"
 
-#: src/protocols/silc/ops.c:814
+#: src/protocols/silc/ops.c:823
 msgid "Job Role"
 msgstr "Job Role"
 
-#: src/protocols/silc/ops.c:818
+#: src/protocols/silc/ops.c:827
 msgid "Organization"
 msgstr "Organisation"
 
-#: src/protocols/silc/ops.c:822
+#: src/protocols/silc/ops.c:831
 msgid "Unit"
 msgstr "Unit"
 
-#: src/protocols/silc/ops.c:841
+#: src/protocols/silc/ops.c:850
 msgid "EMail"
 msgstr "E-Mail"
 
-#: src/protocols/silc/ops.c:846
+#: src/protocols/silc/ops.c:855
 msgid "Note"
 msgstr "Note"
 
-#: src/protocols/silc/ops.c:894
+#: src/protocols/silc/ops.c:903
 msgid "Join Chat"
 msgstr "Join Chat"
 
-#: src/protocols/silc/ops.c:1050 src/protocols/silc/ops.c:1120
+#: src/protocols/silc/ops.c:1059 src/protocols/silc/ops.c:1129
 msgid "Public Key Fingerprint"
 msgstr "Public Key Fingerprint"
 
-#: src/protocols/silc/ops.c:1051 src/protocols/silc/ops.c:1121
+#: src/protocols/silc/ops.c:1060 src/protocols/silc/ops.c:1130
 msgid "Public Key Babbleprint"
 msgstr "Public Key Babbleprint"
 
-#: src/protocols/silc/ops.c:1064
+#: src/protocols/silc/ops.c:1073
 msgid "More..."
 msgstr "More..."
 
-#: src/protocols/silc/ops.c:1135 src/protocols/silc/silc.c:777
+#: src/protocols/silc/ops.c:1144 src/protocols/silc/silc.c:777
 msgid "Detach From Server"
 msgstr "Detach From Server"
 
-#: src/protocols/silc/ops.c:1135
+#: src/protocols/silc/ops.c:1144
 msgid "Cannot detach"
 msgstr "Cannot detach"
 
-#: src/protocols/silc/ops.c:1146
+#: src/protocols/silc/ops.c:1155
 msgid "Cannot set topic"
 msgstr "Cannot set topic"
 
-#: src/protocols/silc/ops.c:1184
+#: src/protocols/silc/ops.c:1193
 msgid "Failed to change nickname"
 msgstr "Failed to change nickname"
 
-#: src/protocols/silc/ops.c:1221
+#: src/protocols/silc/ops.c:1230
 msgid "Roomlist"
 msgstr "Room List"
 
-#: src/protocols/silc/ops.c:1221
+#: src/protocols/silc/ops.c:1230
 msgid "Cannot get room list"
 msgstr "Cannot get room list"
 
-#: src/protocols/silc/ops.c:1269
+#: src/protocols/silc/ops.c:1278
 msgid "No public key was received"
 msgstr "No public key was received"
 
-#: src/protocols/silc/ops.c:1282 src/protocols/silc/ops.c:1296
+#: src/protocols/silc/ops.c:1291 src/protocols/silc/ops.c:1305
 msgid "Server Information"
 msgstr "Server Information"
 
-#: src/protocols/silc/ops.c:1283
+#: src/protocols/silc/ops.c:1292
 msgid "Cannot get server information"
 msgstr "Cannot get server information"
 
-#: src/protocols/silc/ops.c:1314 src/protocols/silc/ops.c:1323
+#: src/protocols/silc/ops.c:1323 src/protocols/silc/ops.c:1332
 msgid "Server Statistics"
 msgstr "Server Statistics"
 
-#: src/protocols/silc/ops.c:1315
+#: src/protocols/silc/ops.c:1324
 msgid "Cannot get server statistics"
 msgstr "Cannot get server statistics"
 
-#: src/protocols/silc/ops.c:1324
-msgid "No server statisitics available"
-msgstr "No server statisitics available"
-
-#: src/protocols/silc/ops.c:1346
+#: src/protocols/silc/ops.c:1333
+msgid "No server statistics available"
+msgstr "No server statistics available"
+
+#: src/protocols/silc/ops.c:1355
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -9213,98 +9252,98 @@
 "Total server operators: %d\n"
 "Total router operators: %d\n"
 
-#: src/protocols/silc/ops.c:1369
+#: src/protocols/silc/ops.c:1378
 msgid "Network Statistics"
 msgstr "Network Statistics"
 
-#: src/protocols/silc/ops.c:1377 src/protocols/silc/ops.c:1382
+#: src/protocols/silc/ops.c:1386 src/protocols/silc/ops.c:1391
 msgid "Ping"
 msgstr "Ping"
 
-#: src/protocols/silc/ops.c:1377
+#: src/protocols/silc/ops.c:1386
 msgid "Ping failed"
 msgstr "Ping failed"
 
-#: src/protocols/silc/ops.c:1382
+#: src/protocols/silc/ops.c:1391
 msgid "Ping reply received from server"
 msgstr "Ping reply received from server"
 
-#: src/protocols/silc/ops.c:1390
+#: src/protocols/silc/ops.c:1399
 msgid "Could not kill user"
 msgstr "Could not kill user"
 
-#: src/protocols/silc/ops.c:1471
+#: src/protocols/silc/ops.c:1480
 msgid "Error during connecting to SILC Server"
 msgstr "Error during connecting to SILC Server"
 
-#: src/protocols/silc/ops.c:1476
+#: src/protocols/silc/ops.c:1485
 msgid "Key Exchange failed"
 msgstr "Key Exchange failed"
 
-#: src/protocols/silc/ops.c:1485
+#: src/protocols/silc/ops.c:1494
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 
-#: src/protocols/silc/ops.c:1520
+#: src/protocols/silc/ops.c:1529
 msgid "Disconnected by server"
 msgstr "Disconnected by server"
 
-#: src/protocols/silc/ops.c:1580 src/protocols/silc/ops.c:1627
+#: src/protocols/silc/ops.c:1589 src/protocols/silc/ops.c:1636
 #: src/protocols/silc/silc.c:167
 msgid "Resuming session"
 msgstr "Resuming session"
 
-#: src/protocols/silc/ops.c:1582
+#: src/protocols/silc/ops.c:1591
 msgid "Authenticating connection"
 msgstr "Authenticating connection"
 
-#: src/protocols/silc/ops.c:1629
+#: src/protocols/silc/ops.c:1638
 msgid "Verifying server public key"
 msgstr "Verifying server public key"
 
-#: src/protocols/silc/ops.c:1670
+#: src/protocols/silc/ops.c:1679
 msgid "Passphrase required"
 msgstr "Passphrase required"
 
-#: src/protocols/silc/ops.c:1699
-msgid "Failure: Version mismatch, upgrade your client"
-msgstr "Failure: Version mismatch, upgrade your client"
-
-#: src/protocols/silc/ops.c:1702
-msgid "Failure: Remote does not trust/support your public key"
-msgstr "Failure: Remote does not trust/support your public key"
-
-#: src/protocols/silc/ops.c:1705
-msgid "Failure: Remote does not support proposed KE group"
-msgstr "Failure: Remote does not support proposed KE group"
-
 #: src/protocols/silc/ops.c:1708
-msgid "Failure: Remote does not support proposed cipher"
-msgstr "Failure: Remote does not support proposed cipher"
+msgid "Failure: Version mismatch, upgrade your client"
+msgstr "Failure: Version mismatch, upgrade your client"
 
 #: src/protocols/silc/ops.c:1711
-msgid "Failure: Remote does not support proposed PKCS"
-msgstr "Failure: Remote does not support proposed PKCS"
+msgid "Failure: Remote does not trust/support your public key"
+msgstr "Failure: Remote does not trust/support your public key"
 
 #: src/protocols/silc/ops.c:1714
-msgid "Failure: Remote does not support proposed hash function"
-msgstr "Failure: Remote does not support proposed hash function"
+msgid "Failure: Remote does not support proposed KE group"
+msgstr "Failure: Remote does not support proposed KE group"
 
 #: src/protocols/silc/ops.c:1717
+msgid "Failure: Remote does not support proposed cipher"
+msgstr "Failure: Remote does not support proposed cipher"
+
+#: src/protocols/silc/ops.c:1720
+msgid "Failure: Remote does not support proposed PKCS"
+msgstr "Failure: Remote does not support proposed PKCS"
+
+#: src/protocols/silc/ops.c:1723
+msgid "Failure: Remote does not support proposed hash function"
+msgstr "Failure: Remote does not support proposed hash function"
+
+#: src/protocols/silc/ops.c:1726
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "Failure: Remote does not support proposed HMAC"
 
-#: src/protocols/silc/ops.c:1719
+#: src/protocols/silc/ops.c:1728
 msgid "Failure: Incorrect signature"
 msgstr "Failure: Incorrect signature"
 
-#: src/protocols/silc/ops.c:1721
+#: src/protocols/silc/ops.c:1730
 msgid "Failure: Invalid cookie"
 msgstr "Failure: Invalid cookie"
 
-#: src/protocols/silc/ops.c:1732
+#: src/protocols/silc/ops.c:1741
 msgid "Failure: Authentication failed"
 msgstr "Failure: Authentication failed"
 
@@ -9517,7 +9556,7 @@
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;nick&gt;:  View nick's information"
 
-#: src/protocols/silc/silc.c:1327 src/protocols/zephyr/zephyr.c:1673
+#: src/protocols/silc/silc.c:1327 src/protocols/zephyr/zephyr.c:1676
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 
@@ -9542,27 +9581,27 @@
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;command&gt;:  Call any silc client command"
 
-#: src/protocols/silc/silc.c:1352
+#: src/protocols/silc/silc.c:1353
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 
-#: src/protocols/silc/silc.c:1356
+#: src/protocols/silc/silc.c:1357
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;newnick&gt;:  Change your nickname"
 
-#: src/protocols/silc/silc.c:1360
+#: src/protocols/silc/silc.c:1361
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;nick&gt;:  View nick's information"
 
-#: src/protocols/silc/silc.c:1364
-msgid ""
-"cmode &lt;channel&gt; [+|-&lt;modes&gt]; [arguments]:  Change or display "
+#: src/protocols/silc/silc.c:1365
+msgid ""
+"cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
 msgstr ""
-"cmode &lt;channel&gt; [+|-&lt;modes&gt]; [arguments]:  Change or display "
+"cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
 
-#: src/protocols/silc/silc.c:1368
+#: src/protocols/silc/silc.c:1369
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
@@ -9570,15 +9609,15 @@
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
 
-#: src/protocols/silc/silc.c:1372
+#: src/protocols/silc/silc.c:1373
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;usermodes&gt;:  Set your modes in the network"
 
-#: src/protocols/silc/silc.c:1376
+#: src/protocols/silc/silc.c:1377
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 
-#: src/protocols/silc/silc.c:1380
+#: src/protocols/silc/silc.c:1381
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
@@ -9586,35 +9625,35 @@
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
 
-#: src/protocols/silc/silc.c:1384
+#: src/protocols/silc/silc.c:1385
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 
-#: src/protocols/silc/silc.c:1388
+#: src/protocols/silc/silc.c:1389
 msgid "info [server]:  View server administrative details"
 msgstr "info [server]:  View server administrative details"
 
-#: src/protocols/silc/silc.c:1392
+#: src/protocols/silc/silc.c:1393
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 
-#: src/protocols/silc/silc.c:1396
+#: src/protocols/silc/silc.c:1397
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 
-#: src/protocols/silc/silc.c:1400
+#: src/protocols/silc/silc.c:1401
 msgid "stats:  View server and network statistics"
 msgstr "stats:  View server and network statistics"
 
-#: src/protocols/silc/silc.c:1404
+#: src/protocols/silc/silc.c:1405
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:  Send PING to the connected server"
 
-#: src/protocols/silc/silc.c:1409
+#: src/protocols/silc/silc.c:1410
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;channel&gt;:  List users in channel"
 
-#: src/protocols/silc/silc.c:1413
+#: src/protocols/silc/silc.c:1414
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -9622,39 +9661,39 @@
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
 
-#: src/protocols/silc/silc.c:1425
+#: src/protocols/silc/silc.c:1426
 msgid "Instant Messages"
 msgstr "Instant Messages"
 
-#: src/protocols/silc/silc.c:1430
+#: src/protocols/silc/silc.c:1431
 msgid "Digitally sign all IM messages"
 msgstr "Digitally sign all IM messages"
 
-#: src/protocols/silc/silc.c:1435
+#: src/protocols/silc/silc.c:1436
 msgid "Verify all IM message signatures"
 msgstr "Verify all IM message signatures"
 
-#: src/protocols/silc/silc.c:1438
+#: src/protocols/silc/silc.c:1439
 msgid "Channel Messages"
 msgstr "Channel Messages"
 
-#: src/protocols/silc/silc.c:1443
+#: src/protocols/silc/silc.c:1444
 msgid "Digitally sign all channel messages"
 msgstr "Digitally sign all channel messages"
 
-#: src/protocols/silc/silc.c:1448
+#: src/protocols/silc/silc.c:1449
 msgid "Verify all channel message signatures"
 msgstr "Verify all channel message signatures"
 
-#: src/protocols/silc/silc.c:1451
+#: src/protocols/silc/silc.c:1452
 msgid "Default SILC Key Pair"
 msgstr "Default SILC Key Pair"
 
-#: src/protocols/silc/silc.c:1456
+#: src/protocols/silc/silc.c:1457
 msgid "SILC Public Key"
 msgstr "SILC Public Key"
 
-#: src/protocols/silc/silc.c:1461
+#: src/protocols/silc/silc.c:1462
 msgid "SILC Private Key"
 msgstr "SILC Private Key"
 
@@ -9668,40 +9707,40 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/silc/silc.c:1547
+#: src/protocols/silc/silc.c:1548
 msgid "SILC Protocol Plugin"
 msgstr "SILC Protocol Plugin"
 
 #. *  description
-#: src/protocols/silc/silc.c:1549
+#: src/protocols/silc/silc.c:1550
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Secure Internet Live Conferencing (SILC) Protocol"
 
-#: src/protocols/silc/silc.c:1579
+#: src/protocols/silc/silc.c:1580
 msgid "Public key authentication"
 msgstr "Public key authentication"
 
-#: src/protocols/silc/silc.c:1585
+#: src/protocols/silc/silc.c:1586
 msgid "Public Key File"
 msgstr "Public Key File"
 
-#: src/protocols/silc/silc.c:1589
+#: src/protocols/silc/silc.c:1590
 msgid "Private Key File"
 msgstr "Private Key File"
 
-#: src/protocols/silc/silc.c:1594
+#: src/protocols/silc/silc.c:1595
 msgid "Reject watching by other users"
 msgstr "Reject watching by other users"
 
-#: src/protocols/silc/silc.c:1597
+#: src/protocols/silc/silc.c:1598
 msgid "Block invites"
 msgstr "Block invites"
 
-#: src/protocols/silc/silc.c:1600
+#: src/protocols/silc/silc.c:1601
 msgid "Block IMs without Key Exchange"
 msgstr "Block IMs without Key Exchange"
 
-#: src/protocols/silc/silc.c:1603
+#: src/protocols/silc/silc.c:1604
 msgid "Reject online status attribute requests"
 msgstr "Reject online status attribute requests"
 
@@ -9925,15 +9964,15 @@
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOC has come back from its pause. You may now send messages again."
 
-#: src/protocols/toc/toc.c:890
+#: src/protocols/toc/toc.c:891
 msgid "Password Change Successful"
 msgstr "Password Change Successful"
 
-#: src/protocols/toc/toc.c:894
+#: src/protocols/toc/toc.c:895
 msgid "TOC has sent a PAUSE command."
 msgstr "TOC has sent a PAUSE command."
 
-#: src/protocols/toc/toc.c:895
+#: src/protocols/toc/toc.c:896
 msgid ""
 "When this happens, TOC ignores any messages sent to it, and may kick you off "
 "if you send a message. Gaim will prevent anything from going through. This "
@@ -9943,44 +9982,44 @@
 "if you send a message. Gaim will prevent anything from going through. This "
 "is only temporary, please be patient."
 
-#: src/protocols/toc/toc.c:1409
+#: src/protocols/toc/toc.c:1410
 msgid "Get Dir Info"
 msgstr "Get Dir Info"
 
-#: src/protocols/toc/toc.c:1545
+#: src/protocols/toc/toc.c:1546
 msgid "Set Dir Info"
 msgstr "Set Dir Info"
 
-#: src/protocols/toc/toc.c:1667
+#: src/protocols/toc/toc.c:1668
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "Could not open %s for writing!"
 
-#: src/protocols/toc/toc.c:1703
+#: src/protocols/toc/toc.c:1704
 msgid "File transfer failed; other side probably canceled."
 msgstr "File transfer failed; other side probably cancelled."
 
-#: src/protocols/toc/toc.c:1748 src/protocols/toc/toc.c:1788
-#: src/protocols/toc/toc.c:1912 src/protocols/toc/toc.c:2000
+#: src/protocols/toc/toc.c:1749 src/protocols/toc/toc.c:1789
+#: src/protocols/toc/toc.c:1913 src/protocols/toc/toc.c:2001
 msgid "Could not connect for transfer."
 msgstr "Could not connect for transfer."
 
-#: src/protocols/toc/toc.c:1945
+#: src/protocols/toc/toc.c:1946
 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:2045
+#: src/protocols/toc/toc.c:2046
 msgid "Gaim - Save As..."
 msgstr "Gaim - Save As..."
 
-#: src/protocols/toc/toc.c:2079
+#: src/protocols/toc/toc.c:2080
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr[0] "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgstr[1] "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 
-#: src/protocols/toc/toc.c:2086
+#: src/protocols/toc/toc.c:2087
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s requests you to send them a file"
@@ -9995,16 +10034,15 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: src/protocols/toc/toc.c:2169 src/protocols/toc/toc.c:2171
+#: src/protocols/toc/toc.c:2170 src/protocols/toc/toc.c:2172
 msgid "TOC Protocol Plugin"
 msgstr "TOC Protocol Plugin"
 
-#: src/protocols/toc/toc.c:2190
+#: src/protocols/toc/toc.c:2191
 msgid "TOC host"
 msgstr "TOC host"
 
-#: src/protocols/toc/toc.c:2194
+#: src/protocols/toc/toc.c:2195
 msgid "TOC port"
 msgstr "TOC port"
 
@@ -10087,7 +10125,6 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: src/protocols/trepia/trepia.c:1271 src/protocols/trepia/trepia.c:1273
 msgid "Trepia Protocol Plugin"
 msgstr "Trepia Protocol Plugin"
@@ -10197,79 +10234,72 @@
 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:1896
+#: src/protocols/yahoo/yahoo.c:1897
 msgid "Could not add buddy to server list"
 msgstr "Could not add buddy to server list"
 
-#: src/protocols/yahoo/yahoo.c:2088 src/protocols/yahoo/yahoo.c:2216
+#: src/protocols/yahoo/yahoo.c:2131 src/protocols/yahoo/yahoo.c:2259
+#: src/protocols/yahoo/ycht.c:414
 msgid "Unable to read"
 msgstr "Unable to read"
 
-#: src/protocols/yahoo/yahoo.c:2238 src/protocols/yahoo/yahoo.c:2348
-#: src/protocols/yahoo/yahoo.c:2398 src/protocols/yahoo/yahoo.c:2408
+#: src/protocols/yahoo/yahoo.c:2281 src/protocols/yahoo/yahoo.c:2391
+#: src/protocols/yahoo/yahoo.c:2441 src/protocols/yahoo/yahoo.c:2451
 #: src/protocols/yahoo/yahoochat.c:1397 src/protocols/yahoo/yahoochat.c:1458
+#: src/protocols/yahoo/ycht.c:518
 msgid "Connection problem"
 msgstr "Connection problem"
 
-#: src/protocols/yahoo/yahoo.c:2495 src/protocols/yahoo/yahoo.c:2857
-#: src/protocols/yahoo/yahoo.c:2971
+#: src/protocols/yahoo/yahoo.c:2538 src/protocols/yahoo/yahoo.c:2900
+#: src/protocols/yahoo/yahoo.c:3014
 msgid "Not At Home"
 msgstr "Not At Home"
 
-#: src/protocols/yahoo/yahoo.c:2497 src/protocols/yahoo/yahoo.c:2859
-#: src/protocols/yahoo/yahoo.c:2972
+#: src/protocols/yahoo/yahoo.c:2540 src/protocols/yahoo/yahoo.c:2902
+#: src/protocols/yahoo/yahoo.c:3015
 msgid "Not At Desk"
 msgstr "Not At Desk"
 
-#: src/protocols/yahoo/yahoo.c:2499 src/protocols/yahoo/yahoo.c:2861
-#: src/protocols/yahoo/yahoo.c:2973
+#: src/protocols/yahoo/yahoo.c:2542 src/protocols/yahoo/yahoo.c:2904
+#: src/protocols/yahoo/yahoo.c:3016
 msgid "Not In Office"
 msgstr "Not In Office"
 
-#: src/protocols/yahoo/yahoo.c:2503 src/protocols/yahoo/yahoo.c:2865
-#: src/protocols/yahoo/yahoo.c:2975
+#: src/protocols/yahoo/yahoo.c:2546 src/protocols/yahoo/yahoo.c:2908
+#: src/protocols/yahoo/yahoo.c:3018
 msgid "On Vacation"
 msgstr "On Vacation"
 
-#: src/protocols/yahoo/yahoo.c:2507 src/protocols/yahoo/yahoo.c:2869
-#: src/protocols/yahoo/yahoo.c:2977
+#: src/protocols/yahoo/yahoo.c:2550 src/protocols/yahoo/yahoo.c:2912
+#: src/protocols/yahoo/yahoo.c:3020
 msgid "Stepped Out"
 msgstr "Stepped Out"
 
-#: src/protocols/yahoo/yahoo.c:2588 src/protocols/yahoo/yahoo.c:2614
+#: src/protocols/yahoo/yahoo.c:2631 src/protocols/yahoo/yahoo.c:2657
 msgid "Not on server list"
 msgstr "Not on server list"
 
-#: src/protocols/yahoo/yahoo.c:2634
-#, c-format
-msgid ""
-"\n"
-"<b>%s:</b> %s"
-msgstr ""
-"\n"
-"<b>%s:</b> %s"
-
-#: src/protocols/yahoo/yahoo.c:2693
+#: src/protocols/yahoo/yahoo.c:2736
 msgid "Join in Chat"
 msgstr "Join in Chat"
 
-#: src/protocols/yahoo/yahoo.c:2698
+#: src/protocols/yahoo/yahoo.c:2741
 msgid "Initiate Conference"
 msgstr "Initiate Conference"
 
-#: src/protocols/yahoo/yahoo.c:2750
+#: src/protocols/yahoo/yahoo.c:2793
 msgid "Active which ID?"
 msgstr "Active which ID?"
 
-#: src/protocols/yahoo/yahoo.c:2759
+#: src/protocols/yahoo/yahoo.c:2802
 msgid "Join who in chat?"
 msgstr "Join who in chat?"
 
-#: src/protocols/yahoo/yahoo.c:2769
+#: src/protocols/yahoo/yahoo.c:2812
 msgid "Activate ID..."
 msgstr "Activate ID..."
 
-#: src/protocols/yahoo/yahoo.c:2773
+#: src/protocols/yahoo/yahoo.c:2816
 msgid "Join user in chat..."
 msgstr "Join user in chat..."
 
@@ -10283,48 +10313,47 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: src/protocols/yahoo/yahoo.c:3292 src/protocols/yahoo/yahoo.c:3294
+#: src/protocols/yahoo/yahoo.c:3335 src/protocols/yahoo/yahoo.c:3337
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo Protocol Plugin"
 
-#: src/protocols/yahoo/yahoo.c:3313
+#: src/protocols/yahoo/yahoo.c:3356
 msgid "Yahoo Japan"
 msgstr "Yahoo Japan"
 
-#: src/protocols/yahoo/yahoo.c:3316
+#: src/protocols/yahoo/yahoo.c:3359
 msgid "Pager host"
 msgstr "Pager host"
 
-#: src/protocols/yahoo/yahoo.c:3319
+#: src/protocols/yahoo/yahoo.c:3362
 msgid "Japan Pager host"
 msgstr "Japan Pager host"
 
-#: src/protocols/yahoo/yahoo.c:3322
+#: src/protocols/yahoo/yahoo.c:3365
 msgid "Pager port"
 msgstr "Pager port"
 
-#: src/protocols/yahoo/yahoo.c:3325
+#: src/protocols/yahoo/yahoo.c:3368
 msgid "File transfer host"
 msgstr "File transfer host"
 
-#: src/protocols/yahoo/yahoo.c:3328
+#: src/protocols/yahoo/yahoo.c:3371
 msgid "Japan File transfer host"
 msgstr "Japan File transfer host"
 
-#: src/protocols/yahoo/yahoo.c:3331
+#: src/protocols/yahoo/yahoo.c:3374
 msgid "File transfer port"
 msgstr "File transfer port"
 
-#: src/protocols/yahoo/yahoo.c:3334
+#: src/protocols/yahoo/yahoo.c:3377
 msgid "Chat Room List Url"
 msgstr "Chat Room List Url"
 
-#: src/protocols/yahoo/yahoo.c:3337
+#: src/protocols/yahoo/yahoo.c:3380
 msgid "YCHT Host"
 msgstr "YCHT Host"
 
-#: src/protocols/yahoo/yahoo.c:3340
+#: src/protocols/yahoo/yahoo.c:3383
 msgid "YCHT Port"
 msgstr "YCHT Port"
 
@@ -10431,33 +10460,33 @@
 msgid "The user's profile is empty."
 msgstr "The user's profile is empty."
 
-#: src/protocols/yahoo/yahoochat.c:203
+#: src/protocols/yahoo/yahoochat.c:193
 #, 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:205
+#: src/protocols/yahoo/yahoochat.c:195
 msgid "Invitation Rejected"
 msgstr "Invitation Rejected"
 
-#: src/protocols/yahoo/yahoochat.c:355
+#: src/protocols/yahoo/yahoochat.c:347
 msgid "Failed to join chat"
 msgstr "Failed to join chat"
 
-#: src/protocols/yahoo/yahoochat.c:355
+#: src/protocols/yahoo/yahoochat.c:347
 msgid "Maybe the room is full?"
 msgstr "Perhaps the room is full?"
 
-#: src/protocols/yahoo/yahoochat.c:429
+#: src/protocols/yahoo/yahoochat.c:425
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "You are now chatting in %s."
 
-#: src/protocols/yahoo/yahoochat.c:583
+#: src/protocols/yahoo/yahoochat.c:579
 msgid "Failed to join buddy in chat"
 msgstr "Failed to join buddy in chat"
 
-#: src/protocols/yahoo/yahoochat.c:584
+#: src/protocols/yahoo/yahoochat.c:580
 msgid "Maybe they're not in a chat?"
 msgstr "Perhaps they're not in a chat?"
 
@@ -10485,85 +10514,77 @@
 msgid "User Rooms"
 msgstr "User Rooms"
 
-#: src/protocols/zephyr/zephyr.c:589
+#: src/protocols/yahoo/ycht.c:401
+msgid "Connection problem with the YCHT server."
+msgstr "Connection problem with the YCHT server."
+
+#: src/protocols/zephyr/zephyr.c:598
 #, c-format
 msgid "Unable send to chat %s,%s,%s"
 msgstr "Unable send to chat %s,%s,%s"
 
-#: src/protocols/zephyr/zephyr.c:624
+#: src/protocols/zephyr/zephyr.c:633
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>User:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:628
+#: src/protocols/zephyr/zephyr.c:637
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>Hidden or not logged-in"
 
-#: src/protocols/zephyr/zephyr.c:633
+#: src/protocols/zephyr/zephyr.c:642
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>At %s since %s"
 
-#: src/protocols/zephyr/zephyr.c:983 src/protocols/zephyr/zephyr.c:984
+#: src/protocols/zephyr/zephyr.c:987 src/protocols/zephyr/zephyr.c:988
 msgid "Anyone"
 msgstr "Anyone"
 
-#: src/protocols/zephyr/zephyr.c:1011
-msgid "Already logged in with Zephyr"
-msgstr "Already logged in with Zephyr"
-
-#: src/protocols/zephyr/zephyr.c:1011
-msgid ""
-"Because Zephyr uses your system username, you are unable to have multiple "
-"accounts on it when logged in as the same user."
-msgstr ""
-"Because Zephyr uses your system username, you are unable to have multiple "
-"accounts on it when logged in as the same user."
-
-#: src/protocols/zephyr/zephyr.c:1386
+#: src/protocols/zephyr/zephyr.c:1389
 msgid "_Class:"
 msgstr "_Class:"
 
-#: src/protocols/zephyr/zephyr.c:1392
+#: src/protocols/zephyr/zephyr.c:1395
 msgid "_Instance:"
 msgstr "_Instance:"
 
-#: src/protocols/zephyr/zephyr.c:1398
+#: src/protocols/zephyr/zephyr.c:1401
 msgid "_Recipient:"
 msgstr "_Recipient:"
 
-#: src/protocols/zephyr/zephyr.c:1409
+#: src/protocols/zephyr/zephyr.c:1412
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "Attempt to subscribe to %s,%s,%s failed"
 
-#: src/protocols/zephyr/zephyr.c:1678
+#: src/protocols/zephyr/zephyr.c:1681
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;nick&gt;: Locate user"
 
-#: src/protocols/zephyr/zephyr.c:1683
+#: src/protocols/zephyr/zephyr.c:1686
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;nick&gt;: Locate user"
 
-#: src/protocols/zephyr/zephyr.c:1688
+#: src/protocols/zephyr/zephyr.c:1691
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "instance &lt;instance&gt;: Set the instance to be used on this class"
 
-#: src/protocols/zephyr/zephyr.c:1693
+#: src/protocols/zephyr/zephyr.c:1696
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "inst &lt;instance&gt;: Set the instance to be used on this class"
 
-#: src/protocols/zephyr/zephyr.c:1699
+#: src/protocols/zephyr/zephyr.c:1702
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 
-#: src/protocols/zephyr/zephyr.c:1704
+#: src/protocols/zephyr/zephyr.c:1707
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 
-#: src/protocols/zephyr/zephyr.c:1710
+#: src/protocols/zephyr/zephyr.c:1713
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
@@ -10571,7 +10592,7 @@
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
 
-#: src/protocols/zephyr/zephyr.c:1716
+#: src/protocols/zephyr/zephyr.c:1719
 msgid ""
 "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
 "<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
@@ -10579,7 +10600,7 @@
 "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
 "<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
 
-#: src/protocols/zephyr/zephyr.c:1722
+#: src/protocols/zephyr/zephyr.c:1725
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
@@ -10587,15 +10608,15 @@
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
 
-#: src/protocols/zephyr/zephyr.c:1727
+#: src/protocols/zephyr/zephyr.c:1730
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 
-#: src/protocols/zephyr/zephyr.c:1802
+#: src/protocols/zephyr/zephyr.c:1806
 msgid "Resubscribe"
 msgstr "Resubscribe"
 
-#: src/protocols/zephyr/zephyr.c:1805
+#: src/protocols/zephyr/zephyr.c:1809
 msgid "Retrieve subscriptions from server"
 msgstr "Retrieve subscriptions from server"
 
@@ -10609,40 +10630,39 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: src/protocols/zephyr/zephyr.c:1885 src/protocols/zephyr/zephyr.c:1887
+#: src/protocols/zephyr/zephyr.c:1889 src/protocols/zephyr/zephyr.c:1891
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr Protocol Plugin"
 
-#: src/protocols/zephyr/zephyr.c:1906
+#: src/protocols/zephyr/zephyr.c:1910
 msgid "Export to .anyone"
 msgstr "Export to .anyone"
 
-#: src/protocols/zephyr/zephyr.c:1909
+#: src/protocols/zephyr/zephyr.c:1913
 msgid "Export to .zephyr.subs"
 msgstr "Export to .zephyr.subs"
 
-#: src/protocols/zephyr/zephyr.c:1912
+#: src/protocols/zephyr/zephyr.c:1916
 msgid "Exposure"
 msgstr "Exposure"
 
 #. XXX: why in the hell are we calling gaim_connection_error() here?
 #. Forbidden
-#: src/proxy.c:845
+#: src/proxy.c:870
 #, c-format
 msgid "Access denied: proxy server forbids port %d tunnelling."
 msgstr "Access denied: proxy server forbids port %d tunnelling."
 
-#: src/proxy.c:849
+#: src/proxy.c:874
 #, c-format
 msgid "Proxy connection error %d"
 msgstr "Proxy connection error %d"
 
-#: src/proxy.c:1495
+#: src/proxy.c:1520
 msgid "Invalid proxy settings"
 msgstr "Invalid proxy settings"
 
-#: src/proxy.c:1495
+#: src/proxy.c:1520
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -10651,7 +10671,7 @@
 "invalid."
 
 #. * Custom away message.
-#: src/prpl.h:165
+#: src/prpl.h:171
 msgid "Custom"
 msgstr "Custom"
 
@@ -10666,63 +10686,63 @@
 msgid "Please enter your password"
 msgstr "Please enter your password"
 
-#: src/server.c:528
+#: src/server.c:534
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s is now known as %s.\n"
 
-#: src/server.c:938
+#: src/server.c:945
 #, c-format
 msgid "(%d message)"
 msgid_plural "(%d messages)"
 msgstr[0] "(%d message)"
 msgstr[1] "(%d messages)"
 
-#: src/server.c:952
+#: src/server.c:959
 msgid "(1 message)"
 msgstr "(1 message)"
 
-#: src/server.c:1180 src/server.c:1189
+#: src/server.c:1188 src/server.c:1197
 #, c-format
 msgid "%s logged in."
 msgstr "%s logged in."
 
-#: src/server.c:1201
+#: src/server.c:1209
 #, c-format
 msgid "%s signed on"
 msgstr "%s signed on"
 
-#: src/server.c:1216
+#: src/server.c:1224
 #, c-format
 msgid "%s came back"
 msgstr "%s came back"
 
-#: src/server.c:1218
+#: src/server.c:1226
 #, c-format
 msgid "%s went away"
 msgstr "%s went away."
 
-#: src/server.c:1232
+#: src/server.c:1240
 #, c-format
 msgid "%s became idle"
 msgstr "%s became idle"
 
-#: src/server.c:1243
+#: src/server.c:1251
 #, c-format
 msgid "%s became unidle"
 msgstr "%s is no longer idle"
 
-#: src/server.c:1253 src/server.c:1260
+#: src/server.c:1261 src/server.c:1268
 #, c-format
 msgid "%s logged out."
 msgstr "%s logged out."
 
-#: src/server.c:1273
+#: src/server.c:1281
 #, c-format
 msgid "%s signed off"
 msgstr "%s signed off"
 
-#: src/server.c:1335
+#: src/server.c:1343
 #, c-format
 msgid ""
 "%s has just been warned by %s.\n"
@@ -10731,11 +10751,11 @@
 "%s has just been warned by %s.\n"
 "Your new warning level is %d%%"
 
-#: src/server.c:1338
+#: src/server.c:1346
 msgid "an anonymous person"
 msgstr "an anonymous person"
 
-#: src/server.c:1448
+#: src/server.c:1456
 #, c-format
 msgid ""
 "User '%s' invites %s to buddy chat room: '%s'\n"
@@ -10744,12 +10764,12 @@
 "User '%s' invites %s to buddy chat room: '%s'\n"
 "%s"
 
-#: src/server.c:1452
+#: src/server.c:1460
 #, 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:1458
+#: src/server.c:1466
 msgid "Accept chat invitation?"
 msgstr "Accept chat invitation?"