diff po/en_GB.po @ 11762:81e26b7f262e

[gaim-migrate @ 14053] I feel like committing make dist'ed po files is a good thing at this point in time committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Sun, 23 Oct 2005 21:06:17 +0000
parents e860157296d4
children f244cd5647af
line wrap: on
line diff
--- a/po/en_GB.po	Sun Oct 23 20:43:02 2005 +0000
+++ b/po/en_GB.po	Sun Oct 23 21:06:17 2005 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: Gaim 1.1.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-08 09:41+0100\n"
+"POT-Creation-Date: 2005-10-23 16:42-0400\n"
 "PO-Revision-Date: 2005-02-14 13:35+0000\n"
 "Last-Translator: Luke Ross <lukeross@sys3175.co.uk>\n"
 "Language-Team:  <en_GB@li.org>\n"
@@ -16,21 +16,22 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n>1;\n"
 
-#: plugins/autorecon.c:240
+#: plugins/autorecon.c:301
 msgid "Error Message Suppression"
 msgstr "Error Message Suppression"
 
-#: plugins/autorecon.c:244
+#: plugins/autorecon.c:305
 msgid "Hide Disconnect Errors"
 msgstr "Hide Disconnect Errors"
 
-#: plugins/autorecon.c:248
+#: plugins/autorecon.c:309
 msgid "Hide Login Errors"
 msgstr "Hide Login Errors"
 
-#: plugins/autorecon.c:252
-msgid "Restore Away State On Reconnect"
-msgstr "Restore Away State On Reconnect"
+#: plugins/autorecon.c:313
+#, fuzzy
+msgid "Hide Reconnecting Dialog"
+msgstr "Hide Disconnect Errors"
 
 #. *< type
 #. *< ui_requirement
@@ -38,7 +39,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/autorecon.c:276
+#: plugins/autorecon.c:337
 msgid "Auto-Reconnect"
 msgstr "Auto-Reconnect"
 
@@ -46,27 +47,10 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/autorecon.c:279 plugins/autorecon.c:281
+#: plugins/autorecon.c:340 plugins/autorecon.c:342
 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..."
@@ -89,12 +73,13 @@
 
 #. 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)\n"
-"will use what used to be the built-in order active->idle->away->away+idle-"
-">offline."
+"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."
 msgstr ""
 "The buddy with the lowest score is the buddy who will have priority in the "
 "contact.\n"
@@ -103,7 +88,8 @@
 ">offline."
 
 #: plugins/contact_priority.c:144
-msgid "Point values to use for Account..."
+#, fuzzy
+msgid "Point values to use for account..."
 msgstr "Point values to use for Account..."
 
 #. *< type
@@ -134,102 +120,6 @@
 "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:685 src/protocols/oscar/oscar.c:5802
-#: src/protocols/oscar/oscar.c:6799 src/protocols/oscar/oscar.c:6999
-#: 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:5720 src/protocols/oscar/oscar.c:7007
-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
 #.
@@ -245,27 +135,86 @@
 msgid "Gaim - Away"
 msgstr "Gaim - Away"
 
-#: plugins/docklet/eggtrayicon.c:122
-msgid "Orientation"
-msgstr "Orientation"
-
-#: plugins/docklet/eggtrayicon.c:123
-msgid "The orientation of the tray."
-msgstr "The orientation of the tray."
-
-#: plugins/extplacement.c:77
+#: plugins/docklet/docklet.c:383
+#, fuzzy
+msgid "Show Buddy List"
+msgstr "Buddy List"
+
+#: plugins/docklet/docklet.c:390
+msgid "New Message..."
+msgstr "New Message..."
+
+#: plugins/docklet/docklet.c:394
+msgid "Join A Chat..."
+msgstr "Join A Chat..."
+
+#: plugins/docklet/docklet.c:399
+msgid "Mute Sounds"
+msgstr "Mute Sounds"
+
+#: plugins/docklet/docklet.c:406 src/gtkft.c:691
+#: src/protocols/oscar/oscar.c:8351
+msgid "File Transfers"
+msgstr "File Transfers"
+
+#: plugins/docklet/docklet.c:407 src/gtkaccount.c:2406
+msgid "Accounts"
+msgstr "Accounts"
+
+#: plugins/docklet/docklet.c:408 src/gtkprefs.c:1792
+msgid "Preferences"
+msgstr "Preferences"
+
+#. TODO: need a submenu to change status, this needs to "link"
+#. * to the status in the buddy list gtkstatusbox
+#.
+#: plugins/docklet/docklet.c:416
+msgid "Quit"
+msgstr "Quit"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/docklet/docklet.c:556
+msgid "System Tray Icon"
+msgstr "System Tray Icon"
+
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/docklet/docklet.c:559
+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:561
+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/extplacement.c:79
 msgid "By conversation count"
 msgstr "By conversation count"
 
-#: plugins/extplacement.c:98
+#: plugins/extplacement.c:100
 msgid "Conversation Placement"
 msgstr "Conversation Placement"
 
-#: plugins/extplacement.c:103
+#: plugins/extplacement.c:105
 msgid "Number of conversations per window"
 msgstr "Number of conversations per window"
 
-#: plugins/extplacement.c:109
+#: plugins/extplacement.c:111
 msgid "Separate IM and Chat windows when placing by number"
 msgstr "Separate IM and Chat windows when placing by number"
 
@@ -275,19 +224,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/extplacement.c:130
+#: plugins/extplacement.c:132
 msgid "ExtPlacement"
 msgstr "ExtPlacement"
 
 #. *< name
 #. *< version
-#: plugins/extplacement.c:132
+#: plugins/extplacement.c:134
 msgid "Extra conversation placement options."
 msgstr "Extra conversation placement options."
 
 #. *< summary
 #. *  description
-#: plugins/extplacement.c:134
+#: plugins/extplacement.c:136
 msgid ""
 "Restrict the number of conversations per windows, optionally separating IMs "
 "and Chats"
@@ -301,7 +250,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/filectl.c:224
+#: plugins/filectl.c:245
 msgid "Gaim File Control"
 msgstr "Gaim File Control"
 
@@ -309,7 +258,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/filectl.c:227 plugins/filectl.c:229
+#: plugins/filectl.c:248 plugins/filectl.c:250
 msgid "Allows you to control Gaim by entering commands in a file."
 msgstr "Allows you to control Gaim by entering commands in a file."
 
@@ -319,19 +268,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gaiminc.c:90
+#: plugins/gaiminc.c:91
 msgid "Gaim Demonstration Plugin"
 msgstr "Gaim Demonstration Plugin"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gaiminc.c:93
+#: 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:95
+#: 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"
@@ -343,76 +292,102 @@
 "- 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"
-
-#: plugins/gaim-remote/remote.c:100 plugins/gaim-remote/remote.c:139
-msgid "No screenname given."
-msgstr "No screenname given."
-
-#: plugins/gaim-remote/remote.c:176
-msgid "No roomname given."
-msgstr "No roomname given."
-
-#: plugins/gaim-remote/remote.c:195
-msgid "Invalid AIM URI"
-msgstr "Invalid AIM URI"
-
-#: plugins/gaim-remote/remote.c:673
-#, c-format
-msgid ""
-"Failed to assign %s to a socket:\n"
-"%s"
-msgstr ""
-"Failed to assign %s to a socket:\n"
-"%s"
-
-#: plugins/gaim-remote/remote.c:697
-msgid "Unable to open socket"
-msgstr "Unable to open socket"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/gaim-remote/remote.c:747
-msgid "Remote Control"
-msgstr "Remote Control"
-
-#. *< name
-#. *< version
-#. *  summary
-#: 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:752
-msgid ""
-"Gives Gaim the ability to be remote-controlled through third-party "
-"applications or through the gaim-remote tool."
-msgstr ""
-"Gives Gaim the ability to be remote-controlled through third-party "
-"applications or through the gaim-remote tool."
+#: plugins/gaimrc.c:40
+msgid "Cursor Color"
+msgstr ""
+
+#: plugins/gaimrc.c:41
+msgid "Secondary Cursor Color"
+msgstr ""
+
+#: plugins/gaimrc.c:42
+#, fuzzy
+msgid "Hyperlink Color"
+msgstr "Hyperlink colour"
+
+#: plugins/gaimrc.c:53
+#, fuzzy
+msgid "GtkTreeView Expander Size"
+msgstr "Expander Size"
+
+#: plugins/gaimrc.c:72
+#, fuzzy
+msgid "Conversation Entry"
+msgstr "Conversations"
+
+#: plugins/gaimrc.c:73
+#, fuzzy
+msgid "Conversation History"
+msgstr "Conversations"
+
+#: plugins/gaimrc.c:74
+#, fuzzy
+msgid "Log Viewer"
+msgstr "Login server"
+
+#: plugins/gaimrc.c:75
+#, fuzzy
+msgid "Request Dialog"
+msgstr "Request ambiguous"
+
+#: plugins/gaimrc.c:76
+#, fuzzy
+msgid "Notify Dialog"
+msgstr "Notify For"
+
+#: plugins/gaimrc.c:209
+#, fuzzy, c-format
+msgid "Select Color for %s"
+msgstr "Select Text Colour"
+
+#: plugins/gaimrc.c:211
+#, fuzzy
+msgid "Select Color"
+msgstr "Select Text Colour"
+
+#: plugins/gaimrc.c:246
+#, fuzzy, c-format
+msgid "Select Font for %s"
+msgstr "Select Font"
+
+#: plugins/gaimrc.c:284
+#, fuzzy
+msgid "Select Interface Font"
+msgstr "Select Font"
+
+#: plugins/gaimrc.c:343
+#, fuzzy
+msgid "GTK+ Interface Font"
+msgstr "Interface Options"
+
+#: plugins/gaimrc.c:362
+msgid "GTK+ Text Shortcut Theme"
+msgstr ""
+
+#: plugins/gaimrc.c:460
+#, fuzzy
+msgid "Gaim GTK+ Theme Control"
+msgstr "Gaim File Control"
+
+#: plugins/gaimrc.c:462 plugins/gaimrc.c:463
+msgid "Provides access to commonly used gtkrc settings."
+msgstr ""
 
 #. Configuration frame
-#: plugins/gestures/gestures.c:221
+#: plugins/gestures/gestures.c:243
 msgid "Mouse Gestures Configuration"
 msgstr "Mouse Gestures Configuration"
 
-#: plugins/gestures/gestures.c:228
+#: plugins/gestures/gestures.c:250
 msgid "Middle mouse button"
 msgstr "Middle mouse button"
 
-#: plugins/gestures/gestures.c:233
+#: plugins/gestures/gestures.c:255
 msgid "Right mouse button"
 msgstr "Right mouse button"
 
 #. "Visual gesture display" checkbox
-#: plugins/gestures/gestures.c:245
+#: plugins/gestures/gestures.c:267
 msgid "_Visual gesture display"
 msgstr "_Visual gesture display"
 
@@ -422,19 +397,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gestures/gestures.c:274
+#: plugins/gestures/gestures.c:296
 msgid "Mouse Gestures"
 msgstr "Mouse Gestures"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gestures/gestures.c:277
+#: plugins/gestures/gestures.c:299
 msgid "Provides support for mouse gestures"
 msgstr "Provides support for mouse gestures"
 
 #. *  description
-#: plugins/gestures/gestures.c:279
+#: plugins/gestures/gestures.c:301
 msgid ""
 "Allows support for mouse gestures in conversation windows.\n"
 "Drag the middle mouse button to perform certain actions:\n"
@@ -451,9 +426,8 @@
 "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:2168
-#: src/gtkroomlist.c:553 src/protocols/jabber/jabber.c:609
-#: src/protocols/msn/msn.c:1474 src/protocols/trepia/trepia.c:399
+#: plugins/gevolution/assoc-buddy.c:120 src/gtkroomlist.c:572
+#: src/protocols/jabber/jabber.c:638 src/protocols/msn/msn.c:1539
 msgid "Name"
 msgstr "Name"
 
@@ -462,30 +436,31 @@
 msgstr "Instant Messaging"
 
 #. Add the label.
-#: plugins/gevolution/add_buddy_dialog.c:455
+#: plugins/gevolution/add_buddy_dialog.c:459
 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:468
-#: plugins/gevolution/assoc-buddy.c:354 src/protocols/oscar/oscar.c:7283
+#: plugins/gevolution/add_buddy_dialog.c:472
+#: plugins/gevolution/assoc-buddy.c:354 src/protocols/jabber/buddy.c:1357
+#: src/protocols/oscar/oscar.c:8122
 msgid "Search"
 msgstr "Search"
 
-#: plugins/gevolution/add_buddy_dialog.c:549
-#: plugins/gevolution/new_person_dialog.c:304 src/gtkblist.c:4186
-#: src/gtkblist.c:4534
+#: plugins/gevolution/add_buddy_dialog.c:553
+#: plugins/gevolution/new_person_dialog.c:306 src/gtkblist.c:4069
+#: src/gtkblist.c:4446
 msgid "Group:"
 msgstr "Group:"
 
 #. "New Person" button
-#: plugins/gevolution/add_buddy_dialog.c:575
-#: plugins/gevolution/assoc-buddy.c:466
+#: plugins/gevolution/add_buddy_dialog.c:579
+#: plugins/gevolution/assoc-buddy.c:465
 msgid "New Person"
 msgstr "New Person"
 
 #. "Select Buddy" button
-#: plugins/gevolution/add_buddy_dialog.c:592
+#: plugins/gevolution/add_buddy_dialog.c:596
 msgid "Select Buddy"
 msgstr "Select Buddy"
 
@@ -498,47 +473,56 @@
 "Select a person from your address book to add this buddy to, or create a new "
 "person."
 
-#. Add the disclosure
+#. Add the expander
 #: plugins/gevolution/assoc-buddy.c:429
-msgid "Show user details"
-msgstr "Show user details"
-
-#: plugins/gevolution/assoc-buddy.c:430
-msgid "Hide user details"
+#, fuzzy
+msgid "User _details"
 msgstr "Hide user details"
 
 #. "Associate Buddy" button
-#: plugins/gevolution/assoc-buddy.c:483
+#: plugins/gevolution/assoc-buddy.c:482
 msgid "_Associate Buddy"
 msgstr "_Associate Buddy"
 
-#: 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:1936 src/gtkblist.c:4001
-#: src/protocols/jabber/roster.c:67
+#: plugins/gevolution/gevo-util.c:64 plugins/gevolution/gevolution.c:96
+#: src/blist.c:518 src/blist.c:1259 src/blist.c:1480 src/gtkblist.c:3884
+#: src/protocols/jabber/roster.c:66
 msgid "Buddies"
 msgstr "Buddies"
 
-#: plugins/gevolution/gevolution.c:225
+#: 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
 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:348
+#: plugins/gevolution/gevolution.c:414
 msgid "Evolution Integration Configuration"
 msgstr "Evolution Integration Configuration"
 
 #. Label
-#: plugins/gevolution/gevolution.c:351
+#: plugins/gevolution/gevolution.c:417
 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:381 plugins/idle.c:52 src/gtkconn.c:627
+#: plugins/gevolution/gevolution.c:447 plugins/idle.c:111 plugins/idle.c:140
 msgid "Account"
 msgstr "Account"
 
@@ -548,7 +532,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gevolution/gevolution.c:464
+#: plugins/gevolution/gevolution.c:530
 msgid "Evolution Integration"
 msgstr "Evolution Integration"
 
@@ -556,90 +540,87 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/gevolution/gevolution.c:467 plugins/gevolution/gevolution.c:469
-msgid "Provides integration with Ximian Evolution."
+#: plugins/gevolution/gevolution.c:533 plugins/gevolution/gevolution.c:535
+#, fuzzy
+msgid "Provides integration with Evolution."
 msgstr "Provides integration with Ximian Evolution."
 
-#: plugins/gevolution/new_person_dialog.c:264
+#: plugins/gevolution/new_person_dialog.c:266
 msgid "Please enter the person's information below."
 msgstr "Please enter the person's information below."
 
-#: plugins/gevolution/new_person_dialog.c:268
+#: plugins/gevolution/new_person_dialog.c:270
 msgid "Please enter the buddy's screen name and account type below."
 msgstr "Please enter the buddy's screen name and account type below."
 
-#: plugins/gevolution/new_person_dialog.c:288
+#: plugins/gevolution/new_person_dialog.c:290
 msgid "Account type:"
 msgstr "Account type:"
 
-#: plugins/gevolution/new_person_dialog.c:292
+#: plugins/gevolution/new_person_dialog.c:294
 msgid "Screenname:"
 msgstr "Screenname:"
 
 #. Optional Information section
-#: plugins/gevolution/new_person_dialog.c:312
+#: plugins/gevolution/new_person_dialog.c:314
 msgid "Optional information:"
 msgstr "Optional information"
 
 #. Label
-#: plugins/gevolution/new_person_dialog.c:335 src/gtkaccount.c:379
-#: src/gtkaccount.c:409 src/protocols/oscar/oscar.c:591
+#: plugins/gevolution/new_person_dialog.c:337 src/gtkaccount.c:413
+#: src/gtkaccount.c:435 src/protocols/oscar/oscar.c:613
 msgid "Buddy Icon"
 msgstr "Buddy Icon"
 
-#: plugins/gevolution/new_person_dialog.c:347
+#: plugins/gevolution/new_person_dialog.c:349
 msgid "First name:"
 msgstr "First name:"
 
-#: plugins/gevolution/new_person_dialog.c:359
+#: plugins/gevolution/new_person_dialog.c:361
 msgid "Last name:"
 msgstr "Last name:"
 
-#: plugins/gevolution/new_person_dialog.c:379
+#: plugins/gevolution/new_person_dialog.c:381
 msgid "E-mail:"
 msgstr "E-mail:"
 
+#: plugins/history.c:138
+msgid "History Plugin Requires Logging"
+msgstr ""
+
+#: plugins/history.c:139
+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:178
+msgid "History"
+msgstr "History"
+
+#: plugins/history.c:180
+msgid "Shows recently logged conversations in new conversations."
+msgstr "Shows recently logged conversations in new conversations."
+
+#: plugins/history.c:181
+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/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
+#: plugins/iconaway.c:101
 msgid "Iconify on Away"
 msgstr "Iconify on Away"
 
@@ -647,32 +628,47 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/iconaway.c:107 plugins/iconaway.c:109
+#: plugins/iconaway.c:104 plugins/iconaway.c:106
 msgid "Iconifies the buddy list and your conversations when you go away."
 msgstr "Iconifies the buddy list and your conversations when you go away."
 
-#: plugins/idle.c:56
+#: plugins/idle.c:115
 msgid "Minutes"
 msgstr "Minutes"
 
-#: plugins/idle.c:63 plugins/idle.c:98
+#: plugins/idle.c:122 plugins/idle.c:149 plugins/idle.c:215
 msgid "I'dle Mak'er"
 msgstr "I'dle Mak'er"
 
-#: plugins/idle.c:64 plugins/idle.c:79
+#: plugins/idle.c:123 plugins/idle.c:181
 msgid "Set Account Idle Time"
 msgstr "Set Account Idle Time"
 
-#: plugins/idle.c:67
+#: plugins/idle.c:126
 msgid "_Set"
 msgstr "_Set"
 
-#: plugins/idle.c:68 src/away.c:922
+#: plugins/idle.c:127 plugins/idle.c:154
 msgid "_Cancel"
 msgstr "_Cancel"
 
-#: plugins/idle.c:100 plugins/idle.c:101
-msgid "Allows you to hand-configure how long you've been idle for"
+#: plugins/idle.c:150 plugins/idle.c:185
+#, fuzzy
+msgid "Unset Account Idle Time"
+msgstr "Set Account Idle Time"
+
+#: plugins/idle.c:153
+#, fuzzy
+msgid "_Unset"
+msgstr "_Use"
+
+#: plugins/idle.c:190
+msgid "Unset Idle Time For All Idled Accounts"
+msgstr ""
+
+#: plugins/idle.c:217 plugins/idle.c:218
+#, fuzzy
+msgid "Allows you to hand-configure how long you've been idle"
 msgstr "Allows you to hand-configure how long you've been idle for"
 
 #. *< type
@@ -736,68 +732,74 @@
 msgstr "Adds a small box to the buddy list that shows if you have new mail."
 
 #. ---------- "Notify For" ----------
-#: plugins/notify.c:614
+#: plugins/notify.c:638
 msgid "Notify For"
 msgstr "Notify For"
 
-#: plugins/notify.c:618
+#: plugins/notify.c:642
 msgid "_IM windows"
 msgstr "_IM windows"
 
-#: plugins/notify.c:625
+#: plugins/notify.c:649
 msgid "C_hat windows"
 msgstr "C_hat windows"
 
-#: plugins/notify.c:632
+#: plugins/notify.c:656
 msgid "_Focused windows"
 msgstr "_Focused windows"
 
 #. ---------- "Notification Methods" ----------
-#: plugins/notify.c:640
+#: plugins/notify.c:664
 msgid "Notification Methods"
 msgstr "Notification Methods"
 
-#: plugins/notify.c:647
+#: plugins/notify.c:671
 msgid "Prepend _string into window title:"
 msgstr "Prepend _string into window title:"
 
 #. Count method button
-#: plugins/notify.c:666
+#: plugins/notify.c:690
 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:674
+#: plugins/notify.c:698
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "Set window manager \"_URGENT\" hint"
 
+#. Raise window method button
+#: plugins/notify.c:706
+#, fuzzy
+msgid "R_aise conversation window"
+msgstr "IM Conversation Windows"
+
 #. ---------- "Notification Removals" ----------
-#: plugins/notify.c:682
+#: plugins/notify.c:714
 msgid "Notification Removal"
 msgstr "Notification Removal"
 
 #. Remove on focus button
-#: plugins/notify.c:687
+#: plugins/notify.c:719
 msgid "Remove when conversation window _gains focus"
 msgstr "Remove when conversation window _gains focus"
 
 #. Remove on click button
-#: plugins/notify.c:694
+#: plugins/notify.c:726
 msgid "Remove when conversation window _receives click"
 msgstr "Remove when conversation window _receives click"
 
 #. Remove on type button
-#: plugins/notify.c:702
+#: plugins/notify.c:734
 msgid "Remove when _typing in conversation window"
 msgstr "Remove when _typing in conversation window"
 
 #. Remove on message send button
-#: plugins/notify.c:710
+#: plugins/notify.c:742
 msgid "Remove when a _message gets sent"
 msgstr "Remove when a _message gets sent"
 
 #. Remove on conversation switch button
-#: plugins/notify.c:719
+#: plugins/notify.c:751
 msgid "Remove on switch to conversation ta_b"
 msgstr "Remove on switch to conversation ta_b"
 
@@ -807,7 +809,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/notify.c:809
+#: plugins/notify.c:841
 msgid "Message Notification"
 msgstr "Message Notification"
 
@@ -815,7 +817,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/notify.c:812 plugins/notify.c:814
+#: plugins/notify.c:844 plugins/notify.c:846
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "Provides a variety of ways of notifying you of unread messages."
 
@@ -825,14 +827,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/perl/perl.c:535
+#: plugins/perl/perl.c:583
 msgid "Perl Plugin Loader"
 msgstr "Perl Plugin Loader"
 
 #. *< name
 #. *< version
 #. *< summary
-#: plugins/perl/perl.c:537 plugins/perl/perl.c:538
+#: plugins/perl/perl.c:585 plugins/perl/perl.c:586
 msgid "Provides support for loading perl plugins."
 msgstr "Provides support for loading perl plugins."
 
@@ -911,7 +913,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/signals-test.c:601
+#: plugins/signals-test.c:730
 msgid "Signals Test"
 msgstr "Signals Test"
 
@@ -919,7 +921,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/signals-test.c:604 plugins/signals-test.c:606
+#: plugins/signals-test.c:733 plugins/signals-test.c:735
 msgid "Test to see that all signals are working properly."
 msgstr "Test to see that all signals are working properly."
 
@@ -941,35 +943,51 @@
 msgid "Tests to see that most things are working."
 msgstr "Tests to see that most things are working."
 
-#: plugins/spellchk.c:416
+#: plugins/spellchk.c:1788
+msgid "Duplicate Correction"
+msgstr ""
+
+#: plugins/spellchk.c:1789
+msgid "The specified word already exists in the correction list."
+msgstr ""
+
+#: plugins/spellchk.c:1939
 msgid "Text Replacements"
 msgstr "Text Replacements"
 
-#: plugins/spellchk.c:440
+#: plugins/spellchk.c:1963
 msgid "You type"
 msgstr "You type"
 
-#: plugins/spellchk.c:452
+#: plugins/spellchk.c:1975
 msgid "You send"
 msgstr "You send"
 
-#: plugins/spellchk.c:478
+#: plugins/spellchk.c:1987
+msgid "Whole words only"
+msgstr ""
+
+#: plugins/spellchk.c:2013
 msgid "Add a new text replacement"
 msgstr "Add a new text replacement"
 
-#: plugins/spellchk.c:485
+#: plugins/spellchk.c:2023
 msgid "You _type:"
 msgstr "You _type:"
 
-#: plugins/spellchk.c:499
+#: plugins/spellchk.c:2039
 msgid "You _send:"
 msgstr "You _send:"
 
-#: plugins/spellchk.c:541
+#: plugins/spellchk.c:2051
+msgid "Only replace _whole words"
+msgstr ""
+
+#: plugins/spellchk.c:2088
 msgid "Text replacement"
 msgstr "Text replacement"
 
-#: plugins/spellchk.c:543 plugins/spellchk.c:544
+#: plugins/spellchk.c:2090 plugins/spellchk.c:2091
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "Replaces text in outgoing messages according to user-defined rules."
 
@@ -979,6 +997,42 @@
 #. *< 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"
@@ -991,71 +1045,35 @@
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "Provides a wrapper around SSL support libraries."
 
-#. *< 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
+#: plugins/statenotify.c:42
 #, c-format
 msgid "%s has gone away."
 msgstr "%s has gone away."
 
-#: plugins/statenotify.c:48
+#: plugins/statenotify.c:49
 #, c-format
 msgid "%s is no longer away."
 msgstr "%s is no longer away."
 
-#: plugins/statenotify.c:55
+#: plugins/statenotify.c:56
 #, c-format
 msgid "%s has become idle."
 msgstr "%s has become idle."
 
-#: plugins/statenotify.c:62
+#: plugins/statenotify.c:63
 #, c-format
 msgid "%s is no longer idle."
 msgstr "%s is no longer idle."
 
-#: plugins/statenotify.c:73
+#: plugins/statenotify.c:74
 msgid "Notify When"
 msgstr "Notify When"
 
-#: plugins/statenotify.c:76
+#: plugins/statenotify.c:77
 msgid "Buddy Goes _Away"
 msgstr "Buddy Goes _Away"
 
-#: plugins/statenotify.c:79
+#: plugins/statenotify.c:80
 msgid "Buddy Goes _Idle"
 msgstr "Buddy Becomes _Idle"
 
@@ -1065,7 +1083,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/statenotify.c:119
+#: plugins/statenotify.c:120
 msgid "Buddy State Notification"
 msgstr "Buddy State Notification"
 
@@ -1073,7 +1091,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/statenotify.c:122 plugins/statenotify.c:125
+#: plugins/statenotify.c:123 plugins/statenotify.c:126
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
@@ -1095,7 +1113,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ticker/ticker.c:75 plugins/ticker/ticker.c:331
+#: plugins/ticker/ticker.c:75 plugins/ticker/ticker.c:326
 msgid "Buddy Ticker"
 msgstr "Buddy Ticker"
 
@@ -1103,33 +1121,29 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/ticker/ticker.c:334 plugins/ticker/ticker.c:336
+#: plugins/ticker/ticker.c:329 plugins/ticker/ticker.c:331
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "A horizontal scrolling version of the buddy list."
 
-#: plugins/timestamp.c:186
+#: plugins/timestamp.c:202
 msgid "iChat Timestamp"
 msgstr "iChat Timestamp"
 
-#: plugins/timestamp.c:193
+#: plugins/timestamp.c:209
 msgid "Delay"
 msgstr "Delay"
 
-#: plugins/timestamp.c:200
+#: plugins/timestamp.c:216
 msgid "minutes."
 msgstr "minutes."
 
-#: plugins/timestamp.c:206
-msgid "_Apply"
-msgstr "_Apply"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/timestamp.c:271
+#: plugins/timestamp.c:279
 msgid "Timestamp"
 msgstr "Timestamp"
 
@@ -1137,287 +1151,294 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/timestamp.c:274 plugins/timestamp.c:276
+#: plugins/timestamp.c:282 plugins/timestamp.c:284
 msgid "Adds iChat-style timestamps to conversations every N minutes."
 msgstr "Adds iChat-style timestamps to conversations every N minutes."
 
-#: plugins/win32/transparency/win2ktrans.c:134
-#: plugins/win32/transparency/win2ktrans.c:413
-#: plugins/win32/transparency/win2ktrans.c:444
+#: plugins/win32/transparency/win2ktrans.c:183
+#: plugins/win32/transparency/win2ktrans.c:569
+#: plugins/win32/transparency/win2ktrans.c:616
 msgid "Opacity:"
 msgstr "Opacity:"
 
 #. IM Convo trans options
-#: plugins/win32/transparency/win2ktrans.c:394
+#: plugins/win32/transparency/win2ktrans.c:533
 msgid "IM Conversation Windows"
 msgstr "IM Conversation Windows"
 
-#: plugins/win32/transparency/win2ktrans.c:395
+#: plugins/win32/transparency/win2ktrans.c:534
 msgid "_IM window transparency"
 msgstr "_IM window transparency"
 
-#: plugins/win32/transparency/win2ktrans.c:405
+#: plugins/win32/transparency/win2ktrans.c:548
 msgid "_Show slider bar in IM window"
 msgstr "_Show slider bar in IM window"
 
+#: plugins/win32/transparency/win2ktrans.c:555
+#, fuzzy
+msgid "Remove IM window transparency on focus"
+msgstr "_IM window transparency"
+
+#: plugins/win32/transparency/win2ktrans.c:558
+#: plugins/win32/transparency/win2ktrans.c:606
+#, fuzzy
+msgid "Always on top"
+msgstr "Alias Contact"
+
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:430 src/gtkprefs.c:956
+#: plugins/win32/transparency/win2ktrans.c:590
 msgid "Buddy List Window"
 msgstr "Buddy List Window"
 
-#: plugins/win32/transparency/win2ktrans.c:431
+#: plugins/win32/transparency/win2ktrans.c:591
 msgid "_Buddy List window transparency"
 msgstr "_Buddy List window transparency"
 
+#: plugins/win32/transparency/win2ktrans.c:604
+#, fuzzy
+msgid "Remove Buddy List window transparency on focus"
+msgstr "_Buddy List window transparency"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/win32/transparency/win2ktrans.c:489
+#: plugins/win32/transparency/win2ktrans.c:657
 msgid "Transparency"
 msgstr "Transparency"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/win32/transparency/win2ktrans.c:492
+#: plugins/win32/transparency/win2ktrans.c:660
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "Variable Transparency for the buddy list and conversations."
 
 #. *  description
-#: plugins/win32/transparency/win2ktrans.c:494
+#: plugins/win32/transparency/win2ktrans.c:662
+#, fuzzy
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
 "\n"
-"* Note: This plugin requires Win2000 or WinXP."
+"* Note: This plugin requires Win2000 or greater."
 msgstr ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
 "\n"
 "* Note: This plugin requires Win2000 or WinXP."
 
-#: plugins/win32/winprefs/winprefs.c:344
+#: plugins/win32/winprefs/winprefs.c:385
 msgid "GTK+ Runtime Version"
 msgstr "GTK+ Runtime Version"
 
 #. Autostart
-#: plugins/win32/winprefs/winprefs.c:352
+#: plugins/win32/winprefs/winprefs.c:393
 msgid "Startup"
 msgstr "Startup"
 
-#: plugins/win32/winprefs/winprefs.c:353
+#: plugins/win32/winprefs/winprefs.c:394
 msgid "_Start Gaim on Windows startup"
 msgstr "_Start Gaim on Windows startup"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3167
-#: src/gtkprefs.c:2421
+#: plugins/win32/winprefs/winprefs.c:405 src/gtkblist.c:3164
+#: src/gtkprefs.c:1755
 msgid "Buddy List"
 msgstr "Buddy List"
 
-#: plugins/win32/winprefs/winprefs.c:363
+#: plugins/win32/winprefs/winprefs.c:406
 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:377
-msgid "_Keep Buddy List window on top"
+#: plugins/win32/winprefs/winprefs.c:410
+#, fuzzy
+msgid "_Keep Buddy List window on top:"
 msgstr "_Keep Buddy List window on top"
 
+#: plugins/win32/winprefs/winprefs.c:412 src/gtkprefs.c:1691
+msgid "Never"
+msgstr "Never"
+
+#: plugins/win32/winprefs/winprefs.c:413
+#, fuzzy
+msgid "Always"
+msgstr "Away"
+
+#. XXX: Did this ever work?
+#: plugins/win32/winprefs/winprefs.c:415
+msgid "Only when docked"
+msgstr ""
+
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:1007
-#: src/gtkprefs.c:2422 src/protocols/msn/msn.c:1811
+#: plugins/win32/winprefs/winprefs.c:419 src/gtkprefs.c:837
+#: src/gtkprefs.c:1756
 msgid "Conversations"
 msgstr "Conversations"
 
-#: plugins/win32/winprefs/winprefs.c:383
-msgid "_Flash Window when messages are received"
+#: plugins/win32/winprefs/winprefs.c:420
+#, fuzzy
+msgid "_Flash window when messages are received"
 msgstr "_Flash Window when messages are received"
 
-#: plugins/win32/winprefs/winprefs.c:407
+#: plugins/win32/winprefs/winprefs.c:443
 msgid "WinGaim Options"
 msgstr "WinGaim Options"
 
-#: plugins/win32/winprefs/winprefs.c:409 plugins/win32/winprefs/winprefs.c:410
+#: plugins/win32/winprefs/winprefs.c:445
 msgid "Options specific to Windows Gaim."
 msgstr "Options specific to Windows Gaim."
 
-#: 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"
+#: plugins/win32/winprefs/winprefs.c:446
+msgid ""
+"Provides options specific to Windows Gaim, such as buddy list docking and "
+"conversation flashing."
+msgstr ""
+
+#: src/account.c:773
+#, fuzzy
+msgid "accounts"
+msgstr "Accounts"
+
+#: src/account.c:915
+#, fuzzy
+msgid "Password is required to sign on."
+msgstr "Password has expired"
+
+#: src/account.c:940
+#, c-format
+msgid "Enter password for %s (%s)"
+msgstr "Enter password for %s (%s)"
+
+#: src/account.c:947
+#, fuzzy
+msgid "Enter Password"
+msgstr "Change Password"
+
+#: src/account.c:952
+#, fuzzy
+msgid "Save 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:363 src/connection.c:198 src/gtkblist.c:2492
-#: src/gtkdialogs.c:506 src/gtkdialogs.c:648 src/gtkdialogs.c:702
-#: 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:2414
-#: src/protocols/oscar/oscar.c:3687 src/protocols/oscar/oscar.c:3781
-#: src/protocols/oscar/oscar.c:7070 src/protocols/oscar/oscar.c:7162
-#: src/protocols/oscar/oscar.c:7214 src/protocols/oscar/oscar.c:7300
-#: 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:3021 src/protocols/yahoo/yahoo.c:3030
-#: src/request.h:1245
+#: src/account.c:960 src/account.c:1116 src/gtkdialogs.c:506
+#: src/gtkdialogs.c:647 src/gtkdialogs.c:703 src/gtkrequest.c:260
+#: src/protocols/gg/gg.c:434 src/protocols/gg/gg.c:581
+#: src/protocols/gg/gg.c:1497 src/protocols/jabber/jabber.c:1162
+#: src/protocols/jabber/xdata.c:337 src/protocols/msn/msn.c:250
+#: src/protocols/msn/msn.c:265 src/protocols/msn/msn.c:280
+#: src/protocols/msn/msn.c:295 src/protocols/oscar/oscar.c:2902
+#: src/protocols/oscar/oscar.c:4410 src/protocols/oscar/oscar.c:4491
+#: src/protocols/oscar/oscar.c:7851 src/protocols/oscar/oscar.c:7976
+#: src/protocols/oscar/oscar.c:8001 src/protocols/oscar/oscar.c:8053
+#: src/protocols/silc/buddy.c:465 src/protocols/silc/buddy.c:1137
+#: 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:1696 src/protocols/silc/silc.c:716
+#: src/protocols/yahoo/yahoo.c:2947 src/protocols/yahoo/yahoo.c:2956
+#: src/request.h:1331
 msgid "OK"
 msgstr "OK"
 
-#: 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:507 src/gtkdialogs.c:649 src/gtkdialogs.c:703
-#: src/gtkdialogs.c:801 src/gtkdialogs.c:823 src/gtkdialogs.c:843
-#: src/gtkdialogs.c:880 src/gtkdialogs.c:940 src/gtkdialogs.c:983
-#: src/gtkdialogs.c:1024 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:1535
-#: src/protocols/oscar/oscar.c:2415 src/protocols/oscar/oscar.c:3645
-#: src/protocols/oscar/oscar.c:3688 src/protocols/oscar/oscar.c:3725
-#: src/protocols/oscar/oscar.c:3782 src/protocols/oscar/oscar.c:7071
-#: src/protocols/oscar/oscar.c:7163 src/protocols/oscar/oscar.c:7215
-#: src/protocols/oscar/oscar.c:7284 src/protocols/oscar/oscar.c:7301
-#: 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:3022 src/protocols/yahoo/yahoo.c:3031
-#: src/request.h:1245 src/request.h:1255
+#: src/account.c:961 src/account.c:1117 src/account.c:1155
+#: src/gtkaccount.c:2108 src/gtkaccount.c:2570 src/gtkblist.c:4484
+#: src/gtkdialogs.c:507 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:419 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/gg/gg.c:435
+#: src/protocols/gg/gg.c:582 src/protocols/gg/gg.c:656
+#: src/protocols/gg/gg.c:1498 src/protocols/jabber/buddy.c:573
+#: src/protocols/jabber/buddy.c:1358 src/protocols/jabber/buddy.c:1392
+#: src/protocols/jabber/chat.c:780 src/protocols/jabber/jabber.c:707
+#: src/protocols/jabber/jabber.c:1163 src/protocols/jabber/xdata.c:338
+#: src/protocols/msn/msn.c:251 src/protocols/msn/msn.c:266
+#: src/protocols/msn/msn.c:281 src/protocols/msn/msn.c:296
+#: src/protocols/msn/msn.c:313 src/protocols/oscar/oscar.c:1596
+#: src/protocols/oscar/oscar.c:2903 src/protocols/oscar/oscar.c:4368
+#: src/protocols/oscar/oscar.c:4411 src/protocols/oscar/oscar.c:4448
+#: src/protocols/oscar/oscar.c:4492 src/protocols/oscar/oscar.c:7852
+#: src/protocols/oscar/oscar.c:7977 src/protocols/oscar/oscar.c:8002
+#: src/protocols/oscar/oscar.c:8054 src/protocols/oscar/oscar.c:8123
+#: src/protocols/silc/buddy.c:466 src/protocols/silc/buddy.c:1042
+#: src/protocols/silc/buddy.c:1138 src/protocols/silc/chat.c:595
+#: src/protocols/silc/chat.c:724 src/protocols/silc/ops.c:1697
+#: src/protocols/silc/silc.c:717 src/protocols/yahoo/yahoo.c:2948
+#: src/protocols/yahoo/yahoo.c:2957 src/request.h:1331 src/request.h:1341
 msgid "Cancel"
 msgstr "Cancel"
 
-#: src/account.c:393
+#: src/account.c:986 src/connection.c:96
+#, c-format
+msgid "Missing protocol plugin for %s"
+msgstr "Missing protocol plugin for %s"
+
+#: src/account.c:988 src/connection.c:99
+msgid "Connection Error"
+msgstr "Connection Error"
+
+#: src/account.c:1052 src/protocols/gg/gg.c:470
+#: src/protocols/jabber/jabber.c:1115
+msgid "New passwords do not match."
+msgstr "New passwords do not match."
+
+#: src/account.c:1061
+msgid "Fill out all fields completely."
+msgstr "Fill out all fields completely."
+
+#: src/account.c:1085
+msgid "Original password"
+msgstr "Original password"
+
+#: src/account.c:1092
+msgid "New password"
+msgstr "New password"
+
+#: src/account.c:1099
+msgid "New password (again)"
+msgstr "New password (again)"
+
+#: src/account.c:1105
+#, c-format
+msgid "Change password for %s"
+msgstr "Change password for %s"
+
+#: src/account.c:1113
+msgid "Please enter your current password and your new password."
+msgstr "Please enter your current password and your new password."
+
+#: src/account.c:1146
 #, c-format
 msgid "Change user information for %s"
 msgstr "Change user information for %s"
 
-#: src/account.c:401 src/gtkrequest.c:250 src/protocols/jabber/buddy.c:514
-#: src/protocols/trepia/trepia.c:347
+#: src/account.c:1154 src/gtkdebug.c:684 src/gtkrequest.c:267
+#: src/protocols/jabber/buddy.c:572
 msgid "Save"
 msgstr "Save"
 
-#: src/account.c:760 src/gtkft.c:159 src/protocols/jabber/buddy.c:573
-#: src/protocols/novell/novell.c:2812
+#: src/account.c:1641 src/gtkft.c:156 src/protocols/jabber/buddy.c:633
+#: src/protocols/jabber/buddy.c:1083 src/protocols/jabber/buddy.c:1100
+#: src/protocols/novell/novell.c:2837
 msgid "Unknown"
 msgstr "Unknown"
 
-#: src/away.c:233
-msgid "Away!"
-msgstr "Away!"
-
-#: src/away.c:303
-msgid "Edit This Message"
-msgstr "Edit This Message"
-
-#: src/away.c:308
-msgid "I'm Back!"
-msgstr "I'm Back!"
-
-#: src/away.c:362
-#, c-format
-msgid "Are you sure you want to remove the away message \"%s\"?"
-msgstr "Are you sure you want to remove the away message \"%s\"?"
-
-#: src/away.c:364 src/away.c:442
-msgid "Remove Away Message"
-msgstr "Remove Away Message"
-
-#. Remove button
-#: src/away.c:366 src/gtkconv.c:1535 src/gtkconv.c:3917 src/gtkconv.c:3988
-#: 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
+#: src/blist.c:545
+#, fuzzy
+msgid "buddy list"
+msgstr "Buddy List"
+
+#: src/blist.c:1162
 msgid "Chats"
 msgstr "Chats"
 
-#: src/blist.c:1357
+#: src/blist.c:1863
 #, c-format
 msgid ""
 "%d buddy from group %s was not removed because its account was not logged "
@@ -1432,119 +1453,73 @@
 "%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:1366
+#: src/blist.c:1872
 msgid "Group not removed"
 msgstr "Group not removed"
 
-#: src/blist.c:2069
-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 been moved to blist.xml~."
-
-#: src/blist.c:2072
-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
+#: src/connection.c:98
 msgid "Registration Error"
 msgstr "Registration Error"
 
-#: 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."
+#: src/conversation.c:205
+#, fuzzy
+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:4248
-#, c-format
-msgid "Unable to send message to %s:"
+#: src/conversation.c:208 src/conversation.c:221
+#, fuzzy, c-format
+msgid "Unable to send message to %s."
 msgstr "Unable to send message to %s:"
 
-#: src/conversation.c:239
+#: src/conversation.c:209
 msgid "The message is too large."
 msgstr "The message is too large."
 
-#: src/conversation.c:248
+#: src/conversation.c:218
 msgid "Unable to send message."
 msgstr "Unable to send message."
 
-#: src/conversation.c:2070
+#: src/conversation.c:1497
 #, c-format
 msgid "%s entered the room."
 msgstr "%s entered the room."
 
-#: src/conversation.c:2073
+#: src/conversation.c:1499
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] entered the room."
 
-#: src/conversation.c:2171
+#: src/conversation.c:1598
 #, c-format
 msgid "You are now known as %s"
 msgstr "You are now known as %s"
 
-#: src/conversation.c:2174
+#: src/conversation.c:1613
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s is now known as %s"
 
-#: src/conversation.c:2216
+#: src/conversation.c:1669
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s left the room (%s)."
 
-#: src/conversation.c:2218
+#: src/conversation.c:1671
 #, c-format
 msgid "%s left the room."
 msgstr "%s left the room."
 
-#: src/conversation.c:2291
+#: src/conversation.c:1748
 #, c-format
 msgid "(+%d more)"
 msgstr "(+%d more)"
 
-#: src/conversation.c:2293
+#: src/conversation.c:1750
 #, c-format
 msgid " left the room (%s)."
 msgstr " left the room (%s)."
 
-#: src/conversation.c:2698
-msgid "Last created window"
-msgstr "Last created window"
-
-#: src/conversation.c:2700
-msgid "Separate IM and Chat windows"
-msgstr "Separate IM and Chat windows"
-
-#: src/conversation.c:2702 src/gtkprefs.c:1387
-msgid "New window"
-msgstr "New window"
-
-#: src/conversation.c:2704
-msgid "By group"
-msgstr "By group"
-
-#: src/conversation.c:2706
-msgid "By account"
-msgstr "By account"
-
-#: src/ft.c:148 src/protocols/msn/msn.c:369
+#: src/ft.c:188 src/protocols/msn/msn.c:412
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -1553,7 +1528,7 @@
 "Error reading %s: \n"
 "%s.\n"
 
-#: src/ft.c:152
+#: src/ft.c:192
 #, c-format
 msgid ""
 "Error writing %s: \n"
@@ -1562,7 +1537,7 @@
 "Error writing %s: \n"
 "%s.\n"
 
-#: src/ft.c:156
+#: src/ft.c:196
 #, c-format
 msgid ""
 "Error accessing %s: \n"
@@ -1571,35 +1546,35 @@
 "Error accessing %s: \n"
 "%s.\n"
 
-#: src/ft.c:189
+#: src/ft.c:229
 msgid "Cannot send a file of 0 bytes."
 msgstr "Cannot send a file of 0 bytes."
 
-#: src/ft.c:199
+#: src/ft.c:239
 msgid "Cannot send a directory."
 msgstr "Cannot send a directory."
 
-#: src/ft.c:208
+#: src/ft.c:248
 #, 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:265
+#: src/ft.c:306
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s wants to send you %s (%s)"
 
-#: src/ft.c:273
+#: src/ft.c:313
 #, c-format
 msgid "%s wants to send you a file"
 msgstr "%s wants to send you a file"
 
-#: src/ft.c:311
+#: src/ft.c:354
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "Accept file transfer request from %s?"
 
-#: src/ft.c:315
+#: src/ft.c:358
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -1610,169 +1585,65 @@
 "Remote host: %s\n"
 "Remote port: %d"
 
-#: src/ft.c:338
+#: src/ft.c:382
 #, c-format
 msgid "%s is offering to send file %s"
 msgstr "%s is offering to send file %s"
 
-#: src/ft.c:374
+#: src/ft.c:422
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s is not a valid filename.\n"
 
-#: src/ft.c:395
+#: src/ft.c:443
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "Offering to send %s to %s"
 
-#: src/ft.c:890
+#: src/ft.c:454
+#, fuzzy, c-format
+msgid "Starting transfer of %s from %s"
+msgstr "Accept file transfer request from %s?"
+
+#: src/ft.c:608
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "Transfer of file %s complete"
 
-#: src/ft.c:893
+#: src/ft.c:611
 msgid "File transfer complete"
 msgstr "File transfer complete"
 
-#: src/ft.c:942
+#: src/ft.c:995
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "You cancelled the transfer of %s"
 
-#: src/ft.c:948
+#: src/ft.c:1000
 msgid "File transfer cancelled"
 msgstr "File transfer cancelled"
 
-#: src/ft.c:1001
+#: src/ft.c:1057
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s cancelled the transfer of %s"
 
-#: src/ft.c:1007
+#: src/ft.c:1062
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s cancelled the file transfer"
 
-#: src/ft.c:1056
-#, c-format
-msgid "File transfer to %s aborted.\n"
+#: src/ft.c:1119
+#, fuzzy, c-format
+msgid "File transfer to %s failed."
 msgstr "File transfer to %s aborted.\n"
 
-#: src/ft.c:1058
-#, c-format
-msgid "File transfer from %s aborted.\n"
+#: src/ft.c:1121
+#, fuzzy, c-format
+msgid "File transfer from %s failed."
 msgstr "File transfer from %s aborted.\n"
 
-#: 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"
-"       uri                      Handle AIM: URI\n"
-"       away                     Popup the away dialog with the default "
-"message\n"
-"       back                     Remove the away dialog\n"
-"       quit                     Close running copy of Gaim\n"
-"\n"
-"    OPTIONS:\n"
-"       -h, --help [command]     Show help for command\n"
-msgstr ""
-"Usage: %s command [OPTIONS] [URI]\n"
-"\n"
-"    COMMANDS:\n"
-"       uri                      Handle AIM: URI\n"
-"       away                     Popup the away dialog with the default "
-"message\n"
-"       back                     Remove the away dialog\n"
-"       quit                     Close running copy of Gaim\n"
-"\n"
-"    OPTIONS:\n"
-"       -h, --help [command]     Show help for command\n"
-
-#: src/gaim-remote.c:185 src/gaim-remote.c:203
-msgid ""
-"Gaim not running (on session 0)\n"
-"Is the \"Remote Control\" plugin loaded?\n"
-msgstr ""
-"Gaim not running (on session 0)\n"
-"Is the \"Remote Control\" plugin loaded?\n"
-
-#: src/gaim-remote.c:219
-msgid ""
-"\n"
-"Using AIM: URIs:\n"
-"Sending an IM to a screen name:\n"
-"\tgaim-remote uri 'aim:goim?screenname=Penguin&message=hello+world'\n"
-"In this case, 'Penguin' is the screen name we wish to IM, and 'hello world'\n"
-"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"
-"with no message:\n"
-"\tgaim-remote uri 'aim:goim?screenname=Penguin'\n"
-"\n"
-"Joining a chat:\n"
-"\tgaim-remote uri 'aim:gochat?roomname=PenguinLounge'\n"
-"...joins the 'PenguinLounge' chat room.\n"
-"\n"
-"Adding a buddy to your buddy list:\n"
-"\tgaim-remote uri 'aim:addbuddy?screenname=Penguin'\n"
-"...prompts you to add 'Penguin' to your buddy list.\n"
-msgstr ""
-"\n"
-"Using AIM: URIs:\n"
-"Sending an IM to a screen name:\n"
-"\tgaim-remote uri 'aim:goim?screenname=Penguin&message=hello+world'\n"
-"In this case, 'Penguin' is the screen name we wish to IM, and 'hello world'\n"
-"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"
-"with no message:\n"
-"\tgaim-remote uri 'aim:goim?screenname=Penguin'\n"
-"\n"
-"Joining a chat:\n"
-"\tgaim-remote uri 'aim:gochat?roomname=PenguinLounge'\n"
-"...joins the 'PenguinLounge' chat room.\n"
-"\n"
-"Adding a buddy to your buddy list:\n"
-"\tgaim-remote uri 'aim:addbuddy?screenname=Penguin'\n"
-"...prompts you to add 'Penguin' to your buddy list.\n"
-
-#: src/gaim-remote.c:239
-msgid ""
-"\n"
-"Close running copy of Gaim\n"
-msgstr ""
-"\n"
-"Close running copy of Gaim\n"
-
-#: src/gaim-remote.c:243
-msgid ""
-"\n"
-"Mark all accounts as \"away\" with the default message.\n"
-msgstr ""
-"\n"
-"Mark all accounts as \"away\" with the default message.\n"
-
-#: src/gaim-remote.c:247
-msgid ""
-"\n"
-"Set all accounts as not away.\n"
-msgstr ""
-"\n"
-"Set all accounts as not away.\n"
-
-#: src/gtkaccount.c:331
+#: src/gtkaccount.c:363
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -1784,165 +1655,153 @@
 "<b>Image size:</b> %dx%d"
 
 #. Build the login options frame.
-#: src/gtkaccount.c:638
+#: src/gtkaccount.c:731
 msgid "Login Options"
 msgstr "Login Options"
 
-#: src/gtkaccount.c:655 src/gtkft.c:585
+#: src/gtkaccount.c:748 src/gtkft.c:623
 msgid "Protocol:"
 msgstr "Protocol:"
 
-#: src/gtkaccount.c:660 src/gtkblist.c:4158
+#: src/gtkaccount.c:753 src/gtkblist.c:4038
 msgid "Screen Name:"
 msgstr "Screen Name:"
 
-#: src/gtkaccount.c:733
+#: src/gtkaccount.c:826
 msgid "Password:"
 msgstr "Password:"
 
-#: src/gtkaccount.c:738 src/gtkblist.c:4172 src/gtkblist.c:4519
+#: src/gtkaccount.c:831 src/gtkblist.c:4052 src/gtkblist.c:4431
 msgid "Alias:"
 msgstr "Alias:"
 
-#: src/gtkaccount.c:742
+#: src/gtkaccount.c:835
 msgid "Remember password"
 msgstr "Remember password"
 
 #. Build the user options frame.
-#: src/gtkaccount.c:798
+#: src/gtkaccount.c:880
 msgid "User Options"
 msgstr "User Options"
 
-#: src/gtkaccount.c:811
+#: src/gtkaccount.c:893
 msgid "New mail notifications"
 msgstr "New mail notifications"
 
-#: src/gtkaccount.c:820
+#: src/gtkaccount.c:902
 msgid "Buddy icon:"
 msgstr "Buddy icon:"
 
 #. Build the protocol options frame.
-#: src/gtkaccount.c:909
+#: src/gtkaccount.c:991
 #, c-format
 msgid "%s Options"
 msgstr "%s Options"
 
 #. Use Global Proxy Settings
-#: src/gtkaccount.c:1048 src/gtkaccount.c:1095
+#: src/gtkaccount.c:1129 src/gtkaccount.c:1176
 msgid "Use Global Proxy Settings"
 msgstr "Use Global Proxy Settings"
 
 #. No Proxy
-#: src/gtkaccount.c:1054 src/gtkaccount.c:1102
+#: src/gtkaccount.c:1135 src/gtkaccount.c:1183
 msgid "No Proxy"
 msgstr "No Proxy"
 
 #. HTTP
-#: src/gtkaccount.c:1060 src/gtkaccount.c:1109
+#: src/gtkaccount.c:1141 src/gtkaccount.c:1190
 msgid "HTTP"
 msgstr "HTTP"
 
 #. SOCKS 4
-#: src/gtkaccount.c:1066 src/gtkaccount.c:1116
+#: src/gtkaccount.c:1147 src/gtkaccount.c:1197
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
 #. SOCKS 5
-#: src/gtkaccount.c:1072 src/gtkaccount.c:1123
+#: src/gtkaccount.c:1153 src/gtkaccount.c:1204
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:1078 src/gtkaccount.c:1130 src/gtkprefs.c:1190
+#: src/gtkaccount.c:1159 src/gtkaccount.c:1211 src/gtkprefs.c:1041
 msgid "Use Environmental Settings"
 msgstr "Use Environmental Settings"
 
-#: src/gtkaccount.c:1169
+#: src/gtkaccount.c:1250
 msgid "you can see the butterflies mating"
 msgstr "you can see the butterflies mating"
 
-#: src/gtkaccount.c:1173
+#: src/gtkaccount.c:1254
 msgid "If you look real closely"
 msgstr "If you look real closely"
 
-#: src/gtkaccount.c:1189
+#: src/gtkaccount.c:1270
 msgid "Proxy Options"
 msgstr "Proxy Options"
 
-#: src/gtkaccount.c:1207 src/gtkprefs.c:1184
+#: src/gtkaccount.c:1288 src/gtkprefs.c:1035
 msgid "Proxy _type:"
 msgstr "Proxy _type:"
 
-#: src/gtkaccount.c:1216 src/gtkprefs.c:1211
+#: src/gtkaccount.c:1297 src/gtkprefs.c:1056
 msgid "_Host:"
 msgstr "_Host:"
 
-#: src/gtkaccount.c:1220 src/gtkprefs.c:1229
+#: src/gtkaccount.c:1301 src/gtkprefs.c:1074
 msgid "_Port:"
 msgstr "_Port:"
 
-#: src/gtkaccount.c:1228
+#: src/gtkaccount.c:1309
 msgid "_Username:"
 msgstr "_Username:"
 
-#: src/gtkaccount.c:1233 src/gtkprefs.c:1266
+#: src/gtkaccount.c:1314 src/gtkprefs.c:1111
 msgid "Pa_ssword:"
 msgstr "Pa_ssword:"
 
-#: src/gtkaccount.c:1604
+#: src/gtkaccount.c:1720
 msgid "Add Account"
 msgstr "Add Account"
 
-#: src/gtkaccount.c:1606
+#: src/gtkaccount.c:1722
 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:1658 src/protocols/jabber/jabber.c:677
+#: src/gtkaccount.c:1770 src/protocols/jabber/jabber.c:706
 msgid "Register"
 msgstr "Register"
 
-#: src/gtkaccount.c:2023
+#: src/gtkaccount.c:2102 src/gtksavedstatuses.c:184
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Are you sure you want to delete %s?"
 
-#: src/gtkaccount.c:2028 src/gtkrequest.c:247
+#: src/gtkaccount.c:2107 src/gtkrequest.c:264 src/gtksavedstatuses.c:187
 msgid "Delete"
 msgstr "Delete"
 
-#: src/gtkaccount.c:2142 src/protocols/oscar/oscar.c:4332
+#: src/gtkaccount.c:2171 src/gtksavedstatuses.c:629
+#: src/protocols/oscar/oscar.c:5055
 msgid "Screen Name"
 msgstr "Screen Name"
 
-#: src/gtkaccount.c:2166 src/protocols/jabber/jabber.c:996
-#: src/protocols/oscar/oscar.c:691 src/protocols/oscar/oscar.c:5800
-#: src/protocols/oscar/oscar.c:6998 src/protocols/silc/silc.c:45
-#: src/protocols/yahoo/yahoo.c:2784 src/protocols/zephyr/zephyr.c:2110
-#: src/protocols/zephyr/zephyr.c:2129
-msgid "Online"
-msgstr "Online"
-
-#: src/gtkaccount.c:2187
+#: src/gtkaccount.c:2194
+#, fuzzy
+msgid "Enabled"
+msgstr "Failed"
+
+#: src/gtkaccount.c:2202
 msgid "Protocol"
 msgstr "Protocol"
 
-#. XXX: Tidy this up when not in string freeze
-#: src/gtkaccount.c:2521 src/protocols/jabber/presence.c:202
+#: src/gtkaccount.c:2545
 #, 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:2535 src/protocols/jabber/presence.c:208
+#: src/gtkaccount.c:2559
 msgid ""
 "\n"
 "\n"
@@ -1952,29 +1811,21 @@
 "\n"
 "Do you wish to add him or her to your buddy list?"
 
-#: src/gtkaccount.c:2561
-msgid "Information"
-msgstr "Information"
-
-#: src/gtkaccount.c:2565 src/gtkaccount.c:2596
-#: src/protocols/jabber/presence.c:210
+#: src/gtkaccount.c:2567
 msgid "Add buddy to your list?"
 msgstr "Add buddy to your list?"
 
-#. Add button
-#: src/gtkaccount.c:2567 src/gtkaccount.c:2598 src/gtkblist.c:4571
-#: src/gtkconv.c:1537 src/gtkconv.c:3910 src/gtkconv.c:3981
-#: src/gtkrequest.c:248 src/protocols/icq/gaim_icq.c:276
-#: src/protocols/jabber/presence.c:212 src/protocols/oscar/oscar.c:3959
-#: src/protocols/silc/chat.c:593
+#: src/gtkaccount.c:2569 src/gtkblist.c:4483 src/gtkconv.c:1501
+#: src/gtkrequest.c:265 src/protocols/gg/gg.c:655
+#: src/protocols/oscar/oscar.c:4680 src/protocols/silc/chat.c:594
 msgid "Add"
 msgstr "Add"
 
-#: src/gtkblist.c:846
+#: src/gtkblist.c:595
 msgid "Join a Chat"
 msgstr "Join a Chat"
 
-#: src/gtkblist.c:867
+#: src/gtkblist.c:616
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
@@ -1982,219 +1833,211 @@
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 
-#: src/gtkblist.c:878 src/gtkpounce.c:415 src/gtkroomlist.c:354
+#: src/gtkblist.c:627 src/gtkpounce.c:415 src/gtkroomlist.c:354
 msgid "_Account:"
 msgstr "_Account:"
 
-#: src/gtkblist.c:1173 src/gtkblist.c:3323
+#: src/gtkblist.c:935
 msgid "Get _Info"
 msgstr "Get _Info"
 
-#: src/gtkblist.c:1176 src/gtkblist.c:3313
+#: src/gtkblist.c:938
 msgid "I_M"
 msgstr "I_M"
 
-#: src/gtkblist.c:1182
+#: src/gtkblist.c:944
 msgid "_Send File"
 msgstr "_Send File"
 
-#: src/gtkblist.c:1188
+#: src/gtkblist.c:950
 msgid "Add Buddy _Pounce"
 msgstr "Add Buddy _Pounce"
 
-#: src/gtkblist.c:1190 src/gtkblist.c:1287
+#: src/gtkblist.c:954 src/gtkblist.c:958 src/gtkblist.c:1056
+#: src/gtkblist.c:1079
 msgid "View _Log"
 msgstr "View _Log"
 
-#: src/gtkblist.c:1200
+#: src/gtkblist.c:969
 msgid "_Alias Buddy..."
 msgstr "_Alias Buddy..."
 
-#: src/gtkblist.c:1202
+#: src/gtkblist.c:971
 msgid "_Remove Buddy"
 msgstr "_Remove Buddy"
 
-#: src/gtkblist.c:1204
+#: src/gtkblist.c:973
 msgid "Alias Contact..."
 msgstr "Alias Contact..."
 
-#: src/gtkblist.c:1207 src/gtkdialogs.c:877 src/gtkdialogs.c:879
+#: src/gtkblist.c:976 src/gtkdialogs.c:807 src/gtkdialogs.c:808
 msgid "Remove Contact"
 msgstr "Remove Contact"
 
-#: src/gtkblist.c:1211 src/gtkblist.c:1295 src/gtkblist.c:1309
+#: src/gtkblist.c:980 src/gtkblist.c:1064 src/gtkblist.c:1085
 msgid "_Alias..."
 msgstr "_Alias..."
 
-#: src/gtkblist.c:1213 src/gtkblist.c:1297 src/gtkblist.c:1314
-#: src/gtkconn.c:367
+#: src/gtkblist.c:982 src/gtkblist.c:1066 src/gtkblist.c:1087
 msgid "_Remove"
 msgstr "_Remove"
 
-#: src/gtkblist.c:1259
+#: src/gtkblist.c:1028
 msgid "Add a _Buddy"
 msgstr "Add a _Buddy"
 
-#: src/gtkblist.c:1261
+#: src/gtkblist.c:1030
 msgid "Add a C_hat"
 msgstr "Add a C_hat"
 
-#: src/gtkblist.c:1263
+#: src/gtkblist.c:1032
 msgid "_Delete Group"
 msgstr "_Delete Group"
 
-#: src/gtkblist.c:1265
+#: src/gtkblist.c:1034
 msgid "_Rename"
 msgstr "_Rename"
 
 #. join button
-#: src/gtkblist.c:1283 src/gtkroomlist.c:264 src/gtkroomlist.c:409
-#: src/stock.c:88
+#: src/gtkblist.c:1052 src/gtkroomlist.c:264 src/gtkroomlist.c:409
+#: src/gtkstock.c:119
 msgid "_Join"
 msgstr "_Join"
 
-#: src/gtkblist.c:1285
+#: src/gtkblist.c:1054
 msgid "Auto-Join"
 msgstr "Auto-Join"
 
-#: src/gtkblist.c:1311 src/gtkblist.c:1336
+#: src/gtkblist.c:1092 src/gtkblist.c:1115
 msgid "_Collapse"
 msgstr "_Collapse"
 
-#: src/gtkblist.c:1341
+#: src/gtkblist.c:1120
 msgid "_Expand"
 msgstr "_Expand"
 
-#: src/gtkblist.c:2016 src/gtkconv.c:4553 src/gtkpounce.c:316
+#: src/gtkblist.c:1347 src/gtkblist.c:1357 src/gtkblist.c:3316
+#: src/gtkblist.c:3319
+#, fuzzy
+msgid "/Tools/Mute Sounds"
+msgstr "Mute Sounds"
+
+#: src/gtkblist.c:1816 src/gtkconv.c:3719 src/gtkpounce.c:314
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr ""
 "You are not currently signed on with an account that can add that buddy."
 
 #. Buddies menu
-#: src/gtkblist.c:2437
+#: src/gtkblist.c:2323
 msgid "/_Buddies"
 msgstr "/_Buddies"
 
-#: src/gtkblist.c:2438
+#: src/gtkblist.c:2324
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Buddies/New Instant _Message..."
 
-#: src/gtkblist.c:2439
+#: src/gtkblist.c:2325
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Buddies/Join a _Chat..."
 
-#: src/gtkblist.c:2440
+#: src/gtkblist.c:2326
 msgid "/Buddies/Get User _Info..."
 msgstr "/Buddies/Get User _Info..."
 
-#: src/gtkblist.c:2441
+#: src/gtkblist.c:2327
 msgid "/Buddies/View User _Log..."
 msgstr "/Buddies/View User _Log..."
 
-#: src/gtkblist.c:2443
+#: src/gtkblist.c:2329
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Buddies/Show _Offline Buddies"
 
-#: src/gtkblist.c:2444
+#: src/gtkblist.c:2330
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Buddies/Show _Empty Groups"
 
-#: src/gtkblist.c:2445
+#: src/gtkblist.c:2331
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Buddies/_Add Buddy..."
 
-#: src/gtkblist.c:2446
+#: src/gtkblist.c:2332
 msgid "/Buddies/Add C_hat..."
 msgstr "/Buddies/Add C_hat..."
 
-#: src/gtkblist.c:2447
+#: src/gtkblist.c:2333
 msgid "/Buddies/Add _Group..."
 msgstr "/Buddies/Add _Group..."
 
-#: src/gtkblist.c:2449
-msgid "/Buddies/_Signoff"
-msgstr "/Buddies/_Signoff"
-
-#: src/gtkblist.c:2450
+#: src/gtkblist.c:2335
 msgid "/Buddies/_Quit"
 msgstr "/Buddies/_Quit"
 
 #. Tools
-#: src/gtkblist.c:2453
+#: src/gtkblist.c:2338
 msgid "/_Tools"
 msgstr "/_Tools"
 
-#: src/gtkblist.c:2454
-msgid "/Tools/_Away"
-msgstr "/Tools/_Away"
-
-#: src/gtkblist.c:2455
+#: src/gtkblist.c:2339
 msgid "/Tools/Buddy _Pounce"
 msgstr "/Tools/Buddy _Pounce"
 
-#: src/gtkblist.c:2456
+#: src/gtkblist.c:2340
 msgid "/Tools/Account Ac_tions"
 msgstr "/Tools/Account Ac_tions"
 
-#: src/gtkblist.c:2457
-msgid "/Tools/Pl_ugin Actions"
-msgstr "/Tools/Pl_ugin Actions"
-
-#: src/gtkblist.c:2459
+#: src/gtkblist.c:2342
 msgid "/Tools/A_ccounts"
 msgstr "/Tools/A_ccounts"
 
-#: src/gtkblist.c:2460
+#: src/gtkblist.c:2343
+msgid "/Tools/Pr_eferences"
+msgstr "/Tools/Pr_eferences"
+
+#: src/gtkblist.c:2344
+#, fuzzy
+msgid "/Tools/P_lugins"
+msgstr "/Tools/Plugin Actions"
+
+#: src/gtkblist.c:2345
+msgid "/Tools/Pr_ivacy"
+msgstr "/Tools/Pr_ivacy"
+
+#: src/gtkblist.c:2346
 msgid "/Tools/_File Transfers"
 msgstr "/Tools/_File Transfers"
 
-#: src/gtkblist.c:2461
+#: src/gtkblist.c:2347
 msgid "/Tools/R_oom List"
 msgstr "/Tools/R_oom List"
 
-#: 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
+#: src/gtkblist.c:2349
+#, fuzzy
+msgid "/Tools/Mute _Sounds"
+msgstr "Mute Sounds"
+
+#: src/gtkblist.c:2350
 msgid "/Tools/View System _Log"
 msgstr "/Tools/View System _Log"
 
 #. Help
-#: src/gtkblist.c:2468
+#: src/gtkblist.c:2353
 msgid "/_Help"
 msgstr "/_Help"
 
-#: src/gtkblist.c:2469
+#: src/gtkblist.c:2354
 msgid "/Help/Online _Help"
 msgstr "/Help/Online _Help"
 
-#: src/gtkblist.c:2470
+#: src/gtkblist.c:2355
 msgid "/Help/_Debug Window"
 msgstr "/Help/_Debug Window"
 
-#: src/gtkblist.c:2471
+#: src/gtkblist.c:2356
 msgid "/Help/_About"
 msgstr "/Help/_About"
 
-#: 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
+#: src/gtkblist.c:2388 src/gtkblist.c:2455
 #, c-format
 msgid ""
 "\n"
@@ -2203,7 +2046,61 @@
 "\n"
 "<b>Account:</b> %s"
 
-#: src/gtkblist.c:2585
+#: src/gtkblist.c:2464
+#, fuzzy, c-format
+msgid ""
+"\n"
+"<b>Contact Alias:</b> %s"
+msgstr ""
+"\n"
+"<b>Contact Alias:</b>"
+
+#: src/gtkblist.c:2472
+#, fuzzy, c-format
+msgid ""
+"\n"
+"<b>Alias:</b> %s"
+msgstr ""
+"\n"
+"<b>Alias:</b>"
+
+#: src/gtkblist.c:2480
+#, fuzzy, c-format
+msgid ""
+"\n"
+"<b>Nickname:</b> %s"
+msgstr ""
+"\n"
+"<b>Nickname:</b>"
+
+#: src/gtkblist.c:2489
+#, fuzzy, c-format
+msgid ""
+"\n"
+"<b>Logged In:</b> %s"
+msgstr ""
+"\n"
+"<b>Logged In:</b>"
+
+#: src/gtkblist.c:2501
+#, fuzzy, c-format
+msgid ""
+"\n"
+"<b>Idle:</b> %s"
+msgstr ""
+"\n"
+"<b>Idle:</b>"
+
+#: src/gtkblist.c:2537
+#, fuzzy, c-format
+msgid ""
+"\n"
+"<b>Last Seen:</b> %s ago"
+msgstr ""
+"\n"
+"<b>%s:</b> %s"
+
+#: src/gtkblist.c:2545
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
@@ -2211,68 +2108,7 @@
 "\n"
 "<b>Status:</b> Offline"
 
-#: 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
+#: src/gtkblist.c:2568
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2280,124 +2116,123 @@
 "\n"
 "<b>Description:</b> Spooky"
 
-#: src/gtkblist.c:2625
+#: src/gtkblist.c:2570
+#, fuzzy
 msgid ""
 "\n"
-"<b>Status</b>: Awesome"
+"<b>Status:</b> Awesome"
 msgstr ""
 "\n"
 "<b>Status</b>: Awesome"
 
-#: src/gtkblist.c:2626
+#: src/gtkblist.c:2572
+#, fuzzy
 msgid ""
 "\n"
-"<b>Status</b>: Rockin'"
+"<b>Status:</b> Rockin'"
 msgstr ""
 "\n"
 "<b>Status</b>: Rockin'"
 
-#: src/gtkblist.c:2908
-#, c-format
-msgid "Idle (%dh%02dm) "
+#: src/gtkblist.c:2834
+#, fuzzy, c-format
+msgid "Idle (%dh %02dm) "
 msgstr "Idle (%dh%02dm) "
 
-#: src/gtkblist.c:2910
+#: src/gtkblist.c:2836
 #, c-format
 msgid "Idle (%dm) "
 msgstr "Idle (%dm) "
 
-#: src/gtkblist.c:2915
-#, c-format
-msgid "Warned (%d%%) "
-msgstr "Warned (%d%%) "
-
-#: src/gtkblist.c:2918
+#: src/gtkblist.c:2839
+#, fuzzy
+msgid "Idle "
+msgstr "Idle"
+
+#: src/gtkblist.c:2843
 msgid "Offline "
 msgstr "Offline "
 
-#. Make menu items sensitive/insensitive where appropriate
-#: src/gtkblist.c:3036
+#: src/gtkblist.c:2959
+#, fuzzy
+msgid "/Buddies/New Instant Message..."
+msgstr "/Buddies/New Instant _Message..."
+
+#: src/gtkblist.c:2960 src/gtkblist.c:2994
 msgid "/Buddies/Join a Chat..."
 msgstr "/Buddies/Join a Chat..."
 
-#: src/gtkblist.c:3039
+#: src/gtkblist.c:2961
+#, fuzzy
+msgid "/Buddies/Get User Info..."
+msgstr "/Buddies/Get User _Info..."
+
+#: src/gtkblist.c:2962
+#, fuzzy
+msgid "/Buddies/Add Buddy..."
+msgstr "/Buddies/_Add Buddy..."
+
+#: src/gtkblist.c:2963
+#, fuzzy
+msgid "/Buddies/Add Chat..."
+msgstr "/Buddies/Add C_hat..."
+
+#: src/gtkblist.c:2964
+#, fuzzy
+msgid "/Buddies/Add Group..."
+msgstr "/Buddies/Add _Group..."
+
+#: src/gtkblist.c:2997
 msgid "/Tools/Room List"
 msgstr "/Tools/Room List"
 
-#: src/gtkblist.c:3042
+#: src/gtkblist.c:3000
 msgid "/Tools/Privacy"
 msgstr "/Tools/Privacy"
 
-#: src/gtkblist.c:3124
+#: src/gtkblist.c:3076 src/protocols/jabber/jabber.c:982
+#: src/protocols/yahoo/yahoo.c:2776
+msgid "None"
+msgstr "None"
+
+#: src/gtkblist.c:3078
 msgid "Alphabetical"
 msgstr "Alphabetical"
 
-#: src/gtkblist.c:3125
+#: src/gtkblist.c:3079
 msgid "By status"
 msgstr "By status"
 
-#: src/gtkblist.c:3126
+#: src/gtkblist.c:3080
 msgid "By log size"
 msgstr "By log size"
 
 #: 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:3198
+#: src/gtkblist.c:3193
 msgid "/Tools/Account Actions"
 msgstr "/Tools/Account Actions"
 
-#: 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:3292
+#: src/gtkblist.c:3312
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Buddies/Show Offline Buddies"
 
-#: src/gtkblist.c:3294
+#: src/gtkblist.c:3314
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Buddies/Show Empty Groups"
 
-#: 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:2951
+#: src/gtkblist.c:3992 src/protocols/silc/buddy.c:736
+#: src/protocols/silc/buddy.c:994 src/protocols/silc/buddy.c:1039
+#: src/protocols/silc/buddy.c:1129 src/protocols/yahoo/yahoo.c:2874
 msgid "Add Buddy"
 msgstr "Add Buddy"
 
-#: src/gtkblist.c:4136
+#: src/gtkblist.c:4016
 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. "
@@ -2408,15 +2243,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:4196 src/gtkblist.c:4499
+#: src/gtkblist.c:4079 src/gtkblist.c:4411
 msgid "Account:"
 msgstr "Account:"
 
-#: src/gtkblist.c:4432
+#: src/gtkblist.c:4344
 msgid "This protocol does not support chat rooms."
 msgstr "This protocol does not support chat rooms."
 
-#: src/gtkblist.c:4448
+#: src/gtkblist.c:4360
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -2424,11 +2259,11 @@
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 
-#: src/gtkblist.c:4465
+#: src/gtkblist.c:4377
 msgid "Add Chat"
 msgstr "Add Chat"
 
-#: src/gtkblist.c:4489
+#: src/gtkblist.c:4401
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -2436,77 +2271,49 @@
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
 
-#: src/gtkblist.c:4568
+#: src/gtkblist.c:4480
 msgid "Add Group"
 msgstr "Add Group"
 
-#: src/gtkblist.c:4569
+#: src/gtkblist.c:4481
 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:5138 src/gtkblist.c:5235
+#: src/gtkblist.c:5005
 msgid "No actions available"
 msgstr "No actions available"
 
-#: 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:564
-#, c-format
-msgid ""
-"<span weight=\"bold\" size=\"larger\">%s has been disconnected.</span>\n"
-"\n"
-"%s\n"
-"%s"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">%s has been disconnected.</span>\n"
-"\n"
-"%s\n"
-"%s"
-
-#: src/gtkconn.c:566
-msgid "Reason Unknown."
-msgstr "Reason Unknown."
-
-#: src/gtkconn.c:605
-msgid "Reconnect _All"
-msgstr "Reconnect _All"
-
-#: src/gtkconn.c:635
-msgid "Time"
-msgstr "Time"
-
-#: src/gtkconv.c:342
+#: src/gtkblist.c:5074
+#, fuzzy
+msgid "/Tools"
+msgstr "/_Tools"
+
+#: src/gtkconn.c:190
+#, fuzzy, c-format
+msgid "%s disconnected"
+msgstr "Disconnected."
+
+#: src/gtkconn.c:191
+#, c-format
+msgid ""
+"%s was disconnected due to an error. %s The account has been disabled. "
+"Correct the error and reenable the account to connect."
+msgstr ""
+
+#: src/gtkconv.c:325
 #, c-format
 msgid "me is using Gaim v%s."
 msgstr "me is using Gaim v%s."
 
-#: src/gtkconv.c:351
+#: src/gtkconv.c:334
 msgid "Supported debug options are:  version"
 msgstr "Supported debug options are:  version"
 
-#: src/gtkconv.c:390
+#: src/gtkconv.c:371
 msgid "No such command (in this context)."
 msgstr "No such command (in this context)."
 
-#: src/gtkconv.c:393
+#: src/gtkconv.c:374
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -2514,47 +2321,50 @@
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
 
-#: src/gtkconv.c:465
+#: src/gtkconv.c:446
 msgid "No such command."
 msgstr "No such command."
 
-#: src/gtkconv.c:472
+#: src/gtkconv.c:453
 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:477
+#: src/gtkconv.c:458
 msgid "Your command failed for an unknown reason."
 msgstr "Your command failed for an unknown reason."
 
-#: src/gtkconv.c:484
-msgid "That command only works in Chats, not IMs."
+#: src/gtkconv.c:465
+#, fuzzy
+msgid "That command only works in chats, not IMs."
 msgstr "That command only works in Chats, not IMs."
 
-#: src/gtkconv.c:487
-msgid "That command only works in IMs, not Chats."
+#: src/gtkconv.c:468
+#, fuzzy
+msgid "That command only works in IMs, not chats."
 msgstr "That command only works in IMs, not Chats."
 
-#: src/gtkconv.c:491
+#: src/gtkconv.c:472
 msgid "That command doesn't work on this protocol."
 msgstr "That command doesn't work on this protocol."
 
-#: src/gtkconv.c:734 src/gtkconv.c:760
-msgid "That buddy is not on the same protocol as this chat"
+#: src/gtkconv.c:699 src/gtkconv.c:725
+#, fuzzy
+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:754
+#: src/gtkconv.c:719
 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:808
+#: src/gtkconv.c:772
 msgid "Invite Buddy Into Chat Room"
 msgstr "Invite Buddy Into Chat Room"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:838
+#: src/gtkconv.c:802
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -2562,347 +2372,289 @@
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 
-#: src/gtkconv.c:859
+#: src/gtkconv.c:823
 msgid "_Buddy:"
 msgstr "_Buddy:"
 
-#: src/gtkconv.c:879
+#: src/gtkconv.c:843 src/gtksavedstatuses.c:779
 msgid "_Message:"
 msgstr "_Message:"
 
-#: src/gtkconv.c:935 src/gtkconv.c:2660 src/gtkdebug.c:182
+#: src/gtkconv.c:900 src/gtkconv.c:2206 src/gtkdebug.c:217 src/gtkft.c:470
 msgid "Unable to open file."
 msgstr "Unable to read file."
 
-#: src/gtkconv.c:940
+#: src/gtkconv.c:906
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Conversation with %s</h1>\n"
 
-#: src/gtkconv.c:954
+#: src/gtkconv.c:930
 msgid "Save Conversation"
 msgstr "Save Conversation"
 
-#: src/gtkconv.c:1039 src/gtkdebug.c:131
+#: src/gtkconv.c:1030 src/gtkdebug.c:165 src/gtkdebug.c:678
 msgid "Find"
 msgstr "Find"
 
-#: src/gtkconv.c:1065 src/gtkdebug.c:159
+#: src/gtkconv.c:1056 src/gtkdebug.c:193
 msgid "_Search for:"
 msgstr "_Search for:"
 
-#: src/gtkconv.c:1481
+#: src/gtkconv.c:1463
 msgid "IM"
 msgstr "IM"
 
-#. Send File button
-#: src/gtkconv.c:1490 src/gtkconv.c:3903 src/protocols/oscar/oscar.c:606
+#: src/gtkconv.c:1469 src/protocols/oscar/oscar.c:628
 msgid "Send File"
 msgstr "Send File"
 
-#: src/gtkconv.c:1499
+#: src/gtkconv.c:1476
 msgid "Un-Ignore"
 msgstr "Un-Ignore"
 
-#: src/gtkconv.c:1501 src/gtkprefs.c:831
+#: src/gtkconv.c:1479
 msgid "Ignore"
 msgstr "Ignore"
 
-#. Info button
-#: src/gtkconv.c:1510 src/gtkconv.c:3924
+#: src/gtkconv.c:1485
 msgid "Info"
 msgstr "Info"
 
-#: src/gtkconv.c:1519
-msgid "Get Away Msg"
-msgstr "Get Away Msg"
-
-#: src/gtkconv.c:2668
+#: src/gtkconv.c:1491
+#, fuzzy
+msgid "Get Away Message"
+msgstr "New Away Message"
+
+#: src/gtkconv.c:1498 src/gtkrequest.c:266
+msgid "Remove"
+msgstr "Remove"
+
+#: src/gtkconv.c:2214
 msgid "Unable to save icon file to disk."
 msgstr "Unable to save icon file to disk."
 
-#: src/gtkconv.c:2690
+#: src/gtkconv.c:2237
 msgid "Save Icon"
 msgstr "Save Icon"
 
-#: src/gtkconv.c:2720
+#: src/gtkconv.c:2287
 msgid "Animate"
 msgstr "Animate"
 
-#: src/gtkconv.c:2725
+#: src/gtkconv.c:2292
 msgid "Hide Icon"
 msgstr "Hide Icon"
 
-#: src/gtkconv.c:2731
+#: src/gtkconv.c:2298
 msgid "Save Icon As..."
 msgstr "Save Icon As..."
 
-#: src/gtkconv.c:3108
-msgid "User is typing..."
-msgstr "User is typing..."
-
-#: src/gtkconv.c:3116
-msgid "User has typed something and paused"
-msgstr "User has typed something and paused"
-
-#. Build the Send As menu
-#: src/gtkconv.c:3219
-msgid "_Send As"
-msgstr "_Send As"
-
 #. Conversation menu
-#: src/gtkconv.c:3673
+#: src/gtkconv.c:2346
 msgid "/_Conversation"
 msgstr "/_Conversation"
 
-#: src/gtkconv.c:3675
+#: src/gtkconv.c:2348
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Conversation/New Instant _Message..."
 
-#: src/gtkconv.c:3680
+#: src/gtkconv.c:2353
 msgid "/Conversation/_Find..."
 msgstr "/Conversation/_Find..."
 
-#: src/gtkconv.c:3682
+#: src/gtkconv.c:2355
 msgid "/Conversation/View _Log"
 msgstr "/Conversation/View _Log"
 
-#: src/gtkconv.c:3683
+#: src/gtkconv.c:2356
 msgid "/Conversation/_Save As..."
 msgstr "/Conversation/_Save As..."
 
-#: src/gtkconv.c:3685
+#: src/gtkconv.c:2358
 msgid "/Conversation/Clear"
 msgstr "/Conversation/Clear"
 
-#: src/gtkconv.c:3689
+#: src/gtkconv.c:2362
 msgid "/Conversation/Se_nd File..."
 msgstr "/Conversation/Se_nd File..."
 
-#: src/gtkconv.c:3690
+#: src/gtkconv.c:2363
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Conversation/Add Buddy _Pounce..."
 
-#: src/gtkconv.c:3692
+#: src/gtkconv.c:2365
 msgid "/Conversation/_Get Info"
 msgstr "/Conversation/_Get Info"
 
-#: src/gtkconv.c:3694
-msgid "/Conversation/_Warn..."
-msgstr "/Conversation/_Warn..."
-
-#: src/gtkconv.c:3696
+#: src/gtkconv.c:2367
 msgid "/Conversation/In_vite..."
 msgstr "/Conversation/In_vite..."
 
-#: src/gtkconv.c:3701
+#: src/gtkconv.c:2372
 msgid "/Conversation/Al_ias..."
 msgstr "/Conversation/Al_ias..."
 
-#: src/gtkconv.c:3703
+#: src/gtkconv.c:2374
 msgid "/Conversation/_Block..."
 msgstr "/Conversation/_Block..."
 
-#: src/gtkconv.c:3705
+#: src/gtkconv.c:2376
 msgid "/Conversation/_Add..."
 msgstr "/Conversation/_Add..."
 
-#: src/gtkconv.c:3707
+#: src/gtkconv.c:2378
 msgid "/Conversation/_Remove..."
 msgstr "/Conversation/_Remove..."
 
-#: src/gtkconv.c:3712
+#: src/gtkconv.c:2383
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Conversation/Insert Lin_k..."
 
-#: src/gtkconv.c:3714
+#: src/gtkconv.c:2385
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Conversation/Insert Imag_e..."
 
-#: src/gtkconv.c:3719
+#: src/gtkconv.c:2390
 msgid "/Conversation/_Close"
 msgstr "/Conversation/_Close"
 
 #. Options
-#: src/gtkconv.c:3723
+#: src/gtkconv.c:2394
 msgid "/_Options"
 msgstr "/_Options"
 
-#: src/gtkconv.c:3724
+#: src/gtkconv.c:2395
 msgid "/Options/Enable _Logging"
 msgstr "/Options/Enable _Logging"
 
-#: src/gtkconv.c:3725
+#: src/gtkconv.c:2396
 msgid "/Options/Enable _Sounds"
 msgstr "/Options/Enable _Sounds"
 
-#: src/gtkconv.c:3726
-msgid "/Options/Show Formatting _Toolbar"
+#: src/gtkconv.c:2397
+#, fuzzy
+msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Options/Show Formatting _Toolbar"
 
-#: src/gtkconv.c:3727
+#: src/gtkconv.c:2398
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Options/Show Ti_mestamps"
 
-#: src/gtkconv.c:3769
+#: src/gtkconv.c:2399
+#, fuzzy
+msgid "/Options/Show Buddy _Icon"
+msgstr "Show buddy _icons"
+
+#: src/gtkconv.c:2439
 msgid "/Conversation/View Log"
 msgstr "/Conversation/View Log"
 
-#: src/gtkconv.c:3774
+#: src/gtkconv.c:2445
 msgid "/Conversation/Send File..."
 msgstr "/Conversation/Send File..."
 
-#: src/gtkconv.c:3778
+#: src/gtkconv.c:2449
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversation/Add Buddy Pounce..."
 
-#: src/gtkconv.c:3784
+#: src/gtkconv.c:2455
 msgid "/Conversation/Get Info"
 msgstr "/Conversation/Get Info"
 
-#: src/gtkconv.c:3788
-msgid "/Conversation/Warn..."
-msgstr "/Conversation/Warn..."
-
-#: src/gtkconv.c:3792
+#: src/gtkconv.c:2459
 msgid "/Conversation/Invite..."
 msgstr "/Conversation/Invite..."
 
-#: src/gtkconv.c:3798
+#: src/gtkconv.c:2465
 msgid "/Conversation/Alias..."
 msgstr "/Conversation/Alias..."
 
-#: src/gtkconv.c:3802
+#: src/gtkconv.c:2469
 msgid "/Conversation/Block..."
 msgstr "/Conversation/Block..."
 
-#: src/gtkconv.c:3806
+#: src/gtkconv.c:2473
 msgid "/Conversation/Add..."
 msgstr "/Conversation/Add..."
 
-#: src/gtkconv.c:3810
+#: src/gtkconv.c:2477
 msgid "/Conversation/Remove..."
 msgstr "/Conversation/Remove..."
 
-#: src/gtkconv.c:3816
+#: src/gtkconv.c:2483
 msgid "/Conversation/Insert Link..."
 msgstr "/Conversation/Insert Link..."
 
-#: src/gtkconv.c:3820
+#: src/gtkconv.c:2487
 msgid "/Conversation/Insert Image..."
 msgstr "/Conversation/Insert Image..."
 
-#: src/gtkconv.c:3826
+#: src/gtkconv.c:2493
 msgid "/Options/Enable Logging"
 msgstr "/Options/Enable Logging"
 
-#: src/gtkconv.c:3829
+#: src/gtkconv.c:2496
 msgid "/Options/Enable Sounds"
 msgstr "/Options/Enable Sounds"
 
-#: src/gtkconv.c:3832
-msgid "/Options/Show Formatting Toolbar"
+#: src/gtkconv.c:2499
+#, fuzzy
+msgid "/Options/Show Formatting Toolbars"
 msgstr "/Options/Show Formatting Toolbar"
 
-#: src/gtkconv.c:3835
+#: src/gtkconv.c:2502
 msgid "/Options/Show Timestamps"
 msgstr "/Options/Show Timestamps"
 
-#. The buttons, from left to right
-#. Warn button
-#: src/gtkconv.c:3889
-msgid "Warn"
-msgstr "Warn"
-
-#: src/gtkconv.c:3890
-msgid "Warn the user"
-msgstr "Warn the user"
-
-#. Block button
-#: src/gtkconv.c:3896 src/gtkprivacy.c:634 src/gtkprivacy.c:645
-msgid "Block"
-msgstr "Block"
-
-#: src/gtkconv.c:3897
-msgid "Block the user"
-msgstr "Block the user"
-
-#: src/gtkconv.c:3904
-msgid "Send a file to the user"
-msgstr "Send a file to the user"
-
-#: src/gtkconv.c:3911
-msgid "Add the user to your buddy list"
-msgstr "Add the user to your buddy list"
-
-#: src/gtkconv.c:3918
-msgid "Remove the user from your buddy list"
-msgstr "Remove the user from your buddy list"
-
-#: src/gtkconv.c:3925 src/gtkconv.c:4260
-msgid "Get the user's information"
-msgstr "Get the user's information"
-
-#. Send button
-#: src/gtkconv.c:3931 src/gtkconv.c:3995
-msgid "Send"
-msgstr "Send"
-
-#: src/gtkconv.c:3932 src/gtkconv.c:3996
-msgid "Send message"
-msgstr "Send message"
-
-#. The buttons, from left to right
-#. Invite
-#: src/gtkconv.c:3974
-msgid "Invite"
-msgstr "Invite"
-
-#: src/gtkconv.c:3975
-msgid "Invite a user"
-msgstr "Invite a user"
-
-#: src/gtkconv.c:3982
-msgid "Add the chat to your buddy list"
-msgstr "Add the chat to your buddy list"
-
-#: src/gtkconv.c:3989
-msgid "Remove the chat from your buddy list"
-msgstr "Remove the chat from your buddy list"
-
-#: src/gtkconv.c:4113
+#: src/gtkconv.c:2505
+#, fuzzy
+msgid "/Options/Show Buddy Icon"
+msgstr "Show buddy _icons"
+
+#: src/gtkconv.c:2578
+msgid "User is typing..."
+msgstr "User is typing..."
+
+#: src/gtkconv.c:2584
+msgid "User has typed something and paused"
+msgstr "User has typed something and paused"
+
+#. Build the Send As menu
+#: src/gtkconv.c:2722
+#, fuzzy
+msgid "_Send To"
+msgstr "_Send As"
+
+#: src/gtkconv.c:3351
 msgid "Topic:"
 msgstr "Topic:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:4176
+#: src/gtkconv.c:3399
 msgid "0 people in room"
 msgstr "0 people in room"
 
-#: src/gtkconv.c:4237
+#: src/gtkconv.c:3478
 msgid "IM the user"
 msgstr "IM the user"
 
-#: src/gtkconv.c:4249
+#: src/gtkconv.c:3491
 msgid "Ignore the user"
 msgstr "Ignore the user"
 
-#: src/gtkconv.c:4848
-msgid "Close conversation"
-msgstr "Close conversation"
-
-#: src/gtkconv.c:5385 src/gtkconv.c:5414 src/gtkconv.c:5510 src/gtkconv.c:5568
+#: src/gtkconv.c:3503
+msgid "Get the user's information"
+msgstr "Get the user's information"
+
+#: src/gtkconv.c:4310 src/gtkconv.c:4412 src/gtkconv.c:4467
 #, 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:6145 src/gtkconv.c:6148
-msgid "<main>/Conversation/Close"
-msgstr "<main>/Conversation/Close"
-
-#: src/gtkconv.c:6520
+#: src/gtkconv.c:5526
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -2910,11 +2662,11 @@
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
 
-#: src/gtkconv.c:6523
+#: src/gtkconv.c:5529
 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:6526
+#: src/gtkconv.c:5532
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -2922,320 +2674,335 @@
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 
-#: src/gtkconv.c:6529
+#: src/gtkconv.c:5535
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Clears the conversation scrollback."
 
-#: src/gtkconv.c:6532
+#: src/gtkconv.c:5538
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;command&gt;:  Help on a specific command."
 
-#: src/gtkdebug.c:197
+#: src/gtkconv.c:5643
+#, fuzzy
+msgid "Confirm close"
+msgstr "Confirm Account"
+
+#: src/gtkconv.c:5675
+#, 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:6340
+msgid "Close conversation"
+msgstr "Close conversation"
+
+#: src/gtkconv.c:6801
+msgid "Last created window"
+msgstr "Last created window"
+
+#: src/gtkconv.c:6803
+msgid "Separate IM and Chat windows"
+msgstr "Separate IM and Chat windows"
+
+#: src/gtkconv.c:6805 src/gtkprefs.c:1239
+msgid "New window"
+msgstr "New window"
+
+#: src/gtkconv.c:6807
+msgid "By group"
+msgstr "By group"
+
+#: src/gtkconv.c:6809
+msgid "By account"
+msgstr "By account"
+
+#: src/gtkdebug.c:232
 msgid "Save Debug Log"
 msgstr "Save Debug Log"
 
-#: src/gtkdebug.c:250
+#: src/gtkdebug.c:586
+#, fuzzy
+msgid "Invert"
+msgstr "_Insert"
+
+#: src/gtkdebug.c:589
+msgid "Highlight matches"
+msgstr ""
+
+#: src/gtkdebug.c:636
 msgid "Debug Window"
 msgstr "Debug Window"
 
-#: src/gtkdebug.c:288
+#: src/gtkdebug.c:689
+#, fuzzy
+msgid "Clear"
+msgstr "Close"
+
+#: src/gtkdebug.c:698
 msgid "Pause"
 msgstr "Pause"
 
-#: src/gtkdebug.c:294
+#: src/gtkdebug.c:705 src/gtkdebug.c:706
 msgid "Timestamps"
 msgstr "Timestamps"
 
-#: src/gtkdialogs.c:63
+#: src/gtkdebug.c:724
+#, fuzzy
+msgid "Filter"
+msgstr "Failed"
+
+#: src/gtkdebug.c:743
+#, fuzzy
+msgid "Right click for more options."
+msgstr "Show more options"
+
+#: src/gtkdialogs.c:59 src/gtkdialogs.c:90
 msgid "lead developer"
 msgstr "lead developer"
 
-#: src/gtkdialogs.c:64 src/gtkdialogs.c:67 src/gtkdialogs.c:68
+#: 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: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:65
+#: src/gtkdialogs.c:61
 msgid "developer & webmaster"
 msgstr "developer & webmaster"
 
-#: src/gtkdialogs.c:66
+#: src/gtkdialogs.c:62
 msgid "win32 port"
 msgstr "win32 port"
 
-#: src/gtkdialogs.c:72
+#: src/gtkdialogs.c:68
 msgid "support"
 msgstr "support"
 
-#: src/gtkdialogs.c:91
+#: src/gtkdialogs.c:88 src/gtkdialogs.c:91
 msgid "maintainer"
 msgstr "maintainer"
 
+#: src/gtkdialogs.c:89
+#, fuzzy
+msgid "libfaim maintainer"
+msgstr "former libfaim maintainer"
+
 #: src/gtkdialogs.c:92
-msgid "former libfaim maintainer"
-msgstr "former libfaim maintainer"
+#, fuzzy
+msgid "Jabber developer"
+msgstr "former Jabber developer"
 
 #: src/gtkdialogs.c:93
-msgid "former lead developer"
-msgstr "former lead developer"
+msgid "original author"
+msgstr "original author"
 
 #: 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:102
-msgid "Azerbaijani"
-msgstr "Azerbaijani"
-
-#: src/gtkdialogs.c:103 src/gtkdialogs.c:150
+#: src/gtkdialogs.c:99 src/gtkdialogs.c:100 src/gtkdialogs.c:143
 msgid "Bulgarian"
 msgstr "Bulgarian"
 
+#: src/gtkdialogs.c:101 src/gtkdialogs.c:144 src/gtkdialogs.c:145
+msgid "Catalan"
+msgstr "Catalan"
+
+#: src/gtkdialogs.c:102 src/gtkdialogs.c:146
+msgid "Czech"
+msgstr "Czech"
+
 #: src/gtkdialogs.c:103
-msgid "Vladimira Girginova and Vladimir (Kaladan) Petkov"
-msgstr "Vladimira Girginova and Vladimir (Kaladan) Petkov"
-
-#: src/gtkdialogs.c:104 src/gtkdialogs.c:151 src/gtkdialogs.c:152
-msgid "Catalan"
-msgstr "Catalan"
-
-#: src/gtkdialogs.c:105 src/gtkdialogs.c:153
-msgid "Czech"
-msgstr "Czech"
+msgid "Danish"
+msgstr "Danish"
+
+#: src/gtkdialogs.c:104 src/gtkdialogs.c:147
+msgid "German"
+msgstr "German"
+
+#: src/gtkdialogs.c:105
+msgid "Australian English"
+msgstr "Australian English"
 
 #: src/gtkdialogs.c:106
-msgid "Danish"
-msgstr "Danish"
-
-#: src/gtkdialogs.c:107 src/gtkdialogs.c:154
-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:110
 msgid "British English"
 msgstr "British English"
 
-#: src/gtkdialogs.c:111 src/gtkdialogs.c:155
+#: src/gtkdialogs.c:107
+msgid "Canadian English"
+msgstr "Canadian English"
+
+#: src/gtkdialogs.c:108 src/gtkdialogs.c:148
 msgid "Spanish"
 msgstr "Spanish"
 
-#: src/gtkdialogs.c:112
-msgid "Estonian"
-msgstr "Estonian"
-
-#: src/gtkdialogs.c:113 src/gtkdialogs.c:156
+#: src/gtkdialogs.c:109 src/gtkdialogs.c:149
 msgid "Finnish"
 msgstr "Finnish"
 
-#: src/gtkdialogs.c:114 src/gtkdialogs.c:157
+#: src/gtkdialogs.c:110 src/gtkdialogs.c:150
 msgid "French"
 msgstr "French"
 
-#: src/gtkdialogs.c:115
+#: src/gtkdialogs.c:111
 msgid "Hebrew"
 msgstr "Hebrew"
 
-#: src/gtkdialogs.c:116 src/gtkdialogs.c:158
+#: src/gtkdialogs.c:112
 msgid "Hindi"
 msgstr "Hindi"
 
-#: src/gtkdialogs.c:117 src/gtkdialogs.c:159
+#: src/gtkdialogs.c:113
 msgid "Hungarian"
 msgstr "Hungarian"
 
-#: src/gtkdialogs.c:118 src/gtkdialogs.c:160
+#: src/gtkdialogs.c:114 src/gtkdialogs.c:151
 msgid "Italian"
 msgstr "Italian"
 
-#: src/gtkdialogs.c:119 src/gtkdialogs.c:161
+#: src/gtkdialogs.c:115 src/gtkdialogs.c:152
 msgid "Japanese"
 msgstr "Japanese"
 
-#: src/gtkdialogs.c:120
+#: src/gtkdialogs.c:116
+msgid "Lithuanian"
+msgstr "Lithuanian"
+
+#: src/gtkdialogs.c:117
 msgid "Georgian"
 msgstr "Georgian"
 
-#: src/gtkdialogs.c:121 src/gtkdialogs.c:162
+#: src/gtkdialogs.c:118 src/gtkdialogs.c:153
 msgid "Korean"
 msgstr "Korean"
 
-#: src/gtkdialogs.c:122
-msgid "Lithuanian"
-msgstr "Lithuanian"
-
-#: src/gtkdialogs.c:123
+#: src/gtkdialogs.c:119
+#, fuzzy
+msgid "Dutch, Flemish"
+msgstr "Dutch; Flemish"
+
+#: src/gtkdialogs.c:120
 msgid "Macedonian"
 msgstr "Macedonian"
 
+#: src/gtkdialogs.c:121
+msgid "Norwegian"
+msgstr "Norwegian"
+
+#: src/gtkdialogs.c:122 src/gtkdialogs.c:123 src/gtkdialogs.c:154
+msgid "Polish"
+msgstr "Polish"
+
 #: src/gtkdialogs.c:124
-msgid "Burmese"
-msgstr "Burmese"
-
-#: src/gtkdialogs.c:125 src/gtkdialogs.c:163
-msgid "Norwegian"
-msgstr "Norwegian"
+msgid "Portuguese"
+msgstr "Portuguese"
+
+#: src/gtkdialogs.c:125
+msgid "Portuguese-Brazil"
+msgstr "Portuguese-Brazil"
 
 #: src/gtkdialogs.c:126
-msgid "Dutch; Flemish"
-msgstr "Dutch; Flemish"
-
-#: src/gtkdialogs.c:127
-msgid "Norwegian (Nynorsk)"
-msgstr "Norwegian (Nynorsk)"
-
-#: src/gtkdialogs.c:128
-msgid "Punjabi"
-msgstr "Punjabi"
-
-#: src/gtkdialogs.c:129 src/gtkdialogs.c:164
-msgid "Polish"
-msgstr "Polish"
-
-#: src/gtkdialogs.c:130
-msgid "Portuguese"
-msgstr "Portuguese"
-
-#: src/gtkdialogs.c:131
-msgid "Portuguese-Brazil"
-msgstr "Portuguese-Brazil"
-
-#: src/gtkdialogs.c:132
 msgid "Romanian"
 msgstr "Romanian"
 
-#: src/gtkdialogs.c:133 src/gtkdialogs.c:165 src/gtkdialogs.c:166
+#: src/gtkdialogs.c:127 src/gtkdialogs.c:155 src/gtkdialogs.c:156
 msgid "Russian"
 msgstr "Russian"
 
-#: src/gtkdialogs.c:134
-msgid "Slovenian"
-msgstr "Slovenian"
-
-#: src/gtkdialogs.c:135
-msgid "Albanian"
-msgstr "Albanian"
-
-#: src/gtkdialogs.c:136
+#: src/gtkdialogs.c:128 src/gtkdialogs.c:129
 msgid "Serbian"
 msgstr "Serbian"
 
-#: src/gtkdialogs.c:137 src/gtkdialogs.c:168 src/gtkdialogs.c:169
+#: src/gtkdialogs.c:130
+msgid "Slovenian"
+msgstr "Slovenian"
+
+#: src/gtkdialogs.c:131 src/gtkdialogs.c:158
 msgid "Swedish"
 msgstr "Swedish"
 
-#: src/gtkdialogs.c:138
-msgid "Turkish"
-msgstr "Turkish"
-
-#: src/gtkdialogs.c:139
-msgid "Ukrainian"
-msgstr "Ukrainian"
-
-#: src/gtkdialogs.c:140
+#: src/gtkdialogs.c:132
+msgid "Telugu"
+msgstr ""
+
+#: src/gtkdialogs.c:133
 msgid "Vietnamese"
 msgstr "Vietnamese"
 
-#: src/gtkdialogs.c:140
+#: src/gtkdialogs.c:133
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh and the Gnome-Vi Team"
 
-#: src/gtkdialogs.c:141
-msgid "Xhosa"
-msgstr "Xhosa"
-
-#: src/gtkdialogs.c:142
+#: src/gtkdialogs.c:134 src/gtkdialogs.c:159
 msgid "Simplified Chinese"
 msgstr "Simplified Chinese"
 
-#: src/gtkdialogs.c:143
+#: src/gtkdialogs.c:135 src/gtkdialogs.c:136 src/gtkdialogs.c:160
 msgid "Traditional Chinese"
 msgstr "Traditional Chinese"
 
-#: src/gtkdialogs.c:149
+#: src/gtkdialogs.c:142
 msgid "Amharic"
 msgstr "Amharic"
 
-#: src/gtkdialogs.c:167
+#: src/gtkdialogs.c:157
 msgid "Slovak"
 msgstr "Slovak"
 
-#: src/gtkdialogs.c:170
-msgid "Chinese"
-msgstr "Chinese"
-
-#: src/gtkdialogs.c:212
+#: src/gtkdialogs.c:201
 msgid "About Gaim"
 msgstr "About Gaim"
 
-#: src/gtkdialogs.c:227
-#, 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:249
+#: src/gtkdialogs.c:225
+#, fuzzy
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
-"at once.  It is written using Gtk+ and is licensed under the GPL.<BR><BR>"
+"at once.  It is written using GTK+ and is licensed under the GNU GPL.<BR><BR>"
 msgstr ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
 "at once.  It is written using Gtk+ and is licensed under the GPL.<BR><BR>"
 
-#: src/gtkdialogs.c:259
+#: src/gtkdialogs.c:234
 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:262
+#: src/gtkdialogs.c:237
 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:268
+#: src/gtkdialogs.c:243
 msgid "Active Developers"
 msgstr "Active Developers"
 
-#: src/gtkdialogs.c:283
+#: src/gtkdialogs.c:258
 msgid "Crazy Patch Writers"
 msgstr "Crazy Patch Writers"
 
-#: src/gtkdialogs.c:298
+#: src/gtkdialogs.c:273
 msgid "Retired Developers"
 msgstr "Retired Developers"
 
-#: src/gtkdialogs.c:313
+#: src/gtkdialogs.c:288
 msgid "Current Translators"
 msgstr "Current Translators"
 
-#: src/gtkdialogs.c:333
+#: src/gtkdialogs.c:308
 msgid "Past Translators"
 msgstr "Past Translators"
 
-#: src/gtkdialogs.c:488 src/gtkdialogs.c:630 src/gtkdialogs.c:683
-msgid "_Screen name"
-msgstr "_Screen name"
-
-#: src/gtkdialogs.c:494 src/gtkdialogs.c:636 src/gtkdialogs.c:689
+#: src/gtkdialogs.c:326
+#, fuzzy
+msgid "Debugging Information"
+msgstr "User Information"
+
+#: src/gtkdialogs.c:488 src/gtkdialogs.c:629 src/gtkdialogs.c:684
+#, fuzzy
+msgid "_Name"
+msgstr "Name"
+
+#: src/gtkdialogs.c:493 src/gtkdialogs.c:634 src/gtkdialogs.c:689
 msgid "_Account"
 msgstr "_Account"
 
@@ -3244,94 +3011,82 @@
 msgstr "New Instant Message"
 
 #: src/gtkdialogs.c:503
-msgid "Please enter the screen name of the person you would like to IM."
+#, fuzzy
+msgid ""
+"Please enter the screen name or alias 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:643
+#: src/gtkdialogs.c:642
 msgid "Get User Info"
 msgstr "Get User Info"
 
-#: src/gtkdialogs.c:645
-msgid ""
-"Please enter the screen name of the person whose info you would like to view."
+#: src/gtkdialogs.c:644
+#, fuzzy
+msgid ""
+"Please enter the screen name or alias 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:697
-msgid "Get User Log"
+#: src/gtkdialogs.c:698
+#, fuzzy
+msgid "View User Log"
 msgstr "Get User Log"
 
-#: src/gtkdialogs.c:699
-msgid ""
-"Please enter the screen name of the person whose log you would like to view."
+#: src/gtkdialogs.c:700
+#, fuzzy
+msgid ""
+"Please enter the screen name or alias 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:739
-msgid "Warn User"
-msgstr "Warn User"
-
-#: src/gtkdialogs.c:760
-#, 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:769
-msgid "Warn _anonymously?"
-msgstr "Warn _anonymously?"
-
-#: src/gtkdialogs.c:776
-msgid "<b>Anonymous warnings are less severe.</b>"
-msgstr "<b>Anonymous warnings are less severe.</b>"
-
-#: src/gtkdialogs.c:797
+#: src/gtkdialogs.c:719
 msgid "Alias Contact"
 msgstr "Alias Contact"
 
-#: src/gtkdialogs.c:798
+#: src/gtkdialogs.c:720
 msgid "Enter an alias for this contact."
 msgstr "Enter an alias for this contact."
 
-#: src/gtkdialogs.c:800 src/gtkdialogs.c:822 src/gtkdialogs.c:842
-#: src/gtkrequest.c:251 src/protocols/silc/chat.c:584
+#: src/gtkdialogs.c:722 src/gtkdialogs.c:744 src/gtkdialogs.c:764
+#: src/gtkrequest.c:268 src/protocols/silc/chat.c:585
 msgid "Alias"
 msgstr "Alias"
 
-#: src/gtkdialogs.c:818
+#: src/gtkdialogs.c:740
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Enter an alias for %s."
 
-#: src/gtkdialogs.c:820
+#: src/gtkdialogs.c:742
 msgid "Alias Buddy"
 msgstr "Alias Buddy"
 
-#: src/gtkdialogs.c:839
+#: src/gtkdialogs.c:761
 msgid "Alias Chat"
 msgstr "Alias Chat"
 
-#: src/gtkdialogs.c:840
+#: src/gtkdialogs.c:762
 msgid "Enter an alias for this chat."
 msgstr "Enter an alias for this chat."
 
-#: src/gtkdialogs.c:874
-#, c-format
-msgid ""
+#: src/gtkdialogs.c:799
+#, fuzzy, 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 ""
 "You are about to remove the contact containing %s and %d other buddies from "
 "your buddy list.  Do you want to continue?"
-msgstr ""
+msgstr[0] ""
 "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:935
+msgstr[1] ""
+"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
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -3340,22 +3095,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:938 src/gtkdialogs.c:939
+#: src/gtkdialogs.c:869 src/gtkdialogs.c:870
 msgid "Remove Group"
 msgstr "Remove Group"
 
-#: src/gtkdialogs.c:977
+#: src/gtkdialogs.c:908
 #, 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:980 src/gtkdialogs.c:982
+#: src/gtkdialogs.c:911 src/gtkdialogs.c:912
 msgid "Remove Buddy"
 msgstr "Remove Buddy"
 
-#: src/gtkdialogs.c:1019
+#: src/gtkdialogs.c:950
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -3364,147 +3119,170 @@
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 
-#: src/gtkdialogs.c:1022 src/gtkdialogs.c:1023
+#: src/gtkdialogs.c:953 src/gtkdialogs.c:954
 msgid "Remove Chat"
 msgstr "Remove Chat"
 
-#: src/gtkft.c:141
+#: src/gtkft.c:138
 #, c-format
 msgid "%.2f KB/s"
 msgstr "%.2f KB/s"
 
-#: src/gtkft.c:162 src/gtkft.c:1012
+#: src/gtkft.c:159 src/gtkft.c:1035
 msgid "Finished"
 msgstr "Finished"
 
-#: src/gtkft.c:165 src/gtkft.c:963
+#: src/gtkft.c:162 src/gtkft.c:986
 msgid "Canceled"
 msgstr "Cancelled"
 
-#: src/gtkft.c:168 src/gtkft.c:882
+#: src/gtkft.c:165 src/gtkft.c:905
 msgid "Waiting for transfer to begin"
 msgstr "Waiting for transfer to begin"
 
-#: src/gtkft.c:221
+#: src/gtkft.c:218
 msgid "<b>Receiving As:</b>"
 msgstr "<b>Receiving As:</b>"
 
-#: src/gtkft.c:223
+#: src/gtkft.c:220
 msgid "<b>Receiving From:</b>"
 msgstr "<b>Receiving From:</b>"
 
-#: src/gtkft.c:227
+#: src/gtkft.c:224
 msgid "<b>Sending To:</b>"
 msgstr "<b>Sending To:</b>"
 
-#: src/gtkft.c:229
+#: src/gtkft.c:226
 msgid "<b>Sending As:</b>"
 msgstr "<b>Sending As:</b>"
 
-#: src/gtkft.c:436
+#: src/gtkft.c:442
 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:441
+#: src/gtkft.c:447
 msgid "An error occurred while opening the file."
 msgstr "An error occurred while opening the file."
 
-#: src/gtkft.c:533
+#: src/gtkft.c:467
+#, fuzzy, c-format
+msgid "Error launching %s: %s"
+msgstr "Error launching <b>%s</b>: %s"
+
+#: src/gtkft.c:476
+#, fuzzy, c-format
+msgid "Error running %s"
+msgstr "Error joining chat %s"
+
+#: src/gtkft.c:477
+#, c-format
+msgid "Process returned error code %d"
+msgstr ""
+
+#: src/gtkft.c:572
 msgid "Progress"
 msgstr "Progress"
 
-#: src/gtkft.c:540
+#: src/gtkft.c:579
 msgid "Filename"
 msgstr "Filename"
 
-#: src/gtkft.c:547
+#: src/gtkft.c:586
 msgid "Size"
 msgstr "Size"
 
-#: src/gtkft.c:554
+#: src/gtkft.c:593
 msgid "Remaining"
 msgstr "Remaining"
 
-#: src/gtkft.c:586
+#: src/gtkft.c:624
 msgid "Filename:"
 msgstr "Filename:"
 
-#: src/gtkft.c:587
+#: src/gtkft.c:625
 msgid "Local File:"
 msgstr "Local File:"
 
-#: src/gtkft.c:588
+#: src/gtkft.c:626
 msgid "Status:"
 msgstr "Status:"
 
-#: src/gtkft.c:589
+#: src/gtkft.c:627
 msgid "Speed:"
 msgstr "Speed:"
 
-#: src/gtkft.c:590
+#: src/gtkft.c:628
 msgid "Time Elapsed:"
 msgstr "Time Elapsed:"
 
-#: src/gtkft.c:591
+#: src/gtkft.c:629
 msgid "Time Remaining:"
 msgstr "Time Remaining:"
 
-#: src/gtkft.c:683
+#: src/gtkft.c:715
 msgid "_Keep the dialog open"
 msgstr "_Keep the dialog open"
 
-#: src/gtkft.c:693
-msgid "_Clear finished transfers"
+#: src/gtkft.c:725
+#, fuzzy
+msgid "C_lear finished transfers"
 msgstr "_Clear finished transfers"
 
 #. "Download Details" arrow
-#: src/gtkft.c:702
-msgid "Show transfer details"
-msgstr "Show transfer details"
-
-#: src/gtkft.c:703
-msgid "Hide transfer details"
+#: src/gtkft.c:734
+#, fuzzy
+msgid "File transfer _details"
 msgstr "Hide transfer details"
 
 #. Pause button
-#: src/gtkft.c:745 src/stock.c:92
+#: src/gtkft.c:764 src/gtkstock.c:123
 msgid "_Pause"
 msgstr "_Pause"
 
 #. Resume button
-#: src/gtkft.c:755
+#: src/gtkft.c:774
 msgid "_Resume"
 msgstr "_Resume"
 
-#: src/gtkft.c:965
+#: src/gtkft.c:988
 msgid "Failed"
 msgstr "Failed"
 
-#: src/gtkimhtml.c:693
+#: src/gtkimhtml.c:817
 msgid "Pa_ste As Text"
 msgstr "Pa_ste As Text"
 
-#: src/gtkimhtml.c:1087
+#: src/gtkimhtml.c:1314
 msgid "Hyperlink color"
 msgstr "Hyperlink colour"
 
-#: src/gtkimhtml.c:1088
+#: src/gtkimhtml.c:1315
 msgid "Color to draw hyperlinks."
 msgstr "Colour to draw hyperlinks."
 
-#: src/gtkimhtml.c:1296
+#: src/gtkimhtml.c:1318
+#, fuzzy
+msgid "Hyperlink prelight color"
+msgstr "Hyperlink colour"
+
+#: src/gtkimhtml.c:1319
+#, fuzzy
+msgid "Color to draw hyperlinks when mouse is over them."
+msgstr "Colour to draw hyperlinks."
+
+#: src/gtkimhtml.c:1538
 msgid "_Copy E-Mail Address"
 msgstr "_Copy E-Mail Address"
 
-#: src/gtkimhtml.c:1308
+#: src/gtkimhtml.c:1550
+msgid "_Open Link in Browser"
+msgstr "_Open Link in Browser"
+
+#: src/gtkimhtml.c:1560
 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:2915
+#: src/gtkimhtml.c:3239
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -3514,7 +3292,7 @@
 "\n"
 "Defaulting to PNG."
 
-#: src/gtkimhtml.c:2918
+#: src/gtkimhtml.c:3242
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -3524,7 +3302,7 @@
 "\n"
 "Defaulting to PNG."
 
-#: src/gtkimhtml.c:2931
+#: src/gtkimhtml.c:3255
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -3535,7 +3313,7 @@
 "\n"
 "%s"
 
-#: src/gtkimhtml.c:2934
+#: src/gtkimhtml.c:3258
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -3546,35 +3324,35 @@
 "\n"
 "%s"
 
-#: src/gtkimhtml.c:3014 src/gtkimhtml.c:3026
+#: src/gtkimhtml.c:3338 src/gtkimhtml.c:3350
 msgid "Save Image"
 msgstr "Save Image"
 
-#: src/gtkimhtml.c:3054
+#: src/gtkimhtml.c:3378
 msgid "_Save Image..."
 msgstr "_Save Image..."
 
-#: src/gtkimhtmltoolbar.c:176
+#: src/gtkimhtmltoolbar.c:147
 msgid "Select Font"
 msgstr "Select Font"
 
-#: src/gtkimhtmltoolbar.c:254
+#: src/gtkimhtmltoolbar.c:226
 msgid "Select Text Color"
 msgstr "Select Text Colour"
 
-#: src/gtkimhtmltoolbar.c:328
+#: src/gtkimhtmltoolbar.c:305
 msgid "Select Background Color"
 msgstr "Select Background Colour"
 
-#: src/gtkimhtmltoolbar.c:412
+#: src/gtkimhtmltoolbar.c:394
 msgid "_URL"
 msgstr "_URL"
 
-#: src/gtkimhtmltoolbar.c:420
+#: src/gtkimhtmltoolbar.c:402
 msgid "_Description"
 msgstr "_Description"
 
-#: src/gtkimhtmltoolbar.c:423
+#: src/gtkimhtmltoolbar.c:405
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
@@ -3582,109 +3360,176 @@
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
 
-#: src/gtkimhtmltoolbar.c:427
+#: src/gtkimhtmltoolbar.c:409
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "Please enter the URL of the link that you want to insert."
 
-#: src/gtkimhtmltoolbar.c:432
+#: src/gtkimhtmltoolbar.c:414
 msgid "Insert Link"
 msgstr "Insert Link"
 
-#: src/gtkimhtmltoolbar.c:436
+#: src/gtkimhtmltoolbar.c:418
 msgid "_Insert"
 msgstr "_Insert"
 
-#: src/gtkimhtmltoolbar.c:505
+#: src/gtkimhtmltoolbar.c:487
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Failed to store image: %s\n"
 
-#: src/gtkimhtmltoolbar.c:531 src/gtkimhtmltoolbar.c:541
+#: src/gtkimhtmltoolbar.c:513 src/gtkimhtmltoolbar.c:523
 msgid "Insert Image"
 msgstr "Insert Image"
 
-#: src/gtkimhtmltoolbar.c:679
+#: src/gtkimhtmltoolbar.c:721
 msgid "This theme has no available smileys."
 msgstr "This theme has no available smileys."
 
 #. show everything
-#: src/gtkimhtmltoolbar.c:694
+#: src/gtkimhtmltoolbar.c:735
 msgid "Smile!"
 msgstr "Smile!"
 
-#: src/gtkimhtmltoolbar.c:912
+#: src/gtkimhtmltoolbar.c:918
 msgid "Bold"
 msgstr "Bold"
 
-#: src/gtkimhtmltoolbar.c:923
+#: src/gtkimhtmltoolbar.c:929
 msgid "Italic"
 msgstr "Italic"
 
-#: src/gtkimhtmltoolbar.c:934
+#: src/gtkimhtmltoolbar.c:940
 msgid "Underline"
 msgstr "Underline"
 
-#: src/gtkimhtmltoolbar.c:950
+#: src/gtkimhtmltoolbar.c:956
 msgid "Larger font size"
 msgstr "Larger font size"
 
-#: src/gtkimhtmltoolbar.c:962
+#: src/gtkimhtmltoolbar.c:968
 msgid "Smaller font size"
 msgstr "Smaller font size"
 
-#: src/gtkimhtmltoolbar.c:979
+#: src/gtkimhtmltoolbar.c:985
 msgid "Font Face"
 msgstr "Font Face"
 
-#: src/gtkimhtmltoolbar.c:991
+#: src/gtkimhtmltoolbar.c:997
 msgid "Foreground font color"
 msgstr "Foreground font colour"
 
-#: src/gtkimhtmltoolbar.c:1003
+#: src/gtkimhtmltoolbar.c:1009
 msgid "Background color"
 msgstr "Background colour"
 
-#: src/gtkimhtmltoolbar.c:1018
+#: src/gtkimhtmltoolbar.c:1025
+#, fuzzy
+msgid "Clear formatting"
+msgstr "_Clear Formatting"
+
+#: src/gtkimhtmltoolbar.c:1040
 msgid "Insert link"
 msgstr "Insert link"
 
-#: src/gtkimhtmltoolbar.c:1028
+#: src/gtkimhtmltoolbar.c:1050
 msgid "Insert image"
 msgstr "Insert image"
 
-#: src/gtkimhtmltoolbar.c:1039
+#: src/gtkimhtmltoolbar.c:1061
 msgid "Insert smiley"
 msgstr "Insert smiley"
 
-#: src/gtklog.c:316
+#: 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:374
+#, fuzzy
+msgid "Total log size:"
+msgstr "By log size"
+
+#: src/gtklog.c:422
+msgid ""
+"System events will only be logged if the <span style=\"italic\">Log all "
+"status changes to system log</span> preference is enabled."
+msgstr ""
+
+#: src/gtklog.c:426
+msgid ""
+"Instant messages will only be logged if the <span style=\"italic\">Log all "
+"instant messages</span> preference is enabled."
+msgstr ""
+
+#: src/gtklog.c:429
+msgid ""
+"Chats will only be logged if the <span style=\"italic\">Log all chats "
+"preference</span> is enabled."
+msgstr ""
+
+#: src/gtklog.c:434
+msgid "No logs were found."
+msgstr ""
+
+#: src/gtklog.c:480
+#, fuzzy, c-format
+msgid "Conversations in %s"
+msgstr "Conversations with %s"
+
+#: src/gtklog.c:488 src/gtklog.c:539
 #, c-format
 msgid "Conversations with %s"
 msgstr "Conversations with %s"
 
-#. Window **********
-#: src/gtklog.c:412 src/gtklog.c:429
+#: src/gtklog.c:564
 msgid "System Log"
 msgstr "System Log"
 
+#: src/gtkmain.c:326
+#, 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:328
+#, 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, separated by commas)\n"
+"  -v, --version       display the current version and exit\n"
+msgstr ""
+
 #. Descriptive label
-#: src/gtknotify.c:216
+#: src/gtknotify.c:275
 #, 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:230
+#: src/gtknotify.c:289
 #, c-format
 msgid "<span weight=\"bold\">From:</span> %s\n"
 msgstr "<span weight=\"bold\">From:</span> %s\n"
 
-#: src/gtknotify.c:239
+#: src/gtknotify.c:298
 #, c-format
 msgid "<span weight=\"bold\">Subject:</span> %s\n"
 msgstr "<span weight=\"bold\">Subject:</span> %s\n"
 
-#: src/gtknotify.c:244
+#: src/gtknotify.c:303
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3695,7 +3540,7 @@
 "\n"
 "%s%s%s%s"
 
-#: src/gtknotify.c:260
+#: src/gtknotify.c:319
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3706,22 +3551,35 @@
 "\n"
 "%s"
 
-#: src/gtknotify.c:430
+#: src/gtknotify.c:504
+msgid "Search Results"
+msgstr "Search Results"
+
+#: src/gtknotify.c:643 src/protocols/oscar/oscar.c:4864
+#, c-format
+msgid "Info for %s"
+msgstr "Info for %s"
+
+#: src/gtknotify.c:644 src/protocols/toc/toc.c:470
+msgid "Buddy Information"
+msgstr "Buddy Information"
+
+#: src/gtknotify.c:687
 #, c-format
 msgid "The browser command <b>%s</b> is invalid."
 msgstr "The browser command <b>%s</b> is invalid."
 
-#: src/gtknotify.c:432 src/gtknotify.c:444 src/gtknotify.c:457
-#: src/gtknotify.c:581
+#: src/gtknotify.c:689 src/gtknotify.c:701 src/gtknotify.c:714
+#: src/gtknotify.c:838
 msgid "Unable to open URL"
 msgstr "Unable to open URL"
 
-#: src/gtknotify.c:442 src/gtknotify.c:455
+#: src/gtknotify.c:699 src/gtknotify.c:712
 #, c-format
 msgid "Error launching <b>%s</b>: %s"
 msgstr "Error launching <b>%s</b>: %s"
 
-#: src/gtknotify.c:582
+#: src/gtknotify.c:839
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
@@ -3736,7 +3594,7 @@
 msgstr "Please enter a buddy to pounce."
 
 #. "New Buddy Pounce"
-#: src/gtkpounce.c:391 src/gtkpounce.c:895
+#: src/gtkpounce.c:391 src/gtkpounce.c:898
 msgid "New Buddy Pounce"
 msgstr "New Buddy Pounce"
 
@@ -3832,63 +3690,55 @@
 msgstr "Sav_e this pounce after activation"
 
 #. "Remove Buddy Pounce"
-#: src/gtkpounce.c:902
+#: src/gtkpounce.c:906
 msgid "Remove Buddy Pounce"
 msgstr "Remove Buddy Pounce"
 
-#: src/gtkpounce.c:963
+#: src/gtkpounce.c:964
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s has started typing to you (%s)"
 
-#: src/gtkpounce.c:965
+#: src/gtkpounce.c:966
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s has signed on (%s)"
 
-#: src/gtkpounce.c:967
+#: src/gtkpounce.c:968
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s has returned from being idle (%s)"
 
-#: src/gtkpounce.c:969
+#: src/gtkpounce.c:970
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s has returned from being away (%s)"
 
-#: src/gtkpounce.c:971
+#: src/gtkpounce.c:972
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s has stopped typing to you (%s)"
 
-#: src/gtkpounce.c:973
+#: src/gtkpounce.c:974
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s has signed off (%s)"
 
-#: src/gtkpounce.c:975
+#: src/gtkpounce.c:976
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s has become idle (%s)"
 
-#: src/gtkpounce.c:977
+#: src/gtkpounce.c:978
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s has gone away. (%s)"
 
-#: src/gtkpounce.c:978
+#: src/gtkpounce.c:979
 msgid "Unknown pounce event. Please report this!"
 msgstr "Unknown pounce event. Please report this!"
 
-#: 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
+#: src/gtkprefs.c:623
 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."
@@ -3896,48 +3746,58 @@
 "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:721
+#: src/gtkprefs.c:658
 msgid "Icon"
 msgstr "Icon"
 
-#: 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
+#: src/gtkprefs.c:665 src/protocols/jabber/buddy.c:267
+#: src/protocols/jabber/buddy.c:811 src/protocols/jabber/chat.c:769
 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
+#: src/gtkprefs.c:786
+msgid "Buddy List Sorting"
+msgstr "Buddy List Sorting"
+
+#: src/gtkprefs.c:795
+msgid "_Sorting:"
+msgstr "_Sorting:"
+
+#: src/gtkprefs.c:800
+msgid "Buddy Display"
+msgstr "Buddy Display"
+
+#: src/gtkprefs.c:801
+#, fuzzy
+msgid "Show more buddy details"
+msgstr "Show user details"
+
+#: src/gtkprefs.c:839
+msgid "Send unknown \"_slash\" commands as messages"
+msgstr "Send unknown \"_slash\" commands as messages"
+
+#: src/gtkprefs.c:841
+#, fuzzy
+msgid "Show _formatting on incoming messages"
+msgstr "Show _formatting toolbar"
+
+#: src/gtkprefs.c:843
+msgid "Show buddy _icons"
+msgstr "Show buddy _icons"
+
+#: src/gtkprefs.c:845
+msgid "Enable buddy ic_on animation"
+msgstr "Enable buddy ic_on animation"
+
+#: src/gtkprefs.c:847
+msgid "_Notify buddies that you are typing to them"
+msgstr "_Notify buddies that you are typing to them"
+
+#: src/gtkprefs.c:850
 msgid "_Highlight misspelled words"
 msgstr "_Highlight misspelled words"
 
-#: src/gtkprefs.c:832
-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 "_Send default formatting with outgoing messages"
-msgstr "_Send default formatting with outgoing messages"
-
-#: src/gtkprefs.c:873
+#: src/gtkprefs.c:868
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting. :)"
@@ -3945,273 +3805,164 @@
 "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:1045
+#: src/gtkprefs.c:890
 msgid "Tab Options"
 msgstr "Tab Options"
 
-#: src/gtkprefs.c:1047
+#: src/gtkprefs.c:892
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Show IMs and chats in _tabbed windows"
 
-#: src/gtkprefs.c:1062
+#: src/gtkprefs.c:906
 msgid "Show close b_utton on tabs"
 msgstr "Show close b_utton on tabs"
 
-#: src/gtkprefs.c:1065
-msgid "Tab p_lacement:"
-msgstr "Tab P_lacement:"
-
-#: src/gtkprefs.c:1067
+#: src/gtkprefs.c:912
+#, fuzzy
+msgid "_Placement:"
+msgstr "ExtPlacement"
+
+#: src/gtkprefs.c:914
 msgid "Top"
 msgstr "Top"
 
-#: src/gtkprefs.c:1068
+#: src/gtkprefs.c:915
 msgid "Bottom"
 msgstr "Bottom"
 
-#: src/gtkprefs.c:1069
+#: src/gtkprefs.c:916
 msgid "Left"
 msgstr "Left"
 
-#: src/gtkprefs.c:1070
+#: src/gtkprefs.c:917
 msgid "Right"
 msgstr "Right"
 
-#: src/gtkprefs.c:1076
-msgid "New conversation _placement:"
-msgstr "New conversation _placement:"
-
-#: src/gtkprefs.c:1127 src/protocols/oscar/oscar.c:749
-#: src/protocols/oscar/oscar.c:5199
+#: src/gtkprefs.c:919
+msgid "Left Vertical"
+msgstr ""
+
+#: src/gtkprefs.c:920
+msgid "Right Vertical"
+msgstr ""
+
+#: src/gtkprefs.c:925
+#, fuzzy
+msgid "N_ew conversations:"
+msgstr "Close conversation"
+
+#: src/gtkprefs.c:976 src/protocols/oscar/oscar.c:779
+#: src/protocols/oscar/oscar.c:5951
 msgid "IP Address"
 msgstr "IP Address"
 
-#: src/gtkprefs.c:1129
+#: src/gtkprefs.c:978
+#, fuzzy
+msgid "STUN Server:"
+msgstr "_Server:"
+
+#: src/gtkprefs.c:980
 msgid "_Autodetect IP Address"
 msgstr "_Autodetect IP Address"
 
-#: src/gtkprefs.c:1138
+#: src/gtkprefs.c:989
 msgid "Public _IP:"
 msgstr "Public _IP:"
 
-#: src/gtkprefs.c:1162
+#: src/gtkprefs.c:1013
 msgid "Ports"
 msgstr "Ports"
 
-#: src/gtkprefs.c:1165
+#: src/gtkprefs.c:1016
 msgid "_Manually specify range of ports to listen on"
 msgstr "_Manually specify range of ports to listen on"
 
-#: src/gtkprefs.c:1168
+#: src/gtkprefs.c:1019
 msgid "_Start Port:"
 msgstr "_Start Port:"
 
-#: src/gtkprefs.c:1175
+#: src/gtkprefs.c:1026
 msgid "_End Port:"
 msgstr "_End Port:"
 
-#: src/gtkprefs.c:1182
+#: src/gtkprefs.c:1033
 msgid "Proxy Server"
 msgstr "Proxy Server"
 
-#: src/gtkprefs.c:1186
+#: src/gtkprefs.c:1037
 msgid "No proxy"
 msgstr "No proxy"
 
-#: src/gtkprefs.c:1248
+#: src/gtkprefs.c:1093
 msgid "_User:"
 msgstr "_User:"
 
-#: src/gtkprefs.c:1304
+#: src/gtkprefs.c:1153
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: src/gtkprefs.c:1305
+#: src/gtkprefs.c:1154
 msgid "Firebird"
 msgstr "Firebird"
 
-#: src/gtkprefs.c:1306
+#: src/gtkprefs.c:1155
 msgid "Firefox"
 msgstr "Firefox"
 
-#: src/gtkprefs.c:1307
+#: src/gtkprefs.c:1156
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/gtkprefs.c:1308
+#: src/gtkprefs.c:1157
 msgid "Gnome Default"
 msgstr "Gnome Default"
 
-#: src/gtkprefs.c:1309
+#: src/gtkprefs.c:1158
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/gtkprefs.c:1310
+#: src/gtkprefs.c:1159
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: src/gtkprefs.c:1311
+#: src/gtkprefs.c:1160
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/gtkprefs.c:1312
+#: src/gtkprefs.c:1161
 msgid "Opera"
 msgstr "Opera"
 
-#: src/gtkprefs.c:1321
+#: src/gtkprefs.c:1170
 msgid "Manual"
 msgstr "Manual"
 
-#: src/gtkprefs.c:1372
+#: src/gtkprefs.c:1223
 msgid "Browser Selection"
 msgstr "Browser Selection"
 
-#: src/gtkprefs.c:1376
+#: src/gtkprefs.c:1227
 msgid "_Browser:"
 msgstr "_Browser:"
 
-#: src/gtkprefs.c:1383
+#: src/gtkprefs.c:1235
 msgid "_Open link in:"
 msgstr "_Open Link in:"
 
-#: src/gtkprefs.c:1385
+#: src/gtkprefs.c:1237
 msgid "Browser default"
 msgstr "Browser default"
 
-#: src/gtkprefs.c:1386
+#: src/gtkprefs.c:1238
 msgid "Existing window"
 msgstr "Existing window"
 
-#: src/gtkprefs.c:1388
+#: src/gtkprefs.c:1240
 msgid "New tab"
 msgstr "New tab"
 
-#: src/gtkprefs.c:1402
+#: src/gtkprefs.c:1254
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -4220,83 +3971,57 @@
 "_Manual:\n"
 "(%s for URL)"
 
-#: src/gtkprefs.c:1439
-msgid "Message Logs"
-msgstr "Message Logs"
-
-#: src/gtkprefs.c:1442
+#: src/gtkprefs.c:1290 src/gtkprefs.c:1767
+msgid "Logging"
+msgstr "Logging"
+
+#: src/gtkprefs.c:1293
 msgid "Log _Format:"
 msgstr "Log _Format:"
 
-#: src/gtkprefs.c:1445
-msgid "_Log all instant messages"
+#: src/gtkprefs.c:1298
+#, fuzzy
+msgid "Log all _instant messages"
 msgstr "_Log all instant messages"
 
-#: src/gtkprefs.c:1447
+#: src/gtkprefs.c:1300
 msgid "Log all c_hats"
 msgstr "Log all c_hats"
 
-#: src/gtkprefs.c:1450
-msgid "System Logs"
-msgstr "System Logs"
-
-#: src/gtkprefs.c:1452
-msgid "_Enable system log"
-msgstr "_Enable system log"
-
-#: 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:1467
-msgid "Log when buddies go away/come _back"
-msgstr "Log when buddies go away/come _back"
-
-#: src/gtkprefs.c:1473
-msgid "Log your _own signons/idleness/awayness"
-msgstr "Log your _own signons/idleness/awayness"
-
-#: src/gtkprefs.c:1600
+#: src/gtkprefs.c:1302
+msgid "Log all _status changes to system log"
+msgstr ""
+
+#: src/gtkprefs.c:1434
 msgid "Sound Selection"
 msgstr "Sound Selection"
 
-#: 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
+#: src/gtkprefs.c:1488
 msgid "Sound Method"
 msgstr "Sound Method"
 
-#: src/gtkprefs.c:1659
+#: src/gtkprefs.c:1489
 msgid "_Method:"
 msgstr "_Method:"
 
-#: src/gtkprefs.c:1661
+#: src/gtkprefs.c:1491
 msgid "Console beep"
 msgstr "Console beep"
 
-#: src/gtkprefs.c:1663
+#: src/gtkprefs.c:1493
 msgid "Automatic"
 msgstr "Automatic"
 
-#: src/gtkprefs.c:1670
+#: src/gtkprefs.c:1498
 msgid "Command"
 msgstr "Command"
 
-#: src/gtkprefs.c:1678
+#: src/gtkprefs.c:1499
+#, fuzzy
+msgid "No sounds"
+msgstr "Sounds"
+
+#: src/gtkprefs.c:1507
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -4305,179 +4030,113 @@
 "Sound c_ommand:\n"
 "(%s for filename)"
 
-#: src/gtkprefs.c:1705
+#: src/gtkprefs.c:1533
+msgid "Sound Options"
+msgstr "Sound Options"
+
+#: src/gtkprefs.c:1534
+msgid "Sounds when conversation has _focus"
+msgstr "Sounds when conversation has _focus"
+
+#: src/gtkprefs.c:1536
+msgid "_Sounds while away"
+msgstr "_Sounds while away"
+
+#: src/gtkprefs.c:1546
 msgid "Sound Events"
 msgstr "Sound Events"
 
-#: src/gtkprefs.c:1756
+#: src/gtkprefs.c:1597
 msgid "Play"
 msgstr "Play"
 
-#: src/gtkprefs.c:1763
+#: src/gtkprefs.c:1604
 msgid "Event"
 msgstr "Event"
 
-#: src/gtkprefs.c:1782
+#: src/gtkprefs.c:1623
 msgid "Test"
 msgstr "Test"
 
-#: src/gtkprefs.c:1786
+#: src/gtkprefs.c:1627
 msgid "Reset"
 msgstr "Reset"
 
-#: src/gtkprefs.c:1790
+#: src/gtkprefs.c:1631
 msgid "Choose..."
 msgstr "Choose..."
 
-#: src/gtkprefs.c:1814
+#: src/gtkprefs.c:1685 src/gtkstatusbox.c:288 src/protocols/irc/irc.c:176
+#: src/protocols/irc/msgs.c:221 src/protocols/jabber/buddy.c:1093
+#: src/protocols/jabber/jabber.c:1055 src/protocols/msn/msn.c:577
+#: src/protocols/novell/novell.c:2825 src/protocols/novell/novell.c:2959
+#: src/protocols/novell/novell.c:3041 src/protocols/oscar/oscar.c:707
+#: src/protocols/oscar/oscar.c:6510 src/protocols/oscar/oscar.c:6579
+#: src/protocols/oscar/oscar.c:7604 src/protocols/oscar/oscar.c:7758
+#: src/protocols/silc/buddy.c:1417 src/protocols/silc/silc.c:52
+#: src/protocols/yahoo/yahoo.c:3234 src/protocols/zephyr/zephyr.c:2259
+#: src/status.c:158
+msgid "Away"
+msgstr "Away"
+
+#: src/gtkprefs.c:1686
 msgid "_Queue new messages when away"
 msgstr "_Queue new messages when away"
 
-#: src/gtkprefs.c:1817
+#: src/gtkprefs.c:1689
 msgid "_Auto-reply:"
 msgstr "_Auto-reply:"
 
-#: src/gtkprefs.c:1819
-msgid "Never"
-msgstr "Never"
-
-#: src/gtkprefs.c:1820
+#: src/gtkprefs.c:1692
 msgid "When away"
 msgstr "When away"
 
-#: src/gtkprefs.c:1821
-msgid "When away and idle"
+#: src/gtkprefs.c:1693
+#, fuzzy
+msgid "When both away and idle"
 msgstr "When away and idle"
 
-#: 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:4347 src/protocols/yahoo/yahoo.c:2780
-#: src/protocols/yahoo/yahoo_profile.c:664
-msgid "Idle"
-msgstr "Idle"
-
-#: src/gtkprefs.c:1825
-msgid "Idle _time reporting:"
-msgstr "Idle _time reporting:"
-
-#: src/gtkprefs.c:1828
-msgid "Gaim usage"
-msgstr "Gaim usage"
-
-#: src/gtkprefs.c:1831
-msgid "X usage"
-msgstr "X usage"
-
-#: src/gtkprefs.c:1833
-msgid "Windows usage"
-msgstr "Windows usage"
-
-#: src/gtkprefs.c:1841
+#: src/gtkprefs.c:1696
+#, fuzzy
+msgid "_Report idle time"
+msgstr "Show idle _times"
+
+#: src/gtkprefs.c:1699
 msgid "Auto-away"
 msgstr "Auto-away"
 
-#: src/gtkprefs.c:1842
+#: src/gtkprefs.c:1700
 msgid "Set away _when idle"
 msgstr "Set away _when idle"
 
-#: src/gtkprefs.c:1846
+#: src/gtkprefs.c:1704
 msgid "_Minutes before setting away:"
 msgstr "_Minutes before setting away:"
 
-#: src/gtkprefs.c:1854
+#: src/gtkprefs.c:1712
 msgid "Away m_essage:"
 msgstr "Away m_essage:"
 
-#: src/gtkprefs.c:1923
-#, c-format
-msgid ""
-"<span size=\"larger\">%s %s</span>\n"
-"\n"
-"<span weight=\"bold\">Written by:</span>\t%s\n"
-"<span weight=\"bold\">Web site:</span>\t\t%s\n"
-"<span weight=\"bold\">File name:</span>\t%s"
-msgstr ""
-"<span size=\"larger\">%s %s</span>\n"
-"\n"
-"<span weight=\"bold\">Written by:</span>\t%s\n"
-"<span weight=\"bold\">Web site:</span>\t\t%s\n"
-"<span weight=\"bold\">File name:</span>\t%s"
-
-#: src/gtkprefs.c:1928
-#, c-format
-msgid ""
-"<span size=\"larger\">%s %s</span>\n"
-"\n"
-"<span weight=\"bold\">Written by:</span>  %s\n"
-"<span weight=\"bold\">URL:</span>  %s\n"
-"<span weight=\"bold\">File name:</span>  %s"
-msgstr ""
-"<span size=\"larger\">%s %s</span>\n"
-"\n"
-"<span weight=\"bold\">Written by:</span>  %s\n"
-"<span weight=\"bold\">URL:</span>  %s\n"
-"<span weight=\"bold\">File name:</span>  %s"
-
-#: src/gtkprefs.c:2161
-msgid "Load"
-msgstr "Load"
-
-#: src/gtkprefs.c:2175
-msgid "Summary"
-msgstr "Summary"
-
-#: src/gtkprefs.c:2223
-msgid "Details"
-msgstr "Details"
-
-#: 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
+#: src/gtkprefs.c:1757
 msgid "Smiley Themes"
 msgstr "Smiley Themes"
 
-#: src/gtkprefs.c:2426
+#: src/gtkprefs.c:1758
 msgid "Sounds"
 msgstr "Sounds"
 
-#: src/gtkprefs.c:2427 src/protocols/silc/silc.c:1588
+#: src/gtkprefs.c:1759 src/protocols/silc/silc.c:1589
 msgid "Network"
 msgstr "Network"
 
-#: src/gtkprefs.c:2432
+#: src/gtkprefs.c:1764
 msgid "Browser"
 msgstr "Browser"
 
-#: src/gtkprefs.c:2435
-msgid "Logging"
-msgstr "Logging"
-
-#: src/gtkprefs.c:2436
+#: src/gtkprefs.c:1768
 msgid "Away / Idle"
 msgstr "Away / Idle"
 
-#: src/gtkprefs.c:2437
-msgid "Away Messages"
-msgstr "Away Messages"
-
-#: src/gtkprefs.c:2440
-msgid "Plugins"
-msgstr "Plugins"
-
 #: src/gtkprivacy.c:79
 msgid "Allow all users to contact me"
 msgstr "Allow all users to contact me"
@@ -4498,63 +4157,67 @@
 msgid "Block only the users below"
 msgstr "Block only the users below"
 
-#: src/gtkprivacy.c:397 src/protocols/jabber/jabber.c:1504
+#: src/gtkprivacy.c:398
 msgid "Privacy"
 msgstr "Privacy"
 
-#: src/gtkprivacy.c:410
+#: src/gtkprivacy.c:411
 msgid "Changes to privacy settings take effect immediately."
 msgstr "Changes to privacy settings take effect immediately."
 
 #. "Set privacy for:" label
-#: src/gtkprivacy.c:422
+#: src/gtkprivacy.c:423
 msgid "Set privacy for:"
 msgstr "Set privacy for:"
 
-#: src/gtkprivacy.c:591 src/gtkprivacy.c:607
+#: src/gtkprivacy.c:589 src/gtkprivacy.c:605
 msgid "Permit User"
 msgstr "Permit User"
 
-#: src/gtkprivacy.c:592
+#: src/gtkprivacy.c:590
 msgid "Type a user you permit to contact you."
 msgstr "Type a user you permit to contact you."
 
-#: src/gtkprivacy.c:593
+#: src/gtkprivacy.c:591
 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:596 src/gtkprivacy.c:609
+#: src/gtkprivacy.c:594 src/gtkprivacy.c:607
 msgid "Permit"
 msgstr "Permit"
 
-#: src/gtkprivacy.c:601
+#: src/gtkprivacy.c:599
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "Allow %s to contact you?"
 
-#: src/gtkprivacy.c:603
+#: src/gtkprivacy.c:601
 #, 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:630 src/gtkprivacy.c:643
+#: src/gtkprivacy.c:628 src/gtkprivacy.c:641
 msgid "Block User"
 msgstr "Block User"
 
-#: src/gtkprivacy.c:631
+#: src/gtkprivacy.c:629
 msgid "Type a user to block."
 msgstr "Type a user to block."
 
-#: src/gtkprivacy.c:632
+#: src/gtkprivacy.c:630
 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:639
+#: src/gtkprivacy.c:632 src/gtkprivacy.c:643 src/protocols/gg/gg.c:1135
+msgid "Block"
+msgstr "Block"
+
+#: src/gtkprivacy.c:637
 #, c-format
 msgid "Block %s?"
 msgstr "Block %s?"
 
-#: src/gtkprivacy.c:641
+#: src/gtkprivacy.c:639
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "Are you sure you want to block %s?"
@@ -4562,44 +4225,42 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: 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:1236
+#: src/gtkrequest.c:258 src/protocols/msn/dialog.c:113
+#: src/protocols/msn/msn.c:553 src/protocols/msn/msn.c:556
+#: src/protocols/novell/novell.c:1902 src/protocols/silc/buddy.c:312
+#: src/protocols/silc/pk.c:117 src/request.h:1322
 msgid "Yes"
 msgstr "Yes"
 
-#: 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:1236
+#: src/gtkrequest.c:259 src/protocols/msn/dialog.c:114
+#: src/protocols/msn/msn.c:553 src/protocols/msn/msn.c:556
+#: src/protocols/novell/novell.c:1903 src/protocols/silc/buddy.c:313
+#: src/protocols/silc/pk.c:118 src/request.h:1322
 msgid "No"
 msgstr "No"
 
-#: src/gtkrequest.c:245
+#: src/gtkrequest.c:262
 msgid "Apply"
 msgstr "Apply"
 
-#: src/gtkrequest.c:246 src/protocols/msn/msn.c:314
+#: src/gtkrequest.c:263 src/protocols/msn/msn.c:357
 #: src/protocols/silc/util.c:335
 msgid "Close"
 msgstr "Close"
 
-#: src/gtkrequest.c:1421
+#: src/gtkrequest.c:1795
 msgid "That file already exists"
 msgstr "That file already exists"
 
-#: src/gtkrequest.c:1422
+#: src/gtkrequest.c:1796
 msgid "Would you like to overwrite it?"
 msgstr "Would you like to overwrite it?"
 
-#: src/gtkrequest.c:1460 src/gtkrequest.c:1481
+#: src/gtkrequest.c:1838 src/gtkrequest.c:1879
 msgid "Save File..."
 msgstr "Save File..."
 
-#: src/gtkrequest.c:1461 src/gtkrequest.c:1482
+#: src/gtkrequest.c:1839 src/gtkrequest.c:1880
 msgid "Open File..."
 msgstr "Open File..."
 
@@ -4612,52 +4273,113 @@
 msgid "_Get List"
 msgstr "_Get List"
 
-#: src/gtksound.c:63
+#: src/gtksavedstatuses.c:317 src/protocols/jabber/buddy.c:264
+#: src/protocols/jabber/buddy.c:805 src/protocols/novell/novell.c:1460
+msgid "Title"
+msgstr "Title"
+
+#: src/gtksavedstatuses.c:332
+msgid "Type"
+msgstr ""
+
+#: src/gtksavedstatuses.c:343 src/protocols/gg/gg.c:1083
+#: src/protocols/gg/gg.c:1088 src/protocols/gg/gg.c:1097
+#: src/protocols/gg/gg.c:1107 src/protocols/gg/gg.c:1112
+#: src/protocols/irc/irc.c:177 src/protocols/jabber/jabber.c:1032
+#: src/protocols/jabber/jabber.c:1040 src/protocols/jabber/jabber.c:1048
+#: src/protocols/jabber/jabber.c:1056 src/protocols/jabber/jabber.c:1064
+#: src/protocols/jabber/jabber.c:1072 src/protocols/novell/novell.c:2845
+#: src/protocols/oscar/oscar.c:7752 src/protocols/oscar/oscar.c:7759
+#: src/protocols/yahoo/yahoo.c:3202 src/protocols/yahoo/yahoo.c:3235
+#: src/protocols/zephyr/zephyr.c:2260
+msgid "Message"
+msgstr "Message"
+
+#: src/gtksavedstatuses.c:406
+#, fuzzy
+msgid "Saved Statuses"
+msgstr "Server Statistics"
+
+#: src/gtksavedstatuses.c:527
+msgid "Title already in use.  You must choose a unique title."
+msgstr ""
+
+#: src/gtksavedstatuses.c:618
+#, fuzzy
+msgid "Custom status"
+msgstr "By status"
+
+#: src/gtksavedstatuses.c:721 src/protocols/gg/gg.c:1064
+#: src/protocols/gg/gg.c:1069 src/protocols/jabber/buddy.c:626
+#: src/protocols/jabber/buddy.c:633 src/protocols/jabber/buddy.c:644
+#: src/protocols/jabber/jabber.c:1005 src/protocols/msn/msn.c:544
+#: src/protocols/novell/novell.c:2844 src/protocols/novell/novell.c:2848
+#: src/protocols/oscar/oscar.c:762 src/protocols/oscar/oscar.c:767
+#: src/protocols/oscar/oscar.c:769 src/protocols/yahoo/yahoo.c:2783
+msgid "Status"
+msgstr "Status"
+
+#: src/gtksavedstatuses.c:740
+#, fuzzy
+msgid "_Title:"
+msgstr "Title"
+
+#: src/gtksavedstatuses.c:760
+#, fuzzy
+msgid "_Status:"
+msgstr "Status:"
+
+#. Custom status message expander
+#: src/gtksavedstatuses.c:795
+msgid "Use a _different status for some accounts"
+msgstr ""
+
+#: src/gtksound.c:61
 msgid "Buddy logs in"
 msgstr "Buddy logs in"
 
-#: src/gtksound.c:64
+#: src/gtksound.c:62
 msgid "Buddy logs out"
 msgstr "Buddy logs out"
 
+#: src/gtksound.c:63
+msgid "Message received"
+msgstr "Message received"
+
+#: src/gtksound.c:64
+msgid "Message received begins conversation"
+msgstr "Message received begins conversation"
+
 #: src/gtksound.c:65
-msgid "Message received"
-msgstr "Message received"
+msgid "Message sent"
+msgstr "Message sent"
 
 #: src/gtksound.c:66
-msgid "Message received begins conversation"
-msgstr "Message received begins conversation"
+msgid "Person enters chat"
+msgstr "Person enters chat"
 
 #: src/gtksound.c:67
-msgid "Message sent"
-msgstr "Message sent"
+msgid "Person leaves chat"
+msgstr "Person leaves chat"
 
 #: src/gtksound.c:68
-msgid "Person enters chat"
-msgstr "Person enters chat"
-
-#: src/gtksound.c:69
-msgid "Person leaves chat"
-msgstr "Person leaves chat"
-
-#: src/gtksound.c:70
 msgid "You talk in chat"
 msgstr "You talk in chat"
 
-#: src/gtksound.c:71
+#: src/gtksound.c:69
 msgid "Others talk in chat"
 msgstr "Others talk in chat"
 
-#: src/gtksound.c:74
+#: src/gtksound.c:72
 msgid "Someone says your name in chat"
 msgstr "Someone says your name in chat"
 
-#: src/gtksound.c:173
+#: src/gtksound.c:414
 #, 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:189
+#: src/gtksound.c:430
 msgid ""
 "Unable to play sound because the 'Command' sound method has been chosen, but "
 "no command has been set."
@@ -4665,7 +4387,7 @@
 "Unable to play sound because the 'Command' sound method has been chosen, but "
 "no command has been set."
 
-#: src/gtksound.c:201
+#: src/gtksound.c:442
 #, c-format
 msgid ""
 "Unable to play sound because the configured sound command could not be "
@@ -4674,15 +4396,184 @@
 "Unable to play sound because the configured sound command could not be "
 "launched: %s"
 
-#: src/log.c:104
+#: src/gtkstatusbox.c:190
+#, fuzzy
+msgid "Typing"
+msgstr "Ping"
+
+#. connect to the server
+#: src/gtkstatusbox.c:193 src/protocols/irc/irc.c:258
+#: src/protocols/jabber/jabber.c:838 src/protocols/msn/session.c:362
+#: src/protocols/napster/napster.c:525 src/protocols/novell/novell.c:2164
+#: src/protocols/oscar/oscar.c:1824 src/protocols/yahoo/yahoo.c:2451
+#: src/protocols/zephyr/zephyr.c:1546
+msgid "Connecting"
+msgstr "Connecting"
+
+#. hacks
+#: src/gtkstatusbox.c:287 src/protocols/irc/irc.c:172
+#: src/protocols/jabber/jabber.c:1039 src/protocols/msn/msn.c:573
+#: 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:2822 src/protocols/novell/novell.c:2956
+#: src/protocols/novell/novell.c:3039 src/protocols/oscar/oscar.c:808
+#: src/protocols/oscar/oscar.c:7751 src/protocols/silc/silc.c:48
+#: src/protocols/yahoo/yahoo.c:3196 src/status.c:155
+msgid "Available"
+msgstr "Available"
+
+#.
+#. * Without this selecting Invisible as own status doesn't
+#. * work. It's not used and not needed to show status of buddies.
+#.
+#: src/gtkstatusbox.c:289 src/protocols/gg/gg.c:1096
+#: src/protocols/oscar/oscar.c:711 src/protocols/oscar/oscar.c:7765
+#: src/protocols/yahoo/yahoo.c:2629 src/protocols/yahoo/yahoo.c:3239
+msgid "Invisible"
+msgstr "Invisible"
+
+#: src/gtkstatusbox.c:290 src/protocols/gg/gg.c:1082
+#: src/protocols/irc/irc.c:168 src/protocols/jabber/buddy.c:1087
+#: src/protocols/jabber/jabber.c:1032 src/protocols/msn/msn.c:569
+#: src/protocols/napster/napster.c:573 src/protocols/novell/novell.c:2834
+#: src/protocols/novell/novell.c:2953 src/protocols/oscar/oscar.c:769
+#: src/protocols/oscar/oscar.c:7585 src/protocols/oscar/oscar.c:7746
+#: src/protocols/silc/silc.c:46 src/protocols/yahoo/yahoo.c:2633
+#: src/protocols/yahoo/yahoo.c:3193 src/status.c:154
+msgid "Offline"
+msgstr "Offline"
+
+#: src/gtkstatusbox.c:292
+#, fuzzy
+msgid "Custom..."
+msgstr "Custom"
+
+#: src/gtkstatusbox.c:293
+#, fuzzy
+msgid "Saved..."
+msgstr "Save File..."
+
+#. TODO: Should save the previous status as a transient status?
+#. Save the newly selected status to prefs.xml and status.xml
+#: src/gtkstatusbox.c:655 src/gtkstatusbox.c:657 src/gtkstatusbox.c:660
+#: src/status.c:1696
+#, fuzzy
+msgid "Default"
+msgstr "Gnome Default"
+
+#: src/gtkstock.c:118
+msgid "_Alias"
+msgstr "_Alias"
+
+#: src/gtkstock.c:120
+msgid "_Invite"
+msgstr "_Invite"
+
+#: src/gtkstock.c:121
+msgid "_Modify"
+msgstr "_Modify"
+
+#: src/gtkstock.c:122
+msgid "_Open Mail"
+msgstr "_Open Mail"
+
+#: src/gtkstock.c:124
+msgid "_Warn"
+msgstr "_Warn"
+
+#: src/gtkutils.c:1393 src/gtkutils.c:1418
+#, fuzzy, c-format
+msgid "The following error has occurred loading %s: %s"
+msgstr "An unknown signon error has occurred: %s."
+
+#: src/gtkutils.c:1395 src/gtkutils.c:1420
+#, fuzzy
+msgid "Failed to load image"
+msgstr "Failed to store image: %s\n"
+
+#: src/gtkutils.c:1495
+#, fuzzy, c-format
+msgid "Cannot send folder %s."
+msgstr "Cannot send file"
+
+#: src/gtkutils.c:1497
+msgid ""
+"Gaim cannot transfer a folder. You will need to send the files within "
+"individually"
+msgstr ""
+
+#: src/gtkutils.c:1525 src/gtkutils.c:1534 src/gtkutils.c:1539
+#, fuzzy
+msgid "You have dragged an image"
+msgstr "You have entered an invalid username"
+
+#: src/gtkutils.c:1526
+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 ""
+
+#: src/gtkutils.c:1530 src/gtkutils.c:1545
+#, fuzzy
+msgid "Set as buddy icon"
+msgstr "Show buddy _icons"
+
+#: src/gtkutils.c:1531 src/gtkutils.c:1546
+#, fuzzy
+msgid "Send image file"
+msgstr "Send message"
+
+#: src/gtkutils.c:1532 src/gtkutils.c:1546
+#, fuzzy
+msgid "Insert in message"
+msgstr "Insert image"
+
+#: src/gtkutils.c:1535
+#, fuzzy
+msgid "Would you like to set it as the buddy icon for this user?"
+msgstr "Would you like to join the conversation?"
+
+#: src/gtkutils.c:1540
+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 ""
+
+#: src/gtkutils.c:1542
+msgid ""
+"You can insert this image into this message, or use it as the buddy icon for "
+"this user"
+msgstr ""
+
+#. 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:1596
+#, fuzzy
+msgid "Cannot send launcher"
+msgstr "Cannot send file"
+
+#: src/gtkutils.c:1596
+msgid ""
+"You dragged a desktop launcher. Most likely you wanted to send whatever this "
+"launcher points to instead of this launcher itself."
+msgstr ""
+
+#: src/log.c:129
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color=\"red\">The logger has no read function</font></b>"
 
-#: src/log.c:545
+#: src/log.c:577
+msgid "Logging of this conversation failed."
+msgstr ""
+
+#: src/log.c:839
 msgid "XML"
 msgstr "XML"
 
-#: src/log.c:610
+#: src/log.c:904
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4691,7 +4582,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
 
-#: src/log.c:612
+#: src/log.c:906
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4700,112 +4591,21 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
 
-#: src/log.c:663 src/log.c:793
+#: src/log.c:957 src/log.c:1074
 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:673 src/log.c:805
+#: src/log.c:967 src/log.c:1086
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>Could not read file: %s</b></font>"
 
-#: src/log.c:677
-msgid "HTML"
-msgstr "HTML"
-
-#: src/log.c:738
+#: src/log.c:1019
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
-#: src/log.c:809
-msgid "Plain text"
-msgstr "Plain text"
-
-#: 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, separated 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 login (optional argument NAME specifies\n"
-"                      account(s) to use, separated 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"
-
-#. 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
+#: src/plugin.c:331
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
@@ -4814,499 +4614,462 @@
 "The required plugin %s was not found. Please install this plugin and try "
 "again."
 
-#: src/plugin.c:300 src/plugin.c:328
+#: src/plugin.c:336 src/plugin.c:364
 msgid "Gaim was unable to load your plugin."
 msgstr "Gaim was unable to load your plugin."
 
-#: src/plugin.c:324
+#: src/plugin.c:360
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "The required plugin %s was unable to load."
 
-#: src/prefs.c:113 src/status.c:273
-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:771 src/protocols/yahoo/yahoo.c:3125
-#: src/protocols/yahoo/yahoo.c:3241
-msgid "Available"
-msgstr "Available"
-
-#: src/protocols/gg/gg.c:51
-msgid "Available for friends only"
-msgstr "Available for friends only"
-
-#: src/protocols/gg/gg.c:53
-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:689
-#: src/protocols/oscar/oscar.c:5715 src/protocols/oscar/oscar.c:5793
-#: src/protocols/oscar/oscar.c:5817 src/protocols/oscar/oscar.c:7004
-#: src/protocols/oscar/oscar.c:7009 src/protocols/yahoo/yahoo.c:2778
-#: src/protocols/yahoo/yahoo.c:3145 src/protocols/yahoo/yahoo.c:3253
-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
-msgid "Unavailable"
-msgstr "Unavailable"
+#: src/protocols/gg/gg.c:136 src/protocols/gg/gg.c:155
+#, fuzzy
+msgid "Save Buddylist..."
+msgstr "Send Buddy List"
 
 #: src/protocols/gg/gg.c:137
-msgid "Unable to resolve hostname."
-msgstr "Unable to resolve hostname."
-
-#: 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: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:146
-msgid "Error while reading from socket."
-msgstr "Error while reading from socket."
-
-#: src/protocols/gg/gg.c:149
-msgid "Error while writing to socket."
-msgstr "Error while writing to socket."
-
-#: src/protocols/gg/gg.c:152
-msgid "Authentication failed."
-msgstr "Authentication failed."
-
-#: src/protocols/gg/gg.c:155
-msgid "Unknown Error Code."
-msgstr "Unknown Error Code."
-
-#: src/protocols/gg/gg.c:243 src/protocols/oscar/oscar.c:4148
-#, c-format
-msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
-msgstr "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
-
-#. res[0] == username
-#. XXX this should use gaim_notify_userinfo, but it is unclear to me what should be passed for 'who'
-#: src/protocols/gg/gg.c:244 src/protocols/gg/gg.c:1013
-#: src/protocols/napster/napster.c:404 src/protocols/oscar/oscar.c:4152
-#: src/protocols/oscar/oscar.c:4376 src/protocols/silc/ops.c:1086
-#: src/protocols/silc/ops.c:1148 src/protocols/toc/toc.c:468
-#: src/protocols/zephyr/zephyr.c:726 src/protocols/zephyr/zephyr.c:1136
-msgid "Buddy Information"
-msgstr "Buddy Information"
-
-#: src/protocols/gg/gg.c:294
-#, c-format
-msgid "Status: %s"
-msgstr "Status: %s"
-
-#: src/protocols/gg/gg.c:447
-msgid "Could not connect"
-msgstr "Could not connect"
-
-#: src/protocols/gg/gg.c:454
+msgid "Your buddylist is empty, nothing was written to the file."
+msgstr ""
+
+#: src/protocols/gg/gg.c:143 src/protocols/gg/gg.c:145
+#: src/protocols/gg/gg.c:176
+#, fuzzy
+msgid "Couldn't open file"
+msgstr "Cannot send file"
+
+#: src/protocols/gg/gg.c:156
+#, fuzzy
+msgid "Buddylist saved successfully!"
+msgstr "Password changed successfully"
+
+#: src/protocols/gg/gg.c:178
+#, fuzzy
+msgid "Could't open file"
+msgstr "Cannot send file"
+
+#: src/protocols/gg/gg.c:199
+#, fuzzy
+msgid "Load Buddylist..."
+msgstr "_Alias Buddy..."
+
+#: src/protocols/gg/gg.c:200
+#, fuzzy
+msgid "Buddylist loaded successfully!"
+msgstr "Password changed successfully"
+
+#: src/protocols/gg/gg.c:211
+#, fuzzy
+msgid "Save buddylist..."
+msgstr "Send Buddy List"
+
+#: src/protocols/gg/gg.c:254
+msgid "Fill in the registration fields."
+msgstr ""
+
+#: src/protocols/gg/gg.c:259
+#, fuzzy
+msgid "Passwords do not match."
+msgstr "New passwords do not match."
+
+#: src/protocols/gg/gg.c:266
+#, fuzzy
+msgid "Unable to register new account. Error occurred.\n"
+msgstr "Unable to create new connection."
+
+#: src/protocols/gg/gg.c:279
+msgid "New Gadu-Gadu Account Registered"
+msgstr ""
+
+#: src/protocols/gg/gg.c:280
+#, fuzzy
+msgid "Registration completed successfully!"
+msgstr "Registration Successful"
+
+#: src/protocols/gg/gg.c:401
+#, fuzzy
+msgid "Last name"
+msgstr "Last name:"
+
+#: src/protocols/gg/gg.c:405
+#, fuzzy
+msgid "First name"
+msgstr "First name:"
+
+#: src/protocols/gg/gg.c:409 src/protocols/gg/gg.c:1664
+#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:698
+#: src/protocols/jabber/buddy.c:1341 src/protocols/jabber/jabber.c:648
+#: src/protocols/msn/msn.c:1394 src/protocols/silc/buddy.c:1480
+#: src/protocols/silc/ops.c:822 src/protocols/silc/ops.c:965
+#: src/protocols/silc/ops.c:1114 src/protocols/yahoo/yahoo_profile.c:1000
+msgid "Nickname"
+msgstr "Nickname"
+
+#: src/protocols/gg/gg.c:413 src/protocols/jabber/jabber.c:668
+#: src/protocols/oscar/oscar.c:5998 src/protocols/oscar/oscar.c:6006
+msgid "City"
+msgstr "City"
+
+#: src/protocols/gg/gg.c:417
+msgid "Year of birth"
+msgstr ""
+
+#: src/protocols/gg/gg.c:426
+#, fuzzy
+msgid "Only online"
+msgstr "Online"
+
+#: src/protocols/gg/gg.c:430 src/protocols/gg/gg.c:431
+#: src/protocols/gg/gg.c:1509
+#, fuzzy
+msgid "Find buddies"
+msgstr "Dim i_dle buddies"
+
+#: src/protocols/gg/gg.c:432
+#, fuzzy
+msgid "Please, enter your search criteria below"
+msgstr "Please enter your new password"
+
+#: src/protocols/gg/gg.c:465
+msgid "Fill in the fields."
+msgstr ""
+
+#: src/protocols/gg/gg.c:476
+msgid "Your current password is different from the one that you specified."
+msgstr ""
+
+#: src/protocols/gg/gg.c:491
+#, fuzzy
+msgid "Unable to change password. Error occured.\n"
+msgstr "Unable to change Gadu-Gadu password"
+
+#: src/protocols/gg/gg.c:500
+#, fuzzy
+msgid "Change password for the Gadu-Gadu account"
+msgstr "Change password for %s"
+
+#: src/protocols/gg/gg.c:501
+#, fuzzy
+msgid "Password was changed successfully!"
+msgstr "Password changed successfully"
+
+#: src/protocols/gg/gg.c:535
+#, fuzzy
+msgid "Token Error"
+msgstr "Unknown Error"
+
+#: src/protocols/gg/gg.c:536
+#, fuzzy
+msgid "Unable to fetch the token.\n"
+msgstr "Unable to fetch room list."
+
+#: src/protocols/gg/gg.c:551
+#, fuzzy
+msgid "Current password"
+msgstr "Incorrect password."
+
+#: src/protocols/gg/gg.c:555 src/protocols/gg/gg.c:1475
+#: src/protocols/jabber/jabber.c:632 src/protocols/jabber/jabber.c:1150
+msgid "Password"
+msgstr "Password"
+
+#: src/protocols/gg/gg.c:559 src/protocols/gg/gg.c:1479
+#, fuzzy
+msgid "Password (retype)"
+msgstr "Password sent"
+
+#: src/protocols/gg/gg.c:563 src/protocols/gg/gg.c:1483
+#, fuzzy
+msgid "Enter current token"
+msgstr "%s not currently logged in."
+
+#. original size: 60x24
+#: src/protocols/gg/gg.c:568 src/protocols/gg/gg.c:1488
+#, fuzzy
+msgid "Current token"
+msgstr "Currently on"
+
+#: src/protocols/gg/gg.c:574
+#, fuzzy
+msgid "Please, enter your current password and your new password for UIN: "
+msgstr "Please enter your current password and your new password."
+
+#: src/protocols/gg/gg.c:578 src/protocols/gg/gg.c:579
+#, fuzzy
+msgid "Change Gadu-Gadu Password"
+msgstr "Unable to change Gadu-Gadu password"
+
+#: src/protocols/gg/gg.c:649
+#, fuzzy, c-format
+msgid "Select a chat for buddy: %s"
+msgstr "Remove the chat from your buddy list"
+
+#: src/protocols/gg/gg.c:651 src/protocols/gg/gg.c:652
+#, fuzzy
+msgid "Add to chat..."
+msgstr "Add a C_hat"
+
+#: src/protocols/gg/gg.c:812
 msgid "Unable to read socket"
 msgstr "Unable to read socket"
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-#: src/protocols/gg/gg.c:674 src/protocols/icq/gaim_icq.c:343
-#: src/protocols/napster/napster.c:486 src/protocols/napster/napster.c:517
-#: src/protocols/toc/toc.c:170 src/protocols/yahoo/yahoo.c:2407
-#: src/protocols/yahoo/yahoo.c:2436 src/protocols/yahoo/yahoo.c:2499
-#: 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:690
-msgid "Reading data"
-msgstr "Reading data"
-
-#: src/protocols/gg/gg.c:693
-msgid "Balancer handshake"
-msgstr "Balancer handshake"
-
-#: src/protocols/gg/gg.c:696
-msgid "Reading server key"
-msgstr "Reading server key"
-
-#: src/protocols/gg/gg.c:699
-msgid "Exchanging key hash"
-msgstr "Exchanging key hash"
-
-#: 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: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:775
-msgid "Unable to ping server"
-msgstr "Unable to ping server"
-
-#: src/protocols/gg/gg.c:787
-msgid "Send as message"
-msgstr "Send as message"
-
-#: src/protocols/gg/gg.c:792
-msgid "Looking up GG server"
-msgstr "Looking up GG server"
-
-#: src/protocols/gg/gg.c:795
-msgid "Invalid Gadu-Gadu UIN specified"
-msgstr "Invalid Gadu-Gadu UIN specified"
-
-#: 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:919
-msgid "Couldn't get search results"
-msgstr "Couldn't get search results"
-
-#: src/protocols/gg/gg.c:924
-msgid "Gadu-Gadu Search Engine"
-msgstr "Gadu-Gadu Search Engine"
-
-#: src/protocols/gg/gg.c:950
-msgid "Active"
-msgstr "Active"
-
-#: src/protocols/gg/gg.c:955 src/protocols/oscar/oscar.c:5191
-msgid "UIN"
-msgstr "UIN"
-
-#. First Name
-#: src/protocols/gg/gg.c:959 src/protocols/jabber/jabber.c:624
-#: src/protocols/oscar/oscar.c:5202 src/protocols/silc/ops.c:808
-#: src/protocols/trepia/trepia.c:268
-msgid "First Name"
-msgstr "Forename"
-
-#. Last Name
-#: src/protocols/gg/gg.c:964 src/protocols/jabber/jabber.c:629
-#: src/protocols/oscar/oscar.c:5203 src/protocols/trepia/trepia.c:275
-msgid "Last Name"
-msgstr "Surname"
-
-#: src/protocols/gg/gg.c:968 src/protocols/gg/gg.c:1712
-#: src/protocols/irc/msgs.c:219 src/protocols/oscar/oscar.c:5192
-#: src/protocols/silc/ops.c:1204
-msgid "Nick"
-msgstr "Nick"
-
-#: src/protocols/gg/gg.c:975 src/protocols/gg/gg.c:978
-msgid "Birth Year"
-msgstr "Birth Year"
-
-#: 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:992 src/protocols/jabber/jabber.c:639
-#: src/protocols/oscar/oscar.c:5246 src/protocols/oscar/oscar.c:5254
-#: src/protocols/trepia/trepia.c:332 src/protocols/trepia/trepia.c:411
-msgid "City"
-msgstr "City"
-
-#: 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:1043
-msgid "Couldn't Import Buddy List from Server"
-msgstr "Couldn't Import Buddy List from Server"
-
-#: 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: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:1121
-msgid "Buddy List successfully deleted from Gadu-Gadu server"
-msgstr "Buddy List successfully deleted from Gadu-Gadu server"
+#: src/protocols/gg/gg.c:959
+msgid "Gadu-Gadu Public Directory"
+msgstr ""
+
+#: src/protocols/gg/gg.c:960
+#, fuzzy
+msgid "Search results"
+msgstr "Search Results"
+
+#. 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:1087 src/protocols/jabber/buddy.c:1089
+#: src/protocols/napster/napster.c:578 src/protocols/oscar/oscar.c:713
+#: src/protocols/yahoo/yahoo.c:2635 src/protocols/zephyr/zephyr.c:2252
+msgid "Online"
+msgstr "Online"
+
+#. type = gaim_status_type_new_with_attrs(GAIM_STATUS_UNAVAILABLE, "not-available", "Not Available",
+#. TRUE, TRUE, FALSE, "message", _("Message"),
+#. gaim_value_new(GAIM_TYPE_STRING), NULL);
+#. types = g_list_append(types, type);
+#: src/protocols/gg/gg.c:1106 src/protocols/msn/msn.c:585
+#: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2828
+#: src/protocols/novell/novell.c:2962 src/protocols/novell/novell.c:3044
+#: src/protocols/silc/buddy.c:1421 src/protocols/silc/silc.c:54
+#: src/protocols/yahoo/yahoo.c:2613 src/protocols/yahoo/yahoo.c:3209
+msgid "Busy"
+msgstr "Busy"
+
+#: src/protocols/gg/gg.c:1111 src/protocols/msn/msn.c:554
+msgid "Blocked"
+msgstr "Blocked"
 
 #: 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:1138
-msgid "Password changed successfully"
-msgstr "Password changed successfully"
-
-#: src/protocols/gg/gg.c:1145
-msgid "Password couldn't be changed"
-msgstr "Password couldn't be changed"
-
-#: 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:1265
-msgid ""
-"Gaim was unable to complete your request due to a problem communicating with "
-"the Gadu-Gadu HTTP server.  Please try again later."
-msgstr ""
-"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:1294
-msgid "Unable to import Gadu-Gadu buddy list"
-msgstr "Unable to import Gadu-Gadu buddy list"
-
-#: src/protocols/gg/gg.c:1295
-msgid ""
-"Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
-"again later."
-msgstr ""
-"Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
-"again later."
-
-#: src/protocols/gg/gg.c:1368
-msgid "Couldn't export buddy list"
-msgstr "Couldn't export buddy list"
-
-#: 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:1391
-msgid "Unable to delete Gadu-Gadu buddy list"
-msgstr "Unable to delete Gadu-Gadu buddy list"
-
-#: src/protocols/gg/gg.c:1442
-msgid "Unable to access directory"
-msgstr "Unable to access directory"
-
-#: 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."
-msgstr ""
-"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:1477
-msgid "Unable to change Gadu-Gadu password"
-msgstr "Unable to change Gadu-Gadu password"
-
-#: 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."
-msgstr ""
-"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:1494
-msgid "Directory Search"
-msgstr "Directory Search"
-
-#. if (js->protocol_options & CHANGE_PASSWORD) {
-#: src/protocols/gg/gg.c:1499 src/protocols/jabber/jabber.c:1100
-#: src/protocols/toc/toc.c:1591
-msgid "Change Password"
+#, fuzzy
+msgid "Add to chat"
+msgstr "Add Chat"
+
+#: src/protocols/gg/gg.c:1133
+#, fuzzy
+msgid "Unblock"
+msgstr "Block"
+
+#: src/protocols/gg/gg.c:1149
+#, fuzzy
+msgid "Chat _name:"
+msgstr "Last name:"
+
+#: src/protocols/gg/gg.c:1182
+#, fuzzy
+msgid "Connection failed."
+msgstr "Connection failed"
+
+#: src/protocols/gg/gg.c:1356
+#, fuzzy
+msgid "Chat error"
+msgstr "Read error"
+
+#: src/protocols/gg/gg.c:1357
+#, fuzzy
+msgid "This chat name is already in use"
+msgstr "That file already exists"
+
+#: src/protocols/gg/gg.c:1434
+#, fuzzy
+msgid "Not connected to the server."
+msgstr "You were disconnected from the server."
+
+#: src/protocols/gg/gg.c:1455
+msgid "Token Error: Unable to fetch the token.\n"
+msgstr ""
+
+#: src/protocols/gg/gg.c:1471
+#, fuzzy
+msgid "e-Mail"
+msgstr "E-Mail"
+
+#: src/protocols/gg/gg.c:1494 src/protocols/gg/gg.c:1495
+#, fuzzy
+msgid "Register New Gadu-Gadu Account"
+msgstr "Register New Jabber Account"
+
+#: src/protocols/gg/gg.c:1496
+msgid "Please, fill in the following fields"
+msgstr ""
+
+#: src/protocols/gg/gg.c:1514
+#, fuzzy
+msgid "Change password"
 msgstr "Change Password"
 
-#: src/protocols/gg/gg.c:1503
-msgid "Import Buddy List from Server"
-msgstr "Import Buddy List from Server"
-
-#: src/protocols/gg/gg.c:1507
-msgid "Export Buddy List to Server"
+#: src/protocols/gg/gg.c:1519
+#, fuzzy
+msgid "Upload buddylist to Server"
 msgstr "Export Buddy List to Server"
 
-#: src/protocols/gg/gg.c:1511
-msgid "Delete Buddy List from Server"
+#: src/protocols/gg/gg.c:1522
+#, fuzzy
+msgid "Download buddylist from Server"
+msgstr "Delete Buddy List from Server"
+
+#: src/protocols/gg/gg.c:1525
+#, fuzzy
+msgid "Delete buddylist from Server"
 msgstr "Delete Buddy List from Server"
 
-#: src/protocols/gg/gg.c:1544
-msgid "Unable to access user profile."
-msgstr "Unable to access user profile."
-
-#: 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."
-msgstr ""
-"Gaim was unable to access this user's profile due to an error connecting to "
-"the directory server.  Please try again later."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: src/protocols/gg/gg.c:1691 src/protocols/gg/gg.c:1693
+#: src/protocols/gg/gg.c:1528
+msgid "Save buddylist to file"
+msgstr ""
+
+#: src/protocols/gg/gg.c:1531
+#, fuzzy
+msgid "Load buddylist from file"
+msgstr "Import Buddy List from Server"
+
+#. magic
+#. major_version
+#. minor_version
+#. plugin type
+#. ui_requirement
+#. flags
+#. dependencies
+#. priority
+#. id
+#. name
+#. version
+#: src/protocols/gg/gg.c:1616
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu Protocol Plugin"
 
-#: src/protocols/icq/gaim_icq.c:223
-msgid "Gaim encountered an error communicating with the ICQ server."
-msgstr "Gaim encountered an error communicating with the ICQ server."
-
-#: src/protocols/icq/gaim_icq.c:293
-#, c-format
-msgid "The user %s (%s%s%s%s%s) wants you to authorize them."
-msgstr "The user %s (%s%s%s%s%s) wants you to authorise 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:3887
-#: src/protocols/oscar/oscar.c:6452 src/protocols/yahoo/yahoo.c:1080
-msgid "Authorize"
-msgstr "Authorise"
-
-#: src/protocols/icq/gaim_icq.c:296 src/protocols/jabber/presence.c:301
-#: src/protocols/msn/userlist.c:104 src/protocols/oscar/oscar.c:3889
-#: src/protocols/oscar/oscar.c:6453 src/protocols/yahoo/yahoo.c:1082
-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
+#. summary
+#: src/protocols/gg/gg.c:1617
+msgid "Polish popular IM"
+msgstr ""
+
+#: src/protocols/gg/gg.c:1664
+#, fuzzy
+msgid "Gadu-Gadu User"
+msgstr "Gadu-Gadu Search Engine"
+
+#: src/protocols/irc/cmds.c:43 src/protocols/silc/silc.c:1313
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Unknown command: %s"
 
-#: src/protocols/irc/cmds.c:464 src/protocols/jabber/chat.c:576
-#: src/protocols/silc/silc.c:1019
+#: src/protocols/irc/cmds.c:463 src/protocols/jabber/chat.c:592
+#: src/protocols/silc/silc.c:1021
 #, c-format
 msgid "current topic is: %s"
 msgstr "current topic is: %s"
 
-#: src/protocols/irc/cmds.c:468 src/protocols/jabber/chat.c:580
-#: src/protocols/silc/silc.c:1023
+#: src/protocols/irc/cmds.c:467 src/protocols/jabber/chat.c:596
+#: src/protocols/silc/silc.c:1025
 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
-msgid "File Transfer Aborted"
-msgstr "File Transfer Aborted"
+#: src/protocols/irc/dcc_send.c:272 src/protocols/yahoo/yahoo_filexfer.c:173
+#: src/protocols/yahoo/yahoo_filexfer.c:182
+#: src/protocols/yahoo/yahoo_filexfer.c:191
+#, fuzzy
+msgid "File Transfer Failed"
+msgstr "File transfer cancelled"
 
 #: 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:76
+#: src/protocols/irc/irc.c:79
 msgid "Error displaying MOTD"
 msgstr "Error displaying MOTD"
 
-#: src/protocols/irc/irc.c:76
+#: src/protocols/irc/irc.c:79
 msgid "No MOTD available"
 msgstr "No MOTD available"
 
-#: src/protocols/irc/irc.c:77
+#: src/protocols/irc/irc.c:80
 msgid "There is no MOTD associated with this connection."
 msgstr "There is no MOTD associated with this connection."
 
-#: src/protocols/irc/irc.c:80
+#: src/protocols/irc/irc.c:83
 #, c-format
 msgid "MOTD for %s"
 msgstr "MOTD for %s"
 
-#: src/protocols/irc/irc.c:94 src/protocols/irc/irc.c:406
+#: src/protocols/irc/irc.c:103 src/protocols/irc/irc.c:522
+#: src/protocols/irc/irc.c:544
 msgid "Server has disconnected"
 msgstr "Server has disconnected"
 
-#: src/protocols/irc/irc.c:159
+#: src/protocols/irc/irc.c:188
 msgid "View MOTD"
 msgstr "View MOTD"
 
-#: src/protocols/irc/irc.c:181 src/protocols/silc/chat.c:32
+#: src/protocols/irc/irc.c:200 src/protocols/silc/chat.c:32
 msgid "_Channel:"
 msgstr "_Channel:"
 
-#: src/protocols/irc/irc.c:186 src/protocols/jabber/chat.c:56
+#: src/protocols/irc/irc.c:206 src/protocols/jabber/chat.c:59
 msgid "_Password:"
 msgstr "_Password:"
 
-#: src/protocols/irc/irc.c:218
+#: src/protocols/irc/irc.c:238
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC nicks may not contain whitespace"
 
-#. connect to the server
-#: src/protocols/irc/irc.c:238 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:1760
-#: src/protocols/trepia/trepia.c:1065 src/protocols/yahoo/yahoo.c:2641
-#: src/protocols/zephyr/zephyr.c:1458
-msgid "Connecting"
-msgstr "Connecting"
-
-#: src/protocols/irc/irc.c:245
+#: src/protocols/irc/irc.c:266 src/protocols/jabber/jabber.c:433
+#: src/protocols/jabber/jabber.c:770
+msgid "SSL support unavailable"
+msgstr "SSL support unavailable"
+
+#: src/protocols/irc/irc.c:277
 msgid "Couldn't create socket"
 msgstr "Couldn't create socket"
 
-#: src/protocols/irc/irc.c:260 src/protocols/jabber/jabber.c:304
-#: src/protocols/oscar/oscar.c:1691 src/protocols/oscar/oscar.c:1756
+#: src/protocols/irc/irc.c:348 src/protocols/jabber/jabber.c:306
+#: src/protocols/oscar/oscar.c:1744 src/protocols/oscar/oscar.c:1820
 msgid "Couldn't connect to host"
 msgstr "Couldn't connect to host"
 
-#: src/protocols/irc/irc.c:403 src/protocols/trepia/trepia.c:927
+#: src/protocols/irc/irc.c:373 src/protocols/jabber/jabber.c:333
+msgid "Connection Failed"
+msgstr "Connection Failed"
+
+#: src/protocols/irc/irc.c:376 src/protocols/jabber/jabber.c:336
+msgid "SSL Handshake Failed"
+msgstr "SSL Handshake Failed"
+
+#: src/protocols/irc/irc.c:519 src/protocols/irc/irc.c:541
 msgid "Read error"
 msgstr "Read error"
 
-#: src/protocols/irc/irc.c:568 src/protocols/silc/chat.c:1373
-#: src/protocols/yahoo/yahoochat.c:1444
+#: src/protocols/irc/irc.c:690 src/protocols/silc/chat.c:1388
+#: src/protocols/yahoo/yahoochat.c:1376
 msgid "Users"
 msgstr "Users"
 
-#: src/protocols/irc/irc.c:571 src/protocols/silc/chat.c:1376
-#: src/protocols/silc/ops.c:1166 src/protocols/yahoo/yahoochat.c:1453
+#: src/protocols/irc/irc.c:693 src/protocols/silc/chat.c:1391
+#: src/protocols/silc/ops.c:1166 src/protocols/yahoo/yahoochat.c:1385
 msgid "Topic"
 msgstr "Topic"
 
-#: src/protocols/irc/irc.c:608
+#: src/protocols/irc/irc.c:730
 msgid "IRC"
 msgstr "IRC"
 
-#: src/protocols/irc/irc.c:612
+#: src/protocols/irc/irc.c:734
 msgid "Quit message"
 msgstr "Quit message"
 
@@ -5318,171 +5081,175 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:699
+#: src/protocols/irc/irc.c:820
 msgid "IRC Protocol Plugin"
 msgstr "IRC Protocol Plugin"
 
 #. *  summary
-#: src/protocols/irc/irc.c:700
+#: src/protocols/irc/irc.c:821
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "The IRC Protocol Plugin that Sucks Less"
 
-#: src/protocols/irc/irc.c:719 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
+#: src/protocols/irc/irc.c:840 src/protocols/irc/msgs.c:233
+#: src/protocols/jabber/jabber.c:1708 src/protocols/napster/napster.c:707
+#: src/protocols/silc/ops.c:1028 src/protocols/silc/ops.c:1130
 msgid "Server"
 msgstr "Server"
 
-#: src/protocols/irc/irc.c:722 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
+#: src/protocols/irc/irc.c:843 src/protocols/msn/msn.c:1968
+#: src/protocols/napster/napster.c:712 src/protocols/silc/silc.c:1597
 msgid "Port"
 msgstr "Port"
 
-#: src/protocols/irc/irc.c:725
+#: src/protocols/irc/irc.c:846
 msgid "Encodings"
 msgstr "Encodings"
 
-#: src/protocols/irc/irc.c:728 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
+#: src/protocols/irc/irc.c:849 src/protocols/irc/msgs.c:227
+#: src/protocols/jabber/jabber.c:628 src/protocols/silc/buddy.c:1483
+#: src/protocols/silc/ops.c:975 src/protocols/silc/ops.c:977
+#: src/protocols/silc/ops.c:1124 src/protocols/silc/ops.c:1126
 msgid "Username"
 msgstr "Username"
 
-#: src/protocols/irc/irc.c:731
+#: src/protocols/irc/irc.c:852
 msgid "Real name"
 msgstr "Real name"
 
-#: src/protocols/irc/msgs.c:107
+#: src/protocols/irc/irc.c:855
+#, fuzzy
+msgid "Use SSL"
+msgstr "SSL"
+
+#: src/protocols/irc/msgs.c:105
 msgid "Bad mode"
 msgstr "Bad mode"
 
-#: src/protocols/irc/msgs.c:120
+#: src/protocols/irc/msgs.c:116
 #, c-format
 msgid "You are banned from %s."
 msgstr "You are banned from %s."
 
-#: src/protocols/irc/msgs.c:121
+#: src/protocols/irc/msgs.c:117
 msgid "Banned"
 msgstr "Banned"
 
-#: src/protocols/irc/msgs.c:139
+#: src/protocols/irc/msgs.c:134
 #, c-format
 msgid "Cannot ban %s: banlist is full"
 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
+#: src/protocols/irc/msgs.c:213 src/protocols/irc/msgs.c:233
+#: src/protocols/irc/msgs.c:246
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: src/protocols/irc/msgs.c:222
+#: src/protocols/irc/msgs.c:213 src/protocols/oscar/oscar.c:5944
+#: src/protocols/silc/ops.c:1198
+msgid "Nick"
+msgstr "Nick"
+
+#: src/protocols/irc/msgs.c:216
 msgid " <i>(ircop)</i>"
 msgstr " <i>(ircop)</i>"
 
-#: src/protocols/irc/msgs.c:223
+#: src/protocols/irc/msgs.c:217
 msgid " <i>(identified)</i>"
 msgstr " <i>(identified)</i>"
 
-#: 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
+#: src/protocols/irc/msgs.c:221 src/protocols/irc/msgs.c:227
+#: src/protocols/irc/msgs.c:228 src/protocols/irc/msgs.c:239
+#: src/protocols/yahoo/yahoo_profile.c:660
 #, c-format
 msgid "<b>%s:</b> %s<br>"
 msgstr "<b>%s:</b> %s<br>"
 
-#: 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
+#: src/protocols/irc/msgs.c:228 src/protocols/silc/ops.c:969
+#: src/protocols/silc/ops.c:1118 src/protocols/yahoo/yahoo_profile.c:1005
 msgid "Realname"
 msgstr "Realname"
 
-#: src/protocols/irc/msgs.c:245 src/protocols/silc/ops.c:1039
+#: src/protocols/irc/msgs.c:239 src/protocols/silc/ops.c:1041
 msgid "Currently on"
 msgstr "Currently on"
 
-#: src/protocols/irc/msgs.c:250
+#: src/protocols/irc/msgs.c:244
 #, c-format
 msgid "<b>Idle for:</b> %s<br>"
 msgstr "<b>Idle for:</b> %s<br>"
 
-#: src/protocols/irc/msgs.c:252
+#: src/protocols/irc/msgs.c:246
 msgid "Online since"
 msgstr "Online since"
 
-#: src/protocols/irc/msgs.c:255
+#: src/protocols/irc/msgs.c:249
 msgid "<br><b>Defining adjective:</b> Glorious<br>"
 msgstr "<br><b>Defining adjective:</b> Glorious<br>"
 
-#: src/protocols/irc/msgs.c:262
-#, c-format
-msgid "Buddy Information for %s"
-msgstr "Buddy Information for %s"
-
-#: src/protocols/irc/msgs.c:325
+#: src/protocols/irc/msgs.c:317
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s has changed the topic to: %s"
 
-#: src/protocols/irc/msgs.c:330
+#: src/protocols/irc/msgs.c:322
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "The topic for %s is: %s"
 
-#: src/protocols/irc/msgs.c:348
+#: src/protocols/irc/msgs.c:339
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Unknown message '%s'"
 
-#: src/protocols/irc/msgs.c:349
+#: src/protocols/irc/msgs.c:340
 msgid "Unknown message"
 msgstr "Unknown message"
 
-#: src/protocols/irc/msgs.c:349
+#: src/protocols/irc/msgs.c:340
 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:373
+#: src/protocols/irc/msgs.c:363
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Users on %s: %s"
 
-#: src/protocols/irc/msgs.c:473
+#: src/protocols/irc/msgs.c:482
 msgid "Time Response"
 msgstr "Time Response"
 
-#: src/protocols/irc/msgs.c:474
+#: src/protocols/irc/msgs.c:483
 msgid "The IRC server's local time is:"
 msgstr "The IRC server's local time is:"
 
-#: src/protocols/irc/msgs.c:488
+#: src/protocols/irc/msgs.c:494
 msgid "No such channel"
 msgstr "No such channel"
 
 #. does this happen?
-#: src/protocols/irc/msgs.c:501
+#: src/protocols/irc/msgs.c:505
 msgid "no such channel"
 msgstr "no such channel"
 
-#: src/protocols/irc/msgs.c:504
+#: src/protocols/irc/msgs.c:508
 msgid "User is not logged in"
 msgstr "User is not logged in"
 
-#: src/protocols/irc/msgs.c:510
+#: src/protocols/irc/msgs.c:513
 msgid "No such nick or channel"
 msgstr "No such nick or channel"
 
-#: src/protocols/irc/msgs.c:531
+#: src/protocols/irc/msgs.c:533
 msgid "Could not send"
 msgstr "Could not send"
 
-#: src/protocols/irc/msgs.c:587
+#: src/protocols/irc/msgs.c:589
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Joining %s requires an invitation."
 
-#: src/protocols/irc/msgs.c:588
+#: src/protocols/irc/msgs.c:590
 msgid "Invitation only"
 msgstr "Invitation only"
 
@@ -5501,16 +5268,7 @@
 msgid "mode (%s %s) by %s"
 msgstr "mode (%s %s) by %s"
 
-#: src/protocols/irc/msgs.c:808
-#, c-format
-msgid "Invalid nickname '%s'"
-msgstr "Invalid nickname '%s'"
-
-#: src/protocols/irc/msgs.c:809
-msgid "Invalid nickname"
-msgstr "Invalid nickname"
-
-#: src/protocols/irc/msgs.c:811 src/protocols/irc/msgs.c:816
+#: src/protocols/irc/msgs.c:805
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
@@ -5518,47 +5276,52 @@
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
 
-#: src/protocols/irc/msgs.c:858
+#: src/protocols/irc/msgs.c:844
 msgid "Cannot change nick"
 msgstr "Cannot change nick"
 
-#: src/protocols/irc/msgs.c:858
+#: src/protocols/irc/msgs.c:844
 msgid "Could not change nick"
 msgstr "Could not change nick"
 
-#: src/protocols/irc/msgs.c:880
+#: src/protocols/irc/msgs.c:865
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "You have parted the channel%s%s"
 
-#: src/protocols/irc/msgs.c:922
+#: src/protocols/irc/msgs.c:907
 msgid "Error: invalid PONG from server"
 msgstr "Error: invalid PONG from server"
 
-#: src/protocols/irc/msgs.c:924
+#: src/protocols/irc/msgs.c:909
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING reply -- Lag: %lu seconds"
 
-#: src/protocols/irc/msgs.c:999
+#: src/protocols/irc/msgs.c:984
 #, c-format
 msgid "Cannot join %s:"
 msgstr "Cannot join %s:"
 
-#: src/protocols/irc/msgs.c:1001 src/protocols/silc/ops.c:912
+#: src/protocols/irc/msgs.c:985 src/protocols/silc/ops.c:914
 msgid "Cannot join channel"
 msgstr "Cannot join channel"
 
-#: src/protocols/irc/msgs.c:1038
+#: src/protocols/irc/msgs.c:1019
+#, fuzzy
+msgid "Nick or channel is temporarily unavailable."
+msgstr "The service is temporarily unavailable."
+
+#: src/protocols/irc/msgs.c:1031
 #, c-format
 msgid "Wallops from %s"
 msgstr "Wallops from %s"
 
-#: src/protocols/irc/parse.c:113
+#: src/protocols/irc/parse.c:114
 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:114
+#: src/protocols/irc/parse.c:115
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
@@ -5566,7 +5329,7 @@
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
 
-#: src/protocols/irc/parse.c:115
+#: src/protocols/irc/parse.c:116
 msgid ""
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
@@ -5574,7 +5337,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:116
+#: src/protocols/irc/parse.c:117
 msgid ""
 "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
 "someone, preventing them from speaking if the channel is moderated (+m). You "
@@ -5584,7 +5347,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:117
+#: src/protocols/irc/parse.c:118
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
@@ -5592,7 +5355,7 @@
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
 
-#: src/protocols/irc/parse.c:118
+#: src/protocols/irc/parse.c:119
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -5600,7 +5363,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:119
+#: src/protocols/irc/parse.c:120
 msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -5608,7 +5371,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:120
+#: src/protocols/irc/parse.c:121
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
@@ -5616,7 +5379,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:121
+#: src/protocols/irc/parse.c:122
 msgid ""
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
@@ -5624,11 +5387,11 @@
 "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:122
+#: src/protocols/irc/parse.c:123
 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:123
+#: src/protocols/irc/parse.c:124
 msgid ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
 "or user mode."
@@ -5636,7 +5399,7 @@
 "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:124
+#: src/protocols/irc/parse.c:125
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -5644,15 +5407,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:125
+#: src/protocols/irc/parse.c:126
 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:126 src/protocols/jabber/jabber.c:1448
+#: src/protocols/irc/parse.c:127 src/protocols/jabber/jabber.c:1555
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;new nickname&gt;:  Change your nickname."
 
-#: src/protocols/irc/parse.c:127
+#: src/protocols/irc/parse.c:128
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
@@ -5660,7 +5423,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:128
+#: src/protocols/irc/parse.c:129
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
@@ -5668,7 +5431,7 @@
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
 
-#: src/protocols/irc/parse.c:129
+#: src/protocols/irc/parse.c:130
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
@@ -5676,7 +5439,7 @@
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
 
-#: src/protocols/irc/parse.c:130
+#: src/protocols/irc/parse.c:131
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
@@ -5684,7 +5447,7 @@
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
 
-#: src/protocols/irc/parse.c:131
+#: src/protocols/irc/parse.c:132
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -5692,15 +5455,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:132
+#: src/protocols/irc/parse.c:133
 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
+#: 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:134
+#: 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."
@@ -5708,19 +5471,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:135
+#: src/protocols/irc/parse.c:136
 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:136
+#: src/protocols/irc/parse.c:137
 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:137
+#: src/protocols/irc/parse.c:138
 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:138
+#: src/protocols/irc/parse.c:139
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
@@ -5728,7 +5491,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:139
+#: src/protocols/irc/parse.c:140
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
@@ -5736,31 +5499,31 @@
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
 
-#: src/protocols/irc/parse.c:140
+#: src/protocols/irc/parse.c:141
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr "whois [server] &lt;nick&gt;:  Get information on a user."
 
-#: src/protocols/irc/parse.c:421
+#: src/protocols/irc/parse.c:422
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Reply time from %s: %lu seconds"
 
-#: src/protocols/irc/parse.c:422
+#: src/protocols/irc/parse.c:423
 msgid "PONG"
 msgstr "PONG"
 
-#: src/protocols/irc/parse.c:422
+#: src/protocols/irc/parse.c:423
 msgid "CTCP PING reply"
 msgstr "CTCP PING reply"
 
-#: src/protocols/irc/parse.c:525 src/protocols/irc/parse.c:529
-#: src/protocols/oscar/oscar.c:1588 src/protocols/toc/toc.c:188
-#: src/protocols/toc/toc.c:596 src/protocols/toc/toc.c:612
-#: src/protocols/toc/toc.c:689
+#: src/protocols/irc/parse.c:526 src/protocols/irc/parse.c:530
+#: src/protocols/oscar/oscar.c:1653 src/protocols/toc/toc.c:190
+#: src/protocols/toc/toc.c:688 src/protocols/toc/toc.c:704
+#: src/protocols/toc/toc.c:780
 msgid "Disconnected."
 msgstr "Disconnected."
 
-#: src/protocols/jabber/auth.c:52
+#: src/protocols/jabber/auth.c:51
 msgid ""
 "Server requires TLS/SSL for login.  Select \"Use TLS if available\" in "
 "account properties"
@@ -5768,20 +5531,26 @@
 "Server requires TLS/SSL for login.  Select \"Use TLS if available\" in "
 "account properties"
 
-#: src/protocols/jabber/auth.c:54
+#: src/protocols/jabber/auth.c:53
 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:115
+#: src/protocols/jabber/auth.c:114
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "Server requires plaintext authentication over an unencrypted stream"
 
-#: src/protocols/jabber/auth.c:164 src/protocols/jabber/auth.c:165
-#: src/protocols/jabber/auth.c:242 src/protocols/jabber/auth.c:243
+#: 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:110
+msgid "Invalid response from server."
+msgstr "Invalid response from server."
+
+#: src/protocols/jabber/auth.c:163 src/protocols/jabber/auth.c:164
+#: src/protocols/jabber/auth.c:244 src/protocols/jabber/auth.c:245
 msgid "Plaintext Authentication"
 msgstr "Plaintext Authentication"
 
-#: src/protocols/jabber/auth.c:166 src/protocols/jabber/auth.c:244
+#: src/protocols/jabber/auth.c:165 src/protocols/jabber/auth.c:246
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
@@ -5789,105 +5558,90 @@
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
 
-#: src/protocols/jabber/auth.c:174 src/protocols/jabber/auth.c:252
+#: src/protocols/jabber/auth.c:173 src/protocols/jabber/auth.c:254
 msgid "Server does not use any supported authentication method"
 msgstr "Server does not use any supported authentication method"
 
-#: src/protocols/jabber/auth.c:390
+#: src/protocols/jabber/auth.c:396
 msgid "Invalid challenge from server"
 msgstr "Invalid challenge from server"
 
-#: src/protocols/jabber/buddy.c:246 src/protocols/jabber/buddy.c:613
-#: src/protocols/silc/ops.c:804
+#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:667
+#: src/protocols/silc/ops.c:806
 msgid "Full Name"
 msgstr "Full Name"
 
-#: src/protocols/jabber/buddy.c:247 src/protocols/jabber/buddy.c:626
-#: src/protocols/silc/ops.c:816
+#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:680
+#: src/protocols/silc/ops.c:818
 msgid "Family Name"
 msgstr "Family Name"
 
-#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:630
+#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/buddy.c:684
 msgid "Given Name"
 msgstr "Given Name"
 
-#: 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:250 src/protocols/jabber/jabber.c:659
+#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/jabber.c:688
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/buddy.c:672
+#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:726
 msgid "Street Address"
 msgstr "Street Address"
 
-#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:668
+#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:722
 msgid "Extended Address"
 msgstr "Extended Address"
 
-#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:676
+#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:730
 msgid "Locality"
 msgstr "Locality"
 
-#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:680
+#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:734
 msgid "Region"
 msgstr "Region"
 
-#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:684
-#: src/protocols/jabber/jabber.c:649
+#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:738
+#: src/protocols/jabber/jabber.c:678
 msgid "Postal Code"
 msgstr "Postal Code"
 
-#. Country
-#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:689
-#: src/protocols/trepia/trepia.c:340 src/protocols/trepia/trepia.c:417
+#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:743
 msgid "Country"
 msgstr "Country"
 
-#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:700
-#: src/protocols/jabber/buddy.c:707
+#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:754
+#: src/protocols/jabber/buddy.c:761
 msgid "Telephone"
 msgstr "Telephone"
 
-#: 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
+#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:772
+#: src/protocols/jabber/buddy.c:780 src/protocols/silc/silc.c:661
+#: src/protocols/silc/util.c:511 src/protocols/yahoo/yahoo_profile.c:995
 msgid "Email"
 msgstr "Email"
 
-#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:741
+#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:795
 msgid "Organization Name"
 msgstr "Organisation Name"
 
-#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:745
+#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:799
 msgid "Organization Unit"
 msgstr "Organisation Unit"
 
-#: 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
+#: src/protocols/jabber/buddy.c:265 src/protocols/jabber/buddy.c:808
 msgid "Role"
 msgstr "Role"
 
-#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:647
-#: src/protocols/oscar/oscar.c:5227
+#: src/protocols/jabber/buddy.c:266 src/protocols/jabber/buddy.c:701
+#: src/protocols/oscar/oscar.c:5979
 msgid "Birthday"
 msgstr "Birthday"
 
-#: src/protocols/jabber/buddy.c:509 src/protocols/jabber/buddy.c:510
+#: src/protocols/jabber/buddy.c:567 src/protocols/jabber/buddy.c:568
 msgid "Edit Jabber vCard"
 msgstr "Edit Jabber vCard"
 
-#: src/protocols/jabber/buddy.c:511
+#: src/protocols/jabber/buddy.c:569
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
@@ -5895,593 +5649,632 @@
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
 
-#: src/protocols/jabber/buddy.c:556
+#: src/protocols/jabber/buddy.c:616
 msgid "Jabber ID"
 msgstr "Jabber ID"
 
-#: 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:731
-#: src/protocols/oscar/oscar.c:737 src/protocols/oscar/oscar.c:739
-#: src/protocols/yahoo/yahoo.c:2903
-msgid "Status"
-msgstr "Status"
-
-#: src/protocols/jabber/buddy.c:634 src/protocols/silc/ops.c:812
+#: src/protocols/jabber/buddy.c:642 src/protocols/jabber/jabber.c:1711
+msgid "Resource"
+msgstr "Resource"
+
+#: src/protocols/jabber/buddy.c:688 src/protocols/silc/ops.c:814
 msgid "Middle Name"
 msgstr "Middle Name"
 
-#: src/protocols/jabber/buddy.c:652 src/protocols/jabber/jabber.c:634
-#: src/protocols/oscar/oscar.c:5245 src/protocols/oscar/oscar.c:5253
-#: src/protocols/silc/ops.c:848
+#: src/protocols/jabber/buddy.c:706 src/protocols/jabber/jabber.c:663
+#: src/protocols/oscar/oscar.c:5997 src/protocols/oscar/oscar.c:6005
+#: src/protocols/silc/ops.c:850
 msgid "Address"
 msgstr "Address"
 
-#: src/protocols/jabber/buddy.c:664
+#: src/protocols/jabber/buddy.c:718
 msgid "P.O. Box"
 msgstr "P.O. Box"
 
-#: src/protocols/jabber/buddy.c:770
+#: src/protocols/jabber/buddy.c:832
 msgid "Photo"
 msgstr "Photo"
 
-#: src/protocols/jabber/buddy.c:770
+#: src/protocols/jabber/buddy.c:832
 msgid "Logo"
 msgstr "Logo"
 
-#: src/protocols/jabber/buddy.c:786
-msgid "Jabber Profile"
-msgstr "Jabber Profile"
-
-#: src/protocols/jabber/buddy.c:941
+#: src/protocols/jabber/buddy.c:1035
 msgid "Un-hide From"
 msgstr "Un-hide From"
 
-#: src/protocols/jabber/buddy.c:944
+#: src/protocols/jabber/buddy.c:1038
 msgid "Temporarily Hide From"
 msgstr "Temporarily Hide From"
 
 #. && NOT ME
-#: src/protocols/jabber/buddy.c:951
+#: src/protocols/jabber/buddy.c:1045
 msgid "Cancel Presence Notification"
 msgstr "Cancel Presence Notification"
 
-#: src/protocols/jabber/buddy.c:957
+#: src/protocols/jabber/buddy.c:1051
 msgid "(Re-)Request authorization"
 msgstr "(Re-)Request authorisation"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: src/protocols/jabber/buddy.c:965
+#: src/protocols/jabber/buddy.c:1059
 msgid "Unsubscribe"
 msgstr "Unsubscribe"
 
-#: src/protocols/jabber/chat.c:41 src/protocols/oscar/oscar.c:6523
-#: src/protocols/yahoo/yahoochat.c:1040
+#: src/protocols/jabber/buddy.c:1085 src/protocols/jabber/chat.c:677
+#: src/protocols/jabber/chat.c:688 src/protocols/jabber/jabber.c:1018
+#: src/protocols/silc/ops.c:1235
+msgid "Error"
+msgstr "Error"
+
+#: src/protocols/jabber/buddy.c:1091 src/protocols/jabber/jabber.c:1047
+msgid "Chatty"
+msgstr "Chatty"
+
+#: src/protocols/jabber/buddy.c:1095 src/protocols/jabber/jabber.c:1063
+#: src/status.c:159
+msgid "Extended Away"
+msgstr "Extended Away"
+
+#: src/protocols/jabber/buddy.c:1097 src/protocols/jabber/jabber.c:1071
+#: src/protocols/oscar/oscar.c:701 src/protocols/oscar/oscar.c:7785
+msgid "Do Not Disturb"
+msgstr "Do Not Disturb"
+
+#: src/protocols/jabber/buddy.c:1235
+msgid "The following are the results of your search"
+msgstr ""
+
+#: src/protocols/jabber/buddy.c:1327
+msgid "Fill in one or more fields to search for any matching Jabber users."
+msgstr ""
+
+#: src/protocols/jabber/buddy.c:1331 src/protocols/jabber/jabber.c:653
+#: src/protocols/oscar/oscar.c:5954 src/protocols/silc/ops.c:810
+msgid "First Name"
+msgstr "Forename"
+
+#: src/protocols/jabber/buddy.c:1336 src/protocols/jabber/jabber.c:658
+#: src/protocols/oscar/oscar.c:5955
+msgid "Last Name"
+msgstr "Surname"
+
+#: src/protocols/jabber/buddy.c:1346
+msgid "E-Mail Address"
+msgstr "E-Mail Address"
+
+#: src/protocols/jabber/buddy.c:1355 src/protocols/jabber/buddy.c:1356
+#, fuzzy
+msgid "Search for Jabber users"
+msgstr "Search for a buddy by e-mail address"
+
+#: src/protocols/jabber/buddy.c:1370
+#, fuzzy
+msgid "Invalid Directory"
+msgstr "Invalid error"
+
+#: src/protocols/jabber/buddy.c:1387
+#, fuzzy
+msgid "Enter a User Directory"
+msgstr "Cannot send a directory."
+
+#: src/protocols/jabber/buddy.c:1388
+#, fuzzy
+msgid "Select a user directory to search"
+msgstr "Select a conference server to query"
+
+#: src/protocols/jabber/buddy.c:1391
+#, fuzzy
+msgid "Search Directory"
+msgstr "_Search for:"
+
+#: src/protocols/jabber/chat.c:41 src/protocols/oscar/oscar.c:7312
+#: src/protocols/yahoo/yahoochat.c:979
 msgid "_Room:"
 msgstr "_Room:"
 
-#: src/protocols/jabber/chat.c:46
+#: src/protocols/jabber/chat.c:47
 msgid "_Server:"
 msgstr "_Server:"
 
-#: src/protocols/jabber/chat.c:51
+#: src/protocols/jabber/chat.c:53
 msgid "_Handle:"
 msgstr "_Handle:"
 
-#: src/protocols/jabber/chat.c:212
+#: src/protocols/jabber/chat.c:223
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s is not a valid room name"
 
-#: src/protocols/jabber/chat.c:213
+#: src/protocols/jabber/chat.c:224
 msgid "Invalid Room Name"
 msgstr "Invalid Room Name"
 
-#: src/protocols/jabber/chat.c:218
+#: src/protocols/jabber/chat.c:229
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s is not a valid server name"
 
-#: src/protocols/jabber/chat.c:219 src/protocols/jabber/chat.c:220
+#: src/protocols/jabber/chat.c:230 src/protocols/jabber/chat.c:231
 msgid "Invalid Server Name"
 msgstr "Invalid Server Name"
 
-#: src/protocols/jabber/chat.c:224
+#: src/protocols/jabber/chat.c:235
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s is not a valid room handle"
 
-#: src/protocols/jabber/chat.c:225 src/protocols/jabber/chat.c:226
+#: src/protocols/jabber/chat.c:236 src/protocols/jabber/chat.c:237
 msgid "Invalid Room Handle"
 msgstr "Invalid Room Handle"
 
-#: src/protocols/jabber/chat.c:379
+#: src/protocols/jabber/chat.c:395
 msgid "Configuration error"
 msgstr "Configuration error"
 
-#: src/protocols/jabber/chat.c:388 src/protocols/jabber/chat.c:533
+#: src/protocols/jabber/chat.c:404 src/protocols/jabber/chat.c:549
 msgid "Unable to configure"
 msgstr "Unable to configure"
 
-#: src/protocols/jabber/chat.c:404
+#: src/protocols/jabber/chat.c:420
 msgid "Room Configuration Error"
 msgstr "Room Configuration Error"
 
-#: src/protocols/jabber/chat.c:405
+#: src/protocols/jabber/chat.c:421
 msgid "This room is not capable of being configured"
 msgstr "This room is not capable of being configured"
 
-#: src/protocols/jabber/chat.c:455 src/protocols/jabber/chat.c:524
+#: src/protocols/jabber/chat.c:471 src/protocols/jabber/chat.c:540
 msgid "Registration error"
 msgstr "Registration error"
 
-#: src/protocols/jabber/chat.c:607
+#: src/protocols/jabber/chat.c:628
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "Nick changing not supported in non-MUC chatrooms"
 
-#: 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"
+#: src/protocols/jabber/chat.c:678 src/protocols/jabber/chat.c:689
+#: src/protocols/silc/ops.c:1235
+#, fuzzy
+msgid "Error retrieving room list"
 msgstr "Error retreiving roomlist"
 
-#: src/protocols/jabber/chat.c:711
+#: src/protocols/jabber/chat.c:737
 msgid "Invalid Server"
 msgstr "Invalid Server"
 
-#: src/protocols/jabber/chat.c:749
+#: src/protocols/jabber/chat.c:775
 msgid "Enter a Conference Server"
 msgstr "Enter a Conference Server"
 
-#: src/protocols/jabber/chat.c:750
+#: src/protocols/jabber/chat.c:776
 msgid "Select a conference server to query"
 msgstr "Select a conference server to query"
 
-#: src/protocols/jabber/chat.c:753
+#: src/protocols/jabber/chat.c:779
 msgid "Find Rooms"
 msgstr "Find Rooms"
 
-#: src/protocols/jabber/jabber.c:77
+#: src/protocols/jabber/jabber.c:79
 msgid "Error initializing session"
 msgstr "Error initializing session"
 
-#: 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
+#: src/protocols/jabber/jabber.c:215
 msgid "Write error"
 msgstr "Write error"
 
-#: src/protocols/jabber/jabber.c:251 src/protocols/jabber/jabber.c:271
+#: src/protocols/jabber/jabber.c:253 src/protocols/jabber/jabber.c:273
 msgid "Read Error"
 msgstr "Read Error"
 
-#: 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
+#: src/protocols/jabber/jabber.c:359 src/protocols/jabber/jabber.c:780
+msgid "Unable to create socket"
+msgstr "Unable to create socket"
+
+#: src/protocols/jabber/jabber.c:403 src/protocols/jabber/jabber.c:740
 msgid "Invalid Jabber ID"
 msgstr "Invalid Jabber ID"
 
-#: 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:444
+#: src/protocols/jabber/jabber.c:473
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registration of %s@%s successful"
 
-#: src/protocols/jabber/jabber.c:446 src/protocols/jabber/jabber.c:447
+#: src/protocols/jabber/jabber.c:475 src/protocols/jabber/jabber.c:476
 msgid "Registration Successful"
 msgstr "Registration Successful"
 
-#: src/protocols/jabber/jabber.c:453 src/protocols/jabber/jabber.c:1219
+#: src/protocols/jabber/jabber.c:482 src/protocols/jabber/jabber.c:1299
 msgid "Unknown Error"
 msgstr "Unknown Error"
 
-#: src/protocols/jabber/jabber.c:455 src/protocols/jabber/jabber.c:456
+#: src/protocols/jabber/jabber.c:484 src/protocols/jabber/jabber.c:485
 msgid "Registration Failed"
 msgstr "Registration Failed"
 
-#: src/protocols/jabber/jabber.c:567 src/protocols/jabber/jabber.c:568
+#: src/protocols/jabber/jabber.c:596 src/protocols/jabber/jabber.c:597
 msgid "Already Registered"
 msgstr "Already Registered"
 
-#: src/protocols/jabber/jabber.c:603 src/protocols/jabber/jabber.c:1074
-msgid "Password"
-msgstr "Password"
-
-#: src/protocols/jabber/jabber.c:614
+#: src/protocols/jabber/jabber.c:643
 msgid "E-Mail"
 msgstr "E-Mail"
 
-#. State
-#: src/protocols/jabber/jabber.c:644 src/protocols/oscar/oscar.c:5247
-#: src/protocols/oscar/oscar.c:5255 src/protocols/trepia/trepia.c:336
-#: src/protocols/trepia/trepia.c:414
+#: src/protocols/jabber/jabber.c:673 src/protocols/oscar/oscar.c:5999
+#: src/protocols/oscar/oscar.c:6007
 msgid "State"
 msgstr "County/State"
 
-#: src/protocols/jabber/jabber.c:654 src/protocols/silc/ops.c:853
-#: src/protocols/silc/silc.c:658 src/protocols/silc/util.c:513
+#: src/protocols/jabber/jabber.c:683 src/protocols/silc/ops.c:855
+#: src/protocols/silc/silc.c:663 src/protocols/silc/util.c:513
 msgid "Phone"
 msgstr "Telephone"
 
-#: src/protocols/jabber/jabber.c:664
+#: src/protocols/jabber/jabber.c:693
 msgid "Date"
 msgstr "Date"
 
-#: src/protocols/jabber/jabber.c:672
+#: src/protocols/jabber/jabber.c:701
 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:675 src/protocols/jabber/jabber.c:676
+#: src/protocols/jabber/jabber.c:704 src/protocols/jabber/jabber.c:705
 msgid "Register New Jabber Account"
 msgstr "Register New Jabber Account"
 
-#: src/protocols/jabber/jabber.c:759
-msgid "Logged out"
-msgstr "Logged out"
-
-#: src/protocols/jabber/jabber.c:802
+#: src/protocols/jabber/jabber.c:842
 msgid "Initializing Stream"
 msgstr "Initialising Stream"
 
-#: src/protocols/jabber/jabber.c:808 src/protocols/msn/session.c:370
+#: src/protocols/jabber/jabber.c:848 src/protocols/msn/session.c:368
 msgid "Authenticating"
 msgstr "Authenticating"
 
-#: src/protocols/jabber/jabber.c:817
+#: src/protocols/jabber/jabber.c:857
 msgid "Re-initializing Stream"
 msgstr "Re-initialising Stream"
 
-#: 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:737 src/protocols/oscar/oscar.c:6807
+#: src/protocols/jabber/jabber.c:928 src/protocols/jabber/jabber.c:1277
+#: src/protocols/jabber/jabber.c:1318 src/protocols/jabber/jabber.c:1351
+#: src/protocols/oscar/oscar.c:767 src/protocols/oscar/oscar.c:7583
 msgid "Not Authorized"
 msgstr "Not Authorised"
 
-#: src/protocols/jabber/jabber.c:938
+#: src/protocols/jabber/jabber.c:971
 msgid "Both"
 msgstr "Both"
 
-#: src/protocols/jabber/jabber.c:940
+#: src/protocols/jabber/jabber.c:973
 msgid "From (To pending)"
 msgstr "From (To pending)"
 
-#: src/protocols/jabber/jabber.c:942
+#: src/protocols/jabber/jabber.c:975
 msgid "From"
 msgstr "From"
 
-#: src/protocols/jabber/jabber.c:945
+#: src/protocols/jabber/jabber.c:978
 msgid "To"
 msgstr "To"
 
-#: src/protocols/jabber/jabber.c:947
+#: src/protocols/jabber/jabber.c:980
 msgid "None (To pending)"
 msgstr "None (To pending)"
 
-#: src/protocols/jabber/jabber.c:951
-msgid "Subscription"
-msgstr "Subscription"
-
 #: 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:679 src/protocols/oscar/oscar.c:5805
-#: src/protocols/oscar/oscar.c:7000
-msgid "Do Not Disturb"
-msgstr "Do Not Disturb"
-
-#: src/protocols/jabber/jabber.c:1017
+msgid "Subscription"
+msgstr "Subscription"
+
+#: src/protocols/jabber/jabber.c:1039 src/protocols/jabber/jabber.c:1047
+#: src/protocols/jabber/jabber.c:1055 src/protocols/jabber/jabber.c:1063
+#: src/protocols/jabber/jabber.c:1071
+#, fuzzy
+msgid "Priority"
+msgstr "Port"
+
+#: src/protocols/jabber/jabber.c:1093
 msgid "Password Changed"
 msgstr "Password Changed"
 
-#: src/protocols/jabber/jabber.c:1018
+#: src/protocols/jabber/jabber.c:1094
 msgid "Your password has been changed."
 msgstr "Your password has been changed."
 
-#: src/protocols/jabber/jabber.c:1022 src/protocols/jabber/jabber.c:1023
+#: src/protocols/jabber/jabber.c:1098 src/protocols/jabber/jabber.c:1099
 msgid "Error changing password"
 msgstr "Error changing password"
 
-#: src/protocols/jabber/jabber.c:1079
+#: src/protocols/jabber/jabber.c:1155
 msgid "Password (again)"
 msgstr "Password (again)"
 
-#: src/protocols/jabber/jabber.c:1084 src/protocols/jabber/jabber.c:1085
+#: src/protocols/jabber/jabber.c:1160 src/protocols/jabber/jabber.c:1161
 msgid "Change Jabber Password"
 msgstr "Change Jabber Password"
 
-#: src/protocols/jabber/jabber.c:1085
+#: src/protocols/jabber/jabber.c:1161
 msgid "Please enter your new password"
 msgstr "Please enter your new password"
 
-#: src/protocols/jabber/jabber.c:1095 src/protocols/toc/toc.c:1581
+#: src/protocols/jabber/jabber.c:1171 src/protocols/toc/toc.c:1684
 msgid "Set User Info"
 msgstr "Set User Info"
 
-#: src/protocols/jabber/jabber.c:1177
+#. if (js->protocol_options & CHANGE_PASSWORD) {
+#: src/protocols/jabber/jabber.c:1176 src/protocols/toc/toc.c:1694
+msgid "Change Password"
+msgstr "Change Password"
+
+#. }
+#: src/protocols/jabber/jabber.c:1181
+#, fuzzy
+msgid "Search for users"
+msgstr "_Search for:"
+
+#: src/protocols/jabber/jabber.c:1257
 msgid "Bad Request"
 msgstr "Bad Request"
 
-#: src/protocols/jabber/jabber.c:1179
+#: src/protocols/jabber/jabber.c:1259
 msgid "Conflict"
 msgstr "Conflict"
 
-#: src/protocols/jabber/jabber.c:1181
+#: src/protocols/jabber/jabber.c:1261
 msgid "Feature Not Implemented"
 msgstr "Feature Not Implemented"
 
-#: src/protocols/jabber/jabber.c:1183
+#: src/protocols/jabber/jabber.c:1263
 msgid "Forbidden"
 msgstr "Forbidden"
 
-#: src/protocols/jabber/jabber.c:1185
+#: src/protocols/jabber/jabber.c:1265
 msgid "Gone"
 msgstr "Gone"
 
-#: src/protocols/jabber/jabber.c:1187 src/protocols/jabber/jabber.c:1261
+#: src/protocols/jabber/jabber.c:1267 src/protocols/jabber/jabber.c:1341
 msgid "Internal Server Error"
 msgstr "Internal Server Error"
 
-#: src/protocols/jabber/jabber.c:1189
+#: src/protocols/jabber/jabber.c:1269
 msgid "Item Not Found"
 msgstr "Item Not Found"
 
-#: src/protocols/jabber/jabber.c:1191
+#: src/protocols/jabber/jabber.c:1271
 msgid "Malformed Jabber ID"
 msgstr "Malformed Jabber ID"
 
-#: src/protocols/jabber/jabber.c:1193
+#: src/protocols/jabber/jabber.c:1273
 msgid "Not Acceptable"
 msgstr "Not Acceptable"
 
-#: src/protocols/jabber/jabber.c:1195
+#: src/protocols/jabber/jabber.c:1275
 msgid "Not Allowed"
 msgstr "Not Allowed"
 
-#: src/protocols/jabber/jabber.c:1199
+#: src/protocols/jabber/jabber.c:1279
 msgid "Payment Required"
 msgstr "Payment Required"
 
-#: src/protocols/jabber/jabber.c:1201
+#: src/protocols/jabber/jabber.c:1281
 msgid "Recipient Unavailable"
 msgstr "Recipient unavailable"
 
-#: src/protocols/jabber/jabber.c:1205
+#: src/protocols/jabber/jabber.c:1285
 msgid "Registration Required"
 msgstr "Registration Required"
 
-#: src/protocols/jabber/jabber.c:1207
+#: src/protocols/jabber/jabber.c:1287
 msgid "Remote Server Not Found"
 msgstr "Remote Server Not Found"
 
-#: src/protocols/jabber/jabber.c:1209
+#: src/protocols/jabber/jabber.c:1289
 msgid "Remote Server Timeout"
 msgstr "Remote Server Timeout"
 
-#: src/protocols/jabber/jabber.c:1211
+#: src/protocols/jabber/jabber.c:1291
 msgid "Server Overloaded"
 msgstr "Server Overloaded"
 
-#: src/protocols/jabber/jabber.c:1213
+#: src/protocols/jabber/jabber.c:1293
 msgid "Service Unavailable"
 msgstr "Service Unavailable"
 
-#: src/protocols/jabber/jabber.c:1215
+#: src/protocols/jabber/jabber.c:1295
 msgid "Subscription Required"
 msgstr "Subscription Required"
 
-#: src/protocols/jabber/jabber.c:1217
+#: src/protocols/jabber/jabber.c:1297
 msgid "Unexpected Request"
 msgstr "Unexpected Request"
 
-#: src/protocols/jabber/jabber.c:1224
+#: src/protocols/jabber/jabber.c:1304
 msgid "Authorization Aborted"
 msgstr "Authorisation Aborted"
 
-#: src/protocols/jabber/jabber.c:1226
+#: src/protocols/jabber/jabber.c:1306
 msgid "Incorrect encoding in authorization"
 msgstr "Incorrect encoding in authorisation"
 
-#: src/protocols/jabber/jabber.c:1229
+#: src/protocols/jabber/jabber.c:1309
 msgid "Invalid authzid"
 msgstr "Invalid authzid"
 
-#: src/protocols/jabber/jabber.c:1232
+#: src/protocols/jabber/jabber.c:1312
 msgid "Invalid Authorization Mechanism"
 msgstr "Invalid Authorisation Mechanism"
 
-#: src/protocols/jabber/jabber.c:1235
+#: src/protocols/jabber/jabber.c:1315
 msgid "Authorization mechanism too weak"
 msgstr "Authorisation mechanism too weak"
 
-#: src/protocols/jabber/jabber.c:1240
+#: src/protocols/jabber/jabber.c:1320
 msgid "Temporary Authentication Failure"
 msgstr "Temporary Authentication Failure"
 
-#: src/protocols/jabber/jabber.c:1242
+#: src/protocols/jabber/jabber.c:1322
 msgid "Authentication Failure"
 msgstr "Authentication Failure"
 
-#: src/protocols/jabber/jabber.c:1246
+#: src/protocols/jabber/jabber.c:1326
 msgid "Bad Format"
 msgstr "Bad Format"
 
-#: src/protocols/jabber/jabber.c:1248
+#: src/protocols/jabber/jabber.c:1328
 msgid "Bad Namespace Prefix"
 msgstr "Bad Namespace Prefix"
 
-#: src/protocols/jabber/jabber.c:1251
+#: src/protocols/jabber/jabber.c:1331
 msgid "Resource Conflict"
 msgstr "Resource Conflict"
 
-#: src/protocols/jabber/jabber.c:1253 src/protocols/silc/ops.c:1519
+#: src/protocols/jabber/jabber.c:1333 src/protocols/silc/ops.c:1514
 msgid "Connection Timeout"
 msgstr "Connection Timeout"
 
-#: src/protocols/jabber/jabber.c:1255
+#: src/protocols/jabber/jabber.c:1335
 msgid "Host Gone"
 msgstr "Host Gone"
 
-#: src/protocols/jabber/jabber.c:1257
+#: src/protocols/jabber/jabber.c:1337
 msgid "Host Unknown"
 msgstr "Host Unknown"
 
-#: src/protocols/jabber/jabber.c:1259
+#: src/protocols/jabber/jabber.c:1339
 msgid "Improper Addressing"
 msgstr "Improper Addressing"
 
-#: src/protocols/jabber/jabber.c:1263
+#: src/protocols/jabber/jabber.c:1343
 msgid "Invalid ID"
 msgstr "Invalid ID"
 
-#: src/protocols/jabber/jabber.c:1265
+#: src/protocols/jabber/jabber.c:1345
 msgid "Invalid Namespace"
 msgstr "Invalid Namespace"
 
-#: src/protocols/jabber/jabber.c:1267
+#: src/protocols/jabber/jabber.c:1347
 msgid "Invalid XML"
 msgstr "Invalid XML"
 
-#: src/protocols/jabber/jabber.c:1269
+#: src/protocols/jabber/jabber.c:1349
 msgid "Non-matching Hosts"
 msgstr "Non-matching Hosts"
 
-#: src/protocols/jabber/jabber.c:1273
+#: src/protocols/jabber/jabber.c:1353
 msgid "Policy Violation"
 msgstr "Policy Violation"
 
-#: src/protocols/jabber/jabber.c:1275
+#: src/protocols/jabber/jabber.c:1355
 msgid "Remote Connection Failed"
 msgstr "Remote Connection Failed"
 
-#: src/protocols/jabber/jabber.c:1277
+#: src/protocols/jabber/jabber.c:1357
 msgid "Resource Constraint"
 msgstr "Resource Constraint"
 
-#: src/protocols/jabber/jabber.c:1279
+#: src/protocols/jabber/jabber.c:1359
 msgid "Restricted XML"
 msgstr "Restricted XML"
 
-#: src/protocols/jabber/jabber.c:1281
+#: src/protocols/jabber/jabber.c:1361
 msgid "See Other Host"
 msgstr "See Other Host"
 
-#: src/protocols/jabber/jabber.c:1283
+#: src/protocols/jabber/jabber.c:1363
 msgid "System Shutdown"
 msgstr "System Shutdown"
 
-#: src/protocols/jabber/jabber.c:1285
+#: src/protocols/jabber/jabber.c:1365
 msgid "Undefined Condition"
 msgstr "Undefined Condition"
 
-#: src/protocols/jabber/jabber.c:1287
+#: src/protocols/jabber/jabber.c:1367
 msgid "Unsupported Encoding"
 msgstr "Unsupported Encoding"
 
-#: src/protocols/jabber/jabber.c:1289
+#: src/protocols/jabber/jabber.c:1369
 msgid "Unsupported Stanza Type"
 msgstr "Unsupported Stanza Type"
 
-#: src/protocols/jabber/jabber.c:1291
+#: src/protocols/jabber/jabber.c:1371
 msgid "Unsupported Version"
 msgstr "Unsupported Version"
 
-#: src/protocols/jabber/jabber.c:1293
+#: src/protocols/jabber/jabber.c:1373
 msgid "XML Not Well Formed"
 msgstr "XML Not Well Formed"
 
-#: src/protocols/jabber/jabber.c:1295
+#: src/protocols/jabber/jabber.c:1375
 msgid "Stream Error"
 msgstr "Stream Error"
 
-#: src/protocols/jabber/jabber.c:1362
+#: src/protocols/jabber/jabber.c:1442
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Unable to ban user %s"
 
-#: src/protocols/jabber/jabber.c:1414
+#: src/protocols/jabber/jabber.c:1464
+#, fuzzy, c-format
+msgid "Unknown affiliation: \"%s\""
+msgstr "Unknown command: %s"
+
+#: src/protocols/jabber/jabber.c:1469
+#, fuzzy, c-format
+msgid "Unable to affiliate user %s as \"%s\""
+msgstr "Unable to invite user (%s)."
+
+#: src/protocols/jabber/jabber.c:1521
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Unable to kick user %s"
 
-#: src/protocols/jabber/jabber.c:1440
+#: src/protocols/jabber/jabber.c:1547
 msgid "config:  Configure a chat room."
 msgstr "config:  Configure a chat room."
 
-#: src/protocols/jabber/jabber.c:1444
+#: src/protocols/jabber/jabber.c:1551
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Configure a chat room."
 
-#: src/protocols/jabber/jabber.c:1453
+#: src/protocols/jabber/jabber.c:1560
 msgid "part [room]:  Leave the room."
 msgstr "part [room]:  Leave the room."
 
-#: src/protocols/jabber/jabber.c:1458
+#: src/protocols/jabber/jabber.c:1565
 msgid "register:  Register with a chat room."
 msgstr "register:  Register with a chat room."
 
-#: src/protocols/jabber/jabber.c:1464
+#: src/protocols/jabber/jabber.c:1571
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [new topic]:  View or change the topic."
 
-#: src/protocols/jabber/jabber.c:1470
+#: src/protocols/jabber/jabber.c:1577
 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
+#: src/protocols/jabber/jabber.c:1583
+msgid ""
+"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
+"affiliation with the room."
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1589
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;user&gt; [message]:  Invite a user to the room."
 
-#: src/protocols/jabber/jabber.c:1482
+#: src/protocols/jabber/jabber.c:1595
 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
+#: src/protocols/jabber/jabber.c:1601
 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
+#: src/protocols/jabber/jabber.c:1606
 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
@@ -6492,42 +6285,48 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/jabber/jabber.c:1595 src/protocols/jabber/jabber.c:1597
+#: src/protocols/jabber/jabber.c:1686 src/protocols/jabber/jabber.c:1688
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber Protocol Plugin"
 
-#: src/protocols/jabber/jabber.c:1620
-msgid "Resource"
-msgstr "Resource"
-
-#: src/protocols/jabber/jabber.c:1623
+#: src/protocols/jabber/jabber.c:1714
 msgid "Use TLS if available"
 msgstr "Use TLS if available"
 
-#: src/protocols/jabber/jabber.c:1628
-msgid "Force old SSL"
+#: src/protocols/jabber/jabber.c:1719
+msgid "Require TLS"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1722
+#, fuzzy
+msgid "Force old (port 5223) SSL"
 msgstr "Force old SSL"
 
-#: src/protocols/jabber/jabber.c:1633
+#: src/protocols/jabber/jabber.c:1727
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Allow plaintext auth over unencrypted streams"
 
+#: src/protocols/jabber/jabber.c:1732
+#, fuzzy
+msgid "Connect port"
+msgstr "Connect"
+
 #. Account options
-#: src/protocols/jabber/jabber.c:1642 src/protocols/silc/silc.c:1592
+#: src/protocols/jabber/jabber.c:1736 src/protocols/silc/silc.c:1593
 msgid "Connect server"
 msgstr "Connect server"
 
-#: src/protocols/jabber/message.c:111
+#: src/protocols/jabber/message.c:114
 #, c-format
 msgid "Message from %s"
 msgstr "Message from %s"
 
-#: src/protocols/jabber/message.c:175
+#: src/protocols/jabber/message.c:178
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s has set the topic to: %s"
 
-#: src/protocols/jabber/message.c:177
+#: src/protocols/jabber/message.c:180
 #, c-format
 msgid "The topic is: %s"
 msgstr "The topic is: %s"
@@ -6550,20 +6349,32 @@
 msgid "XML Parse error"
 msgstr "XML Parse error"
 
-#: src/protocols/jabber/presence.c:290
+#: src/protocols/jabber/presence.c:284
 msgid "Unknown Error in presence"
 msgstr "Unknown Error in presence"
 
-#: 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
+#: 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:4608 src/protocols/oscar/oscar.c:7242
+#: src/protocols/yahoo/yahoo.c:893
+msgid "Authorize"
+msgstr "Authorise"
+
+#: src/protocols/jabber/presence.c:298 src/protocols/msn/userlist.c:101
+#: src/protocols/oscar/oscar.c:4610 src/protocols/oscar/oscar.c:7243
+#: src/protocols/yahoo/yahoo.c:895
+msgid "Deny"
+msgstr "Deny"
+
+#: src/protocols/jabber/presence.c:345 src/protocols/jabber/presence.c:346
 msgid "Create New Room"
 msgstr "Create New Room"
 
-#: src/protocols/jabber/presence.c:350
+#: src/protocols/jabber/presence.c:347
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -6571,30 +6382,30 @@
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
 
-#: src/protocols/jabber/presence.c:352
+#: src/protocols/jabber/presence.c:349
 msgid "Configure Room"
 msgstr "Configure Room"
 
-#: src/protocols/jabber/presence.c:354
+#: src/protocols/jabber/presence.c:351
 msgid "Accept Defaults"
 msgstr "Accept Defaults"
 
-#: src/protocols/jabber/presence.c:384
+#: src/protocols/jabber/presence.c:388
 #, c-format
 msgid "Error in chat %s"
 msgstr "Error in chat %s"
 
-#: src/protocols/jabber/presence.c:387
+#: src/protocols/jabber/presence.c:391
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Error joining chat %s"
 
-#: src/protocols/jabber/si.c:594
+#: src/protocols/jabber/si.c:591
 #, 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:595 src/protocols/jabber/si.c:596
+#: src/protocols/jabber/si.c:592 src/protocols/jabber/si.c:593
 msgid "File Send Failed"
 msgstr "File Send Failed"
 
@@ -6665,7 +6476,7 @@
 msgid "Not on list"
 msgstr "Not on list"
 
-#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:686
+#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:690
 msgid "User is offline"
 msgstr "User is offline"
 
@@ -6717,7 +6528,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:193
+#: src/protocols/msn/error.c:112 src/protocols/oscar/oscar.c:206
 msgid "Not logged in"
 msgstr "Not logged in"
 
@@ -6810,8 +6621,8 @@
 msgid "Server too busy"
 msgstr "Server too busy"
 
-#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2273
-#: src/protocols/silc/ops.c:1508 src/protocols/toc/toc.c:630
+#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2764
+#: src/protocols/silc/ops.c:1503 src/protocols/toc/toc.c:722
 msgid "Authentication failed"
 msgstr "Authentication failed"
 
@@ -6845,35 +6656,39 @@
 msgid "MSN Error: %s\n"
 msgstr "MSN Error: %s\n"
 
-#: src/protocols/msn/msn.c:114
+#: src/protocols/msn/msn.c:113
+msgid "You have just sent a Nudge!"
+msgstr ""
+
+#: src/protocols/msn/msn.c:138
 msgid "Your new MSN friendly name is too long."
 msgstr "Your new MSN friendly name is too long."
 
-#: src/protocols/msn/msn.c:222
+#: src/protocols/msn/msn.c:246
 msgid "Set your friendly name."
 msgstr "Set your friendly name."
 
-#: src/protocols/msn/msn.c:223
+#: src/protocols/msn/msn.c:247
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "This is the name that other MSN buddies will see you as."
 
-#: src/protocols/msn/msn.c:239
+#: src/protocols/msn/msn.c:263
 msgid "Set your home phone number."
 msgstr "Set your home phone number."
 
-#: src/protocols/msn/msn.c:254
+#: src/protocols/msn/msn.c:278
 msgid "Set your work phone number."
 msgstr "Set your work phone number."
 
-#: src/protocols/msn/msn.c:269
+#: src/protocols/msn/msn.c:293
 msgid "Set your mobile phone number."
 msgstr "Set your mobile phone number."
 
-#: src/protocols/msn/msn.c:282
+#: src/protocols/msn/msn.c:306
 msgid "Allow MSN Mobile pages?"
 msgstr "Allow MSN Mobile pages?"
 
-#: src/protocols/msn/msn.c:283
+#: src/protocols/msn/msn.c:307
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
@@ -6881,24 +6696,29 @@
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your mobile phone or other mobile device?"
 
-#: src/protocols/msn/msn.c:287
+#: src/protocols/msn/msn.c:311
 msgid "Allow"
 msgstr "Allow"
 
-#: src/protocols/msn/msn.c:288
+#: src/protocols/msn/msn.c:312
 msgid "Disallow"
 msgstr "Disallow"
 
-#: src/protocols/msn/msn.c:311
+#: src/protocols/msn/msn.c:328
+msgid "This Hotmail account may not be active."
+msgstr ""
+
+#: src/protocols/msn/msn.c:354
 msgid "Send a mobile message."
 msgstr "Send a mobile message."
 
-#: src/protocols/msn/msn.c:313
+#: src/protocols/msn/msn.c:356
 msgid "Page"
 msgstr "Page"
 
-#: src/protocols/msn/msn.c:489 src/protocols/msn/msn.c:497
-#: src/protocols/msn/msn.c:500 src/protocols/yahoo/yahoo.c:2903
+#: src/protocols/msn/msn.c:544 src/protocols/msn/msn.c:551
+#: src/protocols/msn/msn.c:554 src/protocols/yahoo/yahoo.c:2783
+#: src/protocols/yahoo/yahoo.c:2789
 #, c-format
 msgid ""
 "\n"
@@ -6907,84 +6727,73 @@
 "\n"
 "<b>%s:</b> %s"
 
-#: src/protocols/msn/msn.c:497
+#: src/protocols/msn/msn.c:546 src/protocols/msn/state.c:32
+#: src/protocols/novell/novell.c:2831 src/protocols/oscar/oscar.c:5070
+#: src/protocols/yahoo/yahoo.c:2631 src/protocols/yahoo/yahoo_profile.c:660
+msgid "Idle"
+msgstr "Idle"
+
+#: src/protocols/msn/msn.c:551
 msgid "Has you"
 msgstr "Has you"
 
-#: src/protocols/msn/msn.c:500
-msgid "Blocked"
-msgstr "Blocked"
-
-#: 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:2760
-#: src/protocols/yahoo/yahoo.c:3127 src/protocols/yahoo/yahoo.c:3243
+#: src/protocols/msn/msn.c:581 src/protocols/msn/state.c:33
+#: src/protocols/yahoo/yahoo.c:2611 src/protocols/yahoo/yahoo.c:3206
 msgid "Be Right Back"
 msgstr "Be Right Back"
 
-#: 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:2762
-#: src/protocols/yahoo/yahoo.c:3129 src/protocols/yahoo/yahoo.c:3244
-msgid "Busy"
-msgstr "Busy"
-
-#: src/protocols/msn/msn.c:517 src/protocols/msn/msn.c:807
-#: src/protocols/msn/state.c:35 src/protocols/yahoo/yahoo.c:2770
-#: src/protocols/yahoo/yahoo.c:3137 src/protocols/yahoo/yahoo.c:3248
+#: src/protocols/msn/msn.c:589 src/protocols/msn/state.c:35
+#: src/protocols/yahoo/yahoo.c:2621 src/protocols/yahoo/yahoo.c:3221
 msgid "On The Phone"
 msgstr "On The Phone"
 
-#: src/protocols/msn/msn.c:518 src/protocols/msn/msn.c:809
-#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2774
-#: src/protocols/yahoo/yahoo.c:3141 src/protocols/yahoo/yahoo.c:3250
+#: src/protocols/msn/msn.c:593 src/protocols/msn/state.c:36
+#: src/protocols/yahoo/yahoo.c:2625 src/protocols/yahoo/yahoo.c:3227
 msgid "Out To Lunch"
 msgstr "Out To Lunch"
 
-#: src/protocols/msn/msn.c:519 src/protocols/msn/msn.c:811
-#: src/protocols/zephyr/zephyr.c:2099 src/protocols/zephyr/zephyr.c:2131
+#: src/protocols/msn/msn.c:597 src/protocols/zephyr/zephyr.c:2255
+#: src/status.c:157
 msgid "Hidden"
 msgstr "Hidden"
 
-#: src/protocols/msn/msn.c:530
+#: src/protocols/msn/msn.c:613
 msgid "Set Friendly Name"
 msgstr "Set Friendly Name"
 
-#: src/protocols/msn/msn.c:535
+#: src/protocols/msn/msn.c:618
 msgid "Set Home Phone Number"
 msgstr "Set Home Phone Number"
 
-#: src/protocols/msn/msn.c:539
+#: src/protocols/msn/msn.c:622
 msgid "Set Work Phone Number"
 msgstr "Set Work Phone Number"
 
-#: src/protocols/msn/msn.c:543
+#: src/protocols/msn/msn.c:626
 msgid "Set Mobile Phone Number"
 msgstr "Set Mobile Phone Number"
 
-#: src/protocols/msn/msn.c:549
+#: src/protocols/msn/msn.c:632
 msgid "Enable/Disable Mobile Devices"
 msgstr "Enable/Disable Mobile Devices"
 
-#: src/protocols/msn/msn.c:554
+#: src/protocols/msn/msn.c:637
 msgid "Allow/Disallow Mobile Pages"
 msgstr "Allow/Disallow Mobile Pages"
 
-#: src/protocols/msn/msn.c:577
+#: src/protocols/msn/msn.c:647
+msgid "Open Hotmail Inbox"
+msgstr ""
+
+#: src/protocols/msn/msn.c:671
 msgid "Send to Mobile"
 msgstr "Send to Mobile"
 
-#: src/protocols/msn/msn.c:586 src/protocols/novell/novell.c:3369
+#: src/protocols/msn/msn.c:680 src/protocols/novell/novell.c:3442
 msgid "Initiate _Chat"
 msgstr "Initiate _Chat"
 
-#: src/protocols/msn/msn.c:623
+#: src/protocols/msn/msn.c:717
 msgid ""
 "SSL support is needed for MSN. Please install a supported SSL library. See "
 "http://gaim.sf.net/faq-ssl.php for more information."
@@ -6992,95 +6801,89 @@
 "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:651
+#: src/protocols/msn/msn.c:745
 msgid "Failed to connect to server."
 msgstr "Failed to connect to server."
 
-#: src/protocols/msn/msn.c:1309 src/protocols/yahoo/yahoo_profile.c:659
-#: src/protocols/zephyr/zephyr.c:717 src/protocols/zephyr/zephyr.c:1126
+#: src/protocols/msn/msn.c:1387 src/protocols/yahoo/yahoo_profile.c:654
+#: src/protocols/zephyr/zephyr.c:721 src/protocols/zephyr/zephyr.c:1135
 #, 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:1317 src/protocols/msn/msn.c:1675
-#: src/protocols/yahoo/yahoo_profile.c:1174 src/util.c:796
+#: src/protocols/msn/msn.c:1394 src/protocols/msn/msn.c:1740
+#: src/protocols/yahoo/yahoo_profile.c:1167 src/util.c:801
 #, c-format
 msgid "<b>%s:</b> "
 msgstr "<b>%s:</b> "
 
-#: src/protocols/msn/msn.c:1405
+#: src/protocols/msn/msn.c:1471
 msgid "MSN Profile"
 msgstr "MSN Profile"
 
-#: src/protocols/msn/msn.c:1410 src/protocols/msn/msn.c:1662
-#: src/protocols/yahoo/yahoo_profile.c:763
+#: src/protocols/msn/msn.c:1476 src/protocols/msn/msn.c:1727
+#: src/protocols/yahoo/yahoo_profile.c:760
 msgid "Error retrieving profile"
 msgstr "Error retreiving profile"
 
-#. Age
-#: src/protocols/msn/msn.c:1481 src/protocols/oscar/oscar.c:5232
-#: src/protocols/trepia/trepia.c:286 src/protocols/trepia/trepia.c:405
-#: src/protocols/yahoo/yahoo_profile.c:1022
+#: src/protocols/msn/msn.c:1546 src/protocols/oscar/oscar.c:5984
+#: src/protocols/yahoo/yahoo_profile.c:1015
 msgid "Age"
 msgstr "Age"
 
-#. Gender
-#: src/protocols/msn/msn.c:1488 src/protocols/oscar/oscar.c:5218
-#: src/protocols/trepia/trepia.c:280 src/protocols/trepia/trepia.c:407
-#: src/protocols/yahoo/yahoo_profile.c:1032
+#: src/protocols/msn/msn.c:1553 src/protocols/oscar/oscar.c:5971
+#: src/protocols/yahoo/yahoo_profile.c:1025
 msgid "Gender"
 msgstr "Gender"
 
-#: src/protocols/msn/msn.c:1497 src/protocols/yahoo/yahoo_profile.c:1027
+#: src/protocols/msn/msn.c:1562 src/protocols/yahoo/yahoo_profile.c:1020
 msgid "Marital Status"
 msgstr "Marital Status"
 
-#: src/protocols/msn/msn.c:1504 src/protocols/novell/novell.c:1445
-#: src/protocols/yahoo/yahoo_profile.c:1017
+#: src/protocols/msn/msn.c:1569 src/protocols/novell/novell.c:1454
+#: src/protocols/yahoo/yahoo_profile.c:1010
 msgid "Location"
 msgstr "Location"
 
-#: src/protocols/msn/msn.c:1512 src/protocols/yahoo/yahoo_profile.c:1037
+#: src/protocols/msn/msn.c:1577 src/protocols/yahoo/yahoo_profile.c:1030
 msgid "Occupation"
 msgstr "Occupation"
 
-#: 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
+#: src/protocols/msn/msn.c:1594 src/protocols/msn/msn.c:1600
+#: src/protocols/msn/msn.c:1607 src/protocols/msn/msn.c:1615
+#: src/protocols/msn/msn.c:1622
 msgid "A Little About Me"
 msgstr "A Little About Me"
 
-#: src/protocols/msn/msn.c:1566 src/protocols/msn/msn.c:1572
-#: src/protocols/msn/msn.c:1579 src/protocols/msn/msn.c:1586
+#: src/protocols/msn/msn.c:1631 src/protocols/msn/msn.c:1637
+#: src/protocols/msn/msn.c:1644 src/protocols/msn/msn.c:1651
 msgid "Favorite Things"
 msgstr "Favourite Things"
 
-#: src/protocols/msn/msn.c:1595 src/protocols/msn/msn.c:1601
-#: src/protocols/msn/msn.c:1608
+#: src/protocols/msn/msn.c:1660 src/protocols/msn/msn.c:1666
+#: src/protocols/msn/msn.c:1673
 msgid "Hobbies and Interests"
 msgstr "Hobbies and Interests"
 
-#: src/protocols/msn/msn.c:1617 src/protocols/msn/msn.c:1623
-#: src/protocols/yahoo/yahoo_profile.c:1079
+#: src/protocols/msn/msn.c:1682 src/protocols/msn/msn.c:1688
+#: src/protocols/yahoo/yahoo_profile.c:1072
 msgid "Favorite Quote"
 msgstr "Favourite Quote"
 
-#: src/protocols/msn/msn.c:1631
+#: src/protocols/msn/msn.c:1696
 msgid "Last Updated"
 msgstr "Last Updated"
 
-#. Homepage
-#: src/protocols/msn/msn.c:1642 src/protocols/silc/ops.c:844
-#: src/protocols/trepia/trepia.c:290 src/protocols/trepia/trepia.c:420
+#: src/protocols/msn/msn.c:1707 src/protocols/silc/ops.c:846
 msgid "Homepage"
 msgstr "Homepage"
 
-#: src/protocols/msn/msn.c:1664
+#: src/protocols/msn/msn.c:1729
 msgid "The user has not created a public profile."
 msgstr "The user has not created a public profile."
 
-#: src/protocols/msn/msn.c:1665
+#: src/protocols/msn/msn.c:1730
 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 "
@@ -7090,7 +6893,7 @@
 "that the user does not exist, or that the user exists but has not created a "
 "public profile."
 
-#: src/protocols/msn/msn.c:1669
+#: src/protocols/msn/msn.c:1734
 msgid ""
 "Gaim could not find any information in the user's profile. The user most "
 "likely does not exist."
@@ -7098,18 +6901,10 @@
 "Gaim could not find any information in the user's profile. The user most "
 "likely does not exist."
 
-#: src/protocols/msn/msn.c:1675 src/protocols/yahoo/yahoo_profile.c:1174
+#: src/protocols/msn/msn.c:1740 src/protocols/yahoo/yahoo_profile.c:1167
 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
@@ -7120,20 +6915,25 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/msn/msn.c:1908 src/protocols/msn/msn.c:1910
+#: src/protocols/msn/msn.c:1942 src/protocols/msn/msn.c:1944
 msgid "MSN Protocol Plugin"
 msgstr "MSN Protocol Plugin"
 
-#: src/protocols/msn/msn.c:1929 src/protocols/trepia/trepia.c:1296
+#: src/protocols/msn/msn.c:1963
 msgid "Login server"
 msgstr "Login server"
 
-#: src/protocols/msn/msn.c:1938
+#: src/protocols/msn/msn.c:1972
 msgid "Use HTTP Method"
 msgstr "Use HTTP Method"
 
+#: src/protocols/msn/msn.c:1980
+#, fuzzy
+msgid "nudge: nudge a contact to get their attention"
+msgstr "buzz: Buzz a contact to get their attention"
+
 #: src/protocols/msn/nexus.c:103 src/protocols/msn/servconn.c:127
-#: src/protocols/yahoo/yahoochat.c:1394
+#: src/protocols/yahoo/yahoochat.c:1326
 msgid "Unable to connect"
 msgstr "Unable to connect"
 
@@ -7142,8 +6942,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:523
-#: src/protocols/msn/session.c:349
+#: src/protocols/msn/notification.c:184 src/protocols/msn/notification.c:528
+#: src/protocols/msn/session.c:347
 msgid "Unknown error."
 msgstr "Unknown error."
 
@@ -7152,40 +6952,40 @@
 msgid "%s on %s (%s)"
 msgstr "%s on %s (%s)"
 
-#: src/protocols/msn/notification.c:493
+#: src/protocols/msn/notification.c:498
 #, c-format
 msgid "Unable to add user on %s (%s)"
 msgstr "Unable to add user on %s (%s)"
 
-#: src/protocols/msn/notification.c:497
+#: src/protocols/msn/notification.c:502
 #, c-format
 msgid "Unable to block user on %s (%s)"
 msgstr "Unable to block user on %s (%s)"
 
-#: src/protocols/msn/notification.c:501
+#: src/protocols/msn/notification.c:506
 #, c-format
 msgid "Unable to permit user on %s (%s)"
 msgstr "Unable to permit user on %s (%s)"
 
-#: src/protocols/msn/notification.c:509
+#: src/protocols/msn/notification.c:514
 #, 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:518
+#: src/protocols/msn/notification.c:523
 #, c-format
 msgid "%s is not a valid passport account."
 msgstr "%s is not a valid passport account."
 
-#: src/protocols/msn/notification.c:805
+#: src/protocols/msn/notification.c:811
 msgid "Unable to rename group"
 msgstr "Unable to rename group"
 
-#: src/protocols/msn/notification.c:860
+#: src/protocols/msn/notification.c:866
 msgid "Unable to delete group"
 msgstr "Unable to delete group"
 
-#: src/protocols/msn/notification.c:1287
+#: src/protocols/msn/notification.c:1299
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -7224,8 +7024,8 @@
 msgid "Reading error"
 msgstr "Reading error"
 
-#: src/protocols/msn/servconn.c:133 src/protocols/msn/session.c:341
-#: src/protocols/oscar/oscar.c:4210
+#: src/protocols/msn/servconn.c:133 src/protocols/msn/session.c:339
+#: src/protocols/oscar/oscar.c:4931
 msgid "Unknown error"
 msgstr "Unknown error"
 
@@ -7238,162 +7038,178 @@
 "Connection error from %s server (%s):\n"
 "%s"
 
-#: src/protocols/msn/session.c:319
+#: src/protocols/msn/session.c:317
 msgid "Our protocol is not supported by the server."
 msgstr "Our protocol is not supported by the server."
 
-#: src/protocols/msn/session.c:323
+#: src/protocols/msn/session.c:321
 msgid "Error parsing HTTP."
 msgstr "Error parsing HTTP."
 
-#: src/protocols/msn/session.c:327
+#. MSG_SERVER_GHOST
+#. Looks like someone logged in as us! =-O
+#: src/protocols/msn/session.c:325 src/protocols/napster/napster.c:450
+#: src/protocols/oscar/oscar.c:5635 src/protocols/yahoo/yahoo.c:194
 msgid "You have signed on from another location."
 msgstr "You have signed on from another location."
 
-#: src/protocols/msn/session.c:330
+#: src/protocols/msn/session.c:328
 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:335
+#: src/protocols/msn/session.c:333
 msgid "The MSN servers are going down temporarily."
 msgstr "The MSN servers are going down temporarily."
 
-#: src/protocols/msn/session.c:339
+#: src/protocols/msn/session.c:337
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "Unable to authenticate: %s"
 
-#: src/protocols/msn/session.c:344
+#: src/protocols/msn/session.c:342
 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:365 src/protocols/msn/session.c:367
+#: src/protocols/msn/session.c:363 src/protocols/msn/session.c:365
 msgid "Handshaking"
 msgstr "Handshaking"
 
-#: src/protocols/msn/session.c:366
+#: src/protocols/msn/session.c:364
 msgid "Transferring"
 msgstr "Transferring"
 
-#: src/protocols/msn/session.c:368
+#: src/protocols/msn/session.c:366
 msgid "Starting authentication"
 msgstr "Starting authentication"
 
+#: src/protocols/msn/session.c:367
+msgid "Getting cookie"
+msgstr "Getting cookie"
+
 #: src/protocols/msn/session.c:369
-msgid "Getting cookie"
-msgstr "Getting cookie"
-
-#: src/protocols/msn/session.c:371
 msgid "Sending cookie"
 msgstr "Sending cookie"
 
-#: src/protocols/msn/session.c:372 src/protocols/trepia/trepia.c:636
+#: src/protocols/msn/session.c:370
 msgid "Retrieving buddy list"
 msgstr "Retrieving buddy list"
 
-#: src/protocols/msn/switchboard.c:401
+#: src/protocols/msn/state.c:34
+msgid "Away From Computer"
+msgstr "Away From Computer"
+
+#: src/protocols/msn/switchboard.c:403
 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
+#: src/protocols/msn/switchboard.c:411
 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
+#: src/protocols/msn/switchboard.c:415
 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:417
+#: src/protocols/msn/switchboard.c:419
 msgid "Message could not be sent because a connection error occurred:"
 msgstr "Message could not be sent because a connection error occured:"
 
-#: src/protocols/msn/switchboard.c:421
+#: src/protocols/msn/switchboard.c:423
 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:429
+#: src/protocols/msn/switchboard.c:431
 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: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:87
+#: src/protocols/msn/switchboard.c:952
+#, fuzzy, c-format
+msgid "%s just sent you a Nudge!"
+msgstr "%s wants to send you a file"
+
+#: src/protocols/msn/userlist.c:85
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr "The user %s (%s) wants to add %s to his or her buddy list."
 
-#: src/protocols/msn/userlist.c:96
-#, c-format
-msgid "The user %s wants to add %s to his or her buddy list."
+#: src/protocols/msn/userlist.c:275
+#, fuzzy, c-format
+msgid "%s has added you to his or her contact list."
 msgstr "The user %s wants to add %s to his or her buddy list."
 
-#: src/protocols/msn/userlist.c:627
+#: src/protocols/msn/userlist.c:339
+#, c-format
+msgid "%s has removed you from his or her contact list."
+msgstr ""
+
+#: src/protocols/msn/userlist.c:659
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "Unable to add \"%s\"."
 
-#: src/protocols/msn/userlist.c:629
+#: src/protocols/msn/userlist.c:661
 msgid "The screen name specified is invalid."
 msgstr "The screen name specified is invalid."
 
-#: src/protocols/napster/napster.c:241
+#: src/protocols/napster/napster.c:260
 msgid "Unable to read header from server"
 msgstr "Unable to read header from server"
 
-#: src/protocols/napster/napster.c:255
+#: src/protocols/napster/napster.c:274
 #, 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:318
+#: src/protocols/napster/napster.c:290
+#, fuzzy
+msgid "Unknown server error."
+msgstr "Unknown error."
+
+#: src/protocols/napster/napster.c:339
 #, 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:329
+#: src/protocols/napster/napster.c:350
 #, c-format
 msgid "Unable to add \"%s\" to your Napster hotlist"
 msgstr "Unable to add \"%s\" to your Napster hotlist"
 
-#: src/protocols/napster/napster.c:337
+#. MSG_SERVER_DISCONNECTING
+#. we have been kicked off =^(
+#: src/protocols/napster/napster.c:357
 msgid "You were disconnected from the server."
 msgstr "You were disconnected from the server."
 
 #. MSG_CLIENT_WHOIS
-#: src/protocols/napster/napster.c:395
+#: src/protocols/napster/napster.c:414
 #, 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:439
+#: src/protocols/napster/napster.c:454
 #, c-format
 msgid "%s requested a PING"
 msgstr "%s requested a PING"
 
-#: src/protocols/napster/napster.c:554 src/protocols/toc/toc.c:1268
+#. we didn't successfully connect. tdt->toc_fd is valid here
+#: src/protocols/napster/napster.c:501 src/protocols/napster/napster.c:532
+#: src/protocols/toc/toc.c:172 src/protocols/yahoo/yahoo.c:2209
+#: src/protocols/yahoo/yahoo.c:2236 src/protocols/yahoo/yahoo.c:2299
+#: src/protocols/yahoo/yahoo_filexfer.c:69
+#: src/protocols/yahoo/yahoo_filexfer.c:111 src/protocols/yahoo/ycht.c:481
+msgid "Unable to connect."
+msgstr "Unable to connect."
+
+#: src/protocols/napster/napster.c:590 src/protocols/toc/toc.c:1367
 msgid "_Group:"
 msgstr "_Group:"
 
@@ -7407,7 +7223,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/napster/napster.c:652 src/protocols/napster/napster.c:654
+#: src/protocols/napster/napster.c:687 src/protocols/napster/napster.c:689
 msgid "NAPSTER Protocol Plugin"
 msgstr "NAPSTER Protocol Plugin"
 
@@ -7545,38 +7361,38 @@
 msgid "Login failed (%s)."
 msgstr "Login failed (%s)."
 
-#: src/protocols/novell/novell.c:230
+#: src/protocols/novell/novell.c:232
 #, 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:379
+#: src/protocols/novell/novell.c:381
 #, 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:405
+#: src/protocols/novell/novell.c:407
 #, c-format
 msgid "Unable to send message (%s)."
 msgstr "Unable to send message (%s)."
 
-#: src/protocols/novell/novell.c:476 src/protocols/novell/novell.c:970
+#: src/protocols/novell/novell.c:478 src/protocols/novell/novell.c:972
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "Unable to invite user (%s)."
 
-#: src/protocols/novell/novell.c:515
+#: src/protocols/novell/novell.c:517
 #, 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:520
+#: src/protocols/novell/novell.c:522
 #, 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:567
+#: src/protocols/novell/novell.c:569
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
@@ -7585,7 +7401,7 @@
 "Unable to move user %s to folder %s in the server side list. Error while "
 "creating folder (%s)."
 
-#: src/protocols/novell/novell.c:615
+#: src/protocols/novell/novell.c:617
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
@@ -7594,67 +7410,67 @@
 "Unable to add %s to your buddy list. Error creating folder in server side "
 "list (%s)."
 
-#: src/protocols/novell/novell.c:688
+#: src/protocols/novell/novell.c:690
 #, 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:734 src/protocols/novell/novell.c:880
+#: src/protocols/novell/novell.c:736 src/protocols/novell/novell.c:882
 #, 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:781
+#: src/protocols/novell/novell.c:783
 #, 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:834
+#: src/protocols/novell/novell.c:836
 #, 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:902
+#: src/protocols/novell/novell.c:904
 #, 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:925 src/protocols/novell/novell.c:1620
+#: src/protocols/novell/novell.c:927 src/protocols/novell/novell.c:1628
 #, 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:997
+#: src/protocols/novell/novell.c:999
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "Unable to create conference (%s)."
 
-#: src/protocols/novell/novell.c:1108 src/protocols/novell/novell.c:1659
+#: src/protocols/novell/novell.c:1110 src/protocols/novell/novell.c:1667
 msgid "Error communicating with server. Closing connection."
 msgstr "Error communicating with server. Closing connection."
 
-#: src/protocols/novell/novell.c:1443
+#: src/protocols/novell/novell.c:1452
 msgid "Telephone Number"
 msgstr "Telephone Number"
 
-#: src/protocols/novell/novell.c:1447
+#: src/protocols/novell/novell.c:1456
 msgid "Department"
 msgstr "Department"
 
-#: src/protocols/novell/novell.c:1449
+#: src/protocols/novell/novell.c:1458
 msgid "Personal Title"
 msgstr "Personal Title"
 
-#: src/protocols/novell/novell.c:1453
+#: src/protocols/novell/novell.c:1462
 msgid "Mailstop"
 msgstr "Mailstop"
 
-#: src/protocols/novell/novell.c:1455 src/protocols/oscar/oscar.c:5205
-#: src/protocols/oscar/oscar.c:5212
+#: src/protocols/novell/novell.c:1464 src/protocols/oscar/oscar.c:5957
+#: src/protocols/oscar/oscar.c:5964
 msgid "Email Address"
 msgstr "Email Address"
 
-#: src/protocols/novell/novell.c:1471
+#: src/protocols/novell/novell.c:1480
 msgid "User ID"
 msgstr "User ID"
 
@@ -7665,46 +7481,46 @@
 #. tag, value);
 #. }
 #.
-#: src/protocols/novell/novell.c:1485
+#: src/protocols/novell/novell.c:1494
 msgid "Full name"
 msgstr "Full name"
 
-#: src/protocols/novell/novell.c:1506
-msgid "User Properties"
-msgstr "User Properties"
-
-#: src/protocols/novell/novell.c:1610
+#: src/protocols/novell/novell.c:1618
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "GroupWise Conference %d"
 
-#: src/protocols/novell/novell.c:1635
+#: src/protocols/novell/novell.c:1643
 msgid "Unable to make SSL connection to server."
 msgstr "Unable to make SSL connection to server."
 
-#: src/protocols/novell/novell.c:1665
+#: src/protocols/novell/novell.c:1673
 #, c-format
 msgid "Error processing event or response (%s)."
 msgstr "Error processing event or response (%s)."
 
-#: src/protocols/novell/novell.c:1699
+#: src/protocols/novell/novell.c:1707
 msgid "Authenticating..."
 msgstr "Authenticating..."
 
-#: src/protocols/novell/novell.c:1714
+#: src/protocols/novell/novell.c:1719
+msgid "Unable to connect to server."
+msgstr "Unable to connect to server."
+
+#: src/protocols/novell/novell.c:1722
 msgid "Waiting for response..."
 msgstr "Waiting for response..."
 
-#: src/protocols/novell/novell.c:1849
+#: src/protocols/novell/novell.c:1857
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "%s has been invited to this conversation."
 
-#: src/protocols/novell/novell.c:1876
+#: src/protocols/novell/novell.c:1885
 msgid "Invitation to Conversation"
 msgstr "Invitation to Conversation"
 
-#: src/protocols/novell/novell.c:1877
+#: src/protocols/novell/novell.c:1886
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -7715,15 +7531,15 @@
 "\n"
 "Sent: %s"
 
-#: src/protocols/novell/novell.c:1879
+#: src/protocols/novell/novell.c:1888
 msgid "Would you like to join the conversation?"
 msgstr "Would you like to join the conversation?"
 
-#: src/protocols/novell/novell.c:1985
+#: src/protocols/novell/novell.c:1995
 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:2039
+#: src/protocols/novell/novell.c:2051
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -7735,7 +7551,7 @@
 #. *  gaim_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: src/protocols/novell/novell.c:2137
+#: src/protocols/novell/novell.c:2149
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
@@ -7743,24 +7559,16 @@
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
 
-#: src/protocols/novell/novell.c:2159
+#: src/protocols/novell/novell.c:2171
 msgid "Error. SSL support is not installed."
 msgstr "Error: SSL support is not installed."
 
-#: src/protocols/novell/novell.c:2463
+#: src/protocols/novell/novell.c:2475
 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:2809 src/protocols/oscar/oscar.c:739
-#: src/protocols/oscar/oscar.c:6809 src/protocols/yahoo/yahoo.c:2782
-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
+#: src/protocols/novell/novell.c:2965 src/protocols/novell/novell.c:3047
+#: src/protocols/yahoo/yahoo.c:2835
 msgid "Appear Offline"
 msgstr "Appear Offline"
 
@@ -7774,115 +7582,115 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/novell/novell.c:3468 src/protocols/novell/novell.c:3470
+#: src/protocols/novell/novell.c:3540 src/protocols/novell/novell.c:3542
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GroupWise Messenger Protocol Plugin"
 
-#: src/protocols/novell/novell.c:3489
+#: src/protocols/novell/novell.c:3561
 msgid "Server address"
 msgstr "Server address"
 
-#: src/protocols/novell/novell.c:3493
+#: src/protocols/novell/novell.c:3565
 msgid "Server port"
 msgstr "Server port"
 
-#: src/protocols/oscar/oscar.c:189
+#: src/protocols/oscar/oscar.c:202
 msgid "Invalid error"
 msgstr "Invalid error"
 
-#: src/protocols/oscar/oscar.c:190
+#: src/protocols/oscar/oscar.c:203
 msgid "Invalid SNAC"
 msgstr "Invalid SNAC"
 
-#: src/protocols/oscar/oscar.c:191
+#: src/protocols/oscar/oscar.c:204
 msgid "Rate to host"
 msgstr "Rate to host"
 
-#: src/protocols/oscar/oscar.c:192
+#: src/protocols/oscar/oscar.c:205
 msgid "Rate to client"
 msgstr "Rate to client"
 
-#: src/protocols/oscar/oscar.c:194
+#: src/protocols/oscar/oscar.c:207
 msgid "Service unavailable"
 msgstr "Service unavailable"
 
-#: src/protocols/oscar/oscar.c:195
+#: src/protocols/oscar/oscar.c:208
 msgid "Service not defined"
 msgstr "Service not defined"
 
-#: src/protocols/oscar/oscar.c:196
+#: src/protocols/oscar/oscar.c:209
 msgid "Obsolete SNAC"
 msgstr "Obsolete SNAC"
 
-#: src/protocols/oscar/oscar.c:197
+#: src/protocols/oscar/oscar.c:210
 msgid "Not supported by host"
 msgstr "Not supported by host"
 
-#: src/protocols/oscar/oscar.c:198
+#: src/protocols/oscar/oscar.c:211
 msgid "Not supported by client"
 msgstr "Not supported by client"
 
-#: src/protocols/oscar/oscar.c:199
+#: src/protocols/oscar/oscar.c:212
 msgid "Refused by client"
 msgstr "Refused by client"
 
-#: src/protocols/oscar/oscar.c:200
+#: src/protocols/oscar/oscar.c:213
 msgid "Reply too big"
 msgstr "Reply too big"
 
-#: src/protocols/oscar/oscar.c:201
+#: src/protocols/oscar/oscar.c:214
 msgid "Responses lost"
 msgstr "Responses lost"
 
-#: src/protocols/oscar/oscar.c:202
+#: src/protocols/oscar/oscar.c:215
 msgid "Request denied"
 msgstr "Request denied"
 
-#: src/protocols/oscar/oscar.c:203
+#: src/protocols/oscar/oscar.c:216
 msgid "Busted SNAC payload"
 msgstr "Busted SNAC payload"
 
-#: src/protocols/oscar/oscar.c:204
+#: src/protocols/oscar/oscar.c:217
 msgid "Insufficient rights"
 msgstr "Insufficient rights"
 
-#: src/protocols/oscar/oscar.c:205
+#: src/protocols/oscar/oscar.c:218
 msgid "In local permit/deny"
 msgstr "In local permit/deny"
 
-#: src/protocols/oscar/oscar.c:206
+#: src/protocols/oscar/oscar.c:219
 msgid "Too evil (sender)"
 msgstr "Too evil (sender)"
 
-#: src/protocols/oscar/oscar.c:207
+#: src/protocols/oscar/oscar.c:220
 msgid "Too evil (receiver)"
 msgstr "Too evil (receiver)"
 
-#: src/protocols/oscar/oscar.c:208
+#: src/protocols/oscar/oscar.c:221
 msgid "User temporarily unavailable"
 msgstr "User temporarily unavailable"
 
-#: src/protocols/oscar/oscar.c:209
+#: src/protocols/oscar/oscar.c:222
 msgid "No match"
 msgstr "No match"
 
-#: src/protocols/oscar/oscar.c:210
+#: src/protocols/oscar/oscar.c:223
 msgid "List overflow"
 msgstr "List overflow"
 
-#: src/protocols/oscar/oscar.c:211
+#: src/protocols/oscar/oscar.c:224
 msgid "Request ambiguous"
 msgstr "Request ambiguous"
 
-#: src/protocols/oscar/oscar.c:212
+#: src/protocols/oscar/oscar.c:225
 msgid "Queue full"
 msgstr "Queue full"
 
-#: src/protocols/oscar/oscar.c:213
+#: src/protocols/oscar/oscar.c:226
 msgid "Not while on AOL"
 msgstr "Not while on AOL"
 
-#: src/protocols/oscar/oscar.c:409 src/protocols/oscar/oscar.c:492
+#: src/protocols/oscar/oscar.c:417 src/protocols/oscar/oscar.c:502
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking to "
 "most likely has a buggy client.)"
@@ -7890,157 +7698,158 @@
 "(There was an error receiving this message.  The buddy you are speaking to "
 "most likely has a buggy client.)"
 
-#: src/protocols/oscar/oscar.c:594
+#: src/protocols/oscar/oscar.c:616
 msgid "Voice"
 msgstr "Voice"
 
-#: src/protocols/oscar/oscar.c:597
+#: src/protocols/oscar/oscar.c:619
 msgid "AIM Direct IM"
 msgstr "AIM Direct IM"
 
-#: src/protocols/oscar/oscar.c:600 src/protocols/silc/silc.c:654
+#: src/protocols/oscar/oscar.c:622 src/protocols/silc/silc.c:659
 #: src/protocols/silc/util.c:509
 msgid "Chat"
 msgstr "Chat"
 
-#: src/protocols/oscar/oscar.c:603 src/protocols/oscar/oscar.c:7111
+#: src/protocols/oscar/oscar.c:625 src/protocols/oscar/oscar.c:7892
 msgid "Get File"
 msgstr "Get File"
 
-#: src/protocols/oscar/oscar.c:610
+#: src/protocols/oscar/oscar.c:632
 msgid "Games"
 msgstr "Games"
 
-#: src/protocols/oscar/oscar.c:613
+#: src/protocols/oscar/oscar.c:635
 msgid "Add-Ins"
 msgstr "Add-Ins"
 
-#: src/protocols/oscar/oscar.c:616
+#: src/protocols/oscar/oscar.c:638
 msgid "Send Buddy List"
 msgstr "Send Buddy List"
 
-#: src/protocols/oscar/oscar.c:619
+#: src/protocols/oscar/oscar.c:641
 msgid "ICQ Direct Connect"
 msgstr "ICQ Direct Connect"
 
-#: src/protocols/oscar/oscar.c:622
+#: src/protocols/oscar/oscar.c:644
 msgid "AP User"
 msgstr "AP User"
 
-#: src/protocols/oscar/oscar.c:625
+#: src/protocols/oscar/oscar.c:647
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:628
+#: src/protocols/oscar/oscar.c:650
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: src/protocols/oscar/oscar.c:631
+#: src/protocols/oscar/oscar.c:653
 msgid "ICQ Server Relay"
 msgstr "ICQ Server Relay"
 
-#: src/protocols/oscar/oscar.c:634
+#: src/protocols/oscar/oscar.c:656
 msgid "Old ICQ UTF8"
 msgstr "Old ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:637
+#: src/protocols/oscar/oscar.c:659
 msgid "Trillian Encryption"
 msgstr "Trillian Encryption"
 
-#: src/protocols/oscar/oscar.c:640
+#: src/protocols/oscar/oscar.c:662
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:643
+#: src/protocols/oscar/oscar.c:665
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: src/protocols/oscar/oscar.c:646
+#: src/protocols/oscar/oscar.c:668
 msgid "Security Enabled"
 msgstr "Security Enabled"
 
-#: src/protocols/oscar/oscar.c:649
+#: src/protocols/oscar/oscar.c:671
 msgid "Video Chat"
 msgstr "Video Chat"
 
-#: src/protocols/oscar/oscar.c:653
+#: src/protocols/oscar/oscar.c:675
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: src/protocols/oscar/oscar.c:656
+#: src/protocols/oscar/oscar.c:678
 msgid "Live Video"
 msgstr "Live Video"
 
-#: src/protocols/oscar/oscar.c:659
+#: src/protocols/oscar/oscar.c:681
 msgid "Camera"
 msgstr "Camera"
 
-#: src/protocols/oscar/oscar.c:677 src/protocols/oscar/oscar.c:5814
-#: src/protocols/oscar/oscar.c:7003
+#: src/protocols/oscar/oscar.c:699 src/protocols/oscar/oscar.c:7775
 msgid "Free For Chat"
 msgstr "Free For Chat"
 
-#: src/protocols/oscar/oscar.c:681 src/protocols/oscar/oscar.c:5808
-#: src/protocols/oscar/oscar.c:7001
+#: src/protocols/oscar/oscar.c:703 src/protocols/oscar/oscar.c:7790
 msgid "Not Available"
 msgstr "Not Available"
 
-#: src/protocols/oscar/oscar.c:683 src/protocols/oscar/oscar.c:5811
-#: src/protocols/oscar/oscar.c:7002
+#: src/protocols/oscar/oscar.c:705 src/protocols/oscar/oscar.c:7780
 msgid "Occupied"
 msgstr "Occupied"
 
-#: src/protocols/oscar/oscar.c:687
+#: src/protocols/oscar/oscar.c:709
 msgid "Web Aware"
 msgstr "Web Aware"
 
-#: src/protocols/oscar/oscar.c:755
+#: src/protocols/oscar/oscar.c:786 src/protocols/oscar/oscar.c:5056
+msgid "Warning Level"
+msgstr "Warning Level"
+
+#: src/protocols/oscar/oscar.c:792
 msgid "Capabilities"
 msgstr "Capabilities"
 
-#: src/protocols/oscar/oscar.c:764
+#: src/protocols/oscar/oscar.c:801
 msgid "Buddy Comment"
 msgstr "Buddy Comment"
 
-#: src/protocols/oscar/oscar.c:899
+#: src/protocols/oscar/oscar.c:958
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "Direct IM with %s closed"
 
-#: src/protocols/oscar/oscar.c:901
+#: src/protocols/oscar/oscar.c:960
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "Direct IM with %s failed"
 
-#: src/protocols/oscar/oscar.c:908
+#: src/protocols/oscar/oscar.c:968
 msgid "Direct Connect failed"
 msgstr "Direct Connect failed"
 
-#: src/protocols/oscar/oscar.c:985 src/protocols/oscar/oscar.c:1116
+#: src/protocols/oscar/oscar.c:1045 src/protocols/oscar/oscar.c:1176
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Direct IM with %s established"
 
-#: src/protocols/oscar/oscar.c:1066
+#: src/protocols/oscar/oscar.c:1126
 #, 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:1486
+#: src/protocols/oscar/oscar.c:1547
 #, 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:1491
+#: src/protocols/oscar/oscar.c:1552
 msgid "Unable to open Direct IM"
 msgstr "Unable to open Direct IM"
 
-#: src/protocols/oscar/oscar.c:1526
+#: src/protocols/oscar/oscar.c:1587
 #, 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:1530
+#: src/protocols/oscar/oscar.c:1591
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
@@ -8048,24 +7857,24 @@
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
 
-#: src/protocols/oscar/oscar.c:1534 src/protocols/oscar/oscar.c:3644
+#: src/protocols/oscar/oscar.c:1595 src/protocols/oscar/oscar.c:4367
 msgid "Connect"
 msgstr "Connect"
 
-#: src/protocols/oscar/oscar.c:1601 src/protocols/toc/toc.c:874
-#, c-format
-msgid "You have been disconnected from chat room %s."
+#: src/protocols/oscar/oscar.c:1661
+#, fuzzy, c-format
+msgid "You have lost your connection to chat room %s."
 msgstr "You have been disconnected from chat room %s."
 
-#: src/protocols/oscar/oscar.c:1620
+#: src/protocols/oscar/oscar.c:1684
 msgid "Chat is currently unavailable"
 msgstr "Chat is currently unavailable"
 
-#: src/protocols/oscar/oscar.c:1701
+#: src/protocols/oscar/oscar.c:1754
 msgid "Screen name sent"
 msgstr "Screen name sent"
 
-#: src/protocols/oscar/oscar.c:1715
+#: src/protocols/oscar/oscar.c:1778
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -8076,51 +7885,73 @@
 "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:1743
+#: src/protocols/oscar/oscar.c:1807
 msgid "Unable to login to AIM"
 msgstr "Unable to login to AIM"
 
-#: src/protocols/oscar/oscar.c:1845 src/protocols/oscar/oscar.c:2366
+#: src/protocols/oscar/oscar.c:1911 src/protocols/oscar/oscar.c:2854
 msgid "Could Not Connect"
 msgstr "Could Not Connect"
 
-#: src/protocols/oscar/oscar.c:1853
+#: src/protocols/oscar/oscar.c:1919
 msgid "Connection established, cookie sent"
 msgstr "Connection established, cookie sent"
 
-#: src/protocols/oscar/oscar.c:1964
-#, c-format
-msgid "Transfer of file %s timed out."
-msgstr "Transfer of file %s timed out."
-
-#: src/protocols/oscar/oscar.c:2048 src/protocols/yahoo/yahoo_filexfer.c:177
-#: src/protocols/yahoo/yahoo_filexfer.c:186
-#: src/protocols/yahoo/yahoo_filexfer.c:195
+#. clientip & verifiedip failed, request a redirect
+#. * that is, we want the sender to connect to us
+#. Let the user not to lose hope quite yet
+#: src/protocols/oscar/oscar.c:2071
+#, fuzzy
+msgid "Attempting connection redirect..."
+msgstr "Attempting to connect to %s at %s:%hu for Direct IM."
+
+#. proxyip timed out
+#. * Yes, it's a bit odd to ask the user to enable proxied file transfers
+#. * when it's a proxied transfer that timed out. It is possible that a
+#. * stage 1/2 proxied transfer might work when a stage 3 will not.
+#: src/protocols/oscar/oscar.c:2116
+#, c-format
+msgid ""
+"Transfer of file %s timed out.\n"
+" Try enabling proxy servers for file transfers in Tools->Preferences->AIM/"
+"ICQ."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2214 src/protocols/yahoo/yahoo_filexfer.c:174
+#: src/protocols/yahoo/yahoo_filexfer.c:183
+#: src/protocols/yahoo/yahoo_filexfer.c:192
 msgid "Unable to establish file descriptor."
 msgstr "Unable to establish file descriptor."
 
-#: src/protocols/oscar/oscar.c:2053
+#: src/protocols/oscar/oscar.c:2219
 msgid "Unable to create new connection."
 msgstr "Unable to create new connection."
 
-#: src/protocols/oscar/oscar.c:2125
-msgid "Unable to establish listener socket."
+#: src/protocols/oscar/oscar.c:2453 src/protocols/oscar/oscar.c:2462
+#: src/protocols/oscar/oscar.c:2476 src/protocols/oscar/oscar.c:2486
+#, fuzzy
+msgid "Unable to log into file transfer proxy."
+msgstr "Unable to write file %s."
+
+#: src/protocols/oscar/oscar.c:2540
+#, fuzzy
+msgid "Unable to establish listener socket or no AOL proxy connection present."
 msgstr "Unable to establish listener socket."
 
-#: src/protocols/oscar/oscar.c:2250 src/protocols/toc/toc.c:541
+#: src/protocols/oscar/oscar.c:2741 src/protocols/toc/toc.c:543
 msgid "Incorrect nickname or password."
 msgstr "Incorrect nickname or password."
 
-#: src/protocols/oscar/oscar.c:2255
+#: src/protocols/oscar/oscar.c:2746
 msgid "Your account is currently suspended."
 msgstr "Your account is currently suspended."
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:2259
+#: src/protocols/oscar/oscar.c:2750
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "The AOL Instant Messenger service is temporarily unavailable."
 
-#: src/protocols/oscar/oscar.c:2264
+#: src/protocols/oscar/oscar.c:2755
 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."
@@ -8128,33 +7959,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:2269
+#: src/protocols/oscar/oscar.c:2760
 #, 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:2301
+#: src/protocols/oscar/oscar.c:2791
 msgid "Internal Error"
 msgstr "Internal Error"
 
-#: src/protocols/oscar/oscar.c:2373
+#: src/protocols/oscar/oscar.c:2861
 msgid "Received authorization"
 msgstr "Received authorisation"
 
-#: src/protocols/oscar/oscar.c:2397
+#: src/protocols/oscar/oscar.c:2885
 msgid "The SecurID key entered is invalid."
 msgstr "The SecurID key entered is invalid."
 
-#: src/protocols/oscar/oscar.c:2411
+#: src/protocols/oscar/oscar.c:2899
 msgid "Enter SecurID"
 msgstr "Enter SecurID"
 
-#: src/protocols/oscar/oscar.c:2412
+#: src/protocols/oscar/oscar.c:2900
 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:2452 src/protocols/oscar/oscar.c:2482
-#: src/protocols/oscar/oscar.c:2571
+#: src/protocols/oscar/oscar.c:2940 src/protocols/oscar/oscar.c:2970
+#: src/protocols/oscar/oscar.c:3059
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -8163,24 +7994,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:2455 src/protocols/oscar/oscar.c:2485
+#: src/protocols/oscar/oscar.c:2943 src/protocols/oscar/oscar.c:2973
 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:2574
+#: src/protocols/oscar/oscar.c:3062
 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:2606
+#: src/protocols/oscar/oscar.c:3093
 msgid "Password sent"
 msgstr "Password sent"
 
-#: src/protocols/oscar/oscar.c:3636
+#: src/protocols/oscar/oscar.c:4358
 #, 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:3639
+#: src/protocols/oscar/oscar.c:4361
 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 "
@@ -8190,19 +8021,19 @@
 "for IM Images.  Because your IP address will be revealed, this may be "
 "considered a privacy risk."
 
-#: src/protocols/oscar/oscar.c:3677
+#: src/protocols/oscar/oscar.c:4400
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Please authorise me so I can add you to my buddy list."
 
-#: src/protocols/oscar/oscar.c:3685
+#: src/protocols/oscar/oscar.c:4408
 msgid "Authorization Request Message:"
 msgstr "Authorisation Request Message:"
 
-#: src/protocols/oscar/oscar.c:3686
+#: src/protocols/oscar/oscar.c:4409
 msgid "Please authorize me!"
 msgstr "Please authorise me!"
 
-#: src/protocols/oscar/oscar.c:3716
+#: src/protocols/oscar/oscar.c:4439
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
@@ -8211,35 +8042,34 @@
 "The user %s requires authorisation before being added to a buddy list.  Do "
 "you want to send an authorisation request?"
 
-#: src/protocols/oscar/oscar.c:3721 src/protocols/oscar/oscar.c:3723
+#: src/protocols/oscar/oscar.c:4444 src/protocols/oscar/oscar.c:4446
 msgid "Request Authorization"
 msgstr "Request Authorisation"
 
-#: src/protocols/oscar/oscar.c:3771 src/protocols/oscar/oscar.c:3773
-#: src/protocols/oscar/oscar.c:3780 src/protocols/oscar/oscar.c:3877
-#: src/protocols/oscar/oscar.c:3897 src/protocols/oscar/oscar.c:6444
-#: src/protocols/oscar/oscar.c:6490
+#: src/protocols/oscar/oscar.c:4484 src/protocols/oscar/oscar.c:4490
+#: src/protocols/oscar/oscar.c:4594 src/protocols/oscar/oscar.c:4618
+#: src/protocols/oscar/oscar.c:7228 src/protocols/oscar/oscar.c:7280
 msgid "No reason given."
 msgstr "No reason given."
 
-#: src/protocols/oscar/oscar.c:3779
+#: src/protocols/oscar/oscar.c:4489
 msgid "Authorization Denied Message:"
 msgstr "Authorisation Denied Message:"
 
-#: src/protocols/oscar/oscar.c:3877
-#, c-format
-msgid ""
-"The user %u wants to add you to their buddy list for the following reason:\n"
+#: src/protocols/oscar/oscar.c:4596
+#, fuzzy, c-format
+msgid ""
+"The user %u wants to add %s 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:3885 src/protocols/oscar/oscar.c:6450
+#: src/protocols/oscar/oscar.c:4606 src/protocols/oscar/oscar.c:7240
 msgid "Authorization Request"
 msgstr "Authorisation Request"
 
-#: src/protocols/oscar/oscar.c:3897
+#: src/protocols/oscar/oscar.c:4618
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -8250,17 +8080,17 @@
 "following reason:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3898
+#: src/protocols/oscar/oscar.c:4619
 msgid "ICQ authorization denied."
 msgstr "ICQ authorisation denied."
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:3905
+#: src/protocols/oscar/oscar.c:4626
 #, 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:3913
+#: src/protocols/oscar/oscar.c:4634
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -8273,7 +8103,7 @@
 "From: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3921
+#: src/protocols/oscar/oscar.c:4642
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -8286,7 +8116,7 @@
 "From: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3929
+#: src/protocols/oscar/oscar.c:4650
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -8299,34 +8129,34 @@
 "Message is:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3950
+#: src/protocols/oscar/oscar.c:4671
 #, 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:3956
+#: src/protocols/oscar/oscar.c:4677
 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:3960
+#: src/protocols/oscar/oscar.c:4681
 msgid "Decline"
 msgstr "Decline"
 
-#: src/protocols/oscar/oscar.c:4044
+#: src/protocols/oscar/oscar.c:4765
 #, 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:4053
+#: src/protocols/oscar/oscar.c:4774
 #, 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:4062
+#: src/protocols/oscar/oscar.c:4783
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -8337,76 +8167,77 @@
 msgstr[1] ""
 "You missed %hu messages from %s because the rate limit has been exceeded."
 
-#: src/protocols/oscar/oscar.c:4071
+#: src/protocols/oscar/oscar.c:4792
 #, 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:4080
+#: src/protocols/oscar/oscar.c:4801
 #, 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:4089
+#: src/protocols/oscar/oscar.c:4810
 #, 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:4143 src/protocols/oscar/oscar.c:4375
-#, c-format
-msgid "Info for %s"
-msgstr "Info for %s"
-
-#: src/protocols/oscar/oscar.c:4209
+#: src/protocols/oscar/oscar.c:4869
+#, c-format
+msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
+msgstr "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
+
+#: src/protocols/oscar/oscar.c:4930
 #, 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:4245
+#: src/protocols/oscar/oscar.c:4967
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Unable to send message: %s"
 
-#: src/protocols/oscar/oscar.c:4245 src/protocols/oscar/oscar.c:4250
-#: src/protocols/oscar/oscar.c:4308 src/protocols/oscar/oscar.c:4312
+#: src/protocols/oscar/oscar.c:4967 src/protocols/oscar/oscar.c:4972
+#: src/protocols/oscar/oscar.c:5030 src/protocols/oscar/oscar.c:5034
 msgid "Unknown reason."
 msgstr "Unknown reason."
 
-#: src/protocols/oscar/oscar.c:4308
+#: src/protocols/oscar/oscar.c:4970
+#, c-format
+msgid "Unable to send message to %s:"
+msgstr "Unable to send message to %s:"
+
+#: src/protocols/oscar/oscar.c:5030
 #, c-format
 msgid "User information not available: %s"
 msgstr "User information not available: %s"
 
-#: src/protocols/oscar/oscar.c:4311
+#: src/protocols/oscar/oscar.c:5033
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "User information for %s unavailable:"
 
-#: src/protocols/oscar/oscar.c:4333
-msgid "Warning Level"
-msgstr "Warning Level"
-
-#: src/protocols/oscar/oscar.c:4337
+#: src/protocols/oscar/oscar.c:5060
 msgid "Online Since"
 msgstr "Online Since"
 
-#: src/protocols/oscar/oscar.c:4342 src/protocols/yahoo/yahoo_profile.c:1125
+#: src/protocols/oscar/oscar.c:5065 src/protocols/yahoo/yahoo_profile.c:1118
 msgid "Member Since"
 msgstr "Member Since"
 
-#: src/protocols/oscar/oscar.c:4426
+#: src/protocols/oscar/oscar.c:5148
 msgid "Your AIM connection may be lost."
 msgstr "Your AIM connection may be lost."
 
 #. The conversion failed!
-#: src/protocols/oscar/oscar.c:4612
+#: src/protocols/oscar/oscar.c:5334
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -8414,11 +8245,11 @@
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 
-#: src/protocols/oscar/oscar.c:4837
+#: src/protocols/oscar/oscar.c:5560
 msgid "Rate limiting error."
 msgstr "Rate limiting error."
 
-#: src/protocols/oscar/oscar.c:4838
+#: src/protocols/oscar/oscar.c:5561
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -8426,117 +8257,105 @@
 "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:4901
-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:4903
+#: src/protocols/oscar/oscar.c:5637
 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:4934
+#: src/protocols/oscar/oscar.c:5650 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:5675
 msgid "Finalizing connection"
 msgstr "Finalizing connection"
 
-#: src/protocols/oscar/oscar.c:5217 src/protocols/silc/util.c:541
+#: src/protocols/oscar/oscar.c:5943
+msgid "UIN"
+msgstr "UIN"
+
+#: src/protocols/oscar/oscar.c:5969 src/protocols/silc/util.c:541
 msgid "Mobile Phone"
 msgstr "Mobile Phone"
 
-#: src/protocols/oscar/oscar.c:5218
-msgid "Not specified"
-msgstr "Not specified"
-
-#: src/protocols/oscar/oscar.c:5219 src/protocols/trepia/trepia.c:282
-#: src/protocols/trepia/trepia.c:408
+#: src/protocols/oscar/oscar.c:5971
 msgid "Female"
 msgstr "Female"
 
-#: src/protocols/oscar/oscar.c:5219 src/protocols/trepia/trepia.c:281
-#: src/protocols/trepia/trepia.c:408
+#: src/protocols/oscar/oscar.c:5971
 msgid "Male"
 msgstr "Male"
 
-#: src/protocols/oscar/oscar.c:5235
+#: src/protocols/oscar/oscar.c:5987
 msgid "Personal Web Page"
 msgstr "Personal Web Page"
 
-#: src/protocols/oscar/oscar.c:5239
+#: src/protocols/oscar/oscar.c:5991
 msgid "Additional Information"
 msgstr "Additional Information"
 
-#: src/protocols/oscar/oscar.c:5244
+#: src/protocols/oscar/oscar.c:5996
 msgid "Home Address"
 msgstr "Home Address"
 
-#: src/protocols/oscar/oscar.c:5248 src/protocols/oscar/oscar.c:5256
+#: src/protocols/oscar/oscar.c:6000 src/protocols/oscar/oscar.c:6008
 msgid "Zip Code"
 msgstr "Postcode"
 
-#: src/protocols/oscar/oscar.c:5252
+#: src/protocols/oscar/oscar.c:6004
 msgid "Work Address"
 msgstr "Work Address"
 
-#: src/protocols/oscar/oscar.c:5260
+#: src/protocols/oscar/oscar.c:6012
 msgid "Work Information"
 msgstr "Work Information"
 
-#: src/protocols/oscar/oscar.c:5261
+#: src/protocols/oscar/oscar.c:6013
 msgid "Company"
 msgstr "Company"
 
-#: src/protocols/oscar/oscar.c:5262
+#: src/protocols/oscar/oscar.c:6014
 msgid "Division"
 msgstr "Division"
 
-#: src/protocols/oscar/oscar.c:5263
+#: src/protocols/oscar/oscar.c:6015
 msgid "Position"
 msgstr "Position"
 
-#: src/protocols/oscar/oscar.c:5265
+#: src/protocols/oscar/oscar.c:6017
 msgid "Web Page"
 msgstr "Web Page"
 
-#: src/protocols/oscar/oscar.c:5275
-#, c-format
-msgid "ICQ Info for %s"
-msgstr "ICQ Info for %s"
-
-#: src/protocols/oscar/oscar.c:5324
+#: src/protocols/oscar/oscar.c:6074
 msgid "Pop-Up Message"
 msgstr "Pop-Up Message"
 
-#: src/protocols/oscar/oscar.c:5345
+#. TODO: Need to use ngettext() here
+#: src/protocols/oscar/oscar.c:6103
 #, 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:5349
-msgid "Search Results"
-msgstr "Search Results"
-
-#: src/protocols/oscar/oscar.c:5366
+#: src/protocols/oscar/oscar.c:6132
 #, c-format
 msgid "No results found for email address %s"
 msgstr "No results found for email address %s"
 
-#: src/protocols/oscar/oscar.c:5387
+#: src/protocols/oscar/oscar.c:6153
 #, 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:5389
+#: src/protocols/oscar/oscar.c:6155
 msgid "Account Confirmation Requested"
 msgstr "Account Confirmation Requested"
 
-#: src/protocols/oscar/oscar.c:5420
+#: src/protocols/oscar/oscar.c:6186
 msgid "Error Changing Account Info"
 msgstr "Error Changing Account Info"
 
-#: src/protocols/oscar/oscar.c:5423
+#: src/protocols/oscar/oscar.c:6189
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8545,16 +8364,14 @@
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "differs from the original."
 
-#: src/protocols/oscar/oscar.c:5426
-#, c-format
-msgid ""
-"Error 0x%04x: Unable to format screen name because the requested screen name "
-"ends in a space."
+#: src/protocols/oscar/oscar.c:6192
+#, fuzzy, c-format
+msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
-"ends in a space."
-
-#: src/protocols/oscar/oscar.c:5429
+"is too long."
+
+#: src/protocols/oscar/oscar.c:6195
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8563,7 +8380,7 @@
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "is too long."
 
-#: src/protocols/oscar/oscar.c:5432
+#: src/protocols/oscar/oscar.c:6198
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -8572,7 +8389,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:5435
+#: src/protocols/oscar/oscar.c:6201
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -8581,7 +8398,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:5438
+#: src/protocols/oscar/oscar.c:6204
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
@@ -8590,12 +8407,12 @@
 "Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 
-#: src/protocols/oscar/oscar.c:5441
+#: src/protocols/oscar/oscar.c:6207
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Error 0x%04x: Unknown error."
 
-#: src/protocols/oscar/oscar.c:5451
+#: src/protocols/oscar/oscar.c:6217
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -8604,26 +8421,26 @@
 "Your screen name is currently formatted as follows:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5452 src/protocols/oscar/oscar.c:5459
+#: src/protocols/oscar/oscar.c:6218 src/protocols/oscar/oscar.c:6225
 msgid "Account Info"
 msgstr "Account Info"
 
-#: src/protocols/oscar/oscar.c:5457
+#: src/protocols/oscar/oscar.c:6223
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "The email address for %s is %s"
 
-#: src/protocols/oscar/oscar.c:5522
+#: src/protocols/oscar/oscar.c:6290
 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:5663
+#: src/protocols/oscar/oscar.c:6474
 msgid "Unable to set AIM profile."
 msgstr "Unable to set AIM profile."
 
-#: src/protocols/oscar/oscar.c:5664
+#: src/protocols/oscar/oscar.c:6475
 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 "
@@ -8633,7 +8450,7 @@
 "completed.  Your profile remains unset; try setting it again when you are "
 "fully connected."
 
-#: src/protocols/oscar/oscar.c:5691
+#: src/protocols/oscar/oscar.c:6489
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -8648,29 +8465,11 @@
 "The maximum profile length of %d bytes has been exceeded.  Gaim has "
 "truncated it for you."
 
-#: src/protocols/oscar/oscar.c:5696
+#: src/protocols/oscar/oscar.c:6494
 msgid "Profile too long."
 msgstr "Profile too long."
 
-#: src/protocols/oscar/oscar.c:5712 src/protocols/oscar/oscar.c:7008
-msgid "Visible"
-msgstr "Visible"
-
-#: src/protocols/oscar/oscar.c:5730
-msgid "Unable to set AIM away message."
-msgstr "Unable to set AIM away message."
-
-#: src/protocols/oscar/oscar.c:5731
-msgid ""
-"You have probably requested to set your away message before the login "
-"procedure completed.  You remain in a \"present\" state; try setting it "
-"again when you are fully connected."
-msgstr ""
-"You have probably requested to set your away message before the login "
-"procedure completed.  You remain in a \"present\" state; try setting it "
-"again when you are fully connected."
-
-#: src/protocols/oscar/oscar.c:5771
+#: src/protocols/oscar/oscar.c:6517 src/protocols/oscar/oscar.c:6590
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -8685,11 +8484,25 @@
 "The maximum away message length of %d bytes has been exceeded.  Gaim has "
 "truncated it for you."
 
-#: src/protocols/oscar/oscar.c:5776
+#: src/protocols/oscar/oscar.c:6522 src/protocols/oscar/oscar.c:6595
 msgid "Away message too long."
 msgstr "Away message too long."
 
-#: src/protocols/oscar/oscar.c:5853
+#: src/protocols/oscar/oscar.c:6554
+msgid "Unable to set AIM away message."
+msgstr "Unable to set AIM away message."
+
+#: src/protocols/oscar/oscar.c:6555
+msgid ""
+"You have probably requested to set your away message before the login "
+"procedure completed.  You remain in a \"present\" state; try setting it "
+"again when you are fully connected."
+msgstr ""
+"You have probably requested to set your away message before the login "
+"procedure completed.  You remain in a \"present\" state; try setting it "
+"again when you are fully connected."
+
+#: src/protocols/oscar/oscar.c:6685
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -8700,16 +8513,16 @@
 "must either start with a letter and contain only letters, numbers and "
 "spaces, or contain only numbers."
 
-#: src/protocols/oscar/oscar.c:5855 src/protocols/oscar/oscar.c:6310
-#: src/protocols/oscar/oscar.c:6324
+#: src/protocols/oscar/oscar.c:6687 src/protocols/oscar/oscar.c:7086
+#: src/protocols/oscar/oscar.c:7100
 msgid "Unable To Add"
 msgstr "Unable To Add"
 
-#: src/protocols/oscar/oscar.c:6022
+#: src/protocols/oscar/oscar.c:6792
 msgid "Unable To Retrieve Buddy List"
 msgstr "Unable To Retrieve Buddy List"
 
-#: src/protocols/oscar/oscar.c:6023
+#: src/protocols/oscar/oscar.c:6793
 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 "
@@ -8719,13 +8532,13 @@
 "servers.  Your buddy list is not lost, and will probably become available in "
 "a few hours."
 
-#: src/protocols/oscar/oscar.c:6205 src/protocols/oscar/oscar.c:6206
-#: src/protocols/oscar/oscar.c:6211 src/protocols/oscar/oscar.c:6368
-#: src/protocols/oscar/oscar.c:6369 src/protocols/oscar/oscar.c:6374
+#: src/protocols/oscar/oscar.c:6977 src/protocols/oscar/oscar.c:6978
+#: src/protocols/oscar/oscar.c:6983 src/protocols/oscar/oscar.c:7144
+#: src/protocols/oscar/oscar.c:7145 src/protocols/oscar/oscar.c:7150
 msgid "Orphans"
 msgstr "Orphans"
 
-#: src/protocols/oscar/oscar.c:6308
+#: src/protocols/oscar/oscar.c:7084
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -8734,11 +8547,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:6308 src/protocols/oscar/oscar.c:6322
+#: src/protocols/oscar/oscar.c:7084 src/protocols/oscar/oscar.c:7098
 msgid "(no name)"
 msgstr "(no name)"
 
-#: src/protocols/oscar/oscar.c:6322
+#: src/protocols/oscar/oscar.c:7098
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -8749,7 +8562,7 @@
 "for this is that you have the maximum number of allowed buddies in your "
 "buddy list."
 
-#: src/protocols/oscar/oscar.c:6405
+#: src/protocols/oscar/oscar.c:7181
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -8758,31 +8571,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:6411
+#: src/protocols/oscar/oscar.c:7187
 msgid "Authorization Given"
 msgstr "Authorisation Given"
 
-#: src/protocols/oscar/oscar.c:6444
-#, c-format
-msgid ""
-"The user %s wants to add you to their buddy list for the following reason:\n"
+#: src/protocols/oscar/oscar.c:7231
+#, fuzzy, c-format
+msgid ""
+"The user %s wants to add %s 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:6486
+#: src/protocols/oscar/oscar.c:7276
 #, 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:6487
+#: src/protocols/oscar/oscar.c:7277
 msgid "Authorization Granted"
 msgstr "Authorisation Granted"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:6490
+#: src/protocols/oscar/oscar.c:7280
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -8793,76 +8606,96 @@
 "following reason:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:6491
+#: src/protocols/oscar/oscar.c:7281
 msgid "Authorization Denied"
 msgstr "Authorisation Denied"
 
-#: src/protocols/oscar/oscar.c:6528 src/protocols/toc/toc.c:1273
+#: src/protocols/oscar/oscar.c:7318 src/protocols/toc/toc.c:1372
 msgid "_Exchange:"
 msgstr "_Exchange:"
 
-#: src/protocols/oscar/oscar.c:6566
+#: src/protocols/oscar/oscar.c:7354
 msgid "Invalid chat name specified."
 msgstr "Invalid chat name specified."
 
-#: src/protocols/oscar/oscar.c:6655
+#: src/protocols/oscar/oscar.c:7424
 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:6781
+#: src/protocols/oscar/oscar.c:7559
 msgid "Away Message"
 msgstr "Away Message"
 
-#: src/protocols/oscar/oscar.c:7067
+#: src/protocols/oscar/oscar.c:7848
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Buddy Comment for %s"
 
-#: src/protocols/oscar/oscar.c:7068
+#: src/protocols/oscar/oscar.c:7849
 msgid "Buddy Comment:"
 msgstr "Buddy Comment:"
 
-#: src/protocols/oscar/oscar.c:7087
+#: src/protocols/oscar/oscar.c:7868
 msgid "Edit Buddy Comment"
 msgstr "Edit Buddy Comment"
 
-#: src/protocols/oscar/oscar.c:7093
+#: src/protocols/oscar/oscar.c:7874
 msgid "Get Status Msg"
 msgstr "Get Status Msg"
 
-#: src/protocols/oscar/oscar.c:7105
+#: src/protocols/oscar/oscar.c:7886
 msgid "Direct IM"
 msgstr "Direct IM"
 
-#: src/protocols/oscar/oscar.c:7122
+#: src/protocols/oscar/oscar.c:7903
 msgid "Re-request Authorization"
 msgstr "Re-request Authorisation"
 
-#: src/protocols/oscar/oscar.c:7152
+#: src/protocols/oscar/oscar.c:7963
+#, fuzzy
+msgid "Require authorization"
+msgstr "Request Authorisation"
+
+#: src/protocols/oscar/oscar.c:7966
+#, fuzzy
+msgid "Hide IP address"
+msgstr "IP Address"
+
+#: src/protocols/oscar/oscar.c:7969
+#, fuzzy
+msgid "Web aware"
+msgstr "Web Aware"
+
+#: src/protocols/oscar/oscar.c:7974
+#, fuzzy
+msgid "ICQ Privacy Options"
+msgstr "Proxy Options"
+
+#: src/protocols/oscar/oscar.c:7991
 msgid "The new formatting is invalid."
 msgstr "The new formatting is invalid."
 
-#: src/protocols/oscar/oscar.c:7153
+#: src/protocols/oscar/oscar.c:7992
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "Screen name formatting can change only capitalisation and whitespace."
 
-#: src/protocols/oscar/oscar.c:7160
+#: src/protocols/oscar/oscar.c:7999
 msgid "New screen name formatting:"
 msgstr "New screen name formatting:"
 
-#: src/protocols/oscar/oscar.c:7212
+#: src/protocols/oscar/oscar.c:8051
 msgid "Change Address To:"
 msgstr "Change Address To:"
 
-#: src/protocols/oscar/oscar.c:7257
+#: src/protocols/oscar/oscar.c:8096
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>you are not waiting for authorisation</i>"
 
-#: src/protocols/oscar/oscar.c:7260
+#: src/protocols/oscar/oscar.c:8099
 msgid "You are awaiting authorization from the following buddies"
 msgstr "You are awaiting authorisation from the following buddies"
 
-#: src/protocols/oscar/oscar.c:7261
+#: src/protocols/oscar/oscar.c:8100
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -8870,78 +8703,87 @@
 "You can re-request authorisation from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorisation.\""
 
-#: src/protocols/oscar/oscar.c:7278
+#: src/protocols/oscar/oscar.c:8117
 msgid "Find Buddy by E-mail"
 msgstr "Find Buddy by E-mail"
 
-#: src/protocols/oscar/oscar.c:7279
+#: src/protocols/oscar/oscar.c:8118
 msgid "Search for a buddy by e-mail address"
 msgstr "Search for a buddy by e-mail address"
 
-#: src/protocols/oscar/oscar.c:7280
+#: src/protocols/oscar/oscar.c:8119
 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:7297
-msgid "Available Message:"
-msgstr "Available Message:"
-
-#: src/protocols/oscar/oscar.c:7298
-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:7379 src/protocols/silc/silc.c:812
+#: src/protocols/oscar/oscar.c:8206 src/protocols/silc/silc.c:817
 msgid "Set User Info..."
 msgstr "Set User Info..."
 
-#: src/protocols/oscar/oscar.c:7384
+#: src/protocols/oscar/oscar.c:8212
 msgid "Set User Info (URL)..."
 msgstr "Set User Info (URL)..."
 
-#: src/protocols/oscar/oscar.c:7390
-msgid "Set Available Message..."
-msgstr "Set Available Message..."
-
-#: src/protocols/oscar/oscar.c:7395 src/protocols/silc/silc.c:808
+#: src/protocols/oscar/oscar.c:8217 src/protocols/silc/silc.c:813
 msgid "Change Password..."
 msgstr "Change Password..."
 
-#: src/protocols/oscar/oscar.c:7400
+#: src/protocols/oscar/oscar.c:8223
 msgid "Change Password (URL)"
 msgstr "Change Password (URL)"
 
-#: src/protocols/oscar/oscar.c:7404
+#: src/protocols/oscar/oscar.c:8227
 msgid "Configure IM Forwarding (URL)"
 msgstr "Configure IM Forwarding (URL)"
 
-#: src/protocols/oscar/oscar.c:7413
+#. ICQ actions
+#: src/protocols/oscar/oscar.c:8237
+#, fuzzy
+msgid "Show privacy options..."
+msgstr "Show more options"
+
+#. AIM actions
+#: src/protocols/oscar/oscar.c:8244
 msgid "Format Screen Name..."
 msgstr "Format Screen Name..."
 
-#: src/protocols/oscar/oscar.c:7417
+#: src/protocols/oscar/oscar.c:8248
 msgid "Confirm Account"
 msgstr "Confirm Account"
 
-#: src/protocols/oscar/oscar.c:7421
+#: src/protocols/oscar/oscar.c:8252
 msgid "Display Currently Registered Address"
 msgstr "Display Currently Registered Address"
 
-#: src/protocols/oscar/oscar.c:7425
+#: src/protocols/oscar/oscar.c:8256
 msgid "Change Currently Registered Address..."
 msgstr "Change Currently Registered Address"
 
-#: src/protocols/oscar/oscar.c:7432
+#: src/protocols/oscar/oscar.c:8263
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Show Buddies Awaiting Authorisation"
 
-#: src/protocols/oscar/oscar.c:7438
+#: src/protocols/oscar/oscar.c:8269
 msgid "Search for Buddy by Email..."
 msgstr "Search for Buddy by Email..."
 
-#: src/protocols/oscar/oscar.c:7443
+#: src/protocols/oscar/oscar.c:8274
 msgid "Search for Buddy by Information"
 msgstr "Search for Buddy by Information"
 
+#: src/protocols/oscar/oscar.c:8344
+#, fuzzy
+msgid "Use recent buddies group"
+msgstr "User not in group"
+
+#: src/protocols/oscar/oscar.c:8347
+#, fuzzy
+msgid "Show how long you have been idle"
+msgstr "Allows you to hand-configure how long you've been idle for"
+
+#: src/protocols/oscar/oscar.c:8356
+msgid "Use AIM/ICQ proxy server (Slower/More Secure/Usually Works)"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -8952,33 +8794,33 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/oscar/oscar.c:7591 src/protocols/oscar/oscar.c:7593
+#: src/protocols/oscar/oscar.c:8470 src/protocols/oscar/oscar.c:8472
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ Protocol Plugin"
 
-#: src/protocols/oscar/oscar.c:7612
+#: src/protocols/oscar/oscar.c:8491
 msgid "Auth host"
 msgstr "Auth host"
 
-#: src/protocols/oscar/oscar.c:7615
+#: src/protocols/oscar/oscar.c:8494
 msgid "Auth port"
 msgstr "Auth port"
 
-#: src/protocols/oscar/oscar.c:7618 src/protocols/zephyr/zephyr.c:2748
+#: src/protocols/oscar/oscar.c:8497 src/protocols/zephyr/zephyr.c:2892
 msgid "Encoding"
 msgstr "Encoding"
 
-#: src/protocols/silc/buddy.c:51 src/protocols/silc/buddy.c:414
-#: src/protocols/silc/buddy.c:539 src/protocols/silc/buddy.c:706
+#: src/protocols/silc/buddy.c:51 src/protocols/silc/buddy.c:419
+#: src/protocols/silc/buddy.c:544 src/protocols/silc/buddy.c:711
 #: src/protocols/silc/ft.c:338
 #, c-format
 msgid "User %s is not present in the network"
 msgstr "User %s is not present in the network"
 
-#: src/protocols/silc/buddy.c:52 src/protocols/silc/buddy.c:109
-#: src/protocols/silc/buddy.c:114 src/protocols/silc/buddy.c:118
-#: src/protocols/silc/buddy.c:123 src/protocols/silc/buddy.c:128
-#: src/protocols/silc/buddy.c:133 src/protocols/silc/buddy.c:251
+#: src/protocols/silc/buddy.c:52 src/protocols/silc/buddy.c:114
+#: src/protocols/silc/buddy.c:119 src/protocols/silc/buddy.c:123
+#: src/protocols/silc/buddy.c:128 src/protocols/silc/buddy.c:133
+#: src/protocols/silc/buddy.c:138 src/protocols/silc/buddy.c:256
 msgid "Key Agreement"
 msgstr "Key Agreement"
 
@@ -8986,36 +8828,36 @@
 msgid "Cannot perform the key agreement"
 msgstr "Cannot perform the key agreement"
 
-#: src/protocols/silc/buddy.c:110
+#: src/protocols/silc/buddy.c:115
 msgid "Error occurred during key agreement"
 msgstr "Error occurred during key agreement"
 
-#: src/protocols/silc/buddy.c:114
+#: src/protocols/silc/buddy.c:119
 msgid "Key Agreement failed"
 msgstr "Key Agreement failed"
 
-#: src/protocols/silc/buddy.c:119
+#: src/protocols/silc/buddy.c:124
 msgid "Timeout during key agreement"
 msgstr "Timeout during key agreement"
 
-#: src/protocols/silc/buddy.c:124
+#: src/protocols/silc/buddy.c:129
 msgid "Key agreement was aborted"
 msgstr "Key agreement was aborted"
 
-#: src/protocols/silc/buddy.c:129
+#: src/protocols/silc/buddy.c:134
 msgid "Key agreement is already started"
 msgstr "Key agreement is already started"
 
-#: src/protocols/silc/buddy.c:134
+#: src/protocols/silc/buddy.c:139
 msgid "Key agreement cannot be started with yourself"
 msgstr "Key agreement cannot be started with yourself"
 
-#: src/protocols/silc/buddy.c:252 src/protocols/silc/buddy.c:382
-#: src/protocols/silc/buddy.c:507
+#: src/protocols/silc/buddy.c:257 src/protocols/silc/buddy.c:387
+#: src/protocols/silc/buddy.c:512
 msgid "The remote user is not present in the network any more"
 msgstr "The remote user is not present in the network any more"
 
-#: src/protocols/silc/buddy.c:288
+#: src/protocols/silc/buddy.c:293
 #, c-format
 msgid ""
 "Key agreement request received from %s. Would you like to perform the key "
@@ -9024,7 +8866,7 @@
 "Key agreement request received from %s. Would you like to perform the key "
 "agreement?"
 
-#: src/protocols/silc/buddy.c:292
+#: src/protocols/silc/buddy.c:297
 #, c-format
 msgid ""
 "The remote user is waiting key agreement on:\n"
@@ -9035,59 +8877,59 @@
 "Remote host: %s\n"
 "Remote port: %d"
 
-#: src/protocols/silc/buddy.c:305
+#: src/protocols/silc/buddy.c:310
 msgid "Key Agreement Request"
 msgstr "Key Agreement Request"
 
-#: src/protocols/silc/buddy.c:381 src/protocols/silc/buddy.c:416
-#: src/protocols/silc/buddy.c:458
+#: src/protocols/silc/buddy.c:386 src/protocols/silc/buddy.c:421
+#: src/protocols/silc/buddy.c:463
 msgid "IM With Password"
 msgstr "IM With Password"
 
-#: src/protocols/silc/buddy.c:417
+#: src/protocols/silc/buddy.c:422
 msgid "Cannot set IM key"
 msgstr "Cannot set IM key"
 
-#: src/protocols/silc/buddy.c:459
+#: src/protocols/silc/buddy.c:464
 msgid "Set IM Password"
 msgstr "Set IM Password"
 
-#: src/protocols/silc/buddy.c:506 src/protocols/silc/buddy.c:541
-#: src/protocols/silc/ops.c:1284 src/protocols/silc/ops.c:1295
+#: src/protocols/silc/buddy.c:511 src/protocols/silc/buddy.c:546
+#: src/protocols/silc/ops.c:1278 src/protocols/silc/ops.c:1289
 msgid "Get Public Key"
 msgstr "Get Public Key"
 
-#: src/protocols/silc/buddy.c:542 src/protocols/silc/ops.c:1285
-#: src/protocols/silc/ops.c:1296
+#: src/protocols/silc/buddy.c:547 src/protocols/silc/ops.c:1279
+#: src/protocols/silc/ops.c:1290
 msgid "Cannot fetch the public key"
 msgstr "Cannot fetch the public key"
 
-#: src/protocols/silc/buddy.c:629 src/protocols/silc/buddy.c:1553
+#: src/protocols/silc/buddy.c:634 src/protocols/silc/buddy.c:1583
 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:234
+#: src/protocols/silc/buddy.c:635 src/protocols/silc/buddy.c:994
+#: src/protocols/silc/chat.c:235
 msgid "Could not load public key"
 msgstr "Could not load public key"
 
-#: src/protocols/silc/buddy.c:707 src/protocols/silc/ops.c:871
-#: src/protocols/silc/ops.c:943 src/protocols/silc/ops.c:1078
-#: src/protocols/silc/ops.c:1079 src/protocols/silc/ops.c:1098
+#: src/protocols/silc/buddy.c:712 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:1099
 msgid "User Information"
 msgstr "User Information"
 
-#: src/protocols/silc/buddy.c:708 src/protocols/silc/ops.c:944
-#: src/protocols/silc/ops.c:1099
+#: src/protocols/silc/buddy.c:713 src/protocols/silc/ops.c:946
+#: src/protocols/silc/ops.c:1100
 msgid "Cannot get user information"
 msgstr "Cannot get user information"
 
-#: src/protocols/silc/buddy.c:729
+#: src/protocols/silc/buddy.c:734
 #, c-format
 msgid "The %s buddy is not trusted"
 msgstr "The %s buddy is not trusted"
 
-#: src/protocols/silc/buddy.c:732
+#: src/protocols/silc/buddy.c:737
 msgid ""
 "You cannot receive buddy notifications until you import his/her public key.  "
 "You can use the Get Public Key command to get the public key."
@@ -9096,16 +8938,16 @@
 "You can use the Get Public Key command to get the public key."
 
 #. Open file selector to select the public key.
-#: src/protocols/silc/buddy.c:1023
+#: src/protocols/silc/buddy.c:1028
 msgid "Open..."
 msgstr "Open..."
 
-#: src/protocols/silc/buddy.c:1032
+#: src/protocols/silc/buddy.c:1037
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr "The %s buddy is not present in the network"
 
-#: src/protocols/silc/buddy.c:1035
+#: src/protocols/silc/buddy.c:1040
 msgid ""
 "To add the buddy you must import his/her public key. Press Import to import "
 "a public key."
@@ -9113,15 +8955,15 @@
 "To add the buddy you must import their public key. Press Import to import a "
 "public key."
 
-#: src/protocols/silc/buddy.c:1038
+#: src/protocols/silc/buddy.c:1043
 msgid "Import..."
 msgstr "Import..."
 
-#: src/protocols/silc/buddy.c:1125
+#: src/protocols/silc/buddy.c:1130
 msgid "Select correct user"
 msgstr "Select correct user"
 
-#: src/protocols/silc/buddy.c:1127
+#: src/protocols/silc/buddy.c:1132
 msgid ""
 "More than one user was found with the same public key. Select the correct "
 "user from the list to add to the buddy list."
@@ -9129,7 +8971,7 @@
 "More than one user was found with the same public key. Select the correct "
 "user from the list to add to the buddy list."
 
-#: src/protocols/silc/buddy.c:1129
+#: src/protocols/silc/buddy.c:1134
 msgid ""
 "More than one user was found with the same name. Select the correct user "
 "from the list to add to the buddy list."
@@ -9137,216 +8979,213 @@
 "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:1386
+#: src/protocols/silc/buddy.c:1415
 msgid "Detached"
 msgstr "Detached"
 
-#: src/protocols/silc/buddy.c:1390 src/protocols/silc/silc.c:49
-#: src/protocols/silc/silc.c:85
+#: src/protocols/silc/buddy.c:1419 src/protocols/silc/silc.c:56
 msgid "Indisposed"
 msgstr "Indisposed"
 
-#: src/protocols/silc/buddy.c:1394 src/protocols/silc/silc.c:50
-#: src/protocols/silc/silc.c:87
+#: src/protocols/silc/buddy.c:1423 src/protocols/silc/silc.c:58
 msgid "Wake Me Up"
 msgstr "Wake Me Up"
 
-#: src/protocols/silc/buddy.c:1396 src/protocols/silc/silc.c:46
-#: src/protocols/silc/silc.c:79
+#: src/protocols/silc/buddy.c:1425 src/protocols/silc/silc.c:50
 msgid "Hyper Active"
 msgstr "Hyper Active"
 
-#: src/protocols/silc/buddy.c:1398
+#: src/protocols/silc/buddy.c:1427
 msgid "Robot"
 msgstr "Robot"
 
-#: src/protocols/silc/buddy.c:1405 src/protocols/silc/silc.c:629
+#: src/protocols/silc/buddy.c:1434 src/protocols/silc/silc.c:634
 #: src/protocols/silc/util.c:472
 msgid "Happy"
 msgstr "Happy"
 
-#: src/protocols/silc/buddy.c:1407 src/protocols/silc/silc.c:631
+#: src/protocols/silc/buddy.c:1436 src/protocols/silc/silc.c:636
 #: src/protocols/silc/util.c:474
 msgid "Sad"
 msgstr "Sad"
 
-#: src/protocols/silc/buddy.c:1409 src/protocols/silc/silc.c:633
+#: src/protocols/silc/buddy.c:1438 src/protocols/silc/silc.c:638
 #: src/protocols/silc/util.c:476
 msgid "Angry"
 msgstr "Angry"
 
-#: src/protocols/silc/buddy.c:1411 src/protocols/silc/silc.c:635
+#: src/protocols/silc/buddy.c:1440 src/protocols/silc/silc.c:640
 #: src/protocols/silc/util.c:478
 msgid "Jealous"
 msgstr "Jealous"
 
-#: src/protocols/silc/buddy.c:1413 src/protocols/silc/silc.c:637
+#: src/protocols/silc/buddy.c:1442 src/protocols/silc/silc.c:642
 #: src/protocols/silc/util.c:480
 msgid "Ashamed"
 msgstr "Ashamed"
 
-#: src/protocols/silc/buddy.c:1415 src/protocols/silc/silc.c:639
+#: src/protocols/silc/buddy.c:1444 src/protocols/silc/silc.c:644
 #: src/protocols/silc/util.c:482
 msgid "Invincible"
 msgstr "Invincible"
 
-#: src/protocols/silc/buddy.c:1417 src/protocols/silc/silc.c:641
+#: src/protocols/silc/buddy.c:1446 src/protocols/silc/silc.c:646
 #: src/protocols/silc/util.c:484
 msgid "In Love"
 msgstr "In Love"
 
-#: src/protocols/silc/buddy.c:1419 src/protocols/silc/silc.c:643
+#: src/protocols/silc/buddy.c:1448 src/protocols/silc/silc.c:648
 #: src/protocols/silc/util.c:486
 msgid "Sleepy"
 msgstr "Sleepy"
 
-#: src/protocols/silc/buddy.c:1421 src/protocols/silc/silc.c:645
+#: src/protocols/silc/buddy.c:1450 src/protocols/silc/silc.c:650
 #: src/protocols/silc/util.c:488
 msgid "Bored"
 msgstr "Bored"
 
-#: src/protocols/silc/buddy.c:1423 src/protocols/silc/silc.c:647
+#: src/protocols/silc/buddy.c:1452 src/protocols/silc/silc.c:652
 #: src/protocols/silc/util.c:490
 msgid "Excited"
 msgstr "Excited"
 
-#: src/protocols/silc/buddy.c:1425 src/protocols/silc/silc.c:649
+#: src/protocols/silc/buddy.c:1454 src/protocols/silc/silc.c:654
 #: src/protocols/silc/util.c:492
 msgid "Anxious"
 msgstr "Anxious"
 
-#: src/protocols/silc/buddy.c:1457 src/protocols/silc/ops.c:980
+#: src/protocols/silc/buddy.c:1486 src/protocols/silc/ops.c:982
 msgid "User Modes"
 msgstr "User Modes"
 
-#: src/protocols/silc/buddy.c:1466 src/protocols/silc/ops.c:989
+#: src/protocols/silc/buddy.c:1495 src/protocols/silc/ops.c:991
 msgid "Mood"
 msgstr "Mood"
 
-#: src/protocols/silc/buddy.c:1470 src/protocols/silc/ops.c:995
+#: src/protocols/silc/buddy.c:1499 src/protocols/silc/ops.c:997
 msgid "Status Text"
 msgstr "Status Text"
 
-#: src/protocols/silc/buddy.c:1475 src/protocols/silc/ops.c:1001
+#: src/protocols/silc/buddy.c:1504 src/protocols/silc/ops.c:1003
 msgid "Preferred Contact"
 msgstr "Preferred Contact"
 
-#: src/protocols/silc/buddy.c:1480 src/protocols/silc/ops.c:1006
+#: src/protocols/silc/buddy.c:1509 src/protocols/silc/ops.c:1008
 msgid "Preferred Language"
 msgstr "Preferred Language"
 
-#: src/protocols/silc/buddy.c:1485 src/protocols/silc/ops.c:1011
+#: src/protocols/silc/buddy.c:1514 src/protocols/silc/ops.c:1013
 msgid "Device"
 msgstr "Device"
 
-#: src/protocols/silc/buddy.c:1490 src/protocols/silc/ops.c:1016
-#: src/protocols/silc/silc.c:697 src/protocols/silc/silc.c:699
+#: src/protocols/silc/buddy.c:1519 src/protocols/silc/ops.c:1018
+#: src/protocols/silc/silc.c:702 src/protocols/silc/silc.c:704
 msgid "Timezone"
 msgstr "Timezone"
 
-#: src/protocols/silc/buddy.c:1495 src/protocols/silc/ops.c:1021
+#: src/protocols/silc/buddy.c:1524 src/protocols/silc/ops.c:1023
 msgid "Geolocation"
 msgstr "Geolocation"
 
-#: src/protocols/silc/buddy.c:1538
+#: src/protocols/silc/buddy.c:1567
 msgid "Reset IM Key"
 msgstr "Reset IM Key"
 
-#: src/protocols/silc/buddy.c:1543
+#: src/protocols/silc/buddy.c:1572
 msgid "IM with Key Exchange"
 msgstr "IM with Key Exchange"
 
-#: src/protocols/silc/buddy.c:1547
+#: src/protocols/silc/buddy.c:1576
 msgid "IM with Password"
 msgstr "IM with Password"
 
-#: src/protocols/silc/buddy.c:1558
+#: src/protocols/silc/buddy.c:1588
 msgid "Get Public Key..."
 msgstr "Get Public Key..."
 
-#: src/protocols/silc/buddy.c:1564 src/protocols/silc/ops.c:1417
+#: src/protocols/silc/buddy.c:1595 src/protocols/silc/ops.c:1409
 msgid "Kill User"
 msgstr "Kill User"
 
-#: src/protocols/silc/chat.c:37
+#: src/protocols/silc/chat.c:38
 msgid "_Passphrase:"
 msgstr "_Passphrase:"
 
-#: src/protocols/silc/chat.c:78
+#: src/protocols/silc/chat.c:79
 #, 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:79 src/protocols/silc/chat.c:171
+#: src/protocols/silc/chat.c:80 src/protocols/silc/chat.c:172
 msgid "Channel Information"
 msgstr "Channel Information"
 
-#: src/protocols/silc/chat.c:80
+#: src/protocols/silc/chat.c:81
 msgid "Cannot get channel information"
 msgstr "Cannot get channel information"
 
-#: src/protocols/silc/chat.c:117
+#: src/protocols/silc/chat.c:118
 #, c-format
 msgid "<b>Channel Name:</b> %s"
 msgstr "<b>Channel Name:</b> %s"
 
-#: src/protocols/silc/chat.c:120
+#: src/protocols/silc/chat.c:121
 #, c-format
 msgid "<br><b>User Count:</b> %d"
 msgstr "<br><b>User Count:</b> %d"
 
-#: src/protocols/silc/chat.c:127
+#: src/protocols/silc/chat.c:128
 #, c-format
 msgid "<br><b>Channel Founder:</b> %s"
 msgstr "<br><b>Channel Founder:</b> %s"
 
-#: src/protocols/silc/chat.c:136
+#: src/protocols/silc/chat.c:137
 #, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
 msgstr "<br><b>Channel Cipher:</b> %s"
 
-#: src/protocols/silc/chat.c:139
+#: src/protocols/silc/chat.c:140
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
 msgstr "<br><b>Channel HMAC:</b> %s"
 
-#: src/protocols/silc/chat.c:144
+#: src/protocols/silc/chat.c:145
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>Channel Topic:</b><br>%s"
 
-#: src/protocols/silc/chat.c:149
+#: src/protocols/silc/chat.c:150
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>Channel Modes:</b> "
 
-#: src/protocols/silc/chat.c:162
+#: src/protocols/silc/chat.c:163
 #, 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:163
+#: src/protocols/silc/chat.c:164
 #, 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:233
+#: src/protocols/silc/chat.c:234
 msgid "Add Channel Public Key"
 msgstr "Add Channel Public Key"
 
 #. Add new public key
-#: src/protocols/silc/chat.c:288
+#: src/protocols/silc/chat.c:289
 msgid "Open Public Key..."
 msgstr "Open Public Key..."
 
-#: src/protocols/silc/chat.c:397
+#: src/protocols/silc/chat.c:398
 msgid "Channel Passphrase"
 msgstr "Channel Passphrase"
 
-#: src/protocols/silc/chat.c:404
+#: src/protocols/silc/chat.c:405
 msgid "Channel Public Keys List"
 msgstr "Channel Public Keys List"
 
-#: src/protocols/silc/chat.c:409
+#: src/protocols/silc/chat.c:410
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -9360,123 +9199,123 @@
 "channel public keys are set then only users whose public keys are listed are "
 "able to join."
 
-#: 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
+#: 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
 msgid "Channel Authentication"
 msgstr "Channel Authentication"
 
-#: src/protocols/silc/chat.c:420 src/protocols/silc/chat.c:458
+#: src/protocols/silc/chat.c:421 src/protocols/silc/chat.c:459
 msgid "Add / Remove"
 msgstr "Add / Remove"
 
-#: src/protocols/silc/chat.c:575
+#: src/protocols/silc/chat.c:576
 msgid "Group Name"
 msgstr "Group name"
 
-#: src/protocols/silc/chat.c:579 src/protocols/silc/ops.c:1697
+#: src/protocols/silc/chat.c:580 src/protocols/silc/ops.c:1694
 msgid "Passphrase"
 msgstr "Passphrase"
 
-#: src/protocols/silc/chat.c:590
+#: src/protocols/silc/chat.c:591
 #, 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:592
+#: src/protocols/silc/chat.c:593
 msgid "Add Channel Private Group"
 msgstr "Add Channel Private Group"
 
-#: src/protocols/silc/chat.c:719
+#: src/protocols/silc/chat.c:720
 msgid "User Limit"
 msgstr "User Limit"
 
-#: src/protocols/silc/chat.c:720
+#: src/protocols/silc/chat.c:721
 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:862
+#: src/protocols/silc/chat.c:863
 msgid "Get Info"
 msgstr "Get Info"
 
-#: src/protocols/silc/chat.c:869
+#: src/protocols/silc/chat.c:871
 msgid "Invite List"
 msgstr "Invite List"
 
-#: src/protocols/silc/chat.c:873
+#: src/protocols/silc/chat.c:876
 msgid "Ban List"
 msgstr "Ban List"
 
-#: src/protocols/silc/chat.c:880
+#: src/protocols/silc/chat.c:884
 msgid "Add Private Group"
 msgstr "Add Private Group"
 
-#: src/protocols/silc/chat.c:891
+#: src/protocols/silc/chat.c:897
 msgid "Reset Permanent"
 msgstr "Reset Permanent"
 
-#: src/protocols/silc/chat.c:895
+#: src/protocols/silc/chat.c:902
 msgid "Set Permanent"
 msgstr "Set Permanent"
 
-#: src/protocols/silc/chat.c:902
+#: src/protocols/silc/chat.c:910
 msgid "Set User Limit"
 msgstr "Set User Limit"
 
-#: src/protocols/silc/chat.c:907
+#: src/protocols/silc/chat.c:916
 msgid "Reset Topic Restriction"
 msgstr "Reset Topic Restriction"
 
-#: src/protocols/silc/chat.c:911
+#: src/protocols/silc/chat.c:921
 msgid "Set Topic Restriction"
 msgstr "Set Topic Restriction"
 
-#: src/protocols/silc/chat.c:917
+#: src/protocols/silc/chat.c:928
 msgid "Reset Private Channel"
 msgstr "Reset Private Channel"
 
-#: src/protocols/silc/chat.c:921
+#: src/protocols/silc/chat.c:933
 msgid "Set Private Channel"
 msgstr "Set Private Channel"
 
-#: src/protocols/silc/chat.c:927
+#: src/protocols/silc/chat.c:940
 msgid "Reset Secret Channel"
 msgstr "Reset Secret Channel"
 
-#: src/protocols/silc/chat.c:931
+#: src/protocols/silc/chat.c:945
 msgid "Set Secret Channel"
 msgstr "Set Secret Channel"
 
-#: src/protocols/silc/chat.c:993
+#: src/protocols/silc/chat.c:1008
 #, 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:997
+#: src/protocols/silc/chat.c:1012
 #, 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:1056
+#: src/protocols/silc/chat.c:1071
 #, 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:1058
+#: src/protocols/silc/chat.c:1073
 msgid "Join Private Group"
 msgstr "Join Private Group"
 
-#: src/protocols/silc/chat.c:1059
+#: src/protocols/silc/chat.c:1074
 msgid "Cannot join private group"
 msgstr "Cannot join private group"
 
-#: src/protocols/silc/chat.c:1252 src/protocols/silc/silc.c:911
+#: src/protocols/silc/chat.c:1267 src/protocols/silc/silc.c:917
 msgid "Cannot call command"
 msgstr "Cannot call command"
 
-#: src/protocols/silc/chat.c:1253 src/protocols/silc/silc.c:912
+#: src/protocols/silc/chat.c:1268 src/protocols/silc/silc.c:918
 msgid "Unknown command"
 msgstr "Unknown command"
 
@@ -9503,7 +9342,8 @@
 msgstr "Key agreement failed"
 
 #: src/protocols/silc/ft.c:102
-msgid "File transfer sessions does not exist"
+#, fuzzy
+msgid "File transfer session does not exist"
 msgstr "File transfer sessions does not exist"
 
 #: src/protocols/silc/ft.c:206
@@ -9526,102 +9366,102 @@
 msgid "Cannot send file"
 msgstr "Cannot send file"
 
-#: src/protocols/silc/ops.c:339 src/protocols/silc/ops.c:348
-#: src/protocols/silc/ops.c:357
+#: src/protocols/silc/ops.c:341 src/protocols/silc/ops.c:350
+#: src/protocols/silc/ops.c:359
 #, 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:423
+#: src/protocols/silc/ops.c:425
 #, 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:427
+#: src/protocols/silc/ops.c:429
 #, 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:460
+#: src/protocols/silc/ops.c:462
 #, 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:468
+#: src/protocols/silc/ops.c:470
 #, 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:497
+#: src/protocols/silc/ops.c:499
 #, 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:527 src/protocols/silc/ops.c:532
-#: src/protocols/silc/ops.c:537
+#: src/protocols/silc/ops.c:529 src/protocols/silc/ops.c:534
+#: src/protocols/silc/ops.c:539
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr "You have been killed by %s (%s)"
 
-#: src/protocols/silc/ops.c:558 src/protocols/silc/ops.c:563
-#: src/protocols/silc/ops.c:568
+#: src/protocols/silc/ops.c:560 src/protocols/silc/ops.c:565
+#: src/protocols/silc/ops.c:570
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr "Killed by %s (%s)"
 
-#: src/protocols/silc/ops.c:614
+#: src/protocols/silc/ops.c:616
 msgid "Server signoff"
 msgstr "Server signoff"
 
-#: src/protocols/silc/ops.c:801
+#: src/protocols/silc/ops.c:803
 msgid "Personal Information"
 msgstr "Personal Information"
 
-#: src/protocols/silc/ops.c:824
+#: src/protocols/silc/ops.c:826
 msgid "Birth Day"
 msgstr "Birth Day"
 
-#: src/protocols/silc/ops.c:828
+#: src/protocols/silc/ops.c:830
 msgid "Job Title"
 msgstr "Job Title"
 
-#: src/protocols/silc/ops.c:832
+#: src/protocols/silc/ops.c:834
 msgid "Job Role"
 msgstr "Job Role"
 
-#: src/protocols/silc/ops.c:836
+#: src/protocols/silc/ops.c:838
 msgid "Organization"
 msgstr "Organisation"
 
-#: src/protocols/silc/ops.c:840
+#: src/protocols/silc/ops.c:842
 msgid "Unit"
 msgstr "Unit"
 
-#: src/protocols/silc/ops.c:859
+#: src/protocols/silc/ops.c:861
 msgid "EMail"
 msgstr "E-Mail"
 
-#: src/protocols/silc/ops.c:864
+#: src/protocols/silc/ops.c:866
 msgid "Note"
 msgstr "Note"
 
-#: src/protocols/silc/ops.c:912
+#: src/protocols/silc/ops.c:914
 msgid "Join Chat"
 msgstr "Join Chat"
 
-#: src/protocols/silc/ops.c:1068 src/protocols/silc/ops.c:1139
+#: src/protocols/silc/ops.c:1070 src/protocols/silc/ops.c:1140
 msgid "Public Key Fingerprint"
 msgstr "Public Key Fingerprint"
 
-#: src/protocols/silc/ops.c:1069 src/protocols/silc/ops.c:1140
+#: src/protocols/silc/ops.c:1071 src/protocols/silc/ops.c:1141
 msgid "Public Key Babbleprint"
 msgstr "Public Key Babbleprint"
 
-#: src/protocols/silc/ops.c:1082
+#: src/protocols/silc/ops.c:1084
 msgid "More..."
 msgstr "More..."
 
-#: src/protocols/silc/ops.c:1155 src/protocols/silc/silc.c:800
+#: src/protocols/silc/ops.c:1155 src/protocols/silc/silc.c:805
 msgid "Detach From Server"
 msgstr "Detach From Server"
 
@@ -9633,43 +9473,43 @@
 msgid "Cannot set topic"
 msgstr "Cannot set topic"
 
-#: src/protocols/silc/ops.c:1204
+#: src/protocols/silc/ops.c:1198
 msgid "Failed to change nickname"
 msgstr "Failed to change nickname"
 
-#: src/protocols/silc/ops.c:1241 src/protocols/silc/ops.c:1252
+#: src/protocols/silc/ops.c:1246
 msgid "Roomlist"
 msgstr "Room List"
 
-#: src/protocols/silc/ops.c:1241 src/protocols/silc/ops.c:1252
+#: src/protocols/silc/ops.c:1246
 msgid "Cannot get room list"
 msgstr "Cannot get room list"
 
-#: src/protocols/silc/ops.c:1297
+#: src/protocols/silc/ops.c:1291
 msgid "No public key was received"
 msgstr "No public key was received"
 
-#: src/protocols/silc/ops.c:1310 src/protocols/silc/ops.c:1324
+#: src/protocols/silc/ops.c:1304 src/protocols/silc/ops.c:1317
 msgid "Server Information"
 msgstr "Server Information"
 
-#: src/protocols/silc/ops.c:1311
+#: src/protocols/silc/ops.c:1305
 msgid "Cannot get server information"
 msgstr "Cannot get server information"
 
-#: src/protocols/silc/ops.c:1342 src/protocols/silc/ops.c:1351
+#: src/protocols/silc/ops.c:1334 src/protocols/silc/ops.c:1343
 msgid "Server Statistics"
 msgstr "Server Statistics"
 
-#: src/protocols/silc/ops.c:1343
+#: src/protocols/silc/ops.c:1335
 msgid "Cannot get server statistics"
 msgstr "Cannot get server statistics"
 
-#: src/protocols/silc/ops.c:1352
+#: src/protocols/silc/ops.c:1344
 msgid "No server statistics available"
 msgstr "No server statistics available"
 
-#: src/protocols/silc/ops.c:1374
+#: src/protocols/silc/ops.c:1366
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -9704,98 +9544,98 @@
 "Total server operators: %d\n"
 "Total router operators: %d\n"
 
-#: src/protocols/silc/ops.c:1397
+#: src/protocols/silc/ops.c:1389
 msgid "Network Statistics"
 msgstr "Network Statistics"
 
-#: src/protocols/silc/ops.c:1405 src/protocols/silc/ops.c:1410
+#: src/protocols/silc/ops.c:1397 src/protocols/silc/ops.c:1402
 msgid "Ping"
 msgstr "Ping"
 
-#: src/protocols/silc/ops.c:1405
+#: src/protocols/silc/ops.c:1397
 msgid "Ping failed"
 msgstr "Ping failed"
 
-#: src/protocols/silc/ops.c:1410
+#: src/protocols/silc/ops.c:1402
 msgid "Ping reply received from server"
 msgstr "Ping reply received from server"
 
-#: src/protocols/silc/ops.c:1418
+#: src/protocols/silc/ops.c:1410
 msgid "Could not kill user"
 msgstr "Could not kill user"
 
-#: src/protocols/silc/ops.c:1499
+#: src/protocols/silc/ops.c:1494
 msgid "Error during connecting to SILC Server"
 msgstr "Error during connecting to SILC Server"
 
-#: src/protocols/silc/ops.c:1504
+#: src/protocols/silc/ops.c:1499
 msgid "Key Exchange failed"
 msgstr "Key Exchange failed"
 
-#: src/protocols/silc/ops.c:1513
+#: src/protocols/silc/ops.c:1508
 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:1548
+#: src/protocols/silc/ops.c:1543
 msgid "Disconnected by server"
 msgstr "Disconnected by server"
 
-#: src/protocols/silc/ops.c:1608 src/protocols/silc/ops.c:1655
-#: src/protocols/silc/silc.c:178
+#: src/protocols/silc/ops.c:1605 src/protocols/silc/ops.c:1652
+#: src/protocols/silc/silc.c:194
 msgid "Resuming session"
 msgstr "Resuming session"
 
-#: src/protocols/silc/ops.c:1610
+#: src/protocols/silc/ops.c:1607
 msgid "Authenticating connection"
 msgstr "Authenticating connection"
 
-#: src/protocols/silc/ops.c:1657
+#: src/protocols/silc/ops.c:1654
 msgid "Verifying server public key"
 msgstr "Verifying server public key"
 
-#: src/protocols/silc/ops.c:1698
+#: src/protocols/silc/ops.c:1695
 msgid "Passphrase required"
 msgstr "Passphrase required"
 
-#: src/protocols/silc/ops.c:1727
+#: src/protocols/silc/ops.c:1724
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Failure: Version mismatch, upgrade your client"
 
-#: src/protocols/silc/ops.c:1730
+#: src/protocols/silc/ops.c:1727
 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:1733
+#: src/protocols/silc/ops.c:1730
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "Failure: Remote does not support proposed KE group"
 
-#: src/protocols/silc/ops.c:1736
+#: src/protocols/silc/ops.c:1733
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "Failure: Remote does not support proposed cipher"
 
-#: src/protocols/silc/ops.c:1739
+#: src/protocols/silc/ops.c:1736
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "Failure: Remote does not support proposed PKCS"
 
-#: src/protocols/silc/ops.c:1742
+#: src/protocols/silc/ops.c:1739
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "Failure: Remote does not support proposed hash function"
 
-#: src/protocols/silc/ops.c:1745
+#: src/protocols/silc/ops.c:1742
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "Failure: Remote does not support proposed HMAC"
 
-#: src/protocols/silc/ops.c:1747
+#: src/protocols/silc/ops.c:1744
 msgid "Failure: Incorrect signature"
 msgstr "Failure: Incorrect signature"
 
-#: src/protocols/silc/ops.c:1749
+#: src/protocols/silc/ops.c:1746
 msgid "Failure: Invalid cookie"
 msgstr "Failure: Invalid cookie"
 
-#: src/protocols/silc/ops.c:1760
+#: src/protocols/silc/ops.c:1757
 msgid "Failure: Authentication failed"
 msgstr "Failure: Authentication failed"
 
@@ -9838,36 +9678,36 @@
 msgid "Unsupported public key type"
 msgstr "Unsupported public key type"
 
-#: src/protocols/silc/silc.c:138
+#: src/protocols/silc/silc.c:154
 msgid "Connection failed"
 msgstr "Connection failed"
 
-#: src/protocols/silc/silc.c:170
+#: src/protocols/silc/silc.c:186
 msgid "Cannot initialize SILC Client connection"
 msgstr "Cannot initialise SILC Client connection"
 
-#: src/protocols/silc/silc.c:181
+#: src/protocols/silc/silc.c:197
 msgid "Performing key exchange"
 msgstr "Performing key exchange"
 
-#: src/protocols/silc/silc.c:254
+#: src/protocols/silc/silc.c:270
 msgid "Out of memory"
 msgstr "Out of memory"
 
 #. Progress
-#: src/protocols/silc/silc.c:293
+#: src/protocols/silc/silc.c:309
 msgid "Connecting to SILC Server"
 msgstr "Connecting to SILC Server"
 
-#: src/protocols/silc/silc.c:625
+#: src/protocols/silc/silc.c:630
 msgid "Your Current Mood"
 msgstr "Your Current Mood"
 
-#: src/protocols/silc/silc.c:627
+#: src/protocols/silc/silc.c:632
 msgid "Normal"
 msgstr "Normal"
 
-#: src/protocols/silc/silc.c:652
+#: src/protocols/silc/silc.c:657
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9875,43 +9715,43 @@
 "\n"
 "Your Preferred Contact Methods"
 
-#: src/protocols/silc/silc.c:660 src/protocols/silc/util.c:517
+#: src/protocols/silc/silc.c:665 src/protocols/silc/util.c:517
 msgid "SMS"
 msgstr "SMS"
 
-#: src/protocols/silc/silc.c:662 src/protocols/silc/util.c:519
+#: src/protocols/silc/silc.c:667 src/protocols/silc/util.c:519
 msgid "MMS"
 msgstr "MMS"
 
-#: src/protocols/silc/silc.c:664 src/protocols/silc/util.c:521
+#: src/protocols/silc/silc.c:669 src/protocols/silc/util.c:521
 msgid "Video Conferencing"
 msgstr "Video Conferencing"
 
-#: src/protocols/silc/silc.c:669
+#: src/protocols/silc/silc.c:674
 msgid "Your Current Status"
 msgstr "Your Current Status"
 
-#: src/protocols/silc/silc.c:676
+#: src/protocols/silc/silc.c:681
 msgid "Online Services"
 msgstr "Online Services"
 
-#: src/protocols/silc/silc.c:679
+#: src/protocols/silc/silc.c:684
 msgid "Let others see what services you are using"
 msgstr "Let others see what services you are using"
 
-#: src/protocols/silc/silc.c:685
+#: src/protocols/silc/silc.c:690
 msgid "Let others see what computer you are using"
 msgstr "Let others see what computer you are using"
 
-#: src/protocols/silc/silc.c:692
+#: src/protocols/silc/silc.c:697
 msgid "Your VCard File"
 msgstr "Your VCard File"
 
-#: src/protocols/silc/silc.c:705 src/protocols/silc/silc.c:706
+#: src/protocols/silc/silc.c:710 src/protocols/silc/silc.c:711
 msgid "User Online Status Attributes"
 msgstr "User Online Status Attributes"
 
-#: src/protocols/silc/silc.c:707
+#: src/protocols/silc/silc.c:712
 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 "
@@ -9921,131 +9761,127 @@
 "information. Please fill the information you would like other users to see "
 "about yourself."
 
-#: src/protocols/silc/silc.c:747 src/protocols/silc/silc.c:753
-#: src/protocols/silc/silc.c:1160
+#: src/protocols/silc/silc.c:752 src/protocols/silc/silc.c:758
+#: src/protocols/silc/silc.c:1162
 msgid "Message of the Day"
 msgstr "Message of the Day"
 
-#: src/protocols/silc/silc.c:747
+#: src/protocols/silc/silc.c:752
 msgid "No Message of the Day available"
 msgstr "No Message of the Day available"
 
-#: src/protocols/silc/silc.c:748 src/protocols/silc/silc.c:1155
+#: src/protocols/silc/silc.c:753 src/protocols/silc/silc.c:1157
 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:795
+#: src/protocols/silc/silc.c:800
 msgid "Online Status"
 msgstr "Online Status"
 
-#: src/protocols/silc/silc.c:804
+#: src/protocols/silc/silc.c:809
 msgid "View Message of the Day"
 msgstr "View Message of the Day"
 
-#: src/protocols/silc/silc.c:876
+#: src/protocols/silc/silc.c:882
 #, 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:985
-msgid "Failed to leave channel"
-msgstr "Failed to leave channel"
-
-#: src/protocols/silc/silc.c:1031
+#: src/protocols/silc/silc.c:1033
 msgid "Topic too long"
 msgstr "Topic too long."
 
-#: src/protocols/silc/silc.c:1112
+#: src/protocols/silc/silc.c:1114
 msgid "You must specify a nick"
 msgstr "You must specify a nick"
 
-#: src/protocols/silc/silc.c:1214
+#: src/protocols/silc/silc.c:1216
 #, c-format
 msgid "channel %s not found"
 msgstr "channel %s not found"
 
-#: src/protocols/silc/silc.c:1219
+#: src/protocols/silc/silc.c:1221
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "channel modes for %s: %s"
 
-#: src/protocols/silc/silc.c:1221
+#: src/protocols/silc/silc.c:1223
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "no channel modes are set on %s"
 
-#: src/protocols/silc/silc.c:1234
+#: src/protocols/silc/silc.c:1236
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "Failed to set cmodes for %s"
 
-#: src/protocols/silc/silc.c:1264
+#: src/protocols/silc/silc.c:1266
 #, 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:1327
+#: src/protocols/silc/silc.c:1329
 msgid "part [channel]:  Leave the chat"
 msgstr "part [channel]:  Leave the chat"
 
-#: src/protocols/silc/silc.c:1331
+#: src/protocols/silc/silc.c:1333
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [channel]:  Leave the chat"
 
-#: src/protocols/silc/silc.c:1335
+#: src/protocols/silc/silc.c:1337
 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:1340
+#: src/protocols/silc/silc.c:1342
 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:1344
+#: src/protocols/silc/silc.c:1346
 msgid "list:  List channels on this network"
 msgstr "list:  List channels on this network"
 
-#: src/protocols/silc/silc.c:1348
+#: src/protocols/silc/silc.c:1350
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;nick&gt;:  View nick's information"
 
-#: src/protocols/silc/silc.c:1352 src/protocols/zephyr/zephyr.c:2466
+#: src/protocols/silc/silc.c:1354 src/protocols/zephyr/zephyr.c:2597
 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:1356
+#: src/protocols/silc/silc.c:1358
 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:1360
+#: src/protocols/silc/silc.c:1362
 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:1364
+#: src/protocols/silc/silc.c:1366
 msgid "detach:  Detach this session"
 msgstr "detach:  Detach this session"
 
-#: src/protocols/silc/silc.c:1368
+#: src/protocols/silc/silc.c:1370
 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:1372
+#: src/protocols/silc/silc.c:1374
 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:1378
+#: src/protocols/silc/silc.c:1380
 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:1382
+#: src/protocols/silc/silc.c:1384
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;newnick&gt;:  Change your nickname"
 
-#: src/protocols/silc/silc.c:1386
+#: src/protocols/silc/silc.c:1388
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;nick&gt;:  View nick's information"
 
-#: src/protocols/silc/silc.c:1390
+#: src/protocols/silc/silc.c:1392
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
@@ -10053,7 +9889,7 @@
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
 
-#: src/protocols/silc/silc.c:1394
+#: src/protocols/silc/silc.c:1396
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
@@ -10061,15 +9897,15 @@
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
 
-#: src/protocols/silc/silc.c:1398
+#: src/protocols/silc/silc.c:1400
 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:1402
+#: src/protocols/silc/silc.c:1404
 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:1406
+#: src/protocols/silc/silc.c:1408
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
@@ -10077,35 +9913,35 @@
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
 
-#: src/protocols/silc/silc.c:1410
+#: src/protocols/silc/silc.c:1412
 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:1414
+#: src/protocols/silc/silc.c:1416
 msgid "info [server]:  View server administrative details"
 msgstr "info [server]:  View server administrative details"
 
-#: src/protocols/silc/silc.c:1418
+#: src/protocols/silc/silc.c:1420
 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:1422
+#: src/protocols/silc/silc.c:1424
 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:1426
+#: src/protocols/silc/silc.c:1428
 msgid "stats:  View server and network statistics"
 msgstr "stats:  View server and network statistics"
 
-#: src/protocols/silc/silc.c:1430
+#: src/protocols/silc/silc.c:1432
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:  Send PING to the connected server"
 
-#: src/protocols/silc/silc.c:1435
+#: src/protocols/silc/silc.c:1437
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;channel&gt;:  List users in channel"
 
-#: src/protocols/silc/silc.c:1439
+#: src/protocols/silc/silc.c:1441
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -10113,27 +9949,27 @@
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
 
-#: src/protocols/silc/silc.c:1451
+#: src/protocols/silc/silc.c:1453
 msgid "Instant Messages"
 msgstr "Instant Messages"
 
-#: src/protocols/silc/silc.c:1456
+#: src/protocols/silc/silc.c:1458
 msgid "Digitally sign all IM messages"
 msgstr "Digitally sign all IM messages"
 
-#: src/protocols/silc/silc.c:1461
+#: src/protocols/silc/silc.c:1463
 msgid "Verify all IM message signatures"
 msgstr "Verify all IM message signatures"
 
-#: src/protocols/silc/silc.c:1464
+#: src/protocols/silc/silc.c:1466
 msgid "Channel Messages"
 msgstr "Channel Messages"
 
-#: src/protocols/silc/silc.c:1469
+#: src/protocols/silc/silc.c:1471
 msgid "Digitally sign all channel messages"
 msgstr "Digitally sign all channel messages"
 
-#: src/protocols/silc/silc.c:1474
+#: src/protocols/silc/silc.c:1476
 msgid "Verify all channel message signatures"
 msgstr "Verify all channel message signatures"
 
@@ -10146,40 +9982,40 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/silc/silc.c:1563
+#: src/protocols/silc/silc.c:1564
 msgid "SILC Protocol Plugin"
 msgstr "SILC Protocol Plugin"
 
 #. *  description
-#: src/protocols/silc/silc.c:1565
+#: src/protocols/silc/silc.c:1566
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Secure Internet Live Conferencing (SILC) Protocol"
 
-#: src/protocols/silc/silc.c:1599
+#: src/protocols/silc/silc.c:1600
 msgid "Public Key file"
 msgstr "Public Key file"
 
-#: src/protocols/silc/silc.c:1603
+#: src/protocols/silc/silc.c:1604
 msgid "Private Key file"
 msgstr "Private Key file"
 
-#: src/protocols/silc/silc.c:1606
+#: src/protocols/silc/silc.c:1607
 msgid "Public key authentication"
 msgstr "Public key authentication"
 
-#: src/protocols/silc/silc.c:1610
+#: src/protocols/silc/silc.c:1611
 msgid "Reject watching by other users"
 msgstr "Reject watching by other users"
 
-#: src/protocols/silc/silc.c:1613
+#: src/protocols/silc/silc.c:1614
 msgid "Block invites"
 msgstr "Block invites"
 
-#: src/protocols/silc/silc.c:1616
+#: src/protocols/silc/silc.c:1617
 msgid "Block IMs without Key Exchange"
 msgstr "Block IMs without Key Exchange"
 
-#: src/protocols/silc/silc.c:1619
+#: src/protocols/silc/silc.c:1620
 msgid "Reject online status attribute requests"
 msgstr "Reject online status attribute requests"
 
@@ -10270,115 +10106,120 @@
 msgid "Terminal"
 msgstr "Terminal"
 
-#: src/protocols/toc/toc.c:137
+#: src/protocols/toc/toc.c:139
 #, c-format
 msgid "Looking up %s"
 msgstr "Looking up %s"
 
-#: src/protocols/toc/toc.c:198
+#: src/protocols/toc/toc.c:148
+#, c-format
+msgid "Connect to %s failed"
+msgstr "Connect to %s failed"
+
+#: src/protocols/toc/toc.c:200
 #, c-format
 msgid "Signon: %s"
 msgstr "Signon: %s"
 
-#: src/protocols/toc/toc.c:480
+#: src/protocols/toc/toc.c:482
 #, c-format
 msgid "Unable to write file %s."
 msgstr "Unable to write file %s."
 
-#: src/protocols/toc/toc.c:483
+#: src/protocols/toc/toc.c:485
 #, c-format
 msgid "Unable to read file %s."
 msgstr "Unable to read file %s."
 
-#: src/protocols/toc/toc.c:486
+#: src/protocols/toc/toc.c:488
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "Message too long, last %s bytes truncated."
 
-#: src/protocols/toc/toc.c:489
+#: src/protocols/toc/toc.c:491
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s not currently logged in."
 
-#: src/protocols/toc/toc.c:492
+#: src/protocols/toc/toc.c:494
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "Warning of %s not allowed."
 
-#: src/protocols/toc/toc.c:495
+#: src/protocols/toc/toc.c:497
 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:498
+#: src/protocols/toc/toc.c:500
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "Chat in %s is not available."
 
-#: src/protocols/toc/toc.c:501
+#: src/protocols/toc/toc.c:503
 #, 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:504
+#: src/protocols/toc/toc.c:506
 #, 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:507
+#: src/protocols/toc/toc.c:509
 #, 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:510
+#: src/protocols/toc/toc.c:512
 msgid "Failure."
 msgstr "Failure."
 
-#: src/protocols/toc/toc.c:513
+#: src/protocols/toc/toc.c:515
 msgid "Too many matches."
 msgstr "Too many matches."
 
-#: src/protocols/toc/toc.c:516
+#: src/protocols/toc/toc.c:518
 msgid "Need more qualifiers."
 msgstr "Need more qualifiers."
 
-#: src/protocols/toc/toc.c:519
+#: src/protocols/toc/toc.c:521
 msgid "Dir service temporarily unavailable."
 msgstr "Dir service temporarily unavailable."
 
-#: src/protocols/toc/toc.c:522
+#: src/protocols/toc/toc.c:524
 msgid "Email lookup restricted."
 msgstr "Email lookup restricted."
 
-#: src/protocols/toc/toc.c:525
+#: src/protocols/toc/toc.c:527
 msgid "Keyword ignored."
 msgstr "Keyword ignored."
 
-#: src/protocols/toc/toc.c:528
+#: src/protocols/toc/toc.c:530
 msgid "No keywords."
 msgstr "No keywords."
 
-#: src/protocols/toc/toc.c:531
+#: src/protocols/toc/toc.c:533
 msgid "User has no directory information."
 msgstr "User has no directory information."
 
-#: src/protocols/toc/toc.c:535
+#: src/protocols/toc/toc.c:537
 msgid "Country not supported."
 msgstr "Country not supported."
 
-#: src/protocols/toc/toc.c:538
+#: src/protocols/toc/toc.c:540
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "Failure unknown: %s."
 
-#: src/protocols/toc/toc.c:544
+#: src/protocols/toc/toc.c:546
 msgid "The service is temporarily unavailable."
 msgstr "The service is temporarily unavailable."
 
-#: src/protocols/toc/toc.c:547
+#: src/protocols/toc/toc.c:549
 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:550
+#: src/protocols/toc/toc.c:552
 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."
@@ -10386,37 +10227,42 @@
 "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:552
+#: src/protocols/toc/toc.c:554
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "An unknown signon error has occurred: %s."
 
-#: src/protocols/toc/toc.c:555
+#: src/protocols/toc/toc.c:557
 #, 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:576
+#: src/protocols/toc/toc.c:584
+#, fuzzy
+msgid "Invalid Groupname"
+msgstr "Invalid group"
+
+#: src/protocols/toc/toc.c:668
 msgid "Connection Closed"
 msgstr "Connection Closed"
 
-#: src/protocols/toc/toc.c:616
+#: src/protocols/toc/toc.c:708
 msgid "Waiting for reply..."
 msgstr "Waiting for reply..."
 
-#: src/protocols/toc/toc.c:695
+#: src/protocols/toc/toc.c:786
 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:892
+#: src/protocols/toc/toc.c:989
 msgid "Password Change Successful"
 msgstr "Password Change Successful"
 
-#: src/protocols/toc/toc.c:896
+#: src/protocols/toc/toc.c:993
 msgid "TOC has sent a PAUSE command."
 msgstr "TOC has sent a PAUSE command."
 
-#: src/protocols/toc/toc.c:897
+#: src/protocols/toc/toc.c:994
 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 "
@@ -10426,44 +10272,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:1450
+#: src/protocols/toc/toc.c:1549
 msgid "Get Dir Info"
 msgstr "Get Dir Info"
 
-#: src/protocols/toc/toc.c:1586
+#: src/protocols/toc/toc.c:1689
 msgid "Set Dir Info"
 msgstr "Set Dir Info"
 
-#: src/protocols/toc/toc.c:1708
+#: src/protocols/toc/toc.c:1811
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "Could not open %s for writing!"
 
-#: src/protocols/toc/toc.c:1744
+#: src/protocols/toc/toc.c:1847
 msgid "File transfer failed; other side probably canceled."
 msgstr "File transfer failed; other side probably cancelled."
 
-#: src/protocols/toc/toc.c:1789 src/protocols/toc/toc.c:1829
-#: src/protocols/toc/toc.c:1953 src/protocols/toc/toc.c:2041
+#: src/protocols/toc/toc.c:1892 src/protocols/toc/toc.c:1932
+#: src/protocols/toc/toc.c:2056 src/protocols/toc/toc.c:2144
 msgid "Could not connect for transfer."
 msgstr "Could not connect for transfer."
 
-#: src/protocols/toc/toc.c:1986
+#: src/protocols/toc/toc.c:2089
 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:2086
+#: src/protocols/toc/toc.c:2189
 msgid "Gaim - Save As..."
 msgstr "Gaim - Save As..."
 
-#: src/protocols/toc/toc.c:2120
+#: src/protocols/toc/toc.c:2223
 #, 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:2127
+#: src/protocols/toc/toc.c:2230
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s requests you to send them a file"
@@ -10478,140 +10324,49 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/toc/toc.c:2214 src/protocols/toc/toc.c:2216
+#: src/protocols/toc/toc.c:2316 src/protocols/toc/toc.c:2318
 msgid "TOC Protocol Plugin"
 msgstr "TOC Protocol Plugin"
 
-#: src/protocols/toc/toc.c:2235
+#: src/protocols/toc/toc.c:2337
 msgid "TOC host"
 msgstr "TOC host"
 
-#: src/protocols/toc/toc.c:2239
+#: src/protocols/toc/toc.c:2341
 msgid "TOC port"
 msgstr "TOC port"
 
-#. Basic Profile group.
-#: src/protocols/trepia/trepia.c:264
-msgid "Basic Profile"
-msgstr "Basic Profile"
-
-#. E-Mail Address
-#: src/protocols/trepia/trepia.c:295
-msgid "E-Mail Address"
-msgstr "E-Mail Address"
-
-#: src/protocols/trepia/trepia.c:301
-msgid "Profile Information"
-msgstr "Profile Information"
-
-#. Instant Messagers
-#: src/protocols/trepia/trepia.c:307
-msgid "Instant Messagers"
-msgstr "Instant Messagers"
-
-#. AIM
-#: src/protocols/trepia/trepia.c:311
-msgid "AIM"
-msgstr "AIM"
-
-#. ICQ
-#: src/protocols/trepia/trepia.c:315
-msgid "ICQ UIN"
-msgstr "ICQ UIN"
-
-#. MSN
-#: src/protocols/trepia/trepia.c:319
-msgid "MSN"
-msgstr "MSN"
-
-#. Yahoo
-#: src/protocols/trepia/trepia.c:323
-msgid "Yahoo"
-msgstr "Yahoo"
-
-#. I'm From
-#: src/protocols/trepia/trepia.c:328
-msgid "I'm From"
-msgstr "I'm From"
-
-#. Call the dialog.
-#: src/protocols/trepia/trepia.c:345
-msgid "Set your Trepia profile data."
-msgstr "Set your Trepia profile data."
-
-#: src/protocols/trepia/trepia.c:425
-msgid "Profile"
-msgstr "Profile"
-
-#: src/protocols/trepia/trepia.c:439
-msgid "Set Profile"
-msgstr "Set Profile"
-
-#: src/protocols/trepia/trepia.c:476
-msgid "Visit Homepage"
-msgstr "Visit Homepage"
-
-#: src/protocols/trepia/trepia.c:822 src/protocols/trepia/trepia.c:825
-msgid "Local Users"
-msgstr "Local Users"
-
-#: src/protocols/trepia/trepia.c:1028
-msgid "Logging in"
-msgstr "Logging in"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: 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: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
+#: src/protocols/yahoo/yahoo.c:706
 msgid "Your Yahoo! message did not get sent."
 msgstr "Your Yahoo! message did not get sent."
 
-#: src/protocols/yahoo/yahoo.c:936 src/protocols/yahoo/yahoo.c:3520
+#: src/protocols/yahoo/yahoo.c:750 src/protocols/yahoo/yahoo.c:3481
 msgid "Buzz!!"
 msgstr "Buzz!!"
 
-#: src/protocols/yahoo/yahoo.c:981
+#: src/protocols/yahoo/yahoo.c:795
 #, 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:1072
+#.
+#: src/protocols/yahoo/yahoo.c:885
 #, 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%s%s."
 
-#: src/protocols/yahoo/yahoo.c:1078
+#: src/protocols/yahoo/yahoo.c:891
 msgid "Message (optional) :"
 msgstr "Message (optional) :"
 
-#: src/protocols/yahoo/yahoo.c:1120
+#: src/protocols/yahoo/yahoo.c:933
 #, 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:1123
+#: src/protocols/yahoo/yahoo.c:936
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -10620,11 +10375,11 @@
 "%s has (retroactively) denied your request to add them to your list for the "
 "following reason: %s."
 
-#: src/protocols/yahoo/yahoo.c:1126
+#: src/protocols/yahoo/yahoo.c:939
 msgid "Add buddy rejected"
 msgstr "Add buddy rejected"
 
-#: src/protocols/yahoo/yahoo.c:1887
+#: src/protocols/yahoo/yahoo.c:1681
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -10635,11 +10390,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:1890
+#: src/protocols/yahoo/yahoo.c:1684
 msgid "Failed Yahoo! Authentication"
 msgstr "Failed Yahoo! Authentication"
 
-#: src/protocols/yahoo/yahoo.c:1962
+#: src/protocols/yahoo/yahoo.c:1757
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -10648,19 +10403,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:1965
+#: src/protocols/yahoo/yahoo.c:1760
 msgid "Ignore buddy?"
 msgstr "Ignore buddy?"
 
-#: src/protocols/yahoo/yahoo.c:1999
+#: src/protocols/yahoo/yahoo.c:1794
 msgid "Invalid username."
 msgstr "Invalid username."
 
-#: src/protocols/yahoo/yahoo.c:2010
+#: src/protocols/yahoo/yahoo.c:1805
 msgid "Normal authentication failed!"
 msgstr "Normal authentication failed!"
 
-#: src/protocols/yahoo/yahoo.c:2011
+#: src/protocols/yahoo/yahoo.c:1806
 msgid ""
 "The normal authentication method has failed. This means either your password "
 "is incorrect, or Yahoo!'s authentication scheme has changed. Gaim will now "
@@ -10672,101 +10427,124 @@
 "attempt to log in using Web Messenger authentication, will which result in "
 "reduced functionality and features."
 
-#: src/protocols/yahoo/yahoo.c:2019
+#: src/protocols/yahoo/yahoo.c:1814
 msgid "Incorrect password."
 msgstr "Incorrect password."
 
-#: src/protocols/yahoo/yahoo.c:2022
+#: src/protocols/yahoo/yahoo.c:1817
 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:2025
+#: src/protocols/yahoo/yahoo.c:1820
 #, 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:2079
+#: src/protocols/yahoo/yahoo.c:1874
 #, 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:2082
+#: src/protocols/yahoo/yahoo.c:1877
 msgid "Could not add buddy to server list"
 msgstr "Could not add buddy to server list"
 
-#: src/protocols/yahoo/yahoo.c:2319 src/protocols/yahoo/yahoo.c:2467
-#: src/protocols/yahoo/ycht.c:414
+#: src/protocols/yahoo/yahoo.c:2121 src/protocols/yahoo/yahoo.c:2267
+#: src/protocols/yahoo/ycht.c:413
 msgid "Unable to read"
 msgstr "Unable to read"
 
-#: src/protocols/yahoo/yahoo.c:2489 src/protocols/yahoo/yahoo.c:2610
-#: src/protocols/yahoo/yahoo.c:2660 src/protocols/yahoo/yahoo.c:2670
-#: src/protocols/yahoo/yahoochat.c:1461 src/protocols/yahoo/yahoochat.c:1528
-#: src/protocols/yahoo/ycht.c:518
+#: src/protocols/yahoo/yahoo.c:2289 src/protocols/yahoo/yahoo.c:2417
+#: src/protocols/yahoo/yahoo.c:2502 src/protocols/yahoo/yahoo.c:2512
+#: src/protocols/yahoo/yahoochat.c:1393 src/protocols/yahoo/yahoochat.c:1460
+#: src/protocols/yahoo/ycht.c:517
 msgid "Connection problem"
 msgstr "Connection problem"
 
-#: src/protocols/yahoo/yahoo.c:2764 src/protocols/yahoo/yahoo.c:3131
-#: src/protocols/yahoo/yahoo.c:3245
+#: src/protocols/yahoo/yahoo.c:2615 src/protocols/yahoo/yahoo.c:3212
 msgid "Not At Home"
 msgstr "Not At Home"
 
-#: src/protocols/yahoo/yahoo.c:2766 src/protocols/yahoo/yahoo.c:3133
-#: src/protocols/yahoo/yahoo.c:3246
+#: src/protocols/yahoo/yahoo.c:2617 src/protocols/yahoo/yahoo.c:3215
 msgid "Not At Desk"
 msgstr "Not At Desk"
 
-#: src/protocols/yahoo/yahoo.c:2768 src/protocols/yahoo/yahoo.c:3135
-#: src/protocols/yahoo/yahoo.c:3247
+#: src/protocols/yahoo/yahoo.c:2619 src/protocols/yahoo/yahoo.c:3218
 msgid "Not In Office"
 msgstr "Not In Office"
 
-#: src/protocols/yahoo/yahoo.c:2772 src/protocols/yahoo/yahoo.c:3139
-#: src/protocols/yahoo/yahoo.c:3249
+#: src/protocols/yahoo/yahoo.c:2623 src/protocols/yahoo/yahoo.c:3224
 msgid "On Vacation"
 msgstr "On Vacation"
 
-#: src/protocols/yahoo/yahoo.c:2776 src/protocols/yahoo/yahoo.c:3143
-#: src/protocols/yahoo/yahoo.c:3251
+#: src/protocols/yahoo/yahoo.c:2627 src/protocols/yahoo/yahoo.c:3230
 msgid "Stepped Out"
 msgstr "Stepped Out"
 
-#: src/protocols/yahoo/yahoo.c:2857 src/protocols/yahoo/yahoo.c:2883
+#: src/protocols/yahoo/yahoo.c:2719 src/protocols/yahoo/yahoo.c:2746
 msgid "Not on server list"
 msgstr "Not on server list"
 
-#: src/protocols/yahoo/yahoo.c:2962
+#: src/protocols/yahoo/yahoo.c:2769 src/protocols/yahoo/yahoo.c:2829
+#, fuzzy
+msgid "Appear Online"
+msgstr "Appear Offline"
+
+#: src/protocols/yahoo/yahoo.c:2772 src/protocols/yahoo/yahoo.c:2851
+#, fuzzy
+msgid "Appear Permanently Offline"
+msgstr "Appear Offline"
+
+#: src/protocols/yahoo/yahoo.c:2790
+#, fuzzy
+msgid "Stealth"
+msgstr "County/State"
+
+#: src/protocols/yahoo/yahoo.c:2845
+#, fuzzy
+msgid "Don't Appear Permanently Offline"
+msgstr "Appear Offline"
+
+#: src/protocols/yahoo/yahoo.c:2884
 msgid "Join in Chat"
 msgstr "Join in Chat"
 
-#: src/protocols/yahoo/yahoo.c:2967
+#: src/protocols/yahoo/yahoo.c:2889
 msgid "Initiate Conference"
 msgstr "Initiate Conference"
 
-#: src/protocols/yahoo/yahoo.c:3019
+#: src/protocols/yahoo/yahoo.c:2914
+msgid "Stealth Settings"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:2945
 msgid "Active which ID?"
 msgstr "Active which ID?"
 
-#: src/protocols/yahoo/yahoo.c:3028
+#: src/protocols/yahoo/yahoo.c:2954
 msgid "Join who in chat?"
 msgstr "Join who in chat?"
 
-#: src/protocols/yahoo/yahoo.c:3038
+#: src/protocols/yahoo/yahoo.c:2964
 msgid "Activate ID..."
 msgstr "Activate ID..."
 
-#: src/protocols/yahoo/yahoo.c:3042
+#: src/protocols/yahoo/yahoo.c:2968
 msgid "Join user in chat..."
 msgstr "Join user in chat..."
 
-#: src/protocols/yahoo/yahoo.c:3562
+#: src/protocols/yahoo/yahoo.c:3523
 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:3566
+#: src/protocols/yahoo/yahoo.c:3527
 msgid "buzz: Buzz a contact to get their attention"
 msgstr "buzz: Buzz a contact to get their attention"
 
+#: src/protocols/yahoo/yahoo.c:3532
+msgid "doodle: Request user to start a Doodle session"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -10777,118 +10555,68 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/yahoo/yahoo.c:3645 src/protocols/yahoo/yahoo.c:3647
+#: src/protocols/yahoo/yahoo.c:3621 src/protocols/yahoo/yahoo.c:3623
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo Protocol Plugin"
 
-#: src/protocols/yahoo/yahoo.c:3666
+#: src/protocols/yahoo/yahoo.c:3640
 msgid "Yahoo Japan"
 msgstr "Yahoo Japan"
 
-#: src/protocols/yahoo/yahoo.c:3669
+#: src/protocols/yahoo/yahoo.c:3643
 msgid "Pager host"
 msgstr "Pager host"
 
-#: src/protocols/yahoo/yahoo.c:3672
+#: src/protocols/yahoo/yahoo.c:3646
 msgid "Japan Pager host"
 msgstr "Japan Pager host"
 
-#: src/protocols/yahoo/yahoo.c:3675
+#: src/protocols/yahoo/yahoo.c:3649
 msgid "Pager port"
 msgstr "Pager port"
 
-#: src/protocols/yahoo/yahoo.c:3678
+#: src/protocols/yahoo/yahoo.c:3652
 msgid "File transfer host"
 msgstr "File transfer host"
 
-#: src/protocols/yahoo/yahoo.c:3681
+#: src/protocols/yahoo/yahoo.c:3655
 msgid "Japan File transfer host"
 msgstr "Japan File transfer host"
 
-#: src/protocols/yahoo/yahoo.c:3684
+#: src/protocols/yahoo/yahoo.c:3658
 msgid "File transfer port"
 msgstr "File transfer port"
 
-#: src/protocols/yahoo/yahoo.c:3687
+#: src/protocols/yahoo/yahoo.c:3661
 msgid "Chat Room Locale"
 msgstr "Chat Room Locale"
 
-#: src/protocols/yahoo/yahoo.c:3690
+#: src/protocols/yahoo/yahoo.c:3664
 msgid "Chat Room List Url"
 msgstr "Chat Room List Url"
 
-#: src/protocols/yahoo/yahoo.c:3693
+#: src/protocols/yahoo/yahoo.c:3667
 msgid "YCHT Host"
 msgstr "YCHT Host"
 
-#: src/protocols/yahoo/yahoo.c:3696
+#: src/protocols/yahoo/yahoo.c:3670
 msgid "YCHT Port"
 msgstr "YCHT Port"
 
-#: 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 "Perhaps 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 "Perhaps 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
+#: src/protocols/yahoo/yahoo_profile.c:672
 #, c-format
 msgid "<b>IP Address:</b> %s<br>"
 msgstr "<b>IP Address:</b> %s<br>"
 
-#: src/protocols/yahoo/yahoo_profile.c:751
+#: src/protocols/yahoo/yahoo_profile.c:748
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! Japan Profile"
 
-#: src/protocols/yahoo/yahoo_profile.c:752
+#: src/protocols/yahoo/yahoo_profile.c:749
 msgid "Yahoo! Profile"
 msgstr "Yahoo! Profile"
 
-#: src/protocols/yahoo/yahoo_profile.c:796
+#: src/protocols/yahoo/yahoo_profile.c:793
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
@@ -10896,7 +10624,7 @@
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
 
-#: src/protocols/yahoo/yahoo_profile.c:798
+#: src/protocols/yahoo/yahoo_profile.c:795
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser"
@@ -10904,47 +10632,47 @@
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser"
 
-#: src/protocols/yahoo/yahoo_profile.c:976
+#: src/protocols/yahoo/yahoo_profile.c:971
 msgid "Yahoo! ID"
 msgstr "Yahoo! ID"
 
-#: src/protocols/yahoo/yahoo_profile.c:1050
-#: src/protocols/yahoo/yahoo_profile.c:1054
-#: src/protocols/yahoo/yahoo_profile.c:1058
+#: src/protocols/yahoo/yahoo_profile.c:1043
+#: src/protocols/yahoo/yahoo_profile.c:1047
+#: src/protocols/yahoo/yahoo_profile.c:1051
 msgid "Hobbies"
 msgstr "Hobbies"
 
-#: src/protocols/yahoo/yahoo_profile.c:1068
-#: src/protocols/yahoo/yahoo_profile.c:1072
+#: src/protocols/yahoo/yahoo_profile.c:1061
+#: src/protocols/yahoo/yahoo_profile.c:1065
 msgid "Latest News"
 msgstr "Latest News"
 
-#: src/protocols/yahoo/yahoo_profile.c:1093
+#: src/protocols/yahoo/yahoo_profile.c:1086
 msgid "Home Page"
 msgstr "Home Page"
 
-#: src/protocols/yahoo/yahoo_profile.c:1108
+#: src/protocols/yahoo/yahoo_profile.c:1101
 msgid "Cool Link 1"
 msgstr "Cool Link 1"
 
-#: src/protocols/yahoo/yahoo_profile.c:1113
+#: src/protocols/yahoo/yahoo_profile.c:1106
 msgid "Cool Link 2"
 msgstr "Cool Link 2"
 
-#: src/protocols/yahoo/yahoo_profile.c:1117
+#: src/protocols/yahoo/yahoo_profile.c:1110
 msgid "Cool Link 3"
 msgstr "Cool Link 3"
 
-#: src/protocols/yahoo/yahoo_profile.c:1130
+#: src/protocols/yahoo/yahoo_profile.c:1123
 msgid "Last Update"
 msgstr "Last Update"
 
-#: src/protocols/yahoo/yahoo_profile.c:1136
+#: src/protocols/yahoo/yahoo_profile.c:1129
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "User information for %s unavailable"
 
-#: src/protocols/yahoo/yahoo_profile.c:1142
+#: src/protocols/yahoo/yahoo_profile.c:1135
 msgid ""
 "Sorry, this profile seems to be in a language that is not supported at this "
 "time."
@@ -10952,7 +10680,7 @@
 "Sorry, this profile seems to be in a language that is not supported at this "
 "time."
 
-#: src/protocols/yahoo/yahoo_profile.c:1158
+#: src/protocols/yahoo/yahoo_profile.c:1151
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
 "server-side problem. Please try again later."
@@ -10960,7 +10688,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:1161
+#: src/protocols/yahoo/yahoo_profile.c:1154
 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 "
@@ -10970,15 +10698,65 @@
 "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:1169
+#: src/protocols/yahoo/yahoo_profile.c:1162
 msgid "The user's profile is empty."
 msgstr "The user's profile is empty."
 
-#: src/protocols/yahoo/ycht.c:401
+#: src/protocols/yahoo/yahoochat.c:202
+#, 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:204
+msgid "Invitation Rejected"
+msgstr "Invitation Rejected"
+
+#: src/protocols/yahoo/yahoochat.c:358
+msgid "Failed to join chat"
+msgstr "Failed to join chat"
+
+#: src/protocols/yahoo/yahoochat.c:358
+msgid "Maybe the room is full?"
+msgstr "Perhaps the room is full?"
+
+#: src/protocols/yahoo/yahoochat.c:435
+#, c-format
+msgid "You are now chatting in %s."
+msgstr "You are now chatting in %s."
+
+#: src/protocols/yahoo/yahoochat.c:608
+msgid "Failed to join buddy in chat"
+msgstr "Failed to join buddy in chat"
+
+#: src/protocols/yahoo/yahoochat.c:609
+msgid "Maybe they're not in a chat?"
+msgstr "Perhaps they're not in a chat?"
+
+#: src/protocols/yahoo/yahoochat.c:1326
+msgid "Fetching the room list failed."
+msgstr "Fetching the room list failed."
+
+#: src/protocols/yahoo/yahoochat.c:1379
+msgid "Voices"
+msgstr "Voices"
+
+#: src/protocols/yahoo/yahoochat.c:1382
+msgid "Webcams"
+msgstr "Webcams"
+
+#: src/protocols/yahoo/yahoochat.c:1393 src/protocols/yahoo/yahoochat.c:1460
+msgid "Unable to fetch room list."
+msgstr "Unable to fetch room list."
+
+#: src/protocols/yahoo/yahoochat.c:1453
+msgid "User Rooms"
+msgstr "User Rooms"
+
+#: src/protocols/yahoo/ycht.c:400
 msgid "Connection problem with the YCHT server."
 msgstr "Connection problem with the YCHT server."
 
-#: src/protocols/zephyr/zephyr.c:327
+#: src/protocols/zephyr/zephyr.c:331
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -10986,73 +10764,78 @@
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
 
-#: src/protocols/zephyr/zephyr.c:682
-#, c-format
-msgid "Unable send to chat %s,%s,%s"
+#: src/protocols/zephyr/zephyr.c:686
+#, fuzzy, c-format
+msgid "Unable to send to chat %s,%s,%s"
 msgstr "Unable send to chat %s,%s,%s"
 
-#: src/protocols/zephyr/zephyr.c:715 src/protocols/zephyr/zephyr.c:1124
+#: src/protocols/zephyr/zephyr.c:719 src/protocols/zephyr/zephyr.c:1133
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>User:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:719 src/protocols/zephyr/zephyr.c:1129
+#: src/protocols/zephyr/zephyr.c:723 src/protocols/zephyr/zephyr.c:1138
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>Hidden or not logged-in"
 
-#: src/protocols/zephyr/zephyr.c:724 src/protocols/zephyr/zephyr.c:1131
+#: src/protocols/zephyr/zephyr.c:728 src/protocols/zephyr/zephyr.c:1140
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>At %s since %s"
 
-#: src/protocols/zephyr/zephyr.c:1414 src/protocols/zephyr/zephyr.c:1415
+#: src/protocols/zephyr/zephyr.c:1471 src/protocols/zephyr/zephyr.c:1472
 msgid "Anyone"
 msgstr "Anyone"
 
-#: src/protocols/zephyr/zephyr.c:2143
+#: src/protocols/zephyr/zephyr.c:2273
 msgid "_Class:"
 msgstr "_Class:"
 
-#: src/protocols/zephyr/zephyr.c:2149
+#: src/protocols/zephyr/zephyr.c:2279
 msgid "_Instance:"
 msgstr "_Instance:"
 
-#: src/protocols/zephyr/zephyr.c:2155
+#: src/protocols/zephyr/zephyr.c:2285
 msgid "_Recipient:"
 msgstr "_Recipient:"
 
-#: src/protocols/zephyr/zephyr.c:2166
+#: src/protocols/zephyr/zephyr.c:2296
 #, 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:2471
+#: src/protocols/zephyr/zephyr.c:2602
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;nick&gt;: Locate user"
 
-#: src/protocols/zephyr/zephyr.c:2476
+#: src/protocols/zephyr/zephyr.c:2607
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;nick&gt;: Locate user"
 
-#: src/protocols/zephyr/zephyr.c:2481
+#: src/protocols/zephyr/zephyr.c:2612
 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:2486
+#: src/protocols/zephyr/zephyr.c:2617
 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:2492
+#: src/protocols/zephyr/zephyr.c:2622
+#, fuzzy
+msgid "topic &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:2628
 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:2497
+#: src/protocols/zephyr/zephyr.c:2633
 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:2503
+#: src/protocols/zephyr/zephyr.c:2639
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
@@ -11060,7 +10843,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:2509
+#: src/protocols/zephyr/zephyr.c:2645
 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;"
@@ -11068,7 +10851,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:2515
+#: src/protocols/zephyr/zephyr.c:2651
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
@@ -11076,15 +10859,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:2520
+#: src/protocols/zephyr/zephyr.c:2656
 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:2626
+#: src/protocols/zephyr/zephyr.c:2762
 msgid "Resubscribe"
 msgstr "Resubscribe"
 
-#: src/protocols/zephyr/zephyr.c:2629
+#: src/protocols/zephyr/zephyr.c:2765
 msgid "Retrieve subscriptions from server"
 msgstr "Retrieve subscriptions from server"
 
@@ -11098,39 +10881,54 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/zephyr/zephyr.c:2712 src/protocols/zephyr/zephyr.c:2714
+#: src/protocols/zephyr/zephyr.c:2847 src/protocols/zephyr/zephyr.c:2849
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr Protocol Plugin"
 
-#: src/protocols/zephyr/zephyr.c:2739
+#: src/protocols/zephyr/zephyr.c:2874
 msgid "Export to .anyone"
 msgstr "Export to .anyone"
 
-#: src/protocols/zephyr/zephyr.c:2742
+#: src/protocols/zephyr/zephyr.c:2877
 msgid "Export to .zephyr.subs"
 msgstr "Export to .zephyr.subs"
 
-#: src/protocols/zephyr/zephyr.c:2745
+#: src/protocols/zephyr/zephyr.c:2880
+#, fuzzy
+msgid "Import from .anyone"
+msgstr "Export to .anyone"
+
+#: src/protocols/zephyr/zephyr.c:2883
+#, fuzzy
+msgid "Import from .zephyr.subs"
+msgstr "Export to .zephyr.subs"
+
+#: src/protocols/zephyr/zephyr.c:2886
+#, fuzzy
+msgid "Realm"
+msgstr "Realname"
+
+#: src/protocols/zephyr/zephyr.c:2889
 msgid "Exposure"
 msgstr "Exposure"
 
 #. XXX: why in the hell are we calling gaim_connection_error() here?
 #. Forbidden
-#: src/proxy.c:958
+#: src/proxy.c:1036
 #, c-format
 msgid "Access denied: proxy server forbids port %d tunnelling."
 msgstr "Access denied: proxy server forbids port %d tunnelling."
 
-#: src/proxy.c:962
+#: src/proxy.c:1040
 #, c-format
 msgid "Proxy connection error %d"
 msgstr "Proxy connection error %d"
 
-#: src/proxy.c:1790
+#: src/proxy.c:1874
 msgid "Invalid proxy settings"
 msgstr "Invalid proxy settings"
 
-#: src/proxy.c:1790
+#: src/proxy.c:1874
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -11138,172 +10936,1182 @@
 "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:1255
+#: src/request.h:1341
 msgid "Accept"
 msgstr "Accept"
 
-#: src/server.c:64
-msgid "Please enter your password"
-msgstr "Please enter your password"
-
-#: src/server.c:533
+#: src/server.c:243
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s is now known as %s.\n"
 
-#: src/server.c:978
+#: src/server.c:625
 #, c-format
 msgid "(%d message)"
 msgid_plural "(%d messages)"
 msgstr[0] "(%d message)"
 msgstr[1] "(%d messages)"
 
-#: src/server.c:992
+#: src/server.c:639
 msgid "(1 message)"
 msgstr "(1 message)"
 
-#: 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
+#: src/server.c:860
+#, 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:865
+#, 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:869
+msgid "Accept chat invitation?"
+msgstr "Accept chat invitation?"
+
+#: src/status.c:153
+#, fuzzy
+msgid "Unset"
+msgstr "Unit"
+
+#: src/status.c:156
+msgid "Unavailable"
+msgstr "Unavailable"
+
+#: src/status.c:621
 #, c-format
 msgid "%s came back"
 msgstr "%s came back"
 
-#: src/server.c:1253
+#: src/status.c:626
 #, c-format
 msgid "%s went away"
 msgstr "%s went away."
 
-#: src/server.c:1267
+#: src/status.c:1308
 #, c-format
 msgid "%s became idle"
 msgstr "%s became idle"
 
-#: src/server.c:1278
+#: src/status.c:1323
 #, c-format
 msgid "%s became unidle"
 msgstr "%s is no longer idle"
 
-#: 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 old chap, I've stepped out for a while!"
-
-#: 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:2408
+#: src/status.c:1697
+#, fuzzy
+msgid "Default auto-away"
+msgstr "Auto-away"
+
+#: src/util.c:2121
+#, fuzzy, c-format
+msgid "Error Reading %s"
+msgstr ""
+"Error reading %s: \n"
+"%s.\n"
+
+#: src/util.c:2122
+#, fuzzy, c-format
+msgid ""
+"An error was encountered reading your %s.  They have not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
+"An error was encountered parsing your buddy list.  It has not been loaded, "
+"and the old file has been moved to blist.xml~."
+
+#: src/util.c:2559
 msgid "Calculating..."
 msgstr "Calculating..."
 
-#: src/util.c:2411
+#: src/util.c:2562
 msgid "Unknown."
 msgstr "Unknown."
 
-#: src/util.c:2441
+#: src/util.c:2592
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "second"
 msgstr[1] "seconds"
 
-#: src/util.c:2455
+#: src/util.c:2606
 msgid "day"
 msgid_plural "days"
 msgstr[0] "day"
 msgstr[1] "days"
 
-#: src/util.c:2463
+#: src/util.c:2614
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "hour"
 msgstr[1] "hours"
 
-#: src/util.c:2471
+#: src/util.c:2622
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minute"
 msgstr[1] "minutes"
 
-#: src/util.c:2891
+#: src/util.c:3045
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Error opening connection.\n"
 
+#~ msgid "Restore Away State On Reconnect"
+#~ msgstr "Restore Away State On Reconnect"
+
+#~ 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 "New..."
+#~ msgstr "New..."
+
+#~ msgid "Back"
+#~ msgstr "Back"
+
+#~ msgid "Signoff"
+#~ msgstr "Signoff"
+
+#~ msgid "Tray Icon Configuration"
+#~ msgstr "Tray Icon Configuration"
+
+#~ msgid "_Hide new messages until tray icon is clicked"
+#~ msgstr "_Hide new messages until tray icon is clicked"
+
+#~ msgid "Orientation"
+#~ msgstr "Orientation"
+
+#~ msgid "The orientation of the tray."
+#~ msgstr "The orientation of the tray."
+
+#~ msgid "Not connected to AIM"
+#~ msgstr "Not connected to AIM"
+
+#~ msgid "No screenname given."
+#~ msgstr "No screenname given."
+
+#~ msgid "No roomname given."
+#~ msgstr "No roomname given."
+
+#~ msgid "Invalid AIM URI"
+#~ msgstr "Invalid AIM URI"
+
+#~ msgid ""
+#~ "Failed to assign %s to a socket:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Failed to assign %s to a socket:\n"
+#~ "%s"
+
+#~ msgid "Unable to open socket"
+#~ msgstr "Unable to open socket"
+
+#~ msgid "Remote Control"
+#~ msgstr "Remote Control"
+
+#~ msgid "Provides remote control for gaim applications."
+#~ msgstr "Provides remote control for gaim applications."
+
+#~ msgid ""
+#~ "Gives Gaim the ability to be remote-controlled through third-party "
+#~ "applications or through the gaim-remote tool."
+#~ msgstr ""
+#~ "Gives Gaim the ability to be remote-controlled through third-party "
+#~ "applications or through the gaim-remote tool."
+
+#~ msgid "GTK Signals Test"
+#~ msgstr "GTK Signals Test"
+
+#~ msgid "Test to see that all ui signals are working properly."
+#~ msgstr "Test to see that all UI signals are working properly."
+
+#~ 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 "_Apply"
+#~ msgstr "_Apply"
+
+#~ msgid "Docked _Buddy List is always on top"
+#~ msgstr "Docked _Buddy List is always on top"
+
+#~ msgid "Away!"
+#~ msgstr "Away!"
+
+#~ msgid "Edit This Message"
+#~ msgstr "Edit This Message"
+
+#~ msgid "I'm Back!"
+#~ msgstr "I'm Back!"
+
+#~ msgid "Are you sure you want to remove the away message \"%s\"?"
+#~ msgstr "Are you sure you want to remove the away message \"%s\"?"
+
+#~ msgid "Remove Away Message"
+#~ msgstr "Remove Away Message"
+
+#~ msgid "Set All Away"
+#~ msgstr "Set All Away"
+
+#~ msgid "You cannot save an away message with a blank title"
+#~ msgstr "You cannot save an away message with a blank title"
+
+#~ 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."
+
+#~ msgid "You cannot create an empty away message"
+#~ msgstr "You cannot create an empty away message"
+
+#~ msgid "New away message"
+#~ msgstr "New away message"
+
+#~ msgid "Away title: "
+#~ msgstr "Away title: "
+
+#~ msgid "_Save"
+#~ msgstr "_Save"
+
+#~ msgid "Sa_ve & Use"
+#~ msgstr "Sa_ve & Use"
+
+#~ msgid "Buddy List Error"
+#~ msgstr "Buddy List Error"
+
+#~ msgid "Size of the expander arrow"
+#~ msgstr "Size of the expander arrow"
+
+#~ msgid ""
+#~ "Usage: %s command [OPTIONS] [URI]\n"
+#~ "\n"
+#~ "    COMMANDS:\n"
+#~ "       uri                      Handle AIM: URI\n"
+#~ "       away                     Popup the away dialog with the default "
+#~ "message\n"
+#~ "       back                     Remove the away dialog\n"
+#~ "       quit                     Close running copy of Gaim\n"
+#~ "\n"
+#~ "    OPTIONS:\n"
+#~ "       -h, --help [command]     Show help for command\n"
+#~ msgstr ""
+#~ "Usage: %s command [OPTIONS] [URI]\n"
+#~ "\n"
+#~ "    COMMANDS:\n"
+#~ "       uri                      Handle AIM: URI\n"
+#~ "       away                     Popup the away dialog with the default "
+#~ "message\n"
+#~ "       back                     Remove the away dialog\n"
+#~ "       quit                     Close running copy of Gaim\n"
+#~ "\n"
+#~ "    OPTIONS:\n"
+#~ "       -h, --help [command]     Show help for command\n"
+
+#~ msgid ""
+#~ "Gaim not running (on session 0)\n"
+#~ "Is the \"Remote Control\" plugin loaded?\n"
+#~ msgstr ""
+#~ "Gaim not running (on session 0)\n"
+#~ "Is the \"Remote Control\" plugin loaded?\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Using AIM: URIs:\n"
+#~ "Sending an IM to a screen name:\n"
+#~ "\tgaim-remote uri 'aim:goim?screenname=Penguin&message=hello+world'\n"
+#~ "In this case, 'Penguin' is the screen name we wish to IM, and 'hello "
+#~ "world'\n"
+#~ "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"
+#~ "with no message:\n"
+#~ "\tgaim-remote uri 'aim:goim?screenname=Penguin'\n"
+#~ "\n"
+#~ "Joining a chat:\n"
+#~ "\tgaim-remote uri 'aim:gochat?roomname=PenguinLounge'\n"
+#~ "...joins the 'PenguinLounge' chat room.\n"
+#~ "\n"
+#~ "Adding a buddy to your buddy list:\n"
+#~ "\tgaim-remote uri 'aim:addbuddy?screenname=Penguin'\n"
+#~ "...prompts you to add 'Penguin' to your buddy list.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Using AIM: URIs:\n"
+#~ "Sending an IM to a screen name:\n"
+#~ "\tgaim-remote uri 'aim:goim?screenname=Penguin&message=hello+world'\n"
+#~ "In this case, 'Penguin' is the screen name we wish to IM, and 'hello "
+#~ "world'\n"
+#~ "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"
+#~ "with no message:\n"
+#~ "\tgaim-remote uri 'aim:goim?screenname=Penguin'\n"
+#~ "\n"
+#~ "Joining a chat:\n"
+#~ "\tgaim-remote uri 'aim:gochat?roomname=PenguinLounge'\n"
+#~ "...joins the 'PenguinLounge' chat room.\n"
+#~ "\n"
+#~ "Adding a buddy to your buddy list:\n"
+#~ "\tgaim-remote uri 'aim:addbuddy?screenname=Penguin'\n"
+#~ "...prompts you to add 'Penguin' to your buddy list.\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Close running copy of Gaim\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Close running copy of Gaim\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Mark all accounts as \"away\" with the default message.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Mark all accounts as \"away\" with the default message.\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Set all accounts as not away.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Set all accounts as not away.\n"
+
+#~ msgid "Show fewer options"
+#~ msgstr "Show fewer options"
+
+#~ msgid "Information"
+#~ msgstr "Information"
+
+#~ msgid "/Buddies/_Signoff"
+#~ msgstr "/Buddies/_Signoff"
+
+#~ msgid "/Tools/_Away"
+#~ msgstr "/Tools/_Away"
+
+#~ msgid "/Tools/Pl_ugin Actions"
+#~ msgstr "/Tools/Pl_ugin Actions"
+
+#~ 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 "%d%%"
+#~ msgstr "%d%%"
+
+#~ msgid ""
+#~ "\n"
+#~ "<b>Account:</b>"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>Account:</b>"
+
+#~ msgid ""
+#~ "\n"
+#~ "<b>Warned:</b>"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>Warned:</b>"
+
+#~ msgid "Warned (%d%%) "
+#~ msgstr "Warned (%d%%) "
+
+#~ msgid "/Tools/Away"
+#~ msgstr "/Tools/Away"
+
+#~ msgid "Send a message to the selected buddy"
+#~ msgstr "Send a message to the selected buddy"
+
+#~ msgid "Get information on the selected buddy"
+#~ msgstr "Get information on the selected buddy"
+
+#~ msgid "_Chat"
+#~ msgstr "_Chat"
+
+#~ msgid "Join a chat room"
+#~ msgstr "Join a chat room"
+
+#~ msgid "_Away"
+#~ msgstr "_Away"
+
+#~ msgid "Set an away message"
+#~ msgstr "Set an away message"
+
+#~ msgid "Done."
+#~ msgstr "Done."
+
+#~ msgid "Signon: "
+#~ msgstr "Signon: "
+
+#~ msgid "Signon"
+#~ msgstr "Signon"
+
+#~ msgid "Cancel All"
+#~ msgstr "Cancel All"
+
+#~ msgid "_Reconnect"
+#~ msgstr "_Reconnect"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">%s has been disconnected.</span>\n"
+#~ "\n"
+#~ "%s\n"
+#~ "%s"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">%s has been disconnected.</span>\n"
+#~ "\n"
+#~ "%s\n"
+#~ "%s"
+
+#~ msgid "Reason Unknown."
+#~ msgstr "Reason Unknown."
+
+#~ msgid "Reconnect _All"
+#~ msgstr "Reconnect _All"
+
+#~ msgid "Time"
+#~ msgstr "Time"
+
+#~ msgid "Get Away Msg"
+#~ msgstr "Get Away Msg"
+
+#~ msgid "/Conversation/_Warn..."
+#~ msgstr "/Conversation/_Warn..."
+
+#~ msgid "/Conversation/Warn..."
+#~ msgstr "/Conversation/Warn..."
+
+#~ msgid "Warn"
+#~ msgstr "Warn"
+
+#~ msgid "Warn the user"
+#~ msgstr "Warn the user"
+
+#~ msgid "Block the user"
+#~ msgstr "Block the user"
+
+#~ msgid "Send a file to the user"
+#~ msgstr "Send a file to the user"
+
+#~ msgid "Add the user to your buddy list"
+#~ msgstr "Add the user to your buddy list"
+
+#~ msgid "Remove the user from your buddy list"
+#~ msgstr "Remove the user from your buddy list"
+
+#~ msgid "Send"
+#~ msgstr "Send"
+
+#~ msgid "Invite"
+#~ msgstr "Invite"
+
+#~ msgid "Invite a user"
+#~ msgstr "Invite a user"
+
+#~ msgid "Add the chat to your buddy list"
+#~ msgstr "Add the chat to your buddy list"
+
+#~ msgid "<main>/Conversation/Close"
+#~ msgstr "<main>/Conversation/Close"
+
+#~ msgid "former lead developer"
+#~ msgstr "former lead developer"
+
+#~ msgid "former maintainer"
+#~ msgstr "former maintainer"
+
+#~ msgid "Azerbaijani"
+#~ msgstr "Azerbaijani"
+
+#~ msgid "Vladimira Girginova and Vladimir (Kaladan) Petkov"
+#~ msgstr "Vladimira Girginova and Vladimir (Kaladan) Petkov"
+
+#~ msgid "Estonian"
+#~ msgstr "Estonian"
+
+#~ msgid "Burmese"
+#~ msgstr "Burmese"
+
+#~ msgid "Norwegian (Nynorsk)"
+#~ msgstr "Norwegian (Nynorsk)"
+
+#~ msgid "Punjabi"
+#~ msgstr "Punjabi"
+
+#~ msgid "Albanian"
+#~ msgstr "Albanian"
+
+#~ msgid "Turkish"
+#~ msgstr "Turkish"
+
+#~ msgid "Ukrainian"
+#~ msgstr "Ukrainian"
+
+#~ msgid "Xhosa"
+#~ msgstr "Xhosa"
+
+#~ msgid "Chinese"
+#~ msgstr "Chinese"
+
+#~ msgid "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
+#~ msgstr "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
+
+#~ 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 "Show transfer details"
+#~ msgstr "Show transfer details"
+
+#~ msgid "D_isplay remote nicknames if no alias is set"
+#~ msgstr "D_isplay remote nicknames if no alias is set"
+
+#~ msgid "Display"
+#~ msgstr "Display"
+
+#~ msgid "Show _timestamp on messages"
+#~ msgstr "Show _timestamp on messages"
+
+#~ msgid "Ignore c_olors"
+#~ msgstr "Ignore c_olours"
+
+#~ msgid "Ignore font _faces"
+#~ msgstr "Ignore font _faces"
+
+#~ msgid "Ignore font si_zes"
+#~ msgstr "Ignore font si_zes"
+
+#~ msgid "Default Formatting"
+#~ msgstr "Default Formatting"
+
+#~ msgid "_Send default formatting with outgoing messages"
+#~ msgstr "_Send default formatting with outgoing messages"
+
+#~ msgid "Send Message"
+#~ msgstr "Send Message"
+
+#~ msgid "Enter _sends message"
+#~ msgstr "Enter _sends message"
+
+#~ msgid "C_ontrol-Enter sends message"
+#~ msgstr "C_ontrol-Enter sends message"
+
+#~ msgid "Window Closing"
+#~ msgstr "Window Closing"
+
+#~ msgid "_Escape closes window"
+#~ msgstr "_Escape closes window"
+
+#~ msgid "Insertions"
+#~ msgstr "Insertions"
+
+#~ msgid "Control-{B/I/U} changes _formatting"
+#~ msgstr "Control-{B/I/U} changes _formatting"
+
+#~ msgid "Control-(number) _inserts smileys"
+#~ msgstr "Control-(number) _inserts smileys"
+
+#~ msgid "Show _buttons as:"
+#~ msgstr "Show _buttons as:"
+
+#~ msgid "Pictures"
+#~ msgstr "Pictures"
+
+#~ msgid "Text"
+#~ msgstr "Text"
+
+#~ msgid "Pictures and text"
+#~ msgstr "Pictures and text"
+
+#~ msgid "_Raise window on events"
+#~ msgstr "_Raise window on events"
+
+#~ msgid "Show _warning levels"
+#~ msgstr "Show _warning levels"
+
+#~ msgid "_Automatically expand contacts"
+#~ msgstr "_Automatically expand contacts"
+
+#~ msgid "Enable \"_slash\" commands"
+#~ msgstr "Enable \"_slash\" commands"
+
+#~ msgid "Show _aliases in tabs/titles"
+#~ msgstr "Show _aliases in tabs/titles"
+
+#~ msgid "_Raise IM window on events"
+#~ msgstr "_Raise IM window on events"
+
+#~ msgid "Raise chat _window on events"
+#~ msgstr "Raise chat _window on events"
+
+#~ msgid "Use _multi-colored screen names in chats"
+#~ msgstr "Use _multi-coloured screen names in chats"
+
+#~ msgid "Tab p_lacement:"
+#~ msgstr "Tab P_lacement:"
+
+#~ msgid "New conversation _placement:"
+#~ msgstr "New conversation _placement:"
+
+#~ msgid "Message Logs"
+#~ msgstr "Message Logs"
+
+#~ msgid "System Logs"
+#~ msgstr "System Logs"
+
+#~ msgid "_Enable system log"
+#~ msgstr "_Enable system log"
+
+#~ msgid "Log when buddies _sign on/sign off"
+#~ msgstr "Log when buddies _sign on/sign off"
+
+#~ msgid "Log when buddies become _idle/un-idle"
+#~ msgstr "Log when buddies become _idle/un-idle"
+
+#~ msgid "Log when buddies go away/come _back"
+#~ msgstr "Log when buddies go away/come _back"
+
+#~ msgid "Log your _own signons/idleness/awayness"
+#~ msgstr "Log your _own signons/idleness/awayness"
+
+#~ msgid "Idle _time reporting:"
+#~ msgstr "Idle _time reporting:"
+
+#~ msgid "Gaim usage"
+#~ msgstr "Gaim usage"
+
+#~ msgid "X usage"
+#~ msgstr "X usage"
+
+#~ msgid "Windows usage"
+#~ msgstr "Windows usage"
+
+#~ msgid ""
+#~ "<span size=\"larger\">%s %s</span>\n"
+#~ "\n"
+#~ "<span weight=\"bold\">Written by:</span>\t%s\n"
+#~ "<span weight=\"bold\">Web site:</span>\t\t%s\n"
+#~ "<span weight=\"bold\">File name:</span>\t%s"
+#~ msgstr ""
+#~ "<span size=\"larger\">%s %s</span>\n"
+#~ "\n"
+#~ "<span weight=\"bold\">Written by:</span>\t%s\n"
+#~ "<span weight=\"bold\">Web site:</span>\t\t%s\n"
+#~ "<span weight=\"bold\">File name:</span>\t%s"
+
+#~ msgid ""
+#~ "<span size=\"larger\">%s %s</span>\n"
+#~ "\n"
+#~ "<span weight=\"bold\">Written by:</span>  %s\n"
+#~ "<span weight=\"bold\">URL:</span>  %s\n"
+#~ "<span weight=\"bold\">File name:</span>  %s"
+#~ msgstr ""
+#~ "<span size=\"larger\">%s %s</span>\n"
+#~ "\n"
+#~ "<span weight=\"bold\">Written by:</span>  %s\n"
+#~ "<span weight=\"bold\">URL:</span>  %s\n"
+#~ "<span weight=\"bold\">File name:</span>  %s"
+
+#~ msgid "Load"
+#~ msgstr "Load"
+
+#~ msgid "Summary"
+#~ msgstr "Summary"
+
+#~ msgid "Details"
+#~ msgstr "Details"
+
+#~ msgid "_Edit"
+#~ msgstr "_Edit"
+
+#~ msgid "Interface"
+#~ msgstr "Interface"
+
+#~ msgid "Message Text"
+#~ msgstr "Message Text"
+
+#~ msgid "Shortcuts"
+#~ msgstr "Shortcuts"
+
+#~ msgid "Away Messages"
+#~ msgstr "Away Messages"
+
+#~ msgid "Plugins"
+#~ msgstr "Plugins"
+
+#~ msgid "HTML"
+#~ msgstr "HTML"
+
+#~ msgid "Plain text"
+#~ msgstr "Plain text"
+
+#~ msgid "Please create an account."
+#~ msgstr "Please create an account."
+
+#~ msgid "Login"
+#~ msgstr "Login"
+
+#~ msgid "<b>_Account:</b>"
+#~ msgstr "<b>_Account:</b>"
+
+#~ msgid "<b>_Password:</b>"
+#~ msgstr "<b>_Password:</b>"
+
+#~ msgid "A_ccounts"
+#~ msgstr "A_ccounts"
+
+#~ msgid "P_references"
+#~ msgstr "P_references"
+
+#~ msgid "_Sign on"
+#~ msgstr "_Sign on"
+
+#~ 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, separated 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 login (optional argument NAME "
+#~ "specifies\n"
+#~ "                      account(s) to use, separated 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"
+
+#~ 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 "Slightly less boring default"
+#~ msgstr "Slightly less boring default"
+
+#~ msgid "Available for friends only"
+#~ msgstr "Available for friends only"
+
+#~ msgid "Away for friends only"
+#~ msgstr "Away for friends only"
+
+#~ msgid "Invisible for friends only"
+#~ msgstr "Invisible for friends only"
+
+#~ msgid "Unable to resolve hostname."
+#~ msgstr "Unable to resolve hostname."
+
+#~ msgid "Error while reading from socket."
+#~ msgstr "Error while reading from socket."
+
+#~ msgid "Error while writing to socket."
+#~ msgstr "Error while writing to socket."
+
+#~ msgid "Authentication failed."
+#~ msgstr "Authentication failed."
+
+#~ msgid "Unknown Error Code."
+#~ msgstr "Unknown Error Code."
+
+#~ msgid "Status: %s"
+#~ msgstr "Status: %s"
+
+#~ msgid "Could not connect"
+#~ msgstr "Could not connect"
+
+#~ msgid "Reading data"
+#~ msgstr "Reading data"
+
+#~ msgid "Balancer handshake"
+#~ msgstr "Balancer handshake"
+
+#~ msgid "Reading server key"
+#~ msgstr "Reading server key"
+
+#~ msgid "Exchanging key hash"
+#~ msgstr "Exchanging key hash"
+
+#~ msgid "Critical error in GG library\n"
+#~ msgstr "Critical error in GG library\n"
+
+#~ msgid "Unable to ping server"
+#~ msgstr "Unable to ping server"
+
+#~ msgid "Send as message"
+#~ msgstr "Send as message"
+
+#~ msgid "Looking up GG server"
+#~ msgstr "Looking up GG server"
+
+#~ msgid "Invalid Gadu-Gadu UIN specified"
+#~ msgstr "Invalid Gadu-Gadu UIN specified"
+
+#~ 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."
+
+#~ msgid "Couldn't get search results"
+#~ msgstr "Couldn't get search results"
+
+#~ msgid "Active"
+#~ msgstr "Active"
+
+#~ msgid "Birth Year"
+#~ msgstr "Birth Year"
+
+#~ msgid "Sex"
+#~ msgstr "Sex"
+
+#~ msgid "There is no Buddy List stored on the Gadu-Gadu server."
+#~ msgstr "There is no Buddy List stored on the Gadu-Gadu server."
+
+#~ msgid "Couldn't Import Buddy List from Server"
+#~ msgstr "Couldn't Import Buddy List from Server"
+
+#~ msgid "Buddy List successfully transferred to Gadu-Gadu server"
+#~ msgstr "Buddy List successfully transferred to Gadu-Gadu server"
+
+#~ msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
+#~ msgstr "Couldn't transfer Buddy List to Gadu-Gadu server"
+
+#~ msgid "Buddy List successfully deleted from Gadu-Gadu server"
+#~ msgstr "Buddy List successfully deleted from Gadu-Gadu server"
+
+#~ msgid "Couldn't delete Buddy List from Gadu-Gadu server"
+#~ msgstr "Couldn't delete Buddy List from Gadu-Gadu server"
+
+#~ msgid "Password couldn't be changed"
+#~ msgstr "Password couldn't be changed"
+
+#~ msgid "Error communicating with Gadu-Gadu server"
+#~ msgstr "Error communicating with Gadu-Gadu server"
+
+#~ msgid ""
+#~ "Gaim was unable to complete your request due to a problem communicating "
+#~ "with the Gadu-Gadu HTTP server.  Please try again later."
+#~ msgstr ""
+#~ "Gaim was unable to complete your request due to a problem communicating "
+#~ "with the Gadu-Gadu HTTP server.  Please try again later."
+
+#~ msgid "Unable to import Gadu-Gadu buddy list"
+#~ msgstr "Unable to import Gadu-Gadu buddy list"
+
+#~ msgid ""
+#~ "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please "
+#~ "try again later."
+#~ msgstr ""
+#~ "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please "
+#~ "try again later."
+
+#~ msgid "Couldn't export buddy list"
+#~ msgstr "Couldn't export buddy list"
+
+#~ 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."
+
+#~ msgid "Unable to delete Gadu-Gadu buddy list"
+#~ msgstr "Unable to delete Gadu-Gadu buddy list"
+
+#~ msgid "Unable to access directory"
+#~ msgstr "Unable to access directory"
+
+#~ msgid ""
+#~ "Gaim was unable to search the Directory because it was unable to connect "
+#~ "to the directory server.  Please try again later."
+#~ msgstr ""
+#~ "Gaim was unable to search the Directory because it was unable to connect "
+#~ "to the directory server.  Please try again later."
+
+#~ msgid ""
+#~ "Gaim was unable to change your password due to an error connecting to the "
+#~ "Gadu-Gadu server.  Please try again later."
+#~ msgstr ""
+#~ "Gaim was unable to change your password due to an error connecting to the "
+#~ "Gadu-Gadu server.  Please try again later."
+
+#~ msgid "Directory Search"
+#~ msgstr "Directory Search"
+
+#~ msgid "Unable to access user profile."
+#~ msgstr "Unable to access user profile."
+
+#~ msgid ""
+#~ "Gaim was unable to access this user's profile due to an error connecting "
+#~ "to the directory server.  Please try again later."
+#~ msgstr ""
+#~ "Gaim was unable to access this user's profile due to an error connecting "
+#~ "to the directory server.  Please try again later."
+
+#~ msgid "Gaim encountered an error communicating with the ICQ server."
+#~ msgstr "Gaim encountered an error communicating with the ICQ server."
+
+#~ msgid "The user %s (%s%s%s%s%s) wants you to authorize them."
+#~ msgstr "The user %s (%s%s%s%s%s) wants you to authorise them."
+
+#~ msgid "Send message through server"
+#~ msgstr "Send message through server"
+
+#~ msgid "Connecting..."
+#~ msgstr "Connecting..."
+
+#~ msgid "Nick:"
+#~ msgstr "Nick:"
+
+#~ msgid "Gaim User"
+#~ msgstr "Gaim User"
+
+#~ msgid "File Transfer Aborted"
+#~ msgstr "File Transfer Aborted"
+
+#~ msgid "Buddy Information for %s"
+#~ msgstr "Buddy Information for %s"
+
+#~ msgid "Invalid nickname '%s'"
+#~ msgstr "Invalid nickname '%s'"
+
+#~ msgid "Invalid nickname"
+#~ msgstr "Invalid nickname"
+
+#~ msgid "Jabber Profile"
+#~ msgstr "Jabber Profile"
+
+#~ msgid "Roomlist Error"
+#~ msgstr "Roomlist Error"
+
+#~ msgid "Logged out"
+#~ msgstr "Logged out"
+
+#~ msgid "Hide Operating System"
+#~ msgstr "Hide Operating System"
+
+#~ 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 "Display conversation closed notices"
+#~ msgstr "Display conversation closed notices"
+
+#~ msgid "Display timeout notices"
+#~ msgstr "Display timeout notices"
+
+#~ msgid "The conversation has become inactive and timed out."
+#~ msgstr "The conversation has become inactive and timed out."
+
+#~ msgid "%s has closed the conversation window."
+#~ msgstr "%s has closed the conversation window."
+
+#~ 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 "User Properties"
+#~ msgstr "User Properties"
+
+#~ msgid "Transfer of file %s timed out."
+#~ msgstr "Transfer of file %s timed out."
+
+#~ 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 "Not specified"
+#~ msgstr "Not specified"
+
+#~ msgid "ICQ Info for %s"
+#~ msgstr "ICQ Info for %s"
+
+#~ msgid ""
+#~ "Error 0x%04x: Unable to format screen name because the requested screen "
+#~ "name ends in a space."
+#~ msgstr ""
+#~ "Error 0x%04x: Unable to format screen name because the requested screen "
+#~ "name ends in a space."
+
+#~ msgid "Visible"
+#~ msgstr "Visible"
+
+#~ msgid "Available Message:"
+#~ msgstr "Available Message:"
+
+#~ msgid "I'm doing work and hoping for a distraction--IM me!"
+#~ msgstr "I'm doing work and hoping for a distraction--IM me!"
+
+#~ msgid "Set Available Message..."
+#~ msgstr "Set Available Message..."
+
+#~ msgid "Failed to leave channel"
+#~ msgstr "Failed to leave channel"
+
+#~ msgid "Basic Profile"
+#~ msgstr "Basic Profile"
+
+#~ msgid "Profile Information"
+#~ msgstr "Profile Information"
+
+#~ msgid "Instant Messagers"
+#~ msgstr "Instant Messagers"
+
+#~ msgid "AIM"
+#~ msgstr "AIM"
+
+#~ msgid "ICQ UIN"
+#~ msgstr "ICQ UIN"
+
+#~ msgid "MSN"
+#~ msgstr "MSN"
+
+#~ msgid "Yahoo"
+#~ msgstr "Yahoo"
+
+#~ msgid "I'm From"
+#~ msgstr "I'm From"
+
+#~ msgid "Set your Trepia profile data."
+#~ msgstr "Set your Trepia profile data."
+
+#~ msgid "Profile"
+#~ msgstr "Profile"
+
+#~ msgid "Set Profile"
+#~ msgstr "Set Profile"
+
+#~ msgid "Visit Homepage"
+#~ msgstr "Visit Homepage"
+
+#~ msgid "Local Users"
+#~ msgstr "Local Users"
+
+#~ msgid "Logging in"
+#~ msgstr "Logging in"
+
+#~ msgid "Trepia Protocol Plugin"
+#~ msgstr "Trepia Protocol Plugin"
+
+#~ 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 "Please enter your password"
+#~ msgstr "Please enter your password"
+
+#~ msgid "%s logged in."
+#~ msgstr "%s logged in."
+
+#~ msgid "%s signed on"
+#~ msgstr "%s signed on"
+
+#~ msgid "%s logged out."
+#~ msgstr "%s logged out."
+
+#~ msgid "%s signed off"
+#~ msgstr "%s signed off"
+
+#~ 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%%"
+
+#~ msgid "an anonymous person"
+#~ msgstr "an anonymous person"
+
+#~ 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>"
+
+#~ msgid "Sorry, I ran out for a bit!"
+#~ msgstr "Sorry old chap, I've stepped out for a while!"
+
 #~ msgid "/Conversation/A_lias..."
 #~ msgstr "/Conversation/A_lias..."