changeset 9851:4e74f199416f

[gaim-migrate @ 10730] updated committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Tue, 24 Aug 2004 15:07:32 +0000
parents 921428c82d0b
children 8c09ecc3ec4c
files po/ChangeLog po/en_GB.po
diffstat 2 files changed, 1972 insertions(+), 1913 deletions(-) [+]
line wrap: on
line diff
--- a/po/ChangeLog	Tue Aug 24 13:39:52 2004 +0000
+++ b/po/ChangeLog	Tue Aug 24 15:07:32 2004 +0000
@@ -4,6 +4,7 @@
 	* Chinese (Simplified) translation updated (Funda Wang)
 	* Czech translation updated (Miloslav Trmac)
 	* Danish translation updated (Morten Brix Pedersen (mbrix))
+	* English (British) translation updated (Luke Ross (lukeross))
 	* English (Canadian) translation updated (Adam Weinberger)
 	* French translation updated (Eric Boumaour)
 	* Italian translation update (Claudio Satriano)
--- a/po/en_GB.po	Tue Aug 24 13:39:52 2004 +0000
+++ b/po/en_GB.po	Tue Aug 24 15:07:32 2004 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: Gaim 0.73\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-14 22:11-0400\n"
+"POT-Creation-Date: 2004-08-24 15:33+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"
@@ -46,50 +46,49 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: 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."
 
-#: plugins/chkmail.c:90 plugins/chkmail.c:113 plugins/chkmail.c:122
+#: plugins/chkmail.c:94 plugins/chkmail.c:117 plugins/chkmail.c:126
 msgid "Mail Server"
 msgstr "Mail Server"
 
-#: plugins/chkmail.c:132
+#: plugins/chkmail.c:136
 #, c-format
 msgid "%s (%d new/%d total)"
 msgstr "%s (%d new/%d total)"
 
-#: plugins/chkmail.c:195
+#: plugins/chkmail.c:199
 msgid "Check Mail"
 msgstr "Check Mail"
 
-#: plugins/chkmail.c:199
+#: plugins/chkmail.c:203
 msgid "Check email every X seconds.\n"
 msgstr "Check email every X seconds.\n"
 
-#: plugins/contact_priority.c:82
+#: plugins/contact_priority.c:83
 msgid "Point values to use when..."
 msgstr "Point values to use when..."
 
-#: plugins/contact_priority.c:91
+#: plugins/contact_priority.c:92
 msgid "Buddy is offline:"
 msgstr "Buddy is offline:"
 
-#: plugins/contact_priority.c:105
+#: plugins/contact_priority.c:106
 msgid "Buddy is away:"
 msgstr "Buddy is away:"
 
-#: plugins/contact_priority.c:119
+#: plugins/contact_priority.c:120
 msgid "Buddy is idle:"
 msgstr "Buddy is idle:"
 
-#: plugins/contact_priority.c:133
+#: plugins/contact_priority.c:134
 msgid "Use last matching buddy"
 msgstr "Use last matching buddy"
 
 #. Explanation
-#: plugins/contact_priority.c:139
+#: plugins/contact_priority.c:140
 msgid ""
 "The buddy with the lowest score is the buddy who will have priority in the "
 "contact.\n"
@@ -103,7 +102,7 @@
 "will use what used to be the built-in order active->idle->away->away+idle-"
 ">offline."
 
-#: plugins/contact_priority.c:142
+#: plugins/contact_priority.c:143
 msgid "Point values to use for Account..."
 msgstr "Point values to use for Account..."
 
@@ -114,21 +113,21 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/contact_priority.c:191
+#: plugins/contact_priority.c:192
 msgid "Contact Priority"
 msgstr "Contact Priority"
 
 #. *< name
 #. *< version
 #. *< summary
-#: plugins/contact_priority.c:194
+#: plugins/contact_priority.c:195
 msgid ""
 "Allows for controlling the values associated with different buddy states."
 msgstr ""
 "Allows for controlling the values associated with different buddy states."
 
 #. *< description
-#: plugins/contact_priority.c:196
+#: plugins/contact_priority.c:197
 msgid ""
 "Allows for changing the point values of idle/away/offline states for buddies "
 "in contact priority computations."
@@ -151,69 +150,69 @@
 msgid "Gaim - Away"
 msgstr "Gaim - Away"
 
-#: plugins/docklet/docklet.c:115 src/gtkaccount.c:737 src/gtkaccount.c:2158
+#: plugins/docklet/docklet.c:133 src/gtkaccount.c:738 src/gtkaccount.c:2160
 msgid "Auto-login"
 msgstr "Auto-login"
 
-#: plugins/docklet/docklet.c:118
+#: plugins/docklet/docklet.c:136
 msgid "New Message..."
 msgstr "New Message..."
 
-#: plugins/docklet/docklet.c:119
+#: plugins/docklet/docklet.c:137
 msgid "Join A Chat..."
 msgstr "Join A Chat..."
 
-#: plugins/docklet/docklet.c:150
+#: plugins/docklet/docklet.c:172
 msgid "New..."
 msgstr "New..."
 
-#: plugins/docklet/docklet.c:154 src/gtkprefs.c:1802 src/protocols/gg/gg.c:51
+#: plugins/docklet/docklet.c:180 src/gtkprefs.c:1809 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:126 src/protocols/novell/novell.c:2770
-#: src/protocols/novell/novell.c:2887 src/protocols/novell/novell.c:2939
-#: src/protocols/oscar/oscar.c:514 src/protocols/oscar/oscar.c:5496
-#: src/protocols/oscar/oscar.c:6502 src/protocols/oscar/oscar.c:6702
+#: src/protocols/jabber/presence.c:126 src/protocols/novell/novell.c:2798
+#: src/protocols/novell/novell.c:2915 src/protocols/novell/novell.c:2967
+#: src/protocols/oscar/oscar.c:648 src/protocols/oscar/oscar.c:5570
+#: src/protocols/oscar/oscar.c:6558 src/protocols/oscar/oscar.c:6758
 #: 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:160 src/away.c:570
-#: src/protocols/oscar/oscar.c:5414 src/protocols/oscar/oscar.c:6710
+#: plugins/docklet/docklet.c:186 src/away.c:583
+#: src/protocols/oscar/oscar.c:5488 src/protocols/oscar/oscar.c:6766
 msgid "Back"
 msgstr "Back"
 
-#: plugins/docklet/docklet.c:168
+#: plugins/docklet/docklet.c:194
 msgid "Mute Sounds"
 msgstr "Mute Sounds"
 
-#: plugins/docklet/docklet.c:173 src/gtkft.c:612
+#: plugins/docklet/docklet.c:199 src/gtkft.c:628
 msgid "File Transfers"
 msgstr "File Transfers"
 
-#: plugins/docklet/docklet.c:174 src/gtkaccount.c:2339
+#: plugins/docklet/docklet.c:200 src/gtkaccount.c:2341
 msgid "Accounts"
 msgstr "Accounts"
 
-#: plugins/docklet/docklet.c:175 src/gtkprefs.c:2484
+#: plugins/docklet/docklet.c:201 src/gtkprefs.c:2506
 msgid "Preferences"
 msgstr "Preferences"
 
-#: plugins/docklet/docklet.c:184
+#: plugins/docklet/docklet.c:210
 msgid "Signoff"
 msgstr "Signoff"
 
-#: plugins/docklet/docklet.c:188
+#: plugins/docklet/docklet.c:214
 msgid "Quit"
 msgstr "Quit"
 
-#: plugins/docklet/docklet.c:479
+#: plugins/docklet/docklet.c:505
 msgid "Tray Icon Configuration"
 msgstr "Tray Icon Configuration"
 
-#: plugins/docklet/docklet.c:483
+#: plugins/docklet/docklet.c:509
 msgid "_Hide new messages until tray icon is clicked"
 msgstr "_Hide new messages until tray icon is clicked"
 
@@ -224,19 +223,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/docklet/docklet.c:507
+#: plugins/docklet/docklet.c:533
 msgid "System Tray Icon"
 msgstr "System Tray Icon"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/docklet/docklet.c:510
+#: plugins/docklet/docklet.c:536
 msgid "Displays an icon for Gaim in the system tray."
 msgstr "Displays an icon for Gaim in the system tray."
 
 #. *  description
-#: plugins/docklet/docklet.c:512
+#: plugins/docklet/docklet.c:538
 msgid ""
 "Displays a system tray icon (in GNOME, KDE or Windows for example) to show "
 "the current status of Gaim, allow fast access to commonly used functions, "
@@ -248,19 +247,19 @@
 "and to toggle display of the buddy list or login window. Also allows "
 "messages to be queued until the icon is clicked, similar to ICQ."
 
-#: plugins/extplacement.c:75
+#: plugins/extplacement.c:76
 msgid "By conversation count"
 msgstr "By conversation count"
 
-#: plugins/extplacement.c:96
+#: plugins/extplacement.c:97
 msgid "Conversation Placement"
 msgstr "Conversation Placement"
 
-#: plugins/extplacement.c:101
+#: plugins/extplacement.c:102
 msgid "Number of conversations per window"
 msgstr "Number of conversations per window"
 
-#: plugins/extplacement.c:107
+#: plugins/extplacement.c:108
 msgid "Separate IM and Chat windows when placing by number"
 msgstr "Separate IM and Chat windows when placing by number"
 
@@ -271,19 +270,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/extplacement.c:126
+#: plugins/extplacement.c:127
 msgid "ExtPlacement"
 msgstr "ExtPlacement"
 
 #. *< name
 #. *< version
-#: plugins/extplacement.c:128
+#: plugins/extplacement.c:129
 msgid "Extra conversation placement options."
 msgstr "Extra conversation placement options."
 
 #. *< summary
 #. *  description
-#: plugins/extplacement.c:130
+#: plugins/extplacement.c:131
 msgid ""
 "Restrict the number of conversations per windows, optionally separating IMs "
 "and Chats"
@@ -305,7 +304,6 @@
 #. *< 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."
@@ -450,60 +448,60 @@
 "Drag up and then to the left to switch to the previous conversation.\n"
 "Drag up and then to the right to switch to the next conversation."
 
-#: plugins/gevolution/add_buddy_dialog.c:133
-#: plugins/gevolution/assoc-buddy.c:71
+#: plugins/gevolution/add_buddy_dialog.c:134
+#: plugins/gevolution/assoc-buddy.c:72
 msgid "Local Addressbook"
 msgstr "Local Addressbook"
 
-#: 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:3003 src/gtkprefs.c:956 src/gtkprefs.c:1008
-#: src/gtkprefs.c:1816 src/protocols/jabber/jabber.c:924
+#: plugins/gevolution/add_buddy_dialog.c:144
+#: plugins/gevolution/add_buddy_dialog.c:155
+#: plugins/gevolution/assoc-buddy.c:82 plugins/gevolution/assoc-buddy.c:93
+#: src/gtkblist.c:2998 src/gtkprefs.c:959 src/gtkprefs.c:1011
+#: src/gtkprefs.c:1823 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:2157
-#: src/gtkroomlist.c:552 src/protocols/jabber/jabber.c:598
+#: plugins/gevolution/add_buddy_dialog.c:188
+#: plugins/gevolution/assoc-buddy.c:176 src/gtkprefs.c:2164
+#: src/gtkroomlist.c:553 src/protocols/jabber/jabber.c:598
 #: src/protocols/msn/msn.c:1311 src/protocols/trepia/trepia.c:398
 msgid "Name"
 msgstr "Name"
 
-#: plugins/gevolution/add_buddy_dialog.c:198
+#: plugins/gevolution/add_buddy_dialog.c:199
 msgid "Instant Messaging"
 msgstr "Instant Messaging"
 
 #. Add the label.
-#: plugins/gevolution/add_buddy_dialog.c:479
+#: plugins/gevolution/add_buddy_dialog.c:480
 msgid "Select a person from your address book below, or add a new person."
 msgstr "Select a person from your address book below, or add a new person."
 
 #. "Search"
-#: plugins/gevolution/add_buddy_dialog.c:492
-#: plugins/gevolution/assoc-buddy.c:380 src/protocols/oscar/oscar.c:6986
+#: plugins/gevolution/add_buddy_dialog.c:493
+#: plugins/gevolution/assoc-buddy.c:381 src/protocols/oscar/oscar.c:7042
 msgid "Search"
 msgstr "Search"
 
-#: plugins/gevolution/add_buddy_dialog.c:563
-#: plugins/gevolution/new_person_dialog.c:307 src/gtkblist.c:4042
-#: src/gtkblist.c:4370
+#: plugins/gevolution/add_buddy_dialog.c:564
+#: plugins/gevolution/new_person_dialog.c:308 src/gtkblist.c:4038
+#: src/gtkblist.c:4376
 msgid "Group:"
 msgstr "Group:"
 
 #. "New Person" button
-#: plugins/gevolution/add_buddy_dialog.c:589
-#: plugins/gevolution/assoc-buddy.c:483
+#: plugins/gevolution/add_buddy_dialog.c:590
+#: plugins/gevolution/assoc-buddy.c:484
 msgid "New Person"
 msgstr "New Person"
 
 #. "Select Buddy" button
-#: plugins/gevolution/add_buddy_dialog.c:606
+#: plugins/gevolution/add_buddy_dialog.c:607
 msgid "Select Buddy"
 msgstr "Select Buddy"
 
 #. Add the label.
-#: plugins/gevolution/assoc-buddy.c:367
+#: plugins/gevolution/assoc-buddy.c:368
 msgid ""
 "Select a person from your address book to add this buddy to, or create a new "
 "person."
@@ -512,21 +510,21 @@
 "person."
 
 #. Add the disclosure
-#: plugins/gevolution/assoc-buddy.c:446
+#: plugins/gevolution/assoc-buddy.c:447
 msgid "Show user details"
 msgstr "Show user details"
 
-#: plugins/gevolution/assoc-buddy.c:447
+#: plugins/gevolution/assoc-buddy.c:448
 msgid "Hide user details"
 msgstr "Hide user details"
 
 #. "Associate Buddy" button
-#: plugins/gevolution/assoc-buddy.c:500
+#: plugins/gevolution/assoc-buddy.c:501
 msgid "_Associate Buddy"
 msgstr "_Associate Buddy"
 
-#: plugins/gevolution/gevo-util.c:64 plugins/gevolution/gevolution.c:89
-#: src/blist.c:774 src/blist.c:962 src/blist.c:1898 src/gtkblist.c:3861
+#: plugins/gevolution/gevo-util.c:65 plugins/gevolution/gevolution.c:89
+#: src/blist.c:774 src/blist.c:982 src/blist.c:1912 src/gtkblist.c:3857
 #: src/protocols/jabber/roster.c:66
 msgid "Buddies"
 msgstr "Buddies"
@@ -545,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:619
+#: plugins/gevolution/gevolution.c:384 plugins/idle.c:51 src/gtkconn.c:620
 msgid "Account"
 msgstr "Account"
 
@@ -563,59 +561,58 @@
 #. *< 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."
 
-#: plugins/gevolution/new_person_dialog.c:267
+#: plugins/gevolution/new_person_dialog.c:268
 msgid "Please enter the person's information below."
 msgstr "Please enter the person's information below."
 
-#: plugins/gevolution/new_person_dialog.c:271
+#: plugins/gevolution/new_person_dialog.c:272
 msgid "Please enter the buddy's screen name and account type below."
 msgstr "Please enter the buddy's screen name and account type below."
 
-#: plugins/gevolution/new_person_dialog.c:291
+#: plugins/gevolution/new_person_dialog.c:292
 msgid "Account type:"
 msgstr "Account type:"
 
-#: plugins/gevolution/new_person_dialog.c:295
+#: plugins/gevolution/new_person_dialog.c:296
 msgid "Screenname:"
 msgstr "Screenname:"
 
 #. Optional Information section
-#: plugins/gevolution/new_person_dialog.c:315
+#: plugins/gevolution/new_person_dialog.c:316
 msgid "Optional information:"
 msgstr "Optional information"
 
 #. Label
-#: plugins/gevolution/new_person_dialog.c:338 src/gtkaccount.c:371
-#: src/gtkaccount.c:401 src/protocols/oscar/oscar.c:420
+#: plugins/gevolution/new_person_dialog.c:339 src/gtkaccount.c:372
+#: src/gtkaccount.c:402 src/protocols/oscar/oscar.c:554
 msgid "Buddy Icon"
 msgstr "Buddy Icon"
 
-#: plugins/gevolution/new_person_dialog.c:350
+#: plugins/gevolution/new_person_dialog.c:351
 msgid "First name:"
 msgstr "First name:"
 
-#: plugins/gevolution/new_person_dialog.c:362
+#: plugins/gevolution/new_person_dialog.c:363
 msgid "Last name:"
 msgstr "Last name:"
 
-#: plugins/gevolution/new_person_dialog.c:382
+#: plugins/gevolution/new_person_dialog.c:383
 msgid "E-mail:"
 msgstr "E-mail:"
 
-#: plugins/history.c:88
+#: plugins/history.c:89
 msgid "History"
 msgstr "History"
 
-#: plugins/history.c:90
+#: plugins/history.c:91
 msgid "Shows recently logged conversations in new conversations."
 msgstr "Shows recently logged conversations in new conversations."
 
-#: plugins/history.c:91
+#: plugins/history.c:92
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
@@ -630,15 +627,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/iconaway.c:80
+#: plugins/iconaway.c:101
 msgid "Iconify on Away"
 msgstr "Iconify on Away"
 
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: plugins/iconaway.c:83 plugins/iconaway.c:85
+#: plugins/iconaway.c:104 plugins/iconaway.c:106
 msgid "Iconifies the buddy list and your conversations when you go away."
 msgstr "Iconifies the buddy list and your conversations when you go away."
 
@@ -658,7 +654,7 @@
 msgid "_Set"
 msgstr "_Set"
 
-#: plugins/idle.c:67 src/away.c:905
+#: plugins/idle.c:67 src/away.c:910
 msgid "_Cancel"
 msgstr "_Cancel"
 
@@ -729,68 +725,68 @@
 msgstr "Adds a small box to the buddy list that shows if you have new mail."
 
 #. ---------- "Notify For" ----------
-#: plugins/notify.c:599
+#: plugins/notify.c:600
 msgid "Notify For"
 msgstr "Notify For"
 
-#: plugins/notify.c:603
+#: plugins/notify.c:604
 msgid "_IM windows"
 msgstr "_IM windows"
 
-#: plugins/notify.c:610
+#: plugins/notify.c:611
 msgid "C_hat windows"
 msgstr "C_hat windows"
 
-#: plugins/notify.c:617
+#: plugins/notify.c:618
 msgid "_Focused windows"
 msgstr "_Focused windows"
 
 #. ---------- "Notification Methods" ----------
-#: plugins/notify.c:625
+#: plugins/notify.c:626
 msgid "Notification Methods"
 msgstr "Notification Methods"
 
-#: plugins/notify.c:632
+#: plugins/notify.c:633
 msgid "Prepend _string into window title:"
 msgstr "Prepend _string into window title:"
 
 #. Count method button
-#: plugins/notify.c:651
+#: plugins/notify.c:652
 msgid "Insert c_ount of new messages into window title"
 msgstr "Insert c_ount of new messages into window title"
 
 #. Urgent method button
-#: plugins/notify.c:659
+#: plugins/notify.c:660
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "Set window manager \"_URGENT\" hint"
 
 #. ---------- "Notification Removals" ----------
-#: plugins/notify.c:667
+#: plugins/notify.c:668
 msgid "Notification Removal"
 msgstr "Notification Removal"
 
 #. Remove on focus button
-#: plugins/notify.c:672
+#: plugins/notify.c:673
 msgid "Remove when conversation window _gains focus"
 msgstr "Remove when conversation window _gains focus"
 
 #. Remove on click button
-#: plugins/notify.c:679
+#: plugins/notify.c:680
 msgid "Remove when conversation window _receives click"
 msgstr "Remove when conversation window _receives click"
 
 #. Remove on type button
-#: plugins/notify.c:687
+#: plugins/notify.c:688
 msgid "Remove when _typing in conversation window"
 msgstr "Remove when _typing in conversation window"
 
 #. Remove on message send button
-#: plugins/notify.c:695
+#: plugins/notify.c:696
 msgid "Remove when a _message gets sent"
 msgstr "Remove when a _message gets sent"
 
 #. Remove on conversation switch button
-#: plugins/notify.c:704
+#: plugins/notify.c:705
 msgid "Remove on switch to conversation ta_b"
 msgstr "Remove on switch to conversation ta_b"
 
@@ -801,15 +797,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/notify.c:792
+#: plugins/notify.c:793
 msgid "Message Notification"
 msgstr "Message Notification"
 
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: plugins/notify.c:795 plugins/notify.c:797
+#: plugins/notify.c:796 plugins/notify.c:798
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "Provides a variety of ways of notifying you of unread messages."
 
@@ -826,7 +821,6 @@
 
 #. *< name
 #. *< version
-#. *< summary
 #: plugins/perl/perl.c:534 plugins/perl/perl.c:535
 msgid "Provides support for loading perl plugins."
 msgstr "Provides support for loading perl plugins."
@@ -915,7 +909,6 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: 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."
@@ -934,40 +927,39 @@
 #. *< 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."
 
-#: plugins/spellchk.c:412
+#: plugins/spellchk.c:413
 msgid "Text Replacements"
 msgstr "Text Replacements"
 
-#: plugins/spellchk.c:436
+#: plugins/spellchk.c:437
 msgid "You type"
 msgstr "You type"
 
-#: plugins/spellchk.c:448
+#: plugins/spellchk.c:449
 msgid "You send"
 msgstr "You send"
 
-#: plugins/spellchk.c:474
+#: plugins/spellchk.c:475
 msgid "Add a new text replacement"
 msgstr "Add a new text replacement"
 
-#: plugins/spellchk.c:481
+#: plugins/spellchk.c:482
 msgid "You _type:"
 msgstr "You _type:"
 
-#: plugins/spellchk.c:495
+#: plugins/spellchk.c:496
 msgid "You _send:"
 msgstr "You _send:"
 
-#: plugins/spellchk.c:535
+#: plugins/spellchk.c:536
 msgid "Text replacement"
 msgstr "Text replacement"
 
-#: plugins/spellchk.c:537 plugins/spellchk.c:538
+#: plugins/spellchk.c:538 plugins/spellchk.c:539
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "Replaces text in outgoing messages according to user-defined rules."
 
@@ -985,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."
@@ -1004,7 +995,6 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: 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."
@@ -1023,7 +1013,6 @@
 #. *< 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."
@@ -1074,7 +1063,6 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
 #: plugins/statenotify.c:116 plugins/statenotify.c:119
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
@@ -1105,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."
@@ -1140,36 +1127,35 @@
 #. *< 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."
 
 #: plugins/win32/transparency/win2ktrans.c:133
-#: plugins/win32/transparency/win2ktrans.c:388
-#: plugins/win32/transparency/win2ktrans.c:419
+#: plugins/win32/transparency/win2ktrans.c:387
+#: plugins/win32/transparency/win2ktrans.c:418
 msgid "Opacity:"
 msgstr "Opacity:"
 
 #. IM Convo trans options
-#: plugins/win32/transparency/win2ktrans.c:369
+#: plugins/win32/transparency/win2ktrans.c:368
 msgid "IM Conversation Windows"
 msgstr "IM Conversation Windows"
 
-#: plugins/win32/transparency/win2ktrans.c:370
+#: plugins/win32/transparency/win2ktrans.c:369
 msgid "_IM window transparency"
 msgstr "_IM window transparency"
 
-#: plugins/win32/transparency/win2ktrans.c:380
+#: plugins/win32/transparency/win2ktrans.c:379
 msgid "_Show slider bar in IM window"
 msgstr "_Show slider bar in IM window"
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:405 src/gtkprefs.c:950
+#: plugins/win32/transparency/win2ktrans.c:404 src/gtkprefs.c:953
 msgid "Buddy List Window"
 msgstr "Buddy List Window"
 
-#: plugins/win32/transparency/win2ktrans.c:406
+#: plugins/win32/transparency/win2ktrans.c:405
 msgid "_Buddy List window transparency"
 msgstr "_Buddy List window transparency"
 
@@ -1180,19 +1166,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/win32/transparency/win2ktrans.c:462
+#: plugins/win32/transparency/win2ktrans.c:461
 msgid "Transparency"
 msgstr "Transparency"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/win32/transparency/win2ktrans.c:465
+#: plugins/win32/transparency/win2ktrans.c:464
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "Variable Transparency for the buddy list and conversations."
 
 #. *  description
-#: plugins/win32/transparency/win2ktrans.c:467
+#: plugins/win32/transparency/win2ktrans.c:466
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
@@ -1204,288 +1190,57 @@
 "\n"
 "* Note: This plugin requires Win2000 or WinXP."
 
-#: plugins/win32/winprefs/winprefs.c:344
+#: plugins/win32/winprefs/winprefs.c:343
 msgid "GTK+ Runtime Version"
 msgstr "GTK+ Runtime Version"
 
 #. Autostart
-#: plugins/win32/winprefs/winprefs.c:352
+#: plugins/win32/winprefs/winprefs.c:351
 msgid "Startup"
 msgstr "Startup"
 
-#: plugins/win32/winprefs/winprefs.c:353
+#: plugins/win32/winprefs/winprefs.c:352
 msgid "_Start Gaim on Windows startup"
 msgstr "_Start Gaim on Windows startup"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3048
-#: src/gtkprefs.c:2394
+#: plugins/win32/winprefs/winprefs.c:361 src/gtkblist.c:3043
+#: src/gtkprefs.c:2416
 msgid "Buddy List"
 msgstr "Buddy List"
 
-#: plugins/win32/winprefs/winprefs.c:363
+#: plugins/win32/winprefs/winprefs.c:362
 msgid "_Dockable Buddy List"
 msgstr "_Dockable Buddy List"
 
 #. Docked Blist On Top
-#: plugins/win32/winprefs/winprefs.c:367
+#: plugins/win32/winprefs/winprefs.c:366
 msgid "Docked _Buddy List is always on top"
 msgstr "Docked _Buddy List is always on top"
 
 #. Blist On Top
-#: plugins/win32/winprefs/winprefs.c:377
+#: plugins/win32/winprefs/winprefs.c:376
 msgid "_Keep Buddy List window on top"
 msgstr "_Keep Buddy List window on top"
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:1001
-#: src/gtkprefs.c:2395 src/protocols/msn/msn.c:1639
+#: plugins/win32/winprefs/winprefs.c:381 src/gtkprefs.c:1004
+#: src/gtkprefs.c:2417 src/protocols/msn/msn.c:1639
 msgid "Conversations"
 msgstr "Conversations"
 
-#: plugins/win32/winprefs/winprefs.c:383
+#: plugins/win32/winprefs/winprefs.c:382
 msgid "_Flash Window when messages are received"
 msgstr "_Flash Window when messages are received"
 
-#: plugins/win32/winprefs/winprefs.c:405
+#: plugins/win32/winprefs/winprefs.c:404
 msgid "WinGaim Options"
 msgstr "WinGaim Options"
 
-#: plugins/win32/winprefs/winprefs.c:407 plugins/win32/winprefs/winprefs.c:408
+#: plugins/win32/winprefs/winprefs.c:406 plugins/win32/winprefs/winprefs.c:407
 msgid "Options specific to Windows Gaim."
 msgstr "Options specific to Windows Gaim."
 
-#: src/about.c:64
-msgid "About Gaim"
-msgstr "About Gaim"
-
-#: src/about.c:78
-#, 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:98
-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 "
-"at once.  It is written using Gtk+ and is licensed under the GPL.<BR><BR>"
-msgstr ""
-"Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"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:109
-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:114
-msgid "Active Developers"
-msgstr "Active Developers"
-
-#: src/about.c:115
-msgid "maintainer"
-msgstr "maintainer"
-
-#: src/about.c:117
-msgid "lead developer"
-msgstr "lead developer"
-
-#: src/about.c:120
-msgid "developer & webmaster"
-msgstr "developer & webmaster"
-
-#: src/about.c:121
-msgid "win32 port"
-msgstr "win32 port"
-
-#: src/about.c:124 src/about.c:125 src/about.c:126 src/about.c:127
-msgid "developer"
-msgstr "developer"
-
-#: src/about.c:128
-msgid "support"
-msgstr "support"
-
-#: src/about.c:135
-msgid "Crazy Patch Writers"
-msgstr "Crazy Patch Writers"
-
-#: src/about.c:151
-msgid "Retired Developers"
-msgstr "Retired Developers"
-
-#: src/about.c:152
-msgid "former libfaim maintainer"
-msgstr "former libfaim maintainer"
-
-#: src/about.c:153
-msgid "former lead developer"
-msgstr "former lead developer"
-
-#: src/about.c:156
-msgid "former maintainer"
-msgstr "former maintainer"
-
-#: src/about.c:157
-msgid "former Jabber developer"
-msgstr "former Jabber developer"
-
-#: src/about.c:158
-msgid "original author"
-msgstr "original author"
-
-#: src/about.c:161
-msgid "hacker and designated driver [lazy bum]"
-msgstr "hacker and designated driver [lazy bum]"
-
-#: src/about.c:169
-msgid "Current Translators"
-msgstr "Current Translators"
-
-#: src/about.c:170 src/about.c:209
-msgid "Bulgarian"
-msgstr "Bulgarian"
-
-#: src/about.c:171 src/about.c:210
-msgid "Catalan"
-msgstr "Catalan"
-
-#: src/about.c:172 src/about.c:211
-msgid "Czech"
-msgstr "Czech"
-
-#: src/about.c:173
-msgid "Danish"
-msgstr "Danish"
-
-#: src/about.c:174
-msgid "British English"
-msgstr "Proper English"
-
-#: src/about.c:175
-msgid "Canadian English"
-msgstr "Canadian English"
-
-#: src/about.c:176 src/about.c:212
-msgid "German"
-msgstr "German"
-
-#: src/about.c:177 src/about.c:213
-msgid "Spanish"
-msgstr "Spanish"
-
-#: src/about.c:178 src/about.c:214
-msgid "Finnish"
-msgstr "Finnish"
-
-#: src/about.c:179 src/about.c:215
-msgid "French"
-msgstr "French"
-
-#: src/about.c:180
-msgid "Hebrew"
-msgstr "Hebrew"
-
-#: src/about.c:181
-msgid "Hindi"
-msgstr "Hindi"
-
-#: src/about.c:182
-msgid "Hungarian"
-msgstr "Hungarian"
-
-#: src/about.c:183 src/about.c:216
-msgid "Italian"
-msgstr "Italian"
-
-#: src/about.c:184 src/about.c:217
-msgid "Japanese"
-msgstr "Japanese"
-
-#: src/about.c:185
-msgid "Lithuanian"
-msgstr "Lithuanian"
-
-#: src/about.c:186 src/about.c:218
-msgid "Korean"
-msgstr "Korean"
-
-#: src/about.c:187
-msgid "Dutch; Flemish"
-msgstr "Dutch; Flemish"
-
-#: src/about.c:188
-msgid "Macedonian"
-msgstr "Macedonian"
-
-#: src/about.c:189
-msgid "Norwegian"
-msgstr "Norwegian"
-
-#: src/about.c:190 src/about.c:219
-msgid "Polish"
-msgstr "Polish"
-
-#: src/about.c:191
-msgid "Portuguese"
-msgstr "Portuguese"
-
-#: src/about.c:192
-msgid "Portuguese-Brazil"
-msgstr "Portuguese-Brazil"
-
-#: src/about.c:193
-msgid "Romanian"
-msgstr "Romanian"
-
-#: src/about.c:194 src/about.c:220 src/about.c:221
-msgid "Russian"
-msgstr "Russian"
-
-#: src/about.c:195
-msgid "Serbian"
-msgstr "Serbian"
-
-#: src/about.c:196
-msgid "Slovenian"
-msgstr "Slovenian"
-
-#: src/about.c:197 src/about.c:223
-msgid "Swedish"
-msgstr "Swedish"
-
-#: src/about.c:198
-msgid "Vietnamese"
-msgstr "Vietnamese"
-
-#: src/about.c:198
-msgid "and the Gnome-Vi Team"
-msgstr "and the Gnome-Vi Team"
-
-#: src/about.c:199
-msgid "Simplified Chinese"
-msgstr "Simplified Chinese"
-
-#: src/about.c:200
-msgid "Traditional Chinese"
-msgstr "Traditional Chinese"
-
-#: src/about.c:207
-msgid "Past Translators"
-msgstr "Past Translators"
-
-#: src/about.c:208
-msgid "Amharic"
-msgstr "Amharic"
-
-#: src/about.c:222
-msgid "Slovak"
-msgstr "Slovak"
-
-#: src/about.c:224
-msgid "Chinese"
-msgstr "Chinese"
-
 #: src/account.c:277 src/protocols/jabber/jabber.c:1001
 msgid "New passwords do not match."
 msgstr "New passwords do not match."
@@ -1518,47 +1273,47 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:342 src/connection.c:198 src/gtkblist.c:2377
-#: src/gtkdialogs.c:123 src/gtkdialogs.c:262 src/gtkdialogs.c:315
-#: src/gtkrequest.c:241 src/protocols/jabber/jabber.c:1048
+#: src/account.c:342 src/connection.c:198 src/gtkblist.c:2371
+#: src/gtkdialogs.c:384 src/gtkdialogs.c:526 src/gtkdialogs.c:579
+#: 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:3359
-#: src/protocols/oscar/oscar.c:3453 src/protocols/oscar/oscar.c:6773
-#: src/protocols/oscar/oscar.c:6865 src/protocols/oscar/oscar.c:6917
-#: src/protocols/oscar/oscar.c:7003 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:1072 src/protocols/silc/ops.c:1680
-#: src/protocols/silc/silc.c:698 src/protocols/yahoo/yahoo.c:2795
-#: src/protocols/yahoo/yahoo.c:2804 src/request.h:1243
+#: src/protocols/msn/msn.c:271 src/protocols/oscar/oscar.c:3472
+#: src/protocols/oscar/oscar.c:3566 src/protocols/oscar/oscar.c:6829
+#: src/protocols/oscar/oscar.c:6921 src/protocols/oscar/oscar.c:6973
+#: src/protocols/oscar/oscar.c:7059 src/protocols/silc/buddy.c:460
+#: src/protocols/silc/buddy.c:1132 src/protocols/silc/chat.c:421
+#: src/protocols/silc/chat.c:459 src/protocols/silc/chat.c:722
+#: src/protocols/silc/ops.c:1081 src/protocols/silc/ops.c:1691
+#: src/protocols/silc/silc.c:698 src/protocols/yahoo/yahoo.c:2804
+#: src/protocols/yahoo/yahoo.c:2813 src/request.h:1243
 msgid "OK"
 msgstr "OK"
 
-#: src/account.c:343 src/account.c:381 src/away.c:353 src/connection.c:199
-#: src/gtkaccount.c:2008 src/gtkaccount.c:2504 src/gtkblist.c:2378
-#: src/gtkblist.c:4408 src/gtkconn.c:168 src/gtkdialogs.c:124
-#: src/gtkdialogs.c:263 src/gtkdialogs.c:316 src/gtkdialogs.c:404
-#: src/gtkdialogs.c:422 src/gtkdialogs.c:440 src/gtkdialogs.c:479
-#: src/gtkdialogs.c:535 src/gtkdialogs.c:581 src/gtkdialogs.c:600
-#: src/gtkimhtmltoolbar.c:419 src/gtkprivacy.c:585 src/gtkprivacy.c:598
-#: src/gtkprivacy.c:623 src/gtkprivacy.c:634 src/gtkrequest.c:242
+#: src/account.c:343 src/account.c:381 src/away.c:366 src/connection.c:199
+#: src/gtkaccount.c:2010 src/gtkaccount.c:2506 src/gtkblist.c:2372
+#: src/gtkblist.c:4414 src/gtkconn.c:169 src/gtkdialogs.c:385
+#: src/gtkdialogs.c:527 src/gtkdialogs.c:580 src/gtkdialogs.c:678
+#: src/gtkdialogs.c:700 src/gtkdialogs.c:720 src/gtkdialogs.c:756
+#: src/gtkdialogs.c:816 src/gtkdialogs.c:858 src/gtkdialogs.c:879
+#: src/gtkimhtmltoolbar.c:420 src/gtkprivacy.c:586 src/gtkprivacy.c:599
+#: src/gtkprivacy.c:624 src/gtkprivacy.c:635 src/gtkrequest.c:243
 #: src/protocols/icq/gaim_icq.c:276 src/protocols/jabber/buddy.c:515
-#: src/protocols/jabber/chat.c:702 src/protocols/jabber/jabber.c:667
+#: src/protocols/jabber/chat.c:730 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:1361
-#: src/protocols/oscar/oscar.c:3319 src/protocols/oscar/oscar.c:3360
-#: src/protocols/oscar/oscar.c:3397 src/protocols/oscar/oscar.c:3454
-#: src/protocols/oscar/oscar.c:6774 src/protocols/oscar/oscar.c:6866
-#: src/protocols/oscar/oscar.c:6918 src/protocols/oscar/oscar.c:6987
-#: src/protocols/oscar/oscar.c:7004 src/protocols/silc/buddy.c:461
+#: src/protocols/msn/msn.c:289 src/protocols/oscar/oscar.c:1495
+#: src/protocols/oscar/oscar.c:3432 src/protocols/oscar/oscar.c:3473
+#: src/protocols/oscar/oscar.c:3510 src/protocols/oscar/oscar.c:3567
+#: src/protocols/oscar/oscar.c:6830 src/protocols/oscar/oscar.c:6922
+#: src/protocols/oscar/oscar.c:6974 src/protocols/oscar/oscar.c:7043
+#: src/protocols/oscar/oscar.c:7060 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:1681 src/protocols/silc/silc.c:699
-#: src/protocols/trepia/trepia.c:347 src/protocols/yahoo/yahoo.c:2796
-#: src/protocols/yahoo/yahoo.c:2805 src/request.h:1243 src/request.h:1253
+#: src/protocols/silc/chat.c:594 src/protocols/silc/chat.c:723
+#: src/protocols/silc/ops.c:1692 src/protocols/silc/silc.c:699
+#: src/protocols/trepia/trepia.c:347 src/protocols/yahoo/yahoo.c:2805
+#: src/protocols/yahoo/yahoo.c:2814 src/request.h:1243 src/request.h:1253
 msgid "Cancel"
 msgstr "Cancel"
 
@@ -1567,78 +1322,82 @@
 msgid "Change user information for %s"
 msgstr "Change user information for %s"
 
-#: src/account.c:380 src/gtkrequest.c:248 src/protocols/jabber/buddy.c:514
+#: src/account.c:380 src/gtkrequest.c:249 src/protocols/jabber/buddy.c:514
 #: src/protocols/trepia/trepia.c:346
 msgid "Save"
 msgstr "Save"
 
-#: src/account.c:739 src/gtkft.c:154 src/gtkutils.c:627
-#: src/protocols/jabber/buddy.c:570 src/protocols/novell/novell.c:2782
+#: src/account.c:739 src/gtkft.c:158 src/gtkutils.c:591
+#: src/protocols/jabber/buddy.c:570 src/protocols/novell/novell.c:2810
 msgid "Unknown"
 msgstr "Unknown"
 
-#: src/away.c:231
+#: src/away.c:233
 msgid "Away!"
 msgstr "Away!"
 
-#: src/away.c:295
+#: src/away.c:303
+msgid "Edit This Message"
+msgstr "Edit This Message"
+
+#: src/away.c:308
 msgid "I'm Back!"
 msgstr "I'm Back!"
 
-#: src/away.c:349
+#: src/away.c:362
 #, 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:351 src/away.c:442
+#: src/away.c:364 src/away.c:455
 msgid "Remove Away Message"
 msgstr "Remove Away Message"
 
 #. Remove button
-#: src/away.c:352 src/gtkconv.c:1378 src/gtkconv.c:3721 src/gtkconv.c:3825
-#: src/gtkrequest.c:247
+#: src/away.c:365 src/gtkconv.c:1400 src/gtkconv.c:3743 src/gtkconv.c:3814
+#: src/gtkrequest.c:248
 msgid "Remove"
 msgstr "Remove"
 
-#: src/away.c:422
+#: src/away.c:435
 msgid "New Away Message"
 msgstr "New Away Message"
 
-#: src/away.c:638
+#: src/away.c:651
 msgid "Set All Away"
 msgstr "Set All Away"
 
-#: src/away.c:745
+#: src/away.c:758
 msgid "You cannot save an away message with a blank title"
 msgstr "You cannot save an away message with a blank title"
 
-#: src/away.c:747
+#: src/away.c:760
 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/away.c:757
+#: src/away.c:770
 msgid "You cannot create an empty away message"
 msgstr "You cannot create an empty away message"
 
-#: src/away.c:822
+#: src/away.c:835
 msgid "New away message"
 msgstr "New away message"
 
-#: src/away.c:837
+#: src/away.c:850
 msgid "Away title: "
 msgstr "Away title: "
 
-#: src/away.c:893
+#: src/away.c:898
 msgid "_Save"
 msgstr "_Save"
 
-#: src/away.c:897
+#: src/away.c:902
 msgid "Sa_ve & Use"
 msgstr "Sa_ve & Use"
 
-#: src/away.c:901
+#: src/away.c:906
 msgid "_Use"
 msgstr "_Use"
 
@@ -1646,7 +1405,7 @@
 msgid "Chats"
 msgstr "Chats"
 
-#: src/blist.c:1317
+#: src/blist.c:1337
 #, c-format
 msgid ""
 "%d buddy from group %s was not removed because its account was not logged "
@@ -1661,11 +1420,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:1326
+#: src/blist.c:1346
 msgid "Group not removed"
 msgstr "Group not removed"
 
-#: src/blist.c:2029
+#: src/blist.c:2043
 msgid ""
 "An error was encountered parsing your buddy list.  It has not been loaded, "
 "and the old file has moved to blist.xml~."
@@ -1673,7 +1432,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:2032
+#: src/blist.c:2046
 msgid "Buddy List Error"
 msgstr "Buddy List Error"
 
@@ -1691,9 +1450,9 @@
 msgstr "Connection Error"
 
 #: src/connection.c:195
-#, fuzzy, c-format
+#, c-format
 msgid "Enter password for %s (%s)"
-msgstr "Enter password for %s"
+msgstr "Enter password for %s (%s)"
 
 #: src/conversation.c:229
 msgid "Unable to send message. The message is too large."
@@ -1751,7 +1510,7 @@
 msgid "Separate IM and Chat windows"
 msgstr "Separate IM and Chat windows"
 
-#: src/conversation.c:2578 src/gtkprefs.c:1377
+#: src/conversation.c:2578 src/gtkprefs.c:1384
 msgid "New window"
 msgstr "New window"
 
@@ -1763,25 +1522,57 @@
 msgid "By account"
 msgstr "By account"
 
-#: src/ft.c:125
-msgid "That file does not exist."
-msgstr "That file does not exist."
-
-#: src/ft.c:134
+#: src/ft.c:122
+#, c-format
+msgid ""
+"Error reading %s: \n"
+"%s.\n"
+msgstr ""
+"Error reading %s: \n"
+"%s.\n"
+
+#: src/ft.c:126
+#, c-format
+msgid ""
+"Error writing %s: \n"
+"%s.\n"
+msgstr ""
+"Error writing %s: \n"
+"%s.\n"
+
+#: src/ft.c:130
+#, c-format
+msgid ""
+"Error accessing %s: \n"
+"%s.\n"
+msgstr ""
+"Error accessing %s: \n"
+"%s.\n"
+
+#: src/ft.c:161
 msgid "Cannot send a file of 0 bytes."
 msgstr "Cannot send a file of 0 bytes."
 
-#: src/ft.c:194
+#: src/ft.c:171
+msgid "Cannot send a directory."
+msgstr "Cannot send a directory."
+
+#: src/ft.c:178
+#, c-format
+msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
+msgstr "%s is not a regular file. Cowardly refusing to overwrite it.\n"
+
+#: src/ft.c:232
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s wants to send you %s (%s)"
 
-#: src/ft.c:229
+#: src/ft.c:267
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "Accept file transfer request from %s?"
 
-#: src/ft.c:233
+#: src/ft.c:271
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -1792,22 +1583,22 @@
 "Remote host: %s\n"
 "Remote port: %d"
 
-#: src/ft.c:285
+#: src/ft.c:322
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s is not a valid filename.\n"
 
-#: src/ft.c:298
-#, c-format
-msgid "%s was not found.\n"
-msgstr "%s was not found.\n"
-
-#: src/ft.c:927
+#: src/ft.c:898
+#, c-format
+msgid "%s canceled the transfer of %s"
+msgstr "%s cancelled the transfer of %s"
+
+#: src/ft.c:948
 #, c-format
 msgid "File transfer to %s aborted.\n"
 msgstr "File transfer to %s aborted.\n"
 
-#: src/ft.c:929
+#: src/ft.c:950
 #, c-format
 msgid "File transfer from %s aborted.\n"
 msgstr "File transfer from %s aborted.\n"
@@ -1820,7 +1611,7 @@
 msgid "Size of the expander arrow"
 msgstr "Size of the expander arrow"
 
-#: src/gaim-remote.c:65
+#: src/gaim-remote.c:108
 #, c-format
 msgid ""
 "Usage: %s command [OPTIONS] [URI]\n"
@@ -1847,12 +1638,15 @@
 "    OPTIONS:\n"
 "       -h, --help [command]     Show help for command\n"
 
-#: src/gaim-remote.c:174 src/gaim-remote.c:190 src/gaim-remote.c:206
-#: src/gaim-remote.c:222
-msgid "Gaim not running (on session 0)\n"
-msgstr "Gaim not running (on session 0)\n"
-
-#: src/gaim-remote.c:236
+#: src/gaim-remote.c:185 src/gaim-remote.c:203
+msgid ""
+"Gaim not running (on session 0)\n"
+"Is the \"Remote Control\" plugin loaded?\n"
+msgstr ""
+"Gaim not running (on session 0)\n"
+"Is the \"Remote Control\" plugin loaded?\n"
+
+#: src/gaim-remote.c:219
 msgid ""
 "\n"
 "Using AIM: URIs:\n"
@@ -1894,7 +1688,7 @@
 "\tgaim-remote uri 'aim:addbuddy?screenname=Penguin'\n"
 "...prompts you to add 'Penguin' to your buddy list.\n"
 
-#: src/gaim-remote.c:256
+#: src/gaim-remote.c:239
 msgid ""
 "\n"
 "Close running copy of Gaim\n"
@@ -1902,19 +1696,23 @@
 "\n"
 "Close running copy of Gaim\n"
 
-#: src/gaim-remote.c:260
+#: src/gaim-remote.c:243
 msgid ""
 "\n"
 "Mark all accounts as \"away\" with the default message.\n"
 msgstr ""
-
-#: src/gaim-remote.c:264
+"\n"
+"Mark all accounts as \"away\" with the default message.\n"
+
+#: src/gaim-remote.c:247
 msgid ""
 "\n"
 "Set all accounts as not away.\n"
 msgstr ""
-
-#: src/gtkaccount.c:324
+"\n"
+"Set all accounts as not away.\n"
+
+#: src/gtkaccount.c:325
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -1926,164 +1724,164 @@
 "<b>Image size:</b> %dx%d"
 
 #. Build the login options frame.
-#: src/gtkaccount.c:624
+#: src/gtkaccount.c:625
 msgid "Login Options"
 msgstr "Login Options"
 
-#: src/gtkaccount.c:641
+#: src/gtkaccount.c:642 src/gtkft.c:555
 msgid "Protocol:"
 msgstr "Protocol:"
 
-#: src/gtkaccount.c:646 src/gtkblist.c:4014
+#: src/gtkaccount.c:647 src/gtkblist.c:4010
 msgid "Screen Name:"
 msgstr "Screen Name:"
 
-#: src/gtkaccount.c:719
+#: src/gtkaccount.c:720
 msgid "Password:"
 msgstr "Password:"
 
-#: src/gtkaccount.c:724 src/gtkblist.c:4028 src/gtkblist.c:4356
+#: src/gtkaccount.c:725 src/gtkblist.c:4024 src/gtkblist.c:4362
 msgid "Alias:"
 msgstr "Alias:"
 
-#: src/gtkaccount.c:728
+#: src/gtkaccount.c:729
 msgid "Remember password"
 msgstr "Remember password"
 
 #. Build the user options frame.
-#: src/gtkaccount.c:784
+#: src/gtkaccount.c:785
 msgid "User Options"
 msgstr "User Options"
 
-#: src/gtkaccount.c:797
+#: src/gtkaccount.c:798
 msgid "New mail notifications"
 msgstr "New mail notifications"
 
-#: src/gtkaccount.c:806
+#: src/gtkaccount.c:807
 msgid "Buddy icon:"
 msgstr "Buddy icon:"
 
 #. Build the protocol options frame.
-#: src/gtkaccount.c:895
+#: src/gtkaccount.c:896
 #, c-format
 msgid "%s Options"
 msgstr "%s Options"
 
 #. Use Global Proxy Settings
-#: src/gtkaccount.c:1031 src/gtkaccount.c:1078
+#: src/gtkaccount.c:1032 src/gtkaccount.c:1079
 msgid "Use Global Proxy Settings"
 msgstr "Use Global Proxy Settings"
 
 #. No Proxy
-#: src/gtkaccount.c:1037 src/gtkaccount.c:1085
+#: src/gtkaccount.c:1038 src/gtkaccount.c:1086
 msgid "No Proxy"
 msgstr "No Proxy"
 
 #. HTTP
-#: src/gtkaccount.c:1043 src/gtkaccount.c:1092
+#: src/gtkaccount.c:1044 src/gtkaccount.c:1093
 msgid "HTTP"
 msgstr "HTTP"
 
 #. SOCKS 4
-#: src/gtkaccount.c:1049 src/gtkaccount.c:1099
+#: src/gtkaccount.c:1050 src/gtkaccount.c:1100
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
 #. SOCKS 5
-#: src/gtkaccount.c:1055 src/gtkaccount.c:1106
+#: src/gtkaccount.c:1056 src/gtkaccount.c:1107
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:1061 src/gtkaccount.c:1113 src/gtkprefs.c:1180
+#: src/gtkaccount.c:1062 src/gtkaccount.c:1114 src/gtkprefs.c:1187
 msgid "Use Environmental Settings"
 msgstr "Use Environmental Settings"
 
-#: src/gtkaccount.c:1152
+#: src/gtkaccount.c:1153
 msgid "you can see the butterflies mating"
 msgstr "you can see the butterflies mating"
 
-#: src/gtkaccount.c:1156
+#: src/gtkaccount.c:1157
 msgid "If you look real closely"
 msgstr "If you look real closely"
 
-#: src/gtkaccount.c:1172
+#: src/gtkaccount.c:1173
 msgid "Proxy Options"
 msgstr "Proxy Options"
 
-#: src/gtkaccount.c:1190 src/gtkprefs.c:1174
+#: src/gtkaccount.c:1191 src/gtkprefs.c:1181
 msgid "Proxy _type:"
 msgstr "Proxy _type:"
 
-#: src/gtkaccount.c:1199 src/gtkprefs.c:1201
+#: src/gtkaccount.c:1200 src/gtkprefs.c:1208
 msgid "_Host:"
 msgstr "_Host:"
 
-#: src/gtkaccount.c:1203 src/gtkprefs.c:1219
+#: src/gtkaccount.c:1204 src/gtkprefs.c:1226
 msgid "_Port:"
 msgstr "_Port:"
 
-#: src/gtkaccount.c:1211
+#: src/gtkaccount.c:1212
 msgid "_Username:"
 msgstr "_Username:"
 
-#: src/gtkaccount.c:1216 src/gtkprefs.c:1256
+#: src/gtkaccount.c:1217 src/gtkprefs.c:1263
 msgid "Pa_ssword:"
 msgstr "Pa_ssword:"
 
-#: src/gtkaccount.c:1584
+#: src/gtkaccount.c:1585
 msgid "Add Account"
 msgstr "Add Account"
 
-#: src/gtkaccount.c:1586
+#: src/gtkaccount.c:1587
 msgid "Modify Account"
 msgstr "Modify Account"
 
 #. Add the disclosure
-#: src/gtkaccount.c:1610
+#: src/gtkaccount.c:1611
 msgid "Show more options"
 msgstr "Show more options"
 
-#: src/gtkaccount.c:1611
+#: src/gtkaccount.c:1612
 msgid "Show fewer options"
 msgstr "Show fewer options"
 
 #. Register button
-#: src/gtkaccount.c:1638 src/protocols/jabber/jabber.c:666
+#: src/gtkaccount.c:1639 src/protocols/jabber/jabber.c:666
 msgid "Register"
 msgstr "Register"
 
-#: src/gtkaccount.c:2003
+#: src/gtkaccount.c:2004
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Are you sure you want to delete %s?"
 
-#: src/gtkaccount.c:2007 src/gtkrequest.c:245
+#: src/gtkaccount.c:2009 src/gtkrequest.c:246
 msgid "Delete"
 msgstr "Delete"
 
-#: src/gtkaccount.c:2121 src/protocols/oscar/oscar.c:4000
+#: src/gtkaccount.c:2123 src/protocols/oscar/oscar.c:4114
 msgid "Screen Name"
 msgstr "Screen Name"
 
-#: src/gtkaccount.c:2145 src/protocols/jabber/jabber.c:958
-#: src/protocols/oscar/oscar.c:520 src/protocols/oscar/oscar.c:5494
-#: src/protocols/oscar/oscar.c:6701 src/protocols/silc/silc.c:44
-#: src/protocols/yahoo/yahoo.c:2558 src/protocols/zephyr/zephyr.c:1362
-#: src/protocols/zephyr/zephyr.c:1374
+#: src/gtkaccount.c:2147 src/protocols/jabber/jabber.c:958
+#: src/protocols/oscar/oscar.c:654 src/protocols/oscar/oscar.c:5568
+#: src/protocols/oscar/oscar.c:6757 src/protocols/silc/silc.c:44
+#: src/protocols/yahoo/yahoo.c:2567 src/protocols/zephyr/zephyr.c:1365
+#: src/protocols/zephyr/zephyr.c:1377
 msgid "Online"
 msgstr "Online"
 
-#: src/gtkaccount.c:2166
+#: src/gtkaccount.c:2168
 msgid "Protocol"
 msgstr "Protocol"
 
-#: src/gtkaccount.c:2479
+#: src/gtkaccount.c:2481
 #, 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:2493
+#: src/gtkaccount.c:2495
 msgid ""
 "\n"
 "\n"
@@ -2093,27 +1891,27 @@
 "\n"
 "Do you wish to add him or her to your buddy list?"
 
-#: src/gtkaccount.c:2497
+#: src/gtkaccount.c:2499
 msgid "Information"
 msgstr "Information"
 
-#: src/gtkaccount.c:2501
+#: src/gtkaccount.c:2503
 msgid "Add buddy to your list?"
 msgstr "Add buddy to your list?"
 
 #. Add button
-#: src/gtkaccount.c:2503 src/gtkblist.c:4407 src/gtkconv.c:1380
-#: src/gtkconv.c:3714 src/gtkconv.c:3818 src/gtkrequest.c:246
-#: src/protocols/icq/gaim_icq.c:276 src/protocols/oscar/oscar.c:3628
-#: src/protocols/silc/chat.c:581
+#: src/gtkaccount.c:2505 src/gtkblist.c:4413 src/gtkconv.c:1402
+#: src/gtkconv.c:3736 src/gtkconv.c:3807 src/gtkrequest.c:247
+#: src/protocols/icq/gaim_icq.c:276 src/protocols/oscar/oscar.c:3741
+#: src/protocols/silc/chat.c:593
 msgid "Add"
 msgstr "Add"
 
-#: src/gtkblist.c:802
+#: src/gtkblist.c:792
 msgid "Join a Chat"
 msgstr "Join a Chat"
 
-#: src/gtkblist.c:823
+#: src/gtkblist.c:813
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
@@ -2121,19 +1919,19 @@
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 
-#: src/gtkblist.c:834 src/gtkpounce.c:410 src/gtkroomlist.c:353
+#: src/gtkblist.c:824 src/gtkpounce.c:411 src/gtkroomlist.c:354
 msgid "_Account:"
 msgstr "_Account:"
 
-#: src/gtkblist.c:1122 src/gtkblist.c:3200
+#: src/gtkblist.c:1119 src/gtkblist.c:3196
 msgid "Get _Info"
 msgstr "Get _Info"
 
-#: src/gtkblist.c:1125 src/gtkblist.c:3190
+#: src/gtkblist.c:1122 src/gtkblist.c:3186
 msgid "I_M"
 msgstr "I_M"
 
-#: src/gtkblist.c:1130
+#: src/gtkblist.c:1128
 msgid "_Send File"
 msgstr "_Send File"
 
@@ -2145,12 +1943,12 @@
 msgid "View _Log"
 msgstr "View _Log"
 
-#: src/gtkblist.c:1144 src/gtkblist.c:1230 src/gtkblist.c:1244
+#: src/gtkblist.c:1145 src/gtkblist.c:1226 src/gtkblist.c:1240
 msgid "_Alias..."
 msgstr "_Alias..."
 
-#: src/gtkblist.c:1146 src/gtkblist.c:1232 src/gtkblist.c:1249
-#: src/gtkconn.c:360
+#: src/gtkblist.c:1147 src/gtkblist.c:1228 src/gtkblist.c:1245
+#: src/gtkconn.c:361
 msgid "_Remove"
 msgstr "_Remove"
 
@@ -2171,153 +1969,153 @@
 msgstr "_Rename"
 
 #. join button
-#: src/gtkblist.c:1220 src/gtkroomlist.c:263 src/gtkroomlist.c:408
-#: src/stock.c:87
+#: src/gtkblist.c:1216 src/gtkroomlist.c:264 src/gtkroomlist.c:409
+#: src/stock.c:88
 msgid "_Join"
 msgstr "_Join"
 
-#: src/gtkblist.c:1222
+#: src/gtkblist.c:1218
 msgid "Auto-Join"
 msgstr "Auto-Join"
 
-#: src/gtkblist.c:1246 src/gtkblist.c:1275
+#: src/gtkblist.c:1242 src/gtkblist.c:1267
 msgid "_Collapse"
 msgstr "_Collapse"
 
-#: src/gtkblist.c:1280
+#: src/gtkblist.c:1272
 msgid "_Expand"
 msgstr "_Expand"
 
-#: src/gtkblist.c:1938 src/gtkconv.c:4405 src/gtkpounce.c:313
+#: src/gtkblist.c:1919 src/gtkconv.c:4379 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:2322
+#: src/gtkblist.c:2316
 msgid "/_Buddies"
 msgstr "/_Buddies"
 
-#: src/gtkblist.c:2323
+#: src/gtkblist.c:2317
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Buddies/New Instant _Message..."
 
-#: src/gtkblist.c:2324
+#: src/gtkblist.c:2318
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Buddies/Join a _Chat..."
 
-#: src/gtkblist.c:2325
+#: src/gtkblist.c:2319
 msgid "/Buddies/Get User _Info..."
 msgstr "/Buddies/Get User _Info..."
 
-#: src/gtkblist.c:2326
+#: src/gtkblist.c:2320
 msgid "/Buddies/View User _Log..."
 msgstr "/Buddies/View User _Log..."
 
-#: src/gtkblist.c:2328
+#: src/gtkblist.c:2322
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Buddies/Show _Offline Buddies"
 
-#: src/gtkblist.c:2329
+#: src/gtkblist.c:2323
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Buddies/Show _Empty Groups"
 
-#: src/gtkblist.c:2330
+#: src/gtkblist.c:2324
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Buddies/_Add Buddy..."
 
-#: src/gtkblist.c:2331
+#: src/gtkblist.c:2325
 msgid "/Buddies/Add C_hat..."
 msgstr "/Buddies/Add C_hat..."
 
-#: src/gtkblist.c:2332
+#: src/gtkblist.c:2326
 msgid "/Buddies/Add _Group..."
 msgstr "/Buddies/Add _Group..."
 
-#: src/gtkblist.c:2334
+#: src/gtkblist.c:2328
 msgid "/Buddies/_Signoff"
 msgstr "/Buddies/_Signoff"
 
-#: src/gtkblist.c:2335
+#: src/gtkblist.c:2329
 msgid "/Buddies/_Quit"
 msgstr "/Buddies/_Quit"
 
 #. Tools
-#: src/gtkblist.c:2338
+#: src/gtkblist.c:2332
 msgid "/_Tools"
 msgstr "/_Tools"
 
-#: src/gtkblist.c:2339
+#: src/gtkblist.c:2333
 msgid "/Tools/_Away"
 msgstr "/Tools/_Away"
 
+#: src/gtkblist.c:2334
+msgid "/Tools/Buddy _Pounce"
+msgstr "/Tools/Buddy _Pounce"
+
+#: src/gtkblist.c:2335
+msgid "/Tools/Account Ac_tions"
+msgstr "/Tools/Account Ac_tions"
+
+#: src/gtkblist.c:2336
+msgid "/Tools/Pl_ugin Actions"
+msgstr "/Tools/Pl_ugin Actions"
+
+#: src/gtkblist.c:2338
+msgid "/Tools/A_ccounts"
+msgstr "/Tools/A_ccounts"
+
+#: src/gtkblist.c:2339
+msgid "/Tools/_File Transfers"
+msgstr "/Tools/_File Transfers"
+
 #: src/gtkblist.c:2340
-msgid "/Tools/Buddy _Pounce"
-msgstr "/Tools/Buddy _Pounce"
+msgid "/Tools/R_oom List"
+msgstr "/Tools/R_oom List"
 
 #: src/gtkblist.c:2341
-msgid "/Tools/Account Ac_tions"
-msgstr "/Tools/Account Ac_tions"
+msgid "/Tools/Pr_eferences"
+msgstr "/Tools/Pr_eferences"
 
 #: src/gtkblist.c:2342
-msgid "/Tools/Pl_ugin Actions"
-msgstr "/Tools/Pl_ugin Actions"
+msgid "/Tools/Pr_ivacy"
+msgstr "/Tools/Pr_ivacy"
 
 #: src/gtkblist.c:2344
-msgid "/Tools/A_ccounts"
-msgstr "/Tools/A_ccounts"
-
-#: src/gtkblist.c:2345
-msgid "/Tools/_File Transfers"
-msgstr "/Tools/_File Transfers"
-
-#: src/gtkblist.c:2346
-msgid "/Tools/R_oom List"
-msgstr "/Tools/R_oom List"
-
-#: src/gtkblist.c:2347
-msgid "/Tools/Pr_eferences"
-msgstr "/Tools/Pr_eferences"
-
-#: src/gtkblist.c:2348
-msgid "/Tools/Pr_ivacy"
-msgstr "/Tools/Pr_ivacy"
-
-#: src/gtkblist.c:2350
 msgid "/Tools/View System _Log"
 msgstr "/Tools/View System _Log"
 
 #. Help
-#: src/gtkblist.c:2353
+#: src/gtkblist.c:2347
 msgid "/_Help"
 msgstr "/_Help"
 
-#: src/gtkblist.c:2354
+#: src/gtkblist.c:2348
 msgid "/Help/Online _Help"
 msgstr "/Help/Online _Help"
 
-#: src/gtkblist.c:2355
+#: src/gtkblist.c:2349
 msgid "/Help/_Debug Window"
 msgstr "/Help/_Debug Window"
 
-#: src/gtkblist.c:2356
+#: src/gtkblist.c:2350
 msgid "/Help/_About"
 msgstr "/Help/_About"
 
-#: src/gtkblist.c:2374
+#: src/gtkblist.c:2368
 msgid "Rename Group"
 msgstr "Rename Group"
 
-#: src/gtkblist.c:2374
+#: src/gtkblist.c:2368
 msgid "New group name"
 msgstr "New group name"
 
-#: src/gtkblist.c:2375
+#: src/gtkblist.c:2369
 msgid "Please enter a new name for the selected group."
 msgstr "Please enter a new name for the selected group."
 
-#: src/gtkblist.c:2403
+#: src/gtkblist.c:2397
 #, c-format
 msgid ""
 "\n"
@@ -2326,7 +2124,7 @@
 "\n"
 "<b>Account:</b> %s"
 
-#: src/gtkblist.c:2467
+#: src/gtkblist.c:2461
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
@@ -2334,12 +2132,12 @@
 "\n"
 "<b>Status:</b> Offline"
 
-#: src/gtkblist.c:2482
+#: src/gtkblist.c:2476
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:2498
+#: src/gtkblist.c:2492
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -2347,7 +2145,7 @@
 "\n"
 "<b>Account:</b>"
 
-#: src/gtkblist.c:2499
+#: src/gtkblist.c:2493
 msgid ""
 "\n"
 "<b>Contact Alias:</b>"
@@ -2355,7 +2153,7 @@
 "\n"
 "<b>Contact Alias:</b>"
 
-#: src/gtkblist.c:2500
+#: src/gtkblist.c:2494
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -2363,7 +2161,7 @@
 "\n"
 "<b>Alias:</b>"
 
-#: src/gtkblist.c:2501
+#: src/gtkblist.c:2495
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -2371,7 +2169,7 @@
 "\n"
 "<b>Nickname:</b>"
 
-#: src/gtkblist.c:2502
+#: src/gtkblist.c:2496
 msgid ""
 "\n"
 "<b>Logged In:</b>"
@@ -2379,7 +2177,7 @@
 "\n"
 "<b>Logged In:</b>"
 
-#: src/gtkblist.c:2503
+#: src/gtkblist.c:2497
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -2387,7 +2185,7 @@
 "\n"
 "<b>Idle:</b>"
 
-#: src/gtkblist.c:2504
+#: src/gtkblist.c:2498
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -2395,7 +2193,7 @@
 "\n"
 "<b>Warned:</b>"
 
-#: src/gtkblist.c:2506
+#: src/gtkblist.c:2500
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2403,7 +2201,7 @@
 "\n"
 "<b>Description:</b> Spooky"
 
-#: src/gtkblist.c:2507
+#: src/gtkblist.c:2501
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
@@ -2411,7 +2209,7 @@
 "\n"
 "<b>Status</b>: Awesome"
 
-#: src/gtkblist.c:2508
+#: src/gtkblist.c:2502
 msgid ""
 "\n"
 "<b>Status</b>: Rockin'"
@@ -2419,108 +2217,108 @@
 "\n"
 "<b>Status</b>: Rockin'"
 
-#: src/gtkblist.c:2790
+#: src/gtkblist.c:2784
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "Idle (%dh%02dm) "
 
-#: src/gtkblist.c:2792
+#: src/gtkblist.c:2786
 #, c-format
 msgid "Idle (%dm) "
 msgstr "Idle (%dm) "
 
-#: src/gtkblist.c:2797
+#: src/gtkblist.c:2791
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "Warned (%d%%) "
 
-#: src/gtkblist.c:2800
+#: src/gtkblist.c:2794
 msgid "Offline "
 msgstr "Offline "
 
 #. Make menu items sensitive/insensitive where appropriate
-#: src/gtkblist.c:2918
+#: src/gtkblist.c:2912
 msgid "/Buddies/Join a Chat..."
 msgstr "/Buddies/Join a Chat..."
 
-#: src/gtkblist.c:2921
+#: src/gtkblist.c:2915
 msgid "/Tools/Room List"
 msgstr "/Tools/Room List"
 
-#: src/gtkblist.c:2924
+#: src/gtkblist.c:2918
 msgid "/Tools/Privacy"
 msgstr "/Tools/Privacy"
 
-#: src/gtkblist.c:3005
+#: src/gtkblist.c:3000
 msgid "Alphabetical"
 msgstr "Alphabetical"
 
-#: src/gtkblist.c:3006
+#: src/gtkblist.c:3001
 msgid "By status"
 msgstr "By status"
 
-#: src/gtkblist.c:3007
+#: src/gtkblist.c:3002
 msgid "By log size"
 msgstr "By log size"
 
-#: src/gtkblist.c:3073
+#: src/gtkblist.c:3068
 msgid "/Tools/Away"
 msgstr "/Tools/Away"
 
-#: src/gtkblist.c:3076
+#: src/gtkblist.c:3071
 msgid "/Tools/Buddy Pounce"
 msgstr "/Tools/Buddy Pounce"
 
-#: src/gtkblist.c:3079
+#: src/gtkblist.c:3074
 msgid "/Tools/Account Actions"
 msgstr "/Tools/Account Actions"
 
-#: src/gtkblist.c:3082
+#: src/gtkblist.c:3077
 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:3170
+#: src/gtkblist.c:3165
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Buddies/Show Offline Buddies"
 
-#: src/gtkblist.c:3172
+#: src/gtkblist.c:3167
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Buddies/Show Empty Groups"
 
-#: src/gtkblist.c:3196
+#: src/gtkblist.c:3192
 msgid "Send a message to the selected buddy"
 msgstr "Send a message to the selected buddy"
 
+#: src/gtkblist.c:3202
+msgid "Get information on the selected buddy"
+msgstr "Get information on the selected buddy"
+
 #: src/gtkblist.c:3206
-msgid "Get information on the selected buddy"
-msgstr "Get information on the selected buddy"
-
-#: src/gtkblist.c:3210
 msgid "_Chat"
 msgstr "_Chat"
 
-#: src/gtkblist.c:3215
+#: src/gtkblist.c:3211
 msgid "Join a chat room"
 msgstr "Join a chat room"
 
-#: src/gtkblist.c:3220
+#: src/gtkblist.c:3216
 msgid "_Away"
 msgstr "_Away"
 
-#: src/gtkblist.c:3225
+#: src/gtkblist.c:3221
 msgid "Set an away message"
 msgstr "Set an away message"
 
-#: src/gtkblist.c:3968 src/protocols/silc/buddy.c:731
+#: src/gtkblist.c:3964 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:2725
+#: src/protocols/silc/buddy.c:1124 src/protocols/yahoo/yahoo.c:2734
 msgid "Add Buddy"
 msgstr "Add Buddy"
 
-#: src/gtkblist.c:3992
+#: src/gtkblist.c:3988
 msgid ""
 "Please enter the screen name of the person you would like to add to your "
 "buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
@@ -2531,11 +2329,15 @@
 "The alias will be displayed in place of the screen name whenever possible.\n"
 
 #. Set up stuff for the account box
-#: src/gtkblist.c:4052 src/gtkblist.c:4336
+#: src/gtkblist.c:4048 src/gtkblist.c:4342
 msgid "Account:"
 msgstr "Account:"
 
-#: src/gtkblist.c:4295
+#: src/gtkblist.c:4275
+msgid "This protocol does not support chat rooms."
+msgstr "This protocol does not support chat rooms."
+
+#: src/gtkblist.c:4291
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -2543,11 +2345,11 @@
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 
-#: src/gtkblist.c:4302
+#: src/gtkblist.c:4308
 msgid "Add Chat"
 msgstr "Add Chat"
 
-#: src/gtkblist.c:4326
+#: src/gtkblist.c:4332
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -2555,39 +2357,39 @@
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
 
-#: src/gtkblist.c:4404
+#: src/gtkblist.c:4410
 msgid "Add Group"
 msgstr "Add Group"
 
-#: src/gtkblist.c:4405
+#: src/gtkblist.c:4411
 msgid "Please enter the name of the group to be added."
 msgstr "Please enter the name of the group to be added."
 
-#: src/gtkblist.c:4972 src/gtkblist.c:5069
+#: src/gtkblist.c:4978 src/gtkblist.c:5075
 msgid "No actions available"
 msgstr "No actions available"
 
-#: src/gtkconn.c:78 src/gtkconn.c:249 src/gtkconn.c:260
+#: src/gtkconn.c:79 src/gtkconn.c:250 src/gtkconn.c:261
 msgid "Done."
 msgstr "Done."
 
-#: src/gtkconn.c:157
+#: src/gtkconn.c:158
 msgid "Signon: "
 msgstr "Signon: "
 
-#: src/gtkconn.c:203
+#: src/gtkconn.c:204
 msgid "Signon"
 msgstr "Signon"
 
-#: src/gtkconn.c:215
+#: src/gtkconn.c:216
 msgid "Cancel All"
 msgstr "Cancel All"
 
-#: src/gtkconn.c:360 src/gtkconn.c:592
+#: src/gtkconn.c:361 src/gtkconn.c:593
 msgid "_Reconnect"
 msgstr "_Reconnect"
 
-#: src/gtkconn.c:556
+#: src/gtkconn.c:557
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">%s has been disconnected.</span>\n"
@@ -2600,32 +2402,32 @@
 "%s\n"
 "%s"
 
-#: src/gtkconn.c:558
+#: src/gtkconn.c:559
 msgid "Reason Unknown."
 msgstr "Reason Unknown."
 
-#: src/gtkconn.c:597
+#: src/gtkconn.c:598
 msgid "Reconnect _All"
 msgstr "Reconnect _All"
 
-#: src/gtkconn.c:627
+#: src/gtkconn.c:628
 msgid "Time"
 msgstr "Time"
 
-#: src/gtkconv.c:314
+#: src/gtkconv.c:327
 #, c-format
 msgid "me is using Gaim v%s."
 msgstr "me is using Gaim v%s."
 
-#: src/gtkconv.c:323
+#: src/gtkconv.c:336
 msgid "Supported debug options are:  version"
 msgstr "Supported debug options are:  version"
 
-#: src/gtkconv.c:347
+#: src/gtkconv.c:360
 msgid "No such command (in this context)."
 msgstr "No such command (in this context)."
 
-#: src/gtkconv.c:350
+#: src/gtkconv.c:363
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -2633,48 +2435,37 @@
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
 
-#: 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\" "
-"commands."
-msgstr ""
-"No such command. If you didn't mean to type a command, you can turn commands "
-"off from Tools->Preferences->Interface->Conversation->Enable \"slash\" "
-"commands."
+#: src/gtkconv.c:435
+msgid "No such command."
+msgstr "No such command."
 
 #: 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-"
-">Preferences->Interface->Conversation->Enable \"slash\" commands."
-msgstr ""
-"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-"
-">Preferences->Interface->Conversation->Enable \"slash\" commands."
-
-#: src/gtkconv.c:449
+msgid "Syntax Error:  You typed the wrong number of arguments to that command."
+msgstr ""
+"Syntax Error:  You typed the wrong number of arguments to that command."
+
+#: src/gtkconv.c:447
 msgid "Your command failed for an unknown reason."
 msgstr "Your command failed for an unknown reason."
 
-#: src/gtkconv.c:456
+#: src/gtkconv.c:454
 msgid "That command only works in Chats, not IMs."
 msgstr "That command only works in Chats, not IMs."
 
-#: src/gtkconv.c:459
+#: src/gtkconv.c:457
 msgid "That command only works in IMs, not Chats."
 msgstr "That command only works in IMs, not Chats."
 
-#: src/gtkconv.c:463
+#: src/gtkconv.c:461
 msgid "That command doesn't work on this protocol."
 msgstr "That command doesn't work on this protocol."
 
-#: src/gtkconv.c:685
+#: src/gtkconv.c:707
 msgid "Invite Buddy Into Chat Room"
 msgstr "Invite Buddy Into Chat Room"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:713
+#: src/gtkconv.c:735
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -2682,347 +2473,359 @@
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 
-#: src/gtkconv.c:734
+#: src/gtkconv.c:756
 msgid "_Buddy:"
 msgstr "_Buddy:"
 
-#: src/gtkconv.c:754
+#: src/gtkconv.c:776
 msgid "_Message:"
 msgstr "_Message:"
 
-#: src/gtkconv.c:791 src/gtkconv.c:2475 src/gtkdebug.c:181
+#: src/gtkconv.c:813 src/gtkconv.c:2498 src/gtkdebug.c:182
 msgid "Unable to open file."
 msgstr "Unable to read file."
 
-#: src/gtkconv.c:796
+#: src/gtkconv.c:818
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Conversation with %s</h1>\n"
 
-#: src/gtkconv.c:810
+#: src/gtkconv.c:832
 msgid "Save Conversation"
 msgstr "Save Conversation"
 
-#: src/gtkconv.c:887 src/gtkdebug.c:130
+#: src/gtkconv.c:909 src/gtkdebug.c:131
 msgid "Find"
 msgstr "Find"
 
-#: src/gtkconv.c:913 src/gtkdebug.c:158
+#: src/gtkconv.c:935 src/gtkdebug.c:159
 msgid "_Search for:"
 msgstr "_Search for:"
 
-#: src/gtkconv.c:1328
+#: src/gtkconv.c:1350
 msgid "IM"
 msgstr "IM"
 
 #. Send File button
-#: src/gtkconv.c:1337 src/gtkconv.c:3707 src/protocols/oscar/oscar.c:435
+#: src/gtkconv.c:1359 src/gtkconv.c:3729 src/protocols/oscar/oscar.c:569
 msgid "Send File"
 msgstr "Send File"
 
-#: src/gtkconv.c:1346
+#: src/gtkconv.c:1368
 msgid "Un-Ignore"
 msgstr "Un-Ignore"
 
-#: src/gtkconv.c:1348 src/gtkprefs.c:825
+#: src/gtkconv.c:1370 src/gtkprefs.c:828
 msgid "Ignore"
 msgstr "Ignore"
 
 #. Info button
-#: src/gtkconv.c:1357 src/gtkconv.c:3728
+#: src/gtkconv.c:1379 src/gtkconv.c:3750
 msgid "Info"
 msgstr "Info"
 
-#: src/gtkconv.c:1366
+#: src/gtkconv.c:1388
 msgid "Get Away Msg"
 msgstr "Get Away Msg"
 
-#: src/gtkconv.c:2483
+#: src/gtkconv.c:2506
 msgid "Unable to save icon file to disk."
 msgstr "Unable to save icon file to disk."
 
-#: src/gtkconv.c:2504
+#: src/gtkconv.c:2527
 msgid "Save Icon"
 msgstr "Save Icon"
 
-#: src/gtkconv.c:2534
+#: src/gtkconv.c:2557
 msgid "Animate"
 msgstr "Animate"
 
-#: src/gtkconv.c:2539
+#: src/gtkconv.c:2562
 msgid "Hide Icon"
 msgstr "Hide Icon"
 
-#: src/gtkconv.c:2545
+#: src/gtkconv.c:2568
 msgid "Save Icon As..."
 msgstr "Save Icon As..."
 
-#: src/gtkconv.c:2929
+#: src/gtkconv.c:2938
 msgid "User is typing..."
 msgstr "User is typing..."
 
-#: src/gtkconv.c:2937
+#: src/gtkconv.c:2946
 msgid "User has typed something and paused"
 msgstr "User has typed something and paused"
 
 #. Build the Send As menu
-#: src/gtkconv.c:3040
+#: src/gtkconv.c:3049
 msgid "_Send As"
 msgstr "_Send As"
 
 #. Conversation menu
-#: src/gtkconv.c:3491
+#: src/gtkconv.c:3500
 msgid "/_Conversation"
 msgstr "/_Conversation"
 
-#: src/gtkconv.c:3493
+#: src/gtkconv.c:3502
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Conversation/New Instant _Message..."
 
-#: src/gtkconv.c:3498
+#: src/gtkconv.c:3507
 msgid "/Conversation/_Find..."
 msgstr "/Conversation/_Find..."
 
-#: src/gtkconv.c:3500
+#: src/gtkconv.c:3509
 msgid "/Conversation/View _Log"
 msgstr "/Conversation/View _Log"
 
-#: src/gtkconv.c:3501
+#: src/gtkconv.c:3510
 msgid "/Conversation/_Save As..."
 msgstr "/Conversation/_Save As..."
 
-#: src/gtkconv.c:3503
+#: src/gtkconv.c:3512
 msgid "/Conversation/Clear"
 msgstr "/Conversation/Clear"
 
-#: src/gtkconv.c:3507
+#: src/gtkconv.c:3516
 msgid "/Conversation/Se_nd File..."
 msgstr "/Conversation/Se_nd File..."
 
-#: src/gtkconv.c:3508
+#: src/gtkconv.c:3517
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Conversation/Add Buddy _Pounce..."
 
-#: src/gtkconv.c:3510
+#: src/gtkconv.c:3519
 msgid "/Conversation/_Get Info"
 msgstr "/Conversation/_Get Info"
 
-#: src/gtkconv.c:3512
+#: src/gtkconv.c:3521
 msgid "/Conversation/_Warn..."
 msgstr "/Conversation/_Warn..."
 
-#: src/gtkconv.c:3514
-msgid "/Conversation/In_vite..."
-msgstr "/Conversation/In_vite..."
-
-#: src/gtkconv.c:3519
-msgid "/Conversation/A_lias..."
-msgstr "/Conversation/A_lias..."
-
-#: src/gtkconv.c:3521
-msgid "/Conversation/_Block..."
-msgstr "/Conversation/_Block..."
-
 #: src/gtkconv.c:3523
-msgid "/Conversation/_Add..."
-msgstr "/Conversation/_Add..."
-
-#: src/gtkconv.c:3525
-msgid "/Conversation/_Remove..."
-msgstr "/Conversation/_Remove..."
+msgid "/Conversation/In_vite..."
+msgstr "/Conversation/In_vite..."
+
+#: src/gtkconv.c:3528
+msgid "/Conversation/A_lias..."
+msgstr "/Conversation/A_lias..."
 
 #: src/gtkconv.c:3530
-msgid "/Conversation/Insert Lin_k..."
-msgstr "/Conversation/Insert Lin_k..."
+msgid "/Conversation/_Block..."
+msgstr "/Conversation/_Block..."
 
 #: src/gtkconv.c:3532
+msgid "/Conversation/_Add..."
+msgstr "/Conversation/_Add..."
+
+#: src/gtkconv.c:3534
+msgid "/Conversation/_Remove..."
+msgstr "/Conversation/_Remove..."
+
+#: src/gtkconv.c:3539
+msgid "/Conversation/Insert Lin_k..."
+msgstr "/Conversation/Insert Lin_k..."
+
+#: src/gtkconv.c:3541
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Conversation/Insert Imag_e..."
 
-#: src/gtkconv.c:3537
+#: src/gtkconv.c:3546
 msgid "/Conversation/_Close"
 msgstr "/Conversation/_Close"
 
 #. Options
-#: src/gtkconv.c:3541
+#: src/gtkconv.c:3550
 msgid "/_Options"
 msgstr "/_Options"
 
-#: src/gtkconv.c:3542
+#: src/gtkconv.c:3551
 msgid "/Options/Enable _Logging"
 msgstr "/Options/Enable _Logging"
 
-#: src/gtkconv.c:3543
+#: src/gtkconv.c:3552
 msgid "/Options/Enable _Sounds"
 msgstr "/Options/Enable _Sounds"
 
-#: src/gtkconv.c:3544
+#: src/gtkconv.c:3553
 msgid "/Options/Show Formatting _Toolbar"
 msgstr "/Options/Show Formatting _Toolbar"
 
-#: src/gtkconv.c:3545
+#: src/gtkconv.c:3554
 msgid "/Options/Show T_imestamps"
 msgstr "/Options/Show T_imestamps"
 
-#: src/gtkconv.c:3587
+#: src/gtkconv.c:3596
 msgid "/Conversation/View Log"
 msgstr "/Conversation/View Log"
 
-#: src/gtkconv.c:3592
+#: src/gtkconv.c:3601
 msgid "/Conversation/Send File..."
 msgstr "/Conversation/Send File..."
 
-#: src/gtkconv.c:3596
+#: src/gtkconv.c:3605
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversation/Add Buddy Pounce..."
 
-#: src/gtkconv.c:3602
+#: src/gtkconv.c:3611
 msgid "/Conversation/Get Info"
 msgstr "/Conversation/Get Info"
 
-#: src/gtkconv.c:3606
+#: src/gtkconv.c:3615
 msgid "/Conversation/Warn..."
 msgstr "/Conversation/Warn..."
 
-#: src/gtkconv.c:3610
+#: src/gtkconv.c:3619
 msgid "/Conversation/Invite..."
 msgstr "/Conversation/Invite..."
 
-#: src/gtkconv.c:3616
+#: src/gtkconv.c:3625
 msgid "/Conversation/Alias..."
 msgstr "/Conversation/Alias..."
 
-#: src/gtkconv.c:3620
+#: src/gtkconv.c:3629
 msgid "/Conversation/Block..."
 msgstr "/Conversation/Block..."
 
-#: src/gtkconv.c:3624
+#: src/gtkconv.c:3633
 msgid "/Conversation/Add..."
 msgstr "/Conversation/Add..."
 
-#: src/gtkconv.c:3628
+#: src/gtkconv.c:3637
 msgid "/Conversation/Remove..."
 msgstr "/Conversation/Remove..."
 
-#: src/gtkconv.c:3634
+#: src/gtkconv.c:3643
 msgid "/Conversation/Insert Link..."
 msgstr "/Conversation/Insert Link..."
 
-#: src/gtkconv.c:3638
-msgid "/Conversation/Insert Image..."
-msgstr "/Conversation/Insert Image..."
-
-#: src/gtkconv.c:3644
-msgid "/Options/Enable Logging"
-msgstr "/Options/Enable Logging"
-
 #: src/gtkconv.c:3647
+msgid "/Conversation/Insert Image..."
+msgstr "/Conversation/Insert Image..."
+
+#: src/gtkconv.c:3653
+msgid "/Options/Enable Logging"
+msgstr "/Options/Enable Logging"
+
+#: src/gtkconv.c:3656
 msgid "/Options/Enable Sounds"
 msgstr "/Options/Enable Sounds"
 
-#: src/gtkconv.c:3650
+#: src/gtkconv.c:3659
 msgid "/Options/Show Formatting Toolbar"
 msgstr "/Options/Show Formatting Toolbar"
 
-#: src/gtkconv.c:3653
+#: src/gtkconv.c:3662
 msgid "/Options/Show Timestamps"
 msgstr "/Options/Show Timestamps"
 
-#. From right to left...
-#. Send button
-#: src/gtkconv.c:3677 src/gtkconv.c:3679 src/gtkconv.c:3797 src/gtkconv.c:3799
-msgid "Send"
-msgstr "Send"
-
-#. Now, um, just kind of all over the place. Huh?
+#. The buttons, from left to right
 #. Warn button
-#: src/gtkconv.c:3693
+#: src/gtkconv.c:3715
 msgid "Warn"
 msgstr "Warn"
 
-#: src/gtkconv.c:3696
+#: src/gtkconv.c:3716
 msgid "Warn the user"
 msgstr "Warn the user"
 
 #. Block button
-#: src/gtkconv.c:3700 src/gtkprivacy.c:622 src/gtkprivacy.c:633
+#: src/gtkconv.c:3722 src/gtkprivacy.c:623 src/gtkprivacy.c:634
 msgid "Block"
 msgstr "Block"
 
-#: src/gtkconv.c:3703
+#: src/gtkconv.c:3723
 msgid "Block the user"
 msgstr "Block the user"
 
-#: src/gtkconv.c:3710
+#: src/gtkconv.c:3730
 msgid "Send a file to the user"
 msgstr "Send a file to the user"
 
-#: src/gtkconv.c:3717
+#: src/gtkconv.c:3737
 msgid "Add the user to your buddy list"
 msgstr "Add the user to your buddy list"
 
-#: src/gtkconv.c:3724
+#: src/gtkconv.c:3744
 msgid "Remove the user from your buddy list"
 msgstr "Remove the user from your buddy list"
 
-#: src/gtkconv.c:3731 src/gtkconv.c:4110
+#: src/gtkconv.c:3751 src/gtkconv.c:4086
 msgid "Get the user's information"
 msgstr "Get the user's information"
 
+#. Send button
+#: src/gtkconv.c:3757 src/gtkconv.c:3821
+msgid "Send"
+msgstr "Send"
+
+#: src/gtkconv.c:3758 src/gtkconv.c:3822
+msgid "Send message"
+msgstr "Send message"
+
+#. The buttons, from left to right
 #. Invite
-#: src/gtkconv.c:3811
+#: src/gtkconv.c:3800
 msgid "Invite"
 msgstr "Invite"
 
-#: src/gtkconv.c:3814
+#: src/gtkconv.c:3801
 msgid "Invite a user"
 msgstr "Invite a user"
 
-#: src/gtkconv.c:3821
+#: src/gtkconv.c:3808
 msgid "Add the chat to your buddy list"
 msgstr "Add the chat to your buddy list"
 
-#: src/gtkconv.c:3828
+#: src/gtkconv.c:3815
 msgid "Remove the chat from your buddy list"
 msgstr "Remove the chat from your buddy list"
 
-#: src/gtkconv.c:3963
+#: src/gtkconv.c:3939
 msgid "Topic:"
 msgstr "Topic:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:4026
+#: src/gtkconv.c:4002
 msgid "0 people in room"
 msgstr "0 people in room"
 
-#: src/gtkconv.c:4087
+#: src/gtkconv.c:4063
 msgid "IM the user"
 msgstr "IM the user"
 
-#: src/gtkconv.c:4099
+#: src/gtkconv.c:4075
 msgid "Ignore the user"
 msgstr "Ignore the user"
 
-#: src/gtkconv.c:4695
+#: src/gtkconv.c:4669
 msgid "Close conversation"
 msgstr "Close conversation"
 
-#: src/gtkconv.c:5228 src/gtkconv.c:5257 src/gtkconv.c:5353 src/gtkconv.c:5411
+#: src/gtkconv.c:5202 src/gtkconv.c:5231 src/gtkconv.c:5327 src/gtkconv.c:5385
 #, 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:5969 src/gtkconv.c:5972
+#: src/gtkconv.c:5950 src/gtkconv.c:5953
 msgid "<main>/Conversation/Close"
 msgstr "<main>/Conversation/Close"
 
-#: src/gtkconv.c:6344
+#: src/gtkconv.c:6325
+msgid ""
+"say &lt;message&gt;:  Send a message normally as if you weren't using a "
+"command."
+msgstr ""
+"say &lt;message&gt;:  Send a message normally as if you weren't using a "
+"command."
+
+#: src/gtkconv.c:6328
 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:6347
+#: src/gtkconv.c:6331
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -3030,67 +2833,299 @@
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 
-#: src/gtkconv.c:6351
+#: src/gtkconv.c:6335
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;command&gt;:  Help on a specific command."
 
-#: src/gtkdebug.c:196
+#: src/gtkdebug.c:197
 msgid "Save Debug Log"
 msgstr "Save Debug Log"
 
-#: src/gtkdebug.c:249
+#: src/gtkdebug.c:250
 msgid "Debug Window"
 msgstr "Debug Window"
 
-#: src/gtkdebug.c:287
+#: src/gtkdebug.c:288
 msgid "Pause"
 msgstr "Pause"
 
-#: src/gtkdebug.c:293
+#: src/gtkdebug.c:294
 msgid "Timestamps"
 msgstr "Timestamps"
 
-#: src/gtkdialogs.c:105 src/gtkdialogs.c:244 src/gtkdialogs.c:296
+#: src/gtkdialogs.c:63
+msgid "maintainer"
+msgstr "maintainer"
+
+#: src/gtkdialogs.c:64
+msgid "lead developer"
+msgstr "lead developer"
+
+#: src/gtkdialogs.c:65
+msgid "developer & webmaster"
+msgstr "developer & webmaster"
+
+#: src/gtkdialogs.c:66
+msgid "win32 port"
+msgstr "win32 port"
+
+#: src/gtkdialogs.c:67 src/gtkdialogs.c:68 src/gtkdialogs.c:69
+#: src/gtkdialogs.c:70
+msgid "developer"
+msgstr "developer"
+
+#: src/gtkdialogs.c:71
+msgid "support"
+msgstr "support"
+
+#: src/gtkdialogs.c:76
+msgid "former libfaim maintainer"
+msgstr "former libfaim maintainer"
+
+#: src/gtkdialogs.c:77
+msgid "former lead developer"
+msgstr "former lead developer"
+
+#: src/gtkdialogs.c:78
+msgid "former maintainer"
+msgstr "former maintainer"
+
+#: src/gtkdialogs.c:79
+msgid "former Jabber developer"
+msgstr "former Jabber developer"
+
+#: src/gtkdialogs.c:80
+msgid "original author"
+msgstr "original author"
+
+#: src/gtkdialogs.c:81
+msgid "hacker and designated driver [lazy bum]"
+msgstr "hacker and designated driver [lazy bum]"
+
+#: src/gtkdialogs.c:86 src/gtkdialogs.c:123
+msgid "Bulgarian"
+msgstr "Bulgarian"
+
+#: src/gtkdialogs.c:87 src/gtkdialogs.c:124
+msgid "Catalan"
+msgstr "Catalan"
+
+#: src/gtkdialogs.c:88 src/gtkdialogs.c:125
+msgid "Czech"
+msgstr "Czech"
+
+#: src/gtkdialogs.c:89
+msgid "Danish"
+msgstr "Danish"
+
+#: src/gtkdialogs.c:90
+msgid "British English"
+msgstr "Proper English"
+
+#: src/gtkdialogs.c:91
+msgid "Canadian English"
+msgstr "Canadian English"
+
+#: src/gtkdialogs.c:92 src/gtkdialogs.c:126
+msgid "German"
+msgstr "German"
+
+#: src/gtkdialogs.c:93 src/gtkdialogs.c:127
+msgid "Spanish"
+msgstr "Spanish"
+
+#: src/gtkdialogs.c:94 src/gtkdialogs.c:128
+msgid "Finnish"
+msgstr "Finnish"
+
+#: src/gtkdialogs.c:95 src/gtkdialogs.c:129
+msgid "French"
+msgstr "French"
+
+#: src/gtkdialogs.c:96
+msgid "Hebrew"
+msgstr "Hebrew"
+
+#: src/gtkdialogs.c:97
+msgid "Hindi"
+msgstr "Hindi"
+
+#: src/gtkdialogs.c:98
+msgid "Hungarian"
+msgstr "Hungarian"
+
+#: src/gtkdialogs.c:99 src/gtkdialogs.c:130
+msgid "Italian"
+msgstr "Italian"
+
+#: src/gtkdialogs.c:100 src/gtkdialogs.c:131
+msgid "Japanese"
+msgstr "Japanese"
+
+#: src/gtkdialogs.c:101
+msgid "Lithuanian"
+msgstr "Lithuanian"
+
+#: src/gtkdialogs.c:102 src/gtkdialogs.c:132
+msgid "Korean"
+msgstr "Korean"
+
+#: src/gtkdialogs.c:103
+msgid "Dutch; Flemish"
+msgstr "Dutch; Flemish"
+
+#: src/gtkdialogs.c:104
+msgid "Macedonian"
+msgstr "Macedonian"
+
+#: src/gtkdialogs.c:105
+msgid "Norwegian"
+msgstr "Norwegian"
+
+#: src/gtkdialogs.c:106 src/gtkdialogs.c:133
+msgid "Polish"
+msgstr "Polish"
+
+#: src/gtkdialogs.c:107
+msgid "Portuguese"
+msgstr "Portuguese"
+
+#: src/gtkdialogs.c:108
+msgid "Portuguese-Brazil"
+msgstr "Portuguese-Brazil"
+
+#: src/gtkdialogs.c:109
+msgid "Romanian"
+msgstr "Romanian"
+
+#: src/gtkdialogs.c:110 src/gtkdialogs.c:134 src/gtkdialogs.c:135
+msgid "Russian"
+msgstr "Russian"
+
+#: src/gtkdialogs.c:111
+msgid "Serbian"
+msgstr "Serbian"
+
+#: src/gtkdialogs.c:112
+msgid "Slovenian"
+msgstr "Slovenian"
+
+#: src/gtkdialogs.c:113 src/gtkdialogs.c:137
+msgid "Swedish"
+msgstr "Swedish"
+
+#: src/gtkdialogs.c:114
+msgid "Vietnamese"
+msgstr "Vietnamese"
+
+#: src/gtkdialogs.c:114
+msgid "T.M.Thanh and the Gnome-Vi Team"
+msgstr "T.M.Thanh and the Gnome-Vi Team"
+
+#: src/gtkdialogs.c:115
+msgid "Simplified Chinese"
+msgstr "Simplified Chinese"
+
+#: src/gtkdialogs.c:116
+msgid "Traditional Chinese"
+msgstr "Traditional Chinese"
+
+#: src/gtkdialogs.c:122
+msgid "Amharic"
+msgstr "Amharic"
+
+#: src/gtkdialogs.c:136
+msgid "Slovak"
+msgstr "Slovak"
+
+#: src/gtkdialogs.c:138
+msgid "Chinese"
+msgstr "Chinese"
+
+#: src/gtkdialogs.c:180
+msgid "About Gaim"
+msgstr "About Gaim"
+
+#: src/gtkdialogs.c:195
+#, c-format
+msgid "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
+
+#: src/gtkdialogs.c:216
+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 "
+"at once.  It is written using Gtk+ and is licensed under the GPL.<BR><BR>"
+msgstr ""
+"Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
+"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/gtkdialogs.c:225
+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/gtkdialogs.c:230
+msgid "Active Developers"
+msgstr "Active Developers"
+
+#: src/gtkdialogs.c:245
+msgid "Crazy Patch Writers"
+msgstr "Crazy Patch Writers"
+
+#: src/gtkdialogs.c:260
+msgid "Retired Developers"
+msgstr "Retired Developers"
+
+#: src/gtkdialogs.c:275
+msgid "Current Translators"
+msgstr "Current Translators"
+
+#: src/gtkdialogs.c:295
+msgid "Past Translators"
+msgstr "Past Translators"
+
+#: src/gtkdialogs.c:366 src/gtkdialogs.c:508 src/gtkdialogs.c:560
 msgid "_Screen name"
 msgstr "_Screen name"
 
-#: src/gtkdialogs.c:111 src/gtkdialogs.c:250 src/gtkdialogs.c:302
+#: src/gtkdialogs.c:372 src/gtkdialogs.c:514 src/gtkdialogs.c:566
 msgid "_Account"
 msgstr "_Account"
 
-#: src/gtkdialogs.c:118
+#: src/gtkdialogs.c:379
 msgid "New Instant Message"
 msgstr "New Instant Message"
 
-#: src/gtkdialogs.c:120
+#: src/gtkdialogs.c:381
 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/gtkdialogs.c:257
+#: src/gtkdialogs.c:521
 msgid "Get User Info"
 msgstr "Get User Info"
 
-#: src/gtkdialogs.c:259
+#: src/gtkdialogs.c:523
 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/gtkdialogs.c:310
+#: src/gtkdialogs.c:574
 msgid "Get User Log"
 msgstr "Get User Log"
 
-#: src/gtkdialogs.c:312
+#: src/gtkdialogs.c:576
 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/gtkdialogs.c:346
+#: src/gtkdialogs.c:616
 msgid "Warn User"
 msgstr "Warn User"
 
-#: src/gtkdialogs.c:365
+#: src/gtkdialogs.c:637
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -3103,45 +3138,45 @@
 "This will increase %s's warning level and he or she will be subject to "
 "harsher rate limiting.\n"
 
-#: src/gtkdialogs.c:374
+#: src/gtkdialogs.c:646
 msgid "Warn _anonymously?"
 msgstr "Warn _anonymously?"
 
-#: src/gtkdialogs.c:381
+#: src/gtkdialogs.c:653
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>Anonymous warnings are less severe.</b>"
 
-#: src/gtkdialogs.c:400
+#: src/gtkdialogs.c:674
 msgid "Alias Contact"
 msgstr "Alias Contact"
 
-#: src/gtkdialogs.c:401
+#: src/gtkdialogs.c:675
 msgid "Enter an alias for this contact."
 msgstr "Enter an alias for this contact."
 
-#: src/gtkdialogs.c:403 src/gtkdialogs.c:421 src/gtkdialogs.c:439
-#: src/gtkrequest.c:249 src/protocols/silc/chat.c:572
+#: src/gtkdialogs.c:677 src/gtkdialogs.c:699 src/gtkdialogs.c:719
+#: src/gtkrequest.c:250 src/protocols/silc/chat.c:584
 msgid "Alias"
 msgstr "Alias"
 
-#: src/gtkdialogs.c:417
+#: src/gtkdialogs.c:695
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Enter an alias for %s."
 
-#: src/gtkdialogs.c:419
+#: src/gtkdialogs.c:697
 msgid "Alias Buddy"
 msgstr "Alias Buddy"
 
-#: src/gtkdialogs.c:436
+#: src/gtkdialogs.c:716
 msgid "Alias Chat"
 msgstr "Alias Chat"
 
-#: src/gtkdialogs.c:437
+#: src/gtkdialogs.c:717
 msgid "Enter an alias for this chat."
 msgstr "Enter an alias for this chat."
 
-#: src/gtkdialogs.c:474
+#: src/gtkdialogs.c:751
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
@@ -3150,11 +3185,11 @@
 "You are about to remove the contact containing %s and %d other buddies from "
 "your buddy list.  Do you want to continue?"
 
-#: src/gtkdialogs.c:477 src/gtkdialogs.c:478
+#: src/gtkdialogs.c:754 src/gtkdialogs.c:755
 msgid "Remove Contact"
 msgstr "Remove Contact"
 
-#: src/gtkdialogs.c:530
+#: src/gtkdialogs.c:811
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -3163,22 +3198,22 @@
 "You are about to remove the group %s and all its members from your buddy "
 "list.  Do you want to continue?"
 
-#: src/gtkdialogs.c:533 src/gtkdialogs.c:534
+#: src/gtkdialogs.c:814 src/gtkdialogs.c:815
 msgid "Remove Group"
 msgstr "Remove Group"
 
-#: src/gtkdialogs.c:577
+#: src/gtkdialogs.c:853
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 
-#: src/gtkdialogs.c:579 src/gtkdialogs.c:580
+#: src/gtkdialogs.c:856 src/gtkdialogs.c:857
 msgid "Remove Buddy"
 msgstr "Remove Buddy"
 
-#: src/gtkdialogs.c:596
+#: src/gtkdialogs.c:873
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -3187,107 +3222,115 @@
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 
-#: src/gtkdialogs.c:598 src/gtkdialogs.c:599
+#: src/gtkdialogs.c:877 src/gtkdialogs.c:878
 msgid "Remove Chat"
 msgstr "Remove Chat"
 
-#: src/gtkft.c:136
+#: src/gtkft.c:140
 #, c-format
 msgid "%.2f KB/s"
 msgstr "%.2f KB/s"
 
-#: src/gtkft.c:157 src/gtkft.c:962
+#: src/gtkft.c:161 src/gtkft.c:978
 msgid "Finished"
 msgstr "Finished"
 
-#: src/gtkft.c:160 src/gtkft.c:913
+#: src/gtkft.c:164 src/gtkft.c:929
 msgid "Canceled"
 msgstr "Cancelled"
 
-#: src/gtkft.c:163
+#: src/gtkft.c:167 src/gtkft.c:848
 msgid "Waiting for transfer to begin"
 msgstr "Waiting for transfer to begin"
 
-#: src/gtkft.c:216
+#: src/gtkft.c:220
+msgid "<b>Receiving As:</b>"
+msgstr "<b>Receiving As:</b>"
+
+#: src/gtkft.c:222
 msgid "<b>Receiving From:</b>"
 msgstr "<b>Receiving From:</b>"
 
-#: src/gtkft.c:219
+#: src/gtkft.c:226
 msgid "<b>Sending To:</b>"
 msgstr "<b>Sending To:</b>"
 
-#: src/gtkft.c:393
+#: src/gtkft.c:228
+msgid "<b>Sending As:</b>"
+msgstr "<b>Sending As:</b>"
+
+#: src/gtkft.c:407
 msgid "There is no application configured to open this type of file."
 msgstr "There is no application configured to open this type of file."
 
-#: src/gtkft.c:398
+#: src/gtkft.c:412
 msgid "An error occurred while opening the file."
 msgstr "An error occurred while opening the file."
 
-#: src/gtkft.c:489
+#: src/gtkft.c:503
 msgid "Progress"
 msgstr "Progress"
 
-#: src/gtkft.c:496
+#: src/gtkft.c:510
 msgid "Filename"
 msgstr "Filename"
 
-#: src/gtkft.c:503
+#: src/gtkft.c:517
 msgid "Size"
 msgstr "Size"
 
-#: src/gtkft.c:510
+#: src/gtkft.c:524
 msgid "Remaining"
 msgstr "Remaining"
 
-#: src/gtkft.c:540
+#: src/gtkft.c:556
 msgid "Filename:"
 msgstr "Filename:"
 
-#: src/gtkft.c:541
+#: src/gtkft.c:557
 msgid "Status:"
 msgstr "Status:"
 
-#: src/gtkft.c:542
+#: src/gtkft.c:558
 msgid "Speed:"
 msgstr "Speed:"
 
-#: src/gtkft.c:543
+#: src/gtkft.c:559
 msgid "Time Elapsed:"
 msgstr "Time Elapsed:"
 
-#: src/gtkft.c:544
+#: src/gtkft.c:560
 msgid "Time Remaining:"
 msgstr "Time Remaining:"
 
-#: src/gtkft.c:636
+#: src/gtkft.c:652
 msgid "_Keep the dialog open"
 msgstr "_Keep the dialog open"
 
-#: src/gtkft.c:646
+#: src/gtkft.c:662
 msgid "_Clear finished transfers"
 msgstr "_Clear finished transfers"
 
 #. "Download Details" arrow
-#: src/gtkft.c:655
+#: src/gtkft.c:671
 msgid "Show transfer details"
 msgstr "Show transfer details"
 
-#: src/gtkft.c:656
+#: src/gtkft.c:672
 msgid "Hide transfer details"
 msgstr "Hide transfer details"
 
 #. Pause button
-#: src/gtkft.c:698 src/stock.c:91
+#: src/gtkft.c:714 src/stock.c:92
 msgid "_Pause"
 msgstr "_Pause"
 
 #. Resume button
-#: src/gtkft.c:708
+#: src/gtkft.c:724
 msgid "_Resume"
 msgstr "_Resume"
 
-#: src/gtkft.c:915
+#: src/gtkft.c:931
 msgid "Failed"
 msgstr "Failed"
 
@@ -3332,31 +3375,31 @@
 msgid "Save Image"
 msgstr "Save Image"
 
-#: src/gtkimhtml.c:2937
+#: src/gtkimhtml.c:2944
 msgid "_Save Image..."
 msgstr "_Save Image..."
 
-#: src/gtkimhtmltoolbar.c:163
+#: src/gtkimhtmltoolbar.c:164
 msgid "Select Font"
 msgstr "Select Font"
 
-#: src/gtkimhtmltoolbar.c:238
+#: src/gtkimhtmltoolbar.c:239
 msgid "Select Text Color"
 msgstr "Select Text Colour"
 
-#: src/gtkimhtmltoolbar.c:311
+#: src/gtkimhtmltoolbar.c:312
 msgid "Select Background Color"
 msgstr "Select Background Colour"
 
-#: src/gtkimhtmltoolbar.c:394
+#: src/gtkimhtmltoolbar.c:395
 msgid "_URL"
 msgstr "_URL"
 
-#: src/gtkimhtmltoolbar.c:402
+#: src/gtkimhtmltoolbar.c:403
 msgid "_Description"
 msgstr "_Description"
 
-#: src/gtkimhtmltoolbar.c:405
+#: src/gtkimhtmltoolbar.c:406
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
@@ -3364,77 +3407,77 @@
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
 
-#: src/gtkimhtmltoolbar.c:409
+#: src/gtkimhtmltoolbar.c:410
 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:414
+#: src/gtkimhtmltoolbar.c:415
 msgid "Insert Link"
 msgstr "Insert Link"
 
-#: src/gtkimhtmltoolbar.c:418
+#: src/gtkimhtmltoolbar.c:419
 msgid "_Insert"
 msgstr "_Insert"
 
-#: src/gtkimhtmltoolbar.c:487
+#: src/gtkimhtmltoolbar.c:488
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Failed to store image: %s\n"
 
-#: src/gtkimhtmltoolbar.c:513 src/gtkimhtmltoolbar.c:523
+#: src/gtkimhtmltoolbar.c:514 src/gtkimhtmltoolbar.c:524
 msgid "Insert Image"
 msgstr "Insert Image"
 
-#: src/gtkimhtmltoolbar.c:661
+#: src/gtkimhtmltoolbar.c:662
 msgid "This theme has no available smileys."
 msgstr "This theme has no available smileys."
 
 #. show everything
-#: src/gtkimhtmltoolbar.c:676
+#: src/gtkimhtmltoolbar.c:677
 msgid "Smile!"
 msgstr "Smile!"
 
-#: src/gtkimhtmltoolbar.c:894
+#: src/gtkimhtmltoolbar.c:895
 msgid "Bold"
 msgstr "Bold"
 
-#: src/gtkimhtmltoolbar.c:905
+#: src/gtkimhtmltoolbar.c:906
 msgid "Italic"
 msgstr "Italic"
 
-#: src/gtkimhtmltoolbar.c:916
+#: src/gtkimhtmltoolbar.c:917
 msgid "Underline"
 msgstr "Underline"
 
-#: src/gtkimhtmltoolbar.c:932
+#: src/gtkimhtmltoolbar.c:933
 msgid "Larger font size"
 msgstr "Larger font size"
 
-#: src/gtkimhtmltoolbar.c:944
+#: src/gtkimhtmltoolbar.c:945
 msgid "Smaller font size"
 msgstr "Smaller font size"
 
-#: src/gtkimhtmltoolbar.c:961
+#: src/gtkimhtmltoolbar.c:962
 msgid "Font Face"
 msgstr "Font Face"
 
-#: src/gtkimhtmltoolbar.c:973
+#: src/gtkimhtmltoolbar.c:974
 msgid "Foreground font color"
 msgstr "Foreground font colour"
 
-#: src/gtkimhtmltoolbar.c:985
+#: src/gtkimhtmltoolbar.c:986
 msgid "Background color"
 msgstr "Background colour"
 
-#: src/gtkimhtmltoolbar.c:1000
+#: src/gtkimhtmltoolbar.c:1001
 msgid "Insert link"
 msgstr "Insert link"
 
-#: src/gtkimhtmltoolbar.c:1010
+#: src/gtkimhtmltoolbar.c:1011
 msgid "Insert image"
 msgstr "Insert image"
 
-#: src/gtkimhtmltoolbar.c:1021
+#: src/gtkimhtmltoolbar.c:1022
 msgid "Insert smiley"
 msgstr "Insert smiley"
 
@@ -3449,24 +3492,24 @@
 msgstr "System Log"
 
 #. Descriptive label
-#: src/gtknotify.c:215
+#: src/gtknotify.c:216
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s has %d new message."
 msgstr[1] "%s has %d new messages."
 
-#: src/gtknotify.c:229
+#: src/gtknotify.c:230
 #, c-format
 msgid "<span weight=\"bold\">From:</span> %s\n"
 msgstr "<span weight=\"bold\">From:</span> %s\n"
 
-#: src/gtknotify.c:238
+#: src/gtknotify.c:239
 #, c-format
 msgid "<span weight=\"bold\">Subject:</span> %s\n"
 msgstr "<span weight=\"bold\">Subject:</span> %s\n"
 
-#: src/gtknotify.c:243
+#: src/gtknotify.c:244
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3477,7 +3520,7 @@
 "\n"
 "%s%s%s%s"
 
-#: src/gtknotify.c:259
+#: src/gtknotify.c:260
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3488,189 +3531,189 @@
 "\n"
 "%s"
 
-#: src/gtknotify.c:419
-#, c-format
-msgid "The browser command \"%s\" is invalid."
-msgstr "The browser command \"%s\" is invalid."
-
-#: src/gtknotify.c:422 src/gtknotify.c:436 src/gtknotify.c:451
-#: src/gtknotify.c:569
+#: src/gtknotify.c:430
+#, c-format
+msgid "The browser command <b>%s</b> is invalid."
+msgstr "The browser command <b>%s</b> is invalid."
+
+#: src/gtknotify.c:432 src/gtknotify.c:444 src/gtknotify.c:457
+#: src/gtknotify.c:576
 msgid "Unable to open URL"
 msgstr "Unable to open URL"
 
-#: src/gtknotify.c:433 src/gtknotify.c:448
-#, c-format
-msgid "Error launching \"%s\": %s"
-msgstr "Error launching \"%s\": %s"
-
-#: src/gtknotify.c:570
+#: src/gtknotify.c:442 src/gtknotify.c:455
+#, c-format
+msgid "Error launching <b>%s</b>: %s"
+msgstr "Error launching <b>%s</b>: %s"
+
+#: src/gtknotify.c:577
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 
-#: src/gtkpounce.c:129
+#: src/gtkpounce.c:130
 msgid "Select a file"
 msgstr "Select a file"
 
-#: src/gtkpounce.c:160
+#: src/gtkpounce.c:161
 msgid "Please enter a buddy to pounce."
 msgstr "Please enter a buddy to pounce."
 
 #. "New Buddy Pounce"
-#: src/gtkpounce.c:386 src/gtkpounce.c:888
+#: src/gtkpounce.c:387 src/gtkpounce.c:889
 msgid "New Buddy Pounce"
 msgstr "New Buddy Pounce"
 
-#: src/gtkpounce.c:386
+#: src/gtkpounce.c:387
 msgid "Edit Buddy Pounce"
 msgstr "Edit Buddy Pounce"
 
 #. Create the "Pounce Who" frame.
-#: src/gtkpounce.c:403
+#: src/gtkpounce.c:404
 msgid "Pounce Who"
 msgstr "Pounce Who"
 
-#: src/gtkpounce.c:430
+#: src/gtkpounce.c:431
 msgid "_Buddy name:"
 msgstr "_Buddy name:"
 
 #. Create the "Pounce When" frame.
-#: src/gtkpounce.c:454
+#: src/gtkpounce.c:455
 msgid "Pounce When"
 msgstr "Pounce When"
 
-#: src/gtkpounce.c:462
+#: src/gtkpounce.c:463
 msgid "Si_gn on"
 msgstr "Si_gn on"
 
-#: src/gtkpounce.c:464
+#: src/gtkpounce.c:465
 msgid "Sign _off"
 msgstr "Sign _off"
 
-#: src/gtkpounce.c:466
+#: src/gtkpounce.c:467
 msgid "A_way"
 msgstr "A_way"
 
-#: src/gtkpounce.c:468
+#: src/gtkpounce.c:469
 msgid "_Return from away"
 msgstr "_Return from away"
 
-#: src/gtkpounce.c:470
+#: src/gtkpounce.c:471
 msgid "_Idle"
 msgstr "_Idle"
 
-#: src/gtkpounce.c:472
+#: src/gtkpounce.c:473
 msgid "Retur_n from idle"
 msgstr "Retur_n from idle"
 
-#: src/gtkpounce.c:474
+#: src/gtkpounce.c:475
 msgid "Buddy starts _typing"
 msgstr "Buddy starts _typing"
 
-#: src/gtkpounce.c:476
+#: src/gtkpounce.c:477
 msgid "Buddy stops t_yping"
 msgstr "Buddy stops t_yping"
 
 #. Create the "Pounce Action" frame.
-#: src/gtkpounce.c:505
+#: src/gtkpounce.c:506
 msgid "Pounce Action"
 msgstr "Pounce Action"
 
-#: src/gtkpounce.c:513
+#: src/gtkpounce.c:514
 msgid "Op_en an IM window"
 msgstr "Op_en an IM window"
 
-#: src/gtkpounce.c:515
+#: src/gtkpounce.c:516
 msgid "_Popup notification"
 msgstr "_Popup notification"
 
-#: src/gtkpounce.c:517
+#: src/gtkpounce.c:518
 msgid "Send a _message"
 msgstr "Send a _message"
 
-#: src/gtkpounce.c:519
+#: src/gtkpounce.c:520
 msgid "E_xecute a command"
 msgstr "E_xecute a command"
 
-#: src/gtkpounce.c:521
+#: src/gtkpounce.c:522
 msgid "P_lay a sound"
 msgstr "P_lay a sound"
 
-#: src/gtkpounce.c:525
+#: src/gtkpounce.c:526
 msgid "B_rowse..."
 msgstr "B_rowse..."
 
-#: src/gtkpounce.c:527
+#: src/gtkpounce.c:528
 msgid "Bro_wse..."
 msgstr "Bro_wse..."
 
-#: src/gtkpounce.c:528
+#: src/gtkpounce.c:529
 msgid "Pre_view"
 msgstr "Pre_view"
 
-#: src/gtkpounce.c:611
+#: src/gtkpounce.c:612
 msgid "Sav_e this pounce after activation"
 msgstr "Sav_e this pounce after activation"
 
 #. "Remove Buddy Pounce"
-#: src/gtkpounce.c:895
+#: src/gtkpounce.c:896
 msgid "Remove Buddy Pounce"
 msgstr "Remove Buddy Pounce"
 
-#: src/gtkpounce.c:953
+#: src/gtkpounce.c:954
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s has started typing to you (%s)"
 
-#: src/gtkpounce.c:955
+#: src/gtkpounce.c:956
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s has signed on (%s)"
 
-#: src/gtkpounce.c:957
+#: src/gtkpounce.c:958
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s has returned from being idle (%s)"
 
-#: src/gtkpounce.c:959
+#: src/gtkpounce.c:960
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s has returned from being away (%s)"
 
-#: src/gtkpounce.c:961
+#: src/gtkpounce.c:962
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s has stopped typing to you (%s)"
 
-#: src/gtkpounce.c:963
+#: src/gtkpounce.c:964
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s has signed off (%s)"
 
-#: src/gtkpounce.c:965
+#: src/gtkpounce.c:966
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s has become idle (%s)"
 
-#: src/gtkpounce.c:967
+#: src/gtkpounce.c:968
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s has gone away. (%s)"
 
-#: src/gtkpounce.c:968
+#: src/gtkpounce.c:969
 msgid "Unknown pounce event. Please report this!"
 msgstr "Unknown pounce event. Please report this!"
 
-#: src/gtkprefs.c:446
+#: src/gtkprefs.c:447
 msgid "Interface Options"
 msgstr "Interface Options"
 
-#: src/gtkprefs.c:448
+#: src/gtkprefs.c:449
 msgid "D_isplay remote nicknames if no alias is set"
 msgstr "D_isplay remote nicknames if no alias is set"
 
-#: src/gtkprefs.c:675
+#: src/gtkprefs.c:678
 msgid ""
 "Select a smiley theme that you would like to use from the list below. New "
 "themes can be installed by dragging and dropping them onto the theme list."
@@ -3678,48 +3721,48 @@
 "Select a smiley theme that you would like to use from the list below. New "
 "themes can be installed by dragging and dropping them onto the theme list."
 
-#: src/gtkprefs.c:715
+#: src/gtkprefs.c:718
 msgid "Icon"
 msgstr "Icon"
 
-#: 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
+#: src/gtkprefs.c:725 src/gtkprefs.c:2201 src/protocols/jabber/buddy.c:264
+#: src/protocols/jabber/buddy.c:748 src/protocols/jabber/chat.c:721
 msgid "Description"
 msgstr "Description"
 
-#: src/gtkprefs.c:818
+#: src/gtkprefs.c:821
 msgid "Display"
 msgstr "Display"
 
-#: src/gtkprefs.c:819
+#: src/gtkprefs.c:822
 msgid "Show _timestamp on messages"
 msgstr "Show _timestamp on messages"
 
-#: src/gtkprefs.c:822
+#: src/gtkprefs.c:825
 msgid "_Highlight misspelled words"
 msgstr "_Highlight misspelled words"
 
-#: src/gtkprefs.c:826
+#: src/gtkprefs.c:829
 msgid "Ignore c_olors"
 msgstr "Ignore c_olours"
 
-#: src/gtkprefs.c:828
+#: src/gtkprefs.c:831
 msgid "Ignore font _faces"
 msgstr "Ignore font _faces"
 
-#: src/gtkprefs.c:830
+#: src/gtkprefs.c:833
 msgid "Ignore font si_zes"
 msgstr "Ignore font si_zes"
 
-#: src/gtkprefs.c:833
+#: src/gtkprefs.c:836
 msgid "Default Formatting"
 msgstr "Default Formatting"
 
-#: src/gtkprefs.c:835
+#: src/gtkprefs.c:838
 msgid "_Send default formatting with outgoing messages"
 msgstr "_Send default formatting with outgoing messages"
 
-#: src/gtkprefs.c:867
+#: src/gtkprefs.c:870
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting. :)"
@@ -3727,269 +3770,273 @@
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting. :)"
 
-#: src/gtkprefs.c:870
+#: src/gtkprefs.c:873
 msgid "_Clear Formatting"
 msgstr "_Clear Formatting"
 
-#: src/gtkprefs.c:907
-msgid "Send Message"
-msgstr "Send Message"
-
-#: src/gtkprefs.c:908
-msgid "Enter _sends message"
-msgstr "Enter _sends message"
-
 #: src/gtkprefs.c:910
+msgid "Send Message"
+msgstr "Send Message"
+
+#: src/gtkprefs.c:911
+msgid "Enter _sends message"
+msgstr "Enter _sends message"
+
+#: src/gtkprefs.c:913
 msgid "C_ontrol-Enter sends message"
 msgstr "C_ontrol-Enter sends message"
 
-#: src/gtkprefs.c:913
+#: src/gtkprefs.c:916
 msgid "Window Closing"
 msgstr "Window Closing"
 
-#: src/gtkprefs.c:914
+#: src/gtkprefs.c:917
 msgid "_Escape closes window"
 msgstr "_Escape closes window"
 
-#: src/gtkprefs.c:917
+#: src/gtkprefs.c:920
 msgid "Insertions"
 msgstr "Insertions"
 
-#: src/gtkprefs.c:918
+#: src/gtkprefs.c:921
 msgid "Control-{B/I/U} changes _formatting"
 msgstr "Control-{B/I/U} changes _formatting"
 
-#: src/gtkprefs.c:920
+#: src/gtkprefs.c:923
 msgid "Control-(number) _inserts smileys"
 msgstr "Control-(number) _inserts smileys"
 
-#: src/gtkprefs.c:936
+#: src/gtkprefs.c:939
 msgid "Buddy List Sorting"
 msgstr "Buddy List Sorting"
 
-#: src/gtkprefs.c:945
+#: src/gtkprefs.c:948
 msgid "_Sorting:"
 msgstr "_Sorting:"
 
-#: src/gtkprefs.c:951 src/gtkprefs.c:1003
+#: src/gtkprefs.c:954 src/gtkprefs.c:1006
 msgid "Show _buttons as:"
 msgstr "Show _buttons as:"
 
-#: src/gtkprefs.c:953 src/gtkprefs.c:1005
+#: src/gtkprefs.c:956 src/gtkprefs.c:1008
 msgid "Pictures"
 msgstr "Pictures"
 
-#: src/gtkprefs.c:954 src/gtkprefs.c:1006
+#: src/gtkprefs.c:957 src/gtkprefs.c:1009
 msgid "Text"
 msgstr "Text"
 
-#: src/gtkprefs.c:955 src/gtkprefs.c:1007
+#: src/gtkprefs.c:958 src/gtkprefs.c:1010
 msgid "Pictures and text"
 msgstr "Pictures and text"
 
-#: src/gtkprefs.c:958
+#: src/gtkprefs.c:961
 msgid "_Raise window on events"
 msgstr "_Raise window on events"
 
-#: src/gtkprefs.c:961
-msgid "Buddy Display"
-msgstr "Buddy Display"
-
-#: src/gtkprefs.c:962 src/gtkprefs.c:1020
-msgid "Show buddy _icons"
-msgstr "Show buddy _icons"
-
 #: src/gtkprefs.c:964
+msgid "Buddy Display"
+msgstr "Buddy Display"
+
+#: src/gtkprefs.c:965 src/gtkprefs.c:1027
+msgid "Show buddy _icons"
+msgstr "Show buddy _icons"
+
+#: src/gtkprefs.c:967
 msgid "Show _warning levels"
 msgstr "Show _warning levels"
 
-#: src/gtkprefs.c:966
+#: src/gtkprefs.c:969
 msgid "Show idle _times"
 msgstr "Show idle _times"
 
-#: src/gtkprefs.c:968
+#: src/gtkprefs.c:971
 msgid "Dim i_dle buddies"
 msgstr "Dim i_dle buddies"
 
-#: src/gtkprefs.c:970
+#: src/gtkprefs.c:973
 msgid "_Automatically expand contacts"
 msgstr "_Automatically expand contacts"
 
-#: src/gtkprefs.c:1013
+#: src/gtkprefs.c:1017
 msgid "Enable \"_slash\" commands"
 msgstr "Enable \"_slash\" commands"
 
-#: src/gtkprefs.c:1016
+#: src/gtkprefs.c:1020
+msgid "Send unknown \"_slash\" commands as messages"
+msgstr "Send unknown \"_slash\" commands as messages"
+
+#: src/gtkprefs.c:1023
 msgid "Show _formatting toolbar"
 msgstr "Show _formatting toolbar"
 
-#: src/gtkprefs.c:1018
+#: src/gtkprefs.c:1025
 msgid "Show _aliases in tabs/titles"
 msgstr "Show _aliases in tabs/titles"
 
-#: src/gtkprefs.c:1022
+#: src/gtkprefs.c:1029
 msgid "Enable buddy ic_on animation"
 msgstr "Enable buddy ic_on animation"
 
-#: src/gtkprefs.c:1024
+#: src/gtkprefs.c:1031
 msgid "_Notify buddies that you are typing to them"
 msgstr "_Notify buddies that you are typing to them"
 
-#: src/gtkprefs.c:1026
+#: src/gtkprefs.c:1033
 msgid "_Raise IM window on events"
 msgstr "_Raise IM window on events"
 
-#: src/gtkprefs.c:1029
+#: src/gtkprefs.c:1036
 msgid "Raise chat _window on events"
 msgstr "Raise chat _window on events"
 
-#: src/gtkprefs.c:1031
+#: src/gtkprefs.c:1038
 msgid "Use _multi-colored screen names in chats"
 msgstr "Use _multi-coloured screen names in chats"
 
 #. All the tab options!
-#: src/gtkprefs.c:1035
+#: src/gtkprefs.c:1042
 msgid "Tab Options"
 msgstr "Tab Options"
 
-#: src/gtkprefs.c:1037
+#: src/gtkprefs.c:1044
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Show IMs and chats in _tabbed windows"
 
-#: src/gtkprefs.c:1052
+#: src/gtkprefs.c:1059
 msgid "Show _close button on tabs"
 msgstr "Show _close button on tabs"
 
-#: src/gtkprefs.c:1055
+#: src/gtkprefs.c:1062
 msgid "Tab p_lacement:"
 msgstr "Tab P_lacement:"
 
-#: src/gtkprefs.c:1057
+#: src/gtkprefs.c:1064
 msgid "Top"
 msgstr "Top"
 
-#: src/gtkprefs.c:1058
+#: src/gtkprefs.c:1065
 msgid "Bottom"
 msgstr "Bottom"
 
-#: src/gtkprefs.c:1059
-msgid "Left"
-msgstr "Left"
-
-#: src/gtkprefs.c:1060
-msgid "Right"
-msgstr "Right"
-
 #: src/gtkprefs.c:1066
+msgid "Left"
+msgstr "Left"
+
+#: src/gtkprefs.c:1067
+msgid "Right"
+msgstr "Right"
+
+#: src/gtkprefs.c:1073
 msgid "New conversation _placement:"
 msgstr "New conversation _placement:"
 
-#: src/gtkprefs.c:1117 src/protocols/oscar/oscar.c:578
-#: src/protocols/oscar/oscar.c:4860
+#: src/gtkprefs.c:1124 src/protocols/oscar/oscar.c:712
+#: src/protocols/oscar/oscar.c:4974
 msgid "IP Address"
 msgstr "IP Address"
 
-#: src/gtkprefs.c:1119
+#: src/gtkprefs.c:1126
 msgid "_Autodetect IP Address"
 msgstr "_Autodetect IP Address"
 
-#: src/gtkprefs.c:1128
+#: src/gtkprefs.c:1135
 msgid "Public _IP:"
 msgstr "Public _IP:"
 
-#: src/gtkprefs.c:1152
+#: src/gtkprefs.c:1159
 msgid "Ports"
 msgstr "Ports"
 
-#: src/gtkprefs.c:1155
+#: src/gtkprefs.c:1162
 msgid "_Manually specify range of ports to listen on"
 msgstr "_Manually specify range of ports to listen on"
 
-#: src/gtkprefs.c:1158
+#: src/gtkprefs.c:1165
 msgid "_Start Port:"
 msgstr "_Start Port:"
 
-#: src/gtkprefs.c:1165
+#: src/gtkprefs.c:1172
 msgid "_End Port:"
 msgstr "_End Port:"
 
-#: src/gtkprefs.c:1172
+#: src/gtkprefs.c:1179
 msgid "Proxy Server"
 msgstr "Proxy Server"
 
-#: src/gtkprefs.c:1176
+#: src/gtkprefs.c:1183
 msgid "No proxy"
 msgstr "No proxy"
 
-#: src/gtkprefs.c:1238
+#: src/gtkprefs.c:1245
 msgid "_User:"
 msgstr "_User:"
 
-#: src/gtkprefs.c:1294
-msgid "Epiphany"
-msgstr "Epiphany"
-
-#: src/gtkprefs.c:1295
-msgid "Firebird"
-msgstr "Firebird"
-
-#: src/gtkprefs.c:1296
-msgid "Firefox"
-msgstr "Firefox"
-
-#: src/gtkprefs.c:1297
-msgid "Galeon"
-msgstr "Galeon"
-
-#: src/gtkprefs.c:1298
-msgid "Gnome Default"
-msgstr "Gnome Default"
-
-#: src/gtkprefs.c:1299
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: src/gtkprefs.c:1300
-msgid "Mozilla"
-msgstr "Mozilla"
-
 #: src/gtkprefs.c:1301
+msgid "Epiphany"
+msgstr "Epiphany"
+
+#: src/gtkprefs.c:1302
+msgid "Firebird"
+msgstr "Firebird"
+
+#: src/gtkprefs.c:1303
+msgid "Firefox"
+msgstr "Firefox"
+
+#: src/gtkprefs.c:1304
+msgid "Galeon"
+msgstr "Galeon"
+
+#: src/gtkprefs.c:1305
+msgid "Gnome Default"
+msgstr "Gnome Default"
+
+#: src/gtkprefs.c:1306
+msgid "Konqueror"
+msgstr "Konqueror"
+
+#: src/gtkprefs.c:1307
+msgid "Mozilla"
+msgstr "Mozilla"
+
+#: src/gtkprefs.c:1308
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/gtkprefs.c:1302
+#: src/gtkprefs.c:1309
 msgid "Opera"
 msgstr "Opera"
 
-#: src/gtkprefs.c:1311
+#: src/gtkprefs.c:1318
 msgid "Manual"
 msgstr "Manual"
 
-#: src/gtkprefs.c:1362
+#: src/gtkprefs.c:1369
 msgid "Browser Selection"
 msgstr "Browser Selection"
 
-#: src/gtkprefs.c:1366
+#: src/gtkprefs.c:1373
 msgid "_Browser:"
 msgstr "_Browser:"
 
-#: src/gtkprefs.c:1373
+#: src/gtkprefs.c:1380
 msgid "_Open link in:"
 msgstr "_Open Link in:"
 
-#: src/gtkprefs.c:1375
+#: src/gtkprefs.c:1382
 msgid "Browser default"
 msgstr "Browser default"
 
-#: src/gtkprefs.c:1376
+#: src/gtkprefs.c:1383
 msgid "Existing window"
 msgstr "Existing window"
 
-#: src/gtkprefs.c:1378
+#: src/gtkprefs.c:1385
 msgid "New tab"
 msgstr "New tab"
 
-#: src/gtkprefs.c:1392
+#: src/gtkprefs.c:1399
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -3998,83 +4045,83 @@
 "_Manual:\n"
 "(%s for URL)"
 
-#: src/gtkprefs.c:1429
+#: src/gtkprefs.c:1436
 msgid "Message Logs"
 msgstr "Message Logs"
 
-#: src/gtkprefs.c:1432
+#: src/gtkprefs.c:1439
 msgid "Log _Format:"
 msgstr "Log _Format:"
 
-#: src/gtkprefs.c:1435
+#: src/gtkprefs.c:1442
 msgid "_Log all instant messages"
 msgstr "_Log all instant messages"
 
-#: src/gtkprefs.c:1437
+#: src/gtkprefs.c:1444
 msgid "Log all c_hats"
 msgstr "Log all c_hats"
 
-#: src/gtkprefs.c:1440
+#: src/gtkprefs.c:1447
 msgid "System Logs"
 msgstr "System Logs"
 
-#: src/gtkprefs.c:1442
+#: src/gtkprefs.c:1449
 msgid "_Enable system log"
 msgstr "_Enable system log"
 
-#: src/gtkprefs.c:1445
+#: src/gtkprefs.c:1452
 msgid "Log when buddies _sign on/sign off"
 msgstr "Log when buddies _sign on/sign off"
 
-#: src/gtkprefs.c:1451
+#: src/gtkprefs.c:1458
 msgid "Log when buddies become _idle/un-idle"
 msgstr "Log when buddies become _idle/un-idle"
 
-#: src/gtkprefs.c:1457
+#: src/gtkprefs.c:1464
 msgid "Log when buddies go away/come _back"
 msgstr "Log when buddies go away/come _back"
 
-#: src/gtkprefs.c:1463
+#: src/gtkprefs.c:1470
 msgid "Log your _own signons/idleness/awayness"
 msgstr "Log your _own signons/idleness/awayness"
 
-#: src/gtkprefs.c:1589
+#: src/gtkprefs.c:1596
 msgid "Sound Selection"
 msgstr "Sound Selection"
 
-#: src/gtkprefs.c:1640
+#: src/gtkprefs.c:1647
 msgid "Sound Options"
 msgstr "Sound Options"
 
-#: src/gtkprefs.c:1641
+#: src/gtkprefs.c:1648
 msgid "Sounds when conversation has _focus"
 msgstr "Sounds when conversation has _focus"
 
-#: src/gtkprefs.c:1643
+#: src/gtkprefs.c:1650
 msgid "_Sounds while away"
 msgstr "_Sounds while away"
 
-#: src/gtkprefs.c:1647
+#: src/gtkprefs.c:1654
 msgid "Sound Method"
 msgstr "Sound Method"
 
-#: src/gtkprefs.c:1648
+#: src/gtkprefs.c:1655
 msgid "_Method:"
 msgstr "_Method:"
 
-#: src/gtkprefs.c:1650
+#: src/gtkprefs.c:1657
 msgid "Console beep"
 msgstr "Console beep"
 
-#: src/gtkprefs.c:1652
+#: src/gtkprefs.c:1659
 msgid "Automatic"
 msgstr "Automatic"
 
-#: src/gtkprefs.c:1659
+#: src/gtkprefs.c:1666
 msgid "Command"
 msgstr "Command"
 
-#: src/gtkprefs.c:1667
+#: src/gtkprefs.c:1674
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -4083,92 +4130,90 @@
 "Sound c_ommand:\n"
 "(%s for filename)"
 
-#: src/gtkprefs.c:1694
+#: src/gtkprefs.c:1701
 msgid "Sound Events"
 msgstr "Sound Events"
 
-#: src/gtkprefs.c:1745
+#: src/gtkprefs.c:1752
 msgid "Play"
 msgstr "Play"
 
-#: src/gtkprefs.c:1752
+#: src/gtkprefs.c:1759
 msgid "Event"
 msgstr "Event"
 
-#: src/gtkprefs.c:1771
+#: src/gtkprefs.c:1778
 msgid "Test"
 msgstr "Test"
 
-#: src/gtkprefs.c:1775
+#: src/gtkprefs.c:1782
 msgid "Reset"
 msgstr "Reset"
 
-#: src/gtkprefs.c:1779
+#: src/gtkprefs.c:1786
 msgid "Choose..."
 msgstr "Choose..."
 
-#: src/gtkprefs.c:1803
+#: src/gtkprefs.c:1810
 msgid "_Queue new messages when away"
 msgstr "_Queue new messages when away"
 
-#: src/gtkprefs.c:1806
+#: src/gtkprefs.c:1813
 msgid "_Auto-reply:"
 msgstr "_Auto-reply:"
 
-#: src/gtkprefs.c:1808
+#: src/gtkprefs.c:1815
 msgid "Never"
 msgstr "Never"
 
-#: src/gtkprefs.c:1809
-#, fuzzy
+#: src/gtkprefs.c:1816
 msgid "When away"
-msgstr "Only when away"
-
-#: src/gtkprefs.c:1810
-#, fuzzy
+msgstr "When away"
+
+#: src/gtkprefs.c:1817
 msgid "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:2776
-#: src/protocols/oscar/oscar.c:4013 src/protocols/yahoo/yahoo.c:2554
+msgstr "When away and idle"
+
+#: src/gtkprefs.c:1820 src/protocols/msn/msn.c:1179
+#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2804
+#: src/protocols/oscar/oscar.c:4127 src/protocols/yahoo/yahoo.c:2563
 #: src/protocols/yahoo/yahoo_profile.c:664
 msgid "Idle"
 msgstr "Idle"
 
-#: src/gtkprefs.c:1814
+#: src/gtkprefs.c:1821
 msgid "Idle _time reporting:"
 msgstr "Idle _time reporting:"
 
-#: src/gtkprefs.c:1817
+#: src/gtkprefs.c:1824
 msgid "Gaim usage"
 msgstr "Gaim usage"
 
-#: src/gtkprefs.c:1820
+#: src/gtkprefs.c:1827
 msgid "X usage"
 msgstr "X usage"
 
-#: src/gtkprefs.c:1822
+#: src/gtkprefs.c:1829
 msgid "Windows usage"
 msgstr "Windows usage"
 
-#: src/gtkprefs.c:1830
+#: src/gtkprefs.c:1837
 msgid "Auto-away"
 msgstr "Auto-away"
 
-#: src/gtkprefs.c:1831
+#: src/gtkprefs.c:1838
 msgid "Set away _when idle"
 msgstr "Set away _when idle"
 
-#: src/gtkprefs.c:1835
+#: src/gtkprefs.c:1842
 msgid "_Minutes before setting away:"
 msgstr "_Minutes before setting away:"
 
-#: src/gtkprefs.c:1843
+#: src/gtkprefs.c:1850
 msgid "Away m_essage:"
 msgstr "Away m_essage:"
 
-#: src/gtkprefs.c:1912
+#: src/gtkprefs.c:1919
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4183,7 +4228,7 @@
 "<span weight=\"bold\">Web site:</span>\t\t%s\n"
 "<span weight=\"bold\">File name:</span>\t%s"
 
-#: src/gtkprefs.c:1917
+#: src/gtkprefs.c:1924
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4198,144 +4243,144 @@
 "<span weight=\"bold\">URL:</span>  %s\n"
 "<span weight=\"bold\">File name:</span>  %s"
 
-#: src/gtkprefs.c:2150
+#: src/gtkprefs.c:2157
 msgid "Load"
 msgstr "Load"
 
-#: src/gtkprefs.c:2164
+#: src/gtkprefs.c:2171
 msgid "Summary"
 msgstr "Summary"
 
-#: src/gtkprefs.c:2212
+#: src/gtkprefs.c:2219
 msgid "Details"
 msgstr "Details"
 
-#: src/gtkprefs.c:2357
+#: src/gtkprefs.c:2379
 msgid "_Edit"
 msgstr "_Edit"
 
-#: src/gtkprefs.c:2393
+#: src/gtkprefs.c:2415
 msgid "Interface"
 msgstr "Interface"
 
-#: src/gtkprefs.c:2396
+#: src/gtkprefs.c:2418
 msgid "Message Text"
 msgstr "Message Text"
 
-#: src/gtkprefs.c:2397
+#: src/gtkprefs.c:2419
 msgid "Shortcuts"
 msgstr "Shortcuts"
 
-#: src/gtkprefs.c:2398
+#: src/gtkprefs.c:2420
 msgid "Smiley Themes"
 msgstr "Smiley Themes"
 
-#: src/gtkprefs.c:2399
+#: src/gtkprefs.c:2421
 msgid "Sounds"
 msgstr "Sounds"
 
-#: src/gtkprefs.c:2400
+#: src/gtkprefs.c:2422
 msgid "Network"
 msgstr "Network"
 
 #. We use the registered default browser in windows
-#: src/gtkprefs.c:2403
+#: src/gtkprefs.c:2425
 msgid "Browser"
 msgstr "Browser"
 
-#: src/gtkprefs.c:2405
+#: src/gtkprefs.c:2427
 msgid "Logging"
 msgstr "Logging"
 
-#: src/gtkprefs.c:2406
+#: src/gtkprefs.c:2428
 msgid "Away / Idle"
 msgstr "Away / Idle"
 
-#: src/gtkprefs.c:2407
+#: src/gtkprefs.c:2429
 msgid "Away Messages"
 msgstr "Away Messages"
 
-#: src/gtkprefs.c:2410
+#: src/gtkprefs.c:2432
 msgid "Plugins"
 msgstr "Plugins"
 
-#: src/gtkprivacy.c:77
+#: src/gtkprivacy.c:78
 msgid "Allow all users to contact me"
 msgstr "Allow all users to contact me"
 
-#: src/gtkprivacy.c:78
+#: src/gtkprivacy.c:79
 msgid "Allow only the users on my buddy list"
 msgstr "Allow only the users on my buddy list"
 
-#: src/gtkprivacy.c:79
+#: src/gtkprivacy.c:80
 msgid "Allow only the users below"
 msgstr "Allow only the users below"
 
-#: src/gtkprivacy.c:80
+#: src/gtkprivacy.c:81
 msgid "Block all users"
 msgstr "Block all users"
 
-#: src/gtkprivacy.c:81
+#: src/gtkprivacy.c:82
 msgid "Block only the users below"
 msgstr "Block only the users below"
 
-#: src/gtkprivacy.c:385 src/protocols/jabber/jabber.c:1466
+#: src/gtkprivacy.c:386 src/protocols/jabber/jabber.c:1466
 msgid "Privacy"
 msgstr "Privacy"
 
-#: src/gtkprivacy.c:398
+#: src/gtkprivacy.c:399
 msgid "Changes to privacy settings take effect immediately."
 msgstr "Changes to privacy settings take effect immediately."
 
 #. "Set privacy for:" label
-#: src/gtkprivacy.c:410
+#: src/gtkprivacy.c:411
 msgid "Set privacy for:"
 msgstr "Set privacy for:"
 
-#: src/gtkprivacy.c:579 src/gtkprivacy.c:595
+#: src/gtkprivacy.c:580 src/gtkprivacy.c:596
 msgid "Permit User"
 msgstr "Permit User"
 
-#: src/gtkprivacy.c:580
+#: src/gtkprivacy.c:581
 msgid "Type a user you permit to contact you."
 msgstr "Type a user you permit to contact you."
 
-#: src/gtkprivacy.c:581
+#: src/gtkprivacy.c:582
 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:584 src/gtkprivacy.c:597
+#: src/gtkprivacy.c:585 src/gtkprivacy.c:598
 msgid "Permit"
 msgstr "Permit"
 
-#: src/gtkprivacy.c:589
+#: src/gtkprivacy.c:590
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "Allow %s to contact you?"
 
-#: src/gtkprivacy.c:591
+#: src/gtkprivacy.c:592
 #, 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:618 src/gtkprivacy.c:631
+#: src/gtkprivacy.c:619 src/gtkprivacy.c:632
 msgid "Block User"
 msgstr "Block User"
 
-#: src/gtkprivacy.c:619
+#: src/gtkprivacy.c:620
 msgid "Type a user to block."
 msgstr "Type a user to block."
 
-#: src/gtkprivacy.c:620
+#: src/gtkprivacy.c:621
 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:627
+#: src/gtkprivacy.c:628
 #, c-format
 msgid "Block %s?"
 msgstr "Block %s?"
 
-#: src/gtkprivacy.c:629
+#: src/gtkprivacy.c:630
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "Are you sure you want to block %s?"
@@ -4343,98 +4388,98 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:239 src/protocols/gg/gg.c:949
-#: src/protocols/novell/novell.c:1864 src/protocols/silc/buddy.c:307
+#: src/gtkrequest.c:240 src/protocols/gg/gg.c:949
+#: src/protocols/novell/novell.c:1890 src/protocols/silc/buddy.c:307
 #: src/protocols/silc/pk.c:116 src/request.h:1234
 msgid "Yes"
 msgstr "Yes"
 
-#: src/gtkrequest.c:240 src/protocols/gg/gg.c:949
-#: src/protocols/novell/novell.c:1865 src/protocols/silc/buddy.c:308
+#: src/gtkrequest.c:241 src/protocols/gg/gg.c:949
+#: src/protocols/novell/novell.c:1891 src/protocols/silc/buddy.c:308
 #: src/protocols/silc/pk.c:117 src/request.h:1234
 msgid "No"
 msgstr "No"
 
-#: src/gtkrequest.c:243
+#: src/gtkrequest.c:244
 msgid "Apply"
 msgstr "Apply"
 
-#: src/gtkrequest.c:244 src/protocols/msn/msn.c:314
+#: src/gtkrequest.c:245 src/protocols/msn/msn.c:314
 #: src/protocols/silc/util.c:332
 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..."
 
-#: src/gtkroomlist.c:330
+#: src/gtkroomlist.c:331
 msgid "Room List"
 msgstr "Room List"
 
 #. list button
-#: src/gtkroomlist.c:401
+#: src/gtkroomlist.c:402
 msgid "_Get List"
 msgstr "_Get List"
 
-#: src/gtksound.c:62
+#: src/gtksound.c:63
 msgid "Buddy logs in"
 msgstr "Buddy logs in"
 
-#: src/gtksound.c:63
+#: src/gtksound.c:64
 msgid "Buddy logs out"
 msgstr "Buddy logs out"
 
-#: src/gtksound.c:64
+#: src/gtksound.c:65
 msgid "Message received"
 msgstr "Message received"
 
-#: src/gtksound.c:65
+#: src/gtksound.c:66
 msgid "Message received begins conversation"
 msgstr "Message received begins conversation"
 
-#: src/gtksound.c:66
+#: src/gtksound.c:67
 msgid "Message sent"
 msgstr "Message sent"
 
-#: src/gtksound.c:67
+#: src/gtksound.c:68
 msgid "Person enters chat"
 msgstr "Person enters chat"
 
-#: src/gtksound.c:68
+#: src/gtksound.c:69
 msgid "Person leaves chat"
 msgstr "Person leaves chat"
 
-#: src/gtksound.c:69
+#: src/gtksound.c:70
 msgid "You talk in chat"
 msgstr "You talk in chat"
 
-#: src/gtksound.c:70
+#: src/gtksound.c:71
 msgid "Others talk in chat"
 msgstr "Others talk in chat"
 
-#: src/gtksound.c:73
+#: src/gtksound.c:74
 msgid "Someone says your name in chat"
 msgstr "Someone says your name in chat"
 
-#: src/gtksound.c:157
+#: src/gtksound.c:158
 #, c-format
 msgid "Unable to play sound because the chosen file (%s) does not exist."
 msgstr "Unable to play sound because the chosen file (%s) does not exist."
 
-#: src/gtksound.c:173
+#: src/gtksound.c:174
 msgid ""
 "Unable to play sound because the 'Command' sound method has been chosen, but "
 "no command has been set."
@@ -4442,7 +4487,7 @@
 "Unable to play sound because the 'Command' sound method has been chosen, but "
 "no command has been set."
 
-#: src/gtksound.c:185
+#: src/gtksound.c:186
 #, c-format
 msgid ""
 "Unable to play sound because the configured sound command could not be "
@@ -4455,11 +4500,11 @@
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color=\"red\">The logger has no read function</font></b>"
 
-#: src/log.c:491
+#: src/log.c:545
 msgid "XML"
 msgstr "XML"
 
-#: src/log.c:577
+#: src/log.c:604
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4468,7 +4513,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
 
-#: src/log.c:579
+#: src/log.c:606
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4477,59 +4522,59 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
 
-#: src/log.c:630 src/log.c:817
+#: src/log.c:657 src/log.c:787
 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:640 src/log.c:829
+#: src/log.c:667 src/log.c:799
 #, 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:677
+#: src/log.c:671
 msgid "HTML"
 msgstr "HTML"
 
-#: src/log.c:762
+#: src/log.c:732
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
-#: src/log.c:862
+#: src/log.c:803
 msgid "Plain text"
 msgstr "Plain text"
 
-#: src/main.c:149
+#: src/main.c:150
 msgid "Please create an account."
 msgstr "Please create an account."
 
-#: src/main.c:231
+#: src/main.c:232
 msgid "Login"
 msgstr "Login"
 
-#: src/main.c:247
+#: src/main.c:248
 msgid "<b>_Account:</b>"
 msgstr "<b>_Account:</b>"
 
-#: src/main.c:261
+#: src/main.c:262
 msgid "<b>_Password:</b>"
 msgstr "<b>_Password:</b>"
 
 #. And now for the buttons
-#: src/main.c:278
+#: src/main.c:279
 msgid "_Accounts"
 msgstr "_Accounts"
 
-#: src/main.c:284
+#: src/main.c:285
 msgid "_Preferences"
 msgstr "_Preferences"
 
-#: src/main.c:290
+#: src/main.c:291
 msgid "_Sign on"
 msgstr "_Sign on"
 
 #. full help text
-#: src/main.c:516
+#: src/main.c:517
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -4563,16 +4608,16 @@
 "  -h, --help          display this help and exit\n"
 
 #. short message
-#: src/main.c:531
+#: 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:844
+#: src/main.c:845
 msgid "Unable to load preferences"
 msgstr "Unable to load preferences"
 
-#: src/main.c:844
+#: 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 "
@@ -4607,10 +4652,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:2767
-#: src/protocols/novell/novell.c:2886 src/protocols/novell/novell.c:2937
-#: src/protocols/oscar/oscar.c:600 src/protocols/yahoo/yahoo.c:2894
-#: src/protocols/yahoo/yahoo.c:3010
+#: src/protocols/msn/state.c:38 src/protocols/novell/novell.c:2795
+#: src/protocols/novell/novell.c:2914 src/protocols/novell/novell.c:2965
+#: src/protocols/oscar/oscar.c:734 src/protocols/yahoo/yahoo.c:2908
+#: src/protocols/yahoo/yahoo.c:3024
 msgid "Available"
 msgstr "Available"
 
@@ -4623,11 +4668,11 @@
 msgstr "Away for friends only"
 
 #: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:964
-#: src/protocols/jabber/presence.c:133 src/protocols/oscar/oscar.c:518
-#: src/protocols/oscar/oscar.c:5409 src/protocols/oscar/oscar.c:5487
-#: src/protocols/oscar/oscar.c:5511 src/protocols/oscar/oscar.c:6707
-#: src/protocols/oscar/oscar.c:6712 src/protocols/yahoo/yahoo.c:2552
-#: src/protocols/yahoo/yahoo.c:2914 src/protocols/yahoo/yahoo.c:3022
+#: src/protocols/jabber/presence.c:133 src/protocols/oscar/oscar.c:652
+#: src/protocols/oscar/oscar.c:5483 src/protocols/oscar/oscar.c:5561
+#: src/protocols/oscar/oscar.c:5585 src/protocols/oscar/oscar.c:6763
+#: src/protocols/oscar/oscar.c:6768 src/protocols/yahoo/yahoo.c:2561
+#: src/protocols/yahoo/yahoo.c:2928 src/protocols/yahoo/yahoo.c:3036
 msgid "Invisible"
 msgstr "Invisible"
 
@@ -4643,7 +4688,7 @@
 msgid "Unable to resolve hostname."
 msgstr "Unable to resolve hostname."
 
-#: src/protocols/gg/gg.c:139 src/protocols/novell/novell.c:1684
+#: src/protocols/gg/gg.c:139 src/protocols/novell/novell.c:1710
 msgid "Unable to connect to server."
 msgstr "Unable to connect to server."
 
@@ -4670,16 +4715,16 @@
 msgid "Unknown Error Code."
 msgstr "Unknown Error Code."
 
-#: src/protocols/gg/gg.c:242 src/protocols/oscar/oscar.c:3817
+#: src/protocols/gg/gg.c:242 src/protocols/oscar/oscar.c:3930
 #, 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:392 src/protocols/oscar/oscar.c:3821
-#: src/protocols/oscar/oscar.c:4042 src/protocols/silc/ops.c:1076
-#: src/protocols/silc/ops.c:1137 src/protocols/toc/toc.c:467
+#: src/protocols/napster/napster.c:392 src/protocols/oscar/oscar.c:3934
+#: src/protocols/oscar/oscar.c:4156 src/protocols/silc/ops.c:1086
+#: src/protocols/silc/ops.c:1148 src/protocols/toc/toc.c:467
 #: src/protocols/zephyr/zephyr.c:643
 msgid "Buddy Information"
 msgstr "Buddy Information"
@@ -4765,26 +4810,26 @@
 msgid "Active"
 msgstr "Active"
 
-#: src/protocols/gg/gg.c:953 src/protocols/oscar/oscar.c:4852
+#: src/protocols/gg/gg.c:953 src/protocols/oscar/oscar.c:4966
 msgid "UIN"
 msgstr "UIN"
 
 #. First Name
 #: src/protocols/gg/gg.c:957 src/protocols/jabber/jabber.c:613
-#: src/protocols/oscar/oscar.c:4863 src/protocols/silc/ops.c:799
+#: src/protocols/oscar/oscar.c:4977 src/protocols/silc/ops.c:808
 #: 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:4864 src/protocols/trepia/trepia.c:274
+#: src/protocols/oscar/oscar.c:4978 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:182 src/protocols/oscar/oscar.c:4853
-#: src/protocols/silc/ops.c:1193
+#: src/protocols/gg/gg.c:966 src/protocols/gg/gg.c:1708
+#: src/protocols/irc/msgs.c:182 src/protocols/oscar/oscar.c:4967
+#: src/protocols/silc/ops.c:1204
 msgid "Nick"
 msgstr "Nick"
 
@@ -4799,7 +4844,7 @@
 
 #. City
 #: src/protocols/gg/gg.c:990 src/protocols/jabber/jabber.c:628
-#: src/protocols/oscar/oscar.c:4907 src/protocols/oscar/oscar.c:4915
+#: src/protocols/oscar/oscar.c:5021 src/protocols/oscar/oscar.c:5029
 #: src/protocols/trepia/trepia.c:331 src/protocols/trepia/trepia.c:410
 msgid "City"
 msgstr "City"
@@ -4904,7 +4949,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:1562
 msgid "Change Password"
 msgstr "Change Password"
 
@@ -4942,8 +4987,7 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: src/protocols/gg/gg.c:1686 src/protocols/gg/gg.c:1688
+#: src/protocols/gg/gg.c:1687 src/protocols/gg/gg.c:1689
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu Protocol Plugin"
 
@@ -4956,15 +5000,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:296 src/protocols/jabber/presence.c:240
-#: src/protocols/msn/userlist.c:100 src/protocols/oscar/oscar.c:3556
-#: src/protocols/oscar/oscar.c:6141
+#: src/protocols/icq/gaim_icq.c:296 src/protocols/jabber/presence.c:241
+#: src/protocols/msn/userlist.c:100 src/protocols/oscar/oscar.c:3669
+#: src/protocols/oscar/oscar.c:6215
 msgid "Authorize"
 msgstr "Authorise"
 
-#: src/protocols/icq/gaim_icq.c:296 src/protocols/jabber/presence.c:241
-#: src/protocols/msn/userlist.c:101 src/protocols/oscar/oscar.c:3558
-#: src/protocols/oscar/oscar.c:6142
+#: src/protocols/icq/gaim_icq.c:296 src/protocols/jabber/presence.c:242
+#: src/protocols/msn/userlist.c:101 src/protocols/oscar/oscar.c:3671
+#: src/protocols/oscar/oscar.c:6216
 msgid "Deny"
 msgstr "Deny"
 
@@ -4984,19 +5028,19 @@
 msgid "Gaim User"
 msgstr "Gaim User"
 
-#: src/protocols/irc/cmds.c:43 src/protocols/silc/silc.c:1292
+#: src/protocols/irc/cmds.c:43 src/protocols/silc/silc.c:1294
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Unknown command: %s"
 
-#: src/protocols/irc/cmds.c:448 src/protocols/jabber/chat.c:536
-#: src/protocols/silc/silc.c:1001
+#: src/protocols/irc/cmds.c:450 src/protocols/jabber/chat.c:562
+#: src/protocols/silc/silc.c:1002
 #, c-format
 msgid "current topic is: %s"
 msgstr "current topic is: %s"
 
-#: src/protocols/irc/cmds.c:451 src/protocols/jabber/chat.c:538
-#: src/protocols/silc/silc.c:1004
+#: src/protocols/irc/cmds.c:454 src/protocols/jabber/chat.c:566
+#: src/protocols/silc/silc.c:1006
 msgid "No topic is set"
 msgstr "No topic is set"
 
@@ -5028,7 +5072,7 @@
 msgid "MOTD for %s"
 msgstr "MOTD for %s"
 
-#: src/protocols/irc/irc.c:92 src/protocols/irc/irc.c:387
+#: src/protocols/irc/irc.c:92 src/protocols/irc/irc.c:399
 msgid "Server has disconnected"
 msgstr "Server has disconnected"
 
@@ -5040,39 +5084,39 @@
 msgid "_Channel:"
 msgstr "_Channel:"
 
-#: src/protocols/irc/irc.c:184 src/protocols/jabber/chat.c:59
+#: src/protocols/irc/irc.c:184 src/protocols/jabber/chat.c:56
 msgid "_Password:"
 msgstr "_Password:"
 
-#: src/protocols/irc/irc.c:204
+#: src/protocols/irc/irc.c:216
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC nicks may not contain whitespace"
 
-#: src/protocols/irc/irc.c:223 src/protocols/toc/toc.c:197
+#: src/protocols/irc/irc.c:235 src/protocols/toc/toc.c:197
 #, c-format
 msgid "Signon: %s"
 msgstr "Signon: %s"
 
-#: src/protocols/irc/irc.c:232
+#: src/protocols/irc/irc.c:244
 msgid "Couldn't create socket"
 msgstr "Couldn't create socket"
 
-#: src/protocols/irc/irc.c:247 src/protocols/jabber/jabber.c:297
-#: src/protocols/oscar/oscar.c:1517 src/protocols/oscar/oscar.c:1581
+#: src/protocols/irc/irc.c:259 src/protocols/jabber/jabber.c:297
+#: src/protocols/oscar/oscar.c:1651 src/protocols/oscar/oscar.c:1715
 msgid "Couldn't connect to host"
 msgstr "Couldn't connect to host"
 
-#: src/protocols/irc/irc.c:384 src/protocols/trepia/trepia.c:926
+#: src/protocols/irc/irc.c:396 src/protocols/trepia/trepia.c:926
 msgid "Read error"
 msgstr "Read error"
 
-#: src/protocols/irc/irc.c:535 src/protocols/silc/chat.c:1356
-#: src/protocols/yahoo/yahoochat.c:1379
+#: src/protocols/irc/irc.c:547 src/protocols/silc/chat.c:1368
+#: src/protocols/yahoo/yahoochat.c:1393
 msgid "Users"
 msgstr "Users"
 
-#: src/protocols/irc/irc.c:538 src/protocols/silc/chat.c:1359
-#: src/protocols/silc/ops.c:1155 src/protocols/yahoo/yahoochat.c:1388
+#: src/protocols/irc/irc.c:550 src/protocols/silc/chat.c:1371
+#: src/protocols/silc/ops.c:1166 src/protocols/yahoo/yahoochat.c:1402
 msgid "Topic"
 msgstr "Topic"
 
@@ -5085,35 +5129,36 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:642
+#: src/protocols/irc/irc.c:655
 msgid "IRC Protocol Plugin"
 msgstr "IRC Protocol Plugin"
 
 #. *  summary
-#: src/protocols/irc/irc.c:643
+#: src/protocols/irc/irc.c:656
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "The IRC Protocol Plugin that Sucks Less"
 
-#: src/protocols/irc/irc.c:662 src/protocols/irc/msgs.c:201
-#: src/protocols/jabber/jabber.c:1576 src/protocols/napster/napster.c:643
-#: src/protocols/silc/ops.c:1017 src/protocols/silc/ops.c:1119
+#: src/protocols/irc/irc.c:675 src/protocols/irc/msgs.c:201
+#: src/protocols/jabber/jabber.c:1577 src/protocols/napster/napster.c:656
+#: src/protocols/silc/ops.c:1026 src/protocols/silc/ops.c:1129
 msgid "Server"
 msgstr "Server"
 
-#: src/protocols/irc/irc.c:665 src/protocols/jabber/jabber.c:1597
-#: src/protocols/msn/msn.c:1759 src/protocols/napster/napster.c:648
-#: src/protocols/silc/silc.c:1583 src/protocols/trepia/trepia.c:1297
+#: src/protocols/irc/irc.c:678 src/protocols/jabber/jabber.c:1598
+#: src/protocols/msn/msn.c:1760 src/protocols/napster/napster.c:661
+#: src/protocols/silc/silc.c:1586 src/protocols/trepia/trepia.c:1298
 msgid "Port"
 msgstr "Port"
 
-#: src/protocols/irc/irc.c:668 src/protocols/zephyr/zephyr.c:1918
+#: src/protocols/irc/irc.c:681 src/protocols/oscar/oscar.c:7349
+#: src/protocols/zephyr/zephyr.c:1922
 msgid "Encoding"
 msgstr "Encoding"
 
-#: src/protocols/irc/irc.c:671 src/protocols/irc/msgs.c:195
+#: src/protocols/irc/irc.c:684 src/protocols/irc/msgs.c:195
 #: src/protocols/jabber/jabber.c:588 src/protocols/silc/buddy.c:1445
-#: src/protocols/silc/ops.c:964 src/protocols/silc/ops.c:966
-#: src/protocols/silc/ops.c:1113 src/protocols/silc/ops.c:1115
+#: src/protocols/silc/ops.c:973 src/protocols/silc/ops.c:975
+#: src/protocols/silc/ops.c:1123 src/protocols/silc/ops.c:1125
 msgid "Username"
 msgstr "Username"
 
@@ -5151,12 +5196,12 @@
 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
+#: src/protocols/irc/msgs.c:196 src/protocols/silc/ops.c:967
+#: src/protocols/silc/ops.c:1117 src/protocols/yahoo/yahoo_profile.c:1005
 msgid "Realname"
 msgstr "Realname"
 
-#: src/protocols/irc/msgs.c:207 src/protocols/silc/ops.c:1030
+#: src/protocols/irc/msgs.c:207 src/protocols/silc/ops.c:1039
 msgid "Currently on"
 msgstr "Currently on"
 
@@ -5178,111 +5223,111 @@
 msgid "Buddy Information for %s"
 msgstr "Buddy Information for %s"
 
-#: src/protocols/irc/msgs.c:284
+#: src/protocols/irc/msgs.c:286
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s has changed the topic to: %s"
 
-#: src/protocols/irc/msgs.c:289
+#: src/protocols/irc/msgs.c:291
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "The topic for %s is: %s"
 
-#: src/protocols/irc/msgs.c:306
+#: src/protocols/irc/msgs.c:308
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Unknown message '%s'"
 
-#: src/protocols/irc/msgs.c:307
+#: src/protocols/irc/msgs.c:309
 msgid "Unknown message"
 msgstr "Unknown message"
 
-#: src/protocols/irc/msgs.c:307
+#: src/protocols/irc/msgs.c:309
 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:330
+#: src/protocols/irc/msgs.c:332
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Users on %s: %s"
 
-#: src/protocols/irc/msgs.c:424
+#: src/protocols/irc/msgs.c:426
 msgid "No such channel"
 msgstr "No such channel"
 
 #. does this happen?
-#: src/protocols/irc/msgs.c:435
+#: src/protocols/irc/msgs.c:437
 msgid "no such channel"
 msgstr "no such channel"
 
-#: src/protocols/irc/msgs.c:438
+#: src/protocols/irc/msgs.c:440
 msgid "User is not logged in"
 msgstr "User is not logged in"
 
-#: src/protocols/irc/msgs.c:443
+#: src/protocols/irc/msgs.c:445
 msgid "No such nick or channel"
 msgstr "No such nick or channel"
 
-#: src/protocols/irc/msgs.c:463
+#: src/protocols/irc/msgs.c:465
 msgid "Could not send"
 msgstr "Could not send"
 
-#: src/protocols/irc/msgs.c:519
+#: src/protocols/irc/msgs.c:521
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Joining %s requires an invitation."
 
-#: src/protocols/irc/msgs.c:520
+#: src/protocols/irc/msgs.c:522
 msgid "Invitation only"
 msgstr "Invitation only"
 
-#: src/protocols/irc/msgs.c:623
+#: src/protocols/irc/msgs.c:625
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "You have been kicked by %s: (%s)"
 
-#: src/protocols/irc/msgs.c:628
+#: src/protocols/irc/msgs.c:630
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Kicked by %s (%s)"
 
-#: src/protocols/irc/msgs.c:649
+#: src/protocols/irc/msgs.c:651
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "mode (%s %s) by %s"
 
-#: src/protocols/irc/msgs.c:758
+#: src/protocols/irc/msgs.c:760
 msgid "Could not change nick"
 msgstr "Could not change nick"
 
-#: src/protocols/irc/msgs.c:759
+#: src/protocols/irc/msgs.c:761
 msgid "Cannot change nick"
 msgstr "Cannot change nick"
 
-#: src/protocols/irc/msgs.c:780
+#: src/protocols/irc/msgs.c:782
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "You have parted the channel%s%s"
 
-#: src/protocols/irc/msgs.c:820
+#: src/protocols/irc/msgs.c:822
 msgid "Error: invalid PONG from server"
 msgstr "Error: invalid PONG from server"
 
-#: src/protocols/irc/msgs.c:822
+#: src/protocols/irc/msgs.c:824
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING reply -- Lag: %lu seconds"
 
-#: src/protocols/irc/msgs.c:897
+#: src/protocols/irc/msgs.c:899
 #, c-format
 msgid "Cannot join %s:"
 msgstr "Cannot join %s:"
 
-#: src/protocols/irc/msgs.c:898 src/protocols/silc/ops.c:903
+#: src/protocols/irc/msgs.c:900 src/protocols/silc/ops.c:912
 msgid "Cannot join channel"
 msgstr "Cannot join channel"
 
-#: src/protocols/irc/msgs.c:934
+#: src/protocols/irc/msgs.c:936
 #, c-format
 msgid "Wallops from %s"
 msgstr "Wallops from %s"
@@ -5490,7 +5535,7 @@
 msgid "CTCP PING reply"
 msgstr "CTCP PING reply"
 
-#: src/protocols/irc/parse.c:497 src/protocols/oscar/oscar.c:1414
+#: src/protocols/irc/parse.c:497 src/protocols/oscar/oscar.c:1548
 #: src/protocols/toc/toc.c:187 src/protocols/toc/toc.c:595
 #: src/protocols/toc/toc.c:611 src/protocols/toc/toc.c:688
 msgid "Disconnected."
@@ -5526,12 +5571,12 @@
 msgstr "Invalid challenge from server"
 
 #: src/protocols/jabber/buddy.c:246 src/protocols/jabber/buddy.c:604
-#: src/protocols/silc/ops.c:795
+#: src/protocols/silc/ops.c:804
 msgid "Full Name"
 msgstr "Full Name"
 
 #: src/protocols/jabber/buddy.c:247 src/protocols/jabber/buddy.c:617
-#: src/protocols/silc/ops.c:807
+#: src/protocols/silc/ops.c:816
 msgid "Family Name"
 msgstr "Family Name"
 
@@ -5541,8 +5586,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:811
-#: src/protocols/silc/ops.c:954 src/protocols/silc/ops.c:1103
+#: src/protocols/silc/buddy.c:1442 src/protocols/silc/ops.c:820
+#: src/protocols/silc/ops.c:963 src/protocols/silc/ops.c:1113
 #: src/protocols/yahoo/yahoo_profile.c:1000
 msgid "Nickname"
 msgstr "Nickname"
@@ -5598,6 +5643,7 @@
 msgstr "Organisation Unit"
 
 #: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:742
+#: src/protocols/novell/novell.c:1450
 msgid "Title"
 msgstr "Title"
 
@@ -5606,7 +5652,7 @@
 msgstr "Role"
 
 #: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:638
-#: src/protocols/oscar/oscar.c:4888
+#: src/protocols/oscar/oscar.c:5002
 msgid "Birthday"
 msgstr "Birthday"
 
@@ -5628,24 +5674,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:2789
-#: src/protocols/novell/novell.c:2793 src/protocols/oscar/oscar.c:560
-#: src/protocols/oscar/oscar.c:566 src/protocols/oscar/oscar.c:568
-#: src/protocols/yahoo/yahoo.c:2677
+#: src/protocols/msn/msn.c:450 src/protocols/novell/novell.c:2817
+#: src/protocols/novell/novell.c:2821 src/protocols/oscar/oscar.c:694
+#: src/protocols/oscar/oscar.c:700 src/protocols/oscar/oscar.c:702
+#: src/protocols/yahoo/yahoo.c:2686
 msgid "Status"
 msgstr "Status"
 
-#: src/protocols/jabber/buddy.c:579 src/protocols/jabber/jabber.c:1579
+#: src/protocols/jabber/buddy.c:579 src/protocols/jabber/jabber.c:1580
 msgid "Resource"
 msgstr "Resource"
 
-#: src/protocols/jabber/buddy.c:625 src/protocols/silc/ops.c:803
+#: src/protocols/jabber/buddy.c:625 src/protocols/silc/ops.c:812
 msgid "Middle Name"
 msgstr "Middle Name"
 
 #: src/protocols/jabber/buddy.c:643 src/protocols/jabber/jabber.c:623
-#: src/protocols/oscar/oscar.c:4906 src/protocols/oscar/oscar.c:4914
-#: src/protocols/silc/ops.c:839
+#: src/protocols/oscar/oscar.c:5020 src/protocols/oscar/oscar.c:5028
+#: src/protocols/silc/ops.c:848
 msgid "Address"
 msgstr "Address"
 
@@ -5689,90 +5735,91 @@
 msgid "Unsubscribe"
 msgstr "Unsubscribe"
 
-#: src/protocols/jabber/chat.c:42 src/protocols/yahoo/yahoochat.c:1001
+#: src/protocols/jabber/chat.c:41 src/protocols/oscar/oscar.c:6286
+#: src/protocols/yahoo/yahoochat.c:1003
 msgid "_Room:"
 msgstr "_Room:"
 
-#: src/protocols/jabber/chat.c:47
+#: src/protocols/jabber/chat.c:46
 msgid "_Server:"
 msgstr "_Server:"
 
-#: src/protocols/jabber/chat.c:53
+#: src/protocols/jabber/chat.c:51
 msgid "_Handle:"
 msgstr "_Handle:"
 
-#: src/protocols/jabber/chat.c:176
+#: src/protocols/jabber/chat.c:200
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s is not a valid room name"
 
-#: src/protocols/jabber/chat.c:177
+#: src/protocols/jabber/chat.c:201
 msgid "Invalid Room Name"
 msgstr "Invalid Room Name"
 
-#: src/protocols/jabber/chat.c:182
+#: src/protocols/jabber/chat.c:206
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s is not a valid server name"
 
-#: src/protocols/jabber/chat.c:183 src/protocols/jabber/chat.c:184
+#: src/protocols/jabber/chat.c:207 src/protocols/jabber/chat.c:208
 msgid "Invalid Server Name"
 msgstr "Invalid Server Name"
 
-#: src/protocols/jabber/chat.c:188
+#: src/protocols/jabber/chat.c:212
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s is not a valid room handle"
 
-#: src/protocols/jabber/chat.c:189 src/protocols/jabber/chat.c:190
+#: src/protocols/jabber/chat.c:213 src/protocols/jabber/chat.c:214
 msgid "Invalid Room Handle"
 msgstr "Invalid Room Handle"
 
-#: src/protocols/jabber/chat.c:341
+#: src/protocols/jabber/chat.c:365
 msgid "Configuration error"
 msgstr "Configuration error"
 
-#: src/protocols/jabber/chat.c:350 src/protocols/jabber/chat.c:495
+#: src/protocols/jabber/chat.c:374 src/protocols/jabber/chat.c:519
 msgid "Unable to configure"
 msgstr "Unable to configure"
 
-#: src/protocols/jabber/chat.c:366
+#: src/protocols/jabber/chat.c:390
 msgid "Room Configuration Error"
 msgstr "Room Configuration Error"
 
-#: src/protocols/jabber/chat.c:367
+#: src/protocols/jabber/chat.c:391
 msgid "This room is not capable of being configured"
 msgstr "This room is not capable of being configured"
 
-#: src/protocols/jabber/chat.c:417 src/protocols/jabber/chat.c:486
+#: src/protocols/jabber/chat.c:441 src/protocols/jabber/chat.c:510
 msgid "Registration error"
 msgstr "Registration error"
 
-#: src/protocols/jabber/chat.c:565
+#: src/protocols/jabber/chat.c:593
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "Nick changing not supported in non-MUC chatrooms"
 
-#: src/protocols/jabber/chat.c:609 src/protocols/jabber/chat.c:620
+#: src/protocols/jabber/chat.c:637 src/protocols/jabber/chat.c:648
 msgid "Roomlist Error"
 msgstr "Roomlist Error"
 
-#: src/protocols/jabber/chat.c:610 src/protocols/jabber/chat.c:621
+#: src/protocols/jabber/chat.c:638 src/protocols/jabber/chat.c:649
 msgid "Error retreiving roomlist"
 msgstr "Error retreiving roomlist"
 
-#: src/protocols/jabber/chat.c:661
+#: src/protocols/jabber/chat.c:689
 msgid "Invalid Server"
 msgstr "Invalid Server"
 
-#: src/protocols/jabber/chat.c:698
+#: src/protocols/jabber/chat.c:726
 msgid "Enter a Conference Server"
 msgstr "Enter a Conference Server"
 
-#: src/protocols/jabber/chat.c:699
+#: src/protocols/jabber/chat.c:727
 msgid "Select a conference server to query"
 msgstr "Select a conference server to query"
 
-#: src/protocols/jabber/chat.c:702
+#: src/protocols/jabber/chat.c:730
 msgid "Find Rooms"
 msgstr "Find Rooms"
 
@@ -5842,13 +5889,13 @@
 msgstr "E-Mail"
 
 #. State
-#: src/protocols/jabber/jabber.c:633 src/protocols/oscar/oscar.c:4908
-#: src/protocols/oscar/oscar.c:4916 src/protocols/trepia/trepia.c:335
+#: src/protocols/jabber/jabber.c:633 src/protocols/oscar/oscar.c:5022
+#: src/protocols/oscar/oscar.c:5030 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:844
+#: src/protocols/jabber/jabber.c:643 src/protocols/silc/ops.c:853
 #: src/protocols/silc/silc.c:645 src/protocols/silc/util.c:510
 msgid "Phone"
 msgstr "Telephone"
@@ -5871,9 +5918,9 @@
 
 #. connect to the server
 #: src/protocols/jabber/jabber.c:783 src/protocols/msn/msn.c:608
-#: src/protocols/napster/napster.c:498 src/protocols/novell/novell.c:2122
-#: src/protocols/oscar/oscar.c:1585 src/protocols/trepia/trepia.c:1064
-#: src/protocols/yahoo/yahoo.c:2422 src/protocols/zephyr/zephyr.c:1017
+#: src/protocols/napster/napster.c:498 src/protocols/novell/novell.c:2150
+#: src/protocols/oscar/oscar.c:1719 src/protocols/trepia/trepia.c:1064
+#: src/protocols/yahoo/yahoo.c:2422 src/protocols/zephyr/zephyr.c:1020
 msgid "Connecting"
 msgstr "Connecting"
 
@@ -5891,7 +5938,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:566 src/protocols/oscar/oscar.c:6510
+#: src/protocols/oscar/oscar.c:700 src/protocols/oscar/oscar.c:6566
 msgid "Not Authorized"
 msgstr "Not Authorised"
 
@@ -5935,8 +5982,8 @@
 
 #: src/protocols/jabber/jabber.c:962 src/protocols/jabber/jutil.c:41
 #: src/protocols/jabber/presence.c:70 src/protocols/jabber/presence.c:131
-#: src/protocols/oscar/oscar.c:508 src/protocols/oscar/oscar.c:5499
-#: src/protocols/oscar/oscar.c:6703
+#: src/protocols/oscar/oscar.c:642 src/protocols/oscar/oscar.c:5573
+#: src/protocols/oscar/oscar.c:6759
 msgid "Do Not Disturb"
 msgstr "Do Not Disturb"
 
@@ -5964,7 +6011,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:1552
 msgid "Set User Info"
 msgstr "Set User Info"
 
@@ -6084,7 +6131,7 @@
 msgid "Resource Conflict"
 msgstr "Resource Conflict"
 
-#: src/protocols/jabber/jabber.c:1215 src/protocols/silc/ops.c:1500
+#: src/protocols/jabber/jabber.c:1215 src/protocols/silc/ops.c:1511
 msgid "Connection Timeout"
 msgstr "Connection Timeout"
 
@@ -6230,25 +6277,24 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: src/protocols/jabber/jabber.c:1554 src/protocols/jabber/jabber.c:1556
+#: src/protocols/jabber/jabber.c:1555 src/protocols/jabber/jabber.c:1557
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber Protocol Plugin"
 
-#: src/protocols/jabber/jabber.c:1582
+#: src/protocols/jabber/jabber.c:1583
 msgid "Use TLS if available"
 msgstr "Use TLS if available"
 
-#: src/protocols/jabber/jabber.c:1587
+#: src/protocols/jabber/jabber.c:1588
 msgid "Force old SSL"
 msgstr "Force old SSL"
 
-#: src/protocols/jabber/jabber.c:1592
+#: src/protocols/jabber/jabber.c:1593
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Allow plaintext auth over unencrypted streams"
 
 #. Account options
-#: src/protocols/jabber/jabber.c:1601 src/protocols/silc/silc.c:1579
+#: src/protocols/jabber/jabber.c:1602 src/protocols/silc/silc.c:1582
 msgid "Connect server"
 msgstr "Connect server"
 
@@ -6257,26 +6303,26 @@
 msgid "Message from %s"
 msgstr "Message from %s"
 
-#: src/protocols/jabber/message.c:173
+#: src/protocols/jabber/message.c:175
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s has set the topic to: %s"
 
-#: src/protocols/jabber/message.c:175
+#: src/protocols/jabber/message.c:177
 #, c-format
 msgid "The topic is: %s"
 msgstr "The topic is: %s"
 
-#: src/protocols/jabber/message.c:226
+#: src/protocols/jabber/message.c:230
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "Message delivery to %s failed: %s"
 
-#: src/protocols/jabber/message.c:229
+#: src/protocols/jabber/message.c:233
 msgid "Jabber Message Error"
 msgstr "Jabber Message Error"
 
-#: src/protocols/jabber/message.c:293
+#: src/protocols/jabber/message.c:297
 #, c-format
 msgid " (Code %s)"
 msgstr " (Code %s)"
@@ -6285,20 +6331,20 @@
 msgid "XML Parse error"
 msgstr "XML Parse error"
 
-#: src/protocols/jabber/presence.c:232
+#: src/protocols/jabber/presence.c:233
 msgid "Unknown Error in presence"
 msgstr "Unknown Error in presence"
 
-#: src/protocols/jabber/presence.c:235
+#: src/protocols/jabber/presence.c:236
 #, 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:285 src/protocols/jabber/presence.c:286
+#: src/protocols/jabber/presence.c:289 src/protocols/jabber/presence.c:290
 msgid "Create New Room"
 msgstr "Create New Room"
 
-#: src/protocols/jabber/presence.c:287
+#: src/protocols/jabber/presence.c:291
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -6306,20 +6352,20 @@
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
 
-#: src/protocols/jabber/presence.c:289
+#: src/protocols/jabber/presence.c:293
 msgid "Configure Room"
 msgstr "Configure Room"
 
-#: src/protocols/jabber/presence.c:291
+#: src/protocols/jabber/presence.c:295
 msgid "Accept Defaults"
 msgstr "Accept Defaults"
 
-#: src/protocols/jabber/presence.c:319
+#: src/protocols/jabber/presence.c:323
 #, c-format
 msgid "Error in chat %s"
 msgstr "Error in chat %s"
 
-#: src/protocols/jabber/presence.c:322
+#: src/protocols/jabber/presence.c:326
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Error joining chat %s"
@@ -6441,7 +6487,7 @@
 msgid "Too many hits to a FND"
 msgstr "Too many hits to a FND"
 
-#: src/protocols/msn/error.c:112 src/protocols/oscar/oscar.c:188
+#: src/protocols/msn/error.c:112 src/protocols/oscar/oscar.c:189
 msgid "Not logged in"
 msgstr "Not logged in"
 
@@ -6534,8 +6580,8 @@
 msgid "Server too busy"
 msgstr "Server too busy"
 
-#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2014
-#: src/protocols/silc/ops.c:1489 src/protocols/toc/toc.c:629
+#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2150
+#: src/protocols/silc/ops.c:1500 src/protocols/toc/toc.c:629
 msgid "Authentication failed"
 msgstr "Authentication failed"
 
@@ -6621,7 +6667,7 @@
 msgid "Page"
 msgstr "Page"
 
-#: src/protocols/msn/msn.c:450 src/protocols/yahoo/yahoo.c:2677
+#: src/protocols/msn/msn.c:450 src/protocols/yahoo/yahoo.c:2686
 #, c-format
 msgid ""
 "\n"
@@ -6636,34 +6682,34 @@
 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:2534
-#: src/protocols/yahoo/yahoo.c:2896 src/protocols/yahoo/yahoo.c:3012
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2543
+#: src/protocols/yahoo/yahoo.c:2910 src/protocols/yahoo/yahoo.c:3026
 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:2773
-#: src/protocols/novell/novell.c:2888 src/protocols/novell/novell.c:2942
+#: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2801
+#: src/protocols/novell/novell.c:2916 src/protocols/novell/novell.c:2970
 #: src/protocols/silc/buddy.c:1383 src/protocols/silc/silc.c:47
-#: src/protocols/silc/silc.c:78 src/protocols/yahoo/yahoo.c:2536
-#: src/protocols/yahoo/yahoo.c:2898 src/protocols/yahoo/yahoo.c:3013
+#: src/protocols/silc/silc.c:78 src/protocols/yahoo/yahoo.c:2545
+#: src/protocols/yahoo/yahoo.c:2912 src/protocols/yahoo/yahoo.c:3027
 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:2544
-#: src/protocols/yahoo/yahoo.c:2906 src/protocols/yahoo/yahoo.c:3017
+#: src/protocols/msn/state.c:35 src/protocols/yahoo/yahoo.c:2553
+#: src/protocols/yahoo/yahoo.c:2920 src/protocols/yahoo/yahoo.c:3031
 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:2548
-#: src/protocols/yahoo/yahoo.c:2910 src/protocols/yahoo/yahoo.c:3019
+#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2557
+#: src/protocols/yahoo/yahoo.c:2924 src/protocols/yahoo/yahoo.c:3033
 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:1357 src/protocols/zephyr/zephyr.c:1376
+#: src/protocols/zephyr/zephyr.c:1360 src/protocols/zephyr/zephyr.c:1379
 msgid "Hidden"
 msgstr "Hidden"
 
@@ -6734,14 +6780,14 @@
 msgstr "Error retreiving profile"
 
 #. Age
-#: src/protocols/msn/msn.c:1318 src/protocols/oscar/oscar.c:4893
+#: src/protocols/msn/msn.c:1318 src/protocols/oscar/oscar.c:5007
 #: 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:4879
+#: src/protocols/msn/msn.c:1325 src/protocols/oscar/oscar.c:4993
 #: src/protocols/trepia/trepia.c:279 src/protocols/trepia/trepia.c:406
 #: src/protocols/yahoo/yahoo_profile.c:1025
 msgid "Gender"
@@ -6751,7 +6797,8 @@
 msgid "Marital Status"
 msgstr "Marital Status"
 
-#: src/protocols/msn/msn.c:1341 src/protocols/yahoo/yahoo_profile.c:1010
+#: src/protocols/msn/msn.c:1341 src/protocols/novell/novell.c:1444
+#: src/protocols/yahoo/yahoo_profile.c:1010
 msgid "Location"
 msgstr "Location"
 
@@ -6785,7 +6832,7 @@
 msgstr "Last Updated"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1479 src/protocols/silc/ops.c:835
+#: src/protocols/msn/msn.c:1479 src/protocols/silc/ops.c:844
 #: src/protocols/trepia/trepia.c:289 src/protocols/trepia/trepia.c:419
 msgid "Homepage"
 msgstr "Homepage"
@@ -6804,6 +6851,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 "
@@ -6834,16 +6882,15 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: src/protocols/msn/msn.c:1733 src/protocols/msn/msn.c:1735
+#: src/protocols/msn/msn.c:1734 src/protocols/msn/msn.c:1736
 msgid "MSN Protocol Plugin"
 msgstr "MSN Protocol Plugin"
 
-#: src/protocols/msn/msn.c:1754 src/protocols/trepia/trepia.c:1292
+#: src/protocols/msn/msn.c:1755 src/protocols/trepia/trepia.c:1293
 msgid "Login server"
 msgstr "Login server"
 
-#: src/protocols/msn/msn.c:1763
+#: src/protocols/msn/msn.c:1764
 msgid "Use HTTP Method"
 msgstr "Use HTTP Method"
 
@@ -6864,7 +6911,7 @@
 msgstr "Retrieving buddy list"
 
 #: src/protocols/msn/notification.c:144 src/protocols/msn/notification.c:173
-#: src/protocols/oscar/oscar.c:2304
+#: src/protocols/oscar/oscar.c:2440
 msgid "Password sent"
 msgstr "Password sent"
 
@@ -6996,8 +7043,7 @@
 msgid "%s requested a PING"
 msgstr "%s requested a PING"
 
-#: src/protocols/napster/napster.c:540 src/protocols/oscar/oscar.c:6212
-#: src/protocols/toc/toc.c:1266
+#: src/protocols/napster/napster.c:540 src/protocols/toc/toc.c:1266
 msgid "_Group:"
 msgstr "_Group:"
 
@@ -7011,8 +7057,7 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: src/protocols/napster/napster.c:623 src/protocols/napster/napster.c:625
+#: src/protocols/napster/napster.c:636 src/protocols/napster/napster.c:638
 msgid "NAPSTER Protocol Plugin"
 msgstr "NAPSTER Protocol Plugin"
 
@@ -7166,7 +7211,7 @@
 msgid "Unable to send message (%s)."
 msgstr "Unable to send message (%s)."
 
-#: src/protocols/novell/novell.c:475 src/protocols/novell/novell.c:968
+#: src/protocols/novell/novell.c:475 src/protocols/novell/novell.c:969
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "Unable to invite user (%s)."
@@ -7199,96 +7244,117 @@
 "Unable to add %s to your buddy list. Error creating folder in server side "
 "list (%s)."
 
-#: src/protocols/novell/novell.c:686
+#: 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:732 src/protocols/novell/novell.c:878
+#: 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:779
+#: 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:832
+#: 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:900
+#: 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:923 src/protocols/novell/novell.c:1593
+#: src/protocols/novell/novell.c:924 src/protocols/novell/novell.c:1619
 #, 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:995
+#: 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:1106 src/protocols/novell/novell.c:1632
+#: src/protocols/novell/novell.c:1107 src/protocols/novell/novell.c:1658
 msgid "Error communicating with server. Closing connection."
 msgstr "Error communicating with server. Closing connection."
 
-#: src/protocols/novell/novell.c:1445
-msgid "Userid"
+#: src/protocols/novell/novell.c:1442
+msgid "Telephone Number"
+msgstr "Telephone Number"
+
+#: src/protocols/novell/novell.c:1446
+msgid "Department"
+msgstr "Department"
+
+#: src/protocols/novell/novell.c:1448
+msgid "Personal Title"
+msgstr "Personal Title"
+
+#: src/protocols/novell/novell.c:1452
+msgid "Mailstop"
+msgstr "Mailstop"
+
+#: src/protocols/novell/novell.c:1454 src/protocols/oscar/oscar.c:4980
+#: src/protocols/oscar/oscar.c:4987
+msgid "Email Address"
+msgstr "Email Address"
+
+#: src/protocols/novell/novell.c:1470
+msgid "User ID"
 msgstr "User ID"
 
 #. tag = _("DN");
 #. value = nm_user_record_get_dn(user_record);
 #. if (value) {
-#. g_string_append_printf(info_text, "<b>%s:</b> %s<br/>\n",
+#. g_string_append_printf(info_text, "<b>%s:</b> %s<br>",
 #. tag, value);
 #. }
 #.
-#: src/protocols/novell/novell.c:1459
+#: src/protocols/novell/novell.c:1484
 msgid "Full name"
 msgstr "Full name"
 
-#: src/protocols/novell/novell.c:1479
+#: src/protocols/novell/novell.c:1505
 msgid "User Properties"
 msgstr "User Properties"
 
-#: src/protocols/novell/novell.c:1583
+#: src/protocols/novell/novell.c:1609
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "GroupWise Conference %d"
 
-#: src/protocols/novell/novell.c:1608
+#: src/protocols/novell/novell.c:1634
 msgid "Unable to make SSL connection to server."
 msgstr "Unable to make SSL connection to server."
 
-#: src/protocols/novell/novell.c:1638
+#: src/protocols/novell/novell.c:1664
 #, c-format
 msgid "Error processing event or response (%s)."
 msgstr "Error processing event or response (%s)."
 
-#: src/protocols/novell/novell.c:1672
+#: src/protocols/novell/novell.c:1698
 msgid "Authenticating..."
 msgstr "Authenticating..."
 
-#: src/protocols/novell/novell.c:1687
+#: src/protocols/novell/novell.c:1713
 msgid "Waiting for response..."
 msgstr "Waiting for response..."
 
-#: src/protocols/novell/novell.c:1822
+#: src/protocols/novell/novell.c:1848
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "%s has been invited to this conversation."
 
-#: src/protocols/novell/novell.c:1849
+#: src/protocols/novell/novell.c:1875
 msgid "Invitation to Conversation"
 msgstr "Invitation to Conversation"
 
-#: src/protocols/novell/novell.c:1850
+#: src/protocols/novell/novell.c:1876
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -7299,15 +7365,15 @@
 "\n"
 "Sent: %s"
 
-#: src/protocols/novell/novell.c:1852
+#: src/protocols/novell/novell.c:1878
 msgid "Would you like to join the conversation?"
 msgstr "Would you like to join the conversation?"
 
-#: src/protocols/novell/novell.c:1955
+#: src/protocols/novell/novell.c:1983
 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:2009
+#: src/protocols/novell/novell.c:2037
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -7319,7 +7385,7 @@
 #. *  gaim_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: src/protocols/novell/novell.c:2107
+#: src/protocols/novell/novell.c:2135
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
@@ -7327,28 +7393,28 @@
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
 
-#: src/protocols/novell/novell.c:2129
+#: src/protocols/novell/novell.c:2157
 msgid "Error. SSL support is not installed."
 msgstr "Error: SSL support is not installed."
 
-#: src/protocols/novell/novell.c:2433
+#: src/protocols/novell/novell.c:2461
 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:2779 src/protocols/oscar/oscar.c:568
-#: src/protocols/oscar/oscar.c:6512 src/protocols/yahoo/yahoo.c:2556
+#: src/protocols/novell/novell.c:2807 src/protocols/oscar/oscar.c:702
+#: src/protocols/oscar/oscar.c:6568 src/protocols/yahoo/yahoo.c:2565
 msgid "Offline"
 msgstr "Offline"
 
-#: src/protocols/novell/novell.c:2790
+#: src/protocols/novell/novell.c:2818
 msgid "Message"
 msgstr "Message"
 
-#: src/protocols/novell/novell.c:2889 src/protocols/novell/novell.c:2945
+#: src/protocols/novell/novell.c:2917 src/protocols/novell/novell.c:2973
 msgid "Appear Offline"
 msgstr "Appear Offline"
 
-#: src/protocols/novell/novell.c:3339
+#: src/protocols/novell/novell.c:3367
 msgid "Initiate _Chat"
 msgstr "Initiate _Chat"
 
@@ -7362,116 +7428,115 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: src/protocols/novell/novell.c:3435 src/protocols/novell/novell.c:3437
+#: src/protocols/novell/novell.c:3464 src/protocols/novell/novell.c:3466
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GroupWise Messenger Protocol Plugin"
 
-#: src/protocols/novell/novell.c:3456
+#: src/protocols/novell/novell.c:3485
 msgid "Server address"
 msgstr "Server address"
 
-#: src/protocols/novell/novell.c:3460
+#: src/protocols/novell/novell.c:3489
 msgid "Server port"
 msgstr "Server port"
 
-#: src/protocols/oscar/oscar.c:184
+#: src/protocols/oscar/oscar.c:185
 msgid "Invalid error"
 msgstr "Invalid error"
 
-#: src/protocols/oscar/oscar.c:185
+#: src/protocols/oscar/oscar.c:186
 msgid "Invalid SNAC"
 msgstr "Invalid SNAC"
 
-#: src/protocols/oscar/oscar.c:186
-msgid "Rate to host"
-msgstr "Rate to host"
-
 #: src/protocols/oscar/oscar.c:187
+msgid "Rate to host"
+msgstr "Rate to host"
+
+#: src/protocols/oscar/oscar.c:188
 msgid "Rate to client"
 msgstr "Rate to client"
 
-#: src/protocols/oscar/oscar.c:189
+#: src/protocols/oscar/oscar.c:190
 msgid "Service unavailable"
 msgstr "Service unavailable"
 
-#: src/protocols/oscar/oscar.c:190
-msgid "Service not defined"
-msgstr "Service not defined"
-
 #: src/protocols/oscar/oscar.c:191
+msgid "Service not defined"
+msgstr "Service not defined"
+
+#: src/protocols/oscar/oscar.c:192
 msgid "Obsolete SNAC"
 msgstr "Obsolete SNAC"
 
-#: src/protocols/oscar/oscar.c:192
+#: src/protocols/oscar/oscar.c:193
 msgid "Not supported by host"
 msgstr "Not supported by host"
 
-#: src/protocols/oscar/oscar.c:193
+#: src/protocols/oscar/oscar.c:194
 msgid "Not supported by client"
 msgstr "Not supported by client"
 
-#: src/protocols/oscar/oscar.c:194
-msgid "Refused by client"
-msgstr "Refused by client"
-
 #: src/protocols/oscar/oscar.c:195
-msgid "Reply too big"
-msgstr "Reply too big"
+msgid "Refused by client"
+msgstr "Refused by client"
 
 #: src/protocols/oscar/oscar.c:196
+msgid "Reply too big"
+msgstr "Reply too big"
+
+#: src/protocols/oscar/oscar.c:197
 msgid "Responses lost"
 msgstr "Responses lost"
 
-#: src/protocols/oscar/oscar.c:197
-msgid "Request denied"
-msgstr "Request denied"
-
 #: src/protocols/oscar/oscar.c:198
+msgid "Request denied"
+msgstr "Request denied"
+
+#: src/protocols/oscar/oscar.c:199
 msgid "Busted SNAC payload"
 msgstr "Busted SNAC payload"
 
-#: src/protocols/oscar/oscar.c:199
+#: src/protocols/oscar/oscar.c:200
 msgid "Insufficient rights"
 msgstr "Insufficient rights"
 
-#: src/protocols/oscar/oscar.c:200
+#: src/protocols/oscar/oscar.c:201
 msgid "In local permit/deny"
 msgstr "In local permit/deny"
 
-#: src/protocols/oscar/oscar.c:201
-msgid "Too evil (sender)"
-msgstr "Too evil (sender)"
-
 #: src/protocols/oscar/oscar.c:202
+msgid "Too evil (sender)"
+msgstr "Too evil (sender)"
+
+#: src/protocols/oscar/oscar.c:203
 msgid "Too evil (receiver)"
 msgstr "Too evil (receiver)"
 
-#: src/protocols/oscar/oscar.c:203
+#: src/protocols/oscar/oscar.c:204
 msgid "User temporarily unavailable"
 msgstr "User temporarily unavailable"
 
-#: src/protocols/oscar/oscar.c:204
+#: src/protocols/oscar/oscar.c:205
 msgid "No match"
 msgstr "No match"
 
-#: src/protocols/oscar/oscar.c:205
+#: src/protocols/oscar/oscar.c:206
 msgid "List overflow"
 msgstr "List overflow"
 
-#: src/protocols/oscar/oscar.c:206
+#: src/protocols/oscar/oscar.c:207
 msgid "Request ambiguous"
 msgstr "Request ambiguous"
 
-#: src/protocols/oscar/oscar.c:207
+#: src/protocols/oscar/oscar.c:208
 msgid "Queue full"
 msgstr "Queue full"
 
-#: src/protocols/oscar/oscar.c:208
+#: src/protocols/oscar/oscar.c:209
 msgid "Not while on AOL"
 msgstr "Not while on AOL"
 
-#: src/protocols/oscar/oscar.c:398
+#: 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.)"
@@ -7479,157 +7544,161 @@
 "(There was an error converting this message.  The buddy you are speaking to "
 "most likely has a buggy client.)"
 
-#: src/protocols/oscar/oscar.c:423
+#: src/protocols/oscar/oscar.c:452
+msgid "(There was an error receiving this message)"
+msgstr "(There was an error receiving this message)"
+
+#: src/protocols/oscar/oscar.c:557
 msgid "Voice"
 msgstr "Voice"
 
-#: src/protocols/oscar/oscar.c:426
+#: src/protocols/oscar/oscar.c:560
 msgid "AIM Direct IM"
 msgstr "AIM Direct IM"
 
-#: src/protocols/oscar/oscar.c:429 src/protocols/silc/silc.c:641
+#: src/protocols/oscar/oscar.c:563 src/protocols/silc/silc.c:641
 #: src/protocols/silc/util.c:506
 msgid "Chat"
 msgstr "Chat"
 
-#: src/protocols/oscar/oscar.c:432 src/protocols/oscar/oscar.c:6814
+#: src/protocols/oscar/oscar.c:566 src/protocols/oscar/oscar.c:6870
 msgid "Get File"
 msgstr "Get File"
 
-#: src/protocols/oscar/oscar.c:439
+#: src/protocols/oscar/oscar.c:573
 msgid "Games"
 msgstr "Games"
 
-#: src/protocols/oscar/oscar.c:442
+#: src/protocols/oscar/oscar.c:576
 msgid "Add-Ins"
 msgstr "Add-Ins"
 
-#: src/protocols/oscar/oscar.c:445
+#: src/protocols/oscar/oscar.c:579
 msgid "Send Buddy List"
 msgstr "Send Buddy List"
 
-#: src/protocols/oscar/oscar.c:448
+#: src/protocols/oscar/oscar.c:582
 msgid "ICQ Direct Connect"
 msgstr "ICQ Direct Connect"
 
-#: src/protocols/oscar/oscar.c:451
+#: src/protocols/oscar/oscar.c:585
 msgid "AP User"
 msgstr "AP User"
 
-#: src/protocols/oscar/oscar.c:454
+#: src/protocols/oscar/oscar.c:588
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:457
+#: src/protocols/oscar/oscar.c:591
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: src/protocols/oscar/oscar.c:460
+#: src/protocols/oscar/oscar.c:594
 msgid "ICQ Server Relay"
 msgstr "ICQ Server Relay"
 
-#: src/protocols/oscar/oscar.c:463
+#: src/protocols/oscar/oscar.c:597
 msgid "Old ICQ UTF8"
 msgstr "Old ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:466
+#: src/protocols/oscar/oscar.c:600
 msgid "Trillian Encryption"
 msgstr "Trillian Encryption"
 
-#: src/protocols/oscar/oscar.c:469
+#: src/protocols/oscar/oscar.c:603
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:472
+#: src/protocols/oscar/oscar.c:606
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: src/protocols/oscar/oscar.c:475
+#: src/protocols/oscar/oscar.c:609
 msgid "Security Enabled"
 msgstr "Security Enabled"
 
-#: src/protocols/oscar/oscar.c:478
+#: src/protocols/oscar/oscar.c:612
 msgid "Video Chat"
 msgstr "Video Chat"
 
-#: src/protocols/oscar/oscar.c:482
+#: src/protocols/oscar/oscar.c:616
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: src/protocols/oscar/oscar.c:485
+#: src/protocols/oscar/oscar.c:619
 msgid "Live Video"
 msgstr "Live Video"
 
-#: src/protocols/oscar/oscar.c:488
+#: src/protocols/oscar/oscar.c:622
 msgid "Camera"
 msgstr "Camera"
 
-#: src/protocols/oscar/oscar.c:506 src/protocols/oscar/oscar.c:5508
-#: src/protocols/oscar/oscar.c:6706
+#: src/protocols/oscar/oscar.c:640 src/protocols/oscar/oscar.c:5582
+#: src/protocols/oscar/oscar.c:6762
 msgid "Free For Chat"
 msgstr "Free For Chat"
 
-#: src/protocols/oscar/oscar.c:510 src/protocols/oscar/oscar.c:5502
-#: src/protocols/oscar/oscar.c:6704
+#: src/protocols/oscar/oscar.c:644 src/protocols/oscar/oscar.c:5576
+#: src/protocols/oscar/oscar.c:6760
 msgid "Not Available"
 msgstr "Not Available"
 
-#: src/protocols/oscar/oscar.c:512 src/protocols/oscar/oscar.c:5505
-#: src/protocols/oscar/oscar.c:6705
+#: src/protocols/oscar/oscar.c:646 src/protocols/oscar/oscar.c:5579
+#: src/protocols/oscar/oscar.c:6761
 msgid "Occupied"
 msgstr "Occupied"
 
-#: src/protocols/oscar/oscar.c:516
+#: src/protocols/oscar/oscar.c:650
 msgid "Web Aware"
 msgstr "Web Aware"
 
-#: src/protocols/oscar/oscar.c:584
+#: src/protocols/oscar/oscar.c:718
 msgid "Capabilities"
 msgstr "Capabilities"
 
-#: src/protocols/oscar/oscar.c:593
+#: src/protocols/oscar/oscar.c:727
 msgid "Buddy Comment"
 msgstr "Buddy Comment"
 
-#: src/protocols/oscar/oscar.c:728
+#: src/protocols/oscar/oscar.c:862
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "Direct IM with %s closed"
 
-#: src/protocols/oscar/oscar.c:730
+#: src/protocols/oscar/oscar.c:864
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "Direct IM with %s failed"
 
-#: src/protocols/oscar/oscar.c:737
+#: src/protocols/oscar/oscar.c:871
 msgid "Direct Connect failed"
 msgstr "Direct Connect failed"
 
-#: src/protocols/oscar/oscar.c:814 src/protocols/oscar/oscar.c:945
+#: src/protocols/oscar/oscar.c:948 src/protocols/oscar/oscar.c:1079
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Direct IM with %s established"
 
-#: src/protocols/oscar/oscar.c:895
+#: src/protocols/oscar/oscar.c:1029
 #, 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:1312
+#: src/protocols/oscar/oscar.c:1446
 #, 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:1317
+#: src/protocols/oscar/oscar.c:1451
 msgid "Unable to open Direct IM"
 msgstr "Unable to open Direct IM"
 
-#: src/protocols/oscar/oscar.c:1352
+#: src/protocols/oscar/oscar.c:1486
 #, 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:1356
+#: src/protocols/oscar/oscar.c:1490
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
@@ -7637,24 +7706,24 @@
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
 
-#: src/protocols/oscar/oscar.c:1360 src/protocols/oscar/oscar.c:3318
+#: src/protocols/oscar/oscar.c:1494 src/protocols/oscar/oscar.c:3431
 msgid "Connect"
 msgstr "Connect"
 
-#: src/protocols/oscar/oscar.c:1427 src/protocols/toc/toc.c:872
+#: src/protocols/oscar/oscar.c:1561 src/protocols/toc/toc.c:872
 #, 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:1446
+#: src/protocols/oscar/oscar.c:1580
 msgid "Chat is currently unavailable"
 msgstr "Chat is currently unavailable"
 
-#: src/protocols/oscar/oscar.c:1527
+#: src/protocols/oscar/oscar.c:1661
 msgid "Screen name sent"
 msgstr "Screen name sent"
 
-#: src/protocols/oscar/oscar.c:1541
+#: src/protocols/oscar/oscar.c:1675
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -7665,46 +7734,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:1569
+#: src/protocols/oscar/oscar.c:1703
 msgid "Unable to login to AIM"
 msgstr "Unable to login to AIM"
 
-#: src/protocols/oscar/oscar.c:1670 src/protocols/oscar/oscar.c:2107
+#: src/protocols/oscar/oscar.c:1804 src/protocols/oscar/oscar.c:2243
 msgid "Could Not Connect"
 msgstr "Could Not Connect"
 
-#: src/protocols/oscar/oscar.c:1678
+#: src/protocols/oscar/oscar.c:1812
 msgid "Connection established, cookie sent"
 msgstr "Connection established, cookie sent"
 
-#: src/protocols/oscar/oscar.c:1791 src/protocols/yahoo/yahoo_filexfer.c:180
+#: src/protocols/oscar/oscar.c:1925 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:1796
+#: src/protocols/oscar/oscar.c:1930
 msgid "Unable to create new connection."
 msgstr "Unable to create new connection."
 
-#: src/protocols/oscar/oscar.c:1867
+#: src/protocols/oscar/oscar.c:2002
 msgid "Unable to establish listener socket."
 msgstr "Unable to establish listener socket."
 
-#: src/protocols/oscar/oscar.c:1991 src/protocols/toc/toc.c:540
+#: src/protocols/oscar/oscar.c:2127 src/protocols/toc/toc.c:540
 msgid "Incorrect nickname or password."
 msgstr "Incorrect nickname or password."
 
-#: src/protocols/oscar/oscar.c:1996
+#: src/protocols/oscar/oscar.c:2132
 msgid "Your account is currently suspended."
 msgstr "Your account is currently suspended."
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:2000
+#: src/protocols/oscar/oscar.c:2136
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "The AOL Instant Messenger service is temporarily unavailable."
 
-#: src/protocols/oscar/oscar.c:2005
+#: src/protocols/oscar/oscar.c:2141
 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."
@@ -7712,21 +7781,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:2010
+#: src/protocols/oscar/oscar.c:2146
 #, 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:2042
+#: src/protocols/oscar/oscar.c:2178
 msgid "Internal Error"
 msgstr "Internal Error"
 
-#: src/protocols/oscar/oscar.c:2114
+#: src/protocols/oscar/oscar.c:2250
 msgid "Received authorization"
 msgstr "Received authorisation"
 
-#: src/protocols/oscar/oscar.c:2150 src/protocols/oscar/oscar.c:2180
-#: src/protocols/oscar/oscar.c:2269
+#: src/protocols/oscar/oscar.c:2286 src/protocols/oscar/oscar.c:2316
+#: src/protocols/oscar/oscar.c:2405
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -7735,24 +7804,20 @@
 "You may be disconnected shortly.  You may want to use TOC until this is "
 "fixed.  Check %s for updates."
 
-#: src/protocols/oscar/oscar.c:2153 src/protocols/oscar/oscar.c:2183
+#: src/protocols/oscar/oscar.c:2289 src/protocols/oscar/oscar.c:2319
 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:2272
+#: src/protocols/oscar/oscar.c:2408
 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:3102 src/protocols/oscar/oscar.c:3124
-msgid "(There was an error receiving this message)"
-msgstr "(There was an error receiving this message)"
-
-#: src/protocols/oscar/oscar.c:3310
+#: src/protocols/oscar/oscar.c:3423
 #, 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:3313
+#: src/protocols/oscar/oscar.c:3426
 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 "
@@ -7762,19 +7827,19 @@
 "for IM Images.  Because your IP address will be revealed, this may be "
 "considered a privacy risk."
 
-#: src/protocols/oscar/oscar.c:3349
+#: src/protocols/oscar/oscar.c:3462
 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:3357
+#: src/protocols/oscar/oscar.c:3470
 msgid "Authorization Request Message:"
 msgstr "Authorisation Request Message:"
 
-#: src/protocols/oscar/oscar.c:3358
+#: src/protocols/oscar/oscar.c:3471
 msgid "Please authorize me!"
 msgstr "Please authorise me!"
 
-#: src/protocols/oscar/oscar.c:3388
+#: src/protocols/oscar/oscar.c:3501
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
@@ -7783,23 +7848,22 @@
 "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:3393 src/protocols/oscar/oscar.c:3395
+#: src/protocols/oscar/oscar.c:3506 src/protocols/oscar/oscar.c:3508
 msgid "Request Authorization"
 msgstr "Request Authorisation"
 
-#: src/protocols/oscar/oscar.c:3443 src/protocols/oscar/oscar.c:3445
-#: src/protocols/oscar/oscar.c:3452 src/protocols/oscar/oscar.c:3546
-#: src/protocols/oscar/oscar.c:3566 src/protocols/oscar/oscar.c:3918
-#: src/protocols/oscar/oscar.c:3975 src/protocols/oscar/oscar.c:3979
-#: src/protocols/oscar/oscar.c:6133 src/protocols/oscar/oscar.c:6179
+#: src/protocols/oscar/oscar.c:3556 src/protocols/oscar/oscar.c:3558
+#: src/protocols/oscar/oscar.c:3565 src/protocols/oscar/oscar.c:3659
+#: src/protocols/oscar/oscar.c:3679 src/protocols/oscar/oscar.c:6207
+#: src/protocols/oscar/oscar.c:6253
 msgid "No reason given."
 msgstr "No reason given."
 
-#: src/protocols/oscar/oscar.c:3451
+#: src/protocols/oscar/oscar.c:3564
 msgid "Authorization Denied Message:"
 msgstr "Authorisation Denied Message:"
 
-#: src/protocols/oscar/oscar.c:3546
+#: src/protocols/oscar/oscar.c:3659
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -7808,11 +7872,11 @@
 "The user %u wants to add you to their buddy list for the following reason:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3554 src/protocols/oscar/oscar.c:6139
+#: src/protocols/oscar/oscar.c:3667 src/protocols/oscar/oscar.c:6213
 msgid "Authorization Request"
 msgstr "Authorisation Request"
 
-#: src/protocols/oscar/oscar.c:3566
+#: src/protocols/oscar/oscar.c:3679
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7823,17 +7887,17 @@
 "following reason:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3567
+#: src/protocols/oscar/oscar.c:3680
 msgid "ICQ authorization denied."
 msgstr "ICQ authorisation denied."
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:3574
+#: src/protocols/oscar/oscar.c:3687
 #, 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:3582
+#: src/protocols/oscar/oscar.c:3695
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -7846,7 +7910,7 @@
 "From: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3590
+#: src/protocols/oscar/oscar.c:3703
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -7859,7 +7923,7 @@
 "From: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3598
+#: src/protocols/oscar/oscar.c:3711
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -7872,34 +7936,34 @@
 "Message is:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3619
+#: src/protocols/oscar/oscar.c:3732
 #, 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:3625
+#: src/protocols/oscar/oscar.c:3738
 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:3629
+#: src/protocols/oscar/oscar.c:3742
 msgid "Decline"
 msgstr "Decline"
 
-#: src/protocols/oscar/oscar.c:3713
+#: src/protocols/oscar/oscar.c:3826
 #, 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:3835
 #, 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:3844
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -7910,78 +7974,85 @@
 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:3853
 #, 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:3862
 #, 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:3871
 #, 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:3812 src/protocols/oscar/oscar.c:4041
+#: src/protocols/oscar/oscar.c:3925 src/protocols/oscar/oscar.c:4155
 #, c-format
 msgid "Info for %s"
 msgstr "Info for %s"
 
-#: src/protocols/oscar/oscar.c:3878
+#: src/protocols/oscar/oscar.c:3991
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC threw error: %s\n"
 
-#: src/protocols/oscar/oscar.c:3879
+#: src/protocols/oscar/oscar.c:3992
 msgid "Unknown error"
 msgstr "Unknown error"
 
-#: src/protocols/oscar/oscar.c:3915
-msgid "Your message did not get sent."
-msgstr "Your message did not get sent."
-
-#: src/protocols/oscar/oscar.c:3916
-#, 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:3975
+#. Data is assumed to be the destination sn
+#: src/protocols/oscar/oscar.c:4027
+#, c-format
+msgid "Unable to send message: %s"
+msgstr "Unable to send message: %s"
+
+#: src/protocols/oscar/oscar.c:4027 src/protocols/oscar/oscar.c:4032
+#: src/protocols/oscar/oscar.c:4090 src/protocols/oscar/oscar.c:4094
+msgid "Unknown reason."
+msgstr "Unknown reason."
+
+#: src/protocols/oscar/oscar.c:4030
+#, c-format
+msgid "Unable to send message to %s:"
+msgstr "Unable to send message to %s:"
+
+#: src/protocols/oscar/oscar.c:4090
 #, c-format
 msgid "User information not available: %s"
 msgstr "User information not available: %s"
 
-#: src/protocols/oscar/oscar.c:3977
+#: src/protocols/oscar/oscar.c:4093
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "User information for %s unavailable:"
 
-#: src/protocols/oscar/oscar.c:4001
+#: src/protocols/oscar/oscar.c:4115
 msgid "Warning Level"
 msgstr "Warning Level"
 
-#: src/protocols/oscar/oscar.c:4004
+#: src/protocols/oscar/oscar.c:4118
 msgid "Online Since"
 msgstr "Online Since"
 
-#: src/protocols/oscar/oscar.c:4008 src/protocols/yahoo/yahoo_profile.c:1118
+#: src/protocols/oscar/oscar.c:4122 src/protocols/yahoo/yahoo_profile.c:1118
 msgid "Member Since"
 msgstr "Member Since"
 
-#: src/protocols/oscar/oscar.c:4092
+#: src/protocols/oscar/oscar.c:4206
 msgid "Your AIM connection may be lost."
 msgstr "Your AIM connection may be lost."
 
 #. The conversion failed!
-#: src/protocols/oscar/oscar.c:4278
+#: src/protocols/oscar/oscar.c:4392
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -7989,11 +8060,11 @@
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 
-#: src/protocols/oscar/oscar.c:4498
+#: src/protocols/oscar/oscar.c:4612
 msgid "Rate limiting error."
 msgstr "Rate limiting error."
 
-#: src/protocols/oscar/oscar.c:4499
+#: src/protocols/oscar/oscar.c:4613
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -8001,7 +8072,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:4562
+#: src/protocols/oscar/oscar.c:4676
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
@@ -8009,113 +8080,109 @@
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
 
-#: src/protocols/oscar/oscar.c:4564
+#: src/protocols/oscar/oscar.c:4678
 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:4595
+#: src/protocols/oscar/oscar.c:4709
 msgid "Finalizing connection"
 msgstr "Finalizing connection"
 
-#: src/protocols/oscar/oscar.c:4866 src/protocols/oscar/oscar.c:4873
-msgid "Email Address"
-msgstr "Email Address"
-
-#: src/protocols/oscar/oscar.c:4878 src/protocols/silc/util.c:538
+#: src/protocols/oscar/oscar.c:4992 src/protocols/silc/util.c:538
 msgid "Mobile Phone"
 msgstr "Mobile Phone"
 
-#: src/protocols/oscar/oscar.c:4879
+#: src/protocols/oscar/oscar.c:4993
 msgid "Not specified"
 msgstr "Not specified"
 
-#: src/protocols/oscar/oscar.c:4880 src/protocols/trepia/trepia.c:281
+#: src/protocols/oscar/oscar.c:4994 src/protocols/trepia/trepia.c:281
 #: src/protocols/trepia/trepia.c:407
 msgid "Female"
 msgstr "Female"
 
-#: src/protocols/oscar/oscar.c:4880 src/protocols/trepia/trepia.c:280
+#: src/protocols/oscar/oscar.c:4994 src/protocols/trepia/trepia.c:280
 #: src/protocols/trepia/trepia.c:407
 msgid "Male"
 msgstr "Male"
 
-#: src/protocols/oscar/oscar.c:4896
+#: src/protocols/oscar/oscar.c:5010
 msgid "Personal Web Page"
 msgstr "Personal Web Page"
 
-#: src/protocols/oscar/oscar.c:4900
+#: src/protocols/oscar/oscar.c:5014
 msgid "Additional Information"
 msgstr "Additional Information"
 
-#: src/protocols/oscar/oscar.c:4905
+#: src/protocols/oscar/oscar.c:5019
 msgid "Home Address"
 msgstr "Home Address"
 
-#: src/protocols/oscar/oscar.c:4909 src/protocols/oscar/oscar.c:4917
+#: src/protocols/oscar/oscar.c:5023 src/protocols/oscar/oscar.c:5031
 msgid "Zip Code"
 msgstr "Postcode"
 
-#: src/protocols/oscar/oscar.c:4913
+#: src/protocols/oscar/oscar.c:5027
 msgid "Work Address"
 msgstr "Work Address"
 
-#: src/protocols/oscar/oscar.c:4921
+#: src/protocols/oscar/oscar.c:5035
 msgid "Work Information"
 msgstr "Work Information"
 
-#: src/protocols/oscar/oscar.c:4922
+#: src/protocols/oscar/oscar.c:5036
 msgid "Company"
 msgstr "Company"
 
-#: src/protocols/oscar/oscar.c:4923
+#: src/protocols/oscar/oscar.c:5037
 msgid "Division"
 msgstr "Division"
 
-#: src/protocols/oscar/oscar.c:4924
+#: src/protocols/oscar/oscar.c:5038
 msgid "Position"
 msgstr "Position"
 
-#: src/protocols/oscar/oscar.c:4926
+#: src/protocols/oscar/oscar.c:5040
 msgid "Web Page"
 msgstr "Web Page"
 
-#: src/protocols/oscar/oscar.c:4936
+#: src/protocols/oscar/oscar.c:5050
 #, c-format
 msgid "ICQ Info for %s"
 msgstr "ICQ Info for %s"
 
-#: src/protocols/oscar/oscar.c:4985
+#: src/protocols/oscar/oscar.c:5099
 msgid "Pop-Up Message"
 msgstr "Pop-Up Message"
 
-#: src/protocols/oscar/oscar.c:5006
+#: src/protocols/oscar/oscar.c:5120
 #, 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:5010
+#: src/protocols/oscar/oscar.c:5124
 msgid "Search Results"
 msgstr "Search Results"
 
-#: src/protocols/oscar/oscar.c:5027
+#: src/protocols/oscar/oscar.c:5141
 #, c-format
 msgid "No results found for email address %s"
 msgstr "No results found for email address %s"
 
-#: src/protocols/oscar/oscar.c:5048
+#: src/protocols/oscar/oscar.c:5162
 #, 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:5050
+#: src/protocols/oscar/oscar.c:5164
 msgid "Account Confirmation Requested"
 msgstr "Account Confirmation Requested"
 
-#: src/protocols/oscar/oscar.c:5081
+#: src/protocols/oscar/oscar.c:5195
 msgid "Error Changing Account Info"
 msgstr "Error Changing Account Info"
 
-#: src/protocols/oscar/oscar.c:5084
+#: src/protocols/oscar/oscar.c:5198
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8124,7 +8191,7 @@
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "differs from the original."
 
-#: src/protocols/oscar/oscar.c:5087
+#: src/protocols/oscar/oscar.c:5201
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8133,7 +8200,7 @@
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "ends in a space."
 
-#: src/protocols/oscar/oscar.c:5090
+#: src/protocols/oscar/oscar.c:5204
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8142,7 +8209,7 @@
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "is too long."
 
-#: src/protocols/oscar/oscar.c:5093
+#: src/protocols/oscar/oscar.c:5207
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -8151,7 +8218,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:5096
+#: src/protocols/oscar/oscar.c:5210
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -8160,7 +8227,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:5099
+#: src/protocols/oscar/oscar.c:5213
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
@@ -8169,12 +8236,12 @@
 "Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 
-#: src/protocols/oscar/oscar.c:5102
+#: src/protocols/oscar/oscar.c:5216
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Error 0x%04x: Unknown error."
 
-#: src/protocols/oscar/oscar.c:5112
+#: src/protocols/oscar/oscar.c:5226
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -8183,26 +8250,26 @@
 "Your screen name is currently formatted as follows:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5113 src/protocols/oscar/oscar.c:5120
+#: src/protocols/oscar/oscar.c:5227 src/protocols/oscar/oscar.c:5234
 msgid "Account Info"
 msgstr "Account Info"
 
-#: src/protocols/oscar/oscar.c:5118
+#: src/protocols/oscar/oscar.c:5232
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "The email address for %s is %s"
 
-#: src/protocols/oscar/oscar.c:5183
+#: src/protocols/oscar/oscar.c:5296
 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:5357
+#: src/protocols/oscar/oscar.c:5431
 msgid "Unable to set AIM profile."
 msgstr "Unable to set AIM profile."
 
-#: src/protocols/oscar/oscar.c:5358
+#: src/protocols/oscar/oscar.c:5432
 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 "
@@ -8212,7 +8279,7 @@
 "completed.  Your profile remains unset; try setting it again when you are "
 "fully connected."
 
-#: src/protocols/oscar/oscar.c:5385
+#: src/protocols/oscar/oscar.c:5459
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -8227,19 +8294,19 @@
 "The maximum profile length of %d bytes has been exceeded.  Gaim has "
 "truncated it for you."
 
-#: src/protocols/oscar/oscar.c:5390
+#: src/protocols/oscar/oscar.c:5464
 msgid "Profile too long."
 msgstr "Profile too long."
 
-#: src/protocols/oscar/oscar.c:5406 src/protocols/oscar/oscar.c:6711
+#: src/protocols/oscar/oscar.c:5480 src/protocols/oscar/oscar.c:6767
 msgid "Visible"
 msgstr "Visible"
 
-#: src/protocols/oscar/oscar.c:5424
+#: src/protocols/oscar/oscar.c:5498
 msgid "Unable to set AIM away message."
 msgstr "Unable to set AIM away message."
 
-#: src/protocols/oscar/oscar.c:5425
+#: src/protocols/oscar/oscar.c:5499
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -8249,7 +8316,7 @@
 "procedure completed.  You remain in a \"present\" state; try setting it "
 "again when you are fully connected."
 
-#: src/protocols/oscar/oscar.c:5465
+#: src/protocols/oscar/oscar.c:5539
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -8264,11 +8331,11 @@
 "The maximum away message length of %d bytes has been exceeded.  Gaim has "
 "truncated it for you."
 
-#: src/protocols/oscar/oscar.c:5470
+#: src/protocols/oscar/oscar.c:5544
 msgid "Away message too long."
 msgstr "Away message too long."
 
-#: src/protocols/oscar/oscar.c:5548
+#: src/protocols/oscar/oscar.c:5622
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -8279,16 +8346,16 @@
 "must either start with a letter and contain only letters, numbers and "
 "spaces, or contain only numbers."
 
-#: src/protocols/oscar/oscar.c:5550 src/protocols/oscar/oscar.c:5999
-#: src/protocols/oscar/oscar.c:6013
+#: src/protocols/oscar/oscar.c:5624 src/protocols/oscar/oscar.c:6073
+#: src/protocols/oscar/oscar.c:6087
 msgid "Unable To Add"
 msgstr "Unable To Add"
 
-#: src/protocols/oscar/oscar.c:5711
+#: src/protocols/oscar/oscar.c:5785
 msgid "Unable To Retrieve Buddy List"
 msgstr "Unable To Retrieve Buddy List"
 
-#: src/protocols/oscar/oscar.c:5712
+#: src/protocols/oscar/oscar.c:5786
 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 "
@@ -8298,13 +8365,13 @@
 "servers.  Your buddy list is not lost, and will probably become available in "
 "a few hours."
 
-#: src/protocols/oscar/oscar.c:5894 src/protocols/oscar/oscar.c:5895
-#: src/protocols/oscar/oscar.c:5900 src/protocols/oscar/oscar.c:6057
-#: src/protocols/oscar/oscar.c:6058 src/protocols/oscar/oscar.c:6063
+#: src/protocols/oscar/oscar.c:5968 src/protocols/oscar/oscar.c:5969
+#: src/protocols/oscar/oscar.c:5974 src/protocols/oscar/oscar.c:6131
+#: src/protocols/oscar/oscar.c:6132 src/protocols/oscar/oscar.c:6137
 msgid "Orphans"
 msgstr "Orphans"
 
-#: src/protocols/oscar/oscar.c:5997
+#: src/protocols/oscar/oscar.c:6071
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -8313,11 +8380,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:5997 src/protocols/oscar/oscar.c:6011
+#: src/protocols/oscar/oscar.c:6071 src/protocols/oscar/oscar.c:6085
 msgid "(no name)"
 msgstr "(no name)"
 
-#: src/protocols/oscar/oscar.c:6011
+#: src/protocols/oscar/oscar.c:6085
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -8328,7 +8395,7 @@
 "for this is that you have the maximum number of allowed buddies in your "
 "buddy list."
 
-#: src/protocols/oscar/oscar.c:6094
+#: src/protocols/oscar/oscar.c:6168
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -8337,11 +8404,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:6100
+#: src/protocols/oscar/oscar.c:6174
 msgid "Authorization Given"
 msgstr "Authorisation Given"
 
-#: src/protocols/oscar/oscar.c:6133
+#: src/protocols/oscar/oscar.c:6207
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -8351,17 +8418,17 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:6175
+#: src/protocols/oscar/oscar.c:6249
 #, 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:6176
+#: src/protocols/oscar/oscar.c:6250
 msgid "Authorization Granted"
 msgstr "Authorisation Granted"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:6179
+#: src/protocols/oscar/oscar.c:6253
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -8372,76 +8439,76 @@
 "following reason:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:6180
+#: src/protocols/oscar/oscar.c:6254
 msgid "Authorization Denied"
 msgstr "Authorisation Denied"
 
-#: src/protocols/oscar/oscar.c:6217 src/protocols/toc/toc.c:1271
+#: src/protocols/oscar/oscar.c:6291 src/protocols/toc/toc.c:1271
 msgid "_Exchange:"
 msgstr "_Exchange:"
 
-#: src/protocols/oscar/oscar.c:6239
+#: src/protocols/oscar/oscar.c:6325
 msgid "Invalid chat name specified."
 msgstr "Invalid chat name specified."
 
-#: src/protocols/oscar/oscar.c:6329
+#: src/protocols/oscar/oscar.c:6414
 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:6484
+#: src/protocols/oscar/oscar.c:6540
 msgid "Away Message"
 msgstr "Away Message"
 
-#: src/protocols/oscar/oscar.c:6770
+#: src/protocols/oscar/oscar.c:6826
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Buddy Comment for %s"
 
-#: src/protocols/oscar/oscar.c:6771
+#: src/protocols/oscar/oscar.c:6827
 msgid "Buddy Comment:"
 msgstr "Buddy Comment:"
 
-#: src/protocols/oscar/oscar.c:6790
+#: src/protocols/oscar/oscar.c:6846
 msgid "Edit Buddy Comment"
 msgstr "Edit Buddy Comment"
 
-#: src/protocols/oscar/oscar.c:6796
+#: src/protocols/oscar/oscar.c:6852
 msgid "Get Status Msg"
 msgstr "Get Status Msg"
 
-#: src/protocols/oscar/oscar.c:6808
+#: src/protocols/oscar/oscar.c:6864
 msgid "Direct IM"
 msgstr "Direct IM"
 
-#: src/protocols/oscar/oscar.c:6825
+#: src/protocols/oscar/oscar.c:6881
 msgid "Re-request Authorization"
 msgstr "Re-request Authorisation"
 
-#: src/protocols/oscar/oscar.c:6855
+#: src/protocols/oscar/oscar.c:6911
 msgid "The new formatting is invalid."
 msgstr "The new formatting is invalid."
 
-#: src/protocols/oscar/oscar.c:6856
+#: src/protocols/oscar/oscar.c:6912
 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:6863
+#: src/protocols/oscar/oscar.c:6919
 msgid "New screen name formatting:"
 msgstr "New screen name formatting:"
 
-#: src/protocols/oscar/oscar.c:6915
+#: src/protocols/oscar/oscar.c:6971
 msgid "Change Address To:"
 msgstr "Change Address To:"
 
-#: src/protocols/oscar/oscar.c:6960
+#: src/protocols/oscar/oscar.c:7016
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>you are not waiting for authorisation</i>"
 
-#: src/protocols/oscar/oscar.c:6963
+#: src/protocols/oscar/oscar.c:7019
 msgid "You are awaiting authorization from the following buddies"
 msgstr "You are awaiting authorisation from the following buddies"
 
-#: src/protocols/oscar/oscar.c:6964
+#: src/protocols/oscar/oscar.c:7020
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -8449,75 +8516,75 @@
 "You can re-request authorisation from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorisation.\""
 
-#: src/protocols/oscar/oscar.c:6981
+#: src/protocols/oscar/oscar.c:7037
 msgid "Find Buddy by E-mail"
 msgstr "Find Buddy by E-mail"
 
-#: src/protocols/oscar/oscar.c:6982
+#: src/protocols/oscar/oscar.c:7038
 msgid "Search for a buddy by e-mail address"
 msgstr "Search for a buddy by e-mail address"
 
-#: src/protocols/oscar/oscar.c:6983
+#: src/protocols/oscar/oscar.c:7039
 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:7000
+#: src/protocols/oscar/oscar.c:7056
 msgid "Available Message:"
 msgstr "Available Message:"
 
-#: src/protocols/oscar/oscar.c:7001
+#: src/protocols/oscar/oscar.c:7057
 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:7083 src/protocols/silc/silc.c:795
+#: src/protocols/oscar/oscar.c:7139 src/protocols/silc/silc.c:795
 msgid "Set User Info..."
 msgstr "Set User Info..."
 
-#: src/protocols/oscar/oscar.c:7088
+#: src/protocols/oscar/oscar.c:7144
 msgid "Set User Info (URL)..."
 msgstr "Set User Info (URL)..."
 
-#: src/protocols/oscar/oscar.c:7094
+#: src/protocols/oscar/oscar.c:7150
 msgid "Set Available Message..."
 msgstr "Set Available Message..."
 
-#: src/protocols/oscar/oscar.c:7099 src/protocols/silc/silc.c:791
+#: src/protocols/oscar/oscar.c:7155 src/protocols/silc/silc.c:791
 msgid "Change Password..."
 msgstr "Change Password..."
 
-#: src/protocols/oscar/oscar.c:7104
+#: src/protocols/oscar/oscar.c:7160
 msgid "Change Password (URL)"
 msgstr "Change Password (URL)"
 
-#: src/protocols/oscar/oscar.c:7108
+#: src/protocols/oscar/oscar.c:7164
 msgid "Configure IM Forwarding (URL)"
 msgstr "Configure IM Forwarding (URL)"
 
-#: src/protocols/oscar/oscar.c:7117
+#: src/protocols/oscar/oscar.c:7173
 msgid "Format Screen Name..."
 msgstr "Format Screen Name..."
 
-#: src/protocols/oscar/oscar.c:7121
+#: src/protocols/oscar/oscar.c:7177
 msgid "Confirm Account"
 msgstr "Confirm Account"
 
-#: src/protocols/oscar/oscar.c:7125
+#: src/protocols/oscar/oscar.c:7181
 msgid "Display Currently Registered Address"
 msgstr "Display Currently Registered Address"
 
-#: src/protocols/oscar/oscar.c:7129
+#: src/protocols/oscar/oscar.c:7185
 msgid "Change Currently Registered Address..."
 msgstr "Change Currently Registered Address"
 
-#: src/protocols/oscar/oscar.c:7136
+#: src/protocols/oscar/oscar.c:7192
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Show Buddies Awaiting Authorisation"
 
-#: src/protocols/oscar/oscar.c:7142
+#: src/protocols/oscar/oscar.c:7198
 msgid "Search for Buddy by Email..."
 msgstr "Search for Buddy by Email..."
 
-#: src/protocols/oscar/oscar.c:7147
+#: src/protocols/oscar/oscar.c:7203
 msgid "Search for Buddy by Information"
 msgstr "Search for Buddy by Information"
 
@@ -8531,22 +8598,21 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: src/protocols/oscar/oscar.c:7265 src/protocols/oscar/oscar.c:7267
+#: src/protocols/oscar/oscar.c:7322 src/protocols/oscar/oscar.c:7324
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ Protocol Plugin"
 
-#: src/protocols/oscar/oscar.c:7286
+#: src/protocols/oscar/oscar.c:7343
 msgid "Auth host"
 msgstr "Auth host"
 
-#: src/protocols/oscar/oscar.c:7291
+#: src/protocols/oscar/oscar.c:7346
 msgid "Auth port"
 msgstr "Auth port"
 
 #: src/protocols/silc/buddy.c:51 src/protocols/silc/buddy.c:414
 #: src/protocols/silc/buddy.c:539 src/protocols/silc/buddy.c:706
-#: src/protocols/silc/ft.c:340
+#: src/protocols/silc/ft.c:338
 #, c-format
 msgid "User %s is not present in the network"
 msgstr "User %s is not present in the network"
@@ -8629,12 +8695,12 @@
 msgstr "Set IM Password"
 
 #: src/protocols/silc/buddy.c:506 src/protocols/silc/buddy.c:541
-#: src/protocols/silc/ops.c:1265 src/protocols/silc/ops.c:1276
+#: src/protocols/silc/ops.c:1276 src/protocols/silc/ops.c:1287
 msgid "Get Public Key"
 msgstr "Get Public Key"
 
-#: src/protocols/silc/buddy.c:542 src/protocols/silc/ops.c:1266
-#: src/protocols/silc/ops.c:1277
+#: src/protocols/silc/buddy.c:542 src/protocols/silc/ops.c:1277
+#: src/protocols/silc/ops.c:1288
 msgid "Cannot fetch the public key"
 msgstr "Cannot fetch the public key"
 
@@ -8643,18 +8709,18 @@
 msgstr "Show Public Key"
 
 #: src/protocols/silc/buddy.c:630 src/protocols/silc/buddy.c:989
-#: src/protocols/silc/chat.c:222
+#: src/protocols/silc/chat.c:234
 msgid "Could not load public key"
 msgstr "Could not load public key"
 
-#: 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
+#: src/protocols/silc/buddy.c:707 src/protocols/silc/ops.c:871
+#: src/protocols/silc/ops.c:943 src/protocols/silc/ops.c:1078
+#: src/protocols/silc/ops.c:1079 src/protocols/silc/ops.c:1098
 msgid "User Information"
 msgstr "User Information"
 
-#: src/protocols/silc/buddy.c:708 src/protocols/silc/ops.c:935
-#: src/protocols/silc/ops.c:1089
+#: src/protocols/silc/buddy.c:708 src/protocols/silc/ops.c:944
+#: src/protocols/silc/ops.c:1099
 msgid "Cannot get user information"
 msgstr "Cannot get user information"
 
@@ -8791,36 +8857,36 @@
 msgid "Anxious"
 msgstr "Anxious"
 
-#: src/protocols/silc/buddy.c:1448 src/protocols/silc/ops.c:971
+#: src/protocols/silc/buddy.c:1448 src/protocols/silc/ops.c:980
 msgid "User Modes"
 msgstr "User Modes"
 
-#: src/protocols/silc/buddy.c:1457 src/protocols/silc/ops.c:980
+#: src/protocols/silc/buddy.c:1457 src/protocols/silc/ops.c:989
 msgid "Mood"
 msgstr "Mood"
 
-#: src/protocols/silc/buddy.c:1461 src/protocols/silc/ops.c:986
+#: src/protocols/silc/buddy.c:1461 src/protocols/silc/ops.c:995
 msgid "Status Text"
 msgstr "Status Text"
 
-#: src/protocols/silc/buddy.c:1466 src/protocols/silc/ops.c:992
+#: src/protocols/silc/buddy.c:1466 src/protocols/silc/ops.c:1001
 msgid "Preferred Contact"
 msgstr "Preferred Contact"
 
-#: src/protocols/silc/buddy.c:1471 src/protocols/silc/ops.c:997
+#: src/protocols/silc/buddy.c:1471 src/protocols/silc/ops.c:1006
 msgid "Preferred Language"
 msgstr "Preferred Language"
 
-#: src/protocols/silc/buddy.c:1476 src/protocols/silc/ops.c:1002
+#: src/protocols/silc/buddy.c:1476 src/protocols/silc/ops.c:1011
 msgid "Device"
 msgstr "Device"
 
-#: src/protocols/silc/buddy.c:1481 src/protocols/silc/ops.c:1007
+#: src/protocols/silc/buddy.c:1481 src/protocols/silc/ops.c:1016
 #: src/protocols/silc/silc.c:684 src/protocols/silc/silc.c:686
 msgid "Timezone"
 msgstr "Timezone"
 
-#: src/protocols/silc/buddy.c:1486 src/protocols/silc/ops.c:1012
+#: src/protocols/silc/buddy.c:1486 src/protocols/silc/ops.c:1021
 msgid "Geolocation"
 msgstr "Geolocation"
 
@@ -8840,7 +8906,7 @@
 msgid "Get Public Key..."
 msgstr "Get Public Key..."
 
-#: src/protocols/silc/buddy.c:1555 src/protocols/silc/ops.c:1398
+#: src/protocols/silc/buddy.c:1555 src/protocols/silc/ops.c:1409
 msgid "Kill User"
 msgstr "Kill User"
 
@@ -8848,81 +8914,81 @@
 msgid "_Passphrase:"
 msgstr "_Passphrase:"
 
-#: src/protocols/silc/chat.c:66
+#: src/protocols/silc/chat.c:78
 #, c-format
 msgid "Channel %s does not exist in the network"
 msgstr "Channel %s does not exist in the network"
 
-#: src/protocols/silc/chat.c:67 src/protocols/silc/chat.c:159
+#: src/protocols/silc/chat.c:79 src/protocols/silc/chat.c:171
 msgid "Channel Information"
 msgstr "Channel Information"
 
-#: src/protocols/silc/chat.c:68
+#: src/protocols/silc/chat.c:80
 msgid "Cannot get channel information"
 msgstr "Cannot get channel information"
 
-#: src/protocols/silc/chat.c:105
+#: src/protocols/silc/chat.c:117
 #, c-format
 msgid "<b>Channel Name:</b> %s"
 msgstr "<b>Channel Name:</b> %s"
 
-#: src/protocols/silc/chat.c:108
+#: src/protocols/silc/chat.c:120
 #, c-format
 msgid "<br><b>User Count:</b> %d"
 msgstr "<br><b>User Count:</b> %d"
 
-#: src/protocols/silc/chat.c:115
+#: src/protocols/silc/chat.c:127
 #, c-format
 msgid "<br><b>Channel Founder:</b> %s"
 msgstr "<br><b>Channel Founder:</b> %s"
 
-#: src/protocols/silc/chat.c:124
+#: src/protocols/silc/chat.c:136
 #, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
 msgstr "<br><b>Channel Cipher:</b> %s"
 
-#: src/protocols/silc/chat.c:127
+#: src/protocols/silc/chat.c:139
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
 msgstr "<br><b>Channel HMAC:</b> %s"
 
-#: src/protocols/silc/chat.c:132
+#: src/protocols/silc/chat.c:144
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>Channel Topic:</b><br>%s"
 
-#: src/protocols/silc/chat.c:137
+#: src/protocols/silc/chat.c:149
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>Channel Modes:</b> "
 
-#: src/protocols/silc/chat.c:150
+#: src/protocols/silc/chat.c:162
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr "<br><b>Founder Key Fingerprint:</b><br>%s"
 
-#: src/protocols/silc/chat.c:151
+#: src/protocols/silc/chat.c:163
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr "<br><b>Founder Key Babbleprint:</b><br>%s"
 
-#: src/protocols/silc/chat.c:221
+#: src/protocols/silc/chat.c:233
 msgid "Add Channel Public Key"
 msgstr "Add Channel Public Key"
 
 #. Add new public key
-#: src/protocols/silc/chat.c:276
+#: src/protocols/silc/chat.c:288
 msgid "Open Public Key..."
 msgstr "Open Public Key..."
 
-#: src/protocols/silc/chat.c:385
+#: src/protocols/silc/chat.c:397
 msgid "Channel Passphrase"
 msgstr "Channel Passphrase"
 
-#: src/protocols/silc/chat.c:392
+#: src/protocols/silc/chat.c:404
 msgid "Channel Public Keys List"
 msgstr "Channel Public Keys List"
 
-#: src/protocols/silc/chat.c:397
+#: src/protocols/silc/chat.c:409
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -8936,131 +9002,131 @@
 "channel public keys are set then only users whose public keys are listed are "
 "able to join."
 
-#: src/protocols/silc/chat.c:406 src/protocols/silc/chat.c:407
-#: src/protocols/silc/chat.c:444 src/protocols/silc/chat.c:445
-#: src/protocols/silc/chat.c:874
+#: src/protocols/silc/chat.c:418 src/protocols/silc/chat.c:419
+#: src/protocols/silc/chat.c:456 src/protocols/silc/chat.c:457
+#: src/protocols/silc/chat.c:886
 msgid "Channel Authentication"
 msgstr "Channel Authentication"
 
-#: src/protocols/silc/chat.c:408 src/protocols/silc/chat.c:446
+#: src/protocols/silc/chat.c:420 src/protocols/silc/chat.c:458
 msgid "Add / Remove"
 msgstr "Add / Remove"
 
-#: src/protocols/silc/chat.c:563
+#: src/protocols/silc/chat.c:575
 msgid "Group Name"
 msgstr "Group name"
 
-#: src/protocols/silc/chat.c:567 src/protocols/silc/ops.c:1678
+#: src/protocols/silc/chat.c:579 src/protocols/silc/ops.c:1689
 msgid "Passphrase"
 msgstr "Passphrase"
 
-#: src/protocols/silc/chat.c:578
+#: src/protocols/silc/chat.c:590
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "Please enter the %s channel private group name and passphrase."
 
-#: src/protocols/silc/chat.c:580
+#: src/protocols/silc/chat.c:592
 msgid "Add Channel Private Group"
 msgstr "Add Channel Private Group"
 
-#: src/protocols/silc/chat.c:707
+#: src/protocols/silc/chat.c:719
 msgid "User Limit"
 msgstr "User Limit"
 
-#: src/protocols/silc/chat.c:708
+#: src/protocols/silc/chat.c:720
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr "Set user limit on channel. Set to zero to reset user limit."
 
-#: src/protocols/silc/chat.c:850
+#: src/protocols/silc/chat.c:862
 msgid "Get Info"
 msgstr "Get Info"
 
-#: src/protocols/silc/chat.c:857
+#: src/protocols/silc/chat.c:869
 msgid "Invite List"
 msgstr "Invite List"
 
-#: src/protocols/silc/chat.c:861
+#: src/protocols/silc/chat.c:873
 msgid "Ban List"
 msgstr "Ban List"
 
-#: src/protocols/silc/chat.c:868
+#: src/protocols/silc/chat.c:880
 msgid "Add Private Group"
 msgstr "Add Private Group"
 
-#: src/protocols/silc/chat.c:879
+#: src/protocols/silc/chat.c:891
 msgid "Reset Permanent"
 msgstr "Reset Permanent"
 
-#: src/protocols/silc/chat.c:883
+#: src/protocols/silc/chat.c:895
 msgid "Set Permanent"
 msgstr "Set Permanent"
 
-#: src/protocols/silc/chat.c:890
+#: src/protocols/silc/chat.c:902
 msgid "Set User Limit"
 msgstr "Set User Limit"
 
-#: src/protocols/silc/chat.c:895
+#: src/protocols/silc/chat.c:907
 msgid "Reset Topic Restriction"
 msgstr "Reset Topic Restriction"
 
-#: src/protocols/silc/chat.c:899
+#: src/protocols/silc/chat.c:911
 msgid "Set Topic Restriction"
 msgstr "Set Topic Restriction"
 
-#: src/protocols/silc/chat.c:905
+#: src/protocols/silc/chat.c:917
 msgid "Reset Private Channel"
 msgstr "Reset Private Channel"
 
-#: src/protocols/silc/chat.c:909
+#: src/protocols/silc/chat.c:921
 msgid "Set Private Channel"
 msgstr "Set Private Channel"
 
-#: src/protocols/silc/chat.c:915
+#: src/protocols/silc/chat.c:927
 msgid "Reset Secret Channel"
 msgstr "Reset Secret Channel"
 
-#: src/protocols/silc/chat.c:919
+#: src/protocols/silc/chat.c:931
 msgid "Set Secret Channel"
 msgstr "Set Secret Channel"
 
-#: src/protocols/silc/chat.c:981
+#: src/protocols/silc/chat.c:993
 #, 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:985
+#: src/protocols/silc/chat.c:997
 #, 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:1039
+#: src/protocols/silc/chat.c:1051
 #, 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:1041
+#: src/protocols/silc/chat.c:1053
 msgid "Join Private Group"
 msgstr "Join Private Group"
 
-#: src/protocols/silc/chat.c:1042
+#: src/protocols/silc/chat.c:1054
 msgid "Cannot join private group"
 msgstr "Cannot join private group"
 
-#: src/protocols/silc/chat.c:1235 src/protocols/silc/silc.c:894
+#: src/protocols/silc/chat.c:1247 src/protocols/silc/silc.c:894
 msgid "Cannot call command"
 msgstr "Cannot call command"
 
-#: src/protocols/silc/chat.c:1236 src/protocols/silc/silc.c:895
+#: src/protocols/silc/chat.c:1248 src/protocols/silc/silc.c:895
 msgid "Unknown command"
 msgstr "Unknown command"
 
 #: src/protocols/silc/ft.c:89 src/protocols/silc/ft.c:92
 #: src/protocols/silc/ft.c:96 src/protocols/silc/ft.c:100
-#: src/protocols/silc/ft.c:104 src/protocols/silc/ft.c:206
-#: src/protocols/silc/ft.c:211 src/protocols/silc/ft.c:216
-#: src/protocols/silc/ft.c:222 src/protocols/silc/ft.c:342
+#: src/protocols/silc/ft.c:104 src/protocols/silc/ft.c:205
+#: src/protocols/silc/ft.c:210 src/protocols/silc/ft.c:215
+#: src/protocols/silc/ft.c:221 src/protocols/silc/ft.c:340
 msgid "Secure File Transfer"
 msgstr "Secure File Transfer"
 
@@ -9082,170 +9148,170 @@
 msgid "File transfer sessions does not exist"
 msgstr "File transfer sessions does not exist"
 
-#: src/protocols/silc/ft.c:207
+#: src/protocols/silc/ft.c:206
 msgid "No file transfer session active"
 msgstr "No file transfer session active"
 
-#: src/protocols/silc/ft.c:212
+#: src/protocols/silc/ft.c:211
 msgid "File transfer already started"
 msgstr "File transfer already started"
 
-#: src/protocols/silc/ft.c:217
+#: src/protocols/silc/ft.c:216
 msgid "Could not perform key agreement for file transfer"
 msgstr "Could not perform key agreement for file transfer"
 
-#: src/protocols/silc/ft.c:223
+#: src/protocols/silc/ft.c:222
 msgid "Could not start the file transfer"
 msgstr "Could not start the file transfer"
 
-#: src/protocols/silc/ft.c:343
+#: src/protocols/silc/ft.c:341
 msgid "Cannot send file"
 msgstr "Cannot send file"
 
-#: src/protocols/silc/ops.c:333 src/protocols/silc/ops.c:342
-#: src/protocols/silc/ops.c:351
+#: src/protocols/silc/ops.c:339 src/protocols/silc/ops.c:348
+#: src/protocols/silc/ops.c:357
 #, c-format
 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:414
+#: src/protocols/silc/ops.c:423
 #, 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:418
+#: src/protocols/silc/ops.c:427
 #, 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:451
+#: src/protocols/silc/ops.c:460
 #, 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:459
+#: src/protocols/silc/ops.c:468
 #, 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:488
+#: src/protocols/silc/ops.c:497
 #, 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:518 src/protocols/silc/ops.c:523
-#: src/protocols/silc/ops.c:528
+#: src/protocols/silc/ops.c:527 src/protocols/silc/ops.c:532
+#: src/protocols/silc/ops.c:537
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr "You have been killed by %s (%s)"
 
-#: src/protocols/silc/ops.c:549 src/protocols/silc/ops.c:554
-#: src/protocols/silc/ops.c:559
+#: src/protocols/silc/ops.c:558 src/protocols/silc/ops.c:563
+#: src/protocols/silc/ops.c:568
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr "Killed by %s (%s)"
 
-#: src/protocols/silc/ops.c:605
+#: src/protocols/silc/ops.c:614
 msgid "Server signoff"
 msgstr "Server signoff"
 
-#: src/protocols/silc/ops.c:792
+#: src/protocols/silc/ops.c:801
 msgid "Personal Information"
 msgstr "Personal Information"
 
-#: src/protocols/silc/ops.c:815
+#: src/protocols/silc/ops.c:824
 msgid "Birth Day"
 msgstr "Birth Day"
 
-#: src/protocols/silc/ops.c:819
+#: src/protocols/silc/ops.c:828
 msgid "Job Title"
 msgstr "Job Title"
 
-#: src/protocols/silc/ops.c:823
+#: src/protocols/silc/ops.c:832
 msgid "Job Role"
 msgstr "Job Role"
 
-#: src/protocols/silc/ops.c:827
+#: src/protocols/silc/ops.c:836
 msgid "Organization"
 msgstr "Organisation"
 
-#: src/protocols/silc/ops.c:831
+#: src/protocols/silc/ops.c:840
 msgid "Unit"
 msgstr "Unit"
 
-#: src/protocols/silc/ops.c:850
+#: src/protocols/silc/ops.c:859
 msgid "EMail"
 msgstr "E-Mail"
 
-#: src/protocols/silc/ops.c:855
+#: src/protocols/silc/ops.c:864
 msgid "Note"
 msgstr "Note"
 
-#: src/protocols/silc/ops.c:903
+#: src/protocols/silc/ops.c:912
 msgid "Join Chat"
 msgstr "Join Chat"
 
-#: src/protocols/silc/ops.c:1059 src/protocols/silc/ops.c:1129
+#: src/protocols/silc/ops.c:1068 src/protocols/silc/ops.c:1139
 msgid "Public Key Fingerprint"
 msgstr "Public Key Fingerprint"
 
-#: src/protocols/silc/ops.c:1060 src/protocols/silc/ops.c:1130
+#: src/protocols/silc/ops.c:1069 src/protocols/silc/ops.c:1140
 msgid "Public Key Babbleprint"
 msgstr "Public Key Babbleprint"
 
-#: src/protocols/silc/ops.c:1073
+#: src/protocols/silc/ops.c:1082
 msgid "More..."
 msgstr "More..."
 
-#: src/protocols/silc/ops.c:1144 src/protocols/silc/silc.c:783
+#: src/protocols/silc/ops.c:1155 src/protocols/silc/silc.c:783
 msgid "Detach From Server"
 msgstr "Detach From Server"
 
-#: src/protocols/silc/ops.c:1144
+#: src/protocols/silc/ops.c:1155
 msgid "Cannot detach"
 msgstr "Cannot detach"
 
-#: src/protocols/silc/ops.c:1155
+#: src/protocols/silc/ops.c:1166
 msgid "Cannot set topic"
 msgstr "Cannot set topic"
 
-#: src/protocols/silc/ops.c:1193
+#: src/protocols/silc/ops.c:1204
 msgid "Failed to change nickname"
 msgstr "Failed to change nickname"
 
-#: src/protocols/silc/ops.c:1230
+#: src/protocols/silc/ops.c:1241
 msgid "Roomlist"
 msgstr "Room List"
 
-#: src/protocols/silc/ops.c:1230
+#: src/protocols/silc/ops.c:1241
 msgid "Cannot get room list"
 msgstr "Cannot get room list"
 
-#: src/protocols/silc/ops.c:1278
+#: src/protocols/silc/ops.c:1289
 msgid "No public key was received"
 msgstr "No public key was received"
 
-#: src/protocols/silc/ops.c:1291 src/protocols/silc/ops.c:1305
+#: src/protocols/silc/ops.c:1302 src/protocols/silc/ops.c:1316
 msgid "Server Information"
 msgstr "Server Information"
 
-#: src/protocols/silc/ops.c:1292
+#: src/protocols/silc/ops.c:1303
 msgid "Cannot get server information"
 msgstr "Cannot get server information"
 
-#: src/protocols/silc/ops.c:1323 src/protocols/silc/ops.c:1332
+#: src/protocols/silc/ops.c:1334 src/protocols/silc/ops.c:1343
 msgid "Server Statistics"
 msgstr "Server Statistics"
 
-#: src/protocols/silc/ops.c:1324
+#: src/protocols/silc/ops.c:1335
 msgid "Cannot get server statistics"
 msgstr "Cannot get server statistics"
 
-#: src/protocols/silc/ops.c:1333
+#: src/protocols/silc/ops.c:1344
 msgid "No server statistics available"
 msgstr "No server statistics available"
 
-#: src/protocols/silc/ops.c:1355
+#: src/protocols/silc/ops.c:1366
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -9280,98 +9346,98 @@
 "Total server operators: %d\n"
 "Total router operators: %d\n"
 
-#: src/protocols/silc/ops.c:1378
+#: src/protocols/silc/ops.c:1389
 msgid "Network Statistics"
 msgstr "Network Statistics"
 
-#: src/protocols/silc/ops.c:1386 src/protocols/silc/ops.c:1391
+#: src/protocols/silc/ops.c:1397 src/protocols/silc/ops.c:1402
 msgid "Ping"
 msgstr "Ping"
 
-#: src/protocols/silc/ops.c:1386
+#: src/protocols/silc/ops.c:1397
 msgid "Ping failed"
 msgstr "Ping failed"
 
-#: src/protocols/silc/ops.c:1391
+#: src/protocols/silc/ops.c:1402
 msgid "Ping reply received from server"
 msgstr "Ping reply received from server"
 
-#: src/protocols/silc/ops.c:1399
+#: src/protocols/silc/ops.c:1410
 msgid "Could not kill user"
 msgstr "Could not kill user"
 
-#: src/protocols/silc/ops.c:1480
+#: src/protocols/silc/ops.c:1491
 msgid "Error during connecting to SILC Server"
 msgstr "Error during connecting to SILC Server"
 
-#: src/protocols/silc/ops.c:1485
+#: src/protocols/silc/ops.c:1496
 msgid "Key Exchange failed"
 msgstr "Key Exchange failed"
 
-#: src/protocols/silc/ops.c:1494
+#: src/protocols/silc/ops.c:1505
 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:1529
+#: src/protocols/silc/ops.c:1540
 msgid "Disconnected by server"
 msgstr "Disconnected by server"
 
-#: src/protocols/silc/ops.c:1589 src/protocols/silc/ops.c:1636
+#: src/protocols/silc/ops.c:1600 src/protocols/silc/ops.c:1647
 #: src/protocols/silc/silc.c:173
 msgid "Resuming session"
 msgstr "Resuming session"
 
-#: src/protocols/silc/ops.c:1591
+#: src/protocols/silc/ops.c:1602
 msgid "Authenticating connection"
 msgstr "Authenticating connection"
 
-#: src/protocols/silc/ops.c:1638
+#: src/protocols/silc/ops.c:1649
 msgid "Verifying server public key"
 msgstr "Verifying server public key"
 
-#: src/protocols/silc/ops.c:1679
+#: src/protocols/silc/ops.c:1690
 msgid "Passphrase required"
 msgstr "Passphrase required"
 
-#: src/protocols/silc/ops.c:1708
+#: src/protocols/silc/ops.c:1719
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Failure: Version mismatch, upgrade your client"
 
-#: src/protocols/silc/ops.c:1711
+#: src/protocols/silc/ops.c:1722
 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
+#: src/protocols/silc/ops.c:1725
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "Failure: Remote does not support proposed KE group"
 
-#: src/protocols/silc/ops.c:1717
+#: src/protocols/silc/ops.c:1728
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "Failure: Remote does not support proposed cipher"
 
-#: src/protocols/silc/ops.c:1720
+#: src/protocols/silc/ops.c:1731
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "Failure: Remote does not support proposed PKCS"
 
-#: src/protocols/silc/ops.c:1723
+#: src/protocols/silc/ops.c:1734
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "Failure: Remote does not support proposed hash function"
 
-#: src/protocols/silc/ops.c:1726
+#: src/protocols/silc/ops.c:1737
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "Failure: Remote does not support proposed HMAC"
 
-#: src/protocols/silc/ops.c:1728
+#: src/protocols/silc/ops.c:1739
 msgid "Failure: Incorrect signature"
 msgstr "Failure: Incorrect signature"
 
-#: src/protocols/silc/ops.c:1730
+#: src/protocols/silc/ops.c:1741
 msgid "Failure: Invalid cookie"
 msgstr "Failure: Invalid cookie"
 
-#: src/protocols/silc/ops.c:1741
+#: src/protocols/silc/ops.c:1752
 msgid "Failure: Authentication failed"
 msgstr "Failure: Authentication failed"
 
@@ -9498,7 +9564,7 @@
 "about yourself."
 
 #: src/protocols/silc/silc.c:734 src/protocols/silc/silc.c:740
-#: src/protocols/silc/silc.c:1141
+#: src/protocols/silc/silc.c:1143
 msgid "Message of the Day"
 msgstr "Message of the Day"
 
@@ -9506,7 +9572,7 @@
 msgid "No Message of the Day available"
 msgstr "No Message of the Day available"
 
-#: src/protocols/silc/silc.c:735 src/protocols/silc/silc.c:1136
+#: src/protocols/silc/silc.c:735 src/protocols/silc/silc.c:1138
 msgid "There is no Message of the Day associated with this connection"
 msgstr "There is no Message of the Day associated with this connection"
 
@@ -9527,101 +9593,101 @@
 msgid "Failed to leave channel"
 msgstr "Failed to leave channel"
 
-#: src/protocols/silc/silc.c:1012
+#: src/protocols/silc/silc.c:1014
 msgid "Topic too long"
 msgstr "Topic too long."
 
-#: src/protocols/silc/silc.c:1093
+#: src/protocols/silc/silc.c:1095
 msgid "You must specify a nick"
 msgstr "You must specify a nick"
 
-#: src/protocols/silc/silc.c:1195
+#: src/protocols/silc/silc.c:1197
 #, c-format
 msgid "channel %s not found"
 msgstr "channel %s not found"
 
-#: src/protocols/silc/silc.c:1200
+#: src/protocols/silc/silc.c:1202
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "channel modes for %s: %s"
 
-#: src/protocols/silc/silc.c:1202
+#: src/protocols/silc/silc.c:1204
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "no channel modes are set on %s"
 
-#: src/protocols/silc/silc.c:1215
+#: src/protocols/silc/silc.c:1217
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "Failed to set cmodes for %s"
 
-#: src/protocols/silc/silc.c:1245
+#: src/protocols/silc/silc.c:1247
 #, c-format
 msgid "Unknown command: %s, (may be a Gaim bug)"
 msgstr "Unknown command: %s, (may be a Gaim bug)"
 
-#: src/protocols/silc/silc.c:1308
+#: src/protocols/silc/silc.c:1310
 msgid "part [channel]:  Leave the chat"
 msgstr "part [channel]:  Leave the chat"
 
-#: src/protocols/silc/silc.c:1312
+#: src/protocols/silc/silc.c:1314
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [channel]:  Leave the chat"
 
-#: src/protocols/silc/silc.c:1316
+#: src/protocols/silc/silc.c:1318
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;new topic&gt;]:  View or change the topic"
 
-#: src/protocols/silc/silc.c:1321
+#: src/protocols/silc/silc.c:1323
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 
-#: src/protocols/silc/silc.c:1325
+#: src/protocols/silc/silc.c:1327
 msgid "list:  List channels on this network"
 msgstr "list:  List channels on this network"
 
-#: src/protocols/silc/silc.c:1329
+#: src/protocols/silc/silc.c:1331
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;nick&gt;:  View nick's information"
 
-#: src/protocols/silc/silc.c:1333 src/protocols/zephyr/zephyr.c:1675
+#: src/protocols/silc/silc.c:1335 src/protocols/zephyr/zephyr.c:1678
 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"
 
-#: src/protocols/silc/silc.c:1337
+#: src/protocols/silc/silc.c:1339
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr ""
 "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 
-#: src/protocols/silc/silc.c:1341
+#: src/protocols/silc/silc.c:1343
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd:  View the server's Message Of The Day"
 
-#: src/protocols/silc/silc.c:1345
+#: src/protocols/silc/silc.c:1347
 msgid "detach:  Detach this session"
 msgstr "detach:  Detach this session"
 
-#: src/protocols/silc/silc.c:1349
+#: src/protocols/silc/silc.c:1351
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr "quit [message]:  Disconnect from the server, with an optional message"
 
-#: src/protocols/silc/silc.c:1353
+#: src/protocols/silc/silc.c:1355
 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:1359
+#: src/protocols/silc/silc.c:1361
 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:1363
+#: src/protocols/silc/silc.c:1365
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;newnick&gt;:  Change your nickname"
 
-#: src/protocols/silc/silc.c:1367
+#: src/protocols/silc/silc.c:1369
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;nick&gt;:  View nick's information"
 
-#: src/protocols/silc/silc.c:1371
+#: src/protocols/silc/silc.c:1373
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
@@ -9629,7 +9695,7 @@
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
 
-#: src/protocols/silc/silc.c:1375
+#: src/protocols/silc/silc.c:1377
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
@@ -9637,15 +9703,15 @@
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
 
-#: src/protocols/silc/silc.c:1379
+#: src/protocols/silc/silc.c:1381
 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:1383
+#: src/protocols/silc/silc.c:1385
 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:1387
+#: src/protocols/silc/silc.c:1389
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
@@ -9653,35 +9719,35 @@
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
 
-#: src/protocols/silc/silc.c:1391
+#: src/protocols/silc/silc.c:1393
 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:1395
+#: src/protocols/silc/silc.c:1397
 msgid "info [server]:  View server administrative details"
 msgstr "info [server]:  View server administrative details"
 
-#: src/protocols/silc/silc.c:1399
+#: src/protocols/silc/silc.c:1401
 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:1403
+#: src/protocols/silc/silc.c:1405
 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:1407
+#: src/protocols/silc/silc.c:1409
 msgid "stats:  View server and network statistics"
 msgstr "stats:  View server and network statistics"
 
-#: src/protocols/silc/silc.c:1411
+#: src/protocols/silc/silc.c:1413
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:  Send PING to the connected server"
 
-#: src/protocols/silc/silc.c:1416
+#: src/protocols/silc/silc.c:1418
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;channel&gt;:  List users in channel"
 
-#: src/protocols/silc/silc.c:1420
+#: src/protocols/silc/silc.c:1422
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -9689,39 +9755,39 @@
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
 
-#: src/protocols/silc/silc.c:1432
+#: src/protocols/silc/silc.c:1434
 msgid "Instant Messages"
 msgstr "Instant Messages"
 
-#: src/protocols/silc/silc.c:1437
+#: src/protocols/silc/silc.c:1439
 msgid "Digitally sign all IM messages"
 msgstr "Digitally sign all IM messages"
 
-#: src/protocols/silc/silc.c:1442
+#: src/protocols/silc/silc.c:1444
 msgid "Verify all IM message signatures"
 msgstr "Verify all IM message signatures"
 
-#: src/protocols/silc/silc.c:1445
+#: src/protocols/silc/silc.c:1447
 msgid "Channel Messages"
 msgstr "Channel Messages"
 
-#: src/protocols/silc/silc.c:1450
+#: src/protocols/silc/silc.c:1452
 msgid "Digitally sign all channel messages"
 msgstr "Digitally sign all channel messages"
 
-#: src/protocols/silc/silc.c:1455
+#: src/protocols/silc/silc.c:1457
 msgid "Verify all channel message signatures"
 msgstr "Verify all channel message signatures"
 
-#: src/protocols/silc/silc.c:1458
+#: src/protocols/silc/silc.c:1460
 msgid "Default SILC Key Pair"
 msgstr "Default SILC Key Pair"
 
-#: src/protocols/silc/silc.c:1463
+#: src/protocols/silc/silc.c:1465
 msgid "SILC Public Key"
 msgstr "SILC Public Key"
 
-#: src/protocols/silc/silc.c:1468
+#: src/protocols/silc/silc.c:1470
 msgid "SILC Private Key"
 msgstr "SILC Private Key"
 
@@ -9735,40 +9801,40 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/silc/silc.c:1554
+#: src/protocols/silc/silc.c:1557
 msgid "SILC Protocol Plugin"
 msgstr "SILC Protocol Plugin"
 
 #. *  description
-#: src/protocols/silc/silc.c:1556
+#: src/protocols/silc/silc.c:1559
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Secure Internet Live Conferencing (SILC) Protocol"
 
-#: src/protocols/silc/silc.c:1586
+#: src/protocols/silc/silc.c:1589
 msgid "Public key authentication"
 msgstr "Public key authentication"
 
-#: src/protocols/silc/silc.c:1592
+#: src/protocols/silc/silc.c:1595
 msgid "Public Key File"
 msgstr "Public Key File"
 
-#: src/protocols/silc/silc.c:1596
+#: src/protocols/silc/silc.c:1599
 msgid "Private Key File"
 msgstr "Private Key File"
 
-#: src/protocols/silc/silc.c:1601
+#: src/protocols/silc/silc.c:1604
 msgid "Reject watching by other users"
 msgstr "Reject watching by other users"
 
-#: src/protocols/silc/silc.c:1604
+#: src/protocols/silc/silc.c:1607
 msgid "Block invites"
 msgstr "Block invites"
 
-#: src/protocols/silc/silc.c:1607
+#: src/protocols/silc/silc.c:1610
 msgid "Block IMs without Key Exchange"
 msgstr "Block IMs without Key Exchange"
 
-#: src/protocols/silc/silc.c:1610
+#: src/protocols/silc/silc.c:1613
 msgid "Reject online status attribute requests"
 msgstr "Reject online status attribute requests"
 
@@ -10010,44 +10076,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:1421
 msgid "Get Dir Info"
 msgstr "Get Dir Info"
 
-#: src/protocols/toc/toc.c:1545
+#: src/protocols/toc/toc.c:1557
 msgid "Set Dir Info"
 msgstr "Set Dir Info"
 
-#: src/protocols/toc/toc.c:1667
+#: src/protocols/toc/toc.c:1679
 #, 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:1715
 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:1760 src/protocols/toc/toc.c:1800
+#: src/protocols/toc/toc.c:1924 src/protocols/toc/toc.c:2012
 msgid "Could not connect for transfer."
 msgstr "Could not connect for transfer."
 
-#: src/protocols/toc/toc.c:1945
+#: src/protocols/toc/toc.c:1957
 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:2057
 msgid "Gaim - Save As..."
 msgstr "Gaim - Save As..."
 
-#: src/protocols/toc/toc.c:2079
+#: src/protocols/toc/toc.c:2091
 #, 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:2098
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s requests you to send them a file"
@@ -10062,16 +10128,15 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: src/protocols/toc/toc.c:2169 src/protocols/toc/toc.c:2171
+#: src/protocols/toc/toc.c:2182 src/protocols/toc/toc.c:2184
 msgid "TOC Protocol Plugin"
 msgstr "TOC Protocol Plugin"
 
-#: src/protocols/toc/toc.c:2190
+#: src/protocols/toc/toc.c:2203
 msgid "TOC host"
 msgstr "TOC host"
 
-#: src/protocols/toc/toc.c:2194
+#: src/protocols/toc/toc.c:2207
 msgid "TOC port"
 msgstr "TOC port"
 
@@ -10154,8 +10219,7 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: src/protocols/trepia/trepia.c:1271 src/protocols/trepia/trepia.c:1273
+#: src/protocols/trepia/trepia.c:1272 src/protocols/trepia/trepia.c:1274
 msgid "Trepia Protocol Plugin"
 msgstr "Trepia Protocol Plugin"
 
@@ -10231,18 +10295,18 @@
 msgstr "Invalid username."
 
 #: src/protocols/yahoo/yahoo.c:1825
-msgid "Normal authencation failed!"
-msgstr "Normal authencation failed!"
+msgid "Normal authentication failed!"
+msgstr "Normal authentication failed!"
 
 #: src/protocols/yahoo/yahoo.c:1826
 msgid ""
-"The normal authencation method has failed. This means either your password "
-"is incorrect, or Yahoo!'s authencation scheme has changed. Gaim will now "
-"attempt to log in using Web Messenger authencation, will which result in "
+"The normal authentication method has failed. This means either your password "
+"is incorrect, or Yahoo!'s authentication scheme has changed. Gaim will now "
+"attempt to log in using Web Messenger authentication, which will result in "
 "reduced functionality and features."
 msgstr ""
 "The normal authentication method has failed. This means either your password "
-"is incorrect, or Yahoo!'s authencation scheme has changed. Gaim will now "
+"is incorrect, or Yahoo!'s authentication scheme has changed. Gaim will now "
 "attempt to log in using Web Messenger authentication, will which result in "
 "reduced functionality and features."
 
@@ -10275,61 +10339,61 @@
 
 #: 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:1396 src/protocols/yahoo/yahoochat.c:1457
+#: src/protocols/yahoo/yahoochat.c:1410 src/protocols/yahoo/yahoochat.c:1471
 #: src/protocols/yahoo/ycht.c:518
 msgid "Connection problem"
 msgstr "Connection problem"
 
-#: src/protocols/yahoo/yahoo.c:2538 src/protocols/yahoo/yahoo.c:2900
-#: src/protocols/yahoo/yahoo.c:3014
+#: src/protocols/yahoo/yahoo.c:2547 src/protocols/yahoo/yahoo.c:2914
+#: src/protocols/yahoo/yahoo.c:3028
 msgid "Not At Home"
 msgstr "Not At Home"
 
-#: src/protocols/yahoo/yahoo.c:2540 src/protocols/yahoo/yahoo.c:2902
-#: src/protocols/yahoo/yahoo.c:3015
+#: src/protocols/yahoo/yahoo.c:2549 src/protocols/yahoo/yahoo.c:2916
+#: src/protocols/yahoo/yahoo.c:3029
 msgid "Not At Desk"
 msgstr "Not At Desk"
 
-#: src/protocols/yahoo/yahoo.c:2542 src/protocols/yahoo/yahoo.c:2904
-#: src/protocols/yahoo/yahoo.c:3016
+#: src/protocols/yahoo/yahoo.c:2551 src/protocols/yahoo/yahoo.c:2918
+#: src/protocols/yahoo/yahoo.c:3030
 msgid "Not In Office"
 msgstr "Not In Office"
 
-#: src/protocols/yahoo/yahoo.c:2546 src/protocols/yahoo/yahoo.c:2908
-#: src/protocols/yahoo/yahoo.c:3018
+#: src/protocols/yahoo/yahoo.c:2555 src/protocols/yahoo/yahoo.c:2922
+#: src/protocols/yahoo/yahoo.c:3032
 msgid "On Vacation"
 msgstr "On Vacation"
 
-#: src/protocols/yahoo/yahoo.c:2550 src/protocols/yahoo/yahoo.c:2912
-#: src/protocols/yahoo/yahoo.c:3020
+#: src/protocols/yahoo/yahoo.c:2559 src/protocols/yahoo/yahoo.c:2926
+#: src/protocols/yahoo/yahoo.c:3034
 msgid "Stepped Out"
 msgstr "Stepped Out"
 
-#: src/protocols/yahoo/yahoo.c:2631 src/protocols/yahoo/yahoo.c:2657
+#: src/protocols/yahoo/yahoo.c:2640 src/protocols/yahoo/yahoo.c:2666
 msgid "Not on server list"
 msgstr "Not on server list"
 
-#: src/protocols/yahoo/yahoo.c:2736
+#: src/protocols/yahoo/yahoo.c:2745
 msgid "Join in Chat"
 msgstr "Join in Chat"
 
-#: src/protocols/yahoo/yahoo.c:2741
+#: src/protocols/yahoo/yahoo.c:2750
 msgid "Initiate Conference"
 msgstr "Initiate Conference"
 
-#: src/protocols/yahoo/yahoo.c:2793
+#: src/protocols/yahoo/yahoo.c:2802
 msgid "Active which ID?"
 msgstr "Active which ID?"
 
-#: src/protocols/yahoo/yahoo.c:2802
+#: src/protocols/yahoo/yahoo.c:2811
 msgid "Join who in chat?"
 msgstr "Join who in chat?"
 
-#: src/protocols/yahoo/yahoo.c:2812
+#: src/protocols/yahoo/yahoo.c:2821
 msgid "Activate ID..."
 msgstr "Activate ID..."
 
-#: src/protocols/yahoo/yahoo.c:2816
+#: src/protocols/yahoo/yahoo.c:2825
 msgid "Join user in chat..."
 msgstr "Join user in chat..."
 
@@ -10343,48 +10407,47 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: src/protocols/yahoo/yahoo.c:3335 src/protocols/yahoo/yahoo.c:3337
+#: src/protocols/yahoo/yahoo.c:3350 src/protocols/yahoo/yahoo.c:3352
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo Protocol Plugin"
 
-#: src/protocols/yahoo/yahoo.c:3356
+#: src/protocols/yahoo/yahoo.c:3371
 msgid "Yahoo Japan"
 msgstr "Yahoo Japan"
 
-#: src/protocols/yahoo/yahoo.c:3359
+#: src/protocols/yahoo/yahoo.c:3374
 msgid "Pager host"
 msgstr "Pager host"
 
-#: src/protocols/yahoo/yahoo.c:3362
+#: src/protocols/yahoo/yahoo.c:3377
 msgid "Japan Pager host"
 msgstr "Japan Pager host"
 
-#: src/protocols/yahoo/yahoo.c:3365
+#: src/protocols/yahoo/yahoo.c:3380
 msgid "Pager port"
 msgstr "Pager port"
 
-#: src/protocols/yahoo/yahoo.c:3368
+#: src/protocols/yahoo/yahoo.c:3383
 msgid "File transfer host"
 msgstr "File transfer host"
 
-#: src/protocols/yahoo/yahoo.c:3371
+#: src/protocols/yahoo/yahoo.c:3386
 msgid "Japan File transfer host"
 msgstr "Japan File transfer host"
 
-#: src/protocols/yahoo/yahoo.c:3374
+#: src/protocols/yahoo/yahoo.c:3389
 msgid "File transfer port"
 msgstr "File transfer port"
 
-#: src/protocols/yahoo/yahoo.c:3377
+#: src/protocols/yahoo/yahoo.c:3392
 msgid "Chat Room List Url"
 msgstr "Chat Room List Url"
 
-#: src/protocols/yahoo/yahoo.c:3380
+#: src/protocols/yahoo/yahoo.c:3395
 msgid "YCHT Host"
 msgstr "YCHT Host"
 
-#: src/protocols/yahoo/yahoo.c:3383
+#: src/protocols/yahoo/yahoo.c:3398
 msgid "YCHT Port"
 msgstr "YCHT Port"
 
@@ -10491,57 +10554,57 @@
 msgid "The user's profile is empty."
 msgstr "The user's profile is empty."
 
-#: src/protocols/yahoo/yahoochat.c:192
+#: 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:194
+#: src/protocols/yahoo/yahoochat.c:195
 msgid "Invitation Rejected"
 msgstr "Invitation Rejected"
 
-#: src/protocols/yahoo/yahoochat.c:346
+#: src/protocols/yahoo/yahoochat.c:347
 msgid "Failed to join chat"
 msgstr "Failed to join chat"
 
-#: src/protocols/yahoo/yahoochat.c:346
+#: src/protocols/yahoo/yahoochat.c:347
 msgid "Maybe the room is full?"
 msgstr "Perhaps the room is full?"
 
-#: src/protocols/yahoo/yahoochat.c:424
+#: 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:578
+#: 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:579
+#: src/protocols/yahoo/yahoochat.c:580
 msgid "Maybe they're not in a chat?"
 msgstr "Perhaps they're not in a chat?"
 
-#: src/protocols/yahoo/yahoochat.c:1337
+#: src/protocols/yahoo/yahoochat.c:1351
 msgid "Unable to connect"
 msgstr "Unable to connect"
 
-#: src/protocols/yahoo/yahoochat.c:1337
+#: src/protocols/yahoo/yahoochat.c:1351
 msgid "Fetching the room list failed."
 msgstr "Fetching the room list failed."
 
-#: src/protocols/yahoo/yahoochat.c:1382
+#: src/protocols/yahoo/yahoochat.c:1396
 msgid "Voices"
 msgstr "Voices"
 
-#: src/protocols/yahoo/yahoochat.c:1385
+#: src/protocols/yahoo/yahoochat.c:1399
 msgid "Webcams"
 msgstr "Webcams"
 
-#: src/protocols/yahoo/yahoochat.c:1396 src/protocols/yahoo/yahoochat.c:1457
+#: src/protocols/yahoo/yahoochat.c:1410 src/protocols/yahoo/yahoochat.c:1471
 msgid "Unable to fetch room list."
 msgstr "Unable to fetch room list."
 
-#: src/protocols/yahoo/yahoochat.c:1450
+#: src/protocols/yahoo/yahoochat.c:1464
 msgid "User Rooms"
 msgstr "User Rooms"
 
@@ -10568,54 +10631,54 @@
 msgid "<br>At %s since %s"
 msgstr "<br>At %s since %s"
 
-#: src/protocols/zephyr/zephyr.c:986 src/protocols/zephyr/zephyr.c:987
+#: src/protocols/zephyr/zephyr.c:989 src/protocols/zephyr/zephyr.c:990
 msgid "Anyone"
 msgstr "Anyone"
 
-#: src/protocols/zephyr/zephyr.c:1388
+#: src/protocols/zephyr/zephyr.c:1391
 msgid "_Class:"
 msgstr "_Class:"
 
-#: src/protocols/zephyr/zephyr.c:1394
+#: src/protocols/zephyr/zephyr.c:1397
 msgid "_Instance:"
 msgstr "_Instance:"
 
-#: src/protocols/zephyr/zephyr.c:1400
+#: src/protocols/zephyr/zephyr.c:1403
 msgid "_Recipient:"
 msgstr "_Recipient:"
 
-#: src/protocols/zephyr/zephyr.c:1411
+#: src/protocols/zephyr/zephyr.c:1414
 #, 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:1680
+#: src/protocols/zephyr/zephyr.c:1683
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;nick&gt;: Locate user"
 
-#: src/protocols/zephyr/zephyr.c:1685
+#: src/protocols/zephyr/zephyr.c:1688
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;nick&gt;: Locate user"
 
-#: src/protocols/zephyr/zephyr.c:1690
+#: src/protocols/zephyr/zephyr.c:1693
 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:1695
+#: src/protocols/zephyr/zephyr.c:1698
 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:1701
+#: src/protocols/zephyr/zephyr.c:1704
 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:1706
+#: src/protocols/zephyr/zephyr.c:1709
 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:1712
+#: src/protocols/zephyr/zephyr.c:1715
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
@@ -10623,7 +10686,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:1718
+#: src/protocols/zephyr/zephyr.c:1721
 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;"
@@ -10631,7 +10694,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:1724
+#: src/protocols/zephyr/zephyr.c:1727
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
@@ -10639,15 +10702,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:1729
+#: src/protocols/zephyr/zephyr.c:1732
 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:1805
+#: src/protocols/zephyr/zephyr.c:1808
 msgid "Resubscribe"
 msgstr "Resubscribe"
 
-#: src/protocols/zephyr/zephyr.c:1808
+#: src/protocols/zephyr/zephyr.c:1811
 msgid "Retrieve subscriptions from server"
 msgstr "Retrieve subscriptions from server"
 
@@ -10661,20 +10724,19 @@
 #. *< name
 #. *< version
 #. *  summary
-#. *  description
-#: src/protocols/zephyr/zephyr.c:1888 src/protocols/zephyr/zephyr.c:1890
+#: src/protocols/zephyr/zephyr.c:1892 src/protocols/zephyr/zephyr.c:1894
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr Protocol Plugin"
 
-#: src/protocols/zephyr/zephyr.c:1909
+#: src/protocols/zephyr/zephyr.c:1913
 msgid "Export to .anyone"
 msgstr "Export to .anyone"
 
-#: src/protocols/zephyr/zephyr.c:1912
+#: src/protocols/zephyr/zephyr.c:1916
 msgid "Export to .zephyr.subs"
 msgstr "Export to .zephyr.subs"
 
-#: src/protocols/zephyr/zephyr.c:1915
+#: src/protocols/zephyr/zephyr.c:1919
 msgid "Exposure"
 msgstr "Exposure"
 
@@ -10703,7 +10765,7 @@
 "invalid."
 
 #. * Custom away message.
-#: src/prpl.h:181
+#: src/prpl.h:180
 msgid "Custom"
 msgstr "Custom"
 
@@ -10812,60 +10874,59 @@
 msgid "Sorry, I ran out for a bit!"
 msgstr "Sorry, I ran out for a bit!"
 
-#: src/stock.c:86
+#: src/stock.c:87
 msgid "_Alias"
 msgstr "_Alias"
 
-#: src/stock.c:88
-#, fuzzy
+#: src/stock.c:89
 msgid "_Invite"
-msgstr "Invite"
-
-#: src/stock.c:89
-msgid "_Modify"
-msgstr "_Modify"
+msgstr "_Invite"
 
 #: src/stock.c:90
+msgid "_Modify"
+msgstr "_Modify"
+
+#: src/stock.c:91
 msgid "_Open Mail"
 msgstr "_Open Mail"
 
-#: src/stock.c:92
+#: src/stock.c:93
 msgid "_Warn"
 msgstr "_Warn"
 
-#: src/util.c:2353
+#: src/util.c:2352
 msgid "Calculating..."
 msgstr "Calculating..."
 
-#: src/util.c:2356
+#: src/util.c:2355
 msgid "Unknown."
 msgstr "Unknown."
 
-#: src/util.c:2382
+#: src/util.c:2381
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "second"
 msgstr[1] "seconds"
 
-#: src/util.c:2396
+#: src/util.c:2395
 msgid "day"
 msgid_plural "days"
 msgstr[0] "day"
 msgstr[1] "days"
 
-#: src/util.c:2404
+#: src/util.c:2403
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "hour"
 msgstr[1] "hours"
 
-#: src/util.c:2412
+#: src/util.c:2411
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minute"
 msgstr[1] "minutes"
 
-#: src/util.c:2822
+#: src/util.c:2828
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Error opening connection.\n"
 
@@ -10880,6 +10941,3 @@
 #: src/win32/win32dep.c:278
 msgid "Notification"
 msgstr "Notification"
-
-#~ msgid "<font sml=\"msn\">%s</font><br>"
-#~ msgstr "<font sml=\"msn\">%s</font><br>"