diff po/en_CA.po @ 11412:4be6232ffcd3

[gaim-migrate @ 13649] sync the oldstatus translations to head because I have not been updating head, and while head _is_ significantly different, there now exist translations in oldstatus that don't in head, and even where they exist in both, the oldstatus one is often more updated committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Thu, 01 Sep 2005 19:24:17 +0000
parents 67a929d50cfe
children e860157296d4
line wrap: on
line diff
--- a/po/en_CA.po	Thu Sep 01 18:47:49 2005 +0000
+++ b/po/en_CA.po	Thu Sep 01 19:24:17 2005 +0000
@@ -1,37 +1,37 @@
 # Canadian English translation of gaim
-# Copyright (C) 2004-2005 Adam Weinberger
+# Copyright (C) 2004-2005 Adam Weinberger and the gaim project
 # This file is distributed under the same licence as the gaim package.
-# en_CA.po Maintainer: Adam Weinberger <adamw@gnome.org>
+# Adam Weinberger <adamw@gnome.org>, 2004, 2005.
 #
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gaim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-15 12:01-0400\n"
-"PO-Revision-Date: 2005-02-13 19:45-0400\n"
+"POT-Creation-Date: 2005-07-10 16:02-0400\n"
+"PO-Revision-Date: 2005-03-17 19:45-0400\n"
 "Last-Translator: Adam Weinberger <adamw@gnome.org>\n"
-"Language-Team: en_CA <adamw@FreeBSD.org>\n"
+"Language-Team: Canadian English <adamw@gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: plugins/autorecon.c:291
+#: plugins/autorecon.c:240
 msgid "Error Message Suppression"
 msgstr "Error Message Suppression"
 
-#: plugins/autorecon.c:295
+#: plugins/autorecon.c:244
 msgid "Hide Disconnect Errors"
 msgstr "Hide Disconnect Errors"
 
-#: plugins/autorecon.c:299
+#: plugins/autorecon.c:248
 msgid "Hide Login Errors"
 msgstr "Hide Login Errors"
 
-#: plugins/autorecon.c:303
-msgid "Hide Reconnecting Dialog"
-msgstr "Hide Reconnecting Dialogue"
+#: plugins/autorecon.c:252
+msgid "Restore Away State On Reconnect"
+msgstr "Restore Away State On Reconnect"
 
 #. *< type
 #. *< ui_requirement
@@ -39,7 +39,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/autorecon.c:327
+#: plugins/autorecon.c:276
 msgid "Auto-Reconnect"
 msgstr "Auto-Reconnect"
 
@@ -47,10 +47,27 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/autorecon.c:330 plugins/autorecon.c:332
+#: plugins/autorecon.c:279 plugins/autorecon.c:281
 msgid "When you are kicked offline, this reconnects you."
 msgstr "When you are kicked offline, this reconnects you."
 
+#: plugins/chkmail.c:94 plugins/chkmail.c:117 plugins/chkmail.c:126
+msgid "Mail Server"
+msgstr "Mail Server"
+
+#: plugins/chkmail.c:136
+#, c-format
+msgid "%s (%d new/%d total)"
+msgstr "%s (%d new/%d total)"
+
+#: plugins/chkmail.c:199
+msgid "Check Mail"
+msgstr "Check Mail"
+
+#: plugins/chkmail.c:203
+msgid "Check email every X seconds.\n"
+msgstr "Check email every X seconds.\n"
+
 #: plugins/contact_priority.c:84
 msgid "Point values to use when..."
 msgstr "Point values to use when..."
@@ -73,13 +90,12 @@
 
 #. Explanation
 #: plugins/contact_priority.c:141
-#, fuzzy
 msgid ""
 "The buddy with the lowest score is the buddy who will have priority in the "
 "contact.\n"
-"The default values (offline = 4, away = 2, and idle = 1) will use what used "
-"to be\n"
-"the built-in order: active, idle, away, away + idle, offline."
+"The default values (offline = 4,away = 2, and idle = 1)\n"
+"will use what used to be the built-in order active->idle->away->away+idle-"
+">offline."
 msgstr ""
 "The buddy with the lowest score is the buddy who will have priority in the "
 "contact.\n"
@@ -88,8 +104,7 @@
 ">offline."
 
 #: plugins/contact_priority.c:144
-#, fuzzy
-msgid "Point values to use for account..."
+msgid "Point values to use for Account..."
 msgstr "Point values to use for Account..."
 
 #. *< type
@@ -120,6 +135,102 @@
 "Allows for changing the point values of idle/away/offline states for buddies "
 "in contact priority computations."
 
+#: plugins/docklet/docklet.c:137 src/gtkaccount.c:751 src/gtkaccount.c:2179
+msgid "Auto-login"
+msgstr "Auto-login"
+
+#: plugins/docklet/docklet.c:140
+msgid "New Message..."
+msgstr "New Message..."
+
+#: plugins/docklet/docklet.c:141
+msgid "Join A Chat..."
+msgstr "Join A Chat..."
+
+#: plugins/docklet/docklet.c:173
+msgid "New..."
+msgstr "New..."
+
+#: plugins/docklet/docklet.c:177 src/gtkprefs.c:1813 src/protocols/gg/gg.c:52
+#: src/protocols/irc/msgs.c:227 src/protocols/jabber/jabber.c:998
+#: src/protocols/jabber/jutil.c:32 src/protocols/jabber/presence.c:69
+#: src/protocols/jabber/presence.c:132 src/protocols/novell/novell.c:2800
+#: src/protocols/novell/novell.c:2917 src/protocols/novell/novell.c:2969
+#: src/protocols/oscar/oscar.c:684 src/protocols/oscar/oscar.c:5788
+#: src/protocols/oscar/oscar.c:6785 src/protocols/oscar/oscar.c:6985
+#: src/protocols/silc/buddy.c:1388 src/protocols/silc/silc.c:47
+#: src/protocols/silc/silc.c:81
+msgid "Away"
+msgstr "Away"
+
+#. else...
+#: plugins/docklet/docklet.c:183 src/away.c:595
+#: src/protocols/oscar/oscar.c:5706 src/protocols/oscar/oscar.c:6993
+msgid "Back"
+msgstr "Back"
+
+#: plugins/docklet/docklet.c:191
+msgid "Mute Sounds"
+msgstr "Mute Sounds"
+
+#: plugins/docklet/docklet.c:196 src/gtkft.c:659
+msgid "File Transfers"
+msgstr "File Transfers"
+
+#: plugins/docklet/docklet.c:197 src/gtkaccount.c:2391
+msgid "Accounts"
+msgstr "Accounts"
+
+#: plugins/docklet/docklet.c:198 src/gtkprefs.c:2514
+msgid "Preferences"
+msgstr "Preferences"
+
+#: plugins/docklet/docklet.c:207
+msgid "Signoff"
+msgstr "Signoff"
+
+#: plugins/docklet/docklet.c:211
+msgid "Quit"
+msgstr "Quit"
+
+#: plugins/docklet/docklet.c:527
+msgid "Tray Icon Configuration"
+msgstr "Tray Icon Configuration"
+
+#: plugins/docklet/docklet.c:531
+msgid "_Hide new messages until tray icon is clicked"
+msgstr "_Hide new messages until tray icon is clicked"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/docklet/docklet.c:557
+msgid "System Tray Icon"
+msgstr "System Tray Icon"
+
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/docklet/docklet.c:560
+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:562
+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, "
+"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."
+msgstr ""
+"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, "
+"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."
+
 #.
 #. *  DEFINES, MACROS & DATA TYPES
 #.
@@ -135,92 +246,14 @@
 msgid "Gaim - Away"
 msgstr "Gaim - Away"
 
-#: plugins/docklet/docklet.c:136
-msgid "New Message..."
-msgstr "New Message..."
-
-#: plugins/docklet/docklet.c:137
-msgid "Join A Chat..."
-msgstr "Join A Chat..."
-
-#: plugins/docklet/docklet.c:172
-msgid "New..."
-msgstr "New..."
-
-#: plugins/docklet/docklet.c:176 src/gtkprefs.c:1757 src/gtkstatusbox.c:247
-#: src/protocols/gg/gg.c:52 src/protocols/irc/irc.c:180
-#: src/protocols/irc/msgs.c:222 src/protocols/jabber/buddy.c:1089
-#: src/protocols/jabber/jabber.c:1000 src/protocols/msn/msn.c:538
-#: src/protocols/novell/novell.c:2813 src/protocols/novell/novell.c:2951
-#: src/protocols/novell/novell.c:3039 src/protocols/oscar/oscar.c:698
-#: src/protocols/oscar/oscar.c:5868 src/protocols/oscar/oscar.c:6906
-#: src/protocols/oscar/oscar.c:7063 src/protocols/silc/buddy.c:1412
-#: src/protocols/silc/silc.c:54 src/protocols/yahoo/yahoo.c:3214
-#: src/protocols/zephyr/zephyr.c:2259 src/status.c:159
-msgid "Away"
-msgstr "Away"
-
-#: plugins/docklet/docklet.c:184
-msgid "Back"
-msgstr "Back"
-
-#: plugins/docklet/docklet.c:191
-msgid "Mute Sounds"
-msgstr "Mute Sounds"
-
-#: plugins/docklet/docklet.c:198 src/gtkft.c:694
-msgid "File Transfers"
-msgstr "File Transfers"
-
-#: plugins/docklet/docklet.c:199 src/gtkaccount.c:2327
-msgid "Accounts"
-msgstr "Accounts"
-
-#: plugins/docklet/docklet.c:200 src/gtkprefs.c:2144
-msgid "Preferences"
-msgstr "Preferences"
-
-#: plugins/docklet/docklet.c:204
-msgid "Quit"
-msgstr "Quit"
-
-#: plugins/docklet/docklet.c:529
-msgid "Tray Icon Configuration"
-msgstr "Tray Icon Configuration"
-
-#: plugins/docklet/docklet.c:533
-msgid "_Hide new messages until tray icon is clicked"
-msgstr "_Hide new messages until tray icon is clicked"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/docklet/docklet.c:559
-msgid "System Tray Icon"
-msgstr "System Tray Icon"
-
-#. *< name
-#. *< version
-#. *  summary
-#: plugins/docklet/docklet.c:562
-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:564
-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, "
-"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."
-msgstr ""
-"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, "
-"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/docklet/eggtrayicon.c:122
+#, fuzzy
+msgid "Orientation"
+msgstr "Organization"
+
+#: plugins/docklet/eggtrayicon.c:123
+msgid "The orientation of the tray."
+msgstr ""
 
 #: plugins/extplacement.c:77
 msgid "By conversation count"
@@ -270,7 +303,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/filectl.c:245
+#: plugins/filectl.c:224
 msgid "Gaim File Control"
 msgstr "Gaim File Control"
 
@@ -278,10 +311,40 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/filectl.c:248 plugins/filectl.c:250
+#: 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."
 
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/gaiminc.c:90
+msgid "Gaim Demonstration Plugin"
+msgstr "Gaim Demonstration Plugin"
+
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/gaiminc.c:93
+msgid "An example plugin that does stuff - see the description."
+msgstr "An example plugin that does stuff - see the description."
+
+#. *  description
+#: plugins/gaiminc.c:95
+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"
+"- It reverses all incoming text\n"
+"- It sends a message to people on your list immediately when they sign on"
+msgstr ""
+"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"
+"- It reverses all incoming text\n"
+"- It sends a message to people on your list immediately when they sign on"
+
 #: plugins/gaim-remote/remote.c:91
 msgid "Not connected to AIM"
 msgstr "Not connected to AIM"
@@ -298,7 +361,7 @@
 msgid "Invalid AIM URI"
 msgstr "Invalid AIM URI"
 
-#: plugins/gaim-remote/remote.c:750
+#: plugins/gaim-remote/remote.c:673
 #, c-format
 msgid ""
 "Failed to assign %s to a socket:\n"
@@ -307,7 +370,7 @@
 "Failed to assign %s to a socket:\n"
 "%s"
 
-#: plugins/gaim-remote/remote.c:774
+#: plugins/gaim-remote/remote.c:697
 msgid "Unable to open socket"
 msgstr "Unable to open socket"
 
@@ -317,19 +380,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gaim-remote/remote.c:824
+#: plugins/gaim-remote/remote.c:747
 msgid "Remote Control"
 msgstr "Remote Control"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gaim-remote/remote.c:827
+#: plugins/gaim-remote/remote.c:750
 msgid "Provides remote control for gaim applications."
 msgstr "Provides remote control for gaim applications."
 
 #. *  description
-#: plugins/gaim-remote/remote.c:829
+#: plugins/gaim-remote/remote.c:752
 msgid ""
 "Gives Gaim the ability to be remote-controlled through third-party "
 "applications or through the gaim-remote tool."
@@ -337,121 +400,21 @@
 "Gives Gaim the ability to be remote-controlled through third-party "
 "applications or through the gaim-remote tool."
 
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/gaiminc.c:91
-msgid "Gaim Demonstration Plugin"
-msgstr "Gaim Demonstration Plugin"
-
-#. *< name
-#. *< version
-#. *  summary
-#: 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: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"
-"- It reverses all incoming text\n"
-"- It sends a message to people on your list immediately when they sign on"
-msgstr ""
-"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"
-"- It reverses all incoming text\n"
-"- It sends a message to people on your list immediately when they sign on"
-
-#: plugins/gaimrc.c:40
-msgid "Cursor Color"
-msgstr "Cursor Colour"
-
-#: plugins/gaimrc.c:41
-msgid "Secondary Cursor Color"
-msgstr "Secondary Cursor Colour"
-
-#: plugins/gaimrc.c:42
-msgid "Hyperlink Color"
-msgstr "Hyperlink Colour"
-
-#: plugins/gaimrc.c:53
-msgid "GtkTreeView Expander Size"
-msgstr "GtkTreeView Expander Size"
-
-#: plugins/gaimrc.c:72
-msgid "Conversation Entry"
-msgstr "Conversation Entry"
-
-#: plugins/gaimrc.c:73
-msgid "Conversation History"
-msgstr "Conversation History"
-
-#: plugins/gaimrc.c:74
-msgid "Log Viewer"
-msgstr "Log Viewer"
-
-#: plugins/gaimrc.c:75
-msgid "Request Dialog"
-msgstr "Request Dialogue"
-
-#: plugins/gaimrc.c:76
-msgid "Notify Dialog"
-msgstr "Notify Dialogue"
-
-#: plugins/gaimrc.c:209
-#, c-format
-msgid "Select Color for %s"
-msgstr "Select Colour for %s"
-
-#: plugins/gaimrc.c:211
-msgid "Select Color"
-msgstr "Select Colour"
-
-#: plugins/gaimrc.c:246
-#, c-format
-msgid "Select Font for %s"
-msgstr "Select Font for %s"
-
-#: plugins/gaimrc.c:284
-msgid "Select Interface Font"
-msgstr "Select Interface Font"
-
-#: plugins/gaimrc.c:343
-msgid "GTK+ Interface Font"
-msgstr "GTK+ Interface Font"
-
-#: plugins/gaimrc.c:362
-msgid "GTK+ Text Shortcut Theme"
-msgstr "GTK+ Text Shortcut Theme"
-
-#: plugins/gaimrc.c:460
-msgid "Gaim GTK+ Theme Control"
-msgstr "Gaim GTK+ Theme Control"
-
-#: plugins/gaimrc.c:462 plugins/gaimrc.c:463
-msgid "Provides access to commonly used gtkrc settings."
-msgstr "Provides access to commonly used gtkrc settings."
-
 #. Configuration frame
-#: plugins/gestures/gestures.c:241
+#: plugins/gestures/gestures.c:221
 msgid "Mouse Gestures Configuration"
 msgstr "Mouse Gestures Configuration"
 
-#: plugins/gestures/gestures.c:248
+#: plugins/gestures/gestures.c:228
 msgid "Middle mouse button"
 msgstr "Middle mouse button"
 
-#: plugins/gestures/gestures.c:253
+#: plugins/gestures/gestures.c:233
 msgid "Right mouse button"
 msgstr "Right mouse button"
 
 #. "Visual gesture display" checkbox
-#: plugins/gestures/gestures.c:265
+#: plugins/gestures/gestures.c:245
 msgid "_Visual gesture display"
 msgstr "_Visual gesture display"
 
@@ -461,19 +424,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gestures/gestures.c:294
+#: plugins/gestures/gestures.c:274
 msgid "Mouse Gestures"
 msgstr "Mouse Gestures"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gestures/gestures.c:297
+#: plugins/gestures/gestures.c:277
 msgid "Provides support for mouse gestures"
 msgstr "Provides support for mouse gestures"
 
 #. *  description
-#: plugins/gestures/gestures.c:299
+#: 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"
@@ -490,9 +453,9 @@
 "Drag up and then to the right to switch to the next conversation."
 
 #: plugins/gevolution/add_buddy_dialog.c:132
-#: plugins/gevolution/assoc-buddy.c:120 src/gtkprefs.c:2003
-#: src/gtkroomlist.c:553 src/protocols/jabber/jabber.c:613
-#: src/protocols/msn/msn.c:1494 src/protocols/trepia/trepia.c:399
+#: plugins/gevolution/assoc-buddy.c:120 src/gtkprefs.c:2168
+#: src/gtkroomlist.c:553 src/protocols/jabber/jabber.c:609
+#: src/protocols/msn/msn.c:1474 src/protocols/trepia/trepia.c:399
 msgid "Name"
 msgstr "Name"
 
@@ -501,30 +464,30 @@
 msgstr "Instant Messaging"
 
 #. Add the label.
-#: plugins/gevolution/add_buddy_dialog.c:459
+#: 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:472
-#: plugins/gevolution/assoc-buddy.c:354 src/protocols/oscar/oscar.c:7427
+#: plugins/gevolution/add_buddy_dialog.c:468
+#: plugins/gevolution/assoc-buddy.c:354 src/protocols/oscar/oscar.c:7269
 msgid "Search"
 msgstr "Search"
 
-#: plugins/gevolution/add_buddy_dialog.c:553
-#: plugins/gevolution/new_person_dialog.c:306 src/gtkblist.c:4400
-#: src/gtkblist.c:4777
+#: plugins/gevolution/add_buddy_dialog.c:549
+#: plugins/gevolution/new_person_dialog.c:304 src/gtkblist.c:4186
+#: src/gtkblist.c:4534
 msgid "Group:"
 msgstr "Group:"
 
 #. "New Person" button
-#: plugins/gevolution/add_buddy_dialog.c:579
+#: 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:596
+#: plugins/gevolution/add_buddy_dialog.c:592
 msgid "Select Buddy"
 msgstr "Select Buddy"
 
@@ -551,45 +514,33 @@
 msgid "_Associate Buddy"
 msgstr "_Associate Buddy"
 
-#: plugins/gevolution/gevo-util.c:64 plugins/gevolution/gevolution.c:96
-#: src/blist.c:518 src/blist.c:1242 src/blist.c:1458 src/gtkblist.c:4217
-#: src/protocols/jabber/roster.c:66
+#: plugins/gevolution/eds-utils.c:74 plugins/gevolution/eds-utils.c:87
+#: src/gtkblist.c:3122 src/gtkprefs.c:962 src/gtkprefs.c:1014
+#: src/gtkprefs.c:1827 src/protocols/jabber/jabber.c:949
+msgid "None"
+msgstr "None"
+
+#: plugins/gevolution/gevolution.c:93 plugins/gevolution/gevo-util.c:64
+#: src/blist.c:776 src/blist.c:983 src/blist.c:1933 src/gtkblist.c:4001
+#: src/protocols/jabber/roster.c:67
 msgid "Buddies"
 msgstr "Buddies"
 
-#: plugins/gevolution/gevolution.c:262 plugins/gevolution/gevolution.c:268
-#, fuzzy
-msgid "Unable to send e-mail"
-msgstr "Unable to send message."
-
-#: plugins/gevolution/gevolution.c:263
-msgid "The evolution executable was not found in the PATH."
-msgstr ""
-
-#: plugins/gevolution/gevolution.c:269
-msgid "The specified buddy was not found in the Evolution Contacts."
-msgstr ""
-
-#: plugins/gevolution/gevolution.c:286
+#: plugins/gevolution/gevolution.c:225
 msgid "Add to Address Book"
 msgstr "Add to Address Book"
 
-#: plugins/gevolution/gevolution.c:290
-#, fuzzy
-msgid "Send E-Mail"
-msgstr "E-Mail"
-
 #. Configuration frame
-#: plugins/gevolution/gevolution.c:414
+#: plugins/gevolution/gevolution.c:348
 msgid "Evolution Integration Configuration"
 msgstr "Evolution Integration Configuration"
 
 #. Label
-#: plugins/gevolution/gevolution.c:417
+#: plugins/gevolution/gevolution.c:351
 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:447 plugins/idle.c:52 src/gtkconn.c:431
+#: plugins/gevolution/gevolution.c:381 plugins/idle.c:52 src/gtkconn.c:627
 msgid "Account"
 msgstr "Account"
 
@@ -599,7 +550,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gevolution/gevolution.c:530
+#: plugins/gevolution/gevolution.c:464
 msgid "Evolution Integration"
 msgstr "Evolution Integration"
 
@@ -607,87 +558,90 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/gevolution/gevolution.c:533 plugins/gevolution/gevolution.c:535
-#, fuzzy
-msgid "Provides integration with Evolution."
+#: plugins/gevolution/gevolution.c:467 plugins/gevolution/gevolution.c:469
+msgid "Provides integration with Ximian Evolution."
 msgstr "Provides integration with Ximian Evolution."
 
-#: plugins/gevolution/new_person_dialog.c:266
+#: 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:270
+#: 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:290
+#: plugins/gevolution/new_person_dialog.c:288
 msgid "Account type:"
 msgstr "Account type:"
 
-#: plugins/gevolution/new_person_dialog.c:294
+#: plugins/gevolution/new_person_dialog.c:292
 msgid "Screenname:"
 msgstr "Screenname:"
 
 #. Optional Information section
-#: plugins/gevolution/new_person_dialog.c:314
+#: plugins/gevolution/new_person_dialog.c:312
 msgid "Optional information:"
 msgstr "Optional information:"
 
 #. Label
-#: plugins/gevolution/new_person_dialog.c:337 src/gtkaccount.c:395
-#: src/gtkaccount.c:417 src/protocols/oscar/oscar.c:604
+#: plugins/gevolution/new_person_dialog.c:335 src/gtkaccount.c:379
+#: src/gtkaccount.c:409 src/protocols/oscar/oscar.c:590
 msgid "Buddy Icon"
 msgstr "Buddy Icon"
 
-#: plugins/gevolution/new_person_dialog.c:349
+#: plugins/gevolution/new_person_dialog.c:347
 msgid "First name:"
 msgstr "First name:"
 
-#: plugins/gevolution/new_person_dialog.c:361
+#: plugins/gevolution/new_person_dialog.c:359
 msgid "Last name:"
 msgstr "Last name:"
 
-#: plugins/gevolution/new_person_dialog.c:381
+#: plugins/gevolution/new_person_dialog.c:379
 msgid "E-mail:"
 msgstr "E-mail:"
 
-#: plugins/history.c:137
-msgid "History Plugin Requires Logging"
-msgstr ""
-
-#: plugins/history.c:138
-msgid ""
-"Logging can be enabled from Tools -> Preferences -> Logging.\n"
-"\n"
-"Enabling logs for instant messages and/or chats will activate history for "
-"the same conversation type(s)."
-msgstr ""
-
-#: plugins/history.c:177
-msgid "History"
-msgstr "History"
-
-#: plugins/history.c:179
-msgid "Shows recently logged conversations in new conversations."
-msgstr "Shows recently logged conversations in new conversations."
-
-#: plugins/history.c:180
-msgid ""
-"When a new conversation is opened this plugin will insert the last "
-"conversation into the current conversation.\n"
-"\n"
-"The history plugin requires logging be enabled. Logging can be enabled from "
-"Tools -> Preferences -> Logging. Enabling logs for instant messages and/or "
-"chats will activate history for the same conversation type(s)."
-msgstr ""
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/iconaway.c:106
+#: plugins/gtk-signals-test.c:102
+msgid "GTK Signals Test"
+msgstr "GTK Signals Test"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: plugins/gtk-signals-test.c:105 plugins/gtk-signals-test.c:107
+msgid "Test to see that all ui signals are working properly."
+msgstr "Test to see that all UI signals are working properly."
+
+#: plugins/history.c:92
+msgid "History"
+msgstr "History"
+
+#: plugins/history.c:94
+msgid "Shows recently logged conversations in new conversations."
+msgstr "Shows recently logged conversations in new conversations."
+
+#: plugins/history.c:95
+msgid ""
+"When a new conversation is opened this plugin will insert the last "
+"conversation into the current conversation."
+msgstr ""
+"When a new conversation is opened this plugin will insert the last "
+"conversation into the current conversation."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/iconaway.c:104
 msgid "Iconify on Away"
 msgstr "Iconify on Away"
 
@@ -695,7 +649,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/iconaway.c:109 plugins/iconaway.c:111
+#: plugins/iconaway.c:107 plugins/iconaway.c:109
 msgid "Iconifies the buddy list and your conversations when you go away."
 msgstr "Iconifies the buddy list and your conversations when you go away."
 
@@ -703,7 +657,7 @@
 msgid "Minutes"
 msgstr "Minutes"
 
-#: plugins/idle.c:63 plugins/idle.c:97
+#: plugins/idle.c:63 plugins/idle.c:98
 msgid "I'dle Mak'er"
 msgstr "I'dle Mak'er"
 
@@ -715,11 +669,11 @@
 msgid "_Set"
 msgstr "_Set"
 
-#: plugins/idle.c:68
+#: plugins/idle.c:68 src/away.c:922
 msgid "_Cancel"
 msgstr "_Cancel"
 
-#: plugins/idle.c:99 plugins/idle.c:100
+#: 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"
 
@@ -784,74 +738,68 @@
 msgstr "Adds a small box to the buddy list that shows if you have new mail."
 
 #. ---------- "Notify For" ----------
-#: plugins/notify.c:642
+#: plugins/notify.c:614
 msgid "Notify For"
 msgstr "Notify For"
 
-#: plugins/notify.c:646
+#: plugins/notify.c:618
 msgid "_IM windows"
 msgstr "_IM windows"
 
-#: plugins/notify.c:653
+#: plugins/notify.c:625
 msgid "C_hat windows"
 msgstr "C_hat windows"
 
-#: plugins/notify.c:660
+#: plugins/notify.c:632
 msgid "_Focused windows"
 msgstr "_Focused windows"
 
 #. ---------- "Notification Methods" ----------
-#: plugins/notify.c:668
+#: plugins/notify.c:640
 msgid "Notification Methods"
 msgstr "Notification Methods"
 
-#: plugins/notify.c:675
+#: plugins/notify.c:647
 msgid "Prepend _string into window title:"
 msgstr "Prepend _string into window title:"
 
 #. Count method button
-#: plugins/notify.c:694
+#: plugins/notify.c:666
 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:702
+#: plugins/notify.c:674
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "Set window manager \"_URGENT\" hint"
 
-#. Raise window method button
-#: plugins/notify.c:710
-#, fuzzy
-msgid "R_aise conversation window"
-msgstr "IM Conversation Windows"
-
 #. ---------- "Notification Removals" ----------
-#: plugins/notify.c:718
+#: plugins/notify.c:682
 msgid "Notification Removal"
 msgstr "Notification Removal"
 
 #. Remove on focus button
-#: plugins/notify.c:723
+#: plugins/notify.c:687
 msgid "Remove when conversation window _gains focus"
 msgstr "Remove when conversation window _gains focus"
 
 #. Remove on click button
-#: plugins/notify.c:730
+#: plugins/notify.c:694
 msgid "Remove when conversation window _receives click"
 msgstr "Remove when conversation window _receives click"
 
 #. Remove on type button
-#: plugins/notify.c:738
+#: plugins/notify.c:702
 msgid "Remove when _typing in conversation window"
 msgstr "Remove when _typing in conversation window"
 
 #. Remove on message send button
-#: plugins/notify.c:746
+#: plugins/notify.c:710
 msgid "Remove when a _message gets sent"
 msgstr "Remove when a _message gets sent"
 
 #. Remove on conversation switch button
-#: plugins/notify.c:755
+#: plugins/notify.c:719
 msgid "Remove on switch to conversation ta_b"
 msgstr "Remove on switch to conversation ta_b"
 
@@ -861,7 +809,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/notify.c:845
+#: plugins/notify.c:809
 msgid "Message Notification"
 msgstr "Message Notification"
 
@@ -869,7 +817,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/notify.c:848 plugins/notify.c:850
+#: plugins/notify.c:812 plugins/notify.c:814
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "Provides a variety of ways of notifying you of unread messages."
 
@@ -879,14 +827,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/perl/perl.c:567
+#: plugins/perl/perl.c:535
 msgid "Perl Plugin Loader"
 msgstr "Perl Plugin Loader"
 
 #. *< name
 #. *< version
 #. *< summary
-#: plugins/perl/perl.c:569 plugins/perl/perl.c:570
+#: plugins/perl/perl.c:537 plugins/perl/perl.c:538
 msgid "Provides support for loading perl plugins."
 msgstr "Provides support for loading perl plugins."
 
@@ -965,7 +913,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/signals-test.c:626
+#: plugins/signals-test.c:601
 msgid "Signals Test"
 msgstr "Signals Test"
 
@@ -973,7 +921,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/signals-test.c:629 plugins/signals-test.c:631
+#: plugins/signals-test.c:604 plugins/signals-test.c:606
 msgid "Test to see that all signals are working properly."
 msgstr "Test to see that all signals are working properly."
 
@@ -995,43 +943,35 @@
 msgid "Tests to see that most things are working."
 msgstr "Tests to see that most things are working."
 
-#: plugins/spellchk.c:1680
-msgid "Duplicate Correction"
-msgstr ""
-
-#: plugins/spellchk.c:1681
-msgid "The specified word already exists in the correction list."
-msgstr ""
-
-#: plugins/spellchk.c:1826
+#: plugins/spellchk.c:416
 msgid "Text Replacements"
 msgstr "Text Replacements"
 
-#: plugins/spellchk.c:1850
+#: plugins/spellchk.c:440
 msgid "You type"
 msgstr "You type"
 
-#: plugins/spellchk.c:1862
+#: plugins/spellchk.c:452
 msgid "You send"
 msgstr "You send"
 
-#: plugins/spellchk.c:1888
+#: plugins/spellchk.c:478
 msgid "Add a new text replacement"
 msgstr "Add a new text replacement"
 
-#: plugins/spellchk.c:1895
+#: plugins/spellchk.c:485
 msgid "You _type:"
 msgstr "You _type:"
 
-#: plugins/spellchk.c:1909
+#: plugins/spellchk.c:499
 msgid "You _send:"
 msgstr "You _send:"
 
-#: plugins/spellchk.c:1951
+#: plugins/spellchk.c:541
 msgid "Text replacement"
 msgstr "Text replacement"
 
-#: plugins/spellchk.c:1953 plugins/spellchk.c:1954
+#: plugins/spellchk.c:543 plugins/spellchk.c:544
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "Replaces text in outgoing messages according to user-defined rules."
 
@@ -1041,42 +981,6 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl-gnutls.c:227
-msgid "GNUTLS"
-msgstr "GNUTLS"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: plugins/ssl/ssl-gnutls.c:230 plugins/ssl/ssl-gnutls.c:232
-msgid "Provides SSL support through GNUTLS."
-msgstr "Provides SSL support through GNUTLS."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/ssl/ssl-nss.c:319
-msgid "NSS"
-msgstr "NSS"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: plugins/ssl/ssl-nss.c:322 plugins/ssl/ssl-nss.c:324
-msgid "Provides SSL support through Mozilla NSS."
-msgstr "Provides SSL support through Mozilla NSS."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
 #: plugins/ssl/ssl.c:94
 msgid "SSL"
 msgstr "SSL"
@@ -1089,35 +993,71 @@
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "Provides a wrapper around SSL support libraries."
 
-#: plugins/statenotify.c:42
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/ssl/ssl-gnutls.c:226
+msgid "GNUTLS"
+msgstr "GNUTLS"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: plugins/ssl/ssl-gnutls.c:229 plugins/ssl/ssl-gnutls.c:231
+msgid "Provides SSL support through GNUTLS."
+msgstr "Provides SSL support through GNUTLS."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/ssl/ssl-nss.c:318
+msgid "NSS"
+msgstr "NSS"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: plugins/ssl/ssl-nss.c:321 plugins/ssl/ssl-nss.c:323
+msgid "Provides SSL support through Mozilla NSS."
+msgstr "Provides SSL support through Mozilla NSS."
+
+#: plugins/statenotify.c:41
 #, c-format
 msgid "%s has gone away."
 msgstr "%s has gone away."
 
-#: plugins/statenotify.c:49
+#: plugins/statenotify.c:48
 #, c-format
 msgid "%s is no longer away."
 msgstr "%s is no longer away."
 
-#: plugins/statenotify.c:56
+#: plugins/statenotify.c:55
 #, c-format
 msgid "%s has become idle."
 msgstr "%s has become idle."
 
-#: plugins/statenotify.c:63
+#: plugins/statenotify.c:62
 #, c-format
 msgid "%s is no longer idle."
 msgstr "%s is no longer idle."
 
-#: plugins/statenotify.c:74
+#: plugins/statenotify.c:73
 msgid "Notify When"
 msgstr "Notify When"
 
-#: plugins/statenotify.c:77
+#: plugins/statenotify.c:76
 msgid "Buddy Goes _Away"
 msgstr "Buddy Goes _Away"
 
-#: plugins/statenotify.c:80
+#: plugins/statenotify.c:79
 msgid "Buddy Goes _Idle"
 msgstr "Buddy Goes _Idle"
 
@@ -1127,7 +1067,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/statenotify.c:120
+#: plugins/statenotify.c:119
 msgid "Buddy State Notification"
 msgstr "Buddy State Notification"
 
@@ -1135,7 +1075,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/statenotify.c:123 plugins/statenotify.c:126
+#: plugins/statenotify.c:122 plugins/statenotify.c:125
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
@@ -1169,19 +1109,19 @@
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "A horizontal scrolling version of the buddy list."
 
-#: plugins/timestamp.c:202
+#: plugins/timestamp.c:186
 msgid "iChat Timestamp"
 msgstr "iChat Timestamp"
 
-#: plugins/timestamp.c:209
+#: plugins/timestamp.c:193
 msgid "Delay"
 msgstr "Delay"
 
-#: plugins/timestamp.c:216
+#: plugins/timestamp.c:200
 msgid "minutes."
 msgstr "minutes."
 
-#: plugins/timestamp.c:222
+#: plugins/timestamp.c:206
 msgid "_Apply"
 msgstr "_Apply"
 
@@ -1191,7 +1131,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/timestamp.c:287
+#: plugins/timestamp.c:271
 msgid "Timestamp"
 msgstr "Timestamp"
 
@@ -1199,7 +1139,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/timestamp.c:290 plugins/timestamp.c:292
+#: plugins/timestamp.c:274 plugins/timestamp.c:276
 msgid "Adds iChat-style timestamps to conversations every N minutes."
 msgstr "Adds iChat-style timestamps to conversations every N minutes."
 
@@ -1223,7 +1163,7 @@
 msgstr "_Show slider bar in IM window"
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:430
+#: plugins/win32/transparency/win2ktrans.c:430 src/gtkprefs.c:956
 msgid "Buddy List Window"
 msgstr "Buddy List Window"
 
@@ -1261,207 +1201,225 @@
 "\n"
 "* Note: This plugin requires Win2000 or WinXP."
 
-#: plugins/win32/winprefs/winprefs.c:401
+#: plugins/win32/winprefs/winprefs.c:344
 msgid "GTK+ Runtime Version"
 msgstr "GTK+ Runtime Version"
 
 #. Autostart
-#: plugins/win32/winprefs/winprefs.c:409
+#: plugins/win32/winprefs/winprefs.c:352
 msgid "Startup"
 msgstr "Startup"
 
-#: plugins/win32/winprefs/winprefs.c:410
+#: 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:421 src/gtkblist.c:3514
-#: src/gtkprefs.c:2099
+#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3167
+#: src/gtkprefs.c:2421
 msgid "Buddy List"
 msgstr "Buddy List"
 
-#: plugins/win32/winprefs/winprefs.c:422
+#: plugins/win32/winprefs/winprefs.c:363
 msgid "_Dockable Buddy List"
 msgstr "_Dockable Buddy List"
 
+#. Docked Blist On Top
+#: 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:426
-#, fuzzy
-msgid "_Keep Buddy List window on top:"
+#: plugins/win32/winprefs/winprefs.c:377
+msgid "_Keep Buddy List window on top"
 msgstr "_Keep Buddy List window on top"
 
-#: plugins/win32/winprefs/winprefs.c:428 src/gtkprefs.c:1763
-msgid "Never"
-msgstr "Never"
-
-#: plugins/win32/winprefs/winprefs.c:429
-#, fuzzy
-msgid "Always"
-msgstr "Away"
-
-#. XXX: Did this ever work?
-#: plugins/win32/winprefs/winprefs.c:431
-msgid "Only when docked"
-msgstr ""
-
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:435 src/gtkprefs.c:883
-#: src/gtkprefs.c:2100
+#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:1007
+#: src/gtkprefs.c:2422 src/protocols/msn/msn.c:1811
 msgid "Conversations"
 msgstr "Conversations"
 
-#: plugins/win32/winprefs/winprefs.c:436
-#, fuzzy
-msgid "_Flash window when messages are received"
+#: 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:459
+#: plugins/win32/winprefs/winprefs.c:407
 msgid "WinGaim Options"
 msgstr "WinGaim Options"
 
-#: plugins/win32/winprefs/winprefs.c:461
+#: plugins/win32/winprefs/winprefs.c:409 plugins/win32/winprefs/winprefs.c:410
 msgid "Options specific to Windows Gaim."
 msgstr "Options specific to Windows Gaim."
 
-#: plugins/win32/winprefs/winprefs.c:462
-msgid ""
-"Provides options specific to Windows Gaim, such as buddy list docking and "
-"conversation flashing."
-msgstr ""
-
-#: src/account.c:773
-msgid "accounts"
-msgstr "accounts"
-
-#: src/account.c:913
-#, fuzzy
-msgid "Password is required to sign on."
-msgstr "Password has expired"
-
-#: src/account.c:939
-#, c-format
-msgid "Enter password for %s (%s)"
-msgstr "Enter password for %s (%s)"
-
-#: src/account.c:946
-msgid "Enter Password"
-msgstr "Enter Password"
-
-#: src/account.c:951
-#, fuzzy
-msgid "Save password"
+#: src/account.c:298 src/protocols/jabber/jabber.c:1039
+msgid "New passwords do not match."
+msgstr "New passwords do not match."
+
+#: src/account.c:307
+msgid "Fill out all fields completely."
+msgstr "Fill out all fields completely."
+
+#: src/account.c:332
+msgid "Original password"
+msgstr "Original password"
+
+#: src/account.c:339
+msgid "New password"
 msgstr "New password"
 
+#: src/account.c:346
+msgid "New password (again)"
+msgstr "New password (again)"
+
+#: src/account.c:352
+#, c-format
+msgid "Change password for %s"
+msgstr "Change password for %s"
+
+#: src/account.c:360
+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:959 src/account.c:1111 src/gtkdialogs.c:504
-#: src/gtkdialogs.c:647 src/gtkdialogs.c:703 src/gtkrequest.c:260
-#: src/protocols/jabber/jabber.c:1103 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:2476 src/protocols/oscar/oscar.c:3774
-#: src/protocols/oscar/oscar.c:3855 src/protocols/oscar/oscar.c:7156
-#: src/protocols/oscar/oscar.c:7281 src/protocols/oscar/oscar.c:7306
-#: src/protocols/oscar/oscar.c:7358 src/protocols/silc/buddy.c:460
-#: src/protocols/silc/buddy.c:1132 src/protocols/silc/chat.c:422
-#: src/protocols/silc/chat.c:460 src/protocols/silc/chat.c:723
-#: src/protocols/silc/ops.c:1083 src/protocols/silc/ops.c:1700
-#: src/protocols/silc/silc.c:725 src/protocols/yahoo/yahoo.c:2922
-#: src/protocols/yahoo/yahoo.c:2931 src/request.h:1266
+#: src/account.c:363 src/connection.c:198 src/gtkblist.c:2492
+#: src/gtkdialogs.c:505 src/gtkdialogs.c:647 src/gtkdialogs.c:701
+#: src/gtkrequest.c:243 src/protocols/jabber/jabber.c:1086
+#: 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:2413
+#: src/protocols/oscar/oscar.c:3686 src/protocols/oscar/oscar.c:3780
+#: src/protocols/oscar/oscar.c:7056 src/protocols/oscar/oscar.c:7148
+#: src/protocols/oscar/oscar.c:7200 src/protocols/oscar/oscar.c:7286
+#: 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:1699 src/protocols/silc/silc.c:711
+#: src/protocols/yahoo/yahoo.c:2938 src/protocols/yahoo/yahoo.c:2947
+#: src/request.h:1245
 msgid "OK"
 msgstr "OK"
 
-#: src/account.c:960 src/account.c:1112 src/account.c:1150
-#: src/gtkaccount.c:2012 src/gtkaccount.c:2491 src/gtkblist.c:4815
-#: src/gtkdialogs.c:505 src/gtkdialogs.c:648 src/gtkdialogs.c:704
-#: src/gtkdialogs.c:723 src/gtkdialogs.c:745 src/gtkdialogs.c:765
-#: src/gtkdialogs.c:809 src/gtkdialogs.c:871 src/gtkdialogs.c:913
-#: src/gtkdialogs.c:955 src/gtkimhtmltoolbar.c:413 src/gtkprivacy.c:595
-#: src/gtkprivacy.c:608 src/gtkprivacy.c:633 src/gtkprivacy.c:644
-#: src/gtkrequest.c:261 src/gtksavedstatuses.c:188
-#: src/protocols/jabber/buddy.c:569 src/protocols/jabber/chat.c:780
-#: src/protocols/jabber/jabber.c:682 src/protocols/jabber/jabber.c:1104
-#: 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:1594 src/protocols/oscar/oscar.c:2477
-#: src/protocols/oscar/oscar.c:3732 src/protocols/oscar/oscar.c:3775
-#: src/protocols/oscar/oscar.c:3812 src/protocols/oscar/oscar.c:3856
-#: src/protocols/oscar/oscar.c:7157 src/protocols/oscar/oscar.c:7282
-#: src/protocols/oscar/oscar.c:7307 src/protocols/oscar/oscar.c:7359
-#: src/protocols/oscar/oscar.c:7428 src/protocols/silc/buddy.c:461
-#: src/protocols/silc/buddy.c:1037 src/protocols/silc/buddy.c:1133
-#: src/protocols/silc/chat.c:595 src/protocols/silc/chat.c:724
-#: src/protocols/silc/ops.c:1701 src/protocols/silc/silc.c:726
-#: src/protocols/trepia/trepia.c:348 src/protocols/yahoo/yahoo.c:2923
-#: src/protocols/yahoo/yahoo.c:2932 src/request.h:1266 src/request.h:1276
+#: src/account.c:364 src/account.c:402 src/away.c:367 src/connection.c:199
+#: src/gtkaccount.c:2029 src/gtkaccount.c:2568 src/gtkaccount.c:2599
+#: src/gtkblist.c:2493 src/gtkblist.c:4572 src/gtkconn.c:169
+#: src/gtkdialogs.c:506 src/gtkdialogs.c:648 src/gtkdialogs.c:702
+#: src/gtkdialogs.c:800 src/gtkdialogs.c:822 src/gtkdialogs.c:842
+#: src/gtkdialogs.c:879 src/gtkdialogs.c:939 src/gtkdialogs.c:982
+#: src/gtkdialogs.c:1023 src/gtkimhtmltoolbar.c:437 src/gtkprivacy.c:597
+#: src/gtkprivacy.c:610 src/gtkprivacy.c:635 src/gtkprivacy.c:646
+#: src/gtkrequest.c:244 src/protocols/icq/gaim_icq.c:276
+#: src/protocols/jabber/buddy.c:515 src/protocols/jabber/chat.c:754
+#: src/protocols/jabber/jabber.c:678 src/protocols/jabber/jabber.c:1087
+#: src/protocols/jabber/presence.c:213 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:1534
+#: src/protocols/oscar/oscar.c:2414 src/protocols/oscar/oscar.c:3644
+#: src/protocols/oscar/oscar.c:3687 src/protocols/oscar/oscar.c:3724
+#: src/protocols/oscar/oscar.c:3781 src/protocols/oscar/oscar.c:7057
+#: src/protocols/oscar/oscar.c:7149 src/protocols/oscar/oscar.c:7201
+#: src/protocols/oscar/oscar.c:7270 src/protocols/oscar/oscar.c:7287
+#: 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:1700
+#: src/protocols/silc/silc.c:712 src/protocols/trepia/trepia.c:348
+#: src/protocols/yahoo/yahoo.c:2939 src/protocols/yahoo/yahoo.c:2948
+#: src/request.h:1245 src/request.h:1255
 msgid "Cancel"
 msgstr "Cancel"
 
-#: src/account.c:982 src/connection.c:96
-#, c-format
-msgid "Missing protocol plugin for %s"
-msgstr "Missing protocol plugin for %s"
-
-#: src/account.c:984 src/connection.c:99
-msgid "Connection Error"
-msgstr "Connection Error"
-
-#: src/account.c:1046 src/protocols/jabber/jabber.c:1056
-msgid "New passwords do not match."
-msgstr "New passwords do not match."
-
-#: src/account.c:1055
-msgid "Fill out all fields completely."
-msgstr "Fill out all fields completely."
-
-#: src/account.c:1080
-msgid "Original password"
-msgstr "Original password"
-
-#: src/account.c:1087
-msgid "New password"
-msgstr "New password"
-
-#: src/account.c:1094
-msgid "New password (again)"
-msgstr "New password (again)"
-
-#: src/account.c:1100
-#, c-format
-msgid "Change password for %s"
-msgstr "Change password for %s"
-
-#: src/account.c:1108
-msgid "Please enter your current password and your new password."
-msgstr "Please enter your current password and your new password."
-
-#: src/account.c:1141
+#: src/account.c:393
 #, c-format
 msgid "Change user information for %s"
 msgstr "Change user information for %s"
 
-#: src/account.c:1149 src/gtkdebug.c:669 src/gtkrequest.c:267
-#: src/protocols/jabber/buddy.c:568 src/protocols/trepia/trepia.c:347
+#: src/account.c:401 src/gtkrequest.c:250 src/protocols/jabber/buddy.c:514
+#: src/protocols/trepia/trepia.c:347
 msgid "Save"
 msgstr "Save"
 
-#: src/account.c:1605 src/gtkft.c:159 src/protocols/jabber/buddy.c:627
-#: src/protocols/jabber/buddy.c:1079 src/protocols/jabber/buddy.c:1096
-#: src/protocols/novell/novell.c:2825
+#: src/account.c:760 src/gtkft.c:159 src/protocols/jabber/buddy.c:573
+#: src/protocols/novell/novell.c:2812
 msgid "Unknown"
 msgstr "Unknown"
 
-#: src/blist.c:545
-msgid "buddy list"
-msgstr "buddy list"
-
-#: src/blist.c:1145
+#: 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:442
+msgid "Remove Away Message"
+msgstr "Remove Away Message"
+
+#. Remove button
+#: src/away.c:366 src/gtkconv.c:1520 src/gtkconv.c:3902 src/gtkconv.c:3973
+#: src/gtkrequest.c:249
+msgid "Remove"
+msgstr "Remove"
+
+#: src/away.c:436
+msgid "New Away Message"
+msgstr "New Away Message"
+
+#: src/away.c:663
+msgid "Set All Away"
+msgstr "Set All Away"
+
+#: src/away.c:770
+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:772
+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:782
+msgid "You cannot create an empty away message"
+msgstr "You cannot create an empty away message"
+
+#: src/away.c:847
+msgid "New away message"
+msgstr "New away message"
+
+#: src/away.c:862
+msgid "Away title: "
+msgstr "Away title: "
+
+#: src/away.c:910
+msgid "_Save"
+msgstr "_Save"
+
+#: src/away.c:914
+msgid "Sa_ve & Use"
+msgstr "Sa_ve & Use"
+
+#: src/away.c:918
+msgid "_Use"
+msgstr "_Use"
+
+#: src/blist.c:682
 msgid "Chats"
 msgstr "Chats"
 
-#: src/blist.c:1835
+#: src/blist.c:1354
 #, c-format
 msgid ""
 "%d buddy from group %s was not removed because its account was not logged "
@@ -1476,92 +1434,119 @@
 "%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:1844
+#: src/blist.c:1363
 msgid "Group not removed"
 msgstr "Group not removed"
 
-#: src/connection.c:98
+#: src/blist.c:2066
+msgid ""
+"An error was encountered parsing your buddy list.  It has not been loaded, "
+"and the old file has moved to blist.xml~."
+msgstr ""
+"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:2069
+msgid "Buddy List Error"
+msgstr "Buddy List Error"
+
+#: src/connection.c:118 src/connection.c:169
+#, c-format
+msgid "Missing protocol plugin for %s"
+msgstr "Missing protocol plugin for %s"
+
+#: src/connection.c:123
 msgid "Registration Error"
 msgstr "Registration Error"
 
-#: src/conversation.c:237
-msgid "Unable to send message: The message is too large."
-msgstr "Unable to send message: The message is too large."
-
-#: src/conversation.c:240 src/conversation.c:253
-#, c-format
-msgid "Unable to send message to %s."
-msgstr "Unable to send message to %s."
-
-#: src/conversation.c:241
+#: src/connection.c:174
+msgid "Connection Error"
+msgstr "Connection Error"
+
+#: src/connection.c:195
+#, c-format
+msgid "Enter password for %s (%s)"
+msgstr "Enter password for %s (%s)"
+
+#: src/conversation.c:233
+msgid "Unable to send message. The message is too large."
+msgstr "Unable to send message. The message is too large."
+
+#: src/conversation.c:237 src/conversation.c:251
+#: src/protocols/oscar/oscar.c:4247
+#, c-format
+msgid "Unable to send message to %s:"
+msgstr "Unable to send message to %s:"
+
+#: src/conversation.c:239
 msgid "The message is too large."
 msgstr "The message is too large."
 
-#: src/conversation.c:250
+#: src/conversation.c:248
 msgid "Unable to send message."
 msgstr "Unable to send message."
 
-#: src/conversation.c:1962
+#: src/conversation.c:2070
 #, c-format
 msgid "%s entered the room."
 msgstr "%s entered the room."
 
-#: src/conversation.c:1965
+#: src/conversation.c:2073
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] entered the room."
 
-#: src/conversation.c:2062
+#: src/conversation.c:2171
 #, c-format
 msgid "You are now known as %s"
 msgstr "You are now known as %s"
 
-#: src/conversation.c:2065
+#: src/conversation.c:2174
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s is now known as %s"
 
-#: src/conversation.c:2107
+#: src/conversation.c:2216
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s left the room (%s)."
 
-#: src/conversation.c:2109
+#: src/conversation.c:2218
 #, c-format
 msgid "%s left the room."
 msgstr "%s left the room."
 
-#: src/conversation.c:2186
+#: src/conversation.c:2291
 #, c-format
 msgid "(+%d more)"
 msgstr "(+%d more)"
 
-#: src/conversation.c:2188
+#: src/conversation.c:2293
 #, c-format
 msgid " left the room (%s)."
 msgstr " left the room (%s)."
 
-#: src/conversation.c:2596
+#: src/conversation.c:2698
 msgid "Last created window"
 msgstr "Last created window"
 
-#: src/conversation.c:2598
+#: src/conversation.c:2700
 msgid "Separate IM and Chat windows"
 msgstr "Separate IM and Chat windows"
 
-#: src/conversation.c:2600 src/gtkprefs.c:1279
+#: src/conversation.c:2702 src/gtkprefs.c:1387
 msgid "New window"
 msgstr "New window"
 
-#: src/conversation.c:2602
+#: src/conversation.c:2704
 msgid "By group"
 msgstr "By group"
 
-#: src/conversation.c:2604
+#: src/conversation.c:2706
 msgid "By account"
 msgstr "By account"
 
-#: src/ft.c:150 src/protocols/msn/msn.c:369
+#: src/ft.c:148 src/protocols/msn/msn.c:369
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -1570,7 +1555,7 @@
 "Error reading %s: \n"
 "%s.\n"
 
-#: src/ft.c:154
+#: src/ft.c:152
 #, c-format
 msgid ""
 "Error writing %s: \n"
@@ -1579,7 +1564,7 @@
 "Error writing %s: \n"
 "%s.\n"
 
-#: src/ft.c:158
+#: src/ft.c:156
 #, c-format
 msgid ""
 "Error accessing %s: \n"
@@ -1588,35 +1573,35 @@
 "Error accessing %s: \n"
 "%s.\n"
 
-#: src/ft.c:191
+#: src/ft.c:189
 msgid "Cannot send a file of 0 bytes."
 msgstr "Cannot send a file of 0 bytes."
 
-#: src/ft.c:201
+#: src/ft.c:199
 msgid "Cannot send a directory."
 msgstr "Cannot send a directory."
 
-#: src/ft.c:210
+#: src/ft.c:208
 #, 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:268
+#: src/ft.c:265
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s wants to send you %s (%s)"
 
-#: src/ft.c:275
+#: src/ft.c:273
 #, c-format
 msgid "%s wants to send you a file"
 msgstr "%s wants to send you a file"
 
-#: src/ft.c:316
+#: src/ft.c:311
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "Accept file transfer request from %s?"
 
-#: src/ft.c:320
+#: src/ft.c:315
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -1627,125 +1612,103 @@
 "Remote host: %s\n"
 "Remote port: %d"
 
-#: src/ft.c:344
+#: src/ft.c:338
 #, fuzzy, c-format
 msgid "%s is offering to send file %s"
 msgstr "Offering to send %s to %s"
 
-#: src/ft.c:384
+#: src/ft.c:374
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s is not a valid filename.\n"
 
-#: src/ft.c:405
+#: src/ft.c:395
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "Offering to send %s to %s"
 
-#: src/ft.c:416
-#, fuzzy, c-format
-msgid "Starting transfer of %s from %s"
-msgstr "Accept file transfer request from %s?"
-
-#: src/ft.c:570
+#: src/ft.c:890
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "Transfer of file %s complete"
 
-#: src/ft.c:573
+#: src/ft.c:893
 msgid "File transfer complete"
 msgstr "File transfer complete"
 
-#: src/ft.c:957
+#: src/ft.c:942
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "You cancelled the transfer of %s"
 
-#: src/ft.c:962
+#: src/ft.c:948
 msgid "File transfer cancelled"
 msgstr "File transfer cancelled"
 
-#: src/ft.c:1019
+#: src/ft.c:1001
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s cancelled the transfer of %s"
 
-#: src/ft.c:1024
+#: src/ft.c:1007
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s cancelled the file transfer"
 
-#: src/ft.c:1081
-#, fuzzy, c-format
-msgid "File transfer to %s failed."
+#: src/ft.c:1056
+#, c-format
+msgid "File transfer to %s aborted.\n"
 msgstr "File transfer to %s aborted.\n"
 
-#: src/ft.c:1083
-#, fuzzy, c-format
-msgid "File transfer from %s failed."
+#: src/ft.c:1058
+#, c-format
+msgid "File transfer from %s aborted.\n"
 msgstr "File transfer from %s aborted.\n"
 
-#: src/gaim-remote.c:104
+#: src/gaim-disclosure.c:253
+msgid "Expander Size"
+msgstr "Expander Size"
+
+#: src/gaim-disclosure.c:254
+msgid "Size of the expander arrow"
+msgstr "Size of the expander arrow"
+
+#: src/gaim-remote.c:108
 #, c-format
 msgid ""
 "Usage: %s command [OPTIONS] [URI]\n"
 "\n"
 "    COMMANDS:\n"
-"       send                     Send message\n"
 "       uri                      Handle AIM: URI\n"
 "       away                     Popup the away dialog with the default "
 "message\n"
 "       back                     Remove the away dialog\n"
-"       logout                   Log out all accounts\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"
-"       send                     Send message\n"
 "       uri                      Handle AIM: URI\n"
-"       away                     Popup the away dialogue with the default "
+"       away                     Pop up the away dialogue with the default "
 "message\n"
 "       back                     Remove the away dialogue\n"
-"       logout                   Log out all accounts\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:195
-#, c-format
-msgid ""
-"Gaim not running (on session %d)\n"
+#: src/gaim-remote.c:185 src/gaim-remote.c:203
+msgid ""
+"Gaim not running (on session 0)\n"
 "Is the \"Remote Control\" plugin loaded?\n"
 msgstr ""
-"Gaim not running (on session %d)\n"
+"Gaim not running (on session 0)\n"
 "Is the \"Remote Control\" plugin loaded?\n"
 
-#: src/gaim-remote.c:282
-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:293
+#: src/gaim-remote.c:219
 msgid ""
 "\n"
 "Using AIM: URIs:\n"
@@ -1775,7 +1738,7 @@
 "is the message to be sent.  '+' must be used in place of spaces.\n"
 "Please note the quoting used above - if you run this from a shell the '&'\n"
 "needs to be escaped, or the command will stop at that point.\n"
-"Also,the following will just open a conversation window to a screen name,\n"
+"Also, the following will just open a conversation window to a screen name,\n"
 "with no message:\n"
 "\tgaim-remote uri 'aim:goim?screenname=Penguin'\n"
 "\n"
@@ -1787,15 +1750,7 @@
 "\tgaim-remote uri 'aim:addbuddy?screenname=Penguin'\n"
 "...prompts you to add 'Penguin' to your buddy list.\n"
 
-#: src/gaim-remote.c:313
-msgid ""
-"\n"
-"Log out all accounts\n"
-msgstr ""
-"\n"
-"Log out all accounts\n"
-
-#: src/gaim-remote.c:317
+#: src/gaim-remote.c:239
 msgid ""
 "\n"
 "Close running copy of Gaim\n"
@@ -1803,7 +1758,7 @@
 "\n"
 "Close running copy of Gaim\n"
 
-#: src/gaim-remote.c:321
+#: src/gaim-remote.c:243
 msgid ""
 "\n"
 "Mark all accounts as \"away\" with the default message.\n"
@@ -1811,7 +1766,7 @@
 "\n"
 "Mark all accounts as \"away\" with the default message.\n"
 
-#: src/gaim-remote.c:325
+#: src/gaim-remote.c:247
 msgid ""
 "\n"
 "Set all accounts as not away.\n"
@@ -1819,15 +1774,7 @@
 "\n"
 "Set all accounts as not away.\n"
 
-#: src/gaim-remote.c:329
-msgid ""
-"\n"
-"Send instant message\n"
-msgstr ""
-"\n"
-"Send instant message\n"
-
-#: src/gtkaccount.c:345
+#: src/gtkaccount.c:331
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -1839,152 +1786,165 @@
 "<b>Image size:</b> %dx%d"
 
 #. Build the login options frame.
-#: src/gtkaccount.c:665
+#: src/gtkaccount.c:638
 msgid "Login Options"
 msgstr "Login Options"
 
-#: src/gtkaccount.c:682 src/gtkft.c:626
+#: src/gtkaccount.c:655 src/gtkft.c:585
 msgid "Protocol:"
 msgstr "Protocol:"
 
-#: src/gtkaccount.c:687 src/gtkblist.c:4369
+#: src/gtkaccount.c:660 src/gtkblist.c:4158
 msgid "Screen Name:"
 msgstr "Screen Name:"
 
-#: src/gtkaccount.c:760
+#: src/gtkaccount.c:733
 msgid "Password:"
 msgstr "Password:"
 
-#: src/gtkaccount.c:765 src/gtkblist.c:4383 src/gtkblist.c:4762
+#: src/gtkaccount.c:738 src/gtkblist.c:4172 src/gtkblist.c:4519
 msgid "Alias:"
 msgstr "Alias:"
 
-#: src/gtkaccount.c:769
+#: src/gtkaccount.c:742
 msgid "Remember password"
 msgstr "Remember password"
 
 #. Build the user options frame.
-#: src/gtkaccount.c:814
+#: src/gtkaccount.c:798
 msgid "User Options"
 msgstr "User Options"
 
-#: src/gtkaccount.c:827
+#: src/gtkaccount.c:811
 msgid "New mail notifications"
 msgstr "New mail notifications"
 
-#: src/gtkaccount.c:836
+#: src/gtkaccount.c:820
 msgid "Buddy icon:"
 msgstr "Buddy icon:"
 
 #. Build the protocol options frame.
-#: src/gtkaccount.c:925
+#: src/gtkaccount.c:909
 #, c-format
 msgid "%s Options"
 msgstr "%s Options"
 
 #. Use Global Proxy Settings
-#: src/gtkaccount.c:1063 src/gtkaccount.c:1110
+#: src/gtkaccount.c:1048 src/gtkaccount.c:1095
 msgid "Use Global Proxy Settings"
 msgstr "Use Global Proxy Settings"
 
 #. No Proxy
-#: src/gtkaccount.c:1069 src/gtkaccount.c:1117
+#: src/gtkaccount.c:1054 src/gtkaccount.c:1102
 msgid "No Proxy"
 msgstr "No Proxy"
 
 #. HTTP
-#: src/gtkaccount.c:1075 src/gtkaccount.c:1124
+#: src/gtkaccount.c:1060 src/gtkaccount.c:1109
 msgid "HTTP"
 msgstr "HTTP"
 
 #. SOCKS 4
-#: src/gtkaccount.c:1081 src/gtkaccount.c:1131
+#: src/gtkaccount.c:1066 src/gtkaccount.c:1116
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
 #. SOCKS 5
-#: src/gtkaccount.c:1087 src/gtkaccount.c:1138
+#: src/gtkaccount.c:1072 src/gtkaccount.c:1123
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:1093 src/gtkaccount.c:1145 src/gtkprefs.c:1080
+#: src/gtkaccount.c:1078 src/gtkaccount.c:1130 src/gtkprefs.c:1190
 msgid "Use Environmental Settings"
 msgstr "Use Environmental Settings"
 
-#: src/gtkaccount.c:1184
+#: src/gtkaccount.c:1169
 msgid "you can see the butterflies mating"
 msgstr "you can see the butterflies mating"
 
-#: src/gtkaccount.c:1188
+#: src/gtkaccount.c:1173
 msgid "If you look real closely"
 msgstr "If you look real closely"
 
-#: src/gtkaccount.c:1204
+#: src/gtkaccount.c:1189
 msgid "Proxy Options"
 msgstr "Proxy Options"
 
-#: src/gtkaccount.c:1222 src/gtkprefs.c:1074
+#: src/gtkaccount.c:1207 src/gtkprefs.c:1184
 msgid "Proxy _type:"
 msgstr "Proxy _type:"
 
-#: src/gtkaccount.c:1231 src/gtkprefs.c:1101
+#: src/gtkaccount.c:1216 src/gtkprefs.c:1211
 msgid "_Host:"
 msgstr "_Host:"
 
-#: src/gtkaccount.c:1235 src/gtkprefs.c:1119
+#: src/gtkaccount.c:1220 src/gtkprefs.c:1229
 msgid "_Port:"
 msgstr "_Port:"
 
-#: src/gtkaccount.c:1243
+#: src/gtkaccount.c:1228
 msgid "_Username:"
 msgstr "_Username:"
 
-#: src/gtkaccount.c:1248 src/gtkprefs.c:1156
+#: src/gtkaccount.c:1233 src/gtkprefs.c:1266
 msgid "Pa_ssword:"
 msgstr "Pa_ssword:"
 
-#: src/gtkaccount.c:1625
+#: src/gtkaccount.c:1604
 msgid "Add Account"
 msgstr "Add Account"
 
-#: src/gtkaccount.c:1627
+#: src/gtkaccount.c:1606
 msgid "Modify Account"
 msgstr "Modify Account"
 
+#. Add the disclosure
+#: src/gtkaccount.c:1630
+msgid "Show more options"
+msgstr "Show more options"
+
+#: src/gtkaccount.c:1631
+msgid "Show fewer options"
+msgstr "Show fewer options"
+
 #. Register button
-#: src/gtkaccount.c:1674 src/protocols/jabber/jabber.c:681
+#: src/gtkaccount.c:1658 src/protocols/jabber/jabber.c:677
 msgid "Register"
 msgstr "Register"
 
-#: src/gtkaccount.c:2006 src/gtksavedstatuses.c:184
+#: src/gtkaccount.c:2023
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Are you sure you want to delete %s?"
 
-#: src/gtkaccount.c:2011 src/gtkrequest.c:264 src/gtksavedstatuses.c:187
+#: src/gtkaccount.c:2028 src/gtkrequest.c:247
 msgid "Delete"
 msgstr "Delete"
 
-#: src/gtkaccount.c:2092 src/gtksavedstatuses.c:622
-#: src/protocols/oscar/oscar.c:4420
+#: src/gtkaccount.c:2142 src/protocols/oscar/oscar.c:4331
 msgid "Screen Name"
 msgstr "Screen Name"
 
-#: src/gtkaccount.c:2115
-msgid "Enabled"
-msgstr "Enabled"
-
-#: src/gtkaccount.c:2123
+#: src/gtkaccount.c:2166 src/protocols/jabber/jabber.c:996
+#: src/protocols/oscar/oscar.c:690 src/protocols/oscar/oscar.c:5786
+#: src/protocols/oscar/oscar.c:6984 src/protocols/silc/silc.c:45
+#: src/protocols/yahoo/yahoo.c:2701 src/protocols/zephyr/zephyr.c:2122
+#: src/protocols/zephyr/zephyr.c:2141
+msgid "Online"
+msgstr "Online"
+
+#: src/gtkaccount.c:2187
 msgid "Protocol"
 msgstr "Protocol"
 
-#: src/gtkaccount.c:2466
+#. XXX: Tidy this up when not in string freeze
+#: src/gtkaccount.c:2521 src/protocols/jabber/presence.c:202
 #, 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:2480
+#: src/gtkaccount.c:2535 src/protocols/jabber/presence.c:208
 msgid ""
 "\n"
 "\n"
@@ -1994,21 +1954,29 @@
 "\n"
 "Do you wish to add him or her to your buddy list?"
 
-#: src/gtkaccount.c:2488
+#: src/gtkaccount.c:2561
+msgid "Information"
+msgstr "Information"
+
+#: src/gtkaccount.c:2565 src/gtkaccount.c:2596
+#: src/protocols/jabber/presence.c:210
 msgid "Add buddy to your list?"
 msgstr "Add buddy to your list?"
 
-#: src/gtkaccount.c:2490 src/gtkblist.c:4814 src/gtkconv.c:1580
-#: src/gtkrequest.c:265 src/protocols/oscar/oscar.c:4045
-#: src/protocols/silc/chat.c:594
+#. Add button
+#: src/gtkaccount.c:2567 src/gtkaccount.c:2598 src/gtkblist.c:4571
+#: src/gtkconv.c:1522 src/gtkconv.c:3895 src/gtkconv.c:3966
+#: src/gtkrequest.c:248 src/protocols/icq/gaim_icq.c:276
+#: src/protocols/jabber/presence.c:212 src/protocols/oscar/oscar.c:3958
+#: src/protocols/silc/chat.c:593
 msgid "Add"
 msgstr "Add"
 
-#: src/gtkblist.c:888
+#: src/gtkblist.c:846
 msgid "Join a Chat"
 msgstr "Join a Chat"
 
-#: src/gtkblist.c:909
+#: src/gtkblist.c:867
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
@@ -2016,213 +1984,219 @@
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 
-#: src/gtkblist.c:920 src/gtkpounce.c:415 src/gtkroomlist.c:354
+#: src/gtkblist.c:878 src/gtkpounce.c:415 src/gtkroomlist.c:354
 msgid "_Account:"
 msgstr "_Account:"
 
-#: src/gtkblist.c:1225
+#: src/gtkblist.c:1173 src/gtkblist.c:3323
 msgid "Get _Info"
 msgstr "Get _Info"
 
-#: src/gtkblist.c:1228
+#: src/gtkblist.c:1176 src/gtkblist.c:3313
 msgid "I_M"
 msgstr "I_M"
 
-#: src/gtkblist.c:1234
+#: src/gtkblist.c:1182
 msgid "_Send File"
 msgstr "_Send File"
 
-#: src/gtkblist.c:1240
+#: src/gtkblist.c:1188
 msgid "Add Buddy _Pounce"
 msgstr "Add Buddy _Pounce"
 
-#: src/gtkblist.c:1244 src/gtkblist.c:1248 src/gtkblist.c:1346
-#: src/gtkblist.c:1369
+#: src/gtkblist.c:1190 src/gtkblist.c:1287
 msgid "View _Log"
 msgstr "View _Log"
 
-#: src/gtkblist.c:1259
+#: src/gtkblist.c:1200
 msgid "_Alias Buddy..."
 msgstr "_Alias Buddy..."
 
-#: src/gtkblist.c:1261
+#: src/gtkblist.c:1202
 msgid "_Remove Buddy"
 msgstr "_Remove Buddy"
 
-#: src/gtkblist.c:1263
+#: src/gtkblist.c:1204
 msgid "Alias Contact..."
 msgstr "Alias Contact..."
 
-#: src/gtkblist.c:1266 src/gtkdialogs.c:807 src/gtkdialogs.c:808
+#: src/gtkblist.c:1207 src/gtkdialogs.c:876 src/gtkdialogs.c:878
 msgid "Remove Contact"
 msgstr "Remove Contact"
 
-#: src/gtkblist.c:1270 src/gtkblist.c:1354 src/gtkblist.c:1375
+#: src/gtkblist.c:1211 src/gtkblist.c:1295 src/gtkblist.c:1309
 msgid "_Alias..."
 msgstr "_Alias..."
 
-#: src/gtkblist.c:1272 src/gtkblist.c:1356 src/gtkblist.c:1377
-#: src/gtkconn.c:171
+#: src/gtkblist.c:1213 src/gtkblist.c:1297 src/gtkblist.c:1314
+#: src/gtkconn.c:367
 msgid "_Remove"
 msgstr "_Remove"
 
-#: src/gtkblist.c:1318
+#: src/gtkblist.c:1259
 msgid "Add a _Buddy"
 msgstr "Add a _Buddy"
 
-#: src/gtkblist.c:1320
+#: src/gtkblist.c:1261
 msgid "Add a C_hat"
 msgstr "Add a C_hat"
 
-#: src/gtkblist.c:1322
+#: src/gtkblist.c:1263
 msgid "_Delete Group"
 msgstr "_Delete Group"
 
-#: src/gtkblist.c:1324
+#: src/gtkblist.c:1265
 msgid "_Rename"
 msgstr "_Rename"
 
 #. join button
-#: src/gtkblist.c:1342 src/gtkroomlist.c:264 src/gtkroomlist.c:409
-#: src/gtkstock.c:102
+#: src/gtkblist.c:1283 src/gtkroomlist.c:264 src/gtkroomlist.c:409
+#: src/stock.c:88
 msgid "_Join"
 msgstr "_Join"
 
-#: src/gtkblist.c:1344
+#: src/gtkblist.c:1285
 msgid "Auto-Join"
 msgstr "Auto-Join"
 
-#: src/gtkblist.c:1382 src/gtkblist.c:1405
+#: src/gtkblist.c:1311 src/gtkblist.c:1336
 msgid "_Collapse"
 msgstr "_Collapse"
 
-#: src/gtkblist.c:1410
+#: src/gtkblist.c:1341
 msgid "_Expand"
 msgstr "_Expand"
 
-#: src/gtkblist.c:1637 src/gtkblist.c:1647 src/gtkblist.c:3646
-#: src/gtkblist.c:3649
-msgid "/Tools/Mute Sounds"
-msgstr "/Tools/Mute Sounds"
-
-#: src/gtkblist.c:2106 src/gtkconv.c:4255 src/gtkpounce.c:314
+#: src/gtkblist.c:2016 src/gtkconv.c:4538 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:2675
+#: src/gtkblist.c:2437
 msgid "/_Buddies"
 msgstr "/_Buddies"
 
-#: src/gtkblist.c:2676
+#: src/gtkblist.c:2438
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Buddies/New Instant _Message..."
 
-#: src/gtkblist.c:2677
+#: src/gtkblist.c:2439
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Buddies/Join a _Chat..."
 
-#: src/gtkblist.c:2678
+#: src/gtkblist.c:2440
 msgid "/Buddies/Get User _Info..."
 msgstr "/Buddies/Get User _Info..."
 
-#: src/gtkblist.c:2679
+#: src/gtkblist.c:2441
 msgid "/Buddies/View User _Log..."
 msgstr "/Buddies/View User _Log..."
 
-#: src/gtkblist.c:2681
+#: src/gtkblist.c:2443
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Buddies/Show _Offline Buddies"
 
-#: src/gtkblist.c:2682
+#: src/gtkblist.c:2444
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Buddies/Show _Empty Groups"
 
-#: src/gtkblist.c:2683
+#: src/gtkblist.c:2445
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Buddies/_Add Buddy..."
 
-#: src/gtkblist.c:2684
+#: src/gtkblist.c:2446
 msgid "/Buddies/Add C_hat..."
 msgstr "/Buddies/Add C_hat..."
 
-#: src/gtkblist.c:2685
+#: src/gtkblist.c:2447
 msgid "/Buddies/Add _Group..."
 msgstr "/Buddies/Add _Group..."
 
-#: src/gtkblist.c:2687
+#: src/gtkblist.c:2449
+msgid "/Buddies/_Signoff"
+msgstr "/Buddies/_Signoff"
+
+#: src/gtkblist.c:2450
 msgid "/Buddies/_Quit"
 msgstr "/Buddies/_Quit"
 
 #. Tools
-#: src/gtkblist.c:2690
+#: src/gtkblist.c:2453
 msgid "/_Tools"
 msgstr "/_Tools"
 
-#: src/gtkblist.c:2691
+#: src/gtkblist.c:2454
+msgid "/Tools/_Away"
+msgstr "/Tools/_Away"
+
+#: src/gtkblist.c:2455
 msgid "/Tools/Buddy _Pounce"
 msgstr "/Tools/Buddy _Pounce"
 
-#: src/gtkblist.c:2692
+#: src/gtkblist.c:2456
 msgid "/Tools/Account Ac_tions"
 msgstr "/Tools/Account Ac_tions"
 
-#: src/gtkblist.c:2693
+#: src/gtkblist.c:2457
 msgid "/Tools/Pl_ugin Actions"
 msgstr "/Tools/Pl_ugin Actions"
 
-#: src/gtkblist.c:2695
-msgid "/Tools/_Statuses"
-msgstr "/Tools/_Statuses"
-
-#: src/gtkblist.c:2696
+#: src/gtkblist.c:2459
 msgid "/Tools/A_ccounts"
 msgstr "/Tools/A_ccounts"
 
-#: src/gtkblist.c:2697
-msgid "/Tools/Pr_eferences"
-msgstr "/Tools/Pr_eferences"
-
-#: src/gtkblist.c:2698
-msgid "/Tools/Pr_ivacy"
-msgstr "/Tools/Pr_ivacy"
-
-#: src/gtkblist.c:2699
+#: src/gtkblist.c:2460
 msgid "/Tools/_File Transfers"
 msgstr "/Tools/_File Transfers"
 
-#: src/gtkblist.c:2700
+#: src/gtkblist.c:2461
 msgid "/Tools/R_oom List"
 msgstr "/Tools/R_oom List"
 
-#: src/gtkblist.c:2702
-msgid "/Tools/Mute _Sounds"
-msgstr "/Tools/Mute _Sounds"
-
-#: src/gtkblist.c:2703
+#: src/gtkblist.c:2462
+msgid "/Tools/Pr_eferences"
+msgstr "/Tools/Pr_eferences"
+
+#: src/gtkblist.c:2463
+msgid "/Tools/Pr_ivacy"
+msgstr "/Tools/Pr_ivacy"
+
+#: src/gtkblist.c:2465
 msgid "/Tools/View System _Log"
 msgstr "/Tools/View System _Log"
 
 #. Help
-#: src/gtkblist.c:2706
+#: src/gtkblist.c:2468
 msgid "/_Help"
 msgstr "/_Help"
 
-#: src/gtkblist.c:2707
+#: src/gtkblist.c:2469
 msgid "/Help/Online _Help"
 msgstr "/Help/Online _Help"
 
-#: src/gtkblist.c:2708
+#: src/gtkblist.c:2470
 msgid "/Help/_Debug Window"
 msgstr "/Help/_Debug Window"
 
-#: src/gtkblist.c:2709
+#: src/gtkblist.c:2471
 msgid "/Help/_About"
 msgstr "/Help/_About"
 
-#: src/gtkblist.c:2741 src/gtkblist.c:2808
+#: src/gtkblist.c:2489
+msgid "Rename Group"
+msgstr "Rename Group"
+
+#: src/gtkblist.c:2489
+msgid "New group name"
+msgstr "New group name"
+
+#: src/gtkblist.c:2490
+msgid "Please enter a new name for the selected group."
+msgstr "Please enter a new name for the selected group."
+
+#: src/gtkblist.c:2519
 #, c-format
 msgid ""
 "\n"
@@ -2231,61 +2205,7 @@
 "\n"
 "<b>Account:</b> %s"
 
-#: src/gtkblist.c:2817
-#, c-format
-msgid ""
-"\n"
-"<b>Contact Alias:</b> %s"
-msgstr ""
-"\n"
-"<b>Contact Alias:</b> %s"
-
-#: src/gtkblist.c:2825
-#, c-format
-msgid ""
-"\n"
-"<b>Alias:</b> %s"
-msgstr ""
-"\n"
-"<b>Alias:</b> %s"
-
-#: src/gtkblist.c:2833
-#, c-format
-msgid ""
-"\n"
-"<b>Nickname:</b> %s"
-msgstr ""
-"\n"
-"<b>Nickname:</b> %s"
-
-#: src/gtkblist.c:2842
-#, c-format
-msgid ""
-"\n"
-"<b>Logged In:</b> %s"
-msgstr ""
-"\n"
-"<b>Logged In:</b> %s"
-
-#: src/gtkblist.c:2854
-#, c-format
-msgid ""
-"\n"
-"<b>Idle:</b> %s"
-msgstr ""
-"\n"
-"<b>Idle:</b> %s"
-
-#: src/gtkblist.c:2889
-#, c-format
-msgid ""
-"\n"
-"<b>Last Seen:</b> %s ago"
-msgstr ""
-"\n"
-"<b>Last Seen:</b> %s ago"
-
-#: src/gtkblist.c:2897
+#: src/gtkblist.c:2585
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
@@ -2293,7 +2213,68 @@
 "\n"
 "<b>Status:</b> Offline"
 
-#: src/gtkblist.c:2919
+#: src/gtkblist.c:2600
+#, c-format
+msgid "%d%%"
+msgstr "%d%%"
+
+#: src/gtkblist.c:2616
+msgid ""
+"\n"
+"<b>Account:</b>"
+msgstr ""
+"\n"
+"<b>Account:</b>"
+
+#: src/gtkblist.c:2617
+msgid ""
+"\n"
+"<b>Contact Alias:</b>"
+msgstr ""
+"\n"
+"<b>Contact Alias:</b>"
+
+#: src/gtkblist.c:2618
+msgid ""
+"\n"
+"<b>Alias:</b>"
+msgstr ""
+"\n"
+"<b>Alias:</b>"
+
+#: src/gtkblist.c:2619
+msgid ""
+"\n"
+"<b>Nickname:</b>"
+msgstr ""
+"\n"
+"<b>Nickname:</b>"
+
+#: src/gtkblist.c:2620
+msgid ""
+"\n"
+"<b>Logged In:</b>"
+msgstr ""
+"\n"
+"<b>Logged In:</b>"
+
+#: src/gtkblist.c:2621
+msgid ""
+"\n"
+"<b>Idle:</b>"
+msgstr ""
+"\n"
+"<b>Idle:</b>"
+
+#: src/gtkblist.c:2622
+msgid ""
+"\n"
+"<b>Warned:</b>"
+msgstr ""
+"\n"
+"<b>Warned:</b>"
+
+#: src/gtkblist.c:2624
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2301,119 +2282,124 @@
 "\n"
 "<b>Description:</b> Spooky"
 
-#: src/gtkblist.c:2921
+#: src/gtkblist.c:2625
 msgid ""
 "\n"
-"<b>Status:</b> Awesome"
+"<b>Status</b>: Awesome"
 msgstr ""
 "\n"
-"<b>Status:</b> Awesome"
-
-#: src/gtkblist.c:2923
+"<b>Status</b>: Awesome"
+
+#: src/gtkblist.c:2626
 msgid ""
 "\n"
-"<b>Status:</b> Rockin'"
+"<b>Status</b>: Rockin'"
 msgstr ""
 "\n"
-"<b>Status:</b>: Rockin'"
-
-#: src/gtkblist.c:3185
-#, fuzzy, c-format
-msgid "Idle (%dh %02dm) "
+"<b>Status</b>: Rockin'"
+
+#: src/gtkblist.c:2908
+#, c-format
+msgid "Idle (%dh%02dm) "
 msgstr "Idle (%dh%02dm) "
 
-#: src/gtkblist.c:3187
+#: src/gtkblist.c:2910
 #, c-format
 msgid "Idle (%dm) "
 msgstr "Idle (%dm) "
 
-#: src/gtkblist.c:3190
-msgid "Idle "
-msgstr "Idle "
-
-#: src/gtkblist.c:3194
+#: src/gtkblist.c:2915
+#, c-format
+msgid "Warned (%d%%) "
+msgstr "Warned (%d%%) "
+
+#: src/gtkblist.c:2918
 msgid "Offline "
 msgstr "Offline "
 
-#: src/gtkblist.c:3310
-msgid "/Buddies/New Instant Message..."
-msgstr "/Buddies/New Instant Message..."
-
-#: src/gtkblist.c:3311 src/gtkblist.c:3345
+#. Make menu items sensitive/insensitive where appropriate
+#: src/gtkblist.c:3036
 msgid "/Buddies/Join a Chat..."
 msgstr "/Buddies/Join a Chat..."
 
-#: src/gtkblist.c:3312
-msgid "/Buddies/Get User Info..."
-msgstr "/Buddies/Get User Info..."
-
-#: src/gtkblist.c:3313
-msgid "/Buddies/Add Buddy..."
-msgstr "/Buddies/Add Buddy..."
-
-#: src/gtkblist.c:3314
-msgid "/Buddies/Add Chat..."
-msgstr "/Buddies/Add Chat..."
-
-#: src/gtkblist.c:3315
-msgid "/Buddies/Add Group..."
-msgstr "/Buddies/Add Group..."
-
-#: src/gtkblist.c:3348
+#: src/gtkblist.c:3039
 msgid "/Tools/Room List"
 msgstr "/Tools/Room List"
 
-#: src/gtkblist.c:3351
+#: src/gtkblist.c:3042
 msgid "/Tools/Privacy"
 msgstr "/Tools/Privacy"
 
-#: src/gtkblist.c:3427 src/gtkprefs.c:1771 src/protocols/jabber/jabber.c:941
-#: src/protocols/yahoo/yahoo.c:2749
-msgid "None"
-msgstr "None"
-
-#: src/gtkblist.c:3429
+#: src/gtkblist.c:3124
 msgid "Alphabetical"
 msgstr "Alphabetical"
 
-#: src/gtkblist.c:3430
+#: src/gtkblist.c:3125
 msgid "By status"
 msgstr "By status"
 
-#: src/gtkblist.c:3431
+#: src/gtkblist.c:3126
 msgid "By log size"
 msgstr "By log size"
 
-#: src/gtkblist.c:3542
+#: src/gtkblist.c:3192
+msgid "/Tools/Away"
+msgstr "/Tools/Away"
+
+#: src/gtkblist.c:3195
 msgid "/Tools/Buddy Pounce"
 msgstr "/Tools/Buddy Pounce"
 
-#: src/gtkblist.c:3543
+#: src/gtkblist.c:3198
 msgid "/Tools/Account Actions"
 msgstr "/Tools/Account Actions"
 
-#: src/gtkblist.c:3544
+#: src/gtkblist.c:3201
 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:3642
+#: src/gtkblist.c:3292
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Buddies/Show Offline Buddies"
 
-#: src/gtkblist.c:3644
+#: src/gtkblist.c:3294
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Buddies/Show Empty Groups"
 
-#: src/gtkblist.c:4323 src/protocols/silc/buddy.c:731
+#: src/gtkblist.c:3319
+msgid "Send a message to the selected buddy"
+msgstr "Send a message to the selected buddy"
+
+#: src/gtkblist.c:3329
+msgid "Get information on the selected buddy"
+msgstr "Get information on the selected buddy"
+
+#: src/gtkblist.c:3333
+msgid "_Chat"
+msgstr "_Chat"
+
+#: src/gtkblist.c:3338
+msgid "Join a chat room"
+msgstr "Join a chat room"
+
+#: src/gtkblist.c:3343
+msgid "_Away"
+msgstr "_Away"
+
+#: src/gtkblist.c:3348
+msgid "Set an away message"
+msgstr "Set an away message"
+
+#: src/gtkblist.c:4112 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:2847
+#: src/protocols/silc/buddy.c:1124 src/protocols/yahoo/yahoo.c:2868
 msgid "Add Buddy"
 msgstr "Add Buddy"
 
-#: src/gtkblist.c:4347
+#: src/gtkblist.c:4136
 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. "
@@ -2424,15 +2410,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:4410 src/gtkblist.c:4742
+#: src/gtkblist.c:4196 src/gtkblist.c:4499
 msgid "Account:"
 msgstr "Account:"
 
-#: src/gtkblist.c:4675
+#: src/gtkblist.c:4432
 msgid "This protocol does not support chat rooms."
 msgstr "This protocol does not support chat rooms."
 
-#: src/gtkblist.c:4691
+#: src/gtkblist.c:4448
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -2440,11 +2426,11 @@
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 
-#: src/gtkblist.c:4708
+#: src/gtkblist.c:4465
 msgid "Add Chat"
 msgstr "Add Chat"
 
-#: src/gtkblist.c:4732
+#: src/gtkblist.c:4489
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -2452,24 +2438,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:4811
+#: src/gtkblist.c:4568
 msgid "Add Group"
 msgstr "Add Group"
 
-#: src/gtkblist.c:4812
+#: src/gtkblist.c:4569
 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:5362 src/gtkblist.c:5458
+#: src/gtkblist.c:5138 src/gtkblist.c:5235
 msgid "No actions available"
 msgstr "No actions available"
 
-#: src/gtkconn.c:171
-#, fuzzy
-msgid "Reconnect"
+#: src/gtkconn.c:79 src/gtkconn.c:250 src/gtkconn.c:261
+msgid "Done."
+msgstr "Done."
+
+#: src/gtkconn.c:158
+msgid "Signon: "
+msgstr "Signon: "
+
+#: src/gtkconn.c:204
+msgid "Signon"
+msgstr "Signon"
+
+#: src/gtkconn.c:216
+msgid "Cancel All"
+msgstr "Cancel All"
+
+#: src/gtkconn.c:367 src/gtkconn.c:600
+msgid "_Reconnect"
 msgstr "_Reconnect"
 
-#: src/gtkconn.c:368
+#: src/gtkconn.c:564
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">%s has been disconnected.</span>\n"
@@ -2482,50 +2483,32 @@
 "%s\n"
 "%s"
 
-#: src/gtkconn.c:370
+#: src/gtkconn.c:566
 msgid "Reason Unknown."
 msgstr "Reason Unknown."
 
-#: src/gtkconn.c:378
-msgid "Disconnected"
-msgstr "Disconnected"
-
-#: src/gtkconn.c:404
-msgid "_Reconnect"
-msgstr "_Reconnect"
-
-#: src/gtkconn.c:409
+#: src/gtkconn.c:605
 msgid "Reconnect _All"
 msgstr "Reconnect _All"
 
-#: src/gtkconn.c:439
+#: src/gtkconn.c:635
 msgid "Time"
 msgstr "Time"
 
-#: src/gtkconv.c:148
-#, fuzzy
-msgid "Confirm close"
-msgstr "Confirm Account"
-
-#: src/gtkconv.c:180
-#, fuzzy
-msgid "You have unread messages. Are you sure you want to close the window?"
-msgstr "Are you sure you want to delete %s?"
-
-#: src/gtkconv.c:410
+#: src/gtkconv.c:342
 #, c-format
 msgid "me is using Gaim v%s."
 msgstr "me is using Gaim v%s."
 
-#: src/gtkconv.c:419
+#: src/gtkconv.c:351
 msgid "Supported debug options are:  version"
 msgstr "Supported debug options are:  version"
 
-#: src/gtkconv.c:456
+#: src/gtkconv.c:375
 msgid "No such command (in this context)."
 msgstr "No such command (in this context)."
 
-#: src/gtkconv.c:459
+#: src/gtkconv.c:378
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -2533,50 +2516,47 @@
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
 
-#: src/gtkconv.c:531
+#: src/gtkconv.c:450
 msgid "No such command."
 msgstr "No such command."
 
-#: src/gtkconv.c:538
+#: src/gtkconv.c:457
 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:543
+#: src/gtkconv.c:462
 msgid "Your command failed for an unknown reason."
 msgstr "Your command failed for an unknown reason."
 
-#: src/gtkconv.c:550
-#, fuzzy
-msgid "That command only works in chats, not IMs."
+#: src/gtkconv.c:469
+msgid "That command only works in Chats, not IMs."
 msgstr "That command only works in Chats, not IMs."
 
-#: src/gtkconv.c:553
-#, fuzzy
-msgid "That command only works in IMs, not chats."
+#: src/gtkconv.c:472
+msgid "That command only works in IMs, not Chats."
 msgstr "That command only works in IMs, not Chats."
 
-#: src/gtkconv.c:557
+#: src/gtkconv.c:476
 msgid "That command doesn't work on this protocol."
 msgstr "That command doesn't work on this protocol."
 
-#: src/gtkconv.c:783 src/gtkconv.c:809
-#, fuzzy
-msgid "That buddy is not on the same protocol as this chat."
+#: src/gtkconv.c:719 src/gtkconv.c:745
+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:803
+#: src/gtkconv.c:739
 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:858
+#: src/gtkconv.c:793
 msgid "Invite Buddy Into Chat Room"
 msgstr "Invite Buddy Into Chat Room"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:888
+#: src/gtkconv.c:823
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -2584,287 +2564,347 @@
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 
-#: src/gtkconv.c:909
+#: src/gtkconv.c:844
 msgid "_Buddy:"
 msgstr "_Buddy:"
 
-#: src/gtkconv.c:929 src/gtksavedstatuses.c:774
+#: src/gtkconv.c:864
 msgid "_Message:"
 msgstr "_Message:"
 
-#: src/gtkconv.c:986 src/gtkconv.c:2636 src/gtkdebug.c:215 src/gtkft.c:473
+#: src/gtkconv.c:920 src/gtkconv.c:2645 src/gtkdebug.c:182
 msgid "Unable to open file."
 msgstr "Unable to open file."
 
-#: src/gtkconv.c:992
+#: src/gtkconv.c:925
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Conversation with %s</h1>\n"
 
-#: src/gtkconv.c:1016
+#: src/gtkconv.c:939
 msgid "Save Conversation"
 msgstr "Save Conversation"
 
-#: src/gtkconv.c:1117 src/gtkdebug.c:163 src/gtkdebug.c:663
+#: src/gtkconv.c:1024 src/gtkdebug.c:131
 msgid "Find"
 msgstr "Find"
 
-#: src/gtkconv.c:1143 src/gtkdebug.c:191
+#: src/gtkconv.c:1050 src/gtkdebug.c:159
 msgid "_Search for:"
 msgstr "_Search for:"
 
-#: src/gtkconv.c:1541
+#: src/gtkconv.c:1466
 msgid "IM"
 msgstr "IM"
 
-#: src/gtkconv.c:1547 src/protocols/oscar/oscar.c:619
+#. Send File button
+#: src/gtkconv.c:1475 src/gtkconv.c:3888 src/protocols/oscar/oscar.c:605
 msgid "Send File"
 msgstr "Send File"
 
-#: src/gtkconv.c:1554
+#: src/gtkconv.c:1484
 msgid "Un-Ignore"
 msgstr "Un-Ignore"
 
-#: src/gtkconv.c:1557
+#: src/gtkconv.c:1486 src/gtkprefs.c:831
 msgid "Ignore"
 msgstr "Ignore"
 
-#: src/gtkconv.c:1562
+#. Info button
+#: src/gtkconv.c:1495 src/gtkconv.c:3909
 msgid "Info"
 msgstr "Info"
 
-#: src/gtkconv.c:1568
-msgid "Get Away Message"
-msgstr "Get Away Message"
-
-#: src/gtkconv.c:1577 src/gtkrequest.c:266
-msgid "Remove"
-msgstr "Remove"
-
-#: src/gtkconv.c:2644
+#: src/gtkconv.c:1504
+msgid "Get Away Msg"
+msgstr "Get Away Msg"
+
+#: src/gtkconv.c:2653
 msgid "Unable to save icon file to disk."
 msgstr "Unable to save icon file to disk."
 
-#: src/gtkconv.c:2667
+#: src/gtkconv.c:2675
 msgid "Save Icon"
 msgstr "Save Icon"
 
-#: src/gtkconv.c:2695
+#: src/gtkconv.c:2705
 msgid "Animate"
 msgstr "Animate"
 
-#: src/gtkconv.c:2700
+#: src/gtkconv.c:2710
 msgid "Hide Icon"
 msgstr "Hide Icon"
 
-#: src/gtkconv.c:2706
+#: src/gtkconv.c:2716
 msgid "Save Icon As..."
 msgstr "Save Icon As..."
 
-#: src/gtkconv.c:3067
+#: src/gtkconv.c:3093
 msgid "User is typing..."
 msgstr "User is typing..."
 
-#: src/gtkconv.c:3072
+#: src/gtkconv.c:3101
 msgid "User has typed something and paused"
 msgstr "User has typed something and paused"
 
 #. Build the Send As menu
-#: src/gtkconv.c:3173
+#: src/gtkconv.c:3204
 msgid "_Send As"
 msgstr "_Send As"
 
 #. Conversation menu
-#: src/gtkconv.c:3628
+#: src/gtkconv.c:3658
 msgid "/_Conversation"
 msgstr "/_Conversation"
 
-#: src/gtkconv.c:3630
+#: src/gtkconv.c:3660
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Conversation/New Instant _Message..."
 
-#: src/gtkconv.c:3635
+#: src/gtkconv.c:3665
 msgid "/Conversation/_Find..."
 msgstr "/Conversation/_Find..."
 
-#: src/gtkconv.c:3637
+#: src/gtkconv.c:3667
 msgid "/Conversation/View _Log"
 msgstr "/Conversation/View _Log"
 
-#: src/gtkconv.c:3638
+#: src/gtkconv.c:3668
 msgid "/Conversation/_Save As..."
 msgstr "/Conversation/_Save As..."
 
-#: src/gtkconv.c:3640
+#: src/gtkconv.c:3670
 msgid "/Conversation/Clear"
 msgstr "/Conversation/Clear"
 
-#: src/gtkconv.c:3644
+#: src/gtkconv.c:3674
 msgid "/Conversation/Se_nd File..."
 msgstr "/Conversation/Se_nd File..."
 
-#: src/gtkconv.c:3645
+#: src/gtkconv.c:3675
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Conversation/Add Buddy _Pounce..."
 
-#: src/gtkconv.c:3647
+#: src/gtkconv.c:3677
 msgid "/Conversation/_Get Info"
 msgstr "/Conversation/_Get Info"
 
-#: src/gtkconv.c:3649
+#: src/gtkconv.c:3679
+msgid "/Conversation/_Warn..."
+msgstr "/Conversation/_Warn..."
+
+#: src/gtkconv.c:3681
 msgid "/Conversation/In_vite..."
 msgstr "/Conversation/In_vite..."
 
-#: src/gtkconv.c:3654
-msgid "/Conversation/Al_ias..."
-msgstr "/Conversation/Al_ias..."
-
-#: src/gtkconv.c:3656
+#: src/gtkconv.c:3686
+msgid "/Conversation/A_lias..."
+msgstr "/Conversation/A_lias..."
+
+#: src/gtkconv.c:3688
 msgid "/Conversation/_Block..."
 msgstr "/Conversation/_Block..."
 
-#: src/gtkconv.c:3658
+#: src/gtkconv.c:3690
 msgid "/Conversation/_Add..."
 msgstr "/Conversation/_Add..."
 
-#: src/gtkconv.c:3660
+#: src/gtkconv.c:3692
 msgid "/Conversation/_Remove..."
 msgstr "/Conversation/_Remove..."
 
-#: src/gtkconv.c:3665
+#: src/gtkconv.c:3697
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Conversation/Insert Lin_k..."
 
-#: src/gtkconv.c:3667
+#: src/gtkconv.c:3699
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Conversation/Insert Imag_e..."
 
-#: src/gtkconv.c:3672
+#: src/gtkconv.c:3704
 msgid "/Conversation/_Close"
 msgstr "/Conversation/_Close"
 
 #. Options
-#: src/gtkconv.c:3676
+#: src/gtkconv.c:3708
 msgid "/_Options"
 msgstr "/_Options"
 
-#: src/gtkconv.c:3677
+#: src/gtkconv.c:3709
 msgid "/Options/Enable _Logging"
 msgstr "/Options/Enable _Logging"
 
-#: src/gtkconv.c:3678
+#: src/gtkconv.c:3710
 msgid "/Options/Enable _Sounds"
 msgstr "/Options/Enable _Sounds"
 
-#: src/gtkconv.c:3679
-msgid "/Options/Show Formatting _Toolbars"
-msgstr "/Options/Show Formatting _Toolbars"
-
-#: src/gtkconv.c:3680
-msgid "/Options/Show Ti_mestamps"
-msgstr "/Options/Show Ti_mestamps"
-
-#: src/gtkconv.c:3681
-msgid "/Options/Show Buddy _Icon"
-msgstr "/Options/Show Buddy _Icon"
-
-#: src/gtkconv.c:3725
+#: src/gtkconv.c:3711
+msgid "/Options/Show Formatting _Toolbar"
+msgstr "/Options/Show Formatting _Toolbar"
+
+#: src/gtkconv.c:3712
+msgid "/Options/Show T_imestamps"
+msgstr "/Options/Show T_imestamps"
+
+#: src/gtkconv.c:3754
 msgid "/Conversation/View Log"
 msgstr "/Conversation/View Log"
 
-#: src/gtkconv.c:3731
+#: src/gtkconv.c:3759
 msgid "/Conversation/Send File..."
 msgstr "/Conversation/Send File..."
 
-#: src/gtkconv.c:3735
+#: src/gtkconv.c:3763
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversation/Add Buddy Pounce..."
 
-#: src/gtkconv.c:3741
+#: src/gtkconv.c:3769
 msgid "/Conversation/Get Info"
 msgstr "/Conversation/Get Info"
 
-#: src/gtkconv.c:3745
+#: src/gtkconv.c:3773
+msgid "/Conversation/Warn..."
+msgstr "/Conversation/Warn..."
+
+#: src/gtkconv.c:3777
 msgid "/Conversation/Invite..."
 msgstr "/Conversation/Invite..."
 
-#: src/gtkconv.c:3751
+#: src/gtkconv.c:3783
 msgid "/Conversation/Alias..."
 msgstr "/Conversation/Alias..."
 
-#: src/gtkconv.c:3755
+#: src/gtkconv.c:3787
 msgid "/Conversation/Block..."
 msgstr "/Conversation/Block..."
 
-#: src/gtkconv.c:3759
+#: src/gtkconv.c:3791
 msgid "/Conversation/Add..."
 msgstr "/Conversation/Add..."
 
-#: src/gtkconv.c:3763
+#: src/gtkconv.c:3795
 msgid "/Conversation/Remove..."
 msgstr "/Conversation/Remove..."
 
-#: src/gtkconv.c:3769
+#: src/gtkconv.c:3801
 msgid "/Conversation/Insert Link..."
 msgstr "/Conversation/Insert Link..."
 
-#: src/gtkconv.c:3773
+#: src/gtkconv.c:3805
 msgid "/Conversation/Insert Image..."
 msgstr "/Conversation/Insert Image..."
 
-#: src/gtkconv.c:3779
+#: src/gtkconv.c:3811
 msgid "/Options/Enable Logging"
 msgstr "/Options/Enable Logging"
 
-#: src/gtkconv.c:3782
+#: src/gtkconv.c:3814
 msgid "/Options/Enable Sounds"
 msgstr "/Options/Enable Sounds"
 
-#: src/gtkconv.c:3785
-msgid "/Options/Show Formatting Toolbars"
-msgstr "/Options/Show Formatting Toolbars"
-
-#: src/gtkconv.c:3788
+#: src/gtkconv.c:3817
+msgid "/Options/Show Formatting Toolbar"
+msgstr "/Options/Show Formatting Toolbar"
+
+#: src/gtkconv.c:3820
 msgid "/Options/Show Timestamps"
 msgstr "/Options/Show Timestamps"
 
-#: src/gtkconv.c:3791
-msgid "/Options/Show Buddy Icon"
-msgstr "/Options/Show Buddy Icon"
-
-#: src/gtkconv.c:3911
+#. The buttons, from left to right
+#. Warn button
+#: src/gtkconv.c:3874
+msgid "Warn"
+msgstr "Warn"
+
+#: src/gtkconv.c:3875
+msgid "Warn the user"
+msgstr "Warn the user"
+
+#. Block button
+#: src/gtkconv.c:3881 src/gtkprivacy.c:634 src/gtkprivacy.c:645
+msgid "Block"
+msgstr "Block"
+
+#: src/gtkconv.c:3882
+msgid "Block the user"
+msgstr "Block the user"
+
+#: src/gtkconv.c:3889
+msgid "Send a file to the user"
+msgstr "Send a file to the user"
+
+#: src/gtkconv.c:3896
+msgid "Add the user to your buddy list"
+msgstr "Add the user to your buddy list"
+
+#: src/gtkconv.c:3903
+msgid "Remove the user from your buddy list"
+msgstr "Remove the user from your buddy list"
+
+#: src/gtkconv.c:3910 src/gtkconv.c:4245
+msgid "Get the user's information"
+msgstr "Get the user's information"
+
+#. Send button
+#: src/gtkconv.c:3916 src/gtkconv.c:3980
+msgid "Send"
+msgstr "Send"
+
+#: src/gtkconv.c:3917 src/gtkconv.c:3981
+msgid "Send message"
+msgstr "Send message"
+
+#. The buttons, from left to right
+#. Invite
+#: src/gtkconv.c:3959
+msgid "Invite"
+msgstr "Invite"
+
+#: src/gtkconv.c:3960
+msgid "Invite a user"
+msgstr "Invite a user"
+
+#: src/gtkconv.c:3967
+msgid "Add the chat to your buddy list"
+msgstr "Add the chat to your buddy list"
+
+#: src/gtkconv.c:3974
+msgid "Remove the chat from your buddy list"
+msgstr "Remove the chat from your buddy list"
+
+#: src/gtkconv.c:4098
 msgid "Topic:"
 msgstr "Topic:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3959
+#: src/gtkconv.c:4161
 msgid "0 people in room"
 msgstr "0 people in room"
 
-#: src/gtkconv.c:4021
+#: src/gtkconv.c:4222
 msgid "IM the user"
 msgstr "IM the user"
 
-#: src/gtkconv.c:4034
+#: src/gtkconv.c:4234
 msgid "Ignore the user"
 msgstr "Ignore the user"
 
-#: src/gtkconv.c:4046
-msgid "Get the user's information"
-msgstr "Get the user's information"
-
-#: src/gtkconv.c:4569
+#: src/gtkconv.c:4833
 msgid "Close conversation"
 msgstr "Close conversation"
 
-#: src/gtkconv.c:5192 src/gtkconv.c:5220 src/gtkconv.c:5316 src/gtkconv.c:5373
+#: src/gtkconv.c:5370 src/gtkconv.c:5399 src/gtkconv.c:5495 src/gtkconv.c:5553
 #, 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:6279
+#: src/gtkconv.c:6130 src/gtkconv.c:6133
+msgid "<main>/Conversation/Close"
+msgstr "<main>/Conversation/Close"
+
+#: src/gtkconv.c:6505
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -2872,11 +2912,11 @@
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
 
-#: src/gtkconv.c:6282
+#: src/gtkconv.c:6508
 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:6285
+#: src/gtkconv.c:6511
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -2884,310 +2924,325 @@
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 
-#: src/gtkconv.c:6288
-#, fuzzy
-msgid "clear: Clears the conversation scrollback."
-msgstr "%s has closed the conversation window."
-
-#: src/gtkconv.c:6291
+#: src/gtkconv.c:6515
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;command&gt;:  Help on a specific command."
 
-#: src/gtkdebug.c:230
+#: src/gtkdebug.c:197
 msgid "Save Debug Log"
 msgstr "Save Debug Log"
 
-#: src/gtkdebug.c:571
-#, fuzzy
-msgid "Invert"
-msgstr "_Insert"
-
-#: src/gtkdebug.c:574
-msgid "Highlight matches"
-msgstr ""
-
-#: src/gtkdebug.c:621
+#: src/gtkdebug.c:250
 msgid "Debug Window"
 msgstr "Debug Window"
 
-#: src/gtkdebug.c:674
-#, fuzzy
-msgid "Clear"
-msgstr "Close"
-
-#: src/gtkdebug.c:683
+#: src/gtkdebug.c:288
 msgid "Pause"
 msgstr "Pause"
 
-#: src/gtkdebug.c:690 src/gtkdebug.c:691
+#: src/gtkdebug.c:294
 msgid "Timestamps"
 msgstr "Timestamps"
 
-#: src/gtkdebug.c:709
-#, fuzzy
-msgid "Filter"
-msgstr "Failed"
-
-#: src/gtkdebug.c:722
-#, fuzzy
-msgid "Right click for more options."
-msgstr "Show more options"
-
-#: src/gtkdialogs.c:59 src/gtkdialogs.c:89
+#: src/gtkdialogs.c:63
 msgid "lead developer"
 msgstr "lead developer"
 
-#: src/gtkdialogs.c:60 src/gtkdialogs.c:63 src/gtkdialogs.c:64
-#: src/gtkdialogs.c:65 src/gtkdialogs.c:66 src/gtkdialogs.c:67
+#: src/gtkdialogs.c:64 src/gtkdialogs.c:67 src/gtkdialogs.c:68
 #: src/gtkdialogs.c:69 src/gtkdialogs.c:70 src/gtkdialogs.c:71
+#: src/gtkdialogs.c:73 src/gtkdialogs.c:74 src/gtkdialogs.c:75
 msgid "developer"
 msgstr "developer"
 
-#: src/gtkdialogs.c:61
+#: src/gtkdialogs.c:65
 msgid "developer & webmaster"
 msgstr "developer & webmaster"
 
-#: src/gtkdialogs.c:62
+#: src/gtkdialogs.c:66
 msgid "win32 port"
 msgstr "win32 port"
 
-#: src/gtkdialogs.c:68
+#: src/gtkdialogs.c:72
 msgid "support"
 msgstr "support"
 
-#: src/gtkdialogs.c:87 src/gtkdialogs.c:90
-msgid "maintainer"
-msgstr "maintainer"
-
-#: src/gtkdialogs.c:88
-#, fuzzy
-msgid "libfaim maintainer"
-msgstr "former libfaim maintainer"
-
 #: src/gtkdialogs.c:91
-#, fuzzy
-msgid "Jabber developer"
-msgstr "former Jabber developer"
+msgid "maintainer"
+msgstr "maintainer"
 
 #: src/gtkdialogs.c:92
-msgid "original author"
-msgstr "original author"
+msgid "former libfaim maintainer"
+msgstr "former libfaim maintainer"
 
 #: src/gtkdialogs.c:93
+msgid "former lead developer"
+msgstr "former lead developer"
+
+#: src/gtkdialogs.c:94
+msgid "former maintainer"
+msgstr "former maintainer"
+
+#: src/gtkdialogs.c:95
+msgid "former Jabber developer"
+msgstr "former Jabber developer"
+
+#: src/gtkdialogs.c:96
+msgid "original author"
+msgstr "original author"
+
+#: src/gtkdialogs.c:97
 msgid "hacker and designated driver [lazy bum]"
 msgstr "hacker and designated driver [lazy bum]"
 
-#: src/gtkdialogs.c:98 src/gtkdialogs.c:99 src/gtkdialogs.c:141
+#: src/gtkdialogs.c:102
+#, fuzzy
+msgid "Azerbaijani"
+msgstr "Serbian"
+
+#: src/gtkdialogs.c:103 src/gtkdialogs.c:149
 msgid "Bulgarian"
 msgstr "Bulgarian"
 
-#: src/gtkdialogs.c:100 src/gtkdialogs.c:142 src/gtkdialogs.c:143
+#: src/gtkdialogs.c:103
+msgid "Vladimira Girginova and Vladimir (Kaladan) Petkov"
+msgstr ""
+
+#: src/gtkdialogs.c:104 src/gtkdialogs.c:150 src/gtkdialogs.c:151
 msgid "Catalan"
 msgstr "Catalan"
 
-#: src/gtkdialogs.c:101 src/gtkdialogs.c:144
+#: src/gtkdialogs.c:105 src/gtkdialogs.c:152
 msgid "Czech"
 msgstr "Czech"
 
-#: src/gtkdialogs.c:102
-msgid "Danish"
-msgstr "Danish"
-
-#: src/gtkdialogs.c:103 src/gtkdialogs.c:145
-msgid "German"
-msgstr "German"
-
-#: src/gtkdialogs.c:104
-msgid "Australian English"
-msgstr "Australian English"
-
-#: src/gtkdialogs.c:105
-msgid "British English"
-msgstr "British English"
-
 #: src/gtkdialogs.c:106
+msgid "Danish"
+msgstr "Danish"
+
+#: src/gtkdialogs.c:107 src/gtkdialogs.c:153
+msgid "German"
+msgstr "German"
+
+#: src/gtkdialogs.c:108
+msgid "Australian English"
+msgstr "Australian English"
+
+#: src/gtkdialogs.c:109
 msgid "Canadian English"
 msgstr "Canadian English"
 
-#: src/gtkdialogs.c:107 src/gtkdialogs.c:146
+#: src/gtkdialogs.c:110
+msgid "British English"
+msgstr "British English"
+
+#: src/gtkdialogs.c:111 src/gtkdialogs.c:154
 msgid "Spanish"
 msgstr "Spanish"
 
-#: src/gtkdialogs.c:108 src/gtkdialogs.c:147
+#: src/gtkdialogs.c:112
+#, fuzzy
+msgid "Estonian"
+msgstr "Romanian"
+
+#: src/gtkdialogs.c:113 src/gtkdialogs.c:155
 msgid "Finnish"
 msgstr "Finnish"
 
-#: src/gtkdialogs.c:109 src/gtkdialogs.c:148
+#: src/gtkdialogs.c:114 src/gtkdialogs.c:156
 msgid "French"
 msgstr "French"
 
-#: src/gtkdialogs.c:110
+#: src/gtkdialogs.c:115
 msgid "Hebrew"
 msgstr "Hebrew"
 
-#: src/gtkdialogs.c:111
+#: src/gtkdialogs.c:116 src/gtkdialogs.c:157
 msgid "Hindi"
 msgstr "Hindi"
 
-#: src/gtkdialogs.c:112
+#: src/gtkdialogs.c:117 src/gtkdialogs.c:158
 msgid "Hungarian"
 msgstr "Hungarian"
 
-#: src/gtkdialogs.c:113 src/gtkdialogs.c:149
+#: src/gtkdialogs.c:118 src/gtkdialogs.c:159
 msgid "Italian"
 msgstr "Italian"
 
-#: src/gtkdialogs.c:114 src/gtkdialogs.c:150
+#: src/gtkdialogs.c:119 src/gtkdialogs.c:160
 msgid "Japanese"
 msgstr "Japanese"
 
-#: src/gtkdialogs.c:115
-msgid "Lithuanian"
-msgstr "Lithuanian"
-
-#: src/gtkdialogs.c:116
+#: src/gtkdialogs.c:120
 #, fuzzy
 msgid "Georgian"
 msgstr "German"
 
-#: src/gtkdialogs.c:117 src/gtkdialogs.c:151
+#: src/gtkdialogs.c:121 src/gtkdialogs.c:161
 msgid "Korean"
 msgstr "Korean"
 
-#: src/gtkdialogs.c:118
-#, fuzzy
-msgid "Dutch, Flemish"
-msgstr "Dutch; Flemish"
-
-#: src/gtkdialogs.c:119
+#: src/gtkdialogs.c:122
+msgid "Lithuanian"
+msgstr "Lithuanian"
+
+#: src/gtkdialogs.c:123
 msgid "Macedonian"
 msgstr "Macedonian"
 
-#: src/gtkdialogs.c:120
+#: src/gtkdialogs.c:124
+msgid "Burmese"
+msgstr "Burmese"
+
+#: src/gtkdialogs.c:125
+msgid "Dutch; Flemish"
+msgstr "Dutch; Flemish"
+
+#: src/gtkdialogs.c:126
+#, fuzzy
+msgid "Norwegian (Nynorsk)"
+msgstr "Norwegian"
+
+#: src/gtkdialogs.c:127 src/gtkdialogs.c:162
 msgid "Norwegian"
 msgstr "Norwegian"
 
-#: src/gtkdialogs.c:121 src/gtkdialogs.c:122 src/gtkdialogs.c:152
+#: src/gtkdialogs.c:128
+msgid "Punjabi"
+msgstr ""
+
+#: src/gtkdialogs.c:129 src/gtkdialogs.c:163
 msgid "Polish"
 msgstr "Polish"
 
-#: src/gtkdialogs.c:123
+#: src/gtkdialogs.c:130
 msgid "Portuguese"
 msgstr "Portuguese"
 
-#: src/gtkdialogs.c:124
+#: src/gtkdialogs.c:131
 msgid "Portuguese-Brazil"
 msgstr "Portuguese-Brazil"
 
-#: src/gtkdialogs.c:125
+#: src/gtkdialogs.c:132
 msgid "Romanian"
 msgstr "Romanian"
 
-#: src/gtkdialogs.c:126 src/gtkdialogs.c:153 src/gtkdialogs.c:154
+#: src/gtkdialogs.c:133 src/gtkdialogs.c:164 src/gtkdialogs.c:165
 msgid "Russian"
 msgstr "Russian"
 
-#: src/gtkdialogs.c:127 src/gtkdialogs.c:128
+#: src/gtkdialogs.c:134
+msgid "Slovenian"
+msgstr "Slovenian"
+
+#: src/gtkdialogs.c:135
+msgid "Albanian"
+msgstr "Albanian"
+
+#: src/gtkdialogs.c:136
 msgid "Serbian"
 msgstr "Serbian"
 
-#: src/gtkdialogs.c:129
-msgid "Slovenian"
-msgstr "Slovenian"
-
-#: src/gtkdialogs.c:130 src/gtkdialogs.c:156
+#: src/gtkdialogs.c:137 src/gtkdialogs.c:167 src/gtkdialogs.c:168
 msgid "Swedish"
 msgstr "Swedish"
 
-#: src/gtkdialogs.c:131
+#: src/gtkdialogs.c:138
+msgid "Turkish"
+msgstr "Turkish"
+
+#: src/gtkdialogs.c:139
+msgid "Ukrainian"
+msgstr "Ukrainian"
+
+#: src/gtkdialogs.c:140
 msgid "Vietnamese"
 msgstr "Vietnamese"
 
-#: src/gtkdialogs.c:131
+#: src/gtkdialogs.c:140
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh and the Gnome-Vi Team"
 
-#: src/gtkdialogs.c:132 src/gtkdialogs.c:157
+#: src/gtkdialogs.c:141
 msgid "Simplified Chinese"
 msgstr "Simplified Chinese"
 
-#: src/gtkdialogs.c:133 src/gtkdialogs.c:134 src/gtkdialogs.c:158
+#: src/gtkdialogs.c:142
 msgid "Traditional Chinese"
 msgstr "Traditional Chinese"
 
-#: src/gtkdialogs.c:140
+#: src/gtkdialogs.c:148
 msgid "Amharic"
 msgstr "Amharic"
 
-#: src/gtkdialogs.c:155
+#: src/gtkdialogs.c:166
 msgid "Slovak"
 msgstr "Slovak"
 
-#: src/gtkdialogs.c:199
+#: src/gtkdialogs.c:169
+msgid "Chinese"
+msgstr "Chinese"
+
+#: src/gtkdialogs.c:211
 msgid "About Gaim"
 msgstr "About Gaim"
 
-#: src/gtkdialogs.c:223
-#, fuzzy
+#: src/gtkdialogs.c:226
+#, 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:248
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
-"at once.  It is written using GTK+ and is licensed under the GNU GPL.<BR><BR>"
+"at once.  It is written using Gtk+ and is licensed under the GPL.<BR><BR>"
 msgstr ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
-"at once.  It is written using GTK+ and is licenced under the GPL.<BR><BR>"
-
-#: src/gtkdialogs.c:232
+"at once.  It is written using Gtk+ and is licenced under the GPL.<BR><BR>"
+
+#: src/gtkdialogs.c:258
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
 
-#: src/gtkdialogs.c:235
+#: src/gtkdialogs.c:261
 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:241
+#: src/gtkdialogs.c:267
 msgid "Active Developers"
 msgstr "Active Developers"
 
-#: src/gtkdialogs.c:256
+#: src/gtkdialogs.c:282
 msgid "Crazy Patch Writers"
 msgstr "Crazy Patch Writers"
 
-#: src/gtkdialogs.c:271
+#: src/gtkdialogs.c:297
 msgid "Retired Developers"
 msgstr "Retired Developers"
 
-#: src/gtkdialogs.c:286
+#: src/gtkdialogs.c:312
 msgid "Current Translators"
 msgstr "Current Translators"
 
-#: src/gtkdialogs.c:306
+#: src/gtkdialogs.c:332
 msgid "Past Translators"
 msgstr "Past Translators"
 
-#: src/gtkdialogs.c:324
-#, fuzzy
-msgid "Debugging Information"
-msgstr "User Information"
-
-#: src/gtkdialogs.c:486 src/gtkdialogs.c:629 src/gtkdialogs.c:684
-#, fuzzy
-msgid "_Name"
-msgstr "Name"
-
-#: src/gtkdialogs.c:491 src/gtkdialogs.c:634 src/gtkdialogs.c:689
+#: src/gtkdialogs.c:487 src/gtkdialogs.c:629 src/gtkdialogs.c:682
+msgid "_Screen name"
+msgstr "_Screen name"
+
+#: src/gtkdialogs.c:493 src/gtkdialogs.c:635 src/gtkdialogs.c:688
 msgid "_Account"
 msgstr "_Account"
 
-#: src/gtkdialogs.c:499
+#: src/gtkdialogs.c:500
 msgid "New Instant Message"
 msgstr "New Instant Message"
 
-#: src/gtkdialogs.c:501
-#, fuzzy
-msgid ""
-"Please enter the screen name or alias of the person you would like to IM."
+#: src/gtkdialogs.c:502
+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:642
@@ -3195,72 +3250,86 @@
 msgstr "Get User Info"
 
 #: src/gtkdialogs.c:644
-#, fuzzy
-msgid ""
-"Please enter the screen name or alias of the person whose info you would "
-"like to view."
+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:696
+msgid "Get User Log"
+msgstr "Get User Log"
+
 #: src/gtkdialogs.c:698
-#, fuzzy
-msgid "View User Log"
-msgstr "Get User Log"
-
-#: src/gtkdialogs.c:700
-#, fuzzy
-msgid ""
-"Please enter the screen name or alias of the person whose log you would like "
-"to view."
+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:719
+#: src/gtkdialogs.c:738
+msgid "Warn User"
+msgstr "Warn User"
+
+#: src/gtkdialogs.c:759
+#, c-format
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
+"\n"
+"This will increase %s's warning level and he or she will be subject to "
+"harsher rate limiting.\n"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
+"\n"
+"This will increase %s's warning level and he or she will be subject to "
+"harsher rate limiting.\n"
+
+#: src/gtkdialogs.c:768
+msgid "Warn _anonymously?"
+msgstr "Warn _anonymously?"
+
+#: src/gtkdialogs.c:775
+msgid "<b>Anonymous warnings are less severe.</b>"
+msgstr "<b>Anonymous warnings are less severe.</b>"
+
+#: src/gtkdialogs.c:796
 msgid "Alias Contact"
 msgstr "Alias Contact"
 
-#: src/gtkdialogs.c:720
+#: src/gtkdialogs.c:797
 msgid "Enter an alias for this contact."
 msgstr "Enter an alias for this contact."
 
-#: src/gtkdialogs.c:722 src/gtkdialogs.c:744 src/gtkdialogs.c:764
-#: src/gtkrequest.c:268 src/protocols/silc/chat.c:585
+#: src/gtkdialogs.c:799 src/gtkdialogs.c:821 src/gtkdialogs.c:841
+#: src/gtkrequest.c:251 src/protocols/silc/chat.c:584
 msgid "Alias"
 msgstr "Alias"
 
-#: src/gtkdialogs.c:740
+#: src/gtkdialogs.c:817
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Enter an alias for %s."
 
-#: src/gtkdialogs.c:742
+#: src/gtkdialogs.c:819
 msgid "Alias Buddy"
 msgstr "Alias Buddy"
 
-#: src/gtkdialogs.c:761
+#: src/gtkdialogs.c:838
 msgid "Alias Chat"
 msgstr "Alias Chat"
 
-#: src/gtkdialogs.c:762
+#: src/gtkdialogs.c:839
 msgid "Enter an alias for this chat."
 msgstr "Enter an alias for this chat."
 
-#: src/gtkdialogs.c:799
-#, c-format
-msgid ""
-"You are about to remove the contact containing %s and %d other buddy from "
-"your buddy list.  Do you want to continue?"
-msgid_plural ""
+#: src/gtkdialogs.c:873
+#, c-format
+msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
 "your buddy list.  Do you want to continue?"
-msgstr[0] ""
-"You are about to remove the contact containing %s and %d other buddy from "
-"your buddy list.  Do you want to continue?"
-msgstr[1] ""
+msgstr ""
 "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:866
+#: src/gtkdialogs.c:934
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -3269,22 +3338,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:869 src/gtkdialogs.c:870
+#: src/gtkdialogs.c:937 src/gtkdialogs.c:938
 msgid "Remove Group"
 msgstr "Remove Group"
 
-#: src/gtkdialogs.c:908
+#: src/gtkdialogs.c:976
 #, 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:911 src/gtkdialogs.c:912
+#: src/gtkdialogs.c:979 src/gtkdialogs.c:981
 msgid "Remove Buddy"
 msgstr "Remove Buddy"
 
-#: src/gtkdialogs.c:950
+#: src/gtkdialogs.c:1018
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -3293,7 +3362,7 @@
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 
-#: src/gtkdialogs.c:953 src/gtkdialogs.c:954
+#: src/gtkdialogs.c:1021 src/gtkdialogs.c:1022
 msgid "Remove Chat"
 msgstr "Remove Chat"
 
@@ -3302,15 +3371,15 @@
 msgid "%.2f KB/s"
 msgstr "%.2f KB/s"
 
-#: src/gtkft.c:162 src/gtkft.c:1046
+#: src/gtkft.c:162 src/gtkft.c:1012
 msgid "Finished"
 msgstr "Finished"
 
-#: src/gtkft.c:165 src/gtkft.c:997
+#: src/gtkft.c:165 src/gtkft.c:963
 msgid "Canceled"
 msgstr "Cancelled"
 
-#: src/gtkft.c:168 src/gtkft.c:916
+#: src/gtkft.c:168 src/gtkft.c:882
 msgid "Waiting for transfer to begin"
 msgstr "Waiting for transfer to begin"
 
@@ -3330,158 +3399,125 @@
 msgid "<b>Sending As:</b>"
 msgstr "<b>Sending As:</b>"
 
-#: src/gtkft.c:445
+#: src/gtkft.c:436
 msgid "There is no application configured to open this type of file."
 msgstr "There is no application configured to open this type of file."
 
-#: src/gtkft.c:450
+#: src/gtkft.c:441
 msgid "An error occurred while opening the file."
 msgstr "An error occurred while opening the file."
 
-#: src/gtkft.c:470
-#, fuzzy, c-format
-msgid "Error launching %s: %s"
-msgstr "Error launching <b>%s</b>: %s"
-
-#: src/gtkft.c:479
-#, fuzzy, c-format
-msgid "Error running %s"
-msgstr "Error Reading %s"
-
-#: src/gtkft.c:480
-#, c-format
-msgid "Process returned error code %d"
-msgstr ""
-
-#: src/gtkft.c:575
+#: src/gtkft.c:533
 msgid "Progress"
 msgstr "Progress"
 
-#: src/gtkft.c:582
+#: src/gtkft.c:540
 msgid "Filename"
 msgstr "Filename"
 
-#: src/gtkft.c:589
+#: src/gtkft.c:547
 msgid "Size"
 msgstr "Size"
 
-#: src/gtkft.c:596
+#: src/gtkft.c:554
 msgid "Remaining"
 msgstr "Remaining"
 
-#: src/gtkft.c:627
+#: src/gtkft.c:586
 msgid "Filename:"
 msgstr "Filename:"
 
-#: src/gtkft.c:628
+#: src/gtkft.c:587
 #, fuzzy
 msgid "Local File:"
 msgstr "Local Users"
 
-#: src/gtkft.c:629
+#: src/gtkft.c:588
 msgid "Status:"
 msgstr "Status:"
 
-#: src/gtkft.c:630
+#: src/gtkft.c:589
 msgid "Speed:"
 msgstr "Speed:"
 
-#: src/gtkft.c:631
+#: src/gtkft.c:590
 msgid "Time Elapsed:"
 msgstr "Time Elapsed:"
 
-#: src/gtkft.c:632
+#: src/gtkft.c:591
 msgid "Time Remaining:"
 msgstr "Time Remaining:"
 
-#: src/gtkft.c:718
+#: src/gtkft.c:683
 msgid "_Keep the dialog open"
 msgstr "_Keep the dialogue open"
 
-#: src/gtkft.c:728
+#: src/gtkft.c:693
 msgid "_Clear finished transfers"
 msgstr "_Clear finished transfers"
 
 #. "Download Details" arrow
-#: src/gtkft.c:737
+#: src/gtkft.c:702
 msgid "Show transfer details"
 msgstr "Show transfer details"
 
-#: src/gtkft.c:738
+#: src/gtkft.c:703
 msgid "Hide transfer details"
 msgstr "Hide transfer details"
 
 #. Pause button
-#: src/gtkft.c:775 src/gtkstock.c:106
+#: src/gtkft.c:745 src/stock.c:92
 msgid "_Pause"
 msgstr "_Pause"
 
 #. Resume button
-#: src/gtkft.c:785
+#: src/gtkft.c:755
 msgid "_Resume"
 msgstr "_Resume"
 
-#: src/gtkft.c:999
+#: src/gtkft.c:965
 msgid "Failed"
 msgstr "Failed"
 
-#: src/gtkgaim-disclosure.c:258
-msgid "Expander Size"
-msgstr "Expander Size"
-
-#: src/gtkgaim-disclosure.c:259
-msgid "Size of the expander arrow"
-msgstr "Size of the expander arrow"
-
-#: src/gtkimhtml.c:816
+#: src/gtkimhtml.c:693
 msgid "Pa_ste As Text"
 msgstr "Pa_ste As Text"
 
-#: src/gtkimhtml.c:1263
+#: src/gtkimhtml.c:1087
 msgid "Hyperlink color"
 msgstr "Hyperlink colour"
 
-#: src/gtkimhtml.c:1264
+#: src/gtkimhtml.c:1088
 msgid "Color to draw hyperlinks."
 msgstr "Colour to draw hyperlinks."
 
-#: src/gtkimhtml.c:1267
-#, fuzzy
-msgid "Hyperlink prelight color"
-msgstr "Hyperlink colour"
-
-#: src/gtkimhtml.c:1268
-#, fuzzy
-msgid "Color to draw hyperlinks when mouse is over them."
-msgstr "Colour to draw hyperlinks."
-
-#: src/gtkimhtml.c:1486
+#: src/gtkimhtml.c:1296
 msgid "_Copy E-Mail Address"
 msgstr "_Copy E-Mail Address"
 
-#: src/gtkimhtml.c:1498
+#: src/gtkimhtml.c:1308
+msgid "_Copy Link Location"
+msgstr "_Copy Link Location"
+
+#: src/gtkimhtml.c:1318
 msgid "_Open Link in Browser"
 msgstr "_Open Link in Browser"
 
-#: src/gtkimhtml.c:1508
-msgid "_Copy Link Location"
-msgstr "_Copy Link Location"
-
-#: src/gtkimhtml.c:3182
+#: src/gtkimhtml.c:2915
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
 "Defaulting to PNG."
 msgstr ""
 
-#: src/gtkimhtml.c:3185
+#: src/gtkimhtml.c:2918
 msgid ""
 "Unrecognized file type\n"
 "\n"
 "Defaulting to PNG."
 msgstr ""
 
-#: src/gtkimhtml.c:3198
+#: src/gtkimhtml.c:2931
 #, fuzzy, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -3492,7 +3528,7 @@
 "\n"
 "%s"
 
-#: src/gtkimhtml.c:3201
+#: src/gtkimhtml.c:2934
 #, fuzzy, c-format
 msgid ""
 "Error saving image\n"
@@ -3500,35 +3536,35 @@
 "%s"
 msgstr "Error saving image: %s"
 
-#: src/gtkimhtml.c:3281 src/gtkimhtml.c:3293
+#: src/gtkimhtml.c:3014 src/gtkimhtml.c:3026
 msgid "Save Image"
 msgstr "Save Image"
 
-#: src/gtkimhtml.c:3321
+#: src/gtkimhtml.c:3054
 msgid "_Save Image..."
 msgstr "_Save Image..."
 
-#: src/gtkimhtmltoolbar.c:141
+#: src/gtkimhtmltoolbar.c:176
 msgid "Select Font"
 msgstr "Select Font"
 
-#: src/gtkimhtmltoolbar.c:220
+#: src/gtkimhtmltoolbar.c:254
 msgid "Select Text Color"
 msgstr "Select Text Colour"
 
-#: src/gtkimhtmltoolbar.c:299
+#: src/gtkimhtmltoolbar.c:328
 msgid "Select Background Color"
 msgstr "Select Background Colour"
 
-#: src/gtkimhtmltoolbar.c:388
+#: src/gtkimhtmltoolbar.c:412
 msgid "_URL"
 msgstr "_URL"
 
-#: src/gtkimhtmltoolbar.c:396
+#: src/gtkimhtmltoolbar.c:420
 msgid "_Description"
 msgstr "_Description"
 
-#: src/gtkimhtmltoolbar.c:399
+#: src/gtkimhtmltoolbar.c:423
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
@@ -3536,183 +3572,109 @@
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
 
-#: src/gtkimhtmltoolbar.c:403
+#: src/gtkimhtmltoolbar.c:427
 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:408
+#: src/gtkimhtmltoolbar.c:432
 msgid "Insert Link"
 msgstr "Insert Link"
 
-#: src/gtkimhtmltoolbar.c:412
+#: src/gtkimhtmltoolbar.c:436
 msgid "_Insert"
 msgstr "_Insert"
 
-#: src/gtkimhtmltoolbar.c:481
+#: src/gtkimhtmltoolbar.c:505
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Failed to store image: %s\n"
 
-#: src/gtkimhtmltoolbar.c:507 src/gtkimhtmltoolbar.c:517
+#: src/gtkimhtmltoolbar.c:531 src/gtkimhtmltoolbar.c:541
 msgid "Insert Image"
 msgstr "Insert Image"
 
-#: src/gtkimhtmltoolbar.c:715
+#: src/gtkimhtmltoolbar.c:679
 msgid "This theme has no available smileys."
 msgstr "This theme has no available smileys."
 
 #. show everything
-#: src/gtkimhtmltoolbar.c:729
+#: src/gtkimhtmltoolbar.c:694
 msgid "Smile!"
 msgstr "Smile!"
 
-#: src/gtkimhtmltoolbar.c:917
+#: src/gtkimhtmltoolbar.c:912
 msgid "Bold"
 msgstr "Bold"
 
-#: src/gtkimhtmltoolbar.c:928
+#: src/gtkimhtmltoolbar.c:923
 msgid "Italic"
 msgstr "Italic"
 
-#: src/gtkimhtmltoolbar.c:939
+#: src/gtkimhtmltoolbar.c:934
 msgid "Underline"
 msgstr "Underline"
 
-#: src/gtkimhtmltoolbar.c:955
+#: src/gtkimhtmltoolbar.c:950
 msgid "Larger font size"
 msgstr "Larger font size"
 
-#: src/gtkimhtmltoolbar.c:967
+#: src/gtkimhtmltoolbar.c:962
 msgid "Smaller font size"
 msgstr "Smaller font size"
 
-#: src/gtkimhtmltoolbar.c:984
+#: src/gtkimhtmltoolbar.c:979
 msgid "Font Face"
 msgstr "Font Face"
 
-#: src/gtkimhtmltoolbar.c:996
+#: src/gtkimhtmltoolbar.c:991
 msgid "Foreground font color"
 msgstr "Foreground font colour"
 
-#: src/gtkimhtmltoolbar.c:1008
+#: src/gtkimhtmltoolbar.c:1003
 msgid "Background color"
 msgstr "Background colour"
 
-#: src/gtkimhtmltoolbar.c:1024
-#, fuzzy
-msgid "Clear formatting"
-msgstr "_Clear Formatting"
-
-#: src/gtkimhtmltoolbar.c:1039
+#: src/gtkimhtmltoolbar.c:1018
 msgid "Insert link"
 msgstr "Insert link"
 
-#: src/gtkimhtmltoolbar.c:1049
+#: src/gtkimhtmltoolbar.c:1028
 msgid "Insert image"
 msgstr "Insert image"
 
-#: src/gtkimhtmltoolbar.c:1060
+#: src/gtkimhtmltoolbar.c:1039
 msgid "Insert smiley"
 msgstr "Insert smiley"
 
-#: src/gtklog.c:200
-#, fuzzy, c-format
-msgid "Conversation in %s on %s"
-msgstr "Conversations with %s"
-
-#: src/gtklog.c:202
-#, fuzzy, c-format
-msgid "Conversation with %s on %s"
-msgstr "Conversations with %s"
-
-#: src/gtklog.c:397
-msgid ""
-"System events will only be logged if the <span style=\"italic\">Enable "
-"system log preference</span> is set."
-msgstr ""
-
-#: src/gtklog.c:401
-msgid ""
-"Instant messages will only be logged if the <span style=\"italic\">Log all "
-"instant messages</span> preference is enabled."
-msgstr ""
-
-#: src/gtklog.c:404
-msgid ""
-"Chats will only be logged if the <span style=\"italic\">Log all chats "
-"preference</span> is enabled."
-msgstr ""
-
-#: src/gtklog.c:409
-msgid "No logs were found."
-msgstr ""
-
-#: src/gtklog.c:455
-#, fuzzy, c-format
-msgid "Conversations in %s"
-msgstr "Conversations with %s"
-
-#: src/gtklog.c:463 src/gtklog.c:513
+#: src/gtklog.c:316
 #, c-format
 msgid "Conversations with %s"
 msgstr "Conversations with %s"
 
-#: src/gtklog.c:538
+#. Window **********
+#: src/gtklog.c:412 src/gtklog.c:429
 msgid "System Log"
 msgstr "System Log"
 
-#: src/gtkmain.c:323
-#, c-format
-msgid "Gaim %s. Try `%s -h' for more information.\n"
-msgstr "Gaim %s. Try `%s -h' for more information.\n"
-
-#: src/gtkmain.c:325
-#, c-format
-msgid ""
-"Gaim %s\n"
-"Usage: %s [OPTION]...\n"
-"\n"
-"  -a, --acct          display account editor window\n"
-"  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
-"  -h, --help          display this help and exit\n"
-"  -n, --nologin       don't automatically login\n"
-"  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
-"                      account(s) to use, seperated by commas)\n"
-"  -v, --version       display the current version and exit\n"
-msgstr ""
-"Gaim %s\n"
-"Usage: %s [OPTION]...\n"
-"\n"
-"  -a, --acct          display account editor window\n"
-"  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
-"  -h, --help          display this help and exit\n"
-"  -n, --nologin       don't automatically log in\n"
-"  -l, --login[=NAME]  automatically log in (optional argument NAME "
-"specifies\n"
-"                      account(s) to use, separated by commas)\n"
-"  -v, --version       display the current version and exit\n"
-
 #. Descriptive label
-#: src/gtknotify.c:267
+#: src/gtknotify.c:216
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s has %d new message."
 msgstr[1] "%s has %d new messages."
 
-#: src/gtknotify.c:281
+#: src/gtknotify.c:230
 #, c-format
 msgid "<span weight=\"bold\">From:</span> %s\n"
 msgstr "<span weight=\"bold\">From:</span> %s\n"
 
-#: src/gtknotify.c:290
+#: src/gtknotify.c:239
 #, c-format
 msgid "<span weight=\"bold\">Subject:</span> %s\n"
 msgstr "<span weight=\"bold\">Subject:</span> %s\n"
 
-#: src/gtknotify.c:295
+#: src/gtknotify.c:244
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3723,7 +3685,7 @@
 "\n"
 "%s%s%s%s"
 
-#: src/gtknotify.c:311
+#: src/gtknotify.c:260
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3734,26 +3696,22 @@
 "\n"
 "%s"
 
-#: src/gtknotify.c:456
-msgid "Search Results"
-msgstr "Search Results"
-
-#: src/gtknotify.c:617
+#: src/gtknotify.c:430
 #, c-format
 msgid "The browser command <b>%s</b> is invalid."
 msgstr "The browser command <b>%s</b> is invalid."
 
-#: src/gtknotify.c:619 src/gtknotify.c:631 src/gtknotify.c:644
-#: src/gtknotify.c:768
+#: src/gtknotify.c:432 src/gtknotify.c:444 src/gtknotify.c:457
+#: src/gtknotify.c:581
 msgid "Unable to open URL"
 msgstr "Unable to open URL"
 
-#: src/gtknotify.c:629 src/gtknotify.c:642
+#: src/gtknotify.c:442 src/gtknotify.c:455
 #, c-format
 msgid "Error launching <b>%s</b>: %s"
 msgstr "Error launching <b>%s</b>: %s"
 
-#: src/gtknotify.c:769
+#: src/gtknotify.c:582
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
@@ -3768,7 +3726,7 @@
 msgstr "Please enter a buddy to pounce."
 
 #. "New Buddy Pounce"
-#: src/gtkpounce.c:391 src/gtkpounce.c:898
+#: src/gtkpounce.c:391 src/gtkpounce.c:895
 msgid "New Buddy Pounce"
 msgstr "New Buddy Pounce"
 
@@ -3864,55 +3822,63 @@
 msgstr "Sav_e this pounce after activation"
 
 #. "Remove Buddy Pounce"
-#: src/gtkpounce.c:906
+#: src/gtkpounce.c:902
 msgid "Remove Buddy Pounce"
 msgstr "Remove Buddy Pounce"
 
-#: src/gtkpounce.c:964
+#: src/gtkpounce.c:963
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s has started typing to you (%s)"
 
-#: src/gtkpounce.c:966
+#: src/gtkpounce.c:965
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s has signed on (%s)"
 
-#: src/gtkpounce.c:968
+#: src/gtkpounce.c:967
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s has returned from being idle (%s)"
 
-#: src/gtkpounce.c:970
+#: src/gtkpounce.c:969
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s has returned from being away (%s)"
 
-#: src/gtkpounce.c:972
+#: src/gtkpounce.c:971
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s has stopped typing to you (%s)"
 
-#: src/gtkpounce.c:974
+#: src/gtkpounce.c:973
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s has signed off (%s)"
 
-#: src/gtkpounce.c:976
+#: src/gtkpounce.c:975
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s has become idle (%s)"
 
-#: src/gtkpounce.c:978
+#: src/gtkpounce.c:977
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s has gone away. (%s)"
 
-#: src/gtkpounce.c:979
+#: src/gtkpounce.c:978
 msgid "Unknown pounce event. Please report this!"
 msgstr "Unknown pounce event. Please report this!"
 
-#: src/gtkprefs.c:685
+#: src/gtkprefs.c:447
+msgid "Interface Options"
+msgstr "Interface Options"
+
+#: src/gtkprefs.c:449
+msgid "D_isplay remote nicknames if no alias is set"
+msgstr "D_isplay remote nicknames if no alias is set"
+
+#: src/gtkprefs.c:681
 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."
@@ -3920,57 +3886,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:725
+#: src/gtkprefs.c:721
 msgid "Icon"
 msgstr "Icon"
 
-#: src/gtkprefs.c:732 src/gtkprefs.c:2040 src/protocols/jabber/buddy.c:266
-#: src/protocols/jabber/buddy.c:805 src/protocols/jabber/chat.c:769
+#: src/gtkprefs.c:728 src/gtkprefs.c:2205 src/protocols/jabber/buddy.c:264
+#: src/protocols/jabber/buddy.c:757 src/protocols/jabber/chat.c:743
 msgid "Description"
 msgstr "Description"
 
+#: src/gtkprefs.c:824
+msgid "Display"
+msgstr "Display"
+
+#: src/gtkprefs.c:825
+msgid "Show _timestamp on messages"
+msgstr "Show _timestamp on messages"
+
+#: src/gtkprefs.c:828
+msgid "_Highlight misspelled words"
+msgstr "_Highlight misspelled words"
+
 #: src/gtkprefs.c:832
-msgid "Buddy List Sorting"
-msgstr "Buddy List Sorting"
+msgid "Ignore c_olors"
+msgstr "Ignore c_olours"
+
+#: src/gtkprefs.c:834
+msgid "Ignore font _faces"
+msgstr "Ignore font _faces"
+
+#: src/gtkprefs.c:836
+msgid "Ignore font si_zes"
+msgstr "Ignore font si_zes"
+
+#: src/gtkprefs.c:839
+msgid "Default Formatting"
+msgstr "Default Formatting"
 
 #: src/gtkprefs.c:841
-msgid "_Sorting:"
-msgstr "_Sorting:"
-
-#: src/gtkprefs.c:846
-msgid "Buddy Display"
-msgstr "Buddy Display"
-
-#: src/gtkprefs.c:847
-msgid "Show more buddy details"
-msgstr "Show more buddy details"
-
-#: src/gtkprefs.c:885
-msgid "Send unknown \"_slash\" commands as messages"
-msgstr "Send unknown \"_slash\" commands as messages"
-
-#: src/gtkprefs.c:887
-#, fuzzy
-msgid "Show _formatting on incoming messages"
+msgid "_Send default formatting with outgoing messages"
 msgstr "_Send default formatting with outgoing messages"
 
-#: src/gtkprefs.c:889
-msgid "Show buddy _icons"
-msgstr "Show buddy _icons"
-
-#: src/gtkprefs.c:891
-msgid "Enable buddy ic_on animation"
-msgstr "Enable buddy ic_on animation"
-
-#: src/gtkprefs.c:893
-msgid "_Notify buddies that you are typing to them"
-msgstr "_Notify buddies that you are typing to them"
-
-#: src/gtkprefs.c:896
-msgid "_Highlight misspelled words"
-msgstr "_Highlight misspelled words"
-
-#: src/gtkprefs.c:914
+#: src/gtkprefs.c:873
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting. :)"
@@ -3978,151 +3935,273 @@
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting. :)"
 
+#: src/gtkprefs.c:876
+msgid "_Clear Formatting"
+msgstr "_Clear Formatting"
+
+#: src/gtkprefs.c:913
+msgid "Send Message"
+msgstr "Send Message"
+
+#: src/gtkprefs.c:914
+msgid "Enter _sends message"
+msgstr "Enter _sends message"
+
+#: src/gtkprefs.c:916
+msgid "C_ontrol-Enter sends message"
+msgstr "C_ontrol-Enter sends message"
+
+#: src/gtkprefs.c:919
+msgid "Window Closing"
+msgstr "Window Closing"
+
+#: src/gtkprefs.c:920
+msgid "_Escape closes window"
+msgstr "_Escape closes window"
+
+#: src/gtkprefs.c:923
+msgid "Insertions"
+msgstr "Insertions"
+
+#: src/gtkprefs.c:924
+msgid "Control-{B/I/U} changes _formatting"
+msgstr "Control-{B/I/U} changes _formatting"
+
+#: src/gtkprefs.c:926
+msgid "Control-(number) _inserts smileys"
+msgstr "Control-(number) _inserts smileys"
+
+#: src/gtkprefs.c:942
+msgid "Buddy List Sorting"
+msgstr "Buddy List Sorting"
+
+#: src/gtkprefs.c:951
+msgid "_Sorting:"
+msgstr "_Sorting:"
+
+#: src/gtkprefs.c:957 src/gtkprefs.c:1009
+msgid "Show _buttons as:"
+msgstr "Show _buttons as:"
+
+#: src/gtkprefs.c:959 src/gtkprefs.c:1011
+msgid "Pictures"
+msgstr "Pictures"
+
+#: src/gtkprefs.c:960 src/gtkprefs.c:1012
+msgid "Text"
+msgstr "Text"
+
+#: src/gtkprefs.c:961 src/gtkprefs.c:1013
+msgid "Pictures and text"
+msgstr "Pictures and text"
+
+#: src/gtkprefs.c:964
+msgid "_Raise window on events"
+msgstr "_Raise window on events"
+
+#: src/gtkprefs.c:967
+msgid "Buddy Display"
+msgstr "Buddy Display"
+
+#: src/gtkprefs.c:968 src/gtkprefs.c:1030
+msgid "Show buddy _icons"
+msgstr "Show buddy _icons"
+
+#: src/gtkprefs.c:970
+msgid "Show _warning levels"
+msgstr "Show _warning levels"
+
+#: src/gtkprefs.c:972
+msgid "Show idle _times"
+msgstr "Show idle _times"
+
+#: src/gtkprefs.c:974
+msgid "Dim i_dle buddies"
+msgstr "Dim i_dle buddies"
+
+#: src/gtkprefs.c:976
+msgid "_Automatically expand contacts"
+msgstr "_Automatically expand contacts"
+
+#: src/gtkprefs.c:1020
+msgid "Enable \"_slash\" commands"
+msgstr "Enable \"_slash\" commands"
+
+#: src/gtkprefs.c:1023
+msgid "Send unknown \"_slash\" commands as messages"
+msgstr "Send unknown \"_slash\" commands as messages"
+
+#: src/gtkprefs.c:1026
+msgid "Show _formatting toolbar"
+msgstr "Show _formatting toolbar"
+
+#: src/gtkprefs.c:1028
+msgid "Show _aliases in tabs/titles"
+msgstr "Show _aliases in tabs/titles"
+
+#: src/gtkprefs.c:1032
+msgid "Enable buddy ic_on animation"
+msgstr "Enable buddy ic_on animation"
+
+#: src/gtkprefs.c:1034
+msgid "_Notify buddies that you are typing to them"
+msgstr "_Notify buddies that you are typing to them"
+
+#: src/gtkprefs.c:1036
+msgid "_Raise IM window on events"
+msgstr "_Raise IM window on events"
+
+#: src/gtkprefs.c:1039
+msgid "Raise chat _window on events"
+msgstr "Raise chat _window on events"
+
+#: src/gtkprefs.c:1041
+msgid "Use _multi-colored screen names in chats"
+msgstr "Use _multi-coloured screen names in chats"
+
 #. All the tab options!
-#: src/gtkprefs.c:935
+#: src/gtkprefs.c:1045
 msgid "Tab Options"
 msgstr "Tab Options"
 
-#: src/gtkprefs.c:937
+#: src/gtkprefs.c:1047
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Show IMs and chats in _tabbed windows"
 
-#: src/gtkprefs.c:951
+#: src/gtkprefs.c:1062
 msgid "Show close b_utton on tabs"
 msgstr "Show close b_utton on tabs"
 
-#: src/gtkprefs.c:957
-#, fuzzy
-msgid "_Placement:"
-msgstr "ExtPlacement"
-
-#: src/gtkprefs.c:959
+#: src/gtkprefs.c:1065
+msgid "Tab p_lacement:"
+msgstr "Tab p_lacement:"
+
+#: src/gtkprefs.c:1067
 msgid "Top"
 msgstr "Top"
 
-#: src/gtkprefs.c:960
+#: src/gtkprefs.c:1068
 msgid "Bottom"
 msgstr "Bottom"
 
-#: src/gtkprefs.c:961
+#: src/gtkprefs.c:1069
 msgid "Left"
 msgstr "Left"
 
-#: src/gtkprefs.c:962
+#: src/gtkprefs.c:1070
 msgid "Right"
 msgstr "Right"
 
-#: src/gtkprefs.c:966
-#, fuzzy
-msgid "N_ew conversations:"
-msgstr "Close conversation"
-
-#: src/gtkprefs.c:1017 src/protocols/oscar/oscar.c:772
-#: src/protocols/oscar/oscar.c:5310
-msgid "IP Address"
-msgstr "IP Address"
-
-#: src/gtkprefs.c:1019
-msgid "_Autodetect IP Address"
-msgstr "_Autodetect IP Address"
-
-#: src/gtkprefs.c:1028
-msgid "Public _IP:"
-msgstr "Public _IP:"
-
-#: src/gtkprefs.c:1052
-msgid "Ports"
-msgstr "Ports"
-
-#: src/gtkprefs.c:1055
-msgid "_Manually specify range of ports to listen on"
-msgstr "_Manually specify range of ports to listen on"
-
-#: src/gtkprefs.c:1058
-msgid "_Start Port:"
-msgstr "_Start Port:"
-
-#: src/gtkprefs.c:1065
-msgid "_End Port:"
-msgstr "_End Port:"
-
-#: src/gtkprefs.c:1072
-msgid "Proxy Server"
-msgstr "Proxy Server"
-
 #: src/gtkprefs.c:1076
+msgid "New conversation _placement:"
+msgstr "New conversation _placement:"
+
+#: src/gtkprefs.c:1127 src/protocols/oscar/oscar.c:748
+#: src/protocols/oscar/oscar.c:5198
+msgid "IP Address"
+msgstr "IP Address"
+
+#: src/gtkprefs.c:1129
+msgid "_Autodetect IP Address"
+msgstr "_Autodetect IP Address"
+
+#: src/gtkprefs.c:1138
+msgid "Public _IP:"
+msgstr "Public _IP:"
+
+#: src/gtkprefs.c:1162
+msgid "Ports"
+msgstr "Ports"
+
+#: src/gtkprefs.c:1165
+msgid "_Manually specify range of ports to listen on"
+msgstr "_Manually specify range of ports to listen on"
+
+#: src/gtkprefs.c:1168
+msgid "_Start Port:"
+msgstr "_Start Port:"
+
+#: src/gtkprefs.c:1175
+msgid "_End Port:"
+msgstr "_End Port:"
+
+#: src/gtkprefs.c:1182
+msgid "Proxy Server"
+msgstr "Proxy Server"
+
+#: src/gtkprefs.c:1186
 msgid "No proxy"
 msgstr "No proxy"
 
-#: src/gtkprefs.c:1138
+#: src/gtkprefs.c:1248
 msgid "_User:"
 msgstr "_User:"
 
-#: src/gtkprefs.c:1194
+#: src/gtkprefs.c:1304
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: src/gtkprefs.c:1195
+#: src/gtkprefs.c:1305
 msgid "Firebird"
 msgstr "Firebird"
 
-#: src/gtkprefs.c:1196
+#: src/gtkprefs.c:1306
 msgid "Firefox"
 msgstr "Firefox"
 
-#: src/gtkprefs.c:1197
+#: src/gtkprefs.c:1307
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/gtkprefs.c:1198
+#: src/gtkprefs.c:1308
 msgid "Gnome Default"
 msgstr "Gnome Default"
 
-#: src/gtkprefs.c:1199
+#: src/gtkprefs.c:1309
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/gtkprefs.c:1200
+#: src/gtkprefs.c:1310
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: src/gtkprefs.c:1201
+#: src/gtkprefs.c:1311
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/gtkprefs.c:1202
+#: src/gtkprefs.c:1312
 msgid "Opera"
 msgstr "Opera"
 
-#: src/gtkprefs.c:1211
+#: src/gtkprefs.c:1321
 msgid "Manual"
 msgstr "Manual"
 
-#: src/gtkprefs.c:1264
+#: src/gtkprefs.c:1372
 msgid "Browser Selection"
 msgstr "Browser Selection"
 
-#: src/gtkprefs.c:1268
+#: src/gtkprefs.c:1376
 msgid "_Browser:"
 msgstr "_Browser:"
 
-#: src/gtkprefs.c:1275
+#: src/gtkprefs.c:1383
 msgid "_Open link in:"
 msgstr "_Open link in:"
 
-#: src/gtkprefs.c:1277
+#: src/gtkprefs.c:1385
 msgid "Browser default"
 msgstr "Browser default"
 
-#: src/gtkprefs.c:1278
+#: src/gtkprefs.c:1386
 msgid "Existing window"
 msgstr "Existing window"
 
-#: src/gtkprefs.c:1280
+#: src/gtkprefs.c:1388
 msgid "New tab"
 msgstr "New tab"
 
-#: src/gtkprefs.c:1294
+#: src/gtkprefs.c:1402
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -4131,75 +4210,83 @@
 "_Manual:\n"
 "(%s for URL)"
 
-#: src/gtkprefs.c:1333
+#: src/gtkprefs.c:1439
 msgid "Message Logs"
 msgstr "Message Logs"
 
-#: src/gtkprefs.c:1336
+#: src/gtkprefs.c:1442
 msgid "Log _Format:"
 msgstr "Log _Format:"
 
-#: src/gtkprefs.c:1339
+#: src/gtkprefs.c:1445
 msgid "_Log all instant messages"
 msgstr "_Log all instant messages"
 
-#: src/gtkprefs.c:1341
+#: src/gtkprefs.c:1447
 msgid "Log all c_hats"
 msgstr "Log all c_hats"
 
-#: src/gtkprefs.c:1344
+#: src/gtkprefs.c:1450
 msgid "System Logs"
 msgstr "System Logs"
 
-#: src/gtkprefs.c:1346
+#: src/gtkprefs.c:1452
 msgid "_Enable system log"
 msgstr "_Enable system log"
 
-#: src/gtkprefs.c:1349
-msgid "Log when buddies log in/log _out"
-msgstr "Log when buddies log in/log _out"
-
-#: src/gtkprefs.c:1355
+#: src/gtkprefs.c:1455
+msgid "Log when buddies _sign on/sign off"
+msgstr "Log when buddies _sign on/sign off"
+
+#: src/gtkprefs.c:1461
 msgid "Log when buddies become _idle/un-idle"
 msgstr "Log when buddies become _idle/un-idle"
 
-#: src/gtkprefs.c:1361
+#: src/gtkprefs.c:1467
 msgid "Log when buddies go away/come _back"
 msgstr "Log when buddies go away/come _back"
 
-#: src/gtkprefs.c:1367
-msgid "Log your own _signons/idleness/awayness"
-msgstr "Log your own _signons/idleness/awayness"
-
-#: src/gtkprefs.c:1504
+#: src/gtkprefs.c:1473
+msgid "Log your _own signons/idleness/awayness"
+msgstr "Log your _own signons/idleness/awayness"
+
+#: src/gtkprefs.c:1600
 msgid "Sound Selection"
 msgstr "Sound Selection"
 
-#: src/gtkprefs.c:1558
+#: src/gtkprefs.c:1651
+msgid "Sound Options"
+msgstr "Sound Options"
+
+#: src/gtkprefs.c:1652
+msgid "Sounds when conversation has _focus"
+msgstr "Sounds when conversation has _focus"
+
+#: src/gtkprefs.c:1654
+msgid "_Sounds while away"
+msgstr "_Sounds while away"
+
+#: src/gtkprefs.c:1658
 msgid "Sound Method"
 msgstr "Sound Method"
 
-#: src/gtkprefs.c:1559
+#: src/gtkprefs.c:1659
 msgid "_Method:"
 msgstr "_Method:"
 
-#: src/gtkprefs.c:1561
+#: src/gtkprefs.c:1661
 msgid "Console beep"
 msgstr "Console beep"
 
-#: src/gtkprefs.c:1563
+#: src/gtkprefs.c:1663
 msgid "Automatic"
 msgstr "Automatic"
 
-#: src/gtkprefs.c:1568
+#: src/gtkprefs.c:1670
 msgid "Command"
 msgstr "Command"
 
-#: src/gtkprefs.c:1569
-msgid "No sounds"
-msgstr "No sounds"
-
-#: src/gtkprefs.c:1577
+#: src/gtkprefs.c:1678
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -4208,99 +4295,90 @@
 "Sound c_ommand:\n"
 "(%s for filename)"
 
-#: src/gtkprefs.c:1604
-msgid "Sound Options"
-msgstr "Sound Options"
-
-#: src/gtkprefs.c:1605
-msgid "Sounds when conversation has _focus"
-msgstr "Sounds when conversation has _focus"
-
-#: src/gtkprefs.c:1607
-msgid "_Sounds while away"
-msgstr "_Sounds while away"
-
-#: src/gtkprefs.c:1617
+#: src/gtkprefs.c:1705
 msgid "Sound Events"
 msgstr "Sound Events"
 
-#: src/gtkprefs.c:1668
+#: src/gtkprefs.c:1756
 msgid "Play"
 msgstr "Play"
 
-#: src/gtkprefs.c:1675
+#: src/gtkprefs.c:1763
 msgid "Event"
 msgstr "Event"
 
-#: src/gtkprefs.c:1694
+#: src/gtkprefs.c:1782
 msgid "Test"
 msgstr "Test"
 
-#: src/gtkprefs.c:1698
+#: src/gtkprefs.c:1786
 msgid "Reset"
 msgstr "Reset"
 
-#: src/gtkprefs.c:1702
+#: src/gtkprefs.c:1790
 msgid "Choose..."
 msgstr "Choose..."
 
-#: src/gtkprefs.c:1758
+#: src/gtkprefs.c:1814
 msgid "_Queue new messages when away"
 msgstr "_Queue new messages when away"
 
-#: src/gtkprefs.c:1761
+#: src/gtkprefs.c:1817
 msgid "_Auto-reply:"
 msgstr "_Auto-reply:"
 
-#: src/gtkprefs.c:1764
+#: src/gtkprefs.c:1819
+msgid "Never"
+msgstr "Never"
+
+#: src/gtkprefs.c:1820
 msgid "When away"
 msgstr "When away"
 
-#: src/gtkprefs.c:1765
-#, fuzzy
-msgid "When both away and idle"
+#: src/gtkprefs.c:1821
+msgid "When away and idle"
 msgstr "When away and idle"
 
-#: src/gtkprefs.c:1768 src/protocols/msn/msn.c:503
-#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2819
-#: src/protocols/oscar/oscar.c:4435 src/protocols/yahoo/yahoo.c:2604
-#: src/protocols/yahoo/yahoo_profile.c:665
+#: src/gtkprefs.c:1824 src/protocols/msn/msn.c:1327
+#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2806
+#: src/protocols/oscar/oscar.c:4346 src/protocols/yahoo/yahoo.c:2697
+#: src/protocols/yahoo/yahoo_profile.c:664
 msgid "Idle"
 msgstr "Idle"
 
-#: src/gtkprefs.c:1769
+#: src/gtkprefs.c:1825
 msgid "Idle _time reporting:"
 msgstr "Idle _time reporting:"
 
-#: src/gtkprefs.c:1772
+#: src/gtkprefs.c:1828
 msgid "Gaim usage"
 msgstr "Gaim usage"
 
-#: src/gtkprefs.c:1775
+#: src/gtkprefs.c:1831
 msgid "X usage"
 msgstr "X usage"
 
-#: src/gtkprefs.c:1777
+#: src/gtkprefs.c:1833
 msgid "Windows usage"
 msgstr "Windows usage"
 
-#: src/gtkprefs.c:1785
+#: src/gtkprefs.c:1841
 msgid "Auto-away"
 msgstr "Auto-away"
 
-#: src/gtkprefs.c:1786
+#: src/gtkprefs.c:1842
 msgid "Set away _when idle"
 msgstr "Set away _when idle"
 
-#: src/gtkprefs.c:1790
+#: src/gtkprefs.c:1846
 msgid "_Minutes before setting away:"
 msgstr "_Minutes before setting away:"
 
-#: src/gtkprefs.c:1798
+#: src/gtkprefs.c:1854
 msgid "Away m_essage:"
 msgstr "Away m_essage:"
 
-#: src/gtkprefs.c:1856
+#: src/gtkprefs.c:1923
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4315,7 +4393,7 @@
 "<span weight=\"bold\">Web site:</span>\t\t%s\n"
 "<span weight=\"bold\">File name:</span>\t%s"
 
-#: src/gtkprefs.c:1861
+#: src/gtkprefs.c:1928
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4330,43 +4408,63 @@
 "<span weight=\"bold\">URL:</span>  %s\n"
 "<span weight=\"bold\">File name:</span>  %s"
 
-#: src/gtkprefs.c:1996
+#: src/gtkprefs.c:2161
 msgid "Load"
 msgstr "Load"
 
-#: src/gtkprefs.c:2010
+#: src/gtkprefs.c:2175
 msgid "Summary"
 msgstr "Summary"
 
-#: src/gtkprefs.c:2058
+#: src/gtkprefs.c:2223
 msgid "Details"
 msgstr "Details"
 
-#: src/gtkprefs.c:2101
+#: src/gtkprefs.c:2384
+msgid "_Edit"
+msgstr "_Edit"
+
+#: src/gtkprefs.c:2420
+msgid "Interface"
+msgstr "Interface"
+
+#: src/gtkprefs.c:2423
+msgid "Message Text"
+msgstr "Message Text"
+
+#: src/gtkprefs.c:2424
+msgid "Shortcuts"
+msgstr "Shortcuts"
+
+#: src/gtkprefs.c:2425
 msgid "Smiley Themes"
 msgstr "Smiley Themes"
 
-#: src/gtkprefs.c:2102
+#: src/gtkprefs.c:2426
 msgid "Sounds"
 msgstr "Sounds"
 
-#: src/gtkprefs.c:2103 src/protocols/silc/silc.c:1598
+#: src/gtkprefs.c:2427 src/protocols/silc/silc.c:1588
 msgid "Network"
 msgstr "Network"
 
-#: src/gtkprefs.c:2108
+#: src/gtkprefs.c:2432
 msgid "Browser"
 msgstr "Browser"
 
-#: src/gtkprefs.c:2111
+#: src/gtkprefs.c:2435
 msgid "Logging"
 msgstr "Logging"
 
-#: src/gtkprefs.c:2112
+#: src/gtkprefs.c:2436
 msgid "Away / Idle"
 msgstr "Away / Idle"
 
-#: src/gtkprefs.c:2115
+#: src/gtkprefs.c:2437
+msgid "Away Messages"
+msgstr "Away Messages"
+
+#: src/gtkprefs.c:2440
 msgid "Plugins"
 msgstr "Plugins"
 
@@ -4390,67 +4488,63 @@
 msgid "Block only the users below"
 msgstr "Block only the users below"
 
-#: src/gtkprivacy.c:398
+#: src/gtkprivacy.c:397 src/protocols/jabber/jabber.c:1504
 msgid "Privacy"
 msgstr "Privacy"
 
-#: src/gtkprivacy.c:411
+#: src/gtkprivacy.c:410
 msgid "Changes to privacy settings take effect immediately."
 msgstr "Changes to privacy settings take effect immediately."
 
 #. "Set privacy for:" label
-#: src/gtkprivacy.c:423
+#: src/gtkprivacy.c:422
 msgid "Set privacy for:"
 msgstr "Set privacy for:"
 
-#: src/gtkprivacy.c:589 src/gtkprivacy.c:605
+#: src/gtkprivacy.c:591 src/gtkprivacy.c:607
 msgid "Permit User"
 msgstr "Permit User"
 
-#: src/gtkprivacy.c:590
+#: src/gtkprivacy.c:592
 msgid "Type a user you permit to contact you."
 msgstr "Type a user you permit to contact you."
 
-#: src/gtkprivacy.c:591
+#: src/gtkprivacy.c:593
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr "Please enter the name of the user you wish to be able to contact you."
 
-#: src/gtkprivacy.c:594 src/gtkprivacy.c:607
+#: src/gtkprivacy.c:596 src/gtkprivacy.c:609
 msgid "Permit"
 msgstr "Permit"
 
-#: src/gtkprivacy.c:599
+#: src/gtkprivacy.c:601
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "Allow %s to contact you?"
 
-#: src/gtkprivacy.c:601
+#: src/gtkprivacy.c:603
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "Are you sure you wish to allow %s to contact you?"
 
-#: src/gtkprivacy.c:628 src/gtkprivacy.c:641
+#: src/gtkprivacy.c:630 src/gtkprivacy.c:643
 msgid "Block User"
 msgstr "Block User"
 
-#: src/gtkprivacy.c:629
+#: src/gtkprivacy.c:631
 msgid "Type a user to block."
 msgstr "Type a user to block."
 
-#: src/gtkprivacy.c:630
+#: src/gtkprivacy.c:632
 msgid "Please enter the name of the user you wish to block."
 msgstr "Please enter the name of the user you wish to block."
 
-#: src/gtkprivacy.c:632 src/gtkprivacy.c:643
-msgid "Block"
-msgstr "Block"
-
-#: src/gtkprivacy.c:637
+#: src/gtkprivacy.c:639
 #, c-format
 msgid "Block %s?"
 msgstr "Block %s?"
 
-#: src/gtkprivacy.c:639
+#: src/gtkprivacy.c:641
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "Are you sure you want to block %s?"
@@ -4458,44 +4552,44 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:258 src/protocols/gg/gg.c:1072
-#: src/protocols/msn/dialog.c:113 src/protocols/msn/msn.c:510
-#: src/protocols/msn/msn.c:513 src/protocols/novell/novell.c:1903
+#: src/gtkrequest.c:241 src/protocols/gg/gg.c:951
+#: src/protocols/msn/dialog.c:113 src/protocols/msn/msn.c:499
+#: src/protocols/msn/msn.c:502 src/protocols/novell/novell.c:1892
 #: src/protocols/silc/buddy.c:307 src/protocols/silc/pk.c:117
-#: src/request.h:1257
+#: src/request.h:1236
 msgid "Yes"
 msgstr "Yes"
 
-#: src/gtkrequest.c:259 src/protocols/gg/gg.c:1072
-#: src/protocols/msn/dialog.c:114 src/protocols/msn/msn.c:510
-#: src/protocols/msn/msn.c:513 src/protocols/novell/novell.c:1904
+#: src/gtkrequest.c:242 src/protocols/gg/gg.c:951
+#: src/protocols/msn/dialog.c:114 src/protocols/msn/msn.c:499
+#: src/protocols/msn/msn.c:502 src/protocols/novell/novell.c:1893
 #: src/protocols/silc/buddy.c:308 src/protocols/silc/pk.c:118
-#: src/request.h:1257
+#: src/request.h:1236
 msgid "No"
 msgstr "No"
 
-#: src/gtkrequest.c:262
+#: src/gtkrequest.c:245
 msgid "Apply"
 msgstr "Apply"
 
-#: src/gtkrequest.c:263 src/protocols/msn/msn.c:314
+#: src/gtkrequest.c:246 src/protocols/msn/msn.c:314
 #: src/protocols/silc/util.c:335
 msgid "Close"
 msgstr "Close"
 
-#: src/gtkrequest.c:1764
+#: src/gtkrequest.c:1421
 msgid "That file already exists"
 msgstr "That file already exists"
 
-#: src/gtkrequest.c:1765
+#: src/gtkrequest.c:1422
 msgid "Would you like to overwrite it?"
 msgstr "Would you like to overwrite it?"
 
-#: src/gtkrequest.c:1807 src/gtkrequest.c:1848
+#: src/gtkrequest.c:1460 src/gtkrequest.c:1481
 msgid "Save File..."
 msgstr "Save File..."
 
-#: src/gtkrequest.c:1808 src/gtkrequest.c:1849
+#: src/gtkrequest.c:1461 src/gtkrequest.c:1482
 msgid "Open File..."
 msgstr "Open File..."
 
@@ -4508,113 +4602,52 @@
 msgid "_Get List"
 msgstr "_Get List"
 
-#: src/gtksavedstatuses.c:314 src/protocols/jabber/buddy.c:263
-#: src/protocols/jabber/buddy.c:799 src/protocols/novell/novell.c:1460
-msgid "Title"
-msgstr "Title"
-
-#: src/gtksavedstatuses.c:325
-msgid "Type"
-msgstr "Type"
-
-#: src/gtksavedstatuses.c:336 src/protocols/gg/gg.c:316
-#: src/protocols/gg/gg.c:322 src/protocols/gg/gg.c:328
-#: src/protocols/gg/gg.c:334 src/protocols/gg/gg.c:340
-#: src/protocols/gg/gg.c:346 src/protocols/gg/gg.c:352
-#: src/protocols/irc/irc.c:181 src/protocols/jabber/jabber.c:977
-#: src/protocols/jabber/jabber.c:983 src/protocols/jabber/jabber.c:989
-#: src/protocols/jabber/jabber.c:995 src/protocols/jabber/jabber.c:1001
-#: src/protocols/jabber/jabber.c:1007 src/protocols/jabber/jabber.c:1013
-#: src/protocols/novell/novell.c:2833 src/protocols/oscar/oscar.c:7057
-#: src/protocols/oscar/oscar.c:7064 src/protocols/yahoo/yahoo.c:3181
-#: src/protocols/yahoo/yahoo.c:3215 src/protocols/zephyr/zephyr.c:2260
-msgid "Message"
-msgstr "Message"
-
-#: src/gtksavedstatuses.c:399
-msgid "Saved Statuses"
-msgstr "Saved Statuses"
-
-#: src/gtksavedstatuses.c:520
-msgid "Title already in use.  You must choose a unique title."
-msgstr "Title already in use.  You must choose a unique title."
-
-#: src/gtksavedstatuses.c:611
-msgid "Custom status"
-msgstr "Custom status"
-
-#: src/gtksavedstatuses.c:714 src/protocols/jabber/buddy.c:620
-#: src/protocols/jabber/buddy.c:627 src/protocols/jabber/buddy.c:638
-#: src/protocols/jabber/jabber.c:956 src/protocols/msn/msn.c:501
-#: src/protocols/novell/novell.c:2832 src/protocols/novell/novell.c:2836
-#: src/protocols/oscar/oscar.c:754 src/protocols/oscar/oscar.c:760
-#: src/protocols/oscar/oscar.c:762 src/protocols/yahoo/yahoo.c:2756
-msgid "Status"
-msgstr "Status"
-
-#: src/gtksavedstatuses.c:733
-msgid "_Title:"
-msgstr "_Title:"
-
-#: src/gtksavedstatuses.c:744
-msgid "Out of the office"
-msgstr "Out of the office"
-
-#: src/gtksavedstatuses.c:755
-msgid "_Status:"
-msgstr "_Status:"
-
-#. Custom status message disclosure
-#: src/gtksavedstatuses.c:790 src/gtksavedstatuses.c:791
-msgid "Use a different status for some accounts"
-msgstr "Use a different status for some accounts"
-
-#: src/gtksound.c:60
+#: src/gtksound.c:63
 msgid "Buddy logs in"
 msgstr "Buddy logs in"
 
-#: src/gtksound.c:61
+#: src/gtksound.c:64
 msgid "Buddy logs out"
 msgstr "Buddy logs out"
 
-#: src/gtksound.c:62
+#: src/gtksound.c:65
 msgid "Message received"
 msgstr "Message received"
 
-#: src/gtksound.c:63
+#: src/gtksound.c:66
 msgid "Message received begins conversation"
 msgstr "Message received begins conversation"
 
-#: src/gtksound.c:64
+#: src/gtksound.c:67
 msgid "Message sent"
 msgstr "Message sent"
 
-#: src/gtksound.c:65
+#: src/gtksound.c:68
 msgid "Person enters chat"
 msgstr "Person enters chat"
 
-#: src/gtksound.c:66
+#: src/gtksound.c:69
 msgid "Person leaves chat"
 msgstr "Person leaves chat"
 
-#: src/gtksound.c:67
+#: src/gtksound.c:70
 msgid "You talk in chat"
 msgstr "You talk in chat"
 
-#: src/gtksound.c:68
+#: src/gtksound.c:71
 msgid "Others talk in chat"
 msgstr "Others talk in chat"
 
-#: src/gtksound.c:71
+#: src/gtksound.c:74
 msgid "Someone says your name in chat"
 msgstr "Someone says your name in chat"
 
-#: src/gtksound.c:257
+#: src/gtksound.c:173
 #, 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:273
+#: src/gtksound.c:189
 msgid ""
 "Unable to play sound because the 'Command' sound method has been chosen, but "
 "no command has been set."
@@ -4622,7 +4655,7 @@
 "Unable to play sound because the 'Command' sound method has been chosen, but "
 "no command has been set."
 
-#: src/gtksound.c:285
+#: src/gtksound.c:201
 #, c-format
 msgid ""
 "Unable to play sound because the configured sound command could not be "
@@ -4631,167 +4664,15 @@
 "Unable to play sound because the configured sound command could not be "
 "launched: %s"
 
-#: src/gtkstatusbox.c:132
-#, fuzzy
-msgid "Typing"
-msgstr "Ping"
-
-#. connect to the server
-#: src/gtkstatusbox.c:135 src/protocols/irc/irc.c:262
-#: src/protocols/jabber/jabber.c:807 src/protocols/msn/session.c:362
-#: src/protocols/napster/napster.c:526 src/protocols/novell/novell.c:2165
-#: src/protocols/oscar/oscar.c:1819 src/protocols/trepia/trepia.c:1069
-#: src/protocols/yahoo/yahoo.c:2426 src/protocols/zephyr/zephyr.c:1546
-msgid "Connecting"
-msgstr "Connecting"
-
-#. hacks
-#: src/gtkstatusbox.c:246 src/protocols/gg/gg.c:50 src/protocols/irc/irc.c:176
-#: src/protocols/jabber/jabber.c:988 src/protocols/msn/msn.c:534
-#: 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:2810 src/protocols/novell/novell.c:2948
-#: src/protocols/novell/novell.c:3037 src/protocols/oscar/oscar.c:801
-#: src/protocols/oscar/oscar.c:7056 src/protocols/silc/silc.c:50
-#: src/protocols/yahoo/yahoo.c:3175 src/status.c:156
-msgid "Available"
-msgstr "Available"
-
-#: src/gtkstatusbox.c:248 src/protocols/gg/gg.c:54
-#: src/protocols/oscar/oscar.c:702 src/protocols/oscar/oscar.c:7070
-#: src/protocols/yahoo/yahoo.c:2602 src/protocols/yahoo/yahoo.c:3219
-msgid "Invisible"
-msgstr "Invisible"
-
-#: src/gtkstatusbox.c:249 src/protocols/gg/gg.c:306
-#: src/protocols/irc/irc.c:168 src/protocols/jabber/buddy.c:1083
-#: src/protocols/jabber/jabber.c:977 src/protocols/msn/msn.c:526
-#: src/protocols/napster/napster.c:574 src/protocols/novell/novell.c:2822
-#: src/protocols/novell/novell.c:2941 src/protocols/oscar/oscar.c:762
-#: src/protocols/oscar/oscar.c:6892 src/protocols/oscar/oscar.c:7046
-#: src/protocols/silc/silc.c:46 src/protocols/yahoo/yahoo.c:2606
-#: src/protocols/yahoo/yahoo.c:3169 src/status.c:154
-msgid "Offline"
-msgstr "Offline"
-
-#. TODO: Add saved statuses here?
-#: src/gtkstatusselector.c:286 src/gtkstatusselector.c:659
-msgid "New Status"
-msgstr "New Status"
-
-#: src/gtkstock.c:101
-msgid "_Alias"
-msgstr "_Alias"
-
-#: src/gtkstock.c:103
-msgid "_Invite"
-msgstr "_Invite"
-
-#: src/gtkstock.c:104
-msgid "_Modify"
-msgstr "_Modify"
-
-#: src/gtkstock.c:105
-msgid "_Open Mail"
-msgstr "_Open Mail"
-
-#: src/gtkstock.c:107
-msgid "_Warn"
-msgstr "_Warn"
-
-#: src/gtkutils.c:1386 src/gtkutils.c:1411
-#, c-format
-msgid "The following error has occurred loading %s: %s"
-msgstr "The following error has occurred loading %s: %s"
-
-#: src/gtkutils.c:1388 src/gtkutils.c:1413
-msgid "Failed to load image"
-msgstr "Failed to load image"
-
-#: src/gtkutils.c:1488
-#, c-format
-msgid "Cannot send folder %s."
-msgstr "Cannot send folder %s."
-
-#: src/gtkutils.c:1490
-msgid ""
-"Gaim cannot transfer a folder. You will need to send the files within "
-"individually"
-msgstr ""
-"Gaim cannot transfer a folder. You will need to send the files within it "
-"individually"
-
-#: src/gtkutils.c:1518 src/gtkutils.c:1527 src/gtkutils.c:1532
-msgid "You have dragged an image"
-msgstr "You have dragged an image"
-
-#: src/gtkutils.c:1519
-msgid ""
-"You can send this image as a file transfer, embed it into this message, or "
-"use it as the buddy icon for this user."
-msgstr ""
-"You can send this image as a file transfer, embed it into this message, or "
-"use it as the buddy icon for this user."
-
-#: src/gtkutils.c:1523 src/gtkutils.c:1538
-msgid "Set as buddy icon"
-msgstr "Set as buddy icon"
-
-#: src/gtkutils.c:1524 src/gtkutils.c:1539
-msgid "Send image file"
-msgstr "Send image file"
-
-#: src/gtkutils.c:1525 src/gtkutils.c:1539
-msgid "Insert in message"
-msgstr "Insert in message"
-
-#: src/gtkutils.c:1528
-msgid "Would you like to set it as the buddy icon for this user?"
-msgstr "Would you like to set it as the buddy icon for this user?"
-
-#: src/gtkutils.c:1533
-#, fuzzy
-msgid ""
-"You can send this image as a file transfer or embed it into this message, or "
-"use it as the buddy icon for this user."
-msgstr ""
-"You can send this image as a file transfer, embed it into this message, or "
-"use it as the buddy icon for this user."
-
-#: src/gtkutils.c:1535
-msgid ""
-"You can insert this image into this message, or use it as the buddy icon for "
-"this user"
-msgstr ""
-"You can insert this image into this message, or use it as the buddy icon for "
-"this user"
-
-#. I don't know if we really want to do anything here.  Most of the desktop item types are crap like
-#. * "MIME Type" (I have no clue how that would be a desktop item) and "Comment"... nothing we can really
-#. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
-#. * Probably not.  I'll just give an error and return.
-#. The original patch sent the icon used by the launcher.  That's probably wrong
-#: src/gtkutils.c:1589
-msgid "Cannot send launcher"
-msgstr "Cannot send launcher"
-
-#: src/gtkutils.c:1589
-msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
-msgstr ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
-
-#: src/log.c:105
+#: src/log.c:104
 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:746
+#: src/log.c:545
 msgid "XML"
 msgstr "XML"
 
-#: src/log.c:811
+#: src/log.c:608
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4800,7 +4681,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
 
-#: src/log.c:813
+#: src/log.c:610
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4809,29 +4690,113 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
 
-#: src/log.c:864 src/log.c:995
+#: src/log.c:661 src/log.c:791
 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:874 src/log.c:1007
+#: src/log.c:671 src/log.c:803
 #, 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:878
+#: src/log.c:675
 msgid "HTML"
 msgstr "HTML"
 
-#: src/log.c:940
+#: src/log.c:736
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
-#: src/log.c:1011
+#: src/log.c:807
 msgid "Plain text"
 msgstr "Plain text"
 
-#: src/plugin.c:324
+#: src/main.c:150
+msgid "Please create an account."
+msgstr "Please create an account."
+
+#: src/main.c:232
+msgid "Login"
+msgstr "Login"
+
+#: src/main.c:248
+msgid "<b>_Account:</b>"
+msgstr "<b>_Account:</b>"
+
+#: src/main.c:262
+msgid "<b>_Password:</b>"
+msgstr "<b>_Password:</b>"
+
+#. And now for the buttons
+#: src/main.c:279
+msgid "A_ccounts"
+msgstr "A_ccounts"
+
+#: src/main.c:285
+msgid "P_references"
+msgstr "P_references"
+
+#: src/main.c:291
+msgid "_Sign on"
+msgstr "_Sign on"
+
+#. full help text
+#: src/main.c:513
+#, c-format
+msgid ""
+"Gaim %s\n"
+"Usage: %s [OPTION]...\n"
+"\n"
+"  -a, --acct          display account editor window\n"
+"  -w, --away[=MESG]   make away on signon (optional argument MESG specifies\n"
+"                      name of away message to use)\n"
+"  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
+"                      account(s) to use, seperated by commas)\n"
+"  -n, --loginwin      don't automatically login; show login window\n"
+"  -u, --user=NAME     use account NAME\n"
+"  -c, --config=DIR    use DIR for config files\n"
+"  -d, --debug         print debugging messages to stdout\n"
+"  -v, --version       display the current version and exit\n"
+"  -h, --help          display this help and exit\n"
+msgstr ""
+"Gaim %s\n"
+"Usage: %s [OPTION]...\n"
+"\n"
+"  -a, --acct          display account editor window\n"
+"  -w, --away[=MESG]   make away on signon (optional argument MESG specifies\n"
+"                      name of away message to use)\n"
+"  -l, --login[=NAME]  automatically log in (optional argument NAME "
+"specifies\n"
+"                      account(s) to use, separated by commas)\n"
+"  -n, --loginwin      do not automatically log in; show login window\n"
+"  -u, --user=NAME     use account NAME\n"
+"  -c, --config=DIR    use DIR for config files\n"
+"  -d, --debug         print debugging messages to stdout\n"
+"  -v, --version       display the current version and exit\n"
+"  -h, --help          display this help and exit\n"
+
+#. short message
+#: src/main.c: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:895
+msgid "Unable to load preferences"
+msgstr "Unable to load preferences"
+
+#: src/main.c:895
+msgid ""
+"Gaim was not able to load your preferences because they are stored in an old "
+"format that is no longer used.  Please reconfigure your settings using the "
+"Preferences window."
+msgstr ""
+"Gaim was not able to load your preferences because they are stored in an old "
+"format that is no longer used.  Please reconfigure your settings using the "
+"Preferences window."
+
+#: src/plugin.c:295
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
@@ -4840,19 +4805,29 @@
 "The required plugin %s was not found. Please install this plugin and try "
 "again."
 
-#: src/plugin.c:329 src/plugin.c:357
+#: src/plugin.c:300 src/plugin.c:328
 msgid "Gaim was unable to load your plugin."
 msgstr "Gaim was unable to load your plugin."
 
-#: src/plugin.c:353
+#: src/plugin.c:324
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "The required plugin %s was unable to load."
 
-#: src/prefs.c:1094
+#: src/prefs.c:113 src/status.c:273
 msgid "Slightly less boring default"
 msgstr "Slightly less boring default"
 
+#: src/protocols/gg/gg.c:50 src/protocols/jabber/jutil.c:44
+#: src/protocols/msn/msn.c:513 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:2797
+#: src/protocols/novell/novell.c:2916 src/protocols/novell/novell.c:2967
+#: src/protocols/oscar/oscar.c:770 src/protocols/yahoo/yahoo.c:3042
+#: src/protocols/yahoo/yahoo.c:3158
+msgid "Available"
+msgstr "Available"
+
 #: src/protocols/gg/gg.c:51
 msgid "Available for friends only"
 msgstr "Available for friends only"
@@ -4861,239 +4836,226 @@
 msgid "Away for friends only"
 msgstr "Away for friends only"
 
+#: src/protocols/gg/gg.c:54 src/protocols/jabber/jabber.c:1002
+#: src/protocols/jabber/presence.c:139 src/protocols/oscar/oscar.c:688
+#: src/protocols/oscar/oscar.c:5701 src/protocols/oscar/oscar.c:5779
+#: src/protocols/oscar/oscar.c:5803 src/protocols/oscar/oscar.c:6990
+#: src/protocols/oscar/oscar.c:6995 src/protocols/yahoo/yahoo.c:2695
+#: src/protocols/yahoo/yahoo.c:3062 src/protocols/yahoo/yahoo.c:3170
+msgid "Invisible"
+msgstr "Invisible"
+
 #: src/protocols/gg/gg.c:55
 msgid "Invisible for friends only"
 msgstr "Invisible for friends only"
 
-#: src/protocols/gg/gg.c:56 src/status.c:157
+#: src/protocols/gg/gg.c:56
 msgid "Unavailable"
 msgstr "Unavailable"
 
-#: src/protocols/gg/gg.c:151
+#: src/protocols/gg/gg.c:137
 msgid "Unable to resolve hostname."
 msgstr "Unable to resolve hostname."
 
-#: src/protocols/gg/gg.c:154 src/protocols/novell/novell.c:1720
+#: src/protocols/gg/gg.c:140 src/protocols/novell/novell.c:1711
 msgid "Unable to connect to server."
 msgstr "Unable to connect to server."
 
-#: src/protocols/gg/gg.c:157 src/protocols/jabber/auth.c:133
-#: src/protocols/jabber/auth.c:207 src/protocols/jabber/auth.c:375
-#: src/protocols/jabber/auth.c:473 src/protocols/jabber/auth.c:485
-#: src/protocols/jabber/jabber.c:109
+#: src/protocols/gg/gg.c:143 src/protocols/jabber/auth.c:134
+#: src/protocols/jabber/auth.c:208 src/protocols/jabber/auth.c:369
+#: src/protocols/jabber/auth.c:467 src/protocols/jabber/auth.c:479
+#: src/protocols/jabber/jabber.c:108
 msgid "Invalid response from server."
 msgstr "Invalid response from server."
 
-#: src/protocols/gg/gg.c:160
+#: src/protocols/gg/gg.c:146
 msgid "Error while reading from socket."
 msgstr "Error while reading from socket."
 
-#: src/protocols/gg/gg.c:163
+#: src/protocols/gg/gg.c:149
 msgid "Error while writing to socket."
 msgstr "Error while writing to socket."
 
-#: src/protocols/gg/gg.c:166
+#: src/protocols/gg/gg.c:152
 msgid "Authentication failed."
 msgstr "Authentication failed."
 
-#: src/protocols/gg/gg.c:169
+#: src/protocols/gg/gg.c:155
 msgid "Unknown Error Code."
 msgstr "Unknown Error Code."
 
-#: src/protocols/gg/gg.c:271 src/protocols/oscar/oscar.c:4234
+#: src/protocols/gg/gg.c:243 src/protocols/oscar/oscar.c:4147
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 
 #. res[0] == username
-#: src/protocols/gg/gg.c:272 src/protocols/gg/gg.c:1134
-#: src/protocols/napster/napster.c:423 src/protocols/oscar/oscar.c:4238
-#: src/protocols/oscar/oscar.c:4464 src/protocols/silc/ops.c:1088
-#: src/protocols/silc/ops.c:1151 src/protocols/toc/toc.c:470
-#: src/protocols/zephyr/zephyr.c:730 src/protocols/zephyr/zephyr.c:1145
+#. XXX this should use gaim_notify_userinfo, but it is unclear to me what should be passed for 'who'
+#: src/protocols/gg/gg.c:244 src/protocols/gg/gg.c:1013
+#: src/protocols/napster/napster.c:404 src/protocols/oscar/oscar.c:4151
+#: src/protocols/oscar/oscar.c:4375 src/protocols/silc/ops.c:1086
+#: src/protocols/silc/ops.c:1148 src/protocols/toc/toc.c:468
+#: src/protocols/zephyr/zephyr.c:720 src/protocols/zephyr/zephyr.c:1130
 msgid "Buddy Information"
 msgstr "Buddy Information"
 
-#. TODO: Do we need both an "online" and an "available" state?
-#. 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/protocols/gg/gg.c:310 src/protocols/irc/irc.c:172
-#: src/protocols/jabber/buddy.c:1085 src/protocols/jabber/jabber.c:982
-#: src/protocols/msn/msn.c:530 src/protocols/napster/napster.c:579
-#: src/protocols/novell/novell.c:2945 src/protocols/oscar/oscar.c:704
-#: src/protocols/oscar/oscar.c:7051 src/protocols/silc/silc.c:48
-#: src/protocols/yahoo/yahoo.c:2608 src/protocols/yahoo/yahoo.c:3172
-#: src/protocols/zephyr/zephyr.c:2252 src/status.c:155
-msgid "Online"
-msgstr "Online"
-
-#: src/protocols/gg/gg.c:365
+#: src/protocols/gg/gg.c:294
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: src/protocols/gg/gg.c:519
+#: src/protocols/gg/gg.c:447
 msgid "Could not connect"
 msgstr "Could not connect"
 
-#: src/protocols/gg/gg.c:526
+#: src/protocols/gg/gg.c:454
 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:818 src/protocols/napster/napster.c:502
-#: src/protocols/napster/napster.c:533 src/protocols/toc/toc.c:172
-#: src/protocols/yahoo/yahoo.c:2185 src/protocols/yahoo/yahoo.c:2212
-#: src/protocols/yahoo/yahoo.c:2275 src/protocols/yahoo/yahoo_filexfer.c:70
-#: src/protocols/yahoo/yahoo_filexfer.c:114 src/protocols/yahoo/ycht.c:483
+#: src/protocols/gg/gg.c:674 src/protocols/icq/gaim_icq.c:343
+#: src/protocols/napster/napster.c:486 src/protocols/napster/napster.c:517
+#: src/protocols/toc/toc.c:170 src/protocols/yahoo/yahoo.c:2335
+#: src/protocols/yahoo/yahoo.c:2364 src/protocols/yahoo/yahoo.c:2427
+#: src/protocols/yahoo/yahoo_filexfer.c:68
+#: src/protocols/yahoo/yahoo_filexfer.c:111 src/protocols/yahoo/ycht.c:482
 msgid "Unable to connect."
 msgstr "Unable to connect."
 
-#: src/protocols/gg/gg.c:834
+#: src/protocols/gg/gg.c:690
 msgid "Reading data"
 msgstr "Reading data"
 
-#: src/protocols/gg/gg.c:837
+#: src/protocols/gg/gg.c:693
 msgid "Balancer handshake"
 msgstr "Balancer handshake"
 
-#: src/protocols/gg/gg.c:840
+#: src/protocols/gg/gg.c:696
 msgid "Reading server key"
 msgstr "Reading server key"
 
-#: src/protocols/gg/gg.c:843
+#: src/protocols/gg/gg.c:699
 msgid "Exchanging key hash"
 msgstr "Exchanging key hash"
 
-#: src/protocols/gg/gg.c:853
+#: src/protocols/gg/gg.c:709
 msgid "Critical error in GG library\n"
 msgstr "Critical error in GG library\n"
 
-#: src/protocols/gg/gg.c:871 src/protocols/gg/gg.c:964
-#: src/protocols/toc/toc.c:148
+#: src/protocols/gg/gg.c:727 src/protocols/gg/gg.c:818
+#: src/protocols/toc/toc.c:146
 #, c-format
 msgid "Connect to %s failed"
 msgstr "Connect to %s failed"
 
-#: src/protocols/gg/gg.c:921
+#: src/protocols/gg/gg.c:775
 msgid "Unable to ping server"
 msgstr "Unable to ping server"
 
-#: src/protocols/gg/gg.c:933
+#: src/protocols/gg/gg.c:787
 msgid "Send as message"
 msgstr "Send as message"
 
-#: src/protocols/gg/gg.c:938
+#: src/protocols/gg/gg.c:792
 msgid "Looking up GG server"
 msgstr "Looking up GG server"
 
-#: src/protocols/gg/gg.c:941
+#: src/protocols/gg/gg.c:795
 msgid "Invalid Gadu-Gadu UIN specified"
 msgstr "Invalid Gadu-Gadu UIN specified"
 
-#: src/protocols/gg/gg.c:987
+#: src/protocols/gg/gg.c:841
 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:1040
+#: src/protocols/gg/gg.c:919
 msgid "Couldn't get search results"
 msgstr "Couldn't get search results"
 
-#: src/protocols/gg/gg.c:1045
+#: src/protocols/gg/gg.c:924
 msgid "Gadu-Gadu Search Engine"
 msgstr "Gadu-Gadu Search Engine"
 
-#: src/protocols/gg/gg.c:1071
+#: src/protocols/gg/gg.c:950
 msgid "Active"
 msgstr "Active"
 
-#: src/protocols/gg/gg.c:1076 src/protocols/oscar/oscar.c:5302
+#: src/protocols/gg/gg.c:955 src/protocols/oscar/oscar.c:5190
 msgid "UIN"
 msgstr "UIN"
 
 #. First Name
-#: src/protocols/gg/gg.c:1080 src/protocols/jabber/jabber.c:628
-#: src/protocols/oscar/oscar.c:5313 src/protocols/silc/ops.c:810
+#: src/protocols/gg/gg.c:959 src/protocols/jabber/jabber.c:624
+#: src/protocols/oscar/oscar.c:5201 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:1085 src/protocols/jabber/jabber.c:633
-#: src/protocols/oscar/oscar.c:5314 src/protocols/trepia/trepia.c:275
+#: src/protocols/gg/gg.c:964 src/protocols/jabber/jabber.c:629
+#: src/protocols/oscar/oscar.c:5202 src/protocols/trepia/trepia.c:275
 msgid "Last Name"
 msgstr "Last Name"
 
-#: src/protocols/gg/gg.c:1089 src/protocols/gg/gg.c:1833
-#: src/protocols/irc/msgs.c:214 src/protocols/oscar/oscar.c:5303
-#: src/protocols/silc/ops.c:1202
+#: src/protocols/gg/gg.c:968 src/protocols/gg/gg.c:1712
+#: src/protocols/irc/msgs.c:219 src/protocols/oscar/oscar.c:5191
+#: src/protocols/silc/ops.c:1204
 msgid "Nick"
 msgstr "Nick"
 
-#: src/protocols/gg/gg.c:1096 src/protocols/gg/gg.c:1099
+#: src/protocols/gg/gg.c:975 src/protocols/gg/gg.c:978
 msgid "Birth Year"
 msgstr "Birth Year"
 
-#: src/protocols/gg/gg.c:1105 src/protocols/gg/gg.c:1107
-#: src/protocols/gg/gg.c:1109
+#: src/protocols/gg/gg.c:984 src/protocols/gg/gg.c:986
+#: src/protocols/gg/gg.c:988
 msgid "Sex"
 msgstr "Sex"
 
 #. City
-#: src/protocols/gg/gg.c:1113 src/protocols/jabber/jabber.c:643
-#: src/protocols/oscar/oscar.c:5357 src/protocols/oscar/oscar.c:5365
+#: src/protocols/gg/gg.c:992 src/protocols/jabber/jabber.c:639
+#: src/protocols/oscar/oscar.c:5245 src/protocols/oscar/oscar.c:5253
 #: src/protocols/trepia/trepia.c:332 src/protocols/trepia/trepia.c:411
 msgid "City"
 msgstr "City"
 
-#: src/protocols/gg/gg.c:1156
+#: src/protocols/gg/gg.c:1035
 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:1164
+#: src/protocols/gg/gg.c:1043
 msgid "Couldn't Import Buddy List from Server"
 msgstr "Couldn't Import Buddy List from Server"
 
-#: src/protocols/gg/gg.c:1226
+#: src/protocols/gg/gg.c:1105
 msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "Buddy List successfully transferred to Gadu-Gadu server"
 
-#: src/protocols/gg/gg.c:1234
+#: src/protocols/gg/gg.c:1113
 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:1242
+#: src/protocols/gg/gg.c:1121
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
 msgstr "Buddy List successfully deleted from Gadu-Gadu server"
 
-#: src/protocols/gg/gg.c:1250
+#: src/protocols/gg/gg.c:1129
 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:1259
+#: src/protocols/gg/gg.c:1138
 msgid "Password changed successfully"
 msgstr "Password changed successfully"
 
-#: src/protocols/gg/gg.c:1266
+#: src/protocols/gg/gg.c:1145
 msgid "Password couldn't be changed"
 msgstr "Password couldn't be changed"
 
-#: src/protocols/gg/gg.c:1385
+#: src/protocols/gg/gg.c:1264
 msgid "Error communicating with Gadu-Gadu server"
 msgstr "Error communicating with Gadu-Gadu server"
 
-#: src/protocols/gg/gg.c:1386
+#: src/protocols/gg/gg.c:1265
 msgid ""
 "Gaim was unable to complete your request due to a problem communicating with "
 "the Gadu-Gadu HTTP server.  Please try again later."
@@ -5101,11 +5063,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:1415
+#: src/protocols/gg/gg.c:1294
 msgid "Unable to import Gadu-Gadu buddy list"
 msgstr "Unable to import Gadu-Gadu buddy list"
 
-#: src/protocols/gg/gg.c:1416
+#: src/protocols/gg/gg.c:1295
 msgid ""
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
@@ -5113,25 +5075,25 @@
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
 
-#: src/protocols/gg/gg.c:1489
+#: src/protocols/gg/gg.c:1368
 msgid "Couldn't export buddy list"
 msgstr "Couldn't export buddy list"
 
-#: src/protocols/gg/gg.c:1490 src/protocols/gg/gg.c:1513
+#: src/protocols/gg/gg.c:1369 src/protocols/gg/gg.c:1392
 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:1512
+#: src/protocols/gg/gg.c:1391
 msgid "Unable to delete Gadu-Gadu buddy list"
 msgstr "Unable to delete Gadu-Gadu buddy list"
 
-#: src/protocols/gg/gg.c:1563
+#: src/protocols/gg/gg.c:1442
 msgid "Unable to access directory"
 msgstr "Unable to access directory"
 
-#: src/protocols/gg/gg.c:1564
+#: src/protocols/gg/gg.c:1443
 msgid ""
 "Gaim was unable to search the Directory because it was unable to connect to "
 "the directory server.  Please try again later."
@@ -5139,11 +5101,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:1598
+#: src/protocols/gg/gg.c:1477
 msgid "Unable to change Gadu-Gadu password"
 msgstr "Unable to change Gadu-Gadu password"
 
-#: src/protocols/gg/gg.c:1599
+#: src/protocols/gg/gg.c:1478
 msgid ""
 "Gaim was unable to change your password due to an error connecting to the "
 "Gadu-Gadu server.  Please try again later."
@@ -5151,33 +5113,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:1615
+#: src/protocols/gg/gg.c:1494
 msgid "Directory Search"
 msgstr "Directory Search"
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: src/protocols/gg/gg.c:1620 src/protocols/jabber/jabber.c:1117
-#: src/protocols/toc/toc.c:1694
+#: src/protocols/gg/gg.c:1499 src/protocols/jabber/jabber.c:1100
+#: src/protocols/toc/toc.c:1564
 msgid "Change Password"
 msgstr "Change Password"
 
-#: src/protocols/gg/gg.c:1624
+#: src/protocols/gg/gg.c:1503
 msgid "Import Buddy List from Server"
 msgstr "Import Buddy List from Server"
 
-#: src/protocols/gg/gg.c:1628
+#: src/protocols/gg/gg.c:1507
 msgid "Export Buddy List to Server"
 msgstr "Export Buddy List to Server"
 
-#: src/protocols/gg/gg.c:1632
+#: src/protocols/gg/gg.c:1511
 msgid "Delete Buddy List from Server"
 msgstr "Delete Buddy List from Server"
 
-#: src/protocols/gg/gg.c:1665
+#: src/protocols/gg/gg.c:1544
 msgid "Unable to access user profile."
 msgstr "Unable to access user profile."
 
-#: src/protocols/gg/gg.c:1666
+#: src/protocols/gg/gg.c:1545
 msgid ""
 "Gaim was unable to access this user's profile due to an error connecting to "
 "the directory server.  Please try again later."
@@ -5195,117 +5157,147 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/gg/gg.c:1812 src/protocols/gg/gg.c:1814
+#: src/protocols/gg/gg.c:1691 src/protocols/gg/gg.c:1693
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu Protocol Plugin"
 
-#: src/protocols/irc/cmds.c:43 src/protocols/silc/silc.c:1322
+#: 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:300
+#: src/protocols/msn/userlist.c:103 src/protocols/oscar/oscar.c:3886
+#: src/protocols/oscar/oscar.c:6438
+msgid "Authorize"
+msgstr "Authorize"
+
+#: src/protocols/icq/gaim_icq.c:296 src/protocols/jabber/presence.c:301
+#: src/protocols/msn/userlist.c:104 src/protocols/oscar/oscar.c:3888
+#: src/protocols/oscar/oscar.c:6439
+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:1311
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Unknown command: %s"
 
-#: src/protocols/irc/cmds.c:463 src/protocols/jabber/chat.c:592
-#: src/protocols/silc/silc.c:1030
+#: src/protocols/irc/cmds.c:464 src/protocols/jabber/chat.c:576
+#: src/protocols/silc/silc.c:1019
 #, c-format
 msgid "current topic is: %s"
 msgstr "current topic is: %s"
 
-#: src/protocols/irc/cmds.c:467 src/protocols/jabber/chat.c:596
-#: src/protocols/silc/silc.c:1034
+#: src/protocols/irc/cmds.c:468 src/protocols/jabber/chat.c:580
+#: src/protocols/silc/silc.c:1023
 msgid "No topic is set"
 msgstr "No topic is set"
 
 #: src/protocols/irc/dcc_send.c:272 src/protocols/yahoo/yahoo_filexfer.c:176
 #: src/protocols/yahoo/yahoo_filexfer.c:185
 #: src/protocols/yahoo/yahoo_filexfer.c:194
-#, fuzzy
-msgid "File Transfer Failed"
-msgstr "File transfer cancelled"
+msgid "File Transfer Aborted"
+msgstr "File Transfer Aborted"
 
 #: src/protocols/irc/dcc_send.c:273
 msgid "Gaim could not open a listening port."
 msgstr "Gaim could not open a listening port."
 
-#: src/protocols/irc/irc.c:79
+#: src/protocols/irc/irc.c:75
 msgid "Error displaying MOTD"
 msgstr "Error displaying MOTD"
 
-#: src/protocols/irc/irc.c:79
+#: src/protocols/irc/irc.c:75
 msgid "No MOTD available"
 msgstr "No MOTD available"
 
-#: src/protocols/irc/irc.c:80
+#: 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:83
+#: src/protocols/irc/irc.c:79
 #, c-format
 msgid "MOTD for %s"
 msgstr "MOTD for %s"
 
-#: src/protocols/irc/irc.c:103 src/protocols/irc/irc.c:530
-#: src/protocols/irc/irc.c:552
+#: src/protocols/irc/irc.c:93 src/protocols/irc/irc.c:405
 msgid "Server has disconnected"
 msgstr "Server has disconnected"
 
-#: src/protocols/irc/irc.c:192
+#: src/protocols/irc/irc.c:158
 msgid "View MOTD"
 msgstr "View MOTD"
 
-#: src/protocols/irc/irc.c:204 src/protocols/silc/chat.c:32
+#: src/protocols/irc/irc.c:180 src/protocols/silc/chat.c:32
 msgid "_Channel:"
 msgstr "_Channel:"
 
-#: src/protocols/irc/irc.c:210 src/protocols/jabber/chat.c:59
+#: src/protocols/irc/irc.c:185 src/protocols/jabber/chat.c:56
 msgid "_Password:"
 msgstr "_Password:"
 
-#: src/protocols/irc/irc.c:242
+#: src/protocols/irc/irc.c:217
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC nicks may not contain whitespace"
 
-#: src/protocols/irc/irc.c:270 src/protocols/jabber/jabber.c:410
-#: src/protocols/jabber/jabber.c:745
-msgid "SSL support unavailable"
-msgstr "SSL support unavailable"
-
-#: src/protocols/irc/irc.c:281
+#. connect to the server
+#: src/protocols/irc/irc.c:237 src/protocols/jabber/jabber.c:798
+#: src/protocols/msn/session.c:364 src/protocols/napster/napster.c:510
+#: src/protocols/novell/novell.c:2152 src/protocols/oscar/oscar.c:1759
+#: src/protocols/trepia/trepia.c:1065 src/protocols/yahoo/yahoo.c:2558
+#: src/protocols/zephyr/zephyr.c:1452
+msgid "Connecting"
+msgstr "Connecting"
+
+#: src/protocols/irc/irc.c:244
 msgid "Couldn't create socket"
 msgstr "Couldn't create socket"
 
-#: src/protocols/irc/irc.c:352 src/protocols/jabber/jabber.c:305
-#: src/protocols/oscar/oscar.c:1739 src/protocols/oscar/oscar.c:1815
+#: src/protocols/irc/irc.c:259 src/protocols/jabber/jabber.c:304
+#: src/protocols/oscar/oscar.c:1690 src/protocols/oscar/oscar.c:1755
 msgid "Couldn't connect to host"
 msgstr "Couldn't connect to host"
 
-#: src/protocols/irc/irc.c:377 src/protocols/jabber/jabber.c:332
-msgid "Connection Failed"
-msgstr "Connection Failed"
-
-#: src/protocols/irc/irc.c:380 src/protocols/jabber/jabber.c:335
-msgid "SSL Handshake Failed"
-msgstr "SSL Handshake Failed"
-
-#: src/protocols/irc/irc.c:527 src/protocols/irc/irc.c:549
-#: src/protocols/trepia/trepia.c:929
+#: src/protocols/irc/irc.c:402 src/protocols/trepia/trepia.c:927
 msgid "Read error"
 msgstr "Read error"
 
-#: src/protocols/irc/irc.c:698 src/protocols/silc/chat.c:1388
-#: src/protocols/yahoo/yahoochat.c:1400
+#: src/protocols/irc/irc.c:557 src/protocols/silc/chat.c:1373
+#: src/protocols/yahoo/yahoochat.c:1444
 msgid "Users"
 msgstr "Users"
 
-#: src/protocols/irc/irc.c:701 src/protocols/silc/chat.c:1391
-#: src/protocols/silc/ops.c:1170 src/protocols/yahoo/yahoochat.c:1409
+#: src/protocols/irc/irc.c:560 src/protocols/silc/chat.c:1376
+#: src/protocols/silc/ops.c:1166 src/protocols/yahoo/yahoochat.c:1453
 msgid "Topic"
 msgstr "Topic"
 
-#: src/protocols/irc/irc.c:738
+#: src/protocols/irc/irc.c:597
 msgid "IRC"
 msgstr ""
 
-#: src/protocols/irc/irc.c:742
+#: src/protocols/irc/irc.c:601
 #, fuzzy
 msgid "Quit message"
 msgstr "(1 message)"
@@ -5318,245 +5310,248 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:828
+#: src/protocols/irc/irc.c:688
 msgid "IRC Protocol Plugin"
 msgstr "IRC Protocol Plugin"
 
 #. *  summary
-#: src/protocols/irc/irc.c:829
+#: src/protocols/irc/irc.c:689
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "The IRC Protocol Plugin that Sucks Less"
 
-#: src/protocols/irc/irc.c:848 src/protocols/irc/msgs.c:234
-#: src/protocols/jabber/jabber.c:1612 src/protocols/napster/napster.c:708
-#: src/protocols/silc/ops.c:1028 src/protocols/silc/ops.c:1132
+#: src/protocols/irc/irc.c:708 src/protocols/irc/msgs.c:239
+#: src/protocols/jabber/jabber.c:1617 src/protocols/napster/napster.c:672
+#: src/protocols/silc/ops.c:1026 src/protocols/silc/ops.c:1129
 msgid "Server"
 msgstr "Server"
 
-#: src/protocols/irc/irc.c:851 src/protocols/jabber/jabber.c:1636
-#: src/protocols/msn/msn.c:1925 src/protocols/napster/napster.c:713
-#: src/protocols/silc/silc.c:1606 src/protocols/trepia/trepia.c:1304
+#: src/protocols/irc/irc.c:711 src/protocols/jabber/jabber.c:1638
+#: src/protocols/msn/msn.c:1934 src/protocols/napster/napster.c:677
+#: src/protocols/silc/silc.c:1596 src/protocols/trepia/trepia.c:1301
 msgid "Port"
 msgstr "Port"
 
-#: src/protocols/irc/irc.c:854
+#: src/protocols/irc/irc.c:714
 msgid "Encodings"
 msgstr "Encodings"
 
-#: src/protocols/irc/irc.c:857 src/protocols/irc/msgs.c:228
-#: src/protocols/jabber/jabber.c:603 src/protocols/silc/buddy.c:1478
-#: src/protocols/silc/ops.c:975 src/protocols/silc/ops.c:977
-#: src/protocols/silc/ops.c:1126 src/protocols/silc/ops.c:1128
+#: src/protocols/irc/irc.c:717 src/protocols/irc/msgs.c:233
+#: src/protocols/jabber/jabber.c:599 src/protocols/silc/buddy.c:1454
+#: src/protocols/silc/ops.c:973 src/protocols/silc/ops.c:975
+#: src/protocols/silc/ops.c:1123 src/protocols/silc/ops.c:1125
 msgid "Username"
 msgstr "Username"
 
-#: src/protocols/irc/irc.c:860
+#: src/protocols/irc/irc.c:720
 msgid "Real name"
 msgstr "Real name"
 
-#: src/protocols/irc/irc.c:863
-msgid "Use SSL"
-msgstr "Use SSL"
-
-#: src/protocols/irc/msgs.c:105
+#: src/protocols/irc/msgs.c:107
 msgid "Bad mode"
 msgstr "Bad mode"
 
-#: src/protocols/irc/msgs.c:116
+#: src/protocols/irc/msgs.c:120
 #, c-format
 msgid "You are banned from %s."
 msgstr "You are banned from %s."
 
-#: src/protocols/irc/msgs.c:117
+#: src/protocols/irc/msgs.c:121
 msgid "Banned"
 msgstr "Banned"
 
-#: src/protocols/irc/msgs.c:134
+#: src/protocols/irc/msgs.c:139
 #, c-format
 msgid "Cannot ban %s: banlist is full"
-msgstr ""
-
-#: src/protocols/irc/msgs.c:214 src/protocols/irc/msgs.c:234
-#: src/protocols/irc/msgs.c:247
+msgstr "Cannot ban %s: banlist is full"
+
+#: src/protocols/irc/msgs.c:219 src/protocols/irc/msgs.c:239
+#: src/protocols/irc/msgs.c:252
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: src/protocols/irc/msgs.c:217
+#: src/protocols/irc/msgs.c:222
 msgid " <i>(ircop)</i>"
 msgstr " <i>(ircop)</i>"
 
-#: src/protocols/irc/msgs.c:218
+#: src/protocols/irc/msgs.c:223
 msgid " <i>(identified)</i>"
 msgstr " <i>(identified)</i>"
 
-#: src/protocols/irc/msgs.c:222 src/protocols/irc/msgs.c:228
-#: src/protocols/irc/msgs.c:229 src/protocols/irc/msgs.c:240
-#: src/protocols/yahoo/yahoo_profile.c:665
+#: src/protocols/irc/msgs.c:227 src/protocols/irc/msgs.c:233
+#: src/protocols/irc/msgs.c:234 src/protocols/irc/msgs.c:245
+#: src/protocols/msn/msn.c:1327 src/protocols/yahoo/yahoo_profile.c:664
 #, c-format
 msgid "<b>%s:</b> %s<br>"
 msgstr "<b>%s:</b> %s<br>"
 
-#: src/protocols/irc/msgs.c:229 src/protocols/silc/ops.c:969
-#: src/protocols/silc/ops.c:1120 src/protocols/yahoo/yahoo_profile.c:1014
+#: src/protocols/irc/msgs.c:234 src/protocols/silc/ops.c:967
+#: src/protocols/silc/ops.c:1117 src/protocols/yahoo/yahoo_profile.c:1012
 msgid "Realname"
 msgstr "Realname"
 
-#: src/protocols/irc/msgs.c:240 src/protocols/silc/ops.c:1041
+#: src/protocols/irc/msgs.c:245 src/protocols/silc/ops.c:1039
 msgid "Currently on"
 msgstr "Currently on"
 
-#: src/protocols/irc/msgs.c:245
+#: src/protocols/irc/msgs.c:250
 #, c-format
 msgid "<b>Idle for:</b> %s<br>"
 msgstr "<b>Idle for:</b> %s<br>"
 
-#: src/protocols/irc/msgs.c:247
+#: src/protocols/irc/msgs.c:252
 msgid "Online since"
 msgstr "Online since"
 
-#: src/protocols/irc/msgs.c:250
+#: src/protocols/irc/msgs.c:255
 msgid "<br><b>Defining adjective:</b> Glorious<br>"
 msgstr "<br><b>Defining adjective:</b> Glorious<br>"
 
-#: src/protocols/irc/msgs.c:257
+#: src/protocols/irc/msgs.c:262
 #, c-format
 msgid "Buddy Information for %s"
 msgstr "Buddy Information for %s"
 
-#: src/protocols/irc/msgs.c:320
+#: src/protocols/irc/msgs.c:325
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s has changed the topic to: %s"
 
-#: src/protocols/irc/msgs.c:325
+#: src/protocols/irc/msgs.c:330
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "The topic for %s is: %s"
 
-#: src/protocols/irc/msgs.c:342
+#: src/protocols/irc/msgs.c:348
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Unknown message '%s'"
 
-#: src/protocols/irc/msgs.c:343
+#: src/protocols/irc/msgs.c:349
 msgid "Unknown message"
 msgstr "Unknown message"
 
-#: src/protocols/irc/msgs.c:343
+#: src/protocols/irc/msgs.c:349
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr "Gaim has sent a message the IRC server did not understand."
 
-#: src/protocols/irc/msgs.c:366
+#: src/protocols/irc/msgs.c:373
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Users on %s: %s"
 
-#: src/protocols/irc/msgs.c:463
+#: src/protocols/irc/msgs.c:473
 msgid "Time Response"
 msgstr "Time Response"
 
-#: src/protocols/irc/msgs.c:464
+#: src/protocols/irc/msgs.c:474
 msgid "The IRC server's local time is:"
 msgstr "The IRC server's local time is:"
 
-#: src/protocols/irc/msgs.c:475
+#: src/protocols/irc/msgs.c:488
 msgid "No such channel"
 msgstr "No such channel"
 
 #. does this happen?
-#: src/protocols/irc/msgs.c:486
+#: src/protocols/irc/msgs.c:501
 msgid "no such channel"
 msgstr "no such channel"
 
-#: src/protocols/irc/msgs.c:489
+#: src/protocols/irc/msgs.c:504
 msgid "User is not logged in"
 msgstr "User is not logged in"
 
-#: src/protocols/irc/msgs.c:494
+#: src/protocols/irc/msgs.c:510
 msgid "No such nick or channel"
 msgstr "No such nick or channel"
 
-#: src/protocols/irc/msgs.c:514
+#: src/protocols/irc/msgs.c:531
 msgid "Could not send"
 msgstr "Could not send"
 
-#: src/protocols/irc/msgs.c:570
+#: src/protocols/irc/msgs.c:587
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Joining %s requires an invitation."
 
-#: src/protocols/irc/msgs.c:571
+#: src/protocols/irc/msgs.c:588
 msgid "Invitation only"
 msgstr "Invitation only"
 
-#: src/protocols/irc/msgs.c:673
+#: src/protocols/irc/msgs.c:692
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "You have been kicked by %s: (%s)"
 
-#: src/protocols/irc/msgs.c:678
+#: src/protocols/irc/msgs.c:697
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Kicked by %s (%s)"
 
-#: src/protocols/irc/msgs.c:702
+#: src/protocols/irc/msgs.c:721
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "mode (%s %s) by %s"
 
-#: src/protocols/irc/msgs.c:786
+#: src/protocols/irc/msgs.c:808
+#, fuzzy, c-format
+msgid "Invalid nickname '%s'"
+msgstr "Invalid Username"
+
+#: src/protocols/irc/msgs.c:809
+#, fuzzy
+msgid "Invalid nickname"
+msgstr "Invalid Username"
+
+#: src/protocols/irc/msgs.c:811 src/protocols/irc/msgs.c:816
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
 msgstr ""
-
-#: src/protocols/irc/msgs.c:825
+"Your selected account name was rejected by the server.  It probably contains "
+"invalid characters."
+
+#: src/protocols/irc/msgs.c:858
 msgid "Cannot change nick"
 msgstr "Cannot change nick"
 
-#: src/protocols/irc/msgs.c:825
+#: src/protocols/irc/msgs.c:858
 msgid "Could not change nick"
 msgstr "Could not change nick"
 
-#: src/protocols/irc/msgs.c:846
+#: src/protocols/irc/msgs.c:880
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "You have parted the channel%s%s"
 
-#: src/protocols/irc/msgs.c:888
+#: src/protocols/irc/msgs.c:922
 msgid "Error: invalid PONG from server"
 msgstr "Error: invalid PONG from server"
 
-#: src/protocols/irc/msgs.c:890
+#: src/protocols/irc/msgs.c:924
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING reply -- Lag: %lu seconds"
 
-#: src/protocols/irc/msgs.c:965
+#: src/protocols/irc/msgs.c:999
 #, c-format
 msgid "Cannot join %s:"
 msgstr "Cannot join %s:"
 
-#: src/protocols/irc/msgs.c:966 src/protocols/silc/ops.c:914
+#: src/protocols/irc/msgs.c:1001 src/protocols/silc/ops.c:912
 msgid "Cannot join channel"
 msgstr "Cannot join channel"
 
-#: src/protocols/irc/msgs.c:1000
-#, fuzzy
-msgid "Nick or channel is temporarily unavailable."
-msgstr "The service is temporarily unavailable."
-
-#: src/protocols/irc/msgs.c:1012
+#: src/protocols/irc/msgs.c:1038
 #, c-format
 msgid "Wallops from %s"
 msgstr "Wallops from %s"
 
-#: src/protocols/irc/parse.c:114
+#: src/protocols/irc/parse.c:113
 msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr "action &lt;action to perform&gt;:  Perform an action."
 
-#: src/protocols/irc/parse.c:115
+#: src/protocols/irc/parse.c:114
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
@@ -5564,7 +5559,7 @@
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
 
-#: src/protocols/irc/parse.c:116
+#: src/protocols/irc/parse.c:115
 msgid ""
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
@@ -5572,7 +5567,7 @@
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
 
-#: src/protocols/irc/parse.c:117
+#: src/protocols/irc/parse.c:116
 msgid ""
 "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
 "someone, preventing them from speaking if the channel is moderated (+m). You "
@@ -5582,7 +5577,7 @@
 "someone, preventing them from speaking if the channel is moderated (+m). You "
 "must be a channel operator to do this."
 
-#: src/protocols/irc/parse.c:118
+#: src/protocols/irc/parse.c:117
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
@@ -5590,7 +5585,7 @@
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
 
-#: src/protocols/irc/parse.c:119
+#: src/protocols/irc/parse.c:118
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -5598,7 +5593,7 @@
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
 
-#: src/protocols/irc/parse.c:120
+#: src/protocols/irc/parse.c:119
 msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -5606,7 +5601,7 @@
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
 
-#: src/protocols/irc/parse.c:121
+#: src/protocols/irc/parse.c:120
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
@@ -5614,7 +5609,7 @@
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
 
-#: src/protocols/irc/parse.c:122
+#: src/protocols/irc/parse.c:121
 msgid ""
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
@@ -5622,20 +5617,19 @@
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
 
-#: src/protocols/irc/parse.c:123
+#: src/protocols/irc/parse.c:122
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;action to perform&gt;:  Perform an action."
 
-#: src/protocols/irc/parse.c:124
-#, fuzzy
+#: src/protocols/irc/parse.c:123
 msgid ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
 "or user mode."
 msgstr ""
-"mode &lt;nick|channel&gt; &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a channel "
+"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
 "or user mode."
 
-#: src/protocols/irc/parse.c:125
+#: src/protocols/irc/parse.c:124
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -5643,15 +5637,15 @@
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
 
-#: src/protocols/irc/parse.c:126
+#: src/protocols/irc/parse.c:125
 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:127 src/protocols/jabber/jabber.c:1465
+#: src/protocols/irc/parse.c:126 src/protocols/jabber/jabber.c:1448
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;new nickname&gt;:  Change your nickname."
 
-#: src/protocols/irc/parse.c:128
+#: src/protocols/irc/parse.c:127
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
@@ -5659,7 +5653,7 @@
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
 
-#: src/protocols/irc/parse.c:129
+#: src/protocols/irc/parse.c:128
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
@@ -5667,7 +5661,7 @@
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
 
-#: src/protocols/irc/parse.c:130
+#: src/protocols/irc/parse.c:129
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
@@ -5675,7 +5669,7 @@
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
 
-#: src/protocols/irc/parse.c:131
+#: src/protocols/irc/parse.c:130
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
@@ -5683,7 +5677,7 @@
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
 
-#: src/protocols/irc/parse.c:132
+#: src/protocols/irc/parse.c:131
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -5691,15 +5685,15 @@
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
 
-#: src/protocols/irc/parse.c:133
+#: src/protocols/irc/parse.c:132
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr "quit [message]:  Disconnect from the server, with an optional message."
 
+#: src/protocols/irc/parse.c:133
+msgid "quote [...]:  Send a raw command to the server."
+msgstr "quote [...]:  Send a raw command to the server."
+
 #: src/protocols/irc/parse.c:134
-msgid "quote [...]:  Send a raw command to the server."
-msgstr "quote [...]:  Send a raw command to the server."
-
-#: src/protocols/irc/parse.c:135
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
@@ -5707,19 +5701,19 @@
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
 
-#: src/protocols/irc/parse.c:136
+#: src/protocols/irc/parse.c:135
 msgid "time: Displays the current local time at the IRC server."
 msgstr "time: Displays the current local time at the IRC server."
 
-#: src/protocols/irc/parse.c:137
+#: src/protocols/irc/parse.c:136
 msgid "topic [new topic]:  View or change the channel topic."
 msgstr "topic [new topic]:  View or change the channel topic."
 
-#: src/protocols/irc/parse.c:138
+#: src/protocols/irc/parse.c:137
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
 msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
 
-#: src/protocols/irc/parse.c:139
+#: src/protocols/irc/parse.c:138
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
@@ -5727,7 +5721,7 @@
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
 
-#: src/protocols/irc/parse.c:140
+#: src/protocols/irc/parse.c:139
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
@@ -5735,32 +5729,31 @@
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
 
-#: src/protocols/irc/parse.c:141
-#, fuzzy
+#: src/protocols/irc/parse.c:140
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
-msgstr "whois &lt;nick&gt;:  Get information on a user."
-
-#: src/protocols/irc/parse.c:422
+msgstr "whois [server] &lt;nick&gt;:  Get information about a user."
+
+#: src/protocols/irc/parse.c:421
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Reply time from %s: %lu seconds"
 
-#: src/protocols/irc/parse.c:423
+#: src/protocols/irc/parse.c:422
 msgid "PONG"
 msgstr "PONG"
 
-#: src/protocols/irc/parse.c:423
+#: src/protocols/irc/parse.c:422
 msgid "CTCP PING reply"
 msgstr "CTCP PING reply"
 
-#: src/protocols/irc/parse.c:526 src/protocols/irc/parse.c:530
-#: src/protocols/oscar/oscar.c:1648 src/protocols/toc/toc.c:190
-#: src/protocols/toc/toc.c:688 src/protocols/toc/toc.c:704
-#: src/protocols/toc/toc.c:780
+#: src/protocols/irc/parse.c:525 src/protocols/irc/parse.c:529
+#: src/protocols/oscar/oscar.c:1587 src/protocols/toc/toc.c:188
+#: src/protocols/toc/toc.c:596 src/protocols/toc/toc.c:612
+#: src/protocols/toc/toc.c:689
 msgid "Disconnected."
 msgstr "Disconnected."
 
-#: src/protocols/jabber/auth.c:51
+#: src/protocols/jabber/auth.c:52
 msgid ""
 "Server requires TLS/SSL for login.  Select \"Use TLS if available\" in "
 "account properties"
@@ -5768,20 +5761,20 @@
 "Server requires TLS/SSL for login.  Select \"Use TLS if available\" in "
 "account properties"
 
-#: src/protocols/jabber/auth.c:53
+#: src/protocols/jabber/auth.c:54
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
 msgstr "Server requires TLS/SSL for login.  No TLS/SSL support found."
 
-#: src/protocols/jabber/auth.c:114
+#: src/protocols/jabber/auth.c:115
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "Server requires plaintext authentication over an unencrypted stream"
 
-#: src/protocols/jabber/auth.c:163 src/protocols/jabber/auth.c:164
-#: src/protocols/jabber/auth.c:244 src/protocols/jabber/auth.c:245
+#: src/protocols/jabber/auth.c:164 src/protocols/jabber/auth.c:165
+#: src/protocols/jabber/auth.c:242 src/protocols/jabber/auth.c:243
 msgid "Plaintext Authentication"
 msgstr "Plaintext Authentication"
 
-#: src/protocols/jabber/auth.c:165 src/protocols/jabber/auth.c:246
+#: src/protocols/jabber/auth.c:166 src/protocols/jabber/auth.c:244
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
@@ -5789,100 +5782,105 @@
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
 
-#: src/protocols/jabber/auth.c:173 src/protocols/jabber/auth.c:254
+#: src/protocols/jabber/auth.c:174 src/protocols/jabber/auth.c:252
 msgid "Server does not use any supported authentication method"
 msgstr "Server does not use any supported authentication method"
 
-#: src/protocols/jabber/auth.c:396
+#: src/protocols/jabber/auth.c:390
 msgid "Invalid challenge from server"
 msgstr "Invalid challenge from server"
 
-#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:661
-#: src/protocols/silc/ops.c:806
+#: src/protocols/jabber/buddy.c:246 src/protocols/jabber/buddy.c:613
+#: src/protocols/silc/ops.c:804
 msgid "Full Name"
 msgstr "Full Name"
 
-#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:674
-#: src/protocols/silc/ops.c:818
+#: src/protocols/jabber/buddy.c:247 src/protocols/jabber/buddy.c:626
+#: src/protocols/silc/ops.c:816
 msgid "Family Name"
 msgstr "Family Name"
 
-#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:678
+#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:630
 msgid "Given Name"
 msgstr "Given Name"
 
-#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/buddy.c:692
-#: src/protocols/jabber/jabber.c:623 src/protocols/msn/msn.c:1348
-#: src/protocols/silc/buddy.c:1475 src/protocols/silc/ops.c:822
-#: src/protocols/silc/ops.c:965 src/protocols/silc/ops.c:1116
-#: src/protocols/yahoo/yahoo_profile.c:1009
+#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:644
+#: src/protocols/jabber/jabber.c:619 src/protocols/msn/msn.c:1317
+#: src/protocols/silc/buddy.c:1451 src/protocols/silc/ops.c:820
+#: src/protocols/silc/ops.c:963 src/protocols/silc/ops.c:1113
+#: src/protocols/yahoo/yahoo_profile.c:1007
 msgid "Nickname"
 msgstr "Nickname"
 
-#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/jabber.c:663
+#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/jabber.c:659
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:720
+#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/buddy.c:672
 msgid "Street Address"
 msgstr "Street Address"
 
-#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:716
+#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:668
 msgid "Extended Address"
 msgstr "Extended Address"
 
-#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:724
+#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:676
 msgid "Locality"
 msgstr "Locality"
 
-#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:728
+#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:680
 msgid "Region"
 msgstr "Region"
 
-#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:732
-#: src/protocols/jabber/jabber.c:653
+#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:684
+#: src/protocols/jabber/jabber.c:649
 msgid "Postal Code"
 msgstr "Postal Code"
 
 #. Country
-#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:737
+#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:689
 #: src/protocols/trepia/trepia.c:340 src/protocols/trepia/trepia.c:417
 msgid "Country"
 msgstr "Country"
 
-#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:748
-#: src/protocols/jabber/buddy.c:755
+#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:700
+#: src/protocols/jabber/buddy.c:707
 msgid "Telephone"
 msgstr "Telephone"
 
-#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:766
-#: src/protocols/jabber/buddy.c:774 src/protocols/silc/silc.c:670
-#: src/protocols/silc/util.c:511 src/protocols/yahoo/yahoo_profile.c:1004
+#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:718
+#: src/protocols/jabber/buddy.c:726 src/protocols/silc/silc.c:656
+#: src/protocols/silc/util.c:511 src/protocols/yahoo/yahoo_profile.c:1002
 msgid "Email"
 msgstr "Email"
 
-#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:789
+#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:741
 msgid "Organization Name"
 msgstr "Organization Name"
 
-#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:793
+#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:745
 msgid "Organization Unit"
 msgstr "Organization Unit"
 
-#: src/protocols/jabber/buddy.c:264 src/protocols/jabber/buddy.c:802
+#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:751
+#: src/protocols/novell/novell.c:1451
+msgid "Title"
+msgstr "Title"
+
+#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:754
 msgid "Role"
 msgstr "Role"
 
-#: src/protocols/jabber/buddy.c:265 src/protocols/jabber/buddy.c:695
-#: src/protocols/oscar/oscar.c:5338
+#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:647
+#: src/protocols/oscar/oscar.c:5226
 msgid "Birthday"
 msgstr "Birthday"
 
-#: src/protocols/jabber/buddy.c:563 src/protocols/jabber/buddy.c:564
+#: src/protocols/jabber/buddy.c:509 src/protocols/jabber/buddy.c:510
 msgid "Edit Jabber vCard"
 msgstr "Edit Jabber vCard"
 
-#: src/protocols/jabber/buddy.c:565
+#: src/protocols/jabber/buddy.c:511
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
@@ -5890,571 +5888,593 @@
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
 
-#: src/protocols/jabber/buddy.c:610
+#: src/protocols/jabber/buddy.c:556
 msgid "Jabber ID"
 msgstr "Jabber ID"
 
-#: src/protocols/jabber/buddy.c:636 src/protocols/jabber/jabber.c:1615
-msgid "Resource"
-msgstr "Resource"
-
-#: src/protocols/jabber/buddy.c:682 src/protocols/silc/ops.c:814
+#: src/protocols/jabber/buddy.c:566 src/protocols/jabber/buddy.c:573
+#: src/protocols/jabber/buddy.c:586 src/protocols/jabber/jabber.c:971
+#: src/protocols/msn/msn.c:489 src/protocols/novell/novell.c:2819
+#: src/protocols/novell/novell.c:2823 src/protocols/oscar/oscar.c:730
+#: src/protocols/oscar/oscar.c:736 src/protocols/oscar/oscar.c:738
+#: src/protocols/yahoo/yahoo.c:2820
+msgid "Status"
+msgstr "Status"
+
+#: src/protocols/jabber/buddy.c:634 src/protocols/silc/ops.c:812
 msgid "Middle Name"
 msgstr "Middle Name"
 
-#: src/protocols/jabber/buddy.c:700 src/protocols/jabber/jabber.c:638
-#: src/protocols/oscar/oscar.c:5356 src/protocols/oscar/oscar.c:5364
-#: src/protocols/silc/ops.c:850
+#: src/protocols/jabber/buddy.c:652 src/protocols/jabber/jabber.c:634
+#: src/protocols/oscar/oscar.c:5244 src/protocols/oscar/oscar.c:5252
+#: src/protocols/silc/ops.c:848
 msgid "Address"
 msgstr "Address"
 
-#: src/protocols/jabber/buddy.c:712
+#: src/protocols/jabber/buddy.c:664
 msgid "P.O. Box"
 msgstr "P.O. Box"
 
-#: src/protocols/jabber/buddy.c:824
+#: src/protocols/jabber/buddy.c:770
 msgid "Photo"
 msgstr "Photo"
 
-#: src/protocols/jabber/buddy.c:824
+#: src/protocols/jabber/buddy.c:770
 msgid "Logo"
 msgstr "Logo"
 
-#: src/protocols/jabber/buddy.c:849
+#: src/protocols/jabber/buddy.c:786
 msgid "Jabber Profile"
 msgstr "Jabber Profile"
 
-#: src/protocols/jabber/buddy.c:1031
+#: src/protocols/jabber/buddy.c:941
 msgid "Un-hide From"
 msgstr "Un-hide From"
 
-#: src/protocols/jabber/buddy.c:1034
+#: src/protocols/jabber/buddy.c:944
 msgid "Temporarily Hide From"
 msgstr "Temporarily Hide From"
 
 #. && NOT ME
-#: src/protocols/jabber/buddy.c:1041
+#: src/protocols/jabber/buddy.c:951
 msgid "Cancel Presence Notification"
 msgstr "Cancel Presence Notification"
 
-#: src/protocols/jabber/buddy.c:1047
+#: src/protocols/jabber/buddy.c:957
 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:1055
+#: src/protocols/jabber/buddy.c:965
 msgid "Unsubscribe"
 msgstr "Unsubscribe"
 
-#: src/protocols/jabber/buddy.c:1081 src/protocols/jabber/chat.c:677
-#: src/protocols/jabber/chat.c:688 src/protocols/jabber/jabber.c:964
-#: src/protocols/silc/ops.c:1239
-msgid "Error"
-msgstr "Error"
-
-#: src/protocols/jabber/buddy.c:1087 src/protocols/jabber/jabber.c:994
-msgid "Chatty"
-msgstr "Chatty"
-
-#: src/protocols/jabber/buddy.c:1091 src/protocols/jabber/jabber.c:1006
-#: src/status.c:160
-msgid "Extended Away"
-msgstr "Extended Away"
-
-#: src/protocols/jabber/buddy.c:1093 src/protocols/jabber/jabber.c:1012
-#: src/protocols/oscar/oscar.c:692 src/protocols/oscar/oscar.c:7090
-msgid "Do Not Disturb"
-msgstr "Do Not Disturb"
-
-#: src/protocols/jabber/chat.c:41 src/protocols/oscar/oscar.c:6619
-#: src/protocols/yahoo/yahoochat.c:995
+#: src/protocols/jabber/chat.c:41 src/protocols/oscar/oscar.c:6509
+#: src/protocols/yahoo/yahoochat.c:1040
 msgid "_Room:"
 msgstr "_Room:"
 
-#: src/protocols/jabber/chat.c:47
+#: src/protocols/jabber/chat.c:46
 msgid "_Server:"
 msgstr "_Server:"
 
-#: src/protocols/jabber/chat.c:53
+#: src/protocols/jabber/chat.c:51
 msgid "_Handle:"
 msgstr "_Handle:"
 
-#: src/protocols/jabber/chat.c:223
+#: src/protocols/jabber/chat.c:212
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s is not a valid room name"
 
-#: src/protocols/jabber/chat.c:224
+#: src/protocols/jabber/chat.c:213
 msgid "Invalid Room Name"
 msgstr "Invalid Room Name"
 
-#: src/protocols/jabber/chat.c:229
+#: src/protocols/jabber/chat.c:218
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s is not a valid server name"
 
-#: src/protocols/jabber/chat.c:230 src/protocols/jabber/chat.c:231
+#: src/protocols/jabber/chat.c:219 src/protocols/jabber/chat.c:220
 msgid "Invalid Server Name"
 msgstr "Invalid Server Name"
 
-#: src/protocols/jabber/chat.c:235
+#: src/protocols/jabber/chat.c:224
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s is not a valid room handle"
 
-#: src/protocols/jabber/chat.c:236 src/protocols/jabber/chat.c:237
+#: src/protocols/jabber/chat.c:225 src/protocols/jabber/chat.c:226
 msgid "Invalid Room Handle"
 msgstr "Invalid Room Handle"
 
-#: src/protocols/jabber/chat.c:395
+#: src/protocols/jabber/chat.c:379
 msgid "Configuration error"
 msgstr "Configuration error"
 
-#: src/protocols/jabber/chat.c:404 src/protocols/jabber/chat.c:549
+#: src/protocols/jabber/chat.c:388 src/protocols/jabber/chat.c:533
 msgid "Unable to configure"
 msgstr "Unable to configure"
 
-#: src/protocols/jabber/chat.c:420
+#: src/protocols/jabber/chat.c:404
 msgid "Room Configuration Error"
 msgstr "Room Configuration Error"
 
-#: src/protocols/jabber/chat.c:421
+#: src/protocols/jabber/chat.c:405
 msgid "This room is not capable of being configured"
 msgstr "This room is not capable of being configured"
 
-#: src/protocols/jabber/chat.c:471 src/protocols/jabber/chat.c:540
+#: src/protocols/jabber/chat.c:455 src/protocols/jabber/chat.c:524
 msgid "Registration error"
 msgstr "Registration error"
 
-#: src/protocols/jabber/chat.c:628
+#: src/protocols/jabber/chat.c:607
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "Nick changing not supported in non-MUC chatrooms"
 
-#: src/protocols/jabber/chat.c:678 src/protocols/jabber/chat.c:689
-#: src/protocols/silc/ops.c:1239
-msgid "Error retrieving room list"
-msgstr "Error retrieving room list"
-
-#: src/protocols/jabber/chat.c:737
+#: src/protocols/jabber/chat.c:651 src/protocols/jabber/chat.c:662
+msgid "Roomlist Error"
+msgstr "Roomlist Error"
+
+#: src/protocols/jabber/chat.c:652 src/protocols/jabber/chat.c:663
+msgid "Error retreiving roomlist"
+msgstr "Error retreiving roomlist"
+
+#: src/protocols/jabber/chat.c:711
 msgid "Invalid Server"
 msgstr "Invalid Server"
 
-#: src/protocols/jabber/chat.c:775
+#: src/protocols/jabber/chat.c:749
 msgid "Enter a Conference Server"
 msgstr "Enter a Conference Server"
 
-#: src/protocols/jabber/chat.c:776
+#: src/protocols/jabber/chat.c:750
 msgid "Select a conference server to query"
 msgstr "Select a conference server to query"
 
-#: src/protocols/jabber/chat.c:779
+#: src/protocols/jabber/chat.c:753
 msgid "Find Rooms"
 msgstr "Find Rooms"
 
-#: src/protocols/jabber/jabber.c:78
+#: src/protocols/jabber/jabber.c:77
 msgid "Error initializing session"
 msgstr "Error initializing session"
 
-#: src/protocols/jabber/jabber.c:214 src/protocols/trepia/trepia.c:248
-#: src/protocols/trepia/trepia.c:699 src/protocols/trepia/trepia.c:991
-#: src/protocols/trepia/trepia.c:1036 src/protocols/trepia/trepia.c:1135
-#: src/protocols/trepia/trepia.c:1181
+#: src/protocols/jabber/jabber.c:213 src/protocols/trepia/trepia.c:248
+#: src/protocols/trepia/trepia.c:699 src/protocols/trepia/trepia.c:988
+#: src/protocols/trepia/trepia.c:1032 src/protocols/trepia/trepia.c:1131
+#: src/protocols/trepia/trepia.c:1177
 msgid "Write error"
 msgstr "Write error"
 
-#: src/protocols/jabber/jabber.c:252 src/protocols/jabber/jabber.c:272
+#: src/protocols/jabber/jabber.c:251 src/protocols/jabber/jabber.c:271
 msgid "Read Error"
 msgstr "Read Error"
 
-#: src/protocols/jabber/jabber.c:379 src/protocols/jabber/jabber.c:715
+#: src/protocols/jabber/jabber.c:331
+msgid "Connection Failed"
+msgstr "Connection Failed"
+
+#: src/protocols/jabber/jabber.c:334
+msgid "SSL Handshake Failed"
+msgstr "SSL Handshake Failed"
+
+#: src/protocols/jabber/jabber.c:378 src/protocols/jabber/jabber.c:711
 msgid "Invalid Jabber ID"
 msgstr "Invalid Jabber ID"
 
-#: src/protocols/jabber/jabber.c:420 src/protocols/jabber/jabber.c:755
-#: src/protocols/trepia/trepia.c:1075
+#: src/protocols/jabber/jabber.c:409 src/protocols/jabber/jabber.c:741
+msgid "SSL support unavailable"
+msgstr "SSL support unavailable"
+
+#: src/protocols/jabber/jabber.c:419 src/protocols/jabber/jabber.c:751
+#: src/protocols/trepia/trepia.c:1071
 msgid "Unable to create socket"
 msgstr "Unable to create socket"
 
-#: src/protocols/jabber/jabber.c:448
+#: src/protocols/jabber/jabber.c:444
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registration of %s@%s successful"
 
-#: src/protocols/jabber/jabber.c:450 src/protocols/jabber/jabber.c:451
+#: src/protocols/jabber/jabber.c:446 src/protocols/jabber/jabber.c:447
 msgid "Registration Successful"
 msgstr "Registration Successful"
 
-#: src/protocols/jabber/jabber.c:457 src/protocols/jabber/jabber.c:1236
+#: src/protocols/jabber/jabber.c:453 src/protocols/jabber/jabber.c:1219
 msgid "Unknown Error"
 msgstr "Unknown Error"
 
-#: src/protocols/jabber/jabber.c:459 src/protocols/jabber/jabber.c:460
+#: src/protocols/jabber/jabber.c:455 src/protocols/jabber/jabber.c:456
 msgid "Registration Failed"
 msgstr "Registration Failed"
 
-#: src/protocols/jabber/jabber.c:571 src/protocols/jabber/jabber.c:572
+#: src/protocols/jabber/jabber.c:567 src/protocols/jabber/jabber.c:568
 msgid "Already Registered"
 msgstr "Already Registered"
 
-#: src/protocols/jabber/jabber.c:607 src/protocols/jabber/jabber.c:1091
+#: src/protocols/jabber/jabber.c:603 src/protocols/jabber/jabber.c:1074
 msgid "Password"
 msgstr "Password"
 
-#: src/protocols/jabber/jabber.c:618
+#: src/protocols/jabber/jabber.c:614
 msgid "E-Mail"
 msgstr "E-Mail"
 
 #. State
-#: src/protocols/jabber/jabber.c:648 src/protocols/oscar/oscar.c:5358
-#: src/protocols/oscar/oscar.c:5366 src/protocols/trepia/trepia.c:336
+#: src/protocols/jabber/jabber.c:644 src/protocols/oscar/oscar.c:5246
+#: src/protocols/oscar/oscar.c:5254 src/protocols/trepia/trepia.c:336
 #: src/protocols/trepia/trepia.c:414
 msgid "State"
 msgstr "Province/Territory"
 
-#: src/protocols/jabber/jabber.c:658 src/protocols/silc/ops.c:855
-#: src/protocols/silc/silc.c:672 src/protocols/silc/util.c:513
+#: src/protocols/jabber/jabber.c:654 src/protocols/silc/ops.c:853
+#: src/protocols/silc/silc.c:658 src/protocols/silc/util.c:513
 msgid "Phone"
 msgstr "Phone"
 
-#: src/protocols/jabber/jabber.c:668
+#: src/protocols/jabber/jabber.c:664
 msgid "Date"
 msgstr "Date"
 
-#: src/protocols/jabber/jabber.c:676
+#: src/protocols/jabber/jabber.c:672
 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:679 src/protocols/jabber/jabber.c:680
+#: src/protocols/jabber/jabber.c:675 src/protocols/jabber/jabber.c:676
 msgid "Register New Jabber Account"
 msgstr "Register New Jabber Account"
 
-#: src/protocols/jabber/jabber.c:811
+#: src/protocols/jabber/jabber.c:759
+msgid "Logged out"
+msgstr "Logged out"
+
+#: src/protocols/jabber/jabber.c:802
 msgid "Initializing Stream"
 msgstr "Initializing Stream"
 
-#: src/protocols/jabber/jabber.c:817 src/protocols/msn/session.c:368
+#: src/protocols/jabber/jabber.c:808 src/protocols/msn/session.c:370
 msgid "Authenticating"
 msgstr "Authenticating"
 
-#: src/protocols/jabber/jabber.c:826
+#: src/protocols/jabber/jabber.c:817
 msgid "Re-initializing Stream"
 msgstr "Re-initializing Stream"
 
-#: src/protocols/jabber/jabber.c:897 src/protocols/jabber/jabber.c:1214
-#: src/protocols/jabber/jabber.c:1255 src/protocols/jabber/jabber.c:1288
-#: src/protocols/oscar/oscar.c:760 src/protocols/oscar/oscar.c:6890
+#: src/protocols/jabber/jabber.c:897 src/protocols/jabber/jabber.c:1197
+#: src/protocols/jabber/jabber.c:1238 src/protocols/jabber/jabber.c:1271
+#: src/protocols/oscar/oscar.c:736 src/protocols/oscar/oscar.c:6793
 msgid "Not Authorized"
 msgstr "Not Authorized"
 
-#: src/protocols/jabber/jabber.c:930
+#: src/protocols/jabber/jabber.c:938
 msgid "Both"
 msgstr "Both"
 
-#: src/protocols/jabber/jabber.c:932
+#: src/protocols/jabber/jabber.c:940
 msgid "From (To pending)"
 msgstr "From (To pending)"
 
-#: src/protocols/jabber/jabber.c:934
+#: src/protocols/jabber/jabber.c:942
 msgid "From"
 msgstr "From"
 
-#: src/protocols/jabber/jabber.c:937
+#: src/protocols/jabber/jabber.c:945
 msgid "To"
 msgstr "To"
 
-#: src/protocols/jabber/jabber.c:939
+#: src/protocols/jabber/jabber.c:947
 msgid "None (To pending)"
 msgstr "None (To pending)"
 
-#: src/protocols/jabber/jabber.c:943
+#: src/protocols/jabber/jabber.c:951
 msgid "Subscription"
 msgstr "Subscription"
 
-#: src/protocols/jabber/jabber.c:982 src/protocols/jabber/jabber.c:988
-#: src/protocols/jabber/jabber.c:994 src/protocols/jabber/jabber.c:1000
-#: src/protocols/jabber/jabber.c:1006 src/protocols/jabber/jabber.c:1012
-msgid "Priority"
-msgstr "Priority"
-
-#: src/protocols/jabber/jabber.c:1034
+#: src/protocols/jabber/jabber.c:984
+msgid "Error"
+msgstr "Error"
+
+#: src/protocols/jabber/jabber.c:997 src/protocols/jabber/jutil.c:35
+#: src/protocols/jabber/presence.c:72 src/protocols/jabber/presence.c:130
+msgid "Chatty"
+msgstr "Chatty"
+
+#: src/protocols/jabber/jabber.c:999 src/protocols/jabber/jutil.c:38
+#: src/protocols/jabber/presence.c:74 src/protocols/jabber/presence.c:135
+msgid "Extended Away"
+msgstr "Extended Away"
+
+#: src/protocols/jabber/jabber.c:1000 src/protocols/jabber/jutil.c:41
+#: src/protocols/jabber/presence.c:76 src/protocols/jabber/presence.c:137
+#: src/protocols/oscar/oscar.c:678 src/protocols/oscar/oscar.c:5791
+#: src/protocols/oscar/oscar.c:6986
+msgid "Do Not Disturb"
+msgstr "Do Not Disturb"
+
+#: src/protocols/jabber/jabber.c:1017
 msgid "Password Changed"
 msgstr "Password Changed"
 
-#: src/protocols/jabber/jabber.c:1035
+#: src/protocols/jabber/jabber.c:1018
 msgid "Your password has been changed."
 msgstr "Your password has been changed."
 
-#: src/protocols/jabber/jabber.c:1039 src/protocols/jabber/jabber.c:1040
+#: src/protocols/jabber/jabber.c:1022 src/protocols/jabber/jabber.c:1023
 msgid "Error changing password"
 msgstr "Error changing password"
 
-#: src/protocols/jabber/jabber.c:1096
+#: src/protocols/jabber/jabber.c:1079
 msgid "Password (again)"
 msgstr "Password (again)"
 
-#: src/protocols/jabber/jabber.c:1101 src/protocols/jabber/jabber.c:1102
+#: src/protocols/jabber/jabber.c:1084 src/protocols/jabber/jabber.c:1085
 msgid "Change Jabber Password"
 msgstr "Change Jabber Password"
 
-#: src/protocols/jabber/jabber.c:1102
+#: src/protocols/jabber/jabber.c:1085
 msgid "Please enter your new password"
 msgstr "Please enter your new password"
 
-#: src/protocols/jabber/jabber.c:1112 src/protocols/toc/toc.c:1684
+#: src/protocols/jabber/jabber.c:1095 src/protocols/toc/toc.c:1554
 msgid "Set User Info"
 msgstr "Set User Info"
 
-#: src/protocols/jabber/jabber.c:1194
+#: src/protocols/jabber/jabber.c:1177
 msgid "Bad Request"
 msgstr "Bad Request"
 
-#: src/protocols/jabber/jabber.c:1196
+#: src/protocols/jabber/jabber.c:1179
 msgid "Conflict"
 msgstr "Conflict"
 
-#: src/protocols/jabber/jabber.c:1198
+#: src/protocols/jabber/jabber.c:1181
 msgid "Feature Not Implemented"
 msgstr "Feature Not Implemented"
 
-#: src/protocols/jabber/jabber.c:1200
+#: src/protocols/jabber/jabber.c:1183
 msgid "Forbidden"
 msgstr "Forbidden"
 
-#: src/protocols/jabber/jabber.c:1202
+#: src/protocols/jabber/jabber.c:1185
 msgid "Gone"
 msgstr "Gone"
 
-#: src/protocols/jabber/jabber.c:1204 src/protocols/jabber/jabber.c:1278
+#: src/protocols/jabber/jabber.c:1187 src/protocols/jabber/jabber.c:1261
 msgid "Internal Server Error"
 msgstr "Internal Server Error"
 
-#: src/protocols/jabber/jabber.c:1206
+#: src/protocols/jabber/jabber.c:1189
 msgid "Item Not Found"
 msgstr "Item Not Found"
 
-#: src/protocols/jabber/jabber.c:1208
+#: src/protocols/jabber/jabber.c:1191
 msgid "Malformed Jabber ID"
 msgstr "Malformed Jabber ID"
 
-#: src/protocols/jabber/jabber.c:1210
+#: src/protocols/jabber/jabber.c:1193
 msgid "Not Acceptable"
 msgstr "Not Acceptable"
 
-#: src/protocols/jabber/jabber.c:1212
+#: src/protocols/jabber/jabber.c:1195
 msgid "Not Allowed"
 msgstr "Not Allowed"
 
-#: src/protocols/jabber/jabber.c:1216
+#: src/protocols/jabber/jabber.c:1199
 msgid "Payment Required"
 msgstr "Payment Required"
 
-#: src/protocols/jabber/jabber.c:1218
+#: src/protocols/jabber/jabber.c:1201
 msgid "Recipient Unavailable"
 msgstr "Recipient Unavailable"
 
-#: src/protocols/jabber/jabber.c:1222
+#: src/protocols/jabber/jabber.c:1205
 msgid "Registration Required"
 msgstr "Registration Required"
 
-#: src/protocols/jabber/jabber.c:1224
+#: src/protocols/jabber/jabber.c:1207
 msgid "Remote Server Not Found"
 msgstr "Remote Server Not Found"
 
-#: src/protocols/jabber/jabber.c:1226
+#: src/protocols/jabber/jabber.c:1209
 msgid "Remote Server Timeout"
 msgstr "Remote Server Timeout"
 
-#: src/protocols/jabber/jabber.c:1228
+#: src/protocols/jabber/jabber.c:1211
 msgid "Server Overloaded"
 msgstr "Server Overloaded"
 
-#: src/protocols/jabber/jabber.c:1230
+#: src/protocols/jabber/jabber.c:1213
 msgid "Service Unavailable"
 msgstr "Service Unavailable"
 
-#: src/protocols/jabber/jabber.c:1232
+#: src/protocols/jabber/jabber.c:1215
 msgid "Subscription Required"
 msgstr "Subscription Required"
 
-#: src/protocols/jabber/jabber.c:1234
+#: src/protocols/jabber/jabber.c:1217
 msgid "Unexpected Request"
 msgstr "Unexpected Request"
 
-#: src/protocols/jabber/jabber.c:1241
+#: src/protocols/jabber/jabber.c:1224
 msgid "Authorization Aborted"
 msgstr "Authorization Aborted"
 
-#: src/protocols/jabber/jabber.c:1243
+#: src/protocols/jabber/jabber.c:1226
 msgid "Incorrect encoding in authorization"
 msgstr "Incorrect encoding in authorization"
 
-#: src/protocols/jabber/jabber.c:1246
+#: src/protocols/jabber/jabber.c:1229
 msgid "Invalid authzid"
 msgstr "Invalid authzid"
 
-#: src/protocols/jabber/jabber.c:1249
+#: src/protocols/jabber/jabber.c:1232
 msgid "Invalid Authorization Mechanism"
 msgstr "Invalid Authorization Mechanism"
 
-#: src/protocols/jabber/jabber.c:1252
+#: src/protocols/jabber/jabber.c:1235
 msgid "Authorization mechanism too weak"
 msgstr "Authorization mechanism too weak"
 
-#: src/protocols/jabber/jabber.c:1257
+#: src/protocols/jabber/jabber.c:1240
 msgid "Temporary Authentication Failure"
 msgstr "Temporary Authentication Failure"
 
-#: src/protocols/jabber/jabber.c:1259
+#: src/protocols/jabber/jabber.c:1242
 msgid "Authentication Failure"
 msgstr "Authentication Failure"
 
-#: src/protocols/jabber/jabber.c:1263
+#: src/protocols/jabber/jabber.c:1246
 msgid "Bad Format"
 msgstr "Bad Format"
 
-#: src/protocols/jabber/jabber.c:1265
+#: src/protocols/jabber/jabber.c:1248
 msgid "Bad Namespace Prefix"
 msgstr "Bad Namespace Prefix"
 
-#: src/protocols/jabber/jabber.c:1268
+#: src/protocols/jabber/jabber.c:1251
 msgid "Resource Conflict"
 msgstr "Resource Conflict"
 
-#: src/protocols/jabber/jabber.c:1270 src/protocols/silc/ops.c:1518
+#: src/protocols/jabber/jabber.c:1253 src/protocols/silc/ops.c:1519
 msgid "Connection Timeout"
 msgstr "Connection Timeout"
 
-#: src/protocols/jabber/jabber.c:1272
+#: src/protocols/jabber/jabber.c:1255
 msgid "Host Gone"
 msgstr "Host Gone"
 
-#: src/protocols/jabber/jabber.c:1274
+#: src/protocols/jabber/jabber.c:1257
 msgid "Host Unknown"
 msgstr "Host Unknown"
 
-#: src/protocols/jabber/jabber.c:1276
+#: src/protocols/jabber/jabber.c:1259
 msgid "Improper Addressing"
 msgstr "Improper Addressing"
 
-#: src/protocols/jabber/jabber.c:1280
+#: src/protocols/jabber/jabber.c:1263
 msgid "Invalid ID"
 msgstr "Invalid ID"
 
-#: src/protocols/jabber/jabber.c:1282
+#: src/protocols/jabber/jabber.c:1265
 msgid "Invalid Namespace"
 msgstr "Invalid Namespace"
 
-#: src/protocols/jabber/jabber.c:1284
+#: src/protocols/jabber/jabber.c:1267
 msgid "Invalid XML"
 msgstr "Invalid XML"
 
-#: src/protocols/jabber/jabber.c:1286
+#: src/protocols/jabber/jabber.c:1269
 msgid "Non-matching Hosts"
 msgstr "Non-matching Hosts"
 
-#: src/protocols/jabber/jabber.c:1290
+#: src/protocols/jabber/jabber.c:1273
 msgid "Policy Violation"
 msgstr "Policy Violation"
 
-#: src/protocols/jabber/jabber.c:1292
+#: src/protocols/jabber/jabber.c:1275
 msgid "Remote Connection Failed"
 msgstr "Remote Connection Failed"
 
-#: src/protocols/jabber/jabber.c:1294
+#: src/protocols/jabber/jabber.c:1277
 msgid "Resource Constraint"
 msgstr "Resource Constraint"
 
-#: src/protocols/jabber/jabber.c:1296
+#: src/protocols/jabber/jabber.c:1279
 msgid "Restricted XML"
 msgstr "Restricted XML"
 
-#: src/protocols/jabber/jabber.c:1298
+#: src/protocols/jabber/jabber.c:1281
 msgid "See Other Host"
 msgstr "See Other Host"
 
-#: src/protocols/jabber/jabber.c:1300
+#: src/protocols/jabber/jabber.c:1283
 msgid "System Shutdown"
 msgstr "System Shutdown"
 
-#: src/protocols/jabber/jabber.c:1302
+#: src/protocols/jabber/jabber.c:1285
 msgid "Undefined Condition"
 msgstr "Undefined Condition"
 
-#: src/protocols/jabber/jabber.c:1304
+#: src/protocols/jabber/jabber.c:1287
 msgid "Unsupported Encoding"
 msgstr "Unsupported Encoding"
 
-#: src/protocols/jabber/jabber.c:1306
+#: src/protocols/jabber/jabber.c:1289
 msgid "Unsupported Stanza Type"
 msgstr "Unsupported Stanza Type"
 
-#: src/protocols/jabber/jabber.c:1308
+#: src/protocols/jabber/jabber.c:1291
 msgid "Unsupported Version"
 msgstr "Unsupported Version"
 
-#: src/protocols/jabber/jabber.c:1310
+#: src/protocols/jabber/jabber.c:1293
 msgid "XML Not Well Formed"
 msgstr "XML Not Well Formed"
 
-#: src/protocols/jabber/jabber.c:1312
+#: src/protocols/jabber/jabber.c:1295
 msgid "Stream Error"
 msgstr "Stream Error"
 
-#: src/protocols/jabber/jabber.c:1379
+#: src/protocols/jabber/jabber.c:1362
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Unable to ban user %s"
 
-#: src/protocols/jabber/jabber.c:1431
+#: src/protocols/jabber/jabber.c:1414
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Unable to kick user %s"
 
-#: src/protocols/jabber/jabber.c:1457
+#: src/protocols/jabber/jabber.c:1440
 msgid "config:  Configure a chat room."
 msgstr "config:  Configure a chat room."
 
-#: src/protocols/jabber/jabber.c:1461
+#: src/protocols/jabber/jabber.c:1444
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Configure a chat room."
 
-#: src/protocols/jabber/jabber.c:1470
+#: src/protocols/jabber/jabber.c:1453
 msgid "part [room]:  Leave the room."
 msgstr "part [room]:  Leave the room."
 
-#: src/protocols/jabber/jabber.c:1475
+#: src/protocols/jabber/jabber.c:1458
 msgid "register:  Register with a chat room."
 msgstr "register:  Register with a chat room."
 
-#: src/protocols/jabber/jabber.c:1481
+#: src/protocols/jabber/jabber.c:1464
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [new topic]:  View or change the topic."
 
-#: src/protocols/jabber/jabber.c:1487
+#: src/protocols/jabber/jabber.c:1470
 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:1476
+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:1482
+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:1488
+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:1493
-#, fuzzy
-msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
-msgstr "invite &lt;user&gt; [room]:  Invite a user to the room."
-
-#: src/protocols/jabber/jabber.c:1499
-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:1505
-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:1510
 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:1508
+msgid "Hide Operating System"
+msgstr "Hide Operating System"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -6465,43 +6485,42 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/jabber/jabber.c:1590 src/protocols/jabber/jabber.c:1592
+#: src/protocols/jabber/jabber.c:1595 src/protocols/jabber/jabber.c:1597
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber Protocol Plugin"
 
-#: src/protocols/jabber/jabber.c:1618
-msgid "Use TLS if available"
-msgstr "Use TLS if available"
+#: src/protocols/jabber/jabber.c:1620
+msgid "Resource"
+msgstr "Resource"
 
 #: src/protocols/jabber/jabber.c:1623
-msgid "Require TLS"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1626
-#, fuzzy
-msgid "Force old (port 5223) SSL"
+msgid "Use TLS if available"
+msgstr "Use TLS if available"
+
+#: src/protocols/jabber/jabber.c:1628
+msgid "Force old SSL"
 msgstr "Force old SSL"
 
-#: src/protocols/jabber/jabber.c:1631
+#: src/protocols/jabber/jabber.c:1633
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Allow plaintext auth over unencrypted streams"
 
 #. Account options
-#: src/protocols/jabber/jabber.c:1640 src/protocols/silc/silc.c:1602
+#: src/protocols/jabber/jabber.c:1642 src/protocols/silc/silc.c:1592
 msgid "Connect server"
 msgstr "Connect server"
 
-#: src/protocols/jabber/message.c:114
+#: src/protocols/jabber/message.c:111
 #, c-format
 msgid "Message from %s"
 msgstr "Message from %s"
 
-#: src/protocols/jabber/message.c:178
+#: src/protocols/jabber/message.c:175
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s has set the topic to: %s"
 
-#: src/protocols/jabber/message.c:180
+#: src/protocols/jabber/message.c:177
 #, c-format
 msgid "The topic is: %s"
 msgstr "The topic is: %s"
@@ -6524,32 +6543,20 @@
 msgid "XML Parse error"
 msgstr "XML Parse error"
 
-#: src/protocols/jabber/presence.c:284
+#: src/protocols/jabber/presence.c:290
 msgid "Unknown Error in presence"
 msgstr "Unknown Error in presence"
 
-#: src/protocols/jabber/presence.c:289 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/jabber/presence.c:297 src/protocols/msn/userlist.c:100
-#: src/protocols/oscar/oscar.c:3973 src/protocols/oscar/oscar.c:6549
-#: src/protocols/yahoo/yahoo.c:861
-msgid "Authorize"
-msgstr "Authorize"
-
-#: src/protocols/jabber/presence.c:298 src/protocols/msn/userlist.c:101
-#: src/protocols/oscar/oscar.c:3975 src/protocols/oscar/oscar.c:6550
-#: src/protocols/yahoo/yahoo.c:863
-msgid "Deny"
-msgstr "Deny"
-
-#: src/protocols/jabber/presence.c:345 src/protocols/jabber/presence.c:346
+#: src/protocols/jabber/presence.c:293
+#, 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:348 src/protocols/jabber/presence.c:349
 msgid "Create New Room"
 msgstr "Create New Room"
 
-#: src/protocols/jabber/presence.c:347
+#: src/protocols/jabber/presence.c:350
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -6557,30 +6564,30 @@
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
 
-#: src/protocols/jabber/presence.c:349
+#: src/protocols/jabber/presence.c:352
 msgid "Configure Room"
 msgstr "Configure Room"
 
-#: src/protocols/jabber/presence.c:351
+#: src/protocols/jabber/presence.c:354
 msgid "Accept Defaults"
 msgstr "Accept Defaults"
 
-#: src/protocols/jabber/presence.c:388
+#: src/protocols/jabber/presence.c:384
 #, c-format
 msgid "Error in chat %s"
 msgstr "Error in chat %s"
 
-#: src/protocols/jabber/presence.c:391
+#: src/protocols/jabber/presence.c:387
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Error joining chat %s"
 
-#: src/protocols/jabber/si.c:591
+#: src/protocols/jabber/si.c:594
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr "Unable to send file to %s, user does not support file transfers"
 
-#: src/protocols/jabber/si.c:592 src/protocols/jabber/si.c:593
+#: src/protocols/jabber/si.c:595 src/protocols/jabber/si.c:596
 msgid "File Send Failed"
 msgstr "File Send Failed"
 
@@ -6651,7 +6658,7 @@
 msgid "Not on list"
 msgstr "Not on list"
 
-#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:690
+#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:680
 msgid "User is offline"
 msgstr "User is offline"
 
@@ -6703,7 +6710,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:200
+#: src/protocols/msn/error.c:112 src/protocols/oscar/oscar.c:192
 msgid "Not logged in"
 msgstr "Not logged in"
 
@@ -6796,8 +6803,8 @@
 msgid "Server too busy"
 msgstr "Server too busy"
 
-#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2338
-#: src/protocols/silc/ops.c:1507 src/protocols/toc/toc.c:722
+#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2272
+#: src/protocols/silc/ops.c:1508 src/protocols/toc/toc.c:630
 msgid "Authentication failed"
 msgstr "Authentication failed"
 
@@ -6883,9 +6890,8 @@
 msgid "Page"
 msgstr "Page"
 
-#: src/protocols/msn/msn.c:501 src/protocols/msn/msn.c:508
-#: src/protocols/msn/msn.c:511 src/protocols/yahoo/yahoo.c:2756
-#: src/protocols/yahoo/yahoo.c:2762
+#: src/protocols/msn/msn.c:489 src/protocols/msn/msn.c:497
+#: src/protocols/msn/msn.c:500 src/protocols/yahoo/yahoo.c:2820
 #, c-format
 msgid ""
 "\n"
@@ -6894,75 +6900,84 @@
 "\n"
 "<b>%s:</b> %s"
 
-#: src/protocols/msn/msn.c:508
+#: src/protocols/msn/msn.c:497
 msgid "Has you"
 msgstr "Has you"
 
-#: src/protocols/msn/msn.c:511
+#: src/protocols/msn/msn.c:500
 msgid "Blocked"
 msgstr "Blocked"
 
-#: src/protocols/msn/msn.c:542 src/protocols/msn/state.c:33
-#: src/protocols/yahoo/yahoo.c:2584 src/protocols/yahoo/yahoo.c:3186
+#: src/protocols/msn/msn.c:514 src/protocols/msn/msn.c:801
+#: src/protocols/msn/state.c:34
+msgid "Away From Computer"
+msgstr "Away From Computer"
+
+#: src/protocols/msn/msn.c:515 src/protocols/msn/msn.c:803
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2677
+#: src/protocols/yahoo/yahoo.c:3044 src/protocols/yahoo/yahoo.c:3160
 msgid "Be Right Back"
 msgstr "Be Right Back"
 
-#: src/protocols/msn/msn.c:546 src/protocols/msn/state.c:31
-#: src/protocols/novell/novell.c:2816 src/protocols/novell/novell.c:2954
-#: src/protocols/novell/novell.c:3042 src/protocols/silc/buddy.c:1416
-#: src/protocols/silc/silc.c:56 src/protocols/yahoo/yahoo.c:2586
-#: src/protocols/yahoo/yahoo.c:3189
+#: src/protocols/msn/msn.c:516 src/protocols/msn/msn.c:805
+#: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2803
+#: src/protocols/novell/novell.c:2918 src/protocols/novell/novell.c:2972
+#: src/protocols/silc/buddy.c:1392 src/protocols/silc/silc.c:48
+#: src/protocols/silc/silc.c:83 src/protocols/yahoo/yahoo.c:2679
+#: src/protocols/yahoo/yahoo.c:3046 src/protocols/yahoo/yahoo.c:3161
 msgid "Busy"
 msgstr "Busy"
 
-#: src/protocols/msn/msn.c:550 src/protocols/msn/state.c:35
-#: src/protocols/yahoo/yahoo.c:2594 src/protocols/yahoo/yahoo.c:3201
+#: src/protocols/msn/msn.c:517 src/protocols/msn/msn.c:807
+#: src/protocols/msn/state.c:35 src/protocols/yahoo/yahoo.c:2687
+#: src/protocols/yahoo/yahoo.c:3054 src/protocols/yahoo/yahoo.c:3165
 msgid "On The Phone"
 msgstr "On The Phone"
 
-#: src/protocols/msn/msn.c:554 src/protocols/msn/state.c:36
-#: src/protocols/yahoo/yahoo.c:2598 src/protocols/yahoo/yahoo.c:3207
+#: src/protocols/msn/msn.c:518 src/protocols/msn/msn.c:809
+#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2691
+#: src/protocols/yahoo/yahoo.c:3058 src/protocols/yahoo/yahoo.c:3167
 msgid "Out To Lunch"
 msgstr "Out To Lunch"
 
-#: src/protocols/msn/msn.c:558 src/protocols/zephyr/zephyr.c:2255
-#: src/status.c:158
+#: src/protocols/msn/msn.c:519 src/protocols/msn/msn.c:811
+#: src/protocols/zephyr/zephyr.c:2111 src/protocols/zephyr/zephyr.c:2143
 msgid "Hidden"
 msgstr "Hidden"
 
-#: src/protocols/msn/msn.c:570
+#: src/protocols/msn/msn.c:530
 msgid "Set Friendly Name"
 msgstr "Set Friendly Name"
 
-#: src/protocols/msn/msn.c:575
+#: src/protocols/msn/msn.c:535
 msgid "Set Home Phone Number"
 msgstr "Set Home Phone Number"
 
-#: src/protocols/msn/msn.c:579
+#: src/protocols/msn/msn.c:539
 msgid "Set Work Phone Number"
 msgstr "Set Work Phone Number"
 
-#: src/protocols/msn/msn.c:583
+#: src/protocols/msn/msn.c:543
 msgid "Set Mobile Phone Number"
 msgstr "Set Mobile Phone Number"
 
-#: src/protocols/msn/msn.c:589
+#: src/protocols/msn/msn.c:549
 msgid "Enable/Disable Mobile Devices"
 msgstr "Enable/Disable Mobile Devices"
 
-#: src/protocols/msn/msn.c:594
+#: src/protocols/msn/msn.c:554
 msgid "Allow/Disallow Mobile Pages"
 msgstr "Allow/Disallow Mobile Pages"
 
-#: src/protocols/msn/msn.c:617
+#: src/protocols/msn/msn.c:577
 msgid "Send to Mobile"
 msgstr "Send to Mobile"
 
-#: src/protocols/msn/msn.c:626 src/protocols/novell/novell.c:3440
+#: src/protocols/msn/msn.c:586 src/protocols/novell/novell.c:3369
 msgid "Initiate _Chat"
 msgstr "Initiate _Chat"
 
-#: src/protocols/msn/msn.c:663
+#: src/protocols/msn/msn.c:623
 msgid ""
 "SSL support is needed for MSN. Please install a supported SSL library. See "
 "http://gaim.sf.net/faq-ssl.php for more information."
@@ -6970,95 +6985,95 @@
 "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:691
+#: src/protocols/msn/msn.c:651
 msgid "Failed to connect to server."
 msgstr "Failed to connect to server."
 
-#: src/protocols/msn/msn.c:1341 src/protocols/yahoo/yahoo_profile.c:659
-#: src/protocols/zephyr/zephyr.c:721 src/protocols/zephyr/zephyr.c:1135
+#: src/protocols/msn/msn.c:1309 src/protocols/yahoo/yahoo_profile.c:659
+#: src/protocols/zephyr/zephyr.c:711 src/protocols/zephyr/zephyr.c:1120
 #, 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:1348 src/protocols/msn/msn.c:1695
-#: src/protocols/yahoo/yahoo_profile.c:1176 src/util.c:801
+#: src/protocols/msn/msn.c:1317 src/protocols/msn/msn.c:1675
+#: src/protocols/yahoo/yahoo_profile.c:1174 src/util.c:796
 #, c-format
 msgid "<b>%s:</b> "
 msgstr "<b>%s:</b> "
 
-#: src/protocols/msn/msn.c:1425
+#: src/protocols/msn/msn.c:1405
 msgid "MSN Profile"
 msgstr "MSN Profile"
 
-#: src/protocols/msn/msn.c:1430 src/protocols/msn/msn.c:1682
-#: src/protocols/yahoo/yahoo_profile.c:765
+#: src/protocols/msn/msn.c:1410 src/protocols/msn/msn.c:1662
+#: src/protocols/yahoo/yahoo_profile.c:763
 msgid "Error retrieving profile"
 msgstr "Error retrieving profile"
 
 #. Age
-#: src/protocols/msn/msn.c:1501 src/protocols/oscar/oscar.c:5343
+#: src/protocols/msn/msn.c:1481 src/protocols/oscar/oscar.c:5231
 #: src/protocols/trepia/trepia.c:286 src/protocols/trepia/trepia.c:405
-#: src/protocols/yahoo/yahoo_profile.c:1024
+#: src/protocols/yahoo/yahoo_profile.c:1022
 msgid "Age"
 msgstr "Age"
 
 #. Gender
-#: src/protocols/msn/msn.c:1508 src/protocols/oscar/oscar.c:5330
+#: src/protocols/msn/msn.c:1488 src/protocols/oscar/oscar.c:5217
 #: src/protocols/trepia/trepia.c:280 src/protocols/trepia/trepia.c:407
-#: src/protocols/yahoo/yahoo_profile.c:1034
+#: src/protocols/yahoo/yahoo_profile.c:1032
 msgid "Gender"
 msgstr "Gender"
 
-#: src/protocols/msn/msn.c:1517 src/protocols/yahoo/yahoo_profile.c:1029
+#: src/protocols/msn/msn.c:1497 src/protocols/yahoo/yahoo_profile.c:1027
 msgid "Marital Status"
 msgstr "Marital Status"
 
-#: src/protocols/msn/msn.c:1524 src/protocols/novell/novell.c:1454
-#: src/protocols/yahoo/yahoo_profile.c:1019
+#: src/protocols/msn/msn.c:1504 src/protocols/novell/novell.c:1445
+#: src/protocols/yahoo/yahoo_profile.c:1017
 msgid "Location"
 msgstr "Location"
 
-#: src/protocols/msn/msn.c:1532 src/protocols/yahoo/yahoo_profile.c:1039
+#: src/protocols/msn/msn.c:1512 src/protocols/yahoo/yahoo_profile.c:1037
 msgid "Occupation"
 msgstr "Occupation"
 
-#: src/protocols/msn/msn.c:1549 src/protocols/msn/msn.c:1555
-#: src/protocols/msn/msn.c:1562 src/protocols/msn/msn.c:1570
-#: src/protocols/msn/msn.c:1577
+#: src/protocols/msn/msn.c:1529 src/protocols/msn/msn.c:1535
+#: src/protocols/msn/msn.c:1542 src/protocols/msn/msn.c:1550
+#: src/protocols/msn/msn.c:1557
 msgid "A Little About Me"
 msgstr "A Little About Me"
 
-#: src/protocols/msn/msn.c:1586 src/protocols/msn/msn.c:1592
-#: src/protocols/msn/msn.c:1599 src/protocols/msn/msn.c:1606
+#: src/protocols/msn/msn.c:1566 src/protocols/msn/msn.c:1572
+#: src/protocols/msn/msn.c:1579 src/protocols/msn/msn.c:1586
 msgid "Favorite Things"
 msgstr "Favourite Things"
 
-#: src/protocols/msn/msn.c:1615 src/protocols/msn/msn.c:1621
-#: src/protocols/msn/msn.c:1628
+#: src/protocols/msn/msn.c:1595 src/protocols/msn/msn.c:1601
+#: src/protocols/msn/msn.c:1608
 msgid "Hobbies and Interests"
 msgstr "Hobbies and Interests"
 
-#: src/protocols/msn/msn.c:1637 src/protocols/msn/msn.c:1643
-#: src/protocols/yahoo/yahoo_profile.c:1081
+#: src/protocols/msn/msn.c:1617 src/protocols/msn/msn.c:1623
+#: src/protocols/yahoo/yahoo_profile.c:1079
 msgid "Favorite Quote"
 msgstr "Favuorite Quote"
 
-#: src/protocols/msn/msn.c:1651
+#: src/protocols/msn/msn.c:1631
 msgid "Last Updated"
 msgstr "Last Updated"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1662 src/protocols/silc/ops.c:846
+#: src/protocols/msn/msn.c:1642 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:1684
+#: src/protocols/msn/msn.c:1664
 msgid "The user has not created a public profile."
 msgstr "The user has not created a public profile."
 
-#: src/protocols/msn/msn.c:1685
+#: src/protocols/msn/msn.c:1665
 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 "
@@ -7068,7 +7083,7 @@
 "that the user does not exist, or that the user exists but has not created a "
 "public profile."
 
-#: src/protocols/msn/msn.c:1689
+#: src/protocols/msn/msn.c:1669
 msgid ""
 "Gaim could not find any information in the user's profile. The user most "
 "likely does not exist."
@@ -7076,10 +7091,18 @@
 "Gaim could not find any information in the user's profile. The user most "
 "likely does not exist."
 
-#: src/protocols/msn/msn.c:1695 src/protocols/yahoo/yahoo_profile.c:1176
+#: src/protocols/msn/msn.c:1675 src/protocols/yahoo/yahoo_profile.c:1174
 msgid "Profile URL"
 msgstr "Profile URL"
 
+#: src/protocols/msn/msn.c:1816
+msgid "Display conversation closed notices"
+msgstr "Display conversation closed notices"
+
+#: src/protocols/msn/msn.c:1821
+msgid "Display timeout notices"
+msgstr "Display timeout notices"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -7090,20 +7113,20 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/msn/msn.c:1899 src/protocols/msn/msn.c:1901
+#: src/protocols/msn/msn.c:1908 src/protocols/msn/msn.c:1910
 msgid "MSN Protocol Plugin"
 msgstr "MSN Protocol Plugin"
 
-#: src/protocols/msn/msn.c:1920 src/protocols/trepia/trepia.c:1299
+#: src/protocols/msn/msn.c:1929 src/protocols/trepia/trepia.c:1296
 msgid "Login server"
 msgstr "Login server"
 
-#: src/protocols/msn/msn.c:1929
+#: src/protocols/msn/msn.c:1938
 msgid "Use HTTP Method"
 msgstr "Use HTTP Method"
 
 #: src/protocols/msn/nexus.c:103 src/protocols/msn/servconn.c:127
-#: src/protocols/yahoo/yahoochat.c:1350
+#: src/protocols/yahoo/yahoochat.c:1394
 msgid "Unable to connect"
 msgstr "Unable to connect"
 
@@ -7112,8 +7135,8 @@
 msgid "%s is not a valid group."
 msgstr "%s is not a valid group."
 
-#: src/protocols/msn/notification.c:184 src/protocols/msn/notification.c:526
-#: src/protocols/msn/session.c:347
+#: src/protocols/msn/notification.c:184 src/protocols/msn/notification.c:523
+#: src/protocols/msn/session.c:349
 msgid "Unknown error."
 msgstr "Unknown error."
 
@@ -7122,40 +7145,40 @@
 msgid "%s on %s (%s)"
 msgstr "%s on %s (%s)"
 
-#: src/protocols/msn/notification.c:496
+#: src/protocols/msn/notification.c:493
 #, c-format
 msgid "Unable to add user on %s (%s)"
 msgstr "Unable to add user on %s (%s)"
 
-#: src/protocols/msn/notification.c:500
+#: src/protocols/msn/notification.c:497
 #, c-format
 msgid "Unable to block user on %s (%s)"
 msgstr "Unable to block user on %s (%s)"
 
-#: src/protocols/msn/notification.c:504
+#: src/protocols/msn/notification.c:501
 #, c-format
 msgid "Unable to permit user on %s (%s)"
 msgstr "Unable to permit user on %s (%s)"
 
-#: src/protocols/msn/notification.c:512
+#: src/protocols/msn/notification.c:509
 #, c-format
 msgid "%s could not be added because your buddy list is full."
 msgstr "%s could not be added because your buddy list is full."
 
-#: src/protocols/msn/notification.c:521
+#: src/protocols/msn/notification.c:518
 #, c-format
 msgid "%s is not a valid passport account."
 msgstr "%s is not a valid passport account."
 
-#: src/protocols/msn/notification.c:809
+#: src/protocols/msn/notification.c:805
 msgid "Unable to rename group"
 msgstr "Unable to rename group"
 
-#: src/protocols/msn/notification.c:864
+#: src/protocols/msn/notification.c:860
 msgid "Unable to delete group"
 msgstr "Unable to delete group"
 
-#: src/protocols/msn/notification.c:1297
+#: src/protocols/msn/notification.c:1287
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -7194,8 +7217,8 @@
 msgid "Reading error"
 msgstr "Reading error"
 
-#: src/protocols/msn/servconn.c:133 src/protocols/msn/session.c:339
-#: src/protocols/oscar/oscar.c:4296
+#: src/protocols/msn/servconn.c:133 src/protocols/msn/session.c:341
+#: src/protocols/oscar/oscar.c:4209
 msgid "Unknown error"
 msgstr "Unknown error"
 
@@ -7208,170 +7231,163 @@
 "Connection error from %s server (%s):\n"
 "%s"
 
-#: src/protocols/msn/session.c:317
+#: src/protocols/msn/session.c:319
 msgid "Our protocol is not supported by the server."
 msgstr "Our protocol is not supported by the server."
 
-#: src/protocols/msn/session.c:321
+#: src/protocols/msn/session.c:323
 msgid "Error parsing HTTP."
 msgstr "Error parsing HTTP."
 
-#. MSG_SERVER_GHOST
-#. Looks like someone logged in as us! =-O
-#: src/protocols/msn/session.c:325 src/protocols/napster/napster.c:451
-#: src/protocols/oscar/oscar.c:4995 src/protocols/yahoo/yahoo.c:188
+#: src/protocols/msn/session.c:327
 msgid "You have signed on from another location."
 msgstr "You have signed on from another location."
 
-#: src/protocols/msn/session.c:328
+#: src/protocols/msn/session.c:330
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "The MSN servers are temporarily unavailable. Please wait and try again."
 
-#: src/protocols/msn/session.c:333
+#: src/protocols/msn/session.c:335
 msgid "The MSN servers are going down temporarily."
 msgstr "The MSN servers are going down temporarily."
 
-#: src/protocols/msn/session.c:337
+#: src/protocols/msn/session.c:339
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "Unable to authenticate: %s"
 
-#: src/protocols/msn/session.c:342
+#: src/protocols/msn/session.c:344
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 
-#: src/protocols/msn/session.c:363 src/protocols/msn/session.c:365
+#: src/protocols/msn/session.c:365 src/protocols/msn/session.c:367
 msgid "Handshaking"
 msgstr "Handshaking"
 
-#: src/protocols/msn/session.c:364
+#: src/protocols/msn/session.c:366
 msgid "Transferring"
 msgstr "Transferring"
 
-#: src/protocols/msn/session.c:366
+#: src/protocols/msn/session.c:368
 msgid "Starting authentication"
 msgstr "Starting authentication"
 
-#: src/protocols/msn/session.c:367
+#: src/protocols/msn/session.c:369
 msgid "Getting cookie"
 msgstr "Getting cookie"
 
-#: src/protocols/msn/session.c:369
+#: src/protocols/msn/session.c:371
 msgid "Sending cookie"
 msgstr "Sending cookie"
 
-#: src/protocols/msn/session.c:370 src/protocols/trepia/trepia.c:637
+#: src/protocols/msn/session.c:372 src/protocols/trepia/trepia.c:636
 msgid "Retrieving buddy list"
 msgstr "Retrieving buddy list"
 
-#: src/protocols/msn/state.c:34
-msgid "Away From Computer"
-msgstr "Away From Computer"
-
-#: src/protocols/msn/switchboard.c:405
+#: src/protocols/msn/switchboard.c:401
 msgid "Message may have not been sent because a timeout occurred:"
 msgstr "Message may have not been sent because a timeout occurred:"
 
+#: src/protocols/msn/switchboard.c:409
+msgid "Message could not be sent, not allowed while invisible:"
+msgstr "Message could not be sent: not allowed while invisible:"
+
 #: src/protocols/msn/switchboard.c:413
-msgid "Message could not be sent, not allowed while invisible:"
-msgstr "Message could not be sent; not allowed while invisible:"
-
-#: src/protocols/msn/switchboard.c:417
 msgid "Message could not be sent because the user is offline:"
 msgstr "Message could not be sent because the user is offline:"
 
-#: src/protocols/msn/switchboard.c:421
+#: src/protocols/msn/switchboard.c:417
 msgid "Message could not be sent because a connection error occurred:"
 msgstr "Message could not be sent because a connection error occurred:"
 
-#: src/protocols/msn/switchboard.c:425
+#: src/protocols/msn/switchboard.c:421
 msgid ""
 "Message could not be sent because an error with the switchboard occurred:"
 msgstr ""
 "Message could not be sent because an error with the switchboard occurred:"
 
-#: src/protocols/msn/switchboard.c:433
+#: src/protocols/msn/switchboard.c:429
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Message may have not been sent because an unknown error occurred:"
 
-#: src/protocols/msn/switchboard.c:689
+#: src/protocols/msn/switchboard.c:678
+msgid "The conversation has become inactive and timed out."
+msgstr "The conversation has become inactive and timed out."
+
+#: src/protocols/msn/switchboard.c:697
 #, c-format
 msgid "%s has closed the conversation window."
 msgstr "%s has closed the conversation window."
 
-#: src/protocols/msn/userlist.c:85
+#: src/protocols/msn/userlist.c:87
 #, 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:276
-#, fuzzy, c-format
-msgid "%s has added you to his or her contact list."
+#: src/protocols/msn/userlist.c:96
+#, 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/msn/userlist.c:340
-#, c-format
-msgid "%s has removed you from his or her contact list."
-msgstr ""
-
-#: src/protocols/msn/userlist.c:655
+#: src/protocols/msn/userlist.c:627
 #, fuzzy, c-format
 msgid "Unable to add \"%s\"."
 msgstr "Unable to read file %s."
 
-#: src/protocols/msn/userlist.c:657
+#: src/protocols/msn/userlist.c:629
 #, fuzzy
 msgid "The screen name specified is invalid."
 msgstr "The SecurID key entered is invalid."
 
-#: src/protocols/napster/napster.c:260
+#: src/protocols/napster/napster.c:241
 msgid "Unable to read header from server"
 msgstr "Unable to read header from server"
 
-#: src/protocols/napster/napster.c:274
+#: src/protocols/napster/napster.c:255
 #, 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:290
-#, fuzzy
-msgid "Unknown server error."
-msgstr "Unknown error."
-
-#: src/protocols/napster/napster.c:339
+#: src/protocols/napster/napster.c:318
 #, 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:350
+#: src/protocols/napster/napster.c:329
 #, c-format
 msgid "Unable to add \"%s\" to your Napster hotlist"
 msgstr "Unable to add \"%s\" to your Napster hotlist"
 
-#. MSG_SERVER_DISCONNECTING
-#. we have been kicked off =^(
-#: src/protocols/napster/napster.c:357
+#: src/protocols/napster/napster.c:337
 msgid "You were disconnected from the server."
 msgstr "You were disconnected from the server."
 
 #. MSG_CLIENT_WHOIS
-#: src/protocols/napster/napster.c:414
+#: src/protocols/napster/napster.c:395
 #, c-format
 msgid "%s requested your information"
 msgstr "%s requested your information"
 
+#: src/protocols/napster/napster.c:433
+msgid ""
+"You were disconnected from the server, because you logged on from a "
+"different location"
+msgstr ""
+"You were disconnected from the server, because you logged on from a "
+"different location"
+
 #. MSG_CLIENT_PING
-#: src/protocols/napster/napster.c:455
+#: src/protocols/napster/napster.c:439
 #, c-format
 msgid "%s requested a PING"
 msgstr "%s requested a PING"
 
-#: src/protocols/napster/napster.c:591 src/protocols/toc/toc.c:1367
+#: src/protocols/napster/napster.c:554 src/protocols/toc/toc.c:1268
 msgid "_Group:"
 msgstr "_Group:"
 
@@ -7385,7 +7401,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/napster/napster.c:688 src/protocols/napster/napster.c:690
+#: src/protocols/napster/napster.c:652 src/protocols/napster/napster.c:654
 msgid "NAPSTER Protocol Plugin"
 msgstr "NAPSTER Protocol Plugin"
 
@@ -7523,38 +7539,38 @@
 msgid "Login failed (%s)."
 msgstr "Login failed (%s)."
 
-#: src/protocols/novell/novell.c:232
+#: 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:381
+#: 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:407
+#: 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:478 src/protocols/novell/novell.c:972
+#: 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:517
+#: 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:522
+#: 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:569
+#: src/protocols/novell/novell.c:567
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
@@ -7563,7 +7579,7 @@
 "Unable to move user %s to folder %s in the server side list. Error while "
 "creating folder (%s)."
 
-#: src/protocols/novell/novell.c:617
+#: src/protocols/novell/novell.c:615
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
@@ -7572,67 +7588,67 @@
 "Unable to add %s to your buddy list. Error creating folder in server side "
 "list (%s)."
 
-#: src/protocols/novell/novell.c:690
+#: 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:736 src/protocols/novell/novell.c:882
+#: 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:783
+#: 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:836
+#: 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:904
+#: 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:927 src/protocols/novell/novell.c:1629
+#: src/protocols/novell/novell.c:925 src/protocols/novell/novell.c:1620
 #, 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:999
+#: 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:1110 src/protocols/novell/novell.c:1668
+#: src/protocols/novell/novell.c:1108 src/protocols/novell/novell.c:1659
 msgid "Error communicating with server. Closing connection."
 msgstr "Error communicating with server. Closing connection."
 
-#: src/protocols/novell/novell.c:1452
+#: src/protocols/novell/novell.c:1443
 msgid "Telephone Number"
 msgstr "Telephone Number"
 
-#: src/protocols/novell/novell.c:1456
+#: src/protocols/novell/novell.c:1447
 msgid "Department"
 msgstr "Department"
 
-#: src/protocols/novell/novell.c:1458
+#: src/protocols/novell/novell.c:1449
 msgid "Personal Title"
 msgstr "Personal Title"
 
-#: src/protocols/novell/novell.c:1462
+#: src/protocols/novell/novell.c:1453
 msgid "Mailstop"
 msgstr "Mailstop"
 
-#: src/protocols/novell/novell.c:1464 src/protocols/oscar/oscar.c:5316
-#: src/protocols/oscar/oscar.c:5323
+#: src/protocols/novell/novell.c:1455 src/protocols/oscar/oscar.c:5204
+#: src/protocols/oscar/oscar.c:5211
 msgid "Email Address"
 msgstr "Email Address"
 
-#: src/protocols/novell/novell.c:1480
+#: src/protocols/novell/novell.c:1471
 msgid "User ID"
 msgstr "User ID"
 
@@ -7643,46 +7659,46 @@
 #. tag, value);
 #. }
 #.
-#: src/protocols/novell/novell.c:1494
+#: src/protocols/novell/novell.c:1485
 msgid "Full name"
 msgstr "Full name"
 
-#: src/protocols/novell/novell.c:1515
+#: src/protocols/novell/novell.c:1506
 msgid "User Properties"
 msgstr "User Properties"
 
-#: src/protocols/novell/novell.c:1619
+#: src/protocols/novell/novell.c:1610
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "GroupWise Conference %d"
 
-#: src/protocols/novell/novell.c:1644
+#: src/protocols/novell/novell.c:1635
 msgid "Unable to make SSL connection to server."
 msgstr "Unable to make SSL connection to server."
 
-#: src/protocols/novell/novell.c:1674
+#: src/protocols/novell/novell.c:1665
 #, c-format
 msgid "Error processing event or response (%s)."
 msgstr "Error processing event or response (%s)."
 
-#: src/protocols/novell/novell.c:1708
+#: src/protocols/novell/novell.c:1699
 msgid "Authenticating..."
 msgstr "Authenticating..."
 
-#: src/protocols/novell/novell.c:1723
+#: src/protocols/novell/novell.c:1714
 msgid "Waiting for response..."
 msgstr "Waiting for response..."
 
-#: src/protocols/novell/novell.c:1858
+#: src/protocols/novell/novell.c:1849
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "%s has been invited to this conversation."
 
-#: src/protocols/novell/novell.c:1886
+#: src/protocols/novell/novell.c:1876
 msgid "Invitation to Conversation"
 msgstr "Invitation to Conversation"
 
-#: src/protocols/novell/novell.c:1887
+#: src/protocols/novell/novell.c:1877
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -7693,15 +7709,15 @@
 "\n"
 "Sent: %s"
 
-#: src/protocols/novell/novell.c:1889
+#: src/protocols/novell/novell.c:1879
 msgid "Would you like to join the conversation?"
 msgstr "Would you like to join the conversation?"
 
-#: src/protocols/novell/novell.c:1996
+#: src/protocols/novell/novell.c:1985
 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:2052
+#: src/protocols/novell/novell.c:2039
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -7712,7 +7728,7 @@
 #. *  gaim_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: src/protocols/novell/novell.c:2150
+#: src/protocols/novell/novell.c:2137
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
@@ -7720,16 +7736,24 @@
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
 
-#: src/protocols/novell/novell.c:2172
+#: src/protocols/novell/novell.c:2159
 msgid "Error. SSL support is not installed."
 msgstr "Error. SSL support is not installed."
 
-#: src/protocols/novell/novell.c:2476
+#: src/protocols/novell/novell.c:2463
 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:2957 src/protocols/novell/novell.c:3045
-#: src/protocols/yahoo/yahoo.c:2808
+#: src/protocols/novell/novell.c:2809 src/protocols/oscar/oscar.c:738
+#: src/protocols/oscar/oscar.c:6795 src/protocols/yahoo/yahoo.c:2699
+msgid "Offline"
+msgstr "Offline"
+
+#: src/protocols/novell/novell.c:2820
+msgid "Message"
+msgstr "Message"
+
+#: src/protocols/novell/novell.c:2919 src/protocols/novell/novell.c:2975
 msgid "Appear Offline"
 msgstr "Appear Offline"
 
@@ -7743,115 +7767,115 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/novell/novell.c:3538 src/protocols/novell/novell.c:3540
+#: src/protocols/novell/novell.c:3468 src/protocols/novell/novell.c:3470
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GroupWise Messenger Protocol Plugin"
 
-#: src/protocols/novell/novell.c:3559
+#: src/protocols/novell/novell.c:3489
 msgid "Server address"
 msgstr "Server address"
 
-#: src/protocols/novell/novell.c:3563
+#: src/protocols/novell/novell.c:3493
 msgid "Server port"
 msgstr "Server port"
 
-#: src/protocols/oscar/oscar.c:196
+#: src/protocols/oscar/oscar.c:188
 msgid "Invalid error"
 msgstr "Invalid error"
 
-#: src/protocols/oscar/oscar.c:197
+#: src/protocols/oscar/oscar.c:189
 msgid "Invalid SNAC"
 msgstr "Invalid SNAC"
 
-#: src/protocols/oscar/oscar.c:198
+#: src/protocols/oscar/oscar.c:190
 msgid "Rate to host"
 msgstr "Rate to host"
 
-#: src/protocols/oscar/oscar.c:199
+#: src/protocols/oscar/oscar.c:191
 msgid "Rate to client"
 msgstr "Rate to client"
 
-#: src/protocols/oscar/oscar.c:201
+#: src/protocols/oscar/oscar.c:193
 msgid "Service unavailable"
 msgstr "Service unavailable"
 
-#: src/protocols/oscar/oscar.c:202
+#: src/protocols/oscar/oscar.c:194
 msgid "Service not defined"
 msgstr "Service not defined"
 
-#: src/protocols/oscar/oscar.c:203
+#: src/protocols/oscar/oscar.c:195
 msgid "Obsolete SNAC"
 msgstr "Obsolete SNAC"
 
-#: src/protocols/oscar/oscar.c:204
+#: src/protocols/oscar/oscar.c:196
 msgid "Not supported by host"
 msgstr "Not supported by host"
 
-#: src/protocols/oscar/oscar.c:205
+#: src/protocols/oscar/oscar.c:197
 msgid "Not supported by client"
 msgstr "Not supported by client"
 
-#: src/protocols/oscar/oscar.c:206
+#: src/protocols/oscar/oscar.c:198
 msgid "Refused by client"
 msgstr "Refused by client"
 
-#: src/protocols/oscar/oscar.c:207
+#: src/protocols/oscar/oscar.c:199
 msgid "Reply too big"
 msgstr "Reply too big"
 
-#: src/protocols/oscar/oscar.c:208
+#: src/protocols/oscar/oscar.c:200
 msgid "Responses lost"
 msgstr "Responses lost"
 
-#: src/protocols/oscar/oscar.c:209
+#: src/protocols/oscar/oscar.c:201
 msgid "Request denied"
 msgstr "Request denied"
 
-#: src/protocols/oscar/oscar.c:210
+#: src/protocols/oscar/oscar.c:202
 msgid "Busted SNAC payload"
 msgstr "Busted SNAC payload"
 
-#: src/protocols/oscar/oscar.c:211
+#: src/protocols/oscar/oscar.c:203
 msgid "Insufficient rights"
 msgstr "Insufficient rights"
 
-#: src/protocols/oscar/oscar.c:212
+#: src/protocols/oscar/oscar.c:204
 msgid "In local permit/deny"
 msgstr "In local permit/deny"
 
-#: src/protocols/oscar/oscar.c:213
+#: src/protocols/oscar/oscar.c:205
 msgid "Too evil (sender)"
 msgstr "Too evil (sender)"
 
-#: src/protocols/oscar/oscar.c:214
+#: src/protocols/oscar/oscar.c:206
 msgid "Too evil (receiver)"
 msgstr "Too evil (receiver)"
 
-#: src/protocols/oscar/oscar.c:215
+#: src/protocols/oscar/oscar.c:207
 msgid "User temporarily unavailable"
 msgstr "User temporarily unavailable"
 
-#: src/protocols/oscar/oscar.c:216
+#: src/protocols/oscar/oscar.c:208
 msgid "No match"
 msgstr "No match"
 
-#: src/protocols/oscar/oscar.c:217
+#: src/protocols/oscar/oscar.c:209
 msgid "List overflow"
 msgstr "List overflow"
 
-#: src/protocols/oscar/oscar.c:218
+#: src/protocols/oscar/oscar.c:210
 msgid "Request ambiguous"
 msgstr "Request ambiguous"
 
-#: src/protocols/oscar/oscar.c:219
+#: src/protocols/oscar/oscar.c:211
 msgid "Queue full"
 msgstr "Queue full"
 
-#: src/protocols/oscar/oscar.c:220
+#: src/protocols/oscar/oscar.c:212
 msgid "Not while on AOL"
 msgstr "Not while on AOL"
 
-#: src/protocols/oscar/oscar.c:408 src/protocols/oscar/oscar.c:493
+#: src/protocols/oscar/oscar.c:408 src/protocols/oscar/oscar.c:491
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking to "
 "most likely has a buggy client.)"
@@ -7859,158 +7883,157 @@
 "(There was an error receiving this message.  The buddy you are speaking to "
 "most likely has a buggy client.)"
 
-#: src/protocols/oscar/oscar.c:607
+#: src/protocols/oscar/oscar.c:593
 msgid "Voice"
 msgstr "Voice"
 
-#: src/protocols/oscar/oscar.c:610
+#: src/protocols/oscar/oscar.c:596
 msgid "AIM Direct IM"
 msgstr "AIM Direct IM"
 
-#: src/protocols/oscar/oscar.c:613 src/protocols/silc/silc.c:668
+#: src/protocols/oscar/oscar.c:599 src/protocols/silc/silc.c:654
 #: src/protocols/silc/util.c:509
 msgid "Chat"
 msgstr "Chat"
 
-#: src/protocols/oscar/oscar.c:616 src/protocols/oscar/oscar.c:7197
+#: src/protocols/oscar/oscar.c:602 src/protocols/oscar/oscar.c:7097
 msgid "Get File"
 msgstr "Get File"
 
-#: src/protocols/oscar/oscar.c:623
+#: src/protocols/oscar/oscar.c:609
 msgid "Games"
 msgstr "Games"
 
-#: src/protocols/oscar/oscar.c:626
+#: src/protocols/oscar/oscar.c:612
 msgid "Add-Ins"
 msgstr "Add-Ins"
 
-#: src/protocols/oscar/oscar.c:629
+#: src/protocols/oscar/oscar.c:615
 msgid "Send Buddy List"
 msgstr "Send Buddy List"
 
-#: src/protocols/oscar/oscar.c:632
+#: src/protocols/oscar/oscar.c:618
 msgid "ICQ Direct Connect"
 msgstr "ICQ Direct Connect"
 
-#: src/protocols/oscar/oscar.c:635
+#: src/protocols/oscar/oscar.c:621
 msgid "AP User"
 msgstr "AP User"
 
-#: src/protocols/oscar/oscar.c:638
+#: src/protocols/oscar/oscar.c:624
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:641
+#: src/protocols/oscar/oscar.c:627
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: src/protocols/oscar/oscar.c:644
+#: src/protocols/oscar/oscar.c:630
 msgid "ICQ Server Relay"
 msgstr "ICQ Server Relay"
 
-#: src/protocols/oscar/oscar.c:647
+#: src/protocols/oscar/oscar.c:633
 msgid "Old ICQ UTF8"
 msgstr "Old ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:650
+#: src/protocols/oscar/oscar.c:636
 msgid "Trillian Encryption"
 msgstr "Trillian Encryption"
 
-#: src/protocols/oscar/oscar.c:653
+#: src/protocols/oscar/oscar.c:639
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:656
+#: src/protocols/oscar/oscar.c:642
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: src/protocols/oscar/oscar.c:659
+#: src/protocols/oscar/oscar.c:645
 msgid "Security Enabled"
 msgstr "Security Enabled"
 
-#: src/protocols/oscar/oscar.c:662
+#: src/protocols/oscar/oscar.c:648
 msgid "Video Chat"
 msgstr "Video Chat"
 
-#: src/protocols/oscar/oscar.c:666
+#: src/protocols/oscar/oscar.c:652
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: src/protocols/oscar/oscar.c:669
+#: src/protocols/oscar/oscar.c:655
 msgid "Live Video"
 msgstr "Live Video"
 
-#: src/protocols/oscar/oscar.c:672
+#: src/protocols/oscar/oscar.c:658
 msgid "Camera"
 msgstr "Camera"
 
-#: src/protocols/oscar/oscar.c:690 src/protocols/oscar/oscar.c:7080
+#: src/protocols/oscar/oscar.c:676 src/protocols/oscar/oscar.c:5800
+#: src/protocols/oscar/oscar.c:6989
 msgid "Free For Chat"
 msgstr "Free For Chat"
 
-#: src/protocols/oscar/oscar.c:694 src/protocols/oscar/oscar.c:7095
+#: src/protocols/oscar/oscar.c:680 src/protocols/oscar/oscar.c:5794
+#: src/protocols/oscar/oscar.c:6987
 msgid "Not Available"
 msgstr "Not Available"
 
-#: src/protocols/oscar/oscar.c:696 src/protocols/oscar/oscar.c:7085
+#: src/protocols/oscar/oscar.c:682 src/protocols/oscar/oscar.c:5797
+#: src/protocols/oscar/oscar.c:6988
 msgid "Occupied"
 msgstr "Occupied"
 
-#: src/protocols/oscar/oscar.c:700
+#: src/protocols/oscar/oscar.c:686
 msgid "Web Aware"
 msgstr "Web Aware"
 
-#: src/protocols/oscar/oscar.c:779 src/protocols/oscar/oscar.c:4421
-msgid "Warning Level"
-msgstr "Warning Level"
-
-#: src/protocols/oscar/oscar.c:785
+#: src/protocols/oscar/oscar.c:754
 msgid "Capabilities"
 msgstr "Capabilities"
 
-#: src/protocols/oscar/oscar.c:794
+#: src/protocols/oscar/oscar.c:763
 msgid "Buddy Comment"
 msgstr "Buddy Comment"
 
-#: src/protocols/oscar/oscar.c:951
+#: src/protocols/oscar/oscar.c:898
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "Direct IM with %s closed"
 
-#: src/protocols/oscar/oscar.c:953
+#: src/protocols/oscar/oscar.c:900
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "Direct IM with %s failed"
 
-#: src/protocols/oscar/oscar.c:961
+#: src/protocols/oscar/oscar.c:907
 msgid "Direct Connect failed"
 msgstr "Direct Connect failed"
 
-#: src/protocols/oscar/oscar.c:1038 src/protocols/oscar/oscar.c:1169
+#: src/protocols/oscar/oscar.c:984 src/protocols/oscar/oscar.c:1115
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Direct IM with %s established"
 
-#: src/protocols/oscar/oscar.c:1119
+#: src/protocols/oscar/oscar.c:1065
 #, 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:1545
+#: src/protocols/oscar/oscar.c:1485
 #, 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:1550
+#: src/protocols/oscar/oscar.c:1490
 msgid "Unable to open Direct IM"
 msgstr "Unable to open Direct IM"
 
-#: src/protocols/oscar/oscar.c:1585
+#: src/protocols/oscar/oscar.c:1525
 #, 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:1589
+#: src/protocols/oscar/oscar.c:1529
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
@@ -8018,24 +8041,24 @@
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
 
-#: src/protocols/oscar/oscar.c:1593 src/protocols/oscar/oscar.c:3731
+#: src/protocols/oscar/oscar.c:1533 src/protocols/oscar/oscar.c:3643
 msgid "Connect"
 msgstr "Connect"
 
-#: src/protocols/oscar/oscar.c:1657
-#, c-format
-msgid "You have lost your connection to chat room %s."
-msgstr "You have lost your connection to chat room %s."
-
-#: src/protocols/oscar/oscar.c:1680
+#: src/protocols/oscar/oscar.c:1600 src/protocols/toc/toc.c:874
+#, 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:1619
 msgid "Chat is currently unavailable"
 msgstr "Chat is currently unavailable"
 
-#: src/protocols/oscar/oscar.c:1749
+#: src/protocols/oscar/oscar.c:1700
 msgid "Screen name sent"
 msgstr "Screen name sent"
 
-#: src/protocols/oscar/oscar.c:1773
+#: src/protocols/oscar/oscar.c:1714
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -8046,51 +8069,51 @@
 "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:1802
+#: src/protocols/oscar/oscar.c:1742
 msgid "Unable to login to AIM"
 msgstr "Unable to login to AIM"
 
-#: src/protocols/oscar/oscar.c:1906 src/protocols/oscar/oscar.c:2428
+#: src/protocols/oscar/oscar.c:1844 src/protocols/oscar/oscar.c:2365
 msgid "Could Not Connect"
 msgstr "Could Not Connect"
 
-#: src/protocols/oscar/oscar.c:1914
+#: src/protocols/oscar/oscar.c:1852
 msgid "Connection established, cookie sent"
 msgstr "Connection established, cookie sent"
 
-#: src/protocols/oscar/oscar.c:2027
+#: src/protocols/oscar/oscar.c:1963
 #, fuzzy, c-format
 msgid "Transfer of file %s timed out."
 msgstr "Transfer of file %s complete"
 
-#: src/protocols/oscar/oscar.c:2106 src/protocols/yahoo/yahoo_filexfer.c:177
+#: src/protocols/oscar/oscar.c:2047 src/protocols/yahoo/yahoo_filexfer.c:177
 #: src/protocols/yahoo/yahoo_filexfer.c:186
 #: src/protocols/yahoo/yahoo_filexfer.c:195
 msgid "Unable to establish file descriptor."
 msgstr "Unable to establish file descriptor."
 
-#: src/protocols/oscar/oscar.c:2111
+#: src/protocols/oscar/oscar.c:2052
 msgid "Unable to create new connection."
 msgstr "Unable to create new connection."
 
-#: src/protocols/oscar/oscar.c:2190
+#: src/protocols/oscar/oscar.c:2124
 msgid "Unable to establish listener socket."
 msgstr "Unable to establish listener socket."
 
-#: src/protocols/oscar/oscar.c:2315 src/protocols/toc/toc.c:543
+#: src/protocols/oscar/oscar.c:2249 src/protocols/toc/toc.c:541
 msgid "Incorrect nickname or password."
 msgstr "Incorrect nickname or password."
 
-#: src/protocols/oscar/oscar.c:2320
+#: src/protocols/oscar/oscar.c:2254
 msgid "Your account is currently suspended."
 msgstr "Your account is currently suspended."
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:2324
+#: src/protocols/oscar/oscar.c:2258
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "The AOL Instant Messenger service is temporarily unavailable."
 
-#: src/protocols/oscar/oscar.c:2329
+#: src/protocols/oscar/oscar.c:2263
 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."
@@ -8098,33 +8121,33 @@
 "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:2334
+#: src/protocols/oscar/oscar.c:2268
 #, 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:2365
+#: src/protocols/oscar/oscar.c:2300
 msgid "Internal Error"
 msgstr "Internal Error"
 
-#: src/protocols/oscar/oscar.c:2435
+#: src/protocols/oscar/oscar.c:2372
 msgid "Received authorization"
 msgstr "Received authorization"
 
-#: src/protocols/oscar/oscar.c:2459
+#: src/protocols/oscar/oscar.c:2396
 msgid "The SecurID key entered is invalid."
 msgstr "The SecurID key entered is invalid."
 
-#: src/protocols/oscar/oscar.c:2473
+#: src/protocols/oscar/oscar.c:2410
 msgid "Enter SecurID"
 msgstr "Enter SecurID"
 
-#: src/protocols/oscar/oscar.c:2474
+#: src/protocols/oscar/oscar.c:2411
 msgid "Enter the 6 digit number from the digital display."
-msgstr "Enter the 6 digit number from the digital display."
-
-#: src/protocols/oscar/oscar.c:2514 src/protocols/oscar/oscar.c:2544
-#: src/protocols/oscar/oscar.c:2633
+msgstr "Enter the 6-digit number from the digital display."
+
+#: src/protocols/oscar/oscar.c:2451 src/protocols/oscar/oscar.c:2481
+#: src/protocols/oscar/oscar.c:2570
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -8133,24 +8156,24 @@
 "You may be disconnected shortly.  You may want to use TOC until this is "
 "fixed.  Check %s for updates."
 
-#: src/protocols/oscar/oscar.c:2517 src/protocols/oscar/oscar.c:2547
+#: src/protocols/oscar/oscar.c:2454 src/protocols/oscar/oscar.c:2484
 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:2636
+#: src/protocols/oscar/oscar.c:2573
 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:2667
+#: src/protocols/oscar/oscar.c:2605
 msgid "Password sent"
 msgstr "Password sent"
 
-#: src/protocols/oscar/oscar.c:3722
+#: src/protocols/oscar/oscar.c:3635
 #, 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:3725
+#: src/protocols/oscar/oscar.c:3638
 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 "
@@ -8160,19 +8183,19 @@
 "for IM Images.  Because your IP address will be revealed, this may be "
 "considered a privacy risk."
 
-#: src/protocols/oscar/oscar.c:3764
+#: src/protocols/oscar/oscar.c:3676
 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:3772
+#: src/protocols/oscar/oscar.c:3684
 msgid "Authorization Request Message:"
 msgstr "Authorization Request Message:"
 
-#: src/protocols/oscar/oscar.c:3773
+#: src/protocols/oscar/oscar.c:3685
 msgid "Please authorize me!"
 msgstr "Please authorize me!"
 
-#: src/protocols/oscar/oscar.c:3803
+#: src/protocols/oscar/oscar.c:3715
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
@@ -8181,34 +8204,35 @@
 "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:3808 src/protocols/oscar/oscar.c:3810
+#: src/protocols/oscar/oscar.c:3720 src/protocols/oscar/oscar.c:3722
 msgid "Request Authorization"
 msgstr "Request Authorization"
 
-#: src/protocols/oscar/oscar.c:3848 src/protocols/oscar/oscar.c:3854
-#: src/protocols/oscar/oscar.c:3958 src/protocols/oscar/oscar.c:3983
-#: src/protocols/oscar/oscar.c:6535 src/protocols/oscar/oscar.c:6587
+#: src/protocols/oscar/oscar.c:3770 src/protocols/oscar/oscar.c:3772
+#: src/protocols/oscar/oscar.c:3779 src/protocols/oscar/oscar.c:3876
+#: src/protocols/oscar/oscar.c:3896 src/protocols/oscar/oscar.c:6430
+#: src/protocols/oscar/oscar.c:6476
 msgid "No reason given."
 msgstr "No reason given."
 
-#: src/protocols/oscar/oscar.c:3853
+#: src/protocols/oscar/oscar.c:3778
 msgid "Authorization Denied Message:"
 msgstr "Authorization Denied Message:"
 
-#: src/protocols/oscar/oscar.c:3961
-#, fuzzy, c-format
-msgid ""
-"The user %u wants to add %s to their buddy list for the following reason:\n"
+#: src/protocols/oscar/oscar.c:3876
+#, c-format
+msgid ""
+"The user %u wants to add you to their buddy list for the following reason:\n"
 "%s"
 msgstr ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3971 src/protocols/oscar/oscar.c:6547
+#: src/protocols/oscar/oscar.c:3884 src/protocols/oscar/oscar.c:6436
 msgid "Authorization Request"
 msgstr "Authorization Request"
 
-#: src/protocols/oscar/oscar.c:3983
+#: src/protocols/oscar/oscar.c:3896
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -8219,17 +8243,17 @@
 "following reason:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3984
+#: src/protocols/oscar/oscar.c:3897
 msgid "ICQ authorization denied."
 msgstr "ICQ authorization denied."
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:3991
+#: src/protocols/oscar/oscar.c:3904
 #, 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:3999
+#: src/protocols/oscar/oscar.c:3912
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -8242,7 +8266,7 @@
 "From: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4007
+#: src/protocols/oscar/oscar.c:3920
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -8255,7 +8279,7 @@
 "From: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4015
+#: src/protocols/oscar/oscar.c:3928
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -8268,34 +8292,34 @@
 "Message is:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4036
+#: src/protocols/oscar/oscar.c:3949
 #, 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:4042
+#: src/protocols/oscar/oscar.c:3955
 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:4046
+#: src/protocols/oscar/oscar.c:3959
 msgid "Decline"
 msgstr "Decline"
 
-#: src/protocols/oscar/oscar.c:4130
+#: src/protocols/oscar/oscar.c:4043
 #, 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:4139
+#: src/protocols/oscar/oscar.c:4052
 #, 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:4148
+#: src/protocols/oscar/oscar.c:4061
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -8306,78 +8330,76 @@
 msgstr[1] ""
 "You missed %hu messages from %s because the rate limit has been exceeded."
 
-#: src/protocols/oscar/oscar.c:4157
+#: src/protocols/oscar/oscar.c:4070
 #, 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:4166
+#: src/protocols/oscar/oscar.c:4079
 #, 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:4175
+#: src/protocols/oscar/oscar.c:4088
 #, 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:4229 src/protocols/oscar/oscar.c:4463
-#: src/protocols/silc/ops.c:1087 src/protocols/silc/ops.c:1149
+#: src/protocols/oscar/oscar.c:4142 src/protocols/oscar/oscar.c:4374
 #, c-format
 msgid "Info for %s"
 msgstr "Info for %s"
 
-#: src/protocols/oscar/oscar.c:4295
+#: src/protocols/oscar/oscar.c:4208
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC threw error: %s\n"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:4332
+#: src/protocols/oscar/oscar.c:4244
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Unable to send message: %s"
 
-#: src/protocols/oscar/oscar.c:4332 src/protocols/oscar/oscar.c:4337
-#: src/protocols/oscar/oscar.c:4395 src/protocols/oscar/oscar.c:4399
+#: src/protocols/oscar/oscar.c:4244 src/protocols/oscar/oscar.c:4249
+#: src/protocols/oscar/oscar.c:4307 src/protocols/oscar/oscar.c:4311
 msgid "Unknown reason."
 msgstr "Unknown reason."
 
-#: src/protocols/oscar/oscar.c:4335
-#, c-format
-msgid "Unable to send message to %s:"
-msgstr "Unable to send message to %s:"
-
-#: src/protocols/oscar/oscar.c:4395
+#: src/protocols/oscar/oscar.c:4307
 #, c-format
 msgid "User information not available: %s"
 msgstr "User information not available: %s"
 
-#: src/protocols/oscar/oscar.c:4398
+#: src/protocols/oscar/oscar.c:4310
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "User information for %s unavailable:"
 
-#: src/protocols/oscar/oscar.c:4425
+#: src/protocols/oscar/oscar.c:4332
+msgid "Warning Level"
+msgstr "Warning Level"
+
+#: src/protocols/oscar/oscar.c:4336
 msgid "Online Since"
 msgstr "Online Since"
 
-#: src/protocols/oscar/oscar.c:4430 src/protocols/yahoo/yahoo_profile.c:1127
+#: src/protocols/oscar/oscar.c:4341 src/protocols/yahoo/yahoo_profile.c:1125
 msgid "Member Since"
 msgstr "Member Since"
 
-#: src/protocols/oscar/oscar.c:4514
+#: src/protocols/oscar/oscar.c:4425
 msgid "Your AIM connection may be lost."
 msgstr "Your AIM connection may be lost."
 
 #. The conversion failed!
-#: src/protocols/oscar/oscar.c:4700
+#: src/protocols/oscar/oscar.c:4611
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -8385,11 +8407,11 @@
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 
-#: src/protocols/oscar/oscar.c:4925
+#: src/protocols/oscar/oscar.c:4836
 msgid "Rate limiting error."
 msgstr "Rate limiting error."
 
-#: src/protocols/oscar/oscar.c:4926
+#: src/protocols/oscar/oscar.c:4837
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -8397,108 +8419,117 @@
 "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:4997
+#: src/protocols/oscar/oscar.c:4900
+msgid ""
+"You have been disconnected because you have signed on with this screen name "
+"at another location."
+msgstr ""
+"You have been disconnected because you have signed on with this screen name "
+"at another location."
+
+#: src/protocols/oscar/oscar.c:4902
 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:5010 src/protocols/toc/toc.c:971
-#, c-format
-msgid "You have been disconnected from chat room %s."
-msgstr "You have been disconnected from chat room %s."
-
-#. XXX - Don't call this with ssi
-#: src/protocols/oscar/oscar.c:5035
+#: src/protocols/oscar/oscar.c:4933
 msgid "Finalizing connection"
 msgstr "Finalizing connection"
 
-#: src/protocols/oscar/oscar.c:5328 src/protocols/silc/util.c:541
+#: src/protocols/oscar/oscar.c:5216 src/protocols/silc/util.c:541
 msgid "Mobile Phone"
 msgstr "Mobile Phone"
 
-#: src/protocols/oscar/oscar.c:5330 src/protocols/trepia/trepia.c:282
+#: src/protocols/oscar/oscar.c:5217
+msgid "Not specified"
+msgstr "Not specified"
+
+#: src/protocols/oscar/oscar.c:5218 src/protocols/trepia/trepia.c:282
 #: src/protocols/trepia/trepia.c:408
 msgid "Female"
 msgstr "Female"
 
-#: src/protocols/oscar/oscar.c:5330 src/protocols/trepia/trepia.c:281
+#: src/protocols/oscar/oscar.c:5218 src/protocols/trepia/trepia.c:281
 #: src/protocols/trepia/trepia.c:408
 msgid "Male"
 msgstr "Male"
 
-#: src/protocols/oscar/oscar.c:5346
+#: src/protocols/oscar/oscar.c:5234
 msgid "Personal Web Page"
 msgstr "Personal Web Page"
 
-#: src/protocols/oscar/oscar.c:5350
+#: src/protocols/oscar/oscar.c:5238
 msgid "Additional Information"
 msgstr "Additional Information"
 
-#: src/protocols/oscar/oscar.c:5355
+#: src/protocols/oscar/oscar.c:5243
 msgid "Home Address"
 msgstr "Home Address"
 
-#: src/protocols/oscar/oscar.c:5359 src/protocols/oscar/oscar.c:5367
+#: src/protocols/oscar/oscar.c:5247 src/protocols/oscar/oscar.c:5255
 msgid "Zip Code"
 msgstr "Postal Code"
 
-#: src/protocols/oscar/oscar.c:5363
+#: src/protocols/oscar/oscar.c:5251
 msgid "Work Address"
 msgstr "Work Address"
 
-#: src/protocols/oscar/oscar.c:5371
+#: src/protocols/oscar/oscar.c:5259
 msgid "Work Information"
 msgstr "Work Information"
 
-#: src/protocols/oscar/oscar.c:5372
+#: src/protocols/oscar/oscar.c:5260
 msgid "Company"
 msgstr "Company"
 
-#: src/protocols/oscar/oscar.c:5373
+#: src/protocols/oscar/oscar.c:5261
 msgid "Division"
 msgstr "Division"
 
-#: src/protocols/oscar/oscar.c:5374
+#: src/protocols/oscar/oscar.c:5262
 msgid "Position"
 msgstr "Position"
 
-#: src/protocols/oscar/oscar.c:5376
+#: src/protocols/oscar/oscar.c:5264
 msgid "Web Page"
 msgstr "Web Page"
 
-#: src/protocols/oscar/oscar.c:5386
+#: src/protocols/oscar/oscar.c:5274
 #, c-format
 msgid "ICQ Info for %s"
 msgstr "ICQ Info for %s"
 
-#: src/protocols/oscar/oscar.c:5435
+#: src/protocols/oscar/oscar.c:5323
 msgid "Pop-Up Message"
 msgstr "Pop-Up Message"
 
-#. TODO: Need to use ngettext() here
-#: src/protocols/oscar/oscar.c:5457
+#: src/protocols/oscar/oscar.c:5344
 #, 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:5482
+#: src/protocols/oscar/oscar.c:5348
+msgid "Search Results"
+msgstr "Search Results"
+
+#: src/protocols/oscar/oscar.c:5365
 #, c-format
 msgid "No results found for email address %s"
 msgstr "No results found for email address %s"
 
-#: src/protocols/oscar/oscar.c:5503
+#: src/protocols/oscar/oscar.c:5386
 #, 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:5505
+#: src/protocols/oscar/oscar.c:5388
 msgid "Account Confirmation Requested"
 msgstr "Account Confirmation Requested"
 
-#: src/protocols/oscar/oscar.c:5536
+#: src/protocols/oscar/oscar.c:5419
 msgid "Error Changing Account Info"
 msgstr "Error Changing Account Info"
 
-#: src/protocols/oscar/oscar.c:5539
+#: src/protocols/oscar/oscar.c:5422
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8507,7 +8538,7 @@
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "differs from the original."
 
-#: src/protocols/oscar/oscar.c:5542
+#: src/protocols/oscar/oscar.c:5425
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8516,7 +8547,7 @@
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "ends in a space."
 
-#: src/protocols/oscar/oscar.c:5545
+#: src/protocols/oscar/oscar.c:5428
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8525,7 +8556,7 @@
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "is too long."
 
-#: src/protocols/oscar/oscar.c:5548
+#: src/protocols/oscar/oscar.c:5431
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -8534,7 +8565,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:5551
+#: src/protocols/oscar/oscar.c:5434
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -8543,7 +8574,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:5554
+#: src/protocols/oscar/oscar.c:5437
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
@@ -8552,12 +8583,12 @@
 "Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 
-#: src/protocols/oscar/oscar.c:5557
+#: src/protocols/oscar/oscar.c:5440
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Error 0x%04x: Unknown error."
 
-#: src/protocols/oscar/oscar.c:5567
+#: src/protocols/oscar/oscar.c:5450
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -8566,26 +8597,26 @@
 "Your screen name is currently formatted as follows:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5568 src/protocols/oscar/oscar.c:5575
+#: src/protocols/oscar/oscar.c:5451 src/protocols/oscar/oscar.c:5458
 msgid "Account Info"
 msgstr "Account Info"
 
-#: src/protocols/oscar/oscar.c:5573
+#: src/protocols/oscar/oscar.c:5456
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "The email address for %s is %s"
 
-#: src/protocols/oscar/oscar.c:5640
+#: src/protocols/oscar/oscar.c:5521
 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:5780
+#: src/protocols/oscar/oscar.c:5649
 msgid "Unable to set AIM profile."
 msgstr "Unable to set AIM profile."
 
-#: src/protocols/oscar/oscar.c:5781
+#: src/protocols/oscar/oscar.c:5650
 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 "
@@ -8595,7 +8626,7 @@
 "completed.  Your profile remains unset; try setting it again when you are "
 "fully connected."
 
-#: src/protocols/oscar/oscar.c:5808
+#: src/protocols/oscar/oscar.c:5677
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -8610,15 +8641,19 @@
 "The maximum profile length of %d bytes has been exceeded.  Gaim has "
 "truncated it for you."
 
-#: src/protocols/oscar/oscar.c:5813
+#: src/protocols/oscar/oscar.c:5682
 msgid "Profile too long."
 msgstr "Profile too long."
 
-#: src/protocols/oscar/oscar.c:5843
+#: src/protocols/oscar/oscar.c:5698 src/protocols/oscar/oscar.c:6994
+msgid "Visible"
+msgstr "Visible"
+
+#: src/protocols/oscar/oscar.c:5716
 msgid "Unable to set AIM away message."
 msgstr "Unable to set AIM away message."
 
-#: src/protocols/oscar/oscar.c:5844
+#: src/protocols/oscar/oscar.c:5717
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -8628,7 +8663,7 @@
 "procedure completed.  You remain in a \"present\" state; try setting it "
 "again when you are fully connected."
 
-#: src/protocols/oscar/oscar.c:5891
+#: src/protocols/oscar/oscar.c:5757
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -8643,11 +8678,11 @@
 "The maximum away message length of %d bytes has been exceeded.  Gaim has "
 "truncated it for you."
 
-#: src/protocols/oscar/oscar.c:5896
+#: src/protocols/oscar/oscar.c:5762
 msgid "Away message too long."
 msgstr "Away message too long."
 
-#: src/protocols/oscar/oscar.c:5994
+#: src/protocols/oscar/oscar.c:5839
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -8658,16 +8693,16 @@
 "must either start with a letter and contain only letters, numbers and "
 "spaces, or contain only numbers."
 
-#: src/protocols/oscar/oscar.c:5996 src/protocols/oscar/oscar.c:6394
-#: src/protocols/oscar/oscar.c:6408
+#: src/protocols/oscar/oscar.c:5841 src/protocols/oscar/oscar.c:6296
+#: src/protocols/oscar/oscar.c:6310
 msgid "Unable To Add"
 msgstr "Unable To Add"
 
-#: src/protocols/oscar/oscar.c:6100
+#: src/protocols/oscar/oscar.c:6008
 msgid "Unable To Retrieve Buddy List"
 msgstr "Unable To Retrieve Buddy List"
 
-#: src/protocols/oscar/oscar.c:6101
+#: src/protocols/oscar/oscar.c:6009
 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 "
@@ -8677,13 +8712,13 @@
 "servers.  Your buddy list is not lost, and will probably become available in "
 "a few hours."
 
-#: src/protocols/oscar/oscar.c:6285 src/protocols/oscar/oscar.c:6286
-#: src/protocols/oscar/oscar.c:6291 src/protocols/oscar/oscar.c:6452
-#: src/protocols/oscar/oscar.c:6453 src/protocols/oscar/oscar.c:6458
+#: src/protocols/oscar/oscar.c:6191 src/protocols/oscar/oscar.c:6192
+#: src/protocols/oscar/oscar.c:6197 src/protocols/oscar/oscar.c:6354
+#: src/protocols/oscar/oscar.c:6355 src/protocols/oscar/oscar.c:6360
 msgid "Orphans"
 msgstr "Orphans"
 
-#: src/protocols/oscar/oscar.c:6392
+#: src/protocols/oscar/oscar.c:6294
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -8692,11 +8727,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:6392 src/protocols/oscar/oscar.c:6406
+#: src/protocols/oscar/oscar.c:6294 src/protocols/oscar/oscar.c:6308
 msgid "(no name)"
 msgstr "(no name)"
 
-#: src/protocols/oscar/oscar.c:6406
+#: src/protocols/oscar/oscar.c:6308
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -8707,7 +8742,7 @@
 "for this is that you have the maximum number of allowed buddies in your "
 "buddy list."
 
-#: src/protocols/oscar/oscar.c:6489
+#: src/protocols/oscar/oscar.c:6391
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -8716,31 +8751,31 @@
 "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:6495
+#: src/protocols/oscar/oscar.c:6397
 msgid "Authorization Given"
 msgstr "Authorization Given"
 
-#: src/protocols/oscar/oscar.c:6538
-#, fuzzy, c-format
-msgid ""
-"The user %s wants to add %s to their buddy list for the following reason:\n"
+#: src/protocols/oscar/oscar.c:6430
+#, c-format
+msgid ""
+"The user %s wants to add you to their buddy list for the following reason:\n"
 "%s"
 msgstr ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:6583
+#: src/protocols/oscar/oscar.c:6472
 #, 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:6584
+#: src/protocols/oscar/oscar.c:6473
 msgid "Authorization Granted"
 msgstr "Authorization Granted"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:6587
+#: src/protocols/oscar/oscar.c:6476
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -8751,92 +8786,76 @@
 "following reason:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:6588
+#: src/protocols/oscar/oscar.c:6477
 msgid "Authorization Denied"
 msgstr "Authorization Denied"
 
-#: src/protocols/oscar/oscar.c:6625 src/protocols/toc/toc.c:1372
+#: src/protocols/oscar/oscar.c:6514 src/protocols/toc/toc.c:1273
 msgid "_Exchange:"
 msgstr "_Exchange:"
 
-#: src/protocols/oscar/oscar.c:6664
+#: src/protocols/oscar/oscar.c:6552
 msgid "Invalid chat name specified."
 msgstr "Invalid chat name specified."
 
-#: src/protocols/oscar/oscar.c:6731
+#: src/protocols/oscar/oscar.c:6641
 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:6866
+#: src/protocols/oscar/oscar.c:6767
 msgid "Away Message"
 msgstr "Away Message"
 
-#: src/protocols/oscar/oscar.c:7153
+#: src/protocols/oscar/oscar.c:7053
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Buddy Comment for %s"
 
-#: src/protocols/oscar/oscar.c:7154
+#: src/protocols/oscar/oscar.c:7054
 msgid "Buddy Comment:"
 msgstr "Buddy Comment:"
 
-#: src/protocols/oscar/oscar.c:7173
+#: src/protocols/oscar/oscar.c:7073
 msgid "Edit Buddy Comment"
 msgstr "Edit Buddy Comment"
 
-#: src/protocols/oscar/oscar.c:7179
+#: src/protocols/oscar/oscar.c:7079
 msgid "Get Status Msg"
 msgstr "Get Status Msg"
 
-#: src/protocols/oscar/oscar.c:7191
+#: src/protocols/oscar/oscar.c:7091
 msgid "Direct IM"
 msgstr "Direct IM"
 
-#: src/protocols/oscar/oscar.c:7208
+#: src/protocols/oscar/oscar.c:7108
 msgid "Re-request Authorization"
 msgstr "Re-request Authorization"
 
-#: src/protocols/oscar/oscar.c:7268
-msgid "Require authorization"
-msgstr "Require authorization"
-
-#: src/protocols/oscar/oscar.c:7271
-msgid "Hide IP address"
-msgstr "Hide IP address"
-
-#: src/protocols/oscar/oscar.c:7274
-msgid "Web aware"
-msgstr "Web aware"
-
-#: src/protocols/oscar/oscar.c:7279
-msgid "ICQ Privacy Options"
-msgstr "ICQ Privacy Options"
-
-#: src/protocols/oscar/oscar.c:7296
+#: src/protocols/oscar/oscar.c:7138
 msgid "The new formatting is invalid."
 msgstr "The new formatting is invalid."
 
-#: src/protocols/oscar/oscar.c:7297
+#: src/protocols/oscar/oscar.c:7139
 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:7304
+#: src/protocols/oscar/oscar.c:7146
 msgid "New screen name formatting:"
 msgstr "New screen name formatting:"
 
-#: src/protocols/oscar/oscar.c:7356
+#: src/protocols/oscar/oscar.c:7198
 msgid "Change Address To:"
 msgstr "Change Address To:"
 
-#: src/protocols/oscar/oscar.c:7401
+#: src/protocols/oscar/oscar.c:7243
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>you are not waiting for authorization</i>"
 
-#: src/protocols/oscar/oscar.c:7404
+#: src/protocols/oscar/oscar.c:7246
 msgid "You are awaiting authorization from the following buddies"
 msgstr "You are awaiting authorization from the following buddies"
 
-#: src/protocols/oscar/oscar.c:7405
+#: src/protocols/oscar/oscar.c:7247
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -8844,80 +8863,78 @@
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
 
-#: src/protocols/oscar/oscar.c:7422
+#: src/protocols/oscar/oscar.c:7264
 msgid "Find Buddy by E-mail"
 msgstr "Find Buddy by E-mail"
 
-#: src/protocols/oscar/oscar.c:7423
+#: src/protocols/oscar/oscar.c:7265
 msgid "Search for a buddy by e-mail address"
 msgstr "Search for a buddy by e-mail address"
 
-#: src/protocols/oscar/oscar.c:7424
+#: src/protocols/oscar/oscar.c:7266
 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:7505 src/protocols/silc/silc.c:826
+#: src/protocols/oscar/oscar.c:7283
+msgid "Available Message:"
+msgstr "Available Message:"
+
+#: src/protocols/oscar/oscar.c:7284
+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:7365 src/protocols/silc/silc.c:812
 msgid "Set User Info..."
 msgstr "Set User Info..."
 
-#: src/protocols/oscar/oscar.c:7511
+#: src/protocols/oscar/oscar.c:7370
 msgid "Set User Info (URL)..."
 msgstr "Set User Info (URL)..."
 
-#: src/protocols/oscar/oscar.c:7516 src/protocols/silc/silc.c:822
+#: src/protocols/oscar/oscar.c:7376
+msgid "Set Available Message..."
+msgstr "Set Available Message..."
+
+#: src/protocols/oscar/oscar.c:7381 src/protocols/silc/silc.c:808
 msgid "Change Password..."
 msgstr "Change Password..."
 
-#: src/protocols/oscar/oscar.c:7522
+#: src/protocols/oscar/oscar.c:7386
 msgid "Change Password (URL)"
 msgstr "Change Password (URL)"
 
-#: src/protocols/oscar/oscar.c:7526
+#: src/protocols/oscar/oscar.c:7390
 msgid "Configure IM Forwarding (URL)"
 msgstr "Configure IM Forwarding (URL)"
 
-#. ICQ actions
-#: src/protocols/oscar/oscar.c:7536
-msgid "Show privacy options..."
-msgstr "Show privacy options..."
-
-#. AIM actions
-#: src/protocols/oscar/oscar.c:7543
+#: src/protocols/oscar/oscar.c:7399
 msgid "Format Screen Name..."
 msgstr "Format Screen Name..."
 
-#: src/protocols/oscar/oscar.c:7547
+#: src/protocols/oscar/oscar.c:7403
 msgid "Confirm Account"
 msgstr "Confirm Account"
 
-#: src/protocols/oscar/oscar.c:7551
+#: src/protocols/oscar/oscar.c:7407
 msgid "Display Currently Registered Address"
 msgstr "Display Currently Registered Address"
 
-#: src/protocols/oscar/oscar.c:7555
+#: src/protocols/oscar/oscar.c:7411
 msgid "Change Currently Registered Address..."
 msgstr "Change Currently Registered Address..."
 
-#: src/protocols/oscar/oscar.c:7562
+#: src/protocols/oscar/oscar.c:7418
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Show Buddies Awaiting Authorization"
 
-#: src/protocols/oscar/oscar.c:7568
+#: src/protocols/oscar/oscar.c:7424
 msgid "Search for Buddy by Email..."
 msgstr "Search for Buddy by Email..."
 
-#: src/protocols/oscar/oscar.c:7573
+#: src/protocols/oscar/oscar.c:7429
 msgid "Search for Buddy by Information"
 msgstr "Search for Buddy by Information"
 
-#: src/protocols/oscar/oscar.c:7643
-msgid "Use recent buddies group"
-msgstr "Use recent buddies group"
-
-#: src/protocols/oscar/oscar.c:7646
-msgid "Show how long you have been idle"
-msgstr "Show how long you have been idle"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -8928,19 +8945,19 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/oscar/oscar.c:7763 src/protocols/oscar/oscar.c:7765
+#: src/protocols/oscar/oscar.c:7550 src/protocols/oscar/oscar.c:7552
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ Protocol Plugin"
 
-#: src/protocols/oscar/oscar.c:7788
+#: src/protocols/oscar/oscar.c:7571
 msgid "Auth host"
 msgstr "Auth host"
 
-#: src/protocols/oscar/oscar.c:7791
+#: src/protocols/oscar/oscar.c:7574
 msgid "Auth port"
 msgstr "Auth port"
 
-#: src/protocols/oscar/oscar.c:7794 src/protocols/zephyr/zephyr.c:2892
+#: src/protocols/oscar/oscar.c:7577 src/protocols/zephyr/zephyr.c:2760
 msgid "Encoding"
 msgstr "Encoding"
 
@@ -9029,32 +9046,32 @@
 msgstr "Set IM Password"
 
 #: src/protocols/silc/buddy.c:506 src/protocols/silc/buddy.c:541
-#: src/protocols/silc/ops.c:1282 src/protocols/silc/ops.c:1293
+#: src/protocols/silc/ops.c:1284 src/protocols/silc/ops.c:1295
 msgid "Get Public Key"
 msgstr "Get Public Key"
 
-#: src/protocols/silc/buddy.c:542 src/protocols/silc/ops.c:1283
-#: src/protocols/silc/ops.c:1294
+#: src/protocols/silc/buddy.c:542 src/protocols/silc/ops.c:1285
+#: src/protocols/silc/ops.c:1296
 msgid "Cannot fetch the public key"
 msgstr "Cannot fetch the public key"
 
-#: src/protocols/silc/buddy.c:629 src/protocols/silc/buddy.c:1578
+#: src/protocols/silc/buddy.c:629 src/protocols/silc/buddy.c:1553
 msgid "Show Public Key"
 msgstr "Show Public Key"
 
 #: src/protocols/silc/buddy.c:630 src/protocols/silc/buddy.c:989
-#: src/protocols/silc/chat.c:235
+#: src/protocols/silc/chat.c:234
 msgid "Could not load public key"
 msgstr "Could not load public key"
 
-#: src/protocols/silc/buddy.c:707 src/protocols/silc/ops.c:873
-#: src/protocols/silc/ops.c:945 src/protocols/silc/ops.c:1080
-#: src/protocols/silc/ops.c:1081 src/protocols/silc/ops.c:1101
+#: src/protocols/silc/buddy.c:707 src/protocols/silc/ops.c:871
+#: src/protocols/silc/ops.c:943 src/protocols/silc/ops.c:1078
+#: src/protocols/silc/ops.c:1079 src/protocols/silc/ops.c:1098
 msgid "User Information"
 msgstr "User Information"
 
-#: src/protocols/silc/buddy.c:708 src/protocols/silc/ops.c:946
-#: src/protocols/silc/ops.c:1102
+#: src/protocols/silc/buddy.c:708 src/protocols/silc/ops.c:944
+#: src/protocols/silc/ops.c:1099
 msgid "Cannot get user information"
 msgstr "Cannot get user information"
 
@@ -9113,213 +9130,216 @@
 "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:1410
+#: src/protocols/silc/buddy.c:1386
 msgid "Detached"
 msgstr "Detached"
 
-#: src/protocols/silc/buddy.c:1414 src/protocols/silc/silc.c:58
+#: src/protocols/silc/buddy.c:1390 src/protocols/silc/silc.c:49
+#: src/protocols/silc/silc.c:85
 msgid "Indisposed"
 msgstr "Indisposed"
 
-#: src/protocols/silc/buddy.c:1418 src/protocols/silc/silc.c:60
+#: src/protocols/silc/buddy.c:1394 src/protocols/silc/silc.c:50
+#: src/protocols/silc/silc.c:87
 msgid "Wake Me Up"
 msgstr "Wake Me Up"
 
-#: src/protocols/silc/buddy.c:1420 src/protocols/silc/silc.c:52
+#: src/protocols/silc/buddy.c:1396 src/protocols/silc/silc.c:46
+#: src/protocols/silc/silc.c:79
 msgid "Hyper Active"
 msgstr "Hyper Active"
 
-#: src/protocols/silc/buddy.c:1422
+#: src/protocols/silc/buddy.c:1398
 msgid "Robot"
 msgstr "Robot"
 
-#: src/protocols/silc/buddy.c:1429 src/protocols/silc/silc.c:643
+#: src/protocols/silc/buddy.c:1405 src/protocols/silc/silc.c:629
 #: src/protocols/silc/util.c:472
 msgid "Happy"
 msgstr "Happy"
 
-#: src/protocols/silc/buddy.c:1431 src/protocols/silc/silc.c:645
+#: src/protocols/silc/buddy.c:1407 src/protocols/silc/silc.c:631
 #: src/protocols/silc/util.c:474
 msgid "Sad"
 msgstr "Sad"
 
-#: src/protocols/silc/buddy.c:1433 src/protocols/silc/silc.c:647
+#: src/protocols/silc/buddy.c:1409 src/protocols/silc/silc.c:633
 #: src/protocols/silc/util.c:476
 msgid "Angry"
 msgstr "Angry"
 
-#: src/protocols/silc/buddy.c:1435 src/protocols/silc/silc.c:649
+#: src/protocols/silc/buddy.c:1411 src/protocols/silc/silc.c:635
 #: src/protocols/silc/util.c:478
 msgid "Jealous"
 msgstr "Jealous"
 
-#: src/protocols/silc/buddy.c:1437 src/protocols/silc/silc.c:651
+#: src/protocols/silc/buddy.c:1413 src/protocols/silc/silc.c:637
 #: src/protocols/silc/util.c:480
 msgid "Ashamed"
 msgstr "Ashamed"
 
-#: src/protocols/silc/buddy.c:1439 src/protocols/silc/silc.c:653
+#: src/protocols/silc/buddy.c:1415 src/protocols/silc/silc.c:639
 #: src/protocols/silc/util.c:482
 msgid "Invincible"
 msgstr "Invincible"
 
-#: src/protocols/silc/buddy.c:1441 src/protocols/silc/silc.c:655
+#: src/protocols/silc/buddy.c:1417 src/protocols/silc/silc.c:641
 #: src/protocols/silc/util.c:484
 msgid "In Love"
 msgstr "In Love"
 
-#: src/protocols/silc/buddy.c:1443 src/protocols/silc/silc.c:657
+#: src/protocols/silc/buddy.c:1419 src/protocols/silc/silc.c:643
 #: src/protocols/silc/util.c:486
 msgid "Sleepy"
 msgstr "Sleepy"
 
-#: src/protocols/silc/buddy.c:1445 src/protocols/silc/silc.c:659
+#: src/protocols/silc/buddy.c:1421 src/protocols/silc/silc.c:645
 #: src/protocols/silc/util.c:488
 msgid "Bored"
 msgstr "Bored"
 
-#: src/protocols/silc/buddy.c:1447 src/protocols/silc/silc.c:661
+#: src/protocols/silc/buddy.c:1423 src/protocols/silc/silc.c:647
 #: src/protocols/silc/util.c:490
 msgid "Excited"
 msgstr "Excited"
 
-#: src/protocols/silc/buddy.c:1449 src/protocols/silc/silc.c:663
+#: src/protocols/silc/buddy.c:1425 src/protocols/silc/silc.c:649
 #: src/protocols/silc/util.c:492
 msgid "Anxious"
 msgstr "Anxious"
 
-#: src/protocols/silc/buddy.c:1481 src/protocols/silc/ops.c:982
+#: src/protocols/silc/buddy.c:1457 src/protocols/silc/ops.c:980
 msgid "User Modes"
 msgstr "User Modes"
 
-#: src/protocols/silc/buddy.c:1490 src/protocols/silc/ops.c:991
+#: src/protocols/silc/buddy.c:1466 src/protocols/silc/ops.c:989
 msgid "Mood"
 msgstr "Mood"
 
-#: src/protocols/silc/buddy.c:1494 src/protocols/silc/ops.c:997
+#: src/protocols/silc/buddy.c:1470 src/protocols/silc/ops.c:995
 msgid "Status Text"
 msgstr "Status Text"
 
-#: src/protocols/silc/buddy.c:1499 src/protocols/silc/ops.c:1003
+#: src/protocols/silc/buddy.c:1475 src/protocols/silc/ops.c:1001
 msgid "Preferred Contact"
 msgstr "Preferred Contact"
 
-#: src/protocols/silc/buddy.c:1504 src/protocols/silc/ops.c:1008
+#: src/protocols/silc/buddy.c:1480 src/protocols/silc/ops.c:1006
 msgid "Preferred Language"
 msgstr "Preferred Language"
 
-#: src/protocols/silc/buddy.c:1509 src/protocols/silc/ops.c:1013
+#: src/protocols/silc/buddy.c:1485 src/protocols/silc/ops.c:1011
 msgid "Device"
 msgstr "Device"
 
-#: src/protocols/silc/buddy.c:1514 src/protocols/silc/ops.c:1018
-#: src/protocols/silc/silc.c:711 src/protocols/silc/silc.c:713
+#: src/protocols/silc/buddy.c:1490 src/protocols/silc/ops.c:1016
+#: src/protocols/silc/silc.c:697 src/protocols/silc/silc.c:699
 msgid "Timezone"
 msgstr "Time Zone"
 
-#: src/protocols/silc/buddy.c:1519 src/protocols/silc/ops.c:1023
+#: src/protocols/silc/buddy.c:1495 src/protocols/silc/ops.c:1021
 msgid "Geolocation"
 msgstr "Geolocation"
 
-#: src/protocols/silc/buddy.c:1562
+#: src/protocols/silc/buddy.c:1538
 msgid "Reset IM Key"
 msgstr "Reset IM Key"
 
-#: src/protocols/silc/buddy.c:1567
+#: src/protocols/silc/buddy.c:1543
 msgid "IM with Key Exchange"
 msgstr "IM with Key Exchange"
 
-#: src/protocols/silc/buddy.c:1571
+#: src/protocols/silc/buddy.c:1547
 msgid "IM with Password"
 msgstr "IM with Password"
 
-#: src/protocols/silc/buddy.c:1583
+#: src/protocols/silc/buddy.c:1558
 msgid "Get Public Key..."
 msgstr "Get Public Key..."
 
-#: src/protocols/silc/buddy.c:1590 src/protocols/silc/ops.c:1413
+#: src/protocols/silc/buddy.c:1564 src/protocols/silc/ops.c:1417
 msgid "Kill User"
 msgstr "Kill User"
 
-#: src/protocols/silc/chat.c:38
+#: src/protocols/silc/chat.c:37
 msgid "_Passphrase:"
 msgstr "_Passphrase:"
 
-#: src/protocols/silc/chat.c:79
+#: src/protocols/silc/chat.c:78
 #, c-format
 msgid "Channel %s does not exist in the network"
 msgstr "Channel %s does not exist in the network"
 
-#: src/protocols/silc/chat.c:80 src/protocols/silc/chat.c:172
+#: src/protocols/silc/chat.c:79 src/protocols/silc/chat.c:171
 msgid "Channel Information"
 msgstr "Channel Information"
 
-#: src/protocols/silc/chat.c:81
+#: src/protocols/silc/chat.c:80
 msgid "Cannot get channel information"
 msgstr "Cannot get channel information"
 
-#: src/protocols/silc/chat.c:118
+#: src/protocols/silc/chat.c:117
 #, c-format
 msgid "<b>Channel Name:</b> %s"
 msgstr "<b>Channel Name:</b> %s"
 
-#: src/protocols/silc/chat.c:121
+#: src/protocols/silc/chat.c:120
 #, c-format
 msgid "<br><b>User Count:</b> %d"
 msgstr "<br><b>User Count:</b> %d"
 
-#: src/protocols/silc/chat.c:128
+#: src/protocols/silc/chat.c:127
 #, c-format
 msgid "<br><b>Channel Founder:</b> %s"
 msgstr "<br><b>Channel Founder:</b> %s"
 
-#: src/protocols/silc/chat.c:137
+#: src/protocols/silc/chat.c:136
 #, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
 msgstr "<br><b>Channel Cipher:</b> %s"
 
-#: src/protocols/silc/chat.c:140
+#: src/protocols/silc/chat.c:139
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
 msgstr "<br><b>Channel HMAC:</b> %s"
 
-#: src/protocols/silc/chat.c:145
+#: src/protocols/silc/chat.c:144
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>Channel Topic:</b><br>%s"
 
-#: src/protocols/silc/chat.c:150
+#: src/protocols/silc/chat.c:149
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>Channel Modes:</b> "
 
-#: src/protocols/silc/chat.c:163
+#: src/protocols/silc/chat.c:162
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr "<br><b>Founder Key Fingerprint:</b><br>%s"
 
-#: src/protocols/silc/chat.c:164
+#: src/protocols/silc/chat.c:163
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr "<br><b>Founder Key Babbleprint:</b><br>%s"
 
-#: src/protocols/silc/chat.c:234
+#: src/protocols/silc/chat.c:233
 msgid "Add Channel Public Key"
 msgstr "Add Channel Public Key"
 
 #. Add new public key
-#: src/protocols/silc/chat.c:289
+#: src/protocols/silc/chat.c:288
 msgid "Open Public Key..."
 msgstr "Open Public Key..."
 
-#: src/protocols/silc/chat.c:398
+#: src/protocols/silc/chat.c:397
 msgid "Channel Passphrase"
 msgstr "Channel Passphrase"
 
-#: src/protocols/silc/chat.c:405
+#: src/protocols/silc/chat.c:404
 msgid "Channel Public Keys List"
 msgstr "Channel Public Keys List"
 
-#: src/protocols/silc/chat.c:410
+#: src/protocols/silc/chat.c:409
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -9333,123 +9353,123 @@
 "channel public keys are set then only users whose public keys are listed are "
 "able to join."
 
-#: src/protocols/silc/chat.c:419 src/protocols/silc/chat.c:420
-#: src/protocols/silc/chat.c:457 src/protocols/silc/chat.c:458
-#: src/protocols/silc/chat.c:891
+#: src/protocols/silc/chat.c:418 src/protocols/silc/chat.c:419
+#: src/protocols/silc/chat.c:456 src/protocols/silc/chat.c:457
+#: src/protocols/silc/chat.c:886
 msgid "Channel Authentication"
 msgstr "Channel Authentication"
 
-#: src/protocols/silc/chat.c:421 src/protocols/silc/chat.c:459
+#: src/protocols/silc/chat.c:420 src/protocols/silc/chat.c:458
 msgid "Add / Remove"
 msgstr "Add / Remove"
 
-#: src/protocols/silc/chat.c:576
+#: src/protocols/silc/chat.c:575
 msgid "Group Name"
 msgstr "Group Name"
 
-#: src/protocols/silc/chat.c:580 src/protocols/silc/ops.c:1698
+#: src/protocols/silc/chat.c:579 src/protocols/silc/ops.c:1697
 msgid "Passphrase"
 msgstr "Passphrase"
 
-#: src/protocols/silc/chat.c:591
+#: src/protocols/silc/chat.c:590
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "Please enter the %s channel private group name and passphrase."
 
-#: src/protocols/silc/chat.c:593
+#: src/protocols/silc/chat.c:592
 msgid "Add Channel Private Group"
 msgstr "Add Channel Private Group"
 
-#: src/protocols/silc/chat.c:720
+#: src/protocols/silc/chat.c:719
 msgid "User Limit"
 msgstr "User Limit"
 
-#: src/protocols/silc/chat.c:721
+#: src/protocols/silc/chat.c:720
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr "Set user limit on channel. Set to zero to reset user limit."
 
-#: src/protocols/silc/chat.c:863
+#: src/protocols/silc/chat.c:862
 msgid "Get Info"
 msgstr "Get Info"
 
-#: src/protocols/silc/chat.c:871
+#: src/protocols/silc/chat.c:869
 msgid "Invite List"
 msgstr "Invite List"
 
-#: src/protocols/silc/chat.c:876
+#: src/protocols/silc/chat.c:873
 msgid "Ban List"
 msgstr "Ban List"
 
-#: src/protocols/silc/chat.c:884
+#: src/protocols/silc/chat.c:880
 msgid "Add Private Group"
 msgstr "Add Private Group"
 
-#: src/protocols/silc/chat.c:897
+#: src/protocols/silc/chat.c:891
 msgid "Reset Permanent"
 msgstr "Reset Permanent"
 
+#: src/protocols/silc/chat.c:895
+msgid "Set Permanent"
+msgstr "Set Permanent"
+
 #: src/protocols/silc/chat.c:902
-msgid "Set Permanent"
-msgstr "Set Permanent"
-
-#: src/protocols/silc/chat.c:910
 msgid "Set User Limit"
 msgstr "Set User Limit"
 
-#: src/protocols/silc/chat.c:916
+#: src/protocols/silc/chat.c:907
 msgid "Reset Topic Restriction"
 msgstr "Reset Topic Restriction"
 
-#: src/protocols/silc/chat.c:921
+#: src/protocols/silc/chat.c:911
 msgid "Set Topic Restriction"
 msgstr "Set Topic Restriction"
 
-#: src/protocols/silc/chat.c:928
+#: src/protocols/silc/chat.c:917
 msgid "Reset Private Channel"
 msgstr "Reset Private Channel"
 
-#: src/protocols/silc/chat.c:933
+#: src/protocols/silc/chat.c:921
 msgid "Set Private Channel"
 msgstr "Set Private Channel"
 
-#: src/protocols/silc/chat.c:940
+#: src/protocols/silc/chat.c:927
 msgid "Reset Secret Channel"
 msgstr "Reset Secret Channel"
 
-#: src/protocols/silc/chat.c:945
+#: src/protocols/silc/chat.c:931
 msgid "Set Secret Channel"
 msgstr "Set Secret Channel"
 
-#: src/protocols/silc/chat.c:1008
+#: src/protocols/silc/chat.c:993
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "You are channel founder on <I>%s</I>"
 
-#: src/protocols/silc/chat.c:1012
+#: src/protocols/silc/chat.c:997
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "Channel founder on <I>%s</I> is <I>%s</I>"
 
-#: src/protocols/silc/chat.c:1071
+#: 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:1073
+#: src/protocols/silc/chat.c:1058
 msgid "Join Private Group"
 msgstr "Join Private Group"
 
-#: src/protocols/silc/chat.c:1074
+#: src/protocols/silc/chat.c:1059
 msgid "Cannot join private group"
 msgstr "Cannot join private group"
 
-#: src/protocols/silc/chat.c:1267 src/protocols/silc/silc.c:926
+#: src/protocols/silc/chat.c:1252 src/protocols/silc/silc.c:911
 msgid "Cannot call command"
 msgstr "Cannot call command"
 
-#: src/protocols/silc/chat.c:1268 src/protocols/silc/silc.c:927
+#: src/protocols/silc/chat.c:1253 src/protocols/silc/silc.c:912
 msgid "Unknown command"
 msgstr "Unknown command"
 
@@ -9476,8 +9496,8 @@
 msgstr "Key agreement failed"
 
 #: src/protocols/silc/ft.c:102
-msgid "File transfer session does not exist"
-msgstr "File transfer session does not exist"
+msgid "File transfer sessions does not exist"
+msgstr "File transfer sessions does not exist"
 
 #: src/protocols/silc/ft.c:206
 msgid "No file transfer session active"
@@ -9499,152 +9519,150 @@
 msgid "Cannot send file"
 msgstr "Cannot send file"
 
-#: src/protocols/silc/ops.c:341 src/protocols/silc/ops.c:350
-#: src/protocols/silc/ops.c:359
+#: src/protocols/silc/ops.c:339 src/protocols/silc/ops.c:348
+#: src/protocols/silc/ops.c:357
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr "%s has changed the topic of <I>%s</I> to: %s"
 
-#: src/protocols/silc/ops.c:425
+#: src/protocols/silc/ops.c:423
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr "<I>%s</I> set channel <I>%s</I> modes to: %s"
 
-#: src/protocols/silc/ops.c:429
+#: src/protocols/silc/ops.c:427
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr "<I>%s</I> removed all channel <I>%s</I> modes"
 
-#: src/protocols/silc/ops.c:462
+#: src/protocols/silc/ops.c:460
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr "<I>%s</I> set <I>%s's</I> modes to: %s"
 
-#: src/protocols/silc/ops.c:470
+#: src/protocols/silc/ops.c:468
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr "<I>%s</I> removed all <I>%s's</I> modes"
 
-#: src/protocols/silc/ops.c:499
+#: src/protocols/silc/ops.c:497
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 
-#: src/protocols/silc/ops.c:529 src/protocols/silc/ops.c:534
-#: src/protocols/silc/ops.c:539
+#: src/protocols/silc/ops.c:527 src/protocols/silc/ops.c:532
+#: src/protocols/silc/ops.c:537
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr "You have been killed by %s (%s)"
 
-#: src/protocols/silc/ops.c:560 src/protocols/silc/ops.c:565
-#: src/protocols/silc/ops.c:570
+#: src/protocols/silc/ops.c:558 src/protocols/silc/ops.c:563
+#: src/protocols/silc/ops.c:568
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr "Killed by %s (%s)"
 
-#: src/protocols/silc/ops.c:616
+#: src/protocols/silc/ops.c:614
 msgid "Server signoff"
 msgstr "Server signoff"
 
-#: src/protocols/silc/ops.c:803
+#: src/protocols/silc/ops.c:801
 msgid "Personal Information"
 msgstr "Personal Information"
 
-#: src/protocols/silc/ops.c:826
+#: src/protocols/silc/ops.c:824
 msgid "Birth Day"
 msgstr "Birth Day"
 
-#: src/protocols/silc/ops.c:830
+#: src/protocols/silc/ops.c:828
 msgid "Job Title"
 msgstr "Job Title"
 
-#: src/protocols/silc/ops.c:834
+#: src/protocols/silc/ops.c:832
 msgid "Job Role"
 msgstr "Job Role"
 
-#: src/protocols/silc/ops.c:838
+#: src/protocols/silc/ops.c:836
 msgid "Organization"
 msgstr "Organization"
 
-#: src/protocols/silc/ops.c:842
+#: src/protocols/silc/ops.c:840
 msgid "Unit"
 msgstr "Unit"
 
-#: src/protocols/silc/ops.c:861
+#: src/protocols/silc/ops.c:859
 msgid "EMail"
 msgstr "EMail"
 
-#: src/protocols/silc/ops.c:866
+#: src/protocols/silc/ops.c:864
 msgid "Note"
 msgstr "Note"
 
-#: src/protocols/silc/ops.c:914
+#: src/protocols/silc/ops.c:912
 msgid "Join Chat"
 msgstr "Join Chat"
 
-#: src/protocols/silc/ops.c:1070 src/protocols/silc/ops.c:1142
+#: src/protocols/silc/ops.c:1068 src/protocols/silc/ops.c:1139
 msgid "Public Key Fingerprint"
 msgstr "Public Key Fingerprint"
 
-#: src/protocols/silc/ops.c:1071 src/protocols/silc/ops.c:1143
+#: src/protocols/silc/ops.c:1069 src/protocols/silc/ops.c:1140
 msgid "Public Key Babbleprint"
 msgstr "Public Key Babbleprint"
 
-#: src/protocols/silc/ops.c:1084
+#: src/protocols/silc/ops.c:1082
 msgid "More..."
 msgstr "More..."
 
-#: src/protocols/silc/ops.c:1159 src/protocols/silc/silc.c:814
+#: src/protocols/silc/ops.c:1155 src/protocols/silc/silc.c:800
 msgid "Detach From Server"
 msgstr "Detach From Server"
 
-#: src/protocols/silc/ops.c:1159
+#: src/protocols/silc/ops.c:1155
 msgid "Cannot detach"
 msgstr "Cannot detach"
 
-#: src/protocols/silc/ops.c:1170
+#: src/protocols/silc/ops.c:1166
 msgid "Cannot set topic"
 msgstr "Cannot set topic"
 
-#: src/protocols/silc/ops.c:1202
+#: src/protocols/silc/ops.c:1204
 msgid "Failed to change nickname"
 msgstr "Failed to change nickname"
 
-#: src/protocols/silc/ops.c:1250
-#, fuzzy
+#: src/protocols/silc/ops.c:1241 src/protocols/silc/ops.c:1252
 msgid "Roomlist"
-msgstr "Room List"
-
-#: src/protocols/silc/ops.c:1250
-#, fuzzy
+msgstr "Roomlist"
+
+#: src/protocols/silc/ops.c:1241 src/protocols/silc/ops.c:1252
 msgid "Cannot get room list"
-msgstr "Cannot get server statistics"
-
-#: src/protocols/silc/ops.c:1295
+msgstr "Cannot get room list"
+
+#: src/protocols/silc/ops.c:1297
 msgid "No public key was received"
 msgstr "No public key was received"
 
-#: src/protocols/silc/ops.c:1308 src/protocols/silc/ops.c:1321
+#: src/protocols/silc/ops.c:1310 src/protocols/silc/ops.c:1324
 msgid "Server Information"
 msgstr "Server Information"
 
-#: src/protocols/silc/ops.c:1309
+#: src/protocols/silc/ops.c:1311
 msgid "Cannot get server information"
 msgstr "Cannot get server information"
 
-#: src/protocols/silc/ops.c:1338 src/protocols/silc/ops.c:1347
+#: src/protocols/silc/ops.c:1342 src/protocols/silc/ops.c:1351
 msgid "Server Statistics"
 msgstr "Server Statistics"
 
-#: src/protocols/silc/ops.c:1339
+#: src/protocols/silc/ops.c:1343
 msgid "Cannot get server statistics"
 msgstr "Cannot get server statistics"
 
-#: src/protocols/silc/ops.c:1348
+#: src/protocols/silc/ops.c:1352
 msgid "No server statistics available"
 msgstr "No server statistics available"
 
-#: src/protocols/silc/ops.c:1370
+#: src/protocols/silc/ops.c:1374
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -9679,98 +9697,98 @@
 "Total server operators: %d\n"
 "Total router operators: %d\n"
 
-#: src/protocols/silc/ops.c:1393
+#: src/protocols/silc/ops.c:1397
 msgid "Network Statistics"
 msgstr "Network Statistics"
 
-#: src/protocols/silc/ops.c:1401 src/protocols/silc/ops.c:1406
+#: src/protocols/silc/ops.c:1405 src/protocols/silc/ops.c:1410
 msgid "Ping"
 msgstr "Ping"
 
-#: src/protocols/silc/ops.c:1401
+#: src/protocols/silc/ops.c:1405
 msgid "Ping failed"
 msgstr "Ping failed"
 
-#: src/protocols/silc/ops.c:1406
+#: src/protocols/silc/ops.c:1410
 msgid "Ping reply received from server"
 msgstr "Ping reply received from server"
 
-#: src/protocols/silc/ops.c:1414
+#: src/protocols/silc/ops.c:1418
 msgid "Could not kill user"
 msgstr "Could not kill user"
 
-#: src/protocols/silc/ops.c:1498
+#: src/protocols/silc/ops.c:1499
 msgid "Error during connecting to SILC Server"
 msgstr "Error during connecting to SILC Server"
 
-#: src/protocols/silc/ops.c:1503
+#: src/protocols/silc/ops.c:1504
 msgid "Key Exchange failed"
 msgstr "Key Exchange failed"
 
-#: src/protocols/silc/ops.c:1512
+#: src/protocols/silc/ops.c:1513
 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:1547
+#: src/protocols/silc/ops.c:1548
 msgid "Disconnected by server"
 msgstr "Disconnected by server"
 
-#: src/protocols/silc/ops.c:1609 src/protocols/silc/ops.c:1656
-#: src/protocols/silc/silc.c:203
+#: src/protocols/silc/ops.c:1608 src/protocols/silc/ops.c:1655
+#: src/protocols/silc/silc.c:178
 msgid "Resuming session"
 msgstr "Resuming session"
 
-#: src/protocols/silc/ops.c:1611
+#: src/protocols/silc/ops.c:1610
 msgid "Authenticating connection"
 msgstr "Authenticating connection"
 
-#: src/protocols/silc/ops.c:1658
+#: src/protocols/silc/ops.c:1657
 msgid "Verifying server public key"
 msgstr "Verifying server public key"
 
-#: src/protocols/silc/ops.c:1699
+#: src/protocols/silc/ops.c:1698
 msgid "Passphrase required"
 msgstr "Passphrase required"
 
-#: src/protocols/silc/ops.c:1728
+#: src/protocols/silc/ops.c:1727
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Failure: Version mismatch; upgrade your client"
 
-#: src/protocols/silc/ops.c:1731
+#: src/protocols/silc/ops.c:1730
 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:1734
+#: src/protocols/silc/ops.c:1733
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "Failure: Remote does not support proposed KE group"
 
-#: src/protocols/silc/ops.c:1737
+#: src/protocols/silc/ops.c:1736
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "Failure: Remote does not support proposed cipher"
 
-#: src/protocols/silc/ops.c:1740
+#: src/protocols/silc/ops.c:1739
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "Failure: Remote does not support proposed PKCS"
 
-#: src/protocols/silc/ops.c:1743
+#: src/protocols/silc/ops.c:1742
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "Failure: Remote does not support proposed hash function"
 
-#: src/protocols/silc/ops.c:1746
+#: src/protocols/silc/ops.c:1745
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "Failure: Remote does not support proposed HMAC"
 
-#: src/protocols/silc/ops.c:1748
+#: src/protocols/silc/ops.c:1747
 msgid "Failure: Incorrect signature"
 msgstr "Failure: Incorrect signature"
 
-#: src/protocols/silc/ops.c:1750
+#: src/protocols/silc/ops.c:1749
 msgid "Failure: Invalid cookie"
 msgstr "Failure: Invalid cookie"
 
-#: src/protocols/silc/ops.c:1761
+#: src/protocols/silc/ops.c:1760
 msgid "Failure: Authentication failed"
 msgstr "Failure: Authentication failed"
 
@@ -9813,36 +9831,36 @@
 msgid "Unsupported public key type"
 msgstr "Unsupported public key type"
 
-#: src/protocols/silc/silc.c:163
+#: src/protocols/silc/silc.c:138
 msgid "Connection failed"
 msgstr "Connection failed"
 
-#: src/protocols/silc/silc.c:195
+#: src/protocols/silc/silc.c:170
 msgid "Cannot initialize SILC Client connection"
 msgstr "Cannot initialize SILC Client connection"
 
-#: src/protocols/silc/silc.c:206
+#: src/protocols/silc/silc.c:181
 msgid "Performing key exchange"
 msgstr "Performing key exchange"
 
-#: src/protocols/silc/silc.c:279
+#: src/protocols/silc/silc.c:254
 msgid "Out of memory"
 msgstr "Out of memory"
 
 #. Progress
-#: src/protocols/silc/silc.c:318
+#: src/protocols/silc/silc.c:293
 msgid "Connecting to SILC Server"
 msgstr "Connecting to SILC Server"
 
-#: src/protocols/silc/silc.c:639
+#: src/protocols/silc/silc.c:625
 msgid "Your Current Mood"
 msgstr "Your Current Mood"
 
-#: src/protocols/silc/silc.c:641
+#: src/protocols/silc/silc.c:627
 msgid "Normal"
 msgstr "Normal"
 
-#: src/protocols/silc/silc.c:666
+#: src/protocols/silc/silc.c:652
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9850,43 +9868,43 @@
 "\n"
 "Your Preferred Contact Methods"
 
-#: src/protocols/silc/silc.c:674 src/protocols/silc/util.c:517
+#: src/protocols/silc/silc.c:660 src/protocols/silc/util.c:517
 msgid "SMS"
 msgstr "SMS"
 
-#: src/protocols/silc/silc.c:676 src/protocols/silc/util.c:519
+#: src/protocols/silc/silc.c:662 src/protocols/silc/util.c:519
 msgid "MMS"
 msgstr "MMS"
 
-#: src/protocols/silc/silc.c:678 src/protocols/silc/util.c:521
+#: src/protocols/silc/silc.c:664 src/protocols/silc/util.c:521
 msgid "Video Conferencing"
 msgstr "Video Conferencing"
 
-#: src/protocols/silc/silc.c:683
+#: src/protocols/silc/silc.c:669
 msgid "Your Current Status"
 msgstr "Your Current Status"
 
-#: src/protocols/silc/silc.c:690
+#: src/protocols/silc/silc.c:676
 msgid "Online Services"
 msgstr "Online Services"
 
-#: src/protocols/silc/silc.c:693
+#: src/protocols/silc/silc.c:679
 msgid "Let others see what services you are using"
 msgstr "Let others see what services you are using"
 
-#: src/protocols/silc/silc.c:699
+#: src/protocols/silc/silc.c:685
 msgid "Let others see what computer you are using"
 msgstr "Let others see what computer you are using"
 
-#: src/protocols/silc/silc.c:706
+#: src/protocols/silc/silc.c:692
 msgid "Your VCard File"
 msgstr "Your VCard File"
 
-#: src/protocols/silc/silc.c:719 src/protocols/silc/silc.c:720
+#: src/protocols/silc/silc.c:705 src/protocols/silc/silc.c:706
 msgid "User Online Status Attributes"
 msgstr "User Online Status Attributes"
 
-#: src/protocols/silc/silc.c:721
+#: src/protocols/silc/silc.c:707
 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 "
@@ -9896,127 +9914,131 @@
 "information. Please fill the information you would like other users to see "
 "about yourself."
 
-#: src/protocols/silc/silc.c:761 src/protocols/silc/silc.c:767
-#: src/protocols/silc/silc.c:1171
+#: src/protocols/silc/silc.c:747 src/protocols/silc/silc.c:753
+#: src/protocols/silc/silc.c:1160
 msgid "Message of the Day"
 msgstr "Message of the Day"
 
-#: src/protocols/silc/silc.c:761
+#: src/protocols/silc/silc.c:747
 msgid "No Message of the Day available"
 msgstr "No Message of the Day available"
 
-#: src/protocols/silc/silc.c:762 src/protocols/silc/silc.c:1166
+#: src/protocols/silc/silc.c:748 src/protocols/silc/silc.c:1155
 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:809
+#: src/protocols/silc/silc.c:795
 msgid "Online Status"
 msgstr "Online Status"
 
-#: src/protocols/silc/silc.c:818
+#: src/protocols/silc/silc.c:804
 msgid "View Message of the Day"
 msgstr "View Message of the Day"
 
-#: src/protocols/silc/silc.c:891
+#: src/protocols/silc/silc.c:876
 #, 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:1042
+#: src/protocols/silc/silc.c:985
+msgid "Failed to leave channel"
+msgstr "Failed to leave channel"
+
+#: src/protocols/silc/silc.c:1031
 msgid "Topic too long"
 msgstr "Topic too long"
 
-#: src/protocols/silc/silc.c:1123
+#: src/protocols/silc/silc.c:1112
 msgid "You must specify a nick"
 msgstr "You must specify a nick"
 
-#: src/protocols/silc/silc.c:1225
+#: src/protocols/silc/silc.c:1214
 #, c-format
 msgid "channel %s not found"
 msgstr "channel %s not found"
 
-#: src/protocols/silc/silc.c:1230
+#: src/protocols/silc/silc.c:1219
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "channel modes for %s: %s"
 
-#: src/protocols/silc/silc.c:1232
+#: src/protocols/silc/silc.c:1221
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "no channel modes are set on %s"
 
-#: src/protocols/silc/silc.c:1245
+#: src/protocols/silc/silc.c:1234
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "Failed to set cmodes for %s"
 
-#: src/protocols/silc/silc.c:1275
+#: src/protocols/silc/silc.c:1264
 #, 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:1338
+#: src/protocols/silc/silc.c:1327
 msgid "part [channel]:  Leave the chat"
 msgstr "part [channel]:  Leave the chat"
 
-#: src/protocols/silc/silc.c:1342
+#: src/protocols/silc/silc.c:1331
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [channel]:  Leave the chat"
 
-#: src/protocols/silc/silc.c:1346
+#: src/protocols/silc/silc.c:1335
 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:1351
+#: src/protocols/silc/silc.c:1340
 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:1355
+#: src/protocols/silc/silc.c:1344
 msgid "list:  List channels on this network"
 msgstr "list:  List channels on this network"
 
-#: src/protocols/silc/silc.c:1359
+#: src/protocols/silc/silc.c:1348
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;nick&gt;:  View nick's information"
 
-#: src/protocols/silc/silc.c:1363 src/protocols/zephyr/zephyr.c:2597
+#: src/protocols/silc/silc.c:1352 src/protocols/zephyr/zephyr.c:2478
 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:1367
+#: src/protocols/silc/silc.c:1356
 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:1371
+#: src/protocols/silc/silc.c:1360
 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:1375
+#: src/protocols/silc/silc.c:1364
 msgid "detach:  Detach this session"
 msgstr "detach:  Detach this session"
 
-#: src/protocols/silc/silc.c:1379
+#: src/protocols/silc/silc.c:1368
 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:1383
+#: src/protocols/silc/silc.c:1372
 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:1389
+#: src/protocols/silc/silc.c:1378
 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:1393
+#: src/protocols/silc/silc.c:1382
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;newnick&gt;:  Change your nickname"
 
-#: src/protocols/silc/silc.c:1397
+#: src/protocols/silc/silc.c:1386
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;nick&gt;:  View nick's information"
 
-#: src/protocols/silc/silc.c:1401
+#: src/protocols/silc/silc.c:1390
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
@@ -10024,7 +10046,7 @@
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
 
-#: src/protocols/silc/silc.c:1405
+#: src/protocols/silc/silc.c:1394
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
@@ -10032,15 +10054,15 @@
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
 
-#: src/protocols/silc/silc.c:1409
+#: src/protocols/silc/silc.c:1398
 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:1413
+#: src/protocols/silc/silc.c:1402
 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:1417
+#: src/protocols/silc/silc.c:1406
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
@@ -10048,35 +10070,35 @@
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
 
-#: src/protocols/silc/silc.c:1421
+#: src/protocols/silc/silc.c:1410
 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:1425
+#: src/protocols/silc/silc.c:1414
 msgid "info [server]:  View server administrative details"
 msgstr "info [server]:  View server administrative details"
 
-#: src/protocols/silc/silc.c:1429
+#: src/protocols/silc/silc.c:1418
 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:1433
+#: src/protocols/silc/silc.c:1422
 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:1437
+#: src/protocols/silc/silc.c:1426
 msgid "stats:  View server and network statistics"
 msgstr "stats:  View server and network statistics"
 
-#: src/protocols/silc/silc.c:1441
+#: src/protocols/silc/silc.c:1430
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:  Send PING to the connected server"
 
-#: src/protocols/silc/silc.c:1446
+#: src/protocols/silc/silc.c:1435
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;channel&gt;:  List users in channel"
 
-#: src/protocols/silc/silc.c:1450
+#: src/protocols/silc/silc.c:1439
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -10084,27 +10106,27 @@
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
 
-#: src/protocols/silc/silc.c:1462
+#: src/protocols/silc/silc.c:1451
 msgid "Instant Messages"
 msgstr "Instant Messages"
 
-#: src/protocols/silc/silc.c:1467
+#: src/protocols/silc/silc.c:1456
 msgid "Digitally sign all IM messages"
 msgstr "Digitally sign all IM messages"
 
-#: src/protocols/silc/silc.c:1472
+#: src/protocols/silc/silc.c:1461
 msgid "Verify all IM message signatures"
 msgstr "Verify all IM message signatures"
 
-#: src/protocols/silc/silc.c:1475
+#: src/protocols/silc/silc.c:1464
 msgid "Channel Messages"
 msgstr "Channel Messages"
 
-#: src/protocols/silc/silc.c:1480
+#: src/protocols/silc/silc.c:1469
 msgid "Digitally sign all channel messages"
 msgstr "Digitally sign all channel messages"
 
-#: src/protocols/silc/silc.c:1485
+#: src/protocols/silc/silc.c:1474
 msgid "Verify all channel message signatures"
 msgstr "Verify all channel message signatures"
 
@@ -10117,42 +10139,42 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/silc/silc.c:1573
+#: src/protocols/silc/silc.c:1563
 msgid "SILC Protocol Plugin"
 msgstr "SILC Protocol Plugin"
 
 #. *  description
-#: src/protocols/silc/silc.c:1575
+#: src/protocols/silc/silc.c:1565
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Secure Internet Live Conferencing (SILC) Protocol"
 
-#: src/protocols/silc/silc.c:1609
+#: src/protocols/silc/silc.c:1599
 #, fuzzy
 msgid "Public Key file"
 msgstr "Public Key File"
 
-#: src/protocols/silc/silc.c:1613
+#: src/protocols/silc/silc.c:1603
 #, fuzzy
 msgid "Private Key file"
 msgstr "Private Key File"
 
-#: src/protocols/silc/silc.c:1616
+#: src/protocols/silc/silc.c:1606
 msgid "Public key authentication"
 msgstr "Public key authentication"
 
-#: src/protocols/silc/silc.c:1620
+#: src/protocols/silc/silc.c:1610
 msgid "Reject watching by other users"
 msgstr "Reject watching by other users"
 
-#: src/protocols/silc/silc.c:1623
+#: src/protocols/silc/silc.c:1613
 msgid "Block invites"
 msgstr "Block invites"
 
-#: src/protocols/silc/silc.c:1626
+#: src/protocols/silc/silc.c:1616
 msgid "Block IMs without Key Exchange"
 msgstr "Block IMs without Key Exchange"
 
-#: src/protocols/silc/silc.c:1629
+#: src/protocols/silc/silc.c:1619
 msgid "Reject online status attribute requests"
 msgstr "Reject online status attribute requests"
 
@@ -10243,115 +10265,115 @@
 msgid "Terminal"
 msgstr "Terminal"
 
-#: src/protocols/toc/toc.c:139
+#: src/protocols/toc/toc.c:137
 #, c-format
 msgid "Looking up %s"
 msgstr "Looking up %s"
 
-#: src/protocols/toc/toc.c:200
+#: src/protocols/toc/toc.c:198
 #, c-format
 msgid "Signon: %s"
 msgstr "Signon: %s"
 
-#: src/protocols/toc/toc.c:482
+#: src/protocols/toc/toc.c:480
 #, c-format
 msgid "Unable to write file %s."
 msgstr "Unable to write file %s."
 
-#: src/protocols/toc/toc.c:485
+#: src/protocols/toc/toc.c:483
 #, c-format
 msgid "Unable to read file %s."
 msgstr "Unable to read file %s."
 
-#: src/protocols/toc/toc.c:488
+#: src/protocols/toc/toc.c:486
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "Message too long, last %s bytes truncated."
 
-#: src/protocols/toc/toc.c:491
+#: src/protocols/toc/toc.c:489
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s not currently logged in."
 
-#: src/protocols/toc/toc.c:494
+#: src/protocols/toc/toc.c:492
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "Warning of %s not allowed."
 
-#: src/protocols/toc/toc.c:497
+#: src/protocols/toc/toc.c:495
 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:500
+#: src/protocols/toc/toc.c:498
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "Chat in %s is not available."
 
-#: src/protocols/toc/toc.c:503
+#: src/protocols/toc/toc.c:501
 #, 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:506
+#: src/protocols/toc/toc.c:504
 #, 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:509
+#: src/protocols/toc/toc.c:507
 #, 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:512
+#: src/protocols/toc/toc.c:510
 msgid "Failure."
 msgstr "Failure."
 
-#: src/protocols/toc/toc.c:515
+#: src/protocols/toc/toc.c:513
 msgid "Too many matches."
 msgstr "Too many matches."
 
-#: src/protocols/toc/toc.c:518
+#: src/protocols/toc/toc.c:516
 msgid "Need more qualifiers."
 msgstr "Need more qualifiers."
 
-#: src/protocols/toc/toc.c:521
+#: src/protocols/toc/toc.c:519
 msgid "Dir service temporarily unavailable."
 msgstr "Dir service temporarily unavailable."
 
-#: src/protocols/toc/toc.c:524
+#: src/protocols/toc/toc.c:522
 msgid "Email lookup restricted."
 msgstr "Email lookup restricted."
 
-#: src/protocols/toc/toc.c:527
+#: src/protocols/toc/toc.c:525
 msgid "Keyword ignored."
 msgstr "Keyword ignored."
 
-#: src/protocols/toc/toc.c:530
+#: src/protocols/toc/toc.c:528
 msgid "No keywords."
 msgstr "No keywords."
 
-#: src/protocols/toc/toc.c:533
+#: src/protocols/toc/toc.c:531
 msgid "User has no directory information."
 msgstr "User has no directory information."
 
-#: src/protocols/toc/toc.c:537
+#: src/protocols/toc/toc.c:535
 msgid "Country not supported."
 msgstr "Country not supported."
 
-#: src/protocols/toc/toc.c:540
+#: src/protocols/toc/toc.c:538
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "Failure unknown: %s."
 
-#: src/protocols/toc/toc.c:546
+#: src/protocols/toc/toc.c:544
 msgid "The service is temporarily unavailable."
 msgstr "The service is temporarily unavailable."
 
-#: src/protocols/toc/toc.c:549
+#: src/protocols/toc/toc.c:547
 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:552
+#: src/protocols/toc/toc.c:550
 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."
@@ -10359,42 +10381,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:554
+#: src/protocols/toc/toc.c:552
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "An unknown signon error has occurred: %s."
 
-#: src/protocols/toc/toc.c:557
+#: src/protocols/toc/toc.c:555
 #, 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:584
-#, fuzzy
-msgid "Invalid Groupname"
-msgstr "Invalid group"
-
-#: src/protocols/toc/toc.c:668
+#: src/protocols/toc/toc.c:576
 msgid "Connection Closed"
 msgstr "Connection Closed"
 
-#: src/protocols/toc/toc.c:708
+#: src/protocols/toc/toc.c:616
 msgid "Waiting for reply..."
 msgstr "Waiting for reply..."
 
-#: src/protocols/toc/toc.c:786
+#: src/protocols/toc/toc.c:695
 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:989
+#: src/protocols/toc/toc.c:892
 msgid "Password Change Successful"
 msgstr "Password Change Successful"
 
-#: src/protocols/toc/toc.c:993
+#: src/protocols/toc/toc.c:896
 msgid "TOC has sent a PAUSE command."
 msgstr "TOC has sent a PAUSE command."
 
-#: src/protocols/toc/toc.c:994
+#: src/protocols/toc/toc.c:897
 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 "
@@ -10404,44 +10421,44 @@
 "if you send a message. Gaim will prevent anything from going through. This "
 "is only temporary, please be patient."
 
-#: src/protocols/toc/toc.c:1549
+#: src/protocols/toc/toc.c:1423
 msgid "Get Dir Info"
 msgstr "Get Dir Info"
 
-#: src/protocols/toc/toc.c:1689
+#: src/protocols/toc/toc.c:1559
 msgid "Set Dir Info"
 msgstr "Set Dir Info"
 
-#: src/protocols/toc/toc.c:1811
+#: src/protocols/toc/toc.c:1681
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "Could not open %s for writing!"
 
-#: src/protocols/toc/toc.c:1847
+#: src/protocols/toc/toc.c:1717
 msgid "File transfer failed; other side probably canceled."
 msgstr "File transfer failed; other side probably cancelled."
 
-#: src/protocols/toc/toc.c:1892 src/protocols/toc/toc.c:1932
-#: src/protocols/toc/toc.c:2056 src/protocols/toc/toc.c:2144
+#: src/protocols/toc/toc.c:1762 src/protocols/toc/toc.c:1802
+#: src/protocols/toc/toc.c:1926 src/protocols/toc/toc.c:2014
 msgid "Could not connect for transfer."
 msgstr "Could not connect for transfer."
 
-#: src/protocols/toc/toc.c:2089
+#: src/protocols/toc/toc.c:1959
 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:2189
+#: src/protocols/toc/toc.c:2059
 msgid "Gaim - Save As..."
 msgstr "Gaim - Save As..."
 
-#: src/protocols/toc/toc.c:2223
+#: src/protocols/toc/toc.c:2093
 #, 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:2230
+#: src/protocols/toc/toc.c:2100
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s requests you to send them a file"
@@ -10456,15 +10473,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/toc/toc.c:2316 src/protocols/toc/toc.c:2318
+#: src/protocols/toc/toc.c:2187 src/protocols/toc/toc.c:2189
 msgid "TOC Protocol Plugin"
 msgstr "TOC Protocol Plugin"
 
-#: src/protocols/toc/toc.c:2337
+#: src/protocols/toc/toc.c:2208
 msgid "TOC host"
 msgstr "TOC host"
 
-#: src/protocols/toc/toc.c:2341
+#: src/protocols/toc/toc.c:2212
 msgid "TOC port"
 msgstr "TOC port"
 
@@ -10533,7 +10550,7 @@
 msgid "Local Users"
 msgstr "Local Users"
 
-#: src/protocols/trepia/trepia.c:1032
+#: src/protocols/trepia/trepia.c:1028
 msgid "Logging in"
 msgstr "Logging in"
 
@@ -10547,42 +10564,37 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/trepia/trepia.c:1278 src/protocols/trepia/trepia.c:1280
+#: src/protocols/trepia/trepia.c:1275 src/protocols/trepia/trepia.c:1277
 msgid "Trepia Protocol Plugin"
 msgstr "Trepia Protocol Plugin"
 
-#: src/protocols/yahoo/yahoo.c:694
+#: src/protocols/yahoo/yahoo.c:419
+msgid ""
+"You have been logged off as you have logged in on a different machine or "
+"device."
+msgstr ""
+"You have been logged off as you have logged in on a different machine or "
+"device."
+
+#: src/protocols/yahoo/yahoo.c:912
 msgid "Your Yahoo! message did not get sent."
 msgstr "Your Yahoo! message did not get sent."
 
-#: src/protocols/yahoo/yahoo.c:718 src/protocols/yahoo/yahoo.c:3462
+#: src/protocols/yahoo/yahoo.c:936 src/protocols/yahoo/yahoo.c:3437
 msgid "Buzz!!"
 msgstr "Buzz!!"
 
-#: src/protocols/yahoo/yahoo.c:763
+#: src/protocols/yahoo/yahoo.c:981
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Yahoo! system message for %s:"
 
-#. TODO: this is almost exactly the same as what MSN does,
-#. * this should probably be moved to the core.
-#. *
-#: src/protocols/yahoo/yahoo.c:853
-#, fuzzy, c-format
-msgid "The user %s wants to add %s to his or her buddy list%s%s."
-msgstr "The user %s wants to add %s to his or her buddy list."
-
-#: src/protocols/yahoo/yahoo.c:859
-#, fuzzy
-msgid "Message (optional) :"
-msgstr "Message Notification"
-
-#: src/protocols/yahoo/yahoo.c:901
+#: src/protocols/yahoo/yahoo.c:1048
 #, 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:904
+#: src/protocols/yahoo/yahoo.c:1051
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -10591,11 +10603,11 @@
 "%s has (retroactively) denied your request to add them to your list for the "
 "following reason: %s."
 
-#: src/protocols/yahoo/yahoo.c:907
+#: src/protocols/yahoo/yahoo.c:1054
 msgid "Add buddy rejected"
 msgstr "Add buddy rejected"
 
-#: src/protocols/yahoo/yahoo.c:1659
+#: src/protocols/yahoo/yahoo.c:1815
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -10606,11 +10618,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:1662
+#: src/protocols/yahoo/yahoo.c:1818
 msgid "Failed Yahoo! Authentication"
 msgstr "Failed Yahoo! Authentication"
 
-#: src/protocols/yahoo/yahoo.c:1735
+#: src/protocols/yahoo/yahoo.c:1890
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -10619,19 +10631,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:1738
+#: src/protocols/yahoo/yahoo.c:1893
 msgid "Ignore buddy?"
 msgstr "Ignore buddy?"
 
-#: src/protocols/yahoo/yahoo.c:1772
+#: src/protocols/yahoo/yahoo.c:1927
 msgid "Invalid username."
 msgstr "Invalid username."
 
-#: src/protocols/yahoo/yahoo.c:1783
+#: src/protocols/yahoo/yahoo.c:1938
 msgid "Normal authentication failed!"
 msgstr "Normal authentication failed!"
 
-#: src/protocols/yahoo/yahoo.c:1784
+#: src/protocols/yahoo/yahoo.c:1939
 msgid ""
 "The normal authentication method has failed. This means either your password "
 "is incorrect, or Yahoo!'s authentication scheme has changed. Gaim will now "
@@ -10643,119 +10655,101 @@
 "attempt to log in using Web Messenger authentication, which will result in "
 "reduced functionality and features."
 
-#: src/protocols/yahoo/yahoo.c:1792
+#: src/protocols/yahoo/yahoo.c:1947
 msgid "Incorrect password."
 msgstr "Incorrect password."
 
-#: src/protocols/yahoo/yahoo.c:1795
+#: src/protocols/yahoo/yahoo.c:1950
 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:1798
+#: src/protocols/yahoo/yahoo.c:1953
 #, 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:1852
+#: src/protocols/yahoo/yahoo.c:2007
 #, 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:1855
+#: src/protocols/yahoo/yahoo.c:2010
 msgid "Could not add buddy to server list"
 msgstr "Could not add buddy to server list"
 
-#: src/protocols/yahoo/yahoo.c:2097 src/protocols/yahoo/yahoo.c:2243
-#: src/protocols/yahoo/ycht.c:415
+#: src/protocols/yahoo/yahoo.c:2247 src/protocols/yahoo/yahoo.c:2395
+#: src/protocols/yahoo/ycht.c:414
 msgid "Unable to read"
 msgstr "Unable to read"
 
-#: src/protocols/yahoo/yahoo.c:2265 src/protocols/yahoo/yahoo.c:2393
-#: src/protocols/yahoo/yahoo.c:2477 src/protocols/yahoo/yahoo.c:2487
-#: src/protocols/yahoo/yahoochat.c:1417 src/protocols/yahoo/yahoochat.c:1484
-#: src/protocols/yahoo/ycht.c:519
+#: src/protocols/yahoo/yahoo.c:2417 src/protocols/yahoo/yahoo.c:2527
+#: src/protocols/yahoo/yahoo.c:2577 src/protocols/yahoo/yahoo.c:2587
+#: src/protocols/yahoo/yahoochat.c:1461 src/protocols/yahoo/yahoochat.c:1528
+#: src/protocols/yahoo/ycht.c:518
 msgid "Connection problem"
 msgstr "Connection problem"
 
-#: src/protocols/yahoo/yahoo.c:2588 src/protocols/yahoo/yahoo.c:3192
+#: src/protocols/yahoo/yahoo.c:2681 src/protocols/yahoo/yahoo.c:3048
+#: src/protocols/yahoo/yahoo.c:3162
 msgid "Not At Home"
 msgstr "Not At Home"
 
-#: src/protocols/yahoo/yahoo.c:2590 src/protocols/yahoo/yahoo.c:3195
+#: src/protocols/yahoo/yahoo.c:2683 src/protocols/yahoo/yahoo.c:3050
+#: src/protocols/yahoo/yahoo.c:3163
 msgid "Not At Desk"
 msgstr "Not At Desk"
 
-#: src/protocols/yahoo/yahoo.c:2592 src/protocols/yahoo/yahoo.c:3198
+#: src/protocols/yahoo/yahoo.c:2685 src/protocols/yahoo/yahoo.c:3052
+#: src/protocols/yahoo/yahoo.c:3164
 msgid "Not In Office"
 msgstr "Not In Office"
 
-#: src/protocols/yahoo/yahoo.c:2596 src/protocols/yahoo/yahoo.c:3204
+#: src/protocols/yahoo/yahoo.c:2689 src/protocols/yahoo/yahoo.c:3056
+#: src/protocols/yahoo/yahoo.c:3166
 msgid "On Vacation"
 msgstr "On Vacation"
 
-#: src/protocols/yahoo/yahoo.c:2600 src/protocols/yahoo/yahoo.c:3210
+#: src/protocols/yahoo/yahoo.c:2693 src/protocols/yahoo/yahoo.c:3060
+#: src/protocols/yahoo/yahoo.c:3168
 msgid "Stepped Out"
 msgstr "Stepped Out"
 
-#: src/protocols/yahoo/yahoo.c:2692 src/protocols/yahoo/yahoo.c:2719
+#: src/protocols/yahoo/yahoo.c:2774 src/protocols/yahoo/yahoo.c:2800
 msgid "Not on server list"
 msgstr "Not on server list"
 
-#: src/protocols/yahoo/yahoo.c:2742 src/protocols/yahoo/yahoo.c:2802
-#, fuzzy
-msgid "Appear Online"
-msgstr "Appear Offline"
-
-#: src/protocols/yahoo/yahoo.c:2745 src/protocols/yahoo/yahoo.c:2824
-#, fuzzy
-msgid "Appear Permanently Offline"
-msgstr "Appear Offline"
-
-#: src/protocols/yahoo/yahoo.c:2763
-#, fuzzy
-msgid "Stealth"
-msgstr "Province/Territory"
-
-#: src/protocols/yahoo/yahoo.c:2818
-#, fuzzy
-msgid "Don't Appear Permanently Offline"
-msgstr "Appear Offline"
-
-#: src/protocols/yahoo/yahoo.c:2857
+#: src/protocols/yahoo/yahoo.c:2879
 msgid "Join in Chat"
 msgstr "Join in Chat"
 
-#: src/protocols/yahoo/yahoo.c:2862
+#: src/protocols/yahoo/yahoo.c:2884
 msgid "Initiate Conference"
 msgstr "Initiate Conference"
 
-#: src/protocols/yahoo/yahoo.c:2887
-msgid "Stealth Settings"
-msgstr ""
-
-#: src/protocols/yahoo/yahoo.c:2920
+#: src/protocols/yahoo/yahoo.c:2936
 msgid "Active which ID?"
 msgstr "Active which ID?"
 
-#: src/protocols/yahoo/yahoo.c:2929
+#: src/protocols/yahoo/yahoo.c:2945
 msgid "Join who in chat?"
 msgstr "Join who in chat?"
 
-#: src/protocols/yahoo/yahoo.c:2939
+#: src/protocols/yahoo/yahoo.c:2955
 msgid "Activate ID..."
 msgstr "Activate ID..."
 
-#: src/protocols/yahoo/yahoo.c:2943
+#: src/protocols/yahoo/yahoo.c:2959
 msgid "Join user in chat..."
 msgstr "Join user in chat..."
 
-#: src/protocols/yahoo/yahoo.c:3505
+#: src/protocols/yahoo/yahoo.c:3479
+#, fuzzy
 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:3509
+msgstr "join: &lt;room&gt; [server]:  Join a chat on this server."
+
+#: src/protocols/yahoo/yahoo.c:3483
 msgid "buzz: Buzz a contact to get their attention"
-msgstr "buzz: Buzz a contact to get their attention"
+msgstr ""
 
 #. *< type
 #. *< ui_requirement
@@ -10767,69 +10761,119 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/yahoo/yahoo.c:3588 src/protocols/yahoo/yahoo.c:3590
+#: src/protocols/yahoo/yahoo.c:3562 src/protocols/yahoo/yahoo.c:3564
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo Protocol Plugin"
 
-#: src/protocols/yahoo/yahoo.c:3609
+#: src/protocols/yahoo/yahoo.c:3583
 msgid "Yahoo Japan"
 msgstr "Yahoo Japan"
 
-#: src/protocols/yahoo/yahoo.c:3612
+#: src/protocols/yahoo/yahoo.c:3586
 msgid "Pager host"
 msgstr "Pager host"
 
-#: src/protocols/yahoo/yahoo.c:3615
+#: src/protocols/yahoo/yahoo.c:3589
 msgid "Japan Pager host"
 msgstr "Japan Pager host"
 
-#: src/protocols/yahoo/yahoo.c:3618
+#: src/protocols/yahoo/yahoo.c:3592
 msgid "Pager port"
 msgstr "Pager port"
 
-#: src/protocols/yahoo/yahoo.c:3621
+#: src/protocols/yahoo/yahoo.c:3595
 msgid "File transfer host"
 msgstr "File transfer host"
 
-#: src/protocols/yahoo/yahoo.c:3624
+#: src/protocols/yahoo/yahoo.c:3598
 msgid "Japan File transfer host"
 msgstr "Japan File transfer host"
 
-#: src/protocols/yahoo/yahoo.c:3627
+#: src/protocols/yahoo/yahoo.c:3601
 msgid "File transfer port"
 msgstr "File transfer port"
 
-#: src/protocols/yahoo/yahoo.c:3630
+#: src/protocols/yahoo/yahoo.c:3604
 #, fuzzy
 msgid "Chat Room Locale"
 msgstr "Chat Room List Url"
 
-#: src/protocols/yahoo/yahoo.c:3633
+#: src/protocols/yahoo/yahoo.c:3607
 msgid "Chat Room List Url"
 msgstr "Chat Room List Url"
 
-#: src/protocols/yahoo/yahoo.c:3636
+#: src/protocols/yahoo/yahoo.c:3610
 msgid "YCHT Host"
 msgstr "YCHT Host"
 
-#: src/protocols/yahoo/yahoo.c:3639
+#: src/protocols/yahoo/yahoo.c:3613
 msgid "YCHT Port"
 msgstr "YCHT Port"
 
-#: src/protocols/yahoo/yahoo_profile.c:677
+#: src/protocols/yahoo/yahoochat.c:206
+#, c-format
+msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
+msgstr "%s declined your conference invitation to room \"%s\" because \"%s\"."
+
+#: src/protocols/yahoo/yahoochat.c:208
+msgid "Invitation Rejected"
+msgstr "Invitation Rejected"
+
+#: src/protocols/yahoo/yahoochat.c:363
+msgid "Failed to join chat"
+msgstr "Failed to join chat"
+
+#: src/protocols/yahoo/yahoochat.c:363
+msgid "Maybe the room is full?"
+msgstr "Maybe the room is full?"
+
+#: src/protocols/yahoo/yahoochat.c:441
+#, c-format
+msgid "You are now chatting in %s."
+msgstr "You are now chatting in %s."
+
+#: src/protocols/yahoo/yahoochat.c:616
+msgid "Failed to join buddy in chat"
+msgstr "Failed to join buddy in chat"
+
+#: src/protocols/yahoo/yahoochat.c:617
+msgid "Maybe they're not in a chat?"
+msgstr "Maybe they're not in a chat?"
+
+#: src/protocols/yahoo/yahoochat.c:1394
+msgid "Fetching the room list failed."
+msgstr "Fetching the room list failed."
+
+#: src/protocols/yahoo/yahoochat.c:1447
+msgid "Voices"
+msgstr "Voices"
+
+#: src/protocols/yahoo/yahoochat.c:1450
+msgid "Webcams"
+msgstr "Webcams"
+
+#: src/protocols/yahoo/yahoochat.c:1461 src/protocols/yahoo/yahoochat.c:1528
+msgid "Unable to fetch room list."
+msgstr "Unable to fetch room list."
+
+#: src/protocols/yahoo/yahoochat.c:1521
+msgid "User Rooms"
+msgstr "User Rooms"
+
+#: src/protocols/yahoo/yahoo_profile.c:675
 #, c-format
 msgid "<b>IP Address:</b> %s<br>"
 msgstr "<b>IP Address:</b> %s<br>"
 
-#: src/protocols/yahoo/yahoo_profile.c:753
+#: src/protocols/yahoo/yahoo_profile.c:751
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! Japan Profile"
 
-#: src/protocols/yahoo/yahoo_profile.c:754
+#: src/protocols/yahoo/yahoo_profile.c:752
 msgid "Yahoo! Profile"
 msgstr "Yahoo! Profile"
 
-#: src/protocols/yahoo/yahoo_profile.c:798
+#: src/protocols/yahoo/yahoo_profile.c:796
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
@@ -10837,7 +10881,7 @@
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
 
-#: src/protocols/yahoo/yahoo_profile.c:800
+#: 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"
@@ -10845,48 +10889,48 @@
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser"
 
-#: src/protocols/yahoo/yahoo_profile.c:978
+#: src/protocols/yahoo/yahoo_profile.c:976
 msgid "Yahoo! ID"
 msgstr "Yahoo! ID"
 
-#: src/protocols/yahoo/yahoo_profile.c:1052
-#: src/protocols/yahoo/yahoo_profile.c:1056
-#: src/protocols/yahoo/yahoo_profile.c:1060
+#: src/protocols/yahoo/yahoo_profile.c:1050
+#: src/protocols/yahoo/yahoo_profile.c:1054
+#: src/protocols/yahoo/yahoo_profile.c:1058
 msgid "Hobbies"
 msgstr "Hobbies"
 
-#: src/protocols/yahoo/yahoo_profile.c:1070
-#: src/protocols/yahoo/yahoo_profile.c:1074
+#: src/protocols/yahoo/yahoo_profile.c:1068
+#: src/protocols/yahoo/yahoo_profile.c:1072
 msgid "Latest News"
 msgstr "Latest News"
 
-#: src/protocols/yahoo/yahoo_profile.c:1095
+#: src/protocols/yahoo/yahoo_profile.c:1093
 msgid "Home Page"
 msgstr "Home Page"
 
-#: src/protocols/yahoo/yahoo_profile.c:1110
+#: src/protocols/yahoo/yahoo_profile.c:1108
 msgid "Cool Link 1"
 msgstr "Cool Link 1"
 
-#: src/protocols/yahoo/yahoo_profile.c:1115
+#: src/protocols/yahoo/yahoo_profile.c:1113
 msgid "Cool Link 2"
 msgstr "Cool Link 2"
 
-#: src/protocols/yahoo/yahoo_profile.c:1119
+#: src/protocols/yahoo/yahoo_profile.c:1117
 msgid "Cool Link 3"
 msgstr "Cool Link 3"
 
-#: src/protocols/yahoo/yahoo_profile.c:1132
+#: src/protocols/yahoo/yahoo_profile.c:1130
 #, fuzzy
 msgid "Last Update"
 msgstr "Last Updated"
 
-#: src/protocols/yahoo/yahoo_profile.c:1138
+#: src/protocols/yahoo/yahoo_profile.c:1136
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "User information for %s unavailable"
 
-#: src/protocols/yahoo/yahoo_profile.c:1144
+#: src/protocols/yahoo/yahoo_profile.c:1142
 msgid ""
 "Sorry, this profile seems to be in a language that is not supported at this "
 "time."
@@ -10894,7 +10938,7 @@
 "Sorry, this profile seems to be in a language that is not supported at this "
 "time."
 
-#: src/protocols/yahoo/yahoo_profile.c:1160
+#: src/protocols/yahoo/yahoo_profile.c:1158
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
 "server-side problem. Please try again later."
@@ -10902,7 +10946,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:1163
+#: src/protocols/yahoo/yahoo_profile.c:1161
 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 "
@@ -10912,65 +10956,15 @@
 "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:1171
+#: src/protocols/yahoo/yahoo_profile.c:1169
 msgid "The user's profile is empty."
 msgstr "The user's profile is empty."
 
-#: src/protocols/yahoo/yahoochat.c:203
-#, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr "%s declined your conference invitation to room \"%s\" because \"%s\"."
-
-#: src/protocols/yahoo/yahoochat.c:205
-msgid "Invitation Rejected"
-msgstr "Invitation Rejected"
-
-#: src/protocols/yahoo/yahoochat.c:360
-msgid "Failed to join chat"
-msgstr "Failed to join chat"
-
-#: src/protocols/yahoo/yahoochat.c:360
-msgid "Maybe the room is full?"
-msgstr "Maybe the room is full?"
-
-#: src/protocols/yahoo/yahoochat.c:438
-#, c-format
-msgid "You are now chatting in %s."
-msgstr "You are now chatting in %s."
-
-#: src/protocols/yahoo/yahoochat.c:613
-msgid "Failed to join buddy in chat"
-msgstr "Failed to join buddy in chat"
-
-#: src/protocols/yahoo/yahoochat.c:614
-msgid "Maybe they're not in a chat?"
-msgstr "Maybe they're not in a chat?"
-
-#: src/protocols/yahoo/yahoochat.c:1350
-msgid "Fetching the room list failed."
-msgstr "Fetching the room list failed."
-
-#: src/protocols/yahoo/yahoochat.c:1403
-msgid "Voices"
-msgstr "Voices"
-
-#: src/protocols/yahoo/yahoochat.c:1406
-msgid "Webcams"
-msgstr "Webcams"
-
-#: src/protocols/yahoo/yahoochat.c:1417 src/protocols/yahoo/yahoochat.c:1484
-msgid "Unable to fetch room list."
-msgstr "Unable to fetch room list."
-
-#: src/protocols/yahoo/yahoochat.c:1477
-msgid "User Rooms"
-msgstr "User Rooms"
-
-#: src/protocols/yahoo/ycht.c:402
+#: src/protocols/yahoo/ycht.c:401
 msgid "Connection problem with the YCHT server."
 msgstr "Connection problem with the YCHT server."
 
-#: src/protocols/zephyr/zephyr.c:331
+#: src/protocols/zephyr/zephyr.c:328
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10978,77 +10972,73 @@
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
 
-#: src/protocols/zephyr/zephyr.c:686
-#, fuzzy, c-format
-msgid "Unable to send to chat %s,%s,%s"
+#: src/protocols/zephyr/zephyr.c:676
+#, c-format
+msgid "Unable send to chat %s,%s,%s"
 msgstr "Unable send to chat %s,%s,%s"
 
-#: src/protocols/zephyr/zephyr.c:719 src/protocols/zephyr/zephyr.c:1133
+#: src/protocols/zephyr/zephyr.c:709 src/protocols/zephyr/zephyr.c:1118
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>User:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:723 src/protocols/zephyr/zephyr.c:1138
+#: src/protocols/zephyr/zephyr.c:713 src/protocols/zephyr/zephyr.c:1123
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>Hidden or not logged-in"
 
-#: src/protocols/zephyr/zephyr.c:728 src/protocols/zephyr/zephyr.c:1140
+#: src/protocols/zephyr/zephyr.c:718 src/protocols/zephyr/zephyr.c:1125
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>At %s since %s"
 
-#: src/protocols/zephyr/zephyr.c:1471 src/protocols/zephyr/zephyr.c:1472
+#: src/protocols/zephyr/zephyr.c:1408 src/protocols/zephyr/zephyr.c:1409
 msgid "Anyone"
 msgstr "Anyone"
 
-#: src/protocols/zephyr/zephyr.c:2273
+#: src/protocols/zephyr/zephyr.c:2155
 msgid "_Class:"
 msgstr "_Class:"
 
-#: src/protocols/zephyr/zephyr.c:2279
+#: src/protocols/zephyr/zephyr.c:2161
 msgid "_Instance:"
 msgstr "_Instance:"
 
-#: src/protocols/zephyr/zephyr.c:2285
+#: src/protocols/zephyr/zephyr.c:2167
 msgid "_Recipient:"
 msgstr "_Recipient:"
 
-#: src/protocols/zephyr/zephyr.c:2296
+#: src/protocols/zephyr/zephyr.c:2178
 #, 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:2602
+#: src/protocols/zephyr/zephyr.c:2483
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;nick&gt;: Locate user"
 
-#: src/protocols/zephyr/zephyr.c:2607
+#: src/protocols/zephyr/zephyr.c:2488
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;nick&gt;: Locate user"
 
-#: src/protocols/zephyr/zephyr.c:2612
+#: src/protocols/zephyr/zephyr.c:2493
 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:2617
+#: src/protocols/zephyr/zephyr.c:2498
 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:2622
-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:2628
+#: src/protocols/zephyr/zephyr.c:2504
 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:2633
+#: src/protocols/zephyr/zephyr.c:2509
 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:2639
+#: src/protocols/zephyr/zephyr.c:2515
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
@@ -11056,7 +11046,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:2645
+#: src/protocols/zephyr/zephyr.c:2521
 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;"
@@ -11064,7 +11054,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:2651
+#: src/protocols/zephyr/zephyr.c:2527
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
@@ -11072,15 +11062,15 @@
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
 
-#: src/protocols/zephyr/zephyr.c:2656
+#: src/protocols/zephyr/zephyr.c:2532
 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:2762
+#: src/protocols/zephyr/zephyr.c:2638
 msgid "Resubscribe"
 msgstr "Resubscribe"
 
-#: src/protocols/zephyr/zephyr.c:2765
+#: src/protocols/zephyr/zephyr.c:2641
 msgid "Retrieve subscriptions from server"
 msgstr "Retrieve subscriptions from server"
 
@@ -11094,51 +11084,39 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/zephyr/zephyr.c:2847 src/protocols/zephyr/zephyr.c:2849
+#: src/protocols/zephyr/zephyr.c:2724 src/protocols/zephyr/zephyr.c:2726
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr Protocol Plugin"
 
-#: src/protocols/zephyr/zephyr.c:2874
+#: src/protocols/zephyr/zephyr.c:2751
 msgid "Export to .anyone"
 msgstr "Export to .anyone"
 
-#: src/protocols/zephyr/zephyr.c:2877
+#: src/protocols/zephyr/zephyr.c:2754
 msgid "Export to .zephyr.subs"
 msgstr "Export to .zephyr.subs"
 
-#: src/protocols/zephyr/zephyr.c:2880
-msgid "Import from .anyone"
-msgstr "Import from .anyone"
-
-#: src/protocols/zephyr/zephyr.c:2883
-msgid "Import from .zephyr.subs"
-msgstr "Import from .zephyr.subs"
-
-#: src/protocols/zephyr/zephyr.c:2886
-msgid "Realm"
-msgstr "Realm"
-
-#: src/protocols/zephyr/zephyr.c:2889
+#: src/protocols/zephyr/zephyr.c:2757
 msgid "Exposure"
 msgstr "Exposure"
 
 #. XXX: why in the hell are we calling gaim_connection_error() here?
 #. Forbidden
-#: src/proxy.c:1038
+#: src/proxy.c:958
 #, c-format
 msgid "Access denied: proxy server forbids port %d tunnelling."
 msgstr "Access denied: proxy server forbids port %d tunnelling."
 
-#: src/proxy.c:1042
+#: src/proxy.c:962
 #, c-format
 msgid "Proxy connection error %d"
 msgstr "Proxy connection error %d"
 
-#: src/proxy.c:1876
+#: src/proxy.c:1790
 msgid "Invalid proxy settings"
 msgstr "Invalid proxy settings"
 
-#: src/proxy.c:1876
+#: src/proxy.c:1790
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -11146,229 +11124,172 @@
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
 
+#. * Custom away message.
+#: src/prpl.h:187
+msgid "Custom"
+msgstr "Custom"
+
 #. *
 #. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #.
-#: src/request.h:1276
+#: src/request.h:1255
 msgid "Accept"
 msgstr "Accept"
 
-#: src/server.c:351
+#: src/server.c:64
+msgid "Please enter your password"
+msgstr "Please enter your password"
+
+#: src/server.c:533
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s is now known as %s.\n"
 
-#: src/server.c:733
+#: src/server.c:978
 #, c-format
 msgid "(%d message)"
 msgid_plural "(%d messages)"
 msgstr[0] "(%d message)"
 msgstr[1] "(%d messages)"
 
-#: src/server.c:747
+#: src/server.c:992
 msgid "(1 message)"
 msgstr "(1 message)"
 
-#: src/server.c:1008
-#, fuzzy, c-format
-msgid ""
-"%s has invited %s to the chat room %s:\n"
-"%s"
-msgstr "%s has invited %s to the chat room %s\n"
-
-#: src/server.c:1013
-#, 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:1017
-msgid "Accept chat invitation?"
-msgstr "Accept chat invitation?"
-
-#: src/status.c:153
-msgid "Unset"
-msgstr "Unset"
-
-#: src/status.c:626
+#: src/server.c:1215 src/server.c:1224
+#, c-format
+msgid "%s logged in."
+msgstr "%s logged in."
+
+#: src/server.c:1236
+#, c-format
+msgid "%s signed on"
+msgstr "%s signed on"
+
+#: src/server.c:1251
 #, c-format
 msgid "%s came back"
 msgstr "%s came back"
 
-#: src/status.c:631
+#: src/server.c:1253
 #, c-format
 msgid "%s went away"
 msgstr "%s went away"
 
-#: src/status.c:1314
+#: src/server.c:1267
 #, c-format
 msgid "%s became idle"
 msgstr "%s became idle"
 
-#: src/status.c:1330
+#: src/server.c:1278
 #, c-format
 msgid "%s became unidle"
 msgstr "%s became unidle"
 
-#: src/util.c:2120
-#, c-format
-msgid "Error Reading %s"
-msgstr "Error Reading %s"
-
-#: src/util.c:2121
-#, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file been renamed to %s~."
-msgstr ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file been renamed to %s~."
-
-#: src/util.c:2558
+#: src/server.c:1288 src/server.c:1295
+#, c-format
+msgid "%s logged out."
+msgstr "%s logged out."
+
+#: src/server.c:1308
+#, c-format
+msgid "%s signed off"
+msgstr "%s signed off"
+
+#: src/server.c:1370
+#, 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:1373
+msgid "an anonymous person"
+msgstr "an anonymous person"
+
+#: src/server.c:1487
+#, 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:1493
+#, 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:1502
+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"
+
+#: src/stock.c:89
+msgid "_Invite"
+msgstr "_Invite"
+
+#: src/stock.c:90
+msgid "_Modify"
+msgstr "_Modify"
+
+#: src/stock.c:91
+msgid "_Open Mail"
+msgstr "_Open Mail"
+
+#: src/stock.c:93
+msgid "_Warn"
+msgstr "_Warn"
+
+#: src/util.c:2396
 msgid "Calculating..."
 msgstr "Calculating..."
 
-#: src/util.c:2561
+#: src/util.c:2399
 msgid "Unknown."
 msgstr "Unknown."
 
-#: src/util.c:2591
+#: src/util.c:2429
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "second"
 msgstr[1] "seconds"
 
-#: src/util.c:2605
+#: src/util.c:2443
 msgid "day"
 msgid_plural "days"
 msgstr[0] "day"
 msgstr[1] "days"
 
-#: src/util.c:2613
+#: src/util.c:2451
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "hour"
 msgstr[1] "hours"
 
-#: src/util.c:2621
+#: src/util.c:2459
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minute"
 msgstr[1] "minutes"
 
-#: src/util.c:3041
+#: src/util.c:2879
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Error opening connection.\n"
 
-#~ msgid "Mail Server"
-#~ msgstr "Mail Server"
-
-#~ msgid "%s (%d new/%d total)"
-#~ msgstr "%s (%d new/%d total)"
-
-#~ msgid "Check Mail"
-#~ msgstr "Check Mail"
-
-#~ msgid "Check email every X seconds.\n"
-#~ msgstr "Check email every X seconds.\n"
-
-#~ msgid "Auto-login"
-#~ msgstr "Auto-login"
-
-#~ msgid "Log Out"
-#~ msgstr "Log Out"
-
-#~ msgid ""
-#~ "When a new conversation is opened this plugin will insert the last "
-#~ "conversation into the current conversation."
-#~ msgstr ""
-#~ "When a new conversation is opened this plugin will insert the last "
-#~ "conversation into the current conversation."
-
-#~ msgid "Docked _Buddy List is always on top"
-#~ msgstr "Docked _Buddy List is always on top"
-
-#~ msgid "Unable to send messge to %s."
-#~ msgstr "Unable to send messge to %s."
-
-#~ msgid "Show fewer options"
-#~ msgstr "Show fewer options"
-
-#~ msgid "Information"
-#~ msgstr "Information"
-
-#~ msgid "/Buddies/_Log Out"
-#~ msgstr "/Buddies/_Log Out"
-
-#~ msgid "Rename Group"
-#~ msgstr "Rename Group"
-
-#~ msgid "New group name"
-#~ msgstr "New group name"
-
-#~ msgid "Please enter a new name for the selected group."
-#~ msgstr "Please enter a new name for the selected group."
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Idle</b>"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Idle</b>"
-
-#~ msgid "%d%%"
-#~ msgstr "%d%%"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Warned:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Warned:</b> %s"
-
-#~ msgid "Warned (%d%%) "
-#~ msgstr "Warned (%d%%) "
-
-#~ msgid "/Buddies/Log Out"
-#~ msgstr "/Buddies/Log Out"
-
-#~ msgid "/Conversation/_Warn..."
-#~ msgstr "/Conversation/_Warn..."
-
-#~ msgid "/Conversation/Warn..."
-#~ msgstr "/Conversation/Warn..."
-
-#~ msgid "former lead developer"
-#~ msgstr "former lead developer"
-
-#~ msgid "former maintainer"
-#~ msgstr "former maintainer"
-
-#~ msgid "Chinese"
-#~ msgstr "Chinese"
-
-#~ msgid "_Screen name"
-#~ msgstr "_Screen name"
-
-#~ msgid "Warn User"
-#~ msgstr "Warn User"
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
-#~ "\n"
-#~ "This will increase %s's warning level and he or she will be subject to "
-#~ "harsher rate limiting.\n"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
-#~ "\n"
-#~ "This will increase %s's warning level and he or she will be subject to "
-#~ "harsher rate limiting.\n"
-
-#~ msgid "Warn _anonymously?"
-#~ msgstr "Warn _anonymously?"
-
-#~ msgid "<b>Anonymous warnings are less severe.</b>"
-#~ msgstr "<b>Anonymous warnings are less severe.</b>"
-
 #~ msgid ""
 #~ "Unable to guess the image type based on the file extension supplied.  "
 #~ "Defaulting to PNG."
@@ -11376,56 +11297,6 @@
 #~ "Unable to guess the image type based on the file extension supplied.  "
 #~ "Defaulting to PNG."
 
-#~ msgid "Unable to load preferences"
-#~ msgstr "Unable to load preferences"
-
-#~ msgid ""
-#~ "Gaim was not able to load your preferences because they are stored in an "
-#~ "old format that is no longer used.  Please reconfigure your settings "
-#~ "using the Preferences window."
-#~ msgstr ""
-#~ "Gaim was not able to load your preferences because they are stored in an "
-#~ "old format that is no longer used.  Please reconfigure your settings "
-#~ "using the Preferences window."
-
-#~ msgid "Display"
-#~ msgstr "Display"
-
-#~ msgid "Ignore _formatting"
-#~ msgstr "Ignore _formatting"
-
-#~ msgid "Default Formatting"
-#~ msgstr "Default Formatting"
-
-#~ msgid "Tab p_lacement:"
-#~ msgstr "Tab p_lacement:"
-
-#~ msgid "New conversation _placement:"
-#~ msgstr "New conversation _placement:"
-
-#~ msgid "Message Text"
-#~ msgstr "Message Text"
-
-#~ msgid "File Transfer Aborted"
-#~ msgstr "File Transfer Aborted"
-
-#~ msgid "The user %s wants to add you to their buddy list."
-#~ msgstr "The user %s wants to add you to their buddy list."
-
-#~ msgid ""
-#~ "You were disconnected from the server, because you logged on from a "
-#~ "different location"
-#~ msgstr ""
-#~ "You were disconnected from the server, because you logged on from a "
-#~ "different location"
-
-#~ msgid ""
-#~ "You have been disconnected because you have signed on with this screen "
-#~ "name at another location."
-#~ msgstr ""
-#~ "You have been disconnected because you have signed on with this screen "
-#~ "name at another location."
-
 #~ msgid "Default SILC Key Pair"
 #~ msgstr "Default SILC Key Pair"
 
@@ -11434,27 +11305,3 @@
 
 #~ msgid "SILC Private Key"
 #~ msgstr "SILC Private Key"
-
-#~ msgid ""
-#~ "You have been logged off as you have logged in on a different machine or "
-#~ "device."
-#~ msgstr ""
-#~ "You have been logged off as you have logged in on a different machine or "
-#~ "device."
-
-#~ msgid ""
-#~ "Gaim cannot send files over Yahoo! that are bigger than One Megabyte "
-#~ "(1,048,576 bytes)."
-#~ msgstr ""
-#~ "Gaim cannot send files over Yahoo! that are bigger than One Megabyte "
-#~ "(1,048,576 bytes)."
-
-#~ msgid "Please enter your password"
-#~ msgstr "Please enter your password"
-
-#~ 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>"