diff po/en_CA.po @ 9069:0c69f5182652

[gaim-migrate @ 9845] updated committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Wed, 26 May 2004 03:28:36 +0000
parents 82f0d88ada18
children 8d22bc97b7be
line wrap: on
line diff
--- a/po/en_CA.po	Wed May 26 03:20:33 2004 +0000
+++ b/po/en_CA.po	Wed May 26 03:28:36 2004 +0000
@@ -1,20 +1,20 @@
 # Canadian English translation of gaim
 # Copyright (C) 2004 Adam Weinberger
-# This file is distributed under the same license as the gaim package.
+# This file is distributed under the same licence as the gaim package.
 # en_CA.po Maintainer: Adam Weinberger <adamw@gnome.org>
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gaim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-03 17:05-0400\n"
-"PO-Revision-Date: 2004-05-03 20:21-0400\n"
+"POT-Creation-Date: 2004-05-25 13:09-0700\n"
+"PO-Revision-Date: 2004-05-25 13:20-0700\n"
 "Last-Translator: Adam Weinberger <adamw@gnome.org>\n"
 "Language-Team: en_CA <adamw@FreeBSD.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);"
 
 #: plugins/autorecon.c:174
 msgid "Error Message Suppression"
@@ -163,19 +163,21 @@
 msgid "New..."
 msgstr "New..."
 
-#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1604 src/protocols/gg/gg.c:51
+#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1645 src/protocols/gg/gg.c:51
 #: src/protocols/irc/msgs.c:187 src/protocols/jabber/jabber.c:957
 #: src/protocols/jabber/jutil.c:32 src/protocols/jabber/presence.c:63
-#: src/protocols/jabber/presence.c:119 src/protocols/novell/novell.c:2149
-#: src/protocols/novell/novell.c:2266 src/protocols/novell/novell.c:2318
-#: src/protocols/oscar/oscar.c:520 src/protocols/oscar/oscar.c:4827
-#: src/protocols/oscar/oscar.c:5810 src/protocols/oscar/oscar.c:6428
+#: src/protocols/jabber/presence.c:119 src/protocols/novell/novell.c:2723
+#: src/protocols/novell/novell.c:2840 src/protocols/novell/novell.c:2892
+#: src/protocols/oscar/oscar.c:528 src/protocols/oscar/oscar.c:5452
+#: src/protocols/oscar/oscar.c:6434 src/protocols/oscar/oscar.c:6633
+#: src/protocols/silc/buddy.c:1405 src/protocols/silc/silc.c:46
+#: src/protocols/silc/silc.c:76
 msgid "Away"
 msgstr "Away"
 
 #. else...
 #: plugins/docklet/docklet.c:159 src/away.c:550
-#: src/protocols/oscar/oscar.c:4745 src/protocols/oscar/oscar.c:6436
+#: src/protocols/oscar/oscar.c:5370 src/protocols/oscar/oscar.c:6641
 msgid "Back"
 msgstr "Back"
 
@@ -183,16 +185,15 @@
 msgid "Mute Sounds"
 msgstr "Mute Sounds"
 
-#: plugins/docklet/docklet.c:172 src/gtkft.c:605
+#: plugins/docklet/docklet.c:172 src/gtkft.c:619
 msgid "File Transfers"
 msgstr "File Transfers"
 
-#. And now for the buttons
-#: plugins/docklet/docklet.c:173 src/gtkaccount.c:2070 src/main.c:286
+#: plugins/docklet/docklet.c:173 src/gtkaccount.c:2070
 msgid "Accounts"
 msgstr "Accounts"
 
-#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2576 src/main.c:292
+#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2596
 msgid "Preferences"
 msgstr "Preferences"
 
@@ -406,14 +407,15 @@
 #: plugins/gevolution/add_buddy_dialog.c:146
 #: plugins/gevolution/add_buddy_dialog.c:157
 #: plugins/gevolution/assoc-buddy.c:84 plugins/gevolution/assoc-buddy.c:95
-#: src/gtkblist.c:2957 src/gtkprefs.c:1637 src/protocols/jabber/jabber.c:921
+#: src/gtkblist.c:2958 src/gtkprefs.c:918 src/gtkprefs.c:1064
+#: src/gtkprefs.c:1106 src/gtkprefs.c:1658 src/protocols/jabber/jabber.c:921
 msgid "None"
 msgstr "None"
 
 #: plugins/gevolution/add_buddy_dialog.c:190
-#: plugins/gevolution/assoc-buddy.c:178 src/gtkprefs.c:1984
-#: src/gtkroomlist.c:561 src/protocols/jabber/jabber.c:596
-#: src/protocols/msn/msn.c:1369 src/protocols/trepia/trepia.c:398
+#: plugins/gevolution/assoc-buddy.c:178 src/gtkprefs.c:2005
+#: src/gtkroomlist.c:548 src/protocols/jabber/jabber.c:596
+#: src/protocols/msn/msn.c:1371 src/protocols/trepia/trepia.c:398
 msgid "Name"
 msgstr "Name"
 
@@ -427,13 +429,13 @@
 
 #. "Search"
 #: plugins/gevolution/add_buddy_dialog.c:495
-#: plugins/gevolution/assoc-buddy.c:383 src/protocols/oscar/oscar.c:6699
+#: plugins/gevolution/assoc-buddy.c:383 src/protocols/oscar/oscar.c:6920
 msgid "Search"
 msgstr "Search"
 
 #: plugins/gevolution/add_buddy_dialog.c:566
-#: plugins/gevolution/new_person_dialog.c:310 src/gtkblist.c:3978
-#: src/gtkblist.c:4306
+#: plugins/gevolution/new_person_dialog.c:310 src/gtkblist.c:3983
+#: src/gtkblist.c:4312
 msgid "Group:"
 msgstr "Group:"
 
@@ -470,26 +472,26 @@
 msgid "_Associate Buddy"
 msgstr "_Associate Buddy"
 
-#: plugins/gevolution/gevo-util.c:66 plugins/gevolution/gevolution.c:90
-#: src/blist.c:685 src/blist.c:872 src/blist.c:2105 src/gtkblist.c:3803
+#: plugins/gevolution/gevo-util.c:68 plugins/gevolution/gevolution.c:90
+#: src/blist.c:685 src/blist.c:872 src/blist.c:2106 src/gtkblist.c:3807
 #: src/protocols/jabber/roster.c:66 src/protocols/msn/notification.c:799
 msgid "Buddies"
 msgstr "Buddies"
 
-#: plugins/gevolution/gevolution.c:214
+#: plugins/gevolution/gevolution.c:221
 msgid "Add to Address Book"
 msgstr "Add to Address Book"
 
 #. Configuration frame
-#: plugins/gevolution/gevolution.c:347
+#: plugins/gevolution/gevolution.c:352
 msgid "Evolution Integration Configuration"
 msgstr "Evolution Integration Configuration"
 
-#: plugins/gevolution/gevolution.c:350
+#: plugins/gevolution/gevolution.c:355
 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:380 src/gtkconn.c:620
+#: plugins/gevolution/gevolution.c:385 plugins/idle.c:51 src/gtkconn.c:620
 msgid "Account"
 msgstr "Account"
 
@@ -500,7 +502,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gevolution/gevolution.c:461
+#: plugins/gevolution/gevolution.c:466
 msgid "Evolution Integration"
 msgstr "Evolution Integration"
 
@@ -508,7 +510,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/gevolution/gevolution.c:464 plugins/gevolution/gevolution.c:466
+#: plugins/gevolution/gevolution.c:469 plugins/gevolution/gevolution.c:471
 msgid "Provides integration with Ximian Evolution."
 msgstr "Provides integration with Ximian Evolution."
 
@@ -535,7 +537,7 @@
 
 #. Label
 #: plugins/gevolution/new_person_dialog.c:341 src/gtkaccount.c:320
-#: src/protocols/oscar/oscar.c:425
+#: src/protocols/oscar/oscar.c:433
 msgid "Buddy Icon"
 msgstr "Buddy Icon"
 
@@ -551,15 +553,15 @@
 msgid "E-mail:"
 msgstr "E-mail:"
 
-#: plugins/history.c:70
+#: plugins/history.c:88
 msgid "History"
 msgstr "History"
 
-#: plugins/history.c:72
+#: plugins/history.c:90
 msgid "Shows recently logged conversations in new conversations."
 msgstr "Shows recently logged conversations in new conversations."
 
-#: plugins/history.c:73
+#: plugins/history.c:91
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
@@ -586,31 +588,27 @@
 msgid "Iconifies the buddy list and your conversations when you go away."
 msgstr "Iconifies the buddy list and your conversations when you go away."
 
-#: plugins/idle.c:70
-msgid "Idle Time"
-msgstr "Idle Time"
-
-#: plugins/idle.c:78
-msgid "Set"
-msgstr "Set"
-
-#: plugins/idle.c:83
-msgid "idle for"
-msgstr "idle for"
-
-#: plugins/idle.c:90 plugins/timestamp.c:109
-msgid "minutes."
-msgstr "minutes."
-
-#: plugins/idle.c:96
+#: plugins/idle.c:55
+msgid "Minutes"
+msgstr "Minutes"
+
+#: plugins/idle.c:62 plugins/idle.c:95
+msgid "I'dle Mak'er"
+msgstr "I'dle Mak'er"
+
+#: plugins/idle.c:63 plugins/idle.c:78
+msgid "Set Account Idle Time"
+msgstr "Set Account Idle Time"
+
+#: plugins/idle.c:66
 msgid "_Set"
 msgstr "_Set"
 
-#: plugins/idle.c:119
-msgid "I'dle Mak'er"
-msgstr "I'dle Mak'er"
-
-#: plugins/idle.c:121 plugins/idle.c:122
+#: plugins/idle.c:67 src/dialogs.c:793
+msgid "_Cancel"
+msgstr "_Cancel"
+
+#: plugins/idle.c:97 plugins/idle.c:98
 msgid "Allows you to hand-configure how long you've been idle for"
 msgstr "Allows you to hand-configure how long you've been idle for"
 
@@ -853,7 +851,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/signals-test.c:465
+#: plugins/signals-test.c:554
 msgid "Signals Test"
 msgstr "Signals Test"
 
@@ -861,7 +859,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/signals-test.c:468 plugins/signals-test.c:470
+#: plugins/signals-test.c:557 plugins/signals-test.c:559
 msgid "Test to see that all signals are working properly."
 msgstr "Test to see that all signals are working properly."
 
@@ -1012,11 +1010,11 @@
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
 
-#: plugins/tcl/tcl.c:350
+#: plugins/tcl/tcl.c:359
 msgid "Tcl Plugin Loader"
 msgstr "Tcl Plugin Loader"
 
-#: plugins/tcl/tcl.c:352 plugins/tcl/tcl.c:353
+#: plugins/tcl/tcl.c:361 plugins/tcl/tcl.c:362
 msgid "Provides support for loading Tcl plugins"
 msgstr "Provides support for loading Tcl plugins"
 
@@ -1047,6 +1045,10 @@
 msgid "Delay"
 msgstr "Delay"
 
+#: plugins/timestamp.c:109
+msgid "minutes."
+msgstr "minutes."
+
 #: plugins/timestamp.c:115
 msgid "_Apply"
 msgstr "_Apply"
@@ -1071,40 +1073,30 @@
 msgstr "Adds iChat-style timestamps to conversations every N minutes."
 
 #: plugins/win32/transparency/win2ktrans.c:133
-#: plugins/win32/transparency/win2ktrans.c:348
-#: plugins/win32/transparency/win2ktrans.c:379
+#: plugins/win32/transparency/win2ktrans.c:389
+#: plugins/win32/transparency/win2ktrans.c:420
 msgid "Opacity:"
 msgstr "Opacity:"
 
 #. IM Convo trans options
-#: plugins/win32/transparency/win2ktrans.c:329
+#: plugins/win32/transparency/win2ktrans.c:370
 msgid "IM Conversation Windows"
 msgstr "IM Conversation Windows"
 
-#: plugins/win32/transparency/win2ktrans.c:330
+#: plugins/win32/transparency/win2ktrans.c:371
 msgid "_IM window transparency"
 msgstr "_IM window transparency"
 
-#: plugins/win32/transparency/win2ktrans.c:340
+#: plugins/win32/transparency/win2ktrans.c:381
 msgid "_Show slider bar in IM window"
 msgstr "_Show slider bar in IM window"
 
 #. Buddy List trans options
-#.
-#. vbox = gaim_gtk_make_frame (ret, _("Buddy List Toolbar"));
-#. gaim_gtk_prefs_dropdown(vbox, _("Show _buttons as:"), GAIM_PREF_INT,
-#. "/gaim/gtk/blist/button_style",
-#. _("Pictures"), GAIM_BUTTON_IMAGE,
-#. _("Text"), GAIM_BUTTON_TEXT,
-#. _("Pictures and text"), GAIM_BUTTON_TEXT_IMAGE,
-#. _("None"), GAIM_BUTTON_NONE,
-#. NULL);
-#.
-#: plugins/win32/transparency/win2ktrans.c:365 src/gtkprefs.c:845
+#: plugins/win32/transparency/win2ktrans.c:406 src/gtkprefs.c:912
 msgid "Buddy List Window"
 msgstr "Buddy List Window"
 
-#: plugins/win32/transparency/win2ktrans.c:366
+#: plugins/win32/transparency/win2ktrans.c:407
 msgid "_Buddy List window transparency"
 msgstr "_Buddy List window transparency"
 
@@ -1115,18 +1107,18 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/win32/transparency/win2ktrans.c:422
+#: plugins/win32/transparency/win2ktrans.c:463
 msgid "Transparency"
 msgstr "Transparency"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/win32/transparency/win2ktrans.c:425
+#: plugins/win32/transparency/win2ktrans.c:466
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "Variable Transparency for the buddy list and conversations."
 
-#: plugins/win32/transparency/win2ktrans.c:427
+#: plugins/win32/transparency/win2ktrans.c:468
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
@@ -1152,8 +1144,8 @@
 msgstr "_Start Gaim on Windows startup"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:2998
-#: src/gtkprefs.c:2483
+#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:2999
+#: src/gtkprefs.c:2503
 msgid "Buddy List"
 msgstr "Buddy List"
 
@@ -1172,8 +1164,8 @@
 msgstr "_Keep Buddy List window on top"
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:885
-#: src/gtkprefs.c:2484 src/protocols/msn/msn.c:1611
+#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:965
+#: src/gtkprefs.c:2504 src/protocols/msn/msn.c:1613
 msgid "Conversations"
 msgstr "Conversations"
 
@@ -1189,16 +1181,16 @@
 msgid "Options specific to Windows Gaim."
 msgstr "Options specific to Windows Gaim."
 
-#: src/about.c:59
+#: src/about.c:60
 msgid "About Gaim"
 msgstr "About Gaim"
 
-#: src/about.c:74
+#: src/about.c:75
 #, c-format
 msgid "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
 
-#: src/about.c:94
+#: src/about.c:95
 msgid ""
 "Gaim is a modular Instant Messaging client capable of using AIM, ICQ, "
 "Yahoo!, MSN, IRC, Jabber, Napster, Zephyr, and Gadu-Gadu all at once.  It is "
@@ -1206,213 +1198,213 @@
 msgstr ""
 "Gaim is a modular Instant Messaging client capable of using AIM, ICQ, "
 "Yahoo!, MSN, IRC, Jabber, Napster, Zephyr, and Gadu-Gadu all at once.  It is "
-"written using Gtk+ and is licensed under the GPL.<BR><BR>"
-
-#: src/about.c:104
+"written using Gtk+ and is licenced under the GPL.<BR><BR>"
+
+#: src/about.c:105
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 
-#: src/about.c:109
-msgid "Active Developers"
-msgstr "Active Developers"
-
 #: src/about.c:110
+msgid "Active Developers"
+msgstr "Active Developers"
+
+#: src/about.c:111
 msgid "maintainer"
 msgstr "maintainer"
 
-#: src/about.c:112
+#: src/about.c:113
 msgid "lead developer"
 msgstr "lead developer"
 
-#: src/about.c:115
-msgid "developer & webmaster"
-msgstr "developer & webmaster"
-
 #: src/about.c:116
+msgid "developer & webmaster"
+msgstr "developer & webmaster"
+
+#: src/about.c:117
 msgid "win32 port"
 msgstr "win32 port"
 
-#: src/about.c:119 src/about.c:120 src/about.c:121
+#: src/about.c:120 src/about.c:121 src/about.c:122 src/about.c:123
 msgid "developer"
 msgstr "developer"
 
-#: src/about.c:122
+#: src/about.c:124
 msgid "support"
 msgstr "support"
 
-#: src/about.c:129
+#: src/about.c:131
 msgid "Crazy Patch Writers"
 msgstr "Crazy Patch Writers"
 
-#: src/about.c:145
+#: src/about.c:146
 msgid "Retired Developers"
 msgstr "Retired Developers"
 
-#: src/about.c:146
+#: src/about.c:147
 msgid "former libfaim maintainer"
 msgstr "former libfaim maintainer"
 
-#: src/about.c:147
+#: src/about.c:148
 msgid "former lead developer"
 msgstr "former lead developer"
 
-#: src/about.c:150
+#: src/about.c:151
 msgid "former maintainer"
 msgstr "former maintainer"
 
-#: src/about.c:151
+#: src/about.c:152
 msgid "former Jabber developer"
 msgstr "former Jabber developer"
 
-#: src/about.c:152
+#: src/about.c:153
 msgid "original author"
 msgstr "original author"
 
-#: src/about.c:155
+#: src/about.c:156
 msgid "hacker and designated driver [lazy bum]"
 msgstr "hacker and designated driver [lazy bum]"
 
-#: src/about.c:163
+#: src/about.c:164
 msgid "Current Translators"
 msgstr "Current Translators"
 
-#: src/about.c:164 src/about.c:201
-msgid "Catalan"
-msgstr "Catalan"
-
 #: src/about.c:165 src/about.c:202
+msgid "Catalan"
+msgstr "Catalan"
+
+#: src/about.c:166 src/about.c:203
 msgid "Czech"
 msgstr "Czech"
 
-#: src/about.c:166
+#: src/about.c:167
 msgid "Danish"
 msgstr "Danish"
 
-#: src/about.c:167
-msgid "British English"
-msgstr "British English"
-
 #: src/about.c:168
+msgid "British English"
+msgstr "British English"
+
+#: src/about.c:169
 msgid "Canadian English"
 msgstr "Canadian English"
 
-#: src/about.c:169 src/about.c:203
+#: src/about.c:170 src/about.c:204
 msgid "German"
 msgstr "German"
 
-#: src/about.c:170 src/about.c:204
+#: src/about.c:171 src/about.c:205
 msgid "Spanish"
 msgstr "Spanish"
 
-#: src/about.c:171 src/about.c:205
-msgid "Finnish"
-msgstr "Finnish"
-
 #: src/about.c:172 src/about.c:206
+msgid "Finnish"
+msgstr "Finnish"
+
+#: src/about.c:173 src/about.c:207
 msgid "French"
 msgstr "French"
 
-#: src/about.c:173
+#: src/about.c:174
 msgid "Hebrew"
 msgstr "Hebrew"
 
-#: src/about.c:174
+#: src/about.c:175
 msgid "Hindi"
 msgstr "Hindi"
 
-#: src/about.c:175
+#: src/about.c:176
 msgid "Hungarian"
 msgstr "Hungarian"
 
-#: src/about.c:176 src/about.c:207
+#: src/about.c:177 src/about.c:208
 msgid "Italian"
 msgstr "Italian"
 
-#: src/about.c:177 src/about.c:209
+#: src/about.c:178 src/about.c:210
 msgid "Korean"
 msgstr "Korean"
 
-#: src/about.c:178
+#: src/about.c:179
 msgid "Dutch; Flemish"
 msgstr "Dutch; Flemish"
 
-#: src/about.c:179
+#: src/about.c:180
 msgid "Macedonian"
 msgstr "Macedonian"
 
-#: src/about.c:180
+#: src/about.c:181
 msgid "Norwegian"
 msgstr "Norwegian"
 
-#: src/about.c:181 src/about.c:210
+#: src/about.c:182 src/about.c:211
 msgid "Polish"
 msgstr "Polish"
 
-#: src/about.c:182
+#: src/about.c:183
 msgid "Portuguese"
 msgstr "Portuguese"
 
-#: src/about.c:183
+#: src/about.c:184
 msgid "Portuguese-Brazil"
 msgstr "Portuguese-Brazil"
 
-#: src/about.c:184
+#: src/about.c:185
 msgid "Romanian"
 msgstr "Romanian"
 
-#: src/about.c:185 src/about.c:211
+#: src/about.c:186 src/about.c:212
 msgid "Russian"
 msgstr "Russian"
 
-#: src/about.c:186
+#: src/about.c:187
 msgid "Serbian"
 msgstr "Serbian"
 
-#: src/about.c:187
+#: src/about.c:188
 msgid "Slovenian"
 msgstr "Slovenian"
 
-#: src/about.c:188 src/about.c:213
+#: src/about.c:189 src/about.c:214
 msgid "Swedish"
 msgstr "Swedish"
 
-#: src/about.c:189
+#: src/about.c:190
 msgid "Vietnamese"
 msgstr "Vietnamese"
 
-#: src/about.c:189
+#: src/about.c:190
 msgid "Gnome Vi Team"
 msgstr "Gnome Vi Team"
 
-#: src/about.c:190
+#: src/about.c:191
 msgid "Simplified Chinese"
 msgstr "Simplified Chinese"
 
-#: src/about.c:191
+#: src/about.c:192
 msgid "Traditional Chinese"
 msgstr "Traditional Chinese"
 
-#: src/about.c:198
+#: src/about.c:199
 msgid "Past Translators"
 msgstr "Past Translators"
 
-#: src/about.c:199
-msgid "Amharic"
-msgstr "Amharic"
-
 #: src/about.c:200
+msgid "Amharic"
+msgstr "Amharic"
+
+#: src/about.c:201
 msgid "Bulgarian"
 msgstr "Bulgarian"
 
-#: src/about.c:208
+#: src/about.c:209
 msgid "Japanese"
 msgstr "Japanese"
 
-#: src/about.c:212
+#: src/about.c:213
 msgid "Slovak"
 msgstr "Slovak"
 
-#: src/about.c:214
+#: src/about.c:215
 msgid "Chinese"
 msgstr "Chinese"
 
@@ -1448,38 +1440,45 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:343 src/connection.c:198 src/dialogs.c:471 src/dialogs.c:527
-#: src/gtkblist.c:2363 src/gtkrequest.c:235 src/protocols/jabber/jabber.c:1043
-#: src/protocols/jabber/xdata.c:337 src/protocols/msn/msn.c:191
-#: src/protocols/msn/msn.c:202 src/protocols/msn/msn.c:213
-#: src/protocols/msn/msn.c:224 src/protocols/oscar/oscar.c:2759
-#: src/protocols/oscar/oscar.c:2840 src/protocols/oscar/oscar.c:6489
-#: src/protocols/oscar/oscar.c:6585 src/protocols/oscar/oscar.c:6634
-#: src/protocols/oscar/oscar.c:6716 src/protocols/yahoo/yahoo.c:2504
-#: src/protocols/yahoo/yahoo.c:2512 src/request.h:1242
+#: src/account.c:343 src/connection.c:197 src/dialogs.c:471 src/dialogs.c:527
+#: src/dialogs.c:580 src/gtkblist.c:2345 src/gtkrequest.c:235
+#: src/protocols/jabber/jabber.c:1045 src/protocols/jabber/xdata.c:337
+#: src/protocols/msn/msn.c:193 src/protocols/msn/msn.c:205
+#: src/protocols/msn/msn.c:217 src/protocols/msn/msn.c:229
+#: src/protocols/oscar/oscar.c:3343 src/protocols/oscar/oscar.c:3437
+#: src/protocols/oscar/oscar.c:6702 src/protocols/oscar/oscar.c:6799
+#: src/protocols/oscar/oscar.c:6851 src/protocols/oscar/oscar.c:6937
+#: src/protocols/silc/buddy.c:460 src/protocols/silc/buddy.c:1132
+#: src/protocols/silc/chat.c:709 src/protocols/silc/ops.c:994
+#: src/protocols/silc/ops.c:1405 src/protocols/silc/silc.c:688
+#: src/protocols/yahoo/yahoo.c:2564 src/protocols/yahoo/yahoo.c:2573
+#: src/request.h:1242
 msgid "OK"
 msgstr "OK"
 
-#: src/account.c:344 src/account.c:382 src/away.c:334 src/connection.c:199
+#: src/account.c:344 src/account.c:382 src/away.c:334 src/connection.c:198
 #: src/dialogs.c:305 src/dialogs.c:317 src/dialogs.c:330 src/dialogs.c:351
-#: src/dialogs.c:472 src/dialogs.c:528 src/dialogs.c:854 src/dialogs.c:875
-#: src/dialogs.c:892 src/dialogs.c:911 src/gtkaccount.c:1744
-#: src/gtkaccount.c:2235 src/gtkblist.c:2364 src/gtkblist.c:4345
-#: src/gtkconn.c:168 src/gtkimhtmltoolbar.c:399 src/gtkprivacy.c:575
-#: src/gtkprivacy.c:588 src/gtkprivacy.c:613 src/gtkprivacy.c:624
+#: src/dialogs.c:472 src/dialogs.c:528 src/dialogs.c:581 src/dialogs.c:815
+#: src/dialogs.c:832 src/dialogs.c:851 src/gtkaccount.c:1744
+#: src/gtkaccount.c:2235 src/gtkblist.c:2346 src/gtkblist.c:4351
+#: src/gtkconn.c:168 src/gtkimhtmltoolbar.c:414 src/gtkprivacy.c:588
+#: src/gtkprivacy.c:601 src/gtkprivacy.c:626 src/gtkprivacy.c:637
 #: src/gtkrequest.c:236 src/protocols/icq/gaim_icq.c:277
-#: src/protocols/jabber/buddy.c:514 src/protocols/jabber/chat.c:693
-#: src/protocols/jabber/jabber.c:665 src/protocols/jabber/jabber.c:1044
-#: src/protocols/jabber/xdata.c:338 src/protocols/msn/msn.c:192
-#: src/protocols/msn/msn.c:203 src/protocols/msn/msn.c:214
-#: src/protocols/msn/msn.c:225 src/protocols/msn/msn.c:238
-#: src/protocols/oscar/oscar.c:2721 src/protocols/oscar/oscar.c:2760
-#: src/protocols/oscar/oscar.c:2796 src/protocols/oscar/oscar.c:2841
-#: src/protocols/oscar/oscar.c:6307 src/protocols/oscar/oscar.c:6490
-#: src/protocols/oscar/oscar.c:6586 src/protocols/oscar/oscar.c:6635
-#: src/protocols/oscar/oscar.c:6700 src/protocols/oscar/oscar.c:6717
-#: src/protocols/trepia/trepia.c:347 src/protocols/yahoo/yahoo.c:2505
-#: src/protocols/yahoo/yahoo.c:2513 src/request.h:1242 src/request.h:1252
+#: src/protocols/jabber/buddy.c:515 src/protocols/jabber/chat.c:693
+#: src/protocols/jabber/jabber.c:665 src/protocols/jabber/jabber.c:1046
+#: src/protocols/jabber/xdata.c:338 src/protocols/msn/msn.c:194
+#: src/protocols/msn/msn.c:206 src/protocols/msn/msn.c:218
+#: src/protocols/msn/msn.c:230 src/protocols/msn/msn.c:244
+#: src/protocols/oscar/oscar.c:1371 src/protocols/oscar/oscar.c:3303
+#: src/protocols/oscar/oscar.c:3344 src/protocols/oscar/oscar.c:3381
+#: src/protocols/oscar/oscar.c:3438 src/protocols/oscar/oscar.c:6703
+#: src/protocols/oscar/oscar.c:6800 src/protocols/oscar/oscar.c:6852
+#: src/protocols/oscar/oscar.c:6921 src/protocols/oscar/oscar.c:6938
+#: src/protocols/silc/buddy.c:461 src/protocols/silc/buddy.c:1037
+#: src/protocols/silc/buddy.c:1133 src/protocols/silc/chat.c:710
+#: src/protocols/silc/ops.c:1406 src/protocols/silc/silc.c:689
+#: src/protocols/trepia/trepia.c:347 src/protocols/yahoo/yahoo.c:2565
+#: src/protocols/yahoo/yahoo.c:2574 src/request.h:1242 src/request.h:1252
 msgid "Cancel"
 msgstr "Cancel"
 
@@ -1488,8 +1487,8 @@
 msgid "Change user information for %s"
 msgstr "Change user information for %s"
 
-#: src/account.c:381 src/dialogs.c:842 src/gtkrequest.c:242
-#: src/protocols/jabber/buddy.c:513 src/protocols/trepia/trepia.c:346
+#: src/account.c:381 src/gtkrequest.c:242 src/protocols/jabber/buddy.c:514
+#: src/protocols/trepia/trepia.c:346
 msgid "Save"
 msgstr "Save"
 
@@ -1511,7 +1510,7 @@
 msgstr "Remove Away Message"
 
 #. Remove button
-#: src/away.c:333 src/gtkconv.c:1111 src/gtkconv.c:3339 src/gtkconv.c:3438
+#: src/away.c:333 src/gtkconv.c:1175 src/gtkconv.c:3354 src/gtkconv.c:3453
 #: src/gtkrequest.c:241
 msgid "Remove"
 msgstr "Remove"
@@ -1524,7 +1523,7 @@
 msgid "Set All Away"
 msgstr "Set All Away"
 
-#: src/blist.c:590 src/gtkprefs.c:2486
+#: src/blist.c:590 src/gtkprefs.c:2506
 msgid "Chats"
 msgstr "Chats"
 
@@ -1533,13 +1532,11 @@
 msgid ""
 "%d buddy from group %s was not removed because its account was not logged "
 "in.  This buddy and the group were not removed.\n"
-msgid_plural ""
 "%d buddies from group %s were not removed because their accounts were not "
 "logged in.  These buddies and the group were not removed.\n"
-msgstr[0] ""
+msgstr ""
 "%d buddy from group %s was not removed because its account was not logged "
 "in.  This buddy and the group were not removed.\n"
-msgstr[1] ""
 "%d buddies from group %s were not removed because their accounts were not "
 "logged in.  These buddies and the group were not removed.\n"
 
@@ -1547,16 +1544,16 @@
 msgid "Group not removed"
 msgstr "Group not removed"
 
-#: src/blist.c:1251 src/gtkaccount.c:164 src/gtkft.c:153 src/gtkutils.c:696
-#: src/protocols/jabber/buddy.c:569 src/protocols/novell/novell.c:2161
+#: src/blist.c:1251 src/gtkaccount.c:164 src/gtkft.c:161 src/gtkutils.c:732
+#: src/protocols/jabber/buddy.c:570 src/protocols/novell/novell.c:2735
 msgid "Unknown"
 msgstr "Unknown"
 
-#: src/blist.c:1578
+#: src/blist.c:1579
 msgid "Invalid Groupname"
 msgstr "Invalid Groupname"
 
-#: src/blist.c:2235
+#: src/blist.c:2236
 msgid ""
 "An error was encountered parsing your buddy list.  It has not been loaded, "
 "and the old file has moved to blist.xml~."
@@ -1564,92 +1561,96 @@
 "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:2238
+#: src/blist.c:2239
 msgid "Buddy List Error"
 msgstr "Buddy List Error"
 
-#: src/connection.c:119 src/connection.c:170
+#: src/connection.c:118 src/connection.c:169
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "Missing protocol plugin for %s"
 
-#: src/connection.c:124
+#: src/connection.c:123
 msgid "Registration Error"
 msgstr "Registration Error"
 
-#: src/connection.c:175
+#: src/connection.c:174
 msgid "Connection Error"
 msgstr "Connection Error"
 
-#: src/connection.c:196
+#: src/connection.c:195
 #, c-format
 msgid "Enter password for %s"
 msgstr "Enter password for %s"
 
-#: src/conversation.c:296
+#: src/conversation.c:293
 msgid "Unable to send message. The message is too large."
 msgstr "Unable to send message. The message is too large."
 
-#: src/conversation.c:304
+#: src/conversation.c:301
 msgid "Unable to send message."
 msgstr "Unable to send message."
 
-#: src/conversation.c:1969
+#: src/conversation.c:1953
 #, c-format
 msgid "%s entered the room."
 msgstr "%s entered the room."
 
-#: src/conversation.c:1972
+#: src/conversation.c:1956
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] entered the room."
 
-#: src/conversation.c:2064
+#: src/conversation.c:2047
 #, c-format
 msgid "You are now known as %s"
 msgstr "You are now known as %s"
 
-#: src/conversation.c:2067
+#: src/conversation.c:2050
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s is now known as %s"
 
-#: src/conversation.c:2110
+#: src/conversation.c:2092
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s left the room (%s)."
 
-#: src/conversation.c:2112
+#: src/conversation.c:2094
 #, c-format
 msgid "%s left the room."
 msgstr "%s left the room."
 
-#: src/conversation.c:2185
+#: src/conversation.c:2165
 #, c-format
 msgid "(+%d more)"
 msgstr "(+%d more)"
 
-#: src/conversation.c:2187
+#: src/conversation.c:2167
 #, c-format
 msgid " left the room (%s)."
 msgstr " left the room (%s)."
 
-#: src/conversation.c:2467
+#: src/conversation.c:2487
 msgid "Last created window"
 msgstr "Last created window"
 
-#: src/conversation.c:2469 src/gtkprefs.c:1379
+#: src/conversation.c:2489 src/gtkprefs.c:1438
 msgid "New window"
 msgstr "New window"
 
-#: src/conversation.c:2471
+#: src/conversation.c:2491
 msgid "By group"
 msgstr "By group"
 
-#: src/conversation.c:2473
+#: src/conversation.c:2493
 msgid "By account"
 msgstr "By account"
 
+#: src/conversation.c:2495
+msgid "By conversation count"
+msgstr "By conversation count"
+
 #: src/dialogs.c:154
 msgid "Warn User"
 msgstr "Warn User"
@@ -1725,11 +1726,11 @@
 msgid "Remove Contact"
 msgstr "Remove Contact"
 
-#: src/dialogs.c:453 src/dialogs.c:509
+#: src/dialogs.c:453 src/dialogs.c:509 src/dialogs.c:561
 msgid "_Screen name"
 msgstr "_Screen name"
 
-#: src/dialogs.c:459 src/dialogs.c:515
+#: src/dialogs.c:459 src/dialogs.c:515 src/dialogs.c:567
 msgid "_Account"
 msgstr "_Account"
 
@@ -1751,74 +1752,77 @@
 msgstr ""
 "Please enter the screen name of the person whose info you would like to view."
 
-#: src/dialogs.c:552 src/gtkimhtmltoolbar.c:240
-msgid "Select Text Color"
-msgstr "Select Text Colour"
-
-#: src/dialogs.c:580 src/gtkimhtmltoolbar.c:310
-msgid "Select Background Color"
-msgstr "Select Background Colour"
-
-#: src/dialogs.c:619 src/gtkimhtmltoolbar.c:164
-msgid "Select Font"
-msgstr "Select Font"
-
-#: src/dialogs.c:692
+#: src/dialogs.c:575
+msgid "Get User Log"
+msgstr "Get User Log"
+
+#: src/dialogs.c:577
+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/dialogs.c:632
 msgid "You cannot save an away message with a blank title"
 msgstr "You cannot save an away message with a blank title"
 
-#: src/dialogs.c:694
+#: src/dialogs.c:634
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 
-#: src/dialogs.c:704
+#: src/dialogs.c:644
 msgid "You cannot create an empty away message"
 msgstr "You cannot create an empty away message"
 
-#: src/dialogs.c:766
+#: src/dialogs.c:706
 msgid "New away message"
 msgstr "New away message"
 
-#: src/dialogs.c:787
+#: src/dialogs.c:727
 msgid "Away title: "
 msgstr "Away title: "
 
+#: src/dialogs.c:781
+msgid "_Save"
+msgstr "_Save"
+
+#: src/dialogs.c:785
+msgid "Sa_ve & Use"
+msgstr "Sa_ve & Use"
+
+#: src/dialogs.c:789
+msgid "_Use"
+msgstr "_Use"
+
+#: src/dialogs.c:811
+msgid "Alias Chat"
+msgstr "Alias Chat"
+
+#: src/dialogs.c:812
+msgid "Enter an alias for this chat."
+msgstr "Enter an alias for this chat."
+
+#: src/dialogs.c:814 src/dialogs.c:831 src/dialogs.c:850 src/gtkrequest.c:243
+#: src/protocols/silc/chat.c:571
+msgid "Alias"
+msgstr "Alias"
+
+#: src/dialogs.c:828
+msgid "Alias Contact"
+msgstr "Alias Contact"
+
+#: src/dialogs.c:829
+msgid "Enter an alias for this contact."
+msgstr "Enter an alias for this contact."
+
 #: src/dialogs.c:846
-msgid "Save & Use"
-msgstr "Save & Use"
-
-#: src/dialogs.c:850
-msgid "Use"
-msgstr "Use"
-
-#: src/dialogs.c:871
-msgid "Alias Chat"
-msgstr "Alias Chat"
-
-#: src/dialogs.c:872
-msgid "Enter an alias for this chat."
-msgstr "Enter an alias for this chat."
-
-#: src/dialogs.c:874 src/dialogs.c:891 src/dialogs.c:910 src/gtkrequest.c:243
-msgid "Alias"
-msgstr "Alias"
-
-#: src/dialogs.c:888
-msgid "Alias Contact"
-msgstr "Alias Contact"
-
-#: src/dialogs.c:889
-msgid "Enter an alias for this contact."
-msgstr "Enter an alias for this contact."
-
-#: src/dialogs.c:906
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Enter an alias for %s."
 
-#: src/dialogs.c:908
+#: src/dialogs.c:848
 msgid "Alias Buddy"
 msgstr "Alias Buddy"
 
@@ -1930,19 +1934,19 @@
 msgid "sorry, i ran out for a while. bbl"
 msgstr "sorry, i ran out for a while. bbl"
 
-#: src/gaimrc.c:375 src/gaimrc.c:1451
+#: src/gaimrc.c:372 src/gaimrc.c:1411
 msgid "boring default"
 msgstr "boring default"
 
-#: src/gaimrc.c:1260 src/gtkblist.c:2959
+#: src/gaimrc.c:1221 src/gtkblist.c:2960
 msgid "Alphabetical"
 msgstr "Alphabetical"
 
-#: src/gaimrc.c:1262 src/gtkblist.c:2960
+#: src/gaimrc.c:1223 src/gtkblist.c:2961
 msgid "By status"
 msgstr "By status"
 
-#: src/gaimrc.c:1264 src/gtkblist.c:2961
+#: src/gaimrc.c:1225 src/gtkblist.c:2962
 msgid "By log size"
 msgstr "By log size"
 
@@ -1966,7 +1970,7 @@
 msgid "Protocol:"
 msgstr "Protocol:"
 
-#: src/gtkaccount.c:406 src/gtkblist.c:3950
+#: src/gtkaccount.c:406 src/gtkblist.c:3955
 msgid "Screen Name:"
 msgstr "Screen Name:"
 
@@ -1974,7 +1978,7 @@
 msgid "Password:"
 msgstr "Password:"
 
-#: src/gtkaccount.c:484 src/gtkblist.c:3964 src/gtkblist.c:4292
+#: src/gtkaccount.c:484 src/gtkblist.c:3969 src/gtkblist.c:4298
 msgid "Alias:"
 msgstr "Alias:"
 
@@ -2035,7 +2039,7 @@
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:808 src/gtkaccount.c:860 src/gtkprefs.c:1180
+#: src/gtkaccount.c:808 src/gtkaccount.c:860 src/gtkprefs.c:1239
 msgid "Use Environmental Settings"
 msgstr "Use Environmental Settings"
 
@@ -2051,15 +2055,15 @@
 msgid "Proxy Options"
 msgstr "Proxy Options"
 
-#: src/gtkaccount.c:937 src/gtkprefs.c:1174
+#: src/gtkaccount.c:937 src/gtkprefs.c:1233
 msgid "Proxy _type:"
 msgstr "Proxy _type:"
 
-#: src/gtkaccount.c:946 src/gtkprefs.c:1204
+#: src/gtkaccount.c:946 src/gtkprefs.c:1263
 msgid "_Host:"
 msgstr "_Host:"
 
-#: src/gtkaccount.c:950 src/gtkprefs.c:1222
+#: src/gtkaccount.c:950 src/gtkprefs.c:1281
 msgid "_Port:"
 msgstr "_Port:"
 
@@ -2067,7 +2071,7 @@
 msgid "_Username:"
 msgstr "_Username:"
 
-#: src/gtkaccount.c:963 src/gtkprefs.c:1259
+#: src/gtkaccount.c:963 src/gtkprefs.c:1318
 msgid "Pa_ssword:"
 msgstr "Pa_ssword:"
 
@@ -2102,14 +2106,15 @@
 msgid "Delete"
 msgstr "Delete"
 
-#: src/gtkaccount.c:1857 src/protocols/oscar/oscar.c:3364
+#: src/gtkaccount.c:1857 src/protocols/oscar/oscar.c:3968
 msgid "Screen Name"
 msgstr "Screen Name"
 
 #: src/gtkaccount.c:1880 src/protocols/jabber/jabber.c:955
-#: src/protocols/oscar/oscar.c:526 src/protocols/oscar/oscar.c:4825
-#: src/protocols/oscar/oscar.c:6427 src/protocols/yahoo/yahoo.c:2299
-#: src/protocols/zephyr/zephyr.c:1182 src/protocols/zephyr/zephyr.c:1192
+#: src/protocols/oscar/oscar.c:534 src/protocols/oscar/oscar.c:5450
+#: src/protocols/oscar/oscar.c:6632 src/protocols/silc/silc.c:44
+#: src/protocols/yahoo/yahoo.c:2301 src/protocols/zephyr/zephyr.c:1167
+#: src/protocols/zephyr/zephyr.c:1177
 msgid "Online"
 msgstr "Online"
 
@@ -2141,25 +2146,17 @@
 msgstr "Add buddy to your list?"
 
 #. Add button
-#: src/gtkaccount.c:2234 src/gtkblist.c:4344 src/gtkconv.c:1113
-#: src/gtkconv.c:3332 src/gtkconv.c:3431 src/gtkrequest.c:240
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:3003
+#: src/gtkaccount.c:2234 src/gtkblist.c:4350 src/gtkconv.c:1177
+#: src/gtkconv.c:3347 src/gtkconv.c:3446 src/gtkrequest.c:240
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:3600
 msgid "Add"
 msgstr "Add"
 
-#: src/gtkblist.c:801 src/gtkblist.c:4232
-msgid ""
-"You are not currently signed on with any protocols that have the ability to "
-"chat."
-msgstr ""
-"You are not currently signed on with any protocols that have the ability to "
-"chat."
-
-#: src/gtkblist.c:814
+#: src/gtkblist.c:812
 msgid "Join a Chat"
 msgstr "Join a Chat"
 
-#: src/gtkblist.c:835
+#: src/gtkblist.c:833
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
@@ -2167,191 +2164,199 @@
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 
-#: src/gtkblist.c:848 src/gtkpounce.c:431 src/gtkroomlist.c:365
+#: src/gtkblist.c:844 src/gtkpounce.c:431 src/gtkroomlist.c:352
 msgid "_Account:"
 msgstr "_Account:"
 
-#: src/gtkblist.c:1087 src/gtkblist.c:3148
+#: src/gtkblist.c:1132 src/gtkblist.c:3152
 msgid "Get _Info"
 msgstr "Get _Info"
 
-#: src/gtkblist.c:1090 src/gtkblist.c:3139
+#: src/gtkblist.c:1135 src/gtkblist.c:3143
 msgid "I_M"
 msgstr "I_M"
 
-#: src/gtkblist.c:1092
+#: src/gtkblist.c:1137
 msgid "Add Buddy _Pounce"
 msgstr "Add Buddy _Pounce"
 
-#: src/gtkblist.c:1094
+#: src/gtkblist.c:1139
 msgid "View _Log"
 msgstr "View _Log"
 
-#: src/gtkblist.c:1159 src/gtkblist.c:1260 src/gtkblist.c:1274
+#: src/gtkblist.c:1147 src/gtkblist.c:1233 src/gtkblist.c:1247
 msgid "_Alias..."
 msgstr "_Alias..."
 
-#: src/gtkblist.c:1161 src/gtkblist.c:1262 src/gtkblist.c:1279
+#: src/gtkblist.c:1149 src/gtkblist.c:1235 src/gtkblist.c:1252
 #: src/gtkconn.c:361
 msgid "_Remove"
 msgstr "_Remove"
 
-#: src/gtkblist.c:1206
+#: src/gtkblist.c:1195
 msgid "Add a _Buddy"
 msgstr "Add a _Buddy"
 
-#: src/gtkblist.c:1208
+#: src/gtkblist.c:1197
 msgid "Add a C_hat"
 msgstr "Add a C_hat"
 
-#: src/gtkblist.c:1210
+#: src/gtkblist.c:1199
 msgid "_Delete Group"
 msgstr "_Delete Group"
 
-#: src/gtkblist.c:1212
+#: src/gtkblist.c:1201
 msgid "_Rename"
 msgstr "_Rename"
 
 #. join button
-#: src/gtkblist.c:1238 src/gtkroomlist.c:261 src/gtkroomlist.c:417
+#: src/gtkblist.c:1223 src/gtkroomlist.c:261 src/gtkroomlist.c:404
 #: src/stock.c:87
 msgid "_Join"
 msgstr "_Join"
 
-#: src/gtkblist.c:1240
+#: src/gtkblist.c:1225
 msgid "Auto-Join"
 msgstr "Auto-Join"
 
-#: src/gtkblist.c:1276 src/gtkblist.c:1302
+#: src/gtkblist.c:1249 src/gtkblist.c:1278
 msgid "_Collapse"
 msgstr "_Collapse"
 
-#: src/gtkblist.c:1307
+#: src/gtkblist.c:1283
 msgid "_Expand"
 msgstr "_Expand"
 
-#: src/gtkblist.c:1964 src/gtkconv.c:3943 src/gtkpounce.c:333
+#: src/gtkblist.c:1941 src/gtkconv.c:3967 src/gtkpounce.c:333
 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:2312
+#: src/gtkblist.c:2292
 msgid "/_Buddies"
 msgstr "/_Buddies"
 
-#: src/gtkblist.c:2313
+#: src/gtkblist.c:2293
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Buddies/New Instant _Message..."
 
-#: src/gtkblist.c:2314
+#: src/gtkblist.c:2294
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Buddies/Join a _Chat..."
 
-#: src/gtkblist.c:2315
+#: src/gtkblist.c:2295
 msgid "/Buddies/Get User _Info..."
 msgstr "/Buddies/Get User _Info..."
 
-#: src/gtkblist.c:2317
+#: src/gtkblist.c:2296
+msgid "/Buddies/View User _Log..."
+msgstr "/Buddies/View User _Log..."
+
+#: src/gtkblist.c:2298
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Buddies/Show _Offline Buddies"
 
-#: src/gtkblist.c:2318
+#: src/gtkblist.c:2299
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Buddies/Show _Empty Groups"
 
-#: src/gtkblist.c:2319
+#: src/gtkblist.c:2300
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Buddies/_Add Buddy..."
 
-#: src/gtkblist.c:2320
+#: src/gtkblist.c:2301
 msgid "/Buddies/Add C_hat..."
 msgstr "/Buddies/Add C_hat..."
 
-#: src/gtkblist.c:2321
+#: src/gtkblist.c:2302
 msgid "/Buddies/Add _Group..."
 msgstr "/Buddies/Add _Group..."
 
-#: src/gtkblist.c:2323
+#: src/gtkblist.c:2304
 msgid "/Buddies/_Signoff"
 msgstr "/Buddies/_Signoff"
 
-#: src/gtkblist.c:2324
+#: src/gtkblist.c:2305
 msgid "/Buddies/_Quit"
 msgstr "/Buddies/_Quit"
 
 #. Tools
-#: src/gtkblist.c:2327
+#: src/gtkblist.c:2308
 msgid "/_Tools"
 msgstr "/_Tools"
 
-#: src/gtkblist.c:2328
+#: src/gtkblist.c:2309
 msgid "/Tools/_Away"
 msgstr "/Tools/_Away"
 
-#: src/gtkblist.c:2329
+#: src/gtkblist.c:2310
 msgid "/Tools/Buddy _Pounce"
 msgstr "/Tools/Buddy _Pounce"
 
-#: src/gtkblist.c:2330
+#: src/gtkblist.c:2311
 msgid "/Tools/Account Ac_tions"
 msgstr "/Tools/Account Ac_tions"
 
-#: src/gtkblist.c:2332
+#: src/gtkblist.c:2312
+msgid "/Tools/Pl_ugin Actions"
+msgstr "/Tools/Pl_ugin Actions"
+
+#: src/gtkblist.c:2314
 msgid "/Tools/A_ccounts"
 msgstr "/Tools/A_ccounts"
 
-#: src/gtkblist.c:2333
+#: src/gtkblist.c:2315
 msgid "/Tools/_File Transfers"
 msgstr "/Tools/_File Transfers"
 
-#: src/gtkblist.c:2334
+#: src/gtkblist.c:2316
 msgid "/Tools/R_oom List"
 msgstr "/Tools/R_oom List"
 
-#: src/gtkblist.c:2335
+#: src/gtkblist.c:2317
 msgid "/Tools/Pr_eferences"
 msgstr "/Tools/Pr_eferences"
 
-#: src/gtkblist.c:2336
+#: src/gtkblist.c:2318
 msgid "/Tools/Pr_ivacy"
 msgstr "/Tools/Pr_ivacy"
 
-#: src/gtkblist.c:2338
+#: src/gtkblist.c:2320
 msgid "/Tools/View System _Log"
 msgstr "/Tools/View System _Log"
 
 #. Help
-#: src/gtkblist.c:2341
+#: src/gtkblist.c:2323
 msgid "/_Help"
 msgstr "/_Help"
 
-#: src/gtkblist.c:2342
+#: src/gtkblist.c:2324
 msgid "/Help/Online _Help"
 msgstr "/Help/Online _Help"
 
-#: src/gtkblist.c:2343
+#: src/gtkblist.c:2325
 msgid "/Help/_Debug Window"
 msgstr "/Help/_Debug Window"
 
-#: src/gtkblist.c:2344
+#: src/gtkblist.c:2326
 msgid "/Help/_About"
 msgstr "/Help/_About"
 
-#: src/gtkblist.c:2360
+#: src/gtkblist.c:2342
 msgid "Rename Group"
 msgstr "Rename Group"
 
-#: src/gtkblist.c:2360
+#: src/gtkblist.c:2342
 msgid "New group name"
 msgstr "New group name"
 
-#: src/gtkblist.c:2361
+#: src/gtkblist.c:2343
 msgid "Please enter a new name for the selected group."
 msgstr "Please enter a new name for the selected group."
 
-#: src/gtkblist.c:2389
+#: src/gtkblist.c:2371
 #, c-format
 msgid ""
 "\n"
@@ -2360,7 +2365,7 @@
 "\n"
 "<b>Account:</b> %s"
 
-#: src/gtkblist.c:2453
+#: src/gtkblist.c:2435
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
@@ -2368,12 +2373,12 @@
 "\n"
 "<b>Status:</b> Offline"
 
-#: src/gtkblist.c:2468
+#: src/gtkblist.c:2450
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:2484
+#: src/gtkblist.c:2466
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -2381,7 +2386,7 @@
 "\n"
 "<b>Account:</b>"
 
-#: src/gtkblist.c:2485
+#: src/gtkblist.c:2467
 msgid ""
 "\n"
 "<b>Contact Alias:</b>"
@@ -2389,7 +2394,7 @@
 "\n"
 "<b>Contact Alias:</b>"
 
-#: src/gtkblist.c:2486
+#: src/gtkblist.c:2468
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -2397,7 +2402,7 @@
 "\n"
 "<b>Alias:</b>"
 
-#: src/gtkblist.c:2487
+#: src/gtkblist.c:2469
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -2405,7 +2410,7 @@
 "\n"
 "<b>Nickname:</b>"
 
-#: src/gtkblist.c:2488
+#: src/gtkblist.c:2470
 msgid ""
 "\n"
 "<b>Logged In:</b>"
@@ -2413,7 +2418,7 @@
 "\n"
 "<b>Logged In:</b>"
 
-#: src/gtkblist.c:2489
+#: src/gtkblist.c:2471
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -2421,7 +2426,7 @@
 "\n"
 "<b>Idle:</b>"
 
-#: src/gtkblist.c:2490
+#: src/gtkblist.c:2472
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -2429,7 +2434,7 @@
 "\n"
 "<b>Warned:</b>"
 
-#: src/gtkblist.c:2492
+#: src/gtkblist.c:2474
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2437,7 +2442,7 @@
 "\n"
 "<b>Description:</b> Spooky"
 
-#: src/gtkblist.c:2493
+#: src/gtkblist.c:2475
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
@@ -2445,7 +2450,7 @@
 "\n"
 "<b>Status</b>: Awesome"
 
-#: src/gtkblist.c:2494
+#: src/gtkblist.c:2476
 msgid ""
 "\n"
 "<b>Status</b>: Rockin'"
@@ -2453,78 +2458,96 @@
 "\n"
 "<b>Status</b>: Rockin'"
 
-#: src/gtkblist.c:2765
+#: src/gtkblist.c:2747
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "Idle (%dh%02dm) "
 
-#: src/gtkblist.c:2767
+#: src/gtkblist.c:2749
 #, c-format
 msgid "Idle (%dm) "
 msgstr "Idle (%dm) "
 
-#: src/gtkblist.c:2772
+#: src/gtkblist.c:2754
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "Warned (%d%%) "
 
-#: src/gtkblist.c:2775
+#: src/gtkblist.c:2757
 msgid "Offline "
 msgstr "Offline "
 
-#: src/gtkblist.c:3025
+#. Make menu items sensitive/insensitive where appropriate
+#: src/gtkblist.c:2875
+msgid "/Buddies/Join a Chat..."
+msgstr "/Buddies/Join a Chat..."
+
+#: src/gtkblist.c:2878
+msgid "/Tools/Room List"
+msgstr "/Tools/Room List"
+
+#: src/gtkblist.c:2881
+msgid "/Tools/Privacy"
+msgstr "/Tools/Privacy"
+
+#: src/gtkblist.c:3026
 msgid "/Tools/Away"
 msgstr "/Tools/Away"
 
-#: src/gtkblist.c:3028
+#: src/gtkblist.c:3029
 msgid "/Tools/Buddy Pounce"
 msgstr "/Tools/Buddy Pounce"
 
-#: src/gtkblist.c:3031
-#, fuzzy
+#: src/gtkblist.c:3032
 msgid "/Tools/Account Actions"
-msgstr "/Tools/A_ccounts"
+msgstr "/Tools/Account Actions"
+
+#: src/gtkblist.c:3035
+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:3119
+#: src/gtkblist.c:3123
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Buddies/Show Offline Buddies"
 
-#: src/gtkblist.c:3121
+#: src/gtkblist.c:3125
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Buddies/Show Empty Groups"
 
-#: src/gtkblist.c:3145
+#: src/gtkblist.c:3149
 msgid "Send a message to the selected buddy"
 msgstr "Send a message to the selected buddy"
 
-#: src/gtkblist.c:3154
+#: src/gtkblist.c:3158
 msgid "Get information on the selected buddy"
 msgstr "Get information on the selected buddy"
 
-#: src/gtkblist.c:3157
+#: src/gtkblist.c:3161
 msgid "_Chat"
 msgstr "_Chat"
 
-#: src/gtkblist.c:3162
+#: src/gtkblist.c:3166
 msgid "Join a chat room"
 msgstr "Join a chat room"
 
-#: src/gtkblist.c:3165
+#: src/gtkblist.c:3169
 msgid "_Away"
 msgstr "_Away"
 
-#: src/gtkblist.c:3170
+#: src/gtkblist.c:3174
 msgid "Set an away message"
 msgstr "Set an away message"
 
-#: src/gtkblist.c:3905 src/protocols/yahoo/yahoo.c:2431
+#: src/gtkblist.c:3909 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:2488
 msgid "Add Buddy"
 msgstr "Add Buddy"
 
-#: src/gtkblist.c:3928
+#: src/gtkblist.c:3933
 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. "
@@ -2535,15 +2558,23 @@
 "The alias will be displayed in place of the screen name whenever possible.\n"
 
 #. Set up stuff for the account box
-#: src/gtkblist.c:3988 src/gtkblist.c:4272
+#: src/gtkblist.c:3993 src/gtkblist.c:4278
 msgid "Account:"
 msgstr "Account:"
 
-#: src/gtkblist.c:4239
+#: src/gtkblist.c:4237
+msgid ""
+"You are not currently signed on with any protocols that have the ability to "
+"chat."
+msgstr ""
+"You are not currently signed on with any protocols that have the ability to "
+"chat."
+
+#: src/gtkblist.c:4244
 msgid "Add Chat"
 msgstr "Add Chat"
 
-#: src/gtkblist.c:4262
+#: src/gtkblist.c:4268
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -2551,15 +2582,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:4341
+#: src/gtkblist.c:4347
 msgid "Add Group"
 msgstr "Add Group"
 
-#: src/gtkblist.c:4342
+#: src/gtkblist.c:4348
 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:4887
+#: src/gtkblist.c:4915 src/gtkblist.c:5012
 msgid "No actions available"
 msgstr "No actions available"
 
@@ -2613,19 +2644,19 @@
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Conversation with %s</h1>\n"
 
-#: src/gtkconv.c:190
+#: src/gtkconv.c:190 src/gtkdebug.c:212
 msgid "That file already exists"
 msgstr "That file already exists"
 
-#: src/gtkconv.c:191 src/gtkft.c:1106
+#: src/gtkconv.c:191 src/gtkdebug.c:213 src/gtkft.c:1123
 msgid "Would you like to overwrite it?"
 msgstr "Would you like to overwrite it?"
 
-#: src/gtkconv.c:505
+#: src/gtkconv.c:554
 msgid "Invite Buddy Into Chat Room"
 msgstr "Invite Buddy Into Chat Room"
 
-#: src/gtkconv.c:533
+#: src/gtkconv.c:582
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -2633,435 +2664,448 @@
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 
-#: src/gtkconv.c:554
+#: src/gtkconv.c:603
 msgid "_Buddy:"
 msgstr "_Buddy:"
 
-#: src/gtkconv.c:574
+#: src/gtkconv.c:623
 msgid "_Message:"
 msgstr "_Message:"
 
-#: src/gtkconv.c:667
+#: src/gtkconv.c:731 src/gtkdebug.c:127
 msgid "Find"
 msgstr "Find"
 
-#: src/gtkconv.c:693
+#: src/gtkconv.c:757 src/gtkdebug.c:155
 msgid "_Search for:"
 msgstr "_Search for:"
 
-#: src/gtkconv.c:1071
+#: src/gtkconv.c:1135
 msgid "IM"
 msgstr "IM"
 
-#: src/gtkconv.c:1079
+#: src/gtkconv.c:1143
 msgid "Un-Ignore"
 msgstr "Un-Ignore"
 
-#: src/gtkconv.c:1081
+#: src/gtkconv.c:1145 src/gtkprefs.c:783
 msgid "Ignore"
 msgstr "Ignore"
 
 #. Info button
-#: src/gtkconv.c:1090 src/gtkconv.c:3346
+#: src/gtkconv.c:1154 src/gtkconv.c:3361
 msgid "Info"
 msgstr "Info"
 
-#: src/gtkconv.c:1099
+#: src/gtkconv.c:1163
 msgid "Get Away Msg"
 msgstr "Get Away Msg"
 
-#: src/gtkconv.c:2200
+#: src/gtkconv.c:2255
 msgid "Animate"
 msgstr "Animate"
 
-#: src/gtkconv.c:2205
+#: src/gtkconv.c:2260
 msgid "Hide Icon"
 msgstr "Hide Icon"
 
-#: src/gtkconv.c:2211
+#: src/gtkconv.c:2266
 msgid "Save Icon As..."
 msgstr "Save Icon As..."
 
-#: src/gtkconv.c:2578
+#: src/gtkconv.c:2635
 msgid "User is typing..."
 msgstr "User is typing..."
 
-#: src/gtkconv.c:2586
+#: src/gtkconv.c:2643
 msgid "User has typed something and paused"
 msgstr "User has typed something and paused"
 
 #. Build the Send As menu
-#: src/gtkconv.c:2689
+#: src/gtkconv.c:2746
 msgid "_Send As"
 msgstr "_Send As"
 
-#: src/gtkconv.c:3109
+#: src/gtkconv.c:3123
 msgid "Save Conversation"
 msgstr "Save Conversation"
 
 #. Conversation menu
-#: src/gtkconv.c:3126
+#: src/gtkconv.c:3140
 msgid "/_Conversation"
 msgstr "/_Conversation"
 
-#: src/gtkconv.c:3128
+#: src/gtkconv.c:3142
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Conversation/New Instant _Message..."
 
-#: src/gtkconv.c:3133
+#: src/gtkconv.c:3147
 msgid "/Conversation/_Find..."
 msgstr "/Conversation/_Find..."
 
-#: src/gtkconv.c:3135
+#: src/gtkconv.c:3149
 msgid "/Conversation/View _Log"
 msgstr "/Conversation/View _Log"
 
-#: src/gtkconv.c:3136
+#: src/gtkconv.c:3150
 msgid "/Conversation/_Save As..."
 msgstr "/Conversation/_Save As..."
 
-#: src/gtkconv.c:3141
+#: src/gtkconv.c:3152
+msgid "/Conversation/Clear"
+msgstr "/Conversation/Clear"
+
+#: src/gtkconv.c:3156
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Conversation/Add Buddy _Pounce..."
 
-#: src/gtkconv.c:3143
+#: src/gtkconv.c:3158
 msgid "/Conversation/_Get Info"
 msgstr "/Conversation/_Get Info"
 
-#: src/gtkconv.c:3145
+#: src/gtkconv.c:3160
 msgid "/Conversation/_Warn..."
 msgstr "/Conversation/_Warn..."
 
-#: src/gtkconv.c:3147
+#: src/gtkconv.c:3162
 msgid "/Conversation/In_vite..."
 msgstr "/Conversation/In_vite..."
 
-#: src/gtkconv.c:3152
+#: src/gtkconv.c:3167
 msgid "/Conversation/A_lias..."
 msgstr "/Conversation/A_lias..."
 
-#: src/gtkconv.c:3154
+#: src/gtkconv.c:3169
 msgid "/Conversation/_Block..."
 msgstr "/Conversation/_Block..."
 
-#: src/gtkconv.c:3156
+#: src/gtkconv.c:3171
 msgid "/Conversation/_Add..."
 msgstr "/Conversation/_Add..."
 
-#: src/gtkconv.c:3158
+#: src/gtkconv.c:3173
 msgid "/Conversation/_Remove..."
 msgstr "/Conversation/_Remove..."
 
-#: src/gtkconv.c:3163
+#: src/gtkconv.c:3178
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Conversation/Insert Lin_k..."
 
-#: src/gtkconv.c:3165
+#: src/gtkconv.c:3180
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Conversation/Insert Imag_e..."
 
-#: src/gtkconv.c:3170
+#: src/gtkconv.c:3185
 msgid "/Conversation/_Close"
 msgstr "/Conversation/_Close"
 
 #. Options
-#: src/gtkconv.c:3174
+#: src/gtkconv.c:3189
 msgid "/_Options"
 msgstr "/_Options"
 
-#: src/gtkconv.c:3175
+#: src/gtkconv.c:3190
 msgid "/Options/Enable _Logging"
 msgstr "/Options/Enable _Logging"
 
-#: src/gtkconv.c:3176
+#: src/gtkconv.c:3191
 msgid "/Options/Enable _Sounds"
 msgstr "/Options/Enable _Sounds"
 
-#: src/gtkconv.c:3177
+#: src/gtkconv.c:3192
 msgid "/Options/Show Formatting _Toolbar"
 msgstr "/Options/Show Formatting _Toolbar"
 
-#: src/gtkconv.c:3219
+#: src/gtkconv.c:3234
 msgid "/Conversation/View Log"
 msgstr "/Conversation/View Log"
 
-#: src/gtkconv.c:3224
+#: src/gtkconv.c:3239
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversation/Add Buddy Pounce..."
 
-#: src/gtkconv.c:3230
+#: src/gtkconv.c:3245
 msgid "/Conversation/Get Info"
 msgstr "/Conversation/Get Info"
 
-#: src/gtkconv.c:3234
+#: src/gtkconv.c:3249
 msgid "/Conversation/Warn..."
 msgstr "/Conversation/Warn..."
 
-#: src/gtkconv.c:3238
+#: src/gtkconv.c:3253
 msgid "/Conversation/Invite..."
 msgstr "/Conversation/Invite..."
 
-#: src/gtkconv.c:3244
+#: src/gtkconv.c:3259
 msgid "/Conversation/Alias..."
 msgstr "/Conversation/Alias..."
 
-#: src/gtkconv.c:3248
+#: src/gtkconv.c:3263
 msgid "/Conversation/Block..."
 msgstr "/Conversation/Block..."
 
-#: src/gtkconv.c:3252
+#: src/gtkconv.c:3267
 msgid "/Conversation/Add..."
 msgstr "/Conversation/Add..."
 
-#: src/gtkconv.c:3256
+#: src/gtkconv.c:3271
 msgid "/Conversation/Remove..."
 msgstr "/Conversation/Remove..."
 
-#: src/gtkconv.c:3262
+#: src/gtkconv.c:3277
 msgid "/Conversation/Insert Link..."
 msgstr "/Conversation/Insert Link..."
 
-#: src/gtkconv.c:3266
+#: src/gtkconv.c:3281
 msgid "/Conversation/Insert Image..."
 msgstr "/Conversation/Insert Image..."
 
-#: src/gtkconv.c:3272
+#: src/gtkconv.c:3287
 msgid "/Options/Enable Logging"
 msgstr "/Options/Enable Logging"
 
-#: src/gtkconv.c:3275
+#: src/gtkconv.c:3290
 msgid "/Options/Enable Sounds"
 msgstr "/Options/Enable Sounds"
 
-#: src/gtkconv.c:3278
+#: src/gtkconv.c:3293
 msgid "/Options/Show Formatting Toolbar"
 msgstr "/Options/Show Formatting Toolbar"
 
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:3302 src/gtkconv.c:3304 src/gtkconv.c:3410 src/gtkconv.c:3412
+#: src/gtkconv.c:3317 src/gtkconv.c:3319 src/gtkconv.c:3425 src/gtkconv.c:3427
 msgid "Send"
 msgstr "Send"
 
 #. Now, um, just kind of all over the place. Huh?
 #. Warn button
-#: src/gtkconv.c:3318
+#: src/gtkconv.c:3333
 msgid "Warn"
 msgstr "Warn"
 
-#: src/gtkconv.c:3321
+#: src/gtkconv.c:3336
 msgid "Warn the user"
 msgstr "Warn the user"
 
 #. Block button
-#: src/gtkconv.c:3325 src/gtkprivacy.c:612 src/gtkprivacy.c:623
+#: src/gtkconv.c:3340 src/gtkprivacy.c:625 src/gtkprivacy.c:636
 msgid "Block"
 msgstr "Block"
 
-#: src/gtkconv.c:3328
+#: src/gtkconv.c:3343
 msgid "Block the user"
 msgstr "Block the user"
 
-#: src/gtkconv.c:3335
+#: src/gtkconv.c:3350
 msgid "Add the user to your buddy list"
 msgstr "Add the user to your buddy list"
 
-#: src/gtkconv.c:3342
+#: src/gtkconv.c:3357
 msgid "Remove the user from your buddy list"
 msgstr "Remove the user from your buddy list"
 
-#: src/gtkconv.c:3349 src/gtkconv.c:3690
+#: src/gtkconv.c:3364 src/gtkconv.c:3708
 msgid "Get the user's information"
 msgstr "Get the user's information"
 
 #. Invite
-#: src/gtkconv.c:3424
+#: src/gtkconv.c:3439
 msgid "Invite"
 msgstr "Invite"
 
-#: src/gtkconv.c:3427
+#: src/gtkconv.c:3442
 msgid "Invite a user"
 msgstr "Invite a user"
 
-#: src/gtkconv.c:3434
+#: src/gtkconv.c:3449
 msgid "Add the chat to your buddy list"
 msgstr "Add the chat to your buddy list"
 
-#: src/gtkconv.c:3441
+#: src/gtkconv.c:3456
 msgid "Remove the chat from your buddy list"
 msgstr "Remove the chat from your buddy list"
 
-#: src/gtkconv.c:3551
+#: src/gtkconv.c:3566
 msgid "Topic:"
 msgstr "Topic:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3612
+#: src/gtkconv.c:3630
 msgid "0 people in room"
 msgstr "0 people in room"
 
-#: src/gtkconv.c:3667
+#: src/gtkconv.c:3685
 msgid "IM the user"
 msgstr "IM the user"
 
-#: src/gtkconv.c:3679
+#: src/gtkconv.c:3697
 msgid "Ignore the user"
 msgstr "Ignore the user"
 
-#: src/gtkconv.c:4234
+#: src/gtkconv.c:4252
 msgid "Close conversation"
 msgstr "Close conversation"
 
-#: src/gtkconv.c:4779 src/gtkconv.c:4811 src/gtkconv.c:4932 src/gtkconv.c:4999
+#: src/gtkconv.c:4784 src/gtkconv.c:4816 src/gtkconv.c:4937 src/gtkconv.c:5004
 #, 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:5532 src/gtkconv.c:5535
+#: src/gtkconv.c:5503 src/gtkconv.c:5506
 msgid "<main>/Conversation/Close"
 msgstr "<main>/Conversation/Close"
 
-#: src/gtkdebug.c:135
+#: src/gtkdebug.c:226
+msgid "Save Debug Log"
+msgstr "Save Debug Log"
+
+#: src/gtkdebug.c:289
 msgid "Debug Window"
 msgstr "Debug Window"
 
-#: src/gtkdebug.c:175
+#: src/gtkdebug.c:327
 msgid "Pause"
 msgstr "Pause"
 
-#: src/gtkdebug.c:181
+#: src/gtkdebug.c:333
 msgid "Timestamps"
 msgstr "Timestamps"
 
-#: src/gtkft.c:135
+#: src/gtkft.c:143
 #, c-format
 msgid "%.2f KB/s"
 msgstr "%.2f KB/s"
 
-#: src/gtkft.c:156 src/gtkft.c:957
+#: src/gtkft.c:164 src/gtkft.c:974
 msgid "Finished"
 msgstr "Finished"
 
-#: src/gtkft.c:209
+#: src/gtkft.c:167 src/gtkft.c:925
+msgid "Canceled"
+msgstr "Canceled"
+
+#: src/gtkft.c:170
+msgid "Waiting for transfer to begin"
+msgstr "Waiting for transfer to begin"
+
+#: src/gtkft.c:223
 msgid "<b>Receiving From:</b>"
 msgstr "<b>Receiving From:</b>"
 
-#: src/gtkft.c:212
+#: src/gtkft.c:226
 msgid "<b>Sending To:</b>"
 msgstr "<b>Sending To:</b>"
 
-#: src/gtkft.c:386
+#: src/gtkft.c:400
 msgid "There is no application configured to open this type of file."
 msgstr "There is no application configured to open this type of file."
 
-#: src/gtkft.c:391
+#: src/gtkft.c:405
 msgid "An error occurred while opening the file."
 msgstr "An error occurred while opening the file."
 
-#: src/gtkft.c:482
+#: src/gtkft.c:496
 msgid "Progress"
 msgstr "Progress"
 
-#: src/gtkft.c:489
+#: src/gtkft.c:503
 msgid "Filename"
 msgstr "Filename"
 
-#: src/gtkft.c:496
+#: src/gtkft.c:510
 msgid "Size"
 msgstr "Size"
 
-#: src/gtkft.c:503
+#: src/gtkft.c:517
 msgid "Remaining"
 msgstr "Remaining"
 
-#: src/gtkft.c:533
+#: src/gtkft.c:547
 msgid "Filename:"
 msgstr "Filename:"
 
-#: src/gtkft.c:534
+#: src/gtkft.c:548
 msgid "Status:"
 msgstr "Status:"
 
-#: src/gtkft.c:535
+#: src/gtkft.c:549
 msgid "Speed:"
 msgstr "Speed:"
 
-#: src/gtkft.c:536
+#: src/gtkft.c:550
 msgid "Time Elapsed:"
 msgstr "Time Elapsed:"
 
-#: src/gtkft.c:537
+#: src/gtkft.c:551
 msgid "Time Remaining:"
 msgstr "Time Remaining:"
 
-#: src/gtkft.c:634
+#: src/gtkft.c:648
 msgid "_Keep the dialog open"
 msgstr "_Keep the dialog open"
 
-#: src/gtkft.c:644
+#: src/gtkft.c:658
 msgid "_Clear finished transfers"
 msgstr "_Clear finished transfers"
 
 #. "Download Details" arrow
-#: src/gtkft.c:653
+#: src/gtkft.c:667
 msgid "Show transfer details"
 msgstr "Show transfer details"
 
-#: src/gtkft.c:654
+#: src/gtkft.c:668
 msgid "Hide transfer details"
 msgstr "Hide transfer details"
 
 #. Pause button
-#: src/gtkft.c:696 src/stock.c:90
+#: src/gtkft.c:710 src/stock.c:90
 msgid "_Pause"
 msgstr "_Pause"
 
 #. Resume button
-#: src/gtkft.c:706
+#: src/gtkft.c:720
 msgid "_Resume"
 msgstr "_Resume"
 
-#: src/gtkft.c:908
-msgid "Canceled"
-msgstr "Canceled"
-
-#: src/gtkft.c:910
+#: src/gtkft.c:927
 msgid "Failed"
 msgstr "Failed"
 
-#: src/gtkft.c:1082
+#: src/gtkft.c:1099
 msgid "That file does not exist."
 msgstr "That file does not exist."
 
-#: src/gtkft.c:1091
+#: src/gtkft.c:1108
 msgid "Cannot send a file of 0 bytes."
 msgstr "Cannot send a file of 0 bytes."
 
-#: src/gtkft.c:1105
+#: src/gtkft.c:1122
 msgid "That file already exists."
 msgstr "That file already exists."
 
-#: src/gtkft.c:1131
+#. Open file selector to select the public key.
+#: src/gtkft.c:1148 src/protocols/silc/buddy.c:1023
 msgid "Open..."
 msgstr "Open..."
 
-#: src/gtkft.c:1133
+#: src/gtkft.c:1150
 msgid "Save As..."
 msgstr "Save As..."
 
-#: src/gtkft.c:1183
+#: src/gtkft.c:1200
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s wants to send you %s (%s)"
 
-#: src/gtkft.c:1216
+#: src/gtkft.c:1233
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "Accept file transfer request from %s?"
 
-#: src/gtkft.c:1220
+#: src/gtkft.c:1237
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -3072,19 +3116,31 @@
 "Remote host: %s\n"
 "Remote port: %d"
 
-#: src/gtkimhtml.c:1141
+#: src/gtkimhtml.c:559
+msgid "Pa_ste As Text"
+msgstr "Pa_ste As Text"
+
+#: src/gtkimhtml.c:1004
+msgid "Hyperlink color"
+msgstr "Hyperlink colour"
+
+#: src/gtkimhtml.c:1005
+msgid "Color to draw hyperlinks."
+msgstr "Colour to draw hyperlinks."
+
+#: src/gtkimhtml.c:1211
 msgid "_Copy E-Mail Address"
 msgstr "_Copy E-Mail Address"
 
-#: src/gtkimhtml.c:1153
+#: src/gtkimhtml.c:1223
 msgid "_Copy Link Location"
 msgstr "_Copy Link Location"
 
-#: src/gtkimhtml.c:1163
+#: src/gtkimhtml.c:1233
 msgid "_Open Link in Browser"
 msgstr "_Open Link in Browser"
 
-#: src/gtkimhtml.c:2646
+#: src/gtkimhtml.c:2667
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
@@ -3092,32 +3148,40 @@
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
 
-#: src/gtkimhtml.c:2654
+#: src/gtkimhtml.c:2675
 #, c-format
 msgid "Error saving image: %s"
 msgstr "Error saving image: %s"
 
-#: src/gtkimhtml.c:2663
+#: src/gtkimhtml.c:2684
 msgid "Save Image"
 msgstr "Save Image"
 
-#: src/gtkimhtml.c:2686
+#: src/gtkimhtml.c:2707
 msgid "_Save Image..."
 msgstr "_Save Image..."
 
-#: src/gtkimhtmltoolbar.c:383
+#: src/gtkimhtmltoolbar.c:163
+msgid "Select Font"
+msgstr "Select Font"
+
+#: src/gtkimhtmltoolbar.c:238
+msgid "Select Text Color"
+msgstr "Select Text Colour"
+
+#: src/gtkimhtmltoolbar.c:311
+msgid "Select Background Color"
+msgstr "Select Background Colour"
+
+#: src/gtkimhtmltoolbar.c:392
 msgid "_URL"
 msgstr "_URL"
 
-#: src/gtkimhtmltoolbar.c:387
+#: src/gtkimhtmltoolbar.c:397
 msgid "_Description"
 msgstr "_Description"
 
-#: src/gtkimhtmltoolbar.c:392
-msgid "Insert Link"
-msgstr "Insert Link"
-
-#: src/gtkimhtmltoolbar.c:394
+#: src/gtkimhtmltoolbar.c:400
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
@@ -3125,65 +3189,77 @@
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
 
-#: src/gtkimhtmltoolbar.c:398
+#: src/gtkimhtmltoolbar.c:404
+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:409
+msgid "Insert Link"
+msgstr "Insert Link"
+
+#: src/gtkimhtmltoolbar.c:413
 msgid "_Insert"
 msgstr "_Insert"
 
-#: src/gtkimhtmltoolbar.c:455
+#: src/gtkimhtmltoolbar.c:473
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Failed to store image: %s\n"
 
-#: src/gtkimhtmltoolbar.c:481
+#: src/gtkimhtmltoolbar.c:499
 msgid "Insert Image"
 msgstr "Insert Image"
 
+#: src/gtkimhtmltoolbar.c:638
+msgid "This theme has no available smileys."
+msgstr "This theme has no available smileys."
+
 #. show everything
-#: src/gtkimhtmltoolbar.c:625
+#: src/gtkimhtmltoolbar.c:653
 msgid "Smile!"
 msgstr "Smile!"
 
-#: src/gtkimhtmltoolbar.c:843
+#: src/gtkimhtmltoolbar.c:871
 msgid "Bold"
 msgstr "Bold"
 
-#: src/gtkimhtmltoolbar.c:854
+#: src/gtkimhtmltoolbar.c:882
 msgid "Italic"
 msgstr "Italic"
 
-#: src/gtkimhtmltoolbar.c:865
+#: src/gtkimhtmltoolbar.c:893
 msgid "Underline"
 msgstr "Underline"
 
-#: src/gtkimhtmltoolbar.c:881
+#: src/gtkimhtmltoolbar.c:909
 msgid "Larger font size"
 msgstr "Larger font size"
 
-#: src/gtkimhtmltoolbar.c:893
+#: src/gtkimhtmltoolbar.c:921
 msgid "Smaller font size"
 msgstr "Smaller font size"
 
-#: src/gtkimhtmltoolbar.c:910
+#: src/gtkimhtmltoolbar.c:938
 msgid "Font Face"
 msgstr "Font Face"
 
-#: src/gtkimhtmltoolbar.c:922
+#: src/gtkimhtmltoolbar.c:950
 msgid "Foreground font color"
 msgstr "Foreground font colour"
 
-#: src/gtkimhtmltoolbar.c:934
+#: src/gtkimhtmltoolbar.c:962
 msgid "Background color"
 msgstr "Background colour"
 
-#: src/gtkimhtmltoolbar.c:949
+#: src/gtkimhtmltoolbar.c:977
 msgid "Insert link"
 msgstr "Insert link"
 
-#: src/gtkimhtmltoolbar.c:959
+#: src/gtkimhtmltoolbar.c:987
 msgid "Insert image"
 msgstr "Insert image"
 
-#: src/gtkimhtmltoolbar.c:970
+#: src/gtkimhtmltoolbar.c:998
 msgid "Insert smiley"
 msgstr "Insert smiley"
 
@@ -3192,7 +3268,7 @@
 msgstr "Conversations with"
 
 #. Window **********
-#: src/gtklog.c:368 src/gtklog.c:384
+#: src/gtklog.c:370 src/gtklog.c:386
 msgid "System Log"
 msgstr "System Log"
 
@@ -3204,17 +3280,17 @@
 msgstr[0] "%s has %d new message."
 msgstr[1] "%s has %d new messages."
 
-#: src/gtknotify.c:229
+#: src/gtknotify.c:231
 #, c-format
 msgid "<span weight=\"bold\">From:</span> %s\n"
 msgstr "<span weight=\"bold\">From:</span> %s\n"
 
-#: src/gtknotify.c:235
+#: src/gtknotify.c:240
 #, c-format
 msgid "<span weight=\"bold\">Subject:</span> %s\n"
 msgstr "<span weight=\"bold\">Subject:</span> %s\n"
 
-#: src/gtknotify.c:239
+#: src/gtknotify.c:245
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3225,7 +3301,7 @@
 "\n"
 "%s%s%s%s"
 
-#: src/gtknotify.c:255
+#: src/gtknotify.c:261
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3236,22 +3312,22 @@
 "\n"
 "%s"
 
-#: src/gtknotify.c:441
+#: src/gtknotify.c:429
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "The browser command \"%s\" is invalid."
 
-#: src/gtknotify.c:444 src/gtknotify.c:458 src/gtknotify.c:473
-#: src/gtknotify.c:581
+#: src/gtknotify.c:432 src/gtknotify.c:446 src/gtknotify.c:461
+#: src/gtknotify.c:569
 msgid "Unable to open URL"
 msgstr "Unable to open URL"
 
-#: src/gtknotify.c:455 src/gtknotify.c:470
+#: src/gtknotify.c:443 src/gtknotify.c:458
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "Error launching \"%s\": %s"
 
-#: src/gtknotify.c:582
+#: src/gtknotify.c:570
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
@@ -3288,7 +3364,7 @@
 msgid "Pounce When"
 msgstr "Pounce When"
 
-#: src/gtkpounce.c:483
+#: src/gtkpounce.c:483 src/main.c:296
 msgid "_Sign on"
 msgstr "_Sign on"
 
@@ -3405,15 +3481,15 @@
 msgid "Unknown pounce event. Please report this!"
 msgstr "Unknown pounce event. Please report this!"
 
-#: src/gtkprefs.c:405
+#: src/gtkprefs.c:406
 msgid "Interface Options"
 msgstr "Interface Options"
 
-#: src/gtkprefs.c:407
+#: src/gtkprefs.c:408
 msgid "D_isplay remote nicknames if no alias is set"
 msgstr "D_isplay remote nicknames if no alias is set"
 
-#: src/gtkprefs.c:601
+#: 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."
@@ -3421,354 +3497,329 @@
 "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:636
+#: src/gtkprefs.c:672
 msgid "Icon"
 msgstr "Icon"
 
-#: src/gtkprefs.c:643 src/gtkprefs.c:2021 src/protocols/jabber/buddy.c:265
-#: src/protocols/jabber/buddy.c:748 src/protocols/jabber/chat.c:684
+#: src/gtkprefs.c:679 src/gtkprefs.c:2042 src/protocols/jabber/buddy.c:265
+#: src/protocols/jabber/buddy.c:749 src/protocols/jabber/chat.c:684
 msgid "Description"
 msgstr "Description"
 
-#.
-#. vbox = gaim_gtk_make_frame (ret, _("Window"));
-#. dd = gaim_gtk_prefs_dropdown(vbox, _("Show _buttons as:"), GAIM_PREF_INT,
-#. "/gaim/gtk/conversations/chat/button_type",
-#. _("Pictures"), GAIM_BUTTON_IMAGE,
-#. _("Text"), GAIM_BUTTON_TEXT,
-#. _("Pictures and text"), GAIM_BUTTON_TEXT_IMAGE,
-#. _("None"), GAIM_BUTTON_NONE,
-#. NULL);
-#.
-#. gtk_size_group_add_widget(sg, dd);
-#. gtk_misc_set_alignment(GTK_MISC(dd), 0, 0);
-#. gaim_gtk_prefs_labeled_spin_button(vbox, _("New window _width:"),
-#. "/gaim/gtk/conversations/chat/default_width", 25, 9999, sg);
-#. gaim_gtk_prefs_labeled_spin_button(vbox, _("New window _height:"),
-#. "/gaim/gtk/conversations/chat/default_height", 25, 9999, sg);
-#. gaim_gtk_prefs_labeled_spin_button(vbox, _("_Entry field height:"),
-#. "/gaim/gtk/conversations/chat/entry_height", 25, 9999, sg);
-#. gaim_gtk_prefs_checkbox(_("_Raise window on events"),
-#. "/gaim/gtk/conversations/chat/raise_on_events", vbox);
-#.
-#. vbox = gaim_gtk_make_frame (ret, _("Tab Completion"));
-#. gaim_gtk_prefs_checkbox(_("_Tab-complete nicks"),
-#. "/gaim/gtk/conversations/chat/tab_completion", vbox);
-#. gaim_gtk_prefs_checkbox(_("_Old-style tab completion"),
-#. "/gaim/gtk/conversations/chat/old_tab_complete", vbox);
-#.
-#: src/gtkprefs.c:757 src/gtkprefs.c:1049
+#: src/gtkprefs.c:775 src/gtkprefs.c:1114
 msgid "Display"
 msgstr "Display"
 
-#.
-#. gaim_gtk_prefs_checkbox(_("Show graphical _smileys"),
-#. "/gaim/gtk/conversations/show_smileys", vbox);
-#.
-#: src/gtkprefs.c:762
+#: src/gtkprefs.c:776
 msgid "Show _timestamp on messages"
 msgstr "Show _timestamp on messages"
 
-#: src/gtkprefs.c:769
+#: src/gtkprefs.c:779
 msgid "_Highlight misspelled words"
 msgstr "_Highlight misspelled words"
 
-#. vbox = gaim_gtk_make_frame (ret, _("Ignore"));
-#. gaim_gtk_prefs_checkbox(_("Ignore c_olors"),
-#. "/gaim/gtk/conversations/ignore_colors", vbox);
-#. gaim_gtk_prefs_checkbox(_("Ignore font _faces"),
-#. "/gaim/gtk/conversations/ignore_fonts", vbox);
-#. gaim_gtk_prefs_checkbox(_("Ignore font si_zes"),
-#. "/gaim/gtk/conversations/ignore_font_sizes", vbox);
-#.
-#: src/gtkprefs.c:780
-msgid "Ignore formatting on incoming messages"
-msgstr "Ignore formatting on incoming messages"
+#: src/gtkprefs.c:784
+msgid "Ignore c_olors"
+msgstr "Ignore c_olours"
+
+#: src/gtkprefs.c:786
+msgid "Ignore font _faces"
+msgstr "Ignore font _faces"
+
+#: src/gtkprefs.c:788
+msgid "Ignore font si_zes"
+msgstr "Ignore font si_zes"
 
 #: src/gtkprefs.c:791
+msgid "_Ignore formatting on incoming messages"
+msgstr "_Ignore formatting on incoming messages"
+
+#: src/gtkprefs.c:795
+msgid "Default Formatting"
+msgstr "Default Formatting"
+
+#: src/gtkprefs.c:797
+msgid "_Send default formatting with outgoing messages"
+msgstr "_Send default formatting with outgoing messages"
+
+#: src/gtkprefs.c:829
+msgid ""
+"This is how your outgoing message text will appear when you use protocols "
+"that support formatting. :)"
+msgstr ""
+"This is how your outgoing message text will appear when you use protocols "
+"that support formatting. :)"
+
+#: src/gtkprefs.c:832
+msgid "_Clear Formatting"
+msgstr "_Clear Formatting"
+
+#: src/gtkprefs.c:869
 msgid "Send Message"
 msgstr "Send Message"
 
-#: src/gtkprefs.c:792
+#: src/gtkprefs.c:870
 msgid "Enter _sends message"
 msgstr "Enter _sends message"
 
-#: src/gtkprefs.c:794
+#: src/gtkprefs.c:872
 msgid "C_ontrol-Enter sends message"
 msgstr "C_ontrol-Enter sends message"
 
-#: src/gtkprefs.c:797
+#: src/gtkprefs.c:875
 msgid "Window Closing"
 msgstr "Window Closing"
 
-#: src/gtkprefs.c:798
+#: src/gtkprefs.c:876
 msgid "_Escape closes window"
 msgstr "_Escape closes window"
 
-#: src/gtkprefs.c:801
+#: src/gtkprefs.c:879
 msgid "Insertions"
 msgstr "Insertions"
 
-#: src/gtkprefs.c:802
-msgid "Control-{B/I/U} inserts _HTML tags"
-msgstr "Control-{B/I/U} inserts _HTML tags"
-
-#: src/gtkprefs.c:804
+#: src/gtkprefs.c:880
+msgid "Control-{B/I/U} changes _formatting"
+msgstr "Control-{B/I/U} changes _formatting"
+
+#: src/gtkprefs.c:882
 msgid "Control-(number) _inserts smileys"
 msgstr "Control-(number) _inserts smileys"
 
-#: src/gtkprefs.c:820
+#: src/gtkprefs.c:898
 msgid "Buddy List Sorting"
 msgstr "Buddy List Sorting"
 
-#: src/gtkprefs.c:829
+#: src/gtkprefs.c:907
 msgid "_Sorting:"
 msgstr "_Sorting:"
 
-#: src/gtkprefs.c:846
+#: src/gtkprefs.c:913 src/gtkprefs.c:1059 src/gtkprefs.c:1101
+msgid "Show _buttons as:"
+msgstr "Show _buttons as:"
+
+#: src/gtkprefs.c:915 src/gtkprefs.c:1061 src/gtkprefs.c:1103
+msgid "Pictures"
+msgstr "Pictures"
+
+#: src/gtkprefs.c:916 src/gtkprefs.c:1062 src/gtkprefs.c:1104
+msgid "Text"
+msgstr "Text"
+
+#: src/gtkprefs.c:917 src/gtkprefs.c:1063 src/gtkprefs.c:1105
+msgid "Pictures and text"
+msgstr "Pictures and text"
+
+#: src/gtkprefs.c:920 src/gtkprefs.c:1070 src/gtkprefs.c:1112
 msgid "_Raise window on events"
 msgstr "_Raise window on events"
 
-#.
-#. vbox = gaim_gtk_make_frame (ret, _("Group Display"));
-#. gaim_gtk_prefs_checkbox(_("Show _numbers in groups"),
-#. "/gaim/gtk/blist/show_group_count", vbox);
-#.
-#: src/gtkprefs.c:855
+#: src/gtkprefs.c:923
 msgid "Buddy Display"
 msgstr "Buddy Display"
 
-#: src/gtkprefs.c:856 src/gtkprefs.c:995
+#: src/gtkprefs.c:924 src/gtkprefs.c:1074
 msgid "Show buddy _icons"
 msgstr "Show buddy _icons"
 
-#: src/gtkprefs.c:858
+#: src/gtkprefs.c:926
 msgid "Show _warning levels"
 msgstr "Show _warning levels"
 
-#: src/gtkprefs.c:860
+#: src/gtkprefs.c:928
 msgid "Show idle _times"
 msgstr "Show idle _times"
 
-#: src/gtkprefs.c:862
+#: src/gtkprefs.c:930
 msgid "Dim i_dle buddies"
 msgstr "Dim i_dle buddies"
 
-#: src/gtkprefs.c:864
+#: src/gtkprefs.c:932
 msgid "_Automatically expand contacts"
 msgstr "_Automatically expand contacts"
 
-#: src/gtkprefs.c:889
+#: src/gtkprefs.c:969
 msgid "_Placement:"
 msgstr "_Placement:"
 
-#.
-#. gaim_gtk_prefs_checkbox(_("Send _URLs as links"),
-#. "/core/conversations/send_urls_as_links", vbox);
-#.
-#: src/gtkprefs.c:900
+#: src/gtkprefs.c:976
+msgid "Number of conversations per window"
+msgstr "Number of conversations per window"
+
+#: src/gtkprefs.c:985
 msgid "Show _formatting toolbar"
 msgstr "Show _formatting toolbar"
 
-#: src/gtkprefs.c:903
+#: src/gtkprefs.c:988
 msgid "Show a_liases in tabs/titles"
 msgstr "Show a_liases in tabs/titles"
 
-#: src/gtkprefs.c:906
+#: src/gtkprefs.c:991
 msgid "Tab Options"
 msgstr "Tab Options"
 
-#: src/gtkprefs.c:908
+#: src/gtkprefs.c:993
+msgid "Show IMs and chats in _tabbed windows"
+msgstr "Show IMs and chats in _tabbed windows"
+
+#: src/gtkprefs.c:996
+msgid "Show IMs and chats in _same tabbed window"
+msgstr "Show IMs and chats in _same tabbed window"
+
+#: src/gtkprefs.c:1006
+msgid "Show _close button on tabs"
+msgstr "Show _close button on tabs"
+
+#: src/gtkprefs.c:1019
 msgid "_Tab Placement:"
 msgstr "_Tab Placement:"
 
-#: src/gtkprefs.c:910
+#: src/gtkprefs.c:1021
 msgid "Top"
 msgstr "Top"
 
-#: src/gtkprefs.c:911
+#: src/gtkprefs.c:1022
 msgid "Bottom"
 msgstr "Bottom"
 
-#: src/gtkprefs.c:912
+#: src/gtkprefs.c:1023
 msgid "Left"
 msgstr "Left"
 
-#: src/gtkprefs.c:913
+#: src/gtkprefs.c:1024
 msgid "Right"
 msgstr "Right"
 
-#: src/gtkprefs.c:919
-msgid "Show IMs and chats in _tabbed windows"
-msgstr "Show IMs and chats in _tabbed windows"
-
-#: src/gtkprefs.c:922
-msgid "Show IMs and chats in _same tabbed window"
-msgstr "Show IMs and chats in _same tabbed window"
-
-#: src/gtkprefs.c:932
-msgid "Show _close button on tabs"
-msgstr "Show _close button on tabs"
-
-#. vbox = gaim_gtk_make_frame (ret, _("Window"));
-#. widge = gaim_gtk_prefs_dropdown(vbox, _("Show _buttons as:"), GAIM_PREF_INT,
-#. "/gaim/gtk/conversations/im/button_type",
-#. _("Pictures"), GAIM_BUTTON_IMAGE,
-#. _("Text"), GAIM_BUTTON_TEXT,
-#. _("Pictures and text"), GAIM_BUTTON_TEXT_IMAGE,
-#. _("None"), GAIM_BUTTON_NONE,
-#. NULL);
-#.
-#. gtk_size_group_add_widget(sg, widge);
-#. gtk_misc_set_alignment(GTK_MISC(widge), 0, 0);
-#. gaim_gtk_prefs_labeled_spin_button(vbox, _("New window _width:"),
-#. "/gaim/gtk/conversations/im/default_width", 25, 9999, sg);
-#. gaim_gtk_prefs_labeled_spin_button(vbox, _("New window _height:"),
-#. "/gaim/gtk/conversations/im/default_height", 25, 9999, sg);
-#. gaim_gtk_prefs_labeled_spin_button(vbox, _("_Entry field height:"),
-#. "/gaim/gtk/conversations/im/entry_height", 25, 9999, sg);
-#. gaim_gtk_prefs_checkbox(_("_Raise window on events"),
-#. "/gaim/gtk/conversations/im/raise_on_events", vbox);
-#. gaim_gtk_prefs_checkbox(_("Hide window on _send"),
-#. "/gaim/gtk/conversations/im/hide_on_send", vbox);
-#. gtk_widget_show (vbox);
-#.
-#: src/gtkprefs.c:994
+#: src/gtkprefs.c:1057 src/gtkprefs.c:1099
+msgid "Window"
+msgstr "Window"
+
+#: src/gtkprefs.c:1073
 msgid "Buddy Icons"
 msgstr "Buddy Icons"
 
-#: src/gtkprefs.c:997
+#: src/gtkprefs.c:1076
 msgid "Enable buddy icon a_nimation"
 msgstr "Enable buddy icon a_nimation"
 
-#. vbox = gaim_gtk_make_frame (ret, _("Display"));
-#. gaim_gtk_prefs_checkbox(_("Show _logins in window"),
-#. "/core/conversations/im/show_login", vbox);
-#.
-#: src/gtkprefs.c:1004
+#: src/gtkprefs.c:1079
 msgid "Typing Notification"
 msgstr "Typing Notification"
 
-#: src/gtkprefs.c:1005
+#: src/gtkprefs.c:1080
 msgid "Notify buddies that you are _typing to them"
 msgstr "Notify buddies that you are _typing to them"
 
-#.
-#. gaim_gtk_prefs_checkbox(_("_Show people joining in window"),
-#. "/core/conversations/chat/show_join", vbox);
-#. gaim_gtk_prefs_checkbox(_("_Show people leaving in window"),
-#. "/core/conversations/chat/show_leave", vbox);
-#.
-#: src/gtkprefs.c:1056
-msgid "Co_lorize screen names"
-msgstr "Co_lourize screen names"
-
-#: src/gtkprefs.c:1077 src/protocols/oscar/oscar.c:584
-#: src/protocols/oscar/oscar.c:4219
-msgid "IP Address"
-msgstr "IP Address"
-
-#: src/gtkprefs.c:1079
-msgid "_Autodetect IP Address"
-msgstr "_Autodetect IP Address"
-
-#: src/gtkprefs.c:1088
-msgid "Public _IP:"
-msgstr "Public _IP:"
-
-#: src/gtkprefs.c:1112
-msgid "Ports"
-msgstr "Ports"
-
 #: src/gtkprefs.c:1115
+msgid "Co_lorize screen names"
+msgstr "Co_lourize screen names"
+
+#: src/gtkprefs.c:1136 src/protocols/oscar/oscar.c:592
+#: src/protocols/oscar/oscar.c:4823
+msgid "IP Address"
+msgstr "IP Address"
+
+#: src/gtkprefs.c:1138
+msgid "_Autodetect IP Address"
+msgstr "_Autodetect IP Address"
+
+#: src/gtkprefs.c:1147
+msgid "Public _IP:"
+msgstr "Public _IP:"
+
+#: src/gtkprefs.c:1171
+msgid "Ports"
+msgstr "Ports"
+
+#: src/gtkprefs.c:1174
 msgid "_Manually specify range of ports to listen on"
 msgstr "_Manually specify range of ports to listen on"
 
-#: src/gtkprefs.c:1118
+#: src/gtkprefs.c:1177
 msgid "_Start Port:"
 msgstr "_Start Port:"
 
-#: src/gtkprefs.c:1125
+#: src/gtkprefs.c:1184
 msgid "_End Port:"
 msgstr "_End Port:"
 
-#: src/gtkprefs.c:1173
+#: src/gtkprefs.c:1232
 msgid "Proxy Type"
 msgstr "Proxy Type"
 
-#: src/gtkprefs.c:1176
+#: src/gtkprefs.c:1235
 msgid "No proxy"
 msgstr "No proxy"
 
-#: src/gtkprefs.c:1183
+#: src/gtkprefs.c:1242
 msgid "Proxy Server"
 msgstr "Proxy Server"
 
-#: src/gtkprefs.c:1241
+#: src/gtkprefs.c:1300
 msgid "_User:"
 msgstr "_User:"
 
-#: src/gtkprefs.c:1297
+#: src/gtkprefs.c:1356
 msgid "Opera"
 msgstr "Opera"
 
-#: src/gtkprefs.c:1298
+#: src/gtkprefs.c:1357
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/gtkprefs.c:1299
+#: src/gtkprefs.c:1358
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: src/gtkprefs.c:1300
+#: src/gtkprefs.c:1359
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/gtkprefs.c:1301
+#: src/gtkprefs.c:1360
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/gtkprefs.c:1302
+#: src/gtkprefs.c:1361
 msgid "Firebird"
 msgstr "Firebird"
 
-#: src/gtkprefs.c:1303
+#: src/gtkprefs.c:1362
 msgid "Firefox"
 msgstr "Firefox"
 
-#: src/gtkprefs.c:1304
+#: src/gtkprefs.c:1363
 msgid "Gnome Default"
 msgstr "Gnome Default"
 
-#: src/gtkprefs.c:1313
+#: src/gtkprefs.c:1372
 msgid "Manual"
 msgstr "Manual"
 
-#: src/gtkprefs.c:1364
+#: src/gtkprefs.c:1423
 msgid "Browser Selection"
 msgstr "Browser Selection"
 
-#: src/gtkprefs.c:1368
+#: src/gtkprefs.c:1427
 msgid "_Browser:"
 msgstr "_Browser:"
 
-#: src/gtkprefs.c:1375
+#: src/gtkprefs.c:1434
 msgid "_Open link in:"
 msgstr "_Open link in:"
 
-#: src/gtkprefs.c:1377
+#: src/gtkprefs.c:1436
 msgid "Browser default"
 msgstr "Browser default"
 
-#: src/gtkprefs.c:1378
+#: src/gtkprefs.c:1437
 msgid "Existing window"
 msgstr "Existing window"
 
-#: src/gtkprefs.c:1380
+#: src/gtkprefs.c:1439
 msgid "New tab"
 msgstr "New tab"
 
-#: src/gtkprefs.c:1394
+#: src/gtkprefs.c:1453
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -3777,82 +3828,79 @@
 "_Manual:\n"
 "(%s for URL)"
 
-#: src/gtkprefs.c:1431
+#: src/gtkprefs.c:1490
 msgid "Message Logs"
 msgstr "Message Logs"
 
-#: src/gtkprefs.c:1434
+#: src/gtkprefs.c:1493
 msgid "Log _Format:"
 msgstr "Log _Format:"
 
-#: src/gtkprefs.c:1437
+#: src/gtkprefs.c:1496
 msgid "_Log all instant messages"
 msgstr "_Log all instant messages"
 
-#: src/gtkprefs.c:1439
+#: src/gtkprefs.c:1498
 msgid "Log all c_hats"
 msgstr "Log all c_hats"
 
-#: src/gtkprefs.c:1442
+#: src/gtkprefs.c:1501
 msgid "System Logs"
 msgstr "System Logs"
 
-#: src/gtkprefs.c:1444
+#: src/gtkprefs.c:1503
 msgid "_Enable system log"
 msgstr "_Enable system log"
 
-#: src/gtkprefs.c:1447
+#: src/gtkprefs.c:1506
 msgid "Log when buddies _sign on/sign off"
 msgstr "Log when buddies _sign on/sign off"
 
-#: src/gtkprefs.c:1453
+#: src/gtkprefs.c:1512
 msgid "Log when buddies become _idle/un-idle"
 msgstr "Log when buddies become _idle/un-idle"
 
-#: src/gtkprefs.c:1459
+#: src/gtkprefs.c:1518
 msgid "Log when buddies go away/come _back"
 msgstr "Log when buddies go away/come _back"
 
-#: src/gtkprefs.c:1465
+#: src/gtkprefs.c:1524
 msgid "Log your _own signons/idleness/awayness"
 msgstr "Log your _own signons/idleness/awayness"
 
-#: src/gtkprefs.c:1516
+#: src/gtkprefs.c:1570
 msgid "Sound Options"
 msgstr "Sound Options"
 
-#. gaim_gtk_prefs_checkbox(_("Sounds when you _log in"),
-#. "/gaim/gtk/sound/signon", vbox);
-#.
-#: src/gtkprefs.c:1520
+#: src/gtkprefs.c:1571
 msgid "Sounds when conversation has _focus"
 msgstr "Sounds when conversation has _focus"
 
-#: src/gtkprefs.c:1522
+#: src/gtkprefs.c:1573
 msgid "_Sounds while away"
 msgstr "_Sounds while away"
 
-#: src/gtkprefs.c:1526
+#: src/gtkprefs.c:1577
 msgid "Sound Method"
 msgstr "Sound Method"
 
-#: src/gtkprefs.c:1527
+#: src/gtkprefs.c:1578
 msgid "_Method:"
 msgstr "_Method:"
 
-#: src/gtkprefs.c:1529
+#: src/gtkprefs.c:1580
 msgid "Console beep"
 msgstr "Console beep"
 
-#: src/gtkprefs.c:1531
+#: src/gtkprefs.c:1582
 msgid "Automatic"
 msgstr "Automatic"
 
-#: src/gtkprefs.c:1538
+#: src/gtkprefs.c:1589
 msgid "Command"
 msgstr "Command"
 
-#: src/gtkprefs.c:1548
+#: src/gtkprefs.c:1599
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -3861,81 +3909,61 @@
 "Sound c_ommand:\n"
 "(%s for filename)"
 
-#.
-#. gaim_gtk_prefs_checkbox(_("_Sending messages removes away status"),
-#. "/core/conversations/away_back_on_send", vbox);
-#.
-#: src/gtkprefs.c:1609
+#: src/gtkprefs.c:1646
 msgid "_Queue new messages when away"
 msgstr "_Queue new messages when away"
 
-#: src/gtkprefs.c:1612
+#: src/gtkprefs.c:1649
 msgid "Auto-response"
 msgstr "Auto-response"
 
-#.
-#. hbox = gtk_hbox_new(FALSE, 0);
-#. gtk_container_add(GTK_CONTAINER(vbox), hbox);
-#. gaim_gtk_prefs_labeled_spin_button(hbox, _("Seconds before _resending:"),
-#. "/core/away/auto_response/sec_before_resend",
-#. 1, 24 * 60 * 60, sg);
-#.
-#: src/gtkprefs.c:1620
+#: src/gtkprefs.c:1650
 msgid "_Send auto-response"
 msgstr "_Send auto-response"
 
-#: src/gtkprefs.c:1622
+#: src/gtkprefs.c:1652
 msgid "_Only send auto-response when idle"
 msgstr "_Only send auto-response when idle"
 
-#.
-#. gaim_gtk_prefs_checkbox(_("Send auto-response in _active conversations"),
-#. "/core/away/auto_response/in_active_conv", vbox);
-#. if (!gaim_prefs_get_bool("/core/away/auto_response/enabled"))
-#. gtk_widget_set_sensitive(hbox, FALSE);
-#.
-#. auto_resp_pref_id = gaim_prefs_connect_callback("/core/away/auto_response/enabled",
-#. auto_resp_changed_cb, hbox);
-#.
-#: src/gtkprefs.c:1634 src/protocols/msn/state.c:30
-#: src/protocols/novell/novell.c:2155 src/protocols/oscar/oscar.c:3377
-#: src/protocols/yahoo/yahoo.c:2295
+#: src/gtkprefs.c:1655 src/protocols/msn/state.c:30
+#: src/protocols/novell/novell.c:2729 src/protocols/oscar/oscar.c:3981
+#: src/protocols/yahoo/yahoo.c:2297
 msgid "Idle"
 msgstr "Idle"
 
-#: src/gtkprefs.c:1635
+#: src/gtkprefs.c:1656
 msgid "Idle _time reporting:"
 msgstr "Idle _time reporting:"
 
-#: src/gtkprefs.c:1638
+#: src/gtkprefs.c:1659
 msgid "Gaim usage"
 msgstr "Gaim usage"
 
-#: src/gtkprefs.c:1641
+#: src/gtkprefs.c:1662
 msgid "X usage"
 msgstr "X usage"
 
-#: src/gtkprefs.c:1643
+#: src/gtkprefs.c:1664
 msgid "Windows usage"
 msgstr "Windows usage"
 
-#: src/gtkprefs.c:1651
+#: src/gtkprefs.c:1672
 msgid "Auto-away"
 msgstr "Auto-away"
 
-#: src/gtkprefs.c:1652
+#: src/gtkprefs.c:1673
 msgid "Set away _when idle"
 msgstr "Set away _when idle"
 
-#: src/gtkprefs.c:1656
+#: src/gtkprefs.c:1677
 msgid "_Minutes before setting away:"
 msgstr "_Minutes before setting away:"
 
-#: src/gtkprefs.c:1664
+#: src/gtkprefs.c:1685
 msgid "Away m_essage:"
 msgstr "Away m_essage:"
 
-#: src/gtkprefs.c:1739
+#: src/gtkprefs.c:1760
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3950,7 +3978,7 @@
 "<span weight=\"bold\">Web site:</span>\t\t%s\n"
 "<span weight=\"bold\">File name:</span>\t%s"
 
-#: src/gtkprefs.c:1744
+#: src/gtkprefs.c:1765
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3965,108 +3993,104 @@
 "<span weight=\"bold\">URL:</span>  %s\n"
 "<span weight=\"bold\">File name:</span>  %s"
 
-#: src/gtkprefs.c:1977
+#: src/gtkprefs.c:1998
 msgid "Load"
 msgstr "Load"
 
-#: src/gtkprefs.c:1991
+#: src/gtkprefs.c:2012
 msgid "Summary"
 msgstr "Summary"
 
-#: src/gtkprefs.c:2039
+#: src/gtkprefs.c:2060
 msgid "Details"
 msgstr "Details"
 
-#: src/gtkprefs.c:2166
+#: src/gtkprefs.c:2187
 msgid "Sound Selection"
 msgstr "Sound Selection"
 
-#: src/gtkprefs.c:2273
+#: src/gtkprefs.c:2294
 msgid "Play"
 msgstr "Play"
 
-#: src/gtkprefs.c:2280
+#: src/gtkprefs.c:2301
 msgid "Event"
 msgstr "Event"
 
-#: src/gtkprefs.c:2299
+#: src/gtkprefs.c:2320
 msgid "Test"
 msgstr "Test"
 
-#: src/gtkprefs.c:2303
+#: src/gtkprefs.c:2324
 msgid "Reset"
 msgstr "Reset"
 
-#: src/gtkprefs.c:2307
+#: src/gtkprefs.c:2328
 msgid "Choose..."
 msgstr "Choose..."
 
-#: src/gtkprefs.c:2442
+#: src/gtkprefs.c:2463
 msgid "_Edit"
 msgstr "_Edit"
 
-#: src/gtkprefs.c:2478
+#: src/gtkprefs.c:2499
 msgid "Interface"
 msgstr "Interface"
 
-#: src/gtkprefs.c:2479
+#: src/gtkprefs.c:2500
 msgid "Smiley Themes"
 msgstr "Smiley Themes"
 
-#: src/gtkprefs.c:2480
-msgid "Fonts"
-msgstr "Fonts"
-
-#: src/gtkprefs.c:2481
+#: src/gtkprefs.c:2501
 msgid "Message Text"
 msgstr "Message Text"
 
-#: src/gtkprefs.c:2482
+#: src/gtkprefs.c:2502
 msgid "Shortcuts"
 msgstr "Shortcuts"
 
-#: src/gtkprefs.c:2485
+#: src/gtkprefs.c:2505
 msgid "IMs"
 msgstr "IMs"
 
-#: src/gtkprefs.c:2487
+#: src/gtkprefs.c:2507
 msgid "Network"
 msgstr "Network"
 
-#: src/gtkprefs.c:2488
+#: src/gtkprefs.c:2508
 msgid "Proxy"
 msgstr "Proxy"
 
 #. We use the registered default browser in windows
-#: src/gtkprefs.c:2491
+#: src/gtkprefs.c:2511
 msgid "Browser"
 msgstr "Browser"
 
-#: src/gtkprefs.c:2493
+#: src/gtkprefs.c:2513
 msgid "Logging"
 msgstr "Logging"
 
-#: src/gtkprefs.c:2494
+#: src/gtkprefs.c:2514
 msgid "Sounds"
 msgstr "Sounds"
 
-#: src/gtkprefs.c:2495
+#: src/gtkprefs.c:2515
 msgid "Sound Events"
 msgstr "Sound Events"
 
-#: src/gtkprefs.c:2496
+#: src/gtkprefs.c:2516
 msgid "Away / Idle"
 msgstr "Away / Idle"
 
-#: src/gtkprefs.c:2497
+#: src/gtkprefs.c:2517
 msgid "Away Messages"
 msgstr "Away Messages"
 
-#: src/gtkprefs.c:2500
+#: src/gtkprefs.c:2520
 msgid "Protocols"
 msgstr "Protocols"
 
-#: src/gtkprefs.c:2501
+#: src/gtkprefs.c:2521
 msgid "Plugins"
 msgstr "Plugins"
 
@@ -4090,63 +4114,63 @@
 msgid "Block only the users below"
 msgstr "Block only the users below"
 
-#: src/gtkprivacy.c:374 src/protocols/jabber/jabber.c:1277
+#: src/gtkprivacy.c:386 src/protocols/jabber/jabber.c:1275
 msgid "Privacy"
 msgstr "Privacy"
 
-#: src/gtkprivacy.c:389
+#: 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:401
+#: src/gtkprivacy.c:413
 msgid "Set privacy for:"
 msgstr "Set privacy for:"
 
-#: src/gtkprivacy.c:569 src/gtkprivacy.c:585
+#: src/gtkprivacy.c:582 src/gtkprivacy.c:598
 msgid "Permit User"
 msgstr "Permit User"
 
-#: src/gtkprivacy.c:570
+#: 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:571
+#: 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:574 src/gtkprivacy.c:587
+#: src/gtkprivacy.c:587 src/gtkprivacy.c:600
 msgid "Permit"
 msgstr "Permit"
 
-#: src/gtkprivacy.c:579
+#: src/gtkprivacy.c:592
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "Allow %s to contact you?"
 
-#: src/gtkprivacy.c:581
+#: 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:608 src/gtkprivacy.c:621
+#: src/gtkprivacy.c:621 src/gtkprivacy.c:634
 msgid "Block User"
 msgstr "Block User"
 
-#: src/gtkprivacy.c:609
+#: src/gtkprivacy.c:622
 msgid "Type a user to block."
 msgstr "Type a user to block."
 
-#: src/gtkprivacy.c:610
+#: 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:617
+#: src/gtkprivacy.c:630
 #, c-format
 msgid "Block %s?"
 msgstr "Block %s?"
 
-#: src/gtkprivacy.c:619
+#: src/gtkprivacy.c:632
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "Are you sure you want to block %s?"
@@ -4154,13 +4178,15 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:233 src/protocols/gg/gg.c:858
-#: src/protocols/novell/novell.c:1318 src/request.h:1233
+#: src/gtkrequest.c:233 src/protocols/gg/gg.c:866
+#: src/protocols/novell/novell.c:1845 src/protocols/silc/buddy.c:307
+#: src/protocols/silc/pk.c:116 src/request.h:1233
 msgid "Yes"
 msgstr "Yes"
 
-#: src/gtkrequest.c:234 src/protocols/gg/gg.c:858
-#: src/protocols/novell/novell.c:1319 src/request.h:1233
+#: src/gtkrequest.c:234 src/protocols/gg/gg.c:866
+#: src/protocols/novell/novell.c:1846 src/protocols/silc/buddy.c:308
+#: src/protocols/silc/pk.c:117 src/request.h:1233
 msgid "No"
 msgstr "No"
 
@@ -4168,24 +4194,17 @@
 msgid "Apply"
 msgstr "Apply"
 
-#: src/gtkrequest.c:238 src/protocols/msn/msn.c:258
+#: src/gtkrequest.c:238 src/protocols/msn/msn.c:271
+#: src/protocols/silc/util.c:299
 msgid "Close"
 msgstr "Close"
 
-#: src/gtkroomlist.c:322
-msgid ""
-"You are not currently signed on with any protocols that have the ability to "
-"list rooms."
-msgstr ""
-"You are not currently signed on with any protocols that have the ability to "
-"list rooms."
-
-#: src/gtkroomlist.c:335
+#: src/gtkroomlist.c:328
 msgid "Room List"
 msgstr "Room List"
 
 #. list button
-#: src/gtkroomlist.c:410
+#: src/gtkroomlist.c:397
 msgid "_Get List"
 msgstr "_Get List"
 
@@ -4229,12 +4248,12 @@
 msgid "Someone says your name in chat"
 msgstr "Someone says your name in chat"
 
-#: src/gtksound.c:158
+#: src/gtksound.c:157
 #, c-format
 msgid "Unable to play sound because the chosen file (%s) does not exist."
 msgstr "Unable to play sound because the chosen file (%s) does not exist."
 
-#: src/gtksound.c:174
+#: src/gtksound.c:173
 msgid ""
 "Unable to play sound because the 'Command' sound method has been chosen, but "
 "no command has been set."
@@ -4242,7 +4261,7 @@
 "Unable to play sound because the 'Command' sound method has been chosen, but "
 "no command has been set."
 
-#: src/gtksound.c:186
+#: src/gtksound.c:185
 #, c-format
 msgid ""
 "Unable to play sound because the configured sound command could not be "
@@ -4251,11 +4270,11 @@
 "Unable to play sound because the configured sound command could not be "
 "launched: %s"
 
-#: src/gtkutils.c:133
+#: src/gtkutils.c:149
 msgid "Can't save icon file to disk."
 msgstr "Can't save icon file to disk."
 
-#: src/gtkutils.c:168
+#: src/gtkutils.c:184
 msgid "Save Icon"
 msgstr "Save Icon"
 
@@ -4263,11 +4282,11 @@
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color=\"red\">The logger has no read function</font></b>"
 
-#: src/log.c:476
+#: src/log.c:486
 msgid "XML"
 msgstr "XML"
 
-#: src/log.c:561
+#: src/log.c:571
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4276,7 +4295,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
 
-#: src/log.c:563
+#: src/log.c:573
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4285,49 +4304,54 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
 
-#: src/log.c:614 src/log.c:800
+#: src/log.c:624 src/log.c:811
 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:624 src/log.c:812
+#: src/log.c:634 src/log.c:823
 #, 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:661
+#: src/log.c:671
 msgid "HTML"
 msgstr "HTML"
 
-#: src/log.c:745
+#: src/log.c:756
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
-#: src/log.c:845
+#: src/log.c:856
 msgid "Plain text"
 msgstr "Plain text"
 
-#: src/main.c:155
+#: src/main.c:153
 msgid "Please create an account."
 msgstr "Please create an account."
 
-#: src/main.c:237
+#: src/main.c:235
 msgid "Login"
 msgstr "Login"
 
-#: src/main.c:255
-msgid "<b>Screen Name:</b>"
-msgstr "<b>Screen Name:</b>"
-
-#: src/main.c:269
-msgid "<b>Password:</b>"
-msgstr "<b>Password:</b>"
-
-#: src/main.c:298
-msgid "Sign on"
-msgstr "Sign on"
-
-#: src/main.c:522
+#: src/main.c:253
+msgid "<b>_Account:</b>"
+msgstr "<b>_Account:</b>"
+
+#: src/main.c:267
+msgid "<b>_Password:</b>"
+msgstr "<b>_Password:</b>"
+
+#. And now for the buttons
+#: src/main.c:284
+msgid "_Accounts"
+msgstr "_Accounts"
+
+#: src/main.c:290
+msgid "_Preferences"
+msgstr "_Preferences"
+
+#: src/main.c:520
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -4361,12 +4385,12 @@
 "  -h, --help          display this help and exit\n"
 
 #. short message
-#: src/main.c:537
+#: src/main.c:535
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr "Gaim %s. Try `%s -h' for more information.\n"
 
-#: src/plugin.c:277
+#: src/plugin.c:286
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
@@ -4375,11 +4399,11 @@
 "The required plugin %s was not found. Please install this plugin and try "
 "again."
 
-#: src/plugin.c:282 src/plugin.c:310
+#: src/plugin.c:291 src/plugin.c:319
 msgid "Gaim was unable to load your plugin."
 msgstr "Gaim was unable to load your plugin."
 
-#: src/plugin.c:306
+#: src/plugin.c:315
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "The required plugin %s was unable to load."
@@ -4389,12 +4413,12 @@
 msgstr "Slightly less boring default"
 
 #: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:44
-#: src/protocols/msn/msn.c:359 src/protocols/msn/state.c:27
+#: src/protocols/msn/msn.c:378 src/protocols/msn/state.c:27
 #: src/protocols/msn/state.c:28 src/protocols/msn/state.c:35
-#: src/protocols/msn/state.c:36 src/protocols/novell/novell.c:2146
-#: src/protocols/novell/novell.c:2265 src/protocols/novell/novell.c:2316
-#: src/protocols/oscar/oscar.c:603 src/protocols/yahoo/yahoo.c:2599
-#: src/protocols/yahoo/yahoo.c:2714
+#: src/protocols/msn/state.c:36 src/protocols/novell/novell.c:2720
+#: src/protocols/novell/novell.c:2839 src/protocols/novell/novell.c:2890
+#: src/protocols/oscar/oscar.c:611 src/protocols/yahoo/yahoo.c:2656
+#: src/protocols/yahoo/yahoo.c:2771
 msgid "Available"
 msgstr "Available"
 
@@ -4407,11 +4431,11 @@
 msgstr "Away for friends only"
 
 #: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:961
-#: src/protocols/jabber/presence.c:126 src/protocols/oscar/oscar.c:524
-#: src/protocols/oscar/oscar.c:4740 src/protocols/oscar/oscar.c:4818
-#: src/protocols/oscar/oscar.c:4842 src/protocols/oscar/oscar.c:6433
-#: src/protocols/oscar/oscar.c:6438 src/protocols/yahoo/yahoo.c:2293
-#: src/protocols/yahoo/yahoo.c:2619 src/protocols/yahoo/yahoo.c:2724
+#: src/protocols/jabber/presence.c:126 src/protocols/oscar/oscar.c:532
+#: src/protocols/oscar/oscar.c:5365 src/protocols/oscar/oscar.c:5443
+#: src/protocols/oscar/oscar.c:5467 src/protocols/oscar/oscar.c:6638
+#: src/protocols/oscar/oscar.c:6643 src/protocols/yahoo/yahoo.c:2295
+#: src/protocols/yahoo/yahoo.c:2676 src/protocols/yahoo/yahoo.c:2781
 msgid "Invisible"
 msgstr "Invisible"
 
@@ -4427,7 +4451,7 @@
 msgid "Unable to resolve hostname."
 msgstr "Unable to resolve hostname."
 
-#: src/protocols/gg/gg.c:139 src/protocols/novell/novell.c:1160
+#: src/protocols/gg/gg.c:139 src/protocols/novell/novell.c:1667
 msgid "Unable to connect to server."
 msgstr "Unable to connect to server."
 
@@ -4454,173 +4478,174 @@
 msgid "Unknown Error Code."
 msgstr "Unknown Error Code."
 
-#: src/protocols/gg/gg.c:259
+#: src/protocols/gg/gg.c:253
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: src/protocols/gg/gg.c:399
+#: src/protocols/gg/gg.c:407
 msgid "Could not connect"
 msgstr "Could not connect"
 
-#: src/protocols/gg/gg.c:406
+#: src/protocols/gg/gg.c:414
 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:593 src/protocols/icq/gaim_icq.c:344
-#: src/protocols/msn/dispatch.c:208 src/protocols/msn/msn.c:518
-#: src/protocols/msn/servconn.c:47 src/protocols/napster/napster.c:475
-#: src/protocols/napster/napster.c:506 src/protocols/toc/toc.c:200
-#: src/protocols/yahoo/yahoo.c:1958 src/protocols/yahoo/yahoo.c:1989
-#: src/protocols/yahoo/yahoo.c:2052 src/protocols/yahoo/yahoo_filexfer.c:68
+#: src/protocols/gg/gg.c:601 src/protocols/icq/gaim_icq.c:344
+#: src/protocols/msn/dispatch.c:208 src/protocols/msn/msn.c:524
+#: src/protocols/msn/servconn.c:47 src/protocols/napster/napster.c:474
+#: src/protocols/napster/napster.c:505 src/protocols/toc/toc.c:200
+#: src/protocols/yahoo/yahoo.c:1960 src/protocols/yahoo/yahoo.c:1991
+#: src/protocols/yahoo/yahoo.c:2054 src/protocols/yahoo/yahoo_filexfer.c:68
 #: src/protocols/yahoo/yahoo_filexfer.c:139
 msgid "Unable to connect."
 msgstr "Unable to connect."
 
-#: src/protocols/gg/gg.c:609
+#: src/protocols/gg/gg.c:617
 msgid "Reading data"
 msgstr "Reading data"
 
-#: src/protocols/gg/gg.c:612
+#: src/protocols/gg/gg.c:620
 msgid "Balancer handshake"
 msgstr "Balancer handshake"
 
-#: src/protocols/gg/gg.c:615
+#: src/protocols/gg/gg.c:623
 msgid "Reading server key"
 msgstr "Reading server key"
 
-#: src/protocols/gg/gg.c:618
+#: src/protocols/gg/gg.c:626
 msgid "Exchanging key hash"
 msgstr "Exchanging key hash"
 
-#: src/protocols/gg/gg.c:628
+#: src/protocols/gg/gg.c:636
 msgid "Critical error in GG library\n"
 msgstr "Critical error in GG library\n"
 
-#: src/protocols/gg/gg.c:646 src/protocols/gg/gg.c:737
+#: src/protocols/gg/gg.c:654 src/protocols/gg/gg.c:745
 #: src/protocols/toc/toc.c:176
 #, c-format
 msgid "Connect to %s failed"
 msgstr "Connect to %s failed"
 
-#: src/protocols/gg/gg.c:694
+#: src/protocols/gg/gg.c:702
 msgid "Unable to ping server"
 msgstr "Unable to ping server"
 
-#: src/protocols/gg/gg.c:706
+#: src/protocols/gg/gg.c:714
 msgid "Send as message"
 msgstr "Send as message"
 
-#: src/protocols/gg/gg.c:711
+#: src/protocols/gg/gg.c:719
 msgid "Looking up GG server"
 msgstr "Looking up GG server"
 
-#: src/protocols/gg/gg.c:714
+#: src/protocols/gg/gg.c:722
 msgid "Invalid Gadu-Gadu UIN specified"
 msgstr "Invalid Gadu-Gadu UIN specified"
 
-#: src/protocols/gg/gg.c:761
+#: src/protocols/gg/gg.c:769
 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:827
+#: src/protocols/gg/gg.c:835
 msgid "Couldn't get search results"
 msgstr "Couldn't get search results"
 
-#: src/protocols/gg/gg.c:832
+#: src/protocols/gg/gg.c:840
 msgid "Gadu-Gadu Search Engine"
 msgstr "Gadu-Gadu Search Engine"
 
-#: src/protocols/gg/gg.c:857
+#: src/protocols/gg/gg.c:865
 msgid "Active"
 msgstr "Active"
 
-#: src/protocols/gg/gg.c:862 src/protocols/oscar/oscar.c:4211
+#: src/protocols/gg/gg.c:870 src/protocols/oscar/oscar.c:4815
 msgid "UIN"
 msgstr "UIN"
 
 #. First Name
-#: src/protocols/gg/gg.c:866 src/protocols/jabber/jabber.c:611
-#: src/protocols/oscar/oscar.c:4222 src/protocols/trepia/trepia.c:267
+#: src/protocols/gg/gg.c:874 src/protocols/jabber/jabber.c:611
+#: src/protocols/oscar/oscar.c:4826 src/protocols/silc/ops.c:774
+#: src/protocols/trepia/trepia.c:267
 msgid "First Name"
 msgstr "First Name"
 
 #. Last Name
-#: src/protocols/gg/gg.c:871 src/protocols/jabber/jabber.c:616
-#: src/protocols/oscar/oscar.c:4223 src/protocols/trepia/trepia.c:274
+#: src/protocols/gg/gg.c:879 src/protocols/jabber/jabber.c:616
+#: src/protocols/oscar/oscar.c:4827 src/protocols/trepia/trepia.c:274
 msgid "Last Name"
 msgstr "Last Name"
 
-#: src/protocols/gg/gg.c:875 src/protocols/gg/gg.c:1627
-#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4212
+#: src/protocols/gg/gg.c:883 src/protocols/gg/gg.c:1622
+#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4816
 msgid "Nick"
 msgstr "Nick"
 
-#: src/protocols/gg/gg.c:882 src/protocols/gg/gg.c:885
+#: src/protocols/gg/gg.c:890 src/protocols/gg/gg.c:893
 msgid "Birth Year"
 msgstr "Birth Year"
 
-#: src/protocols/gg/gg.c:891 src/protocols/gg/gg.c:893
-#: src/protocols/gg/gg.c:895
+#: src/protocols/gg/gg.c:899 src/protocols/gg/gg.c:901
+#: src/protocols/gg/gg.c:903
 msgid "Sex"
 msgstr "Sex"
 
 #. City
-#: src/protocols/gg/gg.c:899 src/protocols/jabber/jabber.c:626
-#: src/protocols/oscar/oscar.c:4265 src/protocols/oscar/oscar.c:4273
+#: src/protocols/gg/gg.c:907 src/protocols/jabber/jabber.c:626
+#: src/protocols/oscar/oscar.c:4870 src/protocols/oscar/oscar.c:4878
 #: src/protocols/trepia/trepia.c:331 src/protocols/trepia/trepia.c:410
 msgid "City"
 msgstr "City"
 
 #. res[0] == username
 #. show it to the user
-#: src/protocols/gg/gg.c:920 src/protocols/msn/msn.c:1305
-#: src/protocols/msn/msn.c:1549 src/protocols/napster/napster.c:393
-#: src/protocols/oscar/oscar.c:3189 src/protocols/oscar/oscar.c:3405
-#: src/protocols/toc/toc.c:498 src/protocols/yahoo/yahoo.c:2898
-#: src/protocols/yahoo/yahoo.c:2920 src/protocols/yahoo/yahoo.c:2943
-#: src/protocols/yahoo/yahoo.c:3101 src/protocols/zephyr/zephyr.c:567
+#: src/protocols/gg/gg.c:928 src/protocols/msn/msn.c:1307
+#: src/protocols/msn/msn.c:1551 src/protocols/napster/napster.c:392
+#: src/protocols/oscar/oscar.c:3793 src/protocols/oscar/oscar.c:4009
+#: src/protocols/toc/toc.c:498 src/protocols/yahoo/yahoo.c:2955
+#: src/protocols/yahoo/yahoo.c:2977 src/protocols/yahoo/yahoo.c:3000
+#: src/protocols/yahoo/yahoo.c:3158 src/protocols/zephyr/zephyr.c:568
 msgid "Buddy Information"
 msgstr "Buddy Information"
 
-#: src/protocols/gg/gg.c:940
+#: src/protocols/gg/gg.c:950
 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:948
+#: src/protocols/gg/gg.c:958
 msgid "Couldn't Import Buddy List from Server"
 msgstr "Couldn't Import Buddy List from Server"
 
-#: src/protocols/gg/gg.c:1011
+#: src/protocols/gg/gg.c:1021
 msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "Buddy List successfully transferred to Gadu-Gadu server"
 
-#: src/protocols/gg/gg.c:1019
+#: src/protocols/gg/gg.c:1029
 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:1027
+#: src/protocols/gg/gg.c:1037
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
 msgstr "Buddy List successfully deleted from Gadu-Gadu server"
 
-#: src/protocols/gg/gg.c:1035
+#: src/protocols/gg/gg.c:1045
 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:1044
+#: src/protocols/gg/gg.c:1054
 msgid "Password changed successfully"
 msgstr "Password changed successfully"
 
-#: src/protocols/gg/gg.c:1051
+#: src/protocols/gg/gg.c:1061
 msgid "Password couldn't be changed"
 msgstr "Password couldn't be changed"
 
-#: src/protocols/gg/gg.c:1170
+#: src/protocols/gg/gg.c:1180
 msgid "Error communicating with Gadu-Gadu server"
 msgstr "Error communicating with Gadu-Gadu server"
 
-#: src/protocols/gg/gg.c:1171
+#: src/protocols/gg/gg.c:1181
 msgid ""
 "Gaim was unable to complete your request due to a problem communicating with "
 "the Gadu-Gadu HTTP server.  Please try again later."
@@ -4628,11 +4653,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:1200
+#: src/protocols/gg/gg.c:1210
 msgid "Unable to import Gadu-Gadu buddy list"
 msgstr "Unable to import Gadu-Gadu buddy list"
 
-#: src/protocols/gg/gg.c:1201
+#: src/protocols/gg/gg.c:1211
 msgid ""
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
@@ -4640,25 +4665,25 @@
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
 
-#: src/protocols/gg/gg.c:1274
+#: src/protocols/gg/gg.c:1284
 msgid "Couldn't export buddy list"
 msgstr "Couldn't export buddy list"
 
-#: src/protocols/gg/gg.c:1275 src/protocols/gg/gg.c:1298
+#: src/protocols/gg/gg.c:1285 src/protocols/gg/gg.c:1308
 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:1297
+#: src/protocols/gg/gg.c:1307
 msgid "Unable to delete Gadu-Gadu buddy list"
 msgstr "Unable to delete Gadu-Gadu buddy list"
 
-#: src/protocols/gg/gg.c:1347
+#: src/protocols/gg/gg.c:1358
 msgid "Unable to access directory"
 msgstr "Unable to access directory"
 
-#: src/protocols/gg/gg.c:1348
+#: src/protocols/gg/gg.c:1359
 msgid ""
 "Gaim was unable to search the Directory because it was unable to connect to "
 "the directory server.  Please try again later."
@@ -4666,11 +4691,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:1381
+#: src/protocols/gg/gg.c:1393
 msgid "Unable to change Gadu-Gadu password"
 msgstr "Unable to change Gadu-Gadu password"
 
-#: src/protocols/gg/gg.c:1382
+#: src/protocols/gg/gg.c:1394
 msgid ""
 "Gaim was unable to change your password due to an error connecting to the "
 "Gadu-Gadu server.  Please try again later."
@@ -4678,32 +4703,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:1399
+#: src/protocols/gg/gg.c:1410
 msgid "Directory Search"
 msgstr "Directory Search"
 
-#: src/protocols/gg/gg.c:1408 src/protocols/jabber/jabber.c:1060
-#: src/protocols/toc/toc.c:1546
+#. if (js->protocol_options & CHANGE_PASSWORD) {
+#: src/protocols/gg/gg.c:1415 src/protocols/jabber/jabber.c:1059
+#: src/protocols/toc/toc.c:1573
 msgid "Change Password"
 msgstr "Change Password"
 
-#: src/protocols/gg/gg.c:1416
+#: src/protocols/gg/gg.c:1419
 msgid "Import Buddy List from Server"
 msgstr "Import Buddy List from Server"
 
-#: src/protocols/gg/gg.c:1422
+#: src/protocols/gg/gg.c:1423
 msgid "Export Buddy List to Server"
 msgstr "Export Buddy List to Server"
 
-#: src/protocols/gg/gg.c:1428
+#: src/protocols/gg/gg.c:1427
 msgid "Delete Buddy List from Server"
 msgstr "Delete Buddy List from Server"
 
-#: src/protocols/gg/gg.c:1462
+#: src/protocols/gg/gg.c:1460
 msgid "Unable to access user profile."
 msgstr "Unable to access user profile."
 
-#: src/protocols/gg/gg.c:1463
+#: src/protocols/gg/gg.c:1461
 msgid ""
 "Gaim was unable to access this user's profile due to an error connecting to "
 "the directory server.  Please try again later."
@@ -4722,7 +4748,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/gg/gg.c:1608 src/protocols/gg/gg.c:1610
+#: src/protocols/gg/gg.c:1601 src/protocols/gg/gg.c:1603
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu Protocol Plugin"
 
@@ -4737,15 +4763,15 @@
 
 #: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:229
 #: src/protocols/msn/notification.c:531 src/protocols/msn/notification.c:917
-#: src/protocols/msn/notification.c:1084 src/protocols/oscar/oscar.c:2931
-#: src/protocols/oscar/oscar.c:5453
+#: src/protocols/msn/notification.c:1084 src/protocols/oscar/oscar.c:3528
+#: src/protocols/oscar/oscar.c:6071
 msgid "Authorize"
 msgstr "Authorize"
 
 #: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:230
 #: src/protocols/msn/notification.c:532 src/protocols/msn/notification.c:919
-#: src/protocols/msn/notification.c:1086 src/protocols/oscar/oscar.c:2933
-#: src/protocols/oscar/oscar.c:5454
+#: src/protocols/msn/notification.c:1086 src/protocols/oscar/oscar.c:3530
+#: src/protocols/oscar/oscar.c:6072
 msgid "Deny"
 msgstr "Deny"
 
@@ -4807,68 +4833,71 @@
 msgid "Gaim could not open a listening port."
 msgstr "Gaim could not open a listening port."
 
-#: src/protocols/irc/irc.c:73
+#: src/protocols/irc/irc.c:75
 msgid "Error displaying MOTD"
 msgstr "Error displaying MOTD"
 
-#: src/protocols/irc/irc.c:73
+#: src/protocols/irc/irc.c:75
 msgid "No MOTD available"
 msgstr "No MOTD available"
 
-#: src/protocols/irc/irc.c:74
+#: src/protocols/irc/irc.c:76
 msgid "There is no MOTD associated with this connection."
 msgstr "There is no MOTD associated with this connection."
 
-#: src/protocols/irc/irc.c:77
+#: src/protocols/irc/irc.c:79
 #, c-format
 msgid "MOTD for %s"
 msgstr "MOTD for %s"
 
-#: src/protocols/irc/irc.c:140
+#: src/protocols/irc/irc.c:141
 msgid "View MOTD"
 msgstr "View MOTD"
 
-#: src/protocols/irc/irc.c:154 src/protocols/jabber/buddy.c:883
-#: src/protocols/oscar/oscar.c:440 src/protocols/oscar/oscar.c:6534
-#: src/protocols/yahoo/yahoo.c:2456
+#. FIXME: remove this when the ui does it for us.
+#: src/protocols/irc/irc.c:168 src/protocols/jabber/buddy.c:929
+#: src/protocols/oscar/oscar.c:448 src/protocols/oscar/oscar.c:6742
+#: src/protocols/yahoo/yahoo.c:2507
 msgid "Send File"
 msgstr "Send File"
 
-#: src/protocols/irc/irc.c:168
+#: src/protocols/irc/irc.c:182 src/protocols/silc/chat.c:32
 msgid "_Channel:"
 msgstr "_Channel:"
 
-#: src/protocols/irc/irc.c:173 src/protocols/jabber/chat.c:59
+#: src/protocols/irc/irc.c:187 src/protocols/jabber/chat.c:59
 msgid "_Password:"
 msgstr "_Password:"
 
-#: src/protocols/irc/irc.c:193
+#: src/protocols/irc/irc.c:207
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC nicks may not contain whitespace"
 
-#: src/protocols/irc/irc.c:212 src/protocols/toc/toc.c:228
+#: src/protocols/irc/irc.c:226 src/protocols/toc/toc.c:228
 #, c-format
 msgid "Signon: %s"
 msgstr "Signon: %s"
 
-#: src/protocols/irc/irc.c:221
+#: src/protocols/irc/irc.c:235
 msgid "Couldn't create socket"
 msgstr "Couldn't create socket"
 
-#: src/protocols/irc/irc.c:236 src/protocols/jabber/jabber.c:295
-#: src/protocols/oscar/oscar.c:876 src/protocols/oscar/oscar.c:940
+#: src/protocols/irc/irc.c:250 src/protocols/jabber/jabber.c:295
+#: src/protocols/oscar/oscar.c:1523 src/protocols/oscar/oscar.c:1587
 msgid "Couldn't connect to host"
 msgstr "Couldn't connect to host"
 
-#: src/protocols/irc/irc.c:372 src/protocols/trepia/trepia.c:926
+#: src/protocols/irc/irc.c:386 src/protocols/trepia/trepia.c:926
 msgid "Read error"
 msgstr "Read error"
 
-#: src/protocols/irc/irc.c:506 src/protocols/yahoo/yahoochat.c:1343
+#: src/protocols/irc/irc.c:520 src/protocols/silc/chat.c:1345
+#: src/protocols/yahoo/yahoochat.c:1343
 msgid "Users"
 msgstr "Users"
 
-#: src/protocols/irc/irc.c:509 src/protocols/yahoo/yahoochat.c:1352
+#: src/protocols/irc/irc.c:523 src/protocols/silc/chat.c:1348
+#: src/protocols/silc/ops.c:1017 src/protocols/yahoo/yahoochat.c:1352
 msgid "Topic"
 msgstr "Topic"
 
@@ -4881,32 +4910,34 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:615
+#: src/protocols/irc/irc.c:624
 msgid "IRC Protocol Plugin"
 msgstr "IRC Protocol Plugin"
 
 #. *  summary
-#: src/protocols/irc/irc.c:616
+#: src/protocols/irc/irc.c:625
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "The IRC Protocol Plugin that Sucks Less"
 
-#: src/protocols/irc/irc.c:633 src/protocols/irc/msgs.c:197
-#: src/protocols/jabber/jabber.c:1388 src/protocols/napster/napster.c:658
+#: src/protocols/irc/irc.c:644 src/protocols/irc/msgs.c:197
+#: src/protocols/jabber/jabber.c:1382 src/protocols/napster/napster.c:640
+#: src/protocols/silc/ops.c:935
 msgid "Server"
 msgstr "Server"
 
-#: src/protocols/irc/irc.c:636 src/protocols/jabber/jabber.c:1409
-#: src/protocols/msn/msn.c:1732 src/protocols/napster/napster.c:663
-#: src/protocols/trepia/trepia.c:1307
+#: src/protocols/irc/irc.c:647 src/protocols/jabber/jabber.c:1403
+#: src/protocols/msn/msn.c:1730 src/protocols/napster/napster.c:645
+#: src/protocols/silc/silc.c:1055 src/protocols/trepia/trepia.c:1304
 msgid "Port"
 msgstr "Port"
 
-#: src/protocols/irc/irc.c:639 src/protocols/zephyr/zephyr.c:1401
+#: src/protocols/irc/irc.c:650 src/protocols/zephyr/zephyr.c:1383
 msgid "Encoding"
 msgstr "Encoding"
 
-#: src/protocols/irc/irc.c:642 src/protocols/irc/msgs.c:191
-#: src/protocols/jabber/jabber.c:586
+#: src/protocols/irc/irc.c:653 src/protocols/irc/msgs.c:191
+#: src/protocols/jabber/jabber.c:586 src/protocols/silc/buddy.c:1475
+#: src/protocols/silc/ops.c:931
 msgid "Username"
 msgstr "Username"
 
@@ -4931,7 +4962,8 @@
 msgid " <i>(identified)</i>"
 msgstr " <i>(identified)</i>"
 
-#: src/protocols/irc/msgs.c:192 src/protocols/yahoo/yahoo.c:3001
+#: src/protocols/irc/msgs.c:192 src/protocols/silc/ops.c:929
+#: src/protocols/yahoo/yahoo.c:3058
 msgid "Realname"
 msgstr "Realname"
 
@@ -4980,88 +5012,88 @@
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr "Gaim has sent a message the IRC server did not understand."
 
-#: src/protocols/irc/msgs.c:403
+#: src/protocols/irc/msgs.c:405
 msgid "No such channel"
 msgstr "No such channel"
 
 #. does this happen?
-#: src/protocols/irc/msgs.c:414
+#: src/protocols/irc/msgs.c:416
 msgid "no such channel"
 msgstr "no such channel"
 
-#: src/protocols/irc/msgs.c:417
+#: src/protocols/irc/msgs.c:419
 msgid "User is not logged in"
 msgstr "User is not logged in"
 
-#: src/protocols/irc/msgs.c:422
+#: src/protocols/irc/msgs.c:424
 msgid "No such nick or channel"
 msgstr "No such nick or channel"
 
-#: src/protocols/irc/msgs.c:442
+#: src/protocols/irc/msgs.c:444
 msgid "Could not send"
 msgstr "Could not send"
 
-#: src/protocols/irc/msgs.c:498
+#: src/protocols/irc/msgs.c:500
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Joining %s requires an invitation."
 
-#: src/protocols/irc/msgs.c:499
+#: src/protocols/irc/msgs.c:501
 msgid "Invitation only"
 msgstr "Invitation only"
 
-#: src/protocols/irc/msgs.c:595
+#: src/protocols/irc/msgs.c:597
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "You have been kicked by %s: (%s)"
 
-#: src/protocols/irc/msgs.c:600
+#: src/protocols/irc/msgs.c:602
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Kicked by %s (%s)"
 
-#: src/protocols/irc/msgs.c:621
+#: src/protocols/irc/msgs.c:623
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "mode (%s %s) by %s"
 
-#: src/protocols/irc/msgs.c:700
+#: src/protocols/irc/msgs.c:702
 msgid "Could not change nick"
 msgstr "Could not change nick"
 
-#: src/protocols/irc/msgs.c:701
+#: src/protocols/irc/msgs.c:703
 msgid "Cannot change nick"
 msgstr "Cannot change nick"
 
-#: src/protocols/irc/msgs.c:722
+#: src/protocols/irc/msgs.c:724
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "You have parted the channel%s%s"
 
-#: src/protocols/irc/msgs.c:762
+#: src/protocols/irc/msgs.c:764
 msgid "Error: invalid PONG from server"
 msgstr "Error: invalid PONG from server"
 
-#: src/protocols/irc/msgs.c:764
+#: src/protocols/irc/msgs.c:766
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING reply -- Lag: %lu seconds"
 
-#: src/protocols/irc/msgs.c:839
+#: src/protocols/irc/msgs.c:841
 #, c-format
 msgid "Cannot join %s:"
 msgstr "Cannot join %s:"
 
-#: src/protocols/irc/msgs.c:840
+#: src/protocols/irc/msgs.c:842 src/protocols/silc/ops.c:878
 msgid "Cannot join channel"
 msgstr "Cannot join channel"
 
-#: src/protocols/irc/msgs.c:870
+#: src/protocols/irc/msgs.c:872
 #, c-format
 msgid "Wallops from %s"
 msgstr "Wallops from %s"
 
-#: src/protocols/irc/parse.c:165 src/protocols/zephyr/zephyr.c:199
+#: src/protocols/irc/parse.c:166 src/protocols/zephyr/zephyr.c:199
 msgid ""
 "(There was an error converting this message.  Check the 'Encoding' option in "
 "the Account Editor)"
@@ -5069,22 +5101,22 @@
 "(There was an error converting this message.  Check the 'Encoding' option in "
 "the Account Editor)"
 
-#: src/protocols/irc/parse.c:318
+#: src/protocols/irc/parse.c:320
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Reply time from %s: %lu seconds"
 
-#: src/protocols/irc/parse.c:319
+#: src/protocols/irc/parse.c:321
 msgid "PONG"
 msgstr "PONG"
 
-#: src/protocols/irc/parse.c:319
+#: src/protocols/irc/parse.c:321
 msgid "CTCP PING reply"
 msgstr "CTCP PING reply"
 
-#: src/protocols/irc/parse.c:421 src/protocols/oscar/oscar.c:777
-#: src/protocols/toc/toc.c:218 src/protocols/toc/toc.c:625
-#: src/protocols/toc/toc.c:641 src/protocols/toc/toc.c:709
+#: src/protocols/irc/parse.c:423 src/protocols/oscar/oscar.c:1424
+#: src/protocols/toc/toc.c:218 src/protocols/toc/toc.c:626
+#: src/protocols/toc/toc.c:642 src/protocols/toc/toc.c:716
 msgid "Disconnected."
 msgstr "Disconnected."
 
@@ -5117,20 +5149,24 @@
 msgid "Invalid challenge from server"
 msgstr "Invalid challenge from server"
 
-#: src/protocols/jabber/buddy.c:247 src/protocols/jabber/buddy.c:603
+#: src/protocols/jabber/buddy.c:247 src/protocols/jabber/buddy.c:604
+#: src/protocols/silc/ops.c:770
 msgid "Full Name"
 msgstr "Full Name"
 
-#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:616
+#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:617
+#: src/protocols/silc/ops.c:782
 msgid "Family Name"
 msgstr "Family Name"
 
-#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:620
+#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:621
 msgid "Given Name"
 msgstr "Given Name"
 
-#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:635
-#: src/protocols/jabber/jabber.c:606 src/protocols/yahoo/yahoo.c:2997
+#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:636
+#: src/protocols/jabber/jabber.c:606 src/protocols/silc/buddy.c:1472
+#: src/protocols/silc/ops.c:786 src/protocols/silc/ops.c:927
+#: src/protocols/yahoo/yahoo.c:3054
 msgid "Nickname"
 msgstr "Nickname"
 
@@ -5138,69 +5174,71 @@
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:663
+#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:664
 msgid "Street Address"
 msgstr "Street Address"
 
-#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:659
+#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:660
 msgid "Extended Address"
 msgstr "Extended Address"
 
-#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:667
+#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:668
 msgid "Locality"
 msgstr "Locality"
 
-#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:671
+#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:672
 msgid "Region"
 msgstr "Region"
 
-#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:675
+#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:676
 #: src/protocols/jabber/jabber.c:636
 msgid "Postal Code"
 msgstr "Postal Code"
 
 #. Country
-#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:680
-#: src/protocols/trepia/trepia.c:339 src/protocols/trepia/trepia.c:416
+#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:681
+#: src/protocols/silc/util.c:287 src/protocols/trepia/trepia.c:339
+#: src/protocols/trepia/trepia.c:416
 msgid "Country"
 msgstr "Country"
 
-#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:691
-#: src/protocols/jabber/buddy.c:698
+#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:692
+#: src/protocols/jabber/buddy.c:699
 msgid "Telephone"
 msgstr "Telephone"
 
-#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:709
-#: src/protocols/jabber/buddy.c:717 src/protocols/yahoo/yahoo.c:2993
+#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:710
+#: src/protocols/jabber/buddy.c:718 src/protocols/silc/buddy.c:1527
+#: src/protocols/silc/silc.c:633 src/protocols/yahoo/yahoo.c:3050
 msgid "Email"
 msgstr "Email"
 
-#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:732
+#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:733
 msgid "Organization Name"
 msgstr "Organization Name"
 
-#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:736
+#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:737
 msgid "Organization Unit"
 msgstr "Organization Unit"
 
-#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:742
+#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:743
 msgid "Title"
 msgstr "Title"
 
-#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:745
+#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:746
 msgid "Role"
 msgstr "Role"
 
-#: src/protocols/jabber/buddy.c:264 src/protocols/jabber/buddy.c:638
-#: src/protocols/oscar/oscar.c:4246
+#: src/protocols/jabber/buddy.c:264 src/protocols/jabber/buddy.c:639
+#: src/protocols/oscar/oscar.c:4851
 msgid "Birthday"
 msgstr "Birthday"
 
-#: src/protocols/jabber/buddy.c:508 src/protocols/jabber/buddy.c:509
+#: src/protocols/jabber/buddy.c:509 src/protocols/jabber/buddy.c:510
 msgid "Edit Jabber vCard"
 msgstr "Edit Jabber vCard"
 
-#: src/protocols/jabber/buddy.c:510
+#: src/protocols/jabber/buddy.c:511
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
@@ -5208,65 +5246,70 @@
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
 
-#: src/protocols/jabber/buddy.c:552
+#: src/protocols/jabber/buddy.c:553
 msgid "Jabber ID"
 msgstr "Jabber ID"
 
-#: src/protocols/jabber/buddy.c:562 src/protocols/jabber/buddy.c:569
-#: src/protocols/jabber/buddy.c:580 src/protocols/jabber/jabber.c:935
-#: src/protocols/msn/msn.c:347 src/protocols/novell/novell.c:2168
-#: src/protocols/novell/novell.c:2172 src/protocols/oscar/oscar.c:566
-#: src/protocols/oscar/oscar.c:572 src/protocols/oscar/oscar.c:574
-#: src/protocols/yahoo/yahoo.c:2407
+#: src/protocols/jabber/buddy.c:563 src/protocols/jabber/buddy.c:570
+#: src/protocols/jabber/buddy.c:581 src/protocols/jabber/jabber.c:935
+#: src/protocols/msn/msn.c:366 src/protocols/novell/novell.c:2742
+#: src/protocols/novell/novell.c:2746 src/protocols/oscar/oscar.c:574
+#: src/protocols/oscar/oscar.c:580 src/protocols/oscar/oscar.c:582
+#: src/protocols/yahoo/yahoo.c:2426
 msgid "Status"
 msgstr "Status"
 
-#: src/protocols/jabber/buddy.c:578 src/protocols/jabber/jabber.c:1391
+#: src/protocols/jabber/buddy.c:579 src/protocols/jabber/jabber.c:1385
 msgid "Resource"
 msgstr "Resource"
 
-#: src/protocols/jabber/buddy.c:624
+#: src/protocols/jabber/buddy.c:625 src/protocols/silc/ops.c:778
 msgid "Middle Name"
 msgstr "Middle Name"
 
-#: src/protocols/jabber/buddy.c:643 src/protocols/jabber/jabber.c:621
-#: src/protocols/oscar/oscar.c:4264 src/protocols/oscar/oscar.c:4272
+#: src/protocols/jabber/buddy.c:644 src/protocols/jabber/jabber.c:621
+#: src/protocols/oscar/oscar.c:4869 src/protocols/oscar/oscar.c:4877
+#: src/protocols/silc/ops.c:814
 msgid "Address"
 msgstr "Address"
 
-#: src/protocols/jabber/buddy.c:655
+#: src/protocols/jabber/buddy.c:656
 msgid "P.O. Box"
 msgstr "P.O. Box"
 
-#: src/protocols/jabber/buddy.c:761
+#: src/protocols/jabber/buddy.c:762
 msgid "Photo"
 msgstr "Photo"
 
-#: src/protocols/jabber/buddy.c:761
+#: src/protocols/jabber/buddy.c:762
 msgid "Logo"
 msgstr "Logo"
 
-#: src/protocols/jabber/buddy.c:777
+#: src/protocols/jabber/buddy.c:778
 msgid "Jabber Profile"
 msgstr "Jabber Profile"
 
-#: src/protocols/jabber/buddy.c:893
+#: src/protocols/jabber/buddy.c:937
 msgid "Un-hide From"
 msgstr "Un-hide From"
 
-#: src/protocols/jabber/buddy.c:896
+#: src/protocols/jabber/buddy.c:940
 msgid "Temporarily Hide From"
 msgstr "Temporarily Hide From"
 
-#: src/protocols/jabber/buddy.c:905
+#. && NOT ME
+#: src/protocols/jabber/buddy.c:947
 msgid "Cancel Presence Notification"
 msgstr "Cancel Presence Notification"
 
-#: src/protocols/jabber/buddy.c:913
+#: src/protocols/jabber/buddy.c:953
 msgid "(Re-)Request authorization"
 msgstr "(Re-)Request authorization"
 
-#: src/protocols/jabber/buddy.c:919
+#. if(NOT ME)
+#. shouldn't this just happen automatically when the buddy is
+#. removed?
+#: src/protocols/jabber/buddy.c:961
 msgid "Unsubscribe"
 msgstr "Unsubscribe"
 
@@ -5362,7 +5405,7 @@
 msgstr "Error initializing session"
 
 #: src/protocols/jabber/jabber.c:204 src/protocols/msn/httpmethod.c:255
-#: src/protocols/trepia/trepia.c:248 src/protocols/trepia/trepia.c:698
+#: src/protocols/trepia/trepia.c:247 src/protocols/trepia/trepia.c:698
 #: src/protocols/trepia/trepia.c:987 src/protocols/trepia/trepia.c:1031
 #: src/protocols/trepia/trepia.c:1130 src/protocols/trepia/trepia.c:1186
 msgid "Write error"
@@ -5402,7 +5445,7 @@
 msgid "Registration Successful"
 msgstr "Registration Successful"
 
-#: src/protocols/jabber/jabber.c:440 src/protocols/jabber/jabber.c:1180
+#: src/protocols/jabber/jabber.c:440 src/protocols/jabber/jabber.c:1178
 msgid "Unknown Error"
 msgstr "Unknown Error"
 
@@ -5414,7 +5457,7 @@
 msgid "Already Registered"
 msgstr "Already Registered"
 
-#: src/protocols/jabber/jabber.c:590 src/protocols/jabber/jabber.c:1031
+#: src/protocols/jabber/jabber.c:590 src/protocols/jabber/jabber.c:1033
 msgid "Password"
 msgstr "Password"
 
@@ -5423,13 +5466,14 @@
 msgstr "E-Mail"
 
 #. State
-#: src/protocols/jabber/jabber.c:631 src/protocols/oscar/oscar.c:4266
-#: src/protocols/oscar/oscar.c:4274 src/protocols/trepia/trepia.c:335
+#: src/protocols/jabber/jabber.c:631 src/protocols/oscar/oscar.c:4871
+#: src/protocols/oscar/oscar.c:4879 src/protocols/trepia/trepia.c:335
 #: src/protocols/trepia/trepia.c:413
 msgid "State"
 msgstr "Province/Territory"
 
-#: src/protocols/jabber/jabber.c:641
+#: src/protocols/jabber/jabber.c:641 src/protocols/silc/buddy.c:1529
+#: src/protocols/silc/ops.c:819 src/protocols/silc/silc.c:635
 msgid "Phone"
 msgstr "Phone"
 
@@ -5447,10 +5491,10 @@
 
 #. connect to the server
 #: src/protocols/jabber/jabber.c:780 src/protocols/msn/dispatch.c:212
-#: src/protocols/msn/msn.c:508 src/protocols/napster/napster.c:499
-#: src/protocols/novell/novell.c:1576 src/protocols/oscar/oscar.c:944
-#: src/protocols/trepia/trepia.c:1064 src/protocols/yahoo/yahoo.c:2177
-#: src/protocols/zephyr/zephyr.c:864
+#: src/protocols/msn/msn.c:514 src/protocols/napster/napster.c:498
+#: src/protocols/novell/novell.c:2105 src/protocols/oscar/oscar.c:1591
+#: src/protocols/trepia/trepia.c:1064 src/protocols/yahoo/yahoo.c:2179
+#: src/protocols/zephyr/zephyr.c:865
 msgid "Connecting"
 msgstr "Connecting"
 
@@ -5466,9 +5510,9 @@
 msgid "Re-initializing Stream"
 msgstr "Re-initializing Stream"
 
-#: src/protocols/jabber/jabber.c:879 src/protocols/jabber/jabber.c:1158
-#: src/protocols/jabber/jabber.c:1199 src/protocols/jabber/jabber.c:1232
-#: src/protocols/oscar/oscar.c:572 src/protocols/oscar/oscar.c:5818
+#: src/protocols/jabber/jabber.c:879 src/protocols/jabber/jabber.c:1156
+#: src/protocols/jabber/jabber.c:1197 src/protocols/jabber/jabber.c:1230
+#: src/protocols/oscar/oscar.c:580 src/protocols/oscar/oscar.c:6442
 msgid "Not Authorized"
 msgstr "Not Authorized"
 
@@ -5512,8 +5556,8 @@
 
 #: src/protocols/jabber/jabber.c:959 src/protocols/jabber/jutil.c:41
 #: src/protocols/jabber/presence.c:70 src/protocols/jabber/presence.c:124
-#: src/protocols/oscar/oscar.c:514 src/protocols/oscar/oscar.c:4830
-#: src/protocols/oscar/oscar.c:6429
+#: src/protocols/oscar/oscar.c:522 src/protocols/oscar/oscar.c:5455
+#: src/protocols/oscar/oscar.c:6634
 msgid "Do Not Disturb"
 msgstr "Do Not Disturb"
 
@@ -5529,219 +5573,219 @@
 msgid "Error changing password"
 msgstr "Error changing password"
 
-#: src/protocols/jabber/jabber.c:1036
+#: src/protocols/jabber/jabber.c:1038
 msgid "Password (again)"
 msgstr "Password (again)"
 
-#: src/protocols/jabber/jabber.c:1041 src/protocols/jabber/jabber.c:1042
+#: src/protocols/jabber/jabber.c:1043 src/protocols/jabber/jabber.c:1044
 msgid "Change Jabber Password"
 msgstr "Change Jabber Password"
 
-#: src/protocols/jabber/jabber.c:1042
+#: src/protocols/jabber/jabber.c:1044
 msgid "Please enter your new password"
 msgstr "Please enter your new password"
 
-#: src/protocols/jabber/jabber.c:1053 src/protocols/toc/toc.c:1532
+#: src/protocols/jabber/jabber.c:1054 src/protocols/toc/toc.c:1563
 msgid "Set User Info"
 msgstr "Set User Info"
 
+#: src/protocols/jabber/jabber.c:1136
+msgid "Bad Request"
+msgstr "Bad Request"
+
 #: src/protocols/jabber/jabber.c:1138
-msgid "Bad Request"
-msgstr "Bad Request"
+msgid "Conflict"
+msgstr "Conflict"
 
 #: src/protocols/jabber/jabber.c:1140
-msgid "Conflict"
-msgstr "Conflict"
+msgid "Feature Not Implemented"
+msgstr "Feature Not Implemented"
 
 #: src/protocols/jabber/jabber.c:1142
-msgid "Feature Not Implemented"
-msgstr "Feature Not Implemented"
+msgid "Forbidden"
+msgstr "Forbidden"
 
 #: src/protocols/jabber/jabber.c:1144
-msgid "Forbidden"
-msgstr "Forbidden"
-
-#: src/protocols/jabber/jabber.c:1146
 msgid "Gone"
 msgstr "Gone"
 
-#: src/protocols/jabber/jabber.c:1148 src/protocols/jabber/jabber.c:1222
+#: src/protocols/jabber/jabber.c:1146 src/protocols/jabber/jabber.c:1220
 msgid "Internal Server Error"
 msgstr "Internal Server Error"
 
-#: src/protocols/jabber/jabber.c:1150
+#: src/protocols/jabber/jabber.c:1148
 msgid "Item Not Found"
 msgstr "Item Not Found"
 
-#: src/protocols/jabber/jabber.c:1152
+#: src/protocols/jabber/jabber.c:1150
 msgid "Malformed Jabber ID"
 msgstr "Malformed Jabber ID"
 
-#: src/protocols/jabber/jabber.c:1154
+#: src/protocols/jabber/jabber.c:1152
 msgid "Not Acceptable"
 msgstr "Not Acceptable"
 
-#: src/protocols/jabber/jabber.c:1156
+#: src/protocols/jabber/jabber.c:1154
 msgid "Not Allowed"
 msgstr "Not Allowed"
 
+#: src/protocols/jabber/jabber.c:1158
+msgid "Payment Required"
+msgstr "Payment Required"
+
 #: src/protocols/jabber/jabber.c:1160
-msgid "Payment Required"
-msgstr "Payment Required"
-
-#: src/protocols/jabber/jabber.c:1162
 msgid "Recipient Unavailable"
 msgstr "Recipient Unavailable"
 
+#: src/protocols/jabber/jabber.c:1164
+msgid "Registration Required"
+msgstr "Registration Required"
+
 #: src/protocols/jabber/jabber.c:1166
-msgid "Registration Required"
-msgstr "Registration Required"
-
-#: src/protocols/jabber/jabber.c:1168
 msgid "Remote Server Not Found"
 msgstr "Remote Server Not Found"
 
-#: src/protocols/jabber/jabber.c:1170
+#: src/protocols/jabber/jabber.c:1168
 msgid "Remote Server Timeout"
 msgstr "Remote Server Timeout"
 
-#: src/protocols/jabber/jabber.c:1172
+#: src/protocols/jabber/jabber.c:1170
 msgid "Server Overloaded"
 msgstr "Server Overloaded"
 
-#: src/protocols/jabber/jabber.c:1174
+#: src/protocols/jabber/jabber.c:1172
 msgid "Service Unavailable"
 msgstr "Service Unavailable"
 
+#: src/protocols/jabber/jabber.c:1174
+msgid "Subscription Required"
+msgstr "Subscription Required"
+
 #: src/protocols/jabber/jabber.c:1176
-msgid "Subscription Required"
-msgstr "Subscription Required"
-
-#: src/protocols/jabber/jabber.c:1178
 msgid "Unexpected Request"
 msgstr "Unexpected Request"
 
+#: src/protocols/jabber/jabber.c:1183
+msgid "Authorization Aborted"
+msgstr "Authorization Aborted"
+
 #: src/protocols/jabber/jabber.c:1185
-msgid "Authorization Aborted"
-msgstr "Authorization Aborted"
-
-#: src/protocols/jabber/jabber.c:1187
 msgid "Incorrect encoding in authorization"
 msgstr "Incorrect encoding in authorization"
 
-#: src/protocols/jabber/jabber.c:1190
+#: src/protocols/jabber/jabber.c:1188
 msgid "Invalid authzid"
 msgstr "Invalid authzid"
 
-#: src/protocols/jabber/jabber.c:1193
+#: src/protocols/jabber/jabber.c:1191
 msgid "Invalid Authorization Mechanism"
 msgstr "Invalid Authorization Mechanism"
 
-#: src/protocols/jabber/jabber.c:1196
+#: src/protocols/jabber/jabber.c:1194
 msgid "Authorization mechanism too weak"
 msgstr "Authorization mechanism too weak"
 
+#: src/protocols/jabber/jabber.c:1199
+msgid "Temporary Authentication Failure"
+msgstr "Temporary Authentication Failure"
+
 #: src/protocols/jabber/jabber.c:1201
-msgid "Temporary Authentication Failure"
-msgstr "Temporary Authentication Failure"
-
-#: src/protocols/jabber/jabber.c:1203
 msgid "Authentication Failure"
 msgstr "Authentication Failure"
 
-#: src/protocols/jabber/jabber.c:1207
+#: src/protocols/jabber/jabber.c:1205
 msgid "Bad Format"
 msgstr "Bad Format"
 
-#: src/protocols/jabber/jabber.c:1209
+#: src/protocols/jabber/jabber.c:1207
 msgid "Bad Namespace Prefix"
 msgstr "Bad Namespace Prefix"
 
-#: src/protocols/jabber/jabber.c:1212
+#: src/protocols/jabber/jabber.c:1210
 msgid "Resource Conflict"
 msgstr "Resource Conflict"
 
+#: src/protocols/jabber/jabber.c:1212 src/protocols/silc/ops.c:1225
+msgid "Connection Timeout"
+msgstr "Connection Timeout"
+
 #: src/protocols/jabber/jabber.c:1214
-msgid "Connection Timeout"
-msgstr "Connection Timeout"
+msgid "Host Gone"
+msgstr "Host Gone"
 
 #: src/protocols/jabber/jabber.c:1216
-msgid "Host Gone"
-msgstr "Host Gone"
-
-#: src/protocols/jabber/jabber.c:1218
 msgid "Host Unknown"
 msgstr "Host Unknown"
 
-#: src/protocols/jabber/jabber.c:1220
+#: src/protocols/jabber/jabber.c:1218
 msgid "Improper Addressing"
 msgstr "Improper Addressing"
 
-#: src/protocols/jabber/jabber.c:1224
+#: src/protocols/jabber/jabber.c:1222
 msgid "Invalid ID"
 msgstr "Invalid ID"
 
-#: src/protocols/jabber/jabber.c:1226
+#: src/protocols/jabber/jabber.c:1224
 msgid "Invalid Namespace"
 msgstr "Invalid Namespace"
 
-#: src/protocols/jabber/jabber.c:1228
+#: src/protocols/jabber/jabber.c:1226
 msgid "Invalid XML"
 msgstr "Invalid XML"
 
-#: src/protocols/jabber/jabber.c:1230
+#: src/protocols/jabber/jabber.c:1228
 msgid "Non-matching Hosts"
 msgstr "Non-matching Hosts"
 
+#: src/protocols/jabber/jabber.c:1232
+msgid "Policy Violation"
+msgstr "Policy Violation"
+
 #: src/protocols/jabber/jabber.c:1234
-msgid "Policy Violation"
-msgstr "Policy Violation"
+msgid "Remote Connection Failed"
+msgstr "Remote Connection Failed"
 
 #: src/protocols/jabber/jabber.c:1236
-msgid "Remote Connection Failed"
-msgstr "Remote Connection Failed"
+msgid "Resource Constraint"
+msgstr "Resource Constraint"
 
 #: src/protocols/jabber/jabber.c:1238
-msgid "Resource Constraint"
-msgstr "Resource Constraint"
-
-#: src/protocols/jabber/jabber.c:1240
 msgid "Restricted XML"
 msgstr "Restricted XML"
 
-#: src/protocols/jabber/jabber.c:1242
+#: src/protocols/jabber/jabber.c:1240
 msgid "See Other Host"
 msgstr "See Other Host"
 
-#: src/protocols/jabber/jabber.c:1244
+#: src/protocols/jabber/jabber.c:1242
 msgid "System Shutdown"
 msgstr "System Shutdown"
 
-#: src/protocols/jabber/jabber.c:1246
+#: src/protocols/jabber/jabber.c:1244
 msgid "Undefined Condition"
 msgstr "Undefined Condition"
 
+#: src/protocols/jabber/jabber.c:1246
+msgid "Unsupported Encoding"
+msgstr "Unsupported Encoding"
+
 #: src/protocols/jabber/jabber.c:1248
-msgid "Unsupported Encoding"
-msgstr "Unsupported Encoding"
+msgid "Unsupported Stanza Type"
+msgstr "Unsupported Stanza Type"
 
 #: src/protocols/jabber/jabber.c:1250
-msgid "Unsupported Stanza Type"
-msgstr "Unsupported Stanza Type"
+msgid "Unsupported Version"
+msgstr "Unsupported Version"
 
 #: src/protocols/jabber/jabber.c:1252
-msgid "Unsupported Version"
-msgstr "Unsupported Version"
-
-#: src/protocols/jabber/jabber.c:1254
 msgid "XML Not Well Formed"
 msgstr "XML Not Well Formed"
 
-#: src/protocols/jabber/jabber.c:1256
+#: src/protocols/jabber/jabber.c:1254
 msgid "Stream Error"
 msgstr "Stream Error"
 
-#: src/protocols/jabber/jabber.c:1281
+#: src/protocols/jabber/jabber.c:1279
 msgid "Hide Operating System"
 msgstr "Hide Operating System"
 
@@ -5756,23 +5800,24 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/jabber/jabber.c:1367 src/protocols/jabber/jabber.c:1369
+#: src/protocols/jabber/jabber.c:1360 src/protocols/jabber/jabber.c:1362
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber Protocol Plugin"
 
-#: src/protocols/jabber/jabber.c:1394
+#: src/protocols/jabber/jabber.c:1388
 msgid "Use TLS if available"
 msgstr "Use TLS if available"
 
-#: src/protocols/jabber/jabber.c:1399
+#: src/protocols/jabber/jabber.c:1393
 msgid "Force old SSL"
 msgstr "Force old SSL"
 
-#: src/protocols/jabber/jabber.c:1404
+#: src/protocols/jabber/jabber.c:1398
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Allow plaintext auth over unencrypted streams"
 
-#: src/protocols/jabber/jabber.c:1413
+#. Account options
+#: src/protocols/jabber/jabber.c:1407 src/protocols/silc/silc.c:1051
 msgid "Connect server"
 msgstr "Connect server"
 
@@ -5848,12 +5893,12 @@
 msgid "Error joining chat %s"
 msgstr "Error joining chat %s"
 
-#: src/protocols/jabber/si.c:579
+#: src/protocols/jabber/si.c:582
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr "Unable to send file to %s, user does not support file transfers"
 
-#: src/protocols/jabber/si.c:580 src/protocols/jabber/si.c:581
+#: src/protocols/jabber/si.c:583 src/protocols/jabber/si.c:584
 msgid "File Send Failed"
 msgstr "File Send Failed"
 
@@ -5953,7 +5998,7 @@
 msgid "Not on list"
 msgstr "Not on list"
 
-#: src/protocols/msn/error.c:68 src/protocols/zephyr/zephyr.c:527
+#: src/protocols/msn/error.c:68 src/protocols/zephyr/zephyr.c:528
 msgid "User is offline"
 msgstr "User is offline"
 
@@ -6005,7 +6050,7 @@
 msgid "Too many hits to a FND"
 msgstr "Too many hits to a FND"
 
-#: src/protocols/msn/error.c:110 src/protocols/oscar/oscar.c:186
+#: src/protocols/msn/error.c:110 src/protocols/oscar/oscar.c:190
 msgid "Not logged in"
 msgstr "Not logged in"
 
@@ -6098,8 +6143,8 @@
 msgid "Server too busy"
 msgstr "Server too busy"
 
-#: src/protocols/msn/error.c:196 src/protocols/oscar/oscar.c:1356
-#: src/protocols/toc/toc.c:659
+#: src/protocols/msn/error.c:196 src/protocols/oscar/oscar.c:2010
+#: src/protocols/silc/ops.c:1214 src/protocols/toc/toc.c:660
 msgid "Authentication failed"
 msgstr "Authentication failed"
 
@@ -6133,35 +6178,35 @@
 msgid "MSN Error: %s\n"
 msgstr "MSN Error: %s\n"
 
-#: src/protocols/msn/msn.c:79
+#: src/protocols/msn/msn.c:80
 msgid "Your new MSN friendly name is too long."
 msgstr "Your new MSN friendly name is too long."
 
-#: src/protocols/msn/msn.c:187
+#: src/protocols/msn/msn.c:189
 msgid "Set your friendly name."
 msgstr "Set your friendly name."
 
-#: src/protocols/msn/msn.c:188
+#: src/protocols/msn/msn.c:190
 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:200
+#: src/protocols/msn/msn.c:203
 msgid "Set your home phone number."
 msgstr "Set your home phone number."
 
-#: src/protocols/msn/msn.c:211
+#: src/protocols/msn/msn.c:215
 msgid "Set your work phone number."
 msgstr "Set your work phone number."
 
-#: src/protocols/msn/msn.c:222
+#: src/protocols/msn/msn.c:227
 msgid "Set your mobile phone number."
 msgstr "Set your mobile phone number."
 
-#: src/protocols/msn/msn.c:231
+#: src/protocols/msn/msn.c:237
 msgid "Allow MSN Mobile pages?"
 msgstr "Allow MSN Mobile pages?"
 
-#: src/protocols/msn/msn.c:232
+#: src/protocols/msn/msn.c:238
 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?"
@@ -6169,91 +6214,92 @@
 "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:236
+#: src/protocols/msn/msn.c:242
 msgid "Allow"
 msgstr "Allow"
 
-#: src/protocols/msn/msn.c:237
+#: src/protocols/msn/msn.c:243
 msgid "Disallow"
 msgstr "Disallow"
 
-#: src/protocols/msn/msn.c:255
+#: src/protocols/msn/msn.c:268
 msgid "Send a mobile message."
 msgstr "Send a mobile message."
 
-#: src/protocols/msn/msn.c:257
+#: src/protocols/msn/msn.c:270
 msgid "Page"
 msgstr "Page"
 
-#: src/protocols/msn/msn.c:360 src/protocols/msn/msn.c:675
+#: src/protocols/msn/msn.c:379 src/protocols/msn/msn.c:678
 #: src/protocols/msn/state.c:32
 msgid "Away From Computer"
 msgstr "Away From Computer"
 
-#: src/protocols/msn/msn.c:361 src/protocols/msn/msn.c:677
-#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:2275
-#: src/protocols/yahoo/yahoo.c:2601 src/protocols/yahoo/yahoo.c:2715
+#: src/protocols/msn/msn.c:380 src/protocols/msn/msn.c:680
+#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:2277
+#: src/protocols/yahoo/yahoo.c:2658 src/protocols/yahoo/yahoo.c:2772
 msgid "Be Right Back"
 msgstr "Be Right Back"
 
-#: src/protocols/msn/msn.c:362 src/protocols/msn/msn.c:679
-#: src/protocols/msn/state.c:29 src/protocols/novell/novell.c:2152
-#: src/protocols/novell/novell.c:2267 src/protocols/novell/novell.c:2321
-#: src/protocols/yahoo/yahoo.c:2277 src/protocols/yahoo/yahoo.c:2603
-#: src/protocols/yahoo/yahoo.c:2716
+#: src/protocols/msn/msn.c:381 src/protocols/msn/msn.c:682
+#: src/protocols/msn/state.c:29 src/protocols/novell/novell.c:2726
+#: src/protocols/novell/novell.c:2841 src/protocols/novell/novell.c:2895
+#: src/protocols/silc/buddy.c:1409 src/protocols/silc/silc.c:47
+#: src/protocols/silc/silc.c:78 src/protocols/yahoo/yahoo.c:2279
+#: src/protocols/yahoo/yahoo.c:2660 src/protocols/yahoo/yahoo.c:2773
 msgid "Busy"
 msgstr "Busy"
 
-#: src/protocols/msn/msn.c:363 src/protocols/msn/msn.c:681
-#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2285
-#: src/protocols/yahoo/yahoo.c:2611 src/protocols/yahoo/yahoo.c:2720
+#: src/protocols/msn/msn.c:382 src/protocols/msn/msn.c:684
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2287
+#: src/protocols/yahoo/yahoo.c:2668 src/protocols/yahoo/yahoo.c:2777
 msgid "On The Phone"
 msgstr "On The Phone"
 
-#: src/protocols/msn/msn.c:364 src/protocols/msn/msn.c:683
-#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:2289
-#: src/protocols/yahoo/yahoo.c:2615 src/protocols/yahoo/yahoo.c:2722
+#: src/protocols/msn/msn.c:383 src/protocols/msn/msn.c:686
+#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:2291
+#: src/protocols/yahoo/yahoo.c:2672 src/protocols/yahoo/yahoo.c:2779
 msgid "Out To Lunch"
 msgstr "Out To Lunch"
 
-#: src/protocols/msn/msn.c:365 src/protocols/msn/msn.c:685
-#: src/protocols/zephyr/zephyr.c:1179 src/protocols/zephyr/zephyr.c:1194
+#: src/protocols/msn/msn.c:384 src/protocols/msn/msn.c:688
+#: src/protocols/zephyr/zephyr.c:1164 src/protocols/zephyr/zephyr.c:1179
 msgid "Hidden"
 msgstr "Hidden"
 
-#: src/protocols/msn/msn.c:377
+#: src/protocols/msn/msn.c:395
 msgid "Set Friendly Name"
 msgstr "Set Friendly Name"
 
-#: src/protocols/msn/msn.c:385
+#: src/protocols/msn/msn.c:400
 msgid "Set Home Phone Number"
 msgstr "Set Home Phone Number"
 
-#: src/protocols/msn/msn.c:391
+#: src/protocols/msn/msn.c:404
 msgid "Set Work Phone Number"
 msgstr "Set Work Phone Number"
 
-#: src/protocols/msn/msn.c:397
+#: src/protocols/msn/msn.c:408
 msgid "Set Mobile Phone Number"
 msgstr "Set Mobile Phone Number"
 
-#: src/protocols/msn/msn.c:406
+#: src/protocols/msn/msn.c:414
 msgid "Enable/Disable Mobile Devices"
 msgstr "Enable/Disable Mobile Devices"
 
-#: src/protocols/msn/msn.c:413
+#: src/protocols/msn/msn.c:419
 msgid "Allow/Disallow Mobile Pages"
 msgstr "Allow/Disallow Mobile Pages"
 
-#: src/protocols/msn/msn.c:442
+#: src/protocols/msn/msn.c:439
 msgid "Send to Mobile"
 msgstr "Send to Mobile"
 
-#: src/protocols/msn/msn.c:452
+#: src/protocols/msn/msn.c:447
 msgid "Initiate Chat"
 msgstr "Initiate Chat"
 
-#: src/protocols/msn/msn.c:476
+#: src/protocols/msn/msn.c:482
 msgid ""
 "SSL support is needed for MSN. Please install a supported SSL library. See "
 "http://gaim.sf.net/faq-ssl.php for more information."
@@ -6261,7 +6307,7 @@
 "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:802
+#: src/protocols/msn/msn.c:805
 #, c-format
 msgid ""
 "An MSN screen name must be in the form \"user@server.com\". Perhaps you "
@@ -6270,11 +6316,11 @@
 "An MSN screen name must be in the form \"user@server.com\". Perhaps you "
 "meant %s@hotmail.com. No changes were made to your allow list."
 
-#: src/protocols/msn/msn.c:806 src/protocols/msn/msn.c:843
+#: src/protocols/msn/msn.c:809 src/protocols/msn/msn.c:846
 msgid "Invalid MSN screen name"
 msgstr "Invalid MSN screen name"
 
-#: src/protocols/msn/msn.c:839
+#: src/protocols/msn/msn.c:842
 #, c-format
 msgid ""
 "An MSN screen name must be in the form \"user@server.com\". Perhaps you "
@@ -6283,81 +6329,81 @@
 "An MSN screen name must be in the form \"user@server.com\". Perhaps you "
 "meant %s@hotmail.com. No changes were made to your block list."
 
-#: src/protocols/msn/msn.c:1306 src/protocols/yahoo/yahoo.c:2899
+#: src/protocols/msn/msn.c:1308 src/protocols/yahoo/yahoo.c:2956
 msgid "<html><body><b>Error retrieving profile</b></body></html>"
 msgstr "<html><body><b>Error retrieving profile</b></body></html>"
 
 #. Age
-#: src/protocols/msn/msn.c:1376 src/protocols/oscar/oscar.c:4251
+#: src/protocols/msn/msn.c:1378 src/protocols/oscar/oscar.c:4856
 #: src/protocols/trepia/trepia.c:285 src/protocols/trepia/trepia.c:404
-#: src/protocols/yahoo/yahoo.c:3009
+#: src/protocols/yahoo/yahoo.c:3066
 msgid "Age"
 msgstr "Age"
 
 #. Gender
-#: src/protocols/msn/msn.c:1383 src/protocols/oscar/oscar.c:4238
+#: src/protocols/msn/msn.c:1385 src/protocols/oscar/oscar.c:4842
 #: src/protocols/trepia/trepia.c:279 src/protocols/trepia/trepia.c:406
-#: src/protocols/yahoo/yahoo.c:3017
+#: src/protocols/yahoo/yahoo.c:3074
 msgid "Gender"
 msgstr "Gender"
 
-#: src/protocols/msn/msn.c:1391 src/protocols/yahoo/yahoo.c:3013
+#: src/protocols/msn/msn.c:1393 src/protocols/yahoo/yahoo.c:3070
 msgid "Marital Status"
 msgstr "Marital Status"
 
-#: src/protocols/msn/msn.c:1398 src/protocols/yahoo/yahoo.c:3005
+#: src/protocols/msn/msn.c:1400 src/protocols/yahoo/yahoo.c:3062
 msgid "Location"
 msgstr "Location"
 
-#: src/protocols/msn/msn.c:1406 src/protocols/yahoo/yahoo.c:3021
+#: src/protocols/msn/msn.c:1408 src/protocols/yahoo/yahoo.c:3078
 msgid "Occupation"
 msgstr "Occupation"
 
-#: src/protocols/msn/msn.c:1423 src/protocols/msn/msn.c:1429
-#: src/protocols/msn/msn.c:1436 src/protocols/msn/msn.c:1443
-#: src/protocols/msn/msn.c:1450
+#: src/protocols/msn/msn.c:1425 src/protocols/msn/msn.c:1431
+#: src/protocols/msn/msn.c:1438 src/protocols/msn/msn.c:1445
+#: src/protocols/msn/msn.c:1452
 msgid "A Little About Me"
 msgstr "A Little About Me"
 
-#: src/protocols/msn/msn.c:1459 src/protocols/msn/msn.c:1472
-#: src/protocols/msn/msn.c:1479
+#: src/protocols/msn/msn.c:1461 src/protocols/msn/msn.c:1474
+#: src/protocols/msn/msn.c:1481
 msgid "Favorite Things"
 msgstr "Favourite Things"
 
-#: src/protocols/msn/msn.c:1488 src/protocols/msn/msn.c:1494
-#: src/protocols/msn/msn.c:1501
+#: src/protocols/msn/msn.c:1490 src/protocols/msn/msn.c:1496
+#: src/protocols/msn/msn.c:1503
 msgid "Hobbies and Interests"
 msgstr "Hobbies and Interests"
 
-#: src/protocols/msn/msn.c:1510 src/protocols/msn/msn.c:1516
-#: src/protocols/yahoo/yahoo.c:3056
+#: src/protocols/msn/msn.c:1512 src/protocols/msn/msn.c:1518
+#: src/protocols/yahoo/yahoo.c:3113
 msgid "Favorite Quote"
 msgstr "Favuorite Quote"
 
-#: src/protocols/msn/msn.c:1524 src/protocols/yahoo/yahoo.c:3092
+#: src/protocols/msn/msn.c:1526 src/protocols/yahoo/yahoo.c:3149
 msgid "Last Updated"
 msgstr "Last Updated"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1535 src/protocols/trepia/trepia.c:289
-#: src/protocols/trepia/trepia.c:419
+#: src/protocols/msn/msn.c:1537 src/protocols/silc/ops.c:810
+#: src/protocols/trepia/trepia.c:289 src/protocols/trepia/trepia.c:419
 msgid "Homepage"
 msgstr "Homepage"
 
-#: src/protocols/msn/msn.c:1557 src/protocols/yahoo/yahoo.c:3107
+#: src/protocols/msn/msn.c:1559 src/protocols/yahoo/yahoo.c:3164
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "User information for %s unavailable"
 
-#: src/protocols/msn/msn.c:1559 src/protocols/yahoo/yahoo.c:3109
+#: src/protocols/msn/msn.c:1561 src/protocols/yahoo/yahoo.c:3166
 msgid "The user's profile is empty."
 msgstr "The user's profile is empty."
 
-#: src/protocols/msn/msn.c:1616
+#: src/protocols/msn/msn.c:1618
 msgid "Display conversation closed notices"
 msgstr "Display conversation closed notices"
 
-#: src/protocols/msn/msn.c:1621
+#: src/protocols/msn/msn.c:1623
 msgid "Display timeout notices"
 msgstr "Display timeout notices"
 
@@ -6372,15 +6418,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/msn/msn.c:1707 src/protocols/msn/msn.c:1709
+#: src/protocols/msn/msn.c:1704 src/protocols/msn/msn.c:1706
 msgid "MSN Protocol Plugin"
 msgstr "MSN Protocol Plugin"
 
-#: src/protocols/msn/msn.c:1727 src/protocols/trepia/trepia.c:1302
+#: src/protocols/msn/msn.c:1725 src/protocols/trepia/trepia.c:1299
 msgid "Login server"
 msgstr "Login server"
 
-#: src/protocols/msn/msn.c:1736
+#: src/protocols/msn/msn.c:1734
 msgid "Use HTTP Method"
 msgstr "Use HTTP Method"
 
@@ -6405,7 +6451,7 @@
 msgstr "Retrieving buddy list"
 
 #: src/protocols/msn/notification.c:292 src/protocols/msn/notification.c:323
-#: src/protocols/oscar/oscar.c:1645
+#: src/protocols/oscar/oscar.c:2299
 msgid "Password sent"
 msgstr "Password sent"
 
@@ -6454,21 +6500,19 @@
 "\n"
 "After the maintenance has been completed, you will be able to successfully "
 "sign in."
-msgid_plural ""
 "The MSN server will shut down for maintenance in %d minutes. You will "
 "automatically be signed out at that time.  Please finish any conversations "
 "in progress.\n"
 "\n"
 "After the maintenance has been completed, you will be able to successfully "
 "sign in."
-msgstr[0] ""
+msgstr ""
 "The MSN server will shut down for maintenance in %d minute. You will "
 "automatically be signed out at that time.  Please finish any conversations "
 "in progress.\n"
 "\n"
 "After the maintenance has been completed, you will be able to successfully "
 "sign in."
-msgstr[1] ""
 "The MSN server will shut down for maintenance in %d minutes. You will "
 "automatically be signed out at that time.  Please finish any conversations "
 "in progress.\n"
@@ -6517,37 +6561,37 @@
 msgid "An MSN message may not have been received."
 msgstr "An MSN message may not have been received."
 
-#: src/protocols/napster/napster.c:228
+#: src/protocols/napster/napster.c:229
 msgid "Unable to read header from server"
 msgstr "Unable to read header from server"
 
-#: src/protocols/napster/napster.c:242
-#, c-format
-msgid "Unable to read message from server.  Command is %hd, length is %hd."
-msgstr "Unable to read message from server.  Command is %hd, length is %hd."
-
-#: src/protocols/napster/napster.c:307
+#: src/protocols/napster/napster.c:243
+#, c-format
+msgid "Unable to read message from server: %s.  Command is %hd, length is %hd."
+msgstr "Unable to read message from server: %s.  Command is %hd, length is %hd."
+
+#: src/protocols/napster/napster.c:306
 #, 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:318
+#: src/protocols/napster/napster.c:317
 #, 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:326
+#: src/protocols/napster/napster.c:325
 msgid "You were disconnected from the server."
 msgstr "You were disconnected from the server."
 
 #. MSG_CLIENT_WHOIS
-#: src/protocols/napster/napster.c:384
+#: src/protocols/napster/napster.c:383
 #, c-format
 msgid "%s requested your information"
 msgstr "%s requested your information"
 
-#: src/protocols/napster/napster.c:422
+#: src/protocols/napster/napster.c:421
 msgid ""
 "You were disconnected from the server, because you logged on from a "
 "different location"
@@ -6556,17 +6600,13 @@
 "different location"
 
 #. MSG_CLIENT_PING
-#: src/protocols/napster/napster.c:428
+#: src/protocols/napster/napster.c:427
 #, c-format
 msgid "%s requested a PING"
 msgstr "%s requested a PING"
 
-#: src/protocols/napster/napster.c:541
-msgid "Get Info"
-msgstr "Get Info"
-
-#: src/protocols/napster/napster.c:555 src/protocols/oscar/oscar.c:5524
-#: src/protocols/toc/toc.c:1259
+#: src/protocols/napster/napster.c:540 src/protocols/oscar/oscar.c:6142
+#: src/protocols/toc/toc.c:1289
 msgid "_Group:"
 msgstr "_Group:"
 
@@ -6581,74 +6621,233 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/napster/napster.c:640 src/protocols/napster/napster.c:642
+#: src/protocols/napster/napster.c:620 src/protocols/napster/napster.c:622
 msgid "NAPSTER Protocol Plugin"
 msgstr "NAPSTER Protocol Plugin"
 
-#: src/protocols/novell/novell.c:113
-#, c-format
-msgid "Login failed (0x%X)."
-msgstr "Login failed (0x%X)."
-
-#: src/protocols/novell/novell.c:225
-#, c-format
-msgid "Unable to send message. Could not get details for user (0x%X)."
-msgstr "Unable to send message. Could not get details for user (0x%X)."
-
-#: src/protocols/novell/novell.c:371
-#, c-format
-msgid "Unable to add %s to your buddy list (0x%X)."
-msgstr "Unable to add %s to your buddy list (0x%X)."
+#: src/protocols/novell/nmuser.c:2027
+msgid "Required parameters not passed in"
+msgstr "Required parameters not passed in"
+
+#: src/protocols/novell/nmuser.c:2030
+msgid "Unable to write to network"
+msgstr "Unable to write to network"
+
+#: src/protocols/novell/nmuser.c:2033
+msgid "Unable to read from network"
+msgstr "Unable to read from network"
+
+#: src/protocols/novell/nmuser.c:2036
+msgid "Error communicating with server"
+msgstr "Error communicating with server"
+
+#: src/protocols/novell/nmuser.c:2040
+msgid "Conference not found"
+msgstr "Conference not found"
+
+#: src/protocols/novell/nmuser.c:2043
+msgid "Conference does not exist"
+msgstr "Conference does not exist"
+
+#: src/protocols/novell/nmuser.c:2047
+msgid "A folder with that name already exists"
+msgstr "A folder with that name already exists"
+
+#: src/protocols/novell/nmuser.c:2050
+msgid "Not supported"
+msgstr "Not supported"
+
+#: src/protocols/novell/nmuser.c:2054
+msgid "Password has expired"
+msgstr "Password has expired"
+
+#: src/protocols/novell/nmuser.c:2057
+msgid "Invalid password"
+msgstr "Invalid password"
+
+#: src/protocols/novell/nmuser.c:2060
+msgid "User not found"
+msgstr "User not found"
+
+#: src/protocols/novell/nmuser.c:2063
+msgid "Account has been disabled"
+msgstr "Account has been disabled"
+
+#: src/protocols/novell/nmuser.c:2066
+msgid "The server could not access the directory"
+msgstr "The server could not access the directory"
+
+#: src/protocols/novell/nmuser.c:2069
+msgid "Your system administrator has disabled this operation"
+msgstr "Your system administrator has disabled this operation"
+
+#: src/protocols/novell/nmuser.c:2072
+msgid "The server is unavailable; try again later"
+msgstr "The server is unavailable; try again later"
+
+#: src/protocols/novell/nmuser.c:2075
+msgid "Cannot add a contact to the same folder twice"
+msgstr "Cannot add a contact to the same folder twice"
+
+#: src/protocols/novell/nmuser.c:2078
+msgid "Cannot add yourself"
+msgstr "Cannot add yourself"
+
+#: src/protocols/novell/nmuser.c:2081
+msgid "Master archive is misconfigured"
+msgstr "Master archive is misconfigured"
+
+#: src/protocols/novell/nmuser.c:2085
+msgid "Invalid username or password"
+msgstr "Invalid username or password"
+
+#: src/protocols/novell/nmuser.c:2088
+msgid "Could not recognize the host of the username you entered"
+msgstr "Could not recognize the host of the username you entered"
+
+#: src/protocols/novell/nmuser.c:2091
+msgid ""
+"Your account has been disabled because too many invalid passwords were "
+"entered"
+msgstr ""
+"Your account has been disabled because too many invalid passwords were "
+"entered"
+
+#: src/protocols/novell/nmuser.c:2094
+msgid "You cannot add the same person twice to a conversation"
+msgstr "You cannot add the same person twice to a conversation"
+
+#: src/protocols/novell/nmuser.c:2098
+msgid "You have reached your limit for the number of contacts allowed"
+msgstr "You have reached your limit for the number of contacts allowed"
+
+#: src/protocols/novell/nmuser.c:2101
+msgid "You have entered an invalid username"
+msgstr "You have entered an invalid username"
+
+#: src/protocols/novell/nmuser.c:2104
+msgid "An error occurred while updating the directory"
+msgstr "An error occurred while updating the directory"
+
+#: src/protocols/novell/nmuser.c:2107
+msgid "Incompatible protocol version"
+msgstr "Incompatible protocol version"
+
+#: src/protocols/novell/nmuser.c:2110
+msgid "The user has blocked you"
+msgstr "The user has blocked you"
+
+#: src/protocols/novell/nmuser.c:2113
+msgid ""
+"This evaluation version does not allow more than ten users to log in at one "
+"time"
+msgstr ""
+"This evaluation version does not allow more than ten users to log in at one "
+"time"
+
+#: src/protocols/novell/nmuser.c:2116
+msgid "The user is either offline or you are blocked"
+msgstr "The user is either offline or you are blocked"
+
+#: src/protocols/novell/nmuser.c:2119
+#, c-format
+msgid "Unknown error: 0x%X"
+msgstr "Unknown error: 0x%X"
+
+#: src/protocols/novell/novell.c:119
+#, c-format
+msgid "Login failed (%s)."
+msgstr "Login failed (%s)."
+
+#: 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:378
+#, 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:397
-#, c-format
-msgid "Unable to send message (0x%X)."
-msgstr "Unable to send message (0x%X)."
-
-#: src/protocols/novell/novell.c:485
-#, c-format
-msgid "Unable to send message to %s. Could not create the conference (0x%X)."
-msgstr "Unable to send message to %s. Could not create the conference (0x%X)."
-
-#: src/protocols/novell/novell.c:489
-#, c-format
-msgid "Unable to send message. Could not create the conference (0x%X)."
-msgstr "Unable to send message. Could not create the conference (0x%X)."
-
-#: src/protocols/novell/novell.c:536
+#: src/protocols/novell/novell.c:404
+#, c-format
+msgid "Unable to send message (%s)."
+msgstr "Unable to send message (%s)."
+
+#: src/protocols/novell/novell.c:475 src/protocols/novell/novell.c:968
+#, c-format
+msgid "Unable to invite user (%s)."
+msgstr "Unable to invite user (%s)."
+
+#: src/protocols/novell/novell.c:514
+#, c-format
+msgid "Unable to send message to %s. Could not create the conference (%s)."
+msgstr "Unable to send message to %s. Could not create the conference (%s)."
+
+#: src/protocols/novell/novell.c:519
+#, c-format
+msgid "Unable to send message. Could not create the conference (%s)."
+msgstr "Unable to send message. Could not create the conference (%s)."
+
+#: src/protocols/novell/novell.c:566
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
-"creating folder (0x%X)."
+"creating folder (%s)."
 msgstr ""
 "Unable to move user %s to folder %s in the server side list. Error while "
-"creating folder (0x%X)."
-
-#: src/protocols/novell/novell.c:584
+"creating folder (%s)."
+
+#: src/protocols/novell/novell.c:614
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
-"list (0x%X)."
+"list (%s)."
 msgstr ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
-"list (0x%X)."
-
-#: src/protocols/novell/novell.c:615 src/protocols/novell/novell.c:1345
-#, c-format
-msgid "GroupWise Conference %d"
-msgstr "GroupWise Conference %d"
-
-#: src/protocols/novell/novell.c:659
-#, c-format
-msgid "Could not get details for user %s (0x%X)."
-msgstr "Could not get details for user %s (0x%X)."
-
-#: src/protocols/novell/novell.c:773 src/protocols/novell/novell.c:1108
+"list (%s)."
+
+#: src/protocols/novell/novell.c:686
+#, c-format
+msgid "Could not get details for user %s (%s)."
+msgstr "Could not get details for user %s (%s)."
+
+#: src/protocols/novell/novell.c:732 src/protocols/novell/novell.c:878
+#, c-format
+msgid "Unable to add user to privacy list (%s)."
+msgstr "Unable to add user to privacy list (%s)."
+
+#: src/protocols/novell/novell.c:779
+#, c-format
+msgid "Unable to add %s to deny list (%s)."
+msgstr "Unable to add %s to deny list (%s)."
+
+#: src/protocols/novell/novell.c:832
+#, c-format
+msgid "Unable to add %s to permit list (%s)."
+msgstr "Unable to add %s to permit list (%s)."
+
+#: src/protocols/novell/novell.c:900
+#, c-format
+msgid "Unable to remove %s from privacy list (%s)."
+msgstr "Unable to remove %s from privacy list (%s)."
+
+#: src/protocols/novell/novell.c:923 src/protocols/novell/novell.c:1576
+#, c-format
+msgid "Unable to change server side privacy settings (%s)."
+msgstr "Unable to change server side privacy settings (%s)."
+
+#: src/protocols/novell/novell.c:995
+#, c-format
+msgid "Unable to create conference (%s)."
+msgstr "Unable to create conference (%s)."
+
+#: src/protocols/novell/novell.c:1106 src/protocols/novell/novell.c:1615
 msgid "Error communicating with server. Closing connection."
 msgstr "Error communicating with server. Closing connection."
 
-#: src/protocols/novell/novell.c:983
+#: src/protocols/novell/novell.c:1428
 msgid "Userid"
 msgstr "Userid"
 
@@ -6659,36 +6858,46 @@
 #. tag, value);
 #. }
 #.
-#: src/protocols/novell/novell.c:997
+#: src/protocols/novell/novell.c:1442
 msgid "Full name"
 msgstr "Full name"
 
-#: src/protocols/novell/novell.c:1017
+#: src/protocols/novell/novell.c:1462
 msgid "User Properties"
 msgstr "User Properties"
 
-#: src/protocols/novell/novell.c:1085
+#: src/protocols/novell/novell.c:1566
+#, c-format
+msgid "GroupWise Conference %d"
+msgstr "GroupWise Conference %d"
+
+#: src/protocols/novell/novell.c:1591
 msgid "Unable to make SSL connection to server."
 msgstr "Unable to make SSL connection to server."
 
-#: src/protocols/novell/novell.c:1114
-#, c-format
-msgid "Error processing event or response. (0x%X)"
-msgstr "Error processing event or response. (0x%X)"
-
-#: src/protocols/novell/novell.c:1148
+#: src/protocols/novell/novell.c:1621
+#, c-format
+msgid "Error processing event or response (%s)."
+msgstr "Error processing event or response (%s)."
+
+#: src/protocols/novell/novell.c:1655
 msgid "Authenticating..."
 msgstr "Authenticating..."
 
-#: src/protocols/novell/novell.c:1163
+#: src/protocols/novell/novell.c:1670
 msgid "Waiting for response..."
 msgstr "Waiting for response..."
 
-#: src/protocols/novell/novell.c:1303
+#: src/protocols/novell/novell.c:1803
+#, c-format
+msgid "%s has been invited to this conversation."
+msgstr "%s has been invited to this conversation."
+
+#: src/protocols/novell/novell.c:1830
 msgid "Invitation to Conversation"
 msgstr "Invitation to Conversation"
 
-#: src/protocols/novell/novell.c:1304
+#: src/protocols/novell/novell.c:1831
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -6699,22 +6908,22 @@
 "\n"
 "Sent: %s"
 
-#: src/protocols/novell/novell.c:1306
+#: src/protocols/novell/novell.c:1833
 msgid "Would you like to join the conversation?"
 msgstr "Would you like to join the conversation?"
 
-#: src/protocols/novell/novell.c:1409
+#: src/protocols/novell/novell.c:1938
 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:1463
+#: src/protocols/novell/novell.c:1992
 #, 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:1561
+#: src/protocols/novell/novell.c:2090
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
@@ -6722,27 +6931,31 @@
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
 
-#: src/protocols/novell/novell.c:1583
+#: src/protocols/novell/novell.c:2112
 msgid "Error. SSL support is not installed."
 msgstr "Error. SSL support is not installed."
 
-#: src/protocols/novell/novell.c:1847
+#: src/protocols/novell/novell.c:2421
 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:2158 src/protocols/oscar/oscar.c:574
-#: src/protocols/oscar/oscar.c:5820 src/protocols/yahoo/yahoo.c:2297
+#: src/protocols/novell/novell.c:2732 src/protocols/oscar/oscar.c:582
+#: src/protocols/oscar/oscar.c:6444 src/protocols/yahoo/yahoo.c:2299
 msgid "Offline"
 msgstr "Offline"
 
-#: src/protocols/novell/novell.c:2169
+#: src/protocols/novell/novell.c:2743
 msgid "Message"
 msgstr "Message"
 
-#: src/protocols/novell/novell.c:2268 src/protocols/novell/novell.c:2324
+#: src/protocols/novell/novell.c:2842 src/protocols/novell/novell.c:2898
 msgid "Appear Offline"
 msgstr "Appear Offline"
 
+#: src/protocols/novell/novell.c:3291
+msgid "Initiate _Chat"
+msgstr "Initiate _Chat"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -6754,249 +6967,290 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/novell/novell.c:2413 src/protocols/novell/novell.c:2415
+#: src/protocols/novell/novell.c:3367 src/protocols/novell/novell.c:3369
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GroupWise Messenger Protocol Plugin"
 
-#: src/protocols/novell/novell.c:2432
+#: src/protocols/novell/novell.c:3388
 msgid "Server address"
 msgstr "Server address"
 
-#: src/protocols/novell/novell.c:2436
+#: src/protocols/novell/novell.c:3392
 msgid "Server port"
 msgstr "Server port"
 
-#: src/protocols/oscar/oscar.c:182
+#: src/protocols/oscar/oscar.c:186
 msgid "Invalid error"
 msgstr "Invalid error"
 
-#: src/protocols/oscar/oscar.c:183
+#: src/protocols/oscar/oscar.c:187
 msgid "Invalid SNAC"
 msgstr "Invalid SNAC"
 
-#: src/protocols/oscar/oscar.c:184
+#: src/protocols/oscar/oscar.c:188
 msgid "Rate to host"
 msgstr "Rate to host"
 
-#: src/protocols/oscar/oscar.c:185
+#: src/protocols/oscar/oscar.c:189
 msgid "Rate to client"
 msgstr "Rate to client"
 
-#: src/protocols/oscar/oscar.c:187
+#: src/protocols/oscar/oscar.c:191
 msgid "Service unavailable"
 msgstr "Service unavailable"
 
-#: src/protocols/oscar/oscar.c:188
+#: src/protocols/oscar/oscar.c:192
 msgid "Service not defined"
 msgstr "Service not defined"
 
-#: src/protocols/oscar/oscar.c:189
-msgid "Obsolete SNAC"
-msgstr "Obsolete SNAC"
-
-#: src/protocols/oscar/oscar.c:190
-msgid "Not supported by host"
-msgstr "Not supported by host"
-
-#: src/protocols/oscar/oscar.c:191
-msgid "Not supported by client"
-msgstr "Not supported by client"
-
-#: src/protocols/oscar/oscar.c:192
-msgid "Refused by client"
-msgstr "Refused by client"
-
 #: src/protocols/oscar/oscar.c:193
-msgid "Reply too big"
-msgstr "Reply too big"
+msgid "Obsolete SNAC"
+msgstr "Obsolete SNAC"
 
 #: src/protocols/oscar/oscar.c:194
-msgid "Responses lost"
-msgstr "Responses lost"
+msgid "Not supported by host"
+msgstr "Not supported by host"
 
 #: src/protocols/oscar/oscar.c:195
-msgid "Request denied"
-msgstr "Request denied"
+msgid "Not supported by client"
+msgstr "Not supported by client"
 
 #: src/protocols/oscar/oscar.c:196
+msgid "Refused by client"
+msgstr "Refused by client"
+
+#: src/protocols/oscar/oscar.c:197
+msgid "Reply too big"
+msgstr "Reply too big"
+
+#: src/protocols/oscar/oscar.c:198
+msgid "Responses lost"
+msgstr "Responses lost"
+
+#: src/protocols/oscar/oscar.c:199
+msgid "Request denied"
+msgstr "Request denied"
+
+#: src/protocols/oscar/oscar.c:200
 msgid "Busted SNAC payload"
 msgstr "Busted SNAC payload"
 
-#: src/protocols/oscar/oscar.c:197
+#: src/protocols/oscar/oscar.c:201
 msgid "Insufficient rights"
 msgstr "Insufficient rights"
 
-#: src/protocols/oscar/oscar.c:198
+#: src/protocols/oscar/oscar.c:202
 msgid "In local permit/deny"
 msgstr "In local permit/deny"
 
-#: src/protocols/oscar/oscar.c:199
+#: src/protocols/oscar/oscar.c:203
 msgid "Too evil (sender)"
 msgstr "Too evil (sender)"
 
-#: src/protocols/oscar/oscar.c:200
+#: src/protocols/oscar/oscar.c:204
 msgid "Too evil (receiver)"
 msgstr "Too evil (receiver)"
 
-#: src/protocols/oscar/oscar.c:201
+#: src/protocols/oscar/oscar.c:205
 msgid "User temporarily unavailable"
 msgstr "User temporarily unavailable"
 
-#: src/protocols/oscar/oscar.c:202
+#: src/protocols/oscar/oscar.c:206
 msgid "No match"
 msgstr "No match"
 
-#: src/protocols/oscar/oscar.c:203
+#: src/protocols/oscar/oscar.c:207
 msgid "List overflow"
 msgstr "List overflow"
 
-#: src/protocols/oscar/oscar.c:204
+#: src/protocols/oscar/oscar.c:208
 msgid "Request ambiguous"
 msgstr "Request ambiguous"
 
-#: src/protocols/oscar/oscar.c:205
+#: src/protocols/oscar/oscar.c:209
 msgid "Queue full"
 msgstr "Queue full"
 
-#: src/protocols/oscar/oscar.c:206
+#: src/protocols/oscar/oscar.c:210
 msgid "Not while on AOL"
 msgstr "Not while on AOL"
 
-#: src/protocols/oscar/oscar.c:428
+#: src/protocols/oscar/oscar.c:436
 msgid "Voice"
 msgstr "Voice"
 
-#: src/protocols/oscar/oscar.c:431
+#: src/protocols/oscar/oscar.c:439
 msgid "AIM Direct IM"
 msgstr "AIM Direct IM"
 
-#: src/protocols/oscar/oscar.c:434
+#: src/protocols/oscar/oscar.c:442 src/protocols/silc/buddy.c:1525
+#: src/protocols/silc/silc.c:631
 msgid "Chat"
 msgstr "Chat"
 
-#: src/protocols/oscar/oscar.c:437 src/protocols/oscar/oscar.c:6542
+#: src/protocols/oscar/oscar.c:445 src/protocols/oscar/oscar.c:6748
 msgid "Get File"
 msgstr "Get File"
 
-#: src/protocols/oscar/oscar.c:444
+#: src/protocols/oscar/oscar.c:452
 msgid "Games"
 msgstr "Games"
 
-#: src/protocols/oscar/oscar.c:447
+#: src/protocols/oscar/oscar.c:455
 msgid "Add-Ins"
 msgstr "Add-Ins"
 
-#: src/protocols/oscar/oscar.c:450
+#: src/protocols/oscar/oscar.c:458
 msgid "Send Buddy List"
 msgstr "Send Buddy List"
 
-#: src/protocols/oscar/oscar.c:453
+#: src/protocols/oscar/oscar.c:461
 msgid "ICQ Direct Connect"
 msgstr "ICQ Direct Connect"
 
-#: src/protocols/oscar/oscar.c:456
+#: src/protocols/oscar/oscar.c:464
 msgid "AP User"
 msgstr "AP User"
 
-#: src/protocols/oscar/oscar.c:459
+#: src/protocols/oscar/oscar.c:467
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:462
+#: src/protocols/oscar/oscar.c:470
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: src/protocols/oscar/oscar.c:465
+#: src/protocols/oscar/oscar.c:473
 msgid "ICQ Server Relay"
 msgstr "ICQ Server Relay"
 
-#: src/protocols/oscar/oscar.c:468
+#: src/protocols/oscar/oscar.c:476
 msgid "Old ICQ UTF8"
 msgstr "Old ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:471
+#: src/protocols/oscar/oscar.c:479
 msgid "Trillian Encryption"
 msgstr "Trillian Encryption"
 
-#: src/protocols/oscar/oscar.c:474
+#: src/protocols/oscar/oscar.c:482
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:477
+#: src/protocols/oscar/oscar.c:485
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: src/protocols/oscar/oscar.c:480
+#: src/protocols/oscar/oscar.c:488
 msgid "Security Enabled"
 msgstr "Security Enabled"
 
-#: src/protocols/oscar/oscar.c:483
+#: src/protocols/oscar/oscar.c:491
 msgid "Video Chat"
 msgstr "Video Chat"
 
-#: src/protocols/oscar/oscar.c:487
+#: src/protocols/oscar/oscar.c:495
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: src/protocols/oscar/oscar.c:490
+#: src/protocols/oscar/oscar.c:498
 msgid "Live Video"
 msgstr "Live Video"
 
-#: src/protocols/oscar/oscar.c:493
+#: src/protocols/oscar/oscar.c:501
 msgid "Camera"
 msgstr "Camera"
 
-#: src/protocols/oscar/oscar.c:512 src/protocols/oscar/oscar.c:4839
-#: src/protocols/oscar/oscar.c:6432
+#: src/protocols/oscar/oscar.c:520 src/protocols/oscar/oscar.c:5464
+#: src/protocols/oscar/oscar.c:6637
 msgid "Free For Chat"
 msgstr "Free For Chat"
 
-#: src/protocols/oscar/oscar.c:516 src/protocols/oscar/oscar.c:4833
-#: src/protocols/oscar/oscar.c:6430
+#: src/protocols/oscar/oscar.c:524 src/protocols/oscar/oscar.c:5458
+#: src/protocols/oscar/oscar.c:6635
 msgid "Not Available"
 msgstr "Not Available"
 
-#: src/protocols/oscar/oscar.c:518 src/protocols/oscar/oscar.c:4836
-#: src/protocols/oscar/oscar.c:6431
+#: src/protocols/oscar/oscar.c:526 src/protocols/oscar/oscar.c:5461
+#: src/protocols/oscar/oscar.c:6636
 msgid "Occupied"
 msgstr "Occupied"
 
-#: src/protocols/oscar/oscar.c:522
+#: src/protocols/oscar/oscar.c:530
 msgid "Web Aware"
 msgstr "Web Aware"
 
-#: src/protocols/oscar/oscar.c:590
+#: src/protocols/oscar/oscar.c:598
 msgid "Capabilities"
 msgstr "Capabilities"
 
-#: src/protocols/oscar/oscar.c:596
+#: src/protocols/oscar/oscar.c:604
 msgid "Buddy Comment"
 msgstr "Buddy Comment"
 
-#: src/protocols/oscar/oscar.c:716
+#: src/protocols/oscar/oscar.c:739
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "Direct IM with %s closed"
 
-#: src/protocols/oscar/oscar.c:718
+#: src/protocols/oscar/oscar.c:741
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "Direct IM with %s failed"
 
-#: src/protocols/oscar/oscar.c:789 src/protocols/toc/toc.c:885
+#: src/protocols/oscar/oscar.c:748
+msgid "Direct Connect failed"
+msgstr "Direct Connect failed"
+
+#: src/protocols/oscar/oscar.c:825 src/protocols/oscar/oscar.c:956
+#, c-format
+msgid "Direct IM with %s established"
+msgstr "Direct IM with %s established"
+
+#: src/protocols/oscar/oscar.c:906
+#, 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:1322
+#, 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:1327
+msgid "Unable to open Direct IM"
+msgstr "Unable to open Direct IM"
+
+#: src/protocols/oscar/oscar.c:1362
+#, 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:1366
+msgid ""
+"Because this reveals your IP address, it may be considered a privacy risk.  "
+"Do you wish to continue?"
+msgstr ""
+"Because this reveals your IP address, it may be considered a privacy risk.  "
+"Do you wish to continue?"
+
+#: src/protocols/oscar/oscar.c:1370 src/protocols/oscar/oscar.c:3302
+msgid "Connect"
+msgstr "Connect"
+
+#: src/protocols/oscar/oscar.c:1436 src/protocols/toc/toc.c:899
 #, 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:805
+#: src/protocols/oscar/oscar.c:1452
 msgid "Chat is currently unavailable"
 msgstr "Chat is currently unavailable"
 
-#: src/protocols/oscar/oscar.c:886
+#: src/protocols/oscar/oscar.c:1533
 msgid "Screen name sent"
 msgstr "Screen name sent"
 
-#: src/protocols/oscar/oscar.c:900
+#: src/protocols/oscar/oscar.c:1547
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -7007,45 +7261,45 @@
 "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:928
+#: src/protocols/oscar/oscar.c:1575
 msgid "Unable to login to AIM"
 msgstr "Unable to login to AIM"
 
-#: src/protocols/oscar/oscar.c:1032 src/protocols/oscar/oscar.c:1449
+#: src/protocols/oscar/oscar.c:1676 src/protocols/oscar/oscar.c:2103
 msgid "Could Not Connect"
 msgstr "Could Not Connect"
 
-#: src/protocols/oscar/oscar.c:1040
+#: src/protocols/oscar/oscar.c:1684
 msgid "Connection established, cookie sent"
 msgstr "Connection established, cookie sent"
 
-#: src/protocols/oscar/oscar.c:1153 src/protocols/yahoo/yahoo_filexfer.c:209
+#: src/protocols/oscar/oscar.c:1797 src/protocols/yahoo/yahoo_filexfer.c:209
 #: src/protocols/yahoo/yahoo_filexfer.c:218
 msgid "Unable to establish file descriptor."
 msgstr "Unable to establish file descriptor."
 
-#: src/protocols/oscar/oscar.c:1158
+#: src/protocols/oscar/oscar.c:1802
 msgid "Unable to create new connection."
 msgstr "Unable to create new connection."
 
-#: src/protocols/oscar/oscar.c:1229
+#: src/protocols/oscar/oscar.c:1873
 msgid "Unable to establish listener socket."
 msgstr "Unable to establish listener socket."
 
-#: src/protocols/oscar/oscar.c:1333 src/protocols/toc/toc.c:571
+#: src/protocols/oscar/oscar.c:1987 src/protocols/toc/toc.c:571
 msgid "Incorrect nickname or password."
 msgstr "Incorrect nickname or password."
 
-#: src/protocols/oscar/oscar.c:1338
+#: src/protocols/oscar/oscar.c:1992
 msgid "Your account is currently suspended."
 msgstr "Your account is currently suspended."
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:1342
+#: src/protocols/oscar/oscar.c:1996
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "The AOL Instant Messenger service is temporarily unavailable."
 
-#: src/protocols/oscar/oscar.c:1347
+#: src/protocols/oscar/oscar.c:2001
 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."
@@ -7053,21 +7307,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:1352
+#: src/protocols/oscar/oscar.c:2006
 #, 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:1384
+#: src/protocols/oscar/oscar.c:2038
 msgid "Internal Error"
 msgstr "Internal Error"
 
-#: src/protocols/oscar/oscar.c:1456
+#: src/protocols/oscar/oscar.c:2110
 msgid "Received authorization"
 msgstr "Received authorization"
 
-#: src/protocols/oscar/oscar.c:1492 src/protocols/oscar/oscar.c:1522
-#: src/protocols/oscar/oscar.c:1610
+#: src/protocols/oscar/oscar.c:2146 src/protocols/oscar/oscar.c:2176
+#: src/protocols/oscar/oscar.c:2264
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -7076,29 +7330,24 @@
 "You may be disconnected shortly.  You may want to use TOC until this is "
 "fixed.  Check %s for updates."
 
-#: src/protocols/oscar/oscar.c:1495 src/protocols/oscar/oscar.c:1525
+#: src/protocols/oscar/oscar.c:2149 src/protocols/oscar/oscar.c:2179
 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:1613
+#: src/protocols/oscar/oscar.c:2267
 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:2195 src/protocols/oscar/oscar.c:5924
-#, c-format
-msgid "Direct IM with %s established"
-msgstr "Direct IM with %s established"
-
-#: src/protocols/oscar/oscar.c:2529 src/protocols/oscar/oscar.c:2551
+#: src/protocols/oscar/oscar.c:3095 src/protocols/oscar/oscar.c:3117
 msgid "(There was an error receiving this message)"
 msgstr "(There was an error receiving this message)"
 
-#: src/protocols/oscar/oscar.c:2712
+#: src/protocols/oscar/oscar.c:3294
 #, 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:2715
+#: src/protocols/oscar/oscar.c:3297
 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 "
@@ -7108,23 +7357,19 @@
 "for IM Images.  Because your IP address will be revealed, this may be "
 "considered a privacy risk."
 
-#: src/protocols/oscar/oscar.c:2720 src/protocols/oscar/oscar.c:6306
-msgid "Connect"
-msgstr "Connect"
-
-#: src/protocols/oscar/oscar.c:2749
+#: src/protocols/oscar/oscar.c:3333
 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:2757
+#: src/protocols/oscar/oscar.c:3341
 msgid "Authorization Request Message:"
 msgstr "Authorization Request Message:"
 
-#: src/protocols/oscar/oscar.c:2758
+#: src/protocols/oscar/oscar.c:3342
 msgid "Please authorize me!"
 msgstr "Please authorize me!"
 
-#: src/protocols/oscar/oscar.c:2787
+#: src/protocols/oscar/oscar.c:3372
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
@@ -7133,23 +7378,23 @@
 "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:2792 src/protocols/oscar/oscar.c:2794
+#: src/protocols/oscar/oscar.c:3377 src/protocols/oscar/oscar.c:3379
 msgid "Request Authorization"
 msgstr "Request Authorization"
 
-#: src/protocols/oscar/oscar.c:2830 src/protocols/oscar/oscar.c:2832
-#: src/protocols/oscar/oscar.c:2839 src/protocols/oscar/oscar.c:2921
-#: src/protocols/oscar/oscar.c:2941 src/protocols/oscar/oscar.c:3285
-#: src/protocols/oscar/oscar.c:3345 src/protocols/oscar/oscar.c:5445
-#: src/protocols/oscar/oscar.c:5491
+#: src/protocols/oscar/oscar.c:3427 src/protocols/oscar/oscar.c:3429
+#: src/protocols/oscar/oscar.c:3436 src/protocols/oscar/oscar.c:3518
+#: src/protocols/oscar/oscar.c:3538 src/protocols/oscar/oscar.c:3889
+#: src/protocols/oscar/oscar.c:3949 src/protocols/oscar/oscar.c:6063
+#: src/protocols/oscar/oscar.c:6109
 msgid "No reason given."
 msgstr "No reason given."
 
-#: src/protocols/oscar/oscar.c:2838
+#: src/protocols/oscar/oscar.c:3435
 msgid "Authorization Denied Message:"
 msgstr "Authorization Denied Message:"
 
-#: src/protocols/oscar/oscar.c:2921
+#: src/protocols/oscar/oscar.c:3518
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -7158,11 +7403,11 @@
 "The user %u wants to add you to their buddy list for the following reason:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2929 src/protocols/oscar/oscar.c:5451
+#: src/protocols/oscar/oscar.c:3526 src/protocols/oscar/oscar.c:6069
 msgid "Authorization Request"
 msgstr "Authorization Request"
 
-#: src/protocols/oscar/oscar.c:2941
+#: src/protocols/oscar/oscar.c:3538
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7173,17 +7418,17 @@
 "following reason:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2942
+#: src/protocols/oscar/oscar.c:3539
 msgid "ICQ authorization denied."
 msgstr "ICQ authorization denied."
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:2949
+#: src/protocols/oscar/oscar.c:3546
 #, 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:2957
+#: src/protocols/oscar/oscar.c:3554
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -7196,7 +7441,7 @@
 "From: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2965
+#: src/protocols/oscar/oscar.c:3562
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -7209,7 +7454,7 @@
 "From: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2973
+#: src/protocols/oscar/oscar.c:3570
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -7222,108 +7467,106 @@
 "Message is:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2994
+#: src/protocols/oscar/oscar.c:3591
 #, 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:3000
+#: src/protocols/oscar/oscar.c:3597
 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:3004
+#: src/protocols/oscar/oscar.c:3601
 msgid "Decline"
 msgstr "Decline"
 
-#: src/protocols/oscar/oscar.c:3089
+#: src/protocols/oscar/oscar.c:3686
 #, 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:3098
+#: src/protocols/oscar/oscar.c:3695
 #, 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:3107
+#: src/protocols/oscar/oscar.c:3704
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
-msgid_plural ""
 "You missed %hu messages from %s because the rate limit has been exceeded."
-msgstr[0] ""
+msgstr ""
 "You missed %hu message from %s because the rate limit has been exceeded."
-msgstr[1] ""
 "You missed %hu messages from %s because the rate limit has been exceeded."
 
-#: src/protocols/oscar/oscar.c:3116
+#: src/protocols/oscar/oscar.c:3713
 #, 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:3125
+#: src/protocols/oscar/oscar.c:3722
 #, 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:3134
+#: src/protocols/oscar/oscar.c:3731
 #, 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:3188
+#: src/protocols/oscar/oscar.c:3792
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 
-#: src/protocols/oscar/oscar.c:3247
+#: src/protocols/oscar/oscar.c:3851
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC threw error: %s\n"
 
-#: src/protocols/oscar/oscar.c:3248
+#: src/protocols/oscar/oscar.c:3852
 msgid "Unknown error"
 msgstr "Unknown error"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:3283
+#: src/protocols/oscar/oscar.c:3887
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "Your message to %s did not get sent:"
 
-#: src/protocols/oscar/oscar.c:3342
+#: src/protocols/oscar/oscar.c:3946
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "User information for %s unavailable:"
 
-#: src/protocols/oscar/oscar.c:3365
+#: src/protocols/oscar/oscar.c:3969
 msgid "Warning Level"
 msgstr "Warning Level"
 
-#: src/protocols/oscar/oscar.c:3368
+#: src/protocols/oscar/oscar.c:3972
 msgid "Online Since"
 msgstr "Online Since"
 
-#: src/protocols/oscar/oscar.c:3372 src/protocols/yahoo/yahoo.c:3088
+#: src/protocols/oscar/oscar.c:3976 src/protocols/yahoo/yahoo.c:3145
 msgid "Member Since"
 msgstr "Member Since"
 
-#: src/protocols/oscar/oscar.c:3454
+#: src/protocols/oscar/oscar.c:4058
 msgid "Your AIM connection may be lost."
 msgstr "Your AIM connection may be lost."
 
 #. The conversion failed!
-#: src/protocols/oscar/oscar.c:3640
+#: src/protocols/oscar/oscar.c:4244
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -7331,11 +7574,11 @@
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 
-#: src/protocols/oscar/oscar.c:3858
+#: src/protocols/oscar/oscar.c:4462
 msgid "Rate limiting error."
 msgstr "Rate limiting error."
 
-#: src/protocols/oscar/oscar.c:3859
+#: src/protocols/oscar/oscar.c:4463
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -7343,7 +7586,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:3922
+#: src/protocols/oscar/oscar.c:4526
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
@@ -7351,109 +7594,113 @@
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
 
-#: src/protocols/oscar/oscar.c:3924
+#: src/protocols/oscar/oscar.c:4528
 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:3955
+#: src/protocols/oscar/oscar.c:4559
 msgid "Finalizing connection"
 msgstr "Finalizing connection"
 
-#: src/protocols/oscar/oscar.c:4225 src/protocols/oscar/oscar.c:4232
+#: src/protocols/oscar/oscar.c:4829 src/protocols/oscar/oscar.c:4836
 msgid "Email Address"
 msgstr "Email Address"
 
-#: src/protocols/oscar/oscar.c:4237
+#: src/protocols/oscar/oscar.c:4841 src/protocols/silc/buddy.c:1553
 msgid "Mobile Phone"
 msgstr "Mobile Phone"
 
-#: src/protocols/oscar/oscar.c:4238 src/protocols/trepia/trepia.c:281
+#: src/protocols/oscar/oscar.c:4842
+msgid "Not specified"
+msgstr "Not specified"
+
+#: src/protocols/oscar/oscar.c:4843 src/protocols/trepia/trepia.c:281
 #: src/protocols/trepia/trepia.c:407
 msgid "Female"
 msgstr "Female"
 
-#: src/protocols/oscar/oscar.c:4238 src/protocols/trepia/trepia.c:280
+#: src/protocols/oscar/oscar.c:4843 src/protocols/trepia/trepia.c:280
 #: src/protocols/trepia/trepia.c:407
 msgid "Male"
 msgstr "Male"
 
-#: src/protocols/oscar/oscar.c:4254
+#: src/protocols/oscar/oscar.c:4859
 msgid "Personal Web Page"
 msgstr "Personal Web Page"
 
-#: src/protocols/oscar/oscar.c:4258
+#: src/protocols/oscar/oscar.c:4863
 msgid "Additional Information"
 msgstr "Additional Information"
 
-#: src/protocols/oscar/oscar.c:4263
+#: src/protocols/oscar/oscar.c:4868
 msgid "Home Address"
 msgstr "Home Address"
 
-#: src/protocols/oscar/oscar.c:4267 src/protocols/oscar/oscar.c:4275
+#: src/protocols/oscar/oscar.c:4872 src/protocols/oscar/oscar.c:4880
 msgid "Zip Code"
 msgstr "Postal Code"
 
-#: src/protocols/oscar/oscar.c:4271
+#: src/protocols/oscar/oscar.c:4876
 msgid "Work Address"
 msgstr "Work Address"
 
-#: src/protocols/oscar/oscar.c:4279
+#: src/protocols/oscar/oscar.c:4884
 msgid "Work Information"
 msgstr "Work Information"
 
-#: src/protocols/oscar/oscar.c:4280
+#: src/protocols/oscar/oscar.c:4885
 msgid "Company"
 msgstr "Company"
 
-#: src/protocols/oscar/oscar.c:4281
+#: src/protocols/oscar/oscar.c:4886
 msgid "Division"
 msgstr "Division"
 
-#: src/protocols/oscar/oscar.c:4282
+#: src/protocols/oscar/oscar.c:4887
 msgid "Position"
 msgstr "Position"
 
-#: src/protocols/oscar/oscar.c:4284
+#: src/protocols/oscar/oscar.c:4889
 msgid "Web Page"
 msgstr "Web Page"
 
-#: src/protocols/oscar/oscar.c:4290
+#: src/protocols/oscar/oscar.c:4895
 #, c-format
 msgid "ICQ Info for %s"
 msgstr "ICQ Info for %s"
 
-#: src/protocols/oscar/oscar.c:4340
+#: src/protocols/oscar/oscar.c:4945
 msgid "Pop-Up Message"
 msgstr "Pop-Up Message"
 
-#: src/protocols/oscar/oscar.c:4361
+#: src/protocols/oscar/oscar.c:4966
 #, 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:4365
+#: src/protocols/oscar/oscar.c:4970
 msgid "Search Results"
 msgstr "Search Results"
 
-#: src/protocols/oscar/oscar.c:4382
+#: src/protocols/oscar/oscar.c:4987
 #, c-format
 msgid "No results found for email address %s"
 msgstr "No results found for email address %s"
 
-#: src/protocols/oscar/oscar.c:4403
+#: src/protocols/oscar/oscar.c:5008
 #, 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:4405
+#: src/protocols/oscar/oscar.c:5010
 msgid "Account Confirmation Requested"
 msgstr "Account Confirmation Requested"
 
-#: src/protocols/oscar/oscar.c:4433
+#: src/protocols/oscar/oscar.c:5038
 msgid "Error Changing Account Info"
 msgstr "Error Changing Account Info"
 
-#: src/protocols/oscar/oscar.c:4436
+#: src/protocols/oscar/oscar.c:5041
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7462,7 +7709,7 @@
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "differs from the original."
 
-#: src/protocols/oscar/oscar.c:4439
+#: src/protocols/oscar/oscar.c:5044
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7471,7 +7718,7 @@
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "ends in a space."
 
-#: src/protocols/oscar/oscar.c:4442
+#: src/protocols/oscar/oscar.c:5047
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7480,7 +7727,7 @@
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "is too long."
 
-#: src/protocols/oscar/oscar.c:4445
+#: src/protocols/oscar/oscar.c:5050
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -7489,7 +7736,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:4448
+#: src/protocols/oscar/oscar.c:5053
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -7498,7 +7745,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:4451
+#: src/protocols/oscar/oscar.c:5056
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
@@ -7507,12 +7754,12 @@
 "Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 
-#: src/protocols/oscar/oscar.c:4454
+#: src/protocols/oscar/oscar.c:5059
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Error 0x%04x: Unknown error."
 
-#: src/protocols/oscar/oscar.c:4464
+#: src/protocols/oscar/oscar.c:5069
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -7521,20 +7768,26 @@
 "Your screen name is currently formatted as follows:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4465 src/protocols/oscar/oscar.c:4472
+#: src/protocols/oscar/oscar.c:5070 src/protocols/oscar/oscar.c:5077
 msgid "Account Info"
 msgstr "Account Info"
 
-#: src/protocols/oscar/oscar.c:4470
+#: src/protocols/oscar/oscar.c:5075
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "The email address for %s is %s"
 
-#: src/protocols/oscar/oscar.c:4688
+#: src/protocols/oscar/oscar.c:5140
+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:5313
 msgid "Unable to set AIM profile."
 msgstr "Unable to set AIM profile."
 
-#: src/protocols/oscar/oscar.c:4689
+#: src/protocols/oscar/oscar.c:5314
 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 "
@@ -7544,34 +7797,32 @@
 "completed.  Your profile remains unset; try setting it again when you are "
 "fully connected."
 
-#: src/protocols/oscar/oscar.c:4716
+#: src/protocols/oscar/oscar.c:5341
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
 "it for you."
-msgid_plural ""
 "The maximum profile length of %d bytes has been exceeded.  Gaim has "
 "truncated it for you."
-msgstr[0] ""
+msgstr ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
 "it for you."
-msgstr[1] ""
 "The maximum profile length of %d bytes has been exceeded.  Gaim has "
 "truncated it for you."
 
-#: src/protocols/oscar/oscar.c:4721
+#: src/protocols/oscar/oscar.c:5346
 msgid "Profile too long."
 msgstr "Profile too long."
 
-#: src/protocols/oscar/oscar.c:4737 src/protocols/oscar/oscar.c:6437
+#: src/protocols/oscar/oscar.c:5362 src/protocols/oscar/oscar.c:6642
 msgid "Visible"
 msgstr "Visible"
 
-#: src/protocols/oscar/oscar.c:4755
+#: src/protocols/oscar/oscar.c:5380
 msgid "Unable to set AIM away message."
 msgstr "Unable to set AIM away message."
 
-#: src/protocols/oscar/oscar.c:4756
+#: src/protocols/oscar/oscar.c:5381
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -7581,26 +7832,24 @@
 "procedure completed.  You remain in a \"present\" state; try setting it "
 "again when you are fully connected."
 
-#: src/protocols/oscar/oscar.c:4796
+#: src/protocols/oscar/oscar.c:5421
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
 "truncated it for you."
-msgid_plural ""
 "The maximum away message length of %d bytes has been exceeded.  Gaim has "
 "truncated it for you."
-msgstr[0] ""
+msgstr ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
 "truncated it for you."
-msgstr[1] ""
 "The maximum away message length of %d bytes has been exceeded.  Gaim has "
 "truncated it for you."
 
-#: src/protocols/oscar/oscar.c:4801
+#: src/protocols/oscar/oscar.c:5426
 msgid "Away message too long."
 msgstr "Away message too long."
 
-#: src/protocols/oscar/oscar.c:4894
+#: src/protocols/oscar/oscar.c:5512
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -7611,16 +7860,16 @@
 "must either start with a letter and contain only letters, numbers and "
 "spaces, or contain only numbers."
 
-#: src/protocols/oscar/oscar.c:4895 src/protocols/oscar/oscar.c:5312
-#: src/protocols/oscar/oscar.c:5325
+#: src/protocols/oscar/oscar.c:5513 src/protocols/oscar/oscar.c:5930
+#: src/protocols/oscar/oscar.c:5943
 msgid "Unable To Add"
 msgstr "Unable To Add"
 
-#: src/protocols/oscar/oscar.c:5031
+#: src/protocols/oscar/oscar.c:5649
 msgid "Unable To Retrieve Buddy List"
 msgstr "Unable To Retrieve Buddy List"
 
-#: src/protocols/oscar/oscar.c:5032
+#: src/protocols/oscar/oscar.c:5650
 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 "
@@ -7630,13 +7879,13 @@
 "servers.  Your buddy list is not lost, and will probably become available in "
 "a few hours."
 
-#: src/protocols/oscar/oscar.c:5208 src/protocols/oscar/oscar.c:5209
-#: src/protocols/oscar/oscar.c:5214 src/protocols/oscar/oscar.c:5369
-#: src/protocols/oscar/oscar.c:5370 src/protocols/oscar/oscar.c:5375
+#: src/protocols/oscar/oscar.c:5826 src/protocols/oscar/oscar.c:5827
+#: src/protocols/oscar/oscar.c:5832 src/protocols/oscar/oscar.c:5987
+#: src/protocols/oscar/oscar.c:5988 src/protocols/oscar/oscar.c:5993
 msgid "Orphans"
 msgstr "Orphans"
 
-#: src/protocols/oscar/oscar.c:5311
+#: src/protocols/oscar/oscar.c:5929
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -7645,11 +7894,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:5311 src/protocols/oscar/oscar.c:5324
+#: src/protocols/oscar/oscar.c:5929 src/protocols/oscar/oscar.c:5942
 msgid "(no name)"
 msgstr "(no name)"
 
-#: src/protocols/oscar/oscar.c:5324
+#: src/protocols/oscar/oscar.c:5942
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -7660,7 +7909,7 @@
 "for this is that you have the maximum number of allowed buddies in your "
 "buddy list."
 
-#: src/protocols/oscar/oscar.c:5406
+#: src/protocols/oscar/oscar.c:6024
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -7669,11 +7918,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:5412
+#: src/protocols/oscar/oscar.c:6030
 msgid "Authorization Given"
 msgstr "Authorization Given"
 
-#: src/protocols/oscar/oscar.c:5445
+#: src/protocols/oscar/oscar.c:6063
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -7683,17 +7932,17 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:5487
+#: src/protocols/oscar/oscar.c:6105
 #, 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:5488
+#: src/protocols/oscar/oscar.c:6106
 msgid "Authorization Granted"
 msgstr "Authorization Granted"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:5491
+#: src/protocols/oscar/oscar.c:6109
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -7704,84 +7953,71 @@
 "following reason:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5492
+#: src/protocols/oscar/oscar.c:6110
 msgid "Authorization Denied"
 msgstr "Authorization Denied"
 
-#: src/protocols/oscar/oscar.c:5529 src/protocols/toc/toc.c:1264
+#: src/protocols/oscar/oscar.c:6147 src/protocols/toc/toc.c:1294
 msgid "_Exchange:"
 msgstr "_Exchange:"
 
-#: src/protocols/oscar/oscar.c:5551
+#: src/protocols/oscar/oscar.c:6169
 msgid "Invalid chat name specified."
 msgstr "Invalid chat name specified."
 
-#: src/protocols/oscar/oscar.c:5792
+#: src/protocols/oscar/oscar.c:6259
+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:6416
 msgid "Away Message"
 msgstr "Away Message"
 
-#: src/protocols/oscar/oscar.c:6286
-msgid "Unable to open Direct IM"
-msgstr "Unable to open Direct IM"
-
-#: src/protocols/oscar/oscar.c:6299
-#, 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:6302
-msgid ""
-"Because this reveals your IP address, it may be considered a privacy risk.  "
-"Do you wish to continue?"
-msgstr ""
-"Because this reveals your IP address, it may be considered a privacy risk.  "
-"Do you wish to continue?"
-
-#: src/protocols/oscar/oscar.c:6487
+#: src/protocols/oscar/oscar.c:6700
 msgid "Buddy Comment:"
 msgstr "Buddy Comment:"
 
-#: src/protocols/oscar/oscar.c:6503
+#: src/protocols/oscar/oscar.c:6718
 msgid "Edit Buddy Comment"
 msgstr "Edit Buddy Comment"
 
-#: src/protocols/oscar/oscar.c:6511
+#: src/protocols/oscar/oscar.c:6724
 msgid "Get Status Msg"
 msgstr "Get Status Msg"
 
-#: src/protocols/oscar/oscar.c:6526
+#: src/protocols/oscar/oscar.c:6736
 msgid "Direct IM"
 msgstr "Direct IM"
 
-#: src/protocols/oscar/oscar.c:6555
+#: src/protocols/oscar/oscar.c:6759
 msgid "Re-request Authorization"
 msgstr "Re-request Authorization"
 
-#: src/protocols/oscar/oscar.c:6576
+#: src/protocols/oscar/oscar.c:6789
 msgid "The new formatting is invalid."
 msgstr "The new formatting is invalid."
 
-#: src/protocols/oscar/oscar.c:6577
+#: src/protocols/oscar/oscar.c:6790
 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:6583
+#: src/protocols/oscar/oscar.c:6797
 msgid "New screen name formatting:"
 msgstr "New screen name formatting:"
 
-#: src/protocols/oscar/oscar.c:6632
+#: src/protocols/oscar/oscar.c:6849
 msgid "Change Address To:"
 msgstr "Change Address To:"
 
-#: src/protocols/oscar/oscar.c:6676
+#: src/protocols/oscar/oscar.c:6894
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>you are not waiting for authorization</i>"
 
-#: src/protocols/oscar/oscar.c:6679
+#: src/protocols/oscar/oscar.c:6897
 msgid "You are awaiting authorization from the following buddies"
 msgstr "You are awaiting authorization from the following buddies"
 
-#: src/protocols/oscar/oscar.c:6680
+#: src/protocols/oscar/oscar.c:6898
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -7789,75 +8025,75 @@
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
 
-#: src/protocols/oscar/oscar.c:6694
+#: src/protocols/oscar/oscar.c:6915
 msgid "Find Buddy by E-mail"
 msgstr "Find Buddy by E-mail"
 
-#: src/protocols/oscar/oscar.c:6695
+#: src/protocols/oscar/oscar.c:6916
 msgid "Search for a buddy by e-mail address"
 msgstr "Search for a buddy by e-mail address"
 
-#: src/protocols/oscar/oscar.c:6696
+#: src/protocols/oscar/oscar.c:6917
 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:6713
+#: src/protocols/oscar/oscar.c:6934
 msgid "Available Message:"
 msgstr "Available Message:"
 
-#: src/protocols/oscar/oscar.c:6714
+#: src/protocols/oscar/oscar.c:6935
 msgid "I'm doing work and hoping for a distraction--IM me!"
 msgstr "I'm doing work and hoping for a distraction--IM me!"
 
-#: src/protocols/oscar/oscar.c:6790
+#: src/protocols/oscar/oscar.c:7016
 msgid "Set User Info..."
 msgstr "Set User Info..."
 
-#: src/protocols/oscar/oscar.c:6797
+#: src/protocols/oscar/oscar.c:7021
 msgid "Set User Info (URL)..."
 msgstr "Set User Info (URL)..."
 
-#: src/protocols/oscar/oscar.c:6805
+#: src/protocols/oscar/oscar.c:7027
 msgid "Set Available Message..."
 msgstr "Set Available Message..."
 
-#: src/protocols/oscar/oscar.c:6812
+#: src/protocols/oscar/oscar.c:7032
 msgid "Change Password..."
 msgstr "Change Password..."
 
-#: src/protocols/oscar/oscar.c:6819
+#: src/protocols/oscar/oscar.c:7037
 msgid "Change Password (URL)"
 msgstr "Change Password (URL)"
 
-#: src/protocols/oscar/oscar.c:6827
+#: src/protocols/oscar/oscar.c:7041
 msgid "Configure IM Forwarding (URL)"
 msgstr "Configure IM Forwarding (URL)"
 
-#: src/protocols/oscar/oscar.c:6838
+#: src/protocols/oscar/oscar.c:7050
 msgid "Format Screen Name..."
 msgstr "Format Screen Name..."
 
-#: src/protocols/oscar/oscar.c:6844
+#: src/protocols/oscar/oscar.c:7054
 msgid "Confirm Account"
 msgstr "Confirm Account"
 
-#: src/protocols/oscar/oscar.c:6850
+#: src/protocols/oscar/oscar.c:7058
 msgid "Display Currently Registered Address"
 msgstr "Display Currently Registered Address"
 
-#: src/protocols/oscar/oscar.c:6856
+#: src/protocols/oscar/oscar.c:7062
 msgid "Change Currently Registered Address..."
 msgstr "Change Currently Registered Address..."
 
-#: src/protocols/oscar/oscar.c:6865
+#: src/protocols/oscar/oscar.c:7069
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Show Buddies Awaiting Authorization"
 
-#: src/protocols/oscar/oscar.c:6873
+#: src/protocols/oscar/oscar.c:7075
 msgid "Search for Buddy by Email..."
 msgstr "Search for Buddy by Email..."
 
-#: src/protocols/oscar/oscar.c:6880
+#: src/protocols/oscar/oscar.c:7080
 msgid "Search for Buddy by Information"
 msgstr "Search for Buddy by Information"
 
@@ -7872,18 +8108,1021 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/oscar/oscar.c:7004 src/protocols/oscar/oscar.c:7006
+#: src/protocols/oscar/oscar.c:7195 src/protocols/oscar/oscar.c:7197
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ Protocol Plugin"
 
-#: src/protocols/oscar/oscar.c:7023
+#: src/protocols/oscar/oscar.c:7216
 msgid "Auth host"
 msgstr "Auth host"
 
-#: src/protocols/oscar/oscar.c:7028
+#: src/protocols/oscar/oscar.c:7221
 msgid "Auth port"
 msgstr "Auth port"
 
+#: src/protocols/silc/buddy.c:51 src/protocols/silc/buddy.c:414
+#: src/protocols/silc/buddy.c:539 src/protocols/silc/buddy.c:706
+#: src/protocols/silc/ft.c:340
+#, c-format
+msgid "User %s is not present in the network"
+msgstr "User %s is not present in the network"
+
+#: src/protocols/silc/buddy.c:52 src/protocols/silc/buddy.c:109
+#: src/protocols/silc/buddy.c:114 src/protocols/silc/buddy.c:118
+#: src/protocols/silc/buddy.c:123 src/protocols/silc/buddy.c:128
+#: src/protocols/silc/buddy.c:133 src/protocols/silc/buddy.c:251
+msgid "Key Agreement"
+msgstr "Key Agreement"
+
+#: src/protocols/silc/buddy.c:53
+msgid "Cannot perform the key agreement"
+msgstr "Cannot perform the key agreement"
+
+#: src/protocols/silc/buddy.c:110
+msgid "Error occurred during key agreement"
+msgstr "Error occurred during key agreement"
+
+#: src/protocols/silc/buddy.c:114
+msgid "Key Agreement failed"
+msgstr "Key Agreement failed"
+
+#: src/protocols/silc/buddy.c:119
+msgid "Timeout during key agreement"
+msgstr "Timeout during key agreement"
+
+#: src/protocols/silc/buddy.c:124
+msgid "Key agreement was aborted"
+msgstr "Key agreement was aborted"
+
+#: src/protocols/silc/buddy.c:129
+msgid "Key agreement is already started"
+msgstr "Key agreement is already started"
+
+#: src/protocols/silc/buddy.c:134
+msgid "Key agreement cannot be started with yourself"
+msgstr "Key agreement cannot be started with yourself"
+
+#: src/protocols/silc/buddy.c:252 src/protocols/silc/buddy.c:382
+#: src/protocols/silc/buddy.c:507
+msgid "The remote user is not present in the network any more"
+msgstr "The remote user is not present in the network any more"
+
+#: src/protocols/silc/buddy.c:288
+#, c-format
+msgid ""
+"Key agreement request received from %s. Would you like to perform the key "
+"agreement?"
+msgstr ""
+"Key agreement request received from %s. Would you like to perform the key "
+"agreement?"
+
+#: src/protocols/silc/buddy.c:292
+#, c-format
+msgid ""
+"The remote user is waiting key agreement on:\n"
+"Remote host: %s\n"
+"Remote port: %d"
+msgstr ""
+"The remote user is waiting key agreement on:\n"
+"Remote host: %s\n"
+"Remote port: %d"
+
+#: src/protocols/silc/buddy.c:305
+msgid "Key Agreement Request"
+msgstr "Key Agreement Request"
+
+#: src/protocols/silc/buddy.c:381 src/protocols/silc/buddy.c:416
+#: src/protocols/silc/buddy.c:458
+msgid "IM With Password"
+msgstr "IM With Password"
+
+#: src/protocols/silc/buddy.c:417
+msgid "Cannot set IM key"
+msgstr "Cannot set IM key"
+
+#: src/protocols/silc/buddy.c:459
+msgid "Set IM Password"
+msgstr "Set IM Password"
+
+#: src/protocols/silc/buddy.c:506 src/protocols/silc/buddy.c:541
+#: src/protocols/silc/ops.c:1080 src/protocols/silc/ops.c:1091
+msgid "Get Public Key"
+msgstr "Get Public Key"
+
+#: src/protocols/silc/buddy.c:542 src/protocols/silc/ops.c:1081
+#: src/protocols/silc/ops.c:1092
+msgid "Cannot fetch the public key"
+msgstr "Cannot fetch the public key"
+
+#: src/protocols/silc/buddy.c:629 src/protocols/silc/buddy.c:1648
+msgid "Show Public Key"
+msgstr "Show Public Key"
+
+#: src/protocols/silc/buddy.c:630 src/protocols/silc/buddy.c:989
+#: src/protocols/silc/chat.c:218
+msgid "Could not load public key"
+msgstr "Could not load public key"
+
+#: src/protocols/silc/buddy.c:707 src/protocols/silc/ops.c:837
+#: src/protocols/silc/ops.c:908 src/protocols/silc/ops.c:991
+#: src/protocols/silc/ops.c:992 src/protocols/silc/ops.c:998
+#: src/protocols/silc/ops.c:999
+msgid "User Information"
+msgstr "User Information"
+
+#: src/protocols/silc/buddy.c:708 src/protocols/silc/ops.c:909
+msgid "Cannot get user information"
+msgstr "Cannot get user information"
+
+#: src/protocols/silc/buddy.c:729
+#, c-format
+msgid "The %s buddy is not trusted"
+msgstr "The %s buddy is not trusted"
+
+#: src/protocols/silc/buddy.c:732
+msgid ""
+"You cannot receive buddy notifications until you import his/her public key.  "
+"You can use the Get Public Key command to get the public key."
+msgstr ""
+"You cannot receive buddy notifications until you import his/her public key.  "
+"You can use the Get Public Key command to get the public key."
+
+#: src/protocols/silc/buddy.c:1032
+#, c-format
+msgid "The %s buddy is not present in the network"
+msgstr "The %s buddy is not present in the network"
+
+#: src/protocols/silc/buddy.c:1035
+msgid ""
+"To add the buddy you must import his/her public key. Press Import to import "
+"a public key."
+msgstr ""
+"To add the buddy you must import his/her public key. Press Import to import "
+"a public key."
+
+#: src/protocols/silc/buddy.c:1038
+msgid "Import..."
+msgstr "Import..."
+
+#: src/protocols/silc/buddy.c:1125
+msgid "Select correct user"
+msgstr "Select correct user"
+
+#: src/protocols/silc/buddy.c:1127
+msgid ""
+"More than one user was found with the same public key. Select the correct "
+"user from the list to add to the buddy list."
+msgstr ""
+"More than one user was found with the same public key. Select the correct "
+"user from the list to add to the buddy list."
+
+#: src/protocols/silc/buddy.c:1129
+msgid ""
+"More than one user was found with the same name. Select the correct user "
+"from the list to add to the buddy list."
+msgstr ""
+"More than one user was found with the same name. Select the correct user "
+"from the list to add to the buddy list."
+
+#: src/protocols/silc/buddy.c:1403
+msgid "Detached"
+msgstr "Detached"
+
+#: src/protocols/silc/buddy.c:1407 src/protocols/silc/silc.c:48
+#: src/protocols/silc/silc.c:80
+msgid "Indisposed"
+msgstr "Indisposed"
+
+#: src/protocols/silc/buddy.c:1411 src/protocols/silc/silc.c:49
+#: src/protocols/silc/silc.c:82
+msgid "Wake Me Up"
+msgstr "Wake Me Up"
+
+#: src/protocols/silc/buddy.c:1413 src/protocols/silc/silc.c:45
+#: src/protocols/silc/silc.c:74
+msgid "Hyper Active"
+msgstr "Hyper Active"
+
+#: src/protocols/silc/buddy.c:1415
+msgid "Robot"
+msgstr "Robot"
+
+#: src/protocols/silc/buddy.c:1422 src/protocols/silc/buddy.c:1490
+#: src/protocols/silc/silc.c:606
+msgid "Happy"
+msgstr "Happy"
+
+#: src/protocols/silc/buddy.c:1424 src/protocols/silc/buddy.c:1492
+#: src/protocols/silc/silc.c:608
+msgid "Sad"
+msgstr "Sad"
+
+#: src/protocols/silc/buddy.c:1426 src/protocols/silc/buddy.c:1494
+#: src/protocols/silc/silc.c:610
+msgid "Angry"
+msgstr "Angry"
+
+#: src/protocols/silc/buddy.c:1428 src/protocols/silc/buddy.c:1496
+#: src/protocols/silc/silc.c:612
+msgid "Jealous"
+msgstr "Jealous"
+
+#: src/protocols/silc/buddy.c:1430 src/protocols/silc/buddy.c:1498
+#: src/protocols/silc/silc.c:614
+msgid "Ashamed"
+msgstr "Ashamed"
+
+#: src/protocols/silc/buddy.c:1432 src/protocols/silc/buddy.c:1500
+#: src/protocols/silc/silc.c:616
+msgid "Invincible"
+msgstr "Invincible"
+
+#: src/protocols/silc/buddy.c:1434 src/protocols/silc/buddy.c:1502
+#: src/protocols/silc/silc.c:618
+msgid "In Love"
+msgstr "In Love"
+
+#: src/protocols/silc/buddy.c:1436 src/protocols/silc/buddy.c:1504
+#: src/protocols/silc/silc.c:620
+msgid "Sleepy"
+msgstr "Sleepy"
+
+#: src/protocols/silc/buddy.c:1438 src/protocols/silc/buddy.c:1506
+#: src/protocols/silc/silc.c:622
+msgid "Bored"
+msgstr "Bored"
+
+#: src/protocols/silc/buddy.c:1440 src/protocols/silc/buddy.c:1508
+#: src/protocols/silc/silc.c:624
+msgid "Excited"
+msgstr "Excited"
+
+#: src/protocols/silc/buddy.c:1442 src/protocols/silc/buddy.c:1510
+#: src/protocols/silc/silc.c:626
+msgid "Anxious"
+msgstr "Anxious"
+
+#: src/protocols/silc/buddy.c:1478
+msgid "Modes"
+msgstr "Modes"
+
+#: src/protocols/silc/buddy.c:1488
+msgid "Mood"
+msgstr "Mood"
+
+#: src/protocols/silc/buddy.c:1518
+msgid "Status Text"
+msgstr "Status Text"
+
+#: src/protocols/silc/buddy.c:1523
+msgid "Preferred Contact"
+msgstr "Preferred Contact"
+
+#: src/protocols/silc/buddy.c:1531
+msgid "Paging"
+msgstr "Paging"
+
+#: src/protocols/silc/buddy.c:1533 src/protocols/silc/silc.c:637
+msgid "SMS"
+msgstr "SMS"
+
+#: src/protocols/silc/buddy.c:1535 src/protocols/silc/silc.c:639
+msgid "MMS"
+msgstr "MMS"
+
+#: src/protocols/silc/buddy.c:1537 src/protocols/silc/silc.c:641
+msgid "Video Conferencing"
+msgstr "Video Conferencing"
+
+#: src/protocols/silc/buddy.c:1544
+msgid "Preferred Language"
+msgstr "Preferred Language"
+
+#: src/protocols/silc/buddy.c:1549
+msgid "Device"
+msgstr "Device"
+
+#: src/protocols/silc/buddy.c:1551
+msgid "Computer"
+msgstr "Computer"
+
+#: src/protocols/silc/buddy.c:1555
+msgid "PDA"
+msgstr "PDA"
+
+#: src/protocols/silc/buddy.c:1557
+msgid "Terminal"
+msgstr "Terminal"
+
+#: src/protocols/silc/buddy.c:1568 src/protocols/silc/silc.c:674
+#: src/protocols/silc/silc.c:676
+msgid "Timezone"
+msgstr "Time Zone"
+
+#: src/protocols/silc/buddy.c:1574
+msgid "Geolocation"
+msgstr "Geolocation"
+
+#: src/protocols/silc/buddy.c:1633
+msgid "Reset IM Key"
+msgstr "Reset IM Key"
+
+#: src/protocols/silc/buddy.c:1638
+msgid "IM with Key Exchange"
+msgstr "IM with Key Exchange"
+
+#: src/protocols/silc/buddy.c:1642
+msgid "IM with Password"
+msgstr "IM with Password"
+
+#: src/protocols/silc/buddy.c:1653
+msgid "Get Public Key..."
+msgstr "Get Public Key..."
+
+#: src/protocols/silc/buddy.c:1658
+msgid "Send File..."
+msgstr "Send File..."
+
+#: src/protocols/silc/buddy.c:1663 src/protocols/silc/ops.c:1127
+msgid "Kill User"
+msgstr "Kill User"
+
+#: src/protocols/silc/chat.c:37
+msgid "_Passphrase:"
+msgstr "_Passphrase:"
+
+#: src/protocols/silc/chat.c:66
+#, c-format
+msgid "Channel %s does not exist in the network"
+msgstr "Channel %s does not exist in the network"
+
+#: src/protocols/silc/chat.c:67 src/protocols/silc/chat.c:154
+#: src/protocols/silc/chat.c:155
+msgid "Channel Information"
+msgstr "Channel Information"
+
+#: src/protocols/silc/chat.c:68
+msgid "Cannot get channel information"
+msgstr "Cannot get channel information"
+
+#: src/protocols/silc/chat.c:217
+msgid "Add Channel Public Key"
+msgstr "Add Channel Public Key"
+
+#. Add new public key
+#: src/protocols/silc/chat.c:272
+msgid "Open Public Key..."
+msgstr "Open Public Key..."
+
+#: src/protocols/silc/chat.c:383
+msgid "Channel Passphrase"
+msgstr "Channel Passphrase"
+
+#: src/protocols/silc/chat.c:390
+msgid "Channel Public Keys List"
+msgstr "Channel Public Keys List"
+
+#: src/protocols/silc/chat.c:395
+msgid ""
+"Channel authentication is used to secure the channel from unauthorized "
+"access. The authentication may be based on passphrase and digital "
+"signatures. If passphrase is set, it is required to be able to join. If "
+"channel public keys are set then only users whose public keys are listed are "
+"able to join."
+msgstr ""
+"Channel authentication is used to secure the channel from unauthorized "
+"access. The authentication may be based on passphrase and digital "
+"signatures. If passphrase is set, it is required to be able to join. If "
+"channel public keys are set then only users whose public keys are listed are "
+"able to join."
+
+#: src/protocols/silc/chat.c:404 src/protocols/silc/chat.c:405
+#: src/protocols/silc/chat.c:442 src/protocols/silc/chat.c:443
+#: src/protocols/silc/chat.c:873
+msgid "Channel Authentication"
+msgstr "Channel Authentication"
+
+#: src/protocols/silc/chat.c:562
+msgid "Group Name"
+msgstr "Group Name"
+
+#: src/protocols/silc/chat.c:566 src/protocols/silc/ops.c:1403
+msgid "Passphrase"
+msgstr "Passphrase"
+
+#: src/protocols/silc/chat.c:577
+#, c-format
+msgid "Please enter the %s channel private group name and passphrase."
+msgstr "Please enter the %s channel private group name and passphrase."
+
+#: src/protocols/silc/chat.c:579
+msgid "Add Channel Private Group"
+msgstr "Add Channel Private Group"
+
+#: src/protocols/silc/chat.c:706
+msgid "User Limit"
+msgstr "User Limit"
+
+#: src/protocols/silc/chat.c:707
+msgid "Set user limit on channel. Set to zero to reset user limit."
+msgstr "Set user limit on channel. Set to zero to reset user limit."
+
+#: src/protocols/silc/chat.c:849
+msgid "Get Info"
+msgstr "Get Info"
+
+#: src/protocols/silc/chat.c:856
+msgid "Invite List"
+msgstr "Invite List"
+
+#: src/protocols/silc/chat.c:860
+msgid "Ban List"
+msgstr "Ban List"
+
+#: src/protocols/silc/chat.c:867
+msgid "Add Private Group"
+msgstr "Add Private Group"
+
+#: src/protocols/silc/chat.c:878
+msgid "Reset Permanent"
+msgstr "Reset Permanent"
+
+#: src/protocols/silc/chat.c:882
+msgid "Set Permanent"
+msgstr "Set Permanent"
+
+#: src/protocols/silc/chat.c:889
+msgid "Set User Limit"
+msgstr "Set User Limit"
+
+#: src/protocols/silc/chat.c:894
+msgid "Reset Topic Restriction"
+msgstr "Reset Topic Restriction"
+
+#: src/protocols/silc/chat.c:898
+msgid "Set Topic Restriction"
+msgstr "Set Topic Restriction"
+
+#: src/protocols/silc/chat.c:904
+msgid "Reset Private Channel"
+msgstr "Reset Private Channel"
+
+#: src/protocols/silc/chat.c:908
+msgid "Set Private Channel"
+msgstr "Set Private Channel"
+
+#: src/protocols/silc/chat.c:914
+msgid "Reset Secret Channel"
+msgstr "Reset Secret Channel"
+
+#: src/protocols/silc/chat.c:918
+msgid "Set Secret Channel"
+msgstr "Set Secret Channel"
+
+#: src/protocols/silc/chat.c:988
+#, c-format
+msgid "You are channel founder on <I>%s</I>"
+msgstr "You are channel founder on <I>%s</I>"
+
+#: src/protocols/silc/chat.c:992
+#, c-format
+msgid "Channel founder on <I>%s</I> is <I>%s</I>"
+msgstr "Channel founder on <I>%s</I> is <I>%s</I>"
+
+#: src/protocols/silc/chat.c:1042
+#, c-format
+msgid ""
+"You have to join the %s channel before you are able to join the private group"
+msgstr ""
+"You have to join the %s channel before you are able to join the private group"
+
+#: src/protocols/silc/chat.c:1044
+msgid "Join Private Group"
+msgstr "Join Private Group"
+
+#: src/protocols/silc/chat.c:1045
+msgid "Cannot join private group"
+msgstr "Cannot join private group"
+
+#: src/protocols/silc/chat.c:1227 src/protocols/silc/silc.c:842
+msgid "Cannot call command"
+msgstr "Cannot call command"
+
+#: src/protocols/silc/chat.c:1228 src/protocols/silc/silc.c:843
+msgid "Unknown command"
+msgstr "Unknown command"
+
+#: src/protocols/silc/ft.c:89 src/protocols/silc/ft.c:92
+#: src/protocols/silc/ft.c:96 src/protocols/silc/ft.c:100
+#: src/protocols/silc/ft.c:104 src/protocols/silc/ft.c:206
+#: src/protocols/silc/ft.c:211 src/protocols/silc/ft.c:216
+#: src/protocols/silc/ft.c:222 src/protocols/silc/ft.c:342
+msgid "Secure File Transfer"
+msgstr "Secure File Transfer"
+
+#: src/protocols/silc/ft.c:90 src/protocols/silc/ft.c:93
+#: src/protocols/silc/ft.c:97 src/protocols/silc/ft.c:101
+#: src/protocols/silc/ft.c:105
+msgid "Error during file transfer"
+msgstr "Error during file transfer"
+
+#: src/protocols/silc/ft.c:94
+msgid "Permission denied"
+msgstr "Permission denied"
+
+#: src/protocols/silc/ft.c:98
+msgid "Key agreement failed"
+msgstr "Key agreement failed"
+
+#: src/protocols/silc/ft.c:102
+msgid "File transfer sessions does not exist"
+msgstr "File transfer sessions does not exist"
+
+#: src/protocols/silc/ft.c:207
+msgid "No file transfer session active"
+msgstr "No file transfer session active"
+
+#: src/protocols/silc/ft.c:212
+msgid "File transfer already started"
+msgstr "File transfer already started"
+
+#: src/protocols/silc/ft.c:217
+msgid "Could not perform key agreement for file transfer"
+msgstr "Could not perform key agreement for file transfer"
+
+#: src/protocols/silc/ft.c:223
+msgid "Could not start the file transfer"
+msgstr "Could not start the file transfer"
+
+#: src/protocols/silc/ft.c:343
+msgid "Cannot send file"
+msgstr "Cannot send file"
+
+#: src/protocols/silc/ops.c:324 src/protocols/silc/ops.c:331
+#: src/protocols/silc/ops.c:338
+#, 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:398
+#, 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:402
+#, 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:433
+#, 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:437
+#, 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:464
+#, 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:494 src/protocols/silc/ops.c:499
+#: src/protocols/silc/ops.c:504
+#, c-format
+msgid "You have been killed by %s (%s)"
+msgstr "You have been killed by %s (%s)"
+
+#: src/protocols/silc/ops.c:525 src/protocols/silc/ops.c:530
+#: src/protocols/silc/ops.c:535
+#, c-format
+msgid "Killed by %s (%s)"
+msgstr "Killed by %s (%s)"
+
+#: src/protocols/silc/ops.c:581
+msgid "Server signoff"
+msgstr "Server signoff"
+
+#: src/protocols/silc/ops.c:767
+msgid "Personal Information"
+msgstr "Personal Information"
+
+#: src/protocols/silc/ops.c:790
+msgid "Birth Day"
+msgstr "Birth Day"
+
+#: src/protocols/silc/ops.c:794
+msgid "Job Title"
+msgstr "Job Title"
+
+#: src/protocols/silc/ops.c:798
+msgid "Job Role"
+msgstr "Job Role"
+
+#: src/protocols/silc/ops.c:802 src/protocols/silc/util.c:285
+msgid "Organization"
+msgstr "Organization"
+
+#: src/protocols/silc/ops.c:806
+msgid "Unit"
+msgstr "Unit"
+
+#: src/protocols/silc/ops.c:825 src/protocols/silc/util.c:281
+msgid "EMail"
+msgstr "EMail"
+
+#: src/protocols/silc/ops.c:830
+msgid "Note"
+msgstr "Note"
+
+#: src/protocols/silc/ops.c:878
+msgid "Join Chat"
+msgstr "Join Chat"
+
+#: src/protocols/silc/ops.c:933
+msgid "Hostname"
+msgstr "Hostname"
+
+#: src/protocols/silc/ops.c:940
+msgid "User Mode"
+msgstr "User Mode"
+
+#: src/protocols/silc/ops.c:954
+msgid "Channels"
+msgstr "Channels"
+
+#: src/protocols/silc/ops.c:981 src/protocols/silc/util.c:291
+msgid "Public Key Fingerprint"
+msgstr "Public Key Fingerprint"
+
+#: src/protocols/silc/ops.c:982 src/protocols/silc/util.c:292
+msgid "Public Key Babbleprint"
+msgstr "Public Key Babbleprint"
+
+#: src/protocols/silc/ops.c:995
+msgid "More..."
+msgstr "More..."
+
+#: src/protocols/silc/ops.c:1006 src/protocols/silc/silc.c:745
+msgid "Detach From Server"
+msgstr "Detach From Server"
+
+#: src/protocols/silc/ops.c:1006
+msgid "Cannot detach"
+msgstr "Cannot detach"
+
+#: src/protocols/silc/ops.c:1017
+msgid "Cannot set topic"
+msgstr "Cannot set topic"
+
+#: src/protocols/silc/ops.c:1045
+msgid "Roomlist"
+msgstr "Roomlist"
+
+#: src/protocols/silc/ops.c:1045
+msgid "Cannot get room list"
+msgstr "Cannot get room list"
+
+#: src/protocols/silc/ops.c:1093
+msgid "No public key was received"
+msgstr "No public key was received"
+
+#: src/protocols/silc/ops.c:1106 src/protocols/silc/ops.c:1119
+#: src/protocols/silc/ops.c:1120
+msgid "Server Information"
+msgstr "Server Information"
+
+#: src/protocols/silc/ops.c:1107
+msgid "Cannot get server information"
+msgstr "Cannot get server information"
+
+#: src/protocols/silc/ops.c:1128
+msgid "Could not kill user"
+msgstr "Could not kill user"
+
+#: src/protocols/silc/ops.c:1205
+msgid "Error during connecting to SILC Server"
+msgstr "Error during connecting to SILC Server"
+
+#: src/protocols/silc/ops.c:1210
+msgid "Key Exchange failed"
+msgstr "Key Exchange failed"
+
+#: src/protocols/silc/ops.c:1219
+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:1254
+msgid "Disconnected by server"
+msgstr "Disconnected by server"
+
+#: src/protocols/silc/ops.c:1314 src/protocols/silc/ops.c:1361
+#: src/protocols/silc/silc.c:167
+msgid "Resuming session"
+msgstr "Resuming session"
+
+#: src/protocols/silc/ops.c:1316
+msgid "Authenticating connection"
+msgstr "Authenticating connection"
+
+#: src/protocols/silc/ops.c:1363
+msgid "Verifying server public key"
+msgstr "Verifying server public key"
+
+#: src/protocols/silc/ops.c:1404
+msgid "Passphrase required"
+msgstr "Passphrase required"
+
+#: src/protocols/silc/ops.c:1433
+msgid "Failure: Version mismatch, upgrade your client"
+msgstr "Failure: Version mismatch; upgrade your client"
+
+#: src/protocols/silc/ops.c:1436
+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:1439
+msgid "Failure: Remote does not support proposed KE group"
+msgstr "Failure: Remote does not support proposed KE group"
+
+#: src/protocols/silc/ops.c:1442
+msgid "Failure: Remote does not support proposed cipher"
+msgstr "Failure: Remote does not support proposed cipher"
+
+#: src/protocols/silc/ops.c:1445
+msgid "Failure: Remote does not support proposed PKCS"
+msgstr "Failure: Remote does not support proposed PKCS"
+
+#: src/protocols/silc/ops.c:1448
+msgid "Failure: Remote does not support proposed hash function"
+msgstr "Failure: Remote does not support proposed hash function"
+
+#: src/protocols/silc/ops.c:1451
+msgid "Failure: Remote does not support proposed HMAC"
+msgstr "Failure: Remote does not support proposed HMAC"
+
+#: src/protocols/silc/ops.c:1453
+msgid "Failure: Incorrect signature"
+msgstr "Failure: Incorrect signature"
+
+#: src/protocols/silc/ops.c:1455
+msgid "Failure: Invalid cookie"
+msgstr "Failure: Invalid cookie"
+
+#: src/protocols/silc/ops.c:1466
+msgid "Failure: Authentication failed"
+msgstr "Failure: Authentication failed"
+
+#: src/protocols/silc/pk.c:103
+#, c-format
+msgid ""
+"Received %s's public key. Your local copy does not match this key. Would you "
+"still like to accept this public key?"
+msgstr ""
+"Received %s's public key. Your local copy does not match this key. Would you "
+"still like to accept this public key?"
+
+#: src/protocols/silc/pk.c:108
+#, c-format
+msgid "Received %s's public key. Would you like to accept this public key?"
+msgstr "Received %s's public key. Would you like to accept this public key?"
+
+#: src/protocols/silc/pk.c:112
+#, c-format
+msgid ""
+"Fingerprint and babbleprint for the %s key are:\n"
+"\n"
+"%s\n"
+"%s\n"
+msgstr ""
+"Fingerprint and babbleprint for the %s key are:\n"
+"\n"
+"%s\n"
+"%s\n"
+
+#: src/protocols/silc/pk.c:115 src/protocols/silc/pk.c:139
+msgid "Verify Public Key"
+msgstr "Verify Public Key"
+
+#: src/protocols/silc/pk.c:118
+msgid "View..."
+msgstr "View..."
+
+#: src/protocols/silc/pk.c:140
+msgid "Unsupported public key type"
+msgstr "Unsupported public key type"
+
+#: src/protocols/silc/silc.c:133
+msgid "Connection failed"
+msgstr "Connection failed"
+
+#: src/protocols/silc/silc.c:159
+msgid "Cannot initialize SILC Client connection"
+msgstr "Cannot initialize SILC Client connection"
+
+#: src/protocols/silc/silc.c:170
+msgid "Performing key exchange"
+msgstr "Performing key exchange"
+
+#: src/protocols/silc/silc.c:242
+msgid "Out of memory"
+msgstr "Out of memory"
+
+#. Progress
+#: src/protocols/silc/silc.c:276
+msgid "Connecting to SILC Server"
+msgstr "Connecting to SILC Server"
+
+#: src/protocols/silc/silc.c:602
+msgid "Your Current Mood"
+msgstr "Your Current Mood"
+
+#: src/protocols/silc/silc.c:604
+msgid "Normal"
+msgstr "Normal"
+
+#: src/protocols/silc/silc.c:629
+msgid ""
+"\n"
+"Your Preferred Contact Methods"
+msgstr ""
+"\n"
+"Your Preferred Contact Methods"
+
+#: src/protocols/silc/silc.c:646
+msgid "Your Current Status"
+msgstr "Your Current Status"
+
+#: src/protocols/silc/silc.c:653
+msgid "Online Services"
+msgstr "Online Services"
+
+#: src/protocols/silc/silc.c:656
+msgid "Let others see what services you are using"
+msgstr "Let others see what services you are using"
+
+#: src/protocols/silc/silc.c:662
+msgid "Let others see what computer you are using"
+msgstr "Let others see what computer you are using"
+
+#: src/protocols/silc/silc.c:669
+msgid "Your VCard File"
+msgstr "Your VCard File"
+
+#: src/protocols/silc/silc.c:682 src/protocols/silc/silc.c:683
+msgid "User Online Status Attributes"
+msgstr "User Online Status Attributes"
+
+#: src/protocols/silc/silc.c:684
+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 "
+"about yourself."
+msgstr ""
+"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 "
+"about yourself."
+
+#: src/protocols/silc/silc.c:723 src/protocols/silc/silc.c:728
+msgid "Message of the Day"
+msgstr "Message of the Day"
+
+#: src/protocols/silc/silc.c:723
+msgid "No Message of the Day available"
+msgstr "No Message of the Day available"
+
+#: src/protocols/silc/silc.c:724
+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:740
+msgid "Online Status"
+msgstr "Online Status"
+
+#: src/protocols/silc/silc.c:749
+msgid "View Message of the Day"
+msgstr "View Message of the Day"
+
+#: src/protocols/silc/silc.c:813
+#, 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:907
+msgid "Instant Messages"
+msgstr "Instant Messages"
+
+#: src/protocols/silc/silc.c:912
+msgid "Digitally sign all IM messages"
+msgstr "Digitally sign all IM messages"
+
+#: src/protocols/silc/silc.c:917
+msgid "Verify all IM message signatures"
+msgstr "Verify all IM message signatures"
+
+#: src/protocols/silc/silc.c:920
+msgid "Channel Messages"
+msgstr "Channel Messages"
+
+#: src/protocols/silc/silc.c:925
+msgid "Digitally sign all channel messages"
+msgstr "Digitally sign all channel messages"
+
+#: src/protocols/silc/silc.c:930
+msgid "Verify all channel message signatures"
+msgstr "Verify all channel message signatures"
+
+#: src/protocols/silc/silc.c:933
+msgid "Default SILC Key Pair"
+msgstr "Default SILC Key Pair"
+
+#: src/protocols/silc/silc.c:938
+msgid "SILC Public Key"
+msgstr "SILC Public Key"
+
+#: src/protocols/silc/silc.c:943
+msgid "SILC Private Key"
+msgstr "SILC Private Key"
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#: src/protocols/silc/silc.c:1026
+msgid "SILC Protocol Plugin"
+msgstr "SILC Protocol Plugin"
+
+#. *  description
+#: src/protocols/silc/silc.c:1028
+msgid "Secure Internet Live Conferencing (SILC) Protocol"
+msgstr "Secure Internet Live Conferencing (SILC) Protocol"
+
+#: src/protocols/silc/silc.c:1058
+msgid "Public key authentication"
+msgstr "Public key authentication"
+
+#: src/protocols/silc/silc.c:1064
+msgid "Public Key File"
+msgstr "Public Key File"
+
+#: src/protocols/silc/silc.c:1068
+msgid "Private Key File"
+msgstr "Private Key File"
+
+#: src/protocols/silc/silc.c:1073
+msgid "Reject watching by other users"
+msgstr "Reject watching by other users"
+
+#: src/protocols/silc/silc.c:1076
+msgid "Block invites"
+msgstr "Block invites"
+
+#: src/protocols/silc/silc.c:1079
+msgid "Block IMs without Key Exchange"
+msgstr "Block IMs without Key Exchange"
+
+#: src/protocols/silc/silc.c:1082
+msgid "Reject online status attribute requests"
+msgstr "Reject online status attribute requests"
+
+#: src/protocols/silc/util.c:197 src/protocols/silc/util.c:217
+msgid "Creating SILC key pair..."
+msgstr "Creating SILC key pair..."
+
+#: src/protocols/silc/util.c:277
+msgid "Real Name"
+msgstr "Real Name"
+
+#: src/protocols/silc/util.c:279
+msgid "User Name"
+msgstr "User Name"
+
+#: src/protocols/silc/util.c:283
+msgid "Host Name"
+msgstr "Host Name"
+
+#: src/protocols/silc/util.c:288
+msgid "Algorithm"
+msgstr "Algorithm"
+
+#: src/protocols/silc/util.c:289
+msgid "Key Length"
+msgstr "Key Length"
+
+#: src/protocols/silc/util.c:296 src/protocols/silc/util.c:297
+msgid "Public Key Information"
+msgstr "Public Key Information"
+
 #: src/protocols/toc/toc.c:167
 #, c-format
 msgid "Looking up %s"
@@ -8005,27 +9244,27 @@
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "An unknown error, %d, has occurred.  Info: %s"
 
-#: src/protocols/toc/toc.c:605
+#: src/protocols/toc/toc.c:606
 msgid "Connection Closed"
 msgstr "Connection Closed"
 
-#: src/protocols/toc/toc.c:645
+#: src/protocols/toc/toc.c:646
 msgid "Waiting for reply..."
 msgstr "Waiting for reply..."
 
-#: src/protocols/toc/toc.c:715
+#: src/protocols/toc/toc.c:722
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOC has come back from its pause. You may now send messages again."
 
-#: src/protocols/toc/toc.c:903
+#: src/protocols/toc/toc.c:917
 msgid "Password Change Successful"
 msgstr "Password Change Successful"
 
-#: src/protocols/toc/toc.c:907
+#: src/protocols/toc/toc.c:921
 msgid "TOC has sent a PAUSE command."
 msgstr "TOC has sent a PAUSE command."
 
-#: src/protocols/toc/toc.c:908
+#: src/protocols/toc/toc.c:922
 msgid ""
 "When this happens, TOC ignores any messages sent to it, and may kick you off "
 "if you send a message. Gaim will prevent anything from going through. This "
@@ -8035,44 +9274,44 @@
 "if you send a message. Gaim will prevent anything from going through. This "
 "is only temporary, please be patient."
 
-#: src/protocols/toc/toc.c:1402
+#: src/protocols/toc/toc.c:1432
 msgid "Get Dir Info"
 msgstr "Get Dir Info"
 
-#: src/protocols/toc/toc.c:1539
+#: src/protocols/toc/toc.c:1568
 msgid "Set Dir Info"
 msgstr "Set Dir Info"
 
-#: src/protocols/toc/toc.c:1664
+#: src/protocols/toc/toc.c:1690
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "Could not open %s for writing!"
 
-#: src/protocols/toc/toc.c:1700
+#: src/protocols/toc/toc.c:1726
 msgid "File transfer failed; other side probably canceled."
 msgstr "File transfer failed; other side probably canceled."
 
-#: src/protocols/toc/toc.c:1745 src/protocols/toc/toc.c:1785
-#: src/protocols/toc/toc.c:1909 src/protocols/toc/toc.c:1997
+#: src/protocols/toc/toc.c:1771 src/protocols/toc/toc.c:1811
+#: src/protocols/toc/toc.c:1935 src/protocols/toc/toc.c:2023
 msgid "Could not connect for transfer."
 msgstr "Could not connect for transfer."
 
-#: src/protocols/toc/toc.c:1942
+#: src/protocols/toc/toc.c:1968
 msgid "Could not write file header.  The file will not be transferred."
 msgstr "Could not write file header.  The file will not be transferred."
 
-#: src/protocols/toc/toc.c:2042
+#: src/protocols/toc/toc.c:2068
 msgid "Gaim - Save As..."
 msgstr "Gaim - Save As..."
 
-#: src/protocols/toc/toc.c:2076
+#: src/protocols/toc/toc.c:2102
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr[0] "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgstr[1] "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 
-#: src/protocols/toc/toc.c:2083
+#: src/protocols/toc/toc.c:2109
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s requests you to send them a file"
@@ -8088,15 +9327,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/toc/toc.c:2168 src/protocols/toc/toc.c:2170
+#: src/protocols/toc/toc.c:2189 src/protocols/toc/toc.c:2191
 msgid "TOC Protocol Plugin"
 msgstr "TOC Protocol Plugin"
 
-#: src/protocols/toc/toc.c:2187
+#: src/protocols/toc/toc.c:2210
 msgid "TOC host"
 msgstr "TOC host"
 
-#: src/protocols/toc/toc.c:2191
+#: src/protocols/toc/toc.c:2214
 msgid "TOC port"
 msgstr "TOC port"
 
@@ -8153,7 +9392,7 @@
 msgid "Profile"
 msgstr "Profile"
 
-#: src/protocols/trepia/trepia.c:439
+#: src/protocols/trepia/trepia.c:438
 msgid "Set Profile"
 msgstr "Set Profile"
 
@@ -8180,11 +9419,11 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/trepia/trepia.c:1283 src/protocols/trepia/trepia.c:1285
+#: src/protocols/trepia/trepia.c:1278 src/protocols/trepia/trepia.c:1280
 msgid "Trepia Protocol Plugin"
 msgstr "Trepia Protocol Plugin"
 
-#: src/protocols/yahoo/yahoo.c:308
+#: src/protocols/yahoo/yahoo.c:307
 msgid ""
 "You have been logged off as you have logged in on a different machine or "
 "device."
@@ -8192,25 +9431,25 @@
 "You have been logged off as you have logged in on a different machine or "
 "device."
 
-#: src/protocols/yahoo/yahoo.c:747
+#: src/protocols/yahoo/yahoo.c:749
 msgid "Your Yahoo! message did not get sent."
 msgstr "Your Yahoo! message did not get sent."
 
-#: src/protocols/yahoo/yahoo.c:765
+#: src/protocols/yahoo/yahoo.c:767
 msgid "Buzz!!"
 msgstr "Buzz!!"
 
-#: src/protocols/yahoo/yahoo.c:800
+#: src/protocols/yahoo/yahoo.c:802
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Yahoo! system message for %s:"
 
-#: src/protocols/yahoo/yahoo.c:866
+#: src/protocols/yahoo/yahoo.c:868
 #, 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:869
+#: src/protocols/yahoo/yahoo.c:871
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -8219,11 +9458,11 @@
 "%s has (retroactively) denied your request to add them to your list for the "
 "following reason: %s."
 
-#: src/protocols/yahoo/yahoo.c:872
+#: src/protocols/yahoo/yahoo.c:874
 msgid "Add buddy rejected"
 msgstr "Add buddy rejected"
 
-#: src/protocols/yahoo/yahoo.c:1599
+#: src/protocols/yahoo/yahoo.c:1601
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -8234,11 +9473,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:1602
+#: src/protocols/yahoo/yahoo.c:1604
 msgid "Failed Yahoo! Authentication"
 msgstr "Failed Yahoo! Authentication"
 
-#: src/protocols/yahoo/yahoo.c:1675
+#: src/protocols/yahoo/yahoo.c:1677
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -8247,76 +9486,76 @@
 "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:1678
+#: src/protocols/yahoo/yahoo.c:1680
 msgid "Ignore buddy?"
 msgstr "Ignore buddy?"
 
-#: src/protocols/yahoo/yahoo.c:1711
+#: src/protocols/yahoo/yahoo.c:1713
 msgid "Invalid username."
 msgstr "Invalid username."
 
-#: src/protocols/yahoo/yahoo.c:1714
+#: src/protocols/yahoo/yahoo.c:1716
 msgid "Incorrect password."
 msgstr "Incorrect password."
 
-#: src/protocols/yahoo/yahoo.c:1717
+#: src/protocols/yahoo/yahoo.c:1719
 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:1720
+#: src/protocols/yahoo/yahoo.c:1722
 #, c-format
 msgid "Unknown error number %d."
 msgstr "Unknown error number %d."
 
-#: src/protocols/yahoo/yahoo.c:1777
+#: src/protocols/yahoo/yahoo.c:1779
 #, 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:1779
+#: src/protocols/yahoo/yahoo.c:1781
 msgid "Could not add buddy to server list"
 msgstr "Could not add buddy to server list"
 
-#: src/protocols/yahoo/yahoo.c:1889 src/protocols/yahoo/yahoo.c:2020
+#: src/protocols/yahoo/yahoo.c:1891 src/protocols/yahoo/yahoo.c:2022
 msgid "Unable to read"
 msgstr "Unable to read"
 
-#: src/protocols/yahoo/yahoo.c:2042 src/protocols/yahoo/yahoo.c:2152
-#: src/protocols/yahoo/yahoo.c:2195 src/protocols/yahoo/yahoochat.c:1360
+#: src/protocols/yahoo/yahoo.c:2044 src/protocols/yahoo/yahoo.c:2154
+#: src/protocols/yahoo/yahoo.c:2197 src/protocols/yahoo/yahoochat.c:1360
 #: src/protocols/yahoo/yahoochat.c:1421
 msgid "Connection problem"
 msgstr "Connection problem"
 
-#: src/protocols/yahoo/yahoo.c:2279 src/protocols/yahoo/yahoo.c:2605
-#: src/protocols/yahoo/yahoo.c:2717
+#: src/protocols/yahoo/yahoo.c:2281 src/protocols/yahoo/yahoo.c:2662
+#: src/protocols/yahoo/yahoo.c:2774
 msgid "Not At Home"
 msgstr "Not At Home"
 
-#: src/protocols/yahoo/yahoo.c:2281 src/protocols/yahoo/yahoo.c:2607
-#: src/protocols/yahoo/yahoo.c:2718
+#: src/protocols/yahoo/yahoo.c:2283 src/protocols/yahoo/yahoo.c:2664
+#: src/protocols/yahoo/yahoo.c:2775
 msgid "Not At Desk"
 msgstr "Not At Desk"
 
-#: src/protocols/yahoo/yahoo.c:2283 src/protocols/yahoo/yahoo.c:2609
-#: src/protocols/yahoo/yahoo.c:2719
+#: src/protocols/yahoo/yahoo.c:2285 src/protocols/yahoo/yahoo.c:2666
+#: src/protocols/yahoo/yahoo.c:2776
 msgid "Not In Office"
 msgstr "Not In Office"
 
-#: src/protocols/yahoo/yahoo.c:2287 src/protocols/yahoo/yahoo.c:2613
-#: src/protocols/yahoo/yahoo.c:2721
+#: src/protocols/yahoo/yahoo.c:2289 src/protocols/yahoo/yahoo.c:2670
+#: src/protocols/yahoo/yahoo.c:2778
 msgid "On Vacation"
 msgstr "On Vacation"
 
-#: src/protocols/yahoo/yahoo.c:2291 src/protocols/yahoo/yahoo.c:2617
-#: src/protocols/yahoo/yahoo.c:2723
+#: src/protocols/yahoo/yahoo.c:2293 src/protocols/yahoo/yahoo.c:2674
+#: src/protocols/yahoo/yahoo.c:2780
 msgid "Stepped Out"
 msgstr "Stepped Out"
 
-#: src/protocols/yahoo/yahoo.c:2355 src/protocols/yahoo/yahoo.c:2387
+#: src/protocols/yahoo/yahoo.c:2374 src/protocols/yahoo/yahoo.c:2406
 msgid "Not on server list"
 msgstr "Not on server list"
 
-#: src/protocols/yahoo/yahoo.c:2407
+#: src/protocols/yahoo/yahoo.c:2426
 #, c-format
 msgid ""
 "\n"
@@ -8325,31 +9564,31 @@
 "\n"
 "<b>%s:</b> %s"
 
-#: src/protocols/yahoo/yahoo.c:2443
+#: src/protocols/yahoo/yahoo.c:2498
 msgid "Join in Chat"
 msgstr "Join in Chat"
 
-#: src/protocols/yahoo/yahoo.c:2449
+#: src/protocols/yahoo/yahoo.c:2502
 msgid "Initiate Conference"
 msgstr "Initiate Conference"
 
-#: src/protocols/yahoo/yahoo.c:2502
+#: src/protocols/yahoo/yahoo.c:2562
 msgid "Active which ID?"
 msgstr "Active which ID?"
 
-#: src/protocols/yahoo/yahoo.c:2510
+#: src/protocols/yahoo/yahoo.c:2571
 msgid "Join who in chat?"
 msgstr "Join who in chat?"
 
-#: src/protocols/yahoo/yahoo.c:2521
+#: src/protocols/yahoo/yahoo.c:2581
 msgid "Activate ID..."
 msgstr "Activate ID..."
 
-#: src/protocols/yahoo/yahoo.c:2527
+#: src/protocols/yahoo/yahoo.c:2585
 msgid "Join user in chat..."
 msgstr "Join user in chat..."
 
-#: src/protocols/yahoo/yahoo.c:2916
+#: src/protocols/yahoo/yahoo.c:2973
 msgid ""
 "<b>Sorry, profiles marked as containing adult content are not supported at "
 "this time.</b><br><br>\n"
@@ -8357,7 +9596,7 @@
 "<b>Sorry, profiles marked as containing adult content are not supported at "
 "this time.</b><br><br>\n"
 
-#: src/protocols/yahoo/yahoo.c:2917 src/protocols/yahoo/yahoo.c:2940
+#: src/protocols/yahoo/yahoo.c:2974 src/protocols/yahoo/yahoo.c:2997
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser<br>"
@@ -8365,38 +9604,38 @@
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser<br>"
 
-#: src/protocols/yahoo/yahoo.c:2939
+#: src/protocols/yahoo/yahoo.c:2996
 msgid ""
 "<b>Sorry, non-English profiles are not supported at this time.</b><br><br>\n"
 msgstr ""
 "<b>Sorry, non-English profiles are not supported at this time.</b><br><br>\n"
 
-#: src/protocols/yahoo/yahoo.c:2987 src/protocols/yahoo/yahoo.c:2988
+#: src/protocols/yahoo/yahoo.c:3044 src/protocols/yahoo/yahoo.c:3045
 msgid "Yahoo! ID"
 msgstr "Yahoo! ID"
 
-#: src/protocols/yahoo/yahoo.c:3032 src/protocols/yahoo/yahoo.c:3035
-#: src/protocols/yahoo/yahoo.c:3038
+#: src/protocols/yahoo/yahoo.c:3089 src/protocols/yahoo/yahoo.c:3092
+#: src/protocols/yahoo/yahoo.c:3095
 msgid "Hobbies"
 msgstr "Hobbies"
 
-#: src/protocols/yahoo/yahoo.c:3047 src/protocols/yahoo/yahoo.c:3050
+#: src/protocols/yahoo/yahoo.c:3104 src/protocols/yahoo/yahoo.c:3107
 msgid "Latest News"
 msgstr "Latest News"
 
-#: src/protocols/yahoo/yahoo.c:3064
+#: src/protocols/yahoo/yahoo.c:3121
 msgid "Home Page"
 msgstr "Home Page"
 
-#: src/protocols/yahoo/yahoo.c:3076
+#: src/protocols/yahoo/yahoo.c:3133
 msgid "Cool Link 1"
 msgstr "Cool Link 1"
 
-#: src/protocols/yahoo/yahoo.c:3080
+#: src/protocols/yahoo/yahoo.c:3137
 msgid "Cool Link 2"
 msgstr "Cool Link 2"
 
-#: src/protocols/yahoo/yahoo.c:3082
+#: src/protocols/yahoo/yahoo.c:3139
 msgid "Cool Link 3"
 msgstr "Cool Link 3"
 
@@ -8411,27 +9650,27 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/yahoo/yahoo.c:3295 src/protocols/yahoo/yahoo.c:3297
+#: src/protocols/yahoo/yahoo.c:3347 src/protocols/yahoo/yahoo.c:3349
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo Protocol Plugin"
 
-#: src/protocols/yahoo/yahoo.c:3314
+#: src/protocols/yahoo/yahoo.c:3368
 msgid "Pager host"
 msgstr "Pager host"
 
-#: src/protocols/yahoo/yahoo.c:3317
+#: src/protocols/yahoo/yahoo.c:3371
 msgid "Pager port"
 msgstr "Pager port"
 
-#: src/protocols/yahoo/yahoo.c:3320
+#: src/protocols/yahoo/yahoo.c:3374
 msgid "File transfer host"
 msgstr "File transfer host"
 
-#: src/protocols/yahoo/yahoo.c:3323
+#: src/protocols/yahoo/yahoo.c:3377
 msgid "File transfer port"
 msgstr "File transfer port"
 
-#: src/protocols/yahoo/yahoo.c:3326
+#: src/protocols/yahoo/yahoo.c:3380
 msgid "Chat Room List Url"
 msgstr "Chat Room List Url"
 
@@ -8497,34 +9736,34 @@
 msgid "User Rooms"
 msgstr "User Rooms"
 
-#: src/protocols/zephyr/zephyr.c:557
+#: src/protocols/zephyr/zephyr.c:558
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>User:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:559
+#: src/protocols/zephyr/zephyr.c:560
 #, c-format
 msgid "<b>Alias:</b> %s<br>"
 msgstr "<b>Alias:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:561
+#: src/protocols/zephyr/zephyr.c:562
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>Hidden or not logged-in"
 
-#: src/protocols/zephyr/zephyr.c:565
+#: src/protocols/zephyr/zephyr.c:566
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>At %s since %s"
 
-#: src/protocols/zephyr/zephyr.c:831 src/protocols/zephyr/zephyr.c:832
+#: src/protocols/zephyr/zephyr.c:832 src/protocols/zephyr/zephyr.c:833
 msgid "Anyone"
 msgstr "Anyone"
 
-#: src/protocols/zephyr/zephyr.c:858
+#: src/protocols/zephyr/zephyr.c:859
 msgid "Already logged in with Zephyr"
 msgstr "Already logged in with Zephyr"
 
-#: src/protocols/zephyr/zephyr.c:858
+#: src/protocols/zephyr/zephyr.c:859
 msgid ""
 "Because Zephyr uses your system username, you are unable to have multiple "
 "accounts on it when logged in as the same user."
@@ -8532,19 +9771,15 @@
 "Because Zephyr uses your system username, you are unable to have multiple "
 "accounts on it when logged in as the same user."
 
-#: src/protocols/zephyr/zephyr.c:1164
-msgid "ZLocate"
-msgstr "ZLocate"
-
-#: src/protocols/zephyr/zephyr.c:1206
+#: src/protocols/zephyr/zephyr.c:1191
 msgid "_Class:"
 msgstr "_Class:"
 
-#: src/protocols/zephyr/zephyr.c:1212
+#: src/protocols/zephyr/zephyr.c:1197
 msgid "_Instance:"
 msgstr "_Instance:"
 
-#: src/protocols/zephyr/zephyr.c:1218
+#: src/protocols/zephyr/zephyr.c:1203
 msgid "_Recipient:"
 msgstr "_Recipient:"
 
@@ -8559,37 +9794,38 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/zephyr/zephyr.c:1373 src/protocols/zephyr/zephyr.c:1375
+#: src/protocols/zephyr/zephyr.c:1353 src/protocols/zephyr/zephyr.c:1355
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr Protocol Plugin"
 
-#: src/protocols/zephyr/zephyr.c:1392
+#: src/protocols/zephyr/zephyr.c:1374
 msgid "Export to .anyone"
 msgstr "Export to .anyone"
 
-#: src/protocols/zephyr/zephyr.c:1395
+#: src/protocols/zephyr/zephyr.c:1377
 msgid "Export to .zephyr.subs"
 msgstr "Export to .zephyr.subs"
 
-#: src/protocols/zephyr/zephyr.c:1398
+#: src/protocols/zephyr/zephyr.c:1380
 msgid "Exposure"
 msgstr "Exposure"
 
 #. Forbidden
-#: src/proxy.c:958
-msgid "Access denied: proxy server forbids port 80 tunnelling."
-msgstr "Access denied: proxy server forbids port 80 tunnelling."
-
-#: src/proxy.c:960
+#: src/proxy.c:853
+#, c-format
+msgid "Access denied: proxy server forbids port %d tunnelling."
+msgstr "Access denied: proxy server forbids port %d tunnelling."
+
+#: src/proxy.c:857
 #, c-format
 msgid "Proxy connection error %d"
 msgstr "Proxy connection error %d"
 
-#: src/proxy.c:1699
+#: src/proxy.c:1596
 msgid "Invalid proxy settings"
 msgstr "Invalid proxy settings"
 
-#: src/proxy.c:1699
+#: src/proxy.c:1596
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -8598,7 +9834,7 @@
 "invalid."
 
 #. * Custom away message.
-#: src/prpl.h:195
+#: src/prpl.h:177
 msgid "Custom"
 msgstr "Custom"
 
@@ -8609,62 +9845,62 @@
 msgid "Accept"
 msgstr "Accept"
 
-#: src/server.c:58
+#: src/server.c:60
 msgid "Please enter your password"
 msgstr "Please enter your password"
 
-#: src/server.c:962
+#: src/server.c:908
 #, c-format
 msgid "(%d message)"
 msgid_plural "(%d messages)"
 msgstr[0] "(%d message)"
 msgstr[1] "(%d messages)"
 
-#: src/server.c:976
+#: src/server.c:922
 msgid "(1 message)"
 msgstr "(1 message)"
 
-#: src/server.c:1160 src/server.c:1170
+#: src/server.c:1088 src/server.c:1098
 #, c-format
 msgid "%s logged in."
 msgstr "%s logged in."
 
-#: src/server.c:1184
+#: src/server.c:1111
 #, c-format
 msgid "%s signed on"
 msgstr "%s signed on"
 
-#: src/server.c:1200
+#: src/server.c:1127
 #, c-format
 msgid "%s came back"
 msgstr "%s came back"
 
-#: src/server.c:1202
+#: src/server.c:1129
 #, c-format
 msgid "%s went away"
 msgstr "%s went away"
 
-#: src/server.c:1217
+#: src/server.c:1144
 #, c-format
 msgid "%s became idle"
 msgstr "%s became idle"
 
-#: src/server.c:1231
+#: src/server.c:1158
 #, c-format
 msgid "%s became unidle"
 msgstr "%s became unidle"
 
-#: src/server.c:1244 src/server.c:1252
+#: src/server.c:1169 src/server.c:1177
 #, c-format
 msgid "%s logged out."
 msgstr "%s logged out."
 
-#: src/server.c:1267
+#: src/server.c:1191
 #, c-format
 msgid "%s signed off"
 msgstr "%s signed off"
 
-#: src/server.c:1317
+#: src/server.c:1241
 #, c-format
 msgid ""
 "%s has just been warned by %s.\n"
@@ -8673,11 +9909,11 @@
 "%s has just been warned by %s.\n"
 "Your new warning level is %d%%"
 
-#: src/server.c:1320
+#: src/server.c:1244
 msgid "an anonymous person"
 msgstr "an anonymous person"
 
-#: src/server.c:1430
+#: src/server.c:1354
 #, c-format
 msgid ""
 "User '%s' invites %s to buddy chat room: '%s'\n"
@@ -8686,12 +9922,12 @@
 "User '%s' invites %s to buddy chat room: '%s'\n"
 "%s"
 
-#: src/server.c:1434
+#: src/server.c:1358
 #, c-format
 msgid "User '%s' invites %s to buddy chat room: '%s'\n"
 msgstr "User '%s' invites %s to buddy chat room: '%s'\n"
 
-#: src/server.c:1440
+#: src/server.c:1364
 msgid "Accept chat invitation?"
 msgstr "Accept chat invitation?"
 
@@ -8718,33 +9954,33 @@
 msgid "_Warn"
 msgstr "_Warn"
 
-#: src/util.c:2040
+#: src/util.c:2132
 msgid "Calculating..."
 msgstr "Calculating..."
 
-#: src/util.c:2043
+#: src/util.c:2135
 msgid "Unknown."
 msgstr "Unknown."
 
-#: src/util.c:2074 src/util.c:2079 src/util.c:2084 src/util.c:2087
+#: src/util.c:2166 src/util.c:2171 src/util.c:2176 src/util.c:2179
 msgid "day"
 msgid_plural "days"
 msgstr[0] "day"
 msgstr[1] "days"
 
-#: src/util.c:2075 src/util.c:2079 src/util.c:2093 src/util.c:2095
+#: src/util.c:2167 src/util.c:2171 src/util.c:2185 src/util.c:2187
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "hour"
 msgstr[1] "hours"
 
-#: src/util.c:2075 src/util.c:2084 src/util.c:2093 src/util.c:2098
+#: src/util.c:2167 src/util.c:2176 src/util.c:2185 src/util.c:2190
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minute"
 msgstr[1] "minutes"
 
-#: src/util.c:2430
+#: src/util.c:2527
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Error opening connection.\n"