changeset 10149:bc74e3a81abe

[gaim-migrate @ 11226] Update committer: Tailor Script <tailor@pidgin.im>
author Stu Tomlinson <stu@nosnilmot.com>
date Fri, 29 Oct 2004 14:20:04 +0000
parents 946aa96fa103
children 31ade5ef01cc
files po/ChangeLog po/en_CA.po
diffstat 2 files changed, 2313 insertions(+), 2443 deletions(-) [+]
line wrap: on
line diff
--- a/po/ChangeLog	Fri Oct 29 00:06:32 2004 +0000
+++ b/po/ChangeLog	Fri Oct 29 14:20:04 2004 +0000
@@ -1,6 +1,47 @@
 Gaim: The Pimpin' Penguin IM Clone that's good for the soul!
 
-version 0.82-1(08/27/2004)
+version 2.0.0:
+	* English (Canadian) tranlation updated (Adam Weinberger)
+
+version 1.0.2 (10/19/2004):
+	* Dutch translation updated (Vincent van Adrighem)
+
+version 1.0.1 (10/07/2004):
+	* Catalan translation under new translator, and updated (Josep Puigdemont)
+	* Chinese (Simplified) translation updated (Funda Wang)
+	* Chinese (Traditional) translation updated (Ambrose C. Li)
+	* Dutch translation updated (Vincent van Adrighem)
+	* French translation updated (Eric Boumaour)
+	* German Translation updated (Bjoern Voigt)
+	* Italian translation update (Claudio Satriano)
+	* Romanian translation updated (Misu Moldovan)
+	* Spanish translation updated (Javier Fernandez-Sanguino Peña)
+
+version 1.0.0 (09/17/2004):
+	* Chinese (Simplified) translation updated (Funda Wang)
+	* Chinese (Traditional) translation updated (Ambrose C. Li)
+	* Danish translation updated (Morten (mbrix) Brix Pedersen)
+	* Dutch translation updated (Vincent van Adrighem)
+	* English (Australian) transation added (Peter (Bleeter) Lawler)
+	* English (British) translation updated (Luke (lukeross) Ross)
+	* English (Canadian) translation updated (Adam Weinberger)
+	* Finnish translation updated (Arto Alakulju)
+	* French translation updated (Eric Boumaour)
+	* German Translation updated (Bjoern Voigt)
+	* Italian translation update (Claudio Satriano)
+	* Japanese translation updated (Takeshi Aihana)
+	* Polish translation updated (Emil Nowak)
+	* Portuguese translation updated (Duarte Serrano Goncalves Henriques)
+	* Portuguese (Brazilian) translation updated (Mauricio de Lemos
+	  Rodrigues Collares Neto)
+	* Romanian translation updated (Misu Moldovan)
+	* Russian translation updated (Dmitry Beloglazov)
+	* Serbian translation updated (Danilo Segan)
+	* Serbian Latin translation updated (Danilo Segan)
+	* Slovenian translation updated (Martin Srebotnjak)
+	* Spanish translation updated (Javier Fernandez-Sanguino Peña)
+
+version 0.82.1 (08/27/2004):
 	* Finnish translation updated (Arto Alakulju)
 
 version 0.82 (08/26/2004):
--- a/po/en_CA.po	Fri Oct 29 00:06:32 2004 +0000
+++ b/po/en_CA.po	Fri Oct 29 14:20:04 2004 +0000
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: gaim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-25 23:58-0400\n"
-"PO-Revision-Date: 2004-08-23 19:45-0400\n"
+"POT-Creation-Date: 2004-10-22 17:04-0400\n"
+"PO-Revision-Date: 2004-10-22 19:45-0400\n"
 "Last-Translator: Adam Weinberger <adamw@gnome.org>\n"
 "Language-Team: en_CA <adamw@FreeBSD.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,30 +17,29 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: plugins/autorecon.c:233
+#: plugins/autorecon.c:276
 msgid "Error Message Suppression"
 msgstr "Error Message Suppression"
 
-#: plugins/autorecon.c:237
+#: plugins/autorecon.c:280
 msgid "Hide Disconnect Errors"
 msgstr "Hide Disconnect Errors"
 
-#: plugins/autorecon.c:241
+#: plugins/autorecon.c:284
 msgid "Hide Login Errors"
 msgstr "Hide Login Errors"
 
-#: plugins/autorecon.c:245
-msgid "Restore Away State On Reconnect"
-msgstr "Restore Away State On Reconnect"
-
-#. *< api_version
+#: plugins/autorecon.c:288
+msgid "Hide Reconnecting Dialog"
+msgstr "Hide Reconnecting Dialogue"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/autorecon.c:267
+#: plugins/autorecon.c:312
 msgid "Auto-Reconnect"
 msgstr "Auto-Reconnect"
 
@@ -48,7 +47,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/autorecon.c:270 plugins/autorecon.c:272
+#: plugins/autorecon.c:315 plugins/autorecon.c:317
 msgid "When you are kicked offline, this reconnects you."
 msgstr "When you are kicked offline, this reconnects you."
 
@@ -69,28 +68,28 @@
 msgid "Check email every X seconds.\n"
 msgstr "Check email every X seconds.\n"
 
-#: plugins/contact_priority.c:83
+#: plugins/contact_priority.c:84
 msgid "Point values to use when..."
 msgstr "Point values to use when..."
 
-#: plugins/contact_priority.c:92
+#: plugins/contact_priority.c:93
 msgid "Buddy is offline:"
 msgstr "Buddy is offline:"
 
-#: plugins/contact_priority.c:106
+#: plugins/contact_priority.c:107
 msgid "Buddy is away:"
 msgstr "Buddy is away:"
 
-#: plugins/contact_priority.c:120
+#: plugins/contact_priority.c:121
 msgid "Buddy is idle:"
 msgstr "Buddy is idle:"
 
-#: plugins/contact_priority.c:134
+#: plugins/contact_priority.c:135
 msgid "Use last matching buddy"
 msgstr "Use last matching buddy"
 
 #. Explanation
-#: plugins/contact_priority.c:140
+#: plugins/contact_priority.c:141
 msgid ""
 "The buddy with the lowest score is the buddy who will have priority in the "
 "contact.\n"
@@ -104,32 +103,31 @@
 "will use what used to be the built-in order active->idle->away->away+idle-"
 ">offline."
 
-#: plugins/contact_priority.c:143
+#: plugins/contact_priority.c:144
 msgid "Point values to use for Account..."
 msgstr "Point values to use for Account..."
 
-#. *< api_version
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/contact_priority.c:192
+#: plugins/contact_priority.c:195
 msgid "Contact Priority"
 msgstr "Contact Priority"
 
 #. *< name
 #. *< version
 #. *< summary
-#: plugins/contact_priority.c:195
+#: plugins/contact_priority.c:198
 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:197
+#: plugins/contact_priority.c:200
 msgid ""
 "Allows for changing the point values of idle/away/offline states for buddies "
 "in contact priority computations."
@@ -152,92 +150,87 @@
 msgid "Gaim - Away"
 msgstr "Gaim - Away"
 
-#: plugins/docklet/docklet.c:133 src/gtkaccount.c:738 src/gtkaccount.c:2160
+#: plugins/docklet/docklet.c:140 src/gtkaccount.c:738 src/gtkaccount.c:2164
 msgid "Auto-login"
 msgstr "Auto-login"
 
-#: plugins/docklet/docklet.c:136
+#: plugins/docklet/docklet.c:143
 msgid "New Message..."
 msgstr "New Message..."
 
-#: plugins/docklet/docklet.c:137
+#: plugins/docklet/docklet.c:144
 msgid "Join A Chat..."
 msgstr "Join A Chat..."
 
-#: plugins/docklet/docklet.c:172
+#: plugins/docklet/docklet.c:181
 msgid "New..."
 msgstr "New..."
 
-#: 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: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
+#: plugins/docklet/docklet.c:189 src/gtkprefs.c:1774 src/protocols/gg/gg.c:52
+#: src/protocols/irc/irc.c:166 src/protocols/irc/msgs.c:189
+#: src/protocols/jabber/buddy.c:1004 src/protocols/jabber/jabber.c:974
+#: src/protocols/msn/msn.c:534 src/protocols/novell/novell.c:2807
+#: src/protocols/novell/novell.c:2924 src/protocols/novell/novell.c:2976
+#: src/protocols/oscar/oscar.c:677 src/protocols/oscar/oscar.c:6659
+#: src/protocols/oscar/oscar.c:6878 src/protocols/silc/buddy.c:1384
+#: src/protocols/silc/silc.c:52 src/protocols/zephyr/zephyr.c:2224
 msgid "Away"
 msgstr "Away"
 
-#. else...
-#: plugins/docklet/docklet.c:186 src/away.c:583
-#: src/protocols/oscar/oscar.c:5488 src/protocols/oscar/oscar.c:6766
+#: plugins/docklet/docklet.c:197
 msgid "Back"
 msgstr "Back"
 
-#: plugins/docklet/docklet.c:194
+#: plugins/docklet/docklet.c:206
 msgid "Mute Sounds"
 msgstr "Mute Sounds"
 
-#: plugins/docklet/docklet.c:199 src/gtkft.c:628
+#: plugins/docklet/docklet.c:213 src/gtkft.c:628
 msgid "File Transfers"
 msgstr "File Transfers"
 
-#: plugins/docklet/docklet.c:200 src/gtkaccount.c:2341
+#: plugins/docklet/docklet.c:214 src/gtkaccount.c:2345
 msgid "Accounts"
 msgstr "Accounts"
 
-#: plugins/docklet/docklet.c:201 src/gtkprefs.c:2506
+#: plugins/docklet/docklet.c:215 src/gtkprefs.c:2375
 msgid "Preferences"
 msgstr "Preferences"
 
-#: plugins/docklet/docklet.c:210
+#: plugins/docklet/docklet.c:224
 msgid "Signoff"
 msgstr "Signoff"
 
-#: plugins/docklet/docklet.c:214
+#: plugins/docklet/docklet.c:228
 msgid "Quit"
 msgstr "Quit"
 
-#: plugins/docklet/docklet.c:505
+#: plugins/docklet/docklet.c:551
 msgid "Tray Icon Configuration"
 msgstr "Tray Icon Configuration"
 
-#: plugins/docklet/docklet.c:509
+#: plugins/docklet/docklet.c:555
 msgid "_Hide new messages until tray icon is clicked"
 msgstr "_Hide new messages until tray icon is clicked"
 
-#. *< api_version
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/docklet/docklet.c:533
+#: plugins/docklet/docklet.c:581
 msgid "System Tray Icon"
 msgstr "System Tray Icon"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/docklet/docklet.c:536
+#: plugins/docklet/docklet.c:584
 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:538
+#: plugins/docklet/docklet.c:586
 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, "
@@ -249,42 +242,39 @@
 "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:76
+#: plugins/extplacement.c:77
 msgid "By conversation count"
 msgstr "By conversation count"
 
-#: plugins/extplacement.c:97
+#: plugins/extplacement.c:98
 msgid "Conversation Placement"
 msgstr "Conversation Placement"
 
-#: plugins/extplacement.c:102
+#: plugins/extplacement.c:103
 msgid "Number of conversations per window"
 msgstr "Number of conversations per window"
 
-#: plugins/extplacement.c:108
+#: plugins/extplacement.c:109
 msgid "Separate IM and Chat windows when placing by number"
 msgstr "Separate IM and Chat windows when placing by number"
 
-#. *< api_version
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/extplacement.c:127
+#: plugins/extplacement.c:130
 msgid "ExtPlacement"
 msgstr "ExtPlacement"
 
 #. *< name
 #. *< version
-#: plugins/extplacement.c:129
+#: plugins/extplacement.c:132
 msgid "Extra conversation placement options."
 msgstr "Extra conversation placement options."
 
-#. *< summary
-#. *  description
-#: plugins/extplacement.c:131
+#: plugins/extplacement.c:134
 msgid ""
 "Restrict the number of conversations per windows, optionally separating IMs "
 "and Chats"
@@ -292,14 +282,13 @@
 "Restrict the number of conversations per windows, optionally separating IMs "
 "and Chats"
 
-#. *< api_version
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/filectl.c:222
+#: plugins/filectl.c:224
 msgid "Gaim File Control"
 msgstr "Gaim File Control"
 
@@ -307,27 +296,27 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/filectl.c:225 plugins/filectl.c:227
+#: plugins/filectl.c:227 plugins/filectl.c:229
 msgid "Allows you to control Gaim by entering commands in a file."
 msgstr "Allows you to control Gaim by entering commands in a file."
 
-#: plugins/gaim-remote/remote.c:90
+#: plugins/gaim-remote/remote.c:91
 msgid "Not connected to AIM"
 msgstr "Not connected to AIM"
 
-#: plugins/gaim-remote/remote.c:99 plugins/gaim-remote/remote.c:138
+#: plugins/gaim-remote/remote.c:100 plugins/gaim-remote/remote.c:139
 msgid "No screenname given."
 msgstr "No screenname given."
 
-#: plugins/gaim-remote/remote.c:175
+#: plugins/gaim-remote/remote.c:176
 msgid "No roomname given."
 msgstr "No roomname given."
 
-#: plugins/gaim-remote/remote.c:194
+#: plugins/gaim-remote/remote.c:195
 msgid "Invalid AIM URI"
 msgstr "Invalid AIM URI"
 
-#: plugins/gaim-remote/remote.c:668
+#: plugins/gaim-remote/remote.c:742
 #, c-format
 msgid ""
 "Failed to assign %s to a socket:\n"
@@ -336,30 +325,28 @@
 "Failed to assign %s to a socket:\n"
 "%s"
 
-#: plugins/gaim-remote/remote.c:691
+#: plugins/gaim-remote/remote.c:765
 msgid "Unable to open socket"
 msgstr "Unable to open socket"
 
-#. *< api_version
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gaim-remote/remote.c:739
+#: plugins/gaim-remote/remote.c:815
 msgid "Remote Control"
 msgstr "Remote Control"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gaim-remote/remote.c:742
+#: plugins/gaim-remote/remote.c:818
 msgid "Provides remote control for gaim applications."
 msgstr "Provides remote control for gaim applications."
 
-#. *  description
-#: plugins/gaim-remote/remote.c:744
+#: plugins/gaim-remote/remote.c:820
 msgid ""
 "Gives Gaim the ability to be remote-controlled through third-party "
 "applications or through the gaim-remote tool."
@@ -367,26 +354,24 @@
 "Gives Gaim the ability to be remote-controlled through third-party "
 "applications or through the gaim-remote tool."
 
-#. *< api_version
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gaiminc.c:87
+#: plugins/gaiminc.c:91
 msgid "Gaim Demonstration Plugin"
 msgstr "Gaim Demonstration Plugin"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gaiminc.c:90
+#: plugins/gaiminc.c:94
 msgid "An example plugin that does stuff - see the description."
 msgstr "An example plugin that does stuff - see the description."
 
-#. *  description
-#: plugins/gaiminc.c:92
+#: plugins/gaiminc.c:96
 msgid ""
 "This is a really cool plugin that does a lot of stuff:\n"
 "- It tells you who wrote the program when you log in\n"
@@ -399,43 +384,41 @@
 "- It sends a message to people on your list immediately when they sign on"
 
 #. Configuration frame
-#: plugins/gestures/gestures.c:220
+#: plugins/gestures/gestures.c:221
 msgid "Mouse Gestures Configuration"
 msgstr "Mouse Gestures Configuration"
 
-#: plugins/gestures/gestures.c:227
+#: plugins/gestures/gestures.c:228
 msgid "Middle mouse button"
 msgstr "Middle mouse button"
 
-#: plugins/gestures/gestures.c:232
+#: plugins/gestures/gestures.c:233
 msgid "Right mouse button"
 msgstr "Right mouse button"
 
 #. "Visual gesture display" checkbox
-#: plugins/gestures/gestures.c:244
+#: plugins/gestures/gestures.c:245
 msgid "_Visual gesture display"
 msgstr "_Visual gesture display"
 
-#. *< api_version
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gestures/gestures.c:271
+#: plugins/gestures/gestures.c:274
 msgid "Mouse Gestures"
 msgstr "Mouse Gestures"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gestures/gestures.c:274
+#: plugins/gestures/gestures.c:277
 msgid "Provides support for mouse gestures"
 msgstr "Provides support for mouse gestures"
 
-#. *  description
-#: plugins/gestures/gestures.c:276
+#: plugins/gestures/gestures.c:279
 msgid ""
 "Allows support for mouse gestures in conversation windows.\n"
 "Drag the middle mouse button to perform certain actions:\n"
@@ -451,60 +434,45 @@
 "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:134
-#: plugins/gevolution/assoc-buddy.c:72
-msgid "Local Addressbook"
-msgstr "Local Addressbook"
-
-#: 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:3011 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: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:1312 src/protocols/trepia/trepia.c:398
+#: plugins/gevolution/add_buddy_dialog.c:132
+#: plugins/gevolution/assoc-buddy.c:120 src/gtkprefs.c:2105
+#: src/gtkroomlist.c:553 src/protocols/jabber/jabber.c:599
+#: src/protocols/msn/msn.c:1466 src/protocols/trepia/trepia.c:399
 msgid "Name"
 msgstr "Name"
 
-#: plugins/gevolution/add_buddy_dialog.c:199
+#: plugins/gevolution/add_buddy_dialog.c:143
 msgid "Instant Messaging"
 msgstr "Instant Messaging"
 
-#. Add the label.
-#: plugins/gevolution/add_buddy_dialog.c:480
+#: plugins/gevolution/add_buddy_dialog.c:455
 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:493
-#: plugins/gevolution/assoc-buddy.c:381 src/protocols/oscar/oscar.c:7042
+#: plugins/gevolution/add_buddy_dialog.c:468
+#: plugins/gevolution/assoc-buddy.c:354 src/protocols/oscar/oscar.c:7182
 msgid "Search"
 msgstr "Search"
 
-#: plugins/gevolution/add_buddy_dialog.c:564
-#: plugins/gevolution/new_person_dialog.c:308 src/gtkblist.c:4051
-#: src/gtkblist.c:4389
+#: plugins/gevolution/add_buddy_dialog.c:549
+#: plugins/gevolution/new_person_dialog.c:304 src/gtkblist.c:4007
+#: src/gtkblist.c:4354
 msgid "Group:"
 msgstr "Group:"
 
 #. "New Person" button
-#: plugins/gevolution/add_buddy_dialog.c:590
-#: plugins/gevolution/assoc-buddy.c:484
+#: plugins/gevolution/add_buddy_dialog.c:575
+#: plugins/gevolution/assoc-buddy.c:466
 msgid "New Person"
 msgstr "New Person"
 
 #. "Select Buddy" button
-#: plugins/gevolution/add_buddy_dialog.c:607
+#: plugins/gevolution/add_buddy_dialog.c:592
 msgid "Select Buddy"
 msgstr "Select Buddy"
 
-#. Add the label.
-#: plugins/gevolution/assoc-buddy.c:368
+#: plugins/gevolution/assoc-buddy.c:341
 msgid ""
 "Select a person from your address book to add this buddy to, or create a new "
 "person."
@@ -513,51 +481,49 @@
 "person."
 
 #. Add the disclosure
-#: plugins/gevolution/assoc-buddy.c:447
+#: plugins/gevolution/assoc-buddy.c:429
 msgid "Show user details"
 msgstr "Show user details"
 
-#: plugins/gevolution/assoc-buddy.c:448
+#: plugins/gevolution/assoc-buddy.c:430
 msgid "Hide user details"
 msgstr "Hide user details"
 
 #. "Associate Buddy" button
-#: plugins/gevolution/assoc-buddy.c:501
+#: plugins/gevolution/assoc-buddy.c:483
 msgid "_Associate Buddy"
 msgstr "_Associate Buddy"
 
-#: 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:3870
+#: plugins/gevolution/gevo-util.c:64 plugins/gevolution/gevolution.c:90
+#: src/blist.c:769 src/blist.c:976 src/blist.c:1920 src/gtkblist.c:3826
 #: src/protocols/jabber/roster.c:66
 msgid "Buddies"
 msgstr "Buddies"
 
-#: plugins/gevolution/gevolution.c:220
+#: plugins/gevolution/gevolution.c:221
 msgid "Add to Address Book"
 msgstr "Add to Address Book"
 
 #. Configuration frame
-#: plugins/gevolution/gevolution.c:351
+#: plugins/gevolution/gevolution.c:344
 msgid "Evolution Integration Configuration"
 msgstr "Evolution Integration Configuration"
 
-#. Label
-#: plugins/gevolution/gevolution.c:354
+#: plugins/gevolution/gevolution.c:347
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr "Select all accounts that buddies should be auto-added to."
 
-#: plugins/gevolution/gevolution.c:384 plugins/idle.c:51 src/gtkconn.c:620
+#: plugins/gevolution/gevolution.c:377 plugins/idle.c:52 src/gtkconn.c:624
 msgid "Account"
 msgstr "Account"
 
-#. *< api_version
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gevolution/gevolution.c:465
+#: plugins/gevolution/gevolution.c:460
 msgid "Evolution Integration"
 msgstr "Evolution Integration"
 
@@ -565,58 +531,58 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/gevolution/gevolution.c:468 plugins/gevolution/gevolution.c:470
+#: plugins/gevolution/gevolution.c:463 plugins/gevolution/gevolution.c:465
 msgid "Provides integration with Ximian Evolution."
 msgstr "Provides integration with Ximian Evolution."
 
-#: plugins/gevolution/new_person_dialog.c:268
+#: plugins/gevolution/new_person_dialog.c:264
 msgid "Please enter the person's information below."
 msgstr "Please enter the person's information below."
 
-#: plugins/gevolution/new_person_dialog.c:272
+#: plugins/gevolution/new_person_dialog.c:268
 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:288
+msgid "Account type:"
+msgstr "Account type:"
+
 #: plugins/gevolution/new_person_dialog.c:292
-msgid "Account type:"
-msgstr "Account type:"
-
-#: plugins/gevolution/new_person_dialog.c:296
 msgid "Screenname:"
 msgstr "Screenname:"
 
 #. Optional Information section
-#: plugins/gevolution/new_person_dialog.c:316
+#: plugins/gevolution/new_person_dialog.c:312
 msgid "Optional information:"
 msgstr "Optional information:"
 
 #. Label
-#: plugins/gevolution/new_person_dialog.c:339 src/gtkaccount.c:372
-#: src/gtkaccount.c:402 src/protocols/oscar/oscar.c:554
+#: plugins/gevolution/new_person_dialog.c:335 src/gtkaccount.c:372
+#: src/gtkaccount.c:402 src/protocols/oscar/oscar.c:583
 msgid "Buddy Icon"
 msgstr "Buddy Icon"
 
-#: plugins/gevolution/new_person_dialog.c:351
+#: plugins/gevolution/new_person_dialog.c:347
 msgid "First name:"
 msgstr "First name:"
 
-#: plugins/gevolution/new_person_dialog.c:363
+#: plugins/gevolution/new_person_dialog.c:359
 msgid "Last name:"
 msgstr "Last name:"
 
-#: plugins/gevolution/new_person_dialog.c:383
+#: plugins/gevolution/new_person_dialog.c:379
 msgid "E-mail:"
 msgstr "E-mail:"
 
-#: plugins/history.c:89
+#: plugins/history.c:92
 msgid "History"
 msgstr "History"
 
-#: plugins/history.c:91
+#: plugins/history.c:94
 msgid "Shows recently logged conversations in new conversations."
 msgstr "Shows recently logged conversations in new conversations."
 
-#: plugins/history.c:92
+#: plugins/history.c:95
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
@@ -624,14 +590,13 @@
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
 
-#. *< api_version
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/iconaway.c:101
+#: plugins/iconaway.c:106
 msgid "Iconify on Away"
 msgstr "Iconify on Away"
 
@@ -639,54 +604,52 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/iconaway.c:104 plugins/iconaway.c:106
+#: plugins/iconaway.c:109 plugins/iconaway.c:111
 msgid "Iconifies the buddy list and your conversations when you go away."
 msgstr "Iconifies the buddy list and your conversations when you go away."
 
-#: plugins/idle.c:55
+#: plugins/idle.c:56
 msgid "Minutes"
 msgstr "Minutes"
 
-#: plugins/idle.c:62 plugins/idle.c:95
+#: plugins/idle.c:63 plugins/idle.c:98
 msgid "I'dle Mak'er"
 msgstr "I'dle Mak'er"
 
-#: plugins/idle.c:63 plugins/idle.c:78
+#: plugins/idle.c:64 plugins/idle.c:79
 msgid "Set Account Idle Time"
 msgstr "Set Account Idle Time"
 
-#: plugins/idle.c:66
+#: plugins/idle.c:67
 msgid "_Set"
 msgstr "_Set"
 
-#: plugins/idle.c:67 src/away.c:910
+#: plugins/idle.c:68
 msgid "_Cancel"
 msgstr "_Cancel"
 
-#: plugins/idle.c:97 plugins/idle.c:98
+#: plugins/idle.c:100 plugins/idle.c:101
 msgid "Allows you to hand-configure how long you've been idle for"
 msgstr "Allows you to hand-configure how long you've been idle for"
 
-#. *< api_version
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ipc-test-client.c:84
+#: plugins/ipc-test-client.c:87
 msgid "IPC Test Client"
 msgstr "IPC Test Client"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/ipc-test-client.c:87
+#: plugins/ipc-test-client.c:90
 msgid "Test plugin IPC support, as a client."
 msgstr "Test plugin IPC support, as a client."
 
-#. *  description
-#: plugins/ipc-test-client.c:89
+#: plugins/ipc-test-client.c:92
 msgid ""
 "Test plugin IPC support, as a client. This locates the server plugin and "
 "calls the commands registered."
@@ -694,115 +657,112 @@
 "Test plugin IPC support, as a client. This locates the server plugin and "
 "calls the commands registered."
 
-#. *< api_version
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ipc-test-server.c:71
+#: plugins/ipc-test-server.c:74
 msgid "IPC Test Server"
 msgstr "IPC Test Server"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/ipc-test-server.c:74
+#: plugins/ipc-test-server.c:77
 msgid "Test plugin IPC support, as a server."
 msgstr "Test plugin IPC support, as a server."
 
-#. *  description
-#: plugins/ipc-test-server.c:76
+#: plugins/ipc-test-server.c:79
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
 msgstr "Test plugin IPC support, as a server. This registers the IPC commands."
 
-#: plugins/mailchk.c:157
+#: plugins/mailchk.c:160
 msgid "Mail Checker"
 msgstr "Mail Checker"
 
-#: plugins/mailchk.c:159
+#: plugins/mailchk.c:162
 msgid "Checks for new local mail."
 msgstr "Checks for new local mail."
 
-#: plugins/mailchk.c:160
+#: plugins/mailchk.c:163
 msgid "Adds a small box to the buddy list that shows if you have new mail."
 msgstr "Adds a small box to the buddy list that shows if you have new mail."
 
 #. ---------- "Notify For" ----------
-#: plugins/notify.c:600
+#: plugins/notify.c:599
 msgid "Notify For"
 msgstr "Notify For"
 
-#: plugins/notify.c:604
+#: plugins/notify.c:603
 msgid "_IM windows"
 msgstr "_IM windows"
 
-#: plugins/notify.c:611
+#: plugins/notify.c:610
 msgid "C_hat windows"
 msgstr "C_hat windows"
 
-#: plugins/notify.c:618
+#: plugins/notify.c:617
 msgid "_Focused windows"
 msgstr "_Focused windows"
 
 #. ---------- "Notification Methods" ----------
-#: plugins/notify.c:626
+#: plugins/notify.c:625
 msgid "Notification Methods"
 msgstr "Notification Methods"
 
-#: plugins/notify.c:633
+#: plugins/notify.c:632
 msgid "Prepend _string into window title:"
 msgstr "Prepend _string into window title:"
 
 #. Count method button
-#: plugins/notify.c:652
+#: plugins/notify.c:651
 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:660
+#: plugins/notify.c:659
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "Set window manager \"_URGENT\" hint"
 
 #. ---------- "Notification Removals" ----------
-#: plugins/notify.c:668
+#: plugins/notify.c:667
 msgid "Notification Removal"
 msgstr "Notification Removal"
 
 #. Remove on focus button
-#: plugins/notify.c:673
+#: plugins/notify.c:672
 msgid "Remove when conversation window _gains focus"
 msgstr "Remove when conversation window _gains focus"
 
 #. Remove on click button
-#: plugins/notify.c:680
+#: plugins/notify.c:679
 msgid "Remove when conversation window _receives click"
 msgstr "Remove when conversation window _receives click"
 
 #. Remove on type button
-#: plugins/notify.c:688
+#: plugins/notify.c:687
 msgid "Remove when _typing in conversation window"
 msgstr "Remove when _typing in conversation window"
 
 #. Remove on message send button
-#: plugins/notify.c:696
+#: plugins/notify.c:695
 msgid "Remove when a _message gets sent"
 msgstr "Remove when a _message gets sent"
 
 #. Remove on conversation switch button
-#: plugins/notify.c:705
+#: plugins/notify.c:704
 msgid "Remove on switch to conversation ta_b"
 msgstr "Remove on switch to conversation ta_b"
 
-#. *< api_version
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/notify.c:793
+#: plugins/notify.c:794
 msgid "Message Notification"
 msgstr "Message Notification"
 
@@ -810,37 +770,36 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/notify.c:796 plugins/notify.c:798
+#: plugins/notify.c:797 plugins/notify.c:799
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "Provides a variety of ways of notifying you of unread messages."
 
-#. *< api_version
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/perl/perl.c:532
+#: plugins/perl/perl.c:535
 msgid "Perl Plugin Loader"
 msgstr "Perl Plugin Loader"
 
 #. *< name
 #. *< version
 #. *< summary
-#: plugins/perl/perl.c:534 plugins/perl/perl.c:535
+#: plugins/perl/perl.c:537 plugins/perl/perl.c:538
 msgid "Provides support for loading perl plugins."
 msgstr "Provides support for loading perl plugins."
 
-#: plugins/raw.c:146
+#: plugins/raw.c:149
 msgid "Raw"
 msgstr "Raw"
 
-#: plugins/raw.c:148
+#: plugins/raw.c:151
 msgid "Lets you send raw input to text-based protocols."
 msgstr "Lets you send raw input to text-based protocols."
 
-#: plugins/raw.c:149
+#: plugins/raw.c:152
 msgid ""
 "Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
 "'Enter' in the entry box to send. Watch the debug window."
@@ -848,12 +807,12 @@
 "Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
 "'Enter' in the entry box to send. Watch the debug window."
 
-#: plugins/relnot.c:62
+#: plugins/relnot.c:63
 #, c-format
 msgid "You are using Gaim version %s.  The current version is %s.<hr>"
 msgstr "You are using Gaim version %s.  The current version is %s.<hr>"
 
-#: plugins/relnot.c:68
+#: plugins/relnot.c:69
 #, c-format
 msgid ""
 "<b>ChangeLog:</b>\n"
@@ -862,7 +821,7 @@
 "<b>ChangeLog:</b>\n"
 "%s<br><br>"
 
-#: plugins/relnot.c:73
+#: plugins/relnot.c:74
 #, c-format
 msgid ""
 "You can get version %s from:<br><a href=\"http://gaim.sourceforge.net/"
@@ -871,30 +830,28 @@
 "You can get version %s from:<br><a href=\"http://gaim.sourceforge.net/"
 "\">http://gaim.sourceforge.net</a>."
 
-#: plugins/relnot.c:77 plugins/relnot.c:78
+#: plugins/relnot.c:78 plugins/relnot.c:79
 msgid "New Version Available"
 msgstr "New Version Available"
 
-#. *< api_version
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/relnot.c:134
+#: plugins/relnot.c:137
 msgid "Release Notification"
 msgstr "Release Notification"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/relnot.c:137
+#: plugins/relnot.c:140
 msgid "Checks periodically for new releases."
 msgstr "Checks periodically for new releases."
 
-#. *  description
-#: plugins/relnot.c:139
+#: plugins/relnot.c:142
 msgid ""
 "Checks periodically for new releases and notifies the user with the "
 "ChangeLog."
@@ -902,14 +859,13 @@
 "Checks periodically for new releases and notifies the user with the "
 "ChangeLog."
 
-#. *< api_version
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/signals-test.c:582
+#: plugins/signals-test.c:585
 msgid "Signals Test"
 msgstr "Signals Test"
 
@@ -917,18 +873,17 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/signals-test.c:585 plugins/signals-test.c:587
+#: plugins/signals-test.c:588 plugins/signals-test.c:590
 msgid "Test to see that all signals are working properly."
 msgstr "Test to see that all signals are working properly."
 
-#. *< api_version
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/simple.c:31
+#: plugins/simple.c:34
 msgid "Simple Plugin"
 msgstr "Simple Plugin"
 
@@ -936,50 +891,49 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/simple.c:34 plugins/simple.c:36
+#: plugins/simple.c:37 plugins/simple.c:39
 msgid "Tests to see that most things are working."
 msgstr "Tests to see that most things are working."
 
-#: plugins/spellchk.c:413
+#: plugins/spellchk.c:414
 msgid "Text Replacements"
 msgstr "Text Replacements"
 
-#: plugins/spellchk.c:437
+#: plugins/spellchk.c:438
 msgid "You type"
 msgstr "You type"
 
-#: plugins/spellchk.c:449
+#: plugins/spellchk.c:450
 msgid "You send"
 msgstr "You send"
 
-#: plugins/spellchk.c:475
+#: plugins/spellchk.c:476
 msgid "Add a new text replacement"
 msgstr "Add a new text replacement"
 
-#: plugins/spellchk.c:482
+#: plugins/spellchk.c:483
 msgid "You _type:"
 msgstr "You _type:"
 
-#: plugins/spellchk.c:496
+#: plugins/spellchk.c:497
 msgid "You _send:"
 msgstr "You _send:"
 
-#: plugins/spellchk.c:536
+#: plugins/spellchk.c:539
 msgid "Text replacement"
 msgstr "Text replacement"
 
-#: plugins/spellchk.c:538 plugins/spellchk.c:539
+#: plugins/spellchk.c:541 plugins/spellchk.c:542
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "Replaces text in outgoing messages according to user-defined rules."
 
-#. *< api_version
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl-gnutls.c:223
+#: plugins/ssl/ssl-gnutls.c:226
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -987,18 +941,17 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/ssl/ssl-gnutls.c:226 plugins/ssl/ssl-gnutls.c:228
+#: plugins/ssl/ssl-gnutls.c:229 plugins/ssl/ssl-gnutls.c:231
 msgid "Provides SSL support through GNUTLS."
 msgstr "Provides SSL support through GNUTLS."
 
-#. *< api_version
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl-nss.c:314
+#: plugins/ssl/ssl-nss.c:317
 msgid "NSS"
 msgstr "NSS"
 
@@ -1006,18 +959,17 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/ssl/ssl-nss.c:317 plugins/ssl/ssl-nss.c:319
+#: plugins/ssl/ssl-nss.c:320 plugins/ssl/ssl-nss.c:322
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "Provides SSL support through Mozilla NSS."
 
-#. *< api_version
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl.c:91
+#: plugins/ssl/ssl.c:94
 msgid "SSL"
 msgstr "SSL"
 
@@ -1025,58 +977,53 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/ssl/ssl.c:94 plugins/ssl/ssl.c:96
+#: plugins/ssl/ssl.c:97 plugins/ssl/ssl.c:99
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "Provides a wrapper around SSL support libraries."
 
-#: plugins/statenotify.c:37
+#: plugins/statenotify.c:38
 #, c-format
 msgid "%s has gone away."
 msgstr "%s has gone away."
 
-#: plugins/statenotify.c:44
+#: plugins/statenotify.c:45
 #, c-format
 msgid "%s is no longer away."
 msgstr "%s is no longer away."
 
-#: plugins/statenotify.c:51
+#: plugins/statenotify.c:52
 #, c-format
 msgid "%s has become idle."
 msgstr "%s has become idle."
 
-#: plugins/statenotify.c:58
+#: plugins/statenotify.c:59
 #, c-format
 msgid "%s is no longer idle."
 msgstr "%s is no longer idle."
 
-#: plugins/statenotify.c:69
+#: plugins/statenotify.c:70
 msgid "Notify When"
 msgstr "Notify When"
 
-#: plugins/statenotify.c:72
+#: plugins/statenotify.c:73
 msgid "Buddy Goes _Away"
 msgstr "Buddy Goes _Away"
 
-#: plugins/statenotify.c:75
+#: plugins/statenotify.c:76
 msgid "Buddy Goes _Idle"
 msgstr "Buddy Goes _Idle"
 
-#. *< api_version
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/statenotify.c:113
+#: plugins/statenotify.c:116
 msgid "Buddy State Notification"
 msgstr "Buddy State Notification"
 
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: plugins/statenotify.c:116 plugins/statenotify.c:119
+#: plugins/statenotify.c:119 plugins/statenotify.c:122
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
@@ -1084,22 +1031,21 @@
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
 
-#: plugins/tcl/tcl.c:359
+#: plugins/tcl/tcl.c:363
 msgid "Tcl Plugin Loader"
 msgstr "Tcl Plugin Loader"
 
-#: plugins/tcl/tcl.c:361 plugins/tcl/tcl.c:362
+#: plugins/tcl/tcl.c:365 plugins/tcl/tcl.c:366
 msgid "Provides support for loading Tcl plugins"
 msgstr "Provides support for loading Tcl plugins"
 
-#. *< api_version
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ticker/ticker.c:74 plugins/ticker/ticker.c:328
+#: plugins/ticker/ticker.c:75 plugins/ticker/ticker.c:331
 msgid "Buddy Ticker"
 msgstr "Buddy Ticker"
 
@@ -1107,27 +1053,26 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/ticker/ticker.c:331 plugins/ticker/ticker.c:333
+#: plugins/ticker/ticker.c:334 plugins/ticker/ticker.c:336
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "A horizontal scrolling version of the buddy list."
 
-#: plugins/timestamp.c:185
+#: plugins/timestamp.c:183
 msgid "iChat Timestamp"
 msgstr "iChat Timestamp"
 
-#: plugins/timestamp.c:192
+#: plugins/timestamp.c:190
 msgid "Delay"
 msgstr "Delay"
 
-#: plugins/timestamp.c:199
+#: plugins/timestamp.c:197
 msgid "minutes."
 msgstr "minutes."
 
-#: plugins/timestamp.c:205
+#: plugins/timestamp.c:203
 msgid "_Apply"
 msgstr "_Apply"
 
-#. *< api_version
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -1146,54 +1091,52 @@
 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:387
-#: plugins/win32/transparency/win2ktrans.c:418
+#: plugins/win32/transparency/win2ktrans.c:134
+#: plugins/win32/transparency/win2ktrans.c:404
+#: plugins/win32/transparency/win2ktrans.c:435
 msgid "Opacity:"
 msgstr "Opacity:"
 
 #. IM Convo trans options
-#: plugins/win32/transparency/win2ktrans.c:368
+#: plugins/win32/transparency/win2ktrans.c:385
 msgid "IM Conversation Windows"
 msgstr "IM Conversation Windows"
 
-#: plugins/win32/transparency/win2ktrans.c:369
+#: plugins/win32/transparency/win2ktrans.c:386
 msgid "_IM window transparency"
 msgstr "_IM window transparency"
 
-#: plugins/win32/transparency/win2ktrans.c:379
+#: plugins/win32/transparency/win2ktrans.c:396
 msgid "_Show slider bar in IM window"
 msgstr "_Show slider bar in IM window"
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:404 src/gtkprefs.c:953
+#: plugins/win32/transparency/win2ktrans.c:421
 msgid "Buddy List Window"
 msgstr "Buddy List Window"
 
-#: plugins/win32/transparency/win2ktrans.c:405
+#: plugins/win32/transparency/win2ktrans.c:422
 msgid "_Buddy List window transparency"
 msgstr "_Buddy List window transparency"
 
-#. *< api_version
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/win32/transparency/win2ktrans.c:461
+#: plugins/win32/transparency/win2ktrans.c:480
 msgid "Transparency"
 msgstr "Transparency"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/win32/transparency/win2ktrans.c:464
+#: plugins/win32/transparency/win2ktrans.c:483
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "Variable Transparency for the buddy list and conversations."
 
-#. *  description
-#: plugins/win32/transparency/win2ktrans.c:466
+#: plugins/win32/transparency/win2ktrans.c:485
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
@@ -1205,222 +1148,153 @@
 "\n"
 "* Note: This plugin requires Win2000 or WinXP."
 
-#: plugins/win32/winprefs/winprefs.c:343
+#: plugins/win32/winprefs/winprefs.c:344
 msgid "GTK+ Runtime Version"
 msgstr "GTK+ Runtime Version"
 
 #. Autostart
-#: plugins/win32/winprefs/winprefs.c:351
+#: plugins/win32/winprefs/winprefs.c:352
 msgid "Startup"
 msgstr "Startup"
 
-#: plugins/win32/winprefs/winprefs.c:352
+#: plugins/win32/winprefs/winprefs.c:353
 msgid "_Start Gaim on Windows startup"
 msgstr "_Start Gaim on Windows startup"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:361 src/gtkblist.c:3056
-#: src/gtkprefs.c:2416
+#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3113
+#: src/gtkprefs.c:2290
 msgid "Buddy List"
 msgstr "Buddy List"
 
-#: plugins/win32/winprefs/winprefs.c:362
+#: plugins/win32/winprefs/winprefs.c:363
 msgid "_Dockable Buddy List"
 msgstr "_Dockable Buddy List"
 
 #. Docked Blist On Top
-#: plugins/win32/winprefs/winprefs.c:366
+#: plugins/win32/winprefs/winprefs.c:367
 msgid "Docked _Buddy List is always on top"
 msgstr "Docked _Buddy List is always on top"
 
 #. Blist On Top
-#: plugins/win32/winprefs/winprefs.c:376
+#: plugins/win32/winprefs/winprefs.c:377
 msgid "_Keep Buddy List window on top"
 msgstr "_Keep Buddy List window on top"
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:381 src/gtkprefs.c:1004
-#: src/gtkprefs.c:2417 src/protocols/msn/msn.c:1640
+#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:947
+#: src/gtkprefs.c:2291 src/protocols/msn/msn.c:1803
 msgid "Conversations"
 msgstr "Conversations"
 
-#: plugins/win32/winprefs/winprefs.c:382
+#: plugins/win32/winprefs/winprefs.c:383
 msgid "_Flash Window when messages are received"
 msgstr "_Flash Window when messages are received"
 
-#: plugins/win32/winprefs/winprefs.c:404
+#: plugins/win32/winprefs/winprefs.c:407
 msgid "WinGaim Options"
 msgstr "WinGaim Options"
 
-#: plugins/win32/winprefs/winprefs.c:406 plugins/win32/winprefs/winprefs.c:407
+#: plugins/win32/winprefs/winprefs.c:409 plugins/win32/winprefs/winprefs.c:410
 msgid "Options specific to Windows Gaim."
 msgstr "Options specific to Windows Gaim."
 
-#: src/account.c:277 src/protocols/jabber/jabber.c:1001
+#: src/account.c:294 src/protocols/jabber/jabber.c:1030
 msgid "New passwords do not match."
 msgstr "New passwords do not match."
 
-#: src/account.c:286
+#: src/account.c:303
 msgid "Fill out all fields completely."
 msgstr "Fill out all fields completely."
 
-#: src/account.c:311
+#: src/account.c:328
 msgid "Original password"
 msgstr "Original password"
 
-#: src/account.c:318
+#: src/account.c:335
 msgid "New password"
 msgstr "New password"
 
-#: src/account.c:325
+#: src/account.c:342
 msgid "New password (again)"
 msgstr "New password (again)"
 
-#: src/account.c:331
+#: src/account.c:348
 #, c-format
 msgid "Change password for %s"
 msgstr "Change password for %s"
 
-#: src/account.c:339
+#: src/account.c:356
 msgid "Please enter your current password and your new password."
 msgstr "Please enter your current password and your new password."
 
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:342 src/connection.c:198 src/gtkblist.c:2384
-#: 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: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
+#: src/account.c:359 src/connection.c:192 src/gtkblist.c:2422
+#: src/gtkdialogs.c:385 src/gtkdialogs.c:527 src/gtkdialogs.c:583
+#: src/gtkrequest.c:242 src/protocols/jabber/jabber.c:1077
+#: src/protocols/jabber/xdata.c:337 src/protocols/msn/msn.c:230
+#: src/protocols/msn/msn.c:245 src/protocols/msn/msn.c:260
+#: src/protocols/msn/msn.c:275 src/protocols/oscar/oscar.c:3528
+#: src/protocols/oscar/oscar.c:3622 src/protocols/oscar/oscar.c:6969
+#: src/protocols/oscar/oscar.c:7061 src/protocols/oscar/oscar.c:7113
+#: 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:1693 src/protocols/silc/silc.c:713
+#: src/protocols/yahoo/yahoo.c:2878 src/protocols/yahoo/yahoo.c:2887
+#: src/request.h:1245
 msgid "OK"
 msgstr "OK"
 
-#: 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:2385
-#: src/gtkblist.c:4427 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/account.c:360 src/account.c:398 src/connection.c:193
+#: src/gtkaccount.c:2014 src/gtkaccount.c:2510 src/gtkblist.c:2423
+#: src/gtkblist.c:4392 src/gtkconn.c:168 src/gtkdialogs.c:386
+#: src/gtkdialogs.c:528 src/gtkdialogs.c:584 src/gtkdialogs.c:682
+#: src/gtkdialogs.c:704 src/gtkdialogs.c:724 src/gtkdialogs.c:760
+#: src/gtkdialogs.c:820 src/gtkdialogs.c:862 src/gtkdialogs.c:897
+#: src/gtkimhtmltoolbar.c:434 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: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: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/jabber/buddy.c:517 src/protocols/jabber/chat.c:772
+#: src/protocols/jabber/jabber.c:668 src/protocols/jabber/jabber.c:1078
+#: src/protocols/jabber/xdata.c:338 src/protocols/msn/msn.c:231
+#: src/protocols/msn/msn.c:246 src/protocols/msn/msn.c:261
+#: src/protocols/msn/msn.c:276 src/protocols/msn/msn.c:293
+#: src/protocols/oscar/oscar.c:1532 src/protocols/oscar/oscar.c:3486
+#: src/protocols/oscar/oscar.c:3529 src/protocols/oscar/oscar.c:3566
+#: src/protocols/oscar/oscar.c:3623 src/protocols/oscar/oscar.c:6970
+#: src/protocols/oscar/oscar.c:7062 src/protocols/oscar/oscar.c:7114
+#: src/protocols/oscar/oscar.c:7183 src/protocols/silc/buddy.c:461
 #: src/protocols/silc/buddy.c:1037 src/protocols/silc/buddy.c:1133
 #: 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
+#: src/protocols/silc/ops.c:1694 src/protocols/silc/silc.c:714
+#: src/protocols/trepia/trepia.c:348 src/protocols/yahoo/yahoo.c:2879
+#: src/protocols/yahoo/yahoo.c:2888 src/request.h:1245 src/request.h:1255
 msgid "Cancel"
 msgstr "Cancel"
 
-#: src/account.c:372
+#: src/account.c:389
 #, c-format
 msgid "Change user information for %s"
 msgstr "Change user information for %s"
 
-#: src/account.c:380 src/gtkrequest.c:249 src/protocols/jabber/buddy.c:514
-#: src/protocols/trepia/trepia.c:346
+#: src/account.c:397 src/gtkrequest.c:249 src/protocols/jabber/buddy.c:516
+#: src/protocols/trepia/trepia.c:347
 msgid "Save"
 msgstr "Save"
 
-#: src/account.c:739 src/gtkft.c:158 src/gtkutils.c:591
-#: src/protocols/jabber/buddy.c:570 src/protocols/novell/novell.c:2810
+#: src/account.c:809 src/gtkft.c:158 src/protocols/jabber/buddy.c:572
+#: src/protocols/jabber/buddy.c:994 src/protocols/jabber/buddy.c:1011
+#: src/protocols/novell/novell.c:2819
 msgid "Unknown"
 msgstr "Unknown"
 
-#: src/away.c:233
-msgid "Away!"
-msgstr "Away!"
-
-#: 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: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:364 src/away.c:455
-msgid "Remove Away Message"
-msgstr "Remove Away Message"
-
-#. Remove button
-#: 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:435
-msgid "New Away Message"
-msgstr "New Away Message"
-
-#: src/away.c:651
-msgid "Set All Away"
-msgstr "Set All Away"
-
-#: 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: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:770
-msgid "You cannot create an empty away message"
-msgstr "You cannot create an empty away message"
-
-#: src/away.c:835
-msgid "New away message"
-msgstr "New away message"
-
-#: src/away.c:850
-msgid "Away title: "
-msgstr "Away title: "
-
-#: src/away.c:898
-msgid "_Save"
-msgstr "_Save"
-
-#: src/away.c:902
-msgid "Sa_ve & Use"
-msgstr "Sa_ve & Use"
-
-#: src/away.c:906
-msgid "_Use"
-msgstr "_Use"
-
-#: src/blist.c:680
+#: src/blist.c:675
 msgid "Chats"
 msgstr "Chats"
 
-#: src/blist.c:1337
+#: src/blist.c:1339
 #, c-format
 msgid ""
 "%d buddy from group %s was not removed because its account was not logged "
@@ -1435,11 +1309,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:1346
+#: src/blist.c:1348
 msgid "Group not removed"
 msgstr "Group not removed"
 
-#: src/blist.c:2043
+#: src/blist.c:2051
 msgid ""
 "An error was encountered parsing your buddy list.  It has not been loaded, "
 "and the old file has moved to blist.xml~."
@@ -1447,24 +1321,24 @@
 "An error was encountered parsing your buddy list.  It has not been loaded, "
 "and the old file has moved to blist.xml~."
 
-#: src/blist.c:2046
+#: src/blist.c:2054
 msgid "Buddy List Error"
 msgstr "Buddy List Error"
 
-#: src/connection.c:118 src/connection.c:169
+#: src/connection.c:112 src/connection.c:163
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "Missing protocol plugin for %s"
 
-#: src/connection.c:123
+#: src/connection.c:117
 msgid "Registration Error"
 msgstr "Registration Error"
 
-#: src/connection.c:174
+#: src/connection.c:168
 msgid "Connection Error"
 msgstr "Connection Error"
 
-#: src/connection.c:195
+#: src/connection.c:189
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "Enter password for %s (%s)"
@@ -1477,67 +1351,67 @@
 msgid "Unable to send message."
 msgstr "Unable to send message."
 
-#: src/conversation.c:1953
+#: src/conversation.c:1970
 #, c-format
 msgid "%s entered the room."
 msgstr "%s entered the room."
 
-#: src/conversation.c:1956
+#: src/conversation.c:1973
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] entered the room."
 
-#: src/conversation.c:2052
+#: src/conversation.c:2069
 #, c-format
 msgid "You are now known as %s"
 msgstr "You are now known as %s"
 
-#: src/conversation.c:2055
+#: src/conversation.c:2072
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s is now known as %s"
 
-#: src/conversation.c:2096
+#: src/conversation.c:2113
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s left the room (%s)."
 
-#: src/conversation.c:2098
+#: src/conversation.c:2115
 #, c-format
 msgid "%s left the room."
 msgstr "%s left the room."
 
-#: src/conversation.c:2167
+#: src/conversation.c:2184
 #, c-format
 msgid "(+%d more)"
 msgstr "(+%d more)"
 
-#: src/conversation.c:2169
+#: src/conversation.c:2186
 #, c-format
 msgid " left the room (%s)."
 msgstr " left the room (%s)."
 
-#: src/conversation.c:2574
+#: src/conversation.c:2591
 msgid "Last created window"
 msgstr "Last created window"
 
-#: src/conversation.c:2576
+#: src/conversation.c:2593
 msgid "Separate IM and Chat windows"
 msgstr "Separate IM and Chat windows"
 
-#: src/conversation.c:2578 src/gtkprefs.c:1384
+#: src/conversation.c:2595 src/gtkprefs.c:1324
 msgid "New window"
 msgstr "New window"
 
-#: src/conversation.c:2580
+#: src/conversation.c:2597
 msgid "By group"
 msgstr "By group"
 
-#: src/conversation.c:2582
+#: src/conversation.c:2599
 msgid "By account"
 msgstr "By account"
 
-#: src/ft.c:122
+#: src/ft.c:147 src/protocols/msn/msn.c:372
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -1546,7 +1420,7 @@
 "Error reading %s: \n"
 "%s.\n"
 
-#: src/ft.c:126
+#: src/ft.c:151
 #, c-format
 msgid ""
 "Error writing %s: \n"
@@ -1555,7 +1429,7 @@
 "Error writing %s: \n"
 "%s.\n"
 
-#: src/ft.c:130
+#: src/ft.c:155
 #, c-format
 msgid ""
 "Error accessing %s: \n"
@@ -1564,30 +1438,30 @@
 "Error accessing %s: \n"
 "%s.\n"
 
-#: src/ft.c:161
+#: src/ft.c:187
 msgid "Cannot send a file of 0 bytes."
 msgstr "Cannot send a file of 0 bytes."
 
-#: src/ft.c:171
+#: src/ft.c:197
 msgid "Cannot send a directory."
 msgstr "Cannot send a directory."
 
-#: src/ft.c:178
+#: src/ft.c:204
 #, 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
+#: src/ft.c:258
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s wants to send you %s (%s)"
 
-#: src/ft.c:267
+#: src/ft.c:299
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "Accept file transfer request from %s?"
 
-#: src/ft.c:271
+#: src/ft.c:303
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -1598,22 +1472,37 @@
 "Remote host: %s\n"
 "Remote port: %d"
 
-#: src/ft.c:322
+#: src/ft.c:356
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s is not a valid filename.\n"
 
-#: src/ft.c:898
+#: src/ft.c:374
+#, c-format
+msgid "Offering to send %s to %s"
+msgstr "Offering to send %s to %s"
+
+#: src/ft.c:866
+#, c-format
+msgid "Transfer of %s complete"
+msgstr "Transfer of %s complete"
+
+#: src/ft.c:913
+#, c-format
+msgid "You canceled the transfer of %s"
+msgstr "You cancelled the transfer of %s"
+
+#: src/ft.c:963
 #, c-format
 msgid "%s canceled the transfer of %s"
-msgstr "%s canceled the transfer of %s"
-
-#: src/ft.c:948
+msgstr "%s cancelled the transfer of %s"
+
+#: src/ft.c:1012
 #, c-format
 msgid "File transfer to %s aborted.\n"
 msgstr "File transfer to %s aborted.\n"
 
-#: src/ft.c:950
+#: src/ft.c:1014
 #, c-format
 msgid "File transfer from %s aborted.\n"
 msgstr "File transfer from %s aborted.\n"
@@ -1626,7 +1515,7 @@
 msgid "Size of the expander arrow"
 msgstr "Size of the expander arrow"
 
-#: src/gaim-remote.c:108
+#: src/gaim-remote.c:104
 #, c-format
 msgid ""
 "Usage: %s command [OPTIONS] [URI]\n"
@@ -1636,32 +1525,55 @@
 "       away                     Popup the away dialog with the default "
 "message\n"
 "       back                     Remove the away dialog\n"
+"       send                     Send message\n"
 "       quit                     Close running copy of Gaim\n"
 "\n"
 "    OPTIONS:\n"
+"       -m, --message=MESG       Message to send or show in conversation "
+"window\n"
+"       -t, --to=SCREENNAME      Select a target for command\n"
+"       -p, --protocol=PROTO     Specify protocol to use\n"
+"       -f, --from=SCREENNAME    Specify screen name to use\n"
+"       -s, --session=SESSION    Specify which Gaim session to use\n"
 "       -h, --help [command]     Show help for command\n"
 msgstr ""
 "Usage: %s command [OPTIONS] [URI]\n"
 "\n"
 "    COMMANDS:\n"
 "       uri                      Handle AIM: URI\n"
-"       away                     Pop up the away dialog with the default "
+"       away                     Pop up the away dialogue with the default "
 "message\n"
-"       back                     Remove the away dialog\n"
+"       back                     Remove the away dialogue\n"
+"       send                     Send message\n"
 "       quit                     Close running copy of Gaim\n"
 "\n"
 "    OPTIONS:\n"
+"       -m, --message=MESG       Message to send or show in conversation "
+"window\n"
+"       -t, --to=SCREENNAME      Select a target for command\n"
+"       -p, --protocol=PROTO     Specify protocol to use\n"
+"       -f, --from=SCREENNAME    Specify screen name to use\n"
+"       -s, --session=SESSION    Specify which Gaim session to use\n"
 "       -h, --help [command]     Show help for command\n"
 
-#: src/gaim-remote.c:185 src/gaim-remote.c:203
-msgid ""
-"Gaim not running (on session 0)\n"
+#: src/gaim-remote.c:193
+#, c-format
+msgid ""
+"Gaim not running (on session %d)\n"
 "Is the \"Remote Control\" plugin loaded?\n"
 msgstr ""
-"Gaim not running (on session 0)\n"
+"Gaim not running (on session %d)\n"
 "Is the \"Remote Control\" plugin loaded?\n"
 
-#: src/gaim-remote.c:219
+#: src/gaim-remote.c:280
+msgid ""
+"Insufficient arguments (-t, -f, -p, & -m are all required) or arguments "
+"greater than 9999 chars\n"
+msgstr ""
+"Insufficient arguments (-t, -f, -p, & -m are all required) or arguments "
+"greater than 9999 chars\n"
+
+#: src/gaim-remote.c:291
 msgid ""
 "\n"
 "Using AIM: URIs:\n"
@@ -1703,7 +1615,7 @@
 "\tgaim-remote uri 'aim:addbuddy?screenname=Penguin'\n"
 "...prompts you to add 'Penguin' to your buddy list.\n"
 
-#: src/gaim-remote.c:239
+#: src/gaim-remote.c:311
 msgid ""
 "\n"
 "Close running copy of Gaim\n"
@@ -1711,7 +1623,7 @@
 "\n"
 "Close running copy of Gaim\n"
 
-#: src/gaim-remote.c:243
+#: src/gaim-remote.c:315
 msgid ""
 "\n"
 "Mark all accounts as \"away\" with the default message.\n"
@@ -1719,7 +1631,7 @@
 "\n"
 "Mark all accounts as \"away\" with the default message.\n"
 
-#: src/gaim-remote.c:247
+#: src/gaim-remote.c:319
 msgid ""
 "\n"
 "Set all accounts as not away.\n"
@@ -1727,6 +1639,14 @@
 "\n"
 "Set all accounts as not away.\n"
 
+#: src/gaim-remote.c:323
+msgid ""
+"\n"
+"Send instant message\n"
+msgstr ""
+"\n"
+"Send instant message\n"
+
 #: src/gtkaccount.c:325
 #, c-format
 msgid ""
@@ -1747,7 +1667,7 @@
 msgid "Protocol:"
 msgstr "Protocol:"
 
-#: src/gtkaccount.c:647 src/gtkblist.c:4023
+#: src/gtkaccount.c:647 src/gtkblist.c:3979
 msgid "Screen Name:"
 msgstr "Screen Name:"
 
@@ -1755,7 +1675,7 @@
 msgid "Password:"
 msgstr "Password:"
 
-#: src/gtkaccount.c:725 src/gtkblist.c:4037 src/gtkblist.c:4375
+#: src/gtkaccount.c:725 src/gtkblist.c:3993 src/gtkblist.c:4340
 msgid "Alias:"
 msgstr "Alias:"
 
@@ -1808,7 +1728,7 @@
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:1062 src/gtkaccount.c:1114 src/gtkprefs.c:1187
+#: src/gtkaccount.c:1062 src/gtkaccount.c:1114 src/gtkprefs.c:1127
 msgid "Use Environmental Settings"
 msgstr "Use Environmental Settings"
 
@@ -1824,15 +1744,15 @@
 msgid "Proxy Options"
 msgstr "Proxy Options"
 
-#: src/gtkaccount.c:1191 src/gtkprefs.c:1181
+#: src/gtkaccount.c:1191 src/gtkprefs.c:1121
 msgid "Proxy _type:"
 msgstr "Proxy _type:"
 
-#: src/gtkaccount.c:1200 src/gtkprefs.c:1208
+#: src/gtkaccount.c:1200 src/gtkprefs.c:1148
 msgid "_Host:"
 msgstr "_Host:"
 
-#: src/gtkaccount.c:1204 src/gtkprefs.c:1226
+#: src/gtkaccount.c:1204 src/gtkprefs.c:1166
 msgid "_Port:"
 msgstr "_Port:"
 
@@ -1840,63 +1760,77 @@
 msgid "_Username:"
 msgstr "_Username:"
 
-#: src/gtkaccount.c:1217 src/gtkprefs.c:1263
+#: src/gtkaccount.c:1217 src/gtkprefs.c:1203
 msgid "Pa_ssword:"
 msgstr "Pa_ssword:"
 
-#: src/gtkaccount.c:1585
+#: src/gtkaccount.c:1589
 msgid "Add Account"
 msgstr "Add Account"
 
-#: src/gtkaccount.c:1587
+#: src/gtkaccount.c:1591
 msgid "Modify Account"
 msgstr "Modify Account"
 
 #. Add the disclosure
-#: src/gtkaccount.c:1611
+#: src/gtkaccount.c:1615
 msgid "Show more options"
 msgstr "Show more options"
 
-#: src/gtkaccount.c:1612
+#: src/gtkaccount.c:1616
 msgid "Show fewer options"
 msgstr "Show fewer options"
 
 #. Register button
-#: src/gtkaccount.c:1639 src/protocols/jabber/jabber.c:666
+#: src/gtkaccount.c:1643 src/protocols/jabber/jabber.c:667
 msgid "Register"
 msgstr "Register"
 
-#: src/gtkaccount.c:2004
+#: src/gtkaccount.c:2008
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Are you sure you want to delete %s?"
 
-#: src/gtkaccount.c:2009 src/gtkrequest.c:246
+#: src/gtkaccount.c:2013 src/gtkrequest.c:246
 msgid "Delete"
 msgstr "Delete"
 
-#: src/gtkaccount.c:2123 src/protocols/oscar/oscar.c:4114
+#: src/gtkaccount.c:2127 src/protocols/oscar/oscar.c:4173
 msgid "Screen Name"
 msgstr "Screen Name"
 
-#: 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
+#. zephyr has several exposures
+#. NONE (where you are hidden, and zephyrs to you are in practice silently dropped -- yes this is wrong)
+#. OPSTAFF "hidden"
+#. REALM-VISIBLE visible to people in local realm
+#. REALM-ANNOUNCED REALM-VISIBLE+ plus your logins/logouts are announced to <login,username,*>
+#. NET-VISIBLE REALM-ANNOUNCED, plus visible to people in foreign realm
+#. NET-ANNOUNCED NET-VISIBLE, plus logins/logouts are announced	 to <login,username,*>
+#.
+#. Online will set the user to the exposure they have in their options (defaulting to REALM-VISIBLE),
+#. Hidden, will set the user's exposure to OPSTAFF
+#.
+#. Away won't change their exposure but will set an auto away message (for IMs only)
+#.
+#: src/gtkaccount.c:2151 src/protocols/gg/gg.c:271 src/protocols/irc/irc.c:158
+#: src/protocols/jabber/buddy.c:1000 src/protocols/jabber/jabber.c:962
+#: src/protocols/msn/msn.c:526 src/protocols/oscar/oscar.c:683
+#: src/protocols/oscar/oscar.c:6868 src/protocols/silc/silc.c:48
+#: src/protocols/yahoo/yahoo.c:2641 src/protocols/yahoo/yahoo.c:3105
+#: src/protocols/zephyr/zephyr.c:2217
 msgid "Online"
 msgstr "Online"
 
-#: src/gtkaccount.c:2168
+#: src/gtkaccount.c:2172
 msgid "Protocol"
 msgstr "Protocol"
 
-#: src/gtkaccount.c:2481
+#: src/gtkaccount.c:2485
 #, 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:2495
+#: src/gtkaccount.c:2499
 msgid ""
 "\n"
 "\n"
@@ -1906,27 +1840,26 @@
 "\n"
 "Do you wish to add him or her to your buddy list?"
 
-#: src/gtkaccount.c:2499
+#: src/gtkaccount.c:2503
 msgid "Information"
 msgstr "Information"
 
-#: src/gtkaccount.c:2503
+#: src/gtkaccount.c:2507
 msgid "Add buddy to your list?"
 msgstr "Add buddy to your list?"
 
 #. Add button
-#: src/gtkaccount.c:2505 src/gtkblist.c:4426 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
+#: src/gtkaccount.c:2509 src/gtkblist.c:4391 src/gtkconv.c:1487
+#: src/gtkconv.c:3805 src/gtkconv.c:3876 src/gtkrequest.c:247
+#: src/protocols/oscar/oscar.c:3800 src/protocols/silc/chat.c:593
 msgid "Add"
 msgstr "Add"
 
-#: src/gtkblist.c:792
+#: src/gtkblist.c:808
 msgid "Join a Chat"
 msgstr "Join a Chat"
 
-#: src/gtkblist.c:813
+#: src/gtkblist.c:829
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
@@ -1934,203 +1867,228 @@
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 
-#: src/gtkblist.c:824 src/gtkpounce.c:411 src/gtkroomlist.c:354
+#: src/gtkblist.c:840 src/gtkpounce.c:415 src/gtkroomlist.c:354
 msgid "_Account:"
 msgstr "_Account:"
 
-#: src/gtkblist.c:1119 src/gtkblist.c:3209
+#: src/gtkblist.c:1112
 msgid "Get _Info"
 msgstr "Get _Info"
 
-#: src/gtkblist.c:1122 src/gtkblist.c:3199
+#: src/gtkblist.c:1115
 msgid "I_M"
 msgstr "I_M"
 
-#: src/gtkblist.c:1128
+#: src/gtkblist.c:1121
 msgid "_Send File"
 msgstr "_Send File"
 
-#: src/gtkblist.c:1134
+#: src/gtkblist.c:1127
 msgid "Add Buddy _Pounce"
 msgstr "Add Buddy _Pounce"
 
-#: src/gtkblist.c:1136
+#: src/gtkblist.c:1129 src/gtkblist.c:1226
 msgid "View _Log"
 msgstr "View _Log"
 
-#: src/gtkblist.c:1145 src/gtkblist.c:1226 src/gtkblist.c:1240
+#: src/gtkblist.c:1139
+msgid "_Alias Buddy..."
+msgstr "_Alias Buddy..."
+
+#: src/gtkblist.c:1141
+msgid "_Remove Buddy"
+msgstr "_Remove Buddy"
+
+#: src/gtkblist.c:1143
+msgid "Alias Contact..."
+msgstr "Alias Contact..."
+
+#: src/gtkblist.c:1146 src/gtkdialogs.c:758 src/gtkdialogs.c:759
+msgid "Remove Contact"
+msgstr "Remove Contact"
+
+#: src/gtkblist.c:1150 src/gtkblist.c:1234 src/gtkblist.c:1248
 msgid "_Alias..."
 msgstr "_Alias..."
 
-#: src/gtkblist.c:1147 src/gtkblist.c:1228 src/gtkblist.c:1245
-#: src/gtkconn.c:361
+#: src/gtkblist.c:1152 src/gtkblist.c:1236 src/gtkblist.c:1253
+#: src/gtkconn.c:364
 msgid "_Remove"
 msgstr "_Remove"
 
-#: src/gtkblist.c:1192
+#: src/gtkblist.c:1198
 msgid "Add a _Buddy"
 msgstr "Add a _Buddy"
 
-#: src/gtkblist.c:1194
+#: src/gtkblist.c:1200
 msgid "Add a C_hat"
 msgstr "Add a C_hat"
 
-#: src/gtkblist.c:1196
+#: src/gtkblist.c:1202
 msgid "_Delete Group"
 msgstr "_Delete Group"
 
-#: src/gtkblist.c:1198
+#: src/gtkblist.c:1204
 msgid "_Rename"
 msgstr "_Rename"
 
 #. join button
-#: src/gtkblist.c:1216 src/gtkroomlist.c:264 src/gtkroomlist.c:409
+#: src/gtkblist.c:1222 src/gtkroomlist.c:264 src/gtkroomlist.c:409
 #: src/stock.c:88
 msgid "_Join"
 msgstr "_Join"
 
-#: src/gtkblist.c:1218
+#: src/gtkblist.c:1224
 msgid "Auto-Join"
 msgstr "Auto-Join"
 
-#: src/gtkblist.c:1242 src/gtkblist.c:1267
+#: src/gtkblist.c:1250 src/gtkblist.c:1275
 msgid "_Collapse"
 msgstr "_Collapse"
 
-#: src/gtkblist.c:1272
+#: src/gtkblist.c:1280
 msgid "_Expand"
 msgstr "_Expand"
 
-#: src/gtkblist.c:1919 src/gtkconv.c:4379 src/gtkpounce.c:314
+#: src/gtkblist.c:1497 src/gtkblist.c:1507 src/gtkblist.c:3243
+#: src/gtkblist.c:3246
+msgid "/Tools/Mute Sounds"
+msgstr "/Tools/Mute Sounds"
+
+#: src/gtkblist.c:1948 src/gtkconv.c:4475 src/gtkpounce.c:316
 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:2329
+#: src/gtkblist.c:2366
 msgid "/_Buddies"
 msgstr "/_Buddies"
 
-#: src/gtkblist.c:2330
+#: src/gtkblist.c:2367
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Buddies/New Instant _Message..."
 
-#: src/gtkblist.c:2331
+#: src/gtkblist.c:2368
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Buddies/Join a _Chat..."
 
-#: src/gtkblist.c:2332
+#: src/gtkblist.c:2369
 msgid "/Buddies/Get User _Info..."
 msgstr "/Buddies/Get User _Info..."
 
-#: src/gtkblist.c:2333
+#: src/gtkblist.c:2370
 msgid "/Buddies/View User _Log..."
 msgstr "/Buddies/View User _Log..."
 
-#: src/gtkblist.c:2335
+#: src/gtkblist.c:2372
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Buddies/Show _Offline Buddies"
 
-#: src/gtkblist.c:2336
+#: src/gtkblist.c:2373
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Buddies/Show _Empty Groups"
 
-#: src/gtkblist.c:2337
+#: src/gtkblist.c:2374
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Buddies/_Add Buddy..."
 
-#: src/gtkblist.c:2338
+#: src/gtkblist.c:2375
 msgid "/Buddies/Add C_hat..."
 msgstr "/Buddies/Add C_hat..."
 
-#: src/gtkblist.c:2339
+#: src/gtkblist.c:2376
 msgid "/Buddies/Add _Group..."
 msgstr "/Buddies/Add _Group..."
 
-#: src/gtkblist.c:2341
+#: src/gtkblist.c:2378
 msgid "/Buddies/_Signoff"
 msgstr "/Buddies/_Signoff"
 
-#: src/gtkblist.c:2342
+#: src/gtkblist.c:2379
 msgid "/Buddies/_Quit"
 msgstr "/Buddies/_Quit"
 
 #. Tools
-#: src/gtkblist.c:2345
+#: src/gtkblist.c:2382
 msgid "/_Tools"
 msgstr "/_Tools"
 
-#: src/gtkblist.c:2346
+#: src/gtkblist.c:2383
 msgid "/Tools/_Away"
 msgstr "/Tools/_Away"
 
-#: src/gtkblist.c:2347
+#: src/gtkblist.c:2384
 msgid "/Tools/Buddy _Pounce"
 msgstr "/Tools/Buddy _Pounce"
 
-#: src/gtkblist.c:2348
+#: src/gtkblist.c:2385
 msgid "/Tools/Account Ac_tions"
 msgstr "/Tools/Account Ac_tions"
 
-#: src/gtkblist.c:2349
+#: src/gtkblist.c:2386
 msgid "/Tools/Pl_ugin Actions"
 msgstr "/Tools/Pl_ugin Actions"
 
-#: src/gtkblist.c:2351
+#: src/gtkblist.c:2388
 msgid "/Tools/A_ccounts"
 msgstr "/Tools/A_ccounts"
 
-#: src/gtkblist.c:2352
+#: src/gtkblist.c:2389
 msgid "/Tools/_File Transfers"
 msgstr "/Tools/_File Transfers"
 
-#: src/gtkblist.c:2353
+#: src/gtkblist.c:2390
 msgid "/Tools/R_oom List"
 msgstr "/Tools/R_oom List"
 
-#: src/gtkblist.c:2354
+#: src/gtkblist.c:2391
 msgid "/Tools/Pr_eferences"
 msgstr "/Tools/Pr_eferences"
 
-#: src/gtkblist.c:2355
+#: src/gtkblist.c:2392
 msgid "/Tools/Pr_ivacy"
 msgstr "/Tools/Pr_ivacy"
 
-#: src/gtkblist.c:2357
+#: src/gtkblist.c:2393
+msgid "/Tools/Mute _Sounds"
+msgstr "/Tools/Mute _Sounds"
+
+#: src/gtkblist.c:2395
 msgid "/Tools/View System _Log"
 msgstr "/Tools/View System _Log"
 
 #. Help
-#: src/gtkblist.c:2360
+#: src/gtkblist.c:2398
 msgid "/_Help"
 msgstr "/_Help"
 
-#: src/gtkblist.c:2361
+#: src/gtkblist.c:2399
 msgid "/Help/Online _Help"
 msgstr "/Help/Online _Help"
 
-#: src/gtkblist.c:2362
+#: src/gtkblist.c:2400
 msgid "/Help/_Debug Window"
 msgstr "/Help/_Debug Window"
 
-#: src/gtkblist.c:2363
+#: src/gtkblist.c:2401
 msgid "/Help/_About"
 msgstr "/Help/_About"
 
-#: src/gtkblist.c:2381
+#: src/gtkblist.c:2419
 msgid "Rename Group"
 msgstr "Rename Group"
 
-#: src/gtkblist.c:2381
+#: src/gtkblist.c:2419
 msgid "New group name"
 msgstr "New group name"
 
-#: src/gtkblist.c:2382
+#: src/gtkblist.c:2420
 msgid "Please enter a new name for the selected group."
 msgstr "Please enter a new name for the selected group."
 
-#: src/gtkblist.c:2410
+#: src/gtkblist.c:2449
 #, c-format
 msgid ""
 "\n"
@@ -2139,7 +2097,7 @@
 "\n"
 "<b>Account:</b> %s"
 
-#: src/gtkblist.c:2474
+#: src/gtkblist.c:2523
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
@@ -2147,12 +2105,12 @@
 "\n"
 "<b>Status:</b> Offline"
 
-#: src/gtkblist.c:2489
+#: src/gtkblist.c:2538
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:2505
+#: src/gtkblist.c:2554
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -2160,7 +2118,7 @@
 "\n"
 "<b>Account:</b>"
 
-#: src/gtkblist.c:2506
+#: src/gtkblist.c:2555
 msgid ""
 "\n"
 "<b>Contact Alias:</b>"
@@ -2168,7 +2126,7 @@
 "\n"
 "<b>Contact Alias:</b>"
 
-#: src/gtkblist.c:2507
+#: src/gtkblist.c:2556
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -2176,7 +2134,7 @@
 "\n"
 "<b>Alias:</b>"
 
-#: src/gtkblist.c:2508
+#: src/gtkblist.c:2557
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -2184,7 +2142,7 @@
 "\n"
 "<b>Nickname:</b>"
 
-#: src/gtkblist.c:2509
+#: src/gtkblist.c:2558
 msgid ""
 "\n"
 "<b>Logged In:</b>"
@@ -2192,7 +2150,7 @@
 "\n"
 "<b>Logged In:</b>"
 
-#: src/gtkblist.c:2510
+#: src/gtkblist.c:2559
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -2200,7 +2158,15 @@
 "\n"
 "<b>Idle:</b>"
 
-#: src/gtkblist.c:2511
+#: src/gtkblist.c:2559
+msgid ""
+"\n"
+"<b>Idle</b>"
+msgstr ""
+"\n"
+"<b>Idle</b>"
+
+#: src/gtkblist.c:2561
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -2208,7 +2174,7 @@
 "\n"
 "<b>Warned:</b>"
 
-#: src/gtkblist.c:2513
+#: src/gtkblist.c:2563
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2216,7 +2182,7 @@
 "\n"
 "<b>Description:</b> Spooky"
 
-#: src/gtkblist.c:2514
+#: src/gtkblist.c:2564
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
@@ -2224,7 +2190,7 @@
 "\n"
 "<b>Status</b>: Awesome"
 
-#: src/gtkblist.c:2515
+#: src/gtkblist.c:2565
 msgid ""
 "\n"
 "<b>Status</b>: Rockin'"
@@ -2232,108 +2198,93 @@
 "\n"
 "<b>Status</b>: Rockin'"
 
-#: src/gtkblist.c:2797
+#: src/gtkblist.c:2863
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "Idle (%dh%02dm) "
 
-#: src/gtkblist.c:2799
+#: src/gtkblist.c:2865
 #, c-format
 msgid "Idle (%dm) "
 msgstr "Idle (%dm) "
 
-#: src/gtkblist.c:2804
+#: src/gtkblist.c:2868
+msgid "Idle "
+msgstr "Idle "
+
+#: src/gtkblist.c:2876
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "Warned (%d%%) "
 
-#: src/gtkblist.c:2807
+#: src/gtkblist.c:2880
 msgid "Offline "
 msgstr "Offline "
 
 #. Make menu items sensitive/insensitive where appropriate
-#: src/gtkblist.c:2925
+#: src/gtkblist.c:3007
 msgid "/Buddies/Join a Chat..."
 msgstr "/Buddies/Join a Chat..."
 
-#: src/gtkblist.c:2928
+#: src/gtkblist.c:3010
 msgid "/Tools/Room List"
 msgstr "/Tools/Room List"
 
-#: src/gtkblist.c:2931
+#: src/gtkblist.c:3013
 msgid "/Tools/Privacy"
 msgstr "/Tools/Privacy"
 
-#: src/gtkblist.c:3013
+#: src/gtkblist.c:3069 src/gtkprefs.c:954 src/gtkprefs.c:1788
+#: src/protocols/jabber/jabber.c:922
+msgid "None"
+msgstr "None"
+
+#: src/gtkblist.c:3071
 msgid "Alphabetical"
 msgstr "Alphabetical"
 
-#: src/gtkblist.c:3014
+#: src/gtkblist.c:3072
 msgid "By status"
 msgstr "By status"
 
-#: src/gtkblist.c:3015
+#: src/gtkblist.c:3073
 msgid "By log size"
 msgstr "By log size"
 
-#: src/gtkblist.c:3081
+#: src/gtkblist.c:3138
 msgid "/Tools/Away"
 msgstr "/Tools/Away"
 
-#: src/gtkblist.c:3084
+#: src/gtkblist.c:3145
 msgid "/Tools/Buddy Pounce"
 msgstr "/Tools/Buddy Pounce"
 
-#: src/gtkblist.c:3087
+#: src/gtkblist.c:3148
 msgid "/Tools/Account Actions"
 msgstr "/Tools/Account Actions"
 
-#: src/gtkblist.c:3090
+#: src/gtkblist.c:3151
 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:3178
+#: src/gtkblist.c:3239
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Buddies/Show Offline Buddies"
 
-#: src/gtkblist.c:3180
+#: src/gtkblist.c:3241
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Buddies/Show Empty Groups"
 
-#: src/gtkblist.c:3205
-msgid "Send a message to the selected buddy"
-msgstr "Send a message to the selected buddy"
-
-#: src/gtkblist.c:3215
-msgid "Get information on the selected buddy"
-msgstr "Get information on the selected buddy"
-
-#: src/gtkblist.c:3219
-msgid "_Chat"
-msgstr "_Chat"
-
-#: src/gtkblist.c:3224
-msgid "Join a chat room"
-msgstr "Join a chat room"
-
-#: src/gtkblist.c:3229
-msgid "_Away"
-msgstr "_Away"
-
-#: src/gtkblist.c:3234
-msgid "Set an away message"
-msgstr "Set an away message"
-
-#: src/gtkblist.c:3977 src/protocols/silc/buddy.c:731
+#: src/gtkblist.c:3933 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:2734
+#: src/protocols/silc/buddy.c:1124 src/protocols/yahoo/yahoo.c:2808
 msgid "Add Buddy"
 msgstr "Add Buddy"
 
-#: src/gtkblist.c:4001
+#: src/gtkblist.c:3957
 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. "
@@ -2344,15 +2295,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:4061 src/gtkblist.c:4355
+#: src/gtkblist.c:4017 src/gtkblist.c:4320
 msgid "Account:"
 msgstr "Account:"
 
-#: src/gtkblist.c:4288
+#: src/gtkblist.c:4253
 msgid "This protocol does not support chat rooms."
 msgstr "This protocol does not support chat rooms."
 
-#: src/gtkblist.c:4304
+#: src/gtkblist.c:4269
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -2360,11 +2311,11 @@
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 
-#: src/gtkblist.c:4321
+#: src/gtkblist.c:4286
 msgid "Add Chat"
 msgstr "Add Chat"
 
-#: src/gtkblist.c:4345
+#: src/gtkblist.c:4310
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -2372,39 +2323,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:4423
+#: src/gtkblist.c:4388
 msgid "Add Group"
 msgstr "Add Group"
 
-#: src/gtkblist.c:4424
+#: src/gtkblist.c:4389
 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:4991 src/gtkblist.c:5088
+#: src/gtkblist.c:4963 src/gtkblist.c:5060
 msgid "No actions available"
 msgstr "No actions available"
 
-#: src/gtkconn.c:79 src/gtkconn.c:250 src/gtkconn.c:261
+#: src/gtkconn.c:78 src/gtkconn.c:251 src/gtkconn.c:264
 msgid "Done."
 msgstr "Done."
 
-#: src/gtkconn.c:158
+#: src/gtkconn.c:157
 msgid "Signon: "
 msgstr "Signon: "
 
-#: src/gtkconn.c:204
+#: src/gtkconn.c:203
 msgid "Signon"
 msgstr "Signon"
 
-#: src/gtkconn.c:216
+#: src/gtkconn.c:215
 msgid "Cancel All"
 msgstr "Cancel All"
 
-#: src/gtkconn.c:361 src/gtkconn.c:593
+#: src/gtkconn.c:364 src/gtkconn.c:597
 msgid "_Reconnect"
 msgstr "_Reconnect"
 
-#: src/gtkconn.c:557
+#: src/gtkconn.c:560
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">%s has been disconnected.</span>\n"
@@ -2417,32 +2368,36 @@
 "%s\n"
 "%s"
 
-#: src/gtkconn.c:559
+#: src/gtkconn.c:562
 msgid "Reason Unknown."
 msgstr "Reason Unknown."
 
-#: src/gtkconn.c:598
+#: src/gtkconn.c:575
+msgid "Disconnected"
+msgstr "Disconnected"
+
+#: src/gtkconn.c:602
 msgid "Reconnect _All"
 msgstr "Reconnect _All"
 
-#: src/gtkconn.c:628
+#: src/gtkconn.c:632
 msgid "Time"
 msgstr "Time"
 
-#: src/gtkconv.c:327
+#: src/gtkconv.c:317
 #, c-format
 msgid "me is using Gaim v%s."
 msgstr "me is using Gaim v%s."
 
-#: src/gtkconv.c:336
+#: src/gtkconv.c:326
 msgid "Supported debug options are:  version"
 msgstr "Supported debug options are:  version"
 
-#: src/gtkconv.c:360
+#: src/gtkconv.c:350
 msgid "No such command (in this context)."
 msgstr "No such command (in this context)."
 
-#: src/gtkconv.c:363
+#: src/gtkconv.c:353
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -2450,37 +2405,46 @@
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
 
-#: src/gtkconv.c:435
+#: src/gtkconv.c:425
 msgid "No such command."
 msgstr "No such command."
 
-#: src/gtkconv.c:442
+#: src/gtkconv.c:432
 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
+#: src/gtkconv.c:437
 msgid "Your command failed for an unknown reason."
 msgstr "Your command failed for an unknown reason."
 
-#: src/gtkconv.c:454
+#: src/gtkconv.c:444
 msgid "That command only works in Chats, not IMs."
 msgstr "That command only works in Chats, not IMs."
 
-#: src/gtkconv.c:457
+#: src/gtkconv.c:447
 msgid "That command only works in IMs, not Chats."
 msgstr "That command only works in IMs, not Chats."
 
-#: src/gtkconv.c:461
+#: src/gtkconv.c:451
 msgid "That command doesn't work on this protocol."
 msgstr "That command doesn't work on this protocol."
 
-#: src/gtkconv.c:707
+#: src/gtkconv.c:685 src/gtkconv.c:711
+msgid "That buddy is not on the same protocol as this chat"
+msgstr "That buddy is not on the same protocol as this chat"
+
+#: src/gtkconv.c:705
+msgid ""
+"You are not currently signed on with an account that can invite that buddy."
+msgstr ""
+"You are not currently signed on with an account that can invite that buddy."
+
+#: src/gtkconv.c:759
 msgid "Invite Buddy Into Chat Room"
 msgstr "Invite Buddy Into Chat Room"
 
-#. Put our happy label in it.
-#: src/gtkconv.c:735
+#: src/gtkconv.c:789
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -2488,347 +2452,344 @@
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 
-#: src/gtkconv.c:756
+#: src/gtkconv.c:810
 msgid "_Buddy:"
 msgstr "_Buddy:"
 
-#: src/gtkconv.c:776
+#: src/gtkconv.c:830
 msgid "_Message:"
 msgstr "_Message:"
 
-#: src/gtkconv.c:813 src/gtkconv.c:2498 src/gtkdebug.c:182
+#: src/gtkconv.c:886 src/gtkconv.c:2576 src/gtkdebug.c:179
 msgid "Unable to open file."
 msgstr "Unable to open file."
 
-#: src/gtkconv.c:818
+#: src/gtkconv.c:891
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Conversation with %s</h1>\n"
 
-#: src/gtkconv.c:832
+#: src/gtkconv.c:905
 msgid "Save Conversation"
 msgstr "Save Conversation"
 
-#: src/gtkconv.c:909 src/gtkdebug.c:131
+#: src/gtkconv.c:990 src/gtkdebug.c:128
 msgid "Find"
 msgstr "Find"
 
-#: src/gtkconv.c:935 src/gtkdebug.c:159
+#: src/gtkconv.c:1016 src/gtkdebug.c:156
 msgid "_Search for:"
 msgstr "_Search for:"
 
-#: src/gtkconv.c:1350
+#: src/gtkconv.c:1435
 msgid "IM"
 msgstr "IM"
 
 #. Send File button
-#: src/gtkconv.c:1359 src/gtkconv.c:3729 src/protocols/oscar/oscar.c:569
+#: src/gtkconv.c:1444 src/gtkconv.c:3798 src/protocols/oscar/oscar.c:598
 msgid "Send File"
 msgstr "Send File"
 
-#: src/gtkconv.c:1368
+#: src/gtkconv.c:1453
 msgid "Un-Ignore"
 msgstr "Un-Ignore"
 
-#: src/gtkconv.c:1370 src/gtkprefs.c:828
+#: src/gtkconv.c:1455 src/gtkprefs.c:796
 msgid "Ignore"
 msgstr "Ignore"
 
 #. Info button
-#: src/gtkconv.c:1379 src/gtkconv.c:3750
+#: src/gtkconv.c:1464 src/gtkconv.c:3819
 msgid "Info"
 msgstr "Info"
 
-#: src/gtkconv.c:1388
+#: src/gtkconv.c:1473
 msgid "Get Away Msg"
 msgstr "Get Away Msg"
 
-#: src/gtkconv.c:2506
+#. Remove button
+#: src/gtkconv.c:1485 src/gtkconv.c:3812 src/gtkconv.c:3883
+#: src/gtkrequest.c:248
+msgid "Remove"
+msgstr "Remove"
+
+#: src/gtkconv.c:2584
 msgid "Unable to save icon file to disk."
 msgstr "Unable to save icon file to disk."
 
-#: src/gtkconv.c:2527
+#: src/gtkconv.c:2605
 msgid "Save Icon"
 msgstr "Save Icon"
 
-#: src/gtkconv.c:2557
+#: src/gtkconv.c:2635
 msgid "Animate"
 msgstr "Animate"
 
-#: src/gtkconv.c:2562
+#: src/gtkconv.c:2640
 msgid "Hide Icon"
 msgstr "Hide Icon"
 
-#: src/gtkconv.c:2568
+#: src/gtkconv.c:2646
 msgid "Save Icon As..."
 msgstr "Save Icon As..."
 
-#: src/gtkconv.c:2938
+#: src/gtkconv.c:3013
 msgid "User is typing..."
 msgstr "User is typing..."
 
-#: src/gtkconv.c:2946
+#: src/gtkconv.c:3021
 msgid "User has typed something and paused"
 msgstr "User has typed something and paused"
 
 #. Build the Send As menu
-#: src/gtkconv.c:3049
+#: src/gtkconv.c:3124
 msgid "_Send As"
 msgstr "_Send As"
 
 #. Conversation menu
-#: src/gtkconv.c:3500
+#: src/gtkconv.c:3575
 msgid "/_Conversation"
 msgstr "/_Conversation"
 
-#: src/gtkconv.c:3502
+#: src/gtkconv.c:3577
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Conversation/New Instant _Message..."
 
-#: src/gtkconv.c:3507
+#: src/gtkconv.c:3582
 msgid "/Conversation/_Find..."
 msgstr "/Conversation/_Find..."
 
-#: src/gtkconv.c:3509
+#: src/gtkconv.c:3584
 msgid "/Conversation/View _Log"
 msgstr "/Conversation/View _Log"
 
-#: src/gtkconv.c:3510
+#: src/gtkconv.c:3585
 msgid "/Conversation/_Save As..."
 msgstr "/Conversation/_Save As..."
 
-#: src/gtkconv.c:3512
+#: src/gtkconv.c:3587
 msgid "/Conversation/Clear"
 msgstr "/Conversation/Clear"
 
-#: src/gtkconv.c:3516
+#: src/gtkconv.c:3591
 msgid "/Conversation/Se_nd File..."
 msgstr "/Conversation/Se_nd File..."
 
-#: src/gtkconv.c:3517
+#: src/gtkconv.c:3592
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Conversation/Add Buddy _Pounce..."
 
-#: src/gtkconv.c:3519
+#: src/gtkconv.c:3594
 msgid "/Conversation/_Get Info"
 msgstr "/Conversation/_Get Info"
 
-#: src/gtkconv.c:3521
+#: src/gtkconv.c:3596
 msgid "/Conversation/_Warn..."
 msgstr "/Conversation/_Warn..."
 
-#: src/gtkconv.c:3523
+#: src/gtkconv.c:3598
 msgid "/Conversation/In_vite..."
 msgstr "/Conversation/In_vite..."
 
-#: src/gtkconv.c:3528
+#: src/gtkconv.c:3603
 msgid "/Conversation/A_lias..."
 msgstr "/Conversation/A_lias..."
 
-#: src/gtkconv.c:3530
+#: src/gtkconv.c:3605
 msgid "/Conversation/_Block..."
 msgstr "/Conversation/_Block..."
 
-#: src/gtkconv.c:3532
+#: src/gtkconv.c:3607
 msgid "/Conversation/_Add..."
 msgstr "/Conversation/_Add..."
 
-#: src/gtkconv.c:3534
+#: src/gtkconv.c:3609
 msgid "/Conversation/_Remove..."
 msgstr "/Conversation/_Remove..."
 
-#: src/gtkconv.c:3539
+#: src/gtkconv.c:3614
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Conversation/Insert Lin_k..."
 
-#: src/gtkconv.c:3541
+#: src/gtkconv.c:3616
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Conversation/Insert Imag_e..."
 
-#: src/gtkconv.c:3546
+#: src/gtkconv.c:3621
 msgid "/Conversation/_Close"
 msgstr "/Conversation/_Close"
 
 #. Options
-#: src/gtkconv.c:3550
+#: src/gtkconv.c:3625
 msgid "/_Options"
 msgstr "/_Options"
 
-#: src/gtkconv.c:3551
+#: src/gtkconv.c:3626
 msgid "/Options/Enable _Logging"
 msgstr "/Options/Enable _Logging"
 
-#: src/gtkconv.c:3552
+#: src/gtkconv.c:3627
 msgid "/Options/Enable _Sounds"
 msgstr "/Options/Enable _Sounds"
 
-#: src/gtkconv.c:3553
+#: src/gtkconv.c:3628
 msgid "/Options/Show Formatting _Toolbar"
 msgstr "/Options/Show Formatting _Toolbar"
 
-#: src/gtkconv.c:3554
+#: src/gtkconv.c:3629
 msgid "/Options/Show T_imestamps"
 msgstr "/Options/Show T_imestamps"
 
-#: src/gtkconv.c:3596
+#: src/gtkconv.c:3671
 msgid "/Conversation/View Log"
 msgstr "/Conversation/View Log"
 
-#: src/gtkconv.c:3601
+#: src/gtkconv.c:3676
 msgid "/Conversation/Send File..."
 msgstr "/Conversation/Send File..."
 
-#: src/gtkconv.c:3605
+#: src/gtkconv.c:3680
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversation/Add Buddy Pounce..."
 
-#: src/gtkconv.c:3611
+#: src/gtkconv.c:3686
 msgid "/Conversation/Get Info"
 msgstr "/Conversation/Get Info"
 
-#: src/gtkconv.c:3615
+#: src/gtkconv.c:3690
 msgid "/Conversation/Warn..."
 msgstr "/Conversation/Warn..."
 
-#: src/gtkconv.c:3619
+#: src/gtkconv.c:3694
 msgid "/Conversation/Invite..."
 msgstr "/Conversation/Invite..."
 
-#: src/gtkconv.c:3625
+#: src/gtkconv.c:3700
 msgid "/Conversation/Alias..."
 msgstr "/Conversation/Alias..."
 
-#: src/gtkconv.c:3629
+#: src/gtkconv.c:3704
 msgid "/Conversation/Block..."
 msgstr "/Conversation/Block..."
 
-#: src/gtkconv.c:3633
+#: src/gtkconv.c:3708
 msgid "/Conversation/Add..."
 msgstr "/Conversation/Add..."
 
-#: src/gtkconv.c:3637
+#: src/gtkconv.c:3712
 msgid "/Conversation/Remove..."
 msgstr "/Conversation/Remove..."
 
-#: src/gtkconv.c:3643
+#: src/gtkconv.c:3718
 msgid "/Conversation/Insert Link..."
 msgstr "/Conversation/Insert Link..."
 
-#: src/gtkconv.c:3647
+#: src/gtkconv.c:3722
 msgid "/Conversation/Insert Image..."
 msgstr "/Conversation/Insert Image..."
 
-#: src/gtkconv.c:3653
+#: src/gtkconv.c:3728
 msgid "/Options/Enable Logging"
 msgstr "/Options/Enable Logging"
 
-#: src/gtkconv.c:3656
+#: src/gtkconv.c:3731
 msgid "/Options/Enable Sounds"
 msgstr "/Options/Enable Sounds"
 
-#: src/gtkconv.c:3659
+#: src/gtkconv.c:3734
 msgid "/Options/Show Formatting Toolbar"
 msgstr "/Options/Show Formatting Toolbar"
 
-#: src/gtkconv.c:3662
+#: src/gtkconv.c:3737
 msgid "/Options/Show Timestamps"
 msgstr "/Options/Show Timestamps"
 
 #. The buttons, from left to right
-#. Warn button
-#: src/gtkconv.c:3715
-msgid "Warn"
-msgstr "Warn"
-
-#: src/gtkconv.c:3716
-msgid "Warn the user"
-msgstr "Warn the user"
-
 #. Block button
-#: src/gtkconv.c:3722 src/gtkprivacy.c:623 src/gtkprivacy.c:634
+#: src/gtkconv.c:3791 src/gtkprivacy.c:623 src/gtkprivacy.c:634
 msgid "Block"
 msgstr "Block"
 
-#: src/gtkconv.c:3723
+#: src/gtkconv.c:3792
 msgid "Block the user"
 msgstr "Block the user"
 
-#: src/gtkconv.c:3730
+#: src/gtkconv.c:3799
 msgid "Send a file to the user"
 msgstr "Send a file to the user"
 
-#: src/gtkconv.c:3737
+#: src/gtkconv.c:3806
 msgid "Add the user to your buddy list"
 msgstr "Add the user to your buddy list"
 
-#: src/gtkconv.c:3744
+#: src/gtkconv.c:3813
 msgid "Remove the user from your buddy list"
 msgstr "Remove the user from your buddy list"
 
-#: src/gtkconv.c:3751 src/gtkconv.c:4086
+#: src/gtkconv.c:3820 src/gtkconv.c:4155
 msgid "Get the user's information"
 msgstr "Get the user's information"
 
 #. Send button
-#: src/gtkconv.c:3757 src/gtkconv.c:3821
+#: src/gtkconv.c:3826 src/gtkconv.c:3890
 msgid "Send"
 msgstr "Send"
 
-#: src/gtkconv.c:3758 src/gtkconv.c:3822
+#: src/gtkconv.c:3827 src/gtkconv.c:3891
 msgid "Send message"
 msgstr "Send message"
 
 #. The buttons, from left to right
 #. Invite
-#: src/gtkconv.c:3800
+#: src/gtkconv.c:3869
 msgid "Invite"
 msgstr "Invite"
 
-#: src/gtkconv.c:3801
+#: src/gtkconv.c:3870
 msgid "Invite a user"
 msgstr "Invite a user"
 
-#: src/gtkconv.c:3808
+#: src/gtkconv.c:3877
 msgid "Add the chat to your buddy list"
 msgstr "Add the chat to your buddy list"
 
-#: src/gtkconv.c:3815
+#: src/gtkconv.c:3884
 msgid "Remove the chat from your buddy list"
 msgstr "Remove the chat from your buddy list"
 
-#: src/gtkconv.c:3939
+#: src/gtkconv.c:4008
 msgid "Topic:"
 msgstr "Topic:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:4002
+#: src/gtkconv.c:4071
 msgid "0 people in room"
 msgstr "0 people in room"
 
-#: src/gtkconv.c:4063
+#: src/gtkconv.c:4132
 msgid "IM the user"
 msgstr "IM the user"
 
-#: src/gtkconv.c:4075
+#: src/gtkconv.c:4144
 msgid "Ignore the user"
 msgstr "Ignore the user"
 
-#: src/gtkconv.c:4669
+#: src/gtkconv.c:4766
 msgid "Close conversation"
 msgstr "Close conversation"
 
-#: src/gtkconv.c:5202 src/gtkconv.c:5231 src/gtkconv.c:5327 src/gtkconv.c:5385
+#: src/gtkconv.c:5301 src/gtkconv.c:5330 src/gtkconv.c:5426 src/gtkconv.c:5484
 #, 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:5951 src/gtkconv.c:5954
+#: src/gtkconv.c:6057 src/gtkconv.c:6060
 msgid "<main>/Conversation/Close"
 msgstr "<main>/Conversation/Close"
 
-#: src/gtkconv.c:6326
+#: src/gtkconv.c:6427
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -2836,11 +2797,11 @@
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
 
-#: src/gtkconv.c:6329
+#: src/gtkconv.c:6430
 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:6332
+#: src/gtkconv.c:6433
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -2848,23 +2809,23 @@
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 
-#: src/gtkconv.c:6336
+#: src/gtkconv.c:6437
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;command&gt;:  Help on a specific command."
 
-#: src/gtkdebug.c:197
+#: src/gtkdebug.c:194
 msgid "Save Debug Log"
 msgstr "Save Debug Log"
 
-#: src/gtkdebug.c:250
+#: src/gtkdebug.c:247
 msgid "Debug Window"
 msgstr "Debug Window"
 
-#: src/gtkdebug.c:288
+#: src/gtkdebug.c:285
 msgid "Pause"
 msgstr "Pause"
 
-#: src/gtkdebug.c:294
+#: src/gtkdebug.c:291
 msgid "Timestamps"
 msgstr "Timestamps"
 
@@ -2885,7 +2846,7 @@
 msgstr "win32 port"
 
 #: src/gtkdialogs.c:67 src/gtkdialogs.c:68 src/gtkdialogs.c:69
-#: src/gtkdialogs.c:70
+#: src/gtkdialogs.c:70 src/gtkdialogs.c:72
 msgid "developer"
 msgstr "developer"
 
@@ -2893,180 +2854,180 @@
 msgid "support"
 msgstr "support"
 
-#: src/gtkdialogs.c:76
+#: src/gtkdialogs.c:77
 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"
+msgid "former lead developer"
+msgstr "former lead developer"
 
 #: src/gtkdialogs.c:79
+msgid "former maintainer"
+msgstr "former maintainer"
+
+#: src/gtkdialogs.c:80
 msgid "former Jabber developer"
 msgstr "former Jabber developer"
 
-#: src/gtkdialogs.c:80
+#: src/gtkdialogs.c:81
 msgid "original author"
 msgstr "original author"
 
-#: src/gtkdialogs.c:81
+#: src/gtkdialogs.c:82
 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"
+msgid "Bulgarian"
+msgstr "Bulgarian"
 
 #: src/gtkdialogs.c:88 src/gtkdialogs.c:125
+msgid "Catalan"
+msgstr "Catalan"
+
+#: src/gtkdialogs.c:89 src/gtkdialogs.c:126
 msgid "Czech"
 msgstr "Czech"
 
-#: src/gtkdialogs.c:89
-msgid "Danish"
-msgstr "Danish"
-
 #: src/gtkdialogs.c:90
+msgid "Danish"
+msgstr "Danish"
+
+#: src/gtkdialogs.c:91
 msgid "British English"
 msgstr "British English"
 
-#: src/gtkdialogs.c:91
+#: src/gtkdialogs.c:92
 msgid "Canadian English"
 msgstr "Canadian English"
 
-#: src/gtkdialogs.c:92 src/gtkdialogs.c:126
+#: src/gtkdialogs.c:93 src/gtkdialogs.c:127
 msgid "German"
 msgstr "German"
 
-#: src/gtkdialogs.c:93 src/gtkdialogs.c:127
+#: src/gtkdialogs.c:94 src/gtkdialogs.c:128
 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 "Finnish"
+msgstr "Finnish"
+
+#: src/gtkdialogs.c:96 src/gtkdialogs.c:130
 msgid "French"
 msgstr "French"
 
-#: src/gtkdialogs.c:96
+#: src/gtkdialogs.c:97
 msgid "Hebrew"
 msgstr "Hebrew"
 
-#: src/gtkdialogs.c:97
+#: src/gtkdialogs.c:98
 msgid "Hindi"
 msgstr "Hindi"
 
-#: src/gtkdialogs.c:98
+#: src/gtkdialogs.c:99
 msgid "Hungarian"
 msgstr "Hungarian"
 
-#: src/gtkdialogs.c:99 src/gtkdialogs.c:130
+#: src/gtkdialogs.c:100 src/gtkdialogs.c:131
 msgid "Italian"
 msgstr "Italian"
 
-#: src/gtkdialogs.c:100 src/gtkdialogs.c:131
+#: src/gtkdialogs.c:101 src/gtkdialogs.c:132
 msgid "Japanese"
 msgstr "Japanese"
 
-#: src/gtkdialogs.c:101
+#: src/gtkdialogs.c:102
 msgid "Lithuanian"
 msgstr "Lithuanian"
 
-#: src/gtkdialogs.c:102 src/gtkdialogs.c:132
+#: src/gtkdialogs.c:103 src/gtkdialogs.c:133
 msgid "Korean"
 msgstr "Korean"
 
-#: src/gtkdialogs.c:103
+#: src/gtkdialogs.c:104
 msgid "Dutch; Flemish"
 msgstr "Dutch; Flemish"
 
-#: src/gtkdialogs.c:104
+#: src/gtkdialogs.c:105
 msgid "Macedonian"
 msgstr "Macedonian"
 
-#: src/gtkdialogs.c:105
+#: src/gtkdialogs.c:106
 msgid "Norwegian"
 msgstr "Norwegian"
 
-#: src/gtkdialogs.c:106 src/gtkdialogs.c:133
+#: src/gtkdialogs.c:107 src/gtkdialogs.c:134
 msgid "Polish"
 msgstr "Polish"
 
-#: src/gtkdialogs.c:107
+#: src/gtkdialogs.c:108
 msgid "Portuguese"
 msgstr "Portuguese"
 
-#: src/gtkdialogs.c:108
+#: src/gtkdialogs.c:109
 msgid "Portuguese-Brazil"
 msgstr "Portuguese-Brazil"
 
-#: src/gtkdialogs.c:109
+#: src/gtkdialogs.c:110
 msgid "Romanian"
 msgstr "Romanian"
 
-#: src/gtkdialogs.c:110 src/gtkdialogs.c:134 src/gtkdialogs.c:135
+#: src/gtkdialogs.c:111 src/gtkdialogs.c:135 src/gtkdialogs.c:136
 msgid "Russian"
 msgstr "Russian"
 
-#: src/gtkdialogs.c:111
+#: src/gtkdialogs.c:112
 msgid "Serbian"
 msgstr "Serbian"
 
-#: src/gtkdialogs.c:112
+#: src/gtkdialogs.c:113
 msgid "Slovenian"
 msgstr "Slovenian"
 
-#: src/gtkdialogs.c:113 src/gtkdialogs.c:137
+#: src/gtkdialogs.c:114 src/gtkdialogs.c:138
 msgid "Swedish"
 msgstr "Swedish"
 
-#: src/gtkdialogs.c:114
+#: src/gtkdialogs.c:115
 msgid "Vietnamese"
 msgstr "Vietnamese"
 
-#: src/gtkdialogs.c:114
+#: src/gtkdialogs.c:115
 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 "Simplified Chinese"
+msgstr "Simplified Chinese"
+
+#: src/gtkdialogs.c:117
 msgid "Traditional Chinese"
 msgstr "Traditional Chinese"
 
-#: src/gtkdialogs.c:122
+#: src/gtkdialogs.c:123
 msgid "Amharic"
 msgstr "Amharic"
 
-#: src/gtkdialogs.c:136
+#: src/gtkdialogs.c:137
 msgid "Slovak"
 msgstr "Slovak"
 
-#: src/gtkdialogs.c:138
+#: src/gtkdialogs.c:139
 msgid "Chinese"
 msgstr "Chinese"
 
-#: src/gtkdialogs.c:180
+#: src/gtkdialogs.c:181
 msgid "About Gaim"
 msgstr "About Gaim"
 
-#: src/gtkdialogs.c:195
+#: src/gtkdialogs.c:196
 #, 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
+#: src/gtkdialogs.c:217
 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 "
@@ -3076,71 +3037,71 @@
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
 "at once.  It is written using Gtk+ and is licenced under the GPL.<BR><BR>"
 
-#: src/gtkdialogs.c:225
+#: src/gtkdialogs.c:226
 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
+#: src/gtkdialogs.c:231
 msgid "Active Developers"
 msgstr "Active Developers"
 
-#: src/gtkdialogs.c:245
+#: src/gtkdialogs.c:246
 msgid "Crazy Patch Writers"
 msgstr "Crazy Patch Writers"
 
-#: src/gtkdialogs.c:260
+#: src/gtkdialogs.c:261
 msgid "Retired Developers"
 msgstr "Retired Developers"
 
-#: src/gtkdialogs.c:275
+#: src/gtkdialogs.c:276
 msgid "Current Translators"
 msgstr "Current Translators"
 
-#: src/gtkdialogs.c:295
+#: src/gtkdialogs.c:296
 msgid "Past Translators"
 msgstr "Past Translators"
 
-#: src/gtkdialogs.c:366 src/gtkdialogs.c:508 src/gtkdialogs.c:560
+#: src/gtkdialogs.c:367 src/gtkdialogs.c:509 src/gtkdialogs.c:564
 msgid "_Screen name"
 msgstr "_Screen name"
 
-#: src/gtkdialogs.c:372 src/gtkdialogs.c:514 src/gtkdialogs.c:566
+#: src/gtkdialogs.c:373 src/gtkdialogs.c:515 src/gtkdialogs.c:570
 msgid "_Account"
 msgstr "_Account"
 
-#: src/gtkdialogs.c:379
+#: src/gtkdialogs.c:380
 msgid "New Instant Message"
 msgstr "New Instant Message"
 
-#: src/gtkdialogs.c:381
+#: src/gtkdialogs.c:382
 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:521
+#: src/gtkdialogs.c:522
 msgid "Get User Info"
 msgstr "Get User Info"
 
-#: src/gtkdialogs.c:523
+#: src/gtkdialogs.c:524
 msgid ""
 "Please enter the screen name of the person whose info you would like to view."
 msgstr ""
 "Please enter the screen name of the person whose info you would like to view."
 
-#: src/gtkdialogs.c:574
+#: src/gtkdialogs.c:578
 msgid "Get User Log"
 msgstr "Get User Log"
 
-#: src/gtkdialogs.c:576
+#: src/gtkdialogs.c:580
 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:616
+#: src/gtkdialogs.c:620
 msgid "Warn User"
 msgstr "Warn User"
 
-#: src/gtkdialogs.c:637
+#: src/gtkdialogs.c:641
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -3153,45 +3114,45 @@
 "This will increase %s's warning level and he or she will be subject to "
 "harsher rate limiting.\n"
 
-#: src/gtkdialogs.c:646
+#: src/gtkdialogs.c:650
 msgid "Warn _anonymously?"
 msgstr "Warn _anonymously?"
 
-#: src/gtkdialogs.c:653
+#: src/gtkdialogs.c:657
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>Anonymous warnings are less severe.</b>"
 
-#: src/gtkdialogs.c:674
+#: src/gtkdialogs.c:678
 msgid "Alias Contact"
 msgstr "Alias Contact"
 
-#: src/gtkdialogs.c:675
+#: src/gtkdialogs.c:679
 msgid "Enter an alias for this contact."
 msgstr "Enter an alias for this contact."
 
-#: src/gtkdialogs.c:677 src/gtkdialogs.c:699 src/gtkdialogs.c:719
+#: src/gtkdialogs.c:681 src/gtkdialogs.c:703 src/gtkdialogs.c:723
 #: src/gtkrequest.c:250 src/protocols/silc/chat.c:584
 msgid "Alias"
 msgstr "Alias"
 
-#: src/gtkdialogs.c:695
+#: src/gtkdialogs.c:699
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Enter an alias for %s."
 
-#: src/gtkdialogs.c:697
+#: src/gtkdialogs.c:701
 msgid "Alias Buddy"
 msgstr "Alias Buddy"
 
-#: src/gtkdialogs.c:716
+#: src/gtkdialogs.c:720
 msgid "Alias Chat"
 msgstr "Alias Chat"
 
-#: src/gtkdialogs.c:717
+#: src/gtkdialogs.c:721
 msgid "Enter an alias for this chat."
 msgstr "Enter an alias for this chat."
 
-#: src/gtkdialogs.c:751
+#: src/gtkdialogs.c:755
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
@@ -3200,11 +3161,7 @@
 "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:754 src/gtkdialogs.c:755
-msgid "Remove Contact"
-msgstr "Remove Contact"
-
-#: src/gtkdialogs.c:811
+#: src/gtkdialogs.c:815
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -3213,22 +3170,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:814 src/gtkdialogs.c:815
+#: src/gtkdialogs.c:818 src/gtkdialogs.c:819
 msgid "Remove Group"
 msgstr "Remove Group"
 
-#: src/gtkdialogs.c:853
+#: src/gtkdialogs.c:857
 #, 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:856 src/gtkdialogs.c:857
+#: src/gtkdialogs.c:860 src/gtkdialogs.c:861
 msgid "Remove Buddy"
 msgstr "Remove Buddy"
 
-#: src/gtkdialogs.c:873
+#: src/gtkdialogs.c:891
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -3237,7 +3194,7 @@
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 
-#: src/gtkdialogs.c:877 src/gtkdialogs.c:878
+#: src/gtkdialogs.c:895 src/gtkdialogs.c:896
 msgid "Remove Chat"
 msgstr "Remove Chat"
 
@@ -3252,7 +3209,7 @@
 
 #: src/gtkft.c:164 src/gtkft.c:929
 msgid "Canceled"
-msgstr "Canceled"
+msgstr "Cancelled"
 
 #: src/gtkft.c:167 src/gtkft.c:848
 msgid "Waiting for transfer to begin"
@@ -3320,7 +3277,7 @@
 
 #: src/gtkft.c:652
 msgid "_Keep the dialog open"
-msgstr "_Keep the dialog open"
+msgstr "_Keep the dialogue open"
 
 #: src/gtkft.c:662
 msgid "_Clear finished transfers"
@@ -3349,31 +3306,31 @@
 msgid "Failed"
 msgstr "Failed"
 
-#: src/gtkimhtml.c:602
+#: src/gtkimhtml.c:548
 msgid "Pa_ste As Text"
 msgstr "Pa_ste As Text"
 
-#: src/gtkimhtml.c:1047
+#: src/gtkimhtml.c:1031
 msgid "Hyperlink color"
 msgstr "Hyperlink colour"
 
-#: src/gtkimhtml.c:1048
+#: src/gtkimhtml.c:1032
 msgid "Color to draw hyperlinks."
 msgstr "Colour to draw hyperlinks."
 
-#: src/gtkimhtml.c:1253
+#: src/gtkimhtml.c:1248
 msgid "_Copy E-Mail Address"
 msgstr "_Copy E-Mail Address"
 
-#: src/gtkimhtml.c:1265
+#: src/gtkimhtml.c:1260
 msgid "_Copy Link Location"
 msgstr "_Copy Link Location"
 
-#: src/gtkimhtml.c:1275
+#: src/gtkimhtml.c:1270
 msgid "_Open Link in Browser"
 msgstr "_Open Link in Browser"
 
-#: src/gtkimhtml.c:2819
+#: src/gtkimhtml.c:2820
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
@@ -3381,40 +3338,40 @@
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
 
-#: src/gtkimhtml.c:2827
+#: src/gtkimhtml.c:2828
 #, c-format
 msgid "Error saving image: %s"
 msgstr "Error saving image: %s"
 
-#: src/gtkimhtml.c:2904 src/gtkimhtml.c:2916
+#: src/gtkimhtml.c:2905 src/gtkimhtml.c:2917
 msgid "Save Image"
 msgstr "Save Image"
 
-#: src/gtkimhtml.c:2944
+#: src/gtkimhtml.c:2945
 msgid "_Save Image..."
 msgstr "_Save Image..."
 
-#: src/gtkimhtmltoolbar.c:164
+#: src/gtkimhtmltoolbar.c:176
 msgid "Select Font"
 msgstr "Select Font"
 
-#: src/gtkimhtmltoolbar.c:239
+#: src/gtkimhtmltoolbar.c:253
 msgid "Select Text Color"
 msgstr "Select Text Colour"
 
-#: src/gtkimhtmltoolbar.c:312
+#: src/gtkimhtmltoolbar.c:326
 msgid "Select Background Color"
 msgstr "Select Background Colour"
 
-#: src/gtkimhtmltoolbar.c:395
+#: src/gtkimhtmltoolbar.c:409
 msgid "_URL"
 msgstr "_URL"
 
-#: src/gtkimhtmltoolbar.c:403
+#: src/gtkimhtmltoolbar.c:417
 msgid "_Description"
 msgstr "_Description"
 
-#: src/gtkimhtmltoolbar.c:406
+#: src/gtkimhtmltoolbar.c:420
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
@@ -3422,77 +3379,77 @@
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
 
-#: src/gtkimhtmltoolbar.c:410
+#: src/gtkimhtmltoolbar.c:424
 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:415
+#: src/gtkimhtmltoolbar.c:429
 msgid "Insert Link"
 msgstr "Insert Link"
 
-#: src/gtkimhtmltoolbar.c:419
+#: src/gtkimhtmltoolbar.c:433
 msgid "_Insert"
 msgstr "_Insert"
 
-#: src/gtkimhtmltoolbar.c:488
+#: src/gtkimhtmltoolbar.c:502
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Failed to store image: %s\n"
 
-#: src/gtkimhtmltoolbar.c:514 src/gtkimhtmltoolbar.c:524
+#: src/gtkimhtmltoolbar.c:528 src/gtkimhtmltoolbar.c:538
 msgid "Insert Image"
 msgstr "Insert Image"
 
-#: src/gtkimhtmltoolbar.c:662
+#: src/gtkimhtmltoolbar.c:676
 msgid "This theme has no available smileys."
 msgstr "This theme has no available smileys."
 
 #. show everything
-#: src/gtkimhtmltoolbar.c:677
+#: src/gtkimhtmltoolbar.c:691
 msgid "Smile!"
 msgstr "Smile!"
 
-#: src/gtkimhtmltoolbar.c:895
+#: src/gtkimhtmltoolbar.c:894
 msgid "Bold"
 msgstr "Bold"
 
-#: src/gtkimhtmltoolbar.c:906
+#: src/gtkimhtmltoolbar.c:905
 msgid "Italic"
 msgstr "Italic"
 
-#: src/gtkimhtmltoolbar.c:917
+#: src/gtkimhtmltoolbar.c:916
 msgid "Underline"
 msgstr "Underline"
 
-#: src/gtkimhtmltoolbar.c:933
+#: src/gtkimhtmltoolbar.c:932
 msgid "Larger font size"
 msgstr "Larger font size"
 
-#: src/gtkimhtmltoolbar.c:945
+#: src/gtkimhtmltoolbar.c:944
 msgid "Smaller font size"
 msgstr "Smaller font size"
 
-#: src/gtkimhtmltoolbar.c:962
+#: src/gtkimhtmltoolbar.c:961
 msgid "Font Face"
 msgstr "Font Face"
 
-#: src/gtkimhtmltoolbar.c:974
+#: src/gtkimhtmltoolbar.c:973
 msgid "Foreground font color"
 msgstr "Foreground font colour"
 
-#: src/gtkimhtmltoolbar.c:986
+#: src/gtkimhtmltoolbar.c:985
 msgid "Background color"
 msgstr "Background colour"
 
-#: src/gtkimhtmltoolbar.c:1001
+#: src/gtkimhtmltoolbar.c:1000
 msgid "Insert link"
 msgstr "Insert link"
 
-#: src/gtkimhtmltoolbar.c:1011
+#: src/gtkimhtmltoolbar.c:1010
 msgid "Insert image"
 msgstr "Insert image"
 
-#: src/gtkimhtmltoolbar.c:1022
+#: src/gtkimhtmltoolbar.c:1021
 msgid "Insert smiley"
 msgstr "Insert smiley"
 
@@ -3552,7 +3509,7 @@
 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
+#: src/gtknotify.c:581
 msgid "Unable to open URL"
 msgstr "Unable to open URL"
 
@@ -3561,7 +3518,7 @@
 msgid "Error launching <b>%s</b>: %s"
 msgstr "Error launching <b>%s</b>: %s"
 
-#: src/gtknotify.c:577
+#: src/gtknotify.c:582
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
@@ -3576,159 +3533,159 @@
 msgstr "Please enter a buddy to pounce."
 
 #. "New Buddy Pounce"
-#: src/gtkpounce.c:387 src/gtkpounce.c:889
+#: src/gtkpounce.c:391 src/gtkpounce.c:894
 msgid "New Buddy Pounce"
 msgstr "New Buddy Pounce"
 
-#: src/gtkpounce.c:387
+#: src/gtkpounce.c:391
 msgid "Edit Buddy Pounce"
 msgstr "Edit Buddy Pounce"
 
 #. Create the "Pounce Who" frame.
-#: src/gtkpounce.c:404
+#: src/gtkpounce.c:408
 msgid "Pounce Who"
 msgstr "Pounce Who"
 
-#: src/gtkpounce.c:431
+#: src/gtkpounce.c:435
 msgid "_Buddy name:"
 msgstr "_Buddy name:"
 
 #. Create the "Pounce When" frame.
-#: src/gtkpounce.c:455
+#: src/gtkpounce.c:459
 msgid "Pounce When"
 msgstr "Pounce When"
 
-#: src/gtkpounce.c:463
+#: src/gtkpounce.c:467
 msgid "Si_gn on"
 msgstr "Si_gn on"
 
-#: src/gtkpounce.c:465
-msgid "Sign _off"
-msgstr "Sign _off"
-
-#: src/gtkpounce.c:467
-msgid "A_way"
-msgstr "A_way"
-
 #: src/gtkpounce.c:469
-msgid "_Return from away"
-msgstr "_Return from away"
+msgid "Sign _off"
+msgstr "Sign _off"
 
 #: src/gtkpounce.c:471
-msgid "_Idle"
-msgstr "_Idle"
+msgid "A_way"
+msgstr "A_way"
 
 #: src/gtkpounce.c:473
-msgid "Retur_n from idle"
-msgstr "Retur_n from idle"
+msgid "_Return from away"
+msgstr "_Return from away"
 
 #: src/gtkpounce.c:475
+msgid "_Idle"
+msgstr "_Idle"
+
+#: src/gtkpounce.c:477
+msgid "Retur_n from idle"
+msgstr "Retur_n from idle"
+
+#: src/gtkpounce.c:479
 msgid "Buddy starts _typing"
 msgstr "Buddy starts _typing"
 
-#: src/gtkpounce.c:477
+#: src/gtkpounce.c:481
 msgid "Buddy stops t_yping"
 msgstr "Buddy stops t_yping"
 
 #. Create the "Pounce Action" frame.
-#: src/gtkpounce.c:506
+#: src/gtkpounce.c:510
 msgid "Pounce Action"
 msgstr "Pounce Action"
 
-#: src/gtkpounce.c:514
+#: src/gtkpounce.c:518
 msgid "Op_en an IM window"
 msgstr "Op_en an IM window"
 
-#: src/gtkpounce.c:516
+#: src/gtkpounce.c:520
 msgid "_Popup notification"
 msgstr "_Popup notification"
 
-#: src/gtkpounce.c:518
+#: src/gtkpounce.c:522
 msgid "Send a _message"
 msgstr "Send a _message"
 
-#: src/gtkpounce.c:520
+#: src/gtkpounce.c:524
 msgid "E_xecute a command"
 msgstr "E_xecute a command"
 
-#: src/gtkpounce.c:522
+#: src/gtkpounce.c:526
 msgid "P_lay a sound"
 msgstr "P_lay a sound"
 
-#: src/gtkpounce.c:526
+#: src/gtkpounce.c:530
 msgid "B_rowse..."
 msgstr "B_rowse..."
 
-#: src/gtkpounce.c:528
+#: src/gtkpounce.c:532
 msgid "Bro_wse..."
 msgstr "Bro_wse..."
 
-#: src/gtkpounce.c:529
+#: src/gtkpounce.c:533
 msgid "Pre_view"
 msgstr "Pre_view"
 
-#: src/gtkpounce.c:612
+#: src/gtkpounce.c:616
 msgid "Sav_e this pounce after activation"
 msgstr "Sav_e this pounce after activation"
 
 #. "Remove Buddy Pounce"
-#: src/gtkpounce.c:896
+#: src/gtkpounce.c:901
 msgid "Remove Buddy Pounce"
 msgstr "Remove Buddy Pounce"
 
-#: src/gtkpounce.c:954
+#: src/gtkpounce.c:959
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s has started typing to you (%s)"
 
-#: src/gtkpounce.c:956
+#: src/gtkpounce.c:961
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s has signed on (%s)"
 
-#: src/gtkpounce.c:958
+#: src/gtkpounce.c:963
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s has returned from being idle (%s)"
 
-#: src/gtkpounce.c:960
+#: src/gtkpounce.c:965
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s has returned from being away (%s)"
 
-#: src/gtkpounce.c:962
+#: src/gtkpounce.c:967
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s has stopped typing to you (%s)"
 
-#: src/gtkpounce.c:964
+#: src/gtkpounce.c:969
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s has signed off (%s)"
 
-#: src/gtkpounce.c:966
+#: src/gtkpounce.c:971
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s has become idle (%s)"
 
-#: src/gtkpounce.c:968
+#: src/gtkpounce.c:973
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s has gone away. (%s)"
 
-#: src/gtkpounce.c:969
+#: src/gtkpounce.c:974
 msgid "Unknown pounce event. Please report this!"
 msgstr "Unknown pounce event. Please report this!"
 
-#: src/gtkprefs.c:447
+#: src/gtkprefs.c:415
 msgid "Interface Options"
 msgstr "Interface Options"
 
-#: src/gtkprefs.c:449
+#: src/gtkprefs.c:417
 msgid "D_isplay remote nicknames if no alias is set"
 msgstr "D_isplay remote nicknames if no alias is set"
 
-#: src/gtkprefs.c:678
+#: src/gtkprefs.c:646
 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."
@@ -3736,48 +3693,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:718
+#: src/gtkprefs.c:686
 msgid "Icon"
 msgstr "Icon"
 
-#: 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
+#: src/gtkprefs.c:693 src/gtkprefs.c:2142 src/protocols/jabber/buddy.c:266
+#: src/protocols/jabber/buddy.c:750 src/protocols/jabber/chat.c:761
 msgid "Description"
 msgstr "Description"
 
-#: src/gtkprefs.c:821
+#: src/gtkprefs.c:789
 msgid "Display"
 msgstr "Display"
 
-#: src/gtkprefs.c:822
+#: src/gtkprefs.c:790
 msgid "Show _timestamp on messages"
 msgstr "Show _timestamp on messages"
 
-#: src/gtkprefs.c:825
+#: src/gtkprefs.c:793
 msgid "_Highlight misspelled words"
 msgstr "_Highlight misspelled words"
 
-#: src/gtkprefs.c:829
+#: src/gtkprefs.c:797
 msgid "Ignore c_olors"
 msgstr "Ignore c_olours"
 
-#: src/gtkprefs.c:831
+#: src/gtkprefs.c:799
 msgid "Ignore font _faces"
 msgstr "Ignore font _faces"
 
-#: src/gtkprefs.c:833
+#: src/gtkprefs.c:801
 msgid "Ignore font si_zes"
 msgstr "Ignore font si_zes"
 
-#: src/gtkprefs.c:836
+#: src/gtkprefs.c:804
 msgid "Default Formatting"
 msgstr "Default Formatting"
 
+#: src/gtkprefs.c:806
+msgid "_Send default formatting with outgoing messages"
+msgstr "_Send default formatting with outgoing messages"
+
 #: src/gtkprefs.c:838
-msgid "_Send default formatting with outgoing messages"
-msgstr "_Send default formatting with outgoing messages"
-
-#: src/gtkprefs.c:870
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting. :)"
@@ -3785,273 +3742,237 @@
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting. :)"
 
-#: src/gtkprefs.c:873
+#: src/gtkprefs.c:841
 msgid "_Clear Formatting"
 msgstr "_Clear Formatting"
 
-#: 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:916
+#: src/gtkprefs.c:878
 msgid "Window Closing"
 msgstr "Window Closing"
 
-#: src/gtkprefs.c:917
+#: src/gtkprefs.c:879
 msgid "_Escape closes window"
 msgstr "_Escape closes window"
 
-#: src/gtkprefs.c:920
-msgid "Insertions"
-msgstr "Insertions"
-
-#: src/gtkprefs.c:921
-msgid "Control-{B/I/U} changes _formatting"
-msgstr "Control-{B/I/U} changes _formatting"
-
-#: src/gtkprefs.c:923
-msgid "Control-(number) _inserts smileys"
-msgstr "Control-(number) _inserts smileys"
-
-#: src/gtkprefs.c:939
+#: src/gtkprefs.c:895
 msgid "Buddy List Sorting"
 msgstr "Buddy List Sorting"
 
-#: src/gtkprefs.c:948
+#: src/gtkprefs.c:904
 msgid "_Sorting:"
 msgstr "_Sorting:"
 
-#: src/gtkprefs.c:954 src/gtkprefs.c:1006
+#: src/gtkprefs.c:909
+msgid "Buddy Display"
+msgstr "Buddy Display"
+
+#: src/gtkprefs.c:910 src/gtkprefs.c:970
+msgid "Show buddy _icons"
+msgstr "Show buddy _icons"
+
+#: src/gtkprefs.c:912
+msgid "Show _warning levels"
+msgstr "Show _warning levels"
+
+#: src/gtkprefs.c:914
+msgid "Show idle _times"
+msgstr "Show idle _times"
+
+#: src/gtkprefs.c:916
+msgid "_Automatically expand contacts"
+msgstr "_Automatically expand contacts"
+
+#: src/gtkprefs.c:949
 msgid "Show _buttons as:"
 msgstr "Show _buttons as:"
 
-#: src/gtkprefs.c:956 src/gtkprefs.c:1008
+#: src/gtkprefs.c:951
 msgid "Pictures"
 msgstr "Pictures"
 
-#: src/gtkprefs.c:957 src/gtkprefs.c:1009
+#: src/gtkprefs.c:952
 msgid "Text"
 msgstr "Text"
 
-#: src/gtkprefs.c:958 src/gtkprefs.c:1010
+#: src/gtkprefs.c:953
 msgid "Pictures and text"
 msgstr "Pictures and text"
 
-#: src/gtkprefs.c:961
-msgid "_Raise window on events"
-msgstr "_Raise window on events"
-
-#: 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:969
-msgid "Show idle _times"
-msgstr "Show idle _times"
-
-#: src/gtkprefs.c:971
-msgid "Dim i_dle buddies"
-msgstr "Dim i_dle buddies"
-
-#: src/gtkprefs.c:973
-msgid "_Automatically expand contacts"
-msgstr "_Automatically expand contacts"
-
-#: src/gtkprefs.c:1017
+#: src/gtkprefs.c:960
 msgid "Enable \"_slash\" commands"
 msgstr "Enable \"_slash\" commands"
 
-#: src/gtkprefs.c:1020
+#: src/gtkprefs.c:963
 msgid "Send unknown \"_slash\" commands as messages"
 msgstr "Send unknown \"_slash\" commands as messages"
 
-#: src/gtkprefs.c:1023
+#: src/gtkprefs.c:966
 msgid "Show _formatting toolbar"
 msgstr "Show _formatting toolbar"
 
-#: src/gtkprefs.c:1025
+#: src/gtkprefs.c:968
 msgid "Show _aliases in tabs/titles"
 msgstr "Show _aliases in tabs/titles"
 
-#: src/gtkprefs.c:1029
+#: src/gtkprefs.c:972
 msgid "Enable buddy ic_on animation"
 msgstr "Enable buddy ic_on animation"
 
-#: src/gtkprefs.c:1031
+#: src/gtkprefs.c:974
 msgid "_Notify buddies that you are typing to them"
 msgstr "_Notify buddies that you are typing to them"
 
-#: src/gtkprefs.c:1033
+#: src/gtkprefs.c:976
 msgid "_Raise IM window on events"
 msgstr "_Raise IM window on events"
 
-#: src/gtkprefs.c:1036
+#: src/gtkprefs.c:979
 msgid "Raise chat _window on events"
 msgstr "Raise chat _window on events"
 
-#: 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:1042
+#: src/gtkprefs.c:983
 msgid "Tab Options"
 msgstr "Tab Options"
 
-#: src/gtkprefs.c:1044
+#: src/gtkprefs.c:985
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Show IMs and chats in _tabbed windows"
 
-#: src/gtkprefs.c:1059
-msgid "Show _close button on tabs"
-msgstr "Show _close button on tabs"
-
-#: src/gtkprefs.c:1062
+#: src/gtkprefs.c:999
+msgid "Show close b_utton on tabs"
+msgstr "Show close b_utton on tabs"
+
+#: src/gtkprefs.c:1002
 msgid "Tab p_lacement:"
 msgstr "Tab p_lacement:"
 
-#: src/gtkprefs.c:1064
+#: src/gtkprefs.c:1004
 msgid "Top"
 msgstr "Top"
 
-#: src/gtkprefs.c:1065
+#: src/gtkprefs.c:1005
 msgid "Bottom"
 msgstr "Bottom"
 
-#: src/gtkprefs.c:1066
+#: src/gtkprefs.c:1006
 msgid "Left"
 msgstr "Left"
 
-#: src/gtkprefs.c:1067
+#: src/gtkprefs.c:1007
 msgid "Right"
 msgstr "Right"
 
-#: src/gtkprefs.c:1073
+#: src/gtkprefs.c:1013
 msgid "New conversation _placement:"
 msgstr "New conversation _placement:"
 
-#: src/gtkprefs.c:1124 src/protocols/oscar/oscar.c:712
-#: src/protocols/oscar/oscar.c:4974
+#: src/gtkprefs.c:1064 src/protocols/oscar/oscar.c:749
+#: src/protocols/oscar/oscar.c:5041
 msgid "IP Address"
 msgstr "IP Address"
 
-#: src/gtkprefs.c:1126
+#: src/gtkprefs.c:1066
 msgid "_Autodetect IP Address"
 msgstr "_Autodetect IP Address"
 
-#: src/gtkprefs.c:1135
+#: src/gtkprefs.c:1075
 msgid "Public _IP:"
 msgstr "Public _IP:"
 
-#: src/gtkprefs.c:1159
+#: src/gtkprefs.c:1099
 msgid "Ports"
 msgstr "Ports"
 
-#: src/gtkprefs.c:1162
+#: src/gtkprefs.c:1102
 msgid "_Manually specify range of ports to listen on"
 msgstr "_Manually specify range of ports to listen on"
 
-#: src/gtkprefs.c:1165
+#: src/gtkprefs.c:1105
 msgid "_Start Port:"
 msgstr "_Start Port:"
 
-#: src/gtkprefs.c:1172
+#: src/gtkprefs.c:1112
 msgid "_End Port:"
 msgstr "_End Port:"
 
-#: src/gtkprefs.c:1179
+#: src/gtkprefs.c:1119
 msgid "Proxy Server"
 msgstr "Proxy Server"
 
-#: src/gtkprefs.c:1183
+#: src/gtkprefs.c:1123
 msgid "No proxy"
 msgstr "No proxy"
 
+#: src/gtkprefs.c:1185
+msgid "_User:"
+msgstr "_User:"
+
+#: src/gtkprefs.c:1241
+msgid "Epiphany"
+msgstr "Epiphany"
+
+#: src/gtkprefs.c:1242
+msgid "Firebird"
+msgstr "Firebird"
+
+#: src/gtkprefs.c:1243
+msgid "Firefox"
+msgstr "Firefox"
+
+#: src/gtkprefs.c:1244
+msgid "Galeon"
+msgstr "Galeon"
+
 #: src/gtkprefs.c:1245
-msgid "_User:"
-msgstr "_User:"
-
-#: 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
+#: src/gtkprefs.c:1246
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/gtkprefs.c:1307
+#: src/gtkprefs.c:1247
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: src/gtkprefs.c:1308
+#: src/gtkprefs.c:1248
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/gtkprefs.c:1309
+#: src/gtkprefs.c:1249
 msgid "Opera"
 msgstr "Opera"
 
-#: src/gtkprefs.c:1318
+#: src/gtkprefs.c:1258
 msgid "Manual"
 msgstr "Manual"
 
-#: src/gtkprefs.c:1369
+#: src/gtkprefs.c:1309
 msgid "Browser Selection"
 msgstr "Browser Selection"
 
-#: src/gtkprefs.c:1373
+#: src/gtkprefs.c:1313
 msgid "_Browser:"
 msgstr "_Browser:"
 
-#: src/gtkprefs.c:1380
+#: src/gtkprefs.c:1320
 msgid "_Open link in:"
 msgstr "_Open link in:"
 
-#: src/gtkprefs.c:1382
+#: src/gtkprefs.c:1322
 msgid "Browser default"
 msgstr "Browser default"
 
-#: src/gtkprefs.c:1383
+#: src/gtkprefs.c:1323
 msgid "Existing window"
 msgstr "Existing window"
 
-#: src/gtkprefs.c:1385
+#: src/gtkprefs.c:1325
 msgid "New tab"
 msgstr "New tab"
 
-#: src/gtkprefs.c:1399
+#: src/gtkprefs.c:1339
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -4060,83 +3981,75 @@
 "_Manual:\n"
 "(%s for URL)"
 
-#: src/gtkprefs.c:1436
+#: src/gtkprefs.c:1376
 msgid "Message Logs"
 msgstr "Message Logs"
 
-#: src/gtkprefs.c:1439
+#: src/gtkprefs.c:1379
 msgid "Log _Format:"
 msgstr "Log _Format:"
 
-#: src/gtkprefs.c:1442
+#: src/gtkprefs.c:1382
 msgid "_Log all instant messages"
 msgstr "_Log all instant messages"
 
-#: src/gtkprefs.c:1444
+#: src/gtkprefs.c:1384
 msgid "Log all c_hats"
 msgstr "Log all c_hats"
 
-#: src/gtkprefs.c:1447
+#: src/gtkprefs.c:1387
 msgid "System Logs"
 msgstr "System Logs"
 
-#: src/gtkprefs.c:1449
+#: src/gtkprefs.c:1389
 msgid "_Enable system log"
 msgstr "_Enable system log"
 
-#: src/gtkprefs.c:1452
+#: src/gtkprefs.c:1392
 msgid "Log when buddies _sign on/sign off"
 msgstr "Log when buddies _sign on/sign off"
 
-#: src/gtkprefs.c:1458
+#: src/gtkprefs.c:1398
 msgid "Log when buddies become _idle/un-idle"
 msgstr "Log when buddies become _idle/un-idle"
 
-#: src/gtkprefs.c:1464
+#: src/gtkprefs.c:1404
 msgid "Log when buddies go away/come _back"
 msgstr "Log when buddies go away/come _back"
 
-#: src/gtkprefs.c:1470
+#: src/gtkprefs.c:1410
 msgid "Log your _own signons/idleness/awayness"
 msgstr "Log your _own signons/idleness/awayness"
 
-#: src/gtkprefs.c:1596
+#: src/gtkprefs.c:1546
 msgid "Sound Selection"
 msgstr "Sound Selection"
 
-#: src/gtkprefs.c:1647
-msgid "Sound Options"
-msgstr "Sound Options"
-
-#: src/gtkprefs.c:1648
-msgid "Sounds when conversation has _focus"
-msgstr "Sounds when conversation has _focus"
-
-#: src/gtkprefs.c:1650
-msgid "_Sounds while away"
-msgstr "_Sounds while away"
-
-#: src/gtkprefs.c:1654
+#: src/gtkprefs.c:1598
 msgid "Sound Method"
 msgstr "Sound Method"
 
-#: src/gtkprefs.c:1655
+#: src/gtkprefs.c:1599
 msgid "_Method:"
 msgstr "_Method:"
 
-#: src/gtkprefs.c:1657
+#: src/gtkprefs.c:1601
 msgid "Console beep"
 msgstr "Console beep"
 
-#: src/gtkprefs.c:1659
+#: src/gtkprefs.c:1603
 msgid "Automatic"
 msgstr "Automatic"
 
-#: src/gtkprefs.c:1666
+#: src/gtkprefs.c:1610
 msgid "Command"
 msgstr "Command"
 
-#: src/gtkprefs.c:1674
+#: src/gtkprefs.c:1611
+msgid "No sounds"
+msgstr "No sounds"
+
+#: src/gtkprefs.c:1619
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -4145,90 +4058,102 @@
 "Sound c_ommand:\n"
 "(%s for filename)"
 
-#: src/gtkprefs.c:1701
+#: src/gtkprefs.c:1646
+msgid "Sound Options"
+msgstr "Sound Options"
+
+#: src/gtkprefs.c:1647
+msgid "Sounds when conversation has _focus"
+msgstr "Sounds when conversation has _focus"
+
+#: src/gtkprefs.c:1649
+msgid "_Sounds while away"
+msgstr "_Sounds while away"
+
+#: src/gtkprefs.c:1659
 msgid "Sound Events"
 msgstr "Sound Events"
 
-#: src/gtkprefs.c:1752
+#: src/gtkprefs.c:1710
 msgid "Play"
 msgstr "Play"
 
-#: src/gtkprefs.c:1759
+#: src/gtkprefs.c:1717
 msgid "Event"
 msgstr "Event"
 
-#: src/gtkprefs.c:1778
+#: src/gtkprefs.c:1736
 msgid "Test"
 msgstr "Test"
 
-#: src/gtkprefs.c:1782
+#: src/gtkprefs.c:1740
 msgid "Reset"
 msgstr "Reset"
 
-#: src/gtkprefs.c:1786
+#: src/gtkprefs.c:1744
 msgid "Choose..."
 msgstr "Choose..."
 
-#: src/gtkprefs.c:1810
+#: src/gtkprefs.c:1775
 msgid "_Queue new messages when away"
 msgstr "_Queue new messages when away"
 
-#: src/gtkprefs.c:1813
+#: src/gtkprefs.c:1778
 msgid "_Auto-reply:"
 msgstr "_Auto-reply:"
 
-#: src/gtkprefs.c:1815
+#: src/gtkprefs.c:1780
 msgid "Never"
 msgstr "Never"
 
-#: src/gtkprefs.c:1816
+#: src/gtkprefs.c:1781
 msgid "When away"
 msgstr "When away"
 
-#: src/gtkprefs.c:1817
+#: src/gtkprefs.c:1782
 msgid "When away and idle"
 msgstr "When away and idle"
 
-#: src/gtkprefs.c:1820 src/protocols/msn/msn.c:1180
-#: 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
+#: src/gtkprefs.c:1785 src/protocols/msn/msn.c:502
+#: src/protocols/msn/msn.c:1321 src/protocols/msn/state.c:32
+#: src/protocols/novell/novell.c:2813 src/protocols/oscar/oscar.c:4188
+#: src/protocols/yahoo/yahoo.c:2637 src/protocols/yahoo/yahoo_profile.c:665
 msgid "Idle"
 msgstr "Idle"
 
-#: src/gtkprefs.c:1821
+#: src/gtkprefs.c:1786
 msgid "Idle _time reporting:"
 msgstr "Idle _time reporting:"
 
-#: src/gtkprefs.c:1824
+#: src/gtkprefs.c:1789
 msgid "Gaim usage"
 msgstr "Gaim usage"
 
-#: src/gtkprefs.c:1827
+#: src/gtkprefs.c:1792
 msgid "X usage"
 msgstr "X usage"
 
-#: src/gtkprefs.c:1829
+#: src/gtkprefs.c:1794
 msgid "Windows usage"
 msgstr "Windows usage"
 
-#: src/gtkprefs.c:1837
+#: src/gtkprefs.c:1802
 msgid "Auto-away"
 msgstr "Auto-away"
 
-#: src/gtkprefs.c:1838
+#: src/gtkprefs.c:1803
 msgid "Set away _when idle"
 msgstr "Set away _when idle"
 
-#: src/gtkprefs.c:1842
+#: src/gtkprefs.c:1807
 msgid "_Minutes before setting away:"
 msgstr "_Minutes before setting away:"
 
-#: src/gtkprefs.c:1850
+#: src/gtkprefs.c:1815
 msgid "Away m_essage:"
 msgstr "Away m_essage:"
 
-#: src/gtkprefs.c:1919
+#: src/gtkprefs.c:1884
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4243,7 +4168,7 @@
 "<span weight=\"bold\">Web site:</span>\t\t%s\n"
 "<span weight=\"bold\">File name:</span>\t%s"
 
-#: src/gtkprefs.c:1924
+#: src/gtkprefs.c:1889
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4258,64 +4183,55 @@
 "<span weight=\"bold\">URL:</span>  %s\n"
 "<span weight=\"bold\">File name:</span>  %s"
 
-#: src/gtkprefs.c:2157
+#: src/gtkprefs.c:2098
 msgid "Load"
 msgstr "Load"
 
-#: src/gtkprefs.c:2171
+#: src/gtkprefs.c:2112
 msgid "Summary"
 msgstr "Summary"
 
-#: src/gtkprefs.c:2219
+#: src/gtkprefs.c:2160
 msgid "Details"
 msgstr "Details"
 
-#: src/gtkprefs.c:2379
-msgid "_Edit"
-msgstr "_Edit"
-
-#: src/gtkprefs.c:2415
+#: src/gtkprefs.c:2289
 msgid "Interface"
 msgstr "Interface"
 
-#: src/gtkprefs.c:2418
+#: src/gtkprefs.c:2292
 msgid "Message Text"
 msgstr "Message Text"
 
-#: src/gtkprefs.c:2419
+#: src/gtkprefs.c:2293
 msgid "Shortcuts"
 msgstr "Shortcuts"
 
-#: src/gtkprefs.c:2420
+#: src/gtkprefs.c:2294
 msgid "Smiley Themes"
 msgstr "Smiley Themes"
 
-#: src/gtkprefs.c:2421
+#: src/gtkprefs.c:2295
 msgid "Sounds"
 msgstr "Sounds"
 
-#: src/gtkprefs.c:2422
+#: src/gtkprefs.c:2296
 msgid "Network"
 msgstr "Network"
 
-#. We use the registered default browser in windows
-#: src/gtkprefs.c:2425
+#: src/gtkprefs.c:2301
 msgid "Browser"
 msgstr "Browser"
 
-#: src/gtkprefs.c:2427
+#: src/gtkprefs.c:2304
 msgid "Logging"
 msgstr "Logging"
 
-#: src/gtkprefs.c:2428
+#: src/gtkprefs.c:2305
 msgid "Away / Idle"
 msgstr "Away / Idle"
 
-#: src/gtkprefs.c:2429
-msgid "Away Messages"
-msgstr "Away Messages"
-
-#: src/gtkprefs.c:2432
+#: src/gtkprefs.c:2308
 msgid "Plugins"
 msgstr "Plugins"
 
@@ -4339,7 +4255,7 @@
 msgid "Block only the users below"
 msgstr "Block only the users below"
 
-#: src/gtkprivacy.c:386 src/protocols/jabber/jabber.c:1466
+#: src/gtkprivacy.c:386 src/protocols/jabber/jabber.c:1495
 msgid "Privacy"
 msgstr "Privacy"
 
@@ -4403,15 +4319,15 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:240 src/protocols/gg/gg.c:949
-#: src/protocols/novell/novell.c:1890 src/protocols/silc/buddy.c:307
-#: src/protocols/silc/pk.c:116 src/request.h:1234
+#: src/gtkrequest.c:240 src/protocols/gg/gg.c:1012 src/protocols/msn/msn.c:509
+#: src/protocols/novell/novell.c:1899 src/protocols/silc/buddy.c:307
+#: src/protocols/silc/pk.c:117 src/request.h:1236
 msgid "Yes"
 msgstr "Yes"
 
-#: 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
+#: src/gtkrequest.c:241 src/protocols/gg/gg.c:1012 src/protocols/msn/msn.c:509
+#: src/protocols/novell/novell.c:1900 src/protocols/silc/buddy.c:308
+#: src/protocols/silc/pk.c:118 src/request.h:1236
 msgid "No"
 msgstr "No"
 
@@ -4419,24 +4335,24 @@
 msgid "Apply"
 msgstr "Apply"
 
-#: src/gtkrequest.c:245 src/protocols/msn/msn.c:314
+#: src/gtkrequest.c:245 src/protocols/msn/msn.c:318
 #: src/protocols/silc/util.c:332
 msgid "Close"
 msgstr "Close"
 
-#: src/gtkrequest.c:1392
+#: src/gtkrequest.c:1398
 msgid "That file already exists"
 msgstr "That file already exists"
 
-#: src/gtkrequest.c:1393
+#: src/gtkrequest.c:1399
 msgid "Would you like to overwrite it?"
 msgstr "Would you like to overwrite it?"
 
-#: src/gtkrequest.c:1431 src/gtkrequest.c:1452
+#: src/gtkrequest.c:1437 src/gtkrequest.c:1458
 msgid "Save File..."
 msgstr "Save File..."
 
-#: src/gtkrequest.c:1432 src/gtkrequest.c:1453
+#: src/gtkrequest.c:1438 src/gtkrequest.c:1459
 msgid "Open File..."
 msgstr "Open File..."
 
@@ -4449,52 +4365,52 @@
 msgid "_Get List"
 msgstr "_Get List"
 
-#: src/gtksound.c:63
+#: src/gtksound.c:62
 msgid "Buddy logs in"
 msgstr "Buddy logs in"
 
-#: src/gtksound.c:64
+#: src/gtksound.c:63
 msgid "Buddy logs out"
 msgstr "Buddy logs out"
 
+#: src/gtksound.c:64
+msgid "Message received"
+msgstr "Message received"
+
 #: src/gtksound.c:65
-msgid "Message received"
-msgstr "Message received"
+msgid "Message received begins conversation"
+msgstr "Message received begins conversation"
 
 #: src/gtksound.c:66
-msgid "Message received begins conversation"
-msgstr "Message received begins conversation"
+msgid "Message sent"
+msgstr "Message sent"
 
 #: src/gtksound.c:67
-msgid "Message sent"
-msgstr "Message sent"
+msgid "Person enters chat"
+msgstr "Person enters chat"
 
 #: src/gtksound.c:68
-msgid "Person enters chat"
-msgstr "Person enters chat"
+msgid "Person leaves chat"
+msgstr "Person leaves chat"
 
 #: src/gtksound.c:69
-msgid "Person leaves chat"
-msgstr "Person leaves chat"
-
-#: src/gtksound.c:70
 msgid "You talk in chat"
 msgstr "You talk in chat"
 
-#: src/gtksound.c:71
+#: src/gtksound.c:70
 msgid "Others talk in chat"
 msgstr "Others talk in chat"
 
-#: src/gtksound.c:74
+#: src/gtksound.c:73
 msgid "Someone says your name in chat"
 msgstr "Someone says your name in chat"
 
-#: src/gtksound.c:158
+#: src/gtksound.c:177
 #, 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:174
+#: src/gtksound.c:193
 msgid ""
 "Unable to play sound because the 'Command' sound method has been chosen, but "
 "no command has been set."
@@ -4502,7 +4418,7 @@
 "Unable to play sound because the 'Command' sound method has been chosen, but "
 "no command has been set."
 
-#: src/gtksound.c:186
+#: src/gtksound.c:205
 #, c-format
 msgid ""
 "Unable to play sound because the configured sound command could not be "
@@ -4511,15 +4427,15 @@
 "Unable to play sound because the configured sound command could not be "
 "launched: %s"
 
-#: src/log.c:106
+#: src/log.c:109
 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:545
+#: src/log.c:533
 msgid "XML"
 msgstr "XML"
 
-#: src/log.c:604
+#: src/log.c:596
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4528,7 +4444,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
 
-#: src/log.c:606
+#: src/log.c:598
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4537,25 +4453,25 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
 
-#: src/log.c:657 src/log.c:787
+#: src/log.c:649 src/log.c:779
 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:667 src/log.c:799
+#: src/log.c:659 src/log.c:791
 #, 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:671
+#: src/log.c:663
 msgid "HTML"
 msgstr "HTML"
 
-#: src/log.c:732
+#: src/log.c:724
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
-#: src/log.c:803
+#: src/log.c:795
 msgid "Plain text"
 msgstr "Plain text"
 
@@ -4577,19 +4493,18 @@
 
 #. And now for the buttons
 #: src/main.c:279
-msgid "_Accounts"
-msgstr "_Accounts"
+msgid "A_ccounts"
+msgstr "A_ccounts"
 
 #: src/main.c:285
-msgid "_Preferences"
-msgstr "_Preferences"
+msgid "P_references"
+msgstr "P_references"
 
 #: src/main.c:291
 msgid "_Sign on"
 msgstr "_Sign on"
 
-#. full help text
-#: src/main.c:517
+#: src/main.c:513
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -4623,16 +4538,16 @@
 "  -h, --help          display this help and exit\n"
 
 #. short message
-#: src/main.c:532
+#: src/main.c:528
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr "Gaim %s. Try `%s -h' for more information.\n"
 
-#: src/main.c:845
+#: src/main.c:841
 msgid "Unable to load preferences"
 msgstr "Unable to load preferences"
 
-#: src/main.c:845
+#: src/main.c:841
 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 "
@@ -4642,7 +4557,7 @@
 "format that is no longer used.  Please reconfigure your settings using the "
 "Preferences window."
 
-#: src/plugin.c:286
+#: src/plugin.c:291
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
@@ -4651,257 +4566,273 @@
 "The required plugin %s was not found. Please install this plugin and try "
 "again."
 
-#: src/plugin.c:291 src/plugin.c:319
+#: src/plugin.c:296 src/plugin.c:324
 msgid "Gaim was unable to load your plugin."
 msgstr "Gaim was unable to load your plugin."
 
-#: src/plugin.c:315
+#: src/plugin.c:320
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "The required plugin %s was unable to load."
 
-#: src/prefs.c:113 src/status.c:273
+#: src/prefs.c:114
 msgid "Slightly less boring default"
 msgstr "Slightly less boring default"
 
-#: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:44
-#: src/protocols/msn/msn.c:463 src/protocols/msn/state.c:29
+#: src/protocols/gg/gg.c:50 src/protocols/irc/irc.c:162
+#: src/protocols/msn/msn.c:530 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: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
+#: src/protocols/msn/state.c:38 src/protocols/novell/novell.c:2804
+#: src/protocols/novell/novell.c:2923 src/protocols/novell/novell.c:2974
+#: src/protocols/oscar/oscar.c:771 src/protocols/oscar/oscar.c:6873
+#: src/protocols/yahoo/yahoo.c:3108
 msgid "Available"
 msgstr "Available"
 
-#: src/protocols/gg/gg.c:50
+#: src/protocols/gg/gg.c:51
 msgid "Available for friends only"
 msgstr "Available for friends only"
 
-#: src/protocols/gg/gg.c:52
+#: src/protocols/gg/gg.c:53
 msgid "Away for friends only"
 msgstr "Away for friends only"
 
-#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:964
-#: src/protocols/jabber/presence.c: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
+#: src/protocols/gg/gg.c:54 src/protocols/oscar/oscar.c:681
+#: src/protocols/oscar/oscar.c:6883 src/protocols/yahoo/yahoo.c:2635
+#: src/protocols/yahoo/yahoo.c:3152
 msgid "Invisible"
 msgstr "Invisible"
 
-#: src/protocols/gg/gg.c:54
-msgid "Invisible for friends only"
-msgstr "Invisible for friends only"
-
 #: src/protocols/gg/gg.c:55
+msgid "Invisible for friends only"
+msgstr "Invisible for friends only"
+
+#: src/protocols/gg/gg.c:56
 msgid "Unavailable"
 msgstr "Unavailable"
 
-#: src/protocols/gg/gg.c:136
+#: src/protocols/gg/gg.c:137
 msgid "Unable to resolve hostname."
 msgstr "Unable to resolve hostname."
 
-#: src/protocols/gg/gg.c:139 src/protocols/novell/novell.c:1710
+#: src/protocols/gg/gg.c:140 src/protocols/novell/novell.c:1718
 msgid "Unable to connect to server."
 msgstr "Unable to connect to server."
 
-#: src/protocols/gg/gg.c:142 src/protocols/jabber/auth.c:130
+#: src/protocols/gg/gg.c:143 src/protocols/jabber/auth.c:130
 #: src/protocols/jabber/auth.c:204 src/protocols/jabber/auth.c:354
 #: src/protocols/jabber/auth.c:452 src/protocols/jabber/auth.c:464
-#: src/protocols/jabber/jabber.c:106
+#: src/protocols/jabber/jabber.c:107
 msgid "Invalid response from server."
 msgstr "Invalid response from server."
 
-#: src/protocols/gg/gg.c:145
+#: src/protocols/gg/gg.c:146
 msgid "Error while reading from socket."
 msgstr "Error while reading from socket."
 
-#: src/protocols/gg/gg.c:148
+#: src/protocols/gg/gg.c:149
 msgid "Error while writing to socket."
 msgstr "Error while writing to socket."
 
-#: src/protocols/gg/gg.c:151
+#: src/protocols/gg/gg.c:152
 msgid "Authentication failed."
 msgstr "Authentication failed."
 
-#: src/protocols/gg/gg.c:154
+#: src/protocols/gg/gg.c:155
 msgid "Unknown Error Code."
 msgstr "Unknown Error Code."
 
-#: src/protocols/gg/gg.c:242 src/protocols/oscar/oscar.c:3930
+#: src/protocols/gg/gg.c:232 src/protocols/oscar/oscar.c:3989
 #, 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
-#. XXX this should use gaim_notify_userinfo, but it is unclear to me what should be passed for 'who'
-#: src/protocols/gg/gg.c:243 src/protocols/gg/gg.c:1011
-#: 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
+#: src/protocols/gg/gg.c:233 src/protocols/gg/gg.c:1074
+#: src/protocols/napster/napster.c:405 src/protocols/oscar/oscar.c:3993
+#: src/protocols/oscar/oscar.c:4217 src/protocols/silc/ops.c:1086
+#: src/protocols/silc/ops.c:1149 src/protocols/toc/toc.c:469
+#: src/protocols/zephyr/zephyr.c:721 src/protocols/zephyr/zephyr.c:1136
 msgid "Buddy Information"
 msgstr "Buddy Information"
 
-#: src/protocols/gg/gg.c:293
+#: src/protocols/gg/gg.c:267 src/protocols/irc/irc.c:154
+#: src/protocols/jabber/buddy.c:998 src/protocols/jabber/jabber.c:957
+#: src/protocols/msn/msn.c:522 src/protocols/novell/novell.c:2816
+#: src/protocols/oscar/oscar.c:739 src/protocols/oscar/oscar.c:6669
+#: src/protocols/oscar/oscar.c:6863 src/protocols/silc/silc.c:46
+#: src/protocols/yahoo/yahoo.c:2639 src/protocols/yahoo/yahoo.c:3102
+msgid "Offline"
+msgstr "Offline"
+
+#: src/protocols/gg/gg.c:277 src/protocols/gg/gg.c:283
+#: src/protocols/gg/gg.c:289 src/protocols/gg/gg.c:295
+#: src/protocols/gg/gg.c:301 src/protocols/gg/gg.c:307
+#: src/protocols/gg/gg.c:313 src/protocols/irc/irc.c:167
+#: src/protocols/jabber/jabber.c:957 src/protocols/jabber/jabber.c:963
+#: src/protocols/jabber/jabber.c:969 src/protocols/jabber/jabber.c:975
+#: src/protocols/jabber/jabber.c:981 src/protocols/jabber/jabber.c:987
+#: src/protocols/novell/novell.c:2827 src/protocols/yahoo/yahoo.c:3114
+#: src/protocols/yahoo/yahoo.c:3148 src/protocols/zephyr/zephyr.c:2225
+msgid "Message"
+msgstr "Message"
+
+#: src/protocols/gg/gg.c:326
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: src/protocols/gg/gg.c:446
+#: src/protocols/gg/gg.c:480
 msgid "Could not connect"
 msgstr "Could not connect"
 
-#: src/protocols/gg/gg.c:453
+#: src/protocols/gg/gg.c:487
 msgid "Unable to read socket"
 msgstr "Unable to read socket"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: src/protocols/gg/gg.c:674 src/protocols/icq/gaim_icq.c:343
-#: src/protocols/napster/napster.c:474 src/protocols/napster/napster.c:505
-#: src/protocols/toc/toc.c:169 src/protocols/yahoo/yahoo.c:2199
-#: src/protocols/yahoo/yahoo.c:2228 src/protocols/yahoo/yahoo.c:2291
-#: src/protocols/yahoo/yahoo_filexfer.c:68
+#: src/protocols/gg/gg.c:737 src/protocols/napster/napster.c:487
+#: src/protocols/napster/napster.c:518 src/protocols/toc/toc.c:171
+#: src/protocols/yahoo/yahoo.c:2266 src/protocols/yahoo/yahoo.c:2295
+#: src/protocols/yahoo/yahoo.c:2358 src/protocols/yahoo/yahoo_filexfer.c:68
 #: src/protocols/yahoo/yahoo_filexfer.c:109 src/protocols/yahoo/ycht.c:482
 msgid "Unable to connect."
 msgstr "Unable to connect."
 
-#: src/protocols/gg/gg.c:690
+#: src/protocols/gg/gg.c:753
 msgid "Reading data"
 msgstr "Reading data"
 
-#: src/protocols/gg/gg.c:693
+#: src/protocols/gg/gg.c:756
 msgid "Balancer handshake"
 msgstr "Balancer handshake"
 
-#: src/protocols/gg/gg.c:696
+#: src/protocols/gg/gg.c:759
 msgid "Reading server key"
 msgstr "Reading server key"
 
-#: src/protocols/gg/gg.c:699
+#: src/protocols/gg/gg.c:762
 msgid "Exchanging key hash"
 msgstr "Exchanging key hash"
 
-#: src/protocols/gg/gg.c:709
+#: src/protocols/gg/gg.c:772
 msgid "Critical error in GG library\n"
 msgstr "Critical error in GG library\n"
 
-#: src/protocols/gg/gg.c:727 src/protocols/gg/gg.c:818
-#: src/protocols/toc/toc.c:145
+#: src/protocols/gg/gg.c:790 src/protocols/gg/gg.c:881
+#: src/protocols/toc/toc.c:147
 #, c-format
 msgid "Connect to %s failed"
 msgstr "Connect to %s failed"
 
-#: src/protocols/gg/gg.c:775
+#: src/protocols/gg/gg.c:838
 msgid "Unable to ping server"
 msgstr "Unable to ping server"
 
-#: src/protocols/gg/gg.c:787
+#: src/protocols/gg/gg.c:850
 msgid "Send as message"
 msgstr "Send as message"
 
-#: src/protocols/gg/gg.c:792
+#: src/protocols/gg/gg.c:855
 msgid "Looking up GG server"
 msgstr "Looking up GG server"
 
-#: src/protocols/gg/gg.c:795
+#: src/protocols/gg/gg.c:858
 msgid "Invalid Gadu-Gadu UIN specified"
 msgstr "Invalid Gadu-Gadu UIN specified"
 
-#: src/protocols/gg/gg.c:842
+#: src/protocols/gg/gg.c:905
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr "You are trying to send a message to an invalid Gadu-Gadu UIN."
 
-#: src/protocols/gg/gg.c:917
+#: src/protocols/gg/gg.c:980
 msgid "Couldn't get search results"
 msgstr "Couldn't get search results"
 
-#: src/protocols/gg/gg.c:922
+#: src/protocols/gg/gg.c:985
 msgid "Gadu-Gadu Search Engine"
 msgstr "Gadu-Gadu Search Engine"
 
-#: src/protocols/gg/gg.c:948
+#: src/protocols/gg/gg.c:1011
 msgid "Active"
 msgstr "Active"
 
-#: src/protocols/gg/gg.c:953 src/protocols/oscar/oscar.c:4966
+#: src/protocols/gg/gg.c:1016 src/protocols/oscar/oscar.c:5033
 msgid "UIN"
 msgstr "UIN"
 
 #. First Name
-#: src/protocols/gg/gg.c:957 src/protocols/jabber/jabber.c:613
-#: src/protocols/oscar/oscar.c:4977 src/protocols/silc/ops.c:808
-#: src/protocols/trepia/trepia.c:267
+#: src/protocols/gg/gg.c:1020 src/protocols/jabber/jabber.c:614
+#: src/protocols/oscar/oscar.c:5044 src/protocols/silc/ops.c:808
+#: src/protocols/trepia/trepia.c:268
 msgid "First Name"
 msgstr "First Name"
 
 #. Last Name
-#: src/protocols/gg/gg.c:962 src/protocols/jabber/jabber.c:618
-#: src/protocols/oscar/oscar.c:4978 src/protocols/trepia/trepia.c:274
+#: src/protocols/gg/gg.c:1025 src/protocols/jabber/jabber.c:619
+#: src/protocols/oscar/oscar.c:5045 src/protocols/trepia/trepia.c:275
 msgid "Last Name"
 msgstr "Last Name"
 
-#: 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
+#: src/protocols/gg/gg.c:1029 src/protocols/gg/gg.c:1774
+#: src/protocols/irc/msgs.c:182 src/protocols/oscar/oscar.c:5034
+#: src/protocols/silc/ops.c:1206
 msgid "Nick"
 msgstr "Nick"
 
-#: src/protocols/gg/gg.c:973 src/protocols/gg/gg.c:976
+#: src/protocols/gg/gg.c:1036 src/protocols/gg/gg.c:1039
 msgid "Birth Year"
 msgstr "Birth Year"
 
-#: src/protocols/gg/gg.c:982 src/protocols/gg/gg.c:984
-#: src/protocols/gg/gg.c:986
+#: src/protocols/gg/gg.c:1045 src/protocols/gg/gg.c:1047
+#: src/protocols/gg/gg.c:1049
 msgid "Sex"
 msgstr "Sex"
 
 #. City
-#: src/protocols/gg/gg.c:990 src/protocols/jabber/jabber.c:628
-#: src/protocols/oscar/oscar.c:5021 src/protocols/oscar/oscar.c:5029
-#: src/protocols/trepia/trepia.c:331 src/protocols/trepia/trepia.c:410
+#: src/protocols/gg/gg.c:1053 src/protocols/jabber/jabber.c:629
+#: src/protocols/oscar/oscar.c:5088 src/protocols/oscar/oscar.c:5096
+#: src/protocols/trepia/trepia.c:332 src/protocols/trepia/trepia.c:411
 msgid "City"
 msgstr "City"
 
-#: src/protocols/gg/gg.c:1033
+#: src/protocols/gg/gg.c:1096
 msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr "There is no Buddy List stored on the Gadu-Gadu server."
 
-#: src/protocols/gg/gg.c:1041
+#: src/protocols/gg/gg.c:1104
 msgid "Couldn't Import Buddy List from Server"
 msgstr "Couldn't Import Buddy List from Server"
 
-#: src/protocols/gg/gg.c:1103
+#: src/protocols/gg/gg.c:1166
 msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "Buddy List successfully transferred to Gadu-Gadu server"
 
-#: src/protocols/gg/gg.c:1111
+#: src/protocols/gg/gg.c:1174
 msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "Couldn't transfer Buddy List to Gadu-Gadu server"
 
-#: src/protocols/gg/gg.c:1119
+#: src/protocols/gg/gg.c:1182
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
 msgstr "Buddy List successfully deleted from Gadu-Gadu server"
 
-#: src/protocols/gg/gg.c:1127
+#: src/protocols/gg/gg.c:1190
 msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "Couldn't delete Buddy List from Gadu-Gadu server"
 
-#: src/protocols/gg/gg.c:1136
+#: src/protocols/gg/gg.c:1199
 msgid "Password changed successfully"
 msgstr "Password changed successfully"
 
-#: src/protocols/gg/gg.c:1143
+#: src/protocols/gg/gg.c:1206
 msgid "Password couldn't be changed"
 msgstr "Password couldn't be changed"
 
-#: src/protocols/gg/gg.c:1262
+#: src/protocols/gg/gg.c:1325
 msgid "Error communicating with Gadu-Gadu server"
 msgstr "Error communicating with Gadu-Gadu server"
 
-#: src/protocols/gg/gg.c:1263
+#: src/protocols/gg/gg.c:1326
 msgid ""
 "Gaim was unable to complete your request due to a problem communicating with "
 "the Gadu-Gadu HTTP server.  Please try again later."
@@ -4909,11 +4840,11 @@
 "Gaim was unable to complete your request due to a problem communicating with "
 "the Gadu-Gadu HTTP server.  Please try again later."
 
-#: src/protocols/gg/gg.c:1292
+#: src/protocols/gg/gg.c:1355
 msgid "Unable to import Gadu-Gadu buddy list"
 msgstr "Unable to import Gadu-Gadu buddy list"
 
-#: src/protocols/gg/gg.c:1293
+#: src/protocols/gg/gg.c:1356
 msgid ""
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
@@ -4921,25 +4852,25 @@
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
 
-#: src/protocols/gg/gg.c:1366
+#: src/protocols/gg/gg.c:1429
 msgid "Couldn't export buddy list"
 msgstr "Couldn't export buddy list"
 
-#: src/protocols/gg/gg.c:1367 src/protocols/gg/gg.c:1390
+#: src/protocols/gg/gg.c:1430 src/protocols/gg/gg.c:1453
 msgid ""
 "Gaim was unable to connect to the buddy list server.  Please try again later."
 msgstr ""
 "Gaim was unable to connect to the buddy list server.  Please try again later."
 
-#: src/protocols/gg/gg.c:1389
+#: src/protocols/gg/gg.c:1452
 msgid "Unable to delete Gadu-Gadu buddy list"
 msgstr "Unable to delete Gadu-Gadu buddy list"
 
-#: src/protocols/gg/gg.c:1440
+#: src/protocols/gg/gg.c:1503
 msgid "Unable to access directory"
 msgstr "Unable to access directory"
 
-#: src/protocols/gg/gg.c:1441
+#: src/protocols/gg/gg.c:1504
 msgid ""
 "Gaim was unable to search the Directory because it was unable to connect to "
 "the directory server.  Please try again later."
@@ -4947,11 +4878,11 @@
 "Gaim was unable to search the Directory because it was unable to connect to "
 "the directory server.  Please try again later."
 
-#: src/protocols/gg/gg.c:1475
+#: src/protocols/gg/gg.c:1538
 msgid "Unable to change Gadu-Gadu password"
 msgstr "Unable to change Gadu-Gadu password"
 
-#: src/protocols/gg/gg.c:1476
+#: src/protocols/gg/gg.c:1539
 msgid ""
 "Gaim was unable to change your password due to an error connecting to the "
 "Gadu-Gadu server.  Please try again later."
@@ -4959,33 +4890,33 @@
 "Gaim was unable to change your password due to an error connecting to the "
 "Gadu-Gadu server.  Please try again later."
 
-#: src/protocols/gg/gg.c:1492
+#: src/protocols/gg/gg.c:1555
 msgid "Directory Search"
 msgstr "Directory Search"
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: src/protocols/gg/gg.c:1497 src/protocols/jabber/jabber.c:1062
-#: src/protocols/toc/toc.c:1562
+#: src/protocols/gg/gg.c:1560 src/protocols/jabber/jabber.c:1091
+#: src/protocols/toc/toc.c:1571
 msgid "Change Password"
 msgstr "Change Password"
 
-#: src/protocols/gg/gg.c:1501
+#: src/protocols/gg/gg.c:1564
 msgid "Import Buddy List from Server"
 msgstr "Import Buddy List from Server"
 
-#: src/protocols/gg/gg.c:1505
+#: src/protocols/gg/gg.c:1568
 msgid "Export Buddy List to Server"
 msgstr "Export Buddy List to Server"
 
-#: src/protocols/gg/gg.c:1509
+#: src/protocols/gg/gg.c:1572
 msgid "Delete Buddy List from Server"
 msgstr "Delete Buddy List from Server"
 
-#: src/protocols/gg/gg.c:1542
+#: src/protocols/gg/gg.c:1605
 msgid "Unable to access user profile."
 msgstr "Unable to access user profile."
 
-#: src/protocols/gg/gg.c:1543
+#: src/protocols/gg/gg.c:1606
 msgid ""
 "Gaim was unable to access this user's profile due to an error connecting to "
 "the directory server.  Please try again later."
@@ -4993,7 +4924,6 @@
 "Gaim was unable to access this user's profile due to an error connecting to "
 "the directory server.  Please try again later."
 
-#. *< api_version
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -5004,60 +4934,23 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/gg/gg.c:1687 src/protocols/gg/gg.c:1689
+#: src/protocols/gg/gg.c:1753 src/protocols/gg/gg.c:1755
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu Protocol Plugin"
 
-#: src/protocols/icq/gaim_icq.c:223
-msgid "Gaim encountered an error communicating with the ICQ server."
-msgstr "Gaim encountered an error communicating with the ICQ server."
-
-#: src/protocols/icq/gaim_icq.c:293
-#, c-format
-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 authorize them."
-
-#: 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 "Authorize"
-
-#: 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"
-
-#: src/protocols/icq/gaim_icq.c:309
-msgid "Send message through server"
-msgstr "Send message through server"
-
-#: src/protocols/icq/gaim_icq.c:351
-msgid "Connecting..."
-msgstr "Connecting..."
-
-#: src/protocols/icq/gaim_icq.c:497
-msgid "Nick:"
-msgstr "Nick:"
-
-#: src/protocols/icq/gaim_icq.c:498
-msgid "Gaim User"
-msgstr "Gaim User"
-
-#: src/protocols/irc/cmds.c:43 src/protocols/silc/silc.c:1294
+#: src/protocols/irc/cmds.c:43 src/protocols/silc/silc.c:1309
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Unknown command: %s"
 
-#: src/protocols/irc/cmds.c:450 src/protocols/jabber/chat.c:562
-#: src/protocols/silc/silc.c:1002
+#: src/protocols/irc/cmds.c:450 src/protocols/jabber/chat.c:584
+#: src/protocols/silc/silc.c:1017
 #, c-format
 msgid "current topic is: %s"
 msgstr "current topic is: %s"
 
-#: src/protocols/irc/cmds.c:454 src/protocols/jabber/chat.c:566
-#: src/protocols/silc/silc.c:1006
+#: src/protocols/irc/cmds.c:454 src/protocols/jabber/chat.c:588
+#: src/protocols/silc/silc.c:1021
 msgid "No topic is set"
 msgstr "No topic is set"
 
@@ -5072,72 +4965,71 @@
 msgid "Gaim could not open a listening port."
 msgstr "Gaim could not open a listening port."
 
-#: src/protocols/irc/irc.c:74
+#: src/protocols/irc/irc.c:75
 msgid "Error displaying MOTD"
 msgstr "Error displaying MOTD"
 
-#: src/protocols/irc/irc.c:74
+#: src/protocols/irc/irc.c:75
 msgid "No MOTD available"
 msgstr "No MOTD available"
 
-#: src/protocols/irc/irc.c:75
+#: src/protocols/irc/irc.c:76
 msgid "There is no MOTD associated with this connection."
 msgstr "There is no MOTD associated with this connection."
 
-#: src/protocols/irc/irc.c:78
+#: src/protocols/irc/irc.c:79
 #, c-format
 msgid "MOTD for %s"
 msgstr "MOTD for %s"
 
-#: src/protocols/irc/irc.c:92 src/protocols/irc/irc.c:399
+#: src/protocols/irc/irc.c:93 src/protocols/irc/irc.c:409
 msgid "Server has disconnected"
 msgstr "Server has disconnected"
 
-#: src/protocols/irc/irc.c:157
+#: src/protocols/irc/irc.c:178
 msgid "View MOTD"
 msgstr "View MOTD"
 
-#: src/protocols/irc/irc.c:179 src/protocols/silc/chat.c:32
+#: src/protocols/irc/irc.c:190 src/protocols/silc/chat.c:32
 msgid "_Channel:"
 msgstr "_Channel:"
 
-#: src/protocols/irc/irc.c:184 src/protocols/jabber/chat.c:56
+#: src/protocols/irc/irc.c:195 src/protocols/jabber/chat.c:56
 msgid "_Password:"
 msgstr "_Password:"
 
-#: src/protocols/irc/irc.c:216
+#: src/protocols/irc/irc.c:227
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC nicks may not contain whitespace"
 
-#: src/protocols/irc/irc.c:235 src/protocols/toc/toc.c:197
+#: src/protocols/irc/irc.c:246 src/protocols/toc/toc.c:199
 #, c-format
 msgid "Signon: %s"
 msgstr "Signon: %s"
 
-#: src/protocols/irc/irc.c:244
+#: src/protocols/irc/irc.c:255
 msgid "Couldn't create socket"
 msgstr "Couldn't create socket"
 
-#: src/protocols/irc/irc.c:259 src/protocols/jabber/jabber.c:297
-#: src/protocols/oscar/oscar.c:1651 src/protocols/oscar/oscar.c:1715
+#: src/protocols/irc/irc.c:270 src/protocols/jabber/jabber.c:298
+#: src/protocols/oscar/oscar.c:1688 src/protocols/oscar/oscar.c:1755
 msgid "Couldn't connect to host"
 msgstr "Couldn't connect to host"
 
-#: src/protocols/irc/irc.c:396 src/protocols/trepia/trepia.c:926
+#: src/protocols/irc/irc.c:406 src/protocols/trepia/trepia.c:929
 msgid "Read error"
 msgstr "Read error"
 
-#: src/protocols/irc/irc.c:547 src/protocols/silc/chat.c:1368
-#: src/protocols/yahoo/yahoochat.c:1393
+#: src/protocols/irc/irc.c:561 src/protocols/silc/chat.c:1373
+#: src/protocols/yahoo/yahoochat.c:1398
 msgid "Users"
 msgstr "Users"
 
-#: src/protocols/irc/irc.c:550 src/protocols/silc/chat.c:1371
-#: src/protocols/silc/ops.c:1166 src/protocols/yahoo/yahoochat.c:1402
+#: src/protocols/irc/irc.c:564 src/protocols/silc/chat.c:1376
+#: src/protocols/silc/ops.c:1168 src/protocols/yahoo/yahoochat.c:1407
 msgid "Topic"
 msgstr "Topic"
 
-#. *< api_version
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -5146,39 +5038,43 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:655
+#: src/protocols/irc/irc.c:671
 msgid "IRC Protocol Plugin"
 msgstr "IRC Protocol Plugin"
 
 #. *  summary
-#: src/protocols/irc/irc.c:656
+#: src/protocols/irc/irc.c:672
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "The IRC Protocol Plugin that Sucks Less"
 
-#: 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
+#: src/protocols/irc/irc.c:691 src/protocols/irc/msgs.c:201
+#: src/protocols/jabber/jabber.c:1608 src/protocols/napster/napster.c:672
+#: src/protocols/silc/ops.c:1026 src/protocols/silc/ops.c:1130
 msgid "Server"
 msgstr "Server"
 
-#: src/protocols/irc/irc.c:678 src/protocols/jabber/jabber.c:1598
-#: src/protocols/msn/msn.c:1761 src/protocols/napster/napster.c:661
-#: src/protocols/silc/silc.c:1586 src/protocols/trepia/trepia.c:1298
+#: src/protocols/irc/irc.c:694 src/protocols/jabber/jabber.c:1629
+#: src/protocols/msn/msn.c:1926 src/protocols/napster/napster.c:677
+#: src/protocols/silc/silc.c:1603 src/protocols/trepia/trepia.c:1303
 msgid "Port"
 msgstr "Port"
 
-#: src/protocols/irc/irc.c:681 src/protocols/oscar/oscar.c:7348
-#: src/protocols/zephyr/zephyr.c:1922
+#: src/protocols/irc/irc.c:697 src/protocols/oscar/oscar.c:7510
+#: src/protocols/zephyr/zephyr.c:2857
 msgid "Encoding"
 msgstr "Encoding"
 
-#: 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/irc/irc.c:700 src/protocols/irc/msgs.c:195
+#: src/protocols/jabber/jabber.c:589 src/protocols/silc/buddy.c:1450
 #: src/protocols/silc/ops.c:973 src/protocols/silc/ops.c:975
-#: src/protocols/silc/ops.c:1123 src/protocols/silc/ops.c:1125
+#: src/protocols/silc/ops.c:1124 src/protocols/silc/ops.c:1126
 msgid "Username"
 msgstr "Username"
 
+#: src/protocols/irc/irc.c:703
+msgid "Real name"
+msgstr "Real name"
+
 #: src/protocols/irc/msgs.c:97
 msgid "Bad mode"
 msgstr "Bad mode"
@@ -5208,13 +5104,13 @@
 
 #: src/protocols/irc/msgs.c:189 src/protocols/irc/msgs.c:195
 #: src/protocols/irc/msgs.c:196 src/protocols/irc/msgs.c:207
-#: src/protocols/msn/msn.c:1180 src/protocols/yahoo/yahoo_profile.c:664
+#: src/protocols/msn/msn.c:1321 src/protocols/yahoo/yahoo_profile.c:665
 #, c-format
 msgid "<b>%s:</b> %s<br>"
 msgstr "<b>%s:</b> %s<br>"
 
 #: src/protocols/irc/msgs.c:196 src/protocols/silc/ops.c:967
-#: src/protocols/silc/ops.c:1117 src/protocols/yahoo/yahoo_profile.c:1005
+#: src/protocols/silc/ops.c:1118 src/protocols/yahoo/yahoo_profile.c:1007
 msgid "Realname"
 msgstr "Realname"
 
@@ -5298,53 +5194,53 @@
 msgid "Invitation only"
 msgstr "Invitation only"
 
-#: src/protocols/irc/msgs.c:625
+#: src/protocols/irc/msgs.c:628
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "You have been kicked by %s: (%s)"
 
-#: src/protocols/irc/msgs.c:630
+#: src/protocols/irc/msgs.c:633
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Kicked by %s (%s)"
 
-#: src/protocols/irc/msgs.c:651
+#: src/protocols/irc/msgs.c:654
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "mode (%s %s) by %s"
 
-#: src/protocols/irc/msgs.c:760
+#: src/protocols/irc/msgs.c:763
 msgid "Could not change nick"
 msgstr "Could not change nick"
 
-#: src/protocols/irc/msgs.c:761
+#: src/protocols/irc/msgs.c:764
 msgid "Cannot change nick"
 msgstr "Cannot change nick"
 
-#: src/protocols/irc/msgs.c:782
+#: src/protocols/irc/msgs.c:785
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "You have parted the channel%s%s"
 
-#: src/protocols/irc/msgs.c:822
+#: src/protocols/irc/msgs.c:825
 msgid "Error: invalid PONG from server"
 msgstr "Error: invalid PONG from server"
 
-#: src/protocols/irc/msgs.c:824
+#: src/protocols/irc/msgs.c:827
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING reply -- Lag: %lu seconds"
 
-#: src/protocols/irc/msgs.c:899
+#: src/protocols/irc/msgs.c:902
 #, c-format
 msgid "Cannot join %s:"
 msgstr "Cannot join %s:"
 
-#: src/protocols/irc/msgs.c:900 src/protocols/silc/ops.c:912
+#: src/protocols/irc/msgs.c:903 src/protocols/silc/ops.c:912
 msgid "Cannot join channel"
 msgstr "Cannot join channel"
 
-#: src/protocols/irc/msgs.c:936
+#: src/protocols/irc/msgs.c:939
 #, c-format
 msgid "Wallops from %s"
 msgstr "Wallops from %s"
@@ -5443,7 +5339,7 @@
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [channel]:  List the users currently in a channel."
 
-#: src/protocols/irc/parse.c:122 src/protocols/jabber/jabber.c:1410
+#: src/protocols/irc/parse.c:122 src/protocols/jabber/jabber.c:1439
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;new nickname&gt;:  Change your nickname."
 
@@ -5531,7 +5427,7 @@
 msgid "whois &lt;nick&gt;:  Get information on a user."
 msgstr "whois &lt;nick&gt;:  Get information on a user."
 
-#: src/protocols/irc/parse.c:242 src/protocols/zephyr/zephyr.c:264
+#: src/protocols/irc/parse.c:242
 msgid ""
 "(There was an error converting this message.  Check the 'Encoding' option in "
 "the Account Editor)"
@@ -5552,9 +5448,9 @@
 msgid "CTCP PING reply"
 msgstr "CTCP PING reply"
 
-#: 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
+#: src/protocols/irc/parse.c:497 src/protocols/oscar/oscar.c:1585
+#: src/protocols/toc/toc.c:189 src/protocols/toc/toc.c:597
+#: src/protocols/toc/toc.c:613 src/protocols/toc/toc.c:690
 msgid "Disconnected."
 msgstr "Disconnected."
 
@@ -5587,97 +5483,97 @@
 msgid "Invalid challenge from server"
 msgstr "Invalid challenge from server"
 
-#: src/protocols/jabber/buddy.c:246 src/protocols/jabber/buddy.c:604
+#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:606
 #: 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/jabber/buddy.c:249 src/protocols/jabber/buddy.c:619
 #: src/protocols/silc/ops.c:816
 msgid "Family Name"
 msgstr "Family Name"
 
-#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:621
+#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:623
 msgid "Given Name"
 msgstr "Given Name"
 
-#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:635
-#: src/protocols/jabber/jabber.c:608 src/protocols/msn/msn.c:1173
-#: 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
+#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/buddy.c:637
+#: src/protocols/jabber/jabber.c:609 src/protocols/msn/msn.c:1311
+#: src/protocols/silc/buddy.c:1447 src/protocols/silc/ops.c:820
+#: src/protocols/silc/ops.c:963 src/protocols/silc/ops.c:1114
+#: src/protocols/yahoo/yahoo_profile.c:1002
 msgid "Nickname"
 msgstr "Nickname"
 
-#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/jabber.c:648
+#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/jabber.c:649
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/buddy.c:663
+#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:665
 msgid "Street Address"
 msgstr "Street Address"
 
-#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:659
+#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:661
 msgid "Extended Address"
 msgstr "Extended Address"
 
-#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:667
+#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:669
 msgid "Locality"
 msgstr "Locality"
 
-#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:671
+#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:673
 msgid "Region"
 msgstr "Region"
 
-#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:675
-#: src/protocols/jabber/jabber.c:638
+#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:677
+#: src/protocols/jabber/jabber.c:639
 msgid "Postal Code"
 msgstr "Postal Code"
 
 #. Country
-#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:680
-#: src/protocols/trepia/trepia.c:339 src/protocols/trepia/trepia.c:416
+#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:682
+#: src/protocols/trepia/trepia.c:340 src/protocols/trepia/trepia.c:417
 msgid "Country"
 msgstr "Country"
 
-#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:691
-#: src/protocols/jabber/buddy.c:698
+#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:693
+#: src/protocols/jabber/buddy.c:700
 msgid "Telephone"
 msgstr "Telephone"
 
-#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:709
-#: src/protocols/jabber/buddy.c:717 src/protocols/silc/silc.c:643
-#: src/protocols/silc/util.c:508 src/protocols/yahoo/yahoo_profile.c:995
+#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:711
+#: src/protocols/jabber/buddy.c:719 src/protocols/silc/silc.c:658
+#: src/protocols/silc/util.c:508 src/protocols/yahoo/yahoo_profile.c:997
 msgid "Email"
 msgstr "Email"
 
-#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:732
+#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:734
 msgid "Organization Name"
 msgstr "Organization Name"
 
-#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:736
+#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:738
 msgid "Organization Unit"
 msgstr "Organization Unit"
 
-#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:742
-#: src/protocols/novell/novell.c:1450
+#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:744
+#: src/protocols/novell/novell.c:1458
 msgid "Title"
 msgstr "Title"
 
-#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:745
+#: src/protocols/jabber/buddy.c:264 src/protocols/jabber/buddy.c:747
 msgid "Role"
 msgstr "Role"
 
-#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:638
-#: src/protocols/oscar/oscar.c:5002
+#: src/protocols/jabber/buddy.c:265 src/protocols/jabber/buddy.c:640
+#: src/protocols/oscar/oscar.c:5069
 msgid "Birthday"
 msgstr "Birthday"
 
-#: src/protocols/jabber/buddy.c:509 src/protocols/jabber/buddy.c:510
+#: src/protocols/jabber/buddy.c:511 src/protocols/jabber/buddy.c:512
 msgid "Edit Jabber vCard"
 msgstr "Edit Jabber vCard"
 
-#: src/protocols/jabber/buddy.c:511
+#: src/protocols/jabber/buddy.c:513
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
@@ -5685,74 +5581,93 @@
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
 
-#: src/protocols/jabber/buddy.c:553
+#: src/protocols/jabber/buddy.c:555
 msgid "Jabber ID"
 msgstr "Jabber ID"
 
-#: 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:451 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
+#: src/protocols/jabber/buddy.c:565 src/protocols/jabber/buddy.c:572
+#: src/protocols/jabber/buddy.c:583 src/protocols/jabber/jabber.c:936
+#: src/protocols/msn/msn.c:500 src/protocols/novell/novell.c:2826
+#: src/protocols/novell/novell.c:2830 src/protocols/oscar/oscar.c:731
+#: src/protocols/oscar/oscar.c:737 src/protocols/oscar/oscar.c:739
+#: src/protocols/yahoo/yahoo.c:2760
 msgid "Status"
 msgstr "Status"
 
-#: src/protocols/jabber/buddy.c:579 src/protocols/jabber/jabber.c:1580
+#: src/protocols/jabber/buddy.c:581 src/protocols/jabber/jabber.c:1611
 msgid "Resource"
 msgstr "Resource"
 
-#: src/protocols/jabber/buddy.c:625 src/protocols/silc/ops.c:812
+#: src/protocols/jabber/buddy.c:627 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:5020 src/protocols/oscar/oscar.c:5028
+#: src/protocols/jabber/buddy.c:645 src/protocols/jabber/jabber.c:624
+#: src/protocols/oscar/oscar.c:5087 src/protocols/oscar/oscar.c:5095
 #: src/protocols/silc/ops.c:848
 msgid "Address"
 msgstr "Address"
 
-#: src/protocols/jabber/buddy.c:655
+#: src/protocols/jabber/buddy.c:657
 msgid "P.O. Box"
 msgstr "P.O. Box"
 
-#: src/protocols/jabber/buddy.c:761
+#: src/protocols/jabber/buddy.c:763
 msgid "Photo"
 msgstr "Photo"
 
-#: src/protocols/jabber/buddy.c:761
+#: src/protocols/jabber/buddy.c:763
 msgid "Logo"
 msgstr "Logo"
 
-#: src/protocols/jabber/buddy.c:777
+#: src/protocols/jabber/buddy.c:779
 msgid "Jabber Profile"
 msgstr "Jabber Profile"
 
-#: src/protocols/jabber/buddy.c:932
+#: src/protocols/jabber/buddy.c:946
 msgid "Un-hide From"
 msgstr "Un-hide From"
 
-#: src/protocols/jabber/buddy.c:935
+#: src/protocols/jabber/buddy.c:949
 msgid "Temporarily Hide From"
 msgstr "Temporarily Hide From"
 
 #. && NOT ME
-#: src/protocols/jabber/buddy.c:942
+#: src/protocols/jabber/buddy.c:956
 msgid "Cancel Presence Notification"
 msgstr "Cancel Presence Notification"
 
-#: src/protocols/jabber/buddy.c:948
+#: src/protocols/jabber/buddy.c:962
 msgid "(Re-)Request authorization"
 msgstr "(Re-)Request authorization"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: src/protocols/jabber/buddy.c:956
+#: src/protocols/jabber/buddy.c:970
 msgid "Unsubscribe"
 msgstr "Unsubscribe"
 
-#: src/protocols/jabber/chat.c:41 src/protocols/oscar/oscar.c:6286
+#: src/protocols/jabber/buddy.c:996 src/protocols/jabber/chat.c:669
+#: src/protocols/jabber/chat.c:680 src/protocols/jabber/jabber.c:944
+#: src/protocols/silc/ops.c:1243
+msgid "Error"
+msgstr "Error"
+
+#: src/protocols/jabber/buddy.c:1002 src/protocols/jabber/jabber.c:968
+msgid "Chatty"
+msgstr "Chatty"
+
+#: src/protocols/jabber/buddy.c:1006 src/protocols/jabber/jabber.c:980
+msgid "Extended Away"
+msgstr "Extended Away"
+
+#: src/protocols/jabber/buddy.c:1008 src/protocols/jabber/jabber.c:986
+#: src/protocols/oscar/oscar.c:671 src/protocols/oscar/oscar.c:6903
+msgid "Do Not Disturb"
+msgstr "Do Not Disturb"
+
+#: src/protocols/jabber/chat.c:41 src/protocols/oscar/oscar.c:6368
 #: src/protocols/yahoo/yahoochat.c:1003
 msgid "_Room:"
 msgstr "_Room:"
@@ -5765,526 +5680,503 @@
 msgid "_Handle:"
 msgstr "_Handle:"
 
-#: src/protocols/jabber/chat.c:200
+#: src/protocols/jabber/chat.c:217
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s is not a valid room name"
 
-#: src/protocols/jabber/chat.c:201
+#: src/protocols/jabber/chat.c:218
 msgid "Invalid Room Name"
 msgstr "Invalid Room Name"
 
-#: src/protocols/jabber/chat.c:206
+#: src/protocols/jabber/chat.c:223
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s is not a valid server name"
 
-#: src/protocols/jabber/chat.c:207 src/protocols/jabber/chat.c:208
+#: src/protocols/jabber/chat.c:224 src/protocols/jabber/chat.c:225
 msgid "Invalid Server Name"
 msgstr "Invalid Server Name"
 
-#: src/protocols/jabber/chat.c:212
+#: src/protocols/jabber/chat.c:229
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s is not a valid room handle"
 
-#: src/protocols/jabber/chat.c:213 src/protocols/jabber/chat.c:214
+#: src/protocols/jabber/chat.c:230 src/protocols/jabber/chat.c:231
 msgid "Invalid Room Handle"
 msgstr "Invalid Room Handle"
 
-#: src/protocols/jabber/chat.c:365
+#: src/protocols/jabber/chat.c:387
 msgid "Configuration error"
 msgstr "Configuration error"
 
-#: src/protocols/jabber/chat.c:374 src/protocols/jabber/chat.c:519
+#: src/protocols/jabber/chat.c:396 src/protocols/jabber/chat.c:541
 msgid "Unable to configure"
 msgstr "Unable to configure"
 
-#: src/protocols/jabber/chat.c:390
+#: src/protocols/jabber/chat.c:412
 msgid "Room Configuration Error"
 msgstr "Room Configuration Error"
 
-#: src/protocols/jabber/chat.c:391
+#: src/protocols/jabber/chat.c:413
 msgid "This room is not capable of being configured"
 msgstr "This room is not capable of being configured"
 
-#: src/protocols/jabber/chat.c:441 src/protocols/jabber/chat.c:510
+#: src/protocols/jabber/chat.c:463 src/protocols/jabber/chat.c:532
 msgid "Registration error"
 msgstr "Registration error"
 
-#: src/protocols/jabber/chat.c:593
+#: src/protocols/jabber/chat.c:620
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "Nick changing not supported in non-MUC chatrooms"
 
-#: src/protocols/jabber/chat.c:637 src/protocols/jabber/chat.c:648
-msgid "Roomlist Error"
-msgstr "Roomlist Error"
-
-#: 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:689
+#: src/protocols/jabber/chat.c:670 src/protocols/jabber/chat.c:681
+#: src/protocols/silc/ops.c:1243
+msgid "Error retrieving room list"
+msgstr "Error retrieving room list"
+
+#: src/protocols/jabber/chat.c:729
 msgid "Invalid Server"
 msgstr "Invalid Server"
 
-#: src/protocols/jabber/chat.c:726
+#: src/protocols/jabber/chat.c:767
 msgid "Enter a Conference Server"
 msgstr "Enter a Conference Server"
 
-#: src/protocols/jabber/chat.c:727
+#: src/protocols/jabber/chat.c:768
 msgid "Select a conference server to query"
 msgstr "Select a conference server to query"
 
-#: src/protocols/jabber/chat.c:730
+#: src/protocols/jabber/chat.c:771
 msgid "Find Rooms"
 msgstr "Find Rooms"
 
-#: src/protocols/jabber/jabber.c:76
+#: src/protocols/jabber/jabber.c:77
 msgid "Error initializing session"
 msgstr "Error initializing session"
 
-#: src/protocols/jabber/jabber.c:206 src/protocols/msn/httpmethod.c:266
-#: src/protocols/trepia/trepia.c:247 src/protocols/trepia/trepia.c:698
-#: src/protocols/trepia/trepia.c:987 src/protocols/trepia/trepia.c:1031
-#: src/protocols/trepia/trepia.c:1130 src/protocols/trepia/trepia.c:1176
+#: src/protocols/jabber/jabber.c:207 src/protocols/msn/httpmethod.c:266
+#: src/protocols/trepia/trepia.c:248 src/protocols/trepia/trepia.c:699
+#: src/protocols/trepia/trepia.c:990 src/protocols/trepia/trepia.c:1034
+#: src/protocols/trepia/trepia.c:1133 src/protocols/trepia/trepia.c:1179
 msgid "Write error"
 msgstr "Write error"
 
-#: src/protocols/jabber/jabber.c:244 src/protocols/jabber/jabber.c:264
+#: src/protocols/jabber/jabber.c:245 src/protocols/jabber/jabber.c:265
 msgid "Read Error"
 msgstr "Read Error"
 
-#: src/protocols/jabber/jabber.c:324
+#: src/protocols/jabber/jabber.c:325
 msgid "Connection Failed"
 msgstr "Connection Failed"
 
-#: src/protocols/jabber/jabber.c:327
+#: src/protocols/jabber/jabber.c:328
 msgid "SSL Handshake Failed"
 msgstr "SSL Handshake Failed"
 
-#: src/protocols/jabber/jabber.c:370 src/protocols/jabber/jabber.c:699
+#: src/protocols/jabber/jabber.c:371 src/protocols/jabber/jabber.c:700
 msgid "Invalid Jabber ID"
 msgstr "Invalid Jabber ID"
 
-#: src/protocols/jabber/jabber.c:398 src/protocols/jabber/jabber.c:726
+#: src/protocols/jabber/jabber.c:399 src/protocols/jabber/jabber.c:727
 msgid "SSL support unavailable"
 msgstr "SSL support unavailable"
 
-#: src/protocols/jabber/jabber.c:408 src/protocols/jabber/jabber.c:736
-#: src/protocols/trepia/trepia.c:1070
+#: src/protocols/jabber/jabber.c:409 src/protocols/jabber/jabber.c:737
+#: src/protocols/trepia/trepia.c:1073
 msgid "Unable to create socket"
 msgstr "Unable to create socket"
 
-#: src/protocols/jabber/jabber.c:433
+#: src/protocols/jabber/jabber.c:434
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registration of %s@%s successful"
 
-#: src/protocols/jabber/jabber.c:435 src/protocols/jabber/jabber.c:436
+#: src/protocols/jabber/jabber.c:436 src/protocols/jabber/jabber.c:437
 msgid "Registration Successful"
 msgstr "Registration Successful"
 
-#: src/protocols/jabber/jabber.c:442 src/protocols/jabber/jabber.c:1181
+#: src/protocols/jabber/jabber.c:443 src/protocols/jabber/jabber.c:1210
 msgid "Unknown Error"
 msgstr "Unknown Error"
 
-#: src/protocols/jabber/jabber.c:444 src/protocols/jabber/jabber.c:445
+#: src/protocols/jabber/jabber.c:445 src/protocols/jabber/jabber.c:446
 msgid "Registration Failed"
 msgstr "Registration Failed"
 
-#: src/protocols/jabber/jabber.c:556 src/protocols/jabber/jabber.c:557
+#: src/protocols/jabber/jabber.c:557 src/protocols/jabber/jabber.c:558
 msgid "Already Registered"
 msgstr "Already Registered"
 
-#: src/protocols/jabber/jabber.c:592 src/protocols/jabber/jabber.c:1036
+#: src/protocols/jabber/jabber.c:593 src/protocols/jabber/jabber.c:1065
 msgid "Password"
 msgstr "Password"
 
-#: src/protocols/jabber/jabber.c:603
+#: src/protocols/jabber/jabber.c:604
 msgid "E-Mail"
 msgstr "E-Mail"
 
 #. State
-#: 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
+#: src/protocols/jabber/jabber.c:634 src/protocols/oscar/oscar.c:5089
+#: src/protocols/oscar/oscar.c:5097 src/protocols/trepia/trepia.c:336
+#: src/protocols/trepia/trepia.c:414
 msgid "State"
 msgstr "Province/Territory"
 
-#: src/protocols/jabber/jabber.c:643 src/protocols/silc/ops.c:853
-#: src/protocols/silc/silc.c:645 src/protocols/silc/util.c:510
+#: src/protocols/jabber/jabber.c:644 src/protocols/silc/ops.c:853
+#: src/protocols/silc/silc.c:660 src/protocols/silc/util.c:510
 msgid "Phone"
 msgstr "Phone"
 
-#: src/protocols/jabber/jabber.c:653
+#: src/protocols/jabber/jabber.c:654
 msgid "Date"
 msgstr "Date"
 
-#: src/protocols/jabber/jabber.c:661
+#: src/protocols/jabber/jabber.c:662
 msgid "Please fill out the information below to register your new account."
 msgstr "Please fill out the information below to register your new account."
 
-#: src/protocols/jabber/jabber.c:664 src/protocols/jabber/jabber.c:665
+#: src/protocols/jabber/jabber.c:665 src/protocols/jabber/jabber.c:666
 msgid "Register New Jabber Account"
 msgstr "Register New Jabber Account"
 
-#: src/protocols/jabber/jabber.c:744
-msgid "Logged out"
-msgstr "Logged out"
-
 #. connect to the server
-#: src/protocols/jabber/jabber.c:783 src/protocols/msn/msn.c:609
-#: 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
+#: src/protocols/jabber/jabber.c:787 src/protocols/msn/msn.c:690
+#: src/protocols/napster/napster.c:511 src/protocols/novell/novell.c:2159
+#: src/protocols/oscar/oscar.c:1759 src/protocols/trepia/trepia.c:1067
+#: src/protocols/yahoo/yahoo.c:2489 src/protocols/zephyr/zephyr.c:1492
 msgid "Connecting"
 msgstr "Connecting"
 
-#: src/protocols/jabber/jabber.c:787
+#: src/protocols/jabber/jabber.c:791
 msgid "Initializing Stream"
 msgstr "Initializing Stream"
 
-#: src/protocols/jabber/jabber.c:793
+#: src/protocols/jabber/jabber.c:797
 msgid "Authenticating"
 msgstr "Authenticating"
 
-#: src/protocols/jabber/jabber.c:802
+#: src/protocols/jabber/jabber.c:806
 msgid "Re-initializing Stream"
 msgstr "Re-initializing Stream"
 
-#: 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:700 src/protocols/oscar/oscar.c:6566
+#: src/protocols/jabber/jabber.c:878 src/protocols/jabber/jabber.c:1188
+#: src/protocols/jabber/jabber.c:1229 src/protocols/jabber/jabber.c:1262
+#: src/protocols/oscar/oscar.c:737 src/protocols/oscar/oscar.c:6667
 msgid "Not Authorized"
 msgstr "Not Authorized"
 
+#: src/protocols/jabber/jabber.c:911
+msgid "Both"
+msgstr "Both"
+
 #: src/protocols/jabber/jabber.c:913
-msgid "Both"
-msgstr "Both"
+msgid "From (To pending)"
+msgstr "From (To pending)"
 
 #: src/protocols/jabber/jabber.c:915
-msgid "From (To pending)"
-msgstr "From (To pending)"
-
-#: src/protocols/jabber/jabber.c:917
 msgid "From"
 msgstr "From"
 
-#: src/protocols/jabber/jabber.c:920
+#: src/protocols/jabber/jabber.c:918
 msgid "To"
 msgstr "To"
 
-#: src/protocols/jabber/jabber.c:922
+#: src/protocols/jabber/jabber.c:920
 msgid "None (To pending)"
 msgstr "None (To pending)"
 
-#: src/protocols/jabber/jabber.c:926
+#: src/protocols/jabber/jabber.c:924
 msgid "Subscription"
 msgstr "Subscription"
 
-#: src/protocols/jabber/jabber.c:946
-msgid "Error"
-msgstr "Error"
-
-#: src/protocols/jabber/jabber.c:959 src/protocols/jabber/jutil.c:35
-#: src/protocols/jabber/presence.c:66 src/protocols/jabber/presence.c:124
-msgid "Chatty"
-msgstr "Chatty"
-
-#: src/protocols/jabber/jabber.c:961 src/protocols/jabber/jutil.c:38
-#: src/protocols/jabber/presence.c:68 src/protocols/jabber/presence.c:129
-msgid "Extended Away"
-msgstr "Extended Away"
-
-#: src/protocols/jabber/jabber.c:962 src/protocols/jabber/jutil.c:41
-#: src/protocols/jabber/presence.c:70 src/protocols/jabber/presence.c:131
-#: 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"
-
-#: src/protocols/jabber/jabber.c:979
+#: src/protocols/jabber/jabber.c:962 src/protocols/jabber/jabber.c:968
+#: src/protocols/jabber/jabber.c:974 src/protocols/jabber/jabber.c:980
+#: src/protocols/jabber/jabber.c:986
+msgid "Priority"
+msgstr "Priority"
+
+#: src/protocols/jabber/jabber.c:1008
 msgid "Password Changed"
 msgstr "Password Changed"
 
-#: src/protocols/jabber/jabber.c:980
+#: src/protocols/jabber/jabber.c:1009
 msgid "Your password has been changed."
 msgstr "Your password has been changed."
 
-#: src/protocols/jabber/jabber.c:984 src/protocols/jabber/jabber.c:985
+#: src/protocols/jabber/jabber.c:1013 src/protocols/jabber/jabber.c:1014
 msgid "Error changing password"
 msgstr "Error changing password"
 
-#: src/protocols/jabber/jabber.c:1041
+#: src/protocols/jabber/jabber.c:1070
 msgid "Password (again)"
 msgstr "Password (again)"
 
-#: src/protocols/jabber/jabber.c:1046 src/protocols/jabber/jabber.c:1047
+#: src/protocols/jabber/jabber.c:1075 src/protocols/jabber/jabber.c:1076
 msgid "Change Jabber Password"
 msgstr "Change Jabber Password"
 
-#: src/protocols/jabber/jabber.c:1047
+#: src/protocols/jabber/jabber.c:1076
 msgid "Please enter your new password"
 msgstr "Please enter your new password"
 
-#: src/protocols/jabber/jabber.c:1057 src/protocols/toc/toc.c:1552
+#: src/protocols/jabber/jabber.c:1086 src/protocols/toc/toc.c:1561
 msgid "Set User Info"
 msgstr "Set User Info"
 
-#: src/protocols/jabber/jabber.c:1139
+#: src/protocols/jabber/jabber.c:1168
 msgid "Bad Request"
 msgstr "Bad Request"
 
-#: src/protocols/jabber/jabber.c:1141
+#: src/protocols/jabber/jabber.c:1170
 msgid "Conflict"
 msgstr "Conflict"
 
-#: src/protocols/jabber/jabber.c:1143
+#: src/protocols/jabber/jabber.c:1172
 msgid "Feature Not Implemented"
 msgstr "Feature Not Implemented"
 
-#: src/protocols/jabber/jabber.c:1145
+#: src/protocols/jabber/jabber.c:1174
 msgid "Forbidden"
 msgstr "Forbidden"
 
-#: src/protocols/jabber/jabber.c:1147
+#: src/protocols/jabber/jabber.c:1176
 msgid "Gone"
 msgstr "Gone"
 
-#: src/protocols/jabber/jabber.c:1149 src/protocols/jabber/jabber.c:1223
+#: src/protocols/jabber/jabber.c:1178 src/protocols/jabber/jabber.c:1252
 msgid "Internal Server Error"
 msgstr "Internal Server Error"
 
-#: src/protocols/jabber/jabber.c:1151
+#: src/protocols/jabber/jabber.c:1180
 msgid "Item Not Found"
 msgstr "Item Not Found"
 
-#: src/protocols/jabber/jabber.c:1153
+#: src/protocols/jabber/jabber.c:1182
 msgid "Malformed Jabber ID"
 msgstr "Malformed Jabber ID"
 
-#: src/protocols/jabber/jabber.c:1155
+#: src/protocols/jabber/jabber.c:1184
 msgid "Not Acceptable"
 msgstr "Not Acceptable"
 
-#: src/protocols/jabber/jabber.c:1157
+#: src/protocols/jabber/jabber.c:1186
 msgid "Not Allowed"
 msgstr "Not Allowed"
 
-#: src/protocols/jabber/jabber.c:1161
+#: src/protocols/jabber/jabber.c:1190
 msgid "Payment Required"
 msgstr "Payment Required"
 
-#: src/protocols/jabber/jabber.c:1163
+#: src/protocols/jabber/jabber.c:1192
 msgid "Recipient Unavailable"
 msgstr "Recipient Unavailable"
 
-#: src/protocols/jabber/jabber.c:1167
+#: src/protocols/jabber/jabber.c:1196
 msgid "Registration Required"
 msgstr "Registration Required"
 
-#: src/protocols/jabber/jabber.c:1169
+#: src/protocols/jabber/jabber.c:1198
 msgid "Remote Server Not Found"
 msgstr "Remote Server Not Found"
 
-#: src/protocols/jabber/jabber.c:1171
+#: src/protocols/jabber/jabber.c:1200
 msgid "Remote Server Timeout"
 msgstr "Remote Server Timeout"
 
-#: src/protocols/jabber/jabber.c:1173
+#: src/protocols/jabber/jabber.c:1202
 msgid "Server Overloaded"
 msgstr "Server Overloaded"
 
-#: src/protocols/jabber/jabber.c:1175
+#: src/protocols/jabber/jabber.c:1204
 msgid "Service Unavailable"
 msgstr "Service Unavailable"
 
-#: src/protocols/jabber/jabber.c:1177
+#: src/protocols/jabber/jabber.c:1206
 msgid "Subscription Required"
 msgstr "Subscription Required"
 
-#: src/protocols/jabber/jabber.c:1179
+#: src/protocols/jabber/jabber.c:1208
 msgid "Unexpected Request"
 msgstr "Unexpected Request"
 
-#: src/protocols/jabber/jabber.c:1186
+#: src/protocols/jabber/jabber.c:1215
 msgid "Authorization Aborted"
 msgstr "Authorization Aborted"
 
-#: src/protocols/jabber/jabber.c:1188
+#: src/protocols/jabber/jabber.c:1217
 msgid "Incorrect encoding in authorization"
 msgstr "Incorrect encoding in authorization"
 
-#: src/protocols/jabber/jabber.c:1191
+#: src/protocols/jabber/jabber.c:1220
 msgid "Invalid authzid"
 msgstr "Invalid authzid"
 
-#: src/protocols/jabber/jabber.c:1194
+#: src/protocols/jabber/jabber.c:1223
 msgid "Invalid Authorization Mechanism"
 msgstr "Invalid Authorization Mechanism"
 
-#: src/protocols/jabber/jabber.c:1197
+#: src/protocols/jabber/jabber.c:1226
 msgid "Authorization mechanism too weak"
 msgstr "Authorization mechanism too weak"
 
-#: src/protocols/jabber/jabber.c:1202
+#: src/protocols/jabber/jabber.c:1231
 msgid "Temporary Authentication Failure"
 msgstr "Temporary Authentication Failure"
 
-#: src/protocols/jabber/jabber.c:1204
+#: src/protocols/jabber/jabber.c:1233
 msgid "Authentication Failure"
 msgstr "Authentication Failure"
 
-#: src/protocols/jabber/jabber.c:1208
+#: src/protocols/jabber/jabber.c:1237
 msgid "Bad Format"
 msgstr "Bad Format"
 
-#: src/protocols/jabber/jabber.c:1210
+#: src/protocols/jabber/jabber.c:1239
 msgid "Bad Namespace Prefix"
 msgstr "Bad Namespace Prefix"
 
-#: src/protocols/jabber/jabber.c:1213
+#: src/protocols/jabber/jabber.c:1242
 msgid "Resource Conflict"
 msgstr "Resource Conflict"
 
-#: src/protocols/jabber/jabber.c:1215 src/protocols/silc/ops.c:1511
+#: src/protocols/jabber/jabber.c:1244 src/protocols/silc/ops.c:1513
 msgid "Connection Timeout"
 msgstr "Connection Timeout"
 
-#: src/protocols/jabber/jabber.c:1217
+#: src/protocols/jabber/jabber.c:1246
 msgid "Host Gone"
 msgstr "Host Gone"
 
-#: src/protocols/jabber/jabber.c:1219
+#: src/protocols/jabber/jabber.c:1248
 msgid "Host Unknown"
 msgstr "Host Unknown"
 
-#: src/protocols/jabber/jabber.c:1221
+#: src/protocols/jabber/jabber.c:1250
 msgid "Improper Addressing"
 msgstr "Improper Addressing"
 
-#: src/protocols/jabber/jabber.c:1225
+#: src/protocols/jabber/jabber.c:1254
 msgid "Invalid ID"
 msgstr "Invalid ID"
 
-#: src/protocols/jabber/jabber.c:1227
+#: src/protocols/jabber/jabber.c:1256
 msgid "Invalid Namespace"
 msgstr "Invalid Namespace"
 
-#: src/protocols/jabber/jabber.c:1229
+#: src/protocols/jabber/jabber.c:1258
 msgid "Invalid XML"
 msgstr "Invalid XML"
 
-#: src/protocols/jabber/jabber.c:1231
+#: src/protocols/jabber/jabber.c:1260
 msgid "Non-matching Hosts"
 msgstr "Non-matching Hosts"
 
-#: src/protocols/jabber/jabber.c:1235
+#: src/protocols/jabber/jabber.c:1264
 msgid "Policy Violation"
 msgstr "Policy Violation"
 
-#: src/protocols/jabber/jabber.c:1237
+#: src/protocols/jabber/jabber.c:1266
 msgid "Remote Connection Failed"
 msgstr "Remote Connection Failed"
 
-#: src/protocols/jabber/jabber.c:1239
+#: src/protocols/jabber/jabber.c:1268
 msgid "Resource Constraint"
 msgstr "Resource Constraint"
 
-#: src/protocols/jabber/jabber.c:1241
+#: src/protocols/jabber/jabber.c:1270
 msgid "Restricted XML"
 msgstr "Restricted XML"
 
-#: src/protocols/jabber/jabber.c:1243
+#: src/protocols/jabber/jabber.c:1272
 msgid "See Other Host"
 msgstr "See Other Host"
 
-#: src/protocols/jabber/jabber.c:1245
+#: src/protocols/jabber/jabber.c:1274
 msgid "System Shutdown"
 msgstr "System Shutdown"
 
-#: src/protocols/jabber/jabber.c:1247
+#: src/protocols/jabber/jabber.c:1276
 msgid "Undefined Condition"
 msgstr "Undefined Condition"
 
-#: src/protocols/jabber/jabber.c:1249
+#: src/protocols/jabber/jabber.c:1278
 msgid "Unsupported Encoding"
 msgstr "Unsupported Encoding"
 
-#: src/protocols/jabber/jabber.c:1251
+#: src/protocols/jabber/jabber.c:1280
 msgid "Unsupported Stanza Type"
 msgstr "Unsupported Stanza Type"
 
-#: src/protocols/jabber/jabber.c:1253
+#: src/protocols/jabber/jabber.c:1282
 msgid "Unsupported Version"
 msgstr "Unsupported Version"
 
-#: src/protocols/jabber/jabber.c:1255
+#: src/protocols/jabber/jabber.c:1284
 msgid "XML Not Well Formed"
 msgstr "XML Not Well Formed"
 
-#: src/protocols/jabber/jabber.c:1257
+#: src/protocols/jabber/jabber.c:1286
 msgid "Stream Error"
 msgstr "Stream Error"
 
-#: src/protocols/jabber/jabber.c:1324
+#: src/protocols/jabber/jabber.c:1353
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Unable to ban user %s"
 
-#: src/protocols/jabber/jabber.c:1376
+#: src/protocols/jabber/jabber.c:1405
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Unable to kick user %s"
 
-#: src/protocols/jabber/jabber.c:1402
+#: src/protocols/jabber/jabber.c:1431
 msgid "config:  Configure a chat room."
 msgstr "config:  Configure a chat room."
 
-#: src/protocols/jabber/jabber.c:1406
+#: src/protocols/jabber/jabber.c:1435
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Configure a chat room."
 
-#: src/protocols/jabber/jabber.c:1415
+#: src/protocols/jabber/jabber.c:1444
 msgid "part [room]:  Leave the room."
 msgstr "part [room]:  Leave the room."
 
-#: src/protocols/jabber/jabber.c:1420
+#: src/protocols/jabber/jabber.c:1449
 msgid "register:  Register with a chat room."
 msgstr "register:  Register with a chat room."
 
-#: src/protocols/jabber/jabber.c:1426
+#: src/protocols/jabber/jabber.c:1455
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [new topic]:  View or change the topic."
 
-#: src/protocols/jabber/jabber.c:1432
+#: src/protocols/jabber/jabber.c:1461
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;user&gt; [room]:  Ban a user from the room."
 
-#: src/protocols/jabber/jabber.c:1438
+#: src/protocols/jabber/jabber.c:1467
 msgid "invite &lt;user&gt; [room]:  Invite a user to the room."
 msgstr "invite &lt;user&gt; [room]:  Invite a user to the room."
 
-#: src/protocols/jabber/jabber.c:1444
+#: src/protocols/jabber/jabber.c:1473
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt;room&gt; [server]:  Join a chat on this server."
 
-#: src/protocols/jabber/jabber.c:1450
+#: src/protocols/jabber/jabber.c:1479
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;user&gt; [room]:  Kick a user from the room."
 
-#: src/protocols/jabber/jabber.c:1455
+#: src/protocols/jabber/jabber.c:1484
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 
-#: src/protocols/jabber/jabber.c:1470
+#: src/protocols/jabber/jabber.c:1499
 msgid "Hide Operating System"
 msgstr "Hide Operating System"
 
-#. *< api_version
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -6295,24 +6187,24 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/jabber/jabber.c:1555 src/protocols/jabber/jabber.c:1557
+#: src/protocols/jabber/jabber.c:1586 src/protocols/jabber/jabber.c:1588
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber Protocol Plugin"
 
-#: src/protocols/jabber/jabber.c:1583
+#: src/protocols/jabber/jabber.c:1614
 msgid "Use TLS if available"
 msgstr "Use TLS if available"
 
-#: src/protocols/jabber/jabber.c:1588
+#: src/protocols/jabber/jabber.c:1619
 msgid "Force old SSL"
 msgstr "Force old SSL"
 
-#: src/protocols/jabber/jabber.c:1593
+#: src/protocols/jabber/jabber.c:1624
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Allow plaintext auth over unencrypted streams"
 
 #. Account options
-#: src/protocols/jabber/jabber.c:1602 src/protocols/silc/silc.c:1582
+#: src/protocols/jabber/jabber.c:1633 src/protocols/silc/silc.c:1599
 msgid "Connect server"
 msgstr "Connect server"
 
@@ -6349,20 +6241,30 @@
 msgid "XML Parse error"
 msgstr "XML Parse error"
 
-#: src/protocols/jabber/presence.c:233
+#: src/protocols/jabber/presence.c:205
 msgid "Unknown Error in presence"
 msgstr "Unknown Error in presence"
 
-#: src/protocols/jabber/presence.c:236
+#: src/protocols/jabber/presence.c:208
 #, 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:289 src/protocols/jabber/presence.c:290
+#: src/protocols/jabber/presence.c:214 src/protocols/msn/userlist.c:100
+#: src/protocols/oscar/oscar.c:3728 src/protocols/oscar/oscar.c:6297
+msgid "Authorize"
+msgstr "Authorize"
+
+#: src/protocols/jabber/presence.c:215 src/protocols/msn/userlist.c:101
+#: src/protocols/oscar/oscar.c:3730 src/protocols/oscar/oscar.c:6298
+msgid "Deny"
+msgstr "Deny"
+
+#: src/protocols/jabber/presence.c:262 src/protocols/jabber/presence.c:263
 msgid "Create New Room"
 msgstr "Create New Room"
 
-#: src/protocols/jabber/presence.c:291
+#: src/protocols/jabber/presence.c:264
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -6370,20 +6272,20 @@
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
 
-#: src/protocols/jabber/presence.c:293
+#: src/protocols/jabber/presence.c:266
 msgid "Configure Room"
 msgstr "Configure Room"
 
-#: src/protocols/jabber/presence.c:295
+#: src/protocols/jabber/presence.c:268
 msgid "Accept Defaults"
 msgstr "Accept Defaults"
 
-#: src/protocols/jabber/presence.c:323
+#: src/protocols/jabber/presence.c:298
 #, c-format
 msgid "Error in chat %s"
 msgstr "Error in chat %s"
 
-#: src/protocols/jabber/presence.c:326
+#: src/protocols/jabber/presence.c:301
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Error joining chat %s"
@@ -6397,15 +6299,15 @@
 msgid "File Send Failed"
 msgstr "File Send Failed"
 
-#: src/protocols/msn/cmdproc.c:342
+#: src/protocols/msn/cmdproc.c:345
 msgid "Miscellaneous error"
 msgstr "Miscellaneous error"
 
-#: src/protocols/msn/cmdproc.c:345
+#: src/protocols/msn/cmdproc.c:348
 msgid "You have signed on from another location."
 msgstr "You have signed on from another location."
 
-#: src/protocols/msn/cmdproc.c:347
+#: src/protocols/msn/cmdproc.c:350
 msgid "The MSN servers are going down temporarily."
 msgstr "The MSN servers are going down temporarily."
 
@@ -6453,7 +6355,7 @@
 msgid "Not on list"
 msgstr "Not on list"
 
-#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:601
+#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:681
 msgid "User is offline"
 msgstr "User is offline"
 
@@ -6505,7 +6407,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:189
+#: src/protocols/msn/error.c:112 src/protocols/oscar/oscar.c:194
 msgid "Not logged in"
 msgstr "Not logged in"
 
@@ -6598,8 +6500,8 @@
 msgid "Server too busy"
 msgstr "Server too busy"
 
-#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2150
-#: src/protocols/silc/ops.c:1500 src/protocols/toc/toc.c:629
+#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2192
+#: src/protocols/silc/ops.c:1502 src/protocols/toc/toc.c:631
 msgid "Authentication failed"
 msgstr "Authentication failed"
 
@@ -6633,35 +6535,35 @@
 msgid "MSN Error: %s\n"
 msgstr "MSN Error: %s\n"
 
-#: src/protocols/msn/msn.c:114
+#: src/protocols/msn/msn.c:118
 msgid "Your new MSN friendly name is too long."
 msgstr "Your new MSN friendly name is too long."
 
-#: src/protocols/msn/msn.c:222
+#: src/protocols/msn/msn.c:226
 msgid "Set your friendly name."
 msgstr "Set your friendly name."
 
-#: src/protocols/msn/msn.c:223
+#: src/protocols/msn/msn.c:227
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "This is the name that other MSN buddies will see you as."
 
-#: src/protocols/msn/msn.c:239
+#: src/protocols/msn/msn.c:243
 msgid "Set your home phone number."
 msgstr "Set your home phone number."
 
-#: src/protocols/msn/msn.c:254
+#: src/protocols/msn/msn.c:258
 msgid "Set your work phone number."
 msgstr "Set your work phone number."
 
-#: src/protocols/msn/msn.c:269
+#: src/protocols/msn/msn.c:273
 msgid "Set your mobile phone number."
 msgstr "Set your mobile phone number."
 
-#: src/protocols/msn/msn.c:282
+#: src/protocols/msn/msn.c:286
 msgid "Allow MSN Mobile pages?"
 msgstr "Allow MSN Mobile pages?"
 
-#: src/protocols/msn/msn.c:283
+#: src/protocols/msn/msn.c:287
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
@@ -6669,23 +6571,24 @@
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
 
-#: src/protocols/msn/msn.c:287
+#: src/protocols/msn/msn.c:291
 msgid "Allow"
 msgstr "Allow"
 
-#: src/protocols/msn/msn.c:288
+#: src/protocols/msn/msn.c:292
 msgid "Disallow"
 msgstr "Disallow"
 
-#: src/protocols/msn/msn.c:311
+#: src/protocols/msn/msn.c:315
 msgid "Send a mobile message."
 msgstr "Send a mobile message."
 
-#: src/protocols/msn/msn.c:313
+#: src/protocols/msn/msn.c:317
 msgid "Page"
 msgstr "Page"
 
-#: src/protocols/msn/msn.c:451 src/protocols/yahoo/yahoo.c:2686
+#: src/protocols/msn/msn.c:500 src/protocols/msn/msn.c:507
+#: src/protocols/yahoo/yahoo.c:2760
 #, c-format
 msgid ""
 "\n"
@@ -6694,80 +6597,70 @@
 "\n"
 "<b>%s:</b> %s"
 
-#: src/protocols/msn/msn.c:464 src/protocols/msn/msn.c:757
-#: src/protocols/msn/state.c:34
-msgid "Away From Computer"
-msgstr "Away From Computer"
-
-#: src/protocols/msn/msn.c:465 src/protocols/msn/msn.c:759
-#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2543
-#: src/protocols/yahoo/yahoo.c:2910 src/protocols/yahoo/yahoo.c:3026
+#: src/protocols/msn/msn.c:507
+msgid "Has you"
+msgstr "Has you"
+
+#: src/protocols/msn/msn.c:538 src/protocols/msn/state.c:33
+#: src/protocols/yahoo/yahoo.c:2617 src/protocols/yahoo/yahoo.c:3119
 msgid "Be Right Back"
 msgstr "Be Right Back"
 
-#: src/protocols/msn/msn.c:466 src/protocols/msn/msn.c:761
-#: 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:2545
-#: src/protocols/yahoo/yahoo.c:2912 src/protocols/yahoo/yahoo.c:3027
+#: src/protocols/msn/msn.c:542 src/protocols/msn/state.c:31
+#: src/protocols/novell/novell.c:2810 src/protocols/novell/novell.c:2925
+#: src/protocols/novell/novell.c:2979 src/protocols/silc/buddy.c:1388
+#: src/protocols/silc/silc.c:54 src/protocols/yahoo/yahoo.c:2619
+#: src/protocols/yahoo/yahoo.c:3122
 msgid "Busy"
 msgstr "Busy"
 
-#: src/protocols/msn/msn.c:467 src/protocols/msn/msn.c:763
-#: src/protocols/msn/state.c:35 src/protocols/yahoo/yahoo.c:2553
-#: src/protocols/yahoo/yahoo.c:2920 src/protocols/yahoo/yahoo.c:3031
+#: src/protocols/msn/msn.c:546 src/protocols/msn/state.c:35
+#: src/protocols/yahoo/yahoo.c:2627 src/protocols/yahoo/yahoo.c:3134
 msgid "On The Phone"
 msgstr "On The Phone"
 
-#: src/protocols/msn/msn.c:468 src/protocols/msn/msn.c:765
-#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2557
-#: src/protocols/yahoo/yahoo.c:2924 src/protocols/yahoo/yahoo.c:3033
+#: src/protocols/msn/msn.c:550 src/protocols/msn/state.c:36
+#: src/protocols/yahoo/yahoo.c:2631 src/protocols/yahoo/yahoo.c:3140
 msgid "Out To Lunch"
 msgstr "Out To Lunch"
 
-#: src/protocols/msn/msn.c:469 src/protocols/msn/msn.c:767
-#: src/protocols/zephyr/zephyr.c:1360 src/protocols/zephyr/zephyr.c:1379
+#: src/protocols/msn/msn.c:554 src/protocols/zephyr/zephyr.c:2220
 msgid "Hidden"
 msgstr "Hidden"
 
-#: src/protocols/msn/msn.c:480
+#: src/protocols/msn/msn.c:566
 msgid "Set Friendly Name"
 msgstr "Set Friendly Name"
 
-#: src/protocols/msn/msn.c:485
+#: src/protocols/msn/msn.c:571
 msgid "Set Home Phone Number"
 msgstr "Set Home Phone Number"
 
-#: src/protocols/msn/msn.c:489
+#: src/protocols/msn/msn.c:575
 msgid "Set Work Phone Number"
 msgstr "Set Work Phone Number"
 
-#: src/protocols/msn/msn.c:493
+#: src/protocols/msn/msn.c:579
 msgid "Set Mobile Phone Number"
 msgstr "Set Mobile Phone Number"
 
-#: src/protocols/msn/msn.c:499
+#: src/protocols/msn/msn.c:585
 msgid "Enable/Disable Mobile Devices"
 msgstr "Enable/Disable Mobile Devices"
 
-#: src/protocols/msn/msn.c:504
+#: src/protocols/msn/msn.c:590
 msgid "Allow/Disallow Mobile Pages"
 msgstr "Allow/Disallow Mobile Pages"
 
-#: src/protocols/msn/msn.c:527
+#: src/protocols/msn/msn.c:613
 msgid "Send to Mobile"
 msgstr "Send to Mobile"
 
-#: src/protocols/msn/msn.c:537
+#: src/protocols/msn/msn.c:623
 msgid "Initiate Chat"
 msgstr "Initiate Chat"
 
-#: src/protocols/msn/msn.c:541
-msgid "Update Buddy Icon"
-msgstr "Update Buddy Icon"
-
-#: src/protocols/msn/msn.c:578
+#: src/protocols/msn/msn.c:659
 msgid ""
 "SSL support is needed for MSN. Please install a supported SSL library. See "
 "http://gaim.sf.net/faq-ssl.php for more information."
@@ -6775,91 +6668,91 @@
 "SSL support is needed for MSN. Please install a supported SSL library. See "
 "http://gaim.sf.net/faq-ssl.php for more information."
 
-#: src/protocols/msn/msn.c:1168 src/protocols/yahoo/yahoo_profile.c:659
-#: src/protocols/zephyr/zephyr.c:634
+#: src/protocols/msn/msn.c:1304 src/protocols/yahoo/yahoo_profile.c:659
+#: src/protocols/zephyr/zephyr.c:712 src/protocols/zephyr/zephyr.c:1126
 #, c-format
 msgid "<b>Alias:</b> %s<br>"
 msgstr "<b>Alias:</b> %s<br>"
 
 #. put a link to the actual profile URL
-#: src/protocols/msn/msn.c:1173 src/protocols/msn/msn.c:1513
-#: src/protocols/yahoo/yahoo_profile.c:1168 src/util.c:782
+#: src/protocols/msn/msn.c:1311 src/protocols/msn/msn.c:1667
+#: src/protocols/yahoo/yahoo_profile.c:1170 src/util.c:782
 #, c-format
 msgid "<b>%s:</b> "
 msgstr "<b>%s:</b> "
 
-#: src/protocols/msn/msn.c:1243
+#: src/protocols/msn/msn.c:1397
 msgid "MSN Profile"
 msgstr "MSN Profile"
 
-#: src/protocols/msn/msn.c:1248 src/protocols/msn/msn.c:1500
-#: src/protocols/yahoo/yahoo_profile.c:761
+#: src/protocols/msn/msn.c:1402 src/protocols/msn/msn.c:1654
+#: src/protocols/yahoo/yahoo_profile.c:763
 msgid "Error retrieving profile"
 msgstr "Error retrieving profile"
 
 #. Age
-#: src/protocols/msn/msn.c:1319 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
+#: src/protocols/msn/msn.c:1473 src/protocols/oscar/oscar.c:5074
+#: src/protocols/trepia/trepia.c:286 src/protocols/trepia/trepia.c:405
+#: src/protocols/yahoo/yahoo_profile.c:1017
 msgid "Age"
 msgstr "Age"
 
 #. Gender
-#: src/protocols/msn/msn.c:1326 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
+#: src/protocols/msn/msn.c:1480 src/protocols/oscar/oscar.c:5061
+#: src/protocols/trepia/trepia.c:280 src/protocols/trepia/trepia.c:407
+#: src/protocols/yahoo/yahoo_profile.c:1027
 msgid "Gender"
 msgstr "Gender"
 
-#: src/protocols/msn/msn.c:1335 src/protocols/yahoo/yahoo_profile.c:1020
+#: src/protocols/msn/msn.c:1489 src/protocols/yahoo/yahoo_profile.c:1022
 msgid "Marital Status"
 msgstr "Marital Status"
 
-#: src/protocols/msn/msn.c:1342 src/protocols/novell/novell.c:1444
-#: src/protocols/yahoo/yahoo_profile.c:1010
+#: src/protocols/msn/msn.c:1496 src/protocols/novell/novell.c:1452
+#: src/protocols/yahoo/yahoo_profile.c:1012
 msgid "Location"
 msgstr "Location"
 
-#: src/protocols/msn/msn.c:1350 src/protocols/yahoo/yahoo_profile.c:1030
+#: src/protocols/msn/msn.c:1504 src/protocols/yahoo/yahoo_profile.c:1032
 msgid "Occupation"
 msgstr "Occupation"
 
-#: src/protocols/msn/msn.c:1367 src/protocols/msn/msn.c:1373
-#: src/protocols/msn/msn.c:1380 src/protocols/msn/msn.c:1388
-#: src/protocols/msn/msn.c:1395
+#: src/protocols/msn/msn.c:1521 src/protocols/msn/msn.c:1527
+#: src/protocols/msn/msn.c:1534 src/protocols/msn/msn.c:1542
+#: src/protocols/msn/msn.c:1549
 msgid "A Little About Me"
 msgstr "A Little About Me"
 
-#: src/protocols/msn/msn.c:1404 src/protocols/msn/msn.c:1410
-#: src/protocols/msn/msn.c:1417 src/protocols/msn/msn.c:1424
+#: src/protocols/msn/msn.c:1558 src/protocols/msn/msn.c:1564
+#: src/protocols/msn/msn.c:1571 src/protocols/msn/msn.c:1578
 msgid "Favorite Things"
 msgstr "Favourite Things"
 
-#: src/protocols/msn/msn.c:1433 src/protocols/msn/msn.c:1439
-#: src/protocols/msn/msn.c:1446
+#: src/protocols/msn/msn.c:1587 src/protocols/msn/msn.c:1593
+#: src/protocols/msn/msn.c:1600
 msgid "Hobbies and Interests"
 msgstr "Hobbies and Interests"
 
-#: src/protocols/msn/msn.c:1455 src/protocols/msn/msn.c:1461
-#: src/protocols/yahoo/yahoo_profile.c:1072
+#: src/protocols/msn/msn.c:1609 src/protocols/msn/msn.c:1615
+#: src/protocols/yahoo/yahoo_profile.c:1074
 msgid "Favorite Quote"
 msgstr "Favuorite Quote"
 
-#: src/protocols/msn/msn.c:1469 src/protocols/yahoo/yahoo_profile.c:1123
+#: src/protocols/msn/msn.c:1623 src/protocols/yahoo/yahoo_profile.c:1125
 msgid "Last Updated"
 msgstr "Last Updated"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1480 src/protocols/silc/ops.c:844
-#: src/protocols/trepia/trepia.c:289 src/protocols/trepia/trepia.c:419
+#: src/protocols/msn/msn.c:1634 src/protocols/silc/ops.c:844
+#: src/protocols/trepia/trepia.c:290 src/protocols/trepia/trepia.c:420
 msgid "Homepage"
 msgstr "Homepage"
 
-#: src/protocols/msn/msn.c:1502
+#: src/protocols/msn/msn.c:1656
 msgid "The user has not created a public profile."
 msgstr "The user has not created a public profile."
 
-#: src/protocols/msn/msn.c:1503
+#: src/protocols/msn/msn.c:1657
 msgid ""
 "MSN reported not being able to find the user's profile. This either means "
 "that the user does not exist, or that the user exists but has not created a "
@@ -6869,7 +6762,8 @@
 "that the user does not exist, or that the user exists but has not created a "
 "public profile."
 
-#: src/protocols/msn/msn.c:1507
+#. This should never happen
+#: src/protocols/msn/msn.c:1661
 msgid ""
 "Gaim could not find any information in the user's profile. The user most "
 "likely does not exist."
@@ -6877,19 +6771,18 @@
 "Gaim could not find any information in the user's profile. The user most "
 "likely does not exist."
 
-#: src/protocols/msn/msn.c:1513 src/protocols/yahoo/yahoo_profile.c:1168
+#: src/protocols/msn/msn.c:1667 src/protocols/yahoo/yahoo_profile.c:1170
 msgid "Profile URL"
 msgstr "Profile URL"
 
-#: src/protocols/msn/msn.c:1645
+#: src/protocols/msn/msn.c:1808
 msgid "Display conversation closed notices"
 msgstr "Display conversation closed notices"
 
-#: src/protocols/msn/msn.c:1650
+#: src/protocols/msn/msn.c:1813
 msgid "Display timeout notices"
 msgstr "Display timeout notices"
 
-#. *< api_version
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -6900,15 +6793,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/msn/msn.c:1735 src/protocols/msn/msn.c:1737
+#: src/protocols/msn/msn.c:1900 src/protocols/msn/msn.c:1902
 msgid "MSN Protocol Plugin"
 msgstr "MSN Protocol Plugin"
 
-#: src/protocols/msn/msn.c:1756 src/protocols/trepia/trepia.c:1293
+#: src/protocols/msn/msn.c:1921 src/protocols/trepia/trepia.c:1298
 msgid "Login server"
 msgstr "Login server"
 
-#: src/protocols/msn/msn.c:1765
+#: src/protocols/msn/msn.c:1930
 msgid "Use HTTP Method"
 msgstr "Use HTTP Method"
 
@@ -6916,7 +6809,7 @@
 msgid "Unable to connect to server"
 msgstr "Unable to connect to server"
 
-#: src/protocols/msn/nexus.c:215
+#: src/protocols/msn/nexus.c:218
 msgid "Unknown error when attempting to authorize with MSN login server."
 msgstr "Unknown error when attempting to authorize with MSN login server."
 
@@ -6924,16 +6817,16 @@
 msgid "Requesting to send password"
 msgstr "Requesting to send password"
 
-#: src/protocols/msn/notification.c:118 src/protocols/trepia/trepia.c:635
+#: src/protocols/msn/notification.c:118 src/protocols/trepia/trepia.c:636
 msgid "Retrieving buddy list"
 msgstr "Retrieving buddy list"
 
 #: src/protocols/msn/notification.c:144 src/protocols/msn/notification.c:173
-#: src/protocols/oscar/oscar.c:2440
+#: src/protocols/oscar/oscar.c:2481
 msgid "Password sent"
 msgstr "Password sent"
 
-#: src/protocols/msn/notification.c:1079
+#: src/protocols/msn/notification.c:1095
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -6964,7 +6857,7 @@
 "After the maintenance has been completed, you will be able to successfully "
 "sign in."
 
-#: src/protocols/msn/notification.c:1144
+#: src/protocols/msn/notification.c:1160
 msgid "Syncing with server"
 msgstr "Syncing with server"
 
@@ -6997,6 +6890,10 @@
 msgid "Received HTTP error. Please report this."
 msgstr "Received HTTP error. Please report this."
 
+#: src/protocols/msn/state.c:34
+msgid "Away From Computer"
+msgstr "Away From Computer"
+
 #: src/protocols/msn/switchboard.c:172
 msgid "The conversation has become inactive and timed out."
 msgstr "The conversation has become inactive and timed out."
@@ -7006,48 +6903,48 @@
 msgid "%s has closed the conversation window."
 msgstr "%s has closed the conversation window."
 
-#: src/protocols/msn/userlist.c:86
+#: src/protocols/msn/userlist.c:85
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr "The user %s (%s) wants to add %s to his or her buddy list."
 
-#: src/protocols/msn/userlist.c:94
+#: src/protocols/msn/userlist.c:93
 #, c-format
 msgid "The user %s wants to add %s to his or her buddy list."
 msgstr "The user %s wants to add %s to his or her buddy list."
 
-#: src/protocols/napster/napster.c:229
+#: src/protocols/napster/napster.c:242
 msgid "Unable to read header from server"
 msgstr "Unable to read header from server"
 
-#: src/protocols/napster/napster.c:243
+#: src/protocols/napster/napster.c:256
 #, c-format
 msgid "Unable to read message from server: %s.  Command is %hd, length is %hd."
 msgstr ""
 "Unable to read message from server: %s.  Command is %hd, length is %hd."
 
-#: src/protocols/napster/napster.c:306
+#: src/protocols/napster/napster.c:319
 #, c-format
 msgid "users: %s, files: %s, size: %sGB"
 msgstr "users: %s, files: %s, size: %sGB"
 
 #. MSG_SERVER_HOTLIST_ERROR
-#: src/protocols/napster/napster.c:317
+#: src/protocols/napster/napster.c:330
 #, c-format
 msgid "Unable to add \"%s\" to your Napster hotlist"
 msgstr "Unable to add \"%s\" to your Napster hotlist"
 
-#: src/protocols/napster/napster.c:325
+#: src/protocols/napster/napster.c:338
 msgid "You were disconnected from the server."
 msgstr "You were disconnected from the server."
 
 #. MSG_CLIENT_WHOIS
-#: src/protocols/napster/napster.c:383
+#: src/protocols/napster/napster.c:396
 #, c-format
 msgid "%s requested your information"
 msgstr "%s requested your information"
 
-#: src/protocols/napster/napster.c:421
+#: src/protocols/napster/napster.c:434
 msgid ""
 "You were disconnected from the server, because you logged on from a "
 "different location"
@@ -7056,16 +6953,15 @@
 "different location"
 
 #. MSG_CLIENT_PING
-#: src/protocols/napster/napster.c:427
+#: src/protocols/napster/napster.c:440
 #, c-format
 msgid "%s requested a PING"
 msgstr "%s requested a PING"
 
-#: src/protocols/napster/napster.c:540 src/protocols/toc/toc.c:1266
+#: src/protocols/napster/napster.c:554 src/protocols/toc/toc.c:1275
 msgid "_Group:"
 msgstr "_Group:"
 
-#. *< api_version
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -7076,7 +6972,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/napster/napster.c:636 src/protocols/napster/napster.c:638
+#: src/protocols/napster/napster.c:652 src/protocols/napster/napster.c:654
 msgid "NAPSTER Protocol Plugin"
 msgstr "NAPSTER Protocol Plugin"
 
@@ -7209,43 +7105,43 @@
 msgid "Unknown error: 0x%X"
 msgstr "Unknown error: 0x%X"
 
-#: src/protocols/novell/novell.c:116
+#: src/protocols/novell/novell.c:117
 #, c-format
 msgid "Login failed (%s)."
 msgstr "Login failed (%s)."
 
-#: src/protocols/novell/novell.c:229
+#: src/protocols/novell/novell.c:230
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr "Unable to send message. Could not get details for user (%s)."
 
-#: src/protocols/novell/novell.c:378
+#: src/protocols/novell/novell.c:379
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
 msgstr "Unable to add %s to your buddy list (%s)."
 
 #. TODO: Improve this! message to who or for what conference?
-#: src/protocols/novell/novell.c:404
+#: src/protocols/novell/novell.c:405
 #, c-format
 msgid "Unable to send message (%s)."
 msgstr "Unable to send message (%s)."
 
-#: src/protocols/novell/novell.c:475 src/protocols/novell/novell.c:969
+#: src/protocols/novell/novell.c:476 src/protocols/novell/novell.c:970
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "Unable to invite user (%s)."
 
-#: src/protocols/novell/novell.c:514
+#: src/protocols/novell/novell.c:515
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr "Unable to send message to %s. Could not create the conference (%s)."
 
-#: src/protocols/novell/novell.c:519
+#: src/protocols/novell/novell.c:520
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
 msgstr "Unable to send message. Could not create the conference (%s)."
 
-#: src/protocols/novell/novell.c:566
+#: src/protocols/novell/novell.c:567
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
@@ -7254,7 +7150,7 @@
 "Unable to move user %s to folder %s in the server side list. Error while "
 "creating folder (%s)."
 
-#: src/protocols/novell/novell.c:614
+#: src/protocols/novell/novell.c:615
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
@@ -7263,67 +7159,67 @@
 "Unable to add %s to your buddy list. Error creating folder in server side "
 "list (%s)."
 
-#: src/protocols/novell/novell.c:687
+#: src/protocols/novell/novell.c:688
 #, 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:733 src/protocols/novell/novell.c:879
+#: src/protocols/novell/novell.c:734 src/protocols/novell/novell.c:880
 #, 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:780
+#: src/protocols/novell/novell.c:781
 #, 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:833
+#: src/protocols/novell/novell.c:834
 #, 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:901
+#: src/protocols/novell/novell.c:902
 #, 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:924 src/protocols/novell/novell.c:1619
+#: src/protocols/novell/novell.c:925 src/protocols/novell/novell.c:1627
 #, 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:996
+#: src/protocols/novell/novell.c:997
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "Unable to create conference (%s)."
 
-#: src/protocols/novell/novell.c:1107 src/protocols/novell/novell.c:1658
+#: src/protocols/novell/novell.c:1108 src/protocols/novell/novell.c:1666
 msgid "Error communicating with server. Closing connection."
 msgstr "Error communicating with server. Closing connection."
 
-#: src/protocols/novell/novell.c:1442
+#: src/protocols/novell/novell.c:1450
 msgid "Telephone Number"
 msgstr "Telephone Number"
 
-#: src/protocols/novell/novell.c:1446
+#: src/protocols/novell/novell.c:1454
 msgid "Department"
 msgstr "Department"
 
-#: src/protocols/novell/novell.c:1448
+#: src/protocols/novell/novell.c:1456
 msgid "Personal Title"
 msgstr "Personal Title"
 
-#: src/protocols/novell/novell.c:1452
+#: src/protocols/novell/novell.c:1460
 msgid "Mailstop"
 msgstr "Mailstop"
 
-#: src/protocols/novell/novell.c:1454 src/protocols/oscar/oscar.c:4980
-#: src/protocols/oscar/oscar.c:4987
+#: src/protocols/novell/novell.c:1462 src/protocols/oscar/oscar.c:5047
+#: src/protocols/oscar/oscar.c:5054
 msgid "Email Address"
 msgstr "Email Address"
 
-#: src/protocols/novell/novell.c:1470
+#: src/protocols/novell/novell.c:1478
 msgid "User ID"
 msgstr "User ID"
 
@@ -7334,46 +7230,46 @@
 #. tag, value);
 #. }
 #.
-#: src/protocols/novell/novell.c:1484
+#: src/protocols/novell/novell.c:1492
 msgid "Full name"
 msgstr "Full name"
 
-#: src/protocols/novell/novell.c:1505
+#: src/protocols/novell/novell.c:1513
 msgid "User Properties"
 msgstr "User Properties"
 
-#: src/protocols/novell/novell.c:1609
+#: src/protocols/novell/novell.c:1617
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "GroupWise Conference %d"
 
-#: src/protocols/novell/novell.c:1634
+#: src/protocols/novell/novell.c:1642
 msgid "Unable to make SSL connection to server."
 msgstr "Unable to make SSL connection to server."
 
-#: src/protocols/novell/novell.c:1664
+#: src/protocols/novell/novell.c:1672
 #, c-format
 msgid "Error processing event or response (%s)."
 msgstr "Error processing event or response (%s)."
 
-#: src/protocols/novell/novell.c:1698
+#: src/protocols/novell/novell.c:1706
 msgid "Authenticating..."
 msgstr "Authenticating..."
 
-#: src/protocols/novell/novell.c:1713
+#: src/protocols/novell/novell.c:1721
 msgid "Waiting for response..."
 msgstr "Waiting for response..."
 
-#: src/protocols/novell/novell.c:1848
+#: src/protocols/novell/novell.c:1856
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "%s has been invited to this conversation."
 
-#: src/protocols/novell/novell.c:1875
+#: src/protocols/novell/novell.c:1883
 msgid "Invitation to Conversation"
 msgstr "Invitation to Conversation"
 
-#: src/protocols/novell/novell.c:1876
+#: src/protocols/novell/novell.c:1884
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -7384,26 +7280,22 @@
 "\n"
 "Sent: %s"
 
-#: src/protocols/novell/novell.c:1878
+#: src/protocols/novell/novell.c:1886
 msgid "Would you like to join the conversation?"
 msgstr "Would you like to join the conversation?"
 
-#: src/protocols/novell/novell.c:1983
+#: src/protocols/novell/novell.c:1992
 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:2037
+#: src/protocols/novell/novell.c:2046
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr ""
 "%s appears to be offline and did not receive the message that you just sent."
 
-#. TODO: Would be nice to prompt if not set!
-#. *  gaim_request_fields(gc, _("Server Address"),...);
-#.
-#. ...but for now just error out with a nice message.
-#: src/protocols/novell/novell.c:2135
+#: src/protocols/novell/novell.c:2144
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
@@ -7411,32 +7303,22 @@
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
 
-#: src/protocols/novell/novell.c:2157
+#: src/protocols/novell/novell.c:2166
 msgid "Error. SSL support is not installed."
 msgstr "Error. SSL support is not installed."
 
-#: src/protocols/novell/novell.c:2461
+#: src/protocols/novell/novell.c:2470
 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: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:2818
-msgid "Message"
-msgstr "Message"
-
-#: src/protocols/novell/novell.c:2917 src/protocols/novell/novell.c:2973
+#: src/protocols/novell/novell.c:2926 src/protocols/novell/novell.c:2982
 msgid "Appear Offline"
 msgstr "Appear Offline"
 
-#: src/protocols/novell/novell.c:3367
+#: src/protocols/novell/novell.c:3376
 msgid "Initiate _Chat"
 msgstr "Initiate _Chat"
 
-#. *< api_version
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -7447,277 +7329,270 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/novell/novell.c:3464 src/protocols/novell/novell.c:3466
+#: src/protocols/novell/novell.c:3475 src/protocols/novell/novell.c:3477
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GroupWise Messenger Protocol Plugin"
 
-#: src/protocols/novell/novell.c:3485
+#: src/protocols/novell/novell.c:3496
 msgid "Server address"
 msgstr "Server address"
 
-#: src/protocols/novell/novell.c:3489
+#: src/protocols/novell/novell.c:3500
 msgid "Server port"
 msgstr "Server port"
 
-#: src/protocols/oscar/oscar.c:185
+#: src/protocols/oscar/oscar.c:190
 msgid "Invalid error"
 msgstr "Invalid error"
 
-#: src/protocols/oscar/oscar.c:186
+#: src/protocols/oscar/oscar.c:191
 msgid "Invalid SNAC"
 msgstr "Invalid SNAC"
 
-#: src/protocols/oscar/oscar.c:187
+#: src/protocols/oscar/oscar.c:192
 msgid "Rate to host"
 msgstr "Rate to host"
 
-#: src/protocols/oscar/oscar.c:188
+#: src/protocols/oscar/oscar.c:193
 msgid "Rate to client"
 msgstr "Rate to client"
 
-#: src/protocols/oscar/oscar.c:190
+#: src/protocols/oscar/oscar.c:195
 msgid "Service unavailable"
 msgstr "Service unavailable"
 
-#: src/protocols/oscar/oscar.c:191
+#: src/protocols/oscar/oscar.c:196
 msgid "Service not defined"
 msgstr "Service not defined"
 
-#: src/protocols/oscar/oscar.c:192
+#: src/protocols/oscar/oscar.c:197
 msgid "Obsolete SNAC"
 msgstr "Obsolete SNAC"
 
-#: src/protocols/oscar/oscar.c:193
+#: src/protocols/oscar/oscar.c:198
 msgid "Not supported by host"
 msgstr "Not supported by host"
 
-#: src/protocols/oscar/oscar.c:194
-msgid "Not supported by client"
-msgstr "Not supported by client"
-
-#: src/protocols/oscar/oscar.c:195
-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:198
-msgid "Request denied"
-msgstr "Request denied"
-
 #: src/protocols/oscar/oscar.c:199
-msgid "Busted SNAC payload"
-msgstr "Busted SNAC payload"
+msgid "Not supported by client"
+msgstr "Not supported by client"
 
 #: src/protocols/oscar/oscar.c:200
-msgid "Insufficient rights"
-msgstr "Insufficient rights"
+msgid "Refused by client"
+msgstr "Refused by client"
 
 #: src/protocols/oscar/oscar.c:201
-msgid "In local permit/deny"
-msgstr "In local permit/deny"
+msgid "Reply too big"
+msgstr "Reply too big"
 
 #: src/protocols/oscar/oscar.c:202
-msgid "Too evil (sender)"
-msgstr "Too evil (sender)"
+msgid "Responses lost"
+msgstr "Responses lost"
 
 #: src/protocols/oscar/oscar.c:203
-msgid "Too evil (receiver)"
-msgstr "Too evil (receiver)"
+msgid "Request denied"
+msgstr "Request denied"
 
 #: src/protocols/oscar/oscar.c:204
-msgid "User temporarily unavailable"
-msgstr "User temporarily unavailable"
+msgid "Busted SNAC payload"
+msgstr "Busted SNAC payload"
 
 #: src/protocols/oscar/oscar.c:205
-msgid "No match"
-msgstr "No match"
+msgid "Insufficient rights"
+msgstr "Insufficient rights"
 
 #: src/protocols/oscar/oscar.c:206
-msgid "List overflow"
-msgstr "List overflow"
+msgid "In local permit/deny"
+msgstr "In local permit/deny"
 
 #: src/protocols/oscar/oscar.c:207
-msgid "Request ambiguous"
-msgstr "Request ambiguous"
+msgid "Too evil (sender)"
+msgstr "Too evil (sender)"
 
 #: src/protocols/oscar/oscar.c:208
+msgid "Too evil (receiver)"
+msgstr "Too evil (receiver)"
+
+#: src/protocols/oscar/oscar.c:209
+msgid "User temporarily unavailable"
+msgstr "User temporarily unavailable"
+
+#: src/protocols/oscar/oscar.c:210
+msgid "No match"
+msgstr "No match"
+
+#: src/protocols/oscar/oscar.c:211
+msgid "List overflow"
+msgstr "List overflow"
+
+#: src/protocols/oscar/oscar.c:212
+msgid "Request ambiguous"
+msgstr "Request ambiguous"
+
+#: src/protocols/oscar/oscar.c:213
 msgid "Queue full"
 msgstr "Queue full"
 
-#: src/protocols/oscar/oscar.c:209
+#: src/protocols/oscar/oscar.c:214
 msgid "Not while on AOL"
 msgstr "Not while on AOL"
 
-#: 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.)"
-msgstr ""
-"(There was an error converting this message.  The buddy you are speaking to "
+#: src/protocols/oscar/oscar.c:401 src/protocols/oscar/oscar.c:484
+msgid ""
+"(There was an error receiving this message.  The buddy you are speaking to "
 "most likely has a buggy client.)"
-
-#: 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
+msgstr ""
+"(There was an error receiving this message.  The buddy you are speaking to "
+"most likely has a buggy client.)"
+
+#: src/protocols/oscar/oscar.c:586
 msgid "Voice"
 msgstr "Voice"
 
-#: src/protocols/oscar/oscar.c:560
+#: src/protocols/oscar/oscar.c:589
 msgid "AIM Direct IM"
 msgstr "AIM Direct IM"
 
-#: src/protocols/oscar/oscar.c:563 src/protocols/silc/silc.c:641
+#: src/protocols/oscar/oscar.c:592 src/protocols/silc/silc.c:656
 #: src/protocols/silc/util.c:506
 msgid "Chat"
 msgstr "Chat"
 
-#: src/protocols/oscar/oscar.c:566 src/protocols/oscar/oscar.c:6870
+#: src/protocols/oscar/oscar.c:595 src/protocols/oscar/oscar.c:7010
 msgid "Get File"
 msgstr "Get File"
 
-#: src/protocols/oscar/oscar.c:573
+#: src/protocols/oscar/oscar.c:602
 msgid "Games"
 msgstr "Games"
 
-#: src/protocols/oscar/oscar.c:576
+#: src/protocols/oscar/oscar.c:605
 msgid "Add-Ins"
 msgstr "Add-Ins"
 
-#: src/protocols/oscar/oscar.c:579
+#: src/protocols/oscar/oscar.c:608
 msgid "Send Buddy List"
 msgstr "Send Buddy List"
 
-#: src/protocols/oscar/oscar.c:582
+#: src/protocols/oscar/oscar.c:611
 msgid "ICQ Direct Connect"
 msgstr "ICQ Direct Connect"
 
-#: src/protocols/oscar/oscar.c:585
+#: src/protocols/oscar/oscar.c:614
 msgid "AP User"
 msgstr "AP User"
 
-#: src/protocols/oscar/oscar.c:588
+#: src/protocols/oscar/oscar.c:617
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:591
+#: src/protocols/oscar/oscar.c:620
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: src/protocols/oscar/oscar.c:594
+#: src/protocols/oscar/oscar.c:623
 msgid "ICQ Server Relay"
 msgstr "ICQ Server Relay"
 
-#: src/protocols/oscar/oscar.c:597
+#: src/protocols/oscar/oscar.c:626
 msgid "Old ICQ UTF8"
 msgstr "Old ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:600
+#: src/protocols/oscar/oscar.c:629
 msgid "Trillian Encryption"
 msgstr "Trillian Encryption"
 
-#: src/protocols/oscar/oscar.c:603
+#: src/protocols/oscar/oscar.c:632
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:606
+#: src/protocols/oscar/oscar.c:635
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: src/protocols/oscar/oscar.c:609
+#: src/protocols/oscar/oscar.c:638
 msgid "Security Enabled"
 msgstr "Security Enabled"
 
-#: src/protocols/oscar/oscar.c:612
+#: src/protocols/oscar/oscar.c:641
 msgid "Video Chat"
 msgstr "Video Chat"
 
-#: src/protocols/oscar/oscar.c:616
+#: src/protocols/oscar/oscar.c:645
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: src/protocols/oscar/oscar.c:619
+#: src/protocols/oscar/oscar.c:648
 msgid "Live Video"
 msgstr "Live Video"
 
-#: src/protocols/oscar/oscar.c:622
+#: src/protocols/oscar/oscar.c:651
 msgid "Camera"
 msgstr "Camera"
 
-#: src/protocols/oscar/oscar.c:640 src/protocols/oscar/oscar.c:5582
-#: src/protocols/oscar/oscar.c:6762
+#: src/protocols/oscar/oscar.c:669 src/protocols/oscar/oscar.c:6893
 msgid "Free For Chat"
 msgstr "Free For Chat"
 
-#: src/protocols/oscar/oscar.c:644 src/protocols/oscar/oscar.c:5576
-#: src/protocols/oscar/oscar.c:6760
+#: src/protocols/oscar/oscar.c:673 src/protocols/oscar/oscar.c:6908
 msgid "Not Available"
 msgstr "Not Available"
 
-#: src/protocols/oscar/oscar.c:646 src/protocols/oscar/oscar.c:5579
-#: src/protocols/oscar/oscar.c:6761
+#: src/protocols/oscar/oscar.c:675 src/protocols/oscar/oscar.c:6898
 msgid "Occupied"
 msgstr "Occupied"
 
-#: src/protocols/oscar/oscar.c:650
+#: src/protocols/oscar/oscar.c:679
 msgid "Web Aware"
 msgstr "Web Aware"
 
-#: src/protocols/oscar/oscar.c:718
+#: src/protocols/oscar/oscar.c:755
 msgid "Capabilities"
 msgstr "Capabilities"
 
-#: src/protocols/oscar/oscar.c:727
+#: src/protocols/oscar/oscar.c:764
 msgid "Buddy Comment"
 msgstr "Buddy Comment"
 
-#: src/protocols/oscar/oscar.c:862
+#: src/protocols/oscar/oscar.c:899
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "Direct IM with %s closed"
 
-#: src/protocols/oscar/oscar.c:864
+#: src/protocols/oscar/oscar.c:901
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "Direct IM with %s failed"
 
-#: src/protocols/oscar/oscar.c:871
+#: src/protocols/oscar/oscar.c:908
 msgid "Direct Connect failed"
 msgstr "Direct Connect failed"
 
-#: src/protocols/oscar/oscar.c:948 src/protocols/oscar/oscar.c:1079
+#: src/protocols/oscar/oscar.c:985 src/protocols/oscar/oscar.c:1116
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Direct IM with %s established"
 
-#: src/protocols/oscar/oscar.c:1029
+#: src/protocols/oscar/oscar.c:1066
 #, 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:1446
+#: src/protocols/oscar/oscar.c:1483
 #, 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:1451
+#: src/protocols/oscar/oscar.c:1488
 msgid "Unable to open Direct IM"
 msgstr "Unable to open Direct IM"
 
-#: src/protocols/oscar/oscar.c:1486
+#: src/protocols/oscar/oscar.c:1523
 #, 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:1490
+#: src/protocols/oscar/oscar.c:1527
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
@@ -7725,24 +7600,24 @@
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
 
-#: src/protocols/oscar/oscar.c:1494 src/protocols/oscar/oscar.c:3431
+#: src/protocols/oscar/oscar.c:1531 src/protocols/oscar/oscar.c:3485
 msgid "Connect"
 msgstr "Connect"
 
-#: src/protocols/oscar/oscar.c:1561 src/protocols/toc/toc.c:872
+#: src/protocols/oscar/oscar.c:1598 src/protocols/toc/toc.c:881
 #, 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:1580
+#: src/protocols/oscar/oscar.c:1617
 msgid "Chat is currently unavailable"
 msgstr "Chat is currently unavailable"
 
-#: src/protocols/oscar/oscar.c:1661
+#: src/protocols/oscar/oscar.c:1698
 msgid "Screen name sent"
 msgstr "Screen name sent"
 
-#: src/protocols/oscar/oscar.c:1675
+#: src/protocols/oscar/oscar.c:1712
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -7753,46 +7628,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:1703
+#: src/protocols/oscar/oscar.c:1743
 msgid "Unable to login to AIM"
 msgstr "Unable to login to AIM"
 
-#: src/protocols/oscar/oscar.c:1804 src/protocols/oscar/oscar.c:2243
+#: src/protocols/oscar/oscar.c:1846 src/protocols/oscar/oscar.c:2284
 msgid "Could Not Connect"
 msgstr "Could Not Connect"
 
-#: src/protocols/oscar/oscar.c:1812
+#: src/protocols/oscar/oscar.c:1854
 msgid "Connection established, cookie sent"
 msgstr "Connection established, cookie sent"
 
-#: src/protocols/oscar/oscar.c:1925 src/protocols/yahoo/yahoo_filexfer.c:180
+#: src/protocols/oscar/oscar.c:1967 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:1930
+#: src/protocols/oscar/oscar.c:1972
 msgid "Unable to create new connection."
 msgstr "Unable to create new connection."
 
-#: src/protocols/oscar/oscar.c:2002
+#: src/protocols/oscar/oscar.c:2044
 msgid "Unable to establish listener socket."
 msgstr "Unable to establish listener socket."
 
-#: src/protocols/oscar/oscar.c:2127 src/protocols/toc/toc.c:540
+#: src/protocols/oscar/oscar.c:2169 src/protocols/toc/toc.c:542
 msgid "Incorrect nickname or password."
 msgstr "Incorrect nickname or password."
 
-#: src/protocols/oscar/oscar.c:2132
+#: src/protocols/oscar/oscar.c:2174
 msgid "Your account is currently suspended."
 msgstr "Your account is currently suspended."
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:2136
+#: src/protocols/oscar/oscar.c:2178
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "The AOL Instant Messenger service is temporarily unavailable."
 
-#: src/protocols/oscar/oscar.c:2141
+#: src/protocols/oscar/oscar.c:2183
 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."
@@ -7800,21 +7675,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:2146
+#: src/protocols/oscar/oscar.c:2188
 #, 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:2178
+#: src/protocols/oscar/oscar.c:2219
 msgid "Internal Error"
 msgstr "Internal Error"
 
-#: src/protocols/oscar/oscar.c:2250
+#: src/protocols/oscar/oscar.c:2291
 msgid "Received authorization"
 msgstr "Received authorization"
 
-#: src/protocols/oscar/oscar.c:2286 src/protocols/oscar/oscar.c:2316
-#: src/protocols/oscar/oscar.c:2405
+#: src/protocols/oscar/oscar.c:2327 src/protocols/oscar/oscar.c:2357
+#: src/protocols/oscar/oscar.c:2446
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -7823,20 +7698,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:2289 src/protocols/oscar/oscar.c:2319
+#: src/protocols/oscar/oscar.c:2330 src/protocols/oscar/oscar.c:2360
 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:2408
+#: src/protocols/oscar/oscar.c:2449
 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:3423
+#: src/protocols/oscar/oscar.c:3476
 #, 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:3426
+#: src/protocols/oscar/oscar.c:3479
 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 "
@@ -7846,19 +7721,19 @@
 "for IM Images.  Because your IP address will be revealed, this may be "
 "considered a privacy risk."
 
-#: src/protocols/oscar/oscar.c:3462
+#: src/protocols/oscar/oscar.c:3518
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Please authorize me so I can add you to my buddy list."
 
-#: src/protocols/oscar/oscar.c:3470
+#: src/protocols/oscar/oscar.c:3526
 msgid "Authorization Request Message:"
 msgstr "Authorization Request Message:"
 
-#: src/protocols/oscar/oscar.c:3471
+#: src/protocols/oscar/oscar.c:3527
 msgid "Please authorize me!"
 msgstr "Please authorize me!"
 
-#: src/protocols/oscar/oscar.c:3501
+#: src/protocols/oscar/oscar.c:3557
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
@@ -7867,22 +7742,22 @@
 "The user %s requires authorization before being added to a buddy list.  Do "
 "you want to send an authorization request?"
 
-#: src/protocols/oscar/oscar.c:3506 src/protocols/oscar/oscar.c:3508
+#: src/protocols/oscar/oscar.c:3562 src/protocols/oscar/oscar.c:3564
 msgid "Request Authorization"
 msgstr "Request Authorization"
 
-#: 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
+#: src/protocols/oscar/oscar.c:3612 src/protocols/oscar/oscar.c:3614
+#: src/protocols/oscar/oscar.c:3621 src/protocols/oscar/oscar.c:3718
+#: src/protocols/oscar/oscar.c:3738 src/protocols/oscar/oscar.c:6289
+#: src/protocols/oscar/oscar.c:6335
 msgid "No reason given."
 msgstr "No reason given."
 
-#: src/protocols/oscar/oscar.c:3564
+#: src/protocols/oscar/oscar.c:3620
 msgid "Authorization Denied Message:"
 msgstr "Authorization Denied Message:"
 
-#: src/protocols/oscar/oscar.c:3659
+#: src/protocols/oscar/oscar.c:3718
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -7891,11 +7766,11 @@
 "The user %u wants to add you to their buddy list for the following reason:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3667 src/protocols/oscar/oscar.c:6213
+#: src/protocols/oscar/oscar.c:3726 src/protocols/oscar/oscar.c:6295
 msgid "Authorization Request"
 msgstr "Authorization Request"
 
-#: src/protocols/oscar/oscar.c:3679
+#: src/protocols/oscar/oscar.c:3738
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7906,17 +7781,17 @@
 "following reason:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3680
+#: src/protocols/oscar/oscar.c:3739
 msgid "ICQ authorization denied."
 msgstr "ICQ authorization denied."
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:3687
+#: src/protocols/oscar/oscar.c:3746
 #, 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:3695
+#: src/protocols/oscar/oscar.c:3754
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -7929,7 +7804,7 @@
 "From: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3703
+#: src/protocols/oscar/oscar.c:3762
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -7942,7 +7817,7 @@
 "From: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3711
+#: src/protocols/oscar/oscar.c:3770
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -7955,34 +7830,34 @@
 "Message is:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3732
+#: src/protocols/oscar/oscar.c:3791
 #, 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:3738
+#: src/protocols/oscar/oscar.c:3797
 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:3742
+#: src/protocols/oscar/oscar.c:3801
 msgid "Decline"
 msgstr "Decline"
 
-#: src/protocols/oscar/oscar.c:3826
+#: src/protocols/oscar/oscar.c:3885
 #, 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:3835
+#: src/protocols/oscar/oscar.c:3894
 #, 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:3844
+#: src/protocols/oscar/oscar.c:3903
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -7993,85 +7868,86 @@
 msgstr[1] ""
 "You missed %hu messages from %s because the rate limit has been exceeded."
 
-#: src/protocols/oscar/oscar.c:3853
+#: src/protocols/oscar/oscar.c:3912
 #, 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:3862
+#: src/protocols/oscar/oscar.c:3921
 #, 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:3871
+#: src/protocols/oscar/oscar.c:3930
 #, 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:3925 src/protocols/oscar/oscar.c:4155
+#: src/protocols/oscar/oscar.c:3984 src/protocols/oscar/oscar.c:4216
+#: src/protocols/silc/ops.c:1085 src/protocols/silc/ops.c:1147
 #, c-format
 msgid "Info for %s"
 msgstr "Info for %s"
 
-#: src/protocols/oscar/oscar.c:3991
+#: src/protocols/oscar/oscar.c:4050
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC threw error: %s\n"
 
-#: src/protocols/oscar/oscar.c:3992
+#: src/protocols/oscar/oscar.c:4051
 msgid "Unknown error"
 msgstr "Unknown error"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:4027
+#: src/protocols/oscar/oscar.c:4086
 #, 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
+#: src/protocols/oscar/oscar.c:4086 src/protocols/oscar/oscar.c:4091
+#: src/protocols/oscar/oscar.c:4149 src/protocols/oscar/oscar.c:4153
 msgid "Unknown reason."
 msgstr "Unknown reason."
 
-#: src/protocols/oscar/oscar.c:4030
+#: src/protocols/oscar/oscar.c:4089
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Unable to send message to %s:"
 
-#: src/protocols/oscar/oscar.c:4090
+#: src/protocols/oscar/oscar.c:4149
 #, c-format
 msgid "User information not available: %s"
 msgstr "User information not available: %s"
 
-#: src/protocols/oscar/oscar.c:4093
+#: src/protocols/oscar/oscar.c:4152
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "User information for %s unavailable:"
 
-#: src/protocols/oscar/oscar.c:4115
+#: src/protocols/oscar/oscar.c:4174
 msgid "Warning Level"
 msgstr "Warning Level"
 
-#: src/protocols/oscar/oscar.c:4118
+#: src/protocols/oscar/oscar.c:4178
 msgid "Online Since"
 msgstr "Online Since"
 
-#: src/protocols/oscar/oscar.c:4122 src/protocols/yahoo/yahoo_profile.c:1118
+#: src/protocols/oscar/oscar.c:4183 src/protocols/yahoo/yahoo_profile.c:1120
 msgid "Member Since"
 msgstr "Member Since"
 
-#: src/protocols/oscar/oscar.c:4206
+#: src/protocols/oscar/oscar.c:4267
 msgid "Your AIM connection may be lost."
 msgstr "Your AIM connection may be lost."
 
 #. The conversion failed!
-#: src/protocols/oscar/oscar.c:4392
+#: src/protocols/oscar/oscar.c:4453
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -8079,11 +7955,11 @@
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 
-#: src/protocols/oscar/oscar.c:4612
+#: src/protocols/oscar/oscar.c:4673
 msgid "Rate limiting error."
 msgstr "Rate limiting error."
 
-#: src/protocols/oscar/oscar.c:4613
+#: src/protocols/oscar/oscar.c:4674
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -8091,7 +7967,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:4676
+#: src/protocols/oscar/oscar.c:4743
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
@@ -8099,109 +7975,105 @@
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
 
-#: src/protocols/oscar/oscar.c:4678
+#: src/protocols/oscar/oscar.c:4745
 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:4709
+#: src/protocols/oscar/oscar.c:4776
 msgid "Finalizing connection"
 msgstr "Finalizing connection"
 
-#: src/protocols/oscar/oscar.c:4992 src/protocols/silc/util.c:538
+#: src/protocols/oscar/oscar.c:5059 src/protocols/silc/util.c:538
 msgid "Mobile Phone"
 msgstr "Mobile Phone"
 
-#: src/protocols/oscar/oscar.c:4993
-msgid "Not specified"
-msgstr "Not specified"
-
-#: src/protocols/oscar/oscar.c:4994 src/protocols/trepia/trepia.c:281
-#: src/protocols/trepia/trepia.c:407
+#: src/protocols/oscar/oscar.c:5061 src/protocols/trepia/trepia.c:282
+#: src/protocols/trepia/trepia.c:408
 msgid "Female"
 msgstr "Female"
 
-#: src/protocols/oscar/oscar.c:4994 src/protocols/trepia/trepia.c:280
-#: src/protocols/trepia/trepia.c:407
+#: src/protocols/oscar/oscar.c:5061 src/protocols/trepia/trepia.c:281
+#: src/protocols/trepia/trepia.c:408
 msgid "Male"
 msgstr "Male"
 
-#: src/protocols/oscar/oscar.c:5010
+#: src/protocols/oscar/oscar.c:5077
 msgid "Personal Web Page"
 msgstr "Personal Web Page"
 
-#: src/protocols/oscar/oscar.c:5014
+#: src/protocols/oscar/oscar.c:5081
 msgid "Additional Information"
 msgstr "Additional Information"
 
-#: src/protocols/oscar/oscar.c:5019
+#: src/protocols/oscar/oscar.c:5086
 msgid "Home Address"
 msgstr "Home Address"
 
-#: src/protocols/oscar/oscar.c:5023 src/protocols/oscar/oscar.c:5031
+#: src/protocols/oscar/oscar.c:5090 src/protocols/oscar/oscar.c:5098
 msgid "Zip Code"
 msgstr "Postal Code"
 
-#: src/protocols/oscar/oscar.c:5027
+#: src/protocols/oscar/oscar.c:5094
 msgid "Work Address"
 msgstr "Work Address"
 
-#: src/protocols/oscar/oscar.c:5035
+#: src/protocols/oscar/oscar.c:5102
 msgid "Work Information"
 msgstr "Work Information"
 
-#: src/protocols/oscar/oscar.c:5036
+#: src/protocols/oscar/oscar.c:5103
 msgid "Company"
 msgstr "Company"
 
-#: src/protocols/oscar/oscar.c:5037
+#: src/protocols/oscar/oscar.c:5104
 msgid "Division"
 msgstr "Division"
 
-#: src/protocols/oscar/oscar.c:5038
+#: src/protocols/oscar/oscar.c:5105
 msgid "Position"
 msgstr "Position"
 
-#: src/protocols/oscar/oscar.c:5040
+#: src/protocols/oscar/oscar.c:5107
 msgid "Web Page"
 msgstr "Web Page"
 
-#: src/protocols/oscar/oscar.c:5050
+#: src/protocols/oscar/oscar.c:5117
 #, c-format
 msgid "ICQ Info for %s"
 msgstr "ICQ Info for %s"
 
-#: src/protocols/oscar/oscar.c:5099
+#: src/protocols/oscar/oscar.c:5166
 msgid "Pop-Up Message"
 msgstr "Pop-Up Message"
 
-#: src/protocols/oscar/oscar.c:5120
+#: src/protocols/oscar/oscar.c:5187
 #, 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:5124
+#: src/protocols/oscar/oscar.c:5191
 msgid "Search Results"
 msgstr "Search Results"
 
-#: src/protocols/oscar/oscar.c:5141
+#: src/protocols/oscar/oscar.c:5208
 #, c-format
 msgid "No results found for email address %s"
 msgstr "No results found for email address %s"
 
-#: src/protocols/oscar/oscar.c:5162
+#: src/protocols/oscar/oscar.c:5229
 #, 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:5164
+#: src/protocols/oscar/oscar.c:5231
 msgid "Account Confirmation Requested"
 msgstr "Account Confirmation Requested"
 
-#: src/protocols/oscar/oscar.c:5195
+#: src/protocols/oscar/oscar.c:5262
 msgid "Error Changing Account Info"
 msgstr "Error Changing Account Info"
 
-#: src/protocols/oscar/oscar.c:5198
+#: src/protocols/oscar/oscar.c:5265
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8210,7 +8082,7 @@
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "differs from the original."
 
-#: src/protocols/oscar/oscar.c:5201
+#: src/protocols/oscar/oscar.c:5268
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8219,7 +8091,7 @@
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "ends in a space."
 
-#: src/protocols/oscar/oscar.c:5204
+#: src/protocols/oscar/oscar.c:5271
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8228,7 +8100,7 @@
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "is too long."
 
-#: src/protocols/oscar/oscar.c:5207
+#: src/protocols/oscar/oscar.c:5274
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -8237,7 +8109,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:5210
+#: src/protocols/oscar/oscar.c:5277
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -8246,7 +8118,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:5213
+#: src/protocols/oscar/oscar.c:5280
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
@@ -8255,12 +8127,12 @@
 "Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 
-#: src/protocols/oscar/oscar.c:5216
+#: src/protocols/oscar/oscar.c:5283
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Error 0x%04x: Unknown error."
 
-#: src/protocols/oscar/oscar.c:5226
+#: src/protocols/oscar/oscar.c:5293
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -8269,26 +8141,26 @@
 "Your screen name is currently formatted as follows:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5227 src/protocols/oscar/oscar.c:5234
+#: src/protocols/oscar/oscar.c:5294 src/protocols/oscar/oscar.c:5301
 msgid "Account Info"
 msgstr "Account Info"
 
-#: src/protocols/oscar/oscar.c:5232
+#: src/protocols/oscar/oscar.c:5299
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "The email address for %s is %s"
 
-#: src/protocols/oscar/oscar.c:5296
+#: src/protocols/oscar/oscar.c:5363
 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:5431
+#: src/protocols/oscar/oscar.c:5498
 msgid "Unable to set AIM profile."
 msgstr "Unable to set AIM profile."
 
-#: src/protocols/oscar/oscar.c:5432
+#: src/protocols/oscar/oscar.c:5499
 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 "
@@ -8298,7 +8170,7 @@
 "completed.  Your profile remains unset; try setting it again when you are "
 "fully connected."
 
-#: src/protocols/oscar/oscar.c:5459
+#: src/protocols/oscar/oscar.c:5526
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -8313,19 +8185,15 @@
 "The maximum profile length of %d bytes has been exceeded.  Gaim has "
 "truncated it for you."
 
-#: src/protocols/oscar/oscar.c:5464
+#: src/protocols/oscar/oscar.c:5531
 msgid "Profile too long."
 msgstr "Profile too long."
 
-#: src/protocols/oscar/oscar.c:5480 src/protocols/oscar/oscar.c:6767
-msgid "Visible"
-msgstr "Visible"
-
-#: src/protocols/oscar/oscar.c:5498
+#: src/protocols/oscar/oscar.c:5568
 msgid "Unable to set AIM away message."
 msgstr "Unable to set AIM away message."
 
-#: src/protocols/oscar/oscar.c:5499
+#: src/protocols/oscar/oscar.c:5569
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -8335,7 +8203,7 @@
 "procedure completed.  You remain in a \"present\" state; try setting it "
 "again when you are fully connected."
 
-#: src/protocols/oscar/oscar.c:5539
+#: src/protocols/oscar/oscar.c:5617
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -8350,11 +8218,11 @@
 "The maximum away message length of %d bytes has been exceeded.  Gaim has "
 "truncated it for you."
 
-#: src/protocols/oscar/oscar.c:5544
+#: src/protocols/oscar/oscar.c:5622
 msgid "Away message too long."
 msgstr "Away message too long."
 
-#: src/protocols/oscar/oscar.c:5622
+#: src/protocols/oscar/oscar.c:5698
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -8365,16 +8233,16 @@
 "must either start with a letter and contain only letters, numbers and "
 "spaces, or contain only numbers."
 
-#: src/protocols/oscar/oscar.c:5624 src/protocols/oscar/oscar.c:6073
-#: src/protocols/oscar/oscar.c:6087
+#: src/protocols/oscar/oscar.c:5700 src/protocols/oscar/oscar.c:6155
+#: src/protocols/oscar/oscar.c:6169
 msgid "Unable To Add"
 msgstr "Unable To Add"
 
-#: src/protocols/oscar/oscar.c:5785
+#: src/protocols/oscar/oscar.c:5861
 msgid "Unable To Retrieve Buddy List"
 msgstr "Unable To Retrieve Buddy List"
 
-#: src/protocols/oscar/oscar.c:5786
+#: src/protocols/oscar/oscar.c:5862
 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 "
@@ -8384,13 +8252,13 @@
 "servers.  Your buddy list is not lost, and will probably become available in "
 "a few hours."
 
-#: 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
+#: src/protocols/oscar/oscar.c:6046 src/protocols/oscar/oscar.c:6047
+#: src/protocols/oscar/oscar.c:6052 src/protocols/oscar/oscar.c:6213
+#: src/protocols/oscar/oscar.c:6214 src/protocols/oscar/oscar.c:6219
 msgid "Orphans"
 msgstr "Orphans"
 
-#: src/protocols/oscar/oscar.c:6071
+#: src/protocols/oscar/oscar.c:6153
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -8399,11 +8267,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:6071 src/protocols/oscar/oscar.c:6085
+#: src/protocols/oscar/oscar.c:6153 src/protocols/oscar/oscar.c:6167
 msgid "(no name)"
 msgstr "(no name)"
 
-#: src/protocols/oscar/oscar.c:6085
+#: src/protocols/oscar/oscar.c:6167
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -8414,7 +8282,7 @@
 "for this is that you have the maximum number of allowed buddies in your "
 "buddy list."
 
-#: src/protocols/oscar/oscar.c:6168
+#: src/protocols/oscar/oscar.c:6250
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -8423,11 +8291,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:6174
+#: src/protocols/oscar/oscar.c:6256
 msgid "Authorization Given"
 msgstr "Authorization Given"
 
-#: src/protocols/oscar/oscar.c:6207
+#: src/protocols/oscar/oscar.c:6289
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -8437,17 +8305,17 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:6249
+#: src/protocols/oscar/oscar.c:6331
 #, 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:6250
+#: src/protocols/oscar/oscar.c:6332
 msgid "Authorization Granted"
 msgstr "Authorization Granted"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:6253
+#: src/protocols/oscar/oscar.c:6335
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -8458,76 +8326,76 @@
 "following reason:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:6254
+#: src/protocols/oscar/oscar.c:6336
 msgid "Authorization Denied"
 msgstr "Authorization Denied"
 
-#: src/protocols/oscar/oscar.c:6291 src/protocols/toc/toc.c:1271
+#: src/protocols/oscar/oscar.c:6373 src/protocols/toc/toc.c:1280
 msgid "_Exchange:"
 msgstr "_Exchange:"
 
-#: src/protocols/oscar/oscar.c:6325
+#: src/protocols/oscar/oscar.c:6411
 msgid "Invalid chat name specified."
 msgstr "Invalid chat name specified."
 
-#: src/protocols/oscar/oscar.c:6414
+#: src/protocols/oscar/oscar.c:6500
 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:6540
+#: src/protocols/oscar/oscar.c:6635
 msgid "Away Message"
 msgstr "Away Message"
 
-#: src/protocols/oscar/oscar.c:6826
+#: src/protocols/oscar/oscar.c:6966
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Buddy Comment for %s"
 
-#: src/protocols/oscar/oscar.c:6827
+#: src/protocols/oscar/oscar.c:6967
 msgid "Buddy Comment:"
 msgstr "Buddy Comment:"
 
-#: src/protocols/oscar/oscar.c:6846
+#: src/protocols/oscar/oscar.c:6986
 msgid "Edit Buddy Comment"
 msgstr "Edit Buddy Comment"
 
-#: src/protocols/oscar/oscar.c:6852
+#: src/protocols/oscar/oscar.c:6992
 msgid "Get Status Msg"
 msgstr "Get Status Msg"
 
-#: src/protocols/oscar/oscar.c:6864
+#: src/protocols/oscar/oscar.c:7004
 msgid "Direct IM"
 msgstr "Direct IM"
 
-#: src/protocols/oscar/oscar.c:6881
+#: src/protocols/oscar/oscar.c:7021
 msgid "Re-request Authorization"
 msgstr "Re-request Authorization"
 
-#: src/protocols/oscar/oscar.c:6911
+#: src/protocols/oscar/oscar.c:7051
 msgid "The new formatting is invalid."
 msgstr "The new formatting is invalid."
 
-#: src/protocols/oscar/oscar.c:6912
+#: src/protocols/oscar/oscar.c:7052
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "Screen name formatting can change only capitalization and whitespace."
 
-#: src/protocols/oscar/oscar.c:6919
+#: src/protocols/oscar/oscar.c:7059
 msgid "New screen name formatting:"
 msgstr "New screen name formatting:"
 
-#: src/protocols/oscar/oscar.c:6971
+#: src/protocols/oscar/oscar.c:7111
 msgid "Change Address To:"
 msgstr "Change Address To:"
 
-#: src/protocols/oscar/oscar.c:7016
+#: src/protocols/oscar/oscar.c:7156
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>you are not waiting for authorization</i>"
 
-#: src/protocols/oscar/oscar.c:7019
+#: src/protocols/oscar/oscar.c:7159
 msgid "You are awaiting authorization from the following buddies"
 msgstr "You are awaiting authorization from the following buddies"
 
-#: src/protocols/oscar/oscar.c:7020
+#: src/protocols/oscar/oscar.c:7160
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -8535,79 +8403,74 @@
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
 
-#: src/protocols/oscar/oscar.c:7037
+#: src/protocols/oscar/oscar.c:7177
 msgid "Find Buddy by E-mail"
 msgstr "Find Buddy by E-mail"
 
-#: src/protocols/oscar/oscar.c:7038
+#: src/protocols/oscar/oscar.c:7178
 msgid "Search for a buddy by e-mail address"
 msgstr "Search for a buddy by e-mail address"
 
-#: src/protocols/oscar/oscar.c:7039
+#: src/protocols/oscar/oscar.c:7179
 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:7056
-msgid "Available Message:"
-msgstr "Available Message:"
-
-#: 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:7138 src/protocols/silc/silc.c:795
+#: src/protocols/oscar/oscar.c:7260 src/protocols/silc/silc.c:810
 msgid "Set User Info..."
 msgstr "Set User Info..."
 
-#: src/protocols/oscar/oscar.c:7143
+#: src/protocols/oscar/oscar.c:7265
 msgid "Set User Info (URL)..."
 msgstr "Set User Info (URL)..."
 
-#: src/protocols/oscar/oscar.c:7149
-msgid "Set Available Message..."
-msgstr "Set Available Message..."
-
-#: src/protocols/oscar/oscar.c:7154 src/protocols/silc/silc.c:791
+#: src/protocols/oscar/oscar.c:7270 src/protocols/silc/silc.c:806
 msgid "Change Password..."
 msgstr "Change Password..."
 
-#: src/protocols/oscar/oscar.c:7159
+#: src/protocols/oscar/oscar.c:7275
 msgid "Change Password (URL)"
 msgstr "Change Password (URL)"
 
-#: src/protocols/oscar/oscar.c:7163
+#: src/protocols/oscar/oscar.c:7279
 msgid "Configure IM Forwarding (URL)"
 msgstr "Configure IM Forwarding (URL)"
 
-#: src/protocols/oscar/oscar.c:7172
+#: src/protocols/oscar/oscar.c:7288
 msgid "Format Screen Name..."
 msgstr "Format Screen Name..."
 
-#: src/protocols/oscar/oscar.c:7176
+#: src/protocols/oscar/oscar.c:7292
 msgid "Confirm Account"
 msgstr "Confirm Account"
 
-#: src/protocols/oscar/oscar.c:7180
+#: src/protocols/oscar/oscar.c:7296
 msgid "Display Currently Registered Address"
 msgstr "Display Currently Registered Address"
 
-#: src/protocols/oscar/oscar.c:7184
+#: src/protocols/oscar/oscar.c:7300
 msgid "Change Currently Registered Address..."
 msgstr "Change Currently Registered Address..."
 
-#: src/protocols/oscar/oscar.c:7191
+#: src/protocols/oscar/oscar.c:7307
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Show Buddies Awaiting Authorization"
 
-#: src/protocols/oscar/oscar.c:7197
+#: src/protocols/oscar/oscar.c:7313
 msgid "Search for Buddy by Email..."
 msgstr "Search for Buddy by Email..."
 
-#: src/protocols/oscar/oscar.c:7202
+#: src/protocols/oscar/oscar.c:7318
 msgid "Search for Buddy by Information"
 msgstr "Search for Buddy by Information"
 
-#. *< api_version
+#: src/protocols/oscar/oscar.c:7387
+msgid "Use recent buddies group"
+msgstr "Use recent buddies group"
+
+#: src/protocols/oscar/oscar.c:7390
+msgid "Show how long you have been idle"
+msgstr "Show how long you have been idle"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -8618,15 +8481,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/oscar/oscar.c:7321 src/protocols/oscar/oscar.c:7323
+#: src/protocols/oscar/oscar.c:7483 src/protocols/oscar/oscar.c:7485
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ Protocol Plugin"
 
-#: src/protocols/oscar/oscar.c:7342
+#: src/protocols/oscar/oscar.c:7504
 msgid "Auth host"
 msgstr "Auth host"
 
-#: src/protocols/oscar/oscar.c:7345
+#: src/protocols/oscar/oscar.c:7507
 msgid "Auth port"
 msgstr "Auth port"
 
@@ -8715,16 +8578,16 @@
 msgstr "Set IM Password"
 
 #: src/protocols/silc/buddy.c:506 src/protocols/silc/buddy.c:541
-#: src/protocols/silc/ops.c:1276 src/protocols/silc/ops.c:1287
+#: src/protocols/silc/ops.c:1278 src/protocols/silc/ops.c:1289
 msgid "Get Public Key"
 msgstr "Get Public Key"
 
-#: src/protocols/silc/buddy.c:542 src/protocols/silc/ops.c:1277
-#: src/protocols/silc/ops.c:1288
+#: src/protocols/silc/buddy.c:542 src/protocols/silc/ops.c:1279
+#: src/protocols/silc/ops.c:1290
 msgid "Cannot fetch the public key"
 msgstr "Cannot fetch the public key"
 
-#: src/protocols/silc/buddy.c:629 src/protocols/silc/buddy.c:1544
+#: src/protocols/silc/buddy.c:629 src/protocols/silc/buddy.c:1549
 msgid "Show Public Key"
 msgstr "Show Public Key"
 
@@ -8735,12 +8598,12 @@
 
 #: 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
+#: src/protocols/silc/ops.c:1079 src/protocols/silc/ops.c:1099
 msgid "User Information"
 msgstr "User Information"
 
 #: src/protocols/silc/buddy.c:708 src/protocols/silc/ops.c:944
-#: src/protocols/silc/ops.c:1099
+#: src/protocols/silc/ops.c:1100
 msgid "Cannot get user information"
 msgstr "Cannot get user information"
 
@@ -8799,134 +8662,131 @@
 "More than one user was found with the same name. Select the correct user "
 "from the list to add to the buddy list."
 
-#: src/protocols/silc/buddy.c:1377
+#: src/protocols/silc/buddy.c:1382
 msgid "Detached"
 msgstr "Detached"
 
-#: src/protocols/silc/buddy.c:1381 src/protocols/silc/silc.c:48
-#: src/protocols/silc/silc.c:80
+#: src/protocols/silc/buddy.c:1386 src/protocols/silc/silc.c:56
 msgid "Indisposed"
 msgstr "Indisposed"
 
-#: src/protocols/silc/buddy.c:1385 src/protocols/silc/silc.c:49
-#: src/protocols/silc/silc.c:82
+#: src/protocols/silc/buddy.c:1390 src/protocols/silc/silc.c:58
 msgid "Wake Me Up"
 msgstr "Wake Me Up"
 
-#: src/protocols/silc/buddy.c:1387 src/protocols/silc/silc.c:45
-#: src/protocols/silc/silc.c:74
+#: src/protocols/silc/buddy.c:1392 src/protocols/silc/silc.c:50
 msgid "Hyper Active"
 msgstr "Hyper Active"
 
-#: src/protocols/silc/buddy.c:1389
+#: src/protocols/silc/buddy.c:1394
 msgid "Robot"
 msgstr "Robot"
 
-#: src/protocols/silc/buddy.c:1396 src/protocols/silc/silc.c:616
+#: src/protocols/silc/buddy.c:1401 src/protocols/silc/silc.c:631
 #: src/protocols/silc/util.c:469
 msgid "Happy"
 msgstr "Happy"
 
-#: src/protocols/silc/buddy.c:1398 src/protocols/silc/silc.c:618
+#: src/protocols/silc/buddy.c:1403 src/protocols/silc/silc.c:633
 #: src/protocols/silc/util.c:471
 msgid "Sad"
 msgstr "Sad"
 
-#: src/protocols/silc/buddy.c:1400 src/protocols/silc/silc.c:620
+#: src/protocols/silc/buddy.c:1405 src/protocols/silc/silc.c:635
 #: src/protocols/silc/util.c:473
 msgid "Angry"
 msgstr "Angry"
 
-#: src/protocols/silc/buddy.c:1402 src/protocols/silc/silc.c:622
+#: src/protocols/silc/buddy.c:1407 src/protocols/silc/silc.c:637
 #: src/protocols/silc/util.c:475
 msgid "Jealous"
 msgstr "Jealous"
 
-#: src/protocols/silc/buddy.c:1404 src/protocols/silc/silc.c:624
+#: src/protocols/silc/buddy.c:1409 src/protocols/silc/silc.c:639
 #: src/protocols/silc/util.c:477
 msgid "Ashamed"
 msgstr "Ashamed"
 
-#: src/protocols/silc/buddy.c:1406 src/protocols/silc/silc.c:626
+#: src/protocols/silc/buddy.c:1411 src/protocols/silc/silc.c:641
 #: src/protocols/silc/util.c:479
 msgid "Invincible"
 msgstr "Invincible"
 
-#: src/protocols/silc/buddy.c:1408 src/protocols/silc/silc.c:628
+#: src/protocols/silc/buddy.c:1413 src/protocols/silc/silc.c:643
 #: src/protocols/silc/util.c:481
 msgid "In Love"
 msgstr "In Love"
 
-#: src/protocols/silc/buddy.c:1410 src/protocols/silc/silc.c:630
+#: src/protocols/silc/buddy.c:1415 src/protocols/silc/silc.c:645
 #: src/protocols/silc/util.c:483
 msgid "Sleepy"
 msgstr "Sleepy"
 
-#: src/protocols/silc/buddy.c:1412 src/protocols/silc/silc.c:632
+#: src/protocols/silc/buddy.c:1417 src/protocols/silc/silc.c:647
 #: src/protocols/silc/util.c:485
 msgid "Bored"
 msgstr "Bored"
 
-#: src/protocols/silc/buddy.c:1414 src/protocols/silc/silc.c:634
+#: src/protocols/silc/buddy.c:1419 src/protocols/silc/silc.c:649
 #: src/protocols/silc/util.c:487
 msgid "Excited"
 msgstr "Excited"
 
-#: src/protocols/silc/buddy.c:1416 src/protocols/silc/silc.c:636
+#: src/protocols/silc/buddy.c:1421 src/protocols/silc/silc.c:651
 #: src/protocols/silc/util.c:489
 msgid "Anxious"
 msgstr "Anxious"
 
-#: src/protocols/silc/buddy.c:1448 src/protocols/silc/ops.c:980
+#: src/protocols/silc/buddy.c:1453 src/protocols/silc/ops.c:980
 msgid "User Modes"
 msgstr "User Modes"
 
-#: src/protocols/silc/buddy.c:1457 src/protocols/silc/ops.c:989
+#: src/protocols/silc/buddy.c:1462 src/protocols/silc/ops.c:989
 msgid "Mood"
 msgstr "Mood"
 
-#: src/protocols/silc/buddy.c:1461 src/protocols/silc/ops.c:995
+#: src/protocols/silc/buddy.c:1466 src/protocols/silc/ops.c:995
 msgid "Status Text"
 msgstr "Status Text"
 
-#: src/protocols/silc/buddy.c:1466 src/protocols/silc/ops.c:1001
+#: src/protocols/silc/buddy.c:1471 src/protocols/silc/ops.c:1001
 msgid "Preferred Contact"
 msgstr "Preferred Contact"
 
-#: src/protocols/silc/buddy.c:1471 src/protocols/silc/ops.c:1006
+#: src/protocols/silc/buddy.c:1476 src/protocols/silc/ops.c:1006
 msgid "Preferred Language"
 msgstr "Preferred Language"
 
-#: src/protocols/silc/buddy.c:1476 src/protocols/silc/ops.c:1011
+#: src/protocols/silc/buddy.c:1481 src/protocols/silc/ops.c:1011
 msgid "Device"
 msgstr "Device"
 
-#: src/protocols/silc/buddy.c:1481 src/protocols/silc/ops.c:1016
-#: src/protocols/silc/silc.c:684 src/protocols/silc/silc.c:686
+#: src/protocols/silc/buddy.c:1486 src/protocols/silc/ops.c:1016
+#: src/protocols/silc/silc.c:699 src/protocols/silc/silc.c:701
 msgid "Timezone"
 msgstr "Time Zone"
 
-#: src/protocols/silc/buddy.c:1486 src/protocols/silc/ops.c:1021
+#: src/protocols/silc/buddy.c:1491 src/protocols/silc/ops.c:1021
 msgid "Geolocation"
 msgstr "Geolocation"
 
-#: src/protocols/silc/buddy.c:1529
+#: src/protocols/silc/buddy.c:1534
 msgid "Reset IM Key"
 msgstr "Reset IM Key"
 
-#: src/protocols/silc/buddy.c:1534
+#: src/protocols/silc/buddy.c:1539
 msgid "IM with Key Exchange"
 msgstr "IM with Key Exchange"
 
-#: src/protocols/silc/buddy.c:1538
+#: src/protocols/silc/buddy.c:1543
 msgid "IM with Password"
 msgstr "IM with Password"
 
-#: src/protocols/silc/buddy.c:1549
+#: src/protocols/silc/buddy.c:1554
 msgid "Get Public Key..."
 msgstr "Get Public Key..."
 
-#: src/protocols/silc/buddy.c:1555 src/protocols/silc/ops.c:1409
+#: src/protocols/silc/buddy.c:1560 src/protocols/silc/ops.c:1411
 msgid "Kill User"
 msgstr "Kill User"
 
@@ -9036,7 +8896,7 @@
 msgid "Group Name"
 msgstr "Group Name"
 
-#: src/protocols/silc/chat.c:579 src/protocols/silc/ops.c:1689
+#: src/protocols/silc/chat.c:579 src/protocols/silc/ops.c:1691
 msgid "Passphrase"
 msgstr "Passphrase"
 
@@ -9119,26 +8979,26 @@
 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:1051
+#: src/protocols/silc/chat.c:1056
 #, 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:1053
+#: src/protocols/silc/chat.c:1058
 msgid "Join Private Group"
 msgstr "Join Private Group"
 
-#: src/protocols/silc/chat.c:1054
+#: src/protocols/silc/chat.c:1059
 msgid "Cannot join private group"
 msgstr "Cannot join private group"
 
-#: src/protocols/silc/chat.c:1247 src/protocols/silc/silc.c:894
+#: src/protocols/silc/chat.c:1252 src/protocols/silc/silc.c:909
 msgid "Cannot call command"
 msgstr "Cannot call command"
 
-#: src/protocols/silc/chat.c:1248 src/protocols/silc/silc.c:895
+#: src/protocols/silc/chat.c:1253 src/protocols/silc/silc.c:910
 msgid "Unknown command"
 msgstr "Unknown command"
 
@@ -9271,11 +9131,11 @@
 msgid "Join Chat"
 msgstr "Join Chat"
 
-#: src/protocols/silc/ops.c:1068 src/protocols/silc/ops.c:1139
+#: src/protocols/silc/ops.c:1068 src/protocols/silc/ops.c:1140
 msgid "Public Key Fingerprint"
 msgstr "Public Key Fingerprint"
 
-#: src/protocols/silc/ops.c:1069 src/protocols/silc/ops.c:1140
+#: src/protocols/silc/ops.c:1069 src/protocols/silc/ops.c:1141
 msgid "Public Key Babbleprint"
 msgstr "Public Key Babbleprint"
 
@@ -9283,55 +9143,47 @@
 msgid "More..."
 msgstr "More..."
 
-#: src/protocols/silc/ops.c:1155 src/protocols/silc/silc.c:783
+#: src/protocols/silc/ops.c:1157 src/protocols/silc/silc.c:798
 msgid "Detach From Server"
 msgstr "Detach From Server"
 
-#: src/protocols/silc/ops.c:1155
+#: src/protocols/silc/ops.c:1157
 msgid "Cannot detach"
 msgstr "Cannot detach"
 
-#: src/protocols/silc/ops.c:1166
+#: src/protocols/silc/ops.c:1168
 msgid "Cannot set topic"
 msgstr "Cannot set topic"
 
-#: src/protocols/silc/ops.c:1204
+#: src/protocols/silc/ops.c:1206
 msgid "Failed to change nickname"
 msgstr "Failed to change nickname"
 
-#: src/protocols/silc/ops.c:1241
-msgid "Roomlist"
-msgstr "Roomlist"
-
-#: src/protocols/silc/ops.c:1241
-msgid "Cannot get room list"
-msgstr "Cannot get room list"
-
-#: src/protocols/silc/ops.c:1289
+#: src/protocols/silc/ops.c:1291
 msgid "No public key was received"
 msgstr "No public key was received"
 
-#: src/protocols/silc/ops.c:1302 src/protocols/silc/ops.c:1316
+#: src/protocols/silc/ops.c:1304 src/protocols/silc/ops.c:1318
 msgid "Server Information"
 msgstr "Server Information"
 
-#: src/protocols/silc/ops.c:1303
+#: src/protocols/silc/ops.c:1305
 msgid "Cannot get server information"
 msgstr "Cannot get server information"
 
-#: src/protocols/silc/ops.c:1334 src/protocols/silc/ops.c:1343
+#: src/protocols/silc/ops.c:1336 src/protocols/silc/ops.c:1345
 msgid "Server Statistics"
 msgstr "Server Statistics"
 
-#: src/protocols/silc/ops.c:1335
+#: src/protocols/silc/ops.c:1337
 msgid "Cannot get server statistics"
 msgstr "Cannot get server statistics"
 
-#: src/protocols/silc/ops.c:1344
+#: src/protocols/silc/ops.c:1346
 msgid "No server statistics available"
 msgstr "No server statistics available"
 
-#: src/protocols/silc/ops.c:1366
+#: src/protocols/silc/ops.c:1368
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -9366,98 +9218,98 @@
 "Total server operators: %d\n"
 "Total router operators: %d\n"
 
-#: src/protocols/silc/ops.c:1389
+#: src/protocols/silc/ops.c:1391
 msgid "Network Statistics"
 msgstr "Network Statistics"
 
-#: src/protocols/silc/ops.c:1397 src/protocols/silc/ops.c:1402
+#: src/protocols/silc/ops.c:1399 src/protocols/silc/ops.c:1404
 msgid "Ping"
 msgstr "Ping"
 
-#: src/protocols/silc/ops.c:1397
+#: src/protocols/silc/ops.c:1399
 msgid "Ping failed"
 msgstr "Ping failed"
 
-#: src/protocols/silc/ops.c:1402
+#: src/protocols/silc/ops.c:1404
 msgid "Ping reply received from server"
 msgstr "Ping reply received from server"
 
-#: src/protocols/silc/ops.c:1410
+#: src/protocols/silc/ops.c:1412
 msgid "Could not kill user"
 msgstr "Could not kill user"
 
-#: src/protocols/silc/ops.c:1491
+#: src/protocols/silc/ops.c:1493
 msgid "Error during connecting to SILC Server"
 msgstr "Error during connecting to SILC Server"
 
-#: src/protocols/silc/ops.c:1496
+#: src/protocols/silc/ops.c:1498
 msgid "Key Exchange failed"
 msgstr "Key Exchange failed"
 
-#: src/protocols/silc/ops.c:1505
+#: src/protocols/silc/ops.c:1507
 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:1540
+#: src/protocols/silc/ops.c:1542
 msgid "Disconnected by server"
 msgstr "Disconnected by server"
 
-#: src/protocols/silc/ops.c:1600 src/protocols/silc/ops.c:1647
-#: src/protocols/silc/silc.c:173
+#: src/protocols/silc/ops.c:1602 src/protocols/silc/ops.c:1649
+#: src/protocols/silc/silc.c:188
 msgid "Resuming session"
 msgstr "Resuming session"
 
-#: src/protocols/silc/ops.c:1602
+#: src/protocols/silc/ops.c:1604
 msgid "Authenticating connection"
 msgstr "Authenticating connection"
 
-#: src/protocols/silc/ops.c:1649
+#: src/protocols/silc/ops.c:1651
 msgid "Verifying server public key"
 msgstr "Verifying server public key"
 
-#: src/protocols/silc/ops.c:1690
+#: src/protocols/silc/ops.c:1692
 msgid "Passphrase required"
 msgstr "Passphrase required"
 
-#: src/protocols/silc/ops.c:1719
+#: src/protocols/silc/ops.c:1721
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Failure: Version mismatch; upgrade your client"
 
-#: src/protocols/silc/ops.c:1722
+#: src/protocols/silc/ops.c:1724
 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:1725
+#: src/protocols/silc/ops.c:1727
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "Failure: Remote does not support proposed KE group"
 
-#: src/protocols/silc/ops.c:1728
+#: src/protocols/silc/ops.c:1730
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "Failure: Remote does not support proposed cipher"
 
-#: src/protocols/silc/ops.c:1731
+#: src/protocols/silc/ops.c:1733
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "Failure: Remote does not support proposed PKCS"
 
-#: src/protocols/silc/ops.c:1734
+#: src/protocols/silc/ops.c:1736
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "Failure: Remote does not support proposed hash function"
 
-#: src/protocols/silc/ops.c:1737
+#: src/protocols/silc/ops.c:1739
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "Failure: Remote does not support proposed HMAC"
 
-#: src/protocols/silc/ops.c:1739
+#: src/protocols/silc/ops.c:1741
 msgid "Failure: Incorrect signature"
 msgstr "Failure: Incorrect signature"
 
-#: src/protocols/silc/ops.c:1741
+#: src/protocols/silc/ops.c:1743
 msgid "Failure: Invalid cookie"
 msgstr "Failure: Invalid cookie"
 
-#: src/protocols/silc/ops.c:1752
+#: src/protocols/silc/ops.c:1754
 msgid "Failure: Authentication failed"
 msgstr "Failure: Authentication failed"
 
@@ -9488,48 +9340,48 @@
 "%s\n"
 "%s\n"
 
-#: src/protocols/silc/pk.c:115 src/protocols/silc/pk.c:139
+#: src/protocols/silc/pk.c:115 src/protocols/silc/pk.c:140
 msgid "Verify Public Key"
 msgstr "Verify Public Key"
 
-#: src/protocols/silc/pk.c:118
+#: src/protocols/silc/pk.c:119
 msgid "View..."
 msgstr "View..."
 
-#: src/protocols/silc/pk.c:140
+#: src/protocols/silc/pk.c:141
 msgid "Unsupported public key type"
 msgstr "Unsupported public key type"
 
-#: src/protocols/silc/silc.c:133
+#: src/protocols/silc/silc.c:148
 msgid "Connection failed"
 msgstr "Connection failed"
 
-#: src/protocols/silc/silc.c:165
+#: src/protocols/silc/silc.c:180
 msgid "Cannot initialize SILC Client connection"
 msgstr "Cannot initialize SILC Client connection"
 
-#: src/protocols/silc/silc.c:176
+#: src/protocols/silc/silc.c:191
 msgid "Performing key exchange"
 msgstr "Performing key exchange"
 
-#: src/protocols/silc/silc.c:248
+#: src/protocols/silc/silc.c:263
 msgid "Out of memory"
 msgstr "Out of memory"
 
 #. Progress
-#: src/protocols/silc/silc.c:282
+#: src/protocols/silc/silc.c:297
 msgid "Connecting to SILC Server"
 msgstr "Connecting to SILC Server"
 
-#: src/protocols/silc/silc.c:612
+#: src/protocols/silc/silc.c:627
 msgid "Your Current Mood"
 msgstr "Your Current Mood"
 
-#: src/protocols/silc/silc.c:614
+#: src/protocols/silc/silc.c:629
 msgid "Normal"
 msgstr "Normal"
 
-#: src/protocols/silc/silc.c:639
+#: src/protocols/silc/silc.c:654
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9537,43 +9389,43 @@
 "\n"
 "Your Preferred Contact Methods"
 
-#: src/protocols/silc/silc.c:647 src/protocols/silc/util.c:514
+#: src/protocols/silc/silc.c:662 src/protocols/silc/util.c:514
 msgid "SMS"
 msgstr "SMS"
 
-#: src/protocols/silc/silc.c:649 src/protocols/silc/util.c:516
+#: src/protocols/silc/silc.c:664 src/protocols/silc/util.c:516
 msgid "MMS"
 msgstr "MMS"
 
-#: src/protocols/silc/silc.c:651 src/protocols/silc/util.c:518
+#: src/protocols/silc/silc.c:666 src/protocols/silc/util.c:518
 msgid "Video Conferencing"
 msgstr "Video Conferencing"
 
-#: src/protocols/silc/silc.c:656
+#: src/protocols/silc/silc.c:671
 msgid "Your Current Status"
 msgstr "Your Current Status"
 
-#: src/protocols/silc/silc.c:663
+#: src/protocols/silc/silc.c:678
 msgid "Online Services"
 msgstr "Online Services"
 
-#: src/protocols/silc/silc.c:666
+#: src/protocols/silc/silc.c:681
 msgid "Let others see what services you are using"
 msgstr "Let others see what services you are using"
 
-#: src/protocols/silc/silc.c:672
+#: src/protocols/silc/silc.c:687
 msgid "Let others see what computer you are using"
 msgstr "Let others see what computer you are using"
 
-#: src/protocols/silc/silc.c:679
+#: src/protocols/silc/silc.c:694
 msgid "Your VCard File"
 msgstr "Your VCard File"
 
-#: src/protocols/silc/silc.c:692 src/protocols/silc/silc.c:693
+#: src/protocols/silc/silc.c:707 src/protocols/silc/silc.c:708
 msgid "User Online Status Attributes"
 msgstr "User Online Status Attributes"
 
-#: src/protocols/silc/silc.c:694
+#: src/protocols/silc/silc.c:709
 msgid ""
 "You can let other users see your online status information and your personal "
 "information. Please fill the information you would like other users to see "
@@ -9583,131 +9435,131 @@
 "information. Please fill the information you would like other users to see "
 "about yourself."
 
-#: src/protocols/silc/silc.c:734 src/protocols/silc/silc.c:740
-#: src/protocols/silc/silc.c:1143
+#: src/protocols/silc/silc.c:749 src/protocols/silc/silc.c:755
+#: src/protocols/silc/silc.c:1158
 msgid "Message of the Day"
 msgstr "Message of the Day"
 
-#: src/protocols/silc/silc.c:734
+#: src/protocols/silc/silc.c:749
 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:1138
+#: src/protocols/silc/silc.c:750 src/protocols/silc/silc.c:1153
 msgid "There is no Message of the Day associated with this connection"
 msgstr "There is no Message of the Day associated with this connection"
 
-#: src/protocols/silc/silc.c:778
+#: src/protocols/silc/silc.c:793
 msgid "Online Status"
 msgstr "Online Status"
 
-#: src/protocols/silc/silc.c:787
+#: src/protocols/silc/silc.c:802
 msgid "View Message of the Day"
 msgstr "View Message of the Day"
 
-#: src/protocols/silc/silc.c:859
+#: src/protocols/silc/silc.c:874
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "User <I>%s</I> is not present in the network"
 
-#: src/protocols/silc/silc.c:968
+#: src/protocols/silc/silc.c:983
 msgid "Failed to leave channel"
 msgstr "Failed to leave channel"
 
-#: src/protocols/silc/silc.c:1014
+#: src/protocols/silc/silc.c:1029
 msgid "Topic too long"
 msgstr "Topic too long"
 
-#: src/protocols/silc/silc.c:1095
+#: src/protocols/silc/silc.c:1110
 msgid "You must specify a nick"
 msgstr "You must specify a nick"
 
-#: src/protocols/silc/silc.c:1197
+#: src/protocols/silc/silc.c:1212
 #, c-format
 msgid "channel %s not found"
 msgstr "channel %s not found"
 
-#: src/protocols/silc/silc.c:1202
+#: src/protocols/silc/silc.c:1217
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "channel modes for %s: %s"
 
-#: src/protocols/silc/silc.c:1204
+#: src/protocols/silc/silc.c:1219
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "no channel modes are set on %s"
 
-#: src/protocols/silc/silc.c:1217
+#: src/protocols/silc/silc.c:1232
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "Failed to set cmodes for %s"
 
-#: src/protocols/silc/silc.c:1247
+#: src/protocols/silc/silc.c:1262
 #, 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:1310
+#: src/protocols/silc/silc.c:1325
 msgid "part [channel]:  Leave the chat"
 msgstr "part [channel]:  Leave the chat"
 
-#: src/protocols/silc/silc.c:1314
+#: src/protocols/silc/silc.c:1329
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [channel]:  Leave the chat"
 
-#: src/protocols/silc/silc.c:1318
+#: src/protocols/silc/silc.c:1333
 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:1323
+#: src/protocols/silc/silc.c:1338
 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:1327
+#: src/protocols/silc/silc.c:1342
 msgid "list:  List channels on this network"
 msgstr "list:  List channels on this network"
 
-#: src/protocols/silc/silc.c:1331
+#: src/protocols/silc/silc.c:1346
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;nick&gt;:  View nick's information"
 
-#: src/protocols/silc/silc.c:1335 src/protocols/zephyr/zephyr.c:1678
+#: src/protocols/silc/silc.c:1350 src/protocols/zephyr/zephyr.c:2561
 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:1339
+#: src/protocols/silc/silc.c:1354
 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:1343
+#: src/protocols/silc/silc.c:1358
 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:1347
+#: src/protocols/silc/silc.c:1362
 msgid "detach:  Detach this session"
 msgstr "detach:  Detach this session"
 
-#: src/protocols/silc/silc.c:1351
+#: src/protocols/silc/silc.c:1366
 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:1355
+#: src/protocols/silc/silc.c:1370
 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:1361
+#: src/protocols/silc/silc.c:1376
 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:1365
+#: src/protocols/silc/silc.c:1380
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;newnick&gt;:  Change your nickname"
 
-#: src/protocols/silc/silc.c:1369
+#: src/protocols/silc/silc.c:1384
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;nick&gt;:  View nick's information"
 
-#: src/protocols/silc/silc.c:1373
+#: src/protocols/silc/silc.c:1388
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
@@ -9715,7 +9567,7 @@
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
 
-#: src/protocols/silc/silc.c:1377
+#: src/protocols/silc/silc.c:1392
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
@@ -9723,15 +9575,15 @@
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
 
-#: src/protocols/silc/silc.c:1381
+#: src/protocols/silc/silc.c:1396
 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:1385
+#: src/protocols/silc/silc.c:1400
 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:1389
+#: src/protocols/silc/silc.c:1404
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
@@ -9739,35 +9591,35 @@
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
 
-#: src/protocols/silc/silc.c:1393
+#: src/protocols/silc/silc.c:1408
 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:1397
+#: src/protocols/silc/silc.c:1412
 msgid "info [server]:  View server administrative details"
 msgstr "info [server]:  View server administrative details"
 
-#: src/protocols/silc/silc.c:1401
+#: src/protocols/silc/silc.c:1416
 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:1405
+#: src/protocols/silc/silc.c:1420
 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:1409
+#: src/protocols/silc/silc.c:1424
 msgid "stats:  View server and network statistics"
 msgstr "stats:  View server and network statistics"
 
-#: src/protocols/silc/silc.c:1413
+#: src/protocols/silc/silc.c:1428
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:  Send PING to the connected server"
 
-#: src/protocols/silc/silc.c:1418
+#: src/protocols/silc/silc.c:1433
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;channel&gt;:  List users in channel"
 
-#: src/protocols/silc/silc.c:1422
+#: src/protocols/silc/silc.c:1437
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -9775,43 +9627,42 @@
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
 
-#: src/protocols/silc/silc.c:1434
+#: src/protocols/silc/silc.c:1449
 msgid "Instant Messages"
 msgstr "Instant Messages"
 
-#: src/protocols/silc/silc.c:1439
+#: src/protocols/silc/silc.c:1454
 msgid "Digitally sign all IM messages"
 msgstr "Digitally sign all IM messages"
 
-#: src/protocols/silc/silc.c:1444
+#: src/protocols/silc/silc.c:1459
 msgid "Verify all IM message signatures"
 msgstr "Verify all IM message signatures"
 
-#: src/protocols/silc/silc.c:1447
+#: src/protocols/silc/silc.c:1462
 msgid "Channel Messages"
 msgstr "Channel Messages"
 
-#: src/protocols/silc/silc.c:1452
+#: src/protocols/silc/silc.c:1467
 msgid "Digitally sign all channel messages"
 msgstr "Digitally sign all channel messages"
 
-#: src/protocols/silc/silc.c:1457
+#: src/protocols/silc/silc.c:1472
 msgid "Verify all channel message signatures"
 msgstr "Verify all channel message signatures"
 
-#: src/protocols/silc/silc.c:1460
+#: src/protocols/silc/silc.c:1475
 msgid "Default SILC Key Pair"
 msgstr "Default SILC Key Pair"
 
-#: src/protocols/silc/silc.c:1465
+#: src/protocols/silc/silc.c:1480
 msgid "SILC Public Key"
 msgstr "SILC Public Key"
 
-#: src/protocols/silc/silc.c:1470
+#: src/protocols/silc/silc.c:1485
 msgid "SILC Private Key"
 msgstr "SILC Private Key"
 
-#. *< api_version
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -9821,40 +9672,40 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/silc/silc.c:1557
+#: src/protocols/silc/silc.c:1574
 msgid "SILC Protocol Plugin"
 msgstr "SILC Protocol Plugin"
 
 #. *  description
-#: src/protocols/silc/silc.c:1559
+#: src/protocols/silc/silc.c:1576
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Secure Internet Live Conferencing (SILC) Protocol"
 
-#: src/protocols/silc/silc.c:1589
+#: src/protocols/silc/silc.c:1606
 msgid "Public key authentication"
 msgstr "Public key authentication"
 
-#: src/protocols/silc/silc.c:1595
+#: src/protocols/silc/silc.c:1612
 msgid "Public Key File"
 msgstr "Public Key File"
 
-#: src/protocols/silc/silc.c:1599
+#: src/protocols/silc/silc.c:1616
 msgid "Private Key File"
 msgstr "Private Key File"
 
-#: src/protocols/silc/silc.c:1604
+#: src/protocols/silc/silc.c:1621
 msgid "Reject watching by other users"
 msgstr "Reject watching by other users"
 
-#: src/protocols/silc/silc.c:1607
+#: src/protocols/silc/silc.c:1624
 msgid "Block invites"
 msgstr "Block invites"
 
-#: src/protocols/silc/silc.c:1610
+#: src/protocols/silc/silc.c:1627
 msgid "Block IMs without Key Exchange"
 msgstr "Block IMs without Key Exchange"
 
-#: src/protocols/silc/silc.c:1613
+#: src/protocols/silc/silc.c:1630
 msgid "Reject online status attribute requests"
 msgstr "Reject online status attribute requests"
 
@@ -9945,110 +9796,110 @@
 msgid "Terminal"
 msgstr "Terminal"
 
-#: src/protocols/toc/toc.c:136
+#: src/protocols/toc/toc.c:138
 #, c-format
 msgid "Looking up %s"
 msgstr "Looking up %s"
 
-#: src/protocols/toc/toc.c:479
+#: src/protocols/toc/toc.c:481
 #, c-format
 msgid "Unable to write file %s."
 msgstr "Unable to write file %s."
 
-#: src/protocols/toc/toc.c:482
+#: src/protocols/toc/toc.c:484
 #, c-format
 msgid "Unable to read file %s."
 msgstr "Unable to read file %s."
 
-#: src/protocols/toc/toc.c:485
+#: src/protocols/toc/toc.c:487
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "Message too long, last %s bytes truncated."
 
-#: src/protocols/toc/toc.c:488
+#: src/protocols/toc/toc.c:490
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s not currently logged in."
 
-#: src/protocols/toc/toc.c:491
+#: src/protocols/toc/toc.c:493
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "Warning of %s not allowed."
 
-#: src/protocols/toc/toc.c:494
+#: src/protocols/toc/toc.c:496
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "A message has been dropped, you are exceeding the server speed limit."
 
-#: src/protocols/toc/toc.c:497
+#: src/protocols/toc/toc.c:499
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "Chat in %s is not available."
 
-#: src/protocols/toc/toc.c:500
+#: src/protocols/toc/toc.c:502
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "You are sending messages too fast to %s."
 
-#: src/protocols/toc/toc.c:503
+#: src/protocols/toc/toc.c:505
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "You missed an IM from %s because it was too big."
 
-#: src/protocols/toc/toc.c:506
+#: src/protocols/toc/toc.c:508
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "You missed an IM from %s because it was sent too fast."
 
-#: src/protocols/toc/toc.c:509
+#: src/protocols/toc/toc.c:511
 msgid "Failure."
 msgstr "Failure."
 
-#: src/protocols/toc/toc.c:512
+#: src/protocols/toc/toc.c:514
 msgid "Too many matches."
 msgstr "Too many matches."
 
-#: src/protocols/toc/toc.c:515
+#: src/protocols/toc/toc.c:517
 msgid "Need more qualifiers."
 msgstr "Need more qualifiers."
 
-#: src/protocols/toc/toc.c:518
+#: src/protocols/toc/toc.c:520
 msgid "Dir service temporarily unavailable."
 msgstr "Dir service temporarily unavailable."
 
-#: src/protocols/toc/toc.c:521
+#: src/protocols/toc/toc.c:523
 msgid "Email lookup restricted."
 msgstr "Email lookup restricted."
 
-#: src/protocols/toc/toc.c:524
+#: src/protocols/toc/toc.c:526
 msgid "Keyword ignored."
 msgstr "Keyword ignored."
 
-#: src/protocols/toc/toc.c:527
+#: src/protocols/toc/toc.c:529
 msgid "No keywords."
 msgstr "No keywords."
 
-#: src/protocols/toc/toc.c:530
+#: src/protocols/toc/toc.c:532
 msgid "User has no directory information."
 msgstr "User has no directory information."
 
-#: src/protocols/toc/toc.c:534
+#: src/protocols/toc/toc.c:536
 msgid "Country not supported."
 msgstr "Country not supported."
 
-#: src/protocols/toc/toc.c:537
+#: src/protocols/toc/toc.c:539
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "Failure unknown: %s."
 
-#: src/protocols/toc/toc.c:543
+#: src/protocols/toc/toc.c:545
 msgid "The service is temporarily unavailable."
 msgstr "The service is temporarily unavailable."
 
-#: src/protocols/toc/toc.c:546
+#: src/protocols/toc/toc.c:548
 msgid "Your warning level is currently too high to log in."
 msgstr "Your warning level is currently too high to log in."
 
-#: src/protocols/toc/toc.c:549
+#: src/protocols/toc/toc.c:551
 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."
@@ -10056,37 +9907,37 @@
 "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/toc/toc.c:551
+#: src/protocols/toc/toc.c:553
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "An unknown signon error has occurred: %s."
 
-#: src/protocols/toc/toc.c:554
+#: src/protocols/toc/toc.c:556
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "An unknown error, %d, has occurred.  Info: %s"
 
-#: src/protocols/toc/toc.c:575
+#: src/protocols/toc/toc.c:577
 msgid "Connection Closed"
 msgstr "Connection Closed"
 
-#: src/protocols/toc/toc.c:615
+#: src/protocols/toc/toc.c:617
 msgid "Waiting for reply..."
 msgstr "Waiting for reply..."
 
-#: src/protocols/toc/toc.c:694
+#: src/protocols/toc/toc.c:696
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOC has come back from its pause. You may now send messages again."
 
-#: src/protocols/toc/toc.c:890
+#: src/protocols/toc/toc.c:899
 msgid "Password Change Successful"
 msgstr "Password Change Successful"
 
-#: src/protocols/toc/toc.c:894
+#: src/protocols/toc/toc.c:903
 msgid "TOC has sent a PAUSE command."
 msgstr "TOC has sent a PAUSE command."
 
-#: src/protocols/toc/toc.c:895
+#: src/protocols/toc/toc.c:904
 msgid ""
 "When this happens, TOC ignores any messages sent to it, and may kick you off "
 "if you send a message. Gaim will prevent anything from going through. This "
@@ -10096,49 +9947,48 @@
 "if you send a message. Gaim will prevent anything from going through. This "
 "is only temporary, please be patient."
 
-#: src/protocols/toc/toc.c:1421
+#: src/protocols/toc/toc.c:1430
 msgid "Get Dir Info"
 msgstr "Get Dir Info"
 
-#: src/protocols/toc/toc.c:1557
+#: src/protocols/toc/toc.c:1566
 msgid "Set Dir Info"
 msgstr "Set Dir Info"
 
-#: src/protocols/toc/toc.c:1679
+#: src/protocols/toc/toc.c:1688
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "Could not open %s for writing!"
 
-#: src/protocols/toc/toc.c:1715
+#: src/protocols/toc/toc.c:1724
 msgid "File transfer failed; other side probably canceled."
-msgstr "File transfer failed; other side probably canceled."
-
-#: src/protocols/toc/toc.c:1760 src/protocols/toc/toc.c:1800
-#: src/protocols/toc/toc.c:1924 src/protocols/toc/toc.c:2012
+msgstr "File transfer failed; other side probably cancelled."
+
+#: src/protocols/toc/toc.c:1769 src/protocols/toc/toc.c:1809
+#: src/protocols/toc/toc.c:1933 src/protocols/toc/toc.c:2021
 msgid "Could not connect for transfer."
 msgstr "Could not connect for transfer."
 
-#: src/protocols/toc/toc.c:1957
+#: src/protocols/toc/toc.c:1966
 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:2057
+#: src/protocols/toc/toc.c:2066
 msgid "Gaim - Save As..."
 msgstr "Gaim - Save As..."
 
-#: src/protocols/toc/toc.c:2091
+#: src/protocols/toc/toc.c:2100
 #, 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:2098
+#: src/protocols/toc/toc.c:2107
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s requests you to send them a file"
 
-#. *< api_version
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -10149,88 +9999,87 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/toc/toc.c:2182 src/protocols/toc/toc.c:2184
+#: src/protocols/toc/toc.c:2194 src/protocols/toc/toc.c:2196
 msgid "TOC Protocol Plugin"
 msgstr "TOC Protocol Plugin"
 
-#: src/protocols/toc/toc.c:2203
+#: src/protocols/toc/toc.c:2215
 msgid "TOC host"
 msgstr "TOC host"
 
-#: src/protocols/toc/toc.c:2207
+#: src/protocols/toc/toc.c:2219
 msgid "TOC port"
 msgstr "TOC port"
 
 #. Basic Profile group.
-#: src/protocols/trepia/trepia.c:263
+#: src/protocols/trepia/trepia.c:264
 msgid "Basic Profile"
 msgstr "Basic Profile"
 
 #. E-Mail Address
-#: src/protocols/trepia/trepia.c:294
+#: src/protocols/trepia/trepia.c:295
 msgid "E-Mail Address"
 msgstr "E-Mail Address"
 
-#: src/protocols/trepia/trepia.c:300
+#: src/protocols/trepia/trepia.c:301
 msgid "Profile Information"
 msgstr "Profile Information"
 
 #. Instant Messagers
-#: src/protocols/trepia/trepia.c:306
+#: src/protocols/trepia/trepia.c:307
 msgid "Instant Messagers"
 msgstr "Instant Messagers"
 
 #. AIM
-#: src/protocols/trepia/trepia.c:310
+#: src/protocols/trepia/trepia.c:311
 msgid "AIM"
 msgstr "AIM"
 
 #. ICQ
-#: src/protocols/trepia/trepia.c:314
+#: src/protocols/trepia/trepia.c:315
 msgid "ICQ UIN"
 msgstr "ICQ UIN"
 
 #. MSN
-#: src/protocols/trepia/trepia.c:318
+#: src/protocols/trepia/trepia.c:319
 msgid "MSN"
 msgstr "MSN"
 
 #. Yahoo
-#: src/protocols/trepia/trepia.c:322
+#: src/protocols/trepia/trepia.c:323
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #. I'm From
-#: src/protocols/trepia/trepia.c:327
+#: src/protocols/trepia/trepia.c:328
 msgid "I'm From"
 msgstr "I'm From"
 
 #. Call the dialog.
-#: src/protocols/trepia/trepia.c:344
+#: src/protocols/trepia/trepia.c:345
 msgid "Set your Trepia profile data."
 msgstr "Set your Trepia profile data."
 
-#: src/protocols/trepia/trepia.c:424
+#: src/protocols/trepia/trepia.c:425
 msgid "Profile"
 msgstr "Profile"
 
-#: src/protocols/trepia/trepia.c:438
+#: src/protocols/trepia/trepia.c:439
 msgid "Set Profile"
 msgstr "Set Profile"
 
-#: src/protocols/trepia/trepia.c:475
+#: src/protocols/trepia/trepia.c:476
 msgid "Visit Homepage"
 msgstr "Visit Homepage"
 
-#: src/protocols/trepia/trepia.c:821 src/protocols/trepia/trepia.c:824
+#: src/protocols/trepia/trepia.c:822 src/protocols/trepia/trepia.c:825
 msgid "Local Users"
 msgstr "Local Users"
 
-#: src/protocols/trepia/trepia.c:1027
+#: src/protocols/trepia/trepia.c:1030
 msgid "Logging in"
 msgstr "Logging in"
 
-#. *< api_version
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -10241,11 +10090,11 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/trepia/trepia.c:1272 src/protocols/trepia/trepia.c:1274
+#: src/protocols/trepia/trepia.c:1277 src/protocols/trepia/trepia.c:1279
 msgid "Trepia Protocol Plugin"
 msgstr "Trepia Protocol Plugin"
 
-#: src/protocols/yahoo/yahoo.c:338
+#: src/protocols/yahoo/yahoo.c:396
 msgid ""
 "You have been logged off as you have logged in on a different machine or "
 "device."
@@ -10253,25 +10102,25 @@
 "You have been logged off as you have logged in on a different machine or "
 "device."
 
-#: src/protocols/yahoo/yahoo.c:808
+#: src/protocols/yahoo/yahoo.c:871
 msgid "Your Yahoo! message did not get sent."
 msgstr "Your Yahoo! message did not get sent."
 
-#: src/protocols/yahoo/yahoo.c:827
+#: src/protocols/yahoo/yahoo.c:890 src/protocols/yahoo/yahoo.c:3406
 msgid "Buzz!!"
 msgstr "Buzz!!"
 
-#: src/protocols/yahoo/yahoo.c:870
+#: src/protocols/yahoo/yahoo.c:935
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Yahoo! system message for %s:"
 
-#: src/protocols/yahoo/yahoo.c:936
+#: src/protocols/yahoo/yahoo.c:1002
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr "%s has (retroactively) denied your request to add them to your list."
 
-#: src/protocols/yahoo/yahoo.c:939
+#: src/protocols/yahoo/yahoo.c:1005
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -10280,11 +10129,11 @@
 "%s has (retroactively) denied your request to add them to your list for the "
 "following reason: %s."
 
-#: src/protocols/yahoo/yahoo.c:942
+#: src/protocols/yahoo/yahoo.c:1008
 msgid "Add buddy rejected"
 msgstr "Add buddy rejected"
 
-#: src/protocols/yahoo/yahoo.c:1702
+#: src/protocols/yahoo/yahoo.c:1769
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -10295,11 +10144,11 @@
 "method.  This version of Gaim will likely not be able to successfully sign "
 "on to Yahoo.  Check %s for updates."
 
-#: src/protocols/yahoo/yahoo.c:1705
+#: src/protocols/yahoo/yahoo.c:1772
 msgid "Failed Yahoo! Authentication"
 msgstr "Failed Yahoo! Authentication"
 
-#: src/protocols/yahoo/yahoo.c:1777
+#: src/protocols/yahoo/yahoo.c:1844
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -10308,19 +10157,19 @@
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
 "\"Yes\" will remove and ignore the buddy."
 
-#: src/protocols/yahoo/yahoo.c:1780
+#: src/protocols/yahoo/yahoo.c:1847
 msgid "Ignore buddy?"
 msgstr "Ignore buddy?"
 
-#: src/protocols/yahoo/yahoo.c:1814
+#: src/protocols/yahoo/yahoo.c:1881
 msgid "Invalid username."
 msgstr "Invalid username."
 
-#: src/protocols/yahoo/yahoo.c:1825
+#: src/protocols/yahoo/yahoo.c:1892
 msgid "Normal authentication failed!"
 msgstr "Normal authentication failed!"
 
-#: src/protocols/yahoo/yahoo.c:1826
+#: src/protocols/yahoo/yahoo.c:1893
 msgid ""
 "The normal authentication method has failed. This means either your password "
 "is incorrect, or Yahoo!'s authentication scheme has changed. Gaim will now "
@@ -10332,94 +10181,96 @@
 "attempt to log in using Web Messenger authentication, which will result in "
 "reduced functionality and features."
 
-#: src/protocols/yahoo/yahoo.c:1834
+#: src/protocols/yahoo/yahoo.c:1901
 msgid "Incorrect password."
 msgstr "Incorrect password."
 
-#: src/protocols/yahoo/yahoo.c:1837
+#: src/protocols/yahoo/yahoo.c:1904
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "Your account is locked. Please log in to the Yahoo! website."
 
-#: src/protocols/yahoo/yahoo.c:1840
+#: src/protocols/yahoo/yahoo.c:1907
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "Unknown error number %d. Logging into the Yahoo! website may fix this."
 
-#: src/protocols/yahoo/yahoo.c:1894
+#: src/protocols/yahoo/yahoo.c:1961
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr "Could not add buddy %s to group %s to the server list on account %s."
 
-#: src/protocols/yahoo/yahoo.c:1897
+#: src/protocols/yahoo/yahoo.c:1964
 msgid "Could not add buddy to server list"
 msgstr "Could not add buddy to server list"
 
-#: src/protocols/yahoo/yahoo.c:2131 src/protocols/yahoo/yahoo.c:2259
+#: src/protocols/yahoo/yahoo.c:2198 src/protocols/yahoo/yahoo.c:2326
 #: src/protocols/yahoo/ycht.c:414
 msgid "Unable to read"
 msgstr "Unable to read"
 
-#: 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:1410 src/protocols/yahoo/yahoochat.c:1471
+#: src/protocols/yahoo/yahoo.c:2348 src/protocols/yahoo/yahoo.c:2458
+#: src/protocols/yahoo/yahoo.c:2508 src/protocols/yahoo/yahoo.c:2518
+#: src/protocols/yahoo/yahoochat.c:1415 src/protocols/yahoo/yahoochat.c:1476
 #: src/protocols/yahoo/ycht.c:518
 msgid "Connection problem"
 msgstr "Connection problem"
 
-#: src/protocols/yahoo/yahoo.c:2547 src/protocols/yahoo/yahoo.c:2914
-#: src/protocols/yahoo/yahoo.c:3028
+#: src/protocols/yahoo/yahoo.c:2621 src/protocols/yahoo/yahoo.c:3125
 msgid "Not At Home"
 msgstr "Not At Home"
 
-#: src/protocols/yahoo/yahoo.c:2549 src/protocols/yahoo/yahoo.c:2916
-#: src/protocols/yahoo/yahoo.c:3029
+#: src/protocols/yahoo/yahoo.c:2623 src/protocols/yahoo/yahoo.c:3128
 msgid "Not At Desk"
 msgstr "Not At Desk"
 
-#: src/protocols/yahoo/yahoo.c:2551 src/protocols/yahoo/yahoo.c:2918
-#: src/protocols/yahoo/yahoo.c:3030
+#: src/protocols/yahoo/yahoo.c:2625 src/protocols/yahoo/yahoo.c:3131
 msgid "Not In Office"
 msgstr "Not In Office"
 
-#: src/protocols/yahoo/yahoo.c:2555 src/protocols/yahoo/yahoo.c:2922
-#: src/protocols/yahoo/yahoo.c:3032
+#: src/protocols/yahoo/yahoo.c:2629 src/protocols/yahoo/yahoo.c:3137
 msgid "On Vacation"
 msgstr "On Vacation"
 
-#: src/protocols/yahoo/yahoo.c:2559 src/protocols/yahoo/yahoo.c:2926
-#: src/protocols/yahoo/yahoo.c:3034
+#: src/protocols/yahoo/yahoo.c:2633 src/protocols/yahoo/yahoo.c:3143
 msgid "Stepped Out"
 msgstr "Stepped Out"
 
-#: src/protocols/yahoo/yahoo.c:2640 src/protocols/yahoo/yahoo.c:2666
+#: src/protocols/yahoo/yahoo.c:2714 src/protocols/yahoo/yahoo.c:2740
 msgid "Not on server list"
 msgstr "Not on server list"
 
-#: src/protocols/yahoo/yahoo.c:2745
+#: src/protocols/yahoo/yahoo.c:2819
 msgid "Join in Chat"
 msgstr "Join in Chat"
 
-#: src/protocols/yahoo/yahoo.c:2750
+#: src/protocols/yahoo/yahoo.c:2824
 msgid "Initiate Conference"
 msgstr "Initiate Conference"
 
-#: src/protocols/yahoo/yahoo.c:2802
+#: src/protocols/yahoo/yahoo.c:2876
 msgid "Active which ID?"
 msgstr "Active which ID?"
 
-#: src/protocols/yahoo/yahoo.c:2811
+#: src/protocols/yahoo/yahoo.c:2885
 msgid "Join who in chat?"
 msgstr "Join who in chat?"
 
-#: src/protocols/yahoo/yahoo.c:2821
+#: src/protocols/yahoo/yahoo.c:2895
 msgid "Activate ID..."
 msgstr "Activate ID..."
 
-#: src/protocols/yahoo/yahoo.c:2825
+#: src/protocols/yahoo/yahoo.c:2899
 msgid "Join user in chat..."
 msgstr "Join user in chat..."
 
-#. *< api_version
+#: src/protocols/yahoo/yahoo.c:3450
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+
+#: src/protocols/yahoo/yahoo.c:3454
+msgid "buzz: Buzz a contact to get their attention"
+msgstr "buzz: Buzz a contact to get their attention"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -10430,47 +10281,47 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/yahoo/yahoo.c:3350 src/protocols/yahoo/yahoo.c:3352
+#: src/protocols/yahoo/yahoo.c:3534 src/protocols/yahoo/yahoo.c:3536
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo Protocol Plugin"
 
-#: src/protocols/yahoo/yahoo.c:3371
+#: src/protocols/yahoo/yahoo.c:3555
 msgid "Yahoo Japan"
 msgstr "Yahoo Japan"
 
-#: src/protocols/yahoo/yahoo.c:3374
+#: src/protocols/yahoo/yahoo.c:3558
 msgid "Pager host"
 msgstr "Pager host"
 
-#: src/protocols/yahoo/yahoo.c:3377
+#: src/protocols/yahoo/yahoo.c:3561
 msgid "Japan Pager host"
 msgstr "Japan Pager host"
 
-#: src/protocols/yahoo/yahoo.c:3380
+#: src/protocols/yahoo/yahoo.c:3564
 msgid "Pager port"
 msgstr "Pager port"
 
-#: src/protocols/yahoo/yahoo.c:3383
+#: src/protocols/yahoo/yahoo.c:3567
 msgid "File transfer host"
 msgstr "File transfer host"
 
-#: src/protocols/yahoo/yahoo.c:3386
+#: src/protocols/yahoo/yahoo.c:3570
 msgid "Japan File transfer host"
 msgstr "Japan File transfer host"
 
-#: src/protocols/yahoo/yahoo.c:3389
+#: src/protocols/yahoo/yahoo.c:3573
 msgid "File transfer port"
 msgstr "File transfer port"
 
-#: src/protocols/yahoo/yahoo.c:3392
+#: src/protocols/yahoo/yahoo.c:3576
 msgid "Chat Room List Url"
 msgstr "Chat Room List Url"
 
-#: src/protocols/yahoo/yahoo.c:3395
+#: src/protocols/yahoo/yahoo.c:3579
 msgid "YCHT Host"
 msgstr "YCHT Host"
 
-#: src/protocols/yahoo/yahoo.c:3398
+#: src/protocols/yahoo/yahoo.c:3582
 msgid "YCHT Port"
 msgstr "YCHT Port"
 
@@ -10482,20 +10333,20 @@
 "Gaim cannot send files over Yahoo! that are bigger than One Megabyte "
 "(1,048,576 bytes)."
 
-#: src/protocols/yahoo/yahoo_profile.c:675
+#: src/protocols/yahoo/yahoo_profile.c:677
 #, c-format
 msgid "<b>IP Address:</b> %s<br>"
 msgstr "<b>IP Address:</b> %s<br>"
 
-#: src/protocols/yahoo/yahoo_profile.c:749
+#: src/protocols/yahoo/yahoo_profile.c:751
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! Japan Profile"
 
-#: src/protocols/yahoo/yahoo_profile.c:750
+#: src/protocols/yahoo/yahoo_profile.c:752
 msgid "Yahoo! Profile"
 msgstr "Yahoo! Profile"
 
-#: src/protocols/yahoo/yahoo_profile.c:794
+#: src/protocols/yahoo/yahoo_profile.c:796
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
@@ -10503,7 +10354,7 @@
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
 
-#: src/protocols/yahoo/yahoo_profile.c:796
+#: src/protocols/yahoo/yahoo_profile.c:798
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser"
@@ -10511,43 +10362,43 @@
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser"
 
-#: src/protocols/yahoo/yahoo_profile.c:969
+#: src/protocols/yahoo/yahoo_profile.c:971
 msgid "Yahoo! ID"
 msgstr "Yahoo! ID"
 
-#: src/protocols/yahoo/yahoo_profile.c:1043
-#: src/protocols/yahoo/yahoo_profile.c:1047
-#: src/protocols/yahoo/yahoo_profile.c:1051
+#: src/protocols/yahoo/yahoo_profile.c:1045
+#: src/protocols/yahoo/yahoo_profile.c:1049
+#: src/protocols/yahoo/yahoo_profile.c:1053
 msgid "Hobbies"
 msgstr "Hobbies"
 
-#: src/protocols/yahoo/yahoo_profile.c:1061
-#: src/protocols/yahoo/yahoo_profile.c:1065
+#: src/protocols/yahoo/yahoo_profile.c:1063
+#: src/protocols/yahoo/yahoo_profile.c:1067
 msgid "Latest News"
 msgstr "Latest News"
 
-#: src/protocols/yahoo/yahoo_profile.c:1086
+#: src/protocols/yahoo/yahoo_profile.c:1088
 msgid "Home Page"
 msgstr "Home Page"
 
-#: src/protocols/yahoo/yahoo_profile.c:1101
+#: src/protocols/yahoo/yahoo_profile.c:1103
 msgid "Cool Link 1"
 msgstr "Cool Link 1"
 
-#: src/protocols/yahoo/yahoo_profile.c:1106
+#: src/protocols/yahoo/yahoo_profile.c:1108
 msgid "Cool Link 2"
 msgstr "Cool Link 2"
 
-#: src/protocols/yahoo/yahoo_profile.c:1110
+#: src/protocols/yahoo/yahoo_profile.c:1112
 msgid "Cool Link 3"
 msgstr "Cool Link 3"
 
-#: src/protocols/yahoo/yahoo_profile.c:1130
+#: src/protocols/yahoo/yahoo_profile.c:1132
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "User information for %s unavailable"
 
-#: src/protocols/yahoo/yahoo_profile.c:1136
+#: src/protocols/yahoo/yahoo_profile.c:1138
 msgid ""
 "Sorry, this profile seems to be in a language that is not supported at this "
 "time."
@@ -10555,7 +10406,7 @@
 "Sorry, this profile seems to be in a language that is not supported at this "
 "time."
 
-#: src/protocols/yahoo/yahoo_profile.c:1152
+#: src/protocols/yahoo/yahoo_profile.c:1154
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
 "server-side problem. Please try again later."
@@ -10563,7 +10414,7 @@
 "Could not retrieve the user's profile. This most likely is a temporary "
 "server-side problem. Please try again later."
 
-#: src/protocols/yahoo/yahoo_profile.c:1155
+#: src/protocols/yahoo/yahoo_profile.c:1157
 msgid ""
 "Could not retrieve the user's profile. This most likely means that the user "
 "does not exist; however, Yahoo! sometimes does fail to find a user's "
@@ -10573,7 +10424,7 @@
 "does not exist; however, Yahoo! sometimes does fail to find a user's "
 "profile. If you know that the user exists, please try again later."
 
-#: src/protocols/yahoo/yahoo_profile.c:1163
+#: src/protocols/yahoo/yahoo_profile.c:1165
 msgid "The user's profile is empty."
 msgstr "The user's profile is empty."
 
@@ -10607,27 +10458,27 @@
 msgid "Maybe they're not in a chat?"
 msgstr "Maybe they're not in a chat?"
 
-#: src/protocols/yahoo/yahoochat.c:1351
+#: src/protocols/yahoo/yahoochat.c:1356
 msgid "Unable to connect"
 msgstr "Unable to connect"
 
-#: src/protocols/yahoo/yahoochat.c:1351
+#: src/protocols/yahoo/yahoochat.c:1356
 msgid "Fetching the room list failed."
 msgstr "Fetching the room list failed."
 
-#: src/protocols/yahoo/yahoochat.c:1396
+#: src/protocols/yahoo/yahoochat.c:1401
 msgid "Voices"
 msgstr "Voices"
 
-#: src/protocols/yahoo/yahoochat.c:1399
+#: src/protocols/yahoo/yahoochat.c:1404
 msgid "Webcams"
 msgstr "Webcams"
 
-#: src/protocols/yahoo/yahoochat.c:1410 src/protocols/yahoo/yahoochat.c:1471
+#: src/protocols/yahoo/yahoochat.c:1415 src/protocols/yahoo/yahoochat.c:1476
 msgid "Unable to fetch room list."
 msgstr "Unable to fetch room list."
 
-#: src/protocols/yahoo/yahoochat.c:1464
+#: src/protocols/yahoo/yahoochat.c:1469
 msgid "User Rooms"
 msgstr "User Rooms"
 
@@ -10635,73 +10486,85 @@
 msgid "Connection problem with the YCHT server."
 msgstr "Connection problem with the YCHT server."
 
-#: src/protocols/zephyr/zephyr.c:597
+#: src/protocols/zephyr/zephyr.c:329
+msgid ""
+"(There was an error converting this message.\t Check the 'Encoding' option "
+"in the Account Editor)"
+msgstr ""
+"(There was an error converting this message.\t Check the 'Encoding' option "
+"in the Account Editor)"
+
+#: src/protocols/zephyr/zephyr.c:677
 #, c-format
 msgid "Unable send to chat %s,%s,%s"
 msgstr "Unable send to chat %s,%s,%s"
 
-#: src/protocols/zephyr/zephyr.c:632
+#: src/protocols/zephyr/zephyr.c:710 src/protocols/zephyr/zephyr.c:1124
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>User:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:636
+#: src/protocols/zephyr/zephyr.c:714 src/protocols/zephyr/zephyr.c:1129
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>Hidden or not logged-in"
 
-#: src/protocols/zephyr/zephyr.c:641
+#: src/protocols/zephyr/zephyr.c:719 src/protocols/zephyr/zephyr.c:1131
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>At %s since %s"
 
-#: src/protocols/zephyr/zephyr.c:989 src/protocols/zephyr/zephyr.c:990
+#: src/protocols/zephyr/zephyr.c:1420 src/protocols/zephyr/zephyr.c:1421
 msgid "Anyone"
 msgstr "Anyone"
 
-#: src/protocols/zephyr/zephyr.c:1391
+#: src/protocols/zephyr/zephyr.c:2238
 msgid "_Class:"
 msgstr "_Class:"
 
-#: src/protocols/zephyr/zephyr.c:1397
+#: src/protocols/zephyr/zephyr.c:2244
 msgid "_Instance:"
 msgstr "_Instance:"
 
-#: src/protocols/zephyr/zephyr.c:1403
+#: src/protocols/zephyr/zephyr.c:2250
 msgid "_Recipient:"
 msgstr "_Recipient:"
 
-#: src/protocols/zephyr/zephyr.c:1414
+#: src/protocols/zephyr/zephyr.c:2261
 #, 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:1683
+#: src/protocols/zephyr/zephyr.c:2566
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;nick&gt;: Locate user"
 
-#: src/protocols/zephyr/zephyr.c:1688
+#: src/protocols/zephyr/zephyr.c:2571
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;nick&gt;: Locate user"
 
-#: src/protocols/zephyr/zephyr.c:1693
+#: src/protocols/zephyr/zephyr.c:2576
 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:1698
+#: src/protocols/zephyr/zephyr.c:2581
 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:1704
+#: src/protocols/zephyr/zephyr.c:2586
+msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
+msgstr "topic &lt;instance&gt;: Set the instance to be used on this class"
+
+#: src/protocols/zephyr/zephyr.c:2592
 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:1709
+#: src/protocols/zephyr/zephyr.c:2597
 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:1715
+#: src/protocols/zephyr/zephyr.c:2603
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
@@ -10709,7 +10572,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:1721
+#: src/protocols/zephyr/zephyr.c:2609
 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;"
@@ -10717,7 +10580,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:1727
+#: src/protocols/zephyr/zephyr.c:2615
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
@@ -10725,19 +10588,18 @@
 "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:1732
+#: src/protocols/zephyr/zephyr.c:2620
 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:1808
+#: src/protocols/zephyr/zephyr.c:2726
 msgid "Resubscribe"
 msgstr "Resubscribe"
 
-#: src/protocols/zephyr/zephyr.c:1811
+#: src/protocols/zephyr/zephyr.c:2729
 msgid "Retrieve subscriptions from server"
 msgstr "Retrieve subscriptions from server"
 
-#. *< api_version
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -10748,19 +10610,31 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/zephyr/zephyr.c:1892 src/protocols/zephyr/zephyr.c:1894
+#: src/protocols/zephyr/zephyr.c:2812 src/protocols/zephyr/zephyr.c:2814
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr Protocol Plugin"
 
-#: src/protocols/zephyr/zephyr.c:1913
+#: src/protocols/zephyr/zephyr.c:2839
 msgid "Export to .anyone"
 msgstr "Export to .anyone"
 
-#: src/protocols/zephyr/zephyr.c:1916
+#: src/protocols/zephyr/zephyr.c:2842
 msgid "Export to .zephyr.subs"
 msgstr "Export to .zephyr.subs"
 
-#: src/protocols/zephyr/zephyr.c:1919
+#: src/protocols/zephyr/zephyr.c:2845
+msgid "Import from .anyone"
+msgstr "Import from .anyone"
+
+#: src/protocols/zephyr/zephyr.c:2848
+msgid "Import from .zephyr.subs"
+msgstr "Import from .zephyr.subs"
+
+#: src/protocols/zephyr/zephyr.c:2851
+msgid "Realm"
+msgstr "Realm"
+
+#: src/protocols/zephyr/zephyr.c:2854
 msgid "Exposure"
 msgstr "Exposure"
 
@@ -10788,116 +10662,71 @@
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
 
-#. * Custom away message.
-#: src/prpl.h:180
-msgid "Custom"
-msgstr "Custom"
-
 #. *
 #. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #.
-#: src/request.h:1253
+#: src/request.h:1255
 msgid "Accept"
 msgstr "Accept"
 
-#: src/server.c:64
+#: src/server.c:62
 msgid "Please enter your password"
 msgstr "Please enter your password"
 
-#: src/server.c:535
+#: src/server.c:471
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s is now known as %s.\n"
 
-#: src/server.c:946
+#: src/server.c:895
 #, c-format
 msgid "(%d message)"
 msgid_plural "(%d messages)"
 msgstr[0] "(%d message)"
 msgstr[1] "(%d messages)"
 
-#: src/server.c:960
+#: src/server.c:909
 msgid "(1 message)"
 msgstr "(1 message)"
 
-#: src/server.c:1189 src/server.c:1198
-#, c-format
-msgid "%s logged in."
-msgstr "%s logged in."
-
-#: src/server.c:1210
-#, c-format
-msgid "%s signed on"
-msgstr "%s signed on"
-
-#: src/server.c:1225
+#: src/server.c:1162
+#, c-format
+msgid ""
+"%s has invited %s to the chat room %s:\n"
+"<b>%s</b>"
+msgstr ""
+"%s has invited %s to the chat room %s:\n"
+"<b>%s</b>"
+
+#: src/server.c:1166
+#, c-format
+msgid "%s has invited %s to the chat room %s\n"
+msgstr "%s has invited %s to the chat room %s\n"
+
+#: src/server.c:1172
+msgid "Accept chat invitation?"
+msgstr "Accept chat invitation?"
+
+#: src/status.c:552
 #, c-format
 msgid "%s came back"
 msgstr "%s came back"
 
-#: src/server.c:1227
+#: src/status.c:557
 #, c-format
 msgid "%s went away"
 msgstr "%s went away"
 
-#: src/server.c:1241
+#: src/status.c:1154
 #, c-format
 msgid "%s became idle"
 msgstr "%s became idle"
 
-#: src/server.c:1252
+#: src/status.c:1170
 #, c-format
 msgid "%s became unidle"
 msgstr "%s became unidle"
 
-#: src/server.c:1262 src/server.c:1269
-#, c-format
-msgid "%s logged out."
-msgstr "%s logged out."
-
-#: src/server.c:1282
-#, c-format
-msgid "%s signed off"
-msgstr "%s signed off"
-
-#: src/server.c:1344
-#, c-format
-msgid ""
-"%s has just been warned by %s.\n"
-"Your new warning level is %d%%"
-msgstr ""
-"%s has just been warned by %s.\n"
-"Your new warning level is %d%%"
-
-#: src/server.c:1347
-msgid "an anonymous person"
-msgstr "an anonymous person"
-
-#: src/server.c:1457
-#, c-format
-msgid ""
-"User '%s' invites %s to buddy chat room: '%s'\n"
-"%s"
-msgstr ""
-"User '%s' invites %s to buddy chat room: '%s'\n"
-"%s"
-
-#: src/server.c:1461
-#, c-format
-msgid "User '%s' invites %s to buddy chat room: '%s'\n"
-msgstr "User '%s' invites %s to buddy chat room: '%s'\n"
-
-#: src/server.c:1467
-msgid "Accept chat invitation?"
-msgstr "Accept chat invitation?"
-
-#. for people like myself who are too lazy to add an away msg :)
-#. I don't know who "myself" is in this context.  The exclamation point
-#. * makes it slightly less boring ;)
-#: src/status.c:36
-msgid "Sorry, I ran out for a bit!"
-msgstr "Sorry, I ran out for a bit!"
-
 #: src/stock.c:87
 msgid "_Alias"
 msgstr "_Alias"
@@ -10918,39 +10747,39 @@
 msgid "_Warn"
 msgstr "_Warn"
 
-#: src/util.c:2352
+#: src/util.c:2354
 msgid "Calculating..."
 msgstr "Calculating..."
 
-#: src/util.c:2355
+#: src/util.c:2357
 msgid "Unknown."
 msgstr "Unknown."
 
-#: src/util.c:2381
+#: src/util.c:2387
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "second"
 msgstr[1] "seconds"
 
-#: src/util.c:2395
+#: src/util.c:2401
 msgid "day"
 msgid_plural "days"
 msgstr[0] "day"
 msgstr[1] "days"
 
-#: src/util.c:2403
+#: src/util.c:2409
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "hour"
 msgstr[1] "hours"
 
-#: src/util.c:2411
+#: src/util.c:2417
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minute"
 msgstr[1] "minutes"
 
-#: src/util.c:2828
+#: src/util.c:2834
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Error opening connection.\n"