changeset 10290:9384f4492872

[gaim-migrate @ 11466] en_CA likes to keep on top of things committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Thu, 02 Dec 2004 00:50:16 +0000
parents 5683613ea692
children 3f09e34b0928
files po/en_CA.po
diffstat 1 files changed, 1759 insertions(+), 1632 deletions(-) [+]
line wrap: on
line diff
--- a/po/en_CA.po	Wed Dec 01 23:32:46 2004 +0000
+++ b/po/en_CA.po	Thu Dec 02 00:50:16 2004 +0000
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: gaim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-22 17:04-0400\n"
-"PO-Revision-Date: 2004-10-22 19:45-0400\n"
+"POT-Creation-Date: 2004-11-28 23:15-0500\n"
+"PO-Revision-Date: 2004-11-28 19:45-0400\n"
 "Last-Translator: Adam Weinberger <adamw@gnome.org>\n"
 "Language-Team: en_CA <adamw@FreeBSD.org>\n"
 "MIME-Version: 1.0\n"
@@ -150,7 +150,7 @@
 msgid "Gaim - Away"
 msgstr "Gaim - Away"
 
-#: plugins/docklet/docklet.c:140 src/gtkaccount.c:738 src/gtkaccount.c:2164
+#: plugins/docklet/docklet.c:140
 msgid "Auto-login"
 msgstr "Auto-login"
 
@@ -166,14 +166,15 @@
 msgid "New..."
 msgstr "New..."
 
-#: plugins/docklet/docklet.c:189 src/gtkprefs.c:1774 src/protocols/gg/gg.c:52
-#: src/protocols/irc/irc.c:166 src/protocols/irc/msgs.c:189
-#: src/protocols/jabber/buddy.c:1004 src/protocols/jabber/jabber.c:974
-#: src/protocols/msn/msn.c:534 src/protocols/novell/novell.c:2807
-#: src/protocols/novell/novell.c:2924 src/protocols/novell/novell.c:2976
-#: src/protocols/oscar/oscar.c:677 src/protocols/oscar/oscar.c:6659
-#: src/protocols/oscar/oscar.c:6878 src/protocols/silc/buddy.c:1384
-#: src/protocols/silc/silc.c:52 src/protocols/zephyr/zephyr.c:2224
+#: plugins/docklet/docklet.c:189 src/gtkprefs.c:1760 src/protocols/gg/gg.c:52
+#: src/protocols/irc/irc.c:169 src/protocols/irc/msgs.c:189
+#: src/protocols/jabber/buddy.c:1074 src/protocols/jabber/jabber.c:976
+#: src/protocols/msn/msn.c:542 src/protocols/novell/novell.c:2811
+#: src/protocols/novell/novell.c:2928 src/protocols/novell/novell.c:2980
+#: src/protocols/oscar/oscar.c:677 src/protocols/oscar/oscar.c:5592
+#: src/protocols/oscar/oscar.c:6662 src/protocols/oscar/oscar.c:6883
+#: src/protocols/silc/buddy.c:1384 src/protocols/silc/silc.c:52
+#: src/protocols/yahoo/yahoo.c:3167 src/protocols/zephyr/zephyr.c:2226
 msgid "Away"
 msgstr "Away"
 
@@ -193,23 +194,23 @@
 msgid "Accounts"
 msgstr "Accounts"
 
-#: plugins/docklet/docklet.c:215 src/gtkprefs.c:2375
+#: plugins/docklet/docklet.c:215 src/gtkprefs.c:2263
 msgid "Preferences"
 msgstr "Preferences"
 
 #: plugins/docklet/docklet.c:224
-msgid "Signoff"
-msgstr "Signoff"
+msgid "Log Out"
+msgstr "Log Out"
 
 #: plugins/docklet/docklet.c:228
 msgid "Quit"
 msgstr "Quit"
 
-#: plugins/docklet/docklet.c:551
+#: plugins/docklet/docklet.c:553
 msgid "Tray Icon Configuration"
 msgstr "Tray Icon Configuration"
 
-#: plugins/docklet/docklet.c:555
+#: plugins/docklet/docklet.c:557
 msgid "_Hide new messages until tray icon is clicked"
 msgstr "_Hide new messages until tray icon is clicked"
 
@@ -219,18 +220,18 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/docklet/docklet.c:581
+#: plugins/docklet/docklet.c:583
 msgid "System Tray Icon"
 msgstr "System Tray Icon"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/docklet/docklet.c:584
+#: plugins/docklet/docklet.c:586
 msgid "Displays an icon for Gaim in the system tray."
 msgstr "Displays an icon for Gaim in the system tray."
 
-#: plugins/docklet/docklet.c:586
+#: plugins/docklet/docklet.c:588
 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, "
@@ -288,7 +289,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/filectl.c:224
+#: plugins/filectl.c:249
 msgid "Gaim File Control"
 msgstr "Gaim File Control"
 
@@ -296,7 +297,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/filectl.c:227 plugins/filectl.c:229
+#: plugins/filectl.c:252 plugins/filectl.c:254
 msgid "Allows you to control Gaim by entering commands in a file."
 msgstr "Allows you to control Gaim by entering commands in a file."
 
@@ -435,9 +436,9 @@
 "Drag up and then to the right to switch to the next conversation."
 
 #: plugins/gevolution/add_buddy_dialog.c:132
-#: plugins/gevolution/assoc-buddy.c:120 src/gtkprefs.c:2105
+#: plugins/gevolution/assoc-buddy.c:120 src/gtkprefs.c:2080
 #: src/gtkroomlist.c:553 src/protocols/jabber/jabber.c:599
-#: src/protocols/msn/msn.c:1466 src/protocols/trepia/trepia.c:399
+#: src/protocols/msn/msn.c:1503 src/protocols/trepia/trepia.c:399
 msgid "Name"
 msgstr "Name"
 
@@ -451,13 +452,13 @@
 
 #. "Search"
 #: plugins/gevolution/add_buddy_dialog.c:468
-#: plugins/gevolution/assoc-buddy.c:354 src/protocols/oscar/oscar.c:7182
+#: plugins/gevolution/assoc-buddy.c:354 src/protocols/oscar/oscar.c:7189
 msgid "Search"
 msgstr "Search"
 
 #: plugins/gevolution/add_buddy_dialog.c:549
-#: plugins/gevolution/new_person_dialog.c:304 src/gtkblist.c:4007
-#: src/gtkblist.c:4354
+#: plugins/gevolution/new_person_dialog.c:304 src/gtkblist.c:4012
+#: src/gtkblist.c:4361
 msgid "Group:"
 msgstr "Group:"
 
@@ -495,7 +496,7 @@
 msgstr "_Associate Buddy"
 
 #: plugins/gevolution/gevo-util.c:64 plugins/gevolution/gevolution.c:90
-#: src/blist.c:769 src/blist.c:976 src/blist.c:1920 src/gtkblist.c:3826
+#: src/blist.c:775 src/blist.c:982 src/blist.c:1933 src/gtkblist.c:3832
 #: src/protocols/jabber/roster.c:66
 msgid "Buddies"
 msgstr "Buddies"
@@ -513,7 +514,7 @@
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr "Select all accounts that buddies should be auto-added to."
 
-#: plugins/gevolution/gevolution.c:377 plugins/idle.c:52 src/gtkconn.c:624
+#: plugins/gevolution/gevolution.c:377 plugins/idle.c:52 src/gtkconn.c:623
 msgid "Account"
 msgstr "Account"
 
@@ -895,35 +896,35 @@
 msgid "Tests to see that most things are working."
 msgstr "Tests to see that most things are working."
 
-#: plugins/spellchk.c:414
+#: plugins/spellchk.c:415
 msgid "Text Replacements"
 msgstr "Text Replacements"
 
-#: plugins/spellchk.c:438
+#: plugins/spellchk.c:439
 msgid "You type"
 msgstr "You type"
 
-#: plugins/spellchk.c:450
+#: plugins/spellchk.c:451
 msgid "You send"
 msgstr "You send"
 
-#: plugins/spellchk.c:476
+#: plugins/spellchk.c:477
 msgid "Add a new text replacement"
 msgstr "Add a new text replacement"
 
-#: plugins/spellchk.c:483
+#: plugins/spellchk.c:484
 msgid "You _type:"
 msgstr "You _type:"
 
-#: plugins/spellchk.c:497
+#: plugins/spellchk.c:498
 msgid "You _send:"
 msgstr "You _send:"
 
-#: plugins/spellchk.c:539
+#: plugins/spellchk.c:540
 msgid "Text replacement"
 msgstr "Text replacement"
 
-#: plugins/spellchk.c:541 plugins/spellchk.c:542
+#: plugins/spellchk.c:542 plugins/spellchk.c:543
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "Replaces text in outgoing messages according to user-defined rules."
 
@@ -951,7 +952,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl-nss.c:317
+#: plugins/ssl/ssl-nss.c:318
 msgid "NSS"
 msgstr "NSS"
 
@@ -959,7 +960,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/ssl/ssl-nss.c:320 plugins/ssl/ssl-nss.c:322
+#: 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."
 
@@ -981,35 +982,35 @@
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "Provides a wrapper around SSL support libraries."
 
-#: plugins/statenotify.c:38
+#: plugins/statenotify.c:42
 #, c-format
 msgid "%s has gone away."
 msgstr "%s has gone away."
 
-#: plugins/statenotify.c:45
+#: plugins/statenotify.c:49
 #, c-format
 msgid "%s is no longer away."
 msgstr "%s is no longer away."
 
-#: plugins/statenotify.c:52
+#: plugins/statenotify.c:56
 #, c-format
 msgid "%s has become idle."
 msgstr "%s has become idle."
 
-#: plugins/statenotify.c:59
+#: plugins/statenotify.c:63
 #, c-format
 msgid "%s is no longer idle."
 msgstr "%s is no longer idle."
 
-#: plugins/statenotify.c:70
+#: plugins/statenotify.c:74
 msgid "Notify When"
 msgstr "Notify When"
 
-#: plugins/statenotify.c:73
+#: plugins/statenotify.c:77
 msgid "Buddy Goes _Away"
 msgstr "Buddy Goes _Away"
 
-#: plugins/statenotify.c:76
+#: plugins/statenotify.c:80
 msgid "Buddy Goes _Idle"
 msgstr "Buddy Goes _Idle"
 
@@ -1019,11 +1020,11 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/statenotify.c:116
+#: plugins/statenotify.c:120
 msgid "Buddy State Notification"
 msgstr "Buddy State Notification"
 
-#: plugins/statenotify.c:119 plugins/statenotify.c:122
+#: plugins/statenotify.c:123 plugins/statenotify.c:126
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
@@ -1162,8 +1163,8 @@
 msgstr "_Start Gaim on Windows startup"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3113
-#: src/gtkprefs.c:2290
+#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3108
+#: src/gtkprefs.c:2178
 msgid "Buddy List"
 msgstr "Buddy List"
 
@@ -1182,8 +1183,8 @@
 msgstr "_Keep Buddy List window on top"
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:947
-#: src/gtkprefs.c:2291 src/protocols/msn/msn.c:1803
+#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:910
+#: src/gtkprefs.c:2179 src/protocols/msn/msn.c:1840
 msgid "Conversations"
 msgstr "Conversations"
 
@@ -1199,7 +1200,7 @@
 msgid "Options specific to Windows Gaim."
 msgstr "Options specific to Windows Gaim."
 
-#: src/account.c:294 src/protocols/jabber/jabber.c:1030
+#: src/account.c:294 src/protocols/jabber/jabber.c:1032
 msgid "New passwords do not match."
 msgstr "New passwords do not match."
 
@@ -1231,46 +1232,46 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:359 src/connection.c:192 src/gtkblist.c:2422
-#: src/gtkdialogs.c:385 src/gtkdialogs.c:527 src/gtkdialogs.c:583
-#: src/gtkrequest.c:242 src/protocols/jabber/jabber.c:1077
-#: src/protocols/jabber/xdata.c:337 src/protocols/msn/msn.c:230
-#: src/protocols/msn/msn.c:245 src/protocols/msn/msn.c:260
-#: src/protocols/msn/msn.c:275 src/protocols/oscar/oscar.c:3528
-#: src/protocols/oscar/oscar.c:3622 src/protocols/oscar/oscar.c:6969
-#: src/protocols/oscar/oscar.c:7061 src/protocols/oscar/oscar.c:7113
+#: src/account.c:359 src/connection.c:192 src/gtkblist.c:2415
+#: src/gtkdialogs.c:372 src/gtkdialogs.c:515 src/gtkdialogs.c:571
+#: src/gtkrequest.c:259 src/protocols/jabber/jabber.c:1079
+#: src/protocols/jabber/xdata.c:337 src/protocols/msn/msn.c:228
+#: src/protocols/msn/msn.c:243 src/protocols/msn/msn.c:258
+#: src/protocols/msn/msn.c:273 src/protocols/oscar/oscar.c:3533
+#: src/protocols/oscar/oscar.c:3627 src/protocols/oscar/oscar.c:6976
+#: src/protocols/oscar/oscar.c:7068 src/protocols/oscar/oscar.c:7120
 #: src/protocols/silc/buddy.c:460 src/protocols/silc/buddy.c:1132
 #: src/protocols/silc/chat.c:421 src/protocols/silc/chat.c:459
-#: src/protocols/silc/chat.c:722 src/protocols/silc/ops.c:1081
-#: src/protocols/silc/ops.c:1693 src/protocols/silc/silc.c:713
-#: src/protocols/yahoo/yahoo.c:2878 src/protocols/yahoo/yahoo.c:2887
-#: src/request.h:1245
+#: src/protocols/silc/chat.c:722 src/protocols/silc/ops.c:1083
+#: src/protocols/silc/ops.c:1689 src/protocols/silc/silc.c:717
+#: src/protocols/yahoo/yahoo.c:2892 src/protocols/yahoo/yahoo.c:2901
+#: src/request.h:1244
 msgid "OK"
 msgstr "OK"
 
 #: src/account.c:360 src/account.c:398 src/connection.c:193
-#: src/gtkaccount.c:2014 src/gtkaccount.c:2510 src/gtkblist.c:2423
-#: src/gtkblist.c:4392 src/gtkconn.c:168 src/gtkdialogs.c:386
-#: src/gtkdialogs.c:528 src/gtkdialogs.c:584 src/gtkdialogs.c:682
-#: src/gtkdialogs.c:704 src/gtkdialogs.c:724 src/gtkdialogs.c:760
-#: src/gtkdialogs.c:820 src/gtkdialogs.c:862 src/gtkdialogs.c:897
-#: src/gtkimhtmltoolbar.c:434 src/gtkprivacy.c:586 src/gtkprivacy.c:599
-#: src/gtkprivacy.c:624 src/gtkprivacy.c:635 src/gtkrequest.c:243
-#: src/protocols/jabber/buddy.c:517 src/protocols/jabber/chat.c:772
-#: src/protocols/jabber/jabber.c:668 src/protocols/jabber/jabber.c:1078
-#: src/protocols/jabber/xdata.c:338 src/protocols/msn/msn.c:231
-#: src/protocols/msn/msn.c:246 src/protocols/msn/msn.c:261
-#: src/protocols/msn/msn.c:276 src/protocols/msn/msn.c:293
-#: src/protocols/oscar/oscar.c:1532 src/protocols/oscar/oscar.c:3486
-#: src/protocols/oscar/oscar.c:3529 src/protocols/oscar/oscar.c:3566
-#: src/protocols/oscar/oscar.c:3623 src/protocols/oscar/oscar.c:6970
-#: src/protocols/oscar/oscar.c:7062 src/protocols/oscar/oscar.c:7114
-#: src/protocols/oscar/oscar.c:7183 src/protocols/silc/buddy.c:461
+#: src/gtkaccount.c:2014 src/gtkaccount.c:2510 src/gtkblist.c:2416
+#: src/gtkblist.c:4399 src/gtkconn.c:168 src/gtkdialogs.c:373
+#: src/gtkdialogs.c:516 src/gtkdialogs.c:572 src/gtkdialogs.c:670
+#: src/gtkdialogs.c:692 src/gtkdialogs.c:712 src/gtkdialogs.c:748
+#: src/gtkdialogs.c:810 src/gtkdialogs.c:852 src/gtkdialogs.c:890
+#: src/gtkimhtmltoolbar.c:437 src/gtkprivacy.c:588 src/gtkprivacy.c:601
+#: src/gtkprivacy.c:626 src/gtkprivacy.c:637 src/gtkrequest.c:260
+#: src/protocols/jabber/buddy.c:565 src/protocols/jabber/chat.c:772
+#: src/protocols/jabber/jabber.c:668 src/protocols/jabber/jabber.c:1080
+#: src/protocols/jabber/xdata.c:338 src/protocols/msn/msn.c:229
+#: src/protocols/msn/msn.c:244 src/protocols/msn/msn.c:259
+#: src/protocols/msn/msn.c:274 src/protocols/msn/msn.c:291
+#: src/protocols/oscar/oscar.c:1534 src/protocols/oscar/oscar.c:3491
+#: src/protocols/oscar/oscar.c:3534 src/protocols/oscar/oscar.c:3571
+#: src/protocols/oscar/oscar.c:3628 src/protocols/oscar/oscar.c:6977
+#: src/protocols/oscar/oscar.c:7069 src/protocols/oscar/oscar.c:7121
+#: src/protocols/oscar/oscar.c:7190 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:1694 src/protocols/silc/silc.c:714
-#: src/protocols/trepia/trepia.c:348 src/protocols/yahoo/yahoo.c:2879
-#: src/protocols/yahoo/yahoo.c:2888 src/request.h:1245 src/request.h:1255
+#: src/protocols/silc/ops.c:1690 src/protocols/silc/silc.c:718
+#: src/protocols/trepia/trepia.c:348 src/protocols/yahoo/yahoo.c:2893
+#: src/protocols/yahoo/yahoo.c:2902 src/request.h:1244 src/request.h:1254
 msgid "Cancel"
 msgstr "Cancel"
 
@@ -1279,22 +1280,22 @@
 msgid "Change user information for %s"
 msgstr "Change user information for %s"
 
-#: src/account.c:397 src/gtkrequest.c:249 src/protocols/jabber/buddy.c:516
+#: src/account.c:397 src/gtkrequest.c:266 src/protocols/jabber/buddy.c:564
 #: src/protocols/trepia/trepia.c:347
 msgid "Save"
 msgstr "Save"
 
-#: src/account.c:809 src/gtkft.c:158 src/protocols/jabber/buddy.c:572
-#: src/protocols/jabber/buddy.c:994 src/protocols/jabber/buddy.c:1011
-#: src/protocols/novell/novell.c:2819
+#: src/account.c:802 src/gtkft.c:158 src/protocols/jabber/buddy.c:621
+#: src/protocols/jabber/buddy.c:1064 src/protocols/jabber/buddy.c:1081
+#: src/protocols/novell/novell.c:2823
 msgid "Unknown"
 msgstr "Unknown"
 
-#: src/blist.c:675
+#: src/blist.c:681
 msgid "Chats"
 msgstr "Chats"
 
-#: src/blist.c:1339
+#: src/blist.c:1352
 #, c-format
 msgid ""
 "%d buddy from group %s was not removed because its account was not logged "
@@ -1309,11 +1310,11 @@
 "%d buddies from group %s were not removed because their accounts were not "
 "logged in.  These buddies and the group were not removed.\n"
 
-#: src/blist.c:1348
+#: src/blist.c:1361
 msgid "Group not removed"
 msgstr "Group not removed"
 
-#: src/blist.c:2051
+#: src/blist.c:2064
 msgid ""
 "An error was encountered parsing your buddy list.  It has not been loaded, "
 "and the old file has moved to blist.xml~."
@@ -1321,7 +1322,7 @@
 "An error was encountered parsing your buddy list.  It has not been loaded, "
 "and the old file has moved to blist.xml~."
 
-#: src/blist.c:2054
+#: src/blist.c:2067
 msgid "Buddy List Error"
 msgstr "Buddy List Error"
 
@@ -1343,75 +1344,89 @@
 msgid "Enter password for %s (%s)"
 msgstr "Enter password for %s (%s)"
 
-#: src/conversation.c:229
-msgid "Unable to send message. The message is too large."
-msgstr "Unable to send message. The message is too large."
-
-#: src/conversation.c:237
+#: src/conversation.c:236
+msgid "Unable to send message: The message is too large."
+msgstr "Unable to send message: The message is too large."
+
+#: src/conversation.c:239
+#, c-format
+msgid "Unable to send message to %s."
+msgstr "Unable to send message to %s."
+
+#: src/conversation.c:240
+msgid "The message is too large."
+msgstr "The message is too large."
+
+#: src/conversation.c:249
 msgid "Unable to send message."
 msgstr "Unable to send message."
 
-#: src/conversation.c:1970
+#: src/conversation.c:252
+#, c-format
+msgid "Unable to send messge to %s."
+msgstr "Unable to send messge to %s."
+
+#: src/conversation.c:2005
 #, c-format
 msgid "%s entered the room."
 msgstr "%s entered the room."
 
-#: src/conversation.c:1973
+#: src/conversation.c:2008
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] entered the room."
 
-#: src/conversation.c:2069
+#: src/conversation.c:2104
 #, c-format
 msgid "You are now known as %s"
 msgstr "You are now known as %s"
 
-#: src/conversation.c:2072
+#: src/conversation.c:2107
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s is now known as %s"
 
-#: src/conversation.c:2113
+#: src/conversation.c:2148
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s left the room (%s)."
 
-#: src/conversation.c:2115
+#: src/conversation.c:2150
 #, c-format
 msgid "%s left the room."
 msgstr "%s left the room."
 
-#: src/conversation.c:2184
+#: src/conversation.c:2219
 #, c-format
 msgid "(+%d more)"
 msgstr "(+%d more)"
 
-#: src/conversation.c:2186
+#: src/conversation.c:2221
 #, c-format
 msgid " left the room (%s)."
 msgstr " left the room (%s)."
 
-#: src/conversation.c:2591
+#: src/conversation.c:2626
 msgid "Last created window"
 msgstr "Last created window"
 
-#: src/conversation.c:2593
+#: src/conversation.c:2628
 msgid "Separate IM and Chat windows"
 msgstr "Separate IM and Chat windows"
 
-#: src/conversation.c:2595 src/gtkprefs.c:1324
+#: src/conversation.c:2630 src/gtkprefs.c:1287
 msgid "New window"
 msgstr "New window"
 
-#: src/conversation.c:2597
+#: src/conversation.c:2632
 msgid "By group"
 msgstr "By group"
 
-#: src/conversation.c:2599
+#: src/conversation.c:2634
 msgid "By account"
 msgstr "By account"
 
-#: src/ft.c:147 src/protocols/msn/msn.c:372
+#: src/ft.c:148 src/protocols/msn/msn.c:370
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -1420,7 +1435,7 @@
 "Error reading %s: \n"
 "%s.\n"
 
-#: src/ft.c:151
+#: src/ft.c:152
 #, c-format
 msgid ""
 "Error writing %s: \n"
@@ -1429,7 +1444,7 @@
 "Error writing %s: \n"
 "%s.\n"
 
-#: src/ft.c:155
+#: src/ft.c:156
 #, c-format
 msgid ""
 "Error accessing %s: \n"
@@ -1438,30 +1453,30 @@
 "Error accessing %s: \n"
 "%s.\n"
 
-#: src/ft.c:187
+#: src/ft.c:188
 msgid "Cannot send a file of 0 bytes."
 msgstr "Cannot send a file of 0 bytes."
 
-#: src/ft.c:197
+#: src/ft.c:198
 msgid "Cannot send a directory."
 msgstr "Cannot send a directory."
 
-#: src/ft.c:204
+#: src/ft.c:205
 #, 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:258
+#: src/ft.c:260
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s wants to send you %s (%s)"
 
-#: src/ft.c:299
+#: src/ft.c:302
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "Accept file transfer request from %s?"
 
-#: src/ft.c:303
+#: src/ft.c:306
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -1472,37 +1487,37 @@
 "Remote host: %s\n"
 "Remote port: %d"
 
-#: src/ft.c:356
+#: src/ft.c:359
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s is not a valid filename.\n"
 
-#: src/ft.c:374
+#: src/ft.c:377
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "Offering to send %s to %s"
 
-#: src/ft.c:866
+#: src/ft.c:870
 #, c-format
 msgid "Transfer of %s complete"
 msgstr "Transfer of %s complete"
 
-#: src/ft.c:913
+#: src/ft.c:918
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "You cancelled the transfer of %s"
 
-#: src/ft.c:963
+#: src/ft.c:970
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s cancelled the transfer of %s"
 
-#: src/ft.c:1012
+#: src/ft.c:1020
 #, c-format
 msgid "File transfer to %s aborted.\n"
 msgstr "File transfer to %s aborted.\n"
 
-#: src/ft.c:1014
+#: src/ft.c:1022
 #, c-format
 msgid "File transfer from %s aborted.\n"
 msgstr "File transfer from %s aborted.\n"
@@ -1667,7 +1682,7 @@
 msgid "Protocol:"
 msgstr "Protocol:"
 
-#: src/gtkaccount.c:647 src/gtkblist.c:3979
+#: src/gtkaccount.c:647 src/gtkblist.c:3984
 msgid "Screen Name:"
 msgstr "Screen Name:"
 
@@ -1675,7 +1690,7 @@
 msgid "Password:"
 msgstr "Password:"
 
-#: src/gtkaccount.c:725 src/gtkblist.c:3993 src/gtkblist.c:4340
+#: src/gtkaccount.c:725 src/gtkblist.c:3998 src/gtkblist.c:4347
 msgid "Alias:"
 msgstr "Alias:"
 
@@ -1683,6 +1698,10 @@
 msgid "Remember password"
 msgstr "Remember password"
 
+#: src/gtkaccount.c:738
+msgid "Auto log in"
+msgstr "Auto login"
+
 #. Build the user options frame.
 #: src/gtkaccount.c:785
 msgid "User Options"
@@ -1728,7 +1747,7 @@
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:1062 src/gtkaccount.c:1114 src/gtkprefs.c:1127
+#: src/gtkaccount.c:1062 src/gtkaccount.c:1114 src/gtkprefs.c:1090
 msgid "Use Environmental Settings"
 msgstr "Use Environmental Settings"
 
@@ -1744,15 +1763,15 @@
 msgid "Proxy Options"
 msgstr "Proxy Options"
 
-#: src/gtkaccount.c:1191 src/gtkprefs.c:1121
+#: src/gtkaccount.c:1191 src/gtkprefs.c:1084
 msgid "Proxy _type:"
 msgstr "Proxy _type:"
 
-#: src/gtkaccount.c:1200 src/gtkprefs.c:1148
+#: src/gtkaccount.c:1200 src/gtkprefs.c:1111
 msgid "_Host:"
 msgstr "_Host:"
 
-#: src/gtkaccount.c:1204 src/gtkprefs.c:1166
+#: src/gtkaccount.c:1204 src/gtkprefs.c:1129
 msgid "_Port:"
 msgstr "_Port:"
 
@@ -1760,7 +1779,7 @@
 msgid "_Username:"
 msgstr "_Username:"
 
-#: src/gtkaccount.c:1217 src/gtkprefs.c:1203
+#: src/gtkaccount.c:1217 src/gtkprefs.c:1166
 msgid "Pa_ssword:"
 msgstr "Pa_ssword:"
 
@@ -1791,11 +1810,11 @@
 msgid "Are you sure you want to delete %s?"
 msgstr "Are you sure you want to delete %s?"
 
-#: src/gtkaccount.c:2013 src/gtkrequest.c:246
+#: src/gtkaccount.c:2013 src/gtkrequest.c:263
 msgid "Delete"
 msgstr "Delete"
 
-#: src/gtkaccount.c:2127 src/protocols/oscar/oscar.c:4173
+#: src/gtkaccount.c:2127 src/protocols/oscar/oscar.c:4179
 msgid "Screen Name"
 msgstr "Screen Name"
 
@@ -1812,15 +1831,19 @@
 #.
 #. Away won't change their exposure but will set an auto away message (for IMs only)
 #.
-#: src/gtkaccount.c:2151 src/protocols/gg/gg.c:271 src/protocols/irc/irc.c:158
-#: src/protocols/jabber/buddy.c:1000 src/protocols/jabber/jabber.c:962
-#: src/protocols/msn/msn.c:526 src/protocols/oscar/oscar.c:683
-#: src/protocols/oscar/oscar.c:6868 src/protocols/silc/silc.c:48
-#: src/protocols/yahoo/yahoo.c:2641 src/protocols/yahoo/yahoo.c:3105
-#: src/protocols/zephyr/zephyr.c:2217
+#: src/gtkaccount.c:2151 src/protocols/gg/gg.c:272 src/protocols/irc/irc.c:161
+#: src/protocols/jabber/buddy.c:1070 src/protocols/jabber/jabber.c:964
+#: src/protocols/msn/msn.c:534 src/protocols/napster/napster.c:561
+#: src/protocols/oscar/oscar.c:683 src/protocols/oscar/oscar.c:6871
+#: src/protocols/silc/silc.c:48 src/protocols/yahoo/yahoo.c:2655
+#: src/protocols/yahoo/yahoo.c:3125 src/protocols/zephyr/zephyr.c:2219
 msgid "Online"
 msgstr "Online"
 
+#: src/gtkaccount.c:2164
+msgid "Auto Log In"
+msgstr "Auto Login"
+
 #: src/gtkaccount.c:2172
 msgid "Protocol"
 msgstr "Protocol"
@@ -1849,17 +1872,17 @@
 msgstr "Add buddy to your list?"
 
 #. Add button
-#: src/gtkaccount.c:2509 src/gtkblist.c:4391 src/gtkconv.c:1487
-#: src/gtkconv.c:3805 src/gtkconv.c:3876 src/gtkrequest.c:247
-#: src/protocols/oscar/oscar.c:3800 src/protocols/silc/chat.c:593
+#: src/gtkaccount.c:2509 src/gtkblist.c:4398 src/gtkconv.c:1474
+#: src/gtkconv.c:3788 src/gtkconv.c:3859 src/gtkrequest.c:264
+#: src/protocols/oscar/oscar.c:3805 src/protocols/silc/chat.c:593
 msgid "Add"
 msgstr "Add"
 
-#: src/gtkblist.c:808
+#: src/gtkblist.c:809
 msgid "Join a Chat"
 msgstr "Join a Chat"
 
-#: src/gtkblist.c:829
+#: src/gtkblist.c:830
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
@@ -1867,228 +1890,228 @@
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 
-#: src/gtkblist.c:840 src/gtkpounce.c:415 src/gtkroomlist.c:354
+#: src/gtkblist.c:841 src/gtkpounce.c:415 src/gtkroomlist.c:354
 msgid "_Account:"
 msgstr "_Account:"
 
-#: src/gtkblist.c:1112
+#: src/gtkblist.c:1113
 msgid "Get _Info"
 msgstr "Get _Info"
 
-#: src/gtkblist.c:1115
+#: src/gtkblist.c:1116
 msgid "I_M"
 msgstr "I_M"
 
-#: src/gtkblist.c:1121
+#: src/gtkblist.c:1122
 msgid "_Send File"
 msgstr "_Send File"
 
-#: src/gtkblist.c:1127
+#: src/gtkblist.c:1128
 msgid "Add Buddy _Pounce"
 msgstr "Add Buddy _Pounce"
 
-#: src/gtkblist.c:1129 src/gtkblist.c:1226
+#: src/gtkblist.c:1130 src/gtkblist.c:1227
 msgid "View _Log"
 msgstr "View _Log"
 
-#: src/gtkblist.c:1139
+#: src/gtkblist.c:1140
 msgid "_Alias Buddy..."
 msgstr "_Alias Buddy..."
 
-#: src/gtkblist.c:1141
+#: src/gtkblist.c:1142
 msgid "_Remove Buddy"
 msgstr "_Remove Buddy"
 
-#: src/gtkblist.c:1143
+#: src/gtkblist.c:1144
 msgid "Alias Contact..."
 msgstr "Alias Contact..."
 
-#: src/gtkblist.c:1146 src/gtkdialogs.c:758 src/gtkdialogs.c:759
+#: src/gtkblist.c:1147 src/gtkdialogs.c:746 src/gtkdialogs.c:747
 msgid "Remove Contact"
 msgstr "Remove Contact"
 
-#: src/gtkblist.c:1150 src/gtkblist.c:1234 src/gtkblist.c:1248
+#: src/gtkblist.c:1151 src/gtkblist.c:1235 src/gtkblist.c:1249
 msgid "_Alias..."
 msgstr "_Alias..."
 
-#: src/gtkblist.c:1152 src/gtkblist.c:1236 src/gtkblist.c:1253
+#: src/gtkblist.c:1153 src/gtkblist.c:1237 src/gtkblist.c:1254
 #: src/gtkconn.c:364
 msgid "_Remove"
 msgstr "_Remove"
 
-#: src/gtkblist.c:1198
+#: src/gtkblist.c:1199
 msgid "Add a _Buddy"
 msgstr "Add a _Buddy"
 
-#: src/gtkblist.c:1200
+#: src/gtkblist.c:1201
 msgid "Add a C_hat"
 msgstr "Add a C_hat"
 
-#: src/gtkblist.c:1202
+#: src/gtkblist.c:1203
 msgid "_Delete Group"
 msgstr "_Delete Group"
 
-#: src/gtkblist.c:1204
+#: src/gtkblist.c:1205
 msgid "_Rename"
 msgstr "_Rename"
 
 #. join button
-#: src/gtkblist.c:1222 src/gtkroomlist.c:264 src/gtkroomlist.c:409
+#: src/gtkblist.c:1223 src/gtkroomlist.c:264 src/gtkroomlist.c:409
 #: src/stock.c:88
 msgid "_Join"
 msgstr "_Join"
 
-#: src/gtkblist.c:1224
+#: src/gtkblist.c:1225
 msgid "Auto-Join"
 msgstr "Auto-Join"
 
-#: src/gtkblist.c:1250 src/gtkblist.c:1275
+#: src/gtkblist.c:1251 src/gtkblist.c:1276
 msgid "_Collapse"
 msgstr "_Collapse"
 
-#: src/gtkblist.c:1280
+#: src/gtkblist.c:1281
 msgid "_Expand"
 msgstr "_Expand"
 
-#: src/gtkblist.c:1497 src/gtkblist.c:1507 src/gtkblist.c:3243
-#: src/gtkblist.c:3246
+#: src/gtkblist.c:1498 src/gtkblist.c:1508 src/gtkblist.c:3247
+#: src/gtkblist.c:3250
 msgid "/Tools/Mute Sounds"
 msgstr "/Tools/Mute Sounds"
 
-#: src/gtkblist.c:1948 src/gtkconv.c:4475 src/gtkpounce.c:316
+#: src/gtkblist.c:1949 src/gtkconv.c:4354 src/gtkpounce.c:316
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr ""
 "You are not currently signed on with an account that can add that buddy."
 
 #. Buddies menu
-#: src/gtkblist.c:2366
+#: src/gtkblist.c:2359
 msgid "/_Buddies"
 msgstr "/_Buddies"
 
-#: src/gtkblist.c:2367
+#: src/gtkblist.c:2360
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Buddies/New Instant _Message..."
 
-#: src/gtkblist.c:2368
+#: src/gtkblist.c:2361
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Buddies/Join a _Chat..."
 
-#: src/gtkblist.c:2369
+#: src/gtkblist.c:2362
 msgid "/Buddies/Get User _Info..."
 msgstr "/Buddies/Get User _Info..."
 
-#: src/gtkblist.c:2370
+#: src/gtkblist.c:2363
 msgid "/Buddies/View User _Log..."
 msgstr "/Buddies/View User _Log..."
 
-#: src/gtkblist.c:2372
+#: src/gtkblist.c:2365
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Buddies/Show _Offline Buddies"
 
-#: src/gtkblist.c:2373
+#: src/gtkblist.c:2366
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Buddies/Show _Empty Groups"
 
-#: src/gtkblist.c:2374
+#: src/gtkblist.c:2367
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Buddies/_Add Buddy..."
 
-#: src/gtkblist.c:2375
+#: src/gtkblist.c:2368
 msgid "/Buddies/Add C_hat..."
 msgstr "/Buddies/Add C_hat..."
 
-#: src/gtkblist.c:2376
+#: src/gtkblist.c:2369
 msgid "/Buddies/Add _Group..."
 msgstr "/Buddies/Add _Group..."
 
-#: src/gtkblist.c:2378
-msgid "/Buddies/_Signoff"
-msgstr "/Buddies/_Signoff"
-
-#: src/gtkblist.c:2379
+#: src/gtkblist.c:2371
+msgid "/Buddies/_Log Out"
+msgstr "/Buddies/_Log Out"
+
+#: src/gtkblist.c:2372
 msgid "/Buddies/_Quit"
 msgstr "/Buddies/_Quit"
 
 #. Tools
-#: src/gtkblist.c:2382
+#: src/gtkblist.c:2375
 msgid "/_Tools"
 msgstr "/_Tools"
 
-#: src/gtkblist.c:2383
+#: src/gtkblist.c:2376
 msgid "/Tools/_Away"
 msgstr "/Tools/_Away"
 
-#: src/gtkblist.c:2384
+#: src/gtkblist.c:2377
 msgid "/Tools/Buddy _Pounce"
 msgstr "/Tools/Buddy _Pounce"
 
-#: src/gtkblist.c:2385
+#: src/gtkblist.c:2378
 msgid "/Tools/Account Ac_tions"
 msgstr "/Tools/Account Ac_tions"
 
-#: src/gtkblist.c:2386
+#: src/gtkblist.c:2379
 msgid "/Tools/Pl_ugin Actions"
 msgstr "/Tools/Pl_ugin Actions"
 
-#: src/gtkblist.c:2388
+#: src/gtkblist.c:2381
 msgid "/Tools/A_ccounts"
 msgstr "/Tools/A_ccounts"
 
-#: src/gtkblist.c:2389
+#: src/gtkblist.c:2382
 msgid "/Tools/_File Transfers"
 msgstr "/Tools/_File Transfers"
 
-#: src/gtkblist.c:2390
+#: src/gtkblist.c:2383
 msgid "/Tools/R_oom List"
 msgstr "/Tools/R_oom List"
 
-#: src/gtkblist.c:2391
+#: src/gtkblist.c:2384
 msgid "/Tools/Pr_eferences"
 msgstr "/Tools/Pr_eferences"
 
-#: src/gtkblist.c:2392
+#: src/gtkblist.c:2385
 msgid "/Tools/Pr_ivacy"
 msgstr "/Tools/Pr_ivacy"
 
-#: src/gtkblist.c:2393
+#: src/gtkblist.c:2386
 msgid "/Tools/Mute _Sounds"
 msgstr "/Tools/Mute _Sounds"
 
-#: src/gtkblist.c:2395
+#: src/gtkblist.c:2388
 msgid "/Tools/View System _Log"
 msgstr "/Tools/View System _Log"
 
 #. Help
-#: src/gtkblist.c:2398
+#: src/gtkblist.c:2391
 msgid "/_Help"
 msgstr "/_Help"
 
-#: src/gtkblist.c:2399
+#: src/gtkblist.c:2392
 msgid "/Help/Online _Help"
 msgstr "/Help/Online _Help"
 
-#: src/gtkblist.c:2400
+#: src/gtkblist.c:2393
 msgid "/Help/_Debug Window"
 msgstr "/Help/_Debug Window"
 
-#: src/gtkblist.c:2401
+#: src/gtkblist.c:2394
 msgid "/Help/_About"
 msgstr "/Help/_About"
 
-#: src/gtkblist.c:2419
+#: src/gtkblist.c:2412
 msgid "Rename Group"
 msgstr "Rename Group"
 
-#: src/gtkblist.c:2419
+#: src/gtkblist.c:2412
 msgid "New group name"
 msgstr "New group name"
 
-#: src/gtkblist.c:2420
+#: src/gtkblist.c:2413
 msgid "Please enter a new name for the selected group."
 msgstr "Please enter a new name for the selected group."
 
-#: src/gtkblist.c:2449
+#: src/gtkblist.c:2442
 #, c-format
 msgid ""
 "\n"
@@ -2097,7 +2120,7 @@
 "\n"
 "<b>Account:</b> %s"
 
-#: src/gtkblist.c:2523
+#: src/gtkblist.c:2516
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
@@ -2105,12 +2128,12 @@
 "\n"
 "<b>Status:</b> Offline"
 
-#: src/gtkblist.c:2538
+#: src/gtkblist.c:2531
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:2554
+#: src/gtkblist.c:2547
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -2118,7 +2141,7 @@
 "\n"
 "<b>Account:</b>"
 
-#: src/gtkblist.c:2555
+#: src/gtkblist.c:2548
 msgid ""
 "\n"
 "<b>Contact Alias:</b>"
@@ -2126,7 +2149,7 @@
 "\n"
 "<b>Contact Alias:</b>"
 
-#: src/gtkblist.c:2556
+#: src/gtkblist.c:2549
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -2134,7 +2157,7 @@
 "\n"
 "<b>Alias:</b>"
 
-#: src/gtkblist.c:2557
+#: src/gtkblist.c:2550
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -2142,7 +2165,7 @@
 "\n"
 "<b>Nickname:</b>"
 
-#: src/gtkblist.c:2558
+#: src/gtkblist.c:2551
 msgid ""
 "\n"
 "<b>Logged In:</b>"
@@ -2150,7 +2173,7 @@
 "\n"
 "<b>Logged In:</b>"
 
-#: src/gtkblist.c:2559
+#: src/gtkblist.c:2552
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -2158,7 +2181,7 @@
 "\n"
 "<b>Idle:</b>"
 
-#: src/gtkblist.c:2559
+#: src/gtkblist.c:2552
 msgid ""
 "\n"
 "<b>Idle</b>"
@@ -2166,7 +2189,7 @@
 "\n"
 "<b>Idle</b>"
 
-#: src/gtkblist.c:2561
+#: src/gtkblist.c:2554
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -2174,7 +2197,7 @@
 "\n"
 "<b>Warned:</b>"
 
-#: src/gtkblist.c:2563
+#: src/gtkblist.c:2556
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2182,7 +2205,7 @@
 "\n"
 "<b>Description:</b> Spooky"
 
-#: src/gtkblist.c:2564
+#: src/gtkblist.c:2557
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
@@ -2190,7 +2213,7 @@
 "\n"
 "<b>Status</b>: Awesome"
 
-#: src/gtkblist.c:2565
+#: src/gtkblist.c:2558
 msgid ""
 "\n"
 "<b>Status</b>: Rockin'"
@@ -2198,93 +2221,93 @@
 "\n"
 "<b>Status</b>: Rockin'"
 
-#: src/gtkblist.c:2863
+#: src/gtkblist.c:2856
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "Idle (%dh%02dm) "
 
-#: src/gtkblist.c:2865
+#: src/gtkblist.c:2858
 #, c-format
 msgid "Idle (%dm) "
 msgstr "Idle (%dm) "
 
-#: src/gtkblist.c:2868
+#: src/gtkblist.c:2861
 msgid "Idle "
 msgstr "Idle "
 
-#: src/gtkblist.c:2876
+#: src/gtkblist.c:2869
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "Warned (%d%%) "
 
-#: src/gtkblist.c:2880
+#: src/gtkblist.c:2873
 msgid "Offline "
 msgstr "Offline "
 
 #. Make menu items sensitive/insensitive where appropriate
-#: src/gtkblist.c:3007
+#: src/gtkblist.c:3000
 msgid "/Buddies/Join a Chat..."
 msgstr "/Buddies/Join a Chat..."
 
-#: src/gtkblist.c:3010
+#: src/gtkblist.c:3003
 msgid "/Tools/Room List"
 msgstr "/Tools/Room List"
 
-#: src/gtkblist.c:3013
+#: src/gtkblist.c:3006
 msgid "/Tools/Privacy"
 msgstr "/Tools/Privacy"
 
-#: src/gtkblist.c:3069 src/gtkprefs.c:954 src/gtkprefs.c:1788
-#: src/protocols/jabber/jabber.c:922
+#: src/gtkblist.c:3062 src/gtkprefs.c:917 src/gtkprefs.c:1774
+#: src/protocols/jabber/jabber.c:924
 msgid "None"
 msgstr "None"
 
-#: src/gtkblist.c:3071
+#: src/gtkblist.c:3064
 msgid "Alphabetical"
 msgstr "Alphabetical"
 
-#: src/gtkblist.c:3072
+#: src/gtkblist.c:3065
 msgid "By status"
 msgstr "By status"
 
-#: src/gtkblist.c:3073
+#: src/gtkblist.c:3066
 msgid "By log size"
 msgstr "By log size"
 
-#: src/gtkblist.c:3138
+#: src/gtkblist.c:3136
 msgid "/Tools/Away"
 msgstr "/Tools/Away"
 
-#: src/gtkblist.c:3145
+#: src/gtkblist.c:3143
 msgid "/Tools/Buddy Pounce"
 msgstr "/Tools/Buddy Pounce"
 
-#: src/gtkblist.c:3148
+#: src/gtkblist.c:3146
 msgid "/Tools/Account Actions"
 msgstr "/Tools/Account Actions"
 
-#: src/gtkblist.c:3151
+#: src/gtkblist.c:3149
 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:3239
+#: src/gtkblist.c:3243
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Buddies/Show Offline Buddies"
 
-#: src/gtkblist.c:3241
+#: src/gtkblist.c:3245
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Buddies/Show Empty Groups"
 
-#: src/gtkblist.c:3933 src/protocols/silc/buddy.c:731
+#: src/gtkblist.c:3938 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:2808
+#: src/protocols/silc/buddy.c:1124 src/protocols/yahoo/yahoo.c:2822
 msgid "Add Buddy"
 msgstr "Add Buddy"
 
-#: src/gtkblist.c:3957
+#: src/gtkblist.c:3962
 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. "
@@ -2295,15 +2318,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:4017 src/gtkblist.c:4320
+#: src/gtkblist.c:4022 src/gtkblist.c:4327
 msgid "Account:"
 msgstr "Account:"
 
-#: src/gtkblist.c:4253
+#: src/gtkblist.c:4260
 msgid "This protocol does not support chat rooms."
 msgstr "This protocol does not support chat rooms."
 
-#: src/gtkblist.c:4269
+#: src/gtkblist.c:4276
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -2311,11 +2334,11 @@
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 
-#: src/gtkblist.c:4286
+#: src/gtkblist.c:4293
 msgid "Add Chat"
 msgstr "Add Chat"
 
-#: src/gtkblist.c:4310
+#: src/gtkblist.c:4317
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -2323,15 +2346,15 @@
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
 
-#: src/gtkblist.c:4388
+#: src/gtkblist.c:4395
 msgid "Add Group"
 msgstr "Add Group"
 
-#: src/gtkblist.c:4389
+#: src/gtkblist.c:4396
 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:4963 src/gtkblist.c:5060
+#: src/gtkblist.c:4970 src/gtkblist.c:5067
 msgid "No actions available"
 msgstr "No actions available"
 
@@ -2340,18 +2363,18 @@
 msgstr "Done."
 
 #: src/gtkconn.c:157
-msgid "Signon: "
-msgstr "Signon: "
+msgid "Logging in: "
+msgstr "Logging in: "
 
 #: src/gtkconn.c:203
-msgid "Signon"
-msgstr "Signon"
+msgid "Logging In"
+msgstr "Logging In"
 
 #: src/gtkconn.c:215
 msgid "Cancel All"
 msgstr "Cancel All"
 
-#: src/gtkconn.c:364 src/gtkconn.c:597
+#: src/gtkconn.c:364 src/gtkconn.c:596
 msgid "_Reconnect"
 msgstr "_Reconnect"
 
@@ -2372,15 +2395,15 @@
 msgid "Reason Unknown."
 msgstr "Reason Unknown."
 
-#: src/gtkconn.c:575
+#: src/gtkconn.c:570
 msgid "Disconnected"
 msgstr "Disconnected"
 
-#: src/gtkconn.c:602
+#: src/gtkconn.c:601
 msgid "Reconnect _All"
 msgstr "Reconnect _All"
 
-#: src/gtkconn.c:632
+#: src/gtkconn.c:631
 msgid "Time"
 msgstr "Time"
 
@@ -2460,7 +2483,7 @@
 msgid "_Message:"
 msgstr "_Message:"
 
-#: src/gtkconv.c:886 src/gtkconv.c:2576 src/gtkdebug.c:179
+#: src/gtkconv.c:886 src/gtkconv.c:2557 src/gtkdebug.c:179
 msgid "Unable to open file."
 msgstr "Unable to open file."
 
@@ -2486,310 +2509,310 @@
 msgstr "IM"
 
 #. Send File button
-#: src/gtkconv.c:1444 src/gtkconv.c:3798 src/protocols/oscar/oscar.c:598
+#: src/gtkconv.c:1441 src/gtkconv.c:3781 src/protocols/oscar/oscar.c:598
 msgid "Send File"
 msgstr "Send File"
 
-#: src/gtkconv.c:1453
+#: src/gtkconv.c:1448
 msgid "Un-Ignore"
 msgstr "Un-Ignore"
 
-#: src/gtkconv.c:1455 src/gtkprefs.c:796
+#: src/gtkconv.c:1451 src/gtkprefs.c:781
 msgid "Ignore"
 msgstr "Ignore"
 
 #. Info button
-#: src/gtkconv.c:1464 src/gtkconv.c:3819
+#: src/gtkconv.c:1456 src/gtkconv.c:3802
 msgid "Info"
 msgstr "Info"
 
-#: src/gtkconv.c:1473
-msgid "Get Away Msg"
-msgstr "Get Away Msg"
+#: src/gtkconv.c:1462
+msgid "Get Away Message"
+msgstr "Get Away Message"
 
 #. Remove button
-#: src/gtkconv.c:1485 src/gtkconv.c:3812 src/gtkconv.c:3883
-#: src/gtkrequest.c:248
+#: src/gtkconv.c:1471 src/gtkconv.c:3795 src/gtkconv.c:3866
+#: src/gtkrequest.c:265
 msgid "Remove"
 msgstr "Remove"
 
-#: src/gtkconv.c:2584
+#: src/gtkconv.c:2565
 msgid "Unable to save icon file to disk."
 msgstr "Unable to save icon file to disk."
 
-#: src/gtkconv.c:2605
+#: src/gtkconv.c:2586
 msgid "Save Icon"
 msgstr "Save Icon"
 
-#: src/gtkconv.c:2635
+#: src/gtkconv.c:2616
 msgid "Animate"
 msgstr "Animate"
 
-#: src/gtkconv.c:2640
+#: src/gtkconv.c:2621
 msgid "Hide Icon"
 msgstr "Hide Icon"
 
-#: src/gtkconv.c:2646
+#: src/gtkconv.c:2627
 msgid "Save Icon As..."
 msgstr "Save Icon As..."
 
-#: src/gtkconv.c:3013
+#: src/gtkconv.c:2994
 msgid "User is typing..."
 msgstr "User is typing..."
 
-#: src/gtkconv.c:3021
+#: src/gtkconv.c:3002
 msgid "User has typed something and paused"
 msgstr "User has typed something and paused"
 
 #. Build the Send As menu
-#: src/gtkconv.c:3124
+#: src/gtkconv.c:3105
 msgid "_Send As"
 msgstr "_Send As"
 
 #. Conversation menu
-#: src/gtkconv.c:3575
+#: src/gtkconv.c:3558
 msgid "/_Conversation"
 msgstr "/_Conversation"
 
-#: src/gtkconv.c:3577
+#: src/gtkconv.c:3560
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Conversation/New Instant _Message..."
 
-#: src/gtkconv.c:3582
+#: src/gtkconv.c:3565
 msgid "/Conversation/_Find..."
 msgstr "/Conversation/_Find..."
 
-#: src/gtkconv.c:3584
+#: src/gtkconv.c:3567
 msgid "/Conversation/View _Log"
 msgstr "/Conversation/View _Log"
 
-#: src/gtkconv.c:3585
+#: src/gtkconv.c:3568
 msgid "/Conversation/_Save As..."
 msgstr "/Conversation/_Save As..."
 
-#: src/gtkconv.c:3587
+#: src/gtkconv.c:3570
 msgid "/Conversation/Clear"
 msgstr "/Conversation/Clear"
 
-#: src/gtkconv.c:3591
+#: src/gtkconv.c:3574
 msgid "/Conversation/Se_nd File..."
 msgstr "/Conversation/Se_nd File..."
 
-#: src/gtkconv.c:3592
+#: src/gtkconv.c:3575
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Conversation/Add Buddy _Pounce..."
 
-#: src/gtkconv.c:3594
+#: src/gtkconv.c:3577
 msgid "/Conversation/_Get Info"
 msgstr "/Conversation/_Get Info"
 
-#: src/gtkconv.c:3596
+#: src/gtkconv.c:3579
 msgid "/Conversation/_Warn..."
 msgstr "/Conversation/_Warn..."
 
-#: src/gtkconv.c:3598
+#: src/gtkconv.c:3581
 msgid "/Conversation/In_vite..."
 msgstr "/Conversation/In_vite..."
 
-#: src/gtkconv.c:3603
+#: src/gtkconv.c:3586
 msgid "/Conversation/A_lias..."
 msgstr "/Conversation/A_lias..."
 
-#: src/gtkconv.c:3605
+#: src/gtkconv.c:3588
 msgid "/Conversation/_Block..."
 msgstr "/Conversation/_Block..."
 
-#: src/gtkconv.c:3607
+#: src/gtkconv.c:3590
 msgid "/Conversation/_Add..."
 msgstr "/Conversation/_Add..."
 
-#: src/gtkconv.c:3609
+#: src/gtkconv.c:3592
 msgid "/Conversation/_Remove..."
 msgstr "/Conversation/_Remove..."
 
-#: src/gtkconv.c:3614
+#: src/gtkconv.c:3597
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Conversation/Insert Lin_k..."
 
-#: src/gtkconv.c:3616
+#: src/gtkconv.c:3599
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Conversation/Insert Imag_e..."
 
-#: src/gtkconv.c:3621
+#: src/gtkconv.c:3604
 msgid "/Conversation/_Close"
 msgstr "/Conversation/_Close"
 
 #. Options
-#: src/gtkconv.c:3625
+#: src/gtkconv.c:3608
 msgid "/_Options"
 msgstr "/_Options"
 
-#: src/gtkconv.c:3626
+#: src/gtkconv.c:3609
 msgid "/Options/Enable _Logging"
 msgstr "/Options/Enable _Logging"
 
-#: src/gtkconv.c:3627
+#: src/gtkconv.c:3610
 msgid "/Options/Enable _Sounds"
 msgstr "/Options/Enable _Sounds"
 
-#: src/gtkconv.c:3628
+#: src/gtkconv.c:3611
 msgid "/Options/Show Formatting _Toolbar"
 msgstr "/Options/Show Formatting _Toolbar"
 
-#: src/gtkconv.c:3629
+#: src/gtkconv.c:3612
 msgid "/Options/Show T_imestamps"
 msgstr "/Options/Show T_imestamps"
 
-#: src/gtkconv.c:3671
+#: src/gtkconv.c:3654
 msgid "/Conversation/View Log"
 msgstr "/Conversation/View Log"
 
-#: src/gtkconv.c:3676
+#: src/gtkconv.c:3659
 msgid "/Conversation/Send File..."
 msgstr "/Conversation/Send File..."
 
-#: src/gtkconv.c:3680
+#: src/gtkconv.c:3663
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversation/Add Buddy Pounce..."
 
-#: src/gtkconv.c:3686
+#: src/gtkconv.c:3669
 msgid "/Conversation/Get Info"
 msgstr "/Conversation/Get Info"
 
-#: src/gtkconv.c:3690
+#: src/gtkconv.c:3673
 msgid "/Conversation/Warn..."
 msgstr "/Conversation/Warn..."
 
-#: src/gtkconv.c:3694
+#: src/gtkconv.c:3677
 msgid "/Conversation/Invite..."
 msgstr "/Conversation/Invite..."
 
-#: src/gtkconv.c:3700
+#: src/gtkconv.c:3683
 msgid "/Conversation/Alias..."
 msgstr "/Conversation/Alias..."
 
-#: src/gtkconv.c:3704
+#: src/gtkconv.c:3687
 msgid "/Conversation/Block..."
 msgstr "/Conversation/Block..."
 
-#: src/gtkconv.c:3708
+#: src/gtkconv.c:3691
 msgid "/Conversation/Add..."
 msgstr "/Conversation/Add..."
 
-#: src/gtkconv.c:3712
+#: src/gtkconv.c:3695
 msgid "/Conversation/Remove..."
 msgstr "/Conversation/Remove..."
 
-#: src/gtkconv.c:3718
+#: src/gtkconv.c:3701
 msgid "/Conversation/Insert Link..."
 msgstr "/Conversation/Insert Link..."
 
-#: src/gtkconv.c:3722
+#: src/gtkconv.c:3705
 msgid "/Conversation/Insert Image..."
 msgstr "/Conversation/Insert Image..."
 
-#: src/gtkconv.c:3728
+#: src/gtkconv.c:3711
 msgid "/Options/Enable Logging"
 msgstr "/Options/Enable Logging"
 
-#: src/gtkconv.c:3731
+#: src/gtkconv.c:3714
 msgid "/Options/Enable Sounds"
 msgstr "/Options/Enable Sounds"
 
-#: src/gtkconv.c:3734
+#: src/gtkconv.c:3717
 msgid "/Options/Show Formatting Toolbar"
 msgstr "/Options/Show Formatting Toolbar"
 
-#: src/gtkconv.c:3737
+#: src/gtkconv.c:3720
 msgid "/Options/Show Timestamps"
 msgstr "/Options/Show Timestamps"
 
 #. The buttons, from left to right
 #. Block button
-#: src/gtkconv.c:3791 src/gtkprivacy.c:623 src/gtkprivacy.c:634
+#: src/gtkconv.c:3774 src/gtkprivacy.c:625 src/gtkprivacy.c:636
 msgid "Block"
 msgstr "Block"
 
-#: src/gtkconv.c:3792
+#: src/gtkconv.c:3775
 msgid "Block the user"
 msgstr "Block the user"
 
-#: src/gtkconv.c:3799
+#: src/gtkconv.c:3782
 msgid "Send a file to the user"
 msgstr "Send a file to the user"
 
-#: src/gtkconv.c:3806
+#: src/gtkconv.c:3789
 msgid "Add the user to your buddy list"
 msgstr "Add the user to your buddy list"
 
-#: src/gtkconv.c:3813
+#: src/gtkconv.c:3796
 msgid "Remove the user from your buddy list"
 msgstr "Remove the user from your buddy list"
 
-#: src/gtkconv.c:3820 src/gtkconv.c:4155
+#: src/gtkconv.c:3803 src/gtkconv.c:4124
 msgid "Get the user's information"
 msgstr "Get the user's information"
 
 #. Send button
-#: src/gtkconv.c:3826 src/gtkconv.c:3890
+#: src/gtkconv.c:3809 src/gtkconv.c:3873
 msgid "Send"
 msgstr "Send"
 
-#: src/gtkconv.c:3827 src/gtkconv.c:3891
+#: src/gtkconv.c:3810 src/gtkconv.c:3874
 msgid "Send message"
 msgstr "Send message"
 
 #. The buttons, from left to right
 #. Invite
-#: src/gtkconv.c:3869
+#: src/gtkconv.c:3852
 msgid "Invite"
 msgstr "Invite"
 
-#: src/gtkconv.c:3870
+#: src/gtkconv.c:3853
 msgid "Invite a user"
 msgstr "Invite a user"
 
-#: src/gtkconv.c:3877
+#: src/gtkconv.c:3860
 msgid "Add the chat to your buddy list"
 msgstr "Add the chat to your buddy list"
 
-#: src/gtkconv.c:3884
+#: src/gtkconv.c:3867
 msgid "Remove the chat from your buddy list"
 msgstr "Remove the chat from your buddy list"
 
-#: src/gtkconv.c:4008
+#: src/gtkconv.c:3991
 msgid "Topic:"
 msgstr "Topic:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:4071
+#: src/gtkconv.c:4040
 msgid "0 people in room"
 msgstr "0 people in room"
 
-#: src/gtkconv.c:4132
+#: src/gtkconv.c:4101
 msgid "IM the user"
 msgstr "IM the user"
 
-#: src/gtkconv.c:4144
+#: src/gtkconv.c:4113
 msgid "Ignore the user"
 msgstr "Ignore the user"
 
-#: src/gtkconv.c:4766
+#: src/gtkconv.c:4632
 msgid "Close conversation"
 msgstr "Close conversation"
 
-#: src/gtkconv.c:5301 src/gtkconv.c:5330 src/gtkconv.c:5426 src/gtkconv.c:5484
+#: src/gtkconv.c:5167 src/gtkconv.c:5196 src/gtkconv.c:5292 src/gtkconv.c:5350
 #, 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:6057 src/gtkconv.c:6060
+#: src/gtkconv.c:5923 src/gtkconv.c:5926
 msgid "<main>/Conversation/Close"
 msgstr "<main>/Conversation/Close"
 
-#: src/gtkconv.c:6427
+#: src/gtkconv.c:6247
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -2797,11 +2820,11 @@
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
 
-#: src/gtkconv.c:6430
+#: src/gtkconv.c:6250
 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:6433
+#: src/gtkconv.c:6253
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -2809,7 +2832,7 @@
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 
-#: src/gtkconv.c:6437
+#: src/gtkconv.c:6257
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;command&gt;:  Help on a specific command."
 
@@ -2878,15 +2901,15 @@
 msgid "hacker and designated driver [lazy bum]"
 msgstr "hacker and designated driver [lazy bum]"
 
-#: src/gtkdialogs.c:87 src/gtkdialogs.c:124
+#: src/gtkdialogs.c:87 src/gtkdialogs.c:125
 msgid "Bulgarian"
 msgstr "Bulgarian"
 
-#: src/gtkdialogs.c:88 src/gtkdialogs.c:125
+#: src/gtkdialogs.c:88 src/gtkdialogs.c:126 src/gtkdialogs.c:127
 msgid "Catalan"
 msgstr "Catalan"
 
-#: src/gtkdialogs.c:89 src/gtkdialogs.c:126
+#: src/gtkdialogs.c:89 src/gtkdialogs.c:128
 msgid "Czech"
 msgstr "Czech"
 
@@ -2895,139 +2918,138 @@
 msgstr "Danish"
 
 #: src/gtkdialogs.c:91
+msgid "Australian English"
+msgstr "Australian English"
+
+#: src/gtkdialogs.c:92
 msgid "British English"
 msgstr "British English"
 
-#: src/gtkdialogs.c:92
+#: src/gtkdialogs.c:93
 msgid "Canadian English"
 msgstr "Canadian English"
 
-#: src/gtkdialogs.c:93 src/gtkdialogs.c:127
+#: src/gtkdialogs.c:94 src/gtkdialogs.c:129
 msgid "German"
 msgstr "German"
 
-#: src/gtkdialogs.c:94 src/gtkdialogs.c:128
+#: src/gtkdialogs.c:95 src/gtkdialogs.c:130
 msgid "Spanish"
 msgstr "Spanish"
 
-#: src/gtkdialogs.c:95 src/gtkdialogs.c:129
+#: src/gtkdialogs.c:96 src/gtkdialogs.c:131
 msgid "Finnish"
 msgstr "Finnish"
 
-#: src/gtkdialogs.c:96 src/gtkdialogs.c:130
+#: src/gtkdialogs.c:97 src/gtkdialogs.c:132
 msgid "French"
 msgstr "French"
 
-#: src/gtkdialogs.c:97
+#: src/gtkdialogs.c:98
 msgid "Hebrew"
 msgstr "Hebrew"
 
-#: src/gtkdialogs.c:98
-msgid "Hindi"
-msgstr "Hindi"
-
 #: src/gtkdialogs.c:99
+msgid "Hindi"
+msgstr "Hindi"
+
+#: src/gtkdialogs.c:100
 msgid "Hungarian"
 msgstr "Hungarian"
 
-#: src/gtkdialogs.c:100 src/gtkdialogs.c:131
+#: src/gtkdialogs.c:101 src/gtkdialogs.c:133
 msgid "Italian"
 msgstr "Italian"
 
-#: src/gtkdialogs.c:101 src/gtkdialogs.c:132
+#: src/gtkdialogs.c:102 src/gtkdialogs.c:134
 msgid "Japanese"
 msgstr "Japanese"
 
-#: src/gtkdialogs.c:102
+#: src/gtkdialogs.c:103
 msgid "Lithuanian"
 msgstr "Lithuanian"
 
-#: src/gtkdialogs.c:103 src/gtkdialogs.c:133
+#: src/gtkdialogs.c:104 src/gtkdialogs.c:135
 msgid "Korean"
 msgstr "Korean"
 
-#: src/gtkdialogs.c:104
-msgid "Dutch; Flemish"
-msgstr "Dutch; Flemish"
-
 #: src/gtkdialogs.c:105
-msgid "Macedonian"
-msgstr "Macedonian"
+msgid "Dutch; Flemish"
+msgstr "Dutch; Flemish"
 
 #: src/gtkdialogs.c:106
+msgid "Macedonian"
+msgstr "Macedonian"
+
+#: src/gtkdialogs.c:107
 msgid "Norwegian"
 msgstr "Norwegian"
 
-#: src/gtkdialogs.c:107 src/gtkdialogs.c:134
+#: src/gtkdialogs.c:108 src/gtkdialogs.c:136
 msgid "Polish"
 msgstr "Polish"
 
-#: src/gtkdialogs.c:108
+#: src/gtkdialogs.c:109
 msgid "Portuguese"
 msgstr "Portuguese"
 
-#: src/gtkdialogs.c:109
+#: src/gtkdialogs.c:110
 msgid "Portuguese-Brazil"
 msgstr "Portuguese-Brazil"
 
-#: src/gtkdialogs.c:110
+#: src/gtkdialogs.c:111
 msgid "Romanian"
 msgstr "Romanian"
 
-#: src/gtkdialogs.c:111 src/gtkdialogs.c:135 src/gtkdialogs.c:136
+#: src/gtkdialogs.c:112 src/gtkdialogs.c:137 src/gtkdialogs.c:138
 msgid "Russian"
 msgstr "Russian"
 
-#: src/gtkdialogs.c:112
+#: src/gtkdialogs.c:113
 msgid "Serbian"
 msgstr "Serbian"
 
-#: src/gtkdialogs.c:113
+#: src/gtkdialogs.c:114
 msgid "Slovenian"
 msgstr "Slovenian"
 
-#: src/gtkdialogs.c:114 src/gtkdialogs.c:138
+#: src/gtkdialogs.c:115 src/gtkdialogs.c:140
 msgid "Swedish"
 msgstr "Swedish"
 
-#: src/gtkdialogs.c:115
+#: src/gtkdialogs.c:116
 msgid "Vietnamese"
 msgstr "Vietnamese"
 
-#: src/gtkdialogs.c:115
+#: src/gtkdialogs.c:116
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh and the Gnome-Vi Team"
 
-#: src/gtkdialogs.c:116
+#: src/gtkdialogs.c:117
 msgid "Simplified Chinese"
 msgstr "Simplified Chinese"
 
-#: src/gtkdialogs.c:117
+#: src/gtkdialogs.c:118
 msgid "Traditional Chinese"
 msgstr "Traditional Chinese"
 
-#: src/gtkdialogs.c:123
+#: src/gtkdialogs.c:124
 msgid "Amharic"
 msgstr "Amharic"
 
-#: src/gtkdialogs.c:137
+#: src/gtkdialogs.c:139
 msgid "Slovak"
 msgstr "Slovak"
 
-#: src/gtkdialogs.c:139
+#: src/gtkdialogs.c:141
 msgid "Chinese"
 msgstr "Chinese"
 
-#: src/gtkdialogs.c:181
+#: src/gtkdialogs.c:182
 msgid "About Gaim"
 msgstr "About Gaim"
 
-#: src/gtkdialogs.c:196
-#, c-format
-msgid "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
-
-#: src/gtkdialogs.c:217
+#: src/gtkdialogs.c:205
 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 "
@@ -3037,71 +3059,71 @@
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
 "at once.  It is written using Gtk+ and is licenced under the GPL.<BR><BR>"
 
-#: src/gtkdialogs.c:226
+#: src/gtkdialogs.c:214
 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:231
+#: src/gtkdialogs.c:219
 msgid "Active Developers"
 msgstr "Active Developers"
 
-#: src/gtkdialogs.c:246
+#: src/gtkdialogs.c:234
 msgid "Crazy Patch Writers"
 msgstr "Crazy Patch Writers"
 
-#: src/gtkdialogs.c:261
+#: src/gtkdialogs.c:249
 msgid "Retired Developers"
 msgstr "Retired Developers"
 
-#: src/gtkdialogs.c:276
+#: src/gtkdialogs.c:264
 msgid "Current Translators"
 msgstr "Current Translators"
 
-#: src/gtkdialogs.c:296
+#: src/gtkdialogs.c:284
 msgid "Past Translators"
 msgstr "Past Translators"
 
-#: src/gtkdialogs.c:367 src/gtkdialogs.c:509 src/gtkdialogs.c:564
+#: src/gtkdialogs.c:354 src/gtkdialogs.c:497 src/gtkdialogs.c:552
 msgid "_Screen name"
 msgstr "_Screen name"
 
-#: src/gtkdialogs.c:373 src/gtkdialogs.c:515 src/gtkdialogs.c:570
+#: src/gtkdialogs.c:360 src/gtkdialogs.c:503 src/gtkdialogs.c:558
 msgid "_Account"
 msgstr "_Account"
 
-#: src/gtkdialogs.c:380
+#: src/gtkdialogs.c:367
 msgid "New Instant Message"
 msgstr "New Instant Message"
 
-#: src/gtkdialogs.c:382
+#: src/gtkdialogs.c:369
 msgid "Please enter the screen name of the person you would like to IM."
 msgstr "Please enter the screen name of the person you would like to IM."
 
-#: src/gtkdialogs.c:522
+#: src/gtkdialogs.c:510
 msgid "Get User Info"
 msgstr "Get User Info"
 
-#: src/gtkdialogs.c:524
+#: src/gtkdialogs.c:512
 msgid ""
 "Please enter the screen name of the person whose info you would like to view."
 msgstr ""
 "Please enter the screen name of the person whose info you would like to view."
 
-#: src/gtkdialogs.c:578
+#: src/gtkdialogs.c:566
 msgid "Get User Log"
 msgstr "Get User Log"
 
-#: src/gtkdialogs.c:580
+#: src/gtkdialogs.c:568
 msgid ""
 "Please enter the screen name of the person whose log you would like to view."
 msgstr ""
 "Please enter the screen name of the person whose log you would like to view."
 
-#: src/gtkdialogs.c:620
+#: src/gtkdialogs.c:608
 msgid "Warn User"
 msgstr "Warn User"
 
-#: src/gtkdialogs.c:641
+#: src/gtkdialogs.c:629
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -3114,45 +3136,45 @@
 "This will increase %s's warning level and he or she will be subject to "
 "harsher rate limiting.\n"
 
-#: src/gtkdialogs.c:650
+#: src/gtkdialogs.c:638
 msgid "Warn _anonymously?"
 msgstr "Warn _anonymously?"
 
-#: src/gtkdialogs.c:657
+#: src/gtkdialogs.c:645
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>Anonymous warnings are less severe.</b>"
 
-#: src/gtkdialogs.c:678
+#: src/gtkdialogs.c:666
 msgid "Alias Contact"
 msgstr "Alias Contact"
 
-#: src/gtkdialogs.c:679
+#: src/gtkdialogs.c:667
 msgid "Enter an alias for this contact."
 msgstr "Enter an alias for this contact."
 
-#: src/gtkdialogs.c:681 src/gtkdialogs.c:703 src/gtkdialogs.c:723
-#: src/gtkrequest.c:250 src/protocols/silc/chat.c:584
+#: src/gtkdialogs.c:669 src/gtkdialogs.c:691 src/gtkdialogs.c:711
+#: src/gtkrequest.c:267 src/protocols/silc/chat.c:584
 msgid "Alias"
 msgstr "Alias"
 
-#: src/gtkdialogs.c:699
+#: src/gtkdialogs.c:687
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Enter an alias for %s."
 
-#: src/gtkdialogs.c:701
+#: src/gtkdialogs.c:689
 msgid "Alias Buddy"
 msgstr "Alias Buddy"
 
-#: src/gtkdialogs.c:720
+#: src/gtkdialogs.c:708
 msgid "Alias Chat"
 msgstr "Alias Chat"
 
-#: src/gtkdialogs.c:721
+#: src/gtkdialogs.c:709
 msgid "Enter an alias for this chat."
 msgstr "Enter an alias for this chat."
 
-#: src/gtkdialogs.c:755
+#: src/gtkdialogs.c:743
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
@@ -3161,7 +3183,7 @@
 "You are about to remove the contact containing %s and %d other buddies from "
 "your buddy list.  Do you want to continue?"
 
-#: src/gtkdialogs.c:815
+#: src/gtkdialogs.c:805
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -3170,22 +3192,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:818 src/gtkdialogs.c:819
+#: src/gtkdialogs.c:808 src/gtkdialogs.c:809
 msgid "Remove Group"
 msgstr "Remove Group"
 
-#: src/gtkdialogs.c:857
+#: src/gtkdialogs.c:847
 #, 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:860 src/gtkdialogs.c:861
+#: src/gtkdialogs.c:850 src/gtkdialogs.c:851
 msgid "Remove Buddy"
 msgstr "Remove Buddy"
 
-#: src/gtkdialogs.c:891
+#: src/gtkdialogs.c:884
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -3194,7 +3216,7 @@
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 
-#: src/gtkdialogs.c:895 src/gtkdialogs.c:896
+#: src/gtkdialogs.c:888 src/gtkdialogs.c:889
 msgid "Remove Chat"
 msgstr "Remove Chat"
 
@@ -3306,31 +3328,31 @@
 msgid "Failed"
 msgstr "Failed"
 
-#: src/gtkimhtml.c:548
+#: src/gtkimhtml.c:533
 msgid "Pa_ste As Text"
 msgstr "Pa_ste As Text"
 
-#: src/gtkimhtml.c:1031
+#: src/gtkimhtml.c:1016
 msgid "Hyperlink color"
 msgstr "Hyperlink colour"
 
-#: src/gtkimhtml.c:1032
+#: src/gtkimhtml.c:1017
 msgid "Color to draw hyperlinks."
 msgstr "Colour to draw hyperlinks."
 
-#: src/gtkimhtml.c:1248
+#: src/gtkimhtml.c:1234
 msgid "_Copy E-Mail Address"
 msgstr "_Copy E-Mail Address"
 
-#: src/gtkimhtml.c:1260
+#: src/gtkimhtml.c:1246
 msgid "_Copy Link Location"
 msgstr "_Copy Link Location"
 
-#: src/gtkimhtml.c:1270
+#: src/gtkimhtml.c:1256
 msgid "_Open Link in Browser"
 msgstr "_Open Link in Browser"
 
-#: src/gtkimhtml.c:2820
+#: src/gtkimhtml.c:2814
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
@@ -3338,40 +3360,40 @@
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
 
-#: src/gtkimhtml.c:2828
+#: src/gtkimhtml.c:2822
 #, c-format
 msgid "Error saving image: %s"
 msgstr "Error saving image: %s"
 
-#: src/gtkimhtml.c:2905 src/gtkimhtml.c:2917
+#: src/gtkimhtml.c:2899 src/gtkimhtml.c:2911
 msgid "Save Image"
 msgstr "Save Image"
 
-#: src/gtkimhtml.c:2945
+#: src/gtkimhtml.c:2939
 msgid "_Save Image..."
 msgstr "_Save Image..."
 
-#: src/gtkimhtmltoolbar.c:176
+#: src/gtkimhtmltoolbar.c:177
 msgid "Select Font"
 msgstr "Select Font"
 
-#: src/gtkimhtmltoolbar.c:253
+#: src/gtkimhtmltoolbar.c:255
 msgid "Select Text Color"
 msgstr "Select Text Colour"
 
-#: src/gtkimhtmltoolbar.c:326
+#: src/gtkimhtmltoolbar.c:329
 msgid "Select Background Color"
 msgstr "Select Background Colour"
 
-#: src/gtkimhtmltoolbar.c:409
+#: src/gtkimhtmltoolbar.c:412
 msgid "_URL"
 msgstr "_URL"
 
-#: src/gtkimhtmltoolbar.c:417
+#: src/gtkimhtmltoolbar.c:420
 msgid "_Description"
 msgstr "_Description"
 
-#: src/gtkimhtmltoolbar.c:420
+#: src/gtkimhtmltoolbar.c:423
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
@@ -3379,109 +3401,109 @@
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
 
-#: src/gtkimhtmltoolbar.c:424
+#: src/gtkimhtmltoolbar.c:427
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "Please enter the URL of the link that you want to insert."
 
-#: src/gtkimhtmltoolbar.c:429
+#: src/gtkimhtmltoolbar.c:432
 msgid "Insert Link"
 msgstr "Insert Link"
 
-#: src/gtkimhtmltoolbar.c:433
+#: src/gtkimhtmltoolbar.c:436
 msgid "_Insert"
 msgstr "_Insert"
 
-#: src/gtkimhtmltoolbar.c:502
+#: src/gtkimhtmltoolbar.c:505
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Failed to store image: %s\n"
 
-#: src/gtkimhtmltoolbar.c:528 src/gtkimhtmltoolbar.c:538
+#: src/gtkimhtmltoolbar.c:531 src/gtkimhtmltoolbar.c:541
 msgid "Insert Image"
 msgstr "Insert Image"
 
-#: src/gtkimhtmltoolbar.c:676
+#: src/gtkimhtmltoolbar.c:700 src/gtkimhtmltoolbar.c:778
 msgid "This theme has no available smileys."
 msgstr "This theme has no available smileys."
 
 #. show everything
-#: src/gtkimhtmltoolbar.c:691
+#: src/gtkimhtmltoolbar.c:792
 msgid "Smile!"
 msgstr "Smile!"
 
-#: src/gtkimhtmltoolbar.c:894
+#: src/gtkimhtmltoolbar.c:971
 msgid "Bold"
 msgstr "Bold"
 
-#: src/gtkimhtmltoolbar.c:905
+#: src/gtkimhtmltoolbar.c:982
 msgid "Italic"
 msgstr "Italic"
 
-#: src/gtkimhtmltoolbar.c:916
+#: src/gtkimhtmltoolbar.c:993
 msgid "Underline"
 msgstr "Underline"
 
-#: src/gtkimhtmltoolbar.c:932
+#: src/gtkimhtmltoolbar.c:1009
 msgid "Larger font size"
 msgstr "Larger font size"
 
-#: src/gtkimhtmltoolbar.c:944
+#: src/gtkimhtmltoolbar.c:1021
 msgid "Smaller font size"
 msgstr "Smaller font size"
 
-#: src/gtkimhtmltoolbar.c:961
+#: src/gtkimhtmltoolbar.c:1038
 msgid "Font Face"
 msgstr "Font Face"
 
-#: src/gtkimhtmltoolbar.c:973
+#: src/gtkimhtmltoolbar.c:1050
 msgid "Foreground font color"
 msgstr "Foreground font colour"
 
-#: src/gtkimhtmltoolbar.c:985
+#: src/gtkimhtmltoolbar.c:1062
 msgid "Background color"
 msgstr "Background colour"
 
-#: src/gtkimhtmltoolbar.c:1000
+#: src/gtkimhtmltoolbar.c:1077
 msgid "Insert link"
 msgstr "Insert link"
 
-#: src/gtkimhtmltoolbar.c:1010
+#: src/gtkimhtmltoolbar.c:1087
 msgid "Insert image"
 msgstr "Insert image"
 
-#: src/gtkimhtmltoolbar.c:1021
+#: src/gtkimhtmltoolbar.c:1098
 msgid "Insert smiley"
 msgstr "Insert smiley"
 
-#: src/gtklog.c:302
+#: src/gtklog.c:303
 #, c-format
 msgid "Conversations with %s"
 msgstr "Conversations with %s"
 
 #. Window **********
-#: src/gtklog.c:395 src/gtklog.c:411
+#: src/gtklog.c:391 src/gtklog.c:407
 msgid "System Log"
 msgstr "System Log"
 
 #. Descriptive label
-#: src/gtknotify.c:216
+#: src/gtknotify.c:218
 #, 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:232
 #, 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:241
 #, 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:246
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3492,7 +3514,7 @@
 "\n"
 "%s%s%s%s"
 
-#: src/gtknotify.c:260
+#: src/gtknotify.c:262
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3503,22 +3525,22 @@
 "\n"
 "%s"
 
-#: src/gtknotify.c:430
+#: src/gtknotify.c:419
 #, 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:421 src/gtknotify.c:433 src/gtknotify.c:446
+#: src/gtknotify.c:570
 msgid "Unable to open URL"
 msgstr "Unable to open URL"
 
-#: src/gtknotify.c:442 src/gtknotify.c:455
+#: src/gtknotify.c:431 src/gtknotify.c:444
 #, c-format
 msgid "Error launching <b>%s</b>: %s"
 msgstr "Error launching <b>%s</b>: %s"
 
-#: src/gtknotify.c:582
+#: src/gtknotify.c:571
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
@@ -3533,7 +3555,7 @@
 msgstr "Please enter a buddy to pounce."
 
 #. "New Buddy Pounce"
-#: src/gtkpounce.c:391 src/gtkpounce.c:894
+#: src/gtkpounce.c:391 src/gtkpounce.c:901
 msgid "New Buddy Pounce"
 msgstr "New Buddy Pounce"
 
@@ -3629,63 +3651,63 @@
 msgstr "Sav_e this pounce after activation"
 
 #. "Remove Buddy Pounce"
-#: src/gtkpounce.c:901
+#: src/gtkpounce.c:908
 msgid "Remove Buddy Pounce"
 msgstr "Remove Buddy Pounce"
 
-#: src/gtkpounce.c:959
+#: src/gtkpounce.c:969
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s has started typing to you (%s)"
 
-#: src/gtkpounce.c:961
+#: src/gtkpounce.c:971
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s has signed on (%s)"
 
-#: src/gtkpounce.c:963
+#: src/gtkpounce.c:973
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s has returned from being idle (%s)"
 
-#: src/gtkpounce.c:965
+#: src/gtkpounce.c:975
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s has returned from being away (%s)"
 
-#: src/gtkpounce.c:967
+#: src/gtkpounce.c:977
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s has stopped typing to you (%s)"
 
-#: src/gtkpounce.c:969
+#: src/gtkpounce.c:979
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s has signed off (%s)"
 
-#: src/gtkpounce.c:971
+#: src/gtkpounce.c:981
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s has become idle (%s)"
 
-#: src/gtkpounce.c:973
+#: src/gtkpounce.c:983
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s has gone away. (%s)"
 
-#: src/gtkpounce.c:974
+#: src/gtkpounce.c:984
 msgid "Unknown pounce event. Please report this!"
 msgstr "Unknown pounce event. Please report this!"
 
-#: src/gtkprefs.c:415
+#: src/gtkprefs.c:398
 msgid "Interface Options"
 msgstr "Interface Options"
 
-#: src/gtkprefs.c:417
+#: src/gtkprefs.c:400
 msgid "D_isplay remote nicknames if no alias is set"
 msgstr "D_isplay remote nicknames if no alias is set"
 
-#: src/gtkprefs.c:646
+#: src/gtkprefs.c:632
 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."
@@ -3693,48 +3715,48 @@
 "Select a smiley theme that you would like to use from the list below. New "
 "themes can be installed by dragging and dropping them onto the theme list."
 
-#: src/gtkprefs.c:686
+#: src/gtkprefs.c:672
 msgid "Icon"
 msgstr "Icon"
 
-#: src/gtkprefs.c:693 src/gtkprefs.c:2142 src/protocols/jabber/buddy.c:266
-#: src/protocols/jabber/buddy.c:750 src/protocols/jabber/chat.c:761
+#: src/gtkprefs.c:679 src/gtkprefs.c:2117 src/protocols/jabber/buddy.c:267
+#: src/protocols/jabber/buddy.c:799 src/protocols/jabber/chat.c:761
 msgid "Description"
 msgstr "Description"
 
-#: src/gtkprefs.c:789
+#: src/gtkprefs.c:774
 msgid "Display"
 msgstr "Display"
 
-#: src/gtkprefs.c:790
+#: src/gtkprefs.c:775
 msgid "Show _timestamp on messages"
 msgstr "Show _timestamp on messages"
 
-#: src/gtkprefs.c:793
+#: src/gtkprefs.c:778
 msgid "_Highlight misspelled words"
 msgstr "_Highlight misspelled words"
 
-#: src/gtkprefs.c:797
+#: src/gtkprefs.c:782
 msgid "Ignore c_olors"
 msgstr "Ignore c_olours"
 
-#: src/gtkprefs.c:799
+#: src/gtkprefs.c:784
 msgid "Ignore font _faces"
 msgstr "Ignore font _faces"
 
-#: src/gtkprefs.c:801
+#: src/gtkprefs.c:786
 msgid "Ignore font si_zes"
 msgstr "Ignore font si_zes"
 
-#: src/gtkprefs.c:804
+#: src/gtkprefs.c:789
 msgid "Default Formatting"
 msgstr "Default Formatting"
 
-#: src/gtkprefs.c:806
+#: src/gtkprefs.c:791
 msgid "_Send default formatting with outgoing messages"
 msgstr "_Send default formatting with outgoing messages"
 
-#: src/gtkprefs.c:838
+#: src/gtkprefs.c:801
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting. :)"
@@ -3742,237 +3764,237 @@
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting. :)"
 
-#: src/gtkprefs.c:841
+#: src/gtkprefs.c:804
 msgid "_Clear Formatting"
 msgstr "_Clear Formatting"
 
-#: src/gtkprefs.c:878
+#: src/gtkprefs.c:841
 msgid "Window Closing"
 msgstr "Window Closing"
 
-#: src/gtkprefs.c:879
+#: src/gtkprefs.c:842
 msgid "_Escape closes window"
 msgstr "_Escape closes window"
 
-#: src/gtkprefs.c:895
+#: src/gtkprefs.c:858
 msgid "Buddy List Sorting"
 msgstr "Buddy List Sorting"
 
-#: src/gtkprefs.c:904
+#: src/gtkprefs.c:867
 msgid "_Sorting:"
 msgstr "_Sorting:"
 
-#: src/gtkprefs.c:909
+#: src/gtkprefs.c:872
 msgid "Buddy Display"
 msgstr "Buddy Display"
 
-#: src/gtkprefs.c:910 src/gtkprefs.c:970
+#: src/gtkprefs.c:873 src/gtkprefs.c:933
 msgid "Show buddy _icons"
 msgstr "Show buddy _icons"
 
-#: src/gtkprefs.c:912
+#: src/gtkprefs.c:875
 msgid "Show _warning levels"
 msgstr "Show _warning levels"
 
-#: src/gtkprefs.c:914
+#: src/gtkprefs.c:877
 msgid "Show idle _times"
 msgstr "Show idle _times"
 
-#: src/gtkprefs.c:916
+#: src/gtkprefs.c:879
 msgid "_Automatically expand contacts"
 msgstr "_Automatically expand contacts"
 
-#: src/gtkprefs.c:949
+#: src/gtkprefs.c:912
 msgid "Show _buttons as:"
 msgstr "Show _buttons as:"
 
-#: src/gtkprefs.c:951
+#: src/gtkprefs.c:914
 msgid "Pictures"
 msgstr "Pictures"
 
-#: src/gtkprefs.c:952
+#: src/gtkprefs.c:915
 msgid "Text"
 msgstr "Text"
 
-#: src/gtkprefs.c:953
+#: src/gtkprefs.c:916
 msgid "Pictures and text"
 msgstr "Pictures and text"
 
-#: src/gtkprefs.c:960
+#: src/gtkprefs.c:923
 msgid "Enable \"_slash\" commands"
 msgstr "Enable \"_slash\" commands"
 
-#: src/gtkprefs.c:963
+#: src/gtkprefs.c:926
 msgid "Send unknown \"_slash\" commands as messages"
 msgstr "Send unknown \"_slash\" commands as messages"
 
-#: src/gtkprefs.c:966
+#: src/gtkprefs.c:929
 msgid "Show _formatting toolbar"
 msgstr "Show _formatting toolbar"
 
-#: src/gtkprefs.c:968
+#: src/gtkprefs.c:931
 msgid "Show _aliases in tabs/titles"
 msgstr "Show _aliases in tabs/titles"
 
-#: src/gtkprefs.c:972
+#: src/gtkprefs.c:935
 msgid "Enable buddy ic_on animation"
 msgstr "Enable buddy ic_on animation"
 
-#: src/gtkprefs.c:974
+#: src/gtkprefs.c:937
 msgid "_Notify buddies that you are typing to them"
 msgstr "_Notify buddies that you are typing to them"
 
-#: src/gtkprefs.c:976
+#: src/gtkprefs.c:939
 msgid "_Raise IM window on events"
 msgstr "_Raise IM window on events"
 
-#: src/gtkprefs.c:979
+#: src/gtkprefs.c:942
 msgid "Raise chat _window on events"
 msgstr "Raise chat _window on events"
 
 #. All the tab options!
-#: src/gtkprefs.c:983
+#: src/gtkprefs.c:946
 msgid "Tab Options"
 msgstr "Tab Options"
 
-#: src/gtkprefs.c:985
+#: src/gtkprefs.c:948
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Show IMs and chats in _tabbed windows"
 
-#: src/gtkprefs.c:999
+#: src/gtkprefs.c:962
 msgid "Show close b_utton on tabs"
 msgstr "Show close b_utton on tabs"
 
-#: src/gtkprefs.c:1002
+#: src/gtkprefs.c:965
 msgid "Tab p_lacement:"
 msgstr "Tab p_lacement:"
 
-#: src/gtkprefs.c:1004
+#: src/gtkprefs.c:967
 msgid "Top"
 msgstr "Top"
 
-#: src/gtkprefs.c:1005
+#: src/gtkprefs.c:968
 msgid "Bottom"
 msgstr "Bottom"
 
-#: src/gtkprefs.c:1006
+#: src/gtkprefs.c:969
 msgid "Left"
 msgstr "Left"
 
-#: src/gtkprefs.c:1007
+#: src/gtkprefs.c:970
 msgid "Right"
 msgstr "Right"
 
-#: src/gtkprefs.c:1013
+#: src/gtkprefs.c:976
 msgid "New conversation _placement:"
 msgstr "New conversation _placement:"
 
-#: src/gtkprefs.c:1064 src/protocols/oscar/oscar.c:749
-#: src/protocols/oscar/oscar.c:5041
+#: src/gtkprefs.c:1027 src/protocols/oscar/oscar.c:749
+#: src/protocols/oscar/oscar.c:5045
 msgid "IP Address"
 msgstr "IP Address"
 
-#: src/gtkprefs.c:1066
+#: src/gtkprefs.c:1029
 msgid "_Autodetect IP Address"
 msgstr "_Autodetect IP Address"
 
-#: src/gtkprefs.c:1075
+#: src/gtkprefs.c:1038
 msgid "Public _IP:"
 msgstr "Public _IP:"
 
-#: src/gtkprefs.c:1099
+#: src/gtkprefs.c:1062
 msgid "Ports"
 msgstr "Ports"
 
-#: src/gtkprefs.c:1102
+#: src/gtkprefs.c:1065
 msgid "_Manually specify range of ports to listen on"
 msgstr "_Manually specify range of ports to listen on"
 
-#: src/gtkprefs.c:1105
+#: src/gtkprefs.c:1068
 msgid "_Start Port:"
 msgstr "_Start Port:"
 
-#: src/gtkprefs.c:1112
+#: src/gtkprefs.c:1075
 msgid "_End Port:"
 msgstr "_End Port:"
 
-#: src/gtkprefs.c:1119
+#: src/gtkprefs.c:1082
 msgid "Proxy Server"
 msgstr "Proxy Server"
 
-#: src/gtkprefs.c:1123
+#: src/gtkprefs.c:1086
 msgid "No proxy"
 msgstr "No proxy"
 
-#: src/gtkprefs.c:1185
+#: src/gtkprefs.c:1148
 msgid "_User:"
 msgstr "_User:"
 
-#: src/gtkprefs.c:1241
+#: src/gtkprefs.c:1204
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: src/gtkprefs.c:1242
+#: src/gtkprefs.c:1205
 msgid "Firebird"
 msgstr "Firebird"
 
-#: src/gtkprefs.c:1243
+#: src/gtkprefs.c:1206
 msgid "Firefox"
 msgstr "Firefox"
 
-#: src/gtkprefs.c:1244
+#: src/gtkprefs.c:1207
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/gtkprefs.c:1245
+#: src/gtkprefs.c:1208
 msgid "Gnome Default"
 msgstr "Gnome Default"
 
-#: src/gtkprefs.c:1246
+#: src/gtkprefs.c:1209
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/gtkprefs.c:1247
+#: src/gtkprefs.c:1210
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: src/gtkprefs.c:1248
+#: src/gtkprefs.c:1211
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/gtkprefs.c:1249
+#: src/gtkprefs.c:1212
 msgid "Opera"
 msgstr "Opera"
 
-#: src/gtkprefs.c:1258
+#: src/gtkprefs.c:1221
 msgid "Manual"
 msgstr "Manual"
 
-#: src/gtkprefs.c:1309
+#: src/gtkprefs.c:1272
 msgid "Browser Selection"
 msgstr "Browser Selection"
 
-#: src/gtkprefs.c:1313
+#: src/gtkprefs.c:1276
 msgid "_Browser:"
 msgstr "_Browser:"
 
-#: src/gtkprefs.c:1320
+#: src/gtkprefs.c:1283
 msgid "_Open link in:"
 msgstr "_Open link in:"
 
-#: src/gtkprefs.c:1322
+#: src/gtkprefs.c:1285
 msgid "Browser default"
 msgstr "Browser default"
 
-#: src/gtkprefs.c:1323
+#: src/gtkprefs.c:1286
 msgid "Existing window"
 msgstr "Existing window"
 
-#: src/gtkprefs.c:1325
+#: src/gtkprefs.c:1288
 msgid "New tab"
 msgstr "New tab"
 
-#: src/gtkprefs.c:1339
+#: src/gtkprefs.c:1302
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -3981,75 +4003,75 @@
 "_Manual:\n"
 "(%s for URL)"
 
-#: src/gtkprefs.c:1376
+#: src/gtkprefs.c:1339
 msgid "Message Logs"
 msgstr "Message Logs"
 
-#: src/gtkprefs.c:1379
+#: src/gtkprefs.c:1342
 msgid "Log _Format:"
 msgstr "Log _Format:"
 
-#: src/gtkprefs.c:1382
+#: src/gtkprefs.c:1345
 msgid "_Log all instant messages"
 msgstr "_Log all instant messages"
 
-#: src/gtkprefs.c:1384
+#: src/gtkprefs.c:1347
 msgid "Log all c_hats"
 msgstr "Log all c_hats"
 
-#: src/gtkprefs.c:1387
+#: src/gtkprefs.c:1350
 msgid "System Logs"
 msgstr "System Logs"
 
-#: src/gtkprefs.c:1389
+#: src/gtkprefs.c:1352
 msgid "_Enable system log"
 msgstr "_Enable system log"
 
-#: src/gtkprefs.c:1392
-msgid "Log when buddies _sign on/sign off"
-msgstr "Log when buddies _sign on/sign off"
-
-#: src/gtkprefs.c:1398
+#: src/gtkprefs.c:1355
+msgid "Log when buddies log in/log _out"
+msgstr "Log when buddies log in/log _out"
+
+#: src/gtkprefs.c:1361
 msgid "Log when buddies become _idle/un-idle"
 msgstr "Log when buddies become _idle/un-idle"
 
-#: src/gtkprefs.c:1404
+#: src/gtkprefs.c:1367
 msgid "Log when buddies go away/come _back"
 msgstr "Log when buddies go away/come _back"
 
-#: src/gtkprefs.c:1410
-msgid "Log your _own signons/idleness/awayness"
-msgstr "Log your _own signons/idleness/awayness"
-
-#: src/gtkprefs.c:1546
+#: src/gtkprefs.c:1373
+msgid "Log your own _signons/idleness/awayness"
+msgstr "Log your own _signons/idleness/awayness"
+
+#: src/gtkprefs.c:1509
 msgid "Sound Selection"
 msgstr "Sound Selection"
 
-#: src/gtkprefs.c:1598
+#: src/gtkprefs.c:1561
 msgid "Sound Method"
 msgstr "Sound Method"
 
-#: src/gtkprefs.c:1599
+#: src/gtkprefs.c:1562
 msgid "_Method:"
 msgstr "_Method:"
 
-#: src/gtkprefs.c:1601
+#: src/gtkprefs.c:1564
 msgid "Console beep"
 msgstr "Console beep"
 
-#: src/gtkprefs.c:1603
+#: src/gtkprefs.c:1566
 msgid "Automatic"
 msgstr "Automatic"
 
-#: src/gtkprefs.c:1610
+#: src/gtkprefs.c:1573
 msgid "Command"
 msgstr "Command"
 
-#: src/gtkprefs.c:1611
+#: src/gtkprefs.c:1574
 msgid "No sounds"
 msgstr "No sounds"
 
-#: src/gtkprefs.c:1619
+#: src/gtkprefs.c:1582
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -4058,102 +4080,102 @@
 "Sound c_ommand:\n"
 "(%s for filename)"
 
-#: src/gtkprefs.c:1646
+#: src/gtkprefs.c:1609
 msgid "Sound Options"
 msgstr "Sound Options"
 
-#: src/gtkprefs.c:1647
+#: src/gtkprefs.c:1610
 msgid "Sounds when conversation has _focus"
 msgstr "Sounds when conversation has _focus"
 
-#: src/gtkprefs.c:1649
+#: src/gtkprefs.c:1612
 msgid "_Sounds while away"
 msgstr "_Sounds while away"
 
-#: src/gtkprefs.c:1659
+#: src/gtkprefs.c:1622
 msgid "Sound Events"
 msgstr "Sound Events"
 
-#: src/gtkprefs.c:1710
+#: src/gtkprefs.c:1673
 msgid "Play"
 msgstr "Play"
 
-#: src/gtkprefs.c:1717
+#: src/gtkprefs.c:1680
 msgid "Event"
 msgstr "Event"
 
-#: src/gtkprefs.c:1736
+#: src/gtkprefs.c:1699
 msgid "Test"
 msgstr "Test"
 
-#: src/gtkprefs.c:1740
+#: src/gtkprefs.c:1703
 msgid "Reset"
 msgstr "Reset"
 
-#: src/gtkprefs.c:1744
+#: src/gtkprefs.c:1707
 msgid "Choose..."
 msgstr "Choose..."
 
-#: src/gtkprefs.c:1775
+#: src/gtkprefs.c:1761
 msgid "_Queue new messages when away"
 msgstr "_Queue new messages when away"
 
-#: src/gtkprefs.c:1778
+#: src/gtkprefs.c:1764
 msgid "_Auto-reply:"
 msgstr "_Auto-reply:"
 
-#: src/gtkprefs.c:1780
+#: src/gtkprefs.c:1766
 msgid "Never"
 msgstr "Never"
 
-#: src/gtkprefs.c:1781
+#: src/gtkprefs.c:1767
 msgid "When away"
 msgstr "When away"
 
-#: src/gtkprefs.c:1782
+#: src/gtkprefs.c:1768
 msgid "When away and idle"
 msgstr "When away and idle"
 
-#: src/gtkprefs.c:1785 src/protocols/msn/msn.c:502
-#: src/protocols/msn/msn.c:1321 src/protocols/msn/state.c:32
-#: src/protocols/novell/novell.c:2813 src/protocols/oscar/oscar.c:4188
-#: src/protocols/yahoo/yahoo.c:2637 src/protocols/yahoo/yahoo_profile.c:665
+#: src/gtkprefs.c:1771 src/protocols/msn/msn.c:507
+#: src/protocols/msn/msn.c:1358 src/protocols/msn/state.c:32
+#: src/protocols/novell/novell.c:2817 src/protocols/oscar/oscar.c:4194
+#: src/protocols/yahoo/yahoo.c:2651 src/protocols/yahoo/yahoo_profile.c:665
 msgid "Idle"
 msgstr "Idle"
 
-#: src/gtkprefs.c:1786
+#: src/gtkprefs.c:1772
 msgid "Idle _time reporting:"
 msgstr "Idle _time reporting:"
 
-#: src/gtkprefs.c:1789
+#: src/gtkprefs.c:1775
 msgid "Gaim usage"
 msgstr "Gaim usage"
 
-#: src/gtkprefs.c:1792
+#: src/gtkprefs.c:1778
 msgid "X usage"
 msgstr "X usage"
 
-#: src/gtkprefs.c:1794
+#: src/gtkprefs.c:1780
 msgid "Windows usage"
 msgstr "Windows usage"
 
-#: src/gtkprefs.c:1802
+#: src/gtkprefs.c:1788
 msgid "Auto-away"
 msgstr "Auto-away"
 
-#: src/gtkprefs.c:1803
+#: src/gtkprefs.c:1789
 msgid "Set away _when idle"
 msgstr "Set away _when idle"
 
-#: src/gtkprefs.c:1807
+#: src/gtkprefs.c:1793
 msgid "_Minutes before setting away:"
 msgstr "_Minutes before setting away:"
 
-#: src/gtkprefs.c:1815
+#: src/gtkprefs.c:1801
 msgid "Away m_essage:"
 msgstr "Away m_essage:"
 
-#: src/gtkprefs.c:1884
+#: src/gtkprefs.c:1859
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4168,7 +4190,7 @@
 "<span weight=\"bold\">Web site:</span>\t\t%s\n"
 "<span weight=\"bold\">File name:</span>\t%s"
 
-#: src/gtkprefs.c:1889
+#: src/gtkprefs.c:1864
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4183,55 +4205,55 @@
 "<span weight=\"bold\">URL:</span>  %s\n"
 "<span weight=\"bold\">File name:</span>  %s"
 
-#: src/gtkprefs.c:2098
+#: src/gtkprefs.c:2073
 msgid "Load"
 msgstr "Load"
 
-#: src/gtkprefs.c:2112
+#: src/gtkprefs.c:2087
 msgid "Summary"
 msgstr "Summary"
 
-#: src/gtkprefs.c:2160
+#: src/gtkprefs.c:2135
 msgid "Details"
 msgstr "Details"
 
-#: src/gtkprefs.c:2289
+#: src/gtkprefs.c:2177
 msgid "Interface"
 msgstr "Interface"
 
-#: src/gtkprefs.c:2292
+#: src/gtkprefs.c:2180
 msgid "Message Text"
 msgstr "Message Text"
 
-#: src/gtkprefs.c:2293
+#: src/gtkprefs.c:2181
 msgid "Shortcuts"
 msgstr "Shortcuts"
 
-#: src/gtkprefs.c:2294
+#: src/gtkprefs.c:2182
 msgid "Smiley Themes"
 msgstr "Smiley Themes"
 
-#: src/gtkprefs.c:2295
+#: src/gtkprefs.c:2183
 msgid "Sounds"
 msgstr "Sounds"
 
-#: src/gtkprefs.c:2296
+#: src/gtkprefs.c:2184
 msgid "Network"
 msgstr "Network"
 
-#: src/gtkprefs.c:2301
+#: src/gtkprefs.c:2189
 msgid "Browser"
 msgstr "Browser"
 
-#: src/gtkprefs.c:2304
+#: src/gtkprefs.c:2192
 msgid "Logging"
 msgstr "Logging"
 
-#: src/gtkprefs.c:2305
+#: src/gtkprefs.c:2193
 msgid "Away / Idle"
 msgstr "Away / Idle"
 
-#: src/gtkprefs.c:2308
+#: src/gtkprefs.c:2196
 msgid "Plugins"
 msgstr "Plugins"
 
@@ -4255,63 +4277,63 @@
 msgid "Block only the users below"
 msgstr "Block only the users below"
 
-#: src/gtkprivacy.c:386 src/protocols/jabber/jabber.c:1495
+#: src/gtkprivacy.c:388 src/protocols/jabber/jabber.c:1497
 msgid "Privacy"
 msgstr "Privacy"
 
-#: src/gtkprivacy.c:399
+#: src/gtkprivacy.c:401
 msgid "Changes to privacy settings take effect immediately."
 msgstr "Changes to privacy settings take effect immediately."
 
 #. "Set privacy for:" label
-#: src/gtkprivacy.c:411
+#: src/gtkprivacy.c:413
 msgid "Set privacy for:"
 msgstr "Set privacy for:"
 
-#: src/gtkprivacy.c:580 src/gtkprivacy.c:596
+#: src/gtkprivacy.c:582 src/gtkprivacy.c:598
 msgid "Permit User"
 msgstr "Permit User"
 
-#: src/gtkprivacy.c:581
+#: src/gtkprivacy.c:583
 msgid "Type a user you permit to contact you."
 msgstr "Type a user you permit to contact you."
 
-#: src/gtkprivacy.c:582
+#: src/gtkprivacy.c:584
 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:585 src/gtkprivacy.c:598
+#: src/gtkprivacy.c:587 src/gtkprivacy.c:600
 msgid "Permit"
 msgstr "Permit"
 
-#: src/gtkprivacy.c:590
+#: src/gtkprivacy.c:592
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "Allow %s to contact you?"
 
-#: src/gtkprivacy.c:592
+#: src/gtkprivacy.c:594
 #, 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:619 src/gtkprivacy.c:632
+#: src/gtkprivacy.c:621 src/gtkprivacy.c:634
 msgid "Block User"
 msgstr "Block User"
 
-#: src/gtkprivacy.c:620
+#: src/gtkprivacy.c:622
 msgid "Type a user to block."
 msgstr "Type a user to block."
 
-#: src/gtkprivacy.c:621
+#: src/gtkprivacy.c:623
 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:628
+#: src/gtkprivacy.c:630
 #, c-format
 msgid "Block %s?"
 msgstr "Block %s?"
 
-#: src/gtkprivacy.c:630
+#: src/gtkprivacy.c:632
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "Are you sure you want to block %s?"
@@ -4319,40 +4341,42 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:240 src/protocols/gg/gg.c:1012 src/protocols/msn/msn.c:509
-#: src/protocols/novell/novell.c:1899 src/protocols/silc/buddy.c:307
-#: src/protocols/silc/pk.c:117 src/request.h:1236
+#: src/gtkrequest.c:257 src/protocols/gg/gg.c:1013 src/protocols/msn/msn.c:514
+#: src/protocols/msn/msn.c:517 src/protocols/novell/novell.c:1901
+#: src/protocols/silc/buddy.c:307 src/protocols/silc/pk.c:117
+#: src/request.h:1235
 msgid "Yes"
 msgstr "Yes"
 
-#: src/gtkrequest.c:241 src/protocols/gg/gg.c:1012 src/protocols/msn/msn.c:509
-#: src/protocols/novell/novell.c:1900 src/protocols/silc/buddy.c:308
-#: src/protocols/silc/pk.c:118 src/request.h:1236
+#: src/gtkrequest.c:258 src/protocols/gg/gg.c:1013 src/protocols/msn/msn.c:514
+#: src/protocols/msn/msn.c:517 src/protocols/novell/novell.c:1902
+#: src/protocols/silc/buddy.c:308 src/protocols/silc/pk.c:118
+#: src/request.h:1235
 msgid "No"
 msgstr "No"
 
-#: src/gtkrequest.c:244
+#: src/gtkrequest.c:261
 msgid "Apply"
 msgstr "Apply"
 
-#: src/gtkrequest.c:245 src/protocols/msn/msn.c:318
+#: src/gtkrequest.c:262 src/protocols/msn/msn.c:316
 #: src/protocols/silc/util.c:332
 msgid "Close"
 msgstr "Close"
 
-#: src/gtkrequest.c:1398
+#: src/gtkrequest.c:1479
 msgid "That file already exists"
 msgstr "That file already exists"
 
-#: src/gtkrequest.c:1399
+#: src/gtkrequest.c:1480
 msgid "Would you like to overwrite it?"
 msgstr "Would you like to overwrite it?"
 
-#: src/gtkrequest.c:1437 src/gtkrequest.c:1458
+#: src/gtkrequest.c:1518 src/gtkrequest.c:1539
 msgid "Save File..."
 msgstr "Save File..."
 
-#: src/gtkrequest.c:1438 src/gtkrequest.c:1459
+#: src/gtkrequest.c:1519 src/gtkrequest.c:1540
 msgid "Open File..."
 msgstr "Open File..."
 
@@ -4427,15 +4451,98 @@
 "Unable to play sound because the configured sound command could not be "
 "launched: %s"
 
-#: src/log.c:109
+#: src/gtkutils.c:1399 src/gtkutils.c:1424
+#, c-format
+msgid "The following error has occurred loading %s: %s"
+msgstr "The following error has occurred loading %s: %s"
+
+#: src/gtkutils.c:1401 src/gtkutils.c:1426
+msgid "Failed to load image"
+msgstr "Failed to load image"
+
+#: src/gtkutils.c:1487
+#, c-format
+msgid "Cannot send folder %s."
+msgstr "Cannot send folder %s."
+
+#: src/gtkutils.c:1489
+msgid ""
+"Gaim cannot transfer a folder. You will need to send the files within "
+"individually"
+msgstr ""
+"Gaim cannot transfer a folder. You will need to send the files within it "
+"individually"
+
+#: src/gtkutils.c:1516 src/gtkutils.c:1525 src/gtkutils.c:1530
+msgid "You have dragged an image"
+msgstr "You have dragged an image"
+
+#: src/gtkutils.c:1517
+msgid ""
+"You can send this image as a file transfer, embed it into this message, or "
+"use it as the buddy icon for this user."
+msgstr ""
+"You can send this image as a file transfer, embed it into this message, or "
+"use it as the buddy icon for this user."
+
+#: src/gtkutils.c:1521 src/gtkutils.c:1536
+msgid "Set as buddy icon"
+msgstr "Set as buddy icon"
+
+#: src/gtkutils.c:1522 src/gtkutils.c:1537
+msgid "Send image file"
+msgstr "Send image file"
+
+#: src/gtkutils.c:1523 src/gtkutils.c:1537
+msgid "Insert in message"
+msgstr "Insert in message"
+
+#: src/gtkutils.c:1526
+msgid "Would you like to set it as the buddy icon for this user?"
+msgstr "Would you like to set it as the buddy icon for this user?"
+
+#: src/gtkutils.c:1531
+msgid ""
+"You can send this image as a file transfer orembed it into this message, or "
+"use it as the buddy icon for this user."
+msgstr ""
+"You can send this image as a file transfer, embed it into this message, or "
+"use it as the buddy icon for this user."
+
+#: src/gtkutils.c:1533
+msgid ""
+"You can insert this image into this message, or use it as the buddy icon for "
+"this user"
+msgstr ""
+"You can insert this image into this message, or use it as the buddy icon for "
+"this user"
+
+#. I don't know if we really want to do anything here.  Most of the desktop item types are crap like
+#. * "MIME Type" (I have no clue how that would be a desktop item) and "Comment"... nothing we can really
+#. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
+#. * Probably not.  I'll just give an error and return.
+#. The original patch sent the icon used by the launcher.  That's probably wrong
+#: src/gtkutils.c:1587
+msgid "Cannot send launcher"
+msgstr "Cannot send launcher"
+
+#: src/gtkutils.c:1587
+msgid ""
+"You dragged a desktop launcher. Most likely you wanted to send whatever this "
+"launcher points to instead of this launcher itself."
+msgstr ""
+"You dragged a desktop launcher. Most likely you wanted to send whatever this "
+"launcher points to instead of this launcher itself."
+
+#: src/log.c:104
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color=\"red\">The logger has no read function</font></b>"
 
-#: src/log.c:533
+#: src/log.c:528
 msgid "XML"
 msgstr "XML"
 
-#: src/log.c:596
+#: src/log.c:591
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4444,7 +4551,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
 
-#: src/log.c:598
+#: src/log.c:593
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4453,25 +4560,25 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
 
-#: src/log.c:649 src/log.c:779
+#: src/log.c:644 src/log.c:774
 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:659 src/log.c:791
+#: src/log.c:654 src/log.c:786
 #, 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:663
+#: src/log.c:658
 msgid "HTML"
 msgstr "HTML"
 
-#: src/log.c:724
+#: src/log.c:719
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
-#: src/log.c:795
+#: src/log.c:790
 msgid "Plain text"
 msgstr "Plain text"
 
@@ -4501,8 +4608,8 @@
 msgstr "P_references"
 
 #: src/main.c:291
-msgid "_Sign on"
-msgstr "_Sign on"
+msgid "_Log in"
+msgstr "_Log in"
 
 #: src/main.c:513
 #, c-format
@@ -4543,11 +4650,11 @@
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr "Gaim %s. Try `%s -h' for more information.\n"
 
-#: src/main.c:841
+#: src/main.c:895
 msgid "Unable to load preferences"
 msgstr "Unable to load preferences"
 
-#: src/main.c:841
+#: 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 "
@@ -4557,7 +4664,7 @@
 "format that is no longer used.  Please reconfigure your settings using the "
 "Preferences window."
 
-#: src/plugin.c:291
+#: src/plugin.c:304
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
@@ -4566,11 +4673,11 @@
 "The required plugin %s was not found. Please install this plugin and try "
 "again."
 
-#: src/plugin.c:296 src/plugin.c:324
+#: src/plugin.c:309 src/plugin.c:337
 msgid "Gaim was unable to load your plugin."
 msgstr "Gaim was unable to load your plugin."
 
-#: src/plugin.c:320
+#: src/plugin.c:333
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "The required plugin %s was unable to load."
@@ -4579,13 +4686,13 @@
 msgid "Slightly less boring default"
 msgstr "Slightly less boring default"
 
-#: src/protocols/gg/gg.c:50 src/protocols/irc/irc.c:162
-#: src/protocols/msn/msn.c:530 src/protocols/msn/state.c:29
+#: src/protocols/gg/gg.c:50 src/protocols/irc/irc.c:165
+#: src/protocols/msn/msn.c:538 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:2804
-#: src/protocols/novell/novell.c:2923 src/protocols/novell/novell.c:2974
-#: src/protocols/oscar/oscar.c:771 src/protocols/oscar/oscar.c:6873
-#: src/protocols/yahoo/yahoo.c:3108
+#: src/protocols/msn/state.c:38 src/protocols/novell/novell.c:2808
+#: src/protocols/novell/novell.c:2927 src/protocols/novell/novell.c:2978
+#: src/protocols/oscar/oscar.c:771 src/protocols/oscar/oscar.c:6876
+#: src/protocols/yahoo/yahoo.c:3128
 msgid "Available"
 msgstr "Available"
 
@@ -4598,8 +4705,8 @@
 msgstr "Away for friends only"
 
 #: src/protocols/gg/gg.c:54 src/protocols/oscar/oscar.c:681
-#: src/protocols/oscar/oscar.c:6883 src/protocols/yahoo/yahoo.c:2635
-#: src/protocols/yahoo/yahoo.c:3152
+#: src/protocols/oscar/oscar.c:6890 src/protocols/yahoo/yahoo.c:2649
+#: src/protocols/yahoo/yahoo.c:3172
 msgid "Invisible"
 msgstr "Invisible"
 
@@ -4615,13 +4722,13 @@
 msgid "Unable to resolve hostname."
 msgstr "Unable to resolve hostname."
 
-#: src/protocols/gg/gg.c:140 src/protocols/novell/novell.c:1718
+#: src/protocols/gg/gg.c:140 src/protocols/novell/novell.c:1720
 msgid "Unable to connect to server."
 msgstr "Unable to connect to server."
 
 #: src/protocols/gg/gg.c:143 src/protocols/jabber/auth.c:130
-#: src/protocols/jabber/auth.c:204 src/protocols/jabber/auth.c:354
-#: src/protocols/jabber/auth.c:452 src/protocols/jabber/auth.c:464
+#: src/protocols/jabber/auth.c:204 src/protocols/jabber/auth.c:365
+#: src/protocols/jabber/auth.c:463 src/protocols/jabber/auth.c:475
 #: src/protocols/jabber/jabber.c:107
 msgid "Invalid response from server."
 msgstr "Invalid response from server."
@@ -4642,197 +4749,199 @@
 msgid "Unknown Error Code."
 msgstr "Unknown Error Code."
 
-#: src/protocols/gg/gg.c:232 src/protocols/oscar/oscar.c:3989
+#: src/protocols/gg/gg.c:233 src/protocols/oscar/oscar.c:3994
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 
 #. res[0] == username
-#: src/protocols/gg/gg.c:233 src/protocols/gg/gg.c:1074
-#: src/protocols/napster/napster.c:405 src/protocols/oscar/oscar.c:3993
-#: src/protocols/oscar/oscar.c:4217 src/protocols/silc/ops.c:1086
-#: src/protocols/silc/ops.c:1149 src/protocols/toc/toc.c:469
-#: src/protocols/zephyr/zephyr.c:721 src/protocols/zephyr/zephyr.c:1136
+#: src/protocols/gg/gg.c:234 src/protocols/gg/gg.c:1075
+#: src/protocols/napster/napster.c:404 src/protocols/oscar/oscar.c:3998
+#: src/protocols/oscar/oscar.c:4223 src/protocols/silc/ops.c:1088
+#: src/protocols/silc/ops.c:1151 src/protocols/toc/toc.c:469
+#: src/protocols/zephyr/zephyr.c:721 src/protocols/zephyr/zephyr.c:1137
 msgid "Buddy Information"
 msgstr "Buddy Information"
 
-#: src/protocols/gg/gg.c:267 src/protocols/irc/irc.c:154
-#: src/protocols/jabber/buddy.c:998 src/protocols/jabber/jabber.c:957
-#: src/protocols/msn/msn.c:522 src/protocols/novell/novell.c:2816
-#: src/protocols/oscar/oscar.c:739 src/protocols/oscar/oscar.c:6669
-#: src/protocols/oscar/oscar.c:6863 src/protocols/silc/silc.c:46
-#: src/protocols/yahoo/yahoo.c:2639 src/protocols/yahoo/yahoo.c:3102
+#: src/protocols/gg/gg.c:268 src/protocols/irc/irc.c:157
+#: src/protocols/jabber/buddy.c:1068 src/protocols/jabber/jabber.c:959
+#: src/protocols/msn/msn.c:530 src/protocols/napster/napster.c:556
+#: src/protocols/novell/novell.c:2820 src/protocols/oscar/oscar.c:739
+#: src/protocols/oscar/oscar.c:6672 src/protocols/oscar/oscar.c:6866
+#: src/protocols/silc/silc.c:46 src/protocols/yahoo/yahoo.c:2653
+#: src/protocols/yahoo/yahoo.c:3122
 msgid "Offline"
 msgstr "Offline"
 
-#: src/protocols/gg/gg.c:277 src/protocols/gg/gg.c:283
-#: src/protocols/gg/gg.c:289 src/protocols/gg/gg.c:295
-#: src/protocols/gg/gg.c:301 src/protocols/gg/gg.c:307
-#: src/protocols/gg/gg.c:313 src/protocols/irc/irc.c:167
-#: src/protocols/jabber/jabber.c:957 src/protocols/jabber/jabber.c:963
-#: src/protocols/jabber/jabber.c:969 src/protocols/jabber/jabber.c:975
-#: src/protocols/jabber/jabber.c:981 src/protocols/jabber/jabber.c:987
-#: src/protocols/novell/novell.c:2827 src/protocols/yahoo/yahoo.c:3114
-#: src/protocols/yahoo/yahoo.c:3148 src/protocols/zephyr/zephyr.c:2225
+#: src/protocols/gg/gg.c:278 src/protocols/gg/gg.c:284
+#: src/protocols/gg/gg.c:290 src/protocols/gg/gg.c:296
+#: src/protocols/gg/gg.c:302 src/protocols/gg/gg.c:308
+#: src/protocols/gg/gg.c:314 src/protocols/irc/irc.c:170
+#: src/protocols/jabber/jabber.c:959 src/protocols/jabber/jabber.c:965
+#: src/protocols/jabber/jabber.c:971 src/protocols/jabber/jabber.c:977
+#: src/protocols/jabber/jabber.c:983 src/protocols/jabber/jabber.c:989
+#: src/protocols/novell/novell.c:2831 src/protocols/oscar/oscar.c:6877
+#: src/protocols/oscar/oscar.c:6884 src/protocols/yahoo/yahoo.c:3134
+#: src/protocols/yahoo/yahoo.c:3168 src/protocols/zephyr/zephyr.c:2227
 msgid "Message"
 msgstr "Message"
 
-#: src/protocols/gg/gg.c:326
+#: src/protocols/gg/gg.c:327
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: src/protocols/gg/gg.c:480
+#: src/protocols/gg/gg.c:481
 msgid "Could not connect"
 msgstr "Could not connect"
 
-#: src/protocols/gg/gg.c:487
+#: src/protocols/gg/gg.c:488
 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:737 src/protocols/napster/napster.c:487
-#: src/protocols/napster/napster.c:518 src/protocols/toc/toc.c:171
-#: src/protocols/yahoo/yahoo.c:2266 src/protocols/yahoo/yahoo.c:2295
-#: src/protocols/yahoo/yahoo.c:2358 src/protocols/yahoo/yahoo_filexfer.c:68
+#: src/protocols/gg/gg.c:738 src/protocols/napster/napster.c:486
+#: src/protocols/napster/napster.c:517 src/protocols/toc/toc.c:171
+#: src/protocols/yahoo/yahoo.c:2280 src/protocols/yahoo/yahoo.c:2309
+#: src/protocols/yahoo/yahoo.c:2372 src/protocols/yahoo/yahoo_filexfer.c:68
 #: src/protocols/yahoo/yahoo_filexfer.c:109 src/protocols/yahoo/ycht.c:482
 msgid "Unable to connect."
 msgstr "Unable to connect."
 
-#: src/protocols/gg/gg.c:753
+#: src/protocols/gg/gg.c:754
 msgid "Reading data"
 msgstr "Reading data"
 
-#: src/protocols/gg/gg.c:756
+#: src/protocols/gg/gg.c:757
 msgid "Balancer handshake"
 msgstr "Balancer handshake"
 
-#: src/protocols/gg/gg.c:759
+#: src/protocols/gg/gg.c:760
 msgid "Reading server key"
 msgstr "Reading server key"
 
-#: src/protocols/gg/gg.c:762
+#: src/protocols/gg/gg.c:763
 msgid "Exchanging key hash"
 msgstr "Exchanging key hash"
 
-#: src/protocols/gg/gg.c:772
+#: src/protocols/gg/gg.c:773
 msgid "Critical error in GG library\n"
 msgstr "Critical error in GG library\n"
 
-#: src/protocols/gg/gg.c:790 src/protocols/gg/gg.c:881
+#: src/protocols/gg/gg.c:791 src/protocols/gg/gg.c:882
 #: src/protocols/toc/toc.c:147
 #, c-format
 msgid "Connect to %s failed"
 msgstr "Connect to %s failed"
 
-#: src/protocols/gg/gg.c:838
+#: src/protocols/gg/gg.c:839
 msgid "Unable to ping server"
 msgstr "Unable to ping server"
 
-#: src/protocols/gg/gg.c:850
+#: src/protocols/gg/gg.c:851
 msgid "Send as message"
 msgstr "Send as message"
 
-#: src/protocols/gg/gg.c:855
+#: src/protocols/gg/gg.c:856
 msgid "Looking up GG server"
 msgstr "Looking up GG server"
 
-#: src/protocols/gg/gg.c:858
+#: src/protocols/gg/gg.c:859
 msgid "Invalid Gadu-Gadu UIN specified"
 msgstr "Invalid Gadu-Gadu UIN specified"
 
-#: src/protocols/gg/gg.c:905
+#: src/protocols/gg/gg.c:906
 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:980
+#: src/protocols/gg/gg.c:981
 msgid "Couldn't get search results"
 msgstr "Couldn't get search results"
 
-#: src/protocols/gg/gg.c:985
+#: src/protocols/gg/gg.c:986
 msgid "Gadu-Gadu Search Engine"
 msgstr "Gadu-Gadu Search Engine"
 
-#: src/protocols/gg/gg.c:1011
+#: src/protocols/gg/gg.c:1012
 msgid "Active"
 msgstr "Active"
 
-#: src/protocols/gg/gg.c:1016 src/protocols/oscar/oscar.c:5033
+#: src/protocols/gg/gg.c:1017 src/protocols/oscar/oscar.c:5037
 msgid "UIN"
 msgstr "UIN"
 
 #. First Name
-#: src/protocols/gg/gg.c:1020 src/protocols/jabber/jabber.c:614
-#: src/protocols/oscar/oscar.c:5044 src/protocols/silc/ops.c:808
+#: src/protocols/gg/gg.c:1021 src/protocols/jabber/jabber.c:614
+#: src/protocols/oscar/oscar.c:5048 src/protocols/silc/ops.c:810
 #: src/protocols/trepia/trepia.c:268
 msgid "First Name"
 msgstr "First Name"
 
 #. Last Name
-#: src/protocols/gg/gg.c:1025 src/protocols/jabber/jabber.c:619
-#: src/protocols/oscar/oscar.c:5045 src/protocols/trepia/trepia.c:275
+#: src/protocols/gg/gg.c:1026 src/protocols/jabber/jabber.c:619
+#: src/protocols/oscar/oscar.c:5049 src/protocols/trepia/trepia.c:275
 msgid "Last Name"
 msgstr "Last Name"
 
-#: src/protocols/gg/gg.c:1029 src/protocols/gg/gg.c:1774
-#: src/protocols/irc/msgs.c:182 src/protocols/oscar/oscar.c:5034
-#: src/protocols/silc/ops.c:1206
+#: src/protocols/gg/gg.c:1030 src/protocols/gg/gg.c:1775
+#: src/protocols/irc/msgs.c:182 src/protocols/oscar/oscar.c:5038
+#: src/protocols/silc/ops.c:1202
 msgid "Nick"
 msgstr "Nick"
 
-#: src/protocols/gg/gg.c:1036 src/protocols/gg/gg.c:1039
+#: src/protocols/gg/gg.c:1037 src/protocols/gg/gg.c:1040
 msgid "Birth Year"
 msgstr "Birth Year"
 
-#: src/protocols/gg/gg.c:1045 src/protocols/gg/gg.c:1047
-#: src/protocols/gg/gg.c:1049
+#: src/protocols/gg/gg.c:1046 src/protocols/gg/gg.c:1048
+#: src/protocols/gg/gg.c:1050
 msgid "Sex"
 msgstr "Sex"
 
 #. City
-#: src/protocols/gg/gg.c:1053 src/protocols/jabber/jabber.c:629
-#: src/protocols/oscar/oscar.c:5088 src/protocols/oscar/oscar.c:5096
+#: src/protocols/gg/gg.c:1054 src/protocols/jabber/jabber.c:629
+#: src/protocols/oscar/oscar.c:5092 src/protocols/oscar/oscar.c:5100
 #: src/protocols/trepia/trepia.c:332 src/protocols/trepia/trepia.c:411
 msgid "City"
 msgstr "City"
 
-#: src/protocols/gg/gg.c:1096
+#: src/protocols/gg/gg.c:1097
 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:1104
+#: src/protocols/gg/gg.c:1105
 msgid "Couldn't Import Buddy List from Server"
 msgstr "Couldn't Import Buddy List from Server"
 
-#: src/protocols/gg/gg.c:1166
+#: src/protocols/gg/gg.c:1167
 msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "Buddy List successfully transferred to Gadu-Gadu server"
 
-#: src/protocols/gg/gg.c:1174
+#: src/protocols/gg/gg.c:1175
 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:1182
+#: src/protocols/gg/gg.c:1183
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
 msgstr "Buddy List successfully deleted from Gadu-Gadu server"
 
-#: src/protocols/gg/gg.c:1190
+#: src/protocols/gg/gg.c:1191
 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:1199
+#: src/protocols/gg/gg.c:1200
 msgid "Password changed successfully"
 msgstr "Password changed successfully"
 
-#: src/protocols/gg/gg.c:1206
+#: src/protocols/gg/gg.c:1207
 msgid "Password couldn't be changed"
 msgstr "Password couldn't be changed"
 
-#: src/protocols/gg/gg.c:1325
+#: src/protocols/gg/gg.c:1326
 msgid "Error communicating with Gadu-Gadu server"
 msgstr "Error communicating with Gadu-Gadu server"
 
-#: src/protocols/gg/gg.c:1326
+#: src/protocols/gg/gg.c:1327
 msgid ""
 "Gaim was unable to complete your request due to a problem communicating with "
 "the Gadu-Gadu HTTP server.  Please try again later."
@@ -4840,11 +4949,11 @@
 "Gaim was unable to complete your request due to a problem communicating with "
 "the Gadu-Gadu HTTP server.  Please try again later."
 
-#: src/protocols/gg/gg.c:1355
+#: src/protocols/gg/gg.c:1356
 msgid "Unable to import Gadu-Gadu buddy list"
 msgstr "Unable to import Gadu-Gadu buddy list"
 
-#: src/protocols/gg/gg.c:1356
+#: src/protocols/gg/gg.c:1357
 msgid ""
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
@@ -4852,25 +4961,25 @@
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
 
-#: src/protocols/gg/gg.c:1429
+#: src/protocols/gg/gg.c:1430
 msgid "Couldn't export buddy list"
 msgstr "Couldn't export buddy list"
 
-#: src/protocols/gg/gg.c:1430 src/protocols/gg/gg.c:1453
+#: src/protocols/gg/gg.c:1431 src/protocols/gg/gg.c:1454
 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:1452
+#: src/protocols/gg/gg.c:1453
 msgid "Unable to delete Gadu-Gadu buddy list"
 msgstr "Unable to delete Gadu-Gadu buddy list"
 
-#: src/protocols/gg/gg.c:1503
+#: src/protocols/gg/gg.c:1504
 msgid "Unable to access directory"
 msgstr "Unable to access directory"
 
-#: src/protocols/gg/gg.c:1504
+#: src/protocols/gg/gg.c:1505
 msgid ""
 "Gaim was unable to search the Directory because it was unable to connect to "
 "the directory server.  Please try again later."
@@ -4878,11 +4987,11 @@
 "Gaim was unable to search the Directory because it was unable to connect to "
 "the directory server.  Please try again later."
 
-#: src/protocols/gg/gg.c:1538
+#: src/protocols/gg/gg.c:1539
 msgid "Unable to change Gadu-Gadu password"
 msgstr "Unable to change Gadu-Gadu password"
 
-#: src/protocols/gg/gg.c:1539
+#: src/protocols/gg/gg.c:1540
 msgid ""
 "Gaim was unable to change your password due to an error connecting to the "
 "Gadu-Gadu server.  Please try again later."
@@ -4890,33 +4999,33 @@
 "Gaim was unable to change your password due to an error connecting to the "
 "Gadu-Gadu server.  Please try again later."
 
-#: src/protocols/gg/gg.c:1555
+#: src/protocols/gg/gg.c:1556
 msgid "Directory Search"
 msgstr "Directory Search"
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: src/protocols/gg/gg.c:1560 src/protocols/jabber/jabber.c:1091
+#: src/protocols/gg/gg.c:1561 src/protocols/jabber/jabber.c:1093
 #: src/protocols/toc/toc.c:1571
 msgid "Change Password"
 msgstr "Change Password"
 
-#: src/protocols/gg/gg.c:1564
+#: src/protocols/gg/gg.c:1565
 msgid "Import Buddy List from Server"
 msgstr "Import Buddy List from Server"
 
-#: src/protocols/gg/gg.c:1568
+#: src/protocols/gg/gg.c:1569
 msgid "Export Buddy List to Server"
 msgstr "Export Buddy List to Server"
 
-#: src/protocols/gg/gg.c:1572
+#: src/protocols/gg/gg.c:1573
 msgid "Delete Buddy List from Server"
 msgstr "Delete Buddy List from Server"
 
-#: src/protocols/gg/gg.c:1605
+#: src/protocols/gg/gg.c:1606
 msgid "Unable to access user profile."
 msgstr "Unable to access user profile."
 
-#: src/protocols/gg/gg.c:1606
+#: src/protocols/gg/gg.c:1607
 msgid ""
 "Gaim was unable to access this user's profile due to an error connecting to "
 "the directory server.  Please try again later."
@@ -4934,23 +5043,23 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/gg/gg.c:1753 src/protocols/gg/gg.c:1755
+#: src/protocols/gg/gg.c:1754 src/protocols/gg/gg.c:1756
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu Protocol Plugin"
 
-#: src/protocols/irc/cmds.c:43 src/protocols/silc/silc.c:1309
+#: src/protocols/irc/cmds.c:43 src/protocols/silc/silc.c:1310
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Unknown command: %s"
 
 #: src/protocols/irc/cmds.c:450 src/protocols/jabber/chat.c:584
-#: src/protocols/silc/silc.c:1017
+#: src/protocols/silc/silc.c:1018
 #, c-format
 msgid "current topic is: %s"
 msgstr "current topic is: %s"
 
 #: src/protocols/irc/cmds.c:454 src/protocols/jabber/chat.c:588
-#: src/protocols/silc/silc.c:1021
+#: src/protocols/silc/silc.c:1022
 msgid "No topic is set"
 msgstr "No topic is set"
 
@@ -4982,51 +5091,51 @@
 msgid "MOTD for %s"
 msgstr "MOTD for %s"
 
-#: src/protocols/irc/irc.c:93 src/protocols/irc/irc.c:409
+#: src/protocols/irc/irc.c:93 src/protocols/irc/irc.c:412
 msgid "Server has disconnected"
 msgstr "Server has disconnected"
 
-#: src/protocols/irc/irc.c:178
+#: src/protocols/irc/irc.c:181
 msgid "View MOTD"
 msgstr "View MOTD"
 
-#: src/protocols/irc/irc.c:190 src/protocols/silc/chat.c:32
+#: src/protocols/irc/irc.c:193 src/protocols/silc/chat.c:32
 msgid "_Channel:"
 msgstr "_Channel:"
 
-#: src/protocols/irc/irc.c:195 src/protocols/jabber/chat.c:56
+#: src/protocols/irc/irc.c:198 src/protocols/jabber/chat.c:56
 msgid "_Password:"
 msgstr "_Password:"
 
-#: src/protocols/irc/irc.c:227
+#: src/protocols/irc/irc.c:230
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC nicks may not contain whitespace"
 
-#: src/protocols/irc/irc.c:246 src/protocols/toc/toc.c:199
-#, c-format
-msgid "Signon: %s"
-msgstr "Signon: %s"
-
-#: src/protocols/irc/irc.c:255
+#: src/protocols/irc/irc.c:249
+#, c-format
+msgid "Logging in: %s"
+msgstr "Logging in: %s"
+
+#: src/protocols/irc/irc.c:258
 msgid "Couldn't create socket"
 msgstr "Couldn't create socket"
 
-#: src/protocols/irc/irc.c:270 src/protocols/jabber/jabber.c:298
-#: src/protocols/oscar/oscar.c:1688 src/protocols/oscar/oscar.c:1755
+#: src/protocols/irc/irc.c:273 src/protocols/jabber/jabber.c:298
+#: src/protocols/oscar/oscar.c:1690 src/protocols/oscar/oscar.c:1757
 msgid "Couldn't connect to host"
 msgstr "Couldn't connect to host"
 
-#: src/protocols/irc/irc.c:406 src/protocols/trepia/trepia.c:929
+#: src/protocols/irc/irc.c:409 src/protocols/trepia/trepia.c:929
 msgid "Read error"
 msgstr "Read error"
 
-#: src/protocols/irc/irc.c:561 src/protocols/silc/chat.c:1373
+#: src/protocols/irc/irc.c:564 src/protocols/silc/chat.c:1373
 #: src/protocols/yahoo/yahoochat.c:1398
 msgid "Users"
 msgstr "Users"
 
-#: src/protocols/irc/irc.c:564 src/protocols/silc/chat.c:1376
-#: src/protocols/silc/ops.c:1168 src/protocols/yahoo/yahoochat.c:1407
+#: src/protocols/irc/irc.c:567 src/protocols/silc/chat.c:1376
+#: src/protocols/silc/ops.c:1170 src/protocols/yahoo/yahoochat.c:1407
 msgid "Topic"
 msgstr "Topic"
 
@@ -5038,40 +5147,39 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:671
+#: src/protocols/irc/irc.c:674
 msgid "IRC Protocol Plugin"
 msgstr "IRC Protocol Plugin"
 
 #. *  summary
-#: src/protocols/irc/irc.c:672
+#: src/protocols/irc/irc.c:675
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "The IRC Protocol Plugin that Sucks Less"
 
-#: src/protocols/irc/irc.c:691 src/protocols/irc/msgs.c:201
-#: src/protocols/jabber/jabber.c:1608 src/protocols/napster/napster.c:672
-#: src/protocols/silc/ops.c:1026 src/protocols/silc/ops.c:1130
+#: src/protocols/irc/irc.c:694 src/protocols/irc/msgs.c:201
+#: src/protocols/jabber/jabber.c:1610 src/protocols/napster/napster.c:691
+#: src/protocols/silc/ops.c:1028 src/protocols/silc/ops.c:1132
 msgid "Server"
 msgstr "Server"
 
-#: src/protocols/irc/irc.c:694 src/protocols/jabber/jabber.c:1629
-#: src/protocols/msn/msn.c:1926 src/protocols/napster/napster.c:677
-#: src/protocols/silc/silc.c:1603 src/protocols/trepia/trepia.c:1303
+#: src/protocols/irc/irc.c:697 src/protocols/jabber/jabber.c:1631
+#: src/protocols/msn/msn.c:1963 src/protocols/napster/napster.c:696
+#: src/protocols/silc/silc.c:1604 src/protocols/trepia/trepia.c:1303
 msgid "Port"
 msgstr "Port"
 
-#: src/protocols/irc/irc.c:697 src/protocols/oscar/oscar.c:7510
-#: src/protocols/zephyr/zephyr.c:2857
-msgid "Encoding"
-msgstr "Encoding"
-
-#: src/protocols/irc/irc.c:700 src/protocols/irc/msgs.c:195
+#: src/protocols/irc/irc.c:700
+msgid "Encodings"
+msgstr "Encodings"
+
+#: src/protocols/irc/irc.c:703 src/protocols/irc/msgs.c:195
 #: src/protocols/jabber/jabber.c:589 src/protocols/silc/buddy.c:1450
-#: src/protocols/silc/ops.c:973 src/protocols/silc/ops.c:975
-#: src/protocols/silc/ops.c:1124 src/protocols/silc/ops.c:1126
+#: src/protocols/silc/ops.c:975 src/protocols/silc/ops.c:977
+#: src/protocols/silc/ops.c:1126 src/protocols/silc/ops.c:1128
 msgid "Username"
 msgstr "Username"
 
-#: src/protocols/irc/irc.c:703
+#: src/protocols/irc/irc.c:706
 msgid "Real name"
 msgstr "Real name"
 
@@ -5104,17 +5212,17 @@
 
 #: src/protocols/irc/msgs.c:189 src/protocols/irc/msgs.c:195
 #: src/protocols/irc/msgs.c:196 src/protocols/irc/msgs.c:207
-#: src/protocols/msn/msn.c:1321 src/protocols/yahoo/yahoo_profile.c:665
+#: src/protocols/msn/msn.c:1358 src/protocols/yahoo/yahoo_profile.c:665
 #, c-format
 msgid "<b>%s:</b> %s<br>"
 msgstr "<b>%s:</b> %s<br>"
 
-#: src/protocols/irc/msgs.c:196 src/protocols/silc/ops.c:967
-#: src/protocols/silc/ops.c:1118 src/protocols/yahoo/yahoo_profile.c:1007
+#: src/protocols/irc/msgs.c:196 src/protocols/silc/ops.c:969
+#: src/protocols/silc/ops.c:1120 src/protocols/yahoo/yahoo_profile.c:1007
 msgid "Realname"
 msgstr "Realname"
 
-#: src/protocols/irc/msgs.c:207 src/protocols/silc/ops.c:1039
+#: src/protocols/irc/msgs.c:207 src/protocols/silc/ops.c:1041
 msgid "Currently on"
 msgstr "Currently on"
 
@@ -5194,62 +5302,62 @@
 msgid "Invitation only"
 msgstr "Invitation only"
 
-#: src/protocols/irc/msgs.c:628
+#: src/protocols/irc/msgs.c:623
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "You have been kicked by %s: (%s)"
 
-#: src/protocols/irc/msgs.c:633
+#: src/protocols/irc/msgs.c:628
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Kicked by %s (%s)"
 
-#: src/protocols/irc/msgs.c:654
+#: src/protocols/irc/msgs.c:649
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "mode (%s %s) by %s"
 
-#: src/protocols/irc/msgs.c:763
+#: src/protocols/irc/msgs.c:758
 msgid "Could not change nick"
 msgstr "Could not change nick"
 
-#: src/protocols/irc/msgs.c:764
+#: src/protocols/irc/msgs.c:759
 msgid "Cannot change nick"
 msgstr "Cannot change nick"
 
-#: src/protocols/irc/msgs.c:785
+#: src/protocols/irc/msgs.c:780
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "You have parted the channel%s%s"
 
-#: src/protocols/irc/msgs.c:825
+#: src/protocols/irc/msgs.c:820
 msgid "Error: invalid PONG from server"
 msgstr "Error: invalid PONG from server"
 
-#: src/protocols/irc/msgs.c:827
+#: src/protocols/irc/msgs.c:822
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING reply -- Lag: %lu seconds"
 
-#: src/protocols/irc/msgs.c:902
+#: src/protocols/irc/msgs.c:897
 #, c-format
 msgid "Cannot join %s:"
 msgstr "Cannot join %s:"
 
-#: src/protocols/irc/msgs.c:903 src/protocols/silc/ops.c:912
+#: src/protocols/irc/msgs.c:898 src/protocols/silc/ops.c:914
 msgid "Cannot join channel"
 msgstr "Cannot join channel"
 
-#: src/protocols/irc/msgs.c:939
+#: src/protocols/irc/msgs.c:934
 #, c-format
 msgid "Wallops from %s"
 msgstr "Wallops from %s"
 
-#: src/protocols/irc/parse.c:109
+#: src/protocols/irc/parse.c:110
 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:110
+#: src/protocols/irc/parse.c:111
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
@@ -5257,7 +5365,7 @@
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
 
-#: src/protocols/irc/parse.c:111
+#: src/protocols/irc/parse.c:112
 msgid ""
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
@@ -5265,7 +5373,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:112
+#: src/protocols/irc/parse.c:113
 msgid ""
 "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
 "someone, preventing them from speaking if the channel is moderated (+m). You "
@@ -5275,7 +5383,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:113
+#: src/protocols/irc/parse.c:114
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
@@ -5283,7 +5391,7 @@
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
 
-#: src/protocols/irc/parse.c:114
+#: src/protocols/irc/parse.c:115
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -5291,7 +5399,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:115
+#: src/protocols/irc/parse.c:116
 msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -5299,7 +5407,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:116
+#: src/protocols/irc/parse.c:117
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
@@ -5307,7 +5415,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:117
+#: src/protocols/irc/parse.c:118
 msgid ""
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
@@ -5315,11 +5423,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:118
+#: src/protocols/irc/parse.c:119
 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:119
+#: src/protocols/irc/parse.c:120
 msgid ""
 "mode &lt;nick|channel&gt; &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a channel "
 "or user mode."
@@ -5327,7 +5435,7 @@
 "mode &lt;nick|channel&gt; &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a channel "
 "or user mode."
 
-#: src/protocols/irc/parse.c:120
+#: src/protocols/irc/parse.c:121
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -5335,15 +5443,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:121
+#: src/protocols/irc/parse.c:122
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [channel]:  List the users currently in a channel."
 
-#: src/protocols/irc/parse.c:122 src/protocols/jabber/jabber.c:1439
+#: src/protocols/irc/parse.c:123 src/protocols/jabber/jabber.c:1441
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;new nickname&gt;:  Change your nickname."
 
-#: src/protocols/irc/parse.c:123
+#: src/protocols/irc/parse.c:124
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
@@ -5351,7 +5459,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:124
+#: src/protocols/irc/parse.c:125
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
@@ -5359,7 +5467,7 @@
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
 
-#: src/protocols/irc/parse.c:125
+#: src/protocols/irc/parse.c:126
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
@@ -5367,7 +5475,7 @@
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
 
-#: src/protocols/irc/parse.c:126
+#: src/protocols/irc/parse.c:127
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
@@ -5375,7 +5483,7 @@
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
 
-#: src/protocols/irc/parse.c:127
+#: src/protocols/irc/parse.c:128
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -5383,15 +5491,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:128
+#: src/protocols/irc/parse.c:129
 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:129
+#: src/protocols/irc/parse.c:130
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...]:  Send a raw command to the server."
 
-#: src/protocols/irc/parse.c:130
+#: src/protocols/irc/parse.c:131
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
@@ -5399,15 +5507,15 @@
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
 
-#: src/protocols/irc/parse.c:131
+#: src/protocols/irc/parse.c:132
 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:132
+#: src/protocols/irc/parse.c:133
 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:133
+#: src/protocols/irc/parse.c:134
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
@@ -5415,7 +5523,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:134
+#: src/protocols/irc/parse.c:135
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
@@ -5423,34 +5531,27 @@
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
 
-#: src/protocols/irc/parse.c:135
+#: src/protocols/irc/parse.c:136
 msgid "whois &lt;nick&gt;:  Get information on a user."
 msgstr "whois &lt;nick&gt;:  Get information on a user."
 
-#: src/protocols/irc/parse.c:242
-msgid ""
-"(There was an error converting this message.  Check the 'Encoding' option in "
-"the Account Editor)"
-msgstr ""
-"(There was an error converting this message.  Check the 'Encoding' option in "
-"the Account Editor)"
-
-#: src/protocols/irc/parse.c:394
+#: src/protocols/irc/parse.c:412
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Reply time from %s: %lu seconds"
 
-#: src/protocols/irc/parse.c:395
+#: src/protocols/irc/parse.c:413
 msgid "PONG"
 msgstr "PONG"
 
-#: src/protocols/irc/parse.c:395
+#: src/protocols/irc/parse.c:413
 msgid "CTCP PING reply"
 msgstr "CTCP PING reply"
 
-#: src/protocols/irc/parse.c:497 src/protocols/oscar/oscar.c:1585
-#: src/protocols/toc/toc.c:189 src/protocols/toc/toc.c:597
-#: src/protocols/toc/toc.c:613 src/protocols/toc/toc.c:690
+#: src/protocols/irc/parse.c:516 src/protocols/irc/parse.c:520
+#: src/protocols/oscar/oscar.c:1587 src/protocols/toc/toc.c:189
+#: src/protocols/toc/toc.c:597 src/protocols/toc/toc.c:613
+#: src/protocols/toc/toc.c:690
 msgid "Disconnected."
 msgstr "Disconnected."
 
@@ -5479,101 +5580,101 @@
 msgid "Server does not use any supported authentication method"
 msgstr "Server does not use any supported authentication method"
 
-#: src/protocols/jabber/auth.c:375
+#: src/protocols/jabber/auth.c:386
 msgid "Invalid challenge from server"
 msgstr "Invalid challenge from server"
 
-#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:606
-#: src/protocols/silc/ops.c:804
+#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:655
+#: src/protocols/silc/ops.c:806
 msgid "Full Name"
 msgstr "Full Name"
 
-#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:619
-#: src/protocols/silc/ops.c:816
+#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:668
+#: src/protocols/silc/ops.c:818
 msgid "Family Name"
 msgstr "Family Name"
 
-#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:623
+#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/buddy.c:672
 msgid "Given Name"
 msgstr "Given Name"
 
-#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/buddy.c:637
-#: src/protocols/jabber/jabber.c:609 src/protocols/msn/msn.c:1311
-#: src/protocols/silc/buddy.c:1447 src/protocols/silc/ops.c:820
-#: src/protocols/silc/ops.c:963 src/protocols/silc/ops.c:1114
+#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:686
+#: src/protocols/jabber/jabber.c:609 src/protocols/msn/msn.c:1348
+#: src/protocols/silc/buddy.c:1447 src/protocols/silc/ops.c:822
+#: src/protocols/silc/ops.c:965 src/protocols/silc/ops.c:1116
 #: src/protocols/yahoo/yahoo_profile.c:1002
 msgid "Nickname"
 msgstr "Nickname"
 
-#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/jabber.c:649
+#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/jabber.c:649
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:665
+#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:714
 msgid "Street Address"
 msgstr "Street Address"
 
-#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:661
+#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:710
 msgid "Extended Address"
 msgstr "Extended Address"
 
-#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:669
+#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:718
 msgid "Locality"
 msgstr "Locality"
 
-#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:673
+#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:722
 msgid "Region"
 msgstr "Region"
 
-#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:677
+#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:726
 #: src/protocols/jabber/jabber.c:639
 msgid "Postal Code"
 msgstr "Postal Code"
 
 #. Country
-#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:682
+#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:731
 #: src/protocols/trepia/trepia.c:340 src/protocols/trepia/trepia.c:417
 msgid "Country"
 msgstr "Country"
 
-#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:693
-#: src/protocols/jabber/buddy.c:700
+#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:742
+#: src/protocols/jabber/buddy.c:749
 msgid "Telephone"
 msgstr "Telephone"
 
-#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:711
-#: src/protocols/jabber/buddy.c:719 src/protocols/silc/silc.c:658
+#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:760
+#: src/protocols/jabber/buddy.c:768 src/protocols/silc/silc.c:662
 #: src/protocols/silc/util.c:508 src/protocols/yahoo/yahoo_profile.c:997
 msgid "Email"
 msgstr "Email"
 
-#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:734
+#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:783
 msgid "Organization Name"
 msgstr "Organization Name"
 
-#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:738
+#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:787
 msgid "Organization Unit"
 msgstr "Organization Unit"
 
-#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:744
-#: src/protocols/novell/novell.c:1458
+#: src/protocols/jabber/buddy.c:264 src/protocols/jabber/buddy.c:793
+#: src/protocols/novell/novell.c:1460
 msgid "Title"
 msgstr "Title"
 
-#: src/protocols/jabber/buddy.c:264 src/protocols/jabber/buddy.c:747
+#: src/protocols/jabber/buddy.c:265 src/protocols/jabber/buddy.c:796
 msgid "Role"
 msgstr "Role"
 
-#: src/protocols/jabber/buddy.c:265 src/protocols/jabber/buddy.c:640
-#: src/protocols/oscar/oscar.c:5069
+#: src/protocols/jabber/buddy.c:266 src/protocols/jabber/buddy.c:689
+#: src/protocols/oscar/oscar.c:5073
 msgid "Birthday"
 msgstr "Birthday"
 
-#: src/protocols/jabber/buddy.c:511 src/protocols/jabber/buddy.c:512
+#: src/protocols/jabber/buddy.c:559 src/protocols/jabber/buddy.c:560
 msgid "Edit Jabber vCard"
 msgstr "Edit Jabber vCard"
 
-#: src/protocols/jabber/buddy.c:513
+#: src/protocols/jabber/buddy.c:561
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
@@ -5581,93 +5682,93 @@
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
 
-#: src/protocols/jabber/buddy.c:555
+#: src/protocols/jabber/buddy.c:604
 msgid "Jabber ID"
 msgstr "Jabber ID"
 
-#: src/protocols/jabber/buddy.c:565 src/protocols/jabber/buddy.c:572
-#: src/protocols/jabber/buddy.c:583 src/protocols/jabber/jabber.c:936
-#: src/protocols/msn/msn.c:500 src/protocols/novell/novell.c:2826
-#: src/protocols/novell/novell.c:2830 src/protocols/oscar/oscar.c:731
+#: src/protocols/jabber/buddy.c:614 src/protocols/jabber/buddy.c:621
+#: src/protocols/jabber/buddy.c:632 src/protocols/jabber/jabber.c:938
+#: src/protocols/msn/msn.c:505 src/protocols/novell/novell.c:2830
+#: src/protocols/novell/novell.c:2834 src/protocols/oscar/oscar.c:731
 #: src/protocols/oscar/oscar.c:737 src/protocols/oscar/oscar.c:739
-#: src/protocols/yahoo/yahoo.c:2760
+#: src/protocols/yahoo/yahoo.c:2774
 msgid "Status"
 msgstr "Status"
 
-#: src/protocols/jabber/buddy.c:581 src/protocols/jabber/jabber.c:1611
+#: src/protocols/jabber/buddy.c:630 src/protocols/jabber/jabber.c:1613
 msgid "Resource"
 msgstr "Resource"
 
-#: src/protocols/jabber/buddy.c:627 src/protocols/silc/ops.c:812
+#: src/protocols/jabber/buddy.c:676 src/protocols/silc/ops.c:814
 msgid "Middle Name"
 msgstr "Middle Name"
 
-#: src/protocols/jabber/buddy.c:645 src/protocols/jabber/jabber.c:624
-#: src/protocols/oscar/oscar.c:5087 src/protocols/oscar/oscar.c:5095
-#: src/protocols/silc/ops.c:848
+#: src/protocols/jabber/buddy.c:694 src/protocols/jabber/jabber.c:624
+#: src/protocols/oscar/oscar.c:5091 src/protocols/oscar/oscar.c:5099
+#: src/protocols/silc/ops.c:850
 msgid "Address"
 msgstr "Address"
 
-#: src/protocols/jabber/buddy.c:657
+#: src/protocols/jabber/buddy.c:706
 msgid "P.O. Box"
 msgstr "P.O. Box"
 
-#: src/protocols/jabber/buddy.c:763
+#: src/protocols/jabber/buddy.c:812
 msgid "Photo"
 msgstr "Photo"
 
-#: src/protocols/jabber/buddy.c:763
+#: src/protocols/jabber/buddy.c:812
 msgid "Logo"
 msgstr "Logo"
 
-#: src/protocols/jabber/buddy.c:779
+#: src/protocols/jabber/buddy.c:834
 msgid "Jabber Profile"
 msgstr "Jabber Profile"
 
-#: src/protocols/jabber/buddy.c:946
+#: src/protocols/jabber/buddy.c:1016
 msgid "Un-hide From"
 msgstr "Un-hide From"
 
-#: src/protocols/jabber/buddy.c:949
+#: src/protocols/jabber/buddy.c:1019
 msgid "Temporarily Hide From"
 msgstr "Temporarily Hide From"
 
 #. && NOT ME
-#: src/protocols/jabber/buddy.c:956
+#: src/protocols/jabber/buddy.c:1026
 msgid "Cancel Presence Notification"
 msgstr "Cancel Presence Notification"
 
-#: src/protocols/jabber/buddy.c:962
+#: src/protocols/jabber/buddy.c:1032
 msgid "(Re-)Request authorization"
 msgstr "(Re-)Request authorization"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: src/protocols/jabber/buddy.c:970
+#: src/protocols/jabber/buddy.c:1040
 msgid "Unsubscribe"
 msgstr "Unsubscribe"
 
-#: src/protocols/jabber/buddy.c:996 src/protocols/jabber/chat.c:669
-#: src/protocols/jabber/chat.c:680 src/protocols/jabber/jabber.c:944
-#: src/protocols/silc/ops.c:1243
+#: src/protocols/jabber/buddy.c:1066 src/protocols/jabber/chat.c:669
+#: src/protocols/jabber/chat.c:680 src/protocols/jabber/jabber.c:946
+#: src/protocols/silc/ops.c:1239
 msgid "Error"
 msgstr "Error"
 
-#: src/protocols/jabber/buddy.c:1002 src/protocols/jabber/jabber.c:968
+#: src/protocols/jabber/buddy.c:1072 src/protocols/jabber/jabber.c:970
 msgid "Chatty"
 msgstr "Chatty"
 
-#: src/protocols/jabber/buddy.c:1006 src/protocols/jabber/jabber.c:980
+#: src/protocols/jabber/buddy.c:1076 src/protocols/jabber/jabber.c:982
 msgid "Extended Away"
 msgstr "Extended Away"
 
-#: src/protocols/jabber/buddy.c:1008 src/protocols/jabber/jabber.c:986
-#: src/protocols/oscar/oscar.c:671 src/protocols/oscar/oscar.c:6903
+#: src/protocols/jabber/buddy.c:1078 src/protocols/jabber/jabber.c:988
+#: src/protocols/oscar/oscar.c:671 src/protocols/oscar/oscar.c:6910
 msgid "Do Not Disturb"
 msgstr "Do Not Disturb"
 
-#: src/protocols/jabber/chat.c:41 src/protocols/oscar/oscar.c:6368
+#: src/protocols/jabber/chat.c:41 src/protocols/oscar/oscar.c:6371
 #: src/protocols/yahoo/yahoochat.c:1003
 msgid "_Room:"
 msgstr "_Room:"
@@ -5732,7 +5833,7 @@
 msgstr "Nick changing not supported in non-MUC chatrooms"
 
 #: src/protocols/jabber/chat.c:670 src/protocols/jabber/chat.c:681
-#: src/protocols/silc/ops.c:1243
+#: src/protocols/silc/ops.c:1239
 msgid "Error retrieving room list"
 msgstr "Error retrieving room list"
 
@@ -5797,7 +5898,7 @@
 msgid "Registration Successful"
 msgstr "Registration Successful"
 
-#: src/protocols/jabber/jabber.c:443 src/protocols/jabber/jabber.c:1210
+#: src/protocols/jabber/jabber.c:443 src/protocols/jabber/jabber.c:1212
 msgid "Unknown Error"
 msgstr "Unknown Error"
 
@@ -5809,7 +5910,7 @@
 msgid "Already Registered"
 msgstr "Already Registered"
 
-#: src/protocols/jabber/jabber.c:593 src/protocols/jabber/jabber.c:1065
+#: src/protocols/jabber/jabber.c:593 src/protocols/jabber/jabber.c:1067
 msgid "Password"
 msgstr "Password"
 
@@ -5818,14 +5919,14 @@
 msgstr "E-Mail"
 
 #. State
-#: src/protocols/jabber/jabber.c:634 src/protocols/oscar/oscar.c:5089
-#: src/protocols/oscar/oscar.c:5097 src/protocols/trepia/trepia.c:336
+#: src/protocols/jabber/jabber.c:634 src/protocols/oscar/oscar.c:5093
+#: src/protocols/oscar/oscar.c:5101 src/protocols/trepia/trepia.c:336
 #: src/protocols/trepia/trepia.c:414
 msgid "State"
 msgstr "Province/Territory"
 
-#: src/protocols/jabber/jabber.c:644 src/protocols/silc/ops.c:853
-#: src/protocols/silc/silc.c:660 src/protocols/silc/util.c:510
+#: src/protocols/jabber/jabber.c:644 src/protocols/silc/ops.c:855
+#: src/protocols/silc/silc.c:664 src/protocols/silc/util.c:510
 msgid "Phone"
 msgstr "Phone"
 
@@ -5842,338 +5943,338 @@
 msgstr "Register New Jabber Account"
 
 #. connect to the server
-#: src/protocols/jabber/jabber.c:787 src/protocols/msn/msn.c:690
-#: src/protocols/napster/napster.c:511 src/protocols/novell/novell.c:2159
-#: src/protocols/oscar/oscar.c:1759 src/protocols/trepia/trepia.c:1067
-#: src/protocols/yahoo/yahoo.c:2489 src/protocols/zephyr/zephyr.c:1492
+#: src/protocols/jabber/jabber.c:789 src/protocols/msn/msn.c:697
+#: src/protocols/napster/napster.c:510 src/protocols/novell/novell.c:2163
+#: src/protocols/oscar/oscar.c:1761 src/protocols/trepia/trepia.c:1067
+#: src/protocols/yahoo/yahoo.c:2503 src/protocols/zephyr/zephyr.c:1493
 msgid "Connecting"
 msgstr "Connecting"
 
-#: src/protocols/jabber/jabber.c:791
+#: src/protocols/jabber/jabber.c:793
 msgid "Initializing Stream"
 msgstr "Initializing Stream"
 
-#: src/protocols/jabber/jabber.c:797
+#: src/protocols/jabber/jabber.c:799
 msgid "Authenticating"
 msgstr "Authenticating"
 
-#: src/protocols/jabber/jabber.c:806
+#: src/protocols/jabber/jabber.c:808
 msgid "Re-initializing Stream"
 msgstr "Re-initializing Stream"
 
-#: src/protocols/jabber/jabber.c:878 src/protocols/jabber/jabber.c:1188
-#: src/protocols/jabber/jabber.c:1229 src/protocols/jabber/jabber.c:1262
-#: src/protocols/oscar/oscar.c:737 src/protocols/oscar/oscar.c:6667
+#: src/protocols/jabber/jabber.c:880 src/protocols/jabber/jabber.c:1190
+#: src/protocols/jabber/jabber.c:1231 src/protocols/jabber/jabber.c:1264
+#: src/protocols/oscar/oscar.c:737 src/protocols/oscar/oscar.c:6670
 msgid "Not Authorized"
 msgstr "Not Authorized"
 
-#: src/protocols/jabber/jabber.c:911
+#: src/protocols/jabber/jabber.c:913
 msgid "Both"
 msgstr "Both"
 
-#: src/protocols/jabber/jabber.c:913
+#: src/protocols/jabber/jabber.c:915
 msgid "From (To pending)"
 msgstr "From (To pending)"
 
-#: src/protocols/jabber/jabber.c:915
+#: src/protocols/jabber/jabber.c:917
 msgid "From"
 msgstr "From"
 
-#: src/protocols/jabber/jabber.c:918
+#: src/protocols/jabber/jabber.c:920
 msgid "To"
 msgstr "To"
 
-#: src/protocols/jabber/jabber.c:920
+#: src/protocols/jabber/jabber.c:922
 msgid "None (To pending)"
 msgstr "None (To pending)"
 
-#: src/protocols/jabber/jabber.c:924
+#: src/protocols/jabber/jabber.c:926
 msgid "Subscription"
 msgstr "Subscription"
 
-#: src/protocols/jabber/jabber.c:962 src/protocols/jabber/jabber.c:968
-#: src/protocols/jabber/jabber.c:974 src/protocols/jabber/jabber.c:980
-#: src/protocols/jabber/jabber.c:986
+#: src/protocols/jabber/jabber.c:964 src/protocols/jabber/jabber.c:970
+#: src/protocols/jabber/jabber.c:976 src/protocols/jabber/jabber.c:982
+#: src/protocols/jabber/jabber.c:988
 msgid "Priority"
 msgstr "Priority"
 
-#: src/protocols/jabber/jabber.c:1008
+#: src/protocols/jabber/jabber.c:1010
 msgid "Password Changed"
 msgstr "Password Changed"
 
-#: src/protocols/jabber/jabber.c:1009
+#: src/protocols/jabber/jabber.c:1011
 msgid "Your password has been changed."
 msgstr "Your password has been changed."
 
-#: src/protocols/jabber/jabber.c:1013 src/protocols/jabber/jabber.c:1014
+#: src/protocols/jabber/jabber.c:1015 src/protocols/jabber/jabber.c:1016
 msgid "Error changing password"
 msgstr "Error changing password"
 
-#: src/protocols/jabber/jabber.c:1070
+#: src/protocols/jabber/jabber.c:1072
 msgid "Password (again)"
 msgstr "Password (again)"
 
-#: src/protocols/jabber/jabber.c:1075 src/protocols/jabber/jabber.c:1076
+#: src/protocols/jabber/jabber.c:1077 src/protocols/jabber/jabber.c:1078
 msgid "Change Jabber Password"
 msgstr "Change Jabber Password"
 
-#: src/protocols/jabber/jabber.c:1076
+#: src/protocols/jabber/jabber.c:1078
 msgid "Please enter your new password"
 msgstr "Please enter your new password"
 
-#: src/protocols/jabber/jabber.c:1086 src/protocols/toc/toc.c:1561
+#: src/protocols/jabber/jabber.c:1088 src/protocols/toc/toc.c:1561
 msgid "Set User Info"
 msgstr "Set User Info"
 
-#: src/protocols/jabber/jabber.c:1168
+#: src/protocols/jabber/jabber.c:1170
 msgid "Bad Request"
 msgstr "Bad Request"
 
-#: src/protocols/jabber/jabber.c:1170
-msgid "Conflict"
-msgstr "Conflict"
-
 #: src/protocols/jabber/jabber.c:1172
-msgid "Feature Not Implemented"
-msgstr "Feature Not Implemented"
+msgid "Conflict"
+msgstr "Conflict"
 
 #: src/protocols/jabber/jabber.c:1174
+msgid "Feature Not Implemented"
+msgstr "Feature Not Implemented"
+
+#: src/protocols/jabber/jabber.c:1176
 msgid "Forbidden"
 msgstr "Forbidden"
 
-#: src/protocols/jabber/jabber.c:1176
+#: src/protocols/jabber/jabber.c:1178
 msgid "Gone"
 msgstr "Gone"
 
-#: src/protocols/jabber/jabber.c:1178 src/protocols/jabber/jabber.c:1252
+#: src/protocols/jabber/jabber.c:1180 src/protocols/jabber/jabber.c:1254
 msgid "Internal Server Error"
 msgstr "Internal Server Error"
 
-#: src/protocols/jabber/jabber.c:1180
+#: src/protocols/jabber/jabber.c:1182
 msgid "Item Not Found"
 msgstr "Item Not Found"
 
-#: src/protocols/jabber/jabber.c:1182
+#: src/protocols/jabber/jabber.c:1184
 msgid "Malformed Jabber ID"
 msgstr "Malformed Jabber ID"
 
-#: src/protocols/jabber/jabber.c:1184
-msgid "Not Acceptable"
-msgstr "Not Acceptable"
-
 #: src/protocols/jabber/jabber.c:1186
+msgid "Not Acceptable"
+msgstr "Not Acceptable"
+
+#: src/protocols/jabber/jabber.c:1188
 msgid "Not Allowed"
 msgstr "Not Allowed"
 
-#: src/protocols/jabber/jabber.c:1190
-msgid "Payment Required"
-msgstr "Payment Required"
-
 #: src/protocols/jabber/jabber.c:1192
+msgid "Payment Required"
+msgstr "Payment Required"
+
+#: src/protocols/jabber/jabber.c:1194
 msgid "Recipient Unavailable"
 msgstr "Recipient Unavailable"
 
-#: src/protocols/jabber/jabber.c:1196
+#: src/protocols/jabber/jabber.c:1198
 msgid "Registration Required"
 msgstr "Registration Required"
 
-#: src/protocols/jabber/jabber.c:1198
-msgid "Remote Server Not Found"
-msgstr "Remote Server Not Found"
-
 #: src/protocols/jabber/jabber.c:1200
+msgid "Remote Server Not Found"
+msgstr "Remote Server Not Found"
+
+#: src/protocols/jabber/jabber.c:1202
 msgid "Remote Server Timeout"
 msgstr "Remote Server Timeout"
 
-#: src/protocols/jabber/jabber.c:1202
+#: src/protocols/jabber/jabber.c:1204
 msgid "Server Overloaded"
 msgstr "Server Overloaded"
 
-#: src/protocols/jabber/jabber.c:1204
+#: src/protocols/jabber/jabber.c:1206
 msgid "Service Unavailable"
 msgstr "Service Unavailable"
 
-#: src/protocols/jabber/jabber.c:1206
-msgid "Subscription Required"
-msgstr "Subscription Required"
-
 #: src/protocols/jabber/jabber.c:1208
+msgid "Subscription Required"
+msgstr "Subscription Required"
+
+#: src/protocols/jabber/jabber.c:1210
 msgid "Unexpected Request"
 msgstr "Unexpected Request"
 
-#: src/protocols/jabber/jabber.c:1215
-msgid "Authorization Aborted"
-msgstr "Authorization Aborted"
-
 #: src/protocols/jabber/jabber.c:1217
+msgid "Authorization Aborted"
+msgstr "Authorization Aborted"
+
+#: src/protocols/jabber/jabber.c:1219
 msgid "Incorrect encoding in authorization"
 msgstr "Incorrect encoding in authorization"
 
-#: src/protocols/jabber/jabber.c:1220
+#: src/protocols/jabber/jabber.c:1222
 msgid "Invalid authzid"
 msgstr "Invalid authzid"
 
-#: src/protocols/jabber/jabber.c:1223
+#: src/protocols/jabber/jabber.c:1225
 msgid "Invalid Authorization Mechanism"
 msgstr "Invalid Authorization Mechanism"
 
-#: src/protocols/jabber/jabber.c:1226
+#: src/protocols/jabber/jabber.c:1228
 msgid "Authorization mechanism too weak"
 msgstr "Authorization mechanism too weak"
 
-#: src/protocols/jabber/jabber.c:1231
+#: src/protocols/jabber/jabber.c:1233
 msgid "Temporary Authentication Failure"
 msgstr "Temporary Authentication Failure"
 
-#: src/protocols/jabber/jabber.c:1233
+#: src/protocols/jabber/jabber.c:1235
 msgid "Authentication Failure"
 msgstr "Authentication Failure"
 
-#: src/protocols/jabber/jabber.c:1237
-msgid "Bad Format"
-msgstr "Bad Format"
-
 #: src/protocols/jabber/jabber.c:1239
+msgid "Bad Format"
+msgstr "Bad Format"
+
+#: src/protocols/jabber/jabber.c:1241
 msgid "Bad Namespace Prefix"
 msgstr "Bad Namespace Prefix"
 
-#: src/protocols/jabber/jabber.c:1242
+#: src/protocols/jabber/jabber.c:1244
 msgid "Resource Conflict"
 msgstr "Resource Conflict"
 
-#: src/protocols/jabber/jabber.c:1244 src/protocols/silc/ops.c:1513
+#: src/protocols/jabber/jabber.c:1246 src/protocols/silc/ops.c:1509
 msgid "Connection Timeout"
 msgstr "Connection Timeout"
 
-#: src/protocols/jabber/jabber.c:1246
+#: src/protocols/jabber/jabber.c:1248
 msgid "Host Gone"
 msgstr "Host Gone"
 
-#: src/protocols/jabber/jabber.c:1248
+#: src/protocols/jabber/jabber.c:1250
 msgid "Host Unknown"
 msgstr "Host Unknown"
 
-#: src/protocols/jabber/jabber.c:1250
+#: src/protocols/jabber/jabber.c:1252
 msgid "Improper Addressing"
 msgstr "Improper Addressing"
 
-#: src/protocols/jabber/jabber.c:1254
+#: src/protocols/jabber/jabber.c:1256
 msgid "Invalid ID"
 msgstr "Invalid ID"
 
-#: src/protocols/jabber/jabber.c:1256
+#: src/protocols/jabber/jabber.c:1258
 msgid "Invalid Namespace"
 msgstr "Invalid Namespace"
 
-#: src/protocols/jabber/jabber.c:1258
-msgid "Invalid XML"
-msgstr "Invalid XML"
-
 #: src/protocols/jabber/jabber.c:1260
+msgid "Invalid XML"
+msgstr "Invalid XML"
+
+#: src/protocols/jabber/jabber.c:1262
 msgid "Non-matching Hosts"
 msgstr "Non-matching Hosts"
 
-#: src/protocols/jabber/jabber.c:1264
-msgid "Policy Violation"
-msgstr "Policy Violation"
-
 #: src/protocols/jabber/jabber.c:1266
-msgid "Remote Connection Failed"
-msgstr "Remote Connection Failed"
+msgid "Policy Violation"
+msgstr "Policy Violation"
 
 #: src/protocols/jabber/jabber.c:1268
+msgid "Remote Connection Failed"
+msgstr "Remote Connection Failed"
+
+#: src/protocols/jabber/jabber.c:1270
 msgid "Resource Constraint"
 msgstr "Resource Constraint"
 
-#: src/protocols/jabber/jabber.c:1270
+#: src/protocols/jabber/jabber.c:1272
 msgid "Restricted XML"
 msgstr "Restricted XML"
 
-#: src/protocols/jabber/jabber.c:1272
+#: src/protocols/jabber/jabber.c:1274
 msgid "See Other Host"
 msgstr "See Other Host"
 
-#: src/protocols/jabber/jabber.c:1274
+#: src/protocols/jabber/jabber.c:1276
 msgid "System Shutdown"
 msgstr "System Shutdown"
 
-#: src/protocols/jabber/jabber.c:1276
+#: src/protocols/jabber/jabber.c:1278
 msgid "Undefined Condition"
 msgstr "Undefined Condition"
 
-#: src/protocols/jabber/jabber.c:1278
-msgid "Unsupported Encoding"
-msgstr "Unsupported Encoding"
-
 #: src/protocols/jabber/jabber.c:1280
+msgid "Unsupported Encoding"
+msgstr "Unsupported Encoding"
+
+#: src/protocols/jabber/jabber.c:1282
 msgid "Unsupported Stanza Type"
 msgstr "Unsupported Stanza Type"
 
-#: src/protocols/jabber/jabber.c:1282
-msgid "Unsupported Version"
-msgstr "Unsupported Version"
-
 #: src/protocols/jabber/jabber.c:1284
-msgid "XML Not Well Formed"
-msgstr "XML Not Well Formed"
+msgid "Unsupported Version"
+msgstr "Unsupported Version"
 
 #: src/protocols/jabber/jabber.c:1286
+msgid "XML Not Well Formed"
+msgstr "XML Not Well Formed"
+
+#: src/protocols/jabber/jabber.c:1288
 msgid "Stream Error"
 msgstr "Stream Error"
 
-#: src/protocols/jabber/jabber.c:1353
+#: src/protocols/jabber/jabber.c:1355
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Unable to ban user %s"
 
-#: src/protocols/jabber/jabber.c:1405
+#: src/protocols/jabber/jabber.c:1407
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Unable to kick user %s"
 
-#: src/protocols/jabber/jabber.c:1431
+#: src/protocols/jabber/jabber.c:1433
 msgid "config:  Configure a chat room."
 msgstr "config:  Configure a chat room."
 
-#: src/protocols/jabber/jabber.c:1435
+#: src/protocols/jabber/jabber.c:1437
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Configure a chat room."
 
-#: src/protocols/jabber/jabber.c:1444
+#: src/protocols/jabber/jabber.c:1446
 msgid "part [room]:  Leave the room."
 msgstr "part [room]:  Leave the room."
 
-#: src/protocols/jabber/jabber.c:1449
+#: src/protocols/jabber/jabber.c:1451
 msgid "register:  Register with a chat room."
 msgstr "register:  Register with a chat room."
 
-#: src/protocols/jabber/jabber.c:1455
+#: src/protocols/jabber/jabber.c:1457
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [new topic]:  View or change the topic."
 
-#: src/protocols/jabber/jabber.c:1461
+#: src/protocols/jabber/jabber.c:1463
 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:1467
+#: src/protocols/jabber/jabber.c:1469
 msgid "invite &lt;user&gt; [room]:  Invite a user to the room."
 msgstr "invite &lt;user&gt; [room]:  Invite a user to the room."
 
-#: src/protocols/jabber/jabber.c:1473
+#: src/protocols/jabber/jabber.c:1475
 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:1479
+#: src/protocols/jabber/jabber.c:1481
 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:1484
+#: src/protocols/jabber/jabber.c:1486
 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:1499
+#: src/protocols/jabber/jabber.c:1501
 msgid "Hide Operating System"
 msgstr "Hide Operating System"
 
@@ -6187,24 +6288,24 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/jabber/jabber.c:1586 src/protocols/jabber/jabber.c:1588
+#: src/protocols/jabber/jabber.c:1588 src/protocols/jabber/jabber.c:1590
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber Protocol Plugin"
 
-#: src/protocols/jabber/jabber.c:1614
+#: src/protocols/jabber/jabber.c:1616
 msgid "Use TLS if available"
 msgstr "Use TLS if available"
 
-#: src/protocols/jabber/jabber.c:1619
+#: src/protocols/jabber/jabber.c:1621
 msgid "Force old SSL"
 msgstr "Force old SSL"
 
-#: src/protocols/jabber/jabber.c:1624
+#: src/protocols/jabber/jabber.c:1626
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Allow plaintext auth over unencrypted streams"
 
 #. Account options
-#: src/protocols/jabber/jabber.c:1633 src/protocols/silc/silc.c:1599
+#: src/protocols/jabber/jabber.c:1635 src/protocols/silc/silc.c:1600
 msgid "Connect server"
 msgstr "Connect server"
 
@@ -6241,30 +6342,30 @@
 msgid "XML Parse error"
 msgstr "XML Parse error"
 
-#: src/protocols/jabber/presence.c:205
+#: src/protocols/jabber/presence.c:250
 msgid "Unknown Error in presence"
 msgstr "Unknown Error in presence"
 
-#: src/protocols/jabber/presence.c:208
+#: src/protocols/jabber/presence.c:253
 #, 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:214 src/protocols/msn/userlist.c:100
-#: src/protocols/oscar/oscar.c:3728 src/protocols/oscar/oscar.c:6297
+#: src/protocols/jabber/presence.c:259 src/protocols/msn/userlist.c:102
+#: src/protocols/oscar/oscar.c:3733 src/protocols/oscar/oscar.c:6300
 msgid "Authorize"
 msgstr "Authorize"
 
-#: src/protocols/jabber/presence.c:215 src/protocols/msn/userlist.c:101
-#: src/protocols/oscar/oscar.c:3730 src/protocols/oscar/oscar.c:6298
+#: src/protocols/jabber/presence.c:260 src/protocols/msn/userlist.c:103
+#: src/protocols/oscar/oscar.c:3735 src/protocols/oscar/oscar.c:6301
 msgid "Deny"
 msgstr "Deny"
 
-#: src/protocols/jabber/presence.c:262 src/protocols/jabber/presence.c:263
+#: src/protocols/jabber/presence.c:307 src/protocols/jabber/presence.c:308
 msgid "Create New Room"
 msgstr "Create New Room"
 
-#: src/protocols/jabber/presence.c:264
+#: src/protocols/jabber/presence.c:309
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -6272,20 +6373,20 @@
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
 
-#: src/protocols/jabber/presence.c:266
+#: src/protocols/jabber/presence.c:311
 msgid "Configure Room"
 msgstr "Configure Room"
 
-#: src/protocols/jabber/presence.c:268
+#: src/protocols/jabber/presence.c:313
 msgid "Accept Defaults"
 msgstr "Accept Defaults"
 
-#: src/protocols/jabber/presence.c:298
+#: src/protocols/jabber/presence.c:350
 #, c-format
 msgid "Error in chat %s"
 msgstr "Error in chat %s"
 
-#: src/protocols/jabber/presence.c:301
+#: src/protocols/jabber/presence.c:353
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Error joining chat %s"
@@ -6299,15 +6400,15 @@
 msgid "File Send Failed"
 msgstr "File Send Failed"
 
-#: src/protocols/msn/cmdproc.c:345
+#: src/protocols/msn/cmdproc.c:355
 msgid "Miscellaneous error"
 msgstr "Miscellaneous error"
 
-#: src/protocols/msn/cmdproc.c:348
+#: src/protocols/msn/cmdproc.c:358
 msgid "You have signed on from another location."
 msgstr "You have signed on from another location."
 
-#: src/protocols/msn/cmdproc.c:350
+#: src/protocols/msn/cmdproc.c:360
 msgid "The MSN servers are going down temporarily."
 msgstr "The MSN servers are going down temporarily."
 
@@ -6500,8 +6601,8 @@
 msgid "Server too busy"
 msgstr "Server too busy"
 
-#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2192
-#: src/protocols/silc/ops.c:1502 src/protocols/toc/toc.c:631
+#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2194
+#: src/protocols/silc/ops.c:1498 src/protocols/toc/toc.c:631
 msgid "Authentication failed"
 msgstr "Authentication failed"
 
@@ -6535,35 +6636,35 @@
 msgid "MSN Error: %s\n"
 msgstr "MSN Error: %s\n"
 
-#: src/protocols/msn/msn.c:118
+#: src/protocols/msn/msn.c:116
 msgid "Your new MSN friendly name is too long."
 msgstr "Your new MSN friendly name is too long."
 
-#: src/protocols/msn/msn.c:226
+#: src/protocols/msn/msn.c:224
 msgid "Set your friendly name."
 msgstr "Set your friendly name."
 
-#: src/protocols/msn/msn.c:227
+#: src/protocols/msn/msn.c:225
 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:243
+#: src/protocols/msn/msn.c:241
 msgid "Set your home phone number."
 msgstr "Set your home phone number."
 
-#: src/protocols/msn/msn.c:258
+#: src/protocols/msn/msn.c:256
 msgid "Set your work phone number."
 msgstr "Set your work phone number."
 
-#: src/protocols/msn/msn.c:273
+#: src/protocols/msn/msn.c:271
 msgid "Set your mobile phone number."
 msgstr "Set your mobile phone number."
 
-#: src/protocols/msn/msn.c:286
+#: src/protocols/msn/msn.c:284
 msgid "Allow MSN Mobile pages?"
 msgstr "Allow MSN Mobile pages?"
 
-#: src/protocols/msn/msn.c:287
+#: src/protocols/msn/msn.c:285
 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?"
@@ -6571,24 +6672,24 @@
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
 
-#: src/protocols/msn/msn.c:291
+#: src/protocols/msn/msn.c:289
 msgid "Allow"
 msgstr "Allow"
 
-#: src/protocols/msn/msn.c:292
+#: src/protocols/msn/msn.c:290
 msgid "Disallow"
 msgstr "Disallow"
 
+#: src/protocols/msn/msn.c:313
+msgid "Send a mobile message."
+msgstr "Send a mobile message."
+
 #: src/protocols/msn/msn.c:315
-msgid "Send a mobile message."
-msgstr "Send a mobile message."
-
-#: src/protocols/msn/msn.c:317
 msgid "Page"
 msgstr "Page"
 
-#: src/protocols/msn/msn.c:500 src/protocols/msn/msn.c:507
-#: src/protocols/yahoo/yahoo.c:2760
+#: src/protocols/msn/msn.c:505 src/protocols/msn/msn.c:512
+#: src/protocols/msn/msn.c:515 src/protocols/yahoo/yahoo.c:2774
 #, c-format
 msgid ""
 "\n"
@@ -6597,70 +6698,74 @@
 "\n"
 "<b>%s:</b> %s"
 
-#: src/protocols/msn/msn.c:507
+#: src/protocols/msn/msn.c:512
 msgid "Has you"
 msgstr "Has you"
 
-#: src/protocols/msn/msn.c:538 src/protocols/msn/state.c:33
-#: src/protocols/yahoo/yahoo.c:2617 src/protocols/yahoo/yahoo.c:3119
+#: src/protocols/msn/msn.c:515
+msgid "Blocked"
+msgstr "Blocked"
+
+#: src/protocols/msn/msn.c:546 src/protocols/msn/state.c:33
+#: src/protocols/yahoo/yahoo.c:2631 src/protocols/yahoo/yahoo.c:3139
 msgid "Be Right Back"
 msgstr "Be Right Back"
 
-#: src/protocols/msn/msn.c:542 src/protocols/msn/state.c:31
-#: src/protocols/novell/novell.c:2810 src/protocols/novell/novell.c:2925
-#: src/protocols/novell/novell.c:2979 src/protocols/silc/buddy.c:1388
-#: src/protocols/silc/silc.c:54 src/protocols/yahoo/yahoo.c:2619
-#: src/protocols/yahoo/yahoo.c:3122
+#: src/protocols/msn/msn.c:550 src/protocols/msn/state.c:31
+#: src/protocols/novell/novell.c:2814 src/protocols/novell/novell.c:2929
+#: src/protocols/novell/novell.c:2983 src/protocols/silc/buddy.c:1388
+#: src/protocols/silc/silc.c:54 src/protocols/yahoo/yahoo.c:2633
+#: src/protocols/yahoo/yahoo.c:3142
 msgid "Busy"
 msgstr "Busy"
 
-#: src/protocols/msn/msn.c:546 src/protocols/msn/state.c:35
-#: src/protocols/yahoo/yahoo.c:2627 src/protocols/yahoo/yahoo.c:3134
+#: src/protocols/msn/msn.c:554 src/protocols/msn/state.c:35
+#: src/protocols/yahoo/yahoo.c:2641 src/protocols/yahoo/yahoo.c:3154
 msgid "On The Phone"
 msgstr "On The Phone"
 
-#: src/protocols/msn/msn.c:550 src/protocols/msn/state.c:36
-#: src/protocols/yahoo/yahoo.c:2631 src/protocols/yahoo/yahoo.c:3140
+#: src/protocols/msn/msn.c:558 src/protocols/msn/state.c:36
+#: src/protocols/yahoo/yahoo.c:2645 src/protocols/yahoo/yahoo.c:3160
 msgid "Out To Lunch"
 msgstr "Out To Lunch"
 
-#: src/protocols/msn/msn.c:554 src/protocols/zephyr/zephyr.c:2220
+#: src/protocols/msn/msn.c:562 src/protocols/zephyr/zephyr.c:2222
 msgid "Hidden"
 msgstr "Hidden"
 
-#: src/protocols/msn/msn.c:566
+#: src/protocols/msn/msn.c:574
 msgid "Set Friendly Name"
 msgstr "Set Friendly Name"
 
-#: src/protocols/msn/msn.c:571
+#: src/protocols/msn/msn.c:579
 msgid "Set Home Phone Number"
 msgstr "Set Home Phone Number"
 
-#: src/protocols/msn/msn.c:575
+#: src/protocols/msn/msn.c:583
 msgid "Set Work Phone Number"
 msgstr "Set Work Phone Number"
 
-#: src/protocols/msn/msn.c:579
+#: src/protocols/msn/msn.c:587
 msgid "Set Mobile Phone Number"
 msgstr "Set Mobile Phone Number"
 
-#: src/protocols/msn/msn.c:585
+#: src/protocols/msn/msn.c:593
 msgid "Enable/Disable Mobile Devices"
 msgstr "Enable/Disable Mobile Devices"
 
-#: src/protocols/msn/msn.c:590
+#: src/protocols/msn/msn.c:598
 msgid "Allow/Disallow Mobile Pages"
 msgstr "Allow/Disallow Mobile Pages"
 
-#: src/protocols/msn/msn.c:613
+#: src/protocols/msn/msn.c:621
 msgid "Send to Mobile"
 msgstr "Send to Mobile"
 
-#: src/protocols/msn/msn.c:623
+#: src/protocols/msn/msn.c:631
 msgid "Initiate Chat"
 msgstr "Initiate Chat"
 
-#: src/protocols/msn/msn.c:659
+#: src/protocols/msn/msn.c:667
 msgid ""
 "SSL support is needed for MSN. Please install a supported SSL library. See "
 "http://gaim.sf.net/faq-ssl.php for more information."
@@ -6668,91 +6773,91 @@
 "SSL support is needed for MSN. Please install a supported SSL library. See "
 "http://gaim.sf.net/faq-ssl.php for more information."
 
-#: src/protocols/msn/msn.c:1304 src/protocols/yahoo/yahoo_profile.c:659
-#: src/protocols/zephyr/zephyr.c:712 src/protocols/zephyr/zephyr.c:1126
+#: src/protocols/msn/msn.c:1341 src/protocols/yahoo/yahoo_profile.c:659
+#: src/protocols/zephyr/zephyr.c:712 src/protocols/zephyr/zephyr.c:1127
 #, 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:1311 src/protocols/msn/msn.c:1667
+#: src/protocols/msn/msn.c:1348 src/protocols/msn/msn.c:1704
 #: src/protocols/yahoo/yahoo_profile.c:1170 src/util.c:782
 #, c-format
 msgid "<b>%s:</b> "
 msgstr "<b>%s:</b> "
 
-#: src/protocols/msn/msn.c:1397
+#: src/protocols/msn/msn.c:1434
 msgid "MSN Profile"
 msgstr "MSN Profile"
 
-#: src/protocols/msn/msn.c:1402 src/protocols/msn/msn.c:1654
+#: src/protocols/msn/msn.c:1439 src/protocols/msn/msn.c:1691
 #: src/protocols/yahoo/yahoo_profile.c:763
 msgid "Error retrieving profile"
 msgstr "Error retrieving profile"
 
 #. Age
-#: src/protocols/msn/msn.c:1473 src/protocols/oscar/oscar.c:5074
+#: src/protocols/msn/msn.c:1510 src/protocols/oscar/oscar.c:5078
 #: src/protocols/trepia/trepia.c:286 src/protocols/trepia/trepia.c:405
 #: src/protocols/yahoo/yahoo_profile.c:1017
 msgid "Age"
 msgstr "Age"
 
 #. Gender
-#: src/protocols/msn/msn.c:1480 src/protocols/oscar/oscar.c:5061
+#: src/protocols/msn/msn.c:1517 src/protocols/oscar/oscar.c:5065
 #: src/protocols/trepia/trepia.c:280 src/protocols/trepia/trepia.c:407
 #: src/protocols/yahoo/yahoo_profile.c:1027
 msgid "Gender"
 msgstr "Gender"
 
-#: src/protocols/msn/msn.c:1489 src/protocols/yahoo/yahoo_profile.c:1022
+#: src/protocols/msn/msn.c:1526 src/protocols/yahoo/yahoo_profile.c:1022
 msgid "Marital Status"
 msgstr "Marital Status"
 
-#: src/protocols/msn/msn.c:1496 src/protocols/novell/novell.c:1452
+#: src/protocols/msn/msn.c:1533 src/protocols/novell/novell.c:1454
 #: src/protocols/yahoo/yahoo_profile.c:1012
 msgid "Location"
 msgstr "Location"
 
-#: src/protocols/msn/msn.c:1504 src/protocols/yahoo/yahoo_profile.c:1032
+#: src/protocols/msn/msn.c:1541 src/protocols/yahoo/yahoo_profile.c:1032
 msgid "Occupation"
 msgstr "Occupation"
 
-#: src/protocols/msn/msn.c:1521 src/protocols/msn/msn.c:1527
-#: src/protocols/msn/msn.c:1534 src/protocols/msn/msn.c:1542
-#: src/protocols/msn/msn.c:1549
-msgid "A Little About Me"
-msgstr "A Little About Me"
-
 #: src/protocols/msn/msn.c:1558 src/protocols/msn/msn.c:1564
-#: src/protocols/msn/msn.c:1571 src/protocols/msn/msn.c:1578
+#: src/protocols/msn/msn.c:1571 src/protocols/msn/msn.c:1579
+#: src/protocols/msn/msn.c:1586
+msgid "A Little About Me"
+msgstr "A Little About Me"
+
+#: src/protocols/msn/msn.c:1595 src/protocols/msn/msn.c:1601
+#: src/protocols/msn/msn.c:1608 src/protocols/msn/msn.c:1615
 msgid "Favorite Things"
 msgstr "Favourite Things"
 
-#: src/protocols/msn/msn.c:1587 src/protocols/msn/msn.c:1593
-#: src/protocols/msn/msn.c:1600
+#: src/protocols/msn/msn.c:1624 src/protocols/msn/msn.c:1630
+#: src/protocols/msn/msn.c:1637
 msgid "Hobbies and Interests"
 msgstr "Hobbies and Interests"
 
-#: src/protocols/msn/msn.c:1609 src/protocols/msn/msn.c:1615
+#: src/protocols/msn/msn.c:1646 src/protocols/msn/msn.c:1652
 #: src/protocols/yahoo/yahoo_profile.c:1074
 msgid "Favorite Quote"
 msgstr "Favuorite Quote"
 
-#: src/protocols/msn/msn.c:1623 src/protocols/yahoo/yahoo_profile.c:1125
+#: src/protocols/msn/msn.c:1660 src/protocols/yahoo/yahoo_profile.c:1125
 msgid "Last Updated"
 msgstr "Last Updated"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1634 src/protocols/silc/ops.c:844
+#: src/protocols/msn/msn.c:1671 src/protocols/silc/ops.c:846
 #: src/protocols/trepia/trepia.c:290 src/protocols/trepia/trepia.c:420
 msgid "Homepage"
 msgstr "Homepage"
 
-#: src/protocols/msn/msn.c:1656
+#: src/protocols/msn/msn.c:1693
 msgid "The user has not created a public profile."
 msgstr "The user has not created a public profile."
 
-#: src/protocols/msn/msn.c:1657
+#: src/protocols/msn/msn.c:1694
 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 "
@@ -6763,7 +6868,7 @@
 "public profile."
 
 #. This should never happen
-#: src/protocols/msn/msn.c:1661
+#: src/protocols/msn/msn.c:1698
 msgid ""
 "Gaim could not find any information in the user's profile. The user most "
 "likely does not exist."
@@ -6771,15 +6876,15 @@
 "Gaim could not find any information in the user's profile. The user most "
 "likely does not exist."
 
-#: src/protocols/msn/msn.c:1667 src/protocols/yahoo/yahoo_profile.c:1170
+#: src/protocols/msn/msn.c:1704 src/protocols/yahoo/yahoo_profile.c:1170
 msgid "Profile URL"
 msgstr "Profile URL"
 
-#: src/protocols/msn/msn.c:1808
+#: src/protocols/msn/msn.c:1845
 msgid "Display conversation closed notices"
 msgstr "Display conversation closed notices"
 
-#: src/protocols/msn/msn.c:1813
+#: src/protocols/msn/msn.c:1850
 msgid "Display timeout notices"
 msgstr "Display timeout notices"
 
@@ -6793,15 +6898,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/msn/msn.c:1900 src/protocols/msn/msn.c:1902
+#: src/protocols/msn/msn.c:1937 src/protocols/msn/msn.c:1939
 msgid "MSN Protocol Plugin"
 msgstr "MSN Protocol Plugin"
 
-#: src/protocols/msn/msn.c:1921 src/protocols/trepia/trepia.c:1298
+#: src/protocols/msn/msn.c:1958 src/protocols/trepia/trepia.c:1298
 msgid "Login server"
 msgstr "Login server"
 
-#: src/protocols/msn/msn.c:1930
+#: src/protocols/msn/msn.c:1967
 msgid "Use HTTP Method"
 msgstr "Use HTTP Method"
 
@@ -6822,11 +6927,20 @@
 msgstr "Retrieving buddy list"
 
 #: src/protocols/msn/notification.c:144 src/protocols/msn/notification.c:173
-#: src/protocols/oscar/oscar.c:2481
+#: src/protocols/oscar/oscar.c:2483
 msgid "Password sent"
 msgstr "Password sent"
 
-#: src/protocols/msn/notification.c:1095
+#: src/protocols/msn/notification.c:724
+#, c-format
+msgid ""
+"Your MSN buddy list for %s is temporarily unavailable. Please wait and try "
+"again."
+msgstr ""
+"Your MSN buddy list for %s is temporarily unavailable. Please wait and try "
+"again."
+
+#: src/protocols/msn/notification.c:1100
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -6857,7 +6971,7 @@
 "After the maintenance has been completed, you will be able to successfully "
 "sign in."
 
-#: src/protocols/msn/notification.c:1160
+#: src/protocols/msn/notification.c:1165
 msgid "Syncing with server"
 msgstr "Syncing with server"
 
@@ -6881,12 +6995,7 @@
 msgid "Unknown error from %s server"
 msgstr "Unknown error from %s server"
 
-#: src/protocols/msn/servconn.c:72
-#, c-format
-msgid "MSN error for account %s"
-msgstr "MSN error for account %s"
-
-#: src/protocols/msn/servconn.c:346
+#: src/protocols/msn/servconn.c:351
 msgid "Received HTTP error. Please report this."
 msgstr "Received HTTP error. Please report this."
 
@@ -6894,57 +7003,82 @@
 msgid "Away From Computer"
 msgstr "Away From Computer"
 
-#: src/protocols/msn/switchboard.c:172
+#: src/protocols/msn/switchboard.c:197
 msgid "The conversation has become inactive and timed out."
 msgstr "The conversation has become inactive and timed out."
 
-#: src/protocols/msn/switchboard.c:180
+#: src/protocols/msn/switchboard.c:216
 #, c-format
 msgid "%s has closed the conversation window."
 msgstr "%s has closed the conversation window."
 
-#: src/protocols/msn/userlist.c:85
+#: src/protocols/msn/switchboard.c:482
+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:485
+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:488
+msgid "Message could not be sent because a connection error occured"
+msgstr "Message could not be sent because a connection error occurred"
+
+#: src/protocols/msn/switchboard.c:491
+msgid "Message could not be sent for an unkwnown reason"
+msgstr "Message could not be sent for an unknown reason"
+
+#: src/protocols/msn/switchboard.c:496
+#, c-format
+msgid ""
+"%s:\n"
+"%s"
+msgstr ""
+"%s:\n"
+"%s"
+
+#: src/protocols/msn/userlist.c:86
 #, 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:93
+#: src/protocols/msn/userlist.c:95
 #, c-format
 msgid "The user %s wants to add %s to his or her buddy list."
 msgstr "The user %s wants to add %s to his or her buddy list."
 
-#: src/protocols/napster/napster.c:242
+#: src/protocols/napster/napster.c:241
 msgid "Unable to read header from server"
 msgstr "Unable to read header from server"
 
-#: src/protocols/napster/napster.c:256
+#: src/protocols/napster/napster.c:255
 #, c-format
 msgid "Unable to read message from server: %s.  Command is %hd, length is %hd."
 msgstr ""
 "Unable to read message from server: %s.  Command is %hd, length is %hd."
 
-#: src/protocols/napster/napster.c:319
+#: src/protocols/napster/napster.c:318
 #, c-format
 msgid "users: %s, files: %s, size: %sGB"
 msgstr "users: %s, files: %s, size: %sGB"
 
 #. MSG_SERVER_HOTLIST_ERROR
-#: src/protocols/napster/napster.c:330
+#: src/protocols/napster/napster.c:329
 #, c-format
 msgid "Unable to add \"%s\" to your Napster hotlist"
 msgstr "Unable to add \"%s\" to your Napster hotlist"
 
-#: src/protocols/napster/napster.c:338
+#: src/protocols/napster/napster.c:337
 msgid "You were disconnected from the server."
 msgstr "You were disconnected from the server."
 
 #. MSG_CLIENT_WHOIS
-#: src/protocols/napster/napster.c:396
+#: src/protocols/napster/napster.c:395
 #, c-format
 msgid "%s requested your information"
 msgstr "%s requested your information"
 
-#: src/protocols/napster/napster.c:434
+#: src/protocols/napster/napster.c:433
 msgid ""
 "You were disconnected from the server, because you logged on from a "
 "different location"
@@ -6953,12 +7087,12 @@
 "different location"
 
 #. MSG_CLIENT_PING
-#: src/protocols/napster/napster.c:440
+#: src/protocols/napster/napster.c:439
 #, c-format
 msgid "%s requested a PING"
 msgstr "%s requested a PING"
 
-#: src/protocols/napster/napster.c:554 src/protocols/toc/toc.c:1275
+#: src/protocols/napster/napster.c:573 src/protocols/toc/toc.c:1275
 msgid "_Group:"
 msgstr "_Group:"
 
@@ -6972,7 +7106,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/napster/napster.c:652 src/protocols/napster/napster.c:654
+#: src/protocols/napster/napster.c:671 src/protocols/napster/napster.c:673
 msgid "NAPSTER Protocol Plugin"
 msgstr "NAPSTER Protocol Plugin"
 
@@ -7110,38 +7244,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 "
@@ -7150,7 +7284,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 "
@@ -7159,67 +7293,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:1627
+#: src/protocols/novell/novell.c:927 src/protocols/novell/novell.c:1629
 #, 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:1666
+#: src/protocols/novell/novell.c:1110 src/protocols/novell/novell.c:1668
 msgid "Error communicating with server. Closing connection."
 msgstr "Error communicating with server. Closing connection."
 
-#: src/protocols/novell/novell.c:1450
+#: src/protocols/novell/novell.c:1452
 msgid "Telephone Number"
 msgstr "Telephone Number"
 
-#: src/protocols/novell/novell.c:1454
-msgid "Department"
-msgstr "Department"
-
 #: src/protocols/novell/novell.c:1456
+msgid "Department"
+msgstr "Department"
+
+#: src/protocols/novell/novell.c:1458
 msgid "Personal Title"
 msgstr "Personal Title"
 
-#: src/protocols/novell/novell.c:1460
+#: src/protocols/novell/novell.c:1462
 msgid "Mailstop"
 msgstr "Mailstop"
 
-#: src/protocols/novell/novell.c:1462 src/protocols/oscar/oscar.c:5047
-#: src/protocols/oscar/oscar.c:5054
+#: src/protocols/novell/novell.c:1464 src/protocols/oscar/oscar.c:5051
+#: src/protocols/oscar/oscar.c:5058
 msgid "Email Address"
 msgstr "Email Address"
 
-#: src/protocols/novell/novell.c:1478
+#: src/protocols/novell/novell.c:1480
 msgid "User ID"
 msgstr "User ID"
 
@@ -7230,46 +7364,46 @@
 #. tag, value);
 #. }
 #.
-#: src/protocols/novell/novell.c:1492
+#: src/protocols/novell/novell.c:1494
 msgid "Full name"
 msgstr "Full name"
 
-#: src/protocols/novell/novell.c:1513
+#: src/protocols/novell/novell.c:1515
 msgid "User Properties"
 msgstr "User Properties"
 
-#: src/protocols/novell/novell.c:1617
+#: src/protocols/novell/novell.c:1619
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "GroupWise Conference %d"
 
-#: src/protocols/novell/novell.c:1642
+#: src/protocols/novell/novell.c:1644
 msgid "Unable to make SSL connection to server."
 msgstr "Unable to make SSL connection to server."
 
-#: src/protocols/novell/novell.c:1672
+#: src/protocols/novell/novell.c:1674
 #, c-format
 msgid "Error processing event or response (%s)."
 msgstr "Error processing event or response (%s)."
 
-#: src/protocols/novell/novell.c:1706
+#: src/protocols/novell/novell.c:1708
 msgid "Authenticating..."
 msgstr "Authenticating..."
 
-#: src/protocols/novell/novell.c:1721
+#: src/protocols/novell/novell.c:1723
 msgid "Waiting for response..."
 msgstr "Waiting for response..."
 
-#: src/protocols/novell/novell.c:1856
+#: src/protocols/novell/novell.c:1858
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "%s has been invited to this conversation."
 
-#: src/protocols/novell/novell.c:1883
+#: src/protocols/novell/novell.c:1885
 msgid "Invitation to Conversation"
 msgstr "Invitation to Conversation"
 
-#: src/protocols/novell/novell.c:1884
+#: src/protocols/novell/novell.c:1886
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -7280,22 +7414,22 @@
 "\n"
 "Sent: %s"
 
-#: src/protocols/novell/novell.c:1886
+#: 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:1992
+#: src/protocols/novell/novell.c:1994
 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:2046
+#: src/protocols/novell/novell.c:2050
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr ""
 "%s appears to be offline and did not receive the message that you just sent."
 
-#: src/protocols/novell/novell.c:2144
+#: src/protocols/novell/novell.c:2148
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
@@ -7303,19 +7437,19 @@
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
 
-#: src/protocols/novell/novell.c:2166
+#: src/protocols/novell/novell.c:2170
 msgid "Error. SSL support is not installed."
 msgstr "Error. SSL support is not installed."
 
-#: src/protocols/novell/novell.c:2470
+#: src/protocols/novell/novell.c:2474
 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:2926 src/protocols/novell/novell.c:2982
+#: src/protocols/novell/novell.c:2930 src/protocols/novell/novell.c:2986
 msgid "Appear Offline"
 msgstr "Appear Offline"
 
-#: src/protocols/novell/novell.c:3376
+#: src/protocols/novell/novell.c:3380
 msgid "Initiate _Chat"
 msgstr "Initiate _Chat"
 
@@ -7329,15 +7463,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/novell/novell.c:3475 src/protocols/novell/novell.c:3477
+#: src/protocols/novell/novell.c:3479 src/protocols/novell/novell.c:3481
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GroupWise Messenger Protocol Plugin"
 
-#: src/protocols/novell/novell.c:3496
+#: src/protocols/novell/novell.c:3500
 msgid "Server address"
 msgstr "Server address"
 
-#: src/protocols/novell/novell.c:3500
+#: src/protocols/novell/novell.c:3504
 msgid "Server port"
 msgstr "Server port"
 
@@ -7453,12 +7587,12 @@
 msgid "AIM Direct IM"
 msgstr "AIM Direct IM"
 
-#: src/protocols/oscar/oscar.c:592 src/protocols/silc/silc.c:656
+#: src/protocols/oscar/oscar.c:592 src/protocols/silc/silc.c:660
 #: src/protocols/silc/util.c:506
 msgid "Chat"
 msgstr "Chat"
 
-#: src/protocols/oscar/oscar.c:595 src/protocols/oscar/oscar.c:7010
+#: src/protocols/oscar/oscar.c:595 src/protocols/oscar/oscar.c:7017
 msgid "Get File"
 msgstr "Get File"
 
@@ -7530,15 +7664,15 @@
 msgid "Camera"
 msgstr "Camera"
 
-#: src/protocols/oscar/oscar.c:669 src/protocols/oscar/oscar.c:6893
+#: src/protocols/oscar/oscar.c:669 src/protocols/oscar/oscar.c:6900
 msgid "Free For Chat"
 msgstr "Free For Chat"
 
-#: src/protocols/oscar/oscar.c:673 src/protocols/oscar/oscar.c:6908
+#: src/protocols/oscar/oscar.c:673 src/protocols/oscar/oscar.c:6915
 msgid "Not Available"
 msgstr "Not Available"
 
-#: src/protocols/oscar/oscar.c:675 src/protocols/oscar/oscar.c:6898
+#: src/protocols/oscar/oscar.c:675 src/protocols/oscar/oscar.c:6905
 msgid "Occupied"
 msgstr "Occupied"
 
@@ -7564,35 +7698,35 @@
 msgid "Direct IM with %s failed"
 msgstr "Direct IM with %s failed"
 
-#: src/protocols/oscar/oscar.c:908
+#: src/protocols/oscar/oscar.c:909
 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:986 src/protocols/oscar/oscar.c:1117
 #, 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:1067
 #, 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:1483
+#: src/protocols/oscar/oscar.c:1485
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "Asking %s to connect to us at %s:%hu for Direct IM."
 
-#: src/protocols/oscar/oscar.c:1488
+#: src/protocols/oscar/oscar.c:1490
 msgid "Unable to open Direct IM"
 msgstr "Unable to open Direct IM"
 
-#: src/protocols/oscar/oscar.c:1523
+#: src/protocols/oscar/oscar.c:1525
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "You have selected to open a Direct IM connection with %s."
 
-#: src/protocols/oscar/oscar.c:1527
+#: src/protocols/oscar/oscar.c:1529
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
@@ -7600,24 +7734,24 @@
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
 
-#: src/protocols/oscar/oscar.c:1531 src/protocols/oscar/oscar.c:3485
+#: src/protocols/oscar/oscar.c:1533 src/protocols/oscar/oscar.c:3490
 msgid "Connect"
 msgstr "Connect"
 
-#: src/protocols/oscar/oscar.c:1598 src/protocols/toc/toc.c:881
+#: src/protocols/oscar/oscar.c:1600 src/protocols/toc/toc.c:881
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "You have been disconnected from chat room %s."
 
-#: src/protocols/oscar/oscar.c:1617
+#: src/protocols/oscar/oscar.c:1619
 msgid "Chat is currently unavailable"
 msgstr "Chat is currently unavailable"
 
-#: src/protocols/oscar/oscar.c:1698
+#: src/protocols/oscar/oscar.c:1700
 msgid "Screen name sent"
 msgstr "Screen name sent"
 
-#: src/protocols/oscar/oscar.c:1712
+#: src/protocols/oscar/oscar.c:1714
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -7628,46 +7762,46 @@
 "invalid.  Screen names must either start with a letter and contain only "
 "letters, numbers and spaces, or contain only numbers."
 
-#: src/protocols/oscar/oscar.c:1743
+#: src/protocols/oscar/oscar.c:1745
 msgid "Unable to login to AIM"
 msgstr "Unable to login to AIM"
 
-#: src/protocols/oscar/oscar.c:1846 src/protocols/oscar/oscar.c:2284
+#: src/protocols/oscar/oscar.c:1848 src/protocols/oscar/oscar.c:2286
 msgid "Could Not Connect"
 msgstr "Could Not Connect"
 
-#: src/protocols/oscar/oscar.c:1854
+#: src/protocols/oscar/oscar.c:1856
 msgid "Connection established, cookie sent"
 msgstr "Connection established, cookie sent"
 
-#: src/protocols/oscar/oscar.c:1967 src/protocols/yahoo/yahoo_filexfer.c:180
+#: src/protocols/oscar/oscar.c:1969 src/protocols/yahoo/yahoo_filexfer.c:180
 #: src/protocols/yahoo/yahoo_filexfer.c:189
 #: src/protocols/yahoo/yahoo_filexfer.c:199
 msgid "Unable to establish file descriptor."
 msgstr "Unable to establish file descriptor."
 
-#: src/protocols/oscar/oscar.c:1972
+#: src/protocols/oscar/oscar.c:1974
 msgid "Unable to create new connection."
 msgstr "Unable to create new connection."
 
-#: src/protocols/oscar/oscar.c:2044
+#: src/protocols/oscar/oscar.c:2046
 msgid "Unable to establish listener socket."
 msgstr "Unable to establish listener socket."
 
-#: src/protocols/oscar/oscar.c:2169 src/protocols/toc/toc.c:542
+#: src/protocols/oscar/oscar.c:2171 src/protocols/toc/toc.c:542
 msgid "Incorrect nickname or password."
 msgstr "Incorrect nickname or password."
 
-#: src/protocols/oscar/oscar.c:2174
+#: src/protocols/oscar/oscar.c:2176
 msgid "Your account is currently suspended."
 msgstr "Your account is currently suspended."
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:2178
+#: src/protocols/oscar/oscar.c:2180
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "The AOL Instant Messenger service is temporarily unavailable."
 
-#: src/protocols/oscar/oscar.c:2183
+#: src/protocols/oscar/oscar.c:2185
 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."
@@ -7675,21 +7809,21 @@
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
 
-#: src/protocols/oscar/oscar.c:2188
+#: src/protocols/oscar/oscar.c:2190
 #, 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:2219
+#: src/protocols/oscar/oscar.c:2221
 msgid "Internal Error"
 msgstr "Internal Error"
 
-#: src/protocols/oscar/oscar.c:2291
+#: src/protocols/oscar/oscar.c:2293
 msgid "Received authorization"
 msgstr "Received authorization"
 
-#: src/protocols/oscar/oscar.c:2327 src/protocols/oscar/oscar.c:2357
-#: src/protocols/oscar/oscar.c:2446
+#: src/protocols/oscar/oscar.c:2329 src/protocols/oscar/oscar.c:2359
+#: src/protocols/oscar/oscar.c:2448
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -7698,20 +7832,20 @@
 "You may be disconnected shortly.  You may want to use TOC until this is "
 "fixed.  Check %s for updates."
 
-#: src/protocols/oscar/oscar.c:2330 src/protocols/oscar/oscar.c:2360
+#: src/protocols/oscar/oscar.c:2332 src/protocols/oscar/oscar.c:2362
 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:2449
+#: src/protocols/oscar/oscar.c:2451
 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:3476
+#: src/protocols/oscar/oscar.c:3481
 #, 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:3479
+#: src/protocols/oscar/oscar.c:3484
 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 "
@@ -7721,19 +7855,19 @@
 "for IM Images.  Because your IP address will be revealed, this may be "
 "considered a privacy risk."
 
-#: src/protocols/oscar/oscar.c:3518
+#: src/protocols/oscar/oscar.c:3523
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Please authorize me so I can add you to my buddy list."
 
-#: src/protocols/oscar/oscar.c:3526
+#: src/protocols/oscar/oscar.c:3531
 msgid "Authorization Request Message:"
 msgstr "Authorization Request Message:"
 
-#: src/protocols/oscar/oscar.c:3527
+#: src/protocols/oscar/oscar.c:3532
 msgid "Please authorize me!"
 msgstr "Please authorize me!"
 
-#: src/protocols/oscar/oscar.c:3557
+#: src/protocols/oscar/oscar.c:3562
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
@@ -7742,22 +7876,22 @@
 "The user %s requires authorization before being added to a buddy list.  Do "
 "you want to send an authorization request?"
 
-#: src/protocols/oscar/oscar.c:3562 src/protocols/oscar/oscar.c:3564
+#: src/protocols/oscar/oscar.c:3567 src/protocols/oscar/oscar.c:3569
 msgid "Request Authorization"
 msgstr "Request Authorization"
 
-#: src/protocols/oscar/oscar.c:3612 src/protocols/oscar/oscar.c:3614
-#: src/protocols/oscar/oscar.c:3621 src/protocols/oscar/oscar.c:3718
-#: src/protocols/oscar/oscar.c:3738 src/protocols/oscar/oscar.c:6289
-#: src/protocols/oscar/oscar.c:6335
+#: src/protocols/oscar/oscar.c:3617 src/protocols/oscar/oscar.c:3619
+#: src/protocols/oscar/oscar.c:3626 src/protocols/oscar/oscar.c:3723
+#: src/protocols/oscar/oscar.c:3743 src/protocols/oscar/oscar.c:6292
+#: src/protocols/oscar/oscar.c:6338
 msgid "No reason given."
 msgstr "No reason given."
 
-#: src/protocols/oscar/oscar.c:3620
+#: src/protocols/oscar/oscar.c:3625
 msgid "Authorization Denied Message:"
 msgstr "Authorization Denied Message:"
 
-#: src/protocols/oscar/oscar.c:3718
+#: src/protocols/oscar/oscar.c:3723
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -7766,11 +7900,11 @@
 "The user %u wants to add you to their buddy list for the following reason:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3726 src/protocols/oscar/oscar.c:6295
+#: src/protocols/oscar/oscar.c:3731 src/protocols/oscar/oscar.c:6298
 msgid "Authorization Request"
 msgstr "Authorization Request"
 
-#: src/protocols/oscar/oscar.c:3738
+#: src/protocols/oscar/oscar.c:3743
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7781,17 +7915,17 @@
 "following reason:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3739
+#: src/protocols/oscar/oscar.c:3744
 msgid "ICQ authorization denied."
 msgstr "ICQ authorization denied."
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:3746
+#: src/protocols/oscar/oscar.c:3751
 #, 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:3754
+#: src/protocols/oscar/oscar.c:3759
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -7804,7 +7938,7 @@
 "From: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3762
+#: src/protocols/oscar/oscar.c:3767
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -7817,7 +7951,7 @@
 "From: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3770
+#: src/protocols/oscar/oscar.c:3775
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -7830,34 +7964,34 @@
 "Message is:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3791
+#: src/protocols/oscar/oscar.c:3796
 #, 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:3797
+#: src/protocols/oscar/oscar.c:3802
 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:3801
+#: src/protocols/oscar/oscar.c:3806
 msgid "Decline"
 msgstr "Decline"
 
-#: src/protocols/oscar/oscar.c:3885
+#: src/protocols/oscar/oscar.c:3890
 #, 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:3894
+#: src/protocols/oscar/oscar.c:3899
 #, 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:3903
+#: src/protocols/oscar/oscar.c:3908
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -7868,86 +8002,86 @@
 msgstr[1] ""
 "You missed %hu messages from %s because the rate limit has been exceeded."
 
-#: src/protocols/oscar/oscar.c:3912
+#: src/protocols/oscar/oscar.c:3917
 #, 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:3921
+#: src/protocols/oscar/oscar.c:3926
 #, 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:3930
+#: src/protocols/oscar/oscar.c:3935
 #, 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:3984 src/protocols/oscar/oscar.c:4216
-#: src/protocols/silc/ops.c:1085 src/protocols/silc/ops.c:1147
+#: src/protocols/oscar/oscar.c:3989 src/protocols/oscar/oscar.c:4222
+#: src/protocols/silc/ops.c:1087 src/protocols/silc/ops.c:1149
 #, c-format
 msgid "Info for %s"
 msgstr "Info for %s"
 
-#: src/protocols/oscar/oscar.c:4050
+#: src/protocols/oscar/oscar.c:4055
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC threw error: %s\n"
 
-#: src/protocols/oscar/oscar.c:4051
+#: src/protocols/oscar/oscar.c:4056
 msgid "Unknown error"
 msgstr "Unknown error"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:4086
+#: src/protocols/oscar/oscar.c:4092
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Unable to send message: %s"
 
-#: src/protocols/oscar/oscar.c:4086 src/protocols/oscar/oscar.c:4091
-#: src/protocols/oscar/oscar.c:4149 src/protocols/oscar/oscar.c:4153
+#: src/protocols/oscar/oscar.c:4092 src/protocols/oscar/oscar.c:4097
+#: src/protocols/oscar/oscar.c:4155 src/protocols/oscar/oscar.c:4159
 msgid "Unknown reason."
 msgstr "Unknown reason."
 
-#: src/protocols/oscar/oscar.c:4089
+#: src/protocols/oscar/oscar.c:4095
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Unable to send message to %s:"
 
-#: src/protocols/oscar/oscar.c:4149
+#: src/protocols/oscar/oscar.c:4155
 #, c-format
 msgid "User information not available: %s"
 msgstr "User information not available: %s"
 
-#: src/protocols/oscar/oscar.c:4152
+#: src/protocols/oscar/oscar.c:4158
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "User information for %s unavailable:"
 
-#: src/protocols/oscar/oscar.c:4174
+#: src/protocols/oscar/oscar.c:4180
 msgid "Warning Level"
 msgstr "Warning Level"
 
-#: src/protocols/oscar/oscar.c:4178
+#: src/protocols/oscar/oscar.c:4184
 msgid "Online Since"
 msgstr "Online Since"
 
-#: src/protocols/oscar/oscar.c:4183 src/protocols/yahoo/yahoo_profile.c:1120
+#: src/protocols/oscar/oscar.c:4189 src/protocols/yahoo/yahoo_profile.c:1120
 msgid "Member Since"
 msgstr "Member Since"
 
-#: src/protocols/oscar/oscar.c:4267
+#: src/protocols/oscar/oscar.c:4273
 msgid "Your AIM connection may be lost."
 msgstr "Your AIM connection may be lost."
 
 #. The conversion failed!
-#: src/protocols/oscar/oscar.c:4453
+#: src/protocols/oscar/oscar.c:4459
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -7955,11 +8089,11 @@
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 
-#: src/protocols/oscar/oscar.c:4673
+#: src/protocols/oscar/oscar.c:4679
 msgid "Rate limiting error."
 msgstr "Rate limiting error."
 
-#: src/protocols/oscar/oscar.c:4674
+#: src/protocols/oscar/oscar.c:4680
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -7967,7 +8101,7 @@
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
 
-#: src/protocols/oscar/oscar.c:4743
+#: src/protocols/oscar/oscar.c:4747
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
@@ -7975,105 +8109,105 @@
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
 
-#: src/protocols/oscar/oscar.c:4745
+#: src/protocols/oscar/oscar.c:4749
 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:4776
+#: src/protocols/oscar/oscar.c:4780
 msgid "Finalizing connection"
 msgstr "Finalizing connection"
 
-#: src/protocols/oscar/oscar.c:5059 src/protocols/silc/util.c:538
+#: src/protocols/oscar/oscar.c:5063 src/protocols/silc/util.c:538
 msgid "Mobile Phone"
 msgstr "Mobile Phone"
 
-#: src/protocols/oscar/oscar.c:5061 src/protocols/trepia/trepia.c:282
+#: src/protocols/oscar/oscar.c:5065 src/protocols/trepia/trepia.c:282
 #: src/protocols/trepia/trepia.c:408
 msgid "Female"
 msgstr "Female"
 
-#: src/protocols/oscar/oscar.c:5061 src/protocols/trepia/trepia.c:281
+#: src/protocols/oscar/oscar.c:5065 src/protocols/trepia/trepia.c:281
 #: src/protocols/trepia/trepia.c:408
 msgid "Male"
 msgstr "Male"
 
-#: src/protocols/oscar/oscar.c:5077
+#: src/protocols/oscar/oscar.c:5081
 msgid "Personal Web Page"
 msgstr "Personal Web Page"
 
-#: src/protocols/oscar/oscar.c:5081
+#: src/protocols/oscar/oscar.c:5085
 msgid "Additional Information"
 msgstr "Additional Information"
 
-#: src/protocols/oscar/oscar.c:5086
+#: src/protocols/oscar/oscar.c:5090
 msgid "Home Address"
 msgstr "Home Address"
 
-#: src/protocols/oscar/oscar.c:5090 src/protocols/oscar/oscar.c:5098
+#: src/protocols/oscar/oscar.c:5094 src/protocols/oscar/oscar.c:5102
 msgid "Zip Code"
 msgstr "Postal Code"
 
-#: src/protocols/oscar/oscar.c:5094
+#: src/protocols/oscar/oscar.c:5098
 msgid "Work Address"
 msgstr "Work Address"
 
-#: src/protocols/oscar/oscar.c:5102
+#: src/protocols/oscar/oscar.c:5106
 msgid "Work Information"
 msgstr "Work Information"
 
-#: src/protocols/oscar/oscar.c:5103
+#: src/protocols/oscar/oscar.c:5107
 msgid "Company"
 msgstr "Company"
 
-#: src/protocols/oscar/oscar.c:5104
+#: src/protocols/oscar/oscar.c:5108
 msgid "Division"
 msgstr "Division"
 
-#: src/protocols/oscar/oscar.c:5105
+#: src/protocols/oscar/oscar.c:5109
 msgid "Position"
 msgstr "Position"
 
-#: src/protocols/oscar/oscar.c:5107
+#: src/protocols/oscar/oscar.c:5111
 msgid "Web Page"
 msgstr "Web Page"
 
-#: src/protocols/oscar/oscar.c:5117
+#: src/protocols/oscar/oscar.c:5121
 #, c-format
 msgid "ICQ Info for %s"
 msgstr "ICQ Info for %s"
 
-#: src/protocols/oscar/oscar.c:5166
+#: src/protocols/oscar/oscar.c:5170
 msgid "Pop-Up Message"
 msgstr "Pop-Up Message"
 
-#: src/protocols/oscar/oscar.c:5187
+#: src/protocols/oscar/oscar.c:5191
 #, 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:5191
+#: src/protocols/oscar/oscar.c:5195
 msgid "Search Results"
 msgstr "Search Results"
 
-#: src/protocols/oscar/oscar.c:5208
+#: src/protocols/oscar/oscar.c:5212
 #, c-format
 msgid "No results found for email address %s"
 msgstr "No results found for email address %s"
 
-#: src/protocols/oscar/oscar.c:5229
+#: src/protocols/oscar/oscar.c:5233
 #, 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:5231
+#: src/protocols/oscar/oscar.c:5235
 msgid "Account Confirmation Requested"
 msgstr "Account Confirmation Requested"
 
-#: src/protocols/oscar/oscar.c:5262
+#: src/protocols/oscar/oscar.c:5266
 msgid "Error Changing Account Info"
 msgstr "Error Changing Account Info"
 
-#: src/protocols/oscar/oscar.c:5265
+#: src/protocols/oscar/oscar.c:5269
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8082,7 +8216,7 @@
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "differs from the original."
 
-#: src/protocols/oscar/oscar.c:5268
+#: src/protocols/oscar/oscar.c:5272
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8091,7 +8225,7 @@
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "ends in a space."
 
-#: src/protocols/oscar/oscar.c:5271
+#: src/protocols/oscar/oscar.c:5275
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8100,7 +8234,7 @@
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "is too long."
 
-#: src/protocols/oscar/oscar.c:5274
+#: src/protocols/oscar/oscar.c:5278
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -8109,7 +8243,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:5277
+#: src/protocols/oscar/oscar.c:5281
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -8118,7 +8252,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:5280
+#: src/protocols/oscar/oscar.c:5284
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
@@ -8127,12 +8261,12 @@
 "Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 
-#: src/protocols/oscar/oscar.c:5283
+#: src/protocols/oscar/oscar.c:5287
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Error 0x%04x: Unknown error."
 
-#: src/protocols/oscar/oscar.c:5293
+#: src/protocols/oscar/oscar.c:5297
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -8141,26 +8275,26 @@
 "Your screen name is currently formatted as follows:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5294 src/protocols/oscar/oscar.c:5301
+#: src/protocols/oscar/oscar.c:5298 src/protocols/oscar/oscar.c:5305
 msgid "Account Info"
 msgstr "Account Info"
 
-#: src/protocols/oscar/oscar.c:5299
+#: src/protocols/oscar/oscar.c:5303
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "The email address for %s is %s"
 
-#: src/protocols/oscar/oscar.c:5363
+#: src/protocols/oscar/oscar.c:5370
 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:5498
+#: src/protocols/oscar/oscar.c:5505
 msgid "Unable to set AIM profile."
 msgstr "Unable to set AIM profile."
 
-#: src/protocols/oscar/oscar.c:5499
+#: src/protocols/oscar/oscar.c:5506
 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 "
@@ -8170,7 +8304,7 @@
 "completed.  Your profile remains unset; try setting it again when you are "
 "fully connected."
 
-#: src/protocols/oscar/oscar.c:5526
+#: src/protocols/oscar/oscar.c:5533
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -8185,15 +8319,15 @@
 "The maximum profile length of %d bytes has been exceeded.  Gaim has "
 "truncated it for you."
 
-#: src/protocols/oscar/oscar.c:5531
+#: src/protocols/oscar/oscar.c:5538
 msgid "Profile too long."
 msgstr "Profile too long."
 
-#: src/protocols/oscar/oscar.c:5568
+#: src/protocols/oscar/oscar.c:5569
 msgid "Unable to set AIM away message."
 msgstr "Unable to set AIM away message."
 
-#: src/protocols/oscar/oscar.c:5569
+#: src/protocols/oscar/oscar.c:5570
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -8203,7 +8337,7 @@
 "procedure completed.  You remain in a \"present\" state; try setting it "
 "again when you are fully connected."
 
-#: src/protocols/oscar/oscar.c:5617
+#: src/protocols/oscar/oscar.c:5615
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -8218,11 +8352,11 @@
 "The maximum away message length of %d bytes has been exceeded.  Gaim has "
 "truncated it for you."
 
-#: src/protocols/oscar/oscar.c:5622
+#: src/protocols/oscar/oscar.c:5620
 msgid "Away message too long."
 msgstr "Away message too long."
 
-#: src/protocols/oscar/oscar.c:5698
+#: src/protocols/oscar/oscar.c:5700
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -8233,16 +8367,16 @@
 "must either start with a letter and contain only letters, numbers and "
 "spaces, or contain only numbers."
 
-#: src/protocols/oscar/oscar.c:5700 src/protocols/oscar/oscar.c:6155
-#: src/protocols/oscar/oscar.c:6169
+#: src/protocols/oscar/oscar.c:5702 src/protocols/oscar/oscar.c:6158
+#: src/protocols/oscar/oscar.c:6172
 msgid "Unable To Add"
 msgstr "Unable To Add"
 
-#: src/protocols/oscar/oscar.c:5861
+#: src/protocols/oscar/oscar.c:5864
 msgid "Unable To Retrieve Buddy List"
 msgstr "Unable To Retrieve Buddy List"
 
-#: src/protocols/oscar/oscar.c:5862
+#: src/protocols/oscar/oscar.c:5865
 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 "
@@ -8252,13 +8386,13 @@
 "servers.  Your buddy list is not lost, and will probably become available in "
 "a few hours."
 
-#: src/protocols/oscar/oscar.c:6046 src/protocols/oscar/oscar.c:6047
-#: src/protocols/oscar/oscar.c:6052 src/protocols/oscar/oscar.c:6213
-#: src/protocols/oscar/oscar.c:6214 src/protocols/oscar/oscar.c:6219
+#: src/protocols/oscar/oscar.c:6049 src/protocols/oscar/oscar.c:6050
+#: src/protocols/oscar/oscar.c:6055 src/protocols/oscar/oscar.c:6216
+#: src/protocols/oscar/oscar.c:6217 src/protocols/oscar/oscar.c:6222
 msgid "Orphans"
 msgstr "Orphans"
 
-#: src/protocols/oscar/oscar.c:6153
+#: src/protocols/oscar/oscar.c:6156
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -8267,11 +8401,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:6153 src/protocols/oscar/oscar.c:6167
+#: src/protocols/oscar/oscar.c:6156 src/protocols/oscar/oscar.c:6170
 msgid "(no name)"
 msgstr "(no name)"
 
-#: src/protocols/oscar/oscar.c:6167
+#: src/protocols/oscar/oscar.c:6170
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -8282,7 +8416,7 @@
 "for this is that you have the maximum number of allowed buddies in your "
 "buddy list."
 
-#: src/protocols/oscar/oscar.c:6250
+#: src/protocols/oscar/oscar.c:6253
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -8291,11 +8425,11 @@
 "The user %s has given you permission to add you to their buddy list.  Do you "
 "want to add them?"
 
-#: src/protocols/oscar/oscar.c:6256
+#: src/protocols/oscar/oscar.c:6259
 msgid "Authorization Given"
 msgstr "Authorization Given"
 
-#: src/protocols/oscar/oscar.c:6289
+#: src/protocols/oscar/oscar.c:6292
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -8305,17 +8439,17 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:6331
+#: src/protocols/oscar/oscar.c:6334
 #, 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:6332
+#: src/protocols/oscar/oscar.c:6335
 msgid "Authorization Granted"
 msgstr "Authorization Granted"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:6335
+#: src/protocols/oscar/oscar.c:6338
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -8326,76 +8460,76 @@
 "following reason:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:6336
+#: src/protocols/oscar/oscar.c:6339
 msgid "Authorization Denied"
 msgstr "Authorization Denied"
 
-#: src/protocols/oscar/oscar.c:6373 src/protocols/toc/toc.c:1280
+#: src/protocols/oscar/oscar.c:6376 src/protocols/toc/toc.c:1280
 msgid "_Exchange:"
 msgstr "_Exchange:"
 
-#: src/protocols/oscar/oscar.c:6411
+#: src/protocols/oscar/oscar.c:6414
 msgid "Invalid chat name specified."
 msgstr "Invalid chat name specified."
 
-#: src/protocols/oscar/oscar.c:6500
+#: src/protocols/oscar/oscar.c:6503
 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:6635
+#: src/protocols/oscar/oscar.c:6638
 msgid "Away Message"
 msgstr "Away Message"
 
-#: src/protocols/oscar/oscar.c:6966
+#: src/protocols/oscar/oscar.c:6973
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Buddy Comment for %s"
 
-#: src/protocols/oscar/oscar.c:6967
+#: src/protocols/oscar/oscar.c:6974
 msgid "Buddy Comment:"
 msgstr "Buddy Comment:"
 
-#: src/protocols/oscar/oscar.c:6986
+#: src/protocols/oscar/oscar.c:6993
 msgid "Edit Buddy Comment"
 msgstr "Edit Buddy Comment"
 
-#: src/protocols/oscar/oscar.c:6992
+#: src/protocols/oscar/oscar.c:6999
 msgid "Get Status Msg"
 msgstr "Get Status Msg"
 
-#: src/protocols/oscar/oscar.c:7004
+#: src/protocols/oscar/oscar.c:7011
 msgid "Direct IM"
 msgstr "Direct IM"
 
-#: src/protocols/oscar/oscar.c:7021
+#: src/protocols/oscar/oscar.c:7028
 msgid "Re-request Authorization"
 msgstr "Re-request Authorization"
 
-#: src/protocols/oscar/oscar.c:7051
+#: src/protocols/oscar/oscar.c:7058
 msgid "The new formatting is invalid."
 msgstr "The new formatting is invalid."
 
-#: src/protocols/oscar/oscar.c:7052
+#: src/protocols/oscar/oscar.c:7059
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "Screen name formatting can change only capitalization and whitespace."
 
-#: src/protocols/oscar/oscar.c:7059
+#: src/protocols/oscar/oscar.c:7066
 msgid "New screen name formatting:"
 msgstr "New screen name formatting:"
 
-#: src/protocols/oscar/oscar.c:7111
+#: src/protocols/oscar/oscar.c:7118
 msgid "Change Address To:"
 msgstr "Change Address To:"
 
-#: src/protocols/oscar/oscar.c:7156
+#: src/protocols/oscar/oscar.c:7163
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>you are not waiting for authorization</i>"
 
-#: src/protocols/oscar/oscar.c:7159
+#: src/protocols/oscar/oscar.c:7166
 msgid "You are awaiting authorization from the following buddies"
 msgstr "You are awaiting authorization from the following buddies"
 
-#: src/protocols/oscar/oscar.c:7160
+#: src/protocols/oscar/oscar.c:7167
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -8403,71 +8537,71 @@
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
 
-#: src/protocols/oscar/oscar.c:7177
+#: src/protocols/oscar/oscar.c:7184
 msgid "Find Buddy by E-mail"
 msgstr "Find Buddy by E-mail"
 
-#: src/protocols/oscar/oscar.c:7178
+#: src/protocols/oscar/oscar.c:7185
 msgid "Search for a buddy by e-mail address"
 msgstr "Search for a buddy by e-mail address"
 
-#: src/protocols/oscar/oscar.c:7179
+#: src/protocols/oscar/oscar.c:7186
 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:7260 src/protocols/silc/silc.c:810
+#: src/protocols/oscar/oscar.c:7267 src/protocols/silc/silc.c:814
 msgid "Set User Info..."
 msgstr "Set User Info..."
 
-#: src/protocols/oscar/oscar.c:7265
+#: src/protocols/oscar/oscar.c:7272
 msgid "Set User Info (URL)..."
 msgstr "Set User Info (URL)..."
 
-#: src/protocols/oscar/oscar.c:7270 src/protocols/silc/silc.c:806
+#: src/protocols/oscar/oscar.c:7277 src/protocols/silc/silc.c:810
 msgid "Change Password..."
 msgstr "Change Password..."
 
-#: src/protocols/oscar/oscar.c:7275
+#: src/protocols/oscar/oscar.c:7282
 msgid "Change Password (URL)"
 msgstr "Change Password (URL)"
 
-#: src/protocols/oscar/oscar.c:7279
+#: src/protocols/oscar/oscar.c:7286
 msgid "Configure IM Forwarding (URL)"
 msgstr "Configure IM Forwarding (URL)"
 
-#: src/protocols/oscar/oscar.c:7288
+#: src/protocols/oscar/oscar.c:7295
 msgid "Format Screen Name..."
 msgstr "Format Screen Name..."
 
-#: src/protocols/oscar/oscar.c:7292
+#: src/protocols/oscar/oscar.c:7299
 msgid "Confirm Account"
 msgstr "Confirm Account"
 
-#: src/protocols/oscar/oscar.c:7296
+#: src/protocols/oscar/oscar.c:7303
 msgid "Display Currently Registered Address"
 msgstr "Display Currently Registered Address"
 
-#: src/protocols/oscar/oscar.c:7300
-msgid "Change Currently Registered Address..."
-msgstr "Change Currently Registered Address..."
-
 #: src/protocols/oscar/oscar.c:7307
+msgid "Change Currently Registered Address..."
+msgstr "Change Currently Registered Address..."
+
+#: src/protocols/oscar/oscar.c:7314
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Show Buddies Awaiting Authorization"
 
-#: src/protocols/oscar/oscar.c:7313
+#: src/protocols/oscar/oscar.c:7320
 msgid "Search for Buddy by Email..."
 msgstr "Search for Buddy by Email..."
 
-#: src/protocols/oscar/oscar.c:7318
+#: src/protocols/oscar/oscar.c:7325
 msgid "Search for Buddy by Information"
 msgstr "Search for Buddy by Information"
 
-#: src/protocols/oscar/oscar.c:7387
+#: src/protocols/oscar/oscar.c:7394
 msgid "Use recent buddies group"
 msgstr "Use recent buddies group"
 
-#: src/protocols/oscar/oscar.c:7390
+#: src/protocols/oscar/oscar.c:7397
 msgid "Show how long you have been idle"
 msgstr "Show how long you have been idle"
 
@@ -8481,18 +8615,22 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/oscar/oscar.c:7483 src/protocols/oscar/oscar.c:7485
+#: src/protocols/oscar/oscar.c:7490 src/protocols/oscar/oscar.c:7492
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ Protocol Plugin"
 
-#: src/protocols/oscar/oscar.c:7504
+#: src/protocols/oscar/oscar.c:7511
 msgid "Auth host"
 msgstr "Auth host"
 
-#: src/protocols/oscar/oscar.c:7507
+#: src/protocols/oscar/oscar.c:7514
 msgid "Auth port"
 msgstr "Auth port"
 
+#: src/protocols/oscar/oscar.c:7517 src/protocols/zephyr/zephyr.c:2860
+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/ft.c:338
@@ -8578,12 +8716,12 @@
 msgstr "Set IM Password"
 
 #: src/protocols/silc/buddy.c:506 src/protocols/silc/buddy.c:541
-#: src/protocols/silc/ops.c:1278 src/protocols/silc/ops.c:1289
+#: src/protocols/silc/ops.c:1274 src/protocols/silc/ops.c:1285
 msgid "Get Public Key"
 msgstr "Get Public Key"
 
-#: src/protocols/silc/buddy.c:542 src/protocols/silc/ops.c:1279
-#: src/protocols/silc/ops.c:1290
+#: src/protocols/silc/buddy.c:542 src/protocols/silc/ops.c:1275
+#: src/protocols/silc/ops.c:1286
 msgid "Cannot fetch the public key"
 msgstr "Cannot fetch the public key"
 
@@ -8596,14 +8734,14 @@
 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:1099
+#: src/protocols/silc/buddy.c:707 src/protocols/silc/ops.c:873
+#: src/protocols/silc/ops.c:945 src/protocols/silc/ops.c:1080
+#: src/protocols/silc/ops.c:1081 src/protocols/silc/ops.c:1101
 msgid "User Information"
 msgstr "User Information"
 
-#: src/protocols/silc/buddy.c:708 src/protocols/silc/ops.c:944
-#: src/protocols/silc/ops.c:1100
+#: src/protocols/silc/buddy.c:708 src/protocols/silc/ops.c:946
+#: src/protocols/silc/ops.c:1102
 msgid "Cannot get user information"
 msgstr "Cannot get user information"
 
@@ -8682,91 +8820,91 @@
 msgid "Robot"
 msgstr "Robot"
 
-#: src/protocols/silc/buddy.c:1401 src/protocols/silc/silc.c:631
+#: src/protocols/silc/buddy.c:1401 src/protocols/silc/silc.c:635
 #: src/protocols/silc/util.c:469
 msgid "Happy"
 msgstr "Happy"
 
-#: src/protocols/silc/buddy.c:1403 src/protocols/silc/silc.c:633
+#: src/protocols/silc/buddy.c:1403 src/protocols/silc/silc.c:637
 #: src/protocols/silc/util.c:471
 msgid "Sad"
 msgstr "Sad"
 
-#: src/protocols/silc/buddy.c:1405 src/protocols/silc/silc.c:635
+#: src/protocols/silc/buddy.c:1405 src/protocols/silc/silc.c:639
 #: src/protocols/silc/util.c:473
 msgid "Angry"
 msgstr "Angry"
 
-#: src/protocols/silc/buddy.c:1407 src/protocols/silc/silc.c:637
+#: src/protocols/silc/buddy.c:1407 src/protocols/silc/silc.c:641
 #: src/protocols/silc/util.c:475
 msgid "Jealous"
 msgstr "Jealous"
 
-#: src/protocols/silc/buddy.c:1409 src/protocols/silc/silc.c:639
+#: src/protocols/silc/buddy.c:1409 src/protocols/silc/silc.c:643
 #: src/protocols/silc/util.c:477
 msgid "Ashamed"
 msgstr "Ashamed"
 
-#: src/protocols/silc/buddy.c:1411 src/protocols/silc/silc.c:641
+#: src/protocols/silc/buddy.c:1411 src/protocols/silc/silc.c:645
 #: src/protocols/silc/util.c:479
 msgid "Invincible"
 msgstr "Invincible"
 
-#: src/protocols/silc/buddy.c:1413 src/protocols/silc/silc.c:643
+#: src/protocols/silc/buddy.c:1413 src/protocols/silc/silc.c:647
 #: src/protocols/silc/util.c:481
 msgid "In Love"
 msgstr "In Love"
 
-#: src/protocols/silc/buddy.c:1415 src/protocols/silc/silc.c:645
+#: src/protocols/silc/buddy.c:1415 src/protocols/silc/silc.c:649
 #: src/protocols/silc/util.c:483
 msgid "Sleepy"
 msgstr "Sleepy"
 
-#: src/protocols/silc/buddy.c:1417 src/protocols/silc/silc.c:647
+#: src/protocols/silc/buddy.c:1417 src/protocols/silc/silc.c:651
 #: src/protocols/silc/util.c:485
 msgid "Bored"
 msgstr "Bored"
 
-#: src/protocols/silc/buddy.c:1419 src/protocols/silc/silc.c:649
+#: src/protocols/silc/buddy.c:1419 src/protocols/silc/silc.c:653
 #: src/protocols/silc/util.c:487
 msgid "Excited"
 msgstr "Excited"
 
-#: src/protocols/silc/buddy.c:1421 src/protocols/silc/silc.c:651
+#: src/protocols/silc/buddy.c:1421 src/protocols/silc/silc.c:655
 #: src/protocols/silc/util.c:489
 msgid "Anxious"
 msgstr "Anxious"
 
-#: src/protocols/silc/buddy.c:1453 src/protocols/silc/ops.c:980
+#: src/protocols/silc/buddy.c:1453 src/protocols/silc/ops.c:982
 msgid "User Modes"
 msgstr "User Modes"
 
-#: src/protocols/silc/buddy.c:1462 src/protocols/silc/ops.c:989
+#: src/protocols/silc/buddy.c:1462 src/protocols/silc/ops.c:991
 msgid "Mood"
 msgstr "Mood"
 
-#: src/protocols/silc/buddy.c:1466 src/protocols/silc/ops.c:995
+#: src/protocols/silc/buddy.c:1466 src/protocols/silc/ops.c:997
 msgid "Status Text"
 msgstr "Status Text"
 
-#: src/protocols/silc/buddy.c:1471 src/protocols/silc/ops.c:1001
+#: src/protocols/silc/buddy.c:1471 src/protocols/silc/ops.c:1003
 msgid "Preferred Contact"
 msgstr "Preferred Contact"
 
-#: src/protocols/silc/buddy.c:1476 src/protocols/silc/ops.c:1006
+#: src/protocols/silc/buddy.c:1476 src/protocols/silc/ops.c:1008
 msgid "Preferred Language"
 msgstr "Preferred Language"
 
-#: src/protocols/silc/buddy.c:1481 src/protocols/silc/ops.c:1011
+#: src/protocols/silc/buddy.c:1481 src/protocols/silc/ops.c:1013
 msgid "Device"
 msgstr "Device"
 
-#: src/protocols/silc/buddy.c:1486 src/protocols/silc/ops.c:1016
-#: src/protocols/silc/silc.c:699 src/protocols/silc/silc.c:701
+#: src/protocols/silc/buddy.c:1486 src/protocols/silc/ops.c:1018
+#: src/protocols/silc/silc.c:703 src/protocols/silc/silc.c:705
 msgid "Timezone"
 msgstr "Time Zone"
 
-#: src/protocols/silc/buddy.c:1491 src/protocols/silc/ops.c:1021
+#: src/protocols/silc/buddy.c:1491 src/protocols/silc/ops.c:1023
 msgid "Geolocation"
 msgstr "Geolocation"
 
@@ -8786,7 +8924,7 @@
 msgid "Get Public Key..."
 msgstr "Get Public Key..."
 
-#: src/protocols/silc/buddy.c:1560 src/protocols/silc/ops.c:1411
+#: src/protocols/silc/buddy.c:1560 src/protocols/silc/ops.c:1407
 msgid "Kill User"
 msgstr "Kill User"
 
@@ -8896,7 +9034,7 @@
 msgid "Group Name"
 msgstr "Group Name"
 
-#: src/protocols/silc/chat.c:579 src/protocols/silc/ops.c:1691
+#: src/protocols/silc/chat.c:579 src/protocols/silc/ops.c:1687
 msgid "Passphrase"
 msgstr "Passphrase"
 
@@ -8994,11 +9132,11 @@
 msgid "Cannot join private group"
 msgstr "Cannot join private group"
 
-#: src/protocols/silc/chat.c:1252 src/protocols/silc/silc.c:909
+#: src/protocols/silc/chat.c:1252 src/protocols/silc/silc.c:914
 msgid "Cannot call command"
 msgstr "Cannot call command"
 
-#: src/protocols/silc/chat.c:1253 src/protocols/silc/silc.c:910
+#: src/protocols/silc/chat.c:1253 src/protocols/silc/silc.c:915
 msgid "Unknown command"
 msgstr "Unknown command"
 
@@ -9025,8 +9163,8 @@
 msgstr "Key agreement failed"
 
 #: src/protocols/silc/ft.c:102
-msgid "File transfer sessions does not exist"
-msgstr "File transfer sessions does not exist"
+msgid "File transfer session does not exist"
+msgstr "File transfer session does not exist"
 
 #: src/protocols/silc/ft.c:206
 msgid "No file transfer session active"
@@ -9048,142 +9186,142 @@
 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 "Organization"
 
-#: 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 "EMail"
 
-#: 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:1140
+#: src/protocols/silc/ops.c:1070 src/protocols/silc/ops.c:1142
 msgid "Public Key Fingerprint"
 msgstr "Public Key Fingerprint"
 
-#: src/protocols/silc/ops.c:1069 src/protocols/silc/ops.c:1141
+#: src/protocols/silc/ops.c:1071 src/protocols/silc/ops.c:1143
 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:1157 src/protocols/silc/silc.c:798
+#: src/protocols/silc/ops.c:1159 src/protocols/silc/silc.c:802
 msgid "Detach From Server"
 msgstr "Detach From Server"
 
-#: src/protocols/silc/ops.c:1157
+#: src/protocols/silc/ops.c:1159
 msgid "Cannot detach"
 msgstr "Cannot detach"
 
-#: src/protocols/silc/ops.c:1168
+#: src/protocols/silc/ops.c:1170
 msgid "Cannot set topic"
 msgstr "Cannot set topic"
 
-#: src/protocols/silc/ops.c:1206
+#: src/protocols/silc/ops.c:1202
 msgid "Failed to change nickname"
 msgstr "Failed to change nickname"
 
-#: src/protocols/silc/ops.c:1291
+#: src/protocols/silc/ops.c:1287
 msgid "No public key was received"
 msgstr "No public key was received"
 
-#: src/protocols/silc/ops.c:1304 src/protocols/silc/ops.c:1318
+#: src/protocols/silc/ops.c:1300 src/protocols/silc/ops.c:1314
 msgid "Server Information"
 msgstr "Server Information"
 
-#: src/protocols/silc/ops.c:1305
+#: src/protocols/silc/ops.c:1301
 msgid "Cannot get server information"
 msgstr "Cannot get server information"
 
-#: src/protocols/silc/ops.c:1336 src/protocols/silc/ops.c:1345
+#: src/protocols/silc/ops.c:1332 src/protocols/silc/ops.c:1341
 msgid "Server Statistics"
 msgstr "Server Statistics"
 
-#: src/protocols/silc/ops.c:1337
+#: src/protocols/silc/ops.c:1333
 msgid "Cannot get server statistics"
 msgstr "Cannot get server statistics"
 
-#: src/protocols/silc/ops.c:1346
+#: src/protocols/silc/ops.c:1342
 msgid "No server statistics available"
 msgstr "No server statistics available"
 
-#: src/protocols/silc/ops.c:1368
+#: src/protocols/silc/ops.c:1364
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -9218,98 +9356,98 @@
 "Total server operators: %d\n"
 "Total router operators: %d\n"
 
-#: src/protocols/silc/ops.c:1391
+#: src/protocols/silc/ops.c:1387
 msgid "Network Statistics"
 msgstr "Network Statistics"
 
-#: src/protocols/silc/ops.c:1399 src/protocols/silc/ops.c:1404
+#: src/protocols/silc/ops.c:1395 src/protocols/silc/ops.c:1400
 msgid "Ping"
 msgstr "Ping"
 
-#: src/protocols/silc/ops.c:1399
+#: src/protocols/silc/ops.c:1395
 msgid "Ping failed"
 msgstr "Ping failed"
 
-#: src/protocols/silc/ops.c:1404
+#: src/protocols/silc/ops.c:1400
 msgid "Ping reply received from server"
 msgstr "Ping reply received from server"
 
-#: src/protocols/silc/ops.c:1412
+#: src/protocols/silc/ops.c:1408
 msgid "Could not kill user"
 msgstr "Could not kill user"
 
-#: src/protocols/silc/ops.c:1493
+#: src/protocols/silc/ops.c:1489
 msgid "Error during connecting to SILC Server"
 msgstr "Error during connecting to SILC Server"
 
-#: src/protocols/silc/ops.c:1498
+#: src/protocols/silc/ops.c:1494
 msgid "Key Exchange failed"
 msgstr "Key Exchange failed"
 
-#: src/protocols/silc/ops.c:1507
+#: src/protocols/silc/ops.c:1503
 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:1542
+#: src/protocols/silc/ops.c:1538
 msgid "Disconnected by server"
 msgstr "Disconnected by server"
 
-#: src/protocols/silc/ops.c:1602 src/protocols/silc/ops.c:1649
-#: src/protocols/silc/silc.c:188
+#: src/protocols/silc/ops.c:1598 src/protocols/silc/ops.c:1645
+#: src/protocols/silc/silc.c:192
 msgid "Resuming session"
 msgstr "Resuming session"
 
-#: src/protocols/silc/ops.c:1604
+#: src/protocols/silc/ops.c:1600
 msgid "Authenticating connection"
 msgstr "Authenticating connection"
 
-#: src/protocols/silc/ops.c:1651
+#: src/protocols/silc/ops.c:1647
 msgid "Verifying server public key"
 msgstr "Verifying server public key"
 
-#: src/protocols/silc/ops.c:1692
+#: src/protocols/silc/ops.c:1688
 msgid "Passphrase required"
 msgstr "Passphrase required"
 
-#: src/protocols/silc/ops.c:1721
+#: src/protocols/silc/ops.c:1717
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Failure: Version mismatch; upgrade your client"
 
-#: src/protocols/silc/ops.c:1724
+#: src/protocols/silc/ops.c:1720
 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:1727
+#: src/protocols/silc/ops.c:1723
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "Failure: Remote does not support proposed KE group"
 
-#: src/protocols/silc/ops.c:1730
+#: src/protocols/silc/ops.c:1726
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "Failure: Remote does not support proposed cipher"
 
-#: src/protocols/silc/ops.c:1733
+#: src/protocols/silc/ops.c:1729
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "Failure: Remote does not support proposed PKCS"
 
-#: src/protocols/silc/ops.c:1736
+#: src/protocols/silc/ops.c:1732
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "Failure: Remote does not support proposed hash function"
 
-#: src/protocols/silc/ops.c:1739
+#: src/protocols/silc/ops.c:1735
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "Failure: Remote does not support proposed HMAC"
 
-#: src/protocols/silc/ops.c:1741
+#: src/protocols/silc/ops.c:1737
 msgid "Failure: Incorrect signature"
 msgstr "Failure: Incorrect signature"
 
-#: src/protocols/silc/ops.c:1743
+#: src/protocols/silc/ops.c:1739
 msgid "Failure: Invalid cookie"
 msgstr "Failure: Invalid cookie"
 
-#: src/protocols/silc/ops.c:1754
+#: src/protocols/silc/ops.c:1750
 msgid "Failure: Authentication failed"
 msgstr "Failure: Authentication failed"
 
@@ -9352,36 +9490,36 @@
 msgid "Unsupported public key type"
 msgstr "Unsupported public key type"
 
-#: src/protocols/silc/silc.c:148
+#: src/protocols/silc/silc.c:152
 msgid "Connection failed"
 msgstr "Connection failed"
 
-#: src/protocols/silc/silc.c:180
+#: src/protocols/silc/silc.c:184
 msgid "Cannot initialize SILC Client connection"
 msgstr "Cannot initialize SILC Client connection"
 
-#: src/protocols/silc/silc.c:191
+#: src/protocols/silc/silc.c:195
 msgid "Performing key exchange"
 msgstr "Performing key exchange"
 
-#: src/protocols/silc/silc.c:263
+#: src/protocols/silc/silc.c:267
 msgid "Out of memory"
 msgstr "Out of memory"
 
 #. Progress
-#: src/protocols/silc/silc.c:297
+#: src/protocols/silc/silc.c:301
 msgid "Connecting to SILC Server"
 msgstr "Connecting to SILC Server"
 
-#: src/protocols/silc/silc.c:627
+#: src/protocols/silc/silc.c:631
 msgid "Your Current Mood"
 msgstr "Your Current Mood"
 
-#: src/protocols/silc/silc.c:629
+#: src/protocols/silc/silc.c:633
 msgid "Normal"
 msgstr "Normal"
 
-#: src/protocols/silc/silc.c:654
+#: src/protocols/silc/silc.c:658
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9389,43 +9527,43 @@
 "\n"
 "Your Preferred Contact Methods"
 
-#: src/protocols/silc/silc.c:662 src/protocols/silc/util.c:514
+#: src/protocols/silc/silc.c:666 src/protocols/silc/util.c:514
 msgid "SMS"
 msgstr "SMS"
 
-#: src/protocols/silc/silc.c:664 src/protocols/silc/util.c:516
+#: src/protocols/silc/silc.c:668 src/protocols/silc/util.c:516
 msgid "MMS"
 msgstr "MMS"
 
-#: src/protocols/silc/silc.c:666 src/protocols/silc/util.c:518
+#: src/protocols/silc/silc.c:670 src/protocols/silc/util.c:518
 msgid "Video Conferencing"
 msgstr "Video Conferencing"
 
-#: src/protocols/silc/silc.c:671
+#: src/protocols/silc/silc.c:675
 msgid "Your Current Status"
 msgstr "Your Current Status"
 
-#: src/protocols/silc/silc.c:678
+#: src/protocols/silc/silc.c:682
 msgid "Online Services"
 msgstr "Online Services"
 
-#: src/protocols/silc/silc.c:681
+#: src/protocols/silc/silc.c:685
 msgid "Let others see what services you are using"
 msgstr "Let others see what services you are using"
 
-#: src/protocols/silc/silc.c:687
+#: src/protocols/silc/silc.c:691
 msgid "Let others see what computer you are using"
 msgstr "Let others see what computer you are using"
 
-#: src/protocols/silc/silc.c:694
+#: src/protocols/silc/silc.c:698
 msgid "Your VCard File"
 msgstr "Your VCard File"
 
-#: src/protocols/silc/silc.c:707 src/protocols/silc/silc.c:708
+#: src/protocols/silc/silc.c:711 src/protocols/silc/silc.c:712
 msgid "User Online Status Attributes"
 msgstr "User Online Status Attributes"
 
-#: src/protocols/silc/silc.c:709
+#: src/protocols/silc/silc.c:713
 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 "
@@ -9435,131 +9573,127 @@
 "information. Please fill the information you would like other users to see "
 "about yourself."
 
-#: src/protocols/silc/silc.c:749 src/protocols/silc/silc.c:755
-#: src/protocols/silc/silc.c:1158
+#: src/protocols/silc/silc.c:753 src/protocols/silc/silc.c:759
+#: src/protocols/silc/silc.c:1159
 msgid "Message of the Day"
 msgstr "Message of the Day"
 
-#: src/protocols/silc/silc.c:749
+#: src/protocols/silc/silc.c:753
 msgid "No Message of the Day available"
 msgstr "No Message of the Day available"
 
-#: src/protocols/silc/silc.c:750 src/protocols/silc/silc.c:1153
+#: src/protocols/silc/silc.c:754 src/protocols/silc/silc.c:1154
 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:793
+#: src/protocols/silc/silc.c:797
 msgid "Online Status"
 msgstr "Online Status"
 
-#: src/protocols/silc/silc.c:802
+#: src/protocols/silc/silc.c:806
 msgid "View Message of the Day"
 msgstr "View Message of the Day"
 
-#: src/protocols/silc/silc.c:874
+#: src/protocols/silc/silc.c:879
 #, 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:983
-msgid "Failed to leave channel"
-msgstr "Failed to leave channel"
-
-#: src/protocols/silc/silc.c:1029
+#: src/protocols/silc/silc.c:1030
 msgid "Topic too long"
 msgstr "Topic too long"
 
-#: src/protocols/silc/silc.c:1110
+#: src/protocols/silc/silc.c:1111
 msgid "You must specify a nick"
 msgstr "You must specify a nick"
 
-#: src/protocols/silc/silc.c:1212
+#: src/protocols/silc/silc.c:1213
 #, c-format
 msgid "channel %s not found"
 msgstr "channel %s not found"
 
-#: src/protocols/silc/silc.c:1217
+#: src/protocols/silc/silc.c:1218
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "channel modes for %s: %s"
 
-#: src/protocols/silc/silc.c:1219
+#: src/protocols/silc/silc.c:1220
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "no channel modes are set on %s"
 
-#: src/protocols/silc/silc.c:1232
+#: src/protocols/silc/silc.c:1233
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "Failed to set cmodes for %s"
 
-#: src/protocols/silc/silc.c:1262
+#: src/protocols/silc/silc.c:1263
 #, 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:1325
+#: src/protocols/silc/silc.c:1326
 msgid "part [channel]:  Leave the chat"
 msgstr "part [channel]:  Leave the chat"
 
-#: src/protocols/silc/silc.c:1329
+#: src/protocols/silc/silc.c:1330
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [channel]:  Leave the chat"
 
-#: src/protocols/silc/silc.c:1333
+#: src/protocols/silc/silc.c:1334
 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:1338
+#: src/protocols/silc/silc.c:1339
 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:1342
+#: src/protocols/silc/silc.c:1343
 msgid "list:  List channels on this network"
 msgstr "list:  List channels on this network"
 
-#: src/protocols/silc/silc.c:1346
+#: src/protocols/silc/silc.c:1347
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;nick&gt;:  View nick's information"
 
-#: src/protocols/silc/silc.c:1350 src/protocols/zephyr/zephyr.c:2561
+#: src/protocols/silc/silc.c:1351 src/protocols/zephyr/zephyr.c:2564
 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:1354
+#: src/protocols/silc/silc.c:1355
 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:1358
+#: src/protocols/silc/silc.c:1359
 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:1362
+#: src/protocols/silc/silc.c:1363
 msgid "detach:  Detach this session"
 msgstr "detach:  Detach this session"
 
-#: src/protocols/silc/silc.c:1366
+#: src/protocols/silc/silc.c:1367
 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:1370
+#: src/protocols/silc/silc.c:1371
 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:1376
+#: src/protocols/silc/silc.c:1377
 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:1380
+#: src/protocols/silc/silc.c:1381
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;newnick&gt;:  Change your nickname"
 
-#: src/protocols/silc/silc.c:1384
+#: src/protocols/silc/silc.c:1385
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;nick&gt;:  View nick's information"
 
-#: src/protocols/silc/silc.c:1388
+#: src/protocols/silc/silc.c:1389
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
@@ -9567,7 +9701,7 @@
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
 
-#: src/protocols/silc/silc.c:1392
+#: src/protocols/silc/silc.c:1393
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
@@ -9575,15 +9709,15 @@
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
 
-#: src/protocols/silc/silc.c:1396
+#: src/protocols/silc/silc.c:1397
 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:1400
+#: src/protocols/silc/silc.c:1401
 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:1404
+#: src/protocols/silc/silc.c:1405
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
@@ -9591,35 +9725,35 @@
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
 
-#: src/protocols/silc/silc.c:1408
+#: src/protocols/silc/silc.c:1409
 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:1412
+#: src/protocols/silc/silc.c:1413
 msgid "info [server]:  View server administrative details"
 msgstr "info [server]:  View server administrative details"
 
-#: src/protocols/silc/silc.c:1416
+#: src/protocols/silc/silc.c:1417
 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:1420
+#: src/protocols/silc/silc.c:1421
 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:1424
+#: src/protocols/silc/silc.c:1425
 msgid "stats:  View server and network statistics"
 msgstr "stats:  View server and network statistics"
 
-#: src/protocols/silc/silc.c:1428
+#: src/protocols/silc/silc.c:1429
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:  Send PING to the connected server"
 
-#: src/protocols/silc/silc.c:1433
+#: src/protocols/silc/silc.c:1434
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;channel&gt;:  List users in channel"
 
-#: src/protocols/silc/silc.c:1437
+#: src/protocols/silc/silc.c:1438
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -9627,39 +9761,39 @@
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
 
-#: src/protocols/silc/silc.c:1449
+#: src/protocols/silc/silc.c:1450
 msgid "Instant Messages"
 msgstr "Instant Messages"
 
-#: src/protocols/silc/silc.c:1454
+#: src/protocols/silc/silc.c:1455
 msgid "Digitally sign all IM messages"
 msgstr "Digitally sign all IM messages"
 
-#: src/protocols/silc/silc.c:1459
+#: src/protocols/silc/silc.c:1460
 msgid "Verify all IM message signatures"
 msgstr "Verify all IM message signatures"
 
-#: src/protocols/silc/silc.c:1462
+#: src/protocols/silc/silc.c:1463
 msgid "Channel Messages"
 msgstr "Channel Messages"
 
-#: src/protocols/silc/silc.c:1467
+#: src/protocols/silc/silc.c:1468
 msgid "Digitally sign all channel messages"
 msgstr "Digitally sign all channel messages"
 
-#: src/protocols/silc/silc.c:1472
+#: src/protocols/silc/silc.c:1473
 msgid "Verify all channel message signatures"
 msgstr "Verify all channel message signatures"
 
-#: src/protocols/silc/silc.c:1475
+#: src/protocols/silc/silc.c:1476
 msgid "Default SILC Key Pair"
 msgstr "Default SILC Key Pair"
 
-#: src/protocols/silc/silc.c:1480
+#: src/protocols/silc/silc.c:1481
 msgid "SILC Public Key"
 msgstr "SILC Public Key"
 
-#: src/protocols/silc/silc.c:1485
+#: src/protocols/silc/silc.c:1486
 msgid "SILC Private Key"
 msgstr "SILC Private Key"
 
@@ -9672,40 +9806,40 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/silc/silc.c:1574
+#: src/protocols/silc/silc.c:1575
 msgid "SILC Protocol Plugin"
 msgstr "SILC Protocol Plugin"
 
 #. *  description
-#: src/protocols/silc/silc.c:1576
+#: src/protocols/silc/silc.c:1577
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Secure Internet Live Conferencing (SILC) Protocol"
 
-#: 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:1612
+#: src/protocols/silc/silc.c:1613
 msgid "Public Key File"
 msgstr "Public Key File"
 
-#: src/protocols/silc/silc.c:1616
+#: src/protocols/silc/silc.c:1617
 msgid "Private Key File"
 msgstr "Private Key File"
 
-#: src/protocols/silc/silc.c:1621
+#: src/protocols/silc/silc.c:1622
 msgid "Reject watching by other users"
 msgstr "Reject watching by other users"
 
-#: src/protocols/silc/silc.c:1624
+#: src/protocols/silc/silc.c:1625
 msgid "Block invites"
 msgstr "Block invites"
 
-#: src/protocols/silc/silc.c:1627
+#: src/protocols/silc/silc.c:1628
 msgid "Block IMs without Key Exchange"
 msgstr "Block IMs without Key Exchange"
 
-#: src/protocols/silc/silc.c:1630
+#: src/protocols/silc/silc.c:1631
 msgid "Reject online status attribute requests"
 msgstr "Reject online status attribute requests"
 
@@ -9801,6 +9935,11 @@
 msgid "Looking up %s"
 msgstr "Looking up %s"
 
+#: src/protocols/toc/toc.c:199
+#, c-format
+msgid "Signon: %s"
+msgstr "Signon: %s"
+
 #: src/protocols/toc/toc.c:481
 #, c-format
 msgid "Unable to write file %s."
@@ -10094,7 +10233,7 @@
 msgid "Trepia Protocol Plugin"
 msgstr "Trepia Protocol Plugin"
 
-#: src/protocols/yahoo/yahoo.c:396
+#: src/protocols/yahoo/yahoo.c:400
 msgid ""
 "You have been logged off as you have logged in on a different machine or "
 "device."
@@ -10102,25 +10241,25 @@
 "You have been logged off as you have logged in on a different machine or "
 "device."
 
-#: src/protocols/yahoo/yahoo.c:871
+#: src/protocols/yahoo/yahoo.c:884
 msgid "Your Yahoo! message did not get sent."
 msgstr "Your Yahoo! message did not get sent."
 
-#: src/protocols/yahoo/yahoo.c:890 src/protocols/yahoo/yahoo.c:3406
+#: src/protocols/yahoo/yahoo.c:903 src/protocols/yahoo/yahoo.c:3429
 msgid "Buzz!!"
 msgstr "Buzz!!"
 
-#: src/protocols/yahoo/yahoo.c:935
+#: src/protocols/yahoo/yahoo.c:948
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Yahoo! system message for %s:"
 
-#: src/protocols/yahoo/yahoo.c:1002
+#: src/protocols/yahoo/yahoo.c:1015
 #, 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:1005
+#: src/protocols/yahoo/yahoo.c:1018
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -10129,11 +10268,11 @@
 "%s has (retroactively) denied your request to add them to your list for the "
 "following reason: %s."
 
-#: src/protocols/yahoo/yahoo.c:1008
+#: src/protocols/yahoo/yahoo.c:1021
 msgid "Add buddy rejected"
 msgstr "Add buddy rejected"
 
-#: src/protocols/yahoo/yahoo.c:1769
+#: src/protocols/yahoo/yahoo.c:1782
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -10144,11 +10283,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:1772
+#: src/protocols/yahoo/yahoo.c:1785
 msgid "Failed Yahoo! Authentication"
 msgstr "Failed Yahoo! Authentication"
 
-#: src/protocols/yahoo/yahoo.c:1844
+#: src/protocols/yahoo/yahoo.c:1858
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -10157,19 +10296,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:1847
+#: src/protocols/yahoo/yahoo.c:1861
 msgid "Ignore buddy?"
 msgstr "Ignore buddy?"
 
-#: src/protocols/yahoo/yahoo.c:1881
+#: src/protocols/yahoo/yahoo.c:1895
 msgid "Invalid username."
 msgstr "Invalid username."
 
-#: src/protocols/yahoo/yahoo.c:1892
+#: src/protocols/yahoo/yahoo.c:1906
 msgid "Normal authentication failed!"
 msgstr "Normal authentication failed!"
 
-#: src/protocols/yahoo/yahoo.c:1893
+#: src/protocols/yahoo/yahoo.c:1907
 msgid ""
 "The normal authentication method has failed. This means either your password "
 "is incorrect, or Yahoo!'s authentication scheme has changed. Gaim will now "
@@ -10181,93 +10320,93 @@
 "attempt to log in using Web Messenger authentication, which will result in "
 "reduced functionality and features."
 
-#: src/protocols/yahoo/yahoo.c:1901
+#: src/protocols/yahoo/yahoo.c:1915
 msgid "Incorrect password."
 msgstr "Incorrect password."
 
-#: src/protocols/yahoo/yahoo.c:1904
+#: src/protocols/yahoo/yahoo.c:1918
 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:1907
+#: src/protocols/yahoo/yahoo.c:1921
 #, 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:1961
+#: src/protocols/yahoo/yahoo.c:1975
 #, 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:1964
+#: src/protocols/yahoo/yahoo.c:1978
 msgid "Could not add buddy to server list"
 msgstr "Could not add buddy to server list"
 
-#: src/protocols/yahoo/yahoo.c:2198 src/protocols/yahoo/yahoo.c:2326
+#: src/protocols/yahoo/yahoo.c:2212 src/protocols/yahoo/yahoo.c:2340
 #: src/protocols/yahoo/ycht.c:414
 msgid "Unable to read"
 msgstr "Unable to read"
 
-#: src/protocols/yahoo/yahoo.c:2348 src/protocols/yahoo/yahoo.c:2458
-#: src/protocols/yahoo/yahoo.c:2508 src/protocols/yahoo/yahoo.c:2518
+#: src/protocols/yahoo/yahoo.c:2362 src/protocols/yahoo/yahoo.c:2472
+#: src/protocols/yahoo/yahoo.c:2522 src/protocols/yahoo/yahoo.c:2532
 #: src/protocols/yahoo/yahoochat.c:1415 src/protocols/yahoo/yahoochat.c:1476
 #: src/protocols/yahoo/ycht.c:518
 msgid "Connection problem"
 msgstr "Connection problem"
 
-#: src/protocols/yahoo/yahoo.c:2621 src/protocols/yahoo/yahoo.c:3125
+#: src/protocols/yahoo/yahoo.c:2635 src/protocols/yahoo/yahoo.c:3145
 msgid "Not At Home"
 msgstr "Not At Home"
 
-#: src/protocols/yahoo/yahoo.c:2623 src/protocols/yahoo/yahoo.c:3128
+#: src/protocols/yahoo/yahoo.c:2637 src/protocols/yahoo/yahoo.c:3148
 msgid "Not At Desk"
 msgstr "Not At Desk"
 
-#: src/protocols/yahoo/yahoo.c:2625 src/protocols/yahoo/yahoo.c:3131
+#: src/protocols/yahoo/yahoo.c:2639 src/protocols/yahoo/yahoo.c:3151
 msgid "Not In Office"
 msgstr "Not In Office"
 
-#: src/protocols/yahoo/yahoo.c:2629 src/protocols/yahoo/yahoo.c:3137
+#: src/protocols/yahoo/yahoo.c:2643 src/protocols/yahoo/yahoo.c:3157
 msgid "On Vacation"
 msgstr "On Vacation"
 
-#: src/protocols/yahoo/yahoo.c:2633 src/protocols/yahoo/yahoo.c:3143
+#: src/protocols/yahoo/yahoo.c:2647 src/protocols/yahoo/yahoo.c:3163
 msgid "Stepped Out"
 msgstr "Stepped Out"
 
-#: src/protocols/yahoo/yahoo.c:2714 src/protocols/yahoo/yahoo.c:2740
+#: src/protocols/yahoo/yahoo.c:2728 src/protocols/yahoo/yahoo.c:2754
 msgid "Not on server list"
 msgstr "Not on server list"
 
-#: src/protocols/yahoo/yahoo.c:2819
+#: src/protocols/yahoo/yahoo.c:2833
 msgid "Join in Chat"
 msgstr "Join in Chat"
 
-#: src/protocols/yahoo/yahoo.c:2824
+#: src/protocols/yahoo/yahoo.c:2838
 msgid "Initiate Conference"
 msgstr "Initiate Conference"
 
-#: src/protocols/yahoo/yahoo.c:2876
+#: src/protocols/yahoo/yahoo.c:2890
 msgid "Active which ID?"
 msgstr "Active which ID?"
 
-#: src/protocols/yahoo/yahoo.c:2885
+#: src/protocols/yahoo/yahoo.c:2899
 msgid "Join who in chat?"
 msgstr "Join who in chat?"
 
-#: src/protocols/yahoo/yahoo.c:2895
+#: src/protocols/yahoo/yahoo.c:2909
 msgid "Activate ID..."
 msgstr "Activate ID..."
 
-#: src/protocols/yahoo/yahoo.c:2899
+#: src/protocols/yahoo/yahoo.c:2913
 msgid "Join user in chat..."
 msgstr "Join user in chat..."
 
-#: src/protocols/yahoo/yahoo.c:3450
+#: src/protocols/yahoo/yahoo.c:3473
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 
-#: src/protocols/yahoo/yahoo.c:3454
+#: src/protocols/yahoo/yahoo.c:3477
 msgid "buzz: Buzz a contact to get their attention"
 msgstr "buzz: Buzz a contact to get their attention"
 
@@ -10281,47 +10420,47 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/yahoo/yahoo.c:3534 src/protocols/yahoo/yahoo.c:3536
+#: src/protocols/yahoo/yahoo.c:3557 src/protocols/yahoo/yahoo.c:3559
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo Protocol Plugin"
 
-#: src/protocols/yahoo/yahoo.c:3555
+#: src/protocols/yahoo/yahoo.c:3578
 msgid "Yahoo Japan"
 msgstr "Yahoo Japan"
 
-#: src/protocols/yahoo/yahoo.c:3558
+#: src/protocols/yahoo/yahoo.c:3581
 msgid "Pager host"
 msgstr "Pager host"
 
-#: src/protocols/yahoo/yahoo.c:3561
+#: src/protocols/yahoo/yahoo.c:3584
 msgid "Japan Pager host"
 msgstr "Japan Pager host"
 
-#: src/protocols/yahoo/yahoo.c:3564
+#: src/protocols/yahoo/yahoo.c:3587
 msgid "Pager port"
 msgstr "Pager port"
 
-#: src/protocols/yahoo/yahoo.c:3567
+#: src/protocols/yahoo/yahoo.c:3590
 msgid "File transfer host"
 msgstr "File transfer host"
 
-#: src/protocols/yahoo/yahoo.c:3570
+#: src/protocols/yahoo/yahoo.c:3593
 msgid "Japan File transfer host"
 msgstr "Japan File transfer host"
 
-#: src/protocols/yahoo/yahoo.c:3573
+#: src/protocols/yahoo/yahoo.c:3596
 msgid "File transfer port"
 msgstr "File transfer port"
 
-#: src/protocols/yahoo/yahoo.c:3576
+#: src/protocols/yahoo/yahoo.c:3599
 msgid "Chat Room List Url"
 msgstr "Chat Room List Url"
 
-#: src/protocols/yahoo/yahoo.c:3579
+#: src/protocols/yahoo/yahoo.c:3602
 msgid "YCHT Host"
 msgstr "YCHT Host"
 
-#: src/protocols/yahoo/yahoo.c:3582
+#: src/protocols/yahoo/yahoo.c:3605
 msgid "YCHT Port"
 msgstr "YCHT Port"
 
@@ -10499,72 +10638,72 @@
 msgid "Unable send to chat %s,%s,%s"
 msgstr "Unable send to chat %s,%s,%s"
 
-#: src/protocols/zephyr/zephyr.c:710 src/protocols/zephyr/zephyr.c:1124
+#: src/protocols/zephyr/zephyr.c:710 src/protocols/zephyr/zephyr.c:1125
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>User:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:714 src/protocols/zephyr/zephyr.c:1129
+#: src/protocols/zephyr/zephyr.c:714 src/protocols/zephyr/zephyr.c:1130
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>Hidden or not logged-in"
 
-#: src/protocols/zephyr/zephyr.c:719 src/protocols/zephyr/zephyr.c:1131
+#: src/protocols/zephyr/zephyr.c:719 src/protocols/zephyr/zephyr.c:1132
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>At %s since %s"
 
-#: src/protocols/zephyr/zephyr.c:1420 src/protocols/zephyr/zephyr.c:1421
+#: src/protocols/zephyr/zephyr.c:1421 src/protocols/zephyr/zephyr.c:1422
 msgid "Anyone"
 msgstr "Anyone"
 
-#: src/protocols/zephyr/zephyr.c:2238
+#: src/protocols/zephyr/zephyr.c:2240
 msgid "_Class:"
 msgstr "_Class:"
 
-#: src/protocols/zephyr/zephyr.c:2244
+#: src/protocols/zephyr/zephyr.c:2246
 msgid "_Instance:"
 msgstr "_Instance:"
 
-#: src/protocols/zephyr/zephyr.c:2250
+#: src/protocols/zephyr/zephyr.c:2252
 msgid "_Recipient:"
 msgstr "_Recipient:"
 
-#: src/protocols/zephyr/zephyr.c:2261
+#: src/protocols/zephyr/zephyr.c:2263
 #, 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:2566
+#: src/protocols/zephyr/zephyr.c:2569
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;nick&gt;: Locate user"
 
-#: src/protocols/zephyr/zephyr.c:2571
+#: src/protocols/zephyr/zephyr.c:2574
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;nick&gt;: Locate user"
 
-#: src/protocols/zephyr/zephyr.c:2576
+#: src/protocols/zephyr/zephyr.c:2579
 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:2581
+#: src/protocols/zephyr/zephyr.c:2584
 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:2586
+#: src/protocols/zephyr/zephyr.c:2589
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "topic &lt;instance&gt;: Set the instance to be used on this class"
 
-#: src/protocols/zephyr/zephyr.c:2592
+#: src/protocols/zephyr/zephyr.c:2595
 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:2597
+#: src/protocols/zephyr/zephyr.c:2600
 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:2603
+#: src/protocols/zephyr/zephyr.c:2606
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
@@ -10572,7 +10711,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:2609
+#: src/protocols/zephyr/zephyr.c:2612
 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;"
@@ -10580,7 +10719,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:2615
+#: src/protocols/zephyr/zephyr.c:2618
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
@@ -10588,15 +10727,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:2620
+#: src/protocols/zephyr/zephyr.c:2623
 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:2726
+#: src/protocols/zephyr/zephyr.c:2729
 msgid "Resubscribe"
 msgstr "Resubscribe"
 
-#: src/protocols/zephyr/zephyr.c:2729
+#: src/protocols/zephyr/zephyr.c:2732
 msgid "Retrieve subscriptions from server"
 msgstr "Retrieve subscriptions from server"
 
@@ -10610,51 +10749,51 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/zephyr/zephyr.c:2812 src/protocols/zephyr/zephyr.c:2814
+#: src/protocols/zephyr/zephyr.c:2815 src/protocols/zephyr/zephyr.c:2817
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr Protocol Plugin"
 
-#: src/protocols/zephyr/zephyr.c:2839
+#: src/protocols/zephyr/zephyr.c:2842
 msgid "Export to .anyone"
 msgstr "Export to .anyone"
 
-#: src/protocols/zephyr/zephyr.c:2842
-msgid "Export to .zephyr.subs"
-msgstr "Export to .zephyr.subs"
-
 #: src/protocols/zephyr/zephyr.c:2845
+msgid "Export to .zephyr.subs"
+msgstr "Export to .zephyr.subs"
+
+#: src/protocols/zephyr/zephyr.c:2848
 msgid "Import from .anyone"
 msgstr "Import from .anyone"
 
-#: src/protocols/zephyr/zephyr.c:2848
+#: src/protocols/zephyr/zephyr.c:2851
 msgid "Import from .zephyr.subs"
 msgstr "Import from .zephyr.subs"
 
-#: src/protocols/zephyr/zephyr.c:2851
+#: src/protocols/zephyr/zephyr.c:2854
 msgid "Realm"
 msgstr "Realm"
 
-#: src/protocols/zephyr/zephyr.c:2854
+#: src/protocols/zephyr/zephyr.c:2857
 msgid "Exposure"
 msgstr "Exposure"
 
 #. XXX: why in the hell are we calling gaim_connection_error() here?
 #. Forbidden
-#: src/proxy.c:870
+#: src/proxy.c:953
 #, c-format
 msgid "Access denied: proxy server forbids port %d tunnelling."
 msgstr "Access denied: proxy server forbids port %d tunnelling."
 
-#: src/proxy.c:874
+#: src/proxy.c:957
 #, c-format
 msgid "Proxy connection error %d"
 msgstr "Proxy connection error %d"
 
-#: src/proxy.c:1520
+#: src/proxy.c:1612
 msgid "Invalid proxy settings"
 msgstr "Invalid proxy settings"
 
-#: src/proxy.c:1520
+#: src/proxy.c:1612
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -10665,7 +10804,7 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #.
-#: src/request.h:1255
+#: src/request.h:1254
 msgid "Accept"
 msgstr "Accept"
 
@@ -10689,7 +10828,7 @@
 msgid "(1 message)"
 msgstr "(1 message)"
 
-#: src/server.c:1162
+#: src/server.c:1164
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -10698,31 +10837,31 @@
 "%s has invited %s to the chat room %s:\n"
 "<b>%s</b>"
 
-#: src/server.c:1166
+#: src/server.c:1168
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s has invited %s to the chat room %s\n"
 
-#: src/server.c:1172
+#: src/server.c:1174
 msgid "Accept chat invitation?"
 msgstr "Accept chat invitation?"
 
-#: src/status.c:552
+#: src/status.c:553
 #, c-format
 msgid "%s came back"
 msgstr "%s came back"
 
-#: src/status.c:557
+#: src/status.c:558
 #, c-format
 msgid "%s went away"
 msgstr "%s went away"
 
-#: src/status.c:1154
+#: src/status.c:1269
 #, c-format
 msgid "%s became idle"
 msgstr "%s became idle"
 
-#: src/status.c:1170
+#: src/status.c:1285
 #, c-format
 msgid "%s became unidle"
 msgstr "%s became unidle"
@@ -10782,15 +10921,3 @@
 #: src/util.c:2834
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Error opening connection.\n"
-
-#: src/win32/win32dep.c:273
-msgid "Moving Gaim Settings.."
-msgstr "Moving Gaim Settings.."
-
-#: src/win32/win32dep.c:276
-msgid "Moving Gaim user settings to: "
-msgstr "Moving Gaim user settings to: "
-
-#: src/win32/win32dep.c:278
-msgid "Notification"
-msgstr "Notification"